extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 09:38:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

try to prevent infinite loops when decoding mail-headers

Browse Source
This commit is contained in:
Klaus Leithoff 2016-04-14 14:28:41 +00:00
parent 7065f6fd2e
commit b4a4864717
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,14 @@ class Html
*/ */
static function decodeMailHeader($_string, $displayCharset='utf-8') static function decodeMailHeader($_string, $displayCharset='utf-8')
{ {
/*
$maxreclevel=25;
if ($reclevel > $maxreclevel) {
error_log( __METHOD__.__LINE__." Recursion Level Exeeded ($reclevel) while decoding $_string ");
return $_string;
}
$reclevel++;
*/
//error_log(__FILE__.','.__METHOD__.':'."called with $_string and CHARSET $displayCharset"); //error_log(__FILE__.','.__METHOD__.':'."called with $_string and CHARSET $displayCharset");
if(function_exists('imap_mime_header_decode')) if(function_exists('imap_mime_header_decode'))
{ {
@ -62,12 +70,23 @@ class Html
{ {
if( strtoupper($element->charset) != 'UTF-8') $element->text = preg_replace($sar,$rar,$element->text); if( strtoupper($element->charset) != 'UTF-8') $element->text = preg_replace($sar,$rar,$element->text);
// check if there is a possible nested encoding; make sure that the inputstring and the decoded result are different to avoid loops // check if there is a possible nested encoding; make sure that the inputstring and the decoded result are different to avoid loops
if(preg_match('/\?=.+=\?/', $element->text) && $element->text != $_string) $openTags = substr_count($element->text,'?=');
if(preg_match('/\?=.+=\?/', $element->text) && $openTags>0 && $openTags==substr_count($element->text,'=?') && $element->text != $_string)
{ {
$element->text = self::decodeMailHeader($element->text, $element->charset); $element->text = self::decodeMailHeader($element->text, $element->charset);
$element->charset = $displayCharset; $element->charset = $displayCharset;
} }
$newString .= Api\Translation::convert($element->text,$element->charset); $translatedString = Api\Translation::convert($element->text,$element->charset);
/* //try to be smart about concatenating
error_log(__METHOD__.__LINE__.$translatedString);
error_log(__METHOD__.__LINE__.$newString);
if ($translatedString && $newString && strpos($translatedString,$newString)===0)
{
$newString = $translatedString;
}
else
*/
$newString .= $translatedString;
} }
else else
{ {