gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.20, 1.32.2.21

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv26880/patches/horde-webmail/1.2.0

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch update needed)

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.20
retrieving revision 1.32.2.21
diff -u -d -r1.32.2.20 -r1.32.2.21
--- horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 07:04:45 -0000	1.32.2.20
+++ horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 08:34:39 -0000	1.32.2.21
@@ -13643,14 +13643,14 @@
       *
       * For some types of authentications (notably auth:basic) the username
 diff --git a/horde-webmail/lib/SyncML/Backend/Horde.php b/horde-webmail/lib/SyncML/Backend/Horde.php
-index a9be55d..a71b5f8 100644
+index a9be55d..ed07580 100644
 --- a/horde-webmail/lib/SyncML/Backend/Horde.php
 +++ b/horde-webmail/lib/SyncML/Backend/Horde.php
 @@ -204,6 +204,11 @@ class SyncML_Backend_Horde extends SyncML_Backend {
                                    __FILE__, __LINE__, PEAR_LOG_DEBUG);
                  continue;
              }
-+            if ($suid_ts > $to_ts) {
++            if ($add_ts[$suid] > $to_ts) {
 +                // Add delayed to the next sync operation
 +                $this->logMessage("Add ignored, lies in sync future: $suid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 +                continue;
@@ -13662,7 +13662,7 @@
                                        __FILE__, __LINE__, PEAR_LOG_DEBUG);
                      continue;
                  }
-+                if ($suid_ts > $to_ts) {
++                if ($mod_ts[$suid] > $to_ts) {
 +                    // Change delayed to the next sync operation
 +                    $this->logMessage("Change ignored, lies in sync future: $suid", __FILE__, __LINE__, PEAR_LOG_DEBUG);
 +                    continue;
@@ -13916,6 +13916,21 @@
  
 -- 
 tg: (6938161..) t/SyncML/HK/GW/CombinedFixes (depends on: master)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 88d1593c0f1491f19478863ffeb348c87cb2c3b8
+Author: root <Gunnar Wrobel wrobel at pardus.de>
+Date:   Tue Nov 24 08:16:48 2009 +0100
+
+    Fix patch according to  kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch update needed)
+
+commit 3c12e523cdbac5e2d0c1add78fcb25f500af2877
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Sun Feb 1 18:22:13 2009 +0000
+
+    Added patch release/HK-GW-SyncML.patch from the mercurial release queue.
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/Prefs/HK/GW/FixLDAPAuthForIngo