extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 09:58:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

some additional stuff to improve mailheader decoding

Browse Source
This commit is contained in:
Klaus Leithoff 2010-06-07 14:31:59 +00:00
parent 82455c87a6
commit 82cb36ff3a
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
phpgwapi/inc/class.translation.inc.php
View File

@ -985,17 +985,35 @@ class translation
//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))
{ {
// some characterreplacements, as they fail to translate
$sar = array(
'@(\x84|\x93|\x94)@',
'@(\x96|\x97)@',
'@(\x91|\x92)@',
'@(\x85)@',
'@(\x86)@',
);
$rar = array(
'"',
'-',
'\'',
'...',
'+',
);
$newString = ''; $newString = '';
$string = preg_replace('/\?=\s+=\?/', '?= =?', $_string); $string = preg_replace('/\?=\s+=\?/', '?= =?', $_string);
$elements=imap_mime_header_decode($string); $elements=imap_mime_header_decode($string);
$convertAtEnd = false; $convertAtEnd = false;
foreach((array)$elements as $element) foreach((array)$elements as $element)
{ {
if ($element->charset == 'default') $element->charset = 'iso-8859-1'; if ($element->charset == 'default') $element->charset = 'iso-8859-1';
if ($element->charset != 'x-unknown') if ($element->charset != 'x-unknown')
{ {
if( strtoupper($element->charset) != 'UTF-8') $element->text = preg_replace($sar,$rar,$element->text);
$newString .= self::convert($element->text,$element->charset); $newString .= self::convert($element->text,$element->charset);
} }
else else