'desc' => 'Turn on debugging (see DataObjects debugLevel )',
'default' => 0,
'short' => 'v',
+ 'min' => 0,
+ 'max' => 0,
+
+ ),
+ 'DB_DataObject-debug' => array(
+ 'desc' => 'Turn on debugging (see DataObjects debugLevel )',
+ 'default' => 0,
+ 'short' => 'd',
'min' => 1,
'max' => 1,
),
'send-to' => array(
'desc' => 'Send the message to this address, rather than the one listed.',
+ 'default' => '',
'short' => 't',
- 'min' => 1,
+ 'min' => 0,
'max' => 1,
)
function get($id,$opts)
{
- if ($opts['debug']) {
- DB_DataObject::debugLevel($opts['debug']);
+ if ($opts['DB_DataObject-debug']) {
+ DB_DataObject::debugLevel($opts['DB_DataObject-debug']);
}
//DB_DataObject::debugLevel(1);
//date_default_timezone_set('UTC');
// phpinfo();exit;
- $force = $opts['force'];
+ $force = empty($opts['force']) ? 0 : 1;
$w = DB_DataObject::factory($this->table);
// find last event..
$ev = DB_DataObject::factory('Events');
$ev->on_id = $w->id; // int(11)
- $ev->od_table = $this->table;
+ $ev->on_table = $this->table;
$ev->limit(1);
$ev->orderBy('event_when DESC');
$ar = $ev->fetchAll('event_when');
}
$next_try = $next_try_min . ' MINUTES';
- $email = $this->makeEmail($o, $p,$last);
+ $email = $this->makeEmail($o, $p, $last, $w);
+
+ if ($email === true) {
+
+ $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->msgid = '';
+ $w->event_id = $ev->id;
+ $w->update($ww);
+ die(date('Y-m-d h:i:s ') .
+ "Notification event cleared (not required any more)"
+ ."\n");
+ }
+
+ if ($email === false || isset($email['error'])) {
+ // 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->msgid = '';
+ $w->event_id = $ev->id;
+ $w->update($ww);
+ die(date('Y-m-d h:i:s ') .
+ (isset($email['error']) ?
+ $email['error'] : "INTERNAL ERROR - We can not handle " . $w->ontable)
+ ."\n");
+ }
+ if (isset($email['later'])) {
+ $old = clone($w);
+ $w->act_when = $email['later'];
+ $w->update($old);
+ die(date('Y-m-d h:i:s ') . " Delivery postponed by email creator");
+ }
+
+ if (!isset($email['headers']['Message-Id'])) {
+ $HOST = gethostname();
+ $email['headers']['Message-Id'] = "<{$this->table}-{$id}@{$HOST}>";
+
+ }
//$p->email = 'alan@akbkhome.com'; //for testing..
//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'];
}
+ $ff = HTML_FlexyFramework::get();
$dom = array_pop(explode('@', $p->email));
require_once 'Mail.php';
foreach($mxs as $dom) {
- $this->debug("Trying SMTP: $dom");
+
+
+
+ if (!isset($ff->Mail['helo'])) {
+ die("config Mail[helo] is not set");
+ }
+
+ $this->debug("Trying SMTP: $dom / HELO {$ff->Mail['helo']}");
$mailer = Mail::factory('smtp', array(
'host' => $dom ,
+ 'localhost' => $ff->Mail['helo'],
// 'debug' => true
));
$res = $mailer->send($p->email, $email['headers'], $email['body']);
if ($res === true) {
// success....
+ $ev = $this->addEvent('NOTIFY', $w, 'SUCCESS: ' .$email['headers']['Subject']);
+
+
+
$w->sent = date('Y-m-d H:i:s');
$w->msgid = $email['headers']['Message-Id'];
- $w->event_id = -1; // sent ok.. - no need to record it..
+ $w->event_id = $ev->id; // sent ok.. - no need to record it..
$w->update($ww);
+
+ // enable cc in notify..
+ if (!empty($email['headers']['Cc'])) {
+ $mailer = Mail::factory('smtp', array(
+ //'host' => $dom ,
+ // 'debug' => true
+ ));
+ $email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
+ $mailer->send($email['headers']['Cc'],
+ $email['headers'], $email['body']);
+
+ }
+
+
+
+
die(date('Y-m-d h:i:s') . " - SENT\n");
}
// what type of error..
- list($code, $response) = $mailer->_smtp->getResponse();
+ $code = empty($res->userinfo['smtpcode']) ? -1 : $res->userinfo['smtpcode'];
if ($code < 0) {
continue; // try next mx... ??? should we wait??? - nope we did not even connect..
}
// give up after 2 days..
- if ($code == 421 && $next_try_min < (2*24*60)) {
+ if (in_array($code, array( 421, 451, 452)) && $next_try_min < (2*24*60)) {
// try again later..
// check last event for this item..
- $this->addEvent('NOTIFY', $w, 'GREYLISTED\n');
+ $this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
$w->act_when = date('Y-m-d H:i:s', strtotime('NOW + 5 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..
- $id = $this->addEvent('NOTIFY', $w, 'FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED"));
+ $ev = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ".
+ $p->email . ' ' .
+ ($fail ? ($res->userinfo['smtpcode'] . ' : ' .$res->toString()) : " - UNKNOWN ERROR"));
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
- $w->event_id = $id;
+ $w->event_id = $ev->id;
$w->update($ww);
die(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
}
- $this->addEvent('NOTIFY', $w, 'NO HOST CAN BE CONTACTED');
+ $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->update($ww);
die(date('Y-m-d h:i:s') ." - NO HOST AVAILABLE\n");
/**
* wrapper to call object->toEmail()
- *
+ *
+ * return
+ * {
+ headers : {AssocArray},
+ body: {String}
+
+ // optional..
+ error : {String} // error message in log.
+ send-to: {String} // use to override rcpt
+
+ }
**/
- function makeEmail($o, $p, $last)
+ function makeEmail($object, $rcpt, $last_sent_date, $notify)
{
- return $o->toEmail($p,$last);
+ return $object->toEmail($rcpt, $last_sent_date, $notify);
}
function debug($str)
projects / Pman.Core / blobdiff