lib/hosted lib/kolab_client_task.php

[Aleksander Machniak]

 lib/hosted/kolab_client_task_signup.php |    4 ++--
 lib/kolab_client_task.php               |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f70608cc4070999e9e8138afda85751f1cc683bb
Author: Aleksander Machniak <alec at alec.pl>
Date:   Wed Sep 26 13:34:40 2012 +0200

    Fix empty capabilities on hosted (#1043)

diff --git a/lib/hosted/kolab_client_task_signup.php b/lib/hosted/kolab_client_task_signup.php
index b1dbe6d..6ebcdd9 100644
--- a/lib/hosted/kolab_client_task_signup.php
+++ b/lib/hosted/kolab_client_task_signup.php
@@ -63,11 +63,11 @@ class kolab_client_task_signup extends kolab_client_task
     private function login($domain=NULL)
     {
         if(is_null($domain)) {
-            $domain = $this->config_get('primary_domain');
+            $this->domain = $this->config_get('primary_domain');
         }
 
         // Login ($result is a kolab_client_api_result instance)
-        $result = $this->api->login($this->config_get('bind_dn'), $this->config_get('bind_pw'), $domain);
+        $result = $this->api->login($this->config_get('bind_dn'), $this->config_get('bind_pw'), $this->domain);
 
         // Set the session token we got in the API client instance, so subsequent
         // API calls are made in the same session.
diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 47dce4a..02ca4a5 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -630,7 +630,7 @@ class kolab_client_task
             }
         }
 
-        $domain = $_SESSION['user']['domain'];
+        $domain = $this->domain ? $this->domain : $_SESSION['user']['domain'];
 
         return !$all ? $list[$domain] : $list;
     }