extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-06 11:12:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

improving decode_header for charset x-unknown and encoding Base64

Browse Source
This commit is contained in:
Klaus Leithoff 2009-09-08 13:24:16 +00:00
parent 4c3cb299d3
commit 1b5e27616b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
felamimail/inc/class.bofelamimail.inc.php
View File

@ -398,12 +398,20 @@
$string = preg_replace('/\?=\s+=\?/', '?= =?', $_string);
$elements=imap_mime_header_decode($string);
$convertAtEnd = false;
foreach((array)$elements as $element) {
if ($element->charset == 'default')
$element->charset = 'iso-8859-1';
$newString .= self::$botranslation->convert($element->text,$element->charset);
if ($element->charset == 'default') $element->charset = 'iso-8859-1';
if ($element->charset != 'x-unknown')
{
$newString .= self::$botranslation->convert($element->text,$element->charset);
}
else
{
$newString .= $element->text;
$convertAtEnd = true;
}
}
if ($convertAtEnd) $newString = $this->decode_header($newString,self::$displayCharset);
return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$newString);
} elseif(function_exists(mb_decode_mimeheader)) {
$string = $_string;