Minor modifications.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@322 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/i18n.php b/functions/i18n.php
index a7640d42ae83ba25d628e8c7a0f80c907ddee640..3105c53a88328d571119730d7f63422e1b3be83b 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -52,8 +52,7 @@
       // character set is iso-8859-1
 
       // Latin small letter o with stroke
-      while (ereg("\370", $string))
-         $string = ereg_replace ("\370", "ø", $string);
+      $string = str_replace ("\370", "ø", $string);
 
       return ($string);
    }
@@ -67,13 +66,13 @@
 
       // Horizontal bar (parentheki pavla)
       while (ereg("\257", $string))
-         $string = ereg_replace ("\257", "―", $string);
+         $string = str_replace ("\257", "―", $string);
 
       // ISO-8859-7 characters from 11/04 (0xB4) to 11/06 (0xB6)
       // These are Unicode 900-902
       while (ereg("([\264-\266])", $string, $res)) {
          $replace = "&#" . (ord($res[1])+720) . ";";
-         $string = ereg_replace($res[1], $replace, $string);
+         $string = str_replace($res[1], $replace, $string);
       }
 
       // 11/07 (0xB7) Middle dot is the same in iso-8859-1
@@ -82,7 +81,7 @@
       // These are Unicode 900-902
       while (ereg("([\270-\272])", $string, $res)) {
          $replace = "&#" . (ord($res[1])+720) . ";";
-         $string = ereg_replace($res[1], $replace, $string);
+         $string = str_replace($res[1], $replace, $string);
       }
 
       // 11/11 (0xBB) Right angle quotation mark is the same as in
@@ -91,7 +90,7 @@
       // And now the rest of the charset
       while (ereg("([\273-\376])", $string, $res)) {
          $replace = "&#" . (ord($res[1])+720) . ";";
-         $string = ereg_replace($res[1], $replace, $string);
+         $string = str_replace($res[1], $replace, $string);
       }
 
       return $string;
@@ -101,36 +100,30 @@
    // but has the Euro symbol and some characters needed for French.
    function charset_decode_iso_8859_15 ($string) {
       // Euro sign
-      while (ereg("\244", $replace))
-         $string = ereg_replace ("\244", "€", $string);
+      $string = str_replace ("\244", "€", $string);
       // Latin capital letter S with caron
-      while (ereg("\246", $string))
-         $string = ereg_replace ("\244", "Š", $string);
+      $string = str_replace ("\244", "Š", $string);
       // Latin small letter s with caron
-      while (ereg("\250", $string))
-         $string = ereg_replace ("\250", "š", $string);
+      $string = str_replace ("\250", "š", $string);
       // Latin capital letter Z with caron
-      while (ereg("\264", $string))
-         $string = ereg_replace ("\264", "Ž", $string);
+      $string = str_replace ("\264", "Ž", $string);
       // Latin small letter z with caron
-      while (ereg("\270", $string))
-         $string = ereg_replace ("\270", "ž", $string);
+      $string = str_replace ("\270", "ž", $string);
       // Latin capital ligature OE
-      while (ereg("\274", $string))
-         $string = ereg_replace ("\274", "Œ", $string);
+      $string = str_replace ("\274", "Œ", $string);
       // Latin small ligature oe
-      while (ereg("\275", $string))
-         $string = ereg_replace ("\275", "œ", $string);
+      $string = str_replace ("\275", "œ", $string);
       // Latin capital letter Y with diaeresis
-      while (ereg("\276", $string))
-         $string = ereg_replace ("\276", "Ÿ", $string);
+      $string = str_replace ("\276", "Ÿ", $string);
 
       return ($string);
    }
 
    // ISO-8859-15 is Cyrillic
    function charset_decode_iso_8859_5 ($string) {
-      // Not yet implemented.
+      // Convert to KOI8-R, then return this decoded.
+      $string = convert_cyr_string($string, "i", "k");
+      return charset_decode_koi8r($string);
    }
 
    // Remove all 8 bit characters from all other ISO-8859 character sets
@@ -175,134 +168,134 @@
       } else { 
          // Convert to Unicode HTML entities.
          // This code is rather ineffective.
-         $string = ereg_replace("\200", "─", $string);
-         $string = ereg_replace("\201", "│", $string);
-         $string = ereg_replace("\202", "┌", $string);
-         $string = ereg_replace("\203", "┐", $string);
-         $string = ereg_replace("\204", "└", $string);
-         $string = ereg_replace("\205", "┘", $string);
-         $string = ereg_replace("\206", "├", $string);
-         $string = ereg_replace("\207", "┤", $string);
-         $string = ereg_replace("\210", "┬", $string);
-         $string = ereg_replace("\211", "┴", $string);
-         $string = ereg_replace("\212", "┼", $string);
-         $string = ereg_replace("\213", "▀", $string);
-         $string = ereg_replace("\214", "▄", $string);
-         $string = ereg_replace("\215", "█", $string);
-         $string = ereg_replace("\216", "▌", $string);
-         $string = ereg_replace("\217", "▐", $string);
-         $string = ereg_replace("\220", "░", $string);
-         $string = ereg_replace("\221", "▒", $string);
-         $string = ereg_replace("\222", "▓", $string);
-         $string = ereg_replace("\223", "⌠", $string);
-         $string = ereg_replace("\224", "■", $string);
-         $string = ereg_replace("\225", "∙", $string);
-         $string = ereg_replace("\226", "√", $string);
-         $string = ereg_replace("\227", "≈", $string);
-         $string = ereg_replace("\230", "≤", $string);
-         $string = ereg_replace("\231", "≥", $string);
-         $string = ereg_replace("\232", " ", $string);
-         $string = ereg_replace("\233", "⌡", $string);
-         $string = ereg_replace("\234", "°", $string);
-         $string = ereg_replace("\235", "²", $string);
-         $string = ereg_replace("\236", "·", $string);
-         $string = ereg_replace("\237", "÷", $string);
-         $string = ereg_replace("\240", "═", $string);
-         $string = ereg_replace("\241", "║", $string);
-         $string = ereg_replace("\242", "╒", $string);
-         $string = ereg_replace("\243", "ё", $string);
-         $string = ereg_replace("\244", "╓", $string);
-         $string = ereg_replace("\245", "╔", $string);
-         $string = ereg_replace("\246", "╕", $string);
-         $string = ereg_replace("\247", "╖", $string);
-         $string = ereg_replace("\250", "╗", $string);
-         $string = ereg_replace("\251", "╘", $string);
-         $string = ereg_replace("\252", "╙", $string);
-         $string = ereg_replace("\253", "╚", $string);
-         $string = ereg_replace("\254", "╛", $string);
-         $string = ereg_replace("\255", "╜", $string);
-         $string = ereg_replace("\256", "╝", $string);
-         $string = ereg_replace("\257", "╞", $string);
-         $string = ereg_replace("\260", "╟", $string);
-         $string = ereg_replace("\261", "╠", $string);
-         $string = ereg_replace("\262", "╡", $string);
-         $string = ereg_replace("\263", "Ё", $string);
-         $string = ereg_replace("\264", "╢", $string);
-         $string = ereg_replace("\265", "╣", $string);
-         $string = ereg_replace("\266", "╤", $string);
-         $string = ereg_replace("\267", "╥", $string);
-         $string = ereg_replace("\270", "╦", $string);
-         $string = ereg_replace("\271", "╧", $string);
-         $string = ereg_replace("\272", "╨", $string);
-         $string = ereg_replace("\273", "╩", $string);
-         $string = ereg_replace("\274", "╪", $string);
-         $string = ereg_replace("\275", "╫", $string);
-         $string = ereg_replace("\276", "╬", $string);
-         $string = ereg_replace("\277", "©", $string);
-         $string = ereg_replace("\300", "ю", $string);
-         $string = ereg_replace("\301", "а", $string);
-         $string = ereg_replace("\302", "б", $string);
-         $string = ereg_replace("\303", "ц", $string);
-         $string = ereg_replace("\304", "д", $string);
-         $string = ereg_replace("\305", "е", $string);
-         $string = ereg_replace("\306", "ф", $string);
-         $string = ereg_replace("\307", "г", $string);
-         $string = ereg_replace("\310", "х", $string);
-         $string = ereg_replace("\311", "и", $string);
-         $string = ereg_replace("\312", "й", $string);
-         $string = ereg_replace("\313", "к", $string);
-         $string = ereg_replace("\314", "л", $string);
-         $string = ereg_replace("\315", "м", $string);
-         $string = ereg_replace("\316", "н", $string);
-         $string = ereg_replace("\317", "о", $string);
-         $string = ereg_replace("\320", "п", $string);
-         $string = ereg_replace("\321", "я", $string);
-         $string = ereg_replace("\322", "р", $string);
-         $string = ereg_replace("\323", "с", $string);
-         $string = ereg_replace("\324", "т", $string);
-         $string = ereg_replace("\325", "у", $string);
-         $string = ereg_replace("\326", "ж", $string);
-         $string = ereg_replace("\327", "в", $string);
-         $string = ereg_replace("\330", "ь", $string);
-         $string = ereg_replace("\331", "ы", $string);
-         $string = ereg_replace("\332", "з", $string);
-         $string = ereg_replace("\333", "ш", $string);
-         $string = ereg_replace("\334", "э", $string);
-         $string = ereg_replace("\335", "щ", $string);
-         $string = ereg_replace("\336", "ч", $string);
-         $string = ereg_replace("\337", "ъ", $string);
-         $string = ereg_replace("\340", "Ю", $string);
-         $string = ereg_replace("\341", "А", $string);
-         $string = ereg_replace("\342", "Б", $string);
-         $string = ereg_replace("\343", "Ц", $string);
-         $string = ereg_replace("\344", "Д", $string);
-         $string = ereg_replace("\345", "Е", $string);
-         $string = ereg_replace("\346", "Ф", $string);
-         $string = ereg_replace("\347", "Г", $string);
-         $string = ereg_replace("\350", "Х", $string);
-         $string = ereg_replace("\351", "И", $string);
-         $string = ereg_replace("\352", "Й", $string);
-         $string = ereg_replace("\353", "К", $string);
-         $string = ereg_replace("\354", "Л", $string);
-         $string = ereg_replace("\355", "М", $string);
-         $string = ereg_replace("\356", "Н", $string);
-         $string = ereg_replace("\357", "О", $string);
-         $string = ereg_replace("\360", "П", $string);
-         $string = ereg_replace("\361", "Я", $string);
-         $string = ereg_replace("\362", "Р", $string);
-         $string = ereg_replace("\363", "С", $string);
-         $string = ereg_replace("\364", "Т", $string);
-         $string = ereg_replace("\365", "У", $string);
-         $string = ereg_replace("\366", "Ж", $string);
-         $string = ereg_replace("\367", "В", $string);
-         $string = ereg_replace("\370", "Ь", $string);
-         $string = ereg_replace("\371", "Ы", $string);
-         $string = ereg_replace("\372", "З", $string);
-         $string = ereg_replace("\373", "Ш", $string);
-         $string = ereg_replace("\374", "Э", $string);
-         $string = ereg_replace("\375", "Щ", $string);
-         $string = ereg_replace("\376", "Ч", $string);
-         $string = ereg_replace("\377", "Ъ", $string);
+         $string = str_replace("\200", "─", $string);
+         $string = str_replace("\201", "│", $string);
+         $string = str_replace("\202", "┌", $string);
+         $string = str_replace("\203", "┐", $string);
+         $string = str_replace("\204", "└", $string);
+         $string = str_replace("\205", "┘", $string);
+         $string = str_replace("\206", "├", $string);
+         $string = str_replace("\207", "┤", $string);
+         $string = str_replace("\210", "┬", $string);
+         $string = str_replace("\211", "┴", $string);
+         $string = str_replace("\212", "┼", $string);
+         $string = str_replace("\213", "▀", $string);
+         $string = str_replace("\214", "▄", $string);
+         $string = str_replace("\215", "█", $string);
+         $string = str_replace("\216", "▌", $string);
+         $string = str_replace("\217", "▐", $string);
+         $string = str_replace("\220", "░", $string);
+         $string = str_replace("\221", "▒", $string);
+         $string = str_replace("\222", "▓", $string);
+         $string = str_replace("\223", "⌠", $string);
+         $string = str_replace("\224", "■", $string);
+         $string = str_replace("\225", "∙", $string);
+         $string = str_replace("\226", "√", $string);
+         $string = str_replace("\227", "≈", $string);
+         $string = str_replace("\230", "≤", $string);
+         $string = str_replace("\231", "≥", $string);
+         $string = str_replace("\232", " ", $string);
+         $string = str_replace("\233", "⌡", $string);
+         $string = str_replace("\234", "°", $string);
+         $string = str_replace("\235", "²", $string);
+         $string = str_replace("\236", "·", $string);
+         $string = str_replace("\237", "÷", $string);
+         $string = str_replace("\240", "═", $string);
+         $string = str_replace("\241", "║", $string);
+         $string = str_replace("\242", "╒", $string);
+         $string = str_replace("\243", "ё", $string);
+         $string = str_replace("\244", "╓", $string);
+         $string = str_replace("\245", "╔", $string);
+         $string = str_replace("\246", "╕", $string);
+         $string = str_replace("\247", "╖", $string);
+         $string = str_replace("\250", "╗", $string);
+         $string = str_replace("\251", "╘", $string);
+         $string = str_replace("\252", "╙", $string);
+         $string = str_replace("\253", "╚", $string);
+         $string = str_replace("\254", "╛", $string);
+         $string = str_replace("\255", "╜", $string);
+         $string = str_replace("\256", "╝", $string);
+         $string = str_replace("\257", "╞", $string);
+         $string = str_replace("\260", "╟", $string);
+         $string = str_replace("\261", "╠", $string);
+         $string = str_replace("\262", "╡", $string);
+         $string = str_replace("\263", "Ё", $string);
+         $string = str_replace("\264", "╢", $string);
+         $string = str_replace("\265", "╣", $string);
+         $string = str_replace("\266", "╤", $string);
+         $string = str_replace("\267", "╥", $string);
+         $string = str_replace("\270", "╦", $string);
+         $string = str_replace("\271", "╧", $string);
+         $string = str_replace("\272", "╨", $string);
+         $string = str_replace("\273", "╩", $string);
+         $string = str_replace("\274", "╪", $string);
+         $string = str_replace("\275", "╫", $string);
+         $string = str_replace("\276", "╬", $string);
+         $string = str_replace("\277", "©", $string);
+         $string = str_replace("\300", "ю", $string);
+         $string = str_replace("\301", "а", $string);
+         $string = str_replace("\302", "б", $string);
+         $string = str_replace("\303", "ц", $string);
+         $string = str_replace("\304", "д", $string);
+         $string = str_replace("\305", "е", $string);
+         $string = str_replace("\306", "ф", $string);
+         $string = str_replace("\307", "г", $string);
+         $string = str_replace("\310", "х", $string);
+         $string = str_replace("\311", "и", $string);
+         $string = str_replace("\312", "й", $string);
+         $string = str_replace("\313", "к", $string);
+         $string = str_replace("\314", "л", $string);
+         $string = str_replace("\315", "м", $string);
+         $string = str_replace("\316", "н", $string);
+         $string = str_replace("\317", "о", $string);
+         $string = str_replace("\320", "п", $string);
+         $string = str_replace("\321", "я", $string);
+         $string = str_replace("\322", "р", $string);
+         $string = str_replace("\323", "с", $string);
+         $string = str_replace("\324", "т", $string);
+         $string = str_replace("\325", "у", $string);
+         $string = str_replace("\326", "ж", $string);
+         $string = str_replace("\327", "в", $string);
+         $string = str_replace("\330", "ь", $string);
+         $string = str_replace("\331", "ы", $string);
+         $string = str_replace("\332", "з", $string);
+         $string = str_replace("\333", "ш", $string);
+         $string = str_replace("\334", "э", $string);
+         $string = str_replace("\335", "щ", $string);
+         $string = str_replace("\336", "ч", $string);
+         $string = str_replace("\337", "ъ", $string);
+         $string = str_replace("\340", "Ю", $string);
+         $string = str_replace("\341", "А", $string);
+         $string = str_replace("\342", "Б", $string);
+         $string = str_replace("\343", "Ц", $string);
+         $string = str_replace("\344", "Д", $string);
+         $string = str_replace("\345", "Е", $string);
+         $string = str_replace("\346", "Ф", $string);
+         $string = str_replace("\347", "Г", $string);
+         $string = str_replace("\350", "Х", $string);
+         $string = str_replace("\351", "И", $string);
+         $string = str_replace("\352", "Й", $string);
+         $string = str_replace("\353", "К", $string);
+         $string = str_replace("\354", "Л", $string);
+         $string = str_replace("\355", "М", $string);
+         $string = str_replace("\356", "Н", $string);
+         $string = str_replace("\357", "О", $string);
+         $string = str_replace("\360", "П", $string);
+         $string = str_replace("\361", "Я", $string);
+         $string = str_replace("\362", "Р", $string);
+         $string = str_replace("\363", "С", $string);
+         $string = str_replace("\364", "Т", $string);
+         $string = str_replace("\365", "У", $string);
+         $string = str_replace("\366", "Ж", $string);
+         $string = str_replace("\367", "В", $string);
+         $string = str_replace("\370", "Ь", $string);
+         $string = str_replace("\371", "Ы", $string);
+         $string = str_replace("\372", "З", $string);
+         $string = str_replace("\373", "Ш", $string);
+         $string = str_replace("\374", "Э", $string);
+         $string = str_replace("\375", "Щ", $string);
+         $string = str_replace("\376", "Ч", $string);
+         $string = str_replace("\377", "Ъ", $string);
 
          return $string;
       }