Branch 'roundcubemail-plugins-kolab-format2-horde5' - 2 commits - plugins/libkolab

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_format.php  |    2 +-
 plugins/libkolab/lib/kolab_storage.php |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit bbbdb5e073810618ca31cba7a753fe046dc5361e
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Nov 21 15:25:56 2012 +0100

    Fix check if data is loaded

diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
index 438e905..52b7947 100644
--- a/plugins/libkolab/lib/kolab_format.php
+++ b/plugins/libkolab/lib/kolab_format.php
@@ -364,7 +364,7 @@ abstract class kolab_format
     public function to_array()
     {
         // load from XML if not done yet
-        if (!empty($this->data))
+        if (empty($this->data))
             $this->init();
 
         return $this->data;


commit c8a9a45045f2cd23c1e0c882dfcd2006bbaa68ce
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Nov 21 15:25:24 2012 +0100

    Log errors about missing components

diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index 36f304b..4ea0543 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -62,6 +62,18 @@ class kolab_storage
             ));
             self::$imap->set_pagesize(9999);
         }
+        else if (!class_exists('Horde_Kolab_Format_Factory')) {
+            rcube::raise_error(array(
+                'code' => 900, 'type' => 'php',
+                'message' => "Missing required Horde_Kolab_Format_Factory class. Make sure that the Horde5/Kolab_Format package is installed. See README for instructions"
+            ), true);
+        }
+        else {
+            rcube::raise_error(array(
+                'code' => 900, 'type' => 'php',
+                'message' => "IMAP server doesn't support METADATA or ANNOTATEMORE"
+            ), true);
+        }
 
         return self::$ready;
     }