'min' => 0,
'max' => 0,
),
- 'remote' => array(
- 'desc' => 'Return to referer rather then die',
- 'default' => 0,
- 'short' => 'r',
- 'min' => 0,
- 'max' => 0,
- ),
'send-to' => array(
'desc' => 'Send the message to this address, rather than the one listed.',
'default' => '',
);
var $table = 'core_notify';
- var $remote = false;
+ var $error_handler = 'die';
function getAuth()
{
DB_DataObject::debugLevel($opts['DB_DataObject-debug']);
}
- if(!empty($opts['remote'])){
- $this->remote = true;
- }
//DB_DataObject::debugLevel(1);
//date_default_timezone_set('UTC');
// phpinfo();exit;
}
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;
// 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);
"Notification event cleared (not required any more)"
."\n");
}
-
-
+ if (is_a($email, 'PEAR_Error')) {
+ $email =array(
+ 'error' => $email->toString()
+ );
+ }
- if ($email === false || isset($email['error'])) {
+ if (empty($p) && !empty($email['recipients'])) {
+ // make a fake person..
+ $p = (object) array(
+ 'email' => $email['recipients']
+ );
+ }
+
+ if ($email === false || isset($email['error']) || empty($p)) {
// 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);
$old = clone($w);
$w->act_when = $email['later'];
$w->update($old);
- $this->errorHandler(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']}");
}
$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..
if (!empty($opts['send-to'])) {
$p->email = $opts['send-to'];
}
- // since some of them have spaces?!?!
- $p->email = trim($p->email);
+ // since some of them have spaces?!?!
+ $p->email = trim($p->email);
+
require_once 'Validate.php';
if (!Validate::email($p->email, true)) {
$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);
- $this->errorHandler(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 );
+ $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
$w->event_id = $ev->id;
if (!$force && strtotime($w->act_start) < strtotime('NOW - 14 DAY')) {
- $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
+ $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - GIVE UP - ". $p->email );
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
$w->event_id = $ev->id;
$fail = false;
require_once 'Mail.php';
- foreach($mxs as $dom) {
-
-
+ foreach($mxs as $mx) {
if (!isset($ff->Mail['helo'])) {
$this->errorHandler("config Mail[helo] is not set");
}
$this->debug_str = '';
- $this->debug("Trying SMTP: $dom / HELO {$ff->Mail['helo']}");
+ $this->debug("Trying SMTP: $mx / HELO {$ff->Mail['helo']}");
$mailer = Mail::factory('smtp', array(
- 'host' => $dom ,
+ 'host' => $mx ,
'localhost' => $ff->Mail['helo'],
'timeout' => 15,
'socket_options' => isset($ff->Mail['socket_options']) ? $ff->Mail['socket_options'] : null,
'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'] == $mx && !empty($ff->Mail['auth'] )) {
+
+ $username = $ff->Mail['username'] ;
+ $password = $ff->Mail['password'] ;
+
+ if(!empty($ff->Core_Notify)){
+
+ foreach ($ff->Core_Notify['routes'] as $server => $settings){
+ if(!in_array($dom, $settings['domains'])){
+ continue;
+ }
+
+ $mailer->host = $server;
+ $username = $settings['username'];
+ $password = $settings['password'];
+
+ break;
+ }
+
+ }
+
+ $mailer->auth = true;
+ $mailer->username = $username;
+ $mailer->password = $password;
+ }
+
$res = $mailer->send($p->email, $email['headers'], $email['body']);
// enable cc in notify..
if (!empty($email['headers']['Cc'])) {
- $mailer = Mail::factory('smtp', array(
- //'host' => $dom ,
- // 'debug' => true
- ));
+ $cmailer = Mail::factory('smtp', isset($ff->Mail) ? $ff->Mail : array() );
$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(
- //'host' => $dom ,
- // 'debug' => true
- ));
+ $cmailer = Mail::factory('smtp', isset($ff->Mail) ? $ff->Mail : array() );
$email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
- $mailer->send($email['bcc'],
+ $res = $cmailer->send($email['bcc'],
$email['headers'], $email['body']);
-
+ if (!$res || is_a($res, 'PEAR_Error')) {
+ echo "could not send bcc..\n";
+ } else {
+ echo "Sent BCC to {$email['bcc']}\n";
+ }
}
- $this->errorHandler(date('Y-m-d h:i:s') . " - SENT\n");
+ $this->errorHandler(date('Y-m-d h:i:s') . " - SENT {$w->id} - {$w->to_email} \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);
- $this->errorHandler(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->event_id = $ev->id;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - RETRY TIME EXCEEDED\n");
-
-
}
function errorHandler($msg)
{
+ if($this->error_handler == 'exception'){
+ throw new Exception($msg);
+ }
+
+ die($msg);
+
}
}
\ No newline at end of file
projects / Pman.Core / blobdiff