Happy New Year

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

diff --git a/functions/encode/koi8_r.php b/functions/encode/koi8_r.php
index 78075ea1abcd29d3c931fd7fdc9f160d0deb8c52..c498ca9674e1aaab4d50512541c1166af8a673b0 100644 (file)
--- a/functions/encode/koi8_r.php
+++ b/functions/encode/koi8_r.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
  * koi8-r encoding functions
  *
  * takes a string of unicode entities and converts it to a koi8-r encoded string
  * Unsupported characters are replaced with ?.
  *
+ * @copyright 2004-2016 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_koi8_r ($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","unicodetokoi8r('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetokoi8r(hexdec('\\1'))",$string);
-    
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetokoi8r',$string);
+
     return $string;
 }
 
 /**
  * Return koi8-r symbol when unicode character number is provided
- * 
- * This function is used internally by charset_encode_koi8_r 
- * function. It might be unavailable to other squirrelmail functions.
- * Don't use it or make sure, that functions/encode/koi8_r.php is 
- * included. 
  *
- * @param int $var decimal unicode value
+ * This function is used internally by charset_encode_koi8_r
+ * function. It might be unavailable to other SquirrelMail functions.
+ * Don't use it or make sure, that functions/encode/koi8_r.php is
+ * included.
+ *
+ * @param array $matches array with first element a decimal unicode value
  * @return string koi8-r character
  */
-function unicodetokoi8r($var) {
+function unicodetokoi8r($matches) {
+    $var = $matches[1];
 
     $koi8rchars=array('160' => "\x9A",
                       '169' => "\xBF",
@@ -175,4 +177,3 @@ function unicodetokoi8r($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file