Replace invalid characters with a symbol instead of returning empty string for the

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

diff --git a/functions/encode/cp1255.php b/functions/encode/cp1255.php
index 06ef050e7989c057aadd877b9eca437bfd28bc3a..a2c5cda705033cb47f24badcc61485909040918c 100644 (file)
--- a/functions/encode/cp1255.php
+++ b/functions/encode/cp1255.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
  * cp1255 encoding functions
  *
  * takes a string of unicode entities and converts it to a cp1255 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,24 +22,24 @@ function charset_encode_cp1255 ($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","unicodetocp1255('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetocp1255(hexdec('\\1'))",$string);
-    
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetocp1255',$string);
+
     return $string;
 }
 
 /**
  * Return cp1255 symbol when unicode character number is provided
- * 
- * This function is used internally by charset_encode_cp1255 
- * function. It might be unavailable to other squirrelmail functions.
- * Don't use it or make sure, that functions/encode/cp1255.php is 
- * included. 
  *
- * @param int $var decimal unicode value
+ * This function is used internally by charset_encode_cp1255
+ * function. It might be unavailable to other SquirrelMail functions.
+ * Don't use it or make sure, that functions/encode/cp1255.php is
+ * included.
+ *
+ * @param array $matches array with first element a decimal unicode value
  * @return string cp1255 character
  */
-function unicodetocp1255($var) {
+function unicodetocp1255($matches) {
+    $var = $matches[1];
 
     $cp1255chars=array('160' => "\xA0",
                        '161' => "\xA1",
@@ -152,4 +154,3 @@ function unicodetocp1255($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file