Projects
Kolab:16:Testing
kolab-syncroton
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 46
View file
kolab-syncroton.spec
Changed
@@ -37,7 +37,7 @@ %global upstream_version 2.4.2 Name: kolab-syncroton -Version: 2.4.2.19 +Version: 2.4.2.21 Release: 1%{?dist} Summary: ActiveSync for Kolab Groupware
View file
debian.changelog
Changed
@@ -1,4 +1,4 @@ -kolab-syncroton (2.4.2.19-0~kolab1) unstable; urgency=low +kolab-syncroton (2.4.2.21-0~kolab1) unstable; urgency=low * Release version 2.4.2
View file
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; /**
View file
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':
View file
kolab-syncroton.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-syncroton Binary: kolab-syncroton Architecture: all -Version: 1:2.4.2.19-1~kolab1 +Version: 1:2.4.2.21-1~kolab1 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Homepage: http://www.kolab.org/
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.