encodingfixes by Marc

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

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 3429494da1d351e5fc498f5355cd9dac0e13b14d..1c931f0ffe9d6d66f8f9390a25e1a1813f05246e 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -449,6 +449,9 @@ function parseAddress($address, $max=0, $addr_ar = array(), $group = '', $host='
         switch ($char) {
             case '=':
                 if (preg_match('/^(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',substr($address,$pos),$reg)) {
+                   if (!$personal) {
+                       $personal = substr($address,0,$pos);
+                   }
                     $personal .= $reg[1];
                     $pos += strlen($personal);
                 }

diff --git a/functions/mime.php b/functions/mime.php
index fc5891aab650bf725712b6f00e54570c6b8588ff..a1be206c27d8e6ebda59f3f3330ce9df528c1d95 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -564,7 +564,7 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
         $encoded = false;
         $aString[$i] = '';
         while (preg_match('/^(.*)=\?([^?]*)\?(Q|B)\?([^?]*)\?=(.*)$/Ui',$chunk,$res)) {
-            //$aString[$i] .= $res[1];
+            $aString[$i] .= $res[1];
            //echo "$chunk match ". $res[5] . "<br>";
             $encoding = ucfirst($res[3]);
             switch ($encoding)