Happy New Year

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

diff --git a/functions/encode/iso_8859_7.php b/functions/encode/iso_8859_7.php
index 45ab0d1925cb3277724b71fa893acee5239c51c9..9bee4ef9fc98f3b035b5dc6d1c11185471409d67 100644 (file)
--- a/functions/encode/iso_8859_7.php
+++ b/functions/encode/iso_8859_7.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
  * iso-8859-7 encoding functions
  *
  * takes a string of unicode entities and converts it to a iso-8859-7 encoded string
  * Unsupported characters are replaced with ?.
  *
+ * @copyright 2004-2020 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
- * @copyright Copyright &copy; 2004-2005 The SquirrelMail Project Team
  * @package squirrelmail
  * @subpackage encode
  */
@@ -20,8 +22,7 @@ function charset_encode_iso_8859_7 ($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","unicodetoiso88597('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso88597(hexdec('\\1'))",$string);
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetoiso88597',$string);
 
     return $string;
 }
@@ -30,14 +31,15 @@ function charset_encode_iso_8859_7 ($string) {
  * Return iso-8859-7 symbol when unicode character number is provided
  *
  * This function is used internally by charset_encode_iso_8859_7
- * 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/iso_8859_7.php is
  * included.
  *
- * @param int $var decimal unicode value
+ * @param array $matches array with first element a decimal unicode value
  * @return string iso-8859-7 character
  */
-function unicodetoiso88597($var) {
+function unicodetoiso88597($matches) {
+    $var = $matches[1];
 
     $iso88597chars=array('160' => "\xA0",
                          '163' => "\xA3",
@@ -138,4 +140,3 @@ function unicodetoiso88597($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file