File squirrelmail-1.4.22-php54fixes.patch of Package squirrelmail

diff -up squirrelmail-webmail-1.4.22/class/mime/Message.class.php.php54fixes squirrelmail-webmail-1.4.22/class/mime/Message.class.php
--- squirrelmail-webmail-1.4.22/class/mime/Message.class.php.php54fixes	2012-02-24 13:47:04.997225305 +0100
+++ squirrelmail-webmail-1.4.22/class/mime/Message.class.php	2012-02-24 13:47:05.031224597 +0100
@@ -359,6 +359,7 @@ class Message {
                         case 0:
                             if (!isset($msg)) {
                                 $msg = new Message();
+                                $msg->header = new MessageHeader();
                                 $hdr = new MessageHeader();
                                 $hdr->type0 = 'text';
                                 $hdr->type1 = 'plain';
diff -up squirrelmail-webmail-1.4.22/functions/i18n.php.php54fixes squirrelmail-webmail-1.4.22/functions/i18n.php
--- squirrelmail-webmail-1.4.22/functions/i18n.php.php54fixes	2012-02-24 14:29:02.419849488 +0100
+++ squirrelmail-webmail-1.4.22/functions/i18n.php	2012-02-24 14:30:10.709423055 +0100
@@ -184,7 +184,7 @@ function charset_decode ($charset, $stri
     }
 
     /* All HTML special characters are 7 bit and can be replaced first */
-    if (! $save_html) $string = htmlspecialchars ($string);
+    if (! $save_html) $string = htmlspecialchars ($string, ENT_COMPAT, 'ISO-8859-1');
     $charset = strtolower($charset);
 
     set_my_charset();
--- squirrelmail/functions/imap_general.php.php54fixes	2012/01/02 00:18:17	14248
+++ squirrelmail/functions/imap_general.php	2012/03/24 10:41:19	14290
@@ -765,18 +765,19 @@
             if (preg_match('/\* NAMESPACE +(\( *\(.+\) *\)|NIL) +(\( *\(.+\) *\)|NIL) +(\( *\(.+\) *\)|NIL)/i', $read[0], $data)) {
                 if (preg_match('/^\( *\((.*)\) *\)/', $data[1], $data2)) {
                     $pn = $data2[1];
-                }
-                $pna = explode(')(', $pn);
-                while (list($k, $v) = each($pna)) {
-                    $lst = explode('"', $v);
-                    if (isset($lst[3])) {
-                        $pn[$lst[1]] = $lst[3];
-                    } else {
-                        $pn[$lst[1]] = '';
+                    $pna = explode(')(', $pn);
+                    $delnew = array();
+                    while (list($k, $v) = each($pna)) {
+                        $lst = explode('"', $v);
+                        if (isset($lst[3])) {
+                            $delnew[$lst[1]] = $lst[3];
+                        } else {
+                            $delnew[$lst[1]] = '';
+                        }
                     }
+                    $sqimap_delimiter = array_shift($delnew);
                 }
             }
-            $sqimap_delimiter = $pn[0];
         } else {
             fputs ($imap_stream, ". LIST \"INBOX\" \"\"\r\n");
             $read = sqimap_read_data($imap_stream, '.', true, $a, $b);