holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail: check non-utf8 body, if it might be utf-8, to display readable

Browse Source
This commit is contained in:
Ralf Becker 2019-03-29 16:50:33 +01:00
parent 832f105982
commit be212f908c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mail/inc/class.mail_ui.inc.php
View File

@ -3340,7 +3340,15 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
if(($singleBodyPart['mimeType'] == 'text/html' || $singleBodyPart['mimeType'] == 'text/plain') &&
strtoupper($singleBodyPart['charSet']) != 'UTF-8')
{
$singleBodyPart['body'] = preg_replace($sar,$rar,$singleBodyPart['body']);
// check if client set a wrong charset and content is utf-8 --> use utf-8
if (preg_match('//u', $singleBodyPart['body']))
{
$singleBodyPart['charSet'] = 'UTF-8';
}
else
{
$singleBodyPart['body'] = preg_replace($sar,$rar,$singleBodyPart['body']);
}
}
//error_log(__METHOD__.__LINE__.'reports:'.$singleBodyPart['charSet']);
if ($singleBodyPart['charSet']=='us-ascii')