From ee05cd3a349b32b61f0cd473c346a19bb2bc6008 Mon Sep 17 00:00:00 2001 From: Lars Kneschke Date: Tue, 26 Jul 2005 07:22:58 +0000 Subject: [PATCH] fixed handling of ALERT 222 --- phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php | 3 +-- phpgwapi/inc/horde/Horde/SyncML/Sync.php | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php index 6ad807d099..84c6ebdc96 100644 --- a/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php +++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php @@ -312,10 +312,9 @@ class Horde_SyncML_Command_Alert extends Horde_SyncML_Command { switch ($this->_xmlStack) { case 1: $state = & $_SESSION['SyncML.state']; - Horde::logMessage('SyncML: looking for sync for ' . $this->_targetLocURI, __FILE__, __LINE__, PEAR_LOG_DEBUG); $sync = $state->getSync($this->_targetLocURI); - if (!$sync) { + if (!$sync && $this->_alert < ALERT_RESULT_ALERT) { Horde::logMessage('SyncML: create new sync for ' . $this->_targetLocURI . ' ' . $this->_alert, __FILE__, __LINE__, PEAR_LOG_DEBUG); $sync = &Horde_SyncML_Sync::factory($this->_alert); diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync.php index 061150a27c..433ae979a1 100644 --- a/phpgwapi/inc/horde/Horde/SyncML/Sync.php +++ b/phpgwapi/inc/horde/Horde/SyncML/Sync.php @@ -38,6 +38,7 @@ class Horde_SyncML_Sync { function &factory($alert) { + Horde::logMessage('SyncML: new sync for alerttype ' . $alert, __FILE__, __LINE__, PEAR_LOG_DEBUG); switch ($alert) { case ALERT_TWO_WAY: include_once 'Horde/SyncML/Sync/TwoWaySync.php';