Author: jlehrke
New Revision: 29144
URL: http://www.egroupware.org/viewvc/egroupware?rev=29144&view=rev
Log:
Enable SlowSync optimization with old mappings; vCalendar 1.0 folding
Modified:
trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
trunk/phpgwapi/inc/horde/Horde/iCalendar.php
Modified: trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php?rev=29144&r1=29143&r2=29144&view=diff
— trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php (original)
+++ trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php Mon Feb 8 20:48:33 2010
@@ -285,10 +285,10 @@
$synctype != ALERT_ONE_WAY_FROM_CLIENT &&
$synctype != ALERT_ONE_WAY_FROM_SERVER) {
$serverAnchorLast = 0;
-
#if (!$anchormatch) {
-
if (!$anchormatch) { // Erase existing map: $state->removeAllUID($this->_targetLocURI);
-
#}
-
} } // Now create the actual SyncML_Sync object, if it doesn't exist yet. $sync = &$state->getSync($this->_targetLocURI);
Modified: trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php?rev=29144&r1=29143&r2=29144&view=diff
— trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php (original)
+++ trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php Mon Feb 8 20:48:33 2010
@@ -237,14 +237,16 @@
$guid = false;
-
$oguid = $state->getGlobalUID($type, $syncItem->getLocURI()); -
$guid = $registry->call($hordeType . '/search',
-
array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType, $state->getGlobalUID($type, $syncItem->getLocURI()), $type));
-
array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType, $oguid, $type)); if ($guid) { // Check if the found entry came from the client $guid_ts = $state->getSyncTSforAction($guid, 'add'); $sync_ts = $state->getChangeTS($type, $guid);
-
if ($sync_ts && $sync_ts == $guid_ts) {
-
if ($oguid != $guid && $sync_ts && $sync_ts == $guid_ts) { // Entry came from the client, so we get a duplicate here Horde::logMessage('SyncML: CONFLICT for locuri ' . $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_WARNING);
Modified: trunk/phpgwapi/inc/horde/Horde/iCalendar.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/horde/Horde/iCalendar.php?rev=29144&r1=29143&r2=29144&view=diff
— trunk/phpgwapi/inc/horde/Horde/iCalendar.php (original)
+++ trunk/phpgwapi/inc/horde/Horde/iCalendar.php Mon Feb 8 20:48:33 2010
@@ -603,7 +603,11 @@
// last=20line
while (preg_match_all(’/^([^:]+;\s*((ENCODING=)?QUOTED-PRINTABLE|ENCODING=[Q|q])(.=\r?\n)+(.[^=])?\r?\n)/mU’, $vCal, $matches)) {
foreach ($matches[1] as $s) {
-
$r = preg_replace('/=\r?\n[ \t]*/', '', $s);
-
if ($this->isOldFormat()) { -
$r = preg_replace('/=\r?\n([ \t])/', '\1', $s); -
} else { -
$r = preg_replace('/=\r?\n[ \t]*/', '', $s); -
} $vCal = str_replace($s, $r, $vCal); } }
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs