Przeglądaj źródła

Fixed some mistakes.

tokul 22 lat temu
rodzic
commit
4e31219bf9
2 zmienionych plików z 139 dodań i 132 usunięć
  1. 138 131
      functions/decode/cp1256.php
  2. 1 1
      functions/decode/iso8859-6.php

+ 138 - 131
functions/decode/cp1256.php

@@ -21,10 +21,10 @@
  *
  */
 
-function charset_decode_cp1257 ($string) {
+function charset_decode_cp1256 ($string) {
     global $default_charset;
 
-    if (strtolower($default_charset) == 'windows-1257')
+    if (strtolower($default_charset) == 'windows-1256')
         return $string;
 
     /* Only do the slow convert if there are 8-bit characters */
@@ -32,133 +32,140 @@ function charset_decode_cp1257 ($string) {
     if (! ereg("[\200-\237]", $string) and ! ereg("[\241-\377]", $string) )
         return $string;
 
-    $cp1257 = array(
+    $cp1256 = 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($cp1256), array_values($cp1256), $string);
+
+    return $string;
+}
+
+?>

+ 1 - 1
functions/decode/iso8859-6.php

@@ -102,7 +102,7 @@ function charset_decode_iso8859_6 ($string) {
 	"\xF2" => 'ْ'
     );
 
-    $string = str_replace(array_keys(iso8859_6), array_values($iso8859_6), $string);
+    $string = str_replace(array_keys($iso8859_6), array_values($iso8859_6), $string);
 
     return $string;
 }