valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mailer: fix indents

This commit is contained in:
Andrew Dolgov 2018-11-22 16:55:37 +03:00
parent ac5e55c2bd
commit e08990f753
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
classes/mailer.php
View File

@ -1,52 +1,52 @@
<?php <?php
class Mailer { class Mailer {
// TODO: support HTML mail (i.e. MIME messages) // TODO: support HTML mail (i.e. MIME messages)
private $last_error = "Unable to send mail: check local configuration."; private $last_error = "Unable to send mail: check local configuration.";
function mail($params) { function mail($params) {
$to_name = $params["to_name"]; $to_name = $params["to_name"];
$to_address = $params["to_address"]; $to_address = $params["to_address"];
$subject = $params["subject"]; $subject = $params["subject"];
$message = $params["message"]; $message = $params["message"];
$message_html = $params["message_html"]; $message_html = $params["message_html"];
$from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME; $from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME;
$from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS; $from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS;
$additional_headers = $params["headers"] ? $params["headers"] : []; $additional_headers = $params["headers"] ? $params["headers"] : [];
$from_combined = $from_name ? "$to_name <$to_address>" : $to_address; $from_combined = $from_name ? "$to_name <$to_address>" : $to_address;
$to_combined = $to_name ? "$to_name <$to_address>" : $to_address; $to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
Logger::get()->log("Sending mail from $from_combined to $to_combined <$to_address> [$subject]: $message"); Logger::get()->log("Sending mail from $from_combined to $to_combined <$to_address> [$subject]: $message");
// HOOK_SEND_MAIL plugin instructions: // HOOK_SEND_MAIL plugin instructions:
// 1. return 1 or true if mail is handled // 1. return 1 or true if mail is handled
// 2. return -1 if there's been a fatal error and no further action is allowed // 2. return -1 if there's been a fatal error and no further action is allowed
// 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function // 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function
// 4. set error message if needed via passed Mailer instance function set_error() // 4. set error message if needed via passed Mailer instance function set_error()
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) { foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
$rc = $p->hook_send_mail($this, $params); $rc = $p->hook_send_mail($this, $params);
if ($rc == 1) if ($rc == 1)
return $rc; return $rc;
if ($rc == -1) if ($rc == -1)
return 0; return 0;
} }
$headers[] = "From: $from_combined"; $headers[] = "From: $from_combined";
return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers))); return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
} }
function set_error($message) { function set_error($message) {
$this->last_error = $message; $this->last_error = $message;
} }
function error() { function error() {
return $this->last_error; return $this->last_error;
} }
} }