Request 2407 (accepted)

Overview

Request 2407 (accepted)

Release 2.3.14

Created by vanmeeuwen over 5 years ago
In state accepted

Submit kolab-syncroton

Submit package Kolab:Winterfell / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.3.13.tar.gz/lib/kolab_sync.php -> kolab-syncroton-2.3.14.tar.gz/lib/kolab_sync.php Changed

kolab-syncroton-2.3.13.tar.gz/lib/kolab_sync_backend.php -> kolab-syncroton-2.3.14.tar.gz/lib/kolab_sync_backend.php Changed

@@ -149,7 +149,7 @@
     public function folders_list($deviceid, $type, $flat_mode = false)
     {
         // get all folders of specified type
-        $folders = (array) kolab_storage::list_folders('', '*', $type, false, $typedata);
+        $folders = kolab_storage::list_folders('', '*', $type, false, $typedata);
 
         // get folders activesync config
         $folderdata = $this->folder_meta();
@@ -253,14 +253,15 @@
     public function folder_meta()
     {
         if (!isset($this->folder_meta)) {
-            $this->folder_meta = array();
             // get folders activesync config
             $folderdata = $this->storage->get_metadata("*", self::ASYNC_KEY);
 
             if (!is_array($folderdata)) {
-                return false;
+                return $this->folder_meta = false;
             }
 
+            $this->folder_meta = array();
+
             foreach ($folderdata as $folder => $meta) {
                 if ($asyncdata = $meta[self::ASYNC_KEY]) {
                     if ($metadata = $this->unserialize_metadata($asyncdata)) {
@@ -589,7 +590,11 @@
             'event',
             'contact',
             'note',
-            'task'
+            'task',
+            'event.confidential',
+            'event.private',
+            'task.confidential',
+            'task.private',
         );
 
         // This default set can be extended by adding following values:
@@ -736,6 +741,8 @@
      */
     public static function type_kolab2activesync($type)
     {
+        $type = preg_replace('/\.(confidential|private)$/i', '', $type);
+
         if ($key = array_search($type, self::$types)) {
             return $key;
         }
@@ -818,8 +825,15 @@
             return $this->folder_uids[$name] = $uid;
         }
 */
+
+        if ($type === null) {
+            $type = kolab_storage::folder_type($name);
+        }
+
+        $type = preg_replace('/\.(confidential|private)$/i', '', $type);
+
         // Add type to folder UID hash, so type change can be detected by Syncroton
-        $uid = $name . '!!' . ($type !== null ? $type : kolab_storage::folder_type($name));
+        $uid = $name . '!!' . $type;
         $uid = md5($uid);
 
         return $this->folder_uids[$name] = $uid;

kolab-syncroton-2.3.13.tar.gz/lib/kolab_sync_data_email.php -> kolab-syncroton-2.3.14.tar.gz/lib/kolab_sync_data_email.php Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2407 0

Request History

vanmeeuwen created request over 5 years ago

Release 2.3.14

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago