From 217f0de233a3c7fc0775e5cd8df06c15dd52f8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= Date: Wed, 23 Sep 2009 19:20:15 +0000 Subject: [PATCH] Calendar special pseudo recurrence exception handling moved to SyncML code - content type is now available in replace method - pseudo to real exception propagation does now work within a single session --- phpgwapi/inc/horde/Horde/SyncML/Sync.php | 6 +++--- phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync.php index c2c236d3d7..c9f1d2deab 100644 --- a/phpgwapi/inc/horde/Horde/SyncML/Sync.php +++ b/phpgwapi/inc/horde/Horde/SyncML/Sync.php @@ -176,13 +176,13 @@ class Horde_SyncML_Sync { $locName = $state->getLocName(); $sourceURI = $state->getSourceURI(); $hordeType = $state->getHordeType($type); - $refts = $state->getServerAnchorLast($type); + $serverAnchorLast = $state->getServerAnchorLast($type); $state->setTargetURI($type); $changes = array(); // First we get all changes done after the previous sync start foreach ($registry->call($hordeType. '/listBy', array('action' => 'modify', - 'timestamp' => $refts, + 'timestamp' => $serverAnchorLast, 'type' => $type, 'filter' => $this->_filterExpression)) as $change) { // now we have to remove the ones @@ -386,7 +386,7 @@ class Horde_SyncML_Sync { // Entry exists: replace/merge with current one. $ok = $registry->call($hordeType . '/replace', array($guid, $state->convertClient2Server($syncItem->getContent(), - $contentType), $contentType, $merge)); + $contentType), $contentType, $type, $merge)); if (!is_a($ok, 'PEAR_Error') && $ok != false) { $ts = $state->getSyncTSforAction($guid, 'modify'); diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php index 69ccdf9be0..c4a68e9ea1 100644 --- a/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php +++ b/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php @@ -311,7 +311,7 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync { return $currentCmdID; } - $guid_ts = $state->getSyncTSforAction($guid, 'add'); + $guid_ts = $state->getSyncTSforAction($guid, 'modify'); $sync_ts = $state->getChangeTS($syncType, $guid); Horde :: logMessage("SyncML: timestamp add $guid guid_ts: $guid_ts sync_ts: $sync_ts", __FILE__, __LINE__, PEAR_LOG_DEBUG); if ($sync_ts && $sync_ts == $guid_ts) {