From 9ce80d0eb5b94753170a7278e5a218abbf2262ec Mon Sep 17 00:00:00 2001 From: Howaner Date: Tue, 30 Apr 2019 21:41:56 +0200 Subject: [PATCH] Updated php-mime-mail-parser library to 5.1 to really fix webui html preview --- data/web/inc/lib/composer.json | 2 +- .../php-mime-mail-parser/README.md | 2 +- .../php-mime-mail-parser/src/Charset.php | 504 +++++++++--------- 3 files changed, 254 insertions(+), 254 deletions(-) diff --git a/data/web/inc/lib/composer.json b/data/web/inc/lib/composer.json index 50ef1355..07dfe4ba 100644 --- a/data/web/inc/lib/composer.json +++ b/data/web/inc/lib/composer.json @@ -3,7 +3,7 @@ "robthree/twofactorauth": "^1.6", "yubico/u2flib-server": "^1.0", "phpmailer/phpmailer": "^5.2", - "php-mime-mail-parser/php-mime-mail-parser": "^5.0", + "php-mime-mail-parser/php-mime-mail-parser": "^5.1", "soundasleep/html2text": "^0.5.0", "ddeboer/imap": "^1.5", "matthiasmullie/minify": "^1.3" diff --git a/data/web/inc/lib/vendor/php-mime-mail-parser/php-mime-mail-parser/README.md b/data/web/inc/lib/vendor/php-mime-mail-parser/php-mime-mail-parser/README.md index 71b1b841..acd661e6 100644 --- a/data/web/inc/lib/vendor/php-mime-mail-parser/php-mime-mail-parser/README.md +++ b/data/web/inc/lib/vendor/php-mime-mail-parser/php-mime-mail-parser/README.md @@ -23,7 +23,7 @@ Yes. All known issues have been reproduced, fixed and tested. We use Travis CI to help ensure code quality. You can see real-time statistics below: -[![Build Status](https://img.shields.io/travis/php-mime-mail-parser/php-mime-mail-parser/master.svg?style=flat-square)](https://travis-ci.org/php-mime-mail-parser/php-mime-mail-parser) +[![Build Status](https://img.shields.io/travis/php-mime-mail-parser/php-mime-mail-parser/master.svg?style=flat-square)](https://travis-ci.com/php-mime-mail-parser/php-mime-mail-parser) [![Coverage](https://img.shields.io/coveralls/php-mime-mail-parser/php-mime-mail-parser.svg?style=flat-square)](https://coveralls.io/r/php-mime-mail-parser/php-mime-mail-parser) [![Quality Score](https://img.shields.io/scrutinizer/g/php-mime-mail-parser/php-mime-mail-parser.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-mime-mail-parser/php-mime-mail-parser) diff --git a/data/web/inc/lib/vendor/php-mime-mail-parser/php-mime-mail-parser/src/Charset.php b/data/web/inc/lib/vendor/php-mime-mail-parser/php-mime-mail-parser/src/Charset.php index 61bf84a0..9768edea 100644 --- a/data/web/inc/lib/vendor/php-mime-mail-parser/php-mime-mail-parser/src/Charset.php +++ b/data/web/inc/lib/vendor/php-mime-mail-parser/php-mime-mail-parser/src/Charset.php @@ -12,33 +12,33 @@ class Charset implements CharsetManager 'us-ascii' => 'us-ascii', 'ansi_x3.4-1968' => 'us-ascii', '646' => 'us-ascii', - 'iso-8859-1' => 'ISO-8859-1', - 'iso-8859-2' => 'ISO-8859-2', - 'iso-8859-3' => 'ISO-8859-3', - 'iso-8859-4' => 'ISO-8859-4', - 'iso-8859-5' => 'ISO-8859-5', - 'iso-8859-6' => 'ISO-8859-6', - 'iso-8859-6-i' => 'ISO-8859-6-I', - 'iso-8859-6-e' => 'ISO-8859-6-E', - 'iso-8859-7' => 'ISO-8859-7', - 'iso-8859-8' => 'ISO-8859-8', - 'iso-8859-8-i' => 'ISO-8859-8', - 'iso-8859-8-e' => 'ISO-8859-8-E', - 'iso-8859-9' => 'ISO-8859-9', - 'iso-8859-10' => 'ISO-8859-10', - 'iso-8859-11' => 'ISO-8859-11', - 'iso-8859-13' => 'ISO-8859-13', - 'iso-8859-14' => 'ISO-8859-14', - 'iso-8859-15' => 'ISO-8859-15', - 'iso-8859-16' => 'ISO-8859-16', - 'iso-ir-111' => 'ISO-IR-111', - 'iso-2022-cn' => 'ISO-2022-CN', - 'iso-2022-cn-ext' => 'ISO-2022-CN', - 'iso-2022-kr' => 'ISO-2022-KR', - 'iso-2022-jp' => 'ISO-2022-JP', - 'utf-16be' => 'UTF-16BE', - 'utf-16le' => 'UTF-16LE', - 'utf-16' => 'UTF-16', + 'iso-8859-1' => 'iso-8859-1', + 'iso-8859-2' => 'iso-8859-2', + 'iso-8859-3' => 'iso-8859-3', + 'iso-8859-4' => 'iso-8859-4', + 'iso-8859-5' => 'iso-8859-5', + 'iso-8859-6' => 'iso-8859-6', + 'iso-8859-6-i' => 'iso-8859-6-i', + 'iso-8859-6-e' => 'iso-8859-6-e', + 'iso-8859-7' => 'iso-8859-7', + 'iso-8859-8' => 'iso-8859-8', + 'iso-8859-8-i' => 'iso-8859-8', + 'iso-8859-8-e' => 'iso-8859-8-e', + 'iso-8859-9' => 'iso-8859-9', + 'iso-8859-10' => 'iso-8859-10', + 'iso-8859-11' => 'iso-8859-11', + 'iso-8859-13' => 'iso-8859-13', + 'iso-8859-14' => 'iso-8859-14', + 'iso-8859-15' => 'iso-8859-15', + 'iso-8859-16' => 'iso-8859-16', + 'iso-ir-111' => 'iso-ir-111', + 'iso-2022-cn' => 'iso-2022-cn', + 'iso-2022-cn-ext' => 'iso-2022-cn', + 'iso-2022-kr' => 'iso-2022-kr', + 'iso-2022-jp' => 'iso-2022-jp', + 'utf-16be' => 'utf-16be', + 'utf-16le' => 'utf-16le', + 'utf-16' => 'utf-16', 'windows-1250' => 'windows-1250', 'windows-1251' => 'windows-1251', 'windows-1252' => 'windows-1252', @@ -48,172 +48,172 @@ class Charset implements CharsetManager 'windows-1256' => 'windows-1256', 'windows-1257' => 'windows-1257', 'windows-1258' => 'windows-1258', - 'ibm866' => 'IBM866', - 'ibm850' => 'IBM850', - 'ibm852' => 'IBM852', - 'ibm855' => 'IBM855', - 'ibm857' => 'IBM857', - 'ibm862' => 'IBM862', - 'ibm864' => 'IBM864', - 'utf-8' => 'UTF-8', - 'utf-7' => 'UTF-7', - 'shift_jis' => 'Shift_JIS', - 'big5' => 'Big5', - 'euc-jp' => 'EUC-JP', - 'euc-kr' => 'EUC-KR', - 'gb2312' => 'GB2312', + 'ibm866' => 'ibm866', + 'ibm850' => 'ibm850', + 'ibm852' => 'ibm852', + 'ibm855' => 'ibm855', + 'ibm857' => 'ibm857', + 'ibm862' => 'ibm862', + 'ibm864' => 'ibm864', + 'utf-8' => 'utf-8', + 'utf-7' => 'utf-7', + 'shift_jis' => 'shift_jis', + 'big5' => 'big5', + 'euc-jp' => 'euc-jp', + 'euc-kr' => 'euc-kr', + 'gb2312' => 'gb2312', 'gb18030' => 'gb18030', - 'viscii' => 'VISCII', - 'koi8-r' => 'KOI8-R', - 'koi8_r' => 'KOI8-R', - 'cskoi8r' => 'KOI8-R', - 'koi' => 'KOI8-R', - 'koi8' => 'KOI8-R', - 'koi8-u' => 'KOI8-U', - 'tis-620' => 'TIS-620', - 't.61-8bit' => 'T.61-8bit', - 'hz-gb-2312' => 'HZ-GB-2312', - 'big5-hkscs' => 'Big5-HKSCS', + 'viscii' => 'viscii', + 'koi8-r' => 'koi8-r', + 'koi8_r' => 'koi8-r', + 'cskoi8r' => 'koi8-r', + 'koi' => 'koi8-r', + 'koi8' => 'koi8-r', + 'koi8-u' => 'koi8-u', + 'tis-620' => 'tis-620', + 't.61-8bit' => 't.61-8bit', + 'hz-gb-2312' => 'hz-gb-2312', + 'big5-hkscs' => 'big5-hkscs', 'gbk' => 'gbk', 'cns11643' => 'x-euc-tw', 'x-imap4-modified-utf7' => 'x-imap4-modified-utf7', 'x-euc-tw' => 'x-euc-tw', - 'x-mac-ce' => 'MACCE', - 'x-mac-turkish' => 'MACTURKISH', - 'x-mac-greek' => 'MACGREEK', - 'x-mac-icelandic' => 'MACICELANDIC', - 'x-mac-croatian' => 'MACCROATIAN', - 'x-mac-romanian' => 'MACROMANIAN', - 'x-mac-cyrillic' => 'MACCYRILLIC', - 'x-mac-ukrainian' => 'MACUKRAINIAN', - 'x-mac-hebrew' => 'MACHEBREW', - 'x-mac-arabic' => 'MACARABIC', - 'x-mac-farsi' => 'MACFARSI', - 'x-mac-devanagari' => 'MACDEVANAGARI', - 'x-mac-gujarati' => 'MACGUJARATI', - 'x-mac-gurmukhi' => 'MACGURMUKHI', + 'x-mac-ce' => 'macce', + 'x-mac-turkish' => 'macturkish', + 'x-mac-greek' => 'macgreek', + 'x-mac-icelandic' => 'macicelandic', + 'x-mac-croatian' => 'maccroatian', + 'x-mac-romanian' => 'macromanian', + 'x-mac-cyrillic' => 'maccyrillic', + 'x-mac-ukrainian' => 'macukrainian', + 'x-mac-hebrew' => 'machebrew', + 'x-mac-arabic' => 'macarabic', + 'x-mac-farsi' => 'macfarsi', + 'x-mac-devanagari' => 'macdevanagari', + 'x-mac-gujarati' => 'macgujarati', + 'x-mac-gurmukhi' => 'macgurmukhi', 'armscii-8' => 'armscii-8', 'x-viet-tcvn5712' => 'x-viet-tcvn5712', 'x-viet-vps' => 'x-viet-vps', - 'iso-10646-ucs-2' => 'UTF-16BE', - 'x-iso-10646-ucs-2-be' => 'UTF-16BE', - 'x-iso-10646-ucs-2-le' => 'UTF-16LE', + 'iso-10646-ucs-2' => 'utf-16be', + 'x-iso-10646-ucs-2-be' => 'utf-16be', + 'x-iso-10646-ucs-2-le' => 'utf-16le', 'x-user-defined' => 'x-user-defined', 'x-johab' => 'x-johab', - 'latin1' => 'ISO-8859-1', - 'iso_8859-1' => 'ISO-8859-1', - 'iso8859-1' => 'ISO-8859-1', - 'iso8859-2' => 'ISO-8859-2', - 'iso8859-3' => 'ISO-8859-3', - 'iso8859-4' => 'ISO-8859-4', - 'iso8859-5' => 'ISO-8859-5', - 'iso8859-6' => 'ISO-8859-6', - 'iso8859-7' => 'ISO-8859-7', - 'iso8859-8' => 'ISO-8859-8', - 'iso8859-9' => 'ISO-8859-9', - 'iso8859-10' => 'ISO-8859-10', - 'iso8859-11' => 'ISO-8859-11', - 'iso8859-13' => 'ISO-8859-13', - 'iso8859-14' => 'ISO-8859-14', - 'iso8859-15' => 'ISO-8859-15', - 'iso_8859-1:1987' => 'ISO-8859-1', - 'iso-ir-100' => 'ISO-8859-1', - 'l1' => 'ISO-8859-1', - 'ibm819' => 'ISO-8859-1', - 'cp819' => 'ISO-8859-1', - 'csisolatin1' => 'ISO-8859-1', - 'latin2' => 'ISO-8859-2', - 'iso_8859-2' => 'ISO-8859-2', - 'iso_8859-2:1987' => 'ISO-8859-2', - 'iso-ir-101' => 'ISO-8859-2', - 'l2' => 'ISO-8859-2', - 'csisolatin2' => 'ISO-8859-2', - 'latin3' => 'ISO-8859-3', - 'iso_8859-3' => 'ISO-8859-3', - 'iso_8859-3:1988' => 'ISO-8859-3', - 'iso-ir-109' => 'ISO-8859-3', - 'l3' => 'ISO-8859-3', - 'csisolatin3' => 'ISO-8859-3', - 'latin4' => 'ISO-8859-4', - 'iso_8859-4' => 'ISO-8859-4', - 'iso_8859-4:1988' => 'ISO-8859-4', - 'iso-ir-110' => 'ISO-8859-4', - 'l4' => 'ISO-8859-4', - 'csisolatin4' => 'ISO-8859-4', - 'cyrillic' => 'ISO-8859-5', - 'iso_8859-5' => 'ISO-8859-5', - 'iso_8859-5:1988' => 'ISO-8859-5', - 'iso-ir-144' => 'ISO-8859-5', - 'csisolatincyrillic' => 'ISO-8859-5', - 'arabic' => 'ISO-8859-6', - 'iso_8859-6' => 'ISO-8859-6', - 'iso_8859-6:1987' => 'ISO-8859-6', - 'iso-ir-127' => 'ISO-8859-6', - 'ecma-114' => 'ISO-8859-6', - 'asmo-708' => 'ISO-8859-6', - 'csisolatinarabic' => 'ISO-8859-6', - 'csiso88596i' => 'ISO-8859-6-I', - 'csiso88596e' => 'ISO-8859-6-E', - 'greek' => 'ISO-8859-7', - 'greek8' => 'ISO-8859-7', - 'sun_eu_greek' => 'ISO-8859-7', - 'iso_8859-7' => 'ISO-8859-7', - 'iso_8859-7:1987' => 'ISO-8859-7', - 'iso-ir-126' => 'ISO-8859-7', - 'elot_928' => 'ISO-8859-7', - 'ecma-118' => 'ISO-8859-7', - 'csisolatingreek' => 'ISO-8859-7', - 'hebrew' => 'ISO-8859-8', - 'iso_8859-8' => 'ISO-8859-8', - 'visual' => 'ISO-8859-8', - 'iso_8859-8:1988' => 'ISO-8859-8', - 'iso-ir-138' => 'ISO-8859-8', - 'csisolatinhebrew' => 'ISO-8859-8', - 'csiso88598i' => 'ISO-8859-8', - 'iso-8859-8i' => 'ISO-8859-8', - 'logical' => 'ISO-8859-8', - 'csiso88598e' => 'ISO-8859-8-E', - 'latin5' => 'ISO-8859-9', - 'iso_8859-9' => 'ISO-8859-9', - 'iso_8859-9:1989' => 'ISO-8859-9', - 'iso-ir-148' => 'ISO-8859-9', - 'l5' => 'ISO-8859-9', - 'csisolatin5' => 'ISO-8859-9', - 'unicode-1-1-utf-8' => 'UTF-8', - 'utf8' => 'UTF-8', - 'x-sjis' => 'Shift_JIS', - 'shift-jis' => 'Shift_JIS', - 'ms_kanji' => 'Shift_JIS', - 'csshiftjis' => 'Shift_JIS', - 'windows-31j' => 'Shift_JIS', - 'cp932' => 'Shift_JIS', - 'sjis' => 'Shift_JIS', - 'cseucpkdfmtjapanese' => 'EUC-JP', - 'x-euc-jp' => 'EUC-JP', - 'csiso2022jp' => 'ISO-2022-JP', - 'iso-2022-jp-2' => 'ISO-2022-JP', - 'csiso2022jp2' => 'ISO-2022-JP', - 'csbig5' => 'Big5', - 'cn-big5' => 'Big5', - 'x-x-big5' => 'Big5', - 'zh_tw-big5' => 'Big5', - 'cseuckr' => 'EUC-KR', - 'ks_c_5601-1987' => 'EUC-KR', - 'iso-ir-149' => 'EUC-KR', - 'ks_c_5601-1989' => 'EUC-KR', - 'ksc_5601' => 'EUC-KR', - 'ksc5601' => 'EUC-KR', - 'korean' => 'EUC-KR', - 'csksc56011987' => 'EUC-KR', - '5601' => 'EUC-KR', - 'windows-949' => 'EUC-KR', - 'gb_2312-80' => 'GB2312', - 'iso-ir-58' => 'GB2312', - 'chinese' => 'GB2312', - 'csiso58gb231280' => 'GB2312', - 'csgb2312' => 'GB2312', - 'zh_cn.euc' => 'GB2312', - 'gb_2312' => 'GB2312', + 'latin1' => 'iso-8859-1', + 'iso_8859-1' => 'iso-8859-1', + 'iso8859-1' => 'iso-8859-1', + 'iso8859-2' => 'iso-8859-2', + 'iso8859-3' => 'iso-8859-3', + 'iso8859-4' => 'iso-8859-4', + 'iso8859-5' => 'iso-8859-5', + 'iso8859-6' => 'iso-8859-6', + 'iso8859-7' => 'iso-8859-7', + 'iso8859-8' => 'iso-8859-8', + 'iso8859-9' => 'iso-8859-9', + 'iso8859-10' => 'iso-8859-10', + 'iso8859-11' => 'iso-8859-11', + 'iso8859-13' => 'iso-8859-13', + 'iso8859-14' => 'iso-8859-14', + 'iso8859-15' => 'iso-8859-15', + 'iso_8859-1:1987' => 'iso-8859-1', + 'iso-ir-100' => 'iso-8859-1', + 'l1' => 'iso-8859-1', + 'ibm819' => 'iso-8859-1', + 'cp819' => 'iso-8859-1', + 'csisolatin1' => 'iso-8859-1', + 'latin2' => 'iso-8859-2', + 'iso_8859-2' => 'iso-8859-2', + 'iso_8859-2:1987' => 'iso-8859-2', + 'iso-ir-101' => 'iso-8859-2', + 'l2' => 'iso-8859-2', + 'csisolatin2' => 'iso-8859-2', + 'latin3' => 'iso-8859-3', + 'iso_8859-3' => 'iso-8859-3', + 'iso_8859-3:1988' => 'iso-8859-3', + 'iso-ir-109' => 'iso-8859-3', + 'l3' => 'iso-8859-3', + 'csisolatin3' => 'iso-8859-3', + 'latin4' => 'iso-8859-4', + 'iso_8859-4' => 'iso-8859-4', + 'iso_8859-4:1988' => 'iso-8859-4', + 'iso-ir-110' => 'iso-8859-4', + 'l4' => 'iso-8859-4', + 'csisolatin4' => 'iso-8859-4', + 'cyrillic' => 'iso-8859-5', + 'iso_8859-5' => 'iso-8859-5', + 'iso_8859-5:1988' => 'iso-8859-5', + 'iso-ir-144' => 'iso-8859-5', + 'csisolatincyrillic' => 'iso-8859-5', + 'arabic' => 'iso-8859-6', + 'iso_8859-6' => 'iso-8859-6', + 'iso_8859-6:1987' => 'iso-8859-6', + 'iso-ir-127' => 'iso-8859-6', + 'ecma-114' => 'iso-8859-6', + 'asmo-708' => 'iso-8859-6', + 'csisolatinarabic' => 'iso-8859-6', + 'csiso88596i' => 'iso-8859-6-i', + 'csiso88596e' => 'iso-8859-6-e', + 'greek' => 'iso-8859-7', + 'greek8' => 'iso-8859-7', + 'sun_eu_greek' => 'iso-8859-7', + 'iso_8859-7' => 'iso-8859-7', + 'iso_8859-7:1987' => 'iso-8859-7', + 'iso-ir-126' => 'iso-8859-7', + 'elot_928' => 'iso-8859-7', + 'ecma-118' => 'iso-8859-7', + 'csisolatingreek' => 'iso-8859-7', + 'hebrew' => 'iso-8859-8', + 'iso_8859-8' => 'iso-8859-8', + 'visual' => 'iso-8859-8', + 'iso_8859-8:1988' => 'iso-8859-8', + 'iso-ir-138' => 'iso-8859-8', + 'csisolatinhebrew' => 'iso-8859-8', + 'csiso88598i' => 'iso-8859-8', + 'iso-8859-8i' => 'iso-8859-8', + 'logical' => 'iso-8859-8', + 'csiso88598e' => 'iso-8859-8-e', + 'latin5' => 'iso-8859-9', + 'iso_8859-9' => 'iso-8859-9', + 'iso_8859-9:1989' => 'iso-8859-9', + 'iso-ir-148' => 'iso-8859-9', + 'l5' => 'iso-8859-9', + 'csisolatin5' => 'iso-8859-9', + 'unicode-1-1-utf-8' => 'utf-8', + 'utf8' => 'utf-8', + 'x-sjis' => 'shift_jis', + 'shift-jis' => 'shift_jis', + 'ms_kanji' => 'shift_jis', + 'csshiftjis' => 'shift_jis', + 'windows-31j' => 'shift_jis', + 'cp932' => 'shift_jis', + 'sjis' => 'shift_jis', + 'cseucpkdfmtjapanese' => 'euc-jp', + 'x-euc-jp' => 'euc-jp', + 'csiso2022jp' => 'iso-2022-jp', + 'iso-2022-jp-2' => 'iso-2022-jp', + 'csiso2022jp2' => 'iso-2022-jp', + 'csbig5' => 'big5', + 'cn-big5' => 'big5', + 'x-x-big5' => 'big5', + 'zh_tw-big5' => 'big5', + 'cseuckr' => 'euc-kr', + 'ks_c_5601-1987' => 'euc-kr', + 'iso-ir-149' => 'euc-kr', + 'ks_c_5601-1989' => 'euc-kr', + 'ksc_5601' => 'euc-kr', + 'ksc5601' => 'euc-kr', + 'korean' => 'euc-kr', + 'csksc56011987' => 'euc-kr', + '5601' => 'euc-kr', + 'windows-949' => 'euc-kr', + 'gb_2312-80' => 'gb2312', + 'iso-ir-58' => 'gb2312', + 'chinese' => 'gb2312', + 'csiso58gb231280' => 'gb2312', + 'csgb2312' => 'gb2312', + 'zh_cn.euc' => 'gb2312', + 'gb_2312' => 'gb2312', 'x-cp1250' => 'windows-1250', 'x-cp1251' => 'windows-1251', 'x-cp1252' => 'windows-1252', @@ -230,72 +230,72 @@ class Charset implements CharsetManager 'x-mac-roman' => 'macintosh', 'mac' => 'macintosh', 'csmacintosh' => 'macintosh', - 'cp866' => 'IBM866', - 'cp-866' => 'IBM866', - '866' => 'IBM866', - 'csibm866' => 'IBM866', - 'cp850' => 'IBM850', - '850' => 'IBM850', - 'csibm850' => 'IBM850', - 'cp852' => 'IBM852', - '852' => 'IBM852', - 'csibm852' => 'IBM852', - 'cp855' => 'IBM855', - '855' => 'IBM855', - 'csibm855' => 'IBM855', - 'cp857' => 'IBM857', - '857' => 'IBM857', - 'csibm857' => 'IBM857', - 'cp862' => 'IBM862', - '862' => 'IBM862', - 'csibm862' => 'IBM862', - 'cp864' => 'IBM864', - '864' => 'IBM864', - 'csibm864' => 'IBM864', - 'ibm-864' => 'IBM864', - 't.61' => 'T.61-8bit', - 'iso-ir-103' => 'T.61-8bit', - 'csiso103t618bit' => 'T.61-8bit', - 'x-unicode-2-0-utf-7' => 'UTF-7', - 'unicode-2-0-utf-7' => 'UTF-7', - 'unicode-1-1-utf-7' => 'UTF-7', - 'csunicode11utf7' => 'UTF-7', - 'csunicode' => 'UTF-16BE', - 'csunicode11' => 'UTF-16BE', - 'iso-10646-ucs-basic' => 'UTF-16BE', - 'csunicodeascii' => 'UTF-16BE', - 'iso-10646-unicode-latin1' => 'UTF-16BE', - 'csunicodelatin1' => 'UTF-16BE', - 'iso-10646' => 'UTF-16BE', - 'iso-10646-j-1' => 'UTF-16BE', - 'latin6' => 'ISO-8859-10', - 'iso-ir-157' => 'ISO-8859-10', - 'l6' => 'ISO-8859-10', - 'csisolatin6' => 'ISO-8859-10', - 'iso_8859-15' => 'ISO-8859-15', - 'csisolatin9' => 'ISO-8859-15', - 'l9' => 'ISO-8859-15', - 'ecma-cyrillic' => 'ISO-IR-111', - 'csiso111ecmacyrillic' => 'ISO-IR-111', - 'csiso2022kr' => 'ISO-2022-KR', - 'csviscii' => 'VISCII', + 'cp866' => 'ibm866', + 'cp-866' => 'ibm866', + '866' => 'ibm866', + 'csibm866' => 'ibm866', + 'cp850' => 'ibm850', + '850' => 'ibm850', + 'csibm850' => 'ibm850', + 'cp852' => 'ibm852', + '852' => 'ibm852', + 'csibm852' => 'ibm852', + 'cp855' => 'ibm855', + '855' => 'ibm855', + 'csibm855' => 'ibm855', + 'cp857' => 'ibm857', + '857' => 'ibm857', + 'csibm857' => 'ibm857', + 'cp862' => 'ibm862', + '862' => 'ibm862', + 'csibm862' => 'ibm862', + 'cp864' => 'ibm864', + '864' => 'ibm864', + 'csibm864' => 'ibm864', + 'ibm-864' => 'ibm864', + 't.61' => 't.61-8bit', + 'iso-ir-103' => 't.61-8bit', + 'csiso103t618bit' => 't.61-8bit', + 'x-unicode-2-0-utf-7' => 'utf-7', + 'unicode-2-0-utf-7' => 'utf-7', + 'unicode-1-1-utf-7' => 'utf-7', + 'csunicode11utf7' => 'utf-7', + 'csunicode' => 'utf-16be', + 'csunicode11' => 'utf-16be', + 'iso-10646-ucs-basic' => 'utf-16be', + 'csunicodeascii' => 'utf-16be', + 'iso-10646-unicode-latin1' => 'utf-16be', + 'csunicodelatin1' => 'utf-16be', + 'iso-10646' => 'utf-16be', + 'iso-10646-j-1' => 'utf-16be', + 'latin6' => 'iso-8859-10', + 'iso-ir-157' => 'iso-8859-10', + 'l6' => 'iso-8859-10', + 'csisolatin6' => 'iso-8859-10', + 'iso_8859-15' => 'iso-8859-15', + 'csisolatin9' => 'iso-8859-15', + 'l9' => 'iso-8859-15', + 'ecma-cyrillic' => 'iso-ir-111', + 'csiso111ecmacyrillic' => 'iso-ir-111', + 'csiso2022kr' => 'iso-2022-kr', + 'csviscii' => 'viscii', 'zh_tw-euc' => 'x-euc-tw', - 'iso88591' => 'ISO-8859-1', - 'iso88592' => 'ISO-8859-2', - 'iso88593' => 'ISO-8859-3', - 'iso88594' => 'ISO-8859-4', - 'iso88595' => 'ISO-8859-5', - 'iso88596' => 'ISO-8859-6', - 'iso88597' => 'ISO-8859-7', - 'iso88598' => 'ISO-8859-8', - 'iso88599' => 'ISO-8859-9', - 'iso885910' => 'ISO-8859-10', - 'iso885911' => 'ISO-8859-11', - 'iso885912' => 'ISO-8859-12', - 'iso885913' => 'ISO-8859-13', - 'iso885914' => 'ISO-8859-14', - 'iso885915' => 'ISO-8859-15', - 'tis620' => 'TIS-620', + 'iso88591' => 'iso-8859-1', + 'iso88592' => 'iso-8859-2', + 'iso88593' => 'iso-8859-3', + 'iso88594' => 'iso-8859-4', + 'iso88595' => 'iso-8859-5', + 'iso88596' => 'iso-8859-6', + 'iso88597' => 'iso-8859-7', + 'iso88598' => 'iso-8859-8', + 'iso88599' => 'iso-8859-9', + 'iso885910' => 'iso-8859-10', + 'iso885911' => 'iso-8859-11', + 'iso885912' => 'iso-8859-12', + 'iso885913' => 'iso-8859-13', + 'iso885914' => 'iso-8859-14', + 'iso885915' => 'iso-8859-15', + 'tis620' => 'tis-620', 'cp1250' => 'windows-1250', 'cp1251' => 'windows-1251', 'cp1252' => 'windows-1252', @@ -322,16 +322,16 @@ class Charset implements CharsetManager } if (function_exists('mb_convert_encoding')) { - if ($charset == 'ISO-2022-JP') { - return mb_convert_encoding($encodedString, 'UTF-8', 'ISO-2022-JP-MS'); + if ($charset == 'iso-2022-jp') { + return mb_convert_encoding($encodedString, 'utf-8', 'iso-2022-jp-ms'); } if (array_search($charset, array_map('strtolower', mb_list_encodings()))) { - return mb_convert_encoding($encodedString, 'UTF-8', $charset); + return mb_convert_encoding($encodedString, 'utf-8', $charset); } } - return iconv($charset, 'UTF-8//TRANSLIT//IGNORE', $encodedString); + return iconv($charset, 'utf-8//translit//ignore', $encodedString); } /**