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

* Mail: fix PHP Fatal when switching identities

Browse Source
This commit is contained in:
Ralf Becker 2016-06-06 15:08:57 +02:00
parent e2190cee25
commit e03c84f948
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/inc/class.mail_compose.inc.php
View File

@ -664,7 +664,8 @@ class mail_compose
$_htmlConfig = Mail::$htmLawed_config; $_htmlConfig = Mail::$htmLawed_config;
Mail::$htmLawed_config['comment'] = 2; Mail::$htmLawed_config['comment'] = 2;
Mail::$htmLawed_config['transform_anchor'] = false; Mail::$htmLawed_config['transform_anchor'] = false;
$oldSigTextCleaned = str_replace(array("\r","\t","<br />\n",": "),array("","","<br />",":"),($_currentMode == 'html'?html::purify($oldSigText,null,array(),true):$oldSigText)); $oldSigTextCleaned = str_replace(array("\r", "\t", "<br />\n", ": "), array("", "", "<br />", ":"),
$_currentMode == 'html' ? Api\Html::purify($oldSigText, null, array(), true) : $oldSigText);
//error_log(__METHOD__.'Old(clean):'.$oldSigTextCleaned.'#'); //error_log(__METHOD__.'Old(clean):'.$oldSigTextCleaned.'#');
if ($_currentMode == 'html') if ($_currentMode == 'html')
{ {
@ -672,7 +673,8 @@ class mail_compose
$styles = Mail::getStyles(array(array('body'=>$content['body']))); $styles = Mail::getStyles(array(array('body'=>$content['body'])));
if (stripos($content['body'],'style')!==false) Api\Mail\Html::replaceTagsCompletley($content['body'],'style',$endtag='',true); // clean out empty or pagewide style definitions / left over tags if (stripos($content['body'],'style')!==false) Api\Mail\Html::replaceTagsCompletley($content['body'],'style',$endtag='',true); // clean out empty or pagewide style definitions / left over tags
} }
$content['body'] = str_replace(array("\r","\t","<br />\n",": "),array("","","<br />",":"),($_currentMode == 'html'?html::purify($content['body'],Mail::$htmLawed_config,array(),true):$content['body'])); $content['body'] = str_replace(array("\r", "\t", "<br />\n", ": "), array("", "", "<br />", ":"),
$_currentMode == 'html' ? Api\Html::purify($content['body'], Mail::$htmLawed_config, array(), true) : $content['body']);
Mail::$htmLawed_config = $_htmlConfig; Mail::$htmLawed_config = $_htmlConfig;
if ($_currentMode == 'html') if ($_currentMode == 'html')
{ {