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

Run HTMLawed on compose body

Browse Source
This commit is contained in:
Hadi Nategh 2016-10-05 16:31:58 +02:00
parent 93f3826259
commit 3130f9df52
1 changed files with 5 additions and 1 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

@ -594,6 +594,7 @@ class mail_compose
unset($_content['body']); unset($_content['body']);
unset($_content['mail_htmltext']); unset($_content['mail_htmltext']);
unset($_content['mail_plaintext']); unset($_content['mail_plaintext']);
$_currentMode = $_content['mimeType'];
// form was submitted either by clicking a button or by changing one of the triggering selectboxes // form was submitted either by clicking a button or by changing one of the triggering selectboxes
// identity and signatureid; this might trigger that the signature in mail body may have to be altered // identity and signatureid; this might trigger that the signature in mail body may have to be altered
@ -622,7 +623,7 @@ class mail_compose
} }
$_oldSig = $composeCache['mailidentity']; $_oldSig = $composeCache['mailidentity'];
$_signatureid = ($newSig?$newSig:$_content['mailidentity']); $_signatureid = ($newSig?$newSig:$_content['mailidentity']);
$_currentMode = $_content['mimeType'];
if ($_oldSig != $_signatureid) if ($_oldSig != $_signatureid)
{ {
if($this->_debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']); if($this->_debug) error_log(__METHOD__.__LINE__.' old,new ->'.$_oldSig.','.$_signatureid.'#'.$content['body']);
@ -731,6 +732,9 @@ class mail_compose
} }
} }
} }
/*run the purify on compose body unconditional*/
$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']);
// do not double insert a signature on a server roundtrip // do not double insert a signature on a server roundtrip
if ($buttonClicked) $suppressSigOnTop = true; if ($buttonClicked) $suppressSigOnTop = true;