Kolab Groupware OBS

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.3.3.tar.gz/config/config.inc.php.dist Changed

kolab-syncroton-2.3.3.tar.gz/lib/ext/Syncroton/Model/AXMLEntry.php Changed

kolab-syncroton-2.3.3.tar.gz/lib/kolab_sync.php Changed

kolab-syncroton-2.3.3.tar.gz/lib/kolab_sync_data.php Changed

@@ -208,7 +208,7 @@
         $list = array();
 
         // device supports multiple folders ?
-        if (in_array(strtolower($this->device->devicetype), $this->ext_devices)) {
+        if ($this->isMultiFolder()) {
             // get the folders the user has access to
             $list = $this->listFolders();
         }
@@ -243,6 +243,23 @@
     }
 
     /**
+     * Returns true if the device supports multiple folders or it was configured so
+     */
+    protected function isMultiFolder()
+    {
+        $blacklist = rcube::get_instance()->config->get('activesync_multifolder_blacklist');
+
+        if (is_array($blacklist)) {
+            $is_multifolder = !in_array_nocase($this->device->devicetype, $blacklist);
+        }
+        else {
+            $is_multifolder = in_array_nocase($this->device->devicetype, $this->ext_devices);
+        }
+
+        return $is_multifolder;
+    }
+
+    /**
      * Returns default folder for current class type.
      */
     protected function getDefaultFolder()
@@ -878,6 +895,17 @@
      */
     public function hasChanges(Syncroton_Backend_IContent $contentBackend, Syncroton_Model_IFolder $folder, Syncroton_Model_ISyncState $syncState)
     {
+        // Try to detect change in multi-folder mode and throw exception
+        // so device will re-sync folders hierarchy
+        // @TODO: this is a temp solution until we have real hierarchy
+        //        changes detection fort Ping/Hartbeat
+        $is_multifolder = $this->isMultiFolder();
+        if (($is_multifolder && $folder->serverId == $this->defaultRootFolder)
+            || (!$is_multifolder && $folder->type >= 12)
+        ) {
+            throw new Syncroton_Exception_NotFound('Folder not found');
+        }
+
         try {
             if ($this->getChangedEntriesCount($folder->serverId, $syncState->lastsync, null, $folder->lastfiltertype)) {
                 return true;

kolab-syncroton-2.3.3.tar.gz/lib/kolab_sync_data_email.php Changed

kolab-syncroton.dsc Changed

Changes of Revision 12