'ontable' => $w->ontable,
'onid' => $w->onid,
);
- $lar[strtolower($w->person_table).'_id'] = $w->{strtolower($w->person_table).'_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);
$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']}");
}
$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;
// 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";
+ }
}
$w->event_id = $ev->id;
$w->update($ww);
$this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - RETRY TIME EXCEEDED\n");
-
-
}