holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail: fixed equal signs (=) are not displayed in subject

Browse Source 
Not sure why, but equal sign was removed unconditional together with other non-printable chars.
Equal sign is now removed from that preg and code is cleaned up to have a single preg removing unprintable chars independet on the function used to decode the header.
This commit is contained in:
Ralf Becker 2018-05-03 11:01:08 +02:00
parent 6206b3c857
commit b8e230190f
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
api/src/Mail/Html.php
View File

@ -56,13 +56,10 @@ class Html
'+', '+',
); );
$newString = ''; $elements = imap_mime_header_decode(preg_replace('/\?=\s+=\?/', '?= =?', $_string));
$string = preg_replace('/\?=\s+=\?/', '?= =?', $_string);
$elements=imap_mime_header_decode($string);
$convertAtEnd = false; $convertAtEnd = false;
$string = '';
foreach((array)$elements as $element) foreach((array)$elements as $element)
{ {
if ($element->charset == 'default') $element->charset = Api\Translation::detect_encoding($element->text); if ($element->charset == 'default') $element->charset = Api\Translation::detect_encoding($element->text);
@ -76,16 +73,15 @@ class Html
$element->text = self::decodeMailHeader($element->text, $element->charset, $reclevel); $element->text = self::decodeMailHeader($element->text, $element->charset, $reclevel);
$element->charset = $displayCharset; $element->charset = $displayCharset;
} }
$newString .= Api\Translation::convert($element->text,$element->charset); $string .= Api\Translation::convert($element->text,$element->charset);
} }
else else
{ {
$newString .= $element->text; $string .= $element->text;
$convertAtEnd = true; $convertAtEnd = true;
} }
} }
if ($convertAtEnd) $newString = self::decodeMailHeader($newString,$displayCharset,$reclevel); if ($convertAtEnd) $string = self::decodeMailHeader($string, $displayCharset, $reclevel);
return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$newString);
} }
elseif(function_exists(mb_decode_mimeheader)) elseif(function_exists(mb_decode_mimeheader))
{ {
@ -101,17 +97,19 @@ class Html
str_replace('=?windows-1258','=?ISO-8859-1',$string)); str_replace('=?windows-1258','=?ISO-8859-1',$string));
} }
$string = mb_decode_mimeheader($string); $string = mb_decode_mimeheader($string);
return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$string);
} }
elseif(function_exists(iconv_mime_decode)) elseif(function_exists(iconv_mime_decode))
{ {
// continue decoding also if an error occurs // continue decoding also if an error occurs
$string = @iconv_mime_decode($_string, 2, $displayCharset); $string = @iconv_mime_decode($_string, 2, $displayCharset);
return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$string);
} }
else
// no decoding function available {
return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$_string); // no decoding function available
$string = $_string;
}
// remove unprintable chars
return preg_replace('/([\000-\012\015\016\020-\037])/', '', $string);
} }
/** /**