From 55bf4bc1d3e10b35f54c42b10207484fcb3d10fd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 22 Nov 2018 16:36:10 +0300 Subject: mailer: split to/from name/addresses --- classes/mailer.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'classes/mailer.php') diff --git a/classes/mailer.php b/classes/mailer.php index ae22776d4..f67690e80 100644 --- a/classes/mailer.php +++ b/classes/mailer.php @@ -6,16 +6,20 @@ class Mailer { function mail($params) { - $to = $params["to"]; + $to_name = $params["to_name"]; + $to_address = $params["to_address"]; $subject = $params["subject"]; $message = $params["message"]; $message_html = $params["message_html"]; - $from = $params["from"] ? $params["from"] : SMTP_FROM_NAME . " <" . SMTP_FROM_ADDRESS . ">"; + $from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME; + $from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS; + $additional_headers = $params["headers"] ? $params["headers"] : []; - $headers[] = "From: $from"; + $from_combined = $from_name ? "$to_name <$to_address>" : $to_address; + $to_combined = $to_name ? "$to_name <$to_address>" : $to_address; - Logger::get()->log("Sending mail from $from to $to [$subject]: $message"); + Logger::get()->log("Sending mail from $from_combined to $to_combined <$to_address> [$subject]: $message"); // HOOK_SEND_MAIL plugin instructions: // 1. return 1 or true if mail is handled @@ -30,14 +34,16 @@ class Mailer { return $rc; } - return mail($to, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers))); + $headers[] = "From: $from_combined"; + + return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers))); } function set_error($message) { $this->last_error = $message; } - function error($value) { + function error() { return $this->last_error; } } -- cgit v1.2.3