Request 3295 (accepted)

This request supersedes: request 3293 (Show diff)

Overview

Request 3295 (accepted)

New release 2.4.2.21

Created by mollekopf 4 months ago
In state accepted
Supersedes 3293
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

@@ -599,7 +599,26 @@
             }
         }
 
+        // Handle Calendar folders first.
+        // Outlook can't match MeetingRequest with an event that wasn't synced yet, which
+        // leads to duplicated events in Outlook's calendar.
+        uasort(
+            $this->_collections,
+            function ($a, $b) {
+                $ac = $a->folder && $a->folder->class == Syncroton_Data_Factory::CLASS_CALENDAR;
+                $bc = $b->folder && $b->folder->class == Syncroton_Data_Factory::CLASS_CALENDAR;
+                if ($ac) {
+                    return $bc ? 0 : -1;
+                }
+                return $bc ? 1 : 0;
+            }
+        );
+
         foreach ($this->_collections as $collectionData) {
+            if ($this->_logger instanceof Zend_Log) {
+                $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " Processing {$collectionData->collectionId}...");
+            }
+
             $collectionChanges = 0;
 
             /**
@@ -911,6 +930,8 @@
 
                         $applicationData = $change->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'ApplicationData'));
 
+                        $collectionData->options'_changesOnly' = true;
+
                         $dataController
                             ->getEntry($collectionData, $serverId)
                             ->appendXML($applicationData, $this->_device);

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

@@ -223,6 +223,31 @@
     }
 
     /**
+     * Fix date-time string input
+     *
+     * @param string $date Date time string
+     *
+     * @return string
+     */
+    protected function _fixDateTimeString($date)
+    {
+        // Note: Some clients send date-time in local charset instead of ascii
+        // It is not supported by PHP DateTime constructor
+
+        $from = 
+            '١','٢','٣','٤','٥','٦','٧','٨','٩','٠', // arabic
+            '۱','۲','۳','۴','۵','۶','۷','۸','۹','۰', // persian
+        ;
+
+        $to = 
+            '1','2','3','4','5','6','7','8','9','0',
+            '1','2','3','4','5','6','7','8','9','0',
+        ;
+
+        return str_replace($from, $to, $date);
+    }
+
+    /**
      *
      * @param string $element
      * @throws InvalidArgumentException
@@ -284,7 +309,7 @@
                     break;
 
                 case 'datetime':
-                    $property = new DateTime((string) $xmlElement, new DateTimeZone('UTC'));
+                    $property = new DateTime($this->_fixDateTimeString((string) $xmlElement), new DateTimeZone('UTC'));
                     break;
 
                 case 'number':

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

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

kolab-syncroton-2.4.2.tar.gz/tests/Sync/FoldersTest.php Changed

@@ -76,15 +76,15 @@
 
         if ($this->isStorageDriver('kolab4')) {
             $folders = 
-                'Calendar', Syncroton_Command_FolderSync::FOLDERTYPE_CALENDAR_USER_CREATED,
+                'Calendar', Syncroton_Command_FolderSync::FOLDERTYPE_CALENDAR,
                 // Note: Kolab 4 with Cyrus DAV uses Addressbook, but Kolab 3 with iRony would use 'Contacts'
-                '/^(Contacts|Addressbook)$/', Syncroton_Command_FolderSync::FOLDERTYPE_CONTACT_USER_CREATED,
+                '/^(Contacts|Addressbook)$/', Syncroton_Command_FolderSync::FOLDERTYPE_CONTACT,
                 'INBOX', Syncroton_Command_FolderSync::FOLDERTYPE_INBOX,
                 'Drafts', Syncroton_Command_FolderSync::FOLDERTYPE_DRAFTS,
                 'Sent', Syncroton_Command_FolderSync::FOLDERTYPE_SENTMAIL,
                 'Trash', Syncroton_Command_FolderSync::FOLDERTYPE_DELETEDITEMS,
                 // Note: For now Kolab 4 uses the same Calendar folder for calendar and tasks
-                '/^(Tasks|Calendar)$/', Syncroton_Command_FolderSync::FOLDERTYPE_TASK_USER_CREATED,
+                '/^(Tasks|Calendar)$/', Syncroton_Command_FolderSync::FOLDERTYPE_TASK,
             ;
         }

kolab-syncroton-2.4.2.tar.gz/tests/Sync/Sync/EmailTest.php Changed

@@ -153,6 +153,7 @@
         $root .= "/ns:Commands/ns:Add";
         $this->assertStringMatchesFormat("{$folderId}::%d", $xpath->query("{$root}/ns:ServerId")->item(0)->nodeValue);
         $this->assertSame('sync test with attachment', $xpath->query("{$root}/ns:ApplicationData/Email:Subject")->item(0)->nodeValue);
+        $this->assertSame(1, $xpath->query("{$root}/ns:ApplicationData/AirSyncBase:Body")->count());
 
         return $syncKey;
     }
@@ -245,7 +246,11 @@
         $this->assertSame($folderId, $xpath->query("{$root}/ns:CollectionId")->item(0)->nodeValue);
         $this->assertSame(0, $xpath->query("{$root}/ns:Commands/ns:Add")->count());
         $this->assertSame(2, $xpath->query("{$root}/ns:Commands/ns:Change")->count());
+        $this->assertSame(2, $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/Email:Read")->count());
+        $this->assertSame('0', $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/Email:Read")->item(0)->nodeValue);
+        $this->assertSame('0', $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/Email:Read")->item(1)->nodeValue);
 
+        $this->assertSame(0, $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/AirSyncBase:Body")->count());
         return $syncKey;
     }

kolab-syncroton-2.4.2.tar.gz/tests/SyncTestCase.php Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3295 0

Request History

mollekopf created request 4 months ago

New release 2.4.2.21

mollekopf accepted request 4 months ago