function messageIsBlacklisted($err)
{
$match = array(
- '5.7.0 DT:SPM'. // 163.com
+ '5.7.0 DT:SPM', // 163.com
'on our block list ', // live.com
'spameatingmonkey.net', // spameatingmonkey.net (users)
'sender is listed on the block', // korian?
$bl->server_id = $this->id;
$bl->domain_id = $core_domain->id;
if ($bl->count()) {
- return;
+ return true;
}
// is it a blacklist message
if (!$bl->messageIsBlacklisted($errmsg)) {
- return;
+ return false;
}
$bl->added_dt = $bl->sqlValue("NOW()");
$bl->insert();
-
+ return true;
}
if ($black !== false) {
if (false === $this->server->updateNotifyToNextServer($p)) {
- $p->updateState("????");
+ $ev = $this->addEvent('NOTIFY', $p, 'BLACKLISTED FROM our DB');
+ $this->server->updateNotifyToNextServer($w, strtotime('NOW + 5 MINUTES'),true);
+ // $this->errorHandler( $ev->remarks);
}
continue;
$errmsg= $res->userinfo['smtpcode'] . ':' . $res->userinfo['smtptext'];
}
+ if ($res->userinfo['smtpcode'] == 550) {
+ if ($this->server->checkSmtpResponse($errmsg, $core_domain)) {
+ $ev = $this->addEvent('NOTIFY', $w, 'BLACKLISTED - ' . $errmsg);
+ $this->server->updateNotifyToNextServer($w, strtotime('NOW + ' . $retry . ' MINUTES'),true);
+ $this->errorHandler( $ev->remarks);
+ }
+ }
+
+
$ev = $this->addEvent('NOTIFYFAIL', $w, ($fail ? "FAILED - " : "RETRY TIME EXCEEDED - ") . $errmsg);
$w->flagDone($ev, '');
- if ($res->userinfo['smtpcode'] == 550) {
- $this->server->checkSmtpResponse($errmsg, $core_domain);
- }
+
$this->errorHandler( $ev->remarks);