From c97645d022559fefda97f7c0f054c8ecbe69c056 Mon Sep 17 00:00:00 2001 From: kink Date: Tue, 1 Apr 2003 20:47:00 +0000 Subject: [PATCH] encodingfixes by Marc git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4713 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_general.php | 3 +++ functions/mime.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/functions/imap_general.php b/functions/imap_general.php index 3429494d..1c931f0f 100755 --- 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 fc5891aa..a1be206c 100644 --- 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] . "
"; $encoding = ucfirst($res[3]); switch ($encoding) -- 2.25.1