X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdecode%2Fcp1251.php;h=87d11b067ad071ed22b44ccc5339243a4e37db18;hb=049dd3d14ad72a9d624f6b67826e82ad1015c9dc;hp=6ba0ca07c2d21c4c72d17767872b74ecb75ff804;hpb=211d912ffe25b0576bd75064d85462558701ae9c;p=squirrelmail.git

diff --git a/functions/decode/cp1251.php b/functions/decode/cp1251.php
index 6ba0ca07..87d11b06 100644
--- a/functions/decode/cp1251.php
+++ b/functions/decode/cp1251.php
@@ -1,14 +1,11 @@
 <?php
-/*
+
+/**
  * decode/cp1251.php
- * $Id$
- *
- * Copyright (c) 2003 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file contains cp1251 decoding function that is needed to read
  * cp1251 encoded mails in non-cp1251 locale.
- * 
+ *
  * Original data taken from:
  *  ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1250.TXT
  *
@@ -19,153 +16,155 @@
  *   Date:          04/15/98
  *   Contact:       cpxlate@microsoft.com
  *
+ * @copyright 2003-2017 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage decode
  */
 
+/**
+ * Decode cp1251-encoded string
+ * @param string $string Encoded string
+ * @return string $string Decoded string
+ */
 function charset_decode_cp1251 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1251')
-        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-1251'))
         return $string;
 
     $cp1251 = array(
-	"\x80" => '&#1026;',
-	"\x81" => '&#1027;',
-	"\x82" => '&#8218;',
-	"\x83" => '&#1107;',
-	"\x84" => '&#8222;',
-	"\x85" => '&#8230;',
-	"\x86" => '&#8224;',
-	"\x87" => '&#8225;',
-	"\x88" => '&#8364;',
-	"\x89" => '&#8240;',
-	"\x8A" => '&#1033;',
-	"\x8B" => '&#8249;',
-	"\x8C" => '&#1034;',
-	"\x8D" => '&#1036;',
-	"\x8E" => '&#1035;',
-	"\x8F" => '&#1039;',
-	"\x90" => '&#1106;',
-	"\x91" => '&#8216;',
-	"\x92" => '&#8217;',
-	"\x93" => '&#8220;',
-	"\x94" => '&#8221;',
-	"\x95" => '&#8226;',
-	"\x96" => '&#8211;',
-	"\x97" => '&#8212;',
-	"\x98" => '&#65533;',
-	"\x99" => '&#8482;',
-	"\x9A" => '&#1113;',
-	"\x9B" => '&#8250;',
-	"\x9C" => '&#1114;',
-	"\x9D" => '&#1116;',
-	"\x9E" => '&#1115;',
-	"\x9F" => '&#1119;',
-	"\xA0" => '&#160;',
-	"\xA1" => '&#1038;',
-	"\xA2" => '&#1118;',
-	"\xA3" => '&#1032;',
-	"\xA4" => '&#164;',
-	"\xA5" => '&#1168;',
-	"\xA6" => '&#166;',
-	"\xA7" => '&#167;',
-	"\xA8" => '&#1025;',
-	"\xA9" => '&#169;',
-	"\xAA" => '&#1028;',
-	"\xAB" => '&#171;',
-	"\xAC" => '&#172;',
-	"\xAD" => '&#173;',
-	"\xAE" => '&#174;',
-	"\xAF" => '&#1031;',
-	"\xB0" => '&#176;',
-	"\xB1" => '&#177;',
-	"\xB2" => '&#1030;',
-	"\xB3" => '&#1110;',
-	"\xB4" => '&#1169;',
-	"\xB5" => '&#181;',
-	"\xB6" => '&#182;',
-	"\xB7" => '&#183;',
-	"\xB8" => '&#1105;',
-	"\xB9" => '&#8470;',
-	"\xBA" => '&#1108;',
-	"\xBB" => '&#187;',
-	"\xBC" => '&#1112;',
-	"\xBD" => '&#1029;',
-	"\xBE" => '&#1109;',
-	"\xBF" => '&#1111;',
-	"\xC0" => '&#1040;',
-	"\xC1" => '&#1041;',
-	"\xC2" => '&#1042;',
-	"\xC3" => '&#1043;',
-	"\xC4" => '&#1044;',
-	"\xC5" => '&#1045;',
-	"\xC6" => '&#1046;',
-	"\xC7" => '&#1047;',
-	"\xC8" => '&#1048;',
-	"\xC9" => '&#1049;',
-	"\xCA" => '&#1050;',
-	"\xCB" => '&#1051;',
-	"\xCC" => '&#1052;',
-	"\xCD" => '&#1053;',
-	"\xCE" => '&#1054;',
-	"\xCF" => '&#1055;',
-	"\xD0" => '&#1056;',
-	"\xD1" => '&#1057;',
-	"\xD2" => '&#1058;',
-	"\xD3" => '&#1059;',
-	"\xD4" => '&#1060;',
-	"\xD5" => '&#1061;',
-	"\xD6" => '&#1062;',
-	"\xD7" => '&#1063;',
-	"\xD8" => '&#1064;',
-	"\xD9" => '&#1065;',
-	"\xDA" => '&#1066;',
-	"\xDB" => '&#1067;',
-	"\xDC" => '&#1068;',
-	"\xDD" => '&#1069;',
-	"\xDE" => '&#1070;',
-	"\xDF" => '&#1071;',
-	"\xE0" => '&#1072;',
-	"\xE1" => '&#1073;',
-	"\xE2" => '&#1074;',
-	"\xE3" => '&#1075;',
-	"\xE4" => '&#1076;',
-	"\xE5" => '&#1077;',
-	"\xE6" => '&#1078;',
-	"\xE7" => '&#1079;',
-	"\xE8" => '&#1080;',
-	"\xE9" => '&#1081;',
-	"\xEA" => '&#1082;',
-	"\xEB" => '&#1083;',
-	"\xEC" => '&#1084;',
-	"\xED" => '&#1085;',
-	"\xEE" => '&#1086;',
-	"\xEF" => '&#1087;',
-	"\xF0" => '&#1088;',
-	"\xF1" => '&#1089;',
-	"\xF2" => '&#1090;',
-	"\xF3" => '&#1091;',
-	"\xF4" => '&#1092;',
-	"\xF5" => '&#1093;',
-	"\xF6" => '&#1094;',
-	"\xF7" => '&#1095;',
-	"\xF8" => '&#1096;',
-	"\xF9" => '&#1097;',
-	"\xFA" => '&#1098;',
-	"\xFB" => '&#1099;',
-	"\xFC" => '&#1100;',
-	"\xFD" => '&#1101;',
-	"\xFE" => '&#1102;',
-	"\xFF" => '&#1103;'
+        "\x80" => '&#1026;',
+        "\x81" => '&#1027;',
+        "\x82" => '&#8218;',
+        "\x83" => '&#1107;',
+        "\x84" => '&#8222;',
+        "\x85" => '&#8230;',
+        "\x86" => '&#8224;',
+        "\x87" => '&#8225;',
+        "\x88" => '&#8364;',
+        "\x89" => '&#8240;',
+        "\x8A" => '&#1033;',
+        "\x8B" => '&#8249;',
+        "\x8C" => '&#1034;',
+        "\x8D" => '&#1036;',
+        "\x8E" => '&#1035;',
+        "\x8F" => '&#1039;',
+        "\x90" => '&#1106;',
+        "\x91" => '&#8216;',
+        "\x92" => '&#8217;',
+        "\x93" => '&#8220;',
+        "\x94" => '&#8221;',
+        "\x95" => '&#8226;',
+        "\x96" => '&#8211;',
+        "\x97" => '&#8212;',
+        "\x98" => '&#65533;',
+        "\x99" => '&#8482;',
+        "\x9A" => '&#1113;',
+        "\x9B" => '&#8250;',
+        "\x9C" => '&#1114;',
+        "\x9D" => '&#1116;',
+        "\x9E" => '&#1115;',
+        "\x9F" => '&#1119;',
+        "\xA0" => '&#160;',
+        "\xA1" => '&#1038;',
+        "\xA2" => '&#1118;',
+        "\xA3" => '&#1032;',
+        "\xA4" => '&#164;',
+        "\xA5" => '&#1168;',
+        "\xA6" => '&#166;',
+        "\xA7" => '&#167;',
+        "\xA8" => '&#1025;',
+        "\xA9" => '&#169;',
+        "\xAA" => '&#1028;',
+        "\xAB" => '&#171;',
+        "\xAC" => '&#172;',
+        "\xAD" => '&#173;',
+        "\xAE" => '&#174;',
+        "\xAF" => '&#1031;',
+        "\xB0" => '&#176;',
+        "\xB1" => '&#177;',
+        "\xB2" => '&#1030;',
+        "\xB3" => '&#1110;',
+        "\xB4" => '&#1169;',
+        "\xB5" => '&#181;',
+        "\xB6" => '&#182;',
+        "\xB7" => '&#183;',
+        "\xB8" => '&#1105;',
+        "\xB9" => '&#8470;',
+        "\xBA" => '&#1108;',
+        "\xBB" => '&#187;',
+        "\xBC" => '&#1112;',
+        "\xBD" => '&#1029;',
+        "\xBE" => '&#1109;',
+        "\xBF" => '&#1111;',
+        "\xC0" => '&#1040;',
+        "\xC1" => '&#1041;',
+        "\xC2" => '&#1042;',
+        "\xC3" => '&#1043;',
+        "\xC4" => '&#1044;',
+        "\xC5" => '&#1045;',
+        "\xC6" => '&#1046;',
+        "\xC7" => '&#1047;',
+        "\xC8" => '&#1048;',
+        "\xC9" => '&#1049;',
+        "\xCA" => '&#1050;',
+        "\xCB" => '&#1051;',
+        "\xCC" => '&#1052;',
+        "\xCD" => '&#1053;',
+        "\xCE" => '&#1054;',
+        "\xCF" => '&#1055;',
+        "\xD0" => '&#1056;',
+        "\xD1" => '&#1057;',
+        "\xD2" => '&#1058;',
+        "\xD3" => '&#1059;',
+        "\xD4" => '&#1060;',
+        "\xD5" => '&#1061;',
+        "\xD6" => '&#1062;',
+        "\xD7" => '&#1063;',
+        "\xD8" => '&#1064;',
+        "\xD9" => '&#1065;',
+        "\xDA" => '&#1066;',
+        "\xDB" => '&#1067;',
+        "\xDC" => '&#1068;',
+        "\xDD" => '&#1069;',
+        "\xDE" => '&#1070;',
+        "\xDF" => '&#1071;',
+        "\xE0" => '&#1072;',
+        "\xE1" => '&#1073;',
+        "\xE2" => '&#1074;',
+        "\xE3" => '&#1075;',
+        "\xE4" => '&#1076;',
+        "\xE5" => '&#1077;',
+        "\xE6" => '&#1078;',
+        "\xE7" => '&#1079;',
+        "\xE8" => '&#1080;',
+        "\xE9" => '&#1081;',
+        "\xEA" => '&#1082;',
+        "\xEB" => '&#1083;',
+        "\xEC" => '&#1084;',
+        "\xED" => '&#1085;',
+        "\xEE" => '&#1086;',
+        "\xEF" => '&#1087;',
+        "\xF0" => '&#1088;',
+        "\xF1" => '&#1089;',
+        "\xF2" => '&#1090;',
+        "\xF3" => '&#1091;',
+        "\xF4" => '&#1092;',
+        "\xF5" => '&#1093;',
+        "\xF6" => '&#1094;',
+        "\xF7" => '&#1095;',
+        "\xF8" => '&#1096;',
+        "\xF9" => '&#1097;',
+        "\xFA" => '&#1098;',
+        "\xFB" => '&#1099;',
+        "\xFC" => '&#1100;',
+        "\xFD" => '&#1101;',
+        "\xFE" => '&#1102;',
+        "\xFF" => '&#1103;'
     );
 
     $string = str_replace(array_keys($cp1251), array_values($cp1251), $string);
 
     return $string;
 }
-
-?>
\ No newline at end of file