Added koi8-u decoding support. Changed windows-1251 and iso-8859-5 decoding

order. Now decoding does not use php decode_cyr_string function. See SM patch 622280.

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

diff --git a/functions/i18n.php b/functions/i18n.php
index ccccaa8011fe8871af24099fc310255553edd183..698dbd0aa6943c57ba6cd80dc83b76973edef989 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -58,6 +58,8 @@ function charset_decode ($charset, $string) {
         $ret = charset_decode_ns_4551_1 ($string);
     } else if ($charset == 'koi8-r') {
         $ret = charset_decode_koi8r ($string);
+    } else if ($charset == 'koi8-u') {
+        $ret = charset_decode_koi8u ($string);
     } else if ($charset == 'windows-1251') {
         $ret = charset_decode_windows_1251 ($string);
     } else if ($charset == 'windows-1253') {
@@ -493,6 +495,40 @@ function charset_decode_iso_8859_4 ($string) {
     return (charset_decode_iso_8859_1($string));
 }
 
+/* ISO-8859-5 is Cyrillic */
+function charset_decode_iso_8859_5 ($string) {
+    global $default_charset;
+
+    if (strtolower($default_charset) == 'iso-8859-5') {
+        return $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);
+    // 161-172 -> 1025-1036 (+864)
+    $string = preg_replace("/([\241-\254])/e","'&#' . (ord('\\1')+864) . ';'",$string);
+    // SOFT HYPHEN
+    $string = str_replace("\255", '­', $string);
+    // 174-239 -> 1038-1103 (+864)
+    $string = preg_replace("/([\256-\357])/e","'&#' . (ord('\\1')+864) . ';'",$string);
+    // NUMERO SIGN
+    $string = str_replace("\360", '№', $string);
+    // 241-252 -> 1105-1116 (+864)
+    $string = preg_replace("/([\361-\374])/e","'&#' . (ord('\\1')+864) . ';'",$string);
+    // SECTION SIGN
+    $string = str_replace("\375", '§', $string);
+    // CYRILLIC SMALL LETTER SHORT U (Byelorussian)
+    $string = str_replace("\376", 'ў', $string);
+    // CYRILLIC SMALL LETTER DZHE
+    $string = str_replace("\377", 'џ', $string);
+
+    return $string;
+}
+
 /* iso-8859-7 is Greek. */
 function charset_decode_iso_8859_7 ($string) {
     global $default_charset;
@@ -685,12 +721,6 @@ function charset_decode_iso_8859_15 ($string) {
     return (charset_decode_iso_8859_1($string));
 }
 
-/* ISO-8859-5 is Cyrillic */
-function charset_decode_iso_8859_5 ($string) {
-    // 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 */
 function charset_decode_iso_8859_default ($string) {
@@ -875,6 +905,474 @@ function charset_decode_koi8r ($string) {
     return $string;
 }
 
+/*
+ * KOI8-U is used to encode Ukrainian mail (Cyrrilic). Defined in RFC
+ * 2319.
+ */
+function charset_decode_koi8u ($string) {
+    global $default_charset;
+
+    if (strtolower($default_charset) == 'koi8-u') {
+        return $string;
+    }
+
+    /* Only do the slow convert if there are 8-bit characters */
+    if (! ereg("[\200-\377]", $string))
+        return $string;
+
+    // BOX DRAWINGS LIGHT HORIZONTAL
+    $string = str_replace("\200", '─', $string);
+    // BOX DRAWINGS LIGHT VERTICAL
+    $string = str_replace("\201", '│', $string);
+    // BOX DRAWINGS LIGHT DOWN AND RIGHT
+    $string = str_replace("\202", '┌', $string);
+    // BOX DRAWINGS LIGHT DOWN AND LEFT
+    $string = str_replace("\203", '┐', $string);
+    // BOX DRAWINGS LIGHT UP AND RIGHT
+    $string = str_replace("\204", '└', $string);
+    // BOX DRAWINGS LIGHT UP AND LEFT
+    $string = str_replace("\205", '┘', $string);
+    // BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+    $string = str_replace("\206", '├', $string);
+    // BOX DRAWINGS LIGHT VERTICAL AND LEFT
+    $string = str_replace("\207", '┤', $string);
+    // BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+    $string = str_replace("\210", '┬', $string);
+    // BOX DRAWINGS LIGHT UP AND HORIZONTAL
+    $string = str_replace("\211", '┴', $string);
+    // BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+    $string = str_replace("\212", '┼', $string);
+    // UPPER HALF BLOCK
+    $string = str_replace("\213", '▀', $string);
+    // LOWER HALF BLOCK
+    $string = str_replace("\214", '▄', $string);
+    // FULL BLOCK
+    $string = str_replace("\215", '█', $string);
+    // LEFT HALF BLOCK
+    $string = str_replace("\216", '▌', $string);
+    // RIGHT HALF BLOCK
+    $string = str_replace("\217", '▐', $string);
+    // LIGHT SHADE
+    $string = str_replace("\220", '░', $string);
+    // MEDIUM SHADE
+    $string = str_replace("\221", '▒', $string);
+    // DARK SHADE
+    $string = str_replace("\222", '▓', $string);
+    // TOP HALF INTEGRAL
+    $string = str_replace("\223", '⌠', $string);
+    // BLACK SQUARE
+    $string = str_replace("\224", '■', $string);
+    // BULLET OPERATOR
+    $string = str_replace("\225", '∙', $string);
+    // SQUARE ROOT
+    $string = str_replace("\226", '√', $string);
+    // ALMOST EQUAL TO
+    $string = str_replace("\227", '≈', $string);
+    // LESS THAN OR EQUAL TO
+    $string = str_replace("\230", '≤', $string);
+    // GREATER THAN OR EQUAL TO
+    $string = str_replace("\231", '≥', $string);
+    // NO-BREAK SPACE
+    $string = str_replace("\232", ' ', $string);
+    // BOTTOM HALF INTEGRAL
+    $string = str_replace("\233", '⌡', $string);
+    // DEGREE SIGN
+    $string = str_replace("\234", '°', $string);
+    // SUPERSCRIPT DIGIT TWO
+    $string = str_replace("\235", '²', $string);
+    // MIDDLE DOT
+    $string = str_replace("\236", '·', $string);
+    // DIVISION SIGN
+    $string = str_replace("\237", '÷', $string);
+    // BOX DRAWINGS DOUBLE HORIZONTAL
+    $string = str_replace("\240", '═', $string);
+    // BOX DRAWINGS DOUBLE VERTICAL
+    $string = str_replace("\241", '║', $string);
+    // BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+    $string = str_replace("\242", '╒', $string);
+    // CYRILLIC SMALL LETTER IO
+    $string = str_replace("\243", 'ё', $string);
+    // CYRILLIC SMALL LETTER UKRAINIAN IE
+    $string = str_replace("\244", 'є', $string);
+    // BOX DRAWINGS DOUBLE DOWN AND RIGHT
+    $string = str_replace("\245", '╔', $string);
+    // CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+    $string = str_replace("\246", 'і', $string);
+    // CYRILLIC SMALL LETTER YI (Ukrainian)
+    $string = str_replace("\247", 'ї', $string);
+    // BOX DRAWINGS DOUBLE DOWN AND LEFT
+    $string = str_replace("\250", '╗', $string);
+    // BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+    $string = str_replace("\251", '╘', $string);
+    // BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+    $string = str_replace("\252", '╙', $string);
+    // BOX DRAWINGS DOUBLE UP AND RIGHT
+    $string = str_replace("\253", '╚', $string);
+    // BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+    $string = str_replace("\254", '╛', $string);
+    // CYRILLIC SMALL LETTER GHE WITH UPTURN
+    $string = str_replace("\255", 'ґ', $string);
+    // BOX DRAWINGS DOUBLE UP AND LEFT
+    $string = str_replace("\256", '╝', $string);
+    // BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+    $string = str_replace("\257", '╞', $string);
+    // BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+    $string = str_replace("\260", '╟', $string);
+    // BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+    $string = str_replace("\261", '╠', $string);
+    // BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+    $string = str_replace("\262", '╡', $string);
+    // CYRILLIC CAPITAL LETTER IO
+    $string = str_replace("\263", 'Ё', $string);
+    // CYRILLIC CAPITAL LETTER UKRAINIAN IE
+    $string = str_replace("\264", 'Є', $string);
+    // DOUBLE VERTICAL AND LEFT
+    $string = str_replace("\265", '╣', $string);
+    // CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+    $string = str_replace("\266", 'І', $string);
+    // CYRILLIC CAPITAL LETTER YI (Ukrainian)
+    $string = str_replace("\267", 'Ї', $string);
+    // BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+    $string = str_replace("\270", '╦', $string);
+    // BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+    $string = str_replace("\271", '╧', $string);
+    // BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+    $string = str_replace("\272", '╨', $string);
+    // BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+    $string = str_replace("\273", '╩', $string);
+    // BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+    $string = str_replace("\274", '╪', $string);
+    // CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+    $string = str_replace("\275", 'Ґ', $string);
+    // BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+    $string = str_replace("\276", '╬', $string);
+    // COPYRIGHT SIGN
+    $string = str_replace("\277", '©', $string);
+    // CYRILLIC SMALL LETTER YU
+    $string = str_replace("\300", 'ю', $string);
+    // CYRILLIC SMALL LETTER A
+    $string = str_replace("\301", 'а', $string);
+    // CYRILLIC SMALL LETTER BE
+    $string = str_replace("\302", 'б', $string);
+    // CYRILLIC SMALL LETTER TSE
+    $string = str_replace("\303", 'ц', $string);
+    // CYRILLIC SMALL LETTER DE
+    $string = str_replace("\304", 'д', $string);
+    // CYRILLIC SMALL LETTER IE
+    $string = str_replace("\305", 'е', $string);
+    // CYRILLIC SMALL LETTER EF
+    $string = str_replace("\306", 'ф', $string);
+    // CYRILLIC SMALL LETTER GHE
+    $string = str_replace("\307", 'г', $string);
+    // CYRILLIC SMALL LETTER HA
+    $string = str_replace("\310", 'х', $string);
+    // CYRILLIC SMALL LETTER I
+    $string = str_replace("\311", 'и', $string);
+    // CYRILLIC SMALL LETTER SHORT I
+    $string = str_replace("\312", 'й', $string);
+    // CYRILLIC SMALL LETTER KA
+    $string = str_replace("\313", 'к', $string);
+    // CYRILLIC SMALL LETTER EL
+    $string = str_replace("\314", 'л', $string);
+    // CYRILLIC SMALL LETTER EM
+    $string = str_replace("\315", 'м', $string);
+    // CYRILLIC SMALL LETTER EN
+    $string = str_replace("\316", 'н', $string);
+    // CYRILLIC SMALL LETTER O
+    $string = str_replace("\317", 'о', $string);
+    // CYRILLIC SMALL LETTER PE
+    $string = str_replace("\320", 'п', $string);
+    // CYRILLIC SMALL LETTER YA
+    $string = str_replace("\321", 'я', $string);
+    // CYRILLIC SMALL LETTER ER
+    $string = str_replace("\322", 'р', $string);
+    // CYRILLIC SMALL LETTER ES
+    $string = str_replace("\323", 'с', $string);
+    // CYRILLIC SMALL LETTER TE
+    $string = str_replace("\324", 'т', $string);
+    // CYRILLIC SMALL LETTER U
+    $string = str_replace("\325", 'у', $string);
+    // CYRILLIC SMALL LETTER ZHE
+    $string = str_replace("\326", 'ж', $string);
+    // CYRILLIC SMALL LETTER VE
+    $string = str_replace("\327", 'в', $string);
+    // CYRILLIC SMALL LETTER SOFT SIGN
+    $string = str_replace("\330", 'ь', $string);
+    // CYRILLIC SMALL LETTER YERU
+    $string = str_replace("\331", 'ы', $string);
+    // CYRILLIC SMALL LETTER ZE
+    $string = str_replace("\332", 'з', $string);
+    // CYRILLIC SMALL LETTER SHA
+    $string = str_replace("\333", 'ш', $string);
+    // CYRILLIC SMALL LETTER E
+    $string = str_replace("\334", 'э', $string);
+    // CYRILLIC SMALL LETTER SHCHA
+    $string = str_replace("\335", 'щ', $string);
+    // CYRILLIC SMALL LETTER CHE
+    $string = str_replace("\336", 'ч', $string);
+    // CYRILLIC SMALL LETTER HARD SIGN
+    $string = str_replace("\337", 'ъ', $string);
+    // CYRILLIC CAPITAL LETTER YU
+    $string = str_replace("\340", 'Ю', $string);
+    // CYRILLIC CAPITAL LETTER A
+    $string = str_replace("\341", 'А', $string);
+    // CYRILLIC CAPITAL LETTER BE
+    $string = str_replace("\342", 'Б', $string);
+    // CYRILLIC CAPITAL LETTER TSE
+    $string = str_replace("\343", 'Ц', $string);
+    // CYRILLIC CAPITAL LETTER DE
+    $string = str_replace("\344", 'Д', $string);
+    // CYRILLIC CAPITAL LETTER IE
+    $string = str_replace("\345", 'Е', $string);
+    // CYRILLIC CAPITAL LETTER EF
+    $string = str_replace("\346", 'Ф', $string);
+    // CYRILLIC CAPITAL LETTER GHE
+    $string = str_replace("\347", 'Г', $string);
+    // CYRILLIC CAPITAL LETTER HA
+    $string = str_replace("\350", 'Х', $string);
+    // CYRILLIC CAPITAL LETTER I
+    $string = str_replace("\351", 'И', $string);
+    // CYRILLIC CAPITAL LETTER SHORT I
+    $string = str_replace("\352", 'Й', $string);
+    // CYRILLIC CAPITAL LETTER KA
+    $string = str_replace("\353", 'К', $string);
+    // CYRILLIC CAPITAL LETTER EL
+    $string = str_replace("\354", 'Л', $string);
+    // CYRILLIC CAPITAL LETTER EM
+    $string = str_replace("\355", 'М', $string);
+    // CYRILLIC CAPITAL LETTER EN
+    $string = str_replace("\356", 'Н', $string);
+    // CYRILLIC CAPITAL LETTER O
+    $string = str_replace("\357", 'О', $string);
+    // CYRILLIC CAPITAL LETTER PE
+    $string = str_replace("\360", 'П', $string);
+    // CYRILLIC CAPITAL LETTER YA
+    $string = str_replace("\361", 'Я', $string);
+    // CYRILLIC CAPITAL LETTER ER
+    $string = str_replace("\362", 'Р', $string);
+    // CYRILLIC CAPITAL LETTER ES
+    $string = str_replace("\363", 'С', $string);
+    // CYRILLIC CAPITAL LETTER TE
+    $string = str_replace("\364", 'Т', $string);
+    // CYRILLIC CAPITAL LETTER U
+    $string = str_replace("\365", 'У', $string);
+    // CYRILLIC CAPITAL LETTER ZHE
+    $string = str_replace("\366", 'Ж', $string);
+    // CYRILLIC CAPITAL LETTER VE
+    $string = str_replace("\367", 'В', $string);
+    // CYRILLIC CAPITAL LETTER SOFT SIGN
+    $string = str_replace("\370", 'Ь', $string);
+    // CYRILLIC CAPITAL LETTER YERU
+    $string = str_replace("\371", 'Ы', $string);
+    // CYRILLIC CAPITAL LETTER ZE
+    $string = str_replace("\372", 'З', $string);
+    // CYRILLIC CAPITAL LETTER SHA
+    $string = str_replace("\373", 'Ш', $string);
+    // CYRILLIC CAPITAL LETTER E
+    $string = str_replace("\374", 'Э', $string);
+    // CYRILLIC CAPITAL LETTER SHCHA
+    $string = str_replace("\375", 'Щ', $string);
+    // CYRILLIC CAPITAL LETTER CHE
+    $string = str_replace("\376", 'Ч', $string);
+    // CYRILLIC CAPITAL LETTER HARD SIGN
+    $string = str_replace("\377", 'Ъ', $string);
+
+    return $string;
+}
+
+/*
+ * windows-1251 is used to encode Bulgarian mail (Cyrrilic). 
+ */
+function charset_decode_windows_1251 ($string) {
+    global $default_charset;
+
+    if (strtolower($default_charset) == 'windows-1251') {
+        return $string;
+    }
+
+    /* Only do the slow convert if there are 8-bit characters */
+    if (! ereg("[\200-\377]", $string))
+        return $string;
+
+    // CYRILLIC CAPITAL LETTER DJE (Serbocroatian)
+    $string = str_replace("\200", 'Ђ', $string);
+    // CYRILLIC CAPITAL LETTER GJE
+    $string = str_replace("\201", 'Ѓ', $string);
+    // SINGLE LOW-9 QUOTATION MARK
+    $string = str_replace("\202", '‚', $string);
+    // CYRILLIC SMALL LETTER GJE
+    $string = str_replace("\203", 'ѓ', $string);
+    // DOUBLE LOW-9 QUOTATION MARK
+    $string = str_replace("\204", '„', $string);
+    // HORIZONTAL ELLIPSIS
+    $string = str_replace("\205", '…', $string);
+    // DAGGER
+    $string = str_replace("\206", '†', $string);
+    // DOUBLE DAGGER
+    $string = str_replace("\207", '‡', $string);
+    // EURO SIGN
+    $string = str_replace("\210", '€', $string);
+    // PER MILLE SIGN
+    $string = str_replace("\211", '‰', $string);
+    // CYRILLIC CAPITAL LETTER LJE
+    $string = str_replace("\212", 'Љ', $string);
+    // SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+    $string = str_replace("\213", '‹', $string);
+    // CYRILLIC CAPITAL LETTER NJE
+    $string = str_replace("\214", 'Њ', $string);
+    // CYRILLIC CAPITAL LETTER KJE
+    $string = str_replace("\215", 'Ќ', $string);
+    // CYRILLIC CAPITAL LETTER TSHE (Serbocroatian)
+    $string = str_replace("\216", 'Ћ', $string);
+    // CYRILLIC CAPITAL LETTER DZHE
+    $string = str_replace("\217", 'Џ', $string);
+    // CYRILLIC SMALL LETTER DJE (Serbocroatian)
+    $string = str_replace("\220", 'ђ', $string);
+    // LEFT SINGLE QUOTATION MARK
+    $string = str_replace("\221", '‘', $string);
+    // RIGHT SINGLE QUOTATION MARK
+    $string = str_replace("\222", '’', $string);
+    // LEFT DOUBLE QUOTATION MARK
+    $string = str_replace("\223", '“', $string);
+    // RIGHT DOUBLE QUOTATION MARK
+    $string = str_replace("\224", '”', $string);
+    // BULLET
+    $string = str_replace("\225", '•', $string);
+    // EN DASH
+    $string = str_replace("\226", '–', $string);
+    // EM DASH
+    $string = str_replace("\227", '—', $string);
+    // TRADE MARK SIGN
+    $string = str_replace("\231", '™', $string);
+    // CYRILLIC SMALL LETTER LJE
+    $string = str_replace("\232", 'љ', $string);
+    // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+    $string = str_replace("\233", '›', $string);
+    // CYRILLIC SMALL LETTER NJE
+    $string = str_replace("\234", 'њ', $string);
+    // CYRILLIC SMALL LETTER KJE
+    $string = str_replace("\235", 'ќ', $string);
+    // CYRILLIC SMALL LETTER TSHE (Serbocroatian)
+    $string = str_replace("\236", 'ћ', $string);
+    // CYRILLIC SMALL LETTER DZHE
+    $string = str_replace("\237", 'џ', $string);
+    // NO-BREAK SPACE
+    $string = str_replace("\240", ' ', $string);
+    // CYRILLIC CAPITAL LETTER SHORT U (Byelorussian)
+    $string = str_replace("\241", 'Ў', $string);
+    // CYRILLIC SMALL LETTER SHORT U (Byelorussian)
+    $string = str_replace("\242", 'ў', $string);
+    // CYRILLIC CAPITAL LETTER JE
+    $string = str_replace("\243", 'Ј', $string);
+    // CURRENCY SIGN
+    $string = str_replace("\244", '¤', $string);
+    // CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+    $string = str_replace("\245", 'Ґ', $string);
+    // BROKEN BAR
+    $string = str_replace("\246", '¦', $string);
+    // SECTION SIGN
+    $string = str_replace("\247", '§', $string);
+    // CYRILLIC CAPITAL LETTER IO
+    $string = str_replace("\250", 'Ё', $string);
+    // COPYRIGHT SIGN
+    $string = str_replace("\251", '©', $string);
+    // CYRILLIC CAPITAL LETTER UKRAINIAN IE
+    $string = str_replace("\252", 'Є', $string);
+    // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+    $string = str_replace("\253", '«', $string);
+    // NOT SIGN
+    $string = str_replace("\254", '¬', $string);
+    // SOFT HYPHEN
+    $string = str_replace("\255", '­', $string);
+    // REGISTERED SIGN
+    $string = str_replace("\256", '®', $string);
+    // CYRILLIC CAPITAL LETTER YI (Ukrainian)
+    $string = str_replace("\257", 'Ї', $string);
+    // DEGREE SIGN
+    $string = str_replace("\260", '°', $string);
+    // PLUS-MINUS SIGN
+    $string = str_replace("\261", '±', $string);
+    // CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+    $string = str_replace("\262", 'І', $string);
+    // CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+    $string = str_replace("\263", 'і', $string);
+    // CYRILLIC SMALL LETTER GHE WITH UPTURN
+    $string = str_replace("\264", 'ґ', $string);
+    // MICRO SIGN
+    $string = str_replace("\265", 'µ', $string);
+    // PILCROW SIGN
+    $string = str_replace("\266", '¶', $string);
+    // MIDDLE DOT
+    $string = str_replace("\267", '·', $string);
+    // CYRILLIC SMALL LETTER IO
+    $string = str_replace("\270", 'ё', $string);
+    // NUMERO SIGN
+    $string = str_replace("\271", '№', $string);
+    // CYRILLIC SMALL LETTER UKRAINIAN IE
+    $string = str_replace("\272", 'є', $string);
+    // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+    $string = str_replace("\273", '»', $string);
+    // CYRILLIC SMALL LETTER JE
+    $string = str_replace("\274", 'ј', $string);
+    // CYRILLIC CAPITAL LETTER DZE
+    $string = str_replace("\275", 'Ѕ', $string);
+    // CYRILLIC SMALL LETTER DZE
+    $string = str_replace("\276", 'ѕ', $string);
+    // CYRILLIC SMALL LETTER YI (Ukrainian)
+    $string = str_replace("\277", 'ї', $string);
+
+    // 192-255 > 1040-1103 (+848)
+    $string = preg_replace("/([\300-\377])/e","'&#' . (ord('\\1')+848) . ';'",$string);
+
+    return $string;
+}
+
+/*
+ windows-1253 (Greek)
+ */
+function charset_decode_windows_1253 ($string) {
+    global $default_charset;
+
+    if (strtolower($default_charset) == 'windows-1253')
+        return $string;
+
+    /* Only do the slow convert if there are 8-bit characters */
+    if (! ereg("[\200-\377]", $string))
+        return $string;
+
+    $string = str_replace("\200", '€', $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("\211", '‰', $string);
+    $string = str_replace("\213", '‹', $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("\231", '™', $string);
+    $string = str_replace("\233", '›', $string);
+    $string = str_replace("\241", '΅', $string);
+    $string = str_replace("\242", 'Ά', $string);
+    $string = str_replace ("\257", '―', $string);
+    $string = str_replace("\264", '΄', $string);
+    $string = str_replace("\270", 'Έ', $string);
+    $string = str_replace ("\271", 'Ή', $string);
+    $string = str_replace ("\272", 'Ί', $string);
+    $string = str_replace ("\274", 'Ό', $string);
+    // cycle for 190-254 symbols
+    $string = preg_replace("/([\274-\376])/e","'&#' . (ord('\\1')+720);",$string);
+
+    // Rest of charset is like iso-8859-1
+    return (charset_decode_iso_8859_1($string));
+}
+
 /*
  windows-1254 (Turks)
  */
@@ -955,53 +1453,6 @@ function charset_decode_windows_1254 ($string) {
     return (charset_decode_iso_8859_1($string));
 }
 
-/*
- windows-1253 (Greek)
- */
-function charset_decode_windows_1253 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1253')
-        return $string;
-
-    /* Only do the slow convert if there are 8-bit characters */
-    if (! ereg("[\200-\377]", $string))
-        return $string;
-
-    $string = str_replace("\200", '€', $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("\211", '‰', $string);
-    $string = str_replace("\213", '‹', $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("\231", '™', $string);
-    $string = str_replace("\233", '›', $string);
-    $string = str_replace("\241", '΅', $string);
-    $string = str_replace("\242", 'Ά', $string);
-    $string = str_replace ("\257", '―', $string);
-    $string = str_replace("\264", '΄', $string);
-    $string = str_replace("\270", 'Έ', $string);
-    $string = str_replace ("\271", 'Ή', $string);
-    $string = str_replace ("\272", 'Ί', $string);
-    $string = str_replace ("\274", 'Ό', $string);
-    // cycle for 190-254 symbols
-    $string = preg_replace("/([\274-\376])/e","'&#' . (ord('\\1')+720);",$string);
-
-    // Rest of charset is like iso-8859-1
-    return (charset_decode_iso_8859_1($string));
-}
-
-
 /*
  windows-1257 (BaltRim)
  */
@@ -1095,14 +1546,6 @@ function charset_decode_windows_1257 ($string) {
     return (charset_decode_iso_8859_1($string));
 }
 
-/* windows-1251 is Microsoft Cyrillic encoding */
-function charset_decode_windows_1251 ($string) {
-    // Convert to KOI8-R, then return this decoded.
-    $string = convert_cyr_string($string, 'w', 'k');
-    return charset_decode_koi8r($string);
-}
-
-
 
 /*
  * Set up the language to be output