lib/kolab_sync_backend.php

[Aleksander Machniak]

 lib/kolab_sync_backend.php |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 87ec6f2101fdd54e3a293051839f2530d2d7e917
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Sat Mar 15 18:27:48 2014 +0100

    Fix errors when renaming a mail folder

diff --git a/lib/kolab_sync_backend.php b/lib/kolab_sync_backend.php
index cd984bb..e7b4162 100644
--- a/lib/kolab_sync_backend.php
+++ b/lib/kolab_sync_backend.php
@@ -252,18 +252,17 @@ class kolab_sync_backend
      */
     public function folder_rename($old_name, $new_name, $type, $deviceid)
     {
-        $moved = kolab_storage::folder_rename($old_name, $new_name);
+        $this->folder_meta = null;
 
-        if ($moved) {
-            // UnSet ActiveSync subscription flag
-            $this->folder_set($old_name, $deviceid, 0);
-            // Set ActiveSync subscription flag
-            $this->folder_set($new_name, $deviceid, 1);
+        $type = self::type_activesync2kolab($type);
 
-            return true;
+        // don't use kolab_storage for moving mail folders
+        if (preg_match('/^mail/', $type)) {
+            return $this->storage->rename_folder($old_name, $new_name);
+        }
+        else {
+            return kolab_storage::folder_rename($old_name, $new_name);
         }
-
-        return false;
     }