projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Even better HTML email content style containment
[squirrelmail.git]
/
functions
/
encode
/
cp1255.php
diff --git
a/functions/encode/cp1255.php
b/functions/encode/cp1255.php
index 2e19139628ee0b138777c3e7ac44f4c079a43a8c..f4bcac7cf8eff5a59d35ac7d9541d6c41eb3a992 100644
(file)
--- a/
functions/encode/cp1255.php
+++ b/
functions/encode/cp1255.php
@@
-1,12
+1,14
@@
<?php
<?php
+
/**
* cp1255 encoding functions
*
* takes a string of unicode entities and converts it to a cp1255 encoded string
* Unsupported characters are replaced with ?.
*
/**
* cp1255 encoding functions
*
* takes a string of unicode entities and converts it to a cp1255 encoded string
* Unsupported characters are replaced with ?.
*
+ * @copyright 2004-2019 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_cp1255 ($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","unicodetocp1255('\\1')",$string);
- // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetocp1255(hexdec('\\1'))",$string);
+ $string=preg_replace_callback("/&#([0-9]+);/",'unicodetocp1255',$string);
return $string;
}
return $string;
}
@@
-34,10
+35,11
@@
function charset_encode_cp1255 ($string) {
* Don't use it or make sure, that functions/encode/cp1255.php is
* included.
*
* Don't use it or make sure, that functions/encode/cp1255.php is
* included.
*
- * @param
int $var
decimal unicode value
+ * @param
array $matches array with first element a
decimal unicode value
* @return string cp1255 character
*/
* @return string cp1255 character
*/
-function unicodetocp1255($var) {
+function unicodetocp1255($matches) {
+ $var = $matches[1];
$cp1255chars=array('160' => "\xA0",
'161' => "\xA1",
$cp1255chars=array('160' => "\xA0",
'161' => "\xA1",
@@
-152,4
+154,3
@@
function unicodetocp1255($var) {
}
return $ret;
}
}
return $ret;
}
-?>
\ No newline at end of file