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

#505 Try iconv() when \mb_convert_encoding() will not work.

Browse source
This commit is contained in:
the-djmaze 2022-08-30 22:25:09 +02:00
parent 3d5e094fd8
commit 5340ca84e5
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,10 +59,7 @@ abstract class Utils
return 'iso-8859-8'; return 'iso-8859-8';
} }
$sEncoding = \preg_replace('/^cp-([\d])/', 'cp$1', $sEncoding); return \preg_replace('/^(cp-?|windows?)(12[\d])/', 'windows-$1', $sEncoding);
$sEncoding = \preg_replace('/^windows?12/', 'windows-12', $sEncoding);
return $sEncoding;
} }
public static function NormalizeCharsetByValue(string $sCharset, string $sValue) : string public static function NormalizeCharsetByValue(string $sCharset, string $sValue) : string
@ -159,14 +156,13 @@ abstract class Utils
$sInputFromEncoding = static::$RenameEncoding[$sInputFromEncoding]; $sInputFromEncoding = static::$RenameEncoding[$sInputFromEncoding];
} }
if (!static::MbSupportedEncoding($sInputFromEncoding)) { if (!static::MbSupportedEncoding($sInputFromEncoding)) {
if (\function_exists('iconv')) {
$sResult = \iconv($sInputFromEncoding, "{$sInputToEncoding}//IGNORE", $sInputString);
return (false !== $sResult) ? $sResult : $sInputString;
}
\error_log("Unsupported encoding {$sInputFromEncoding}"); \error_log("Unsupported encoding {$sInputFromEncoding}");
$sInputFromEncoding = null; $sInputFromEncoding = null;
// return $sInputString; // return $sInputString;
/*
if (\function_exists('iconv')) {
return \iconv($sInputFromEncoding, $sInputToEncoding, $sInputString);
}
*/
} }
} }
@ -179,12 +175,10 @@ abstract class Utils
public static function ConvertEncoding(string $sInputString, string $sInputFromEncoding, string $sInputToEncoding) : string public static function ConvertEncoding(string $sInputString, string $sInputFromEncoding, string $sInputToEncoding) : string
{ {
$sResult = $sInputString;
$sFromEncoding = static::NormalizeCharset($sInputFromEncoding); $sFromEncoding = static::NormalizeCharset($sInputFromEncoding);
$sToEncoding = static::NormalizeCharset($sInputToEncoding); $sToEncoding = static::NormalizeCharset($sInputToEncoding);
if ('' === \trim($sResult) || ($sFromEncoding === $sToEncoding && Enumerations\Charset::UTF_8 !== $sFromEncoding)) if ('' === \trim($sInputString) || ($sFromEncoding === $sToEncoding && Enumerations\Charset::UTF_8 !== $sFromEncoding))
{ {
return $sInputString; return $sInputString;
} }