fixing multiline headers. space or tab should not be removed.

tab is replaced by space, because it is later used split decoded string into chunks

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6339 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/mime/Rfc822Header.class.php b/class/mime/Rfc822Header.class.php
index d459fb5979a73c42d0dee274ccfc941f6424139e..9a63be0a6380dc97c784bba562a88c0d87dda6a1 100644 (file)
--- a/class/mime/Rfc822Header.class.php
+++ b/class/mime/Rfc822Header.class.php
@@ -44,7 +44,7 @@ class Rfc822Header {
             $hdr = implode('', $hdr);
         }
         /* First we unfold the header */
-        $hdr = trim(str_replace(array("\r\n\t", "\r\n "),array('', ''), $hdr));
+        $hdr = trim(str_replace(array("\r\n\t", "\r\n "),array(' ', ' '), $hdr));
 
         /* Now we can make a new header array with */
         /* each element representing a headerline  */

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index bc3561d118ff0a2183b0835b1c1a004af9f27236..6aaaf8d4774833b1c97b1ce0100de70e7eba3165 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -621,7 +621,7 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $show_num=false)
                 $header = parseString($read,$i);
                 if ($header === false) break 3;
                 /* First we unfold the header */
-                $hdr = trim(str_replace(array("\r\n\t", "\r\n "),array('', ''), $header));
+                $hdr = trim(str_replace(array("\r\n\t", "\r\n "),array(' ', ' '), $header));
                 /* Now we can make a new header array with */
                 /* each element representing a headerline  */
                 $hdr = explode("\r\n" , $hdr);