X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fencode%2Futf_8.php;h=50ab58bb4b5c47c1d457dee6959c001db37a1de1;hp=c1c45b520b0234105d4e40339a5df29c0018c070;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=78086b294b663875a6192edbe8f337da96ccdb2b

diff --git a/functions/encode/utf_8.php b/functions/encode/utf_8.php
index c1c45b52..50ab58bb 100644
--- a/functions/encode/utf_8.php
+++ b/functions/encode/utf_8.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * utf-8 encoding functions
  *
@@ -9,8 +10,9 @@
  * Original code is taken from www.php.net manual comments
  * Original author: ronen at greyzone dot com
  *
+ * @copyright 2004-2018 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
- * @copyright Copyright &copy; SquirrelMail Development Team, 2004
  * @package squirrelmail
  * @subpackage encode
  */
@@ -24,24 +26,24 @@ function charset_encode_utf_8 ($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","unicodetoutf8('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoutf8(hexdec('\\1'))",$string);
-    
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetoutf8',$string);
+
     return $string;
 }
 
 /**
  * Return utf8 symbol when unicode character number is provided
- * 
- * This function is used internally by charset_encode_utf_8 
- * function. It might be unavailable to other squirrelmail functions.
- * Don't use it or make sure, that functions/encode/utf_8.php is 
- * included. 
  *
- * @param int $var decimal unicode value
+ * This function is used internally by charset_encode_utf_8
+ * function. It might be unavailable to other SquirrelMail functions.
+ * Don't use it or make sure, that functions/encode/utf_8.php is
+ * included.
+ *
+ * @param array $matches array with first element a decimal unicode value
  * @return string utf8 character
  */
-function unicodetoutf8($var) {
+function unicodetoutf8($matches) {
+    $var = $matches[1];
 
     if ($var < 128) {
         $ret = chr ($var);
@@ -50,7 +52,7 @@ function unicodetoutf8($var) {
         $binVal = str_pad (decbin ($var), 11, "0", STR_PAD_LEFT);
         $binPart1 = substr ($binVal, 0, 5);
         $binPart2 = substr ($binVal, 5);
-        
+
         $char1 = chr (192 + bindec ($binPart1));
         $char2 = chr (128 + bindec ($binPart2));
         $ret = $char1 . $char2;
@@ -116,4 +118,3 @@ function unicodetoutf8($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file