DataObjects/core.sql

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 23373f2..0bf879e 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -98,17 +98,35 @@ class Pman_Core_NotifySend extends Pman
             print_r($w);
         }
         
+        $sent = (empty($w->sent) || preg_match('/^0000/', $w->sent)) ? false : true;
         
-        if (!$force && !empty($w->msgid)) {
+        if (!$force && (!empty($w->msgid) || $sent)) {
             $ww = clone($w);
-            $w->sent = $w->sqlValue("NOW()");
-            $w->update($ww);
-            
+            if (!$sent) { 
+                $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)) {
@@ -156,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,
@@ -200,7 +217,7 @@ class Pman_Core_NotifySend extends Pman
         }
         
          
-        if (!isset($email['headers']['Message-Id'])) {
+        if (empty($email['headers']['Message-Id'])) {
             $HOST = gethostname();
             $email['headers']['Message-Id'] = "<{$this->table}-{$id}@{$HOST}>";
             
@@ -209,12 +226,17 @@ 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'])) {
-            $p->email = $opts['send-to'];
-        }
+       
         if (!empty($email['send-to'])) {
             $p->email = $email['send-to'];
         }
+         if (!empty($opts['send-to'])) {
+            $p->email = $opts['send-to'];
+        }
+        // since some of them have spaces?!?!
+        $p->email = trim($p->email);
+        
+        
         //print_r($p);
         require_once 'Validate.php';
         if (!Validate::email($p->email, true)) {
@@ -236,7 +258,6 @@ class Pman_Core_NotifySend extends Pman
         $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');
@@ -264,7 +285,7 @@ class Pman_Core_NotifySend extends Pman
             // older that 1 day.
             $retry = 120;
         }
-        if (strtotime($w->act_start) <  strtotime('NOW - 14 DAY')) {
+        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 = '';
@@ -280,8 +301,7 @@ class Pman_Core_NotifySend extends Pman
         $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
         $w->update($ww);
         
-        
-        
+        $ww = clone($w);   
         
         $fail = false;
         require_once 'Mail.php';
@@ -302,9 +322,7 @@ class Pman_Core_NotifySend extends Pman
                   //  'debug' => true
                 ));
             $res = $mailer->send($p->email, $email['headers'], $email['body']);
-            
-            
-            
+             
             
             if ($res === true) {
                 // success....
@@ -330,7 +348,16 @@ class Pman_Core_NotifySend extends Pman
                     
                 }
                 
-                
+                if (!empty($email['bcc'])) {
+                    $mailer = Mail::factory('smtp', array(
+                       //'host'    => $dom ,
+                      //  'debug' => true
+                    ));
+                    $email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
+                    $mailer->send($email['bcc'],
+                                  $email['headers'], $email['body']);
+                    
+                }
                 
                 
                 die(date('Y-m-d h:i:s') . " - SENT\n");
@@ -435,7 +462,10 @@ class Pman_Core_NotifySend extends Pman
             return $object->$m($rcpt, $last_sent_date, $notify, $force);
         }
                 
-        if (!method_exists)
+        if (!method_exists($object, 'toEmail')) {
+            //var_Dump($object);
+            //exit;
+        }
         return $object->toEmail($rcpt, $last_sent_date, $notify, $force);
     }