From: Gunnar Wrobel <p@rdus.de>
Date: Thu, 11 Mar 2010 18:48:16 +0000 (+0100)
Subject: Temporarily fix handling of return values from the Imap_Client library
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=da46407104315a21f4605c1f7b0ed3434a51a1bf;p=horde.git

Temporarily fix handling of return values from the Imap_Client library
so that Kolab_Storage can be used by the applications.
---

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
index bfd99cdec..8c1a50589 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
@@ -278,7 +278,17 @@ class Horde_Kolab_Storage_Driver_Imap extends Horde_Kolab_Storage_Driver
             return $acl;
         }
 
-        return $this->_imap->getACL($folder);
+        try {
+            return $this->_imap->getACL($folder);
+        } catch (Exception $e) {
+            try {
+                return $this->_imap->getMyACLRights($folder);
+            } catch (Exception $e) {
+                $acl = array();
+                $acl[Horde_Auth::getAuth()] = 'lrid';
+                return $acl;
+            }
+        }            
     }
 
     /**
@@ -305,8 +315,12 @@ class Horde_Kolab_Storage_Driver_Imap extends Horde_Kolab_Storage_Driver
      */
     function getAnnotation($entry, $mailbox_name)
     {
-        $result = $this->_imap->getMetadata($mailbox_name, $entry);
-        return $result[$mailbox_name][$entry];
+        try {
+            $result = $this->_imap->getMetadata($mailbox_name, $entry);
+        } catch (Exception $e) {
+            return '';
+        }
+        return isset($result[$mailbox_name][$entry]) ? $result[$mailbox_name][$entry] : '';
     }
 
     /**