X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fencode%2Fcp1256.php;h=0676edaebce602b4b767a55d0fefe82362ff5e99;hb=95fde4c89e9b9c235cb3923cd1a286f94c93f449;hp=13736e424cd121289e74b90d108f3331d9d325d1;hpb=91e0dccca7b2452d8b450791cae3aa4125e8889e;p=squirrelmail.git

diff --git a/functions/encode/cp1256.php b/functions/encode/cp1256.php
index 13736e42..0676edae 100644
--- a/functions/encode/cp1256.php
+++ b/functions/encode/cp1256.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
  * cp1256 encoding functions
  *
  * takes a string of unicode entities and converts it to a cp1256 encoded string
  * Unsupported characters are replaced with ?.
  *
+ * @copyright 2004-2015 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
  */
@@ -20,8 +22,7 @@ function charset_encode_cp1256 ($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","unicodetocp1256('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetocp1256(hexdec('\\1'))",$string);
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetocp1256',$string);
 
     return $string;
 }
@@ -30,14 +31,15 @@ function charset_encode_cp1256 ($string) {
  * Return cp1256 symbol when unicode character number is provided
  *
  * This function is used internally by charset_encode_cp1256
- * function. It might be unavailable to other squirrelmail functions.
+ * function. It might be unavailable to other SquirrelMail functions.
  * Don't use it or make sure, that functions/encode/cp1256.php is
  * included.
  *
- * @param int $var decimal unicode value
+ * @param array $matches array with first element a decimal unicode value
  * @return string cp1256 character
  */
-function unicodetocp1256($var) {
+function unicodetocp1256($matches) {
+    $var = $matches[1];
 
     $cp1256chars=array('160' => "\xA0",
                        '162' => "\xA2",
@@ -175,4 +177,3 @@ function unicodetocp1256($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file