DataObjects/Core_locking.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 323eba5..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)  {
@@ -222,6 +227,28 @@ class Pman_Core_NotifySend extends Pman
         }
         
         
+          // 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';
@@ -238,6 +265,7 @@ 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']);
@@ -248,7 +276,7 @@ class Pman_Core_NotifySend extends Pman
             if ($res === true) {
                 // success....
                 
-                $ev = $this->addEvent('NOTIFY', $w, 'SUCCESS: ' .$email['headers']['Subject']);
+                $ev = $this->addEvent('NOTIFYSENT', $w, "{$w->to_email} - {$email['headers']['Subject']}");
                
                 
                 
@@ -290,22 +318,7 @@ class Pman_Core_NotifySend extends Pman
                 // try again later..
                 // check last event for this item..
                 
-                // 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;
-                }
-                
+               
                 $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);
@@ -316,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');
@@ -380,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)