Request 3306 (accepted)

This request supersedes: request 3305 (Show diff)

Overview

Request 3306 (accepted)

New release 2.4.2.24

Created by mollekopf 6 months ago
In state accepted
Supersedes 3305
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-syncroton

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

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/Sync.php Changed

@@ -670,7 +670,7 @@
                     if(is_array($collectionData->syncState->pendingdata)) {
                         $serverModifications = $collectionData->syncState->pendingdata;
                         if ($this->_logger instanceof Zend_Log) {
-                            $this->_logger->info(__METHOD__ . '::' . __LINE__ . " restored from sync state: (added/changed/deleted) " . count($serverModifications'added') . '/' . count($serverModifications'changed') . '/' . count($serverModifications'deleted')  . ' entries for sync from server to client');
+                            $this->_logger->info(__METHOD__ . '::' . __LINE__ . " restored from sync state: (added/changed/deleted) " . count($serverModifications'added') . '/' . count($serverModifications'changed') . '/' . count($serverModifications'deleted') . ' entries for sync from server to client');
                         }
                     } else {
                         try {
@@ -796,7 +796,7 @@
                 if ($this->_logger instanceof Zend_Log) {
                     $this->_logger->info(__METHOD__ . '::' . __LINE__ . " Processing collection " . $collectionData->collectionId);
                 }
-                
+
                 // send reponse for newly added entries
                 if(!empty($clientModifications'added')) {
                     foreach($clientModifications'added' as $entryData) {

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

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_calendar.php Changed

@@ -190,7 +190,7 @@
     public function getEntry(Syncroton_Model_SyncCollection $collection, $serverId, $as_array = false)
     {
         $event  = is_array($serverId) ? $serverId : $this->getObject($collection->collectionId, $serverId);
-        $config = $this->getFolderConfig($event'folderId');
+        $config = !empty($event'folderId') ? $this->getFolderConfig($event'folderId') : ;
         $result = ;
 
         $is_outlook = stripos($this->device->devicetype, 'outlook') !== false;
@@ -1328,14 +1328,14 @@
         $rec = (array) $event'recurrence';
 
         // Add BYDAY if not exists
-        if ($rec'FREQ' == 'WEEKLY' && empty($rec'BYDAY')) {
+        if (($rec'FREQ' ?? '') == 'WEEKLY' && empty($rec'BYDAY')) {
             $days = 'SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA';
             $day  = $event'start'->format('w');
 
             $rec'BYDAY' = $days$day;
         }
 
-        if (!$rec'INTERVAL') {
+        if (empty($rec'INTERVAL')) {
             $rec'INTERVAL' = 1;
         }

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_message.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_storage.php Changed

@@ -1937,6 +1937,7 @@
                 $synctime,
                 $data
             );
+
             if ($err = $db->is_error($result)) {
                 throw new Exception("Failed to save relation: {$err}");
             }
@@ -1968,19 +1969,21 @@
             );
 
             if ($row = $db->fetch_assoc()) {
-                $synctime = $row'synctime';
-                // @TODO: make sure synctime from sql is in "Y-m-d H:i:s" format
+                // Don't use $row'synctime' for the internal cache.
+                // The synctime of the found row is usually earlier than the requested synctime.
+                // Note: We use internal cache because there's a call to both hasChanges() and
+                // getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
                 $this->relations$folderid$synctime = json_decode($row'data', true);
-            }
 
-            // Cleanup: remove all records except the current one
-            $db->query(
-                "DELETE FROM `syncroton_relations_state`"
-                . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
-                $device_key,
-                $folderid,
-                $synctime
-            );
+                // Cleanup: remove all records except the current one
+                $db->query(
+                    "DELETE FROM `syncroton_relations_state`"
+                    . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
+                    $device_key,
+                    $folderid,
+                    $row'synctime',
+                );
+            }
         }
 
         return $this->relations$folderid$synctime ?? null;

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_timezone_converter.php Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3306 0

Request History

mollekopf created request 6 months ago

New release 2.4.2.24

mollekopf accepted request 6 months ago