lib/api

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Fri Jun 22 11:53:40 CEST 2012


 lib/api/kolab_api_service_domain.php |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 4f5b2a1330ac60d46ac7f0c56af45bef24fd7a9f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jun 22 10:53:01 2012 +0100

    Add secondary domain name space handling to API service method domain.add

diff --git a/lib/api/kolab_api_service_domain.php b/lib/api/kolab_api_service_domain.php
index 3d1b9dd..ad29375 100644
--- a/lib/api/kolab_api_service_domain.php
+++ b/lib/api/kolab_api_service_domain.php
@@ -91,8 +91,14 @@ class kolab_api_service_domain extends kolab_api_service
             return;
         }
 
-        $auth = Auth::get_instance();
-        $auth->domain_add($postdata[$dna]);
+        $auth = Auth::get_instance($conf->get('kolab', 'primary_domain'));
+
+        if (is_array($postdata[$dna])) {
+            $parent_domain = array_shift($postdata[$dna]);
+            return $auth->domain_add($parent_domain, $postdata[$dna]);
+        } else {
+            return $auth->domain_add($postdata[$dna]);
+        }
     }
 
     public function domain_edit($getdata, $postdata)





More information about the commits mailing list