}
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?!?!
+
+ // since some of them have spaces?!?!
$p->email = trim($p->email);
+
- print_r($p);exit;
require_once 'Validate.php';
if (!Validate::email($p->email, true)) {
$ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);
$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;
'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'])) {
- $cmailer = 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'];
$cmailer->send($email['headers']['Cc'],
$email['headers'], $email['body']);
}
if (!empty($email['bcc'])) {
- $cmailer = 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'];
- $cmailer->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'];
$w->event_id = $ev->id;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - RETRY TIME EXCEEDED\n");
-
-
}