X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdecode%2Fcp1252.php;h=3c53ec4fc37c6a6730497da65670f2b24276b20d;hb=24e8917ead46268f6a4264900c832b4a5c37ee84;hp=56218332214a5c3ab5ef1e9bc23dd91d5ce408e4;hpb=31841a9ece7cc2ae90bf52dd92db68142172a47b;p=squirrelmail.git

diff --git a/functions/decode/cp1252.php b/functions/decode/cp1252.php
index 56218332..3c53ec4f 100644
--- a/functions/decode/cp1252.php
+++ b/functions/decode/cp1252.php
@@ -1,13 +1,11 @@
 <?php
+
 /**
  * decode/cp1252.php
  *
- * Copyright (c) 2003-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This file contains cp1252 decoding function that is needed to read
  * cp1252 encoded mails in non-cp1252 locale.
- * 
+ *
  * Original data taken from:
  *  ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1252.TXT
  *
@@ -18,6 +16,8 @@
  *   Date:          04/15/98
  *   Contact:       cpxlate@microsoft.com
  *
+ * @copyright 2003-2020 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @subpackage decode
@@ -30,150 +30,142 @@
  */
 
 function charset_decode_cp1252 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1252')
-        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-1252'))
         return $string;
 
     $cp1252 = array(
-	"\x80" => '&#8364;',
-	"\x81" => '&#65533;',
-	"\x82" => '&#8218;',
-	"\x83" => '&#402;',
-	"\x84" => '&#8222;',
-	"\x85" => '&#8230;',
-	"\x86" => '&#8224;',
-	"\x87" => '&#8225;',
-	"\x88" => '&#710;',
-	"\x89" => '&#8240;',
-	"\x8A" => '&#352;',
-	"\x8B" => '&#8249;',
-	"\x8C" => '&#338;',
-	"\x8D" => '&#65533;',
-	"\x8E" => '&#381;',
-	"\x8F" => '&#65533;',
-	"\x90" => '&#65533;',
-	"\x91" => '&#8216;',
-	"\x92" => '&#8217;',
-	"\x93" => '&#8220;',
-	"\x94" => '&#8221;',
-	"\x95" => '&#8226;',
-	"\x96" => '&#8211;',
-	"\x97" => '&#8212;',
-	"\x98" => '&#732;',
-	"\x99" => '&#8482;',
-	"\x9A" => '&#353;',
-	"\x9B" => '&#8250;',
-	"\x9C" => '&#339;',
-	"\x9D" => '&#65533;',
-	"\x9E" => '&#382;',
-	"\x9F" => '&#376;',
-	"\xA0" => '&#160;',
-	"\xA1" => '&#161;',
-	"\xA2" => '&#162;',
-	"\xA3" => '&#163;',
-	"\xA4" => '&#164;',
-	"\xA5" => '&#165;',
-	"\xA6" => '&#166;',
-	"\xA7" => '&#167;',
-	"\xA8" => '&#168;',
-	"\xA9" => '&#169;',
-	"\xAA" => '&#170;',
-	"\xAB" => '&#171;',
-	"\xAC" => '&#172;',
-	"\xAD" => '&#173;',
-	"\xAE" => '&#174;',
-	"\xAF" => '&#175;',
-	"\xB0" => '&#176;',
-	"\xB1" => '&#177;',
-	"\xB2" => '&#178;',
-	"\xB3" => '&#179;',
-	"\xB4" => '&#180;',
-	"\xB5" => '&#181;',
-	"\xB6" => '&#182;',
-	"\xB7" => '&#183;',
-	"\xB8" => '&#184;',
-	"\xB9" => '&#185;',
-	"\xBA" => '&#186;',
-	"\xBB" => '&#187;',
-	"\xBC" => '&#188;',
-	"\xBD" => '&#189;',
-	"\xBE" => '&#190;',
-	"\xBF" => '&#191;',
-	"\xC0" => '&#192;',
-	"\xC1" => '&#193;',
-	"\xC2" => '&#194;',
-	"\xC3" => '&#195;',
-	"\xC4" => '&#196;',
-	"\xC5" => '&#197;',
-	"\xC6" => '&#198;',
-	"\xC7" => '&#199;',
-	"\xC8" => '&#200;',
-	"\xC9" => '&#201;',
-	"\xCA" => '&#202;',
-	"\xCB" => '&#203;',
-	"\xCC" => '&#204;',
-	"\xCD" => '&#205;',
-	"\xCE" => '&#206;',
-	"\xCF" => '&#207;',
-	"\xD0" => '&#208;',
-	"\xD1" => '&#209;',
-	"\xD2" => '&#210;',
-	"\xD3" => '&#211;',
-	"\xD4" => '&#212;',
-	"\xD5" => '&#213;',
-	"\xD6" => '&#214;',
-	"\xD7" => '&#215;',
-	"\xD8" => '&#216;',
-	"\xD9" => '&#217;',
-	"\xDA" => '&#218;',
-	"\xDB" => '&#219;',
-	"\xDC" => '&#220;',
-	"\xDD" => '&#221;',
-	"\xDE" => '&#222;',
-	"\xDF" => '&#223;',
-	"\xE0" => '&#224;',
-	"\xE1" => '&#225;',
-	"\xE2" => '&#226;',
-	"\xE3" => '&#227;',
-	"\xE4" => '&#228;',
-	"\xE5" => '&#229;',
-	"\xE6" => '&#230;',
-	"\xE7" => '&#231;',
-	"\xE8" => '&#232;',
-	"\xE9" => '&#233;',
-	"\xEA" => '&#234;',
-	"\xEB" => '&#235;',
-	"\xEC" => '&#236;',
-	"\xED" => '&#237;',
-	"\xEE" => '&#238;',
-	"\xEF" => '&#239;',
-	"\xF0" => '&#240;',
-	"\xF1" => '&#241;',
-	"\xF2" => '&#242;',
-	"\xF3" => '&#243;',
-	"\xF4" => '&#244;',
-	"\xF5" => '&#245;',
-	"\xF6" => '&#246;',
-	"\xF7" => '&#247;',
-	"\xF8" => '&#248;',
-	"\xF9" => '&#249;',
-	"\xFA" => '&#250;',
-	"\xFB" => '&#251;',
-	"\xFC" => '&#252;',
-	"\xFD" => '&#253;',
-	"\xFE" => '&#254;',
-	"\xFF" => '&#255;'
+        "\x80" => '&#8364;',
+        "\x81" => '&#65533;',
+        "\x82" => '&#8218;',
+        "\x83" => '&#402;',
+        "\x84" => '&#8222;',
+        "\x85" => '&#8230;',
+        "\x86" => '&#8224;',
+        "\x87" => '&#8225;',
+        "\x88" => '&#710;',
+        "\x89" => '&#8240;',
+        "\x8A" => '&#352;',
+        "\x8B" => '&#8249;',
+        "\x8C" => '&#338;',
+        "\x8D" => '&#65533;',
+        "\x8E" => '&#381;',
+        "\x8F" => '&#65533;',
+        "\x90" => '&#65533;',
+        "\x91" => '&#8216;',
+        "\x92" => '&#8217;',
+        "\x93" => '&#8220;',
+        "\x94" => '&#8221;',
+        "\x95" => '&#8226;',
+        "\x96" => '&#8211;',
+        "\x97" => '&#8212;',
+        "\x98" => '&#732;',
+        "\x99" => '&#8482;',
+        "\x9A" => '&#353;',
+        "\x9B" => '&#8250;',
+        "\x9C" => '&#339;',
+        "\x9D" => '&#65533;',
+        "\x9E" => '&#382;',
+        "\x9F" => '&#376;',
+        "\xA0" => '&#160;',
+        "\xA1" => '&#161;',
+        "\xA2" => '&#162;',
+        "\xA3" => '&#163;',
+        "\xA4" => '&#164;',
+        "\xA5" => '&#165;',
+        "\xA6" => '&#166;',
+        "\xA7" => '&#167;',
+        "\xA8" => '&#168;',
+        "\xA9" => '&#169;',
+        "\xAA" => '&#170;',
+        "\xAB" => '&#171;',
+        "\xAC" => '&#172;',
+        "\xAD" => '&#173;',
+        "\xAE" => '&#174;',
+        "\xAF" => '&#175;',
+        "\xB0" => '&#176;',
+        "\xB1" => '&#177;',
+        "\xB2" => '&#178;',
+        "\xB3" => '&#179;',
+        "\xB4" => '&#180;',
+        "\xB5" => '&#181;',
+        "\xB6" => '&#182;',
+        "\xB7" => '&#183;',
+        "\xB8" => '&#184;',
+        "\xB9" => '&#185;',
+        "\xBA" => '&#186;',
+        "\xBB" => '&#187;',
+        "\xBC" => '&#188;',
+        "\xBD" => '&#189;',
+        "\xBE" => '&#190;',
+        "\xBF" => '&#191;',
+        "\xC0" => '&#192;',
+        "\xC1" => '&#193;',
+        "\xC2" => '&#194;',
+        "\xC3" => '&#195;',
+        "\xC4" => '&#196;',
+        "\xC5" => '&#197;',
+        "\xC6" => '&#198;',
+        "\xC7" => '&#199;',
+        "\xC8" => '&#200;',
+        "\xC9" => '&#201;',
+        "\xCA" => '&#202;',
+        "\xCB" => '&#203;',
+        "\xCC" => '&#204;',
+        "\xCD" => '&#205;',
+        "\xCE" => '&#206;',
+        "\xCF" => '&#207;',
+        "\xD0" => '&#208;',
+        "\xD1" => '&#209;',
+        "\xD2" => '&#210;',
+        "\xD3" => '&#211;',
+        "\xD4" => '&#212;',
+        "\xD5" => '&#213;',
+        "\xD6" => '&#214;',
+        "\xD7" => '&#215;',
+        "\xD8" => '&#216;',
+        "\xD9" => '&#217;',
+        "\xDA" => '&#218;',
+        "\xDB" => '&#219;',
+        "\xDC" => '&#220;',
+        "\xDD" => '&#221;',
+        "\xDE" => '&#222;',
+        "\xDF" => '&#223;',
+        "\xE0" => '&#224;',
+        "\xE1" => '&#225;',
+        "\xE2" => '&#226;',
+        "\xE3" => '&#227;',
+        "\xE4" => '&#228;',
+        "\xE5" => '&#229;',
+        "\xE6" => '&#230;',
+        "\xE7" => '&#231;',
+        "\xE8" => '&#232;',
+        "\xE9" => '&#233;',
+        "\xEA" => '&#234;',
+        "\xEB" => '&#235;',
+        "\xEC" => '&#236;',
+        "\xED" => '&#237;',
+        "\xEE" => '&#238;',
+        "\xEF" => '&#239;',
+        "\xF0" => '&#240;',
+        "\xF1" => '&#241;',
+        "\xF2" => '&#242;',
+        "\xF3" => '&#243;',
+        "\xF4" => '&#244;',
+        "\xF5" => '&#245;',
+        "\xF6" => '&#246;',
+        "\xF7" => '&#247;',
+        "\xF8" => '&#248;',
+        "\xF9" => '&#249;',
+        "\xFA" => '&#250;',
+        "\xFB" => '&#251;',
+        "\xFC" => '&#252;',
+        "\xFD" => '&#253;',
+        "\xFE" => '&#254;',
+        "\xFF" => '&#255;'
     );
 
     $string = str_replace(array_keys($cp1252), array_values($cp1252), $string);
 
     return $string;
 }
-
-?>