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

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

diff --git a/functions/decode/iso_ir_111.php b/functions/decode/iso_ir_111.php
index 0d1473dff19f55021818d45248d3f5289321114c..d610e86ac22448f562e166d2979d3066280024e5 100644 (file)
--- a/functions/decode/iso_ir_111.php
+++ b/functions/decode/iso_ir_111.php
@@ -55,113 +55,111 @@ function charset_decode_iso_ir_111 ($string) {
     if (strtolower($default_charset) == 'iso-ir-111')
         return $string;
 
-    /* Only do the slow convert if there are 8-bit characters */
-    /* there is no 0x80-0x9F letters in ISO-IR-111 */
-    if ( ! ereg("[\241-\377]", $string) )
+    // don't do decoding when there are no 8bit symbols
+    if (! sq_is8bit($string,'iso-ir-111'))
         return $string;
 
     $iso_ir_111 = array(
-       "\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" => 'Ъ'
+        "\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($iso_ir_111), array_values($iso_ir_111), $string);
 
     return $string;
 }
-
-?>
+?>
\ No newline at end of file