wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Report if the email was not sent!

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-12-27 02:16:12 +01:00
parent 62c4ffe889
commit 6026dcaed1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/mail.php
View File

@ -54,7 +54,7 @@ function mail_backend()
$backend = $mail->factory(common_config('mail', 'backend'), $backend = $mail->factory(common_config('mail', 'backend'),
common_config('mail', 'params') ?: array()); common_config('mail', 'params') ?: array());
if ($_PEAR->isError($backend)) { if ($_PEAR->isError($backend)) {
common_server_error($backend->getMessage(), 500); throw new ServerException($backend->getMessage());
} }
} }
return $backend; return $backend;
@ -71,6 +71,8 @@ function mail_backend()
*/ */
function mail_send($recipients, $headers, $body) function mail_send($recipients, $headers, $body)
{ {
global $_PEAR;
try { try {
// XXX: use Mail_Queue... maybe // XXX: use Mail_Queue... maybe
$backend = mail_backend(); $backend = mail_backend();
@ -81,6 +83,9 @@ function mail_send($recipients, $headers, $body)
assert($backend); // throws an error if it's bad assert($backend); // throws an error if it's bad
$sent = $backend->send($recipients, $headers, $body); $sent = $backend->send($recipients, $headers, $body);
if ($_PEAR->isError($sent)) {
throw new ServerException($sent->getMessage());
}
return true; return true;
} catch (PEAR_Exception $e) { } catch (PEAR_Exception $e) {
common_log( common_log(