DataObjects/core.sql

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 9dfcd86..23a2f70 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -96,6 +96,10 @@ class Pman_Core_NotifySend extends Pman
         }
         
         if (!$force && !empty($w->msgid)) {
+            $ww = clone($w);
+            $w->sent = $w->sqlValue("NOW()");
+            $w->update($ww);
+            
             die("message has been sent already.\n");
         }
         
@@ -129,8 +133,9 @@ class Pman_Core_NotifySend extends Pman
             $next_try_min = floor((time() - strtotime($last_event)) / 60) * 2;
         }
         $next_try = $next_try_min . ' MINUTES';
-        
-        $email =  $this->makeEmail($o, $p, $last, $w);
+         
+        // this may modify $p->email. (it will not update it though)
+        $email =  $this->makeEmail($o, $p, $last, $w, $force);
         
         
         if ($email === true)  {
@@ -147,11 +152,12 @@ class Pman_Core_NotifySend extends Pman
                     ."\n");
         }
      
+       
         
         if ($email === false || isset($email['error'])) {
             // 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);;
+                            $email['error'] : "INTERNAL ERROR  - We can not handle " . $w->ontable); 
             $ww = clone($w);
             $w->sent = date('Y-m-d H:i:s');
             $w->msgid = '';
@@ -162,6 +168,11 @@ class Pman_Core_NotifySend extends Pman
                             $email['error'] : "INTERNAL ERROR  - We can not handle " . $w->ontable)
                     ."\n");
         }
+        
+        
+        
+        
+        
         if (isset($email['later'])) {
             $old = clone($w);
             $w->act_when = $email['later'];
@@ -183,12 +194,61 @@ class Pman_Core_NotifySend extends Pman
             $p->email = $opts['send-to'];
         }
         
+        require_once 'Validate.php';
+        if (!Validate::email($p->email, true)) {
+            $ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);
+            $ww = clone($w);
+            $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 ') . "INVALID ADDRESS: " . $p->email. "\n");
+            
+        }
+        
+        
         $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 try for 3 days..
+        $retry = 5;
+        if (strtotime($w->act_start) <  strtotime('NOW - 1 HOUR')) {
+            // older that 1 hour.
+            $retry = 15;
+        }
+        
+        if (strtotime($w->act_start) <  strtotime('NOW - 1 DAY')) {
+            // older that 1 day.
+            $retry = 60;
+        }
+        if (strtotime($w->act_start) <  strtotime('NOW - 2 DAY')) {
+            // older that 1 day.
+            $retry = 120;
+        }
+        $w->to_email = $p->email; 
+        //$this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
+        $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+        $w->update($ww);
+        
+        
+        
         
         $fail = false;
         require_once 'Mail.php';
@@ -205,13 +265,18 @@ class Pman_Core_NotifySend extends Pman
             $mailer = Mail::factory('smtp', array(
                     'host'    => $dom ,
                     'localhost' => $ff->Mail['helo'],
+                    'timeout' => 15,
                   //  'debug' => true
                 ));
             $res = $mailer->send($p->email, $email['headers'], $email['body']);
+            
+            
+            
+            
             if ($res === true) {
                 // success....
                 
-                $ev = $this->addEvent('NOTIFY', $w, 'SUCCESS: ' .$email['headers']['Subject']);
+                $ev = $this->addEvent('NOTIFYSENT', $w, "{$w->to_email} - {$email['headers']['Subject']}");
                
                 
                 
@@ -239,15 +304,23 @@ class Pman_Core_NotifySend extends Pman
             }
             // what type of error..
             $code = empty($res->userinfo['smtpcode']) ? -1 : $res->userinfo['smtpcode'];
+            if (!empty($res->code) && $res->code == 10001) {
+                // fake greylist if timed out.
+                $code = 421;
+            }
+            
             if ($code < 0) {
+                $this->debug($res->message);
                 continue; // try next mx... ??? should we wait??? - nope we did not even connect..
             }
             // give up after 2 days..
             if (in_array($code, array( 421, 450, 451, 452))   && $next_try_min < (2*24*60)) {
                 // try again later..
                 // check last event for this item..
+                
+               
                 $this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
-                $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + 5 MINUTES'));
+                $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");
             }
@@ -256,7 +329,7 @@ class Pman_Core_NotifySend extends Pman
         }
         if ($fail || $next_try_min > (2*24*60)) {
         // fail.. = log and give up..
-            $ev = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ".
+            $ev = $this->addEvent('NOTIFY', $w, ($fail ? "FAILED - " : "RETRY TIME EXCEEDED - ") .
                         $p->email . ' ' .
                         ($fail ? ($res->userinfo['smtpcode'] . ' : ' .$res->toString()) :  " - UNKNOWN ERROR"));
             $w->sent = date('Y-m-d H:i:s');
@@ -266,6 +339,19 @@ class Pman_Core_NotifySend extends Pman
             die(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
         }
         
+        // handle no host availalbe forever...
+        if (strtotime($w->act_start) < strtotime('NOW - 3 DAYS')) {
+            $ev = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ". $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 - RETRY TIME EXCEEDED\n");
+            
+            
+        }
+        
+        
         $this->addEvent('NOTIFY', $w, 'NO HOST CAN BE CONTACTED:' . $p->email);
         $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + 5 MINUTES'));
         $w->update($ww);
@@ -307,9 +393,9 @@ class Pman_Core_NotifySend extends Pman
          
      }
      **/
-    function makeEmail($object, $rcpt, $last_sent_date, $notify)
+    function makeEmail($object, $rcpt, $last_sent_date, $notify, $force =false)
     {
-        return $object->toEmail($rcpt, $last_sent_date, $notify);
+        return $object->toEmail($rcpt, $last_sent_date, $notify, $force);
     }
     
     function debug($str)