From: Alan Knowles Date: Fri, 7 Dec 2018 02:09:19 +0000 (+0800) Subject: Pman/Login.php X-Git-Url: http://git.roojs.org/?p=Pman.Base;a=commitdiff_plain;h=468336ac9cfa75513f3ea626c411669c42d69a87 Pman/Login.php --- diff --git a/Pman/Login.php b/Pman/Login.php index 74d81e2..2baaec7 100644 --- a/Pman/Login.php +++ b/Pman/Login.php @@ -416,11 +416,15 @@ class Pman_Login extends Pman $this->bcc = $bcc; $this->rcpts = $u->getEmailFrom(); - $ret = $cm->send($this); - //$this->jerr(print_r($r->toData(),true)); - - if (is_object($ret)) { - $this->addEvent('SYSERR',false, $ret->getMessage()); + + $mailer = $core_email->toMailer($this, false); + if (is_a($mailer,'PEAR_Error') ) { + $this->addEvent('SYSERR',false, $ret->getMessage()); + $this->jerr($mailer->getMessage()); + } + $sent = $mailer->send(); + if (is_a($sent,'PEAR_Error') ) { + $this->addEvent('SYSERR',false, $ret->getMessage()); $this->jerr($ret->getMessage()); } $this->addEvent('PASSREQ',$u, $u->email);