* Mail[helo] << helo host name
* Mail[socket_options] << any socket option.
*/
+class Pman_Core_NotifySend_Exception_Success extends Exception {}
+class Pman_Core_NotifySend_Exception_Fail extends Exception {}
class Pman_Core_NotifySend extends Pman
}
- function get($id,$opts)
+ function get($id,$opts=array())
{
//print_r($opts);
$force = empty($opts['force']) ? 0 : 1;
$w = DB_DataObject::factory($this->table);
-
+
if (!$w->get($id)) {
$this->errorHandler("invalid id\n");
}
if (!$force && (!empty($w->msgid) || $sent)) {
$ww = clone($w);
if (!$sent) {
- $w->sent = $w->sqlValue("NOW()");
+ $w->sent = $w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
$w->update($ww);
}
$this->errorHandler("message has been sent already.\n");
$ev = $this->addEvent('NOTIFY', $w,
"Notification event cleared (underlying object does not exist)" );;
$ww = clone($w);
- $w->sent = date('Y-m-d H:i:s');
+ $w->sent = $w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
$ev = $this->addEvent('NOTIFY', $w,
"Notification event cleared (not user not active any more)" );;
$ww = clone($w);
- $w->sent = date('Y-m-d H:i:s');
+ $w->sent = $w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
$ev = $this->addEvent('NOTIFY', $w,
"Notification event cleared (not required any more)" );;
$ww = clone($w);
- $w->sent = date('Y-m-d H:i:s');
+ $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
"Notification event cleared (not required any more)"
."\n");
}
-
- if (empty($p) && !empty($email['rcpts'])) {
+ if (is_a($email, 'PEAR_Error')) {
+ $email =array(
+ 'error' => $email->toString()
+ );
+ }
+
+ if (empty($p) && !empty($email['recipients'])) {
// make a fake person..
$p = (object) array(
- 'email' => $email['rcpts']
+ 'email' => $email['recipients']
);
}
-
+
if ($email === false || isset($email['error']) || empty($p)) {
// object returned 'false' - it does not know how to send it..
$ev = $this->addEvent('NOTIFY', $w, isset($email['error']) ?
$email['error'] : "INTERNAL ERROR - We can not handle " . $w->ontable);
$ww = clone($w);
- $w->sent = date('Y-m-d H:i:s');
+ $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
if (!Validate::email($p->email, true)) {
$ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);
$ww = clone($w);
- $w->sent = date('Y-m-d H:i:s');
+ $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
$ff = HTML_FlexyFramework::get();
-
- $dom = array_pop(explode('@', $p->email));
+ $explode_email = explode('@', $p->email);
+ $dom = array_pop($explode_email);
$mxs = $this->mxs($dom);
$ww = clone($w);
}
$ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );
- $w->sent = date('Y-m-d H:i:s');
+ $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
if (!$force && strtotime($w->act_start) < strtotime('NOW - 14 DAY')) {
$ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - GIVE UP - ". $p->email );
- $w->sent = date('Y-m-d H:i:s');
+ $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
$w->to_email = $p->email;
//$this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
- $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+ // we can only update act_when if it has not been sent already (only happens when running in force mode..)
+ $w->act_when = (!$w->act_when || $w->act_when == '0000-00-00 00:00:00') ? date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES')) : $w->act_when;
$w->update($ww);
$ww = clone($w);
$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');
+ if(strtotime($w->act_when) > strtotime("NOW")){
+ $w->act_when = date('Y-m-d H:i:s');
+ }
+
+ $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
$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..
}
- $this->errorHandler(date('Y-m-d h:i:s') . " - SENT {$w->id} - {$w->to_email} \n");
+ $this->errorHandler(date('Y-m-d h:i:s') . " - SENT {$w->id} - {$w->to_email} \n", true);
}
// what type of error..
$code = empty($res->userinfo['smtpcode']) ? -1 : $res->userinfo['smtpcode'];
//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);
$ev = $this->addEvent('NOTIFY', $w, ($fail ? "FAILED - " : "RETRY TIME EXCEEDED - ") .
$errmsg);
- $w->sent = date('Y-m-d H:i:s');
+ $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
$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"));
}
// handle no host availalbe forever...
if (strtotime($w->act_start) < strtotime('NOW - 3 DAYS')) {
$ev = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ". $p->email);
- $w->sent = date('Y-m-d H:i:s');
+ $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
$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");
return $object->$m($rcpt, $last_sent_date, $notify, $force);
}
- if (!method_exists($object, 'toEmail')) {
+ if (method_exists($object, 'toMailerData')) {
+ return $object->toMailerData(array(
+ 'rcpts'=>$rcpt,
+ 'person'=>$rcpt, // added as mediaoutreach used this?
+ )); //this is core_email - i think it's only used for testing...
//var_Dump($object);
//exit;
}
$this->debug_str .= $message;
}
- function errorHandler($msg)
+ function errorHandler($msg, $success = false)
{
if($this->error_handler == 'exception'){
- throw new Exception($msg);
+ if($success){
+ throw new Pman_Core_NotifySend_Exception_Success($msg);
+ }
+
+ throw new Pman_Core_NotifySend_Exception_Fail($msg);
}
die($msg);
projects / Pman.Core / blobdiff