projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow HTML in option info
[squirrelmail.git]
/
functions
/
encode
/
iso_8859_2.php
diff --git
a/functions/encode/iso_8859_2.php
b/functions/encode/iso_8859_2.php
index 2a2cf52647d2f3b7617b1c33b5c8436e00f7934e..a5453186c69f65a81e188fe46892a9eeb19dc7dc 100644
(file)
--- a/
functions/encode/iso_8859_2.php
+++ b/
functions/encode/iso_8859_2.php
@@
-1,12
+1,14
@@
<?php
<?php
+
/**
* iso-8859-2 encoding functions
*
* takes a string of unicode entities and converts it to a iso-8859-2 encoded string
* Unsupported characters are replaced with ?.
*
/**
* iso-8859-2 encoding functions
*
* takes a string of unicode entities and converts it to a iso-8859-2 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$
* @version $Id$
- * @copyright Copyright © 2004-2005 The SquirrelMail Project Team
* @package squirrelmail
* @subpackage encode
*/
* @package squirrelmail
* @subpackage encode
*/
@@
-20,8
+22,7
@@
function charset_encode_iso_8859_2 ($string) {
// don't run encoding function, if there is no encoded characters
if (! preg_match("'&#[0-9]+;'",$string) ) return $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","unicodetoiso88592('\\1')",$string);
- // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso88592(hexdec('\\1'))",$string);
+ $string=preg_replace_callback("/&#([0-9]+);/",'unicodetoiso88592',$string);
return $string;
}
return $string;
}
@@
-34,10
+35,11
@@
function charset_encode_iso_8859_2 ($string) {
* Don't use it or make sure, that functions/encode/iso_8859_2.php is
* included.
*
* Don't use it or make sure, that functions/encode/iso_8859_2.php is
* included.
*
- * @param
int $var
decimal unicode value
+ * @param
array $matches array with first element a
decimal unicode value
* @return string iso-8859-2 character
*/
* @return string iso-8859-2 character
*/
-function unicodetoiso88592($var) {
+function unicodetoiso88592($matches) {
+ $var = $matches[1];
$iso88592chars=array('160' => "\xA0",
'164' => "\xA4",
$iso88592chars=array('160' => "\xA0",
'164' => "\xA4",
@@
-144,4
+146,3
@@
function unicodetoiso88592($var) {
}
return $ret;
}
}
return $ret;
}
-?>
\ No newline at end of file