holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display attachments also as a block (fieldset) replacing the ruler, if one is configured

Browse Source
This commit is contained in:
ralf 2022-05-11 18:05:54 +02:00
parent 8d29ad1841
commit 1fb46bb74c
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Etemplate/Widget/HtmlArea.php
View File

@ -203,7 +203,7 @@ class HtmlArea extends Etemplate\Widget
* For LGPL see License.txt in the project root for license information. * For LGPL see License.txt in the project root for license information.
* For commercial licenses see https://www.tiny.cloud/ * For commercial licenses see https://www.tiny.cloud/
*/ */
body { body, p, div {
font-family: $font_family; font-family: $font_family;
font-size: $font_size; font-size: $font_size;
line-height: 1.4; line-height: 1.4;

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

@ -1165,7 +1165,7 @@ class mail_compose
if ($content['mimeType'] === 'html') if ($content['mimeType'] === 'html')
{ {
$start = "<br/>\n"; $start = "<br/>\n";
$before = $disableRuler ? '' : '<hr style="border:1px dotted silver; width:100%;">'; $before = $disableRuler ? '' : '<hr class="ruler" style="border:1px dotted silver; width:100%;">';
$inbetween = ''; $inbetween = '';
} }
else else
@ -2382,13 +2382,9 @@ class mail_compose
*/ */
static function wrapBlockWithPreferredFont($content, $legend, $class=null) static function wrapBlockWithPreferredFont($content, $legend, $class=null)
{ {
$options = '';/*' style="border: 2px solid silver; border-left: none; border-right: none;'.
'font-family: '.($GLOBALS['egw_info']['user']['preferences']['common']['rtf_font'] ?? 'arial, helvetica, sans-serif').
'; font-size: '.($GLOBALS['egw_info']['user']['preferences']['common']['rtf_size'] ?? '10').'pt"';*/
if (!empty($class)) $options = ' class="'.htmlspecialchars($class).'"'; if (!empty($class)) $options = ' class="'.htmlspecialchars($class).'"';
return Api\Html::fieldset($content, $legend, $options); return Api\Html::fieldset($content, $legend, $options ?? '');
} }
/** /**
@ -2532,9 +2528,17 @@ class mail_compose
case 'html': case 'html':
$body = "<style>\n".preg_replace('#/\*.*?\*/\s*#sm', '', Etemplate\Widget\HtmlArea::contentCss()). $body = "<style>\n".preg_replace('#/\*.*?\*/\s*#sm', '', Etemplate\Widget\HtmlArea::contentCss()).
"</style>\n".$_formData['body']; "</style>\n".$_formData['body'];
if (!empty($attachment_links)) if (!empty($attachment_links))
{ {
if (strpos($body, '<!-- HTMLSIGBEGIN -->') !== false) // if we have a ruler, replace it with the attachment block
static $ruler = '<hr class="ruler"';
if (strpos($body, $ruler) !== false)
{
$body = preg_replace('#'.$ruler.'[^>]*>#', $attachment_links, $body);
}
// else place it before the signature
elseif (strpos($body, '<!-- HTMLSIGBEGIN -->') !== false)
{ {
$body = str_replace('<!-- HTMLSIGBEGIN -->', $attachment_links.'<!-- HTMLSIGBEGIN -->', $body); $body = str_replace('<!-- HTMLSIGBEGIN -->', $attachment_links.'<!-- HTMLSIGBEGIN -->', $body);
} }
@ -2543,6 +2547,8 @@ class mail_compose
$body .= $attachment_links; $body .= $attachment_links;
} }
} }
$body = str_replace($ruler, '<hr', $body); // remove id from ruler, to not replace in cited mails
if(!empty($signature)) if(!empty($signature))
{ {
$_mailObject->setBody($this->convertHTMLToText($body, true, true). $_mailObject->setBody($this->convertHTMLToText($body, true, true).
@ -2714,7 +2720,7 @@ class mail_compose
} }
elseif ($html) elseif ($html)
{ {
return '<p>'.lang('Download attachments').":</p>\n<ul><li>".implode("</li>\n<li>", $links)."</li></ul>\n"; return self::wrapBlockWithPreferredFont("<ul><li>".implode("</li>\n<li>", $links)."</li></ul>\n", lang('Download attachments'), 'attachmentLinks');
} }
return lang('Download attachments').":\n- ".implode("\n- ", $links)."\n"; return lang('Download attachments').":\n- ".implode("\n- ", $links)."\n";
} }