extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-05 12:59:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix postion of download-/sharing-links for signature-on-top preference

Browse Source
This commit is contained in:
ralf 2022-04-30 12:10:47 +02:00
parent 369585763a
commit cc0e687087
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1131,11 +1131,8 @@ class mail_compose
//PROBABLY NOT FOUND //PROBABLY NOT FOUND
$signature=array(); $signature=array();
} }
if ((isset($this->mailPreferences['disableRulerForSignatureSeparation']) && if (!empty($this->mailPreferences['disableRulerForSignatureSeparation']) ||
$this->mailPreferences['disableRulerForSignatureSeparation']) || empty($signature['ident_signature']))
empty($signature['ident_signature']) ||
trim($this->convertHTMLToText($signature['ident_signature'],true,true)) =='' ||
$this->mailPreferences['insertSignatureAtTopOfMessage'] == '1')
{ {
$disableRuler = true; $disableRuler = true;
} }
@ -1169,7 +1166,7 @@ class mail_compose
$sigText = Mail::merge($signature['ident_signature'],array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id'))); $sigText = Mail::merge($signature['ident_signature'],array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
if ($content['mimeType'] == 'html') if ($content['mimeType'] == 'html')
{ {
$sigTextStartsWithBlockElement = ($disableRuler?false:true); $sigTextStartsWithBlockElement = !$disableRuler;
foreach($blockElements as $e) foreach($blockElements as $e)
{ {
if ($sigTextStartsWithBlockElement) break; if ($sigTextStartsWithBlockElement) break;
@ -1177,7 +1174,7 @@ class mail_compose
} }
} }
if($content['mimeType'] == 'html') { if($content['mimeType'] == 'html') {
$before = $disableRuler ? '' : '<hr style="border:1px dotted silver; width:100%;">'; $before = '<br>'.($disableRuler ? '' : '<hr style="border:1px dotted silver; width:100%;">');
$inbetween = ''; $inbetween = '';
} else { } else {
$before = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n"); $before = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");