X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fencode%2Ftis_620.php;h=c0399e0d82d481095cb09c8b90db1d81c03a3576;hp=50664b2f01f66895b29d7e1114d31df2e653b2fb;hb=c4faef335b2362c81b8ebf026d4066c12d70536c;hpb=c338735de487d761a22f7d4befd0a5a33cdcabf7

diff --git a/functions/encode/tis_620.php b/functions/encode/tis_620.php
index 50664b2f..c0399e0d 100644
--- a/functions/encode/tis_620.php
+++ b/functions/encode/tis_620.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
  * tis-620 encoding functions
  *
  * takes a string of unicode entities and converts it to a tis-620 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; SquirrelMail Development Team, 2004
  * @package squirrelmail
  * @subpackage encode
  */
@@ -20,24 +22,24 @@ function charset_encode_tis_620 ($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","unicodetotis620('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetotis620(hexdec('\\1'))",$string);
-    
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetotis620',$string);
+
     return $string;
 }
 
 /**
  * Return tis-620 symbol when unicode character number is provided
- * 
- * This function is used internally by charset_encode_tis_620 
- * function. It might be unavailable to other squirrelmail functions.
- * Don't use it or make sure, that functions/encode/tis_620.php is 
- * included. 
  *
- * @param int $var decimal unicode value
+ * This function is used internally by charset_encode_tis_620
+ * function. It might be unavailable to other SquirrelMail functions.
+ * Don't use it or make sure, that functions/encode/tis_620.php is
+ * included.
+ *
+ * @param array $matches array with first element a decimal unicode value
  * @return string tis-620 character
  */
-function unicodetotis620($var) {
+function unicodetotis620($matches) {
+    $var = $matches[1];
 
     $tis620chars=array('3585' => "\xA1",
                        '3586' => "\xA2",
@@ -134,4 +136,3 @@ function unicodetotis620($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file