public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 01:25:56 +00:00
Code Issues Releases Wiki Activity

mailer: split to/from name/addresses

Browse Source
This commit is contained in:
Andrew Dolgov
2018-11-22 16:36:10 +03:00
parent 57932e1837
commit 55bf4bc1d3
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
classes/mailer.php
View File

@@ -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;
}
}