X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fencode%2Fiso_8859_9.php;h=8e4864b60a55e500b92fbc1a60860610deafd6d8;hb=aa1340ebb1e775a36b74dbfc22391ee095d45394;hp=9dafdb7a4b59179307aacfa40146445e0c422dfb;hpb=6e687363cd5d9c0c5709c82b2dd37c0d197452c3;p=squirrelmail.git

diff --git a/functions/encode/iso_8859_9.php b/functions/encode/iso_8859_9.php
index 9dafdb7a..8e4864b6 100644
--- a/functions/encode/iso_8859_9.php
+++ b/functions/encode/iso_8859_9.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
  * iso-8859-9 encoding functions
  *
  * takes a string of unicode entities and converts it to a iso-8859-9 encoded string
  * Unsupported characters are replaced with ?.
  *
+ * @copyright 2004-2017 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_iso_8859_9 ($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","unicodetoiso88599('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso88599(hexdec('\\1'))",$string);
-    
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetoiso88599',$string);
+
     return $string;
 }
 
 /**
  * Return iso-8859-9 symbol when unicode character number is provided
- * 
- * This function is used internally by charset_encode_iso_8859_9 
- * function. It might be unavailable to other squirrelmail functions.
- * Don't use it or make sure, that functions/encode/iso_8859_9.php is 
- * included. 
  *
- * @param int $var decimal unicode value
+ * This function is used internally by charset_encode_iso_8859_9
+ * function. It might be unavailable to other SquirrelMail functions.
+ * Don't use it or make sure, that functions/encode/iso_8859_9.php is
+ * included.
+ *
+ * @param array $matches array with first element a decimal unicode value
  * @return string iso-8859-9 character
  */
-function unicodetoiso88599($var) {
+function unicodetoiso88599($matches) {
+    $var = $matches[1];
 
     $iso88599chars=array('160' => "\xA0",
                          '161' => "\xA1",
@@ -144,4 +146,3 @@ function unicodetoiso88599($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file