gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.23, 1.32.2.24

cvs at kolab.org cvs at kolab.org
Fri Nov 27 19:51:52 CET 2009


Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue3846 (fix recurring events that are counted per week and not per incident)

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.23
retrieving revision 1.32.2.24
diff -u -d -r1.32.2.23 -r1.32.2.24
--- horde-webmail-1.2.0_kolab_openpkg.patch	24 Nov 2009 15:05:58 -0000	1.32.2.23
+++ horde-webmail-1.2.0_kolab_openpkg.patch	27 Nov 2009 18:51:49 -0000	1.32.2.24
@@ -27794,15 +27794,15 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/kronolith/lib/Recurrence.php  |   57 ++++++++++++++++++++++++--
- horde-webmail/lib/Horde/Date/Recurrence.php |   57 ++++++++++++++++++++++++--
- 2 files changed, 104 insertions(+), 10 deletions(-)
+ horde-webmail/kronolith/lib/Recurrence.php  |   58 ++++++++++++++++++++++++--
+ horde-webmail/lib/Horde/Date/Recurrence.php |   58 ++++++++++++++++++++++++--
+ 2 files changed, 106 insertions(+), 10 deletions(-)
 
 diff --git a/horde-webmail/kronolith/lib/Recurrence.php b/horde-webmail/kronolith/lib/Recurrence.php
-index f22351d..5aa5960 100644
+index f22351d..409063f 100644
 --- a/horde-webmail/kronolith/lib/Recurrence.php
 +++ b/horde-webmail/kronolith/lib/Recurrence.php
-@@ -374,18 +374,65 @@ class Horde_Date_Recurrence {
+@@ -374,18 +374,66 @@ class Horde_Date_Recurrence {
  
              $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                          $after_week->mday, $after_week->month, $after_week->year);
@@ -27824,7 +27824,7 @@
 +                 * first week.
 +                 */
 +                $recur = $interval * ($repeats + 1);
-             }
++            }
 +
 +            if ($this->hasRecurCount()) {
 +                $recurrences = 0;
@@ -27839,6 +27839,7 @@
 +                        $recurrences--;
 +                    }
 +                    ++$next->mday;
++                    $next->correct();
 +                }
 +                if ($repeats > 0) {
 +                    $weekdays = $this->recurData;
@@ -27851,7 +27852,7 @@
 +                    }
 +                    $recurrences += $total_recurrences_per_week * $repeats;
 +                }
-+            }
+             }
 +
              $next = $start_week;
 -            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
@@ -27874,10 +27875,10 @@
              if (!$this->hasRecurEnd() ||
                  $next->compareDateTime($this->recurEnd) <= 0) {
 diff --git a/horde-webmail/lib/Horde/Date/Recurrence.php b/horde-webmail/lib/Horde/Date/Recurrence.php
-index 9dbf057..e21193f 100644
+index 9dbf057..c11624b 100644
 --- a/horde-webmail/lib/Horde/Date/Recurrence.php
 +++ b/horde-webmail/lib/Horde/Date/Recurrence.php
-@@ -374,18 +374,65 @@ class Horde_Date_Recurrence {
+@@ -374,18 +374,66 @@ class Horde_Date_Recurrence {
  
              $diff = Date_Calc::dateDiff($start_week->mday, $start_week->month, $start_week->year,
                                          $after_week->mday, $after_week->month, $after_week->year);
@@ -27899,7 +27900,7 @@
 +                 * first week.
 +                 */
 +                $recur = $interval * ($repeats + 1);
-             }
++            }
 +
 +            if ($this->hasRecurCount()) {
 +                $recurrences = 0;
@@ -27914,6 +27915,7 @@
 +                        $recurrences--;
 +                    }
 +                    ++$next->mday;
++                    $next->correct();
 +                }
 +                if ($repeats > 0) {
 +                    $weekdays = $this->recurData;
@@ -27926,7 +27928,7 @@
 +                    }
 +                    $recurrences += $total_recurrences_per_week * $repeats;
 +                }
-+            }
+             }
 +
              $next = $start_week;
 -            list($next->mday, $next->month, $next->year) = explode('/', Date_Calc::daysToDate(Date_Calc::dateToDays($next->mday, $next->month, $next->year) + $recur, '%e/%m/%Y'));
@@ -27949,10 +27951,17 @@
              if (!$this->hasRecurEnd() ||
                  $next->compareDateTime($this->recurEnd) <= 0) {
 -- 
-tg: (01f4e60..) t/kronolith/HK/GW/FixWeeklyRecurringEvents (depends on: t/kronolith/HK/UV/dateInputFieldOrder)
+tg: (1f477b1..) t/kronolith/HK/GW/FixWeeklyRecurringEvents (depends on: t/kronolith/HK/UV/dateInputFieldOrder)
 -- 
 TOPGIT patch commit log
 =======================
+
+commit 2b3d01e220c0a2f5a80f68e5ac7eb759d6090fe3
+Author: root <Gunnar Wrobel wrobel at pardus.de>
+Date:   Fri Nov 27 19:28:59 2009 +0100
+
+    In FW3 dates need to be corrected after modifying them. Missed one
+    such call. Bug #8702: Infinite loop because of a recurring event.
 
 commit ecde0d9b33f53d7ed3a3d5bdd358118213d4abe1
 Author: Gunnar Wrobel <p at rdus.de>





More information about the commits mailing list