Replacing tabs with spaces, trimming white space at EOL and newline at EOF

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

diff --git a/functions/decode/cp1250.php b/functions/decode/cp1250.php
index bff8fa3b06c82e2c1eb14313a094c129d6d32ffa..e2156c635bebf09f645f6f9b1a4c8324ceb314ce 100644 (file)
--- a/functions/decode/cp1250.php
+++ b/functions/decode/cp1250.php
@@ -7,7 +7,7 @@
  *
  * This file contains cp1250 decoding function that is needed to read
  * cp1250 encoded mails in non-cp1250 locale.
- * 
+ *
  * Original data taken from:
  *  ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1250.TXT
  *
@@ -34,140 +34,139 @@ function charset_decode_cp1250 ($string) {
     if (strtolower($default_charset) == 'windows-1250')
         return $string;
 
-    /* Only do the slow convert if there are 8-bit characters */
-    /* avoid using 0xA0 (\240) in ereg ranges. RH73 does not like that */
-    if (! ereg("[\200-\237]", $string) and ! ereg("[\241-\377]", $string) )
+    // don't do decoding when there are no 8bit symbols
+    if (! sq_is8bit($string,'windows-1250'))
         return $string;
 
     $cp1250 = array(
-       "\x80" => '€',
-       "\x81" => '�',
-       "\x82" => '‚',
-       "\x83" => '�',
-       "\x84" => '„',
-       "\x85" => '…',
-       "\x86" => '†',
-       "\x87" => '‡',
-       "\x88" => '�',
-       "\x89" => '‰',
-       "\x8A" => 'Š',
-       "\x8B" => '‹',
-       "\x8C" => 'Ś',
-       "\x8D" => 'Ť',
-       "\x8E" => 'Ž',
-       "\x8F" => 'Ź',
-       "\x90" => '�',
-       "\x91" => '‘',
-       "\x92" => '’',
-       "\x93" => '“',
-       "\x94" => '”',
-       "\x95" => '•',
-       "\x96" => '–',
-       "\x97" => '—',
-       "\x98" => '�',
-       "\x99" => '™',
-       "\x9A" => 'š',
-       "\x9B" => '›',
-       "\x9C" => 'ś',
-       "\x9D" => 'ť',
-       "\x9E" => 'ž',
-       "\x9F" => 'ź',
-       "\xA0" => ' ',
-       "\xA1" => 'ˇ',
-       "\xA2" => '˘',
-       "\xA3" => 'Ł',
-       "\xA4" => '¤',
-       "\xA5" => 'Ą',
-       "\xA6" => '¦',
-       "\xA7" => '§',
-       "\xA8" => '¨',
-       "\xA9" => '©',
-       "\xAA" => 'Ş',
-       "\xAB" => '«',
-       "\xAC" => '¬',
-       "\xAD" => '­',
-       "\xAE" => '®',
-       "\xAF" => 'Ż',
-       "\xB0" => '°',
-       "\xB1" => '±',
-       "\xB2" => '˛',
-       "\xB3" => 'ł',
-       "\xB4" => '´',
-       "\xB5" => 'µ',
-       "\xB6" => '¶',
-       "\xB7" => '·',
-       "\xB8" => '¸',
-       "\xB9" => 'ą',
-       "\xBA" => 'ş',
-       "\xBB" => '»',
-       "\xBC" => 'Ľ',
-       "\xBD" => '˝',
-       "\xBE" => 'ľ',
-       "\xBF" => 'ż',
-       "\xC0" => 'Ŕ',
-       "\xC1" => 'Á',
-       "\xC2" => 'Â',
-       "\xC3" => 'Ă',
-       "\xC4" => 'Ä',
-       "\xC5" => 'Ĺ',
-       "\xC6" => 'Ć',
-       "\xC7" => 'Ç',
-       "\xC8" => 'Č',
-       "\xC9" => 'É',
-       "\xCA" => 'Ę',
-       "\xCB" => 'Ë',
-       "\xCC" => 'Ě',
-       "\xCD" => 'Í',
-       "\xCE" => 'Î',
-       "\xCF" => 'Ď',
-       "\xD0" => 'Đ',
-       "\xD1" => 'Ń',
-       "\xD2" => 'Ň',
-       "\xD3" => 'Ó',
-       "\xD4" => 'Ô',
-       "\xD5" => 'Ő',
-       "\xD6" => 'Ö',
-       "\xD7" => '×',
-       "\xD8" => 'Ř',
-       "\xD9" => 'Ů',
-       "\xDA" => 'Ú',
-       "\xDB" => 'Ű',
-       "\xDC" => 'Ü',
-       "\xDD" => 'Ý',
-       "\xDE" => 'Ţ',
-       "\xDF" => 'ß',
-       "\xE0" => 'ŕ',
-       "\xE1" => 'á',
-       "\xE2" => 'â',
-       "\xE3" => 'ă',
-       "\xE4" => 'ä',
-       "\xE5" => 'ĺ',
-       "\xE6" => 'ć',
-       "\xE7" => 'ç',
-       "\xE8" => 'č',
-       "\xE9" => 'é',
-       "\xEA" => 'ę',
-       "\xEB" => 'ë',
-       "\xEC" => 'ě',
-       "\xED" => 'í',
-       "\xEE" => 'î',
-       "\xEF" => 'ď',
-       "\xF0" => 'đ',
-       "\xF1" => 'ń',
-       "\xF2" => 'ň',
-       "\xF3" => 'ó',
-       "\xF4" => 'ô',
-       "\xF5" => 'ő',
-       "\xF6" => 'ö',
-       "\xF7" => '÷',
-       "\xF8" => 'ř',
-       "\xF9" => 'ů',
-       "\xFA" => 'ú',
-       "\xFB" => 'ű',
-       "\xFC" => 'ü',
-       "\xFD" => 'ý',
-       "\xFE" => 'ţ',
-       "\xFF" => '˙'
+        "\x80" => '€',
+        "\x81" => '�',
+        "\x82" => '‚',
+        "\x83" => '�',
+        "\x84" => '„',
+        "\x85" => '…',
+        "\x86" => '†',
+        "\x87" => '‡',
+        "\x88" => '�',
+        "\x89" => '‰',
+        "\x8A" => 'Š',
+        "\x8B" => '‹',
+        "\x8C" => 'Ś',
+        "\x8D" => 'Ť',
+        "\x8E" => 'Ž',
+        "\x8F" => 'Ź',
+        "\x90" => '�',
+        "\x91" => '‘',
+        "\x92" => '’',
+        "\x93" => '“',
+        "\x94" => '”',
+        "\x95" => '•',
+        "\x96" => '–',
+        "\x97" => '—',
+        "\x98" => '�',
+        "\x99" => '™',
+        "\x9A" => 'š',
+        "\x9B" => '›',
+        "\x9C" => 'ś',
+        "\x9D" => 'ť',
+        "\x9E" => 'ž',
+        "\x9F" => 'ź',
+        "\xA0" => ' ',
+        "\xA1" => 'ˇ',
+        "\xA2" => '˘',
+        "\xA3" => 'Ł',
+        "\xA4" => '¤',
+        "\xA5" => 'Ą',
+        "\xA6" => '¦',
+        "\xA7" => '§',
+        "\xA8" => '¨',
+        "\xA9" => '©',
+        "\xAA" => 'Ş',
+        "\xAB" => '«',
+        "\xAC" => '¬',
+        "\xAD" => '­',
+        "\xAE" => '®',
+        "\xAF" => 'Ż',
+        "\xB0" => '°',
+        "\xB1" => '±',
+        "\xB2" => '˛',
+        "\xB3" => 'ł',
+        "\xB4" => '´',
+        "\xB5" => 'µ',
+        "\xB6" => '¶',
+        "\xB7" => '·',
+        "\xB8" => '¸',
+        "\xB9" => 'ą',
+        "\xBA" => 'ş',
+        "\xBB" => '»',
+        "\xBC" => 'Ľ',
+        "\xBD" => '˝',
+        "\xBE" => 'ľ',
+        "\xBF" => 'ż',
+        "\xC0" => 'Ŕ',
+        "\xC1" => 'Á',
+        "\xC2" => 'Â',
+        "\xC3" => 'Ă',
+        "\xC4" => 'Ä',
+        "\xC5" => 'Ĺ',
+        "\xC6" => 'Ć',
+        "\xC7" => 'Ç',
+        "\xC8" => 'Č',
+        "\xC9" => 'É',
+        "\xCA" => 'Ę',
+        "\xCB" => 'Ë',
+        "\xCC" => 'Ě',
+        "\xCD" => 'Í',
+        "\xCE" => 'Î',
+        "\xCF" => 'Ď',
+        "\xD0" => 'Đ',
+        "\xD1" => 'Ń',
+        "\xD2" => 'Ň',
+        "\xD3" => 'Ó',
+        "\xD4" => 'Ô',
+        "\xD5" => 'Ő',
+        "\xD6" => 'Ö',
+        "\xD7" => '×',
+        "\xD8" => 'Ř',
+        "\xD9" => 'Ů',
+        "\xDA" => 'Ú',
+        "\xDB" => 'Ű',
+        "\xDC" => 'Ü',
+        "\xDD" => 'Ý',
+        "\xDE" => 'Ţ',
+        "\xDF" => 'ß',
+        "\xE0" => 'ŕ',
+        "\xE1" => 'á',
+        "\xE2" => 'â',
+        "\xE3" => 'ă',
+        "\xE4" => 'ä',
+        "\xE5" => 'ĺ',
+        "\xE6" => 'ć',
+        "\xE7" => 'ç',
+        "\xE8" => 'č',
+        "\xE9" => 'é',
+        "\xEA" => 'ę',
+        "\xEB" => 'ë',
+        "\xEC" => 'ě',
+        "\xED" => 'í',
+        "\xEE" => 'î',
+        "\xEF" => 'ď',
+        "\xF0" => 'đ',
+        "\xF1" => 'ń',
+        "\xF2" => 'ň',
+        "\xF3" => 'ó',
+        "\xF4" => 'ô',
+        "\xF5" => 'ő',
+        "\xF6" => 'ö',
+        "\xF7" => '÷',
+        "\xF8" => 'ř',
+        "\xF9" => 'ů',
+        "\xFA" => 'ú',
+        "\xFB" => 'ű',
+        "\xFC" => 'ü',
+        "\xFD" => 'ý',
+        "\xFE" => 'ţ',
+        "\xFF" => '˙'
     );
 
     $string = str_replace(array_keys($cp1250), array_values($cp1250), $string);
@@ -175,4 +174,4 @@ function charset_decode_cp1250 ($string) {
     return $string;
 }
 
-?>
+?>
\ No newline at end of file