print_r($w);
}
+ $sent = (empty($w->sent) || preg_match('/^0000/', $w->sent)) ? false : true;
- if (!$force && !empty($w->msgid)) {
+ if (!$force && (!empty($w->msgid) || $sent)) {
$ww = clone($w);
- $w->sent = $w->sqlValue("NOW()");
- $w->update($ww);
-
+ if (!$sent) {
+ $w->sent = $w->sqlValue("NOW()");
+ $w->update($ww);
+ }
die("message has been sent already.\n");
}
-
$o = $w->object();
if ($o === false) {
$w->event_id = $ev->id;
$w->update($ww);
die(date('Y-m-d h:i:s ') .
- "Notification event cleared (underlying object does not exist)""
+ "Notification event cleared (underlying object does not exist)"
."\n");
}
// this may modify $p->email. (it will not update it though)
$email = $this->makeEmail($o, $p, $last, $w, $force);
-
if ($email === true) {
$ev = $this->addEvent('NOTIFY', $w,
}
-
-
-
if (isset($email['later'])) {
$old = clone($w);
$w->act_when = $email['later'];
}
- if (!isset($email['headers']['Message-Id'])) {
+ if (empty($email['headers']['Message-Id'])) {
$HOST = gethostname();
$email['headers']['Message-Id'] = "<{$this->table}-{$id}@{$HOST}>";
//print_r($email);exit;
// should we fetch the watch that caused it.. - which should contain the method to call..
// --send-to=test@xxx.com
- if (!empty($opts['send-to'])) {
- $p->email = $opts['send-to'];
- }
+
if (!empty($email['send-to'])) {
$p->email = $email['send-to'];
}
- //print_r($p);
+ if (!empty($opts['send-to'])) {
+ $p->email = $opts['send-to'];
+ }
+ // since some of them have spaces?!?!
+ $p->email = trim($p->email);
+
+
require_once 'Validate.php';
if (!Validate::email($p->email, true)) {
$ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);
$ff = HTML_FlexyFramework::get();
+
$dom = array_pop(explode('@', $p->email));
$mxs = $this->mxs($dom);
$ww = clone($w);
-
- if ($mxs === false) {
- $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
- $w->sent = date('Y-m-d H:i:s');
- $w->msgid = '';
- $w->event_id = $ev->id;
- $w->update($ww);
- die(date('Y-m-d h:i:s') . " - FAILED - BAD EMAIL - {$p->email} \n");
-
-
- }
-
+ // we might fail doing this...
+ // need to handle temporary failure..
+
// we try for 3 days..
$retry = 5;
// older that 1 day.
$retry = 120;
}
- if (strtotime($w->act_start) < strtotime('NOW - 14 DAY')) {
+
+ if ($mxs === false) {
+ // only retry for 2 day son the MX issue..
+ if ($retry < 120) {
+ $this->addEvent('NOTIFY', $w, 'MX LOOKUP FAILED ' . $dom . ' ' . $res->toString());
+ $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+ $w->update($ww);
+ die(date('Y-m-d h:i:s') . " - GREYLISTED\n");
+ }
+
+ $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
+ $w->sent = date('Y-m-d H:i:s');
+ $w->msgid = '';
+ $w->event_id = $ev->id;
+ $w->update($ww);
+ die(date('Y-m-d h:i:s') . " - FAILED - BAD EMAIL - {$p->email} \n");
+
+
+ }
+
+
+
+
+ if (!$force && strtotime($w->act_start) < strtotime('NOW - 14 DAY')) {
$ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
$w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
$w->update($ww);
-
-
+ $ww = clone($w);
$fail = false;
require_once 'Mail.php';
'host' => $dom ,
'localhost' => $ff->Mail['helo'],
'timeout' => 15,
+ 'socket_options' => isset($ff->Mail['socket_options']) ? $ff->Mail['socket_options'] : null
// 'debug' => true
));
$res = $mailer->send($p->email, $email['headers'], $email['body']);
-
-
-
+
if ($res === true) {
// success....
}
-
+ if (!empty($email['bcc'])) {
+ $mailer = Mail::factory('smtp', array(
+ //'host' => $dom ,
+ // 'debug' => true
+ ));
+ $email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
+ $mailer->send($email['bcc'],
+ $email['headers'], $email['body']);
+
+ }
die(date('Y-m-d h:i:s') . " - SENT\n");
if (in_array($code, array( 421, 450, 451, 452)) && $next_try_min < (2*24*60)) {
// try again later..
// check last event for this item..
-
+ $errmsg= $fail ? ($res->userinfo['smtpcode'] . ': ' .$res->toString()) : " - UNKNOWN ERROR";
+ if (isset($res->userinfo['smtptext'])) {
+ $errmsg= $res->userinfo['smtpcode'] . ':' . $res->userinfo['smtptext'];
+ }
//print_r($res);
- $this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
+ $this->addEvent('NOTIFY', $w, 'GREYLISTED - ' . $errmsg);
$w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
$w->update($ww);
die(date('Y-m-d h:i:s') . " - GREYLISTED\n");
}
if ($fail || $next_try_min > (2*24*60)) {
// fail.. = log and give up..
+ $errmsg= $fail ? ($res->userinfo['smtpcode'] . ': ' .$res->toString()) : " - UNKNOWN ERROR";
+ if (isset($res->userinfo['smtptext'])) {
+ $errmsg= $res->userinfo['smtpcode'] . ':' . $res->userinfo['smtptext'];
+ }
+
$ev = $this->addEvent('NOTIFY', $w, ($fail ? "FAILED - " : "RETRY TIME EXCEEDED - ") .
- $p->email . ' ' .
- ($fail ? ($res->userinfo['smtpcode'] . ' : ' .$res->toString()) : " - UNKNOWN ERROR"));
+ $errmsg);
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
$w->event_id = $ev->id;