DataObjects/Core_watch.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 857e959..b4a8d2a 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -94,15 +94,55 @@ class Pman_Core_NotifySend extends Pman
             
             die("send repeat to early\n");
         }
+        if (!empty($opts['debug'])) {
+            print_r($w);
+        }
+        
         
         if (!$force && !empty($w->msgid)) {
+            $ww = clone($w);
+            $w->sent = $w->sqlValue("NOW()");
+            $w->update($ww);
+            
             die("message has been sent already.\n");
         }
         
         
         $o = $w->object();
+        
+        if ($o === false)  {
+            
+            $ev = $this->addEvent('NOTIFY', $w,
+                            "Notification event cleared (underlying object does not exist)" );;
+            $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 ') . 
+                     "Notification event cleared (underlying object does not exist)" 
+                    ."\n");
+        }
+     
+        
+        
         $p = $w->person();
         
+        if (isset($p->active) && empty($p->active)) {
+            $ev = $this->addEvent('NOTIFY', $w,
+                            "Notification event cleared (not user not active any more)" );;
+            $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 ') . 
+                     "Notification event cleared (not user not active any more)" 
+                    ."\n");
+            die("message has been sent already.\n");
+        }
+        
+        
         // let's work out the last notification sent to this user..
         $l = DB_DataObject::factory($this->table);
         $l->setFrom( array(
@@ -129,8 +169,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)  {
@@ -185,10 +226,15 @@ class Pman_Core_NotifySend extends Pman
         //print_r($email);exit;
         // should we fetch the watch that caused it.. - which should contain the method to call..
         // --send-to=test@xxx.com
-        if (!empty($opts['send-to'])) {
+       
+        if (!empty($email['send-to'])) {
+            $p->email = $email['send-to'];
+        }
+         if (!empty($opts['send-to'])) {
             $p->email = $opts['send-to'];
         }
         
+        //print_r($p);
         require_once 'Validate.php';
         if (!Validate::email($p->email, true)) {
             $ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);
@@ -222,6 +268,39 @@ 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;
+        }
+        if (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 = '';
+            $w->event_id = $ev->id;
+            $w->update($ww);
+            die(date('Y-m-d h:i:s') . " - FAILED -  GAVE UP TO OLD - {$p->email} \n");
+        }
+        
+        
+        
+        $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,7 +317,7 @@ class Pman_Core_NotifySend extends Pman
             $mailer = Mail::factory('smtp', array(
                     'host'    => $dom ,
                     'localhost' => $ff->Mail['helo'],
-                    'timeout' => 30,
+                    'timeout' => 15,
                   //  'debug' => true
                 ));
             $res = $mailer->send($p->email, $email['headers'], $email['body']);
@@ -249,7 +328,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']}");
                
                 
                 
@@ -291,22 +370,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;
-                }
-                
+                //print_r($res);
                 $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);
@@ -317,7 +381,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');
@@ -381,9 +445,20 @@ 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);
+        $m = 'notify'. $notify->evtype;
+        //var_dump($m);
+        
+        if (!empty($notify->evtype) && method_exists($object,$m)) {
+            return $object->$m($rcpt, $last_sent_date, $notify, $force);
+        }
+                
+        if (!method_exists($object, 'toEmail')) {
+            //var_Dump($object);
+            //exit;
+        }
+        return $object->toEmail($rcpt, $last_sent_date, $notify, $force);
     }
     
     function debug($str)
@@ -394,5 +469,8 @@ class Pman_Core_NotifySend extends Pman
         }
         echo $str . "\n";
     }
-    
+    function output()
+    {
+        die("done\n");
+    }
 }
\ No newline at end of file