extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 08:23:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

do not use ENT_IGNORE on the first attempt (effective for php > 5.3 only anyway)

Browse Source
This commit is contained in:
Klaus Leithoff 2010-11-03 16:22:01 +00:00
parent 5ad3714fe9
commit e7b5cb1dbc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
felamimail/inc/class.uiwidgets.inc.php
View File

@ -321,7 +321,7 @@
$replace = ''; $replace = '';
$header['subject'] = preg_replace($search,$replace,$header['subject']); $header['subject'] = preg_replace($search,$replace,$header['subject']);
$headerSubject = @htmlentities($header['subject'],ENT_QUOTES | ENT_IGNORE,$this->charset,false); $headerSubject = @htmlentities($header['subject'],ENT_QUOTES,$this->charset,false);
if (empty($headerSubject)) $headerSubject = @htmlentities($GLOBALS['egw']->translation->convert($header['subject'], bofelamimail::detect_encoding($header['subject']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false); if (empty($headerSubject)) $headerSubject = @htmlentities($GLOBALS['egw']->translation->convert($header['subject'], bofelamimail::detect_encoding($header['subject']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false);
$header['subject'] = $headerSubject; $header['subject'] = $headerSubject;
// curly brackets get messed up by the template! // curly brackets get messed up by the template!
@ -379,11 +379,11 @@
if ($_folderType > 0) { if ($_folderType > 0) {
// sent or drafts or template folder // sent or drafts or template folder
$header2add = @htmlentities($header['to_address'],ENT_QUOTES | ENT_IGNORE,$this->charset,false); $header2add = @htmlentities($header['to_address'],ENT_QUOTES,$this->charset,false);
if (empty($header2add)) $header2add = @htmlentities($GLOBALS['egw']->translation->convert($header['to_address'], bofelamimail::detect_encoding($header['to_address']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false); if (empty($header2add)) $header2add = @htmlentities($GLOBALS['egw']->translation->convert($header['to_address'], bofelamimail::detect_encoding($header['to_address']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false);
$header['to_address'] = $header2add; $header['to_address'] = $header2add;
if (!empty($header['to_name'])) { if (!empty($header['to_name'])) {
$header2name = @htmlentities($header['to_name'],ENT_QUOTES | ENT_IGNORE,$this->charset,false); $header2name = @htmlentities($header['to_name'],ENT_QUOTES,$this->charset,false);
if (empty($header2name)) $header2name = @htmlentities($GLOBALS['egw']->translation->convert($header['to_name'], bofelamimail::detect_encoding($header['to_name']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false); if (empty($header2name)) $header2name = @htmlentities($GLOBALS['egw']->translation->convert($header['to_name'], bofelamimail::detect_encoding($header['to_name']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false);
$header['to_name'] = $header2name; $header['to_name'] = $header2name;
@ -394,11 +394,11 @@
$full_address = $header['to_address']; $full_address = $header['to_address'];
} }
} else { } else {
$header2add = @htmlentities($header['sender_address'],ENT_QUOTES | ENT_IGNORE,$this->charset,false); $header2add = @htmlentities($header['sender_address'],ENT_QUOTES,$this->charset,false);
if (empty($header2add)) $header2add = @htmlentities($GLOBALS['egw']->translation->convert($header['sender_address'], bofelamimail::detect_encoding($header['sender_address']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false); if (empty($header2add)) $header2add = @htmlentities($GLOBALS['egw']->translation->convert($header['sender_address'], bofelamimail::detect_encoding($header['sender_address']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false);
$header['sender_address'] = $header2add; $header['sender_address'] = $header2add;
if (!empty($header['sender_name'])) { if (!empty($header['sender_name'])) {
$header2name = @htmlentities($header['sender_name'],ENT_QUOTES | ENT_IGNORE,$this->charset,false); $header2name = @htmlentities($header['sender_name'],ENT_QUOTES,$this->charset,false);
if (empty($header2name)) $header2name = @htmlentities($GLOBALS['egw']->translation->convert($header['sender_name'], bofelamimail::detect_encoding($header['sender_name']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false); if (empty($header2name)) $header2name = @htmlentities($GLOBALS['egw']->translation->convert($header['sender_name'], bofelamimail::detect_encoding($header['sender_name']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false);
$header['sender_name'] = $header2name; $header['sender_name'] = $header2name;