using sq_is8bit function instead of ereg. Code reuse and fixes some problems

[squirrelmail.git] / functions / decode / koi8_u.php

diff --git a/functions/decode/koi8_u.php b/functions/decode/koi8_u.php
index 061812037660b4f1de630fc80a9c640c02b679a1..06c11b0cba468735b85114c54a6a663a34f279f7 100644 (file)
--- a/functions/decode/koi8_u.php
+++ b/functions/decode/koi8_u.php
@@ -54,145 +54,143 @@ function charset_decode_koi8_u ($string) {
     if (strtolower($default_charset) == 'koi8-u')
         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) )
+    // don't do decoding when there are no 8bit symbols
+    if (! sq_is8bit($string,'koi8-u'))
         return $string;
 
     $koi8u = 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" => 'Ъ'
+        "\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($koi8u), array_values($koi8u), $string);
 
     return $string;
 }
-
-?>
+?>
\ No newline at end of file