Happy New Year

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

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