Happy New Year

[squirrelmail.git] / functions / encode / us_ascii.php

diff --git a/functions/encode/us_ascii.php b/functions/encode/us_ascii.php
index efa9638aebfb598b8e8474977a21e6f287da1f87..2c75c93b1d8ea4b2c45b63aefda48e6d5c95afa1 100644 (file)
--- a/functions/encode/us_ascii.php
+++ b/functions/encode/us_ascii.php
@@ -6,7 +6,7 @@
  * takes a string of unicode entities and converts it to a us-ascii encoded string
  * Unsupported characters are replaced with ?.
  *
- * @copyright © 2004-2005 The SquirrelMail Project Team
+ * @copyright 2004-2018 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -22,8 +22,7 @@ function charset_encode_us_ascii ($string) {
    // don't run encoding function, if there is no encoded characters
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
-    $string=preg_replace("/&#([0-9]+);/e","unicodetousascii('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetousascii(hexdec('\\1'))",$string);
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetousascii',$string);
 
     return $string;
 }
@@ -36,10 +35,11 @@ function charset_encode_us_ascii ($string) {
  * Don't use it or make sure, that functions/encode/us_ascii.php is
  * included.
  *
- * @param int $var decimal unicode value
+ * @param array $matches array with first element a decimal unicode value
  * @return string us-ascii character
  */
-function unicodetousascii($var) {
+function unicodetousascii($matches) {
+    $var = $matches[1];
 
     if ($var < 128) {
         $ret = chr ($var);
@@ -48,4 +48,3 @@ function unicodetousascii($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file