lib/api lib/client

[Aleksander Machniak]

 lib/api/kolab_api_service_domain.php    |   20 ++++++++------------
 lib/client/kolab_client_task_domain.php |    4 ++--
 2 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit 16b8953a659bf316495ab2076ff6a1c8d27f8dea
Author: Aleksander Machniak <alec at alec.pl>
Date:   Tue Sep 10 08:57:12 2013 +0200

    Fix issue where domain.info wasn't returning domain id. Domain update/delete wasn't working. (Bug #2199)

diff --git a/lib/api/kolab_api_service_domain.php b/lib/api/kolab_api_service_domain.php
index 6f03987..4d5fcaa 100644
--- a/lib/api/kolab_api_service_domain.php
+++ b/lib/api/kolab_api_service_domain.php
@@ -135,11 +135,9 @@ class kolab_api_service_domain extends kolab_api_service
             return false;
         }
 
-        $domain_attributes  = $this->parse_input_attributes('domain', $postdata);
-        $domain             = $postdata['id'];
-
-        $auth   = Auth::get_instance();
-        $result = $auth->domain_edit($postdata['id'], $domain_attributes, $postdata['type_id']);
+        $auth       = Auth::get_instance();
+        $attributes = $this->parse_input_attributes('domain', $postdata);
+        $result     = $auth->domain_edit($postdata['id'], $attributes, $postdata['type_id']);
 
         // @TODO: return unique attribute or all attributes as domain_add()
         if ($result) {
@@ -152,9 +150,8 @@ class kolab_api_service_domain extends kolab_api_service
     public function domain_effective_rights($getdata, $postdata)
     {
         $auth = Auth::get_instance();
-
         $conf = Conf::get_instance();
-        $dna = $conf->get('domain_name_attribute');
+        $dna  = $conf->get('domain_name_attribute');
 
         if (empty($dna)) {
             $dna = 'associateddomain';
@@ -171,7 +168,6 @@ class kolab_api_service_domain extends kolab_api_service
             }
         }
         else {
-            $conf = Conf::get_instance();
             $entry_dn = $conf->get('ldap', 'domain_base_dn');
         }
 
@@ -184,9 +180,8 @@ class kolab_api_service_domain extends kolab_api_service
 
     public function domain_find($getdata, $postdata)
     {
-        $auth = Auth::get_instance();
         $conf = Conf::get_instance();
-        $dna = $conf->get('domain_name_attribute');
+        $dna  = $conf->get('domain_name_attribute');
 
         if (empty($dna)) {
             $dna = 'associateddomain';
@@ -197,7 +192,8 @@ class kolab_api_service_domain extends kolab_api_service
             return false;
         }
 
-        $domain      = $auth->domain_find_by_attribute(array($dna => $getdata[$dna]));
+        $auth   = Auth::get_instance();
+        $domain = $auth->domain_find_by_attribute(array($dna => $getdata[$dna]));
 
         if (!empty($domain)) {
             return $domain;
@@ -230,7 +226,7 @@ class kolab_api_service_domain extends kolab_api_service
         $result = $this->parse_result_attributes('domain', $result);
 
         if (empty($result['id'])) {
-            $result['id'] = $getdata[$dna];
+            $result['id'] = $getdata['id'];
         }
 
         if ($result) {
diff --git a/lib/client/kolab_client_task_domain.php b/lib/client/kolab_client_task_domain.php
index dce73f9..4a1190a 100644
--- a/lib/client/kolab_client_task_domain.php
+++ b/lib/client/kolab_client_task_domain.php
@@ -77,13 +77,13 @@ class kolab_client_task_domain extends kolab_client_task
      */
     public function action_info()
     {
-        $id     = $this->get_input('id', 'POST');
+        $id = $this->get_input('id', 'POST');
         //console("action_info() on", $id);
 
         $result = $this->api_get('domain.info', array('id' => $id));
         //console("action_info() \$result", $result);
 
-        $domain  = $result->get();
+        $domain = $result->get();
         //console("action_info() \$domain", $domain);
 
         $output = $this->domain_form(array_keys($domain), $domain);