$fail = false;
require_once 'Mail.php';
- foreach($mxs as $dom) {
-
-
+ $core_domain = DB_DataObject::factory('core_domain');
+ if(!$core_domain->get('domain', $dom)){
+ $core_domain = DB_DataObject::factory('core_domain');
+ $core_domain->setFrom(array(
+ 'domain' => $dom
+ ));
+ $core_domain->insert();
+ }
+
+ 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) && !empty($ff->Core_Notify['routes'])){
+
+ foreach ($ff->Core_Notify['routes'] as $server => $settings){
+ if(!in_array($dom, $settings['domains'])){
+ continue;
+ }
+
+ // what's the minimum timespan.. - if we have 60/hour.. that's 1 every minute.
+ // if it's newer that '1' minute...
+ // then shunt it..
+
+ $seconds = floor((60 * 60) / $settings['rate']);
+
+ $core_notify = DB_DataObject::factory($this->table);
+ $core_notify->domain_id = $core_domain->id;
+ $core_notify->whereAdd("
+ sent >= NOW() - INTERVAL $seconds SECONDS
+ ");
+
+ if($core_notify->count()){
+ $old = clone($w);
+ $w->act_when = date("Y-m-d H:i:s", time() + $seconds);
+ $w->update($old);
+ $this->errorHandler(date('Y-m-d h:i:s ') . " Too many emails sent by {$dom}");
+ }
+
+ // that make's this test obsolete...
+ /*
+
+ $core_notify = DB_DataObject::factory($this->table);
+ $core_notify->domain_id = $core_domain->id;
+ $core_notify->whereAdd("
+ sent >= NOW() - INTERVAL 1 HOUR
+ ");
+
+ if($core_notify->count() >= $settings['rate']){
+ $old = clone($w);
+ $w->act_when = date("Y-m-d H:i:s", strtotime('+1 HOUR'));
+ $w->update($old);
+ $this->errorHandler(date('Y-m-d h:i:s ') . " Too many emails sent by {$dom}");
+ }
+ */
+
+
+
+ $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']);
if ($res === true) {
// success....
- $ev = $this->addEvent('NOTIFYSENT', $w, "{$w->to_email} - {$email['headers']['Subject']}");
+ $successEventName = (empty($email['successEventName'])) ? 'NOTIFYSENT' : $email['successEventName'];
+
+ $ev = $this->addEvent($successEventName, $w, "{$w->to_email} - {$email['headers']['Subject']}");
$ev->writeEventLog($this->debug_str);
$w->sent = date('Y-m-d H:i:s');
$w->msgid = $email['headers']['Message-Id'];
$w->event_id = $ev->id; // sent ok.. - no need to record it..
+ $w->domain_id = $core_domain->id;
$w->update($ww);
// enable cc in notify..
//print_r($res);
$this->addEvent('NOTIFY', $w, 'GREYLISTED - ' . $errmsg);
$w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+ $w->domain_id = $core_domain->id;
$w->update($ww);
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
$w->event_id = $ev->id;
+ $w->domain_id = $core_domain->id;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
}
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
$w->event_id = $ev->id;
+ $w->domain_id = $core_domain->id;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - RETRY TIME EXCEEDED\n");
}
$this->addEvent('NOTIFY', $w, 'NO HOST CAN BE CONTACTED:' . $p->email);
$w->act_when = date('Y-m-d H:i:s', strtotime('NOW + 5 MINUTES'));
+ $w->domain_id = $core_domain->id;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s') ." - NO HOST AVAILABLE\n");