extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 10:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle utf-16 plain text attachments

Browse Source
This commit is contained in:
Klaus Leithoff 2011-11-10 15:07:38 +00:00
parent 047f07a8da
commit 135a4f6501
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -1476,7 +1476,6 @@ class felamimail_bo
'attachment' =>__METHOD__.' failed:'.$attachment->message
);
}
switch ($structure->encoding) {
case 'BASE64':
// use imap_base64 to decode
@ -1490,6 +1489,10 @@ class felamimail_bo
default:
// it is either not encoded or we don't know about it
}
if ($structure->type === 'TEXT' && isset($structure->parameters['CHARSET']) && stripos('UTF-16',$structure->parameters['CHARSET'])!==false)
{
$attachment = mb_convert_encoding($attachment,self::$displayCharset,$structure->parameters['CHARSET']);
}
$attachmentData = array(
'type' => $structure->type .'/'. $structure->subType,