Request 2168 (accepted)

Overview

Request 2168 (accepted)

Check in 2.3.8

Created by vanmeeuwen over 6 years ago
In state accepted
Open review for Admin

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.7.tar.gz/config/config.inc.php.dist -> kolab-syncroton-2.3.8.tar.gz/config/config.inc.php.dist Changed

kolab-syncroton-2.3.7.tar.gz/lib/ext/Syncroton/Command/Ping.php -> kolab-syncroton-2.3.8.tar.gz/lib/ext/Syncroton/Command/Ping.php Changed

@@ -22,7 +22,7 @@
     const STATUS_MISSING_PARAMETERS         = 3;
     const STATUS_REQUEST_FORMAT_ERROR       = 4;
     const STATUS_INTERVAL_TO_GREAT_OR_SMALL = 5;
-    const STATUS_TO_MUCH_FOLDERS            = 6;
+    const STATUS_TOO_MANY_FOLDERS           = 6;
     const STATUS_FOLDER_NOT_FOUND           = 7;
     const STATUS_GENERAL_ERROR              = 8;
     
@@ -64,6 +64,14 @@
             }
             
             if (isset($xml->Folders->Folder)) {
+                $maxCollections = Syncroton_Registry::getMaxCollections();
+                if ($maxCollections && count($xml->Folders->Folder) > $maxCollections) {
+                    $ping = $this->_outputDom->documentElement;
+                    $ping->appendChild($this->_outputDom->createElementNS('uri:Ping', 'Status', self::STATUS_TOO_MANY_FOLDERS));
+                    $ping->appendChild($this->_outputDom->createElementNS('uri:Ping', 'MaxFolders', $maxCollections));
+                    return;
+                }
+
                 $folders = array();
                 foreach ($xml->Folders->Folder as $folderXml) {
                     try {

kolab-syncroton-2.3.7.tar.gz/lib/ext/Syncroton/Command/Sync.php -> kolab-syncroton-2.3.8.tar.gz/lib/ext/Syncroton/Command/Sync.php Changed

@@ -31,6 +31,7 @@
     const STATUS_FOLDER_HIERARCHY_HAS_CHANGED           = 12;
     const STATUS_RESEND_FULL_XML                        = 13;
     const STATUS_WAIT_INTERVAL_OUT_OF_RANGE             = 14;
+    const STATUS_TOO_MANY_COLLECTIONS                   = 15;
     
     const CONFLICT_OVERWRITE_SERVER                     = 0;
     const CONFLICT_OVERWRITE_PIM                        = 1;
@@ -141,6 +142,7 @@
             $sync->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Status', self::STATUS_WAIT_INTERVAL_OUT_OF_RANGE));
             $sync->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Limit', floor($maxInterval/$intervalDiv)));
             $this->_heartbeatInterval = null;
+            return;
         }
         
         $this->_globalWindowSize = isset($requestXML->WindowSize) ? (int)$requestXML->WindowSize : 100;
@@ -161,7 +163,15 @@
                 $lastSyncCollection['options'] = array();
             }
         }
-        
+
+        $maxCollections = Syncroton_Registry::getMaxCollections();
+        if ($maxCollections && count($requestXML->Collections->Collection) > $maxCollections) {
+            $sync = $this->_outputDom->documentElement;
+            $sync->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Status', self::STATUS_TOO_MANY_COLLECTIONS));
+            $sync->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Limit', $maxCollections));
+            return;
+        }
+
         $collections = array();
         
         foreach ($requestXML->Collections->Collection as $xmlCollection) {

kolab-syncroton-2.3.7.tar.gz/lib/ext/Syncroton/Registry.php -> kolab-syncroton-2.3.8.tar.gz/lib/ext/Syncroton/Registry.php Changed

kolab-syncroton-2.3.7.tar.gz/lib/kolab_sync.php -> kolab-syncroton-2.3.8.tar.gz/lib/kolab_sync.php Changed

@@ -166,9 +166,10 @@
         Syncroton_Registry::setGALDataClass('kolab_sync_data_gal');
 
         // Configuration
-        Syncroton_Registry::set(Syncroton_Registry::PING_TIMEOUT, $this->config->get('activesync_ping_timeout', 60));
-        Syncroton_Registry::set(Syncroton_Registry::PING_INTERVAL, $this->config->get('activesync_ping_interval', 15 * 60));
-        Syncroton_Registry::set(Syncroton_Registry::QUIET_TIME,   $this->config->get('activesync_quiet_time', 3 * 60));
+        Syncroton_Registry::set(Syncroton_Registry::PING_TIMEOUT,    (int) $this->config->get('activesync_ping_timeout', 60));
+        Syncroton_Registry::set(Syncroton_Registry::PING_INTERVAL,   (int) $this->config->get('activesync_ping_interval', 15 * 60));
+        Syncroton_Registry::set(Syncroton_Registry::QUIET_TIME,      (int) $this->config->get('activesync_quiet_time', 3 * 60));
+        Syncroton_Registry::set(Syncroton_Registry::MAX_COLLECTIONS, (int) $this->config->get('activesync_max_folders', 100));
 
         // Run Syncroton
         $syncroton = new Syncroton_Server($userid);

kolab-syncroton-2.3.7.tar.gz/lib/kolab_sync_data.php -> kolab-syncroton-2.3.8.tar.gz/lib/kolab_sync_data.php Changed

kolab-syncroton-2.3.7.tar.gz/lib/kolab_sync_data_calendar.php -> kolab-syncroton-2.3.8.tar.gz/lib/kolab_sync_data_calendar.php Changed

@@ -581,6 +581,30 @@
             // Update/Save the event
             if (empty($existing)) {
                 $folder = $this->save_event($event, $status);
+
+                // Create SyncState for the new event, so it is not synced twice
+                if ($folder) {
+                    $folderId  = $this->getFolderId($folder);
+
+                    try {
+                        $syncBackend    = Syncroton_Registry::getSyncStateBackend();
+                        $folderBackend  = Syncroton_Registry::getFolderBackend();
+                        $contentBackend = Syncroton_Registry::getContentStateBackend();
+                        $syncFolder     = $folderBackend->getFolder($this->device->id, $folderId);
+                        $syncState      = $syncBackend->getSyncState($this->device->id, $syncFolder->id);
+
+                        $contentBackend->create(new Syncroton_Model_Content(array(
+                            'device_id'        => $this->device->id,
+                            'folder_id'        => $syncFolder->id,
+                            'contentid'        => $this->serverId($event['uid'], $folder),
+                            'creation_time'    => $syncState->lastsync,
+                            'creation_synckey' => $syncState->counter,
+                        )));
+                    }
+                    catch (Exception $e) {
+                        // ignore
+                    }
+                }
             }
             else {
                 $folder = $this->update_event($event, $existing, $status, $request->instanceId);

kolab-syncroton-2.3.7.tar.gz/lib/kolab_sync_logger.php -> kolab-syncroton-2.3.8.tar.gz/lib/kolab_sync_logger.php Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2168 0

Request History

vanmeeuwen created request over 6 years ago

Check in 2.3.8

vanmeeuwen accepted review over 6 years ago

vanmeeuwen accepted request over 6 years ago

Please add a comment