DataObjects/Core_watch.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index b7f635c..a5dc71a 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -98,7 +98,8 @@ class Pman_Core_NotifySend extends Pman
             print_r($w);
         }
         
-        $sent = preg_match('/^0000/', $w->sent) ? false : true;
+        $sent = (empty($w->sent) || preg_match('/^0000/', $w->sent)) ? false : true;
+        
         if (!$force && (!empty($w->msgid) || $sent)) {
             $ww = clone($w);
             if (!$sent) { 
@@ -108,7 +109,6 @@ class Pman_Core_NotifySend extends Pman
             die("message has been sent already.\n");
         }
         
-        
         $o = $w->object();
         
         if ($o === false)  {
@@ -174,7 +174,6 @@ class Pman_Core_NotifySend extends Pman
         // 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,
@@ -254,23 +253,15 @@ class Pman_Core_NotifySend extends Pman
         
         $ff = HTML_FlexyFramework::get();
         
+        
         $dom = array_pop(explode('@', $p->email));
         
         $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->msgid = '';
-            $w->event_id = $ev->id;
-            $w->update($ww);
-            die(date('Y-m-d h:i:s') . " - FAILED -  BAD EMAIL - {$p->email} \n");
-            
-            
-        }
-        
+        // we might fail doing this...
+        // need to handle temporary failure..
+       
         
           // we try for 3 days..
         $retry = 5;
@@ -287,7 +278,30 @@ class Pman_Core_NotifySend extends Pman
             // older that 1 day.
             $retry = 120;
         }
-        if (strtotime($w->act_start) <  strtotime('NOW - 14 DAY')) {
+        
+        if ($mxs === false) {
+            // only retry for 2 day son the MX issue..
+            if ($retry < 120) {
+                $this->addEvent('NOTIFY', $w, 'MX LOOKUP FAILED ' . $dom . ' ' . $res->toString());
+                $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+                $w->update($ww);
+                die(date('Y-m-d h:i:s') . " - GREYLISTED\n");
+            }
+            
+            $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
+            $w->sent = date('Y-m-d H:i:s');
+            $w->msgid = '';
+            $w->event_id = $ev->id;
+            $w->update($ww);
+            die(date('Y-m-d h:i:s') . " - FAILED -  BAD EMAIL - {$p->email} \n");
+            
+            
+        }
+        
+        
+        
+        
+        if (!$force && strtotime($w->act_start) <  strtotime('NOW - 14 DAY')) {
             $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
             $w->sent = date('Y-m-d H:i:s');
             $w->msgid = '';