plugins/libkolab

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_storage_folder.php |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 372cf33d18505415011a0c22cefda1f35132deb2
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Sep 25 10:09:58 2014 +0200

    Use folder name for UID if writing to IMAP metadata fails

diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index a54b069..2b25826 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -119,9 +119,12 @@ class kolab_storage_folder extends kolab_storage_folder_api
 
         // generate a folder UID and set it to IMAP
         $uid = rtrim(chunk_split(md5($this->name . $this->get_owner() . uniqid('-', true)), 12, '-'), '-');
-        $this->set_uid($uid);
+        if ($this->set_uid($uid)) {
+            return $uid;
+        }
 
-        return $uid;
+        // create hash from folder name if we can't write the UID metadata
+        return md5($this->name . $this->get_owner());
     }
 
     /**