X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fi18n.php;h=289e7ee1e45ba359d324aa8a1cfad7ba61d1cc8a;hp=2b7d5f40659b980fa8a275a21274aa6aeca98563;hb=f7e8861e131604364fc3c5b8a46d4ff66a2b64fb;hpb=e9d611cb380996446831517408052bfbefe670cb

diff --git a/functions/i18n.php b/functions/i18n.php
index 2b7d5f40..289e7ee1 100644
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -9,40 +9,87 @@
  ** Internally the output character set is used. Other characters are
  ** encoded using Unicode entities according to HTML 4.0.
  **
+ ** $Id$
  **/
 
-   $i18n_php = true;
+   if (defined ('i18n_php'))
+      return; 
+   define ('i18n_php', true);
+
+   global $squirrelmail_language, $languages;
+   if (! isset($squirrelmail_language)) { $squirrelmail_language = ''; }
 
    // This array specifies the available languages.
-   $languages["en"]["NAME"]    = "English";
-   $languages["no"]["NAME"]    = "Norwegian (Bokmål)";
-   $languages["no"]["CHARSET"] = "iso-8859-1";
-   $languages["no_NO_ny"]["NAME"] = "Norwegian (Nynorsk)";
-   $languages["no_NO_ny"]["CHARSET"] = "iso-8859-1";
-   $languages["de"]["NAME"]    = "Deutsch";
-   $languages["de"]["CHARSET"] = "iso-8859-1";
-   $languages["ru"]["NAME"]    = "Russian KOI8-R";
-   $languages["ru"]["CHARSET"] = "koi8-r";
-   $languages["pl"]["NAME"]    = "Polish";
-   $languages["pl"]["CHARSET"] = "iso-8859-2";
-   $languages["sv"]["NAME"]    = "Swedish";
-   $languages["sv"]["CHARSET"] = "iso-8859-1";
-   $languages["nl"]["NAME"]    = "Dutch";
-   $languages["nl"]["CHARSET"] = "iso-8859-1";
-   $languages["pt_BR"]["NAME"] = "Portuguese (Brazil)";
-   $languages["pt_BR"]["CHARSET"] = "iso-8859-1";
-   $languages["fr"]["NAME"]    = "French";
-   $languages["fr"]["CHARSET"] = "iso-8859-1";
-   $languages["it"]["NAME"]    = "Italian";
-   $languages["it"]["CHARSET"] = "iso-8859-1";
-   $languages["cs"]["NAME"]    = "Czech";
-   $languages["cs"]["CHARSET"] = "iso-8859-2";
-   $languages["es"]["NAME"]    = "Spanish";
-   $languages["es"]["CHARSET"] = "iso-8859-1";
-   $languages["ko"]["NAME"]    = "Korean";
-   $languages["ko"]["CHARSET"] = "euc-KR";
-   $languages["ca"]["NAME"]    = "Catalan";
-   $languages["ca"]["CHARSET"] = "iso-8859-1";
+   $languages['en']['NAME']    = 'English';
+   $languages['en']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['ca']['NAME']    = 'Catalan';
+   $languages['ca']['CHARSET'] = 'iso-8859-1';
+
+   $languages['hr']['NAME']    = 'Croatian';
+   $languages['hr']['CHARSET'] = 'iso-8859-2';
+
+   $languages['cs_CZ']['NAME']    = 'Czech';
+   $languages['cs_CZ']['CHARSET'] = 'iso-8859-2';
+   
+   $languages['da']['NAME']    = 'Danish';
+   $languages['da']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['de']['NAME']    = 'Deutsch';
+   $languages['de']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['id']['NAME']    = 'Indonesian';
+   $languages['id']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['nl']['NAME']    = 'Dutch';
+   $languages['nl']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['fr']['NAME']    = 'French';
+   $languages['fr']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['fi']['NAME']    = 'Finnish';
+   $languages['fi']['CHARSET'] = 'iso-8859-1';
+
+   $languages['hu']['NAME']    = 'Hungarian';
+   $languages['hu']['CHARSET'] = 'iso-8859-1';
+
+   $languages['is']['NAME']    = 'Icelandic';
+   $languages['is']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['it']['NAME']    = 'Italian';
+   $languages['it']['CHARSET'] = 'iso-8859-1';
+  
+   $languages['ko']['NAME']    = 'Korean';
+   $languages['ko']['CHARSET'] = 'euc-KR';
+   
+   $languages['no']['NAME']    = 'Norwegian (Bokmål)';
+   $languages['no']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['no_NO_ny']['NAME']    = 'Norwegian (Nynorsk)';
+   $languages['no_NO_ny']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['pl']['NAME']    = 'Polish';
+   $languages['pl']['CHARSET'] = 'iso-8859-2';
+   
+   $languages['pt_BR']['NAME']    = 'Portuguese (Brazil)';
+   $languages['pt_BR']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['ru']['NAME']    = 'Russian KOI8-R';
+   $languages['ru']['CHARSET'] = 'koi8-r';
+   
+   $languages['sr']['NAME']    = 'Serbian';
+   $languages['sr']['CHARSET'] = 'iso-8859-2';
+   
+   $languages['es']['NAME']    = 'Spanish';
+   $languages['es']['CHARSET'] = 'iso-8859-1';
+   $languages['es_ES']['ALIAS'] = 'es';
+
+   $languages['sv']['NAME']    = 'Swedish';
+   $languages['sv']['CHARSET'] = 'iso-8859-1';
+   
+   $languages['tw']['NAME']    = 'Taiwan';
+   $languages['tw']['CHARSET'] = 'big5';
+   
 
    // Decodes a string to the internal encoding from the given charset
    function charset_decode ($charset, $string) {
@@ -53,25 +100,25 @@
 
       $charset = strtolower($charset);
 
-      if ($debug_mime) $string = $charset.":".$string;
+      if ($debug_mime) $string = $charset . ':' . $string;
 
-      if (ereg("iso-8859-(.*)", $charset, $res)) {
-         if ($res[1] == "1")
+      if (ereg('iso-8859-([[:digit:]]+)', $charset, $res)) {
+         if ($res[1] == '1')
             return charset_decode_iso_8859_1 ($string);
-         else if ($res[1] == "2")
+         else if ($res[1] == '2')
             return charset_decode_iso_8859_2 ($string);
-         else if ($res[1] == "7")
+         else if ($res[1] == '7')
             return charset_decode_iso_8859_7 ($string);
-         else if ($res[1] == "15")
+         else if ($res[1] == '15')
             return charset_decode_iso_8859_15 ($string);
          else
             return charset_decode_iso_8859_default ($string);
-      } else if ($charset == "ns_4551-1") {
+      } else if ($charset == 'ns_4551-1') {
          return charset_decode_ns_4551_1 ($string);
-      } else if ($charset == "koi8-r") {
+      } else if ($charset == 'koi8-r') {
         return charset_decode_koi8r ($string);
       } else
-         return "$string";
+         return $string;
    }
 
    // iso-8859-1 is the same as Latin 1 and is normally used
@@ -79,138 +126,138 @@
    function charset_decode_iso_8859_1 ($string) {
       global $default_charset;
 
-      if (strtolower($default_charset) == "iso-8859-1") {
+      if (strtolower($default_charset) == 'iso-8859-1') {
          return $string;
       } else { 
          // Only do the slow convert if there are 8-bit characters
          if (ereg("[\200-\377]", $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);
+            $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);
          }
       }
 
@@ -221,205 +268,206 @@
    function charset_decode_iso_8859_2 ($string) {
       global $default_charset;
 
-      if (strtolower($default_charset) == "iso-8859-2") {
+      if (strtolower($default_charset) == 'iso-8859-2')
          return $string;
-      } else {
-         // Only do the slow convert if there are 8-bit characters
-         if (ereg("[\200-\377]", $string)) {
-            // NO-BREAK SPACE
-            $string = str_replace("\240", "&#160", $string);
-            // LATIN CAPITAL LETTER A WITH OGONEK
-            $string = str_replace("\241", "&#260", $string);
-            // BREVE
-            $string = str_replace("\242", "&#728", $string);
-            // LATIN CAPITAL LETTER L WITH STROKE
-            $string = str_replace("\243", "&#321", $string);
-            // CURRENCY SIGN
-            $string = str_replace("\244", "&#164", $string);
-            // LATIN CAPITAL LETTER L WITH CARON
-            $string = str_replace("\245", "&#317", $string);
-            // LATIN CAPITAL LETTER S WITH ACUTE
-            $string = str_replace("\246", "&#346", $string);
-            // SECTION SIGN
-            $string = str_replace("\247", "&#167", $string);
-            // DIAERESIS
-            $string = str_replace("\250", "&#168", $string);
-            // LATIN CAPITAL LETTER S WITH CARON
-            $string = str_replace("\251", "&#352", $string);
-            // LATIN CAPITAL LETTER S WITH CEDILLA
-            $string = str_replace("\252", "&#350", $string);
-            // LATIN CAPITAL LETTER T WITH CARON
-            $string = str_replace("\253", "&#356", $string);
-            // LATIN CAPITAL LETTER Z WITH ACUTE
-            $string = str_replace("\254", "&#377", $string);
-            // SOFT HYPHEN
-            $string = str_replace("\255", "&#173", $string);
-            // LATIN CAPITAL LETTER Z WITH CARON
-            $string = str_replace("\256", "&#381", $string);
-            // LATIN CAPITAL LETTER Z WITH DOT ABOVE
-            $string = str_replace("\257", "&#379", $string);
-            // DEGREE SIGN
-            $string = str_replace("\260", "&#176", $string);
-            // LATIN SMALL LETTER A WITH OGONEK
-            $string = str_replace("\261", "&#261", $string);
-            // OGONEK
-            $string = str_replace("\262", "&#731", $string);
-            // LATIN SMALL LETTER L WITH STROKE
-            $string = str_replace("\263", "&#322", $string);
-            // ACUTE ACCENT
-            $string = str_replace("\264", "&#180", $string);
-            // LATIN SMALL LETTER L WITH CARON
-            $string = str_replace("\265", "&#318", $string);
-            // LATIN SMALL LETTER S WITH ACUTE
-            $string = str_replace("\266", "&#347", $string);
-            // CARON
-            $string = str_replace("\267", "&#711", $string);
-            // CEDILLA
-            $string = str_replace("\270", "&#184", $string);
-            // LATIN SMALL LETTER S WITH CARON
-            $string = str_replace("\271", "&#353", $string);
-            // LATIN SMALL LETTER S WITH CEDILLA
-            $string = str_replace("\272", "&#351", $string);
-            // LATIN SMALL LETTER T WITH CARON
-            $string = str_replace("\273", "&#357", $string);
-            // LATIN SMALL LETTER Z WITH ACUTE
-            $string = str_replace("\274", "&#378", $string);
-            // DOUBLE ACUTE ACCENT
-            $string = str_replace("\275", "&#733", $string);
-            // LATIN SMALL LETTER Z WITH CARON
-            $string = str_replace("\276", "&#382", $string);
-            // LATIN SMALL LETTER Z WITH DOT ABOVE
-            $string = str_replace("\277", "&#380", $string);
-            // LATIN CAPITAL LETTER R WITH ACUTE
-            $string = str_replace("\300", "&#340", $string);
-            // LATIN CAPITAL LETTER A WITH ACUTE
-            $string = str_replace("\301", "&#193", $string);
-            // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-            $string = str_replace("\302", "&#194", $string);
-            // LATIN CAPITAL LETTER A WITH BREVE
-            $string = str_replace("\303", "&#258", $string);
-            // LATIN CAPITAL LETTER A WITH DIAERESIS
-            $string = str_replace("\304", "&#196", $string);
-            // LATIN CAPITAL LETTER L WITH ACUTE
-            $string = str_replace("\305", "&#313", $string);
-            // LATIN CAPITAL LETTER C WITH ACUTE
-            $string = str_replace("\306", "&#262", $string);
-            // LATIN CAPITAL LETTER C WITH CEDILLA
-            $string = str_replace("\307", "&#199", $string);
-            // LATIN CAPITAL LETTER C WITH CARON
-            $string = str_replace("\310", "&#268", $string);
-            // LATIN CAPITAL LETTER E WITH ACUTE
-            $string = str_replace("\311", "&#201", $string);
-            // LATIN CAPITAL LETTER E WITH OGONEK
-            $string = str_replace("\312", "&#280", $string);
-            // LATIN CAPITAL LETTER E WITH DIAERESIS
-            $string = str_replace("\313", "&#203", $string);
-            // LATIN CAPITAL LETTER E WITH CARON
-            $string = str_replace("\314", "&#282", $string);
-            // LATIN CAPITAL LETTER I WITH ACUTE
-            $string = str_replace("\315", "&#205", $string);
-            // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-            $string = str_replace("\316", "&#206", $string);
-            // LATIN CAPITAL LETTER D WITH CARON
-            $string = str_replace("\317", "&#270", $string);
-            // LATIN CAPITAL LETTER D WITH STROKE
-            $string = str_replace("\320", "&#272", $string);
-            // LATIN CAPITAL LETTER N WITH ACUTE
-            $string = str_replace("\321", "&#323", $string);
-            // LATIN CAPITAL LETTER N WITH CARON
-            $string = str_replace("\322", "&#327", $string);
-            // LATIN CAPITAL LETTER O WITH ACUTE
-            $string = str_replace("\323", "&#211", $string);
-            // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-            $string = str_replace("\324", "&#212", $string);
-            // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-            $string = str_replace("\325", "&#336", $string);
-            // LATIN CAPITAL LETTER O WITH DIAERESIS
-            $string = str_replace("\326", "&#214", $string);
-            // MULTIPLICATION SIGN
-            $string = str_replace("\327", "&#215", $string);
-            // LATIN CAPITAL LETTER R WITH CARON
-            $string = str_replace("\330", "&#344", $string);
-            // LATIN CAPITAL LETTER U WITH RING ABOVE
-            $string = str_replace("\331", "&#366", $string);
-            // LATIN CAPITAL LETTER U WITH ACUTE
-            $string = str_replace("\332", "&#218", $string);
-            // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-            $string = str_replace("\333", "&#368", $string);
-            // LATIN CAPITAL LETTER U WITH DIAERESIS
-            $string = str_replace("\334", "&#220", $string);
-            // LATIN CAPITAL LETTER Y WITH ACUTE
-            $string = str_replace("\335", "&#221", $string);
-            // LATIN CAPITAL LETTER T WITH CEDILLA
-            $string = str_replace("\336", "&#354", $string);
-            // LATIN SMALL LETTER SHARP S
-            $string = str_replace("\337", "&#223", $string);
-            // LATIN SMALL LETTER R WITH ACUTE
-            $string = str_replace("\340", "&#341", $string);
-            // LATIN SMALL LETTER A WITH ACUTE
-            $string = str_replace("\341", "&#225", $string);
-            // LATIN SMALL LETTER A WITH CIRCUMFLEX
-            $string = str_replace("\342", "&#226", $string);
-            // LATIN SMALL LETTER A WITH BREVE
-            $string = str_replace("\343", "&#259", $string);
-            // LATIN SMALL LETTER A WITH DIAERESIS
-            $string = str_replace("\344", "&#228", $string);
-            // LATIN SMALL LETTER L WITH ACUTE
-            $string = str_replace("\345", "&#314", $string);
-            // LATIN SMALL LETTER C WITH ACUTE
-            $string = str_replace("\346", "&#263", $string);
-            // LATIN SMALL LETTER C WITH CEDILLA
-            $string = str_replace("\347", "&#231", $string);
-            // LATIN SMALL LETTER C WITH CARON
-            $string = str_replace("\350", "&#269", $string);
-            // LATIN SMALL LETTER E WITH ACUTE
-            $string = str_replace("\351", "&#233", $string);
-            // LATIN SMALL LETTER E WITH OGONEK
-            $string = str_replace("\352", "&#281", $string);
-            // LATIN SMALL LETTER E WITH DIAERESIS
-            $string = str_replace("\353", "&#235", $string);
-            // LATIN SMALL LETTER E WITH CARON
-            $string = str_replace("\354", "&#283", $string);
-            // LATIN SMALL LETTER I WITH ACUTE
-            $string = str_replace("\355", "&#237", $string);
-            // LATIN SMALL LETTER I WITH CIRCUMFLEX
-            $string = str_replace("\356", "&#238", $string);
-            // LATIN SMALL LETTER D WITH CARON
-            $string = str_replace("\357", "&#271", $string);
-            // LATIN SMALL LETTER D WITH STROKE
-            $string = str_replace("\360", "&#273", $string);
-            // LATIN SMALL LETTER N WITH ACUTE
-            $string = str_replace("\361", "&#324", $string);
-            // LATIN SMALL LETTER N WITH CARON
-            $string = str_replace("\362", "&#328", $string);
-            // LATIN SMALL LETTER O WITH ACUTE
-            $string = str_replace("\363", "&#243", $string);
-            // LATIN SMALL LETTER O WITH CIRCUMFLEX
-            $string = str_replace("\364", "&#244", $string);
-            // LATIN SMALL LETTER O WITH DOUBLE ACUTE
-            $string = str_replace("\365", "&#337", $string);
-            // LATIN SMALL LETTER O WITH DIAERESIS
-            $string = str_replace("\366", "&#246", $string);
-            // DIVISION SIGN
-            $string = str_replace("\367", "&#247", $string);
-            // LATIN SMALL LETTER R WITH CARON
-            $string = str_replace("\370", "&#345", $string);
-            // LATIN SMALL LETTER U WITH RING ABOVE
-            $string = str_replace("\371", "&#367", $string);
-            // LATIN SMALL LETTER U WITH ACUTE
-            $string = str_replace("\372", "&#250", $string);
-            // LATIN SMALL LETTER U WITH DOUBLE ACUTE
-            $string = str_replace("\373", "&#369", $string);
-            // LATIN SMALL LETTER U WITH DIAERESIS
-            $string = str_replace("\374", "&#252", $string);
-            // LATIN SMALL LETTER Y WITH ACUTE
-            $string = str_replace("\375", "&#253", $string);
-            // LATIN SMALL LETTER T WITH CEDILLA
-            $string = str_replace("\376", "&#355", $string);
-            // DOT ABOVE
-            $string = str_replace("\377", "&#729", $string);
-	 }
-      }
+     
+      // Only do the slow convert if there are 8-bit characters
+      if (! ereg("[\200-\377]", $string))
+         return $string;
+	 
+      // NO-BREAK SPACE
+      $string = str_replace("\240", ' ', $string);
+      // LATIN CAPITAL LETTER A WITH OGONEK
+      $string = str_replace("\241", 'Ą', $string);
+      // BREVE
+      $string = str_replace("\242", '˘', $string);
+      // LATIN CAPITAL LETTER L WITH STROKE
+      $string = str_replace("\243", 'Ł', $string);
+      // CURRENCY SIGN
+      $string = str_replace("\244", '¤', $string);
+      // LATIN CAPITAL LETTER L WITH CARON
+      $string = str_replace("\245", 'Ľ', $string);
+      // LATIN CAPITAL LETTER S WITH ACUTE
+      $string = str_replace("\246", 'Ś', $string);
+      // SECTION SIGN
+      $string = str_replace("\247", '§', $string);
+      // DIAERESIS
+      $string = str_replace("\250", '¨', $string);
+      // LATIN CAPITAL LETTER S WITH CARON
+      $string = str_replace("\251", 'Š', $string);
+      // LATIN CAPITAL LETTER S WITH CEDILLA
+      $string = str_replace("\252", 'Ş', $string);
+      // LATIN CAPITAL LETTER T WITH CARON
+      $string = str_replace("\253", 'Ť', $string);
+      // LATIN CAPITAL LETTER Z WITH ACUTE
+      $string = str_replace("\254", 'Ź', $string);
+      // SOFT HYPHEN
+      $string = str_replace("\255", '­', $string);
+      // LATIN CAPITAL LETTER Z WITH CARON
+      $string = str_replace("\256", 'Ž', $string);
+      // LATIN CAPITAL LETTER Z WITH DOT ABOVE
+      $string = str_replace("\257", 'Ż', $string);
+      // DEGREE SIGN
+      $string = str_replace("\260", '°', $string);
+      // LATIN SMALL LETTER A WITH OGONEK
+      $string = str_replace("\261", 'ą', $string);
+      // OGONEK
+      $string = str_replace("\262", '˛', $string);
+      // LATIN SMALL LETTER L WITH STROKE
+      $string = str_replace("\263", 'ł', $string);
+      // ACUTE ACCENT
+      $string = str_replace("\264", '´', $string);
+      // LATIN SMALL LETTER L WITH CARON
+      $string = str_replace("\265", 'ľ', $string);
+      // LATIN SMALL LETTER S WITH ACUTE
+      $string = str_replace("\266", 'ś', $string);
+      // CARON
+      $string = str_replace("\267", 'ˇ', $string);
+      // CEDILLA
+      $string = str_replace("\270", '¸', $string);
+      // LATIN SMALL LETTER S WITH CARON
+      $string = str_replace("\271", 'š', $string);
+      // LATIN SMALL LETTER S WITH CEDILLA
+      $string = str_replace("\272", 'ş', $string);
+      // LATIN SMALL LETTER T WITH CARON
+      $string = str_replace("\273", 'ť', $string);
+      // LATIN SMALL LETTER Z WITH ACUTE
+      $string = str_replace("\274", 'ź', $string);
+      // DOUBLE ACUTE ACCENT
+      $string = str_replace("\275", '˝', $string);
+      // LATIN SMALL LETTER Z WITH CARON
+      $string = str_replace("\276", 'ž', $string);
+      // LATIN SMALL LETTER Z WITH DOT ABOVE
+      $string = str_replace("\277", 'ż', $string);
+      // LATIN CAPITAL LETTER R WITH ACUTE
+      $string = str_replace("\300", 'Ŕ', $string);
+      // LATIN CAPITAL LETTER A WITH ACUTE
+      $string = str_replace("\301", 'Á', $string);
+      // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+      $string = str_replace("\302", 'Â', $string);
+      // LATIN CAPITAL LETTER A WITH BREVE
+      $string = str_replace("\303", 'Ă', $string);
+      // LATIN CAPITAL LETTER A WITH DIAERESIS
+      $string = str_replace("\304", 'Ä', $string);
+      // LATIN CAPITAL LETTER L WITH ACUTE
+      $string = str_replace("\305", 'Ĺ', $string);
+      // LATIN CAPITAL LETTER C WITH ACUTE
+      $string = str_replace("\306", 'Ć', $string);
+      // LATIN CAPITAL LETTER C WITH CEDILLA
+      $string = str_replace("\307", 'Ç', $string);
+      // LATIN CAPITAL LETTER C WITH CARON
+      $string = str_replace("\310", 'Č', $string);
+      // LATIN CAPITAL LETTER E WITH ACUTE
+      $string = str_replace("\311", 'É', $string);
+      // LATIN CAPITAL LETTER E WITH OGONEK
+      $string = str_replace("\312", 'Ę', $string);
+      // LATIN CAPITAL LETTER E WITH DIAERESIS
+      $string = str_replace("\313", 'Ë', $string);
+      // LATIN CAPITAL LETTER E WITH CARON
+      $string = str_replace("\314", 'Ě', $string);
+      // LATIN CAPITAL LETTER I WITH ACUTE
+      $string = str_replace("\315", 'Í', $string);
+      // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+      $string = str_replace("\316", 'Î', $string);
+      // LATIN CAPITAL LETTER D WITH CARON
+      $string = str_replace("\317", 'Ď', $string);
+      // LATIN CAPITAL LETTER D WITH STROKE
+      $string = str_replace("\320", 'Đ', $string);
+      // LATIN CAPITAL LETTER N WITH ACUTE
+      $string = str_replace("\321", 'Ń', $string);
+      // LATIN CAPITAL LETTER N WITH CARON
+      $string = str_replace("\322", 'Ň', $string);
+      // LATIN CAPITAL LETTER O WITH ACUTE
+      $string = str_replace("\323", 'Ó', $string);
+      // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+      $string = str_replace("\324", 'Ô', $string);
+      // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+      $string = str_replace("\325", 'Ő', $string);
+      // LATIN CAPITAL LETTER O WITH DIAERESIS
+      $string = str_replace("\326", 'Ö', $string);
+      // MULTIPLICATION SIGN
+      $string = str_replace("\327", '×', $string);
+      // LATIN CAPITAL LETTER R WITH CARON
+      $string = str_replace("\330", 'Ř', $string);
+      // LATIN CAPITAL LETTER U WITH RING ABOVE
+      $string = str_replace("\331", 'Ů', $string);
+      // LATIN CAPITAL LETTER U WITH ACUTE
+      $string = str_replace("\332", 'Ú', $string);
+      // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+      $string = str_replace("\333", 'Ű', $string);
+      // LATIN CAPITAL LETTER U WITH DIAERESIS
+      $string = str_replace("\334", 'Ü', $string);
+      // LATIN CAPITAL LETTER Y WITH ACUTE
+      $string = str_replace("\335", 'Ý', $string);
+      // LATIN CAPITAL LETTER T WITH CEDILLA
+      $string = str_replace("\336", 'Ţ', $string);
+      // LATIN SMALL LETTER SHARP S
+      $string = str_replace("\337", 'ß', $string);
+      // LATIN SMALL LETTER R WITH ACUTE
+      $string = str_replace("\340", 'ŕ', $string);
+      // LATIN SMALL LETTER A WITH ACUTE
+      $string = str_replace("\341", 'á', $string);
+      // LATIN SMALL LETTER A WITH CIRCUMFLEX
+      $string = str_replace("\342", 'â', $string);
+      // LATIN SMALL LETTER A WITH BREVE
+      $string = str_replace("\343", 'ă', $string);
+      // LATIN SMALL LETTER A WITH DIAERESIS
+      $string = str_replace("\344", 'ä', $string);
+      // LATIN SMALL LETTER L WITH ACUTE
+      $string = str_replace("\345", 'ĺ', $string);
+      // LATIN SMALL LETTER C WITH ACUTE
+      $string = str_replace("\346", 'ć', $string);
+      // LATIN SMALL LETTER C WITH CEDILLA
+      $string = str_replace("\347", 'ç', $string);
+      // LATIN SMALL LETTER C WITH CARON
+      $string = str_replace("\350", 'č', $string);
+      // LATIN SMALL LETTER E WITH ACUTE
+      $string = str_replace("\351", 'é', $string);
+      // LATIN SMALL LETTER E WITH OGONEK
+      $string = str_replace("\352", 'ę', $string);
+      // LATIN SMALL LETTER E WITH DIAERESIS
+      $string = str_replace("\353", 'ë', $string);
+      // LATIN SMALL LETTER E WITH CARON
+      $string = str_replace("\354", 'ě', $string);
+      // LATIN SMALL LETTER I WITH ACUTE
+      $string = str_replace("\355", 'í', $string);
+      // LATIN SMALL LETTER I WITH CIRCUMFLEX
+      $string = str_replace("\356", 'î', $string);
+      // LATIN SMALL LETTER D WITH CARON
+      $string = str_replace("\357", 'ď', $string);
+      // LATIN SMALL LETTER D WITH STROKE
+      $string = str_replace("\360", 'đ', $string);
+      // LATIN SMALL LETTER N WITH ACUTE
+      $string = str_replace("\361", 'ń', $string);
+      // LATIN SMALL LETTER N WITH CARON
+      $string = str_replace("\362", 'ň', $string);
+      // LATIN SMALL LETTER O WITH ACUTE
+      $string = str_replace("\363", 'ó', $string);
+      // LATIN SMALL LETTER O WITH CIRCUMFLEX
+      $string = str_replace("\364", 'ô', $string);
+      // LATIN SMALL LETTER O WITH DOUBLE ACUTE
+      $string = str_replace("\365", 'ő', $string);
+      // LATIN SMALL LETTER O WITH DIAERESIS
+      $string = str_replace("\366", 'ö', $string);
+      // DIVISION SIGN
+      $string = str_replace("\367", '÷', $string);
+      // LATIN SMALL LETTER R WITH CARON
+      $string = str_replace("\370", 'ř', $string);
+      // LATIN SMALL LETTER U WITH RING ABOVE
+      $string = str_replace("\371", 'ů', $string);
+      // LATIN SMALL LETTER U WITH ACUTE
+      $string = str_replace("\372", 'ú', $string);
+      // LATIN SMALL LETTER U WITH DOUBLE ACUTE
+      $string = str_replace("\373", 'ű', $string);
+      // LATIN SMALL LETTER U WITH DIAERESIS
+      $string = str_replace("\374", 'ü', $string);
+      // LATIN SMALL LETTER Y WITH ACUTE
+      $string = str_replace("\375", 'ý', $string);
+      // LATIN SMALL LETTER T WITH CEDILLA
+      $string = str_replace("\376", 'ţ', $string);
+      // DOT ABOVE
+      $string = str_replace("\377", '˙', $string);
+
       return $string;
    }
 
@@ -427,59 +475,59 @@
    function charset_decode_iso_8859_7 ($string) {
       global $default_charset;
 
-      if (strtolower($default_charset) == "iso-8859-7") {
+      if (strtolower($default_charset) == 'iso-8859-7')
          return $string;
-      } else { 
-         // Only do the slow convert if there are 8-bit characters
-         if (ereg("[\200-\377]", $string)) {
-            // Some diverse characters in the beginning
-            $string = str_replace("\240", " ", $string);
-            $string = str_replace("\241", "‘", $string);
-            $string = str_replace("\242", "’", $string);
-            $string = str_replace("\243", "£", $string);
-            $string = str_replace("\246", "¦", $string);
-            $string = str_replace("\247", "§", $string);
-            $string = str_replace("\250", "¨", $string);
-            $string = str_replace("\251", "©", $string);
-            $string = str_replace("\253", "«", $string);
-            $string = str_replace("\254", "¬", $string);
-            $string = str_replace("\255", "­", $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);
-         
-         // Horizontal bar (parentheki pavla)
-            $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 = str_replace($res[1], $replace, $string);
-            }
-         
-            // 11/07 (0xB7) Middle dot is the same in iso-8859-1
-            $string = str_replace("\267", "·", $string);
+	 
+      // Only do the slow convert if there are 8-bit characters
+      if (!ereg("[\200-\377]", $string))
+         return $string;
+	 
+      // Some diverse characters in the beginning
+      $string = str_replace("\240", ' ', $string);
+      $string = str_replace("\241", '‘', $string);
+      $string = str_replace("\242", '’', $string);
+      $string = str_replace("\243", '£', $string);
+      $string = str_replace("\246", '¦', $string);
+      $string = str_replace("\247", '§', $string);
+      $string = str_replace("\250", '¨', $string);
+      $string = str_replace("\251", '©', $string);
+      $string = str_replace("\253", '«', $string);
+      $string = str_replace("\254", '¬', $string);
+      $string = str_replace("\255", '­', $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);
+      
+      // Horizontal bar (parentheki pavla)
+      $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 = str_replace($res[1], $replace, $string);
+      }
          
-            // ISO-8859-7 characters from 11/08 (0xB8) to 11/10 (0xBA)
-            // These are Unicode 900-902
-            while (ereg("([\270-\272])", $string, $res)) {
-               $replace = "&#" . (ord($res[1])+720) . ";";
-               $string = str_replace($res[1], $replace, $string);
-            }
+      // 11/07 (0xB7) Middle dot is the same in iso-8859-1
+      $string = str_replace("\267", '·', $string);
+      
+      // ISO-8859-7 characters from 11/08 (0xB8) to 11/10 (0xBA)
+      // These are Unicode 900-902
+      while (ereg("([\270-\272])", $string, $res)) {
+         $replace = '&#' . (ord($res[1])+720) . ";";
+	 $string = str_replace($res[1], $replace, $string);
+      }
          
-            // 11/11 (0xBB) Right angle quotation mark is the same as in
-            // iso-8859-1
-            $string = str_replace("\273", "»", $string);
+      // 11/11 (0xBB) Right angle quotation mark is the same as in
+      // iso-8859-1
+      $string = str_replace("\273", '»', $string);
          
-         // And now the rest of the charset
-            while (ereg("([\274-\376])", $string, $res)) {
-               $replace = "&#" . (ord($res[1])+720) . ";";
-               $string = str_replace($res[1], $replace, $string);
-            }
-         }
+      // And now the rest of the charset
+      while (ereg("([\274-\376])", $string, $res)) {
+         $replace = '&#' . (ord($res[1])+720) . ';';
+	 $string = str_replace($res[1], $replace, $string);
       }
 
       return $string;
@@ -489,21 +537,21 @@
    // but has the Euro symbol and some characters needed for French.
    function charset_decode_iso_8859_15 ($string) {
       // Euro sign
-      $string = str_replace ("\244", "€", $string);
+      $string = str_replace ("\244", '€', $string);
       // Latin capital letter S with caron
-      $string = str_replace ("\244", "Š", $string);
+      $string = str_replace ("\244", 'Š', $string);
       // Latin small letter s with caron
-      $string = str_replace ("\250", "š", $string);
+      $string = str_replace ("\250", 'š', $string);
       // Latin capital letter Z with caron
-      $string = str_replace ("\264", "Ž", $string);
+      $string = str_replace ("\264", 'Ž', $string);
       // Latin small letter z with caron
-      $string = str_replace ("\270", "ž", $string);
+      $string = str_replace ("\270", 'ž', $string);
       // Latin capital ligature OE
-      $string = str_replace ("\274", "Œ", $string);
+      $string = str_replace ("\274", 'Œ', $string);
       // Latin small ligature oe
-      $string = str_replace ("\275", "œ", $string);
+      $string = str_replace ("\275", 'œ', $string);
       // Latin capital letter Y with diaeresis
-      $string = str_replace ("\276", "Ÿ", $string);
+      $string = str_replace ("\276", 'Ÿ', $string);
 
       return (charset_decode_iso_8859_1($string));
    }
@@ -511,7 +559,7 @@
    // ISO-8859-15 is Cyrillic
    function charset_decode_iso_8859_5 ($string) {
       // Convert to KOI8-R, then return this decoded.
-      $string = convert_cyr_string($string, "i", "k");
+      $string = convert_cyr_string($string, 'i', 'k');
       return charset_decode_koi8r($string);
    }
 
@@ -552,142 +600,229 @@
    function charset_decode_koi8r ($string) {
       global $default_charset;
 
-      if ($default_charset == "koi8-r") {
+      if ($default_charset == 'koi8-r')
          return $string;
-      } else { 
-         // Convert to Unicode HTML entities.
-         // This code is rather ineffective.
-         $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);
+	 
+      // Convert to Unicode HTML entities.
+      // This code is rather ineffective.
+      $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;
+   }
 
-         return $string;
+
+   global $use_gettext;
+   
+   // Detect whether gettext is installed.
+   $gettext_flags = 0;
+   if (function_exists('_')) $gettext_flags += 1;
+   if (function_exists('bindtextdomain')) $gettext_flags += 2;
+   if (function_exists('textdomain')) $gettext_flags += 4;
+
+   // If gettext is fully loaded, cool
+   if ($gettext_flags == 7)
+      $use_gettext = true;
+   // If we can fake gettext, try that
+   elseif ($gettext_flags == 0) {
+      $use_gettext = true;
+      include('../functions/gettext.php');
+   } else {
+      // Uh-ho.  A weird install
+      if (! $gettext_flags & 1) {
+         function _($str) { return $str; };
+      }
+      if (! $gettext_flags & 2) {
+         function bindtextdomain() { return; }
       }
+      if (! $gettext_flags & 4) {
+         function textdomain() { return; }
+      }
+   }
+
+
+   // Set up the language to be output
+   // if $do_search is true, then scan the browser information
+   // for a possible language that we know
+   function set_up_language($sm_language, $do_search = false)
+   {
+      static $SetupAlready = 0;
+      global $HTTP_ACCEPT_LANGUAGE, $use_gettext, $languages, 
+          $squirrelmail_language, $squirrelmail_default_language, 
+	  $sm_notAlias;
+      
+      if ($SetupAlready)
+         return;
+
+      $SetupAlready = 1;
+      
+      $charset_headers_sent=false;
+      
+      if ($do_search && ! $sm_language && isset($HTTP_ACCEPT_LANGUAGE)) {
+         $sm_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
+      }
+      if (! $sm_language && isset($squirrelmail_default_language))
+         $sm_language = $squirrelmail_default_language;
+      $sm_notAlias = $sm_language;
+      while (isset($languages[$sm_notAlias]['ALIAS']))
+         $sm_notAlias = $languages[$sm_notAlias]['ALIAS'];
+
+      if (isset($sm_language) && $use_gettext &&
+          $squirrelmail_language != '' &&
+ 	  isset($languages[$sm_notAlias]['CHARSET'])) {
+         if ((ini_get('safe_mode') == FALSE) && (getenv('LC_ALL') != $sm_language)) {
+           putenv('LC_ALL=' . $sm_notAlias);
+         }
+         setlocale('LC_ALL', $sm_notAlias);
+         bindtextdomain('squirrelmail', '../locale/');
+         textdomain('squirrelmail');
+         header ('Content-Type: text/html; charset=' . $languages[$sm_language]['CHARSET']);
+      }
+   }
+
+   function set_my_charset(){
+     //
+     // There can be a $default_charset setting in the
+     // config.php file, but the user may have a different language
+     // selected for a user interface. This function checks the
+     // language selected by the user and tags the outgoing messages 
+     // with the appropriate charset corresponding to the language
+     // selection. This is "more right" (tm), than just stamping the 
+     // message blindly with the system-wide $default_charset.
+     //
+     global $data_dir, $username, $default_charset, $languages;
+     $my_language = getPref($data_dir, $username, "language");
+     if (!$my_language) return;
+     while (isset($languages[$my_language]['ALIAS']))
+        $my_language = $languages[$my_language]['ALIAS'];
+     $my_charset=$languages[$my_language]['CHARSET'];
+     if ($my_charset) $default_charset=$my_charset;
    }
 
 ?>