extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 23:29:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

some minor fixes to make funambol happy

Browse Source
This commit is contained in:
Lars Kneschke 2006-04-28 05:44:43 +00:00
parent 2082498285
commit 955f766a19
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/inc/horde/Horde/SyncML/State.php
View File

@ -630,6 +630,15 @@ class Horde_SyncML_State {
*/ */
function getPreferedContentType($type) function getPreferedContentType($type)
{ {
# if ($type == 'contacts') {
# return 'text/x-vcard';
# } elseif ($type == 'notes') {
# return 'text/x-vnote';
# } elseif ($type == 'tasks') {
# return 'text/x-vcalendar';
# } elseif ($type == 'calendar') {
# return 'text/x-vcalendar';
# }
switch($type) { switch($type) {
case 'contacts': case 'contacts':
return 'text/x-vcard'; return 'text/x-vcard';

8
phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
View File

@ -36,7 +36,7 @@ class Horde_SyncML_Sync_SlowSync extends Horde_SyncML_Sync_TwoWaySync {
# $adds = &$state->getAddedItems($hordeType); # $adds = &$state->getAddedItems($hordeType);
#} #}
#Horde::logMessage("SyncML: ".count($adds). ' added items found for '.$hordeType , __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage("SyncML: ".count($adds). ' added items found for '.$hordeType , __FILE__, __LINE__, PEAR_LOG_DEBUG);
$serverAnchorNext = $state->getServerAnchorNext($syncType); $serverAnchorNext = $state->getServerAnchorNext($syncType);
$counter = 0; $counter = 0;
@ -79,8 +79,8 @@ class Horde_SyncML_Sync_SlowSync extends Horde_SyncML_Sync_TwoWaySync {
$state->log('Server-Add'); $state->log('Server-Add');
// return if we have to much data // return if we have to much data
if(++$counter >= MAX_ENTRIES) #Horde::logMessage("SyncML: ".' checking hordetype '.$hordeType , __FILE__, __LINE__, PEAR_LOG_DEBUG);
{ if(++$counter >= MAX_ENTRIES && $hordeType != 'sifcalendar' && $hordeType != 'sifcontacts' && $hordeType != 'siftasks') {
$state->setSyncStatus(SERVER_SYNC_DATA_PENDING); $state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
return $currentCmdID; return $currentCmdID;
} }
@ -229,7 +229,7 @@ class Horde_SyncML_Sync_SlowSync extends Horde_SyncML_Sync_TwoWaySync {
$syncType = $this->_targetLocURI; $syncType = $this->_targetLocURI;
$hordeType = str_replace('./','',$syncType); $hordeType = str_replace('./','',$syncType);
#Horde::logMessage("SyncML: reading added items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage("SyncML: reading added items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
$state->setAddedItems($hordeType, $registry->call($hordeType. '/list', array())); $state->setAddedItems($hordeType, $registry->call($hordeType. '/list', array()));
$adds = &$state->getAddedItems($hordeType); $adds = &$state->getAddedItems($hordeType);
$this->_syncDataLoaded = TRUE; $this->_syncDataLoaded = TRUE;

13
phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php
View File

@ -103,7 +103,7 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
$state->log('Server-Replace'); $state->log('Server-Replace');
// return if we have to much data // return if we have to much data
if(++$counter >= MAX_ENTRIES) { if(++$counter >= MAX_ENTRIES && $hordeType != 'sifcalender' && $hordeType != 'sifcontacts' &&$hordeType != 'siftasks') {
$state->setSyncStatus(SERVER_SYNC_DATA_PENDING); $state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
return $currentCmdID; return $currentCmdID;
} }
@ -139,8 +139,7 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
$state->removeUID($syncType, $locid); $state->removeUID($syncType, $locid);
// return if we have to much data // return if we have to much data
if(++$counter >= MAX_ENTRIES) if(++$counter >= MAX_ENTRIES && $hordeType != 'sifcalender' && $hordeType != 'sifcontacts' &&$hordeType != 'siftasks') {
{
$state->setSyncStatus(SERVER_SYNC_DATA_PENDING); $state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
return $currentCmdID; return $currentCmdID;
} }
@ -201,7 +200,7 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
$state->log('Server-Add'); $state->log('Server-Add');
// return if we have to much data // return if we have to much data
if(++$counter >= MAX_ENTRIES) { if(++$counter >= MAX_ENTRIES && $hordeType != 'sifcalender' && $hordeType != 'sifcontacts' &&$hordeType != 'siftasks') {
$state->setSyncStatus(SERVER_SYNC_DATA_PENDING); $state->setSyncStatus(SERVER_SYNC_DATA_PENDING);
return $currentCmdID; return $currentCmdID;
} }
@ -223,13 +222,13 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
$hordeType = str_replace('./','',$syncType); $hordeType = str_replace('./','',$syncType);
$refts = $state->getServerAnchorLast($syncType); $refts = $state->getServerAnchorLast($syncType);
#Horde::logMessage("SyncML: reading changed items from database", __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage("SyncML: reading changed items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
$state->setChangedItems($hordeType, $registry->call($hordeType. '/listBy', array('action' => 'modify', 'timestamp' => $refts))); $state->setChangedItems($hordeType, $registry->call($hordeType. '/listBy', array('action' => 'modify', 'timestamp' => $refts)));
#Horde::logMessage("SyncML: reading deleted items from database", __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage("SyncML: reading deleted items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
$state->setDeletedItems($hordeType, $registry->call($hordeType. '/listBy', array('action' => 'delete', 'timestamp' => $refts))); $state->setDeletedItems($hordeType, $registry->call($hordeType. '/listBy', array('action' => 'delete', 'timestamp' => $refts)));
#Horde::logMessage("SyncML: reading added items from database", __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage("SyncML: reading added items from database for $hordeType", __FILE__, __LINE__, PEAR_LOG_DEBUG);
$state->setAddedItems($hordeType, $registry->call($hordeType. '/listBy', array('action' => 'add', 'timestamp' => $refts))); $state->setAddedItems($hordeType, $registry->call($hordeType. '/listBy', array('action' => 'add', 'timestamp' => $refts)));
$this->_syncDataLoaded = TRUE; $this->_syncDataLoaded = TRUE;