Alex/freescout
1
0
Fork 0
mirror of https://github.com/freescout-helpdesk/freescout.git synced 2024-11-24 03:12:46 +01:00
Code Issues Releases Wiki Activity

Improve subject decoding

Browse Source
This commit is contained in:
FreeScout 2023-06-27 23:36:16 -07:00
parent 3092424315
commit fa9289293b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Misc/Mail.php
View File

@ -907,7 +907,21 @@ class Mail
$subject_decoded = iconv_mime_decode($joined_parts, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, "UTF-8");
if ($subject_decoded && trim($subject_decoded) != trim(rtrim($joined_parts, '='))) {
if ($subject_decoded
&& trim($subject_decoded) != trim($joined_parts)
&& trim($subject_decoded) != trim(rtrim($joined_parts, '='))
) {
return $subject_decoded;
}
// Try imap_utf8().
// =?iso-2022-jp?B?IBskQiFaSEcyPDpuQ=?= =?iso-2022-jp?B?C4wTU1qIVs3Mkp2JSIlLyU3JSItahsoQg==?=
$subject_decoded = \imap_utf8($joined_parts);
if ($subject_decoded
&& trim($subject_decoded) != trim($joined_parts)
&& trim($subject_decoded) != trim(rtrim($joined_parts, '='))
) {
return $subject_decoded;
}
}