lib/api lib/Auth lib/Auth.php
Aleksander Machniak
machniak at kolabsys.com
Thu Oct 4 08:34:05 CEST 2012
lib/Auth.php | 5 +++++
lib/Auth/LDAP.php | 4 ++++
lib/api/kolab_api_service_domain.php | 25 +++++++++++++++++++++++++
3 files changed, 34 insertions(+)
New commits:
commit 2783356ecbe4614e42daaa6c5f8aa667986788af
Author: Aleksander Machniak <alec at alec.pl>
Date: Thu Oct 4 08:33:47 2012 +0200
Implement domain.delete
diff --git a/lib/Auth.php b/lib/Auth.php
index 3e0b9bd..db61490 100644
--- a/lib/Auth.php
+++ b/lib/Auth.php
@@ -219,6 +219,11 @@ class Auth {
return $this->auth_instance()->domain_edit($domain, $attributes, $typeid);
}
+ public function domain_delete($domain)
+ {
+ return $this->auth_instance()->domain_delete($domain);
+ }
+
public function domain_find_by_attribute($attribute)
{
return $this->auth_instance()->domain_find_by_attribute($attribute);
diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index 7e0ecd4..b73c2a2 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -179,6 +179,10 @@ class LDAP extends Net_LDAP3 {
return $this->modify_entry($_domain_dn, $_domain[$_domain_dn], $attributes);
}
+ public function domain_delete($domain) {
+ return $this->entry_delete($domain);
+ }
+
public function domain_find_by_attribute($attribute) {
$base_dn = $this->conf->get('ldap', 'domain_base_dn');
diff --git a/lib/api/kolab_api_service_domain.php b/lib/api/kolab_api_service_domain.php
index 23da894..89064e0 100644
--- a/lib/api/kolab_api_service_domain.php
+++ b/lib/api/kolab_api_service_domain.php
@@ -117,6 +117,31 @@ class kolab_api_service_domain extends kolab_api_service
return false;
}
+ /**
+ * Domain delete.
+ *
+ * @param array $get GET parameters
+ * @param array $post POST parameters
+ *
+ * @return bool True on success, False on failure
+ */
+ public function domain_delete($getdata, $postdata)
+ {
+ if (empty($postdata['domain'])) {
+ return false;
+ }
+
+ // TODO: Input validation
+ $auth = Auth::get_instance();
+ $result = $auth->domain_delete($postdata['domain']);
+
+ if ($result) {
+ return $result;
+ }
+
+ return false;
+ }
+
public function domain_effective_rights($getdata, $postdata)
{
$auth = Auth::get_instance();
More information about the commits
mailing list