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

* REST API/Mail: always add signature below supplied body (independent of user preference for reply/forward)

Browse Source
This commit is contained in:
ralf 2023-10-27 10:21:00 +03:00
parent db7d26a6a0
commit f36149ae93
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1018,6 +1018,11 @@ class mail_compose
//error_log(__METHOD__.__LINE__.':'.$name.'->'. $_REQUEST['preset'][$name]); //error_log(__METHOD__.__LINE__.':'.$name.'->'. $_REQUEST['preset'][$name]);
if (!empty($_REQUEST['preset'][$name])) $content[$name] = $_REQUEST['preset'][$name]; if (!empty($_REQUEST['preset'][$name])) $content[$name] = $_REQUEST['preset'][$name];
} }
// if we preset the body, we always want the signature below (independent of user preference for replay or forward!)
if (!empty($_REQUEST['preset']['body']))
{
$insertSigOnTop = 'below';
}
} }
// is the to address set already? // is the to address set already?
if (!empty($_REQUEST['send_to'])) if (!empty($_REQUEST['send_to']))
@ -1166,6 +1171,11 @@ class mail_compose
$before = $disableRuler ? "\r\n" : "\r\n-- \r\n"; $before = $disableRuler ? "\r\n" : "\r\n-- \r\n";
$start = $inbetween = "\r\n"; $start = $inbetween = "\r\n";
} }
// if we already have a body in compose (not reply or forward!), do NOT add an empty line above it
if (!empty($content['body']) && !$isReply)
{
$start = '';
}
if ($content['mimeType'] === 'html') if ($content['mimeType'] === 'html')
{ {
$sigText = ($sigTextStartsWithBlockElement?'':"<div>")."<!-- HTMLSIGBEGIN -->".$sigText."<!-- HTMLSIGEND -->".($sigTextStartsWithBlockElement?'':"</div>"); $sigText = ($sigTextStartsWithBlockElement?'':"<div>")."<!-- HTMLSIGBEGIN -->".$sigText."<!-- HTMLSIGEND -->".($sigTextStartsWithBlockElement?'':"</div>");