Branch 'kolab-webadmin-2.4' - lib/kolab_api_controller.php

[Jeroen van Meeuwen]

 lib/kolab_api_controller.php |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 363e350b9c75d1b59d62b759b66001dca417bec8
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon May 14 16:28:13 2012 +0100

    Fix domains with aliases mixing up the capabilities return

diff --git a/lib/kolab_api_controller.php b/lib/kolab_api_controller.php
index cfd984a..aca1374 100644
--- a/lib/kolab_api_controller.php
+++ b/lib/kolab_api_controller.php
@@ -307,11 +307,13 @@ class kolab_api_controller
             $this->domains[] = $_SESSION['user']->get_domain();
         }
 
+        //console("\$this->domains:", $this->domains);
+
         // add capabilities of all registered services
         foreach ($this->domains as $domain) {
             // TODO: 'associateddomain' is very specific to 389ds based deployments, and this
             // is supposed to be very generic.
-            $domain_name = is_array($domain) ? $domain['associateddomain'] : $domain;
+            $domain_name = is_array($domain) ? (is_array($domain['associateddomain']) ? $domain['associateddomain'][0] : $domain['associateddomain']) : $domain;
             // define our very own capabilities
             $actions = array(
                 'system.quit'      => array('type' => 'w'),
@@ -325,6 +327,8 @@ class kolab_api_controller
                 }
             }
 
+            //console("api capabilities", $domain, $domain_name);
+
             $result[$domain_name] = array('actions' => $actions);
         }