print_r($w);
}
+ $sent = (empty($w->sent) || preg_match('/^0000/', $w->sent)) ? false : true;
- if (!$force && (!empty($w->msgid) || (strtotime($w->sent) > strtotime('2000-01-01'))) {
+ 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) {
// 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}>";
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';
$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->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....