Spread Kolab-specific fields to the new form groups; check if connection to Kolab server succeeded; sort contacts by name

git-svn-id: https://svn.roundcube.net/trunk@4442 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 2 deletions

diff --git a/plugins/kolab_core/rcube_kolab.php b/plugins/kolab_core/rcube_kolab.php
index 4fadb23f4..a69a90365 100644
--- a/plugins/kolab_core/rcube_kolab.php
+++ b/plugins/kolab_core/rcube_kolab.php
@@ -15,6 +15,7 @@ require_once 'Horde/Perms.php';
 class rcube_kolab
 {
     private static $horde_auth;
+    private static $ready = false;
     
     
     /**
@@ -47,6 +48,7 @@ class rcube_kolab
                 'remote_addr' => $_SERVER['REMOTE_ADDR'],
             );
             Auth::setCredential('password', $pwd);
+            self::$ready = true;
         }
         
         NLS::setCharset('UTF-8');
@@ -76,7 +78,7 @@ class rcube_kolab
     {
         self::setup();
         $kolab = Kolab_List::singleton();
-        return $kolab->getByType($type);
+        return self::$ready ? $kolab->getByType($type) : array();
     }
 
     /**
@@ -90,7 +92,7 @@ class rcube_kolab
     {
         self::setup();
         $kolab = Kolab_List::singleton();
-        return $kolab->getFolder($folder)->getData($data_type);
+        return self::$ready ? $kolab->getFolder($folder)->getData($data_type) : null;
     }
 
     /**