Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 17:07:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #394

Browse source
This commit is contained in:
the-djmaze 2022-05-16 14:10:44 +02:00
parent 2b22c06b34
commit 894ac99687
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
View file

@ -147,11 +147,19 @@ abstract class Utils
return \in_array(\strtoupper($sEncoding), $aSupportedEncodings); return \in_array(\strtoupper($sEncoding), $aSupportedEncodings);
} }
private static $RenameEncoding = [
'SHIFT_JIS' => 'SJIS'
];
public static function MbConvertEncoding(string $sInputString, ?string $sInputFromEncoding, string $sInputToEncoding) : string public static function MbConvertEncoding(string $sInputString, ?string $sInputFromEncoding, string $sInputToEncoding) : string
{ {
if ($sInputFromEncoding) { if ($sInputFromEncoding) {
$sInputFromEncoding = \strtoupper($sInputFromEncoding); $sInputFromEncoding = \strtoupper($sInputFromEncoding);
if (isset(static::$RenameEncoding[$sInputFromEncoding])) {
$sInputFromEncoding = static::$RenameEncoding[$sInputFromEncoding];
}
if (!static::MbSupportedEncoding($sInputFromEncoding)) { if (!static::MbSupportedEncoding($sInputFromEncoding)) {
\error_log("Unsupported encoding {$sInputFromEncoding}");
$sInputFromEncoding = null; $sInputFromEncoding = null;
// return $sInputString; // return $sInputString;
/* /*