Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2021-02-23 11:50:13 +01:00
commit b0868e9726

View File

@ -135,19 +135,19 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
$bodyhtml = ''; $bodyhtml = '';
if(!isset($params['__skip_header__']) || !$params['__skip_header__']) { if(!isset($params['__skip_header__']) || !$params['__skip_header__']) {
if(!isset($params['__header_html__'])) if(!isset($params['__header_html__']))
$body .= getMLText("email_header", $params, "", $lang)."\r\n\r\n"; $bodyhtml .= getMLText("email_header_html", $params, "", $lang)."\r\n\r\n";
elseif($params['__header_html__']) elseif($params['__header_html__'])
$body .= getMLText($params['__header_html__'], $params, "", $lang)."\r\n\r\n"; $bodyhtml .= getMLText($params['__header_html__'], $params, "", $lang)."\r\n\r\n";
} }
if(isset($params['__body_html__'])) if(isset($params['__body_html__']))
$body .= $params['__body_html__']; $bodyhtml .= $params['__body_html__'];
else else
$body .= getMLText($messagekey.'_html', $params, "", $lang); $bodyhtml .= getMLText($messagekey.'_html', $params, "", $lang);
if(!isset($params['__skip_footer__']) || !$params['__skip_footer__']) { if(!isset($params['__skip_footer__']) || !$params['__skip_footer__']) {
if(!isset($params['__footer_html__'])) if(!isset($params['__footer_html__']))
$body .= "\r\n\r\n".getMLText("email_footer", $params, "", $lang); $bodyhtml .= "\r\n\r\n".getMLText("email_footer_html", $params, "", $lang);
elseif($params['__footer_html__']) elseif($params['__footer_html__'])
$body .= "\r\n\r\n".getMLText($params['__footer_html__'], $params, "", $lang); $bodyhtml .= "\r\n\r\n".getMLText($params['__footer_html__'], $params, "", $lang);
} }
$mime = new Mail_mime(array('eol' => "\n")); $mime = new Mail_mime(array('eol' => "\n"));