From df8c4d6d0d3ecbfd0bb64f52ab6db6708debbdba Mon Sep 17 00:00:00 2001 From: tokul Date: Sun, 21 Dec 2003 11:40:08 +0000 Subject: [PATCH] Makes managing decoding easier. Mac decoding moved to separate cvs module git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6293 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/decode/cp10000.php | 177 ------------------ functions/decode/cp10006.php | 177 ------------------ functions/decode/cp10007.php | 177 ------------------ functions/decode/cp10017.php | 176 ----------------- functions/decode/cp10029.php | 177 ------------------ functions/decode/cp10079.php | 177 ------------------ functions/decode/cp10081.php | 177 ------------------ .../decode/{iso8859-1.php => iso_8859_1.php} | 2 +- .../{iso8859-10.php => iso_8859_10.php} | 2 +- .../{iso8859-11.php => iso_8859_11.php} | 2 +- .../{iso8859-13.php => iso_8859_13.php} | 2 +- .../{iso8859-14.php => iso_8859_14.php} | 2 +- .../{iso8859-15.php => iso_8859_15.php} | 2 +- .../{iso8859-16.php => iso_8859_16.php} | 2 +- .../decode/{iso8859-2.php => iso_8859_2.php} | 2 +- .../decode/{iso8859-3.php => iso_8859_3.php} | 2 +- .../decode/{iso8859-4.php => iso_8859_4.php} | 2 +- .../decode/{iso8859-5.php => iso_8859_5.php} | 2 +- .../decode/{iso8859-6.php => iso_8859_6.php} | 2 +- .../decode/{iso8859-7.php => iso_8859_7.php} | 2 +- .../decode/{iso8859-8.php => iso_8859_8.php} | 2 +- .../decode/{iso8859-9.php => iso_8859_9.php} | 2 +- .../decode/{iso-ir-111.php => iso_ir_111.php} | 0 functions/decode/{koi8-r.php => koi8_r.php} | 2 +- functions/decode/{koi8-u.php => koi8_u.php} | 2 +- functions/decode/{tis620.php => tis_620.php} | 2 +- functions/decode/{utf-8.php => utf_8.php} | 2 +- 27 files changed, 19 insertions(+), 1257 deletions(-) delete mode 100644 functions/decode/cp10000.php delete mode 100644 functions/decode/cp10006.php delete mode 100644 functions/decode/cp10007.php delete mode 100644 functions/decode/cp10017.php delete mode 100644 functions/decode/cp10029.php delete mode 100644 functions/decode/cp10079.php delete mode 100644 functions/decode/cp10081.php rename functions/decode/{iso8859-1.php => iso_8859_1.php} (95%) rename functions/decode/{iso8859-10.php => iso_8859_10.php} (98%) rename functions/decode/{iso8859-11.php => iso_8859_11.php} (98%) rename functions/decode/{iso8859-13.php => iso_8859_13.php} (98%) rename functions/decode/{iso8859-14.php => iso_8859_14.php} (98%) rename functions/decode/{iso8859-15.php => iso_8859_15.php} (98%) rename functions/decode/{iso8859-16.php => iso_8859_16.php} (98%) rename functions/decode/{iso8859-2.php => iso_8859_2.php} (98%) rename functions/decode/{iso8859-3.php => iso_8859_3.php} (98%) rename functions/decode/{iso8859-4.php => iso_8859_4.php} (98%) rename functions/decode/{iso8859-5.php => iso_8859_5.php} (98%) rename functions/decode/{iso8859-6.php => iso_8859_6.php} (98%) rename functions/decode/{iso8859-7.php => iso_8859_7.php} (98%) rename functions/decode/{iso8859-8.php => iso_8859_8.php} (98%) rename functions/decode/{iso8859-9.php => iso_8859_9.php} (98%) rename functions/decode/{iso-ir-111.php => iso_ir_111.php} (100%) rename functions/decode/{koi8-r.php => koi8_r.php} (99%) rename functions/decode/{koi8-u.php => koi8_u.php} (99%) rename functions/decode/{tis620.php => tis_620.php} (98%) rename functions/decode/{utf-8.php => utf_8.php} (97%) diff --git a/functions/decode/cp10000.php b/functions/decode/cp10000.php deleted file mode 100644 index 95c53980..00000000 --- a/functions/decode/cp10000.php +++ /dev/null @@ -1,177 +0,0 @@ - - * K.D. Chang - * @package squirrelmail - * @subpackage decode - */ - -/** - * Decode cp10000 (MacRoman) string - * @param string $string String to decode - * @return string $string Decoded string - */ -function charset_decode_cp10000 ($string) { - global $default_charset; - - if (strtolower($default_charset) == 'x-mac-roman') - return $string; - - /* Only do the slow convert if there are 8-bit characters */ - /* avoid using 0xA0 (\240) in ereg ranges. RH73 does not like that */ - if (! ereg("[\200-\237]", $string) and ! ereg("[\241-\377]", $string) ) - return $string; - - $cp10000 = array( - "\0x80" => 'Ä', - "\0x81" => 'Å', - "\0x82" => 'Ç', - "\0x83" => 'É', - "\0x84" => 'Ñ', - "\0x85" => 'Ö', - "\0x86" => 'Ü', - "\0x87" => 'á', - "\0x88" => 'à', - "\0x89" => 'â', - "\0x8A" => 'ä', - "\0x8B" => 'ã', - "\0x8C" => 'å', - "\0x8D" => 'ç', - "\0x8E" => 'é', - "\0x8F" => 'è', - "\0x90" => 'ê', - "\0x91" => 'ë', - "\0x92" => 'í', - "\0x93" => 'ì', - "\0x94" => 'î', - "\0x95" => 'ï', - "\0x96" => 'ñ', - "\0x97" => 'ó', - "\0x98" => 'ò', - "\0x99" => 'ô', - "\0x9A" => 'ö', - "\0x9B" => 'õ', - "\0x9C" => 'ú', - "\0x9D" => 'ù', - "\0x9E" => 'û', - "\0x9F" => 'ü', - "\0xA0" => '†', - "\0xA1" => '°', - "\0xA2" => '¢', - "\0xA3" => '£', - "\0xA4" => '§', - "\0xA5" => '•', - "\0xA6" => '¶', - "\0xA7" => 'ß', - "\0xA8" => '®', - "\0xA9" => '©', - "\0xAA" => '™', - "\0xAB" => '´', - "\0xAC" => '¨', - "\0xAD" => '≠', - "\0xAE" => 'Æ', - "\0xAF" => 'Ø', - "\0xB0" => '∞', - "\0xB1" => '±', - "\0xB2" => '≤', - "\0xB3" => '≥', - "\0xB4" => '¥', - "\0xB5" => 'µ', - "\0xB6" => '∂', - "\0xB7" => '∑', - "\0xB8" => '∏', - "\0xB9" => 'π', - "\0xBA" => '∫', - "\0xBB" => 'ª', - "\0xBC" => 'º', - "\0xBD" => 'Ω', - "\0xBE" => 'æ', - "\0xBF" => 'ø', - "\0xC0" => '¿', - "\0xC1" => '¡', - "\0xC2" => '¬', - "\0xC3" => '√', - "\0xC4" => 'ƒ', - "\0xC5" => '≈', - "\0xC6" => '∆', - "\0xC7" => '«', - "\0xC8" => '»', - "\0xC9" => '…', - "\0xCA" => ' ', - "\0xCB" => 'À', - "\0xCC" => 'Ã', - "\0xCD" => 'Õ', - "\0xCE" => 'Œ', - "\0xCF" => 'œ', - "\0xD0" => '–', - "\0xD1" => '—', - "\0xD2" => '“', - "\0xD3" => '”', - "\0xD4" => '‘', - "\0xD5" => '’', - "\0xD6" => '÷', - "\0xD7" => '◊', - "\0xD8" => 'ÿ', - "\0xD9" => 'Ÿ', - "\0xDA" => '⁄', - "\0xDB" => '¤', - "\0xDC" => '‹', - "\0xDD" => '›', - "\0xDE" => 'fi', - "\0xDF" => 'fl', - "\0xE0" => '‡', - "\0xE1" => '·', - "\0xE2" => '‚', - "\0xE3" => '„', - "\0xE4" => '‰', - "\0xE5" => 'Â', - "\0xE6" => 'Ê', - "\0xE7" => 'Á', - "\0xE8" => 'Ë', - "\0xE9" => 'È', - "\0xEA" => 'Í', - "\0xEB" => 'Î', - "\0xEC" => 'Ï', - "\0xED" => 'Ì', - "\0xEE" => 'Ó', - "\0xEF" => 'Ô', - "\0xF0" => '￿', - "\0xF1" => 'Ò', - "\0xF2" => 'Ú', - "\0xF3" => 'Û', - "\0xF4" => 'Ù', - "\0xF5" => 'ı', - "\0xF6" => 'ˆ', - "\0xF7" => '˜', - "\0xF8" => '¯', - "\0xF9" => '˘', - "\0xFA" => '˙', - "\0xFB" => '˚', - "\0xFC" => '¸', - "\0xFD" => '˝', - "\0xFE" => '˛', - "\0xFF" => 'ˇ' - ); - - $string = str_replace(array_keys($cp10000), array_values($cp10000), $string); - - return $string; -} -?> diff --git a/functions/decode/cp10006.php b/functions/decode/cp10006.php deleted file mode 100644 index ec5e7af7..00000000 --- a/functions/decode/cp10006.php +++ /dev/null @@ -1,177 +0,0 @@ - - * K.D. Chang - * @package squirrelmail - * @subpackage decode - */ - -/** - * Decode cp10006 (MacGreek) string - * @param string $string String to decode - * @return string $string Decoded string - */ -function charset_decode_cp10006 ($string) { - global $default_charset; - - if (strtolower($default_charset) == 'x-mac-greek') - return $string; - - /* Only do the slow convert if there are 8-bit characters */ - /* avoid using 0xA0 (\240) in ereg ranges. RH73 does not like that */ - if (! ereg("[\200-\237]", $string) and ! ereg("[\241-\377]", $string) ) - return $string; - - $cp10006 = array( - "\0x80" => 'Ä', - "\0x81" => '¹', - "\0x82" => '²', - "\0x83" => 'É', - "\0x84" => '³', - "\0x85" => 'Ö', - "\0x86" => 'Ü', - "\0x87" => '΅', - "\0x88" => 'à', - "\0x89" => 'â', - "\0x8A" => 'ä', - "\0x8B" => '΄', - "\0x8C" => '¨', - "\0x8D" => 'ç', - "\0x8E" => 'é', - "\0x8F" => 'è', - "\0x90" => 'ê', - "\0x91" => 'ë', - "\0x92" => '£', - "\0x93" => '™', - "\0x94" => 'î', - "\0x95" => 'ï', - "\0x96" => '•', - "\0x97" => '½', - "\0x98" => '‰', - "\0x99" => 'ô', - "\0x9A" => 'ö', - "\0x9B" => '¦', - "\0x9C" => '­', - "\0x9D" => 'ù', - "\0x9E" => 'û', - "\0x9F" => 'ü', - "\0xA0" => '†', - "\0xA1" => 'Γ', - "\0xA2" => 'Δ', - "\0xA3" => 'Θ', - "\0xA4" => 'Λ', - "\0xA5" => 'Ξ', - "\0xA6" => 'Π', - "\0xA7" => 'ß', - "\0xA8" => '®', - "\0xA9" => '©', - "\0xAA" => 'Σ', - "\0xAB" => 'Ϊ', - "\0xAC" => '§', - "\0xAD" => '≠', - "\0xAE" => '°', - "\0xAF" => '·', - "\0xB0" => 'Α', - "\0xB1" => '±', - "\0xB2" => '≤', - "\0xB3" => '≥', - "\0xB4" => '¥', - "\0xB5" => 'Β', - "\0xB6" => 'Ε', - "\0xB7" => 'Ζ', - "\0xB8" => 'Η', - "\0xB9" => 'Ι', - "\0xBA" => 'Κ', - "\0xBB" => 'Μ', - "\0xBC" => 'Φ', - "\0xBD" => 'Ϋ', - "\0xBE" => 'Ψ', - "\0xBF" => 'Ω', - "\0xC0" => 'ά', - "\0xC1" => 'Ν', - "\0xC2" => '¬', - "\0xC3" => 'Ο', - "\0xC4" => 'Ρ', - "\0xC5" => '≈', - "\0xC6" => 'Τ', - "\0xC7" => '«', - "\0xC8" => '»', - "\0xC9" => '…', - "\0xCA" => ' ', - "\0xCB" => 'Υ', - "\0xCC" => 'Χ', - "\0xCD" => 'Ά', - "\0xCE" => 'Έ', - "\0xCF" => 'œ', - "\0xD0" => '–', - "\0xD1" => '―', - "\0xD2" => '“', - "\0xD3" => '”', - "\0xD4" => '‘', - "\0xD5" => '’', - "\0xD6" => '÷', - "\0xD7" => 'Ή', - "\0xD8" => 'Ί', - "\0xD9" => 'Ό', - "\0xDA" => 'Ύ', - "\0xDB" => 'έ', - "\0xDC" => 'ή', - "\0xDD" => 'ί', - "\0xDE" => 'ό', - "\0xDF" => 'Ώ', - "\0xE0" => 'ύ', - "\0xE1" => 'α', - "\0xE2" => 'β', - "\0xE3" => 'ψ', - "\0xE4" => 'δ', - "\0xE5" => 'ε', - "\0xE6" => 'φ', - "\0xE7" => 'γ', - "\0xE8" => 'η', - "\0xE9" => 'ι', - "\0xEA" => 'ξ', - "\0xEB" => 'κ', - "\0xEC" => 'λ', - "\0xED" => 'μ', - "\0xEE" => 'ν', - "\0xEF" => 'ο', - "\0xF0" => 'π', - "\0xF1" => 'ώ', - "\0xF2" => 'ρ', - "\0xF3" => 'σ', - "\0xF4" => 'τ', - "\0xF5" => 'θ', - "\0xF6" => 'ω', - "\0xF7" => 'ς', - "\0xF8" => 'χ', - "\0xF9" => 'υ', - "\0xFA" => 'ζ', - "\0xFB" => 'ϊ', - "\0xFC" => 'ϋ', - "\0xFD" => 'ΐ', - "\0xFE" => 'ΰ', - "\0xFF" => '￿' - ); - - $string = str_replace(array_keys($cp10006), array_values($cp10006), $string); - - return $string; -} -?> diff --git a/functions/decode/cp10007.php b/functions/decode/cp10007.php deleted file mode 100644 index 0794efd3..00000000 --- a/functions/decode/cp10007.php +++ /dev/null @@ -1,177 +0,0 @@ - - * K.D. Chang - * @package squirrelmail - * @subpackage decode - */ - -/** - * Decode cp10007 (MacCyrillic) string - * @param string $string MacCyrillic string to decode - * @return string $string Decoded string - */ -function charset_decode_cp10007 ($string) { - global $default_charset; - - if (strtolower($default_charset) == 'x-mac-cyrillic') - return $string; - - /* Only do the slow convert if there are 8-bit characters */ - /* avoid using 0xA0 (\240) in ereg ranges. RH73 does not like that */ - if (! ereg("[\200-\237]", $string) and ! ereg("[\241-\377]", $string) ) - return $string; - - $cp10007 = array( - "\x80" => 'А', - "\x81" => 'Б', - "\x82" => 'В', - "\x83" => 'Г', - "\x84" => 'Д', - "\x85" => 'Е', - "\x86" => 'Ж', - "\x87" => 'З', - "\x88" => 'И', - "\x89" => 'Й', - "\x8A" => 'К', - "\x8B" => 'Л', - "\x8C" => 'М', - "\x8D" => 'Н', - "\x8E" => 'О', - "\x8F" => 'П', - "\x90" => 'Р', - "\x91" => 'С', - "\x92" => 'Т', - "\x93" => 'У', - "\x94" => 'Ф', - "\x95" => 'Х', - "\x96" => 'Ц', - "\x97" => 'Ч', - "\x98" => 'Ш', - "\x99" => 'Щ', - "\x9A" => 'Ъ', - "\x9B" => 'Ы', - "\x9C" => 'Ь', - "\x9D" => 'Э', - "\x9E" => 'Ю', - "\x9F" => 'Я', - "\xA0" => '†', - "\xA1" => '°', - "\xA2" => '¢', - "\xA3" => '£', - "\xA4" => '§', - "\xA5" => '•', - "\xA6" => '¶', - "\xA7" => 'І', - "\xA8" => '®', - "\xA9" => '©', - "\xAA" => '™', - "\xAB" => 'Ђ', - "\xAC" => 'ђ', - "\xAD" => '≠', - "\xAE" => 'Ѓ', - "\xAF" => 'ѓ', - "\xB0" => '∞', - "\xB1" => '±', - "\xB2" => '≤', - "\xB3" => '≥', - "\xB4" => 'і', - "\xB5" => 'µ', - "\xB6" => '∂', - "\xB7" => 'Ј', - "\xB8" => 'Є', - "\xB9" => 'є', - "\xBA" => 'Ї', - "\xBB" => 'ї', - "\xBC" => 'Љ', - "\xBD" => 'љ', - "\xBE" => 'Њ', - "\xBF" => 'њ', - "\xC0" => 'ј', - "\xC1" => 'Ѕ', - "\xC2" => '¬', - "\xC3" => '√', - "\xC4" => 'ƒ', - "\xC5" => '≈', - "\xC6" => '∆', - "\xC7" => '«', - "\xC8" => '»', - "\xC9" => '…', - "\xCA" => ' ', - "\xCB" => 'Ћ', - "\xCC" => 'ћ', - "\xCD" => 'Ќ', - "\xCE" => 'ќ', - "\xCF" => 'ѕ', - "\xD0" => '–', - "\xD1" => '—', - "\xD2" => '“', - "\xD3" => '”', - "\xD4" => '‘', - "\xD5" => '’', - "\xD6" => '÷', - "\xD7" => '„', - "\xD8" => 'Ў', - "\xD9" => 'ў', - "\xDA" => 'Џ', - "\xDB" => 'џ', - "\xDC" => '№', - "\xDD" => 'Ё', - "\xDE" => 'ё', - "\xDF" => 'я', - "\xE0" => 'а', - "\xE1" => 'б', - "\xE2" => 'в', - "\xE3" => 'г', - "\xE4" => 'д', - "\xE5" => 'е', - "\xE6" => 'ж', - "\xE7" => 'з', - "\xE8" => 'и', - "\xE9" => 'й', - "\xEA" => 'к', - "\xEB" => 'л', - "\xEC" => 'м', - "\xED" => 'н', - "\xEE" => 'о', - "\xEF" => 'п', - "\xF0" => 'р', - "\xF1" => 'с', - "\xF2" => 'т', - "\xF3" => 'у', - "\xF4" => 'ф', - "\xF5" => 'х', - "\xF6" => 'ц', - "\xF7" => 'ч', - "\xF8" => 'ш', - "\xF9" => 'щ', - "\xFA" => 'ъ', - "\xFB" => 'ы', - "\xFC" => 'ь', - "\xFD" => 'э', - "\xFE" => 'ю', - "\xFF" => '¤' - ); - - $string = str_replace(array_keys($cp10007), array_values($cp10007), $string); - - return $string; -} -?> diff --git a/functions/decode/cp10017.php b/functions/decode/cp10017.php deleted file mode 100644 index 57d6e55a..00000000 --- a/functions/decode/cp10017.php +++ /dev/null @@ -1,176 +0,0 @@ - 'А', - "\x81" => 'Б', - "\x82" => 'В', - "\x83" => 'Г', - "\x84" => 'Д', - "\x85" => 'Е', - "\x86" => 'Ж', - "\x87" => 'З', - "\x88" => 'И', - "\x89" => 'Й', - "\x8A" => 'К', - "\x8B" => 'Л', - "\x8C" => 'М', - "\x8D" => 'Н', - "\x8E" => 'О', - "\x8F" => 'П', - "\x90" => 'Р', - "\x91" => 'С', - "\x92" => 'Ґ', - "\x93" => 'У', - "\x94" => 'Ф', - "\x95" => 'Х', - "\x96" => 'Ц', - "\x97" => 'Ч', - "\x98" => 'Ш', - "\x99" => 'Щ', - "\x9A" => 'Ъ', - "\x9B" => 'Ы', - "\x9C" => 'Ь', - "\x9D" => 'Э', - "\x9E" => 'Ю', - "\x9F" => 'Я', - "\xA0" => '†', - "\xA1" => '°', - "\xA2" => '¢', - "\xA3" => '£', - "\xA4" => '§', - "\xA5" => '•', - "\xA6" => '¶', - "\xA7" => 'І', - "\xA8" => '®', - "\xA9" => '©', - "\xAA" => '™', - "\xAB" => 'Ђ', - "\xAC" => 'ђ', - "\xAD" => '≠', - "\xAE" => 'Ѓ', - "\xAF" => 'ѓ', - "\xB0" => '∞', - "\xB1" => '±', - "\xB2" => '≤', - "\xB3" => '≥', - "\xB4" => 'і', - "\xB5" => 'µ', - "\xB6" => '∂', - "\xB7" => 'Ј', - "\xB8" => 'Є', - "\xB9" => 'є', - "\xBA" => 'Ї', - "\xBB" => 'ї', - "\xBC" => 'Љ', - "\xBD" => 'љ', - "\xBE" => 'Њ', - "\xBF" => 'њ', - "\xC0" => 'ј', - "\xC1" => 'Ѕ', - "\xC2" => '¬', - "\xC3" => '√', - "\xC4" => 'ƒ', - "\xC5" => '≈', - "\xC6" => '∆', - "\xC7" => '«', - "\xC8" => '»', - "\xC9" => '…', - "\xCA" => ' ', - "\xCB" => 'Ћ', - "\xCC" => 'ћ', - "\xCD" => 'Ќ', - "\xCE" => 'ќ', - "\xCF" => 'ѕ', - "\xD0" => '–', - "\xD1" => '—', - "\xD2" => '“', - "\xD3" => '”', - "\xD4" => '‘', - "\xD5" => '’', - "\xD6" => 'ґ', - "\xD7" => '„', - "\xD8" => 'Ў', - "\xD9" => 'ў', - "\xDA" => 'Џ', - "\xDB" => 'џ', - "\xDC" => '№', - "\xDD" => 'Ё', - "\xDE" => 'ё', - "\xDF" => 'я', - "\xE0" => 'а', - "\xE1" => 'б', - "\xE2" => 'в', - "\xE3" => 'г', - "\xE4" => 'д', - "\xE5" => 'е', - "\xE6" => 'ж', - "\xE7" => 'з', - "\xE8" => 'и', - "\xE9" => 'й', - "\xEA" => 'к', - "\xEB" => 'л', - "\xEC" => 'м', - "\xED" => 'н', - "\xEE" => 'о', - "\xEF" => 'п', - "\xF0" => 'р', - "\xF1" => 'с', - "\xF2" => 'т', - "\xF3" => 'у', - "\xF4" => 'ф', - "\xF5" => 'х', - "\xF6" => 'ц', - "\xF7" => 'ч', - "\xF8" => 'ш', - "\xF9" => 'щ', - "\xFA" => 'ъ', - "\xFB" => 'ы', - "\xFC" => 'ь', - "\xFD" => 'э', - "\xFE" => 'ю', - "\xFF" => '¤' - ); - - $string = str_replace(array_keys($cp10017), array_values($cp10017), $string); - - return $string; -} -?> diff --git a/functions/decode/cp10029.php b/functions/decode/cp10029.php deleted file mode 100644 index cd06b688..00000000 --- a/functions/decode/cp10029.php +++ /dev/null @@ -1,177 +0,0 @@ - - * K.D. Chang - * @package squirrelmail - * @subpackage decode - */ - -/** - * Decode cp10029 (MacLatin2) string - * @param string $string Encoded string - * @return string $string Decoded string - */ -function charset_decode_cp10029 ($string) { - global $default_charset; - - if (strtolower($default_charset) == 'x-mac-centraleurroman') - return $string; - - /* Only do the slow convert if there are 8-bit characters */ - /* avoid using 0xA0 (\240) in ereg ranges. RH73 does not like that */ - if (! ereg("[\200-\237]", $string) and ! ereg("[\241-\377]", $string) ) - return $string; - - $cp10029 = array( - "\0x80" => 'Ä', - "\0x81" => 'Ā', - "\0x82" => 'ā', - "\0x83" => 'É', - "\0x84" => 'Ą', - "\0x85" => 'Ö', - "\0x86" => 'Ü', - "\0x87" => 'á', - "\0x88" => 'ą', - "\0x89" => 'Č', - "\0x8A" => 'ä', - "\0x8B" => 'č', - "\0x8C" => 'Ć', - "\0x8D" => 'ć', - "\0x8E" => 'é', - "\0x8F" => 'Ź', - "\0x90" => 'ź', - "\0x91" => 'Ď', - "\0x92" => 'í', - "\0x93" => 'ď', - "\0x94" => 'Ē', - "\0x95" => 'ē', - "\0x96" => 'Ė', - "\0x97" => 'ó', - "\0x98" => 'ė', - "\0x99" => 'ô', - "\0x9A" => 'ö', - "\0x9B" => 'õ', - "\0x9C" => 'ú', - "\0x9D" => 'Ě', - "\0x9E" => 'ě', - "\0x9F" => 'ü', - "\0xA0" => '†', - "\0xA1" => '°', - "\0xA2" => 'Ę', - "\0xA3" => '£', - "\0xA4" => '§', - "\0xA5" => '•', - "\0xA6" => '¶', - "\0xA7" => 'ß', - "\0xA8" => '®', - "\0xA9" => '©', - "\0xAA" => '™', - "\0xAB" => 'ę', - "\0xAC" => '¨', - "\0xAD" => '≠', - "\0xAE" => 'ģ', - "\0xAF" => 'Į', - "\0xB0" => 'į', - "\0xB1" => 'Ī', - "\0xB2" => '≤', - "\0xB3" => '≥', - "\0xB4" => 'ī', - "\0xB5" => 'Ķ', - "\0xB6" => '∂', - "\0xB7" => '∑', - "\0xB8" => 'ł', - "\0xB9" => 'Ļ', - "\0xBA" => 'ļ', - "\0xBB" => 'Ľ', - "\0xBC" => 'ľ', - "\0xBD" => 'Ĺ', - "\0xBE" => 'ĺ', - "\0xBF" => 'Ņ', - "\0xC0" => 'ņ', - "\0xC1" => 'Ń', - "\0xC2" => '¬', - "\0xC3" => '√', - "\0xC4" => 'ń', - "\0xC5" => 'Ň', - "\0xC6" => '∆', - "\0xC7" => '«', - "\0xC8" => '»', - "\0xC9" => '…', - "\0xCA" => ' ', - "\0xCB" => 'ň', - "\0xCC" => 'Ő', - "\0xCD" => 'Õ', - "\0xCE" => 'ő', - "\0xCF" => 'Ō', - "\0xD0" => '–', - "\0xD1" => '—', - "\0xD2" => '“', - "\0xD3" => '”', - "\0xD4" => '‘', - "\0xD5" => '’', - "\0xD6" => '÷', - "\0xD7" => '◊', - "\0xD8" => 'ō', - "\0xD9" => 'Ŕ', - "\0xDA" => 'ŕ', - "\0xDB" => 'Ř', - "\0xDC" => '‹', - "\0xDD" => '›', - "\0xDE" => 'ř', - "\0xDF" => 'Ŗ', - "\0xE0" => 'ŗ', - "\0xE1" => 'Š', - "\0xE2" => '‚', - "\0xE3" => '„', - "\0xE4" => 'š', - "\0xE5" => 'Ś', - "\0xE6" => 'ś', - "\0xE7" => 'Á', - "\0xE8" => 'Ť', - "\0xE9" => 'ť', - "\0xEA" => 'Í', - "\0xEB" => 'Ž', - "\0xEC" => 'ž', - "\0xED" => 'Ū', - "\0xEE" => 'Ó', - "\0xEF" => 'Ô', - "\0xF0" => 'ū', - "\0xF1" => 'Ů', - "\0xF2" => 'Ú', - "\0xF3" => 'ů', - "\0xF4" => 'Ű', - "\0xF5" => 'ű', - "\0xF6" => 'Ų', - "\0xF7" => 'ų', - "\0xF8" => 'Ý', - "\0xF9" => 'ý', - "\0xFA" => 'ķ', - "\0xFB" => 'Ż', - "\0xFC" => 'Ł', - "\0xFD" => 'ż', - "\0xFE" => 'Ģ', - "\0xFF" => 'ˇ' - ); - - $string = str_replace(array_keys($cp10029), array_values($cp10029), $string); - - return $string; -} -?> diff --git a/functions/decode/cp10079.php b/functions/decode/cp10079.php deleted file mode 100644 index 5853ddb3..00000000 --- a/functions/decode/cp10079.php +++ /dev/null @@ -1,177 +0,0 @@ - - * K.D. Chang - * @package squirrelmail - * @subpackage decode - */ - -/** - * Decode a cp10079 (MacIcelandic) string - * @param string $string Encoded string - * @return string $string Decoded string - */ -function charset_decode_cp10079 ($string) { - global $default_charset; - - if (strtolower($default_charset) == 'x-mac-icelandic') - return $string; - - /* Only do the slow convert if there are 8-bit characters */ - /* avoid using 0xA0 (\240) in ereg ranges. RH73 does not like that */ - if (! ereg("[\200-\237]", $string) and ! ereg("[\241-\377]", $string) ) - return $string; - - $cp10079 = array( - "\0x80" => 'Ä', - "\0x81" => 'Å', - "\0x82" => 'Ç', - "\0x83" => 'É', - "\0x84" => 'Ñ', - "\0x85" => 'Ö', - "\0x86" => 'Ü', - "\0x87" => 'á', - "\0x88" => 'à', - "\0x89" => 'â', - "\0x8A" => 'ä', - "\0x8B" => 'ã', - "\0x8C" => 'å', - "\0x8D" => 'ç', - "\0x8E" => 'é', - "\0x8F" => 'è', - "\0x90" => 'ê', - "\0x91" => 'ë', - "\0x92" => 'í', - "\0x93" => 'ì', - "\0x94" => 'î', - "\0x95" => 'ï', - "\0x96" => 'ñ', - "\0x97" => 'ó', - "\0x98" => 'ò', - "\0x99" => 'ô', - "\0x9A" => 'ö', - "\0x9B" => 'õ', - "\0x9C" => 'ú', - "\0x9D" => 'ù', - "\0x9E" => 'û', - "\0x9F" => 'ü', - "\0xA0" => 'Ý', - "\0xA1" => '°', - "\0xA2" => '¢', - "\0xA3" => '£', - "\0xA4" => '§', - "\0xA5" => '•', - "\0xA6" => '¶', - "\0xA7" => 'ß', - "\0xA8" => '®', - "\0xA9" => '©', - "\0xAA" => '™', - "\0xAB" => '´', - "\0xAC" => '¨', - "\0xAD" => '≠', - "\0xAE" => 'Æ', - "\0xAF" => 'Ø', - "\0xB0" => '∞', - "\0xB1" => '±', - "\0xB2" => '≤', - "\0xB3" => '≥', - "\0xB4" => '¥', - "\0xB5" => 'µ', - "\0xB6" => '∂', - "\0xB7" => '∑', - "\0xB8" => '∏', - "\0xB9" => 'π', - "\0xBA" => '∫', - "\0xBB" => 'ª', - "\0xBC" => 'º', - "\0xBD" => 'Ω', - "\0xBE" => 'æ', - "\0xBF" => 'ø', - "\0xC0" => '¿', - "\0xC1" => '¡', - "\0xC2" => '¬', - "\0xC3" => '√', - "\0xC4" => 'ƒ', - "\0xC5" => '≈', - "\0xC6" => '∆', - "\0xC7" => '«', - "\0xC8" => '»', - "\0xC9" => '…', - "\0xCA" => ' ', - "\0xCB" => 'À', - "\0xCC" => 'Ã', - "\0xCD" => 'Õ', - "\0xCE" => 'Œ', - "\0xCF" => 'œ', - "\0xD0" => '–', - "\0xD1" => '—', - "\0xD2" => '“', - "\0xD3" => '”', - "\0xD4" => '‘', - "\0xD5" => '’', - "\0xD6" => '÷', - "\0xD7" => '◊', - "\0xD8" => 'ÿ', - "\0xD9" => 'Ÿ', - "\0xDA" => '⁄', - "\0xDB" => '¤', - "\0xDC" => 'Ð', - "\0xDD" => 'ð', - "\0xDE" => 'Þ', - "\0xDF" => 'þ', - "\0xE0" => 'ý', - "\0xE1" => '·', - "\0xE2" => '‚', - "\0xE3" => '„', - "\0xE4" => '‰', - "\0xE5" => 'Â', - "\0xE6" => 'Ê', - "\0xE7" => 'Á', - "\0xE8" => 'Ë', - "\0xE9" => 'È', - "\0xEA" => 'Í', - "\0xEB" => 'Î', - "\0xEC" => 'Ï', - "\0xED" => 'Ì', - "\0xEE" => 'Ó', - "\0xEF" => 'Ô', - "\0xF0" => '￿', - "\0xF1" => 'Ò', - "\0xF2" => 'Ú', - "\0xF3" => 'Û', - "\0xF4" => 'Ù', - "\0xF5" => 'ı', - "\0xF6" => 'ˆ', - "\0xF7" => '˜', - "\0xF8" => '¯', - "\0xF9" => '˘', - "\0xFA" => '˙', - "\0xFB" => '˚', - "\0xFC" => '¸', - "\0xFD" => '˝', - "\0xFE" => '˛', - "\0xFF" => 'ˇ' - ); - - $string = str_replace(array_keys($cp10079), array_values($cp10079), $string); - - return $string; -} -?> diff --git a/functions/decode/cp10081.php b/functions/decode/cp10081.php deleted file mode 100644 index ec0d3de7..00000000 --- a/functions/decode/cp10081.php +++ /dev/null @@ -1,177 +0,0 @@ - - * K.D. Chang - * @package squirrelmail - * @subpackage decode - */ - -/** - * Decode cp10081(MacTurkish) encoded string - * @param string $string Encoded string - * @return string $string Decoded string - */ -function charset_decode_cp10081 ($string) { - global $default_charset; - - if (strtolower($default_charset) == 'x-mac-turkish') - return $string; - - /* Only do the slow convert if there are 8-bit characters */ - /* avoid using 0xA0 (\240) in ereg ranges. RH73 does not like that */ - if (! ereg("[\200-\237]", $string) and ! ereg("[\241-\377]", $string) ) - return $string; - - $cp10081 = array( - "\0x80" => 'Ä', - "\0x81" => 'Å', - "\0x82" => 'Ç', - "\0x83" => 'É', - "\0x84" => 'Ñ', - "\0x85" => 'Ö', - "\0x86" => 'Ü', - "\0x87" => 'á', - "\0x88" => 'à', - "\0x89" => 'â', - "\0x8A" => 'ä', - "\0x8B" => 'ã', - "\0x8C" => 'å', - "\0x8D" => 'ç', - "\0x8E" => 'é', - "\0x8F" => 'è', - "\0x90" => 'ê', - "\0x91" => 'ë', - "\0x92" => 'í', - "\0x93" => 'ì', - "\0x94" => 'î', - "\0x95" => 'ï', - "\0x96" => 'ñ', - "\0x97" => 'ó', - "\0x98" => 'ò', - "\0x99" => 'ô', - "\0x9A" => 'ö', - "\0x9B" => 'õ', - "\0x9C" => 'ú', - "\0x9D" => 'ù', - "\0x9E" => 'û', - "\0x9F" => 'ü', - "\0xA0" => '†', - "\0xA1" => '°', - "\0xA2" => '¢', - "\0xA3" => '£', - "\0xA4" => '§', - "\0xA5" => '•', - "\0xA6" => '¶', - "\0xA7" => 'ß', - "\0xA8" => '®', - "\0xA9" => '©', - "\0xAA" => '™', - "\0xAB" => '´', - "\0xAC" => '¨', - "\0xAD" => '≠', - "\0xAE" => 'Æ', - "\0xAF" => 'Ø', - "\0xB0" => '∞', - "\0xB1" => '±', - "\0xB2" => '≤', - "\0xB3" => '≥', - "\0xB4" => '¥', - "\0xB5" => 'µ', - "\0xB6" => '∂', - "\0xB7" => '∑', - "\0xB8" => '∏', - "\0xB9" => 'π', - "\0xBA" => '∫', - "\0xBB" => 'ª', - "\0xBC" => 'º', - "\0xBD" => 'Ω', - "\0xBE" => 'æ', - "\0xBF" => 'ø', - "\0xC0" => '¿', - "\0xC1" => '¡', - "\0xC2" => '¬', - "\0xC3" => '√', - "\0xC4" => 'ƒ', - "\0xC5" => '≈', - "\0xC6" => '∆', - "\0xC7" => '«', - "\0xC8" => '»', - "\0xC9" => '…', - "\0xCA" => ' ', - "\0xCB" => 'À', - "\0xCC" => 'Ã', - "\0xCD" => 'Õ', - "\0xCE" => 'Œ', - "\0xCF" => 'œ', - "\0xD0" => '–', - "\0xD1" => '—', - "\0xD2" => '“', - "\0xD3" => '”', - "\0xD4" => '‘', - "\0xD5" => '’', - "\0xD6" => '÷', - "\0xD7" => '◊', - "\0xD8" => 'ÿ', - "\0xD9" => 'Ÿ', - "\0xDA" => 'Ğ', - "\0xDB" => 'ğ', - "\0xDC" => 'İ', - "\0xDD" => 'ı', - "\0xDE" => 'Ş', - "\0xDF" => 'ş', - "\0xE0" => '‡', - "\0xE1" => '·', - "\0xE2" => '‚', - "\0xE3" => '„', - "\0xE4" => '‰', - "\0xE5" => 'Â', - "\0xE6" => 'Ê', - "\0xE7" => 'Á', - "\0xE8" => 'Ë', - "\0xE9" => 'È', - "\0xEA" => 'Í', - "\0xEB" => 'Î', - "\0xEC" => 'Ï', - "\0xED" => 'Ì', - "\0xEE" => 'Ó', - "\0xEF" => 'Ô', - "\0xF0" => '￿', - "\0xF1" => 'Ò', - "\0xF2" => 'Ú', - "\0xF3" => 'Û', - "\0xF4" => 'Ù', - "\0xF5" => '￿', - "\0xF6" => 'ˆ', - "\0xF7" => '˜', - "\0xF8" => '¯', - "\0xF9" => '˘', - "\0xFA" => '˙', - "\0xFB" => '˚', - "\0xFC" => '¸', - "\0xFD" => '˝', - "\0xFE" => '˛', - "\0xFF" => 'ˇ' - ); - - $string = str_replace(array_keys($cp10081), array_values($cp10081), $string); - - return $string; -} -?> diff --git a/functions/decode/iso8859-1.php b/functions/decode/iso_8859_1.php similarity index 95% rename from functions/decode/iso8859-1.php rename to functions/decode/iso_8859_1.php index 5bbe7430..d1c9a399 100644 --- a/functions/decode/iso8859-1.php +++ b/functions/decode/iso_8859_1.php @@ -17,7 +17,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_1 ($string) { +function charset_decode_iso_8859_1 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-1') diff --git a/functions/decode/iso8859-10.php b/functions/decode/iso_8859_10.php similarity index 98% rename from functions/decode/iso8859-10.php rename to functions/decode/iso_8859_10.php index 655b1247..355d215d 100644 --- a/functions/decode/iso8859-10.php +++ b/functions/decode/iso_8859_10.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_10 ($string) { +function charset_decode_iso_8859_10 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-10') diff --git a/functions/decode/iso8859-11.php b/functions/decode/iso_8859_11.php similarity index 98% rename from functions/decode/iso8859-11.php rename to functions/decode/iso_8859_11.php index 7d34f72d..1bfce757 100644 --- a/functions/decode/iso8859-11.php +++ b/functions/decode/iso_8859_11.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_11 ($string) { +function charset_decode_iso_8859_11 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-11') diff --git a/functions/decode/iso8859-13.php b/functions/decode/iso_8859_13.php similarity index 98% rename from functions/decode/iso8859-13.php rename to functions/decode/iso_8859_13.php index 475a5f06..abbe9503 100644 --- a/functions/decode/iso8859-13.php +++ b/functions/decode/iso_8859_13.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_13 ($string) { +function charset_decode_iso_8859_13 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-13') diff --git a/functions/decode/iso8859-14.php b/functions/decode/iso_8859_14.php similarity index 98% rename from functions/decode/iso8859-14.php rename to functions/decode/iso_8859_14.php index 2203fc07..a76707df 100644 --- a/functions/decode/iso8859-14.php +++ b/functions/decode/iso_8859_14.php @@ -45,7 +45,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_14 ($string) { +function charset_decode_iso_8859_14 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-14') diff --git a/functions/decode/iso8859-15.php b/functions/decode/iso_8859_15.php similarity index 98% rename from functions/decode/iso8859-15.php rename to functions/decode/iso_8859_15.php index af83a572..87efd2a6 100644 --- a/functions/decode/iso8859-15.php +++ b/functions/decode/iso_8859_15.php @@ -45,7 +45,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_15 ($string) { +function charset_decode_iso_8859_15 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-15') diff --git a/functions/decode/iso8859-16.php b/functions/decode/iso_8859_16.php similarity index 98% rename from functions/decode/iso8859-16.php rename to functions/decode/iso_8859_16.php index f5e96919..8fcc20e7 100644 --- a/functions/decode/iso8859-16.php +++ b/functions/decode/iso_8859_16.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_16 ($string) { +function charset_decode_iso_8859_16 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-16') diff --git a/functions/decode/iso8859-2.php b/functions/decode/iso_8859_2.php similarity index 98% rename from functions/decode/iso8859-2.php rename to functions/decode/iso_8859_2.php index 1dd5c6ad..9ab9e411 100644 --- a/functions/decode/iso8859-2.php +++ b/functions/decode/iso_8859_2.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_2 ($string) { +function charset_decode_iso_8859_2 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-2') diff --git a/functions/decode/iso8859-3.php b/functions/decode/iso_8859_3.php similarity index 98% rename from functions/decode/iso8859-3.php rename to functions/decode/iso_8859_3.php index eb408910..f548bfd3 100644 --- a/functions/decode/iso8859-3.php +++ b/functions/decode/iso_8859_3.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_3 ($string) { +function charset_decode_iso_8859_3 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-3') diff --git a/functions/decode/iso8859-4.php b/functions/decode/iso_8859_4.php similarity index 98% rename from functions/decode/iso8859-4.php rename to functions/decode/iso_8859_4.php index e2b0247e..2dfefb2b 100644 --- a/functions/decode/iso8859-4.php +++ b/functions/decode/iso_8859_4.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_4 ($string) { +function charset_decode_iso_8859_4 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-4') diff --git a/functions/decode/iso8859-5.php b/functions/decode/iso_8859_5.php similarity index 98% rename from functions/decode/iso8859-5.php rename to functions/decode/iso_8859_5.php index 7c3ae2b3..706b29f0 100644 --- a/functions/decode/iso8859-5.php +++ b/functions/decode/iso_8859_5.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_5 ($string) { +function charset_decode_iso_8859_5 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-5') diff --git a/functions/decode/iso8859-6.php b/functions/decode/iso_8859_6.php similarity index 98% rename from functions/decode/iso8859-6.php rename to functions/decode/iso_8859_6.php index c67dbf27..f7ae8321 100644 --- a/functions/decode/iso8859-6.php +++ b/functions/decode/iso_8859_6.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_6 ($string) { +function charset_decode_iso_8859_6 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-6') diff --git a/functions/decode/iso8859-7.php b/functions/decode/iso_8859_7.php similarity index 98% rename from functions/decode/iso8859-7.php rename to functions/decode/iso_8859_7.php index e9d90fc5..9ee8ea81 100644 --- a/functions/decode/iso8859-7.php +++ b/functions/decode/iso_8859_7.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_7 ($string) { +function charset_decode_iso_8859_7 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso-8859-7') diff --git a/functions/decode/iso8859-8.php b/functions/decode/iso_8859_8.php similarity index 98% rename from functions/decode/iso8859-8.php rename to functions/decode/iso_8859_8.php index 439d4b00..3fa4d6da 100644 --- a/functions/decode/iso8859-8.php +++ b/functions/decode/iso_8859_8.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string $string Decoded string */ -function charset_decode_iso8859_8 ($string) { +function charset_decode_iso_8859_8 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso8859-8') diff --git a/functions/decode/iso8859-9.php b/functions/decode/iso_8859_9.php similarity index 98% rename from functions/decode/iso8859-9.php rename to functions/decode/iso_8859_9.php index 41b41b35..7e54b9a6 100644 --- a/functions/decode/iso8859-9.php +++ b/functions/decode/iso_8859_9.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string Decoded string */ -function charset_decode_iso8859_9 ($string) { +function charset_decode_iso_8859_9 ($string) { global $default_charset; if (strtolower($default_charset) == 'iso8859-9') diff --git a/functions/decode/iso-ir-111.php b/functions/decode/iso_ir_111.php similarity index 100% rename from functions/decode/iso-ir-111.php rename to functions/decode/iso_ir_111.php diff --git a/functions/decode/koi8-r.php b/functions/decode/koi8_r.php similarity index 99% rename from functions/decode/koi8-r.php rename to functions/decode/koi8_r.php index 84628d81..08426394 100644 --- a/functions/decode/koi8-r.php +++ b/functions/decode/koi8_r.php @@ -44,7 +44,7 @@ * @param string $string Encoded string * @return string Decoded string */ -function charset_decode_koi8r ($string) { +function charset_decode_koi8_r ($string) { global $default_charset; if (strtolower($default_charset) == 'koi8-r') diff --git a/functions/decode/koi8-u.php b/functions/decode/koi8_u.php similarity index 99% rename from functions/decode/koi8-u.php rename to functions/decode/koi8_u.php index f01ce9e5..9a7f058b 100644 --- a/functions/decode/koi8-u.php +++ b/functions/decode/koi8_u.php @@ -48,7 +48,7 @@ * @param string $string Encoded string * @return string Decoded string */ -function charset_decode_koi8u ($string) { +function charset_decode_koi8_u ($string) { global $default_charset; if (strtolower($default_charset) == 'koi8-u') diff --git a/functions/decode/tis620.php b/functions/decode/tis_620.php similarity index 98% rename from functions/decode/tis620.php rename to functions/decode/tis_620.php index 53183175..c817e9ff 100644 --- a/functions/decode/tis620.php +++ b/functions/decode/tis_620.php @@ -43,7 +43,7 @@ * @param string $string Encoded string * @return string Decoded string */ -function charset_decode_tis620 ($string) { +function charset_decode_tis_620 ($string) { global $default_charset; if (strtolower($default_charset) == 'tis-620') diff --git a/functions/decode/utf-8.php b/functions/decode/utf_8.php similarity index 97% rename from functions/decode/utf-8.php rename to functions/decode/utf_8.php index 72f2a160..df87dcac 100644 --- a/functions/decode/utf-8.php +++ b/functions/decode/utf_8.php @@ -26,7 +26,7 @@ * @param string $string Encoded string * @return string Decoded string */ -function charset_decode_utf8 ($string) { +function charset_decode_utf_8 ($string) { global $default_charset; if (strtolower($default_charset) == 'utf-8') -- 2.25.1