X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdecode%2Fiso_8859_1.php;h=027cac69df7b5609e2c078ba43f185f38fe5f8c7;hp=d1c9a399b357eb4bd7008eef2b611e076a666267;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=df8c4d6d0d3ecbfd0bb64f52ab6db6708debbdba;ds=sidebyside

diff --git a/functions/decode/iso_8859_1.php b/functions/decode/iso_8859_1.php
index d1c9a399..027cac69 100644
--- a/functions/decode/iso_8859_1.php
+++ b/functions/decode/iso_8859_1.php
@@ -1,13 +1,14 @@
 <?php
+
 /**
  * decode/iso8859-1.php
- * $Id$
- *
- * Copyright (c) 2003 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file contains iso-8859-1 decoding function that is needed to read
  * iso-8859-1 encoded mails in non-iso-8859-1 locale.
+ *
+ * @copyright 2003-2018 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package squirrelmail
  * @subpackage decode
  */
@@ -18,23 +19,19 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_1 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-1')
+    // don't do decoding when there are no 8bit symbols
+    if (! sq_is8bit($string,'iso-8859-1'))
         return $string;
 
-    /* Only do the slow convert if there are 8-bit characters */
-    /* there is no 0x80-0x9F letters in ISO8859-* */
-    if ( ! ereg("[\241-\377]", $string) )
-        return $string;
-
-    $string = preg_replace("/([\201-\237])/e","'&#' . ord('\\1') . ';'",$string);
+    $string = preg_replace_callback("/([\201-\237])/",
+    create_function ('$matches', 'return \'&#\' . ord($matches[1]) . \';\';'),
+    $string);
 
     /* I don't want to use 0xA0 (\240) in any ranges. RH73 may dislike it */
     $string = str_replace("\240", '&#160;', $string);
 
-    $string = preg_replace("/([\241-\377])/e","'&#' . ord('\\1') . ';'",$string);
+    $string = preg_replace_callback("/([\241-\377])/",
+    create_function ('$matches', 'return \'&#\' . ord($matches[1]) . \';\';'),
+    $string);
     return $string;
 }
-
-?>