Projects
Kolab:16:Testing
kolab-syncroton
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 47
View file
kolab-syncroton.spec
Changed
@@ -37,7 +37,7 @@ %global upstream_version 2.4.2 Name: kolab-syncroton -Version: 2.4.2.21 +Version: 2.4.2.22 Release: 1%{?dist} Summary: ActiveSync for Kolab Groupware
View file
debian.changelog
Changed
@@ -1,4 +1,4 @@ -kolab-syncroton (2.4.2.21-0~kolab1) unstable; urgency=low +kolab-syncroton (2.4.2.22-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
@@ -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) {
View file
kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data.php
Changed
@@ -712,7 +712,7 @@ // Or (faster) strict UID matching... $object = $this->backend->getItem($fid, $this->device->deviceid, $this->modelName, $uid); - if (!empty($object) && ($crc === null || $crc == $this->objectCRC($object'uid', $fid))) { + if (!empty($object) && ($crc === null || $crc == $this->objectCRC($uid, $fid))) { $object'folderId' = $fid; return $object; }
View file
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; }
View file
kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_message.php
Changed
@@ -495,5 +495,4 @@ } } } - }
View file
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,8 +1969,9 @@ ); if ($row = $db->fetch_assoc()) { - $synctime = $row'synctime'; - // @TODO: make sure synctime from sql is in "Y-m-d H:i:s" format + // MariaDB's datetime output includes microseconds, we need to remove them, + // it must be "Y-m-d H:i:s" format + $synctime = preg_match('/\.0-9+/', '', $row'synctime'); $this->relations$folderid$synctime = json_decode($row'data', true); }
View file
kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_timezone_converter.php
Changed
@@ -633,7 +633,7 @@ $transitions = $_timezone->getTransitions($start, $end); if ($transitions === false) { - return ; + return null, null; } foreach ($transitions as $index => $transition) {
View file
kolab-syncroton.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-syncroton Binary: kolab-syncroton Architecture: all -Version: 1:2.4.2.21-1~kolab1 +Version: 1:2.4.2.22-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
.