X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fmailer.php;fp=classes%2Fmailer.php;h=93a9279e5727e053ec559f57f07f40ea018440d9;hb=e08990f753c73a6a65a1bc840dec8e44a527d259;hp=974e33bc4b4fed47193a3771aa612155f028c36b;hpb=ac5e55c2bdd1c986129d44bdc6ffa1ca3c743ba4;p=tt-rss.git diff --git a/classes/mailer.php b/classes/mailer.php index 974e33bc..93a9279e 100644 --- a/classes/mailer.php +++ b/classes/mailer.php @@ -1,52 +1,52 @@ " : $to_address; - $to_combined = $to_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; - 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: - // 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 - // 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() + // HOOK_SEND_MAIL plugin instructions: + // 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 + // 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() - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) { - $rc = $p->hook_send_mail($this, $params); + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) { + $rc = $p->hook_send_mail($this, $params); - if ($rc == 1) - return $rc; + if ($rc == 1) + return $rc; - if ($rc == -1) - return 0; - } + if ($rc == -1) + 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) { - $this->last_error = $message; - } + function set_error($message) { + $this->last_error = $message; + } - function error() { - return $this->last_error; - } + function error() { + return $this->last_error; + } }