From bda5e014d7648dde87d642cfa0039638ea5f8ba4 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 18 Aug 2011 14:49:16 +0000 Subject: [PATCH] * tracker: mailhandling - prevent to use rsh or ssh to establish connection --- phpgwapi/inc/class.translation.inc.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php index d277dad6df..0f36d5e989 100644 --- a/phpgwapi/inc/class.translation.inc.php +++ b/phpgwapi/inc/class.translation.inc.php @@ -1027,6 +1027,11 @@ class translation if ($element->charset != 'x-unknown') { if( strtoupper($element->charset) != 'UTF-8') $element->text = preg_replace($sar,$rar,$element->text); + if(preg_match('/\?=.+=\?/', $element->text)) + { + $element->text = self::decodeMailHeader($element->text, $element->charset); + $element->charset = $displayCharset; + } $newString .= self::convert($element->text,$element->charset); } else