holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove calls to removed htmlspecialchars method

Browse Source
This commit is contained in:
Ralf Becker 2014-09-30 12:28:42 +00:00
parent 511bd8674a
commit 3b2619719c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -4299,7 +4299,6 @@ class emailadmin_imapbase
$message .= $newBody; $message .= $newBody;
continue; continue;
} }
$newBody =self::htmlspecialchars($newBody);
//error_log(__METHOD__.' ('.__LINE__.') '.' Body(after specialchars):'.$newBody); //error_log(__METHOD__.' ('.__LINE__.') '.' Body(after specialchars):'.$newBody);
$newBody = strip_tags($newBody); //we need to fix broken tags (or just stuff like "<800 USD/p" ) $newBody = strip_tags($newBody); //we need to fix broken tags (or just stuff like "<800 USD/p" )
//error_log(__METHOD__.' ('.__LINE__.') '.' Body(after strip tags):'.$newBody); //error_log(__METHOD__.' ('.__LINE__.') '.' Body(after strip tags):'.$newBody);
@ -5329,7 +5328,6 @@ class emailadmin_imapbase
//error_log(__METHOD__.' ('.__LINE__.') '.$p.' <'.$mb.'@'.$h.'>'); //error_log(__METHOD__.' ('.__LINE__.') '.$p.' <'.$mb.'@'.$h.'>');
$buff = imap_rfc822_write_address($addressObject->mailbox, self::$idna2->decode($addressObject->host), $addressObject->personal); $buff = imap_rfc822_write_address($addressObject->mailbox, self::$idna2->decode($addressObject->host), $addressObject->personal);
$buff = str_replace(array('<','>','"\'','\'"'),array('[',']','"','"'),$buff); $buff = str_replace(array('<','>','"\'','\'"'),array('[',']','"','"'),$buff);
if ($createHTML) $buff = emailadmin_imapbase::htmlspecialchars($buff);
//error_log(__METHOD__.' ('.__LINE__.') '.' Address: '.$returnAddr); //error_log(__METHOD__.' ('.__LINE__.') '.' Address: '.$returnAddr);
$returnAddr .= $buff; $returnAddr .= $buff;
} }
@ -5339,7 +5337,7 @@ class emailadmin_imapbase
// do not mess with strings, return them untouched /* ToDo: validate string as Address */ // do not mess with strings, return them untouched /* ToDo: validate string as Address */
$rfcAddressArray = self::decode_header($rfcAddressArray,true); $rfcAddressArray = self::decode_header($rfcAddressArray,true);
$rfcAddressArray = str_replace(array('<','>','"\'','\'"'),array('[',']','"','"'),$rfcAddressArray); $rfcAddressArray = str_replace(array('<','>','"\'','\'"'),array('[',']','"','"'),$rfcAddressArray);
if (is_string($rfcAddressArray)) return ($createHTML ? emailadmin_imapbase::htmlspecialchars($rfcAddressArray) : $rfcAddressArray); if (is_string($rfcAddressArray)) return $rfcAddressArray;
} }
return $returnAddr; return $returnAddr;
} }