gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.3, 1.32.2.4

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
       kolab/issue3520 (calendar with certain entries does not display in
                        web client)
       kolab/issue3528 (Events with broken encoding should work)


Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.3
retrieving revision 1.32.2.4
diff -u -d -r1.32.2.3 -r1.32.2.4
--- horde-webmail-1.2.0_kolab_openpkg.patch	26 Mar 2009 21:31:00 -0000	1.32.2.3
+++ horde-webmail-1.2.0_kolab_openpkg.patch	2 Apr 2009 09:51:33 -0000	1.32.2.4
@@ -19915,6 +19915,91 @@
 Date:   Sun Mar 8 07:23:20 2009 +0000
 
     Fix [#7438] Failed login not passed back to login screen
+From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/Kolab_Format/HK/GW/HandleEmptyXmlParserReturn
+
+Correct handling of empty return values from the XML parser. An empty
+return might occur if the XML document is broken (e.g. broken encoding).
+
+ISSUE: kolab/issue3520 (calendar with certain entries does not display in web client)
+ISSUE: kolab/issue3525 (free/busy regeneration aborts for unparsable events)
+ISSUE: kolab/issue3528 (Events with broken encoding should work)
+
+LINK: https://www.intevation.de/roundup/kolab/issue3520
+LINK: https://www.intevation.de/roundup/kolab/issue3525
+LINK: https://www.intevation.de/roundup/kolab/issue3528
+
+STATUS: COMMIT
+
+REF:
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+ horde-webmail/lib/Horde/Kolab/Format/XML.php |   14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/horde-webmail/lib/Horde/Kolab/Format/XML.php b/horde-webmail/lib/Horde/Kolab/Format/XML.php
+index d3d7def..30320c9 100644
+--- a/horde-webmail/lib/Horde/Kolab/Format/XML.php
++++ b/horde-webmail/lib/Horde/Kolab/Format/XML.php
+@@ -364,6 +364,9 @@ class Horde_Kolab_Format_XML
+     /**
+      * Load an object based on the given XML string.
+      *
++     * @todo Check encoding of the returned array. It seems to be ISO-8859-1 at
++     * the moment and UTF-8 would seem more appropriate.
++     *
+      * @param string $xmltext  The XML of the message as string.
+      *
+      * @return array|PEAR_Error The data array representing the object.
+@@ -371,7 +374,10 @@ class Horde_Kolab_Format_XML
+     function load(&$xmltext)
+     {
+         $noderoot = $this->_parseXml($xmltext);
+-        if ($noderoot === false) {
++        if (is_a($noderoot, 'PEAR_Error')) {
++            return $noderoot;
++        }
++        if (empty($noderoot)) {
+             return false;
+         }
+ 
+@@ -530,9 +536,13 @@ class Horde_Kolab_Format_XML
+      */
+     function _parseXml(&$xmltext)
+     {
++        if (strcasecmp(mb_detect_encoding($xmltext, 'UTF-8, ISO-8859-1'), 'UTF-8') !== 0) {
++            $xmltext = mb_convert_encoding($xmltext, 'UTF-8', 'ISO-8859-1');
++        }
++
+         $params = array(
+             'xml' => $xmltext,
+-            'options' => HORDE_DOM_LOAD_REMOVE_BLANKS,
++            'options' => HORDE_DOM_LOAD_REMOVE_BLANKS | HORDE_DOM_LOAD_RECOVER,
+         );
+ 
+         $result = Horde_DOM_Document::factory($params);
+-- 
+tg: (2d1588f..) t/Kolab_Format/HK/GW/HandleEmptyXmlParserReturn (depends on: t/kronolith/HK/GW/XfbAccess)
+-- 
+TOPGIT patch commit log
+=======================
+
+commit 1883efc257b2e50646e11da79cc47fb0f7f328ca
+Author: Gunnar Wrobel <p at rdus.de>
+Date:   Thu Apr 2 11:36:17 2009 +0200
+
+    Correct handling of empty return values from the XML parser. An empty
+    return might occur if the XML document is broken (e.g. broken encoding).
+    
+    ISSUE: kolab/issue3520 (calendar with certain entries does not display in web client)
+    ISSUE: kolab/issue3525 (free/busy regeneration aborts for unparsable events)
+    ISSUE: kolab/issue3528 (Events with broken encoding should work)
+    
+    LINK: https://www.intevation.de/roundup/kolab/issue3520
+    LINK: https://www.intevation.de/roundup/kolab/issue3525
+    LINK: https://www.intevation.de/roundup/kolab/issue3528
 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