mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 07:53:39 +01:00
let the backend at the very end enclose HTML-messages in <html> and <body> tags and not get_body. We do not want to lock out further html.
This commit is contained in:
parent
5a7319417e
commit
c03db413c3
@ -425,7 +425,7 @@ class bo_tracking
|
||||
$send->FromName = '';
|
||||
}
|
||||
$send->Subject = $subject;
|
||||
$send->Body = $this->get_body($html_email,$data,$old);
|
||||
$send->Body = "<html>\n<body>\n".$this->get_body($html_email,$data,$old)."</body>\n</html>\n";
|
||||
|
||||
foreach($attachments as $attachment)
|
||||
{
|
||||
@ -621,7 +621,7 @@ class bo_tracking
|
||||
$body = '';
|
||||
if ($html_email)
|
||||
{
|
||||
$body = "<html>\n<body>\n".'<table cellspacing="2" cellpadding="0" border="0" width="100%">'."\n";
|
||||
$body = '<table cellspacing="2" cellpadding="0" border="0" width="100%">'."\n";
|
||||
}
|
||||
// new or modified message
|
||||
if (($message = $this->get_message($data,$old)))
|
||||
@ -645,7 +645,7 @@ class bo_tracking
|
||||
}
|
||||
if ($html_email)
|
||||
{
|
||||
$body .= "</table>\n</body>\n</html>\n";
|
||||
$body .= "</table>\n";
|
||||
}
|
||||
|
||||
return $body;
|
||||
|
@ -119,10 +119,10 @@ class notification_email implements iface_notification {
|
||||
}
|
||||
if($this->preferences->external_mailclient) {
|
||||
$body_plain = $_messages['plain']['text'].$_messages['plain']['link_external'];
|
||||
$body_html = $_messages['html']['text'].$_messages['html']['link_external'];
|
||||
$body_html = "<html>\n<body>\n".$_messages['html']['text'].$_messages['html']['link_external']."</body>\n</html>\n";
|
||||
} else {
|
||||
$body_plain = $_messages['plain']['text'].$_messages['plain']['link_internal'];
|
||||
$body_html = $_messages['html']['text'].$_messages['html']['link_internal'];
|
||||
$body_html = "<html>\n<body>\n".$_messages['html']['text'].$_messages['html']['link_internal']."</body>\n</html>\n";
|
||||
}
|
||||
$this->mail->ClearAddresses();
|
||||
$this->mail->ClearAttachments();
|
||||
|
Loading…
Reference in New Issue
Block a user