die("send repeat to early\n");
}
+ if (!empty($opts['debug'])) {
+ 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) {
+
+ $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->msgid = '';
+ $w->event_id = $ev->id;
+ $w->update($ww);
+ die(date('Y-m-d h:i:s ') .
+ "Notification event cleared (underlying object does not exist)"
+ ."\n");
+ }
+
+
+
$p = $w->person();
+ if (isset($p->active) && empty($p->active)) {
+ $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->msgid = '';
+ $w->event_id = $ev->id;
+ $w->update($ww);
+ die(date('Y-m-d h:i:s ') .
+ "Notification event cleared (not user not active any more)"
+ ."\n");
+ die("message has been sent already.\n");
+ }
+
+
// let's work out the last notification sent to this user..
$l = DB_DataObject::factory($this->table);
$l->setFrom( array(
// 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['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'])) {
+
+ if (!empty($email['send-to'])) {
+ $p->email = $email['send-to'];
+ }
+ if (!empty($opts['send-to'])) {
$p->email = $opts['send-to'];
}
+ // since some of them have spaces?!?!
+ $p->email = trim($p->email);
+
+ //print_r($p);
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 ($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->event_id = $ev->id;
+ $w->update($ww);
+ die(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());
$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';
// '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");
// try again later..
// check last event for this item..
-
+ //print_r($res);
$this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
$w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
$w->update($ww);
**/
function makeEmail($object, $rcpt, $last_sent_date, $notify, $force =false)
{
+ $m = 'notify'. $notify->evtype;
+ //var_dump($m);
+
+ if (!empty($notify->evtype) && method_exists($object,$m)) {
+ return $object->$m($rcpt, $last_sent_date, $notify, $force);
+ }
+
+ if (!method_exists($object, 'toEmail')) {
+ //var_Dump($object);
+ //exit;
+ }
return $object->toEmail($rcpt, $last_sent_date, $notify, $force);
}
}
echo $str . "\n";
}
-
+ function output()
+ {
+ die("done\n");
+ }
}
\ No newline at end of file
projects / Pman.Core / blobdiff