$this->errorHandler("invalid id\n");
}
- if (!$force && strtotime($w->act_when) < strtotime($w->sent)) {
-
-
- $this->errorHandler("send repeat to early\n");
+ if (!$force && !empty($w->sent) && strtotime($w->act_when) < strtotime($w->sent)) {
+
+ $this->errorHandler("already sent - repeat to early\n");
}
if (!empty($opts['debug'])) {
print_r($w);
."\n");
$this->errorHandler("message has been sent already.\n");
}
+ // has it failed mutliple times..
+ if (!empty($w->field) && isset($p->{$w->field .'_fails'}) && $p->{$w->field .'_fails'} > 9) {
+ $ev = $this->addEvent('NOTIFY', $w,
+ "Notification event cleared (user has to many failures)" );;
+ $ww = clone($w);
+ $w->sent = $w->sqlValue('NOW()'); // do not update if sent.....
+ $w->msgid = '';
+ $w->event_id = $ev->id;
+ $w->update($ww);
+ $this->errorHandler(date('Y-m-d h:i:s ') .
+ "Notification event cleared (user has to many failures)"
+ ."\n");
+ $this->errorHandler("user has to many failures.\n");
+ }
// let's work out the last notification sent to this user..
$l = DB_DataObject::factory($this->table);
'onid' => $w->onid,
);
// only newer version of the database us this..
- $personid_col = strtolower($w->person_table).'_id';
- if (isset($w->{$personid_col})) {
- $lar[$personid_col] = $w->{$personid_col};
+ if (isset($w->person_table)) {
+ $personid_col = strtolower($w->person_table).'_id';
+ if (isset($w->{$personid_col})) {
+ $lar[$personid_col] = $w->{$personid_col};
+ }
}
$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->to_email = $p->email;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s ') .
(isset($email['error']) ?
if (isset($email['later'])) {
$old = clone($w);
$w->act_when = $email['later'];
+ $this->updateServer($w);
$w->update($old);
$this->errorHandler(date('Y-m-d h:i:s ') . " Delivery postponed by email creator to {$email['later']}");
}
$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->to_email = $p->email;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s ') . "INVALID ADDRESS: " . $p->email. "\n");
// need to handle temporary failure..
- // we try for 3 days..
- $retry = 5;
+ // we try for 2 days..
+ $retry = 15;
if (strtotime($w->act_start) < strtotime('NOW - 1 HOUR')) {
// older that 1 hour.
- $retry = 15;
+ $retry = 60;
}
if (strtotime($w->act_start) < strtotime('NOW - 1 DAY')) {
// older that 1 day.
- $retry = 60;
+ $retry = 120;
}
if (strtotime($w->act_start) < strtotime('NOW - 2 DAY')) {
// older that 1 day.
- $retry = 120;
+ $retry = 240;
}
if ($mxs === false) {
- // only retry for 2 day son the MX issue..
- if ($retry < 120) {
+ // only retry for 1 day if the MX issue..
+ if ($retry < 240) {
$this->addEvent('NOTIFY', $w, 'MX LOOKUP FAILED ' . $dom );
$w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+ $this->updateServer($w);
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s') . " - MX LOOKUP FAILED\n");
}
$ev = $this->addEvent('NOTIFYFAIL', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );
- $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
+ $w->sent = $w->sqlValue('NOW()'); // why not updated - used to leave as is?
$w->msgid = '';
$w->event_id = $ev->id;
+ $w->to_email = $p->email;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - BAD EMAIL - {$p->email} \n");
- if (!$force && strtotime($w->act_start) < strtotime('NOW - 14 DAY')) {
+ if (!$force && strtotime($w->act_start) < strtotime('NOW - 3 DAY')) {
$ev = $this->addEvent('NOTIFYFAIL', $w, "BAD ADDRESS - GIVE UP - ". $p->email );
- $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
+ $w->sent = $w->sqlValue('NOW()');
$w->msgid = '';
$w->event_id = $ev->id;
+ $w->to_email = $p->email;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - GAVE UP TO OLD - {$p->email} \n");
}
$w->to_email = $p->email;
//$this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
// we can only update act_when if it has not been sent already (only happens when running in force mode..)
+ // set act when if it's empty...
$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);
));
$core_domain->insert();
}
+
+
+ $this->initHelo();
+
+ if (!isset($ff->Mail['helo'])) {
+ $this->errorHandler("config Mail[helo] is not set");
+ }
+
+
foreach($mxs as $mx) {
- if (!isset($ff->Mail['helo'])) {
- $this->errorHandler("config Mail[helo] is not set");
- }
+
$this->debug_str = '';
$this->debug("Trying SMTP: $mx / HELO {$ff->Mail['helo']}");
$mailer = Mail::factory('smtp', array(
if($core_notify->count()){
$old = clone($w);
$w->act_when = date("Y-m-d H:i:s", time() + $seconds);
+ $this->updateServer($w);
$w->update($old);
$this->errorHandler(date('Y-m-d h:i:s ') . " Too many emails sent by {$dom}");
}
//print_r($res);
$this->addEvent('NOTIFY', $w, 'GREYLISTED - ' . $errmsg);
$w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+ $this->updateServer($w);
$w->domain_id = $core_domain->id;
$w->update($ww);
$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->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+
+ $this->updateServer($w);
+
$w->domain_id = $core_domain->id;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s') ." - NO HOST AVAILABLE\n");
}
+
+ function updateServer($w)
+ {
+ $ff = HTML_FlexyFramework::get();
+
+ if (empty($ff->Core_Notify['servers'])) {
+ return;
+ }
+ // next server..
+ $w->server_id = ($w->server_id + 1) % count(array_keys($ff->Core_Notify['servers']));
+
+ }
+
+ function initHelo()
+ {
+ $ff = HTML_FlexyFramework::get();
+ if (empty($ff->Core_Notify['servers'])) {
+ return;
+ }
+ if (!isset($ff->Core_Notify['servers'][gethostname()]) || !isset($ff->Core_Notify['servers'][gethostname()]['helo']) ) {
+ $this->jerr("Core_Notify['servers']['" . gethostname() . "']['helo'] not set");
+ }
+ $ff->Mail['helo'] = $ff->Core_Notify['servers'][gethostname()]['helo'];
+
+ }
+
}
\ No newline at end of file
projects / Pman.Core / blobdiff