gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.19, 1.32.2.20
cvs at kolab.org
cvs at kolab.org
Tue Nov 24 08:04:48 CET 2009
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv23367/patches/horde-webmail/1.2.0
Modified Files:
Tag: kolab_2_2_branch
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
kolab/issue3656 (Unable to SyncML Calendar / PHP Fatal error compareDateTime())
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.19
retrieving revision 1.32.2.20
diff -u -d -r1.32.2.19 -r1.32.2.20
--- horde-webmail-1.2.0_kolab_openpkg.patch 10 Nov 2009 17:33:25 -0000 1.32.2.19
+++ horde-webmail-1.2.0_kolab_openpkg.patch 24 Nov 2009 07:04:45 -0000 1.32.2.20
@@ -28246,6 +28246,59 @@
SECURITY: Fix vulnerability in image form fields that allows overwriting
of arbitrary local files.
+From: root <Gunnar Wrobel wrobel at pardus.de>
+Subject: [PATCH] t/kronolith/HK/GW/HandleEmptyDates
+
+Enables the Kolab driver to handle empty start and/or end dates
+correctly.
+
+REF: https://issues.kolab.org/issue3656
+
+Signed-off-by: root <Gunnar Wrobel wrobel at pardus.de>
+
+---
+ horde-webmail/kronolith/lib/Driver/kolab.php | 10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/horde-webmail/kronolith/lib/Driver/kolab.php b/horde-webmail/kronolith/lib/Driver/kolab.php
+index de49c81..e915475 100644
+--- a/horde-webmail/kronolith/lib/Driver/kolab.php
++++ b/horde-webmail/kronolith/lib/Driver/kolab.php
+@@ -1134,12 +1134,18 @@ class Kronolith_Driver_kolab_wrapper_new extends Kronolith_Driver_kolab_wrapper
+ return $result;
+ }
+
+- if (is_null($startDate)) {
++ if (empty($startDate)) {
+ $startDate = &new Horde_Date(array('mday' => 1, 'month' => 1, 'year' => 0000));
+ }
+- if (is_null($endDate)) {
++ if (empty($endDate)) {
+ $endDate = &new Horde_Date(array('mday' => 31, 'month' => 12, 'year' => 9999));
+ }
++ if (!is_a($startDate, 'Horde_Date')) {
++ $startDate = &new Horde_Date($startDate);
++ }
++ if (!is_a($endDate, 'Horde_Date')) {
++ $endDate = &new Horde_Date($endDate);
++ }
+
+ $ids = array();
+
+--
+tg: (e6faeaf..) t/kronolith/HK/GW/HandleEmptyDates (depends on: t/framework/H/JS/Form/FixFormSecurityForImageUploads)
+--
+TOPGIT patch commit log
+=======================
+
+commit be56600b19e429f4ece1ca685c1e25550b5a02f6
+Author: root <Gunnar Wrobel wrobel at pardus.de>
+Date: Tue Nov 24 07:37:58 2009 +0100
+
+ Enables the Kolab driver to handle empty start and/or end dates
+ correctly.
+
+ REF: https://issues.kolab.org/issue3656
diff -c a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
--- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
+++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
More information about the commits
mailing list