);
var $table = 'core_notify';
+ var $error_handler = 'die';
+
function getAuth()
{
$ff = HTML_FlexyFramework::get();
if (!$ff->cli) {
- die("access denied");
+ $this->errorHandler("access denied");
}
//HTML_FlexyFramework::ensureSingle(__FILE__, $this);
return true;
{
//print_r($opts);
- if ($opts['DB_DataObject-debug']) {
+ if (!empty($opts['DB_DataObject-debug'])) {
DB_DataObject::debugLevel($opts['DB_DataObject-debug']);
}
+
//DB_DataObject::debugLevel(1);
//date_default_timezone_set('UTC');
// phpinfo();exit;
$w = DB_DataObject::factory($this->table);
if (!$w->get($id)) {
- die("invalid id\n");
+ $this->errorHandler("invalid id\n");
}
if (!$force && strtotime($w->act_when) < strtotime($w->sent)) {
- die("send repeat to early\n");
+ $this->errorHandler("send repeat to early\n");
}
if (!empty($opts['debug'])) {
print_r($w);
+ $ff = HTML_FlexyFramework::get();
+ if (!isset($ff->Core_Mailer)) {
+ $ff->Core_Mailer = array();
+ }
+ HTML_FlexyFramework::get()->Core_Mailer['debug'] = true;
}
$sent = (empty($w->sent) || preg_match('/^0000/', $w->sent)) ? false : true;
$w->sent = $w->sqlValue("NOW()");
$w->update($ww);
}
- die("message has been sent already.\n");
+ $this->errorHandler("message has been sent already.\n");
}
$o = $w->object();
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
- die(date('Y-m-d h:i:s ') .
+ $this->errorHandler(date('Y-m-d h:i:s ') .
"Notification event cleared (underlying object does not exist)"
."\n");
}
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
- die(date('Y-m-d h:i:s ') .
+ $this->errorHandler(date('Y-m-d h:i:s ') .
"Notification event cleared (not user not active any more)"
."\n");
- die("message has been sent already.\n");
+ $this->errorHandler("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(
+
+ $lar = array(
'ontable' => $w->ontable,
'onid' => $w->onid,
- 'person_id' => $w->person_id,
- ));
+ );
+ // 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};
+ }
+
+
+ $l->setFrom( $lar );
$l->whereAdd('id != '. $w->id);
$l->orderBy('sent DESC');
$l->limit(1);
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
- die(date('Y-m-d h:i:s ') .
+ $this->errorHandler(date('Y-m-d h:i:s ') .
"Notification event cleared (not required any more)"
."\n");
}
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
- die(date('Y-m-d h:i:s ') .
+ $this->errorHandler(date('Y-m-d h:i:s ') .
(isset($email['error']) ?
$email['error'] : "INTERNAL ERROR - We can not handle " . $w->ontable)
."\n");
$old = clone($w);
$w->act_when = $email['later'];
$w->update($old);
- die(date('Y-m-d h:i:s ') . " Delivery postponed by email creator");
+ $this->errorHandler(date('Y-m-d h:i:s ') . " Delivery postponed by email creator to {$email['later']}");
}
}
//$p->email = 'alan@akbkhome.com'; //for testing..
- print_r($email);exit;
+ //print_r($email);exit;
// should we fetch the watch that caused it.. - which should contain the method to call..
// --send-to=test@xxx.com
// 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);
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
- die(date('Y-m-d h:i:s ') . "INVALID ADDRESS: " . $p->email. "\n");
+ $this->errorHandler(date('Y-m-d h:i:s ') . "INVALID ADDRESS: " . $p->email. "\n");
}
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());
+ $this->addEvent('NOTIFY', $w, 'MX LOOKUP FAILED ' . $dom );
$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");
+ $this->errorHandler(date('Y-m-d h:i:s') . " - MX LOOKUP FAILED\n");
}
$ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
- die(date('Y-m-d h:i:s') . " - FAILED - BAD EMAIL - {$p->email} \n");
+ $this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - BAD EMAIL - {$p->email} \n");
}
$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");
+ $this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - GAVE UP TO OLD - {$p->email} \n");
}
if (!isset($ff->Mail['helo'])) {
- die("config Mail[helo] is not set");
+ $this->errorHandler("config Mail[helo] is not set");
}
$this->debug_str = '';
$this->debug("Trying SMTP: $dom / HELO {$ff->Mail['helo']}");
'debug' => 1,
'debug_handler' => array($this, 'debugHandler')
));
+
+ // 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'] )) {
+ $mailer->auth = true;
+ $mailer->username = $ff->Mail['username'] ;
+ $mailer->password = $ff->Mail['password'] ;
+ }
+
$res = $mailer->send($p->email, $email['headers'], $email['body']);
// enable cc in notify..
if (!empty($email['headers']['Cc'])) {
- $mailer = Mail::factory('smtp', array(
+ $cmailer = Mail::factory('smtp', array(
//'host' => $dom ,
// 'debug' => true
));
$email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
- $mailer->send($email['headers']['Cc'],
+ $cmailer->send($email['headers']['Cc'],
$email['headers'], $email['body']);
}
if (!empty($email['bcc'])) {
- $mailer = Mail::factory('smtp', array(
+ $cmailer = Mail::factory('smtp', array(
//'host' => $dom ,
// 'debug' => true
));
$email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
- $mailer->send($email['bcc'],
+ $cmailer->send($email['bcc'],
$email['headers'], $email['body']);
}
- die(date('Y-m-d h:i:s') . " - SENT\n");
+ $this->errorHandler(date('Y-m-d h:i:s') . " - SENT\n");
}
// what type of error..
$code = empty($res->userinfo['smtpcode']) ? -1 : $res->userinfo['smtpcode'];
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= $fail ? ($res->userinfo['smtpcode'] . ': ' .$res->toString()) : " - UNKNOWN ERROR";
+ $errmsg= $res->userinfo['smtpcode'] . ': ' .$res->message ;
+ if (!empty($res->userinfo['smtptext'])) {
$errmsg= $res->userinfo['smtpcode'] . ':' . $res->userinfo['smtptext'];
}
//print_r($res);
$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");
+
+
+ $this->errorHandler(date('Y-m-d h:i:s') . " - GREYLISTED - $errmsg \n");
}
$fail = true;
break;
$w->msgid = '';
$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->errorHandler(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
}
// handle no host availalbe forever...
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
- die(date('Y-m-d h:i:s') . " - FAILED - RETRY TIME EXCEEDED\n");
+ $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->update($ww);
- die(date('Y-m-d h:i:s') ." - NO HOST AVAILABLE\n");
+ $this->errorHandler(date('Y-m-d h:i:s') ." - NO HOST AVAILABLE\n");
}
}
function output()
{
- die("done\n");
+ $this->errorHandler("done\n");
}
var $debug_str = '';
$this->debug_str .= strlen($this->debug_str) ? "\n" : '';
$this->debug_str .= $message;
}
+
+ function errorHandler($msg)
+ {
+ if($this->error_handler == 'exception'){
+ throw new Exception($msg);
+ }
+
+ die($msg);
+
+
+ }
}
\ No newline at end of file
projects / Pman.Core / blobdiff