$fail = false;
require_once 'Mail.php';
- foreach($mxs as $dom) {
+ foreach($mxs as $mx) {
if (!isset($ff->Mail['helo'])) {
$this->errorHandler("config Mail[helo] is not set");
}
$this->debug_str = '';
- $this->debug("Trying SMTP: $dom / HELO {$ff->Mail['helo']}");
+ $this->debug("Trying SMTP: $mx / HELO {$ff->Mail['helo']}");
$mailer = Mail::factory('smtp', array(
- 'host' => $dom ,
+ 'host' => $mx ,
'localhost' => $ff->Mail['helo'],
'timeout' => 15,
'socket_options' => isset($ff->Mail['socket_options']) ? $ff->Mail['socket_options'] : null,
// if the host is the mail host + it's authenticated add auth details
// this normally will happen if you sent Pman_Core_NotifySend['host']
- if (isset($ff->Mail['host']) && $ff->Mail['host'] == $dom && !empty($ff->Mail['auth'] )) {
+ if (isset($ff->Mail['host']) && $ff->Mail['host'] == $mx && !empty($ff->Mail['auth'] )) {
+
+ $username = $ff->Mail['username'] ;
+ $password = $ff->Mail['password'] ;
if(!empty($ff->Core_Notify)){
+ foreach ($ff->Core_Notify['routes'] as $server => $settings){
+ if(!in_array($dom, $settings['domains'])){
+ continue;
+ }
+
+ $mailer->host = $server;
+ $username = $settings['username'];
+ $password = $settings['password'];
+
+ break;
+ }
+
}
$mailer->auth = true;
- $mailer->username = $ff->Mail['username'] ;
- $mailer->password = $ff->Mail['password'] ;
+ $mailer->username = $username;
+ $mailer->password = $password;
}
$res = $mailer->send($p->email, $email['headers'], $email['body']);