2005-06-19 21:00:58 +02:00
|
|
|
<?php
|
|
|
|
/**
|
2009-07-15 21:31:25 +02:00
|
|
|
* eGroupWare - SyncML based on Horde 3
|
2005-06-19 21:00:58 +02:00
|
|
|
*
|
|
|
|
*
|
2009-07-15 21:31:25 +02:00
|
|
|
* Using the PEAR Log class (which need to be installed!)
|
2005-06-19 21:00:58 +02:00
|
|
|
*
|
2009-07-15 21:31:25 +02:00
|
|
|
* @link http://www.egroupware.org
|
|
|
|
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
|
|
|
|
* @package api
|
|
|
|
* @subpackage horde
|
|
|
|
* @author Anthony Mills <amills@pyramid6.com>
|
|
|
|
* @author Joerg Lehrke <jlehrke@noc.de>
|
|
|
|
* @copyright (c) The Horde Project (http://www.horde.org/)
|
|
|
|
* @version $Id$
|
2005-06-19 21:00:58 +02:00
|
|
|
*/
|
2009-07-15 21:31:25 +02:00
|
|
|
|
2005-06-19 21:00:58 +02:00
|
|
|
class Horde_SyncML_Sync {
|
|
|
|
|
2009-07-15 21:31:25 +02:00
|
|
|
/**
|
|
|
|
* Target, either contacts, notes, events,
|
|
|
|
*/
|
|
|
|
var $_targetLocURI;
|
2005-06-19 21:00:58 +02:00
|
|
|
|
2009-07-15 21:31:25 +02:00
|
|
|
var $_sourceLocURI;
|
2005-06-19 21:00:58 +02:00
|
|
|
|
2009-07-15 21:31:25 +02:00
|
|
|
var $_locName;
|
2005-06-19 21:00:58 +02:00
|
|
|
|
2009-07-15 21:31:25 +02:00
|
|
|
/**
|
|
|
|
* The synchronization method, one of the ALERT_* constants.
|
|
|
|
*
|
|
|
|
* @var integer
|
|
|
|
*/
|
|
|
|
var $_syncType;
|
2005-06-19 21:00:58 +02:00
|
|
|
|
2009-07-15 21:31:25 +02:00
|
|
|
/**
|
|
|
|
* Return if all commands success.
|
|
|
|
*/
|
|
|
|
var $globalSuccess;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This is the content type to use to export data.
|
|
|
|
*/
|
|
|
|
var $preferedContentType;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Optional filter expression for this content.
|
|
|
|
*
|
|
|
|
* @var string
|
2005-06-19 21:00:58 +02:00
|
|
|
*/
|
2009-07-15 21:31:25 +02:00
|
|
|
var $_filterExpression = '';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Do have the sync data loaded from the database already?
|
|
|
|
*/
|
|
|
|
var $syncDataLoaded;
|
|
|
|
|
|
|
|
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';
|
|
|
|
return $sync = new Horde_SyncML_Sync_TwoWaySync();
|
|
|
|
|
|
|
|
case ALERT_SLOW_SYNC:
|
|
|
|
include_once 'Horde/SyncML/Sync/SlowSync.php';
|
|
|
|
return $sync = new Horde_SyncML_Sync_SlowSync();
|
|
|
|
|
|
|
|
case ALERT_ONE_WAY_FROM_CLIENT:
|
|
|
|
include_once 'Horde/SyncML/Sync/OneWayFromClientSync.php';
|
|
|
|
return $sync = new Horde_SyncML_Sync_OneWayFromClientSync();
|
|
|
|
|
|
|
|
case ALERT_REFRESH_FROM_CLIENT:
|
|
|
|
include_once 'Horde/SyncML/Sync/RefreshFromClientSync.php';
|
|
|
|
return $sync = new Horde_SyncML_Sync_RefreshFromClientSync();
|
|
|
|
|
|
|
|
case ALERT_ONE_WAY_FROM_SERVER:
|
|
|
|
include_once 'Horde/SyncML/Sync/OneWayFromServerSync.php';
|
|
|
|
return $sync = new Horde_SyncML_Sync_OneWayFromServerSync();
|
|
|
|
|
|
|
|
case ALERT_REFRESH_FROM_SERVER:
|
|
|
|
include_once 'Horde/SyncML/Sync/RefreshFromServerSync.php';
|
|
|
|
return $sync = new Horde_SyncML_Sync_RefreshFromServerSync();
|
|
|
|
}
|
|
|
|
|
|
|
|
require_once 'PEAR.php';
|
|
|
|
return PEAR::raiseError('Alert ' . $alert . ' not found.');
|
|
|
|
}
|
|
|
|
|
|
|
|
function nextSyncCommand($currentCmdID, &$syncCommand, &$output) {
|
|
|
|
$result = $this->runSyncCommand($syncCommand);
|
|
|
|
return $syncCommand->output($currentCmdID, $output);
|
|
|
|
}
|
|
|
|
|
|
|
|
function startSync($currentCmdID, &$output) {
|
|
|
|
return $currentCmdID;
|
|
|
|
}
|
|
|
|
|
|
|
|
function endSync($currentCmdID, &$output) {
|
|
|
|
return $currentCmdID;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Setter for property sourceURI.
|
|
|
|
*
|
|
|
|
* @param string $sourceURI New value of property sourceLocURI.
|
|
|
|
*/
|
|
|
|
function setSourceLocURI($sourceURI) {
|
|
|
|
$this->_sourceLocURI = $sourceURI;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Setter for property targetURI.
|
|
|
|
*
|
|
|
|
* @param string $targetURI New value of property targetLocURI.
|
|
|
|
*/
|
|
|
|
function setTargetLocURI($targetURI) {
|
|
|
|
$this->_targetLocURI = $targetURI;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Setter for property syncType.
|
|
|
|
*
|
|
|
|
* @param integer $syncType New value of property syncType.
|
|
|
|
*/
|
|
|
|
function setSyncType($syncType) {
|
|
|
|
$this->_syncType = $syncType;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Setter for property locName.
|
|
|
|
*
|
|
|
|
* @param string $locName New value of property locName.
|
|
|
|
*/
|
|
|
|
function setLocName($locName) {
|
|
|
|
$this->_locName = $locName;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Setter for property filterExpression.
|
|
|
|
*
|
|
|
|
* @param string $expression New value of property filterExpression.
|
|
|
|
*/
|
|
|
|
function setFilterExpression($expression) {
|
|
|
|
$this->_filterExpression = $expression;
|
|
|
|
}
|
2005-06-19 21:00:58 +02:00
|
|
|
|
2006-03-21 14:49:13 +01:00
|
|
|
/**
|
2009-07-15 21:31:25 +02:00
|
|
|
* Here's where the actual processing of a client-sent Sync
|
|
|
|
* Command takes place. Entries are added, deleted or replaced
|
|
|
|
* from the server database by using Horde API (Registry) calls.
|
|
|
|
*/
|
2006-03-21 14:49:13 +01:00
|
|
|
function runSyncCommand(&$command) {
|
|
|
|
global $registry;
|
|
|
|
$history = $GLOBALS['egw']->contenthistory;
|
|
|
|
$state = &$_SESSION['SyncML.state'];
|
2009-07-15 21:31:25 +02:00
|
|
|
|
|
|
|
if ($command->hasMoreData()) {
|
|
|
|
Horde::logMessage('SyncML: moreData: TRUE', __FILE__, __LINE__, PEAR_LOG_DEBUG);
|
|
|
|
$command->setStatus(RESPONSE_CHUNKED_ITEM_ACCEPTED_AND_BUFFERED);
|
|
|
|
return true;
|
2006-03-21 14:49:13 +01:00
|
|
|
}
|
2009-07-15 21:31:25 +02:00
|
|
|
|
|
|
|
$type = $this->_targetLocURI;
|
|
|
|
|
|
|
|
$syncml_prefs = $GLOBALS['egw_info']['user']['preferences']['syncml'];
|
|
|
|
if (isset($syncml_prefs[$type])) {
|
|
|
|
$sync_conflicts = $syncml_prefs[$type];
|
|
|
|
} else {
|
|
|
|
$sync_conflicts = CONFLICT_SERVER_WINNING;
|
2006-03-21 14:49:13 +01:00
|
|
|
}
|
2009-07-15 21:31:25 +02:00
|
|
|
|
|
|
|
$state->setLocName($this->_locName);
|
|
|
|
$locName = $state->getLocName();
|
|
|
|
$sourceURI = $state->getSourceURI();
|
|
|
|
$hordeType = $state->getHordeType($type);
|
2009-09-23 21:20:15 +02:00
|
|
|
$serverAnchorLast = $state->getServerAnchorLast($type);
|
2009-07-15 21:31:25 +02:00
|
|
|
$changes = array();
|
2009-12-01 11:14:23 +01:00
|
|
|
foreach($state->getChangedItems($type) as $change) {
|
2009-07-15 21:31:25 +02:00
|
|
|
// now we have to remove the ones
|
|
|
|
// that came from the last sync with this client
|
|
|
|
$guid_ts = $state->getSyncTSforAction($change, 'modify');
|
|
|
|
$sync_ts = $state->getChangeTS($type, $change);
|
|
|
|
if ($sync_ts && $sync_ts == $guid_ts) {
|
|
|
|
// Change was done by us upon request of client.
|
|
|
|
Horde::logMessage("SyncML: change: $change ignored, " .
|
|
|
|
"came from client", __FILE__, __LINE__, PEAR_LOG_DEBUG);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
$changes[] = $change;
|
|
|
|
}
|
|
|
|
|
|
|
|
Horde::logMessage('SyncML: runSyncCommand found ' . count($changes) .
|
|
|
|
" possible conflicts for $type", __FILE__, __LINE__, PEAR_LOG_DEBUG);
|
|
|
|
|
2006-03-21 14:49:13 +01:00
|
|
|
if(!$contentType = $command->getContentType()) {
|
|
|
|
$contentType = $state->getPreferedContentType($type);
|
|
|
|
}
|
2009-07-15 21:31:25 +02:00
|
|
|
|
SyncML patches from patrick.bihan-faou-AT-mindstep.com (without
logout+mbstring stuff), small modification to use the already exiting
methodes to generate full name and fileas)
The code is commited to trunk only at the moment to allow testing of it.
If everything goes well, we intend to commit it to 1.4 branch too.
Here's the original description of the patch by Patrick:
- handles the default config for current versions of funambol (i.e. the
scard/stask/snote/scal locations)
- tries to be a bit smarter on how the data content should be encoded
based on what the client specified (sif+base64/vcard, / fragmented or
not, etc.)
- workaround a bug in some versions of funambol, where funambol does not
specify the proper sif type for the type of requested data
- imported patch #117 from egw's tracker
- make sure that the logs generated by the horde code go to stderr so
they can be view in the webserver's logs
- as much as possible reduce code duplication. For example, the
categories are handled in the parent classes for both the SIF avn VCAL
formats for each type of data (addressbook,infolog,calendar).
- make sure the code can handle more than one categories in each
direction
- treat the 'sony ericsson' vendor string just like 'sonyericsson', the
newer phones apparently have a space in the vendor string... (this
touches some files in the icalsrv as well)
- handle notes: these should now work with everything (funambol or
other)
- remove more code duplication: the syncml "api" for the various data
types (calendar, contacts, infolog) is now common for both the vcard and
sif data formats (cf the files that need to be removed)
- handle the "privat" filter in infolog like the "private" filter (some
part of the code use the name without the trailing e)
- imported patch # 267 from egw's tracker
2007-09-29 12:29:48 +02:00
|
|
|
if (($contentType == 'text/x-vcalendar' || $contentType == 'text/calendar')
|
2009-07-15 21:31:25 +02:00
|
|
|
&& strpos($command->getContent(), 'BEGIN:VTODO') !== false) {
|
2006-03-21 14:49:13 +01:00
|
|
|
$hordeType = 'tasks';
|
|
|
|
}
|
|
|
|
|
|
|
|
$syncElementItems = $command->getSyncElementItems();
|
2009-07-15 21:31:25 +02:00
|
|
|
|
2006-03-21 14:49:13 +01:00
|
|
|
foreach($syncElementItems as $syncItem) {
|
2009-07-15 21:31:25 +02:00
|
|
|
|
2006-03-21 14:49:13 +01:00
|
|
|
$guid = false;
|
2009-07-15 21:31:25 +02:00
|
|
|
|
|
|
|
$contentSize = strlen($syncItem->_content);
|
|
|
|
if ((($size = $syncItem->getContentSize()) !== false) &&
|
2010-05-14 15:07:15 +02:00
|
|
|
abs($contentSize - $size) > 3) {
|
|
|
|
Horde::logMessage('SyncML: content size mismatch for LocURI '
|
2009-07-15 21:31:25 +02:00
|
|
|
. $syncItem->getLocURI() . ": $contentSize ($size)",
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_ERROR);
|
|
|
|
$command->setStatus(RESPONSE_SIZE_MISMATCH);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2006-03-21 14:49:13 +01:00
|
|
|
if (is_a($command, 'Horde_SyncML_Command_Sync_Add')) {
|
2009-07-15 21:31:25 +02:00
|
|
|
if ($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) {
|
|
|
|
// We enforce the client not to change anything
|
|
|
|
if ($sync_conflicts > CONFLICT_CLIENT_CHANGES_IGNORED) {
|
|
|
|
// delete this item from client
|
|
|
|
Horde::logMessage('SyncML: Server RO! REMOVE '
|
|
|
|
. $syncItem->getLocURI() . ' from client',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
2009-11-11 21:16:34 +01:00
|
|
|
$state->addConflictItem($type, $syncItem->getLocURI());
|
2009-07-15 21:31:25 +02:00
|
|
|
} else {
|
|
|
|
Horde::logMessage('SyncML: Server RO! '
|
|
|
|
. 'REJECT all client changes',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
|
|
|
$state->log('Client-AddReplaceIgnored');
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2006-03-21 14:49:13 +01:00
|
|
|
$guid = $registry->call($hordeType . '/import',
|
|
|
|
array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType));
|
2009-07-15 21:31:25 +02:00
|
|
|
|
2008-11-16 16:36:37 +01:00
|
|
|
if (!is_a($guid, 'PEAR_Error') && $guid != false) {
|
2008-11-03 08:44:02 +01:00
|
|
|
$ts = $state->getSyncTSforAction($guid, 'add');
|
2006-03-21 14:49:13 +01:00
|
|
|
$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
|
2009-07-15 21:31:25 +02:00
|
|
|
$state->log('Client-Add');
|
|
|
|
Horde::logMessage('SyncML: added client entry as '
|
|
|
|
. $guid, __FILE__, __LINE__, PEAR_LOG_DEBUG);
|
2006-03-21 14:49:13 +01:00
|
|
|
} else {
|
2009-07-15 21:31:25 +02:00
|
|
|
$state->log('Client-AddFailure');
|
|
|
|
Horde::logMessage('SyncML: Error in adding client entry: '
|
|
|
|
. $guid->message, __FILE__, __LINE__, PEAR_LOG_ERR);
|
2006-03-21 14:49:13 +01:00
|
|
|
}
|
|
|
|
} elseif (is_a($command, 'Horde_SyncML_Command_Sync_Delete')) {
|
|
|
|
$guid = $state->removeUID($type, $syncItem->getLocURI());
|
2009-07-15 21:31:25 +02:00
|
|
|
if (!$guid) {
|
|
|
|
// the entry is no longer on the server
|
|
|
|
$state->log('Client-DeleteFailure');
|
|
|
|
Horde::logMessage('SyncML: Failure deleting client entry, '
|
|
|
|
. 'gone already on server!',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_ERR);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) {
|
|
|
|
// We enforce the client not to change anything
|
|
|
|
if ($sync_conflicts > CONFLICT_CLIENT_CHANGES_IGNORED) {
|
|
|
|
Horde::logMessage('SyncML: Server RO! ADD '
|
|
|
|
. $guid . ' to client again',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
2009-11-11 21:16:34 +01:00
|
|
|
$state->pushAddedItem($type, $guid);
|
2009-07-15 21:31:25 +02:00
|
|
|
} else {
|
|
|
|
Horde::logMessage('SyncML: '.
|
|
|
|
'Server RO! REJECT all client changes',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
|
|
|
}
|
|
|
|
$state->log('Client-DeleteIgnored');
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
elseif ($sync_conflicts == CONFLICT_RESOLVED_WITH_DUPLICATE &&
|
|
|
|
in_array($guid, $changes))
|
|
|
|
{
|
|
|
|
Horde::logMessage('SyncML: '.
|
|
|
|
'Server has updated version to keep',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
|
|
|
$state->log('Client-DeleteIgnored');
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
elseif ($sync_conflicts == CONFLICT_MERGE_DATA)
|
|
|
|
{
|
|
|
|
Horde::logMessage('SyncML: Server Merge Only: ADD '
|
|
|
|
. $guid . ' to client again',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
2009-11-11 21:16:34 +01:00
|
|
|
$state->pushAddedItem($type, $guid);
|
2009-07-15 21:31:25 +02:00
|
|
|
$state->log('Client-DeleteIgnored');
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
Horde::logMessage('SyncML: about to delete entry '
|
|
|
|
. $type .' / '. $guid . ' due to client request '
|
|
|
|
. $syncItem->getLocURI(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
|
|
|
|
|
2006-03-21 14:49:13 +01:00
|
|
|
if (!is_a($guid, 'PEAR_Error') && $guid != false) {
|
|
|
|
$registry->call($hordeType . '/delete', array($guid));
|
2009-07-15 21:31:25 +02:00
|
|
|
$ts = $state->getSyncTSforAction($guid, 'delete');
|
|
|
|
$state->setUID($type, $syncItem->getLocURI(), $guid, $ts, 1);
|
|
|
|
$state->log('Client-Delete');
|
|
|
|
Horde::logMessage('SyncML: deleted entry '
|
|
|
|
. $guid . ' due to client request',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_DEBUG);
|
2006-03-21 14:49:13 +01:00
|
|
|
} else {
|
2009-07-15 21:31:25 +02:00
|
|
|
$state->log('Client-DeleteFailure');
|
|
|
|
Horde::logMessage('SyncML: Failure deleting client entry, '
|
|
|
|
. 'maybe gone already on server. msg: '
|
|
|
|
. $guid->message, __FILE__, __LINE__, PEAR_LOG_ERR);
|
2006-03-21 14:49:13 +01:00
|
|
|
}
|
|
|
|
} elseif (is_a($command, 'Horde_SyncML_Command_Sync_Replace')) {
|
|
|
|
$guid = $state->getGlobalUID($type, $syncItem->getLocURI());
|
2009-07-15 21:31:25 +02:00
|
|
|
$replace = true;
|
2006-03-21 14:49:13 +01:00
|
|
|
$ok = false;
|
2009-07-15 21:31:25 +02:00
|
|
|
$merge = false;
|
|
|
|
if ($guid)
|
|
|
|
{
|
2009-09-20 21:45:03 +02:00
|
|
|
Horde::logMessage('SyncML: locuri '. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_DEBUG);
|
2009-07-15 21:31:25 +02:00
|
|
|
if (($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) || in_array($guid, $changes))
|
|
|
|
{
|
2009-09-20 21:45:03 +02:00
|
|
|
Horde::logMessage('SyncML: CONFLICT for locuri '. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_WARNING);
|
2009-07-15 21:31:25 +02:00
|
|
|
switch ($sync_conflicts)
|
|
|
|
{
|
|
|
|
case CONFLICT_CLIENT_WINNING:
|
|
|
|
$command->setStatus(RESPONSE_CONFLICT_RESOLVED_WITH_CLIENT_WINNING);
|
|
|
|
break;
|
|
|
|
case CONFLICT_SERVER_WINNING:
|
|
|
|
Horde::logMessage('SyncML: REJECT client change for locuri ' .
|
|
|
|
$syncItem->getLocURI() . ' guid ' . $guid ,
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
|
|
|
$ok = true;
|
|
|
|
$replace = false;
|
|
|
|
$state->log('Client-AddReplaceIgnored');
|
|
|
|
break;
|
|
|
|
case CONFLICT_MERGE_DATA:
|
|
|
|
Horde::logMessage('SyncML: Merge server and client data for locuri ' .
|
|
|
|
$syncItem->getLocURI() . ' guid ' . $guid ,
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
|
|
|
$merge = true;
|
|
|
|
break;
|
|
|
|
case CONFLICT_RESOLVED_WITH_DUPLICATE:
|
|
|
|
$replace = false;
|
|
|
|
break;
|
|
|
|
case CONFLICT_CLIENT_CHANGES_IGNORED:
|
|
|
|
Horde::logMessage('SyncML: Server RO! REJECT client change for locuri ' .
|
|
|
|
$syncItem->getLocURI() . ' guid ' . $guid ,
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
|
|
|
$ok = true;
|
|
|
|
$replace = false;
|
|
|
|
$ts = $state->getSyncTSforAction($guid, 'modify');
|
|
|
|
$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
|
|
|
|
$state->log('Client-AddReplaceIgnored');
|
|
|
|
break;
|
|
|
|
default: // We enforce our data on client
|
|
|
|
Horde::logMessage('SyncML: Server RO! UNDO client change for locuri ' .
|
|
|
|
$syncItem->getLocURI() . ' guid ' . $guid ,
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
2009-11-11 21:16:34 +01:00
|
|
|
$state->pushChangedItem($type, $guid);
|
2009-07-15 21:31:25 +02:00
|
|
|
$ok = true;
|
|
|
|
$replace = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
elseif ($sync_conflicts == CONFLICT_MERGE_DATA)
|
|
|
|
{
|
|
|
|
Horde::logMessage('SyncML: Merge server and client data for locuri ' .
|
|
|
|
$syncItem->getLocURI() . ' guid ' . $guid ,
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
|
|
|
$merge = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($replace)
|
|
|
|
{
|
|
|
|
// Entry exists: replace/merge with current one.
|
|
|
|
$ok = $registry->call($hordeType . '/replace',
|
|
|
|
array($guid, $state->convertClient2Server($syncItem->getContent(),
|
2009-09-23 21:20:15 +02:00
|
|
|
$contentType), $contentType, $type, $merge));
|
2009-07-15 21:31:25 +02:00
|
|
|
if (!is_a($ok, 'PEAR_Error') && $ok != false)
|
|
|
|
{
|
|
|
|
$ts = $state->getSyncTSforAction($guid, 'modify');
|
|
|
|
$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
|
|
|
|
if ($merge)
|
|
|
|
{
|
|
|
|
Horde::logMessage('SyncML: Merged entry due to client request guid: ' .
|
|
|
|
$guid . ' ts: ' . $ts, __FILE__, __LINE__, PEAR_LOG_DEBUG);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Horde::logMessage('SyncML: replaced entry due to client request guid: ' .
|
|
|
|
$guid . ' ts: ' . $ts, __FILE__, __LINE__, PEAR_LOG_DEBUG);
|
|
|
|
}
|
|
|
|
$state->log('Client-Replace');
|
|
|
|
$ok = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Entry may have been deleted; try adding it.
|
|
|
|
$ok = false;
|
|
|
|
}
|
2006-03-21 14:49:13 +01:00
|
|
|
}
|
|
|
|
}
|
2009-07-15 21:31:25 +02:00
|
|
|
|
2006-03-21 14:49:13 +01:00
|
|
|
if (!$ok) {
|
2009-07-15 21:31:25 +02:00
|
|
|
// Entry does either not exist in map or database, or should be added due to a conflict
|
|
|
|
|
|
|
|
if ($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) {
|
|
|
|
// We enforce the client not to change anything
|
|
|
|
if ($sync_conflicts > CONFLICT_CLIENT_CHANGES_IGNORED) {
|
|
|
|
// delete this item from client
|
|
|
|
Horde::logMessage('SyncML: Server RO! REMOVE ' . $syncItem->getLocURI() . ' from client',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
2009-11-11 21:16:34 +01:00
|
|
|
$state->addConflictItem($type, $syncItem->getLocURI());
|
2009-07-15 21:31:25 +02:00
|
|
|
} else {
|
|
|
|
Horde::logMessage('SyncML: Server RO! REJECT all client changes',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_WARNING);
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
Horde::logMessage('SyncML: try to add contentype '
|
|
|
|
. $contentType . ' for locuri ' . $syncItem->getLocURI(),
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_DEBUG);
|
|
|
|
//continue;
|
|
|
|
$oguid = $guid;
|
2006-03-21 14:49:13 +01:00
|
|
|
$guid = $registry->call($hordeType . '/import',
|
2009-07-15 21:31:25 +02:00
|
|
|
array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType, $guid));
|
2006-03-21 14:49:13 +01:00
|
|
|
if (!is_a($guid, 'PEAR_Error')) {
|
2009-07-15 21:31:25 +02:00
|
|
|
if ($oguid != $guid) {
|
|
|
|
// We add a new entry
|
|
|
|
$ts = $state->getSyncTSforAction($guid, 'add');
|
|
|
|
Horde::logMessage('SyncML: added entry '
|
|
|
|
. $guid . ' from client',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_DEBUG);
|
|
|
|
$state->log('Client-Add');
|
|
|
|
} else {
|
|
|
|
// We replaced an entry
|
|
|
|
$ts = $state->getSyncTSforAction($guid, 'modify');
|
|
|
|
Horde::logMessage('SyncML: replaced entry '
|
|
|
|
. $guid . ' from client',
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_DEBUG);
|
|
|
|
$state->log('Client-Replace');
|
|
|
|
}
|
2006-03-21 14:49:13 +01:00
|
|
|
$state->setUID($type, $syncItem->getLocURI(), $guid, $ts);
|
|
|
|
} else {
|
2009-07-15 21:31:25 +02:00
|
|
|
Horde::logMessage('SyncML: Error in replacing/'
|
|
|
|
. 'add client entry:' . $guid->message,
|
|
|
|
__FILE__, __LINE__, PEAR_LOG_ERR);
|
|
|
|
$state->log('Client-AddFailure');
|
2006-03-21 14:49:13 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return $guid;
|
|
|
|
}
|
2005-06-19 21:00:58 +02:00
|
|
|
}
|