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

[Jeroen van Meeuwen]

 lib/kolab_client_task.php |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit ae29e8f58e0528d5a965b95542b0254ff55ca023
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon May 14 09:17:51 2012 +0100

    Be more verbose on the capabilities and how they impact the menu

diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 4bcc56b..6a16538 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -457,14 +457,14 @@ class kolab_client_task
 
         $capabilities = $this->capabilities();
 
-        //console($capabilities);
+        console("Obtained the following capabilities:", $capabilities);
 
         foreach ($this->menu as $idx => $label) {
-            //console("$task: $task, idx: $idx, label: $label");
+            console("Looking if \$task: $task, \$idx: $idx, \$label: $label is part of the capabilities");
 
             if (in_array($task, array('user', 'group'))) {
                 if (!array_key_exists($task . "." . $idx, $capabilities['actions'])) {
-                    //console("$task.$idx not in \$capabilities['actions'], skipping", $capabilities['actions']);
+                    console("$task.$idx not in \$capabilities['actions'], skipping", $capabilities['actions']);
                     continue;
                 }
             }
@@ -553,17 +553,19 @@ class kolab_client_task
      */
     protected function capabilities()
     {
+        $domain = $_SESSION['user']['domain'];
+
         if (!isset($_SESSION['capabilities'])) {
             $result = $this->api->post('system.capabilities');
             $list   = $result->get('list');
 
             if (is_array($list)) {
                 $_SESSION['capabilities'] = $list;
+            } else {
+                $_SESSION['capabilities'][$domain] = $list;
             }
         }
 
-        $domain = $_SESSION['user']['domain'];
-
         return $_SESSION['capabilities'][$domain];
     }