extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Funambol configuration issue and missing spaces in log enrties

Browse Source
This commit is contained in:
Jörg Lehrke 2009-09-20 19:45:03 +00:00
parent fd3425bac4
commit 6648c7c404
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
View File

@ -88,7 +88,8 @@ class Horde_SyncML_Command_Sync extends Horde_SyncML_Command {
$currentCmdID = $status->output($currentCmdID, $output);
if ($sync = &$state->getSync($this->_targetURI)) {
if ($this->_targetURI != "configuration" && // Fix Funambol issue
($sync = &$state->getSync($this->_targetURI))) {
$currentCmdID = $sync->startSync($currentCmdID, $output);
foreach ($this->_syncElements as $element) {

4
phpgwapi/inc/horde/Horde/SyncML/Sync.php
View File

@ -328,10 +328,10 @@ class Horde_SyncML_Sync {
$merge = false;
if ($guid)
{
Horde::logMessage('SyncML: locuri'. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_DEBUG);
Horde::logMessage('SyncML: locuri '. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_DEBUG);
if (($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) || in_array($guid, $changes))
{
Horde::logMessage('SyncML: CONFLICT for locuri'. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_WARNING);
Horde::logMessage('SyncML: CONFLICT for locuri '. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_WARNING);
switch ($sync_conflicts)
{
case CONFLICT_CLIENT_WINNING: