gunnar: server/pear/Horde_SyncML/patches/Horde_SyncML-0.7.0dev20091215 t_SyncML_HK_GW_SynchronizeBackendBeforeSync.diff, NONE, 1.1 t_SyncML_HK_GW_NoDuplicationOnUidChange.diff, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Sun Feb 28 10:27:25 CET 2010


Author: gunnar

Update of /kolabrepository/server/pear/Horde_SyncML/patches/Horde_SyncML-0.7.0dev20091215
In directory doto:/tmp/cvs-serv30678/pear/Horde_SyncML/patches/Horde_SyncML-0.7.0dev20091215

Modified Files:
	t_SyncML_HK_GW_NoDuplicationOnUidChange.diff 
Added Files:
	t_SyncML_HK_GW_SynchronizeBackendBeforeSync.diff 
Log Message:
MFB: kolab/issue3237 (Double Sync with SyncML when using external client) 

--- NEW FILE: t_SyncML_HK_GW_SynchronizeBackendBeforeSync.diff ---
REF: https://issues.kolab.org/issue3237

---
diff --git a/horde-webmail/lib/SyncML/Command/Alert.php b/horde-webmail/lib/SyncML/Command/Alert.php
index 0b004f6..6f4aa5b 100644
--- a/horde-webmail/lib/SyncML/Command/Alert.php
+++ b/horde-webmail/lib/SyncML/Command/Alert.php
@@ -287,6 +287,17 @@ class SyncML_Command_Alert extends SyncML_Command {
                 'Creating SyncML_Sync object for database '
                 . $this->_targetLocURI .  '; sync type ' . $synctype,
                 __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            /* Synchronize databases with the IMAP backend */
+            $databases = array ('kronolith', 'turba', 'nag', 'mnemo');
+            foreach($databases as $app) {
+                $GLOBALS['registry']->callByPackage($app, 'synchronize');
+            }
+            if ($serverAnchorNext == time ()) {
+                // make sure that the timestamps of the synchronized items in
+                // the database are different from serverAnchorNext
+                sleep (1);
+            }
+            $serverAnchorNext = $GLOBALS['backend']->getCurrentTimeStamp();
             $sync = new SyncML_Sync($synctype,
                                     $this->_targetLocURI,
                                     $this->_sourceLocURI,

Index: t_SyncML_HK_GW_NoDuplicationOnUidChange.diff
===================================================================
RCS file: /kolabrepository/server/pear/Horde_SyncML/patches/Horde_SyncML-0.7.0dev20091215/t_SyncML_HK_GW_NoDuplicationOnUidChange.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_SyncML_HK_GW_NoDuplicationOnUidChange.diff	27 Feb 2010 22:59:54 -0000	1.1
+++ t_SyncML_HK_GW_NoDuplicationOnUidChange.diff	28 Feb 2010 09:27:23 -0000	1.2
@@ -1,5 +1,13 @@
+From: root <Gunnar Wrobel wrobel at pardus.de>
+Subject: [PATCH] t/SyncML/HK/GW/DoubleSyncFix
+
+When the uid validity of an IMAP folder changes this confuses the Kolab storage
+driver and leads to double entries. The attached patch has been proposed by
+Univention and should be applied after some cleanup.
+
 REF: https://issues.kolab.org/issue3238
 
+Signed-off-by: root <Gunnar Wrobel wrobel at pardus.de>
 ---
 Index: a/a/a/SyncML/Backend/Horde.php
 ===================================================================





More information about the commits mailing list