mirror of https://github.com/MISP/MISP
fix: [email] Correctly set domain for email message ID
parent
d523025b6d
commit
9f81f0fb65
|
@ -469,7 +469,7 @@ class SendEmail
|
||||||
$email->transport($this->transport);
|
$email->transport($this->transport);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate `In-Reply-To` and `References` to group emails
|
// Generate `In-Reply-To` and `References` headers to group emails
|
||||||
if ($body instanceof SendEmailTemplate && $body->referenceId()) {
|
if ($body instanceof SendEmailTemplate && $body->referenceId()) {
|
||||||
$reference = sha1($body->referenceId() . '|' . Configure::read('MISP.uuid'));
|
$reference = sha1($body->referenceId() . '|' . Configure::read('MISP.uuid'));
|
||||||
$reference = "<$reference@{$email->domain()}>";
|
$reference = "<$reference@{$email->domain()}>";
|
||||||
|
@ -603,6 +603,14 @@ class SendEmail
|
||||||
{
|
{
|
||||||
$email = new CakeEmailExtended();
|
$email = new CakeEmailExtended();
|
||||||
|
|
||||||
|
$fromEmail = Configure::read('MISP.email');
|
||||||
|
|
||||||
|
// Set correct domain when sending email from CLI
|
||||||
|
$fromEmailParts = explode('@', $fromEmail, 2);
|
||||||
|
if (isset($fromEmailParts[1])) {
|
||||||
|
$email->domain($fromEmailParts[1]);
|
||||||
|
}
|
||||||
|
|
||||||
// We must generate message ID by own, because CakeEmail returns different message ID for every call of
|
// We must generate message ID by own, because CakeEmail returns different message ID for every call of
|
||||||
// getHeaders() method.
|
// getHeaders() method.
|
||||||
$email->messageId($this->generateMessageId($email));
|
$email->messageId($this->generateMessageId($email));
|
||||||
|
@ -625,8 +633,8 @@ class SendEmail
|
||||||
$email->replyTo(Configure::read('MISP.email_reply_to'));
|
$email->replyTo(Configure::read('MISP.email_reply_to'));
|
||||||
}
|
}
|
||||||
|
|
||||||
$email->from(Configure::read('MISP.email'), Configure::read('MISP.email_from_name'));
|
$email->from($fromEmail, Configure::read('MISP.email_from_name'));
|
||||||
$email->returnPath(Configure::read('MISP.email')); // TODO?
|
$email->returnPath($fromEmail); // TODO?
|
||||||
$email->to($user['User']['email']);
|
$email->to($user['User']['email']);
|
||||||
$email->subject($subject);
|
$email->subject($subject);
|
||||||
$email->emailFormat($body->format());
|
$email->emailFormat($body->format());
|
||||||
|
|
Loading…
Reference in New Issue