2 commits - lib/api

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu Apr 18 16:52:21 CEST 2013


 lib/api/kolab_api_service_domain.php |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

New commits:
commit a3dfc9b28c5064649761adaa2d8d6402df076ec4
Merge: e08f381 8ebe838
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Apr 18 16:52:18 2013 +0200

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap



commit e08f381eae403dc5296b083ff9ca55a6d4c81787
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Apr 18 16:52:08 2013 +0200

    Add domain.find service method

diff --git a/lib/api/kolab_api_service_domain.php b/lib/api/kolab_api_service_domain.php
index e66cae3..07f7513 100644
--- a/lib/api/kolab_api_service_domain.php
+++ b/lib/api/kolab_api_service_domain.php
@@ -63,6 +63,7 @@ class kolab_api_service_domain extends kolab_api_service
         }
 
         if (in_array('read', $effective_rights['entryLevelRights'])) {
+            $rights['find'] = "r";
             $rights['info'] = "r";
         }
 
@@ -179,6 +180,30 @@ class kolab_api_service_domain extends kolab_api_service
         return $effective_rights;
     }
 
+    public function domain_find($getdata, $postdata)
+    {
+        $auth = Auth::get_instance();
+        $conf = Conf::get_instance();
+        $dna = $conf->get('domain_name_attribute');
+
+        if (empty($dna)) {
+            $dna = 'associateddomain';
+        }
+
+        if (empty($getdata[$dna])) {
+            Log::error("domain.find called without a '" . $dna . "' parameter");
+            return false;
+        }
+
+        $domain      = $auth->domain_find_by_attribute(array($dna => $getdata[$dna]));
+
+        if (!empty($domain)) {
+            return $domain;
+        }
+
+        return false;
+    }
+
     /**
      * Domain information.
      *





More information about the commits mailing list