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

* eMail: fix problem with signature change on html with styles (left over style fragments)

Browse Source
This commit is contained in:
Klaus Leithoff 2013-04-08 14:00:25 +00:00
parent 853adeb619
commit 98aa3cdb3b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
felamimail/inc/class.ajaxfelamimail.inc.php
View File

@ -1490,10 +1490,15 @@ class ajaxfelamimail
$htmlConfig['comment'] = 2;
$oldSigText = str_replace(array("\r","\t","<br />\n",": "),array("","","<br />",":"),($_currentMode == 'html'?html::purify($oldSigText,$htmlConfig,array(),true):$oldSigText));
//error_log(__METHOD__.'Old(clean):'.$oldSigText.'#');
$_content = str_replace(array("\r","\t","<br />\n",": "),array("","","<br />",":"),($_currentMode == 'html'?html::purify($_content,$htmlConfig,array(),true):$_content));
if ($_currentMode == 'html')
{
$_content = str_replace("\n",'\n',$_content); // dont know why, but \n screws up preg_replace
$styles = felamimail_bo::getStyles(array(array('body'=>$_content)));
if (stripos($_content,'style')!==false) felamimail_bo::replaceTagsCompletley($_content,'style'); // clean out empty or pagewide style definitions / left over tags
}
$_content = str_replace(array("\r","\t","<br />\n",": "),array("","","<br />",":"),($_currentMode == 'html'?html::purify($_content,$htmlConfig,array(),true):$_content));
if ($_currentMode == 'html')
{
$_content = preg_replace($reg='|'.preg_quote('<!-- HTMLSIGBEGIN -->','|').'.*'.preg_quote('<!-- HTMLSIGEND -->','|').'|u',
$rep='<!-- HTMLSIGBEGIN -->'.$sigText.'<!-- HTMLSIGEND -->', $in=$_content, -1, $replaced);
$_content = str_replace(array('\n',"\xe2\x80\x93","\xe2\x80\x94","\xe2\x82\xac"),array("\n",'&ndash;','&mdash;','&euro;'),$_content);
@ -1533,7 +1538,15 @@ class ajaxfelamimail
if($this->_debug) error_log(__METHOD__." Compare content:".$_content);
}
$response = new xajaxResponse();
if ($_currentMode == 'html') $_content = utf8_decode($_content);
if ($styles)
{
//error_log($styles);
$_content = $styles.$_content;
}
if ($_currentMode == 'html')
{
$_content = utf8_decode($_content);
}
$escaped = utf8_encode(str_replace(array("'", "\r", "\n"), array("\\'", "\\r", "\\n"), $_content));
//error_log(__METHOD__.$escaped);