DataObjects/Core_notify_recur.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 1f58161..06bc890 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -98,12 +98,13 @@ class Pman_Core_NotifySend extends Pman
             print_r($w);
         }
         
-        
-        if (!$force && !empty($w->msgid)) {
+        $sent = preg_match('/^0000/', $w->sent) ? false : true;
+        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");
         }
         
@@ -217,7 +218,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}>";
             
@@ -226,12 +227,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'];
+        }
+        
+         
+        
+        
         //print_r($p);
         require_once 'Validate.php';
         if (!Validate::email($p->email, true)) {
@@ -297,8 +303,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';
@@ -319,9 +324,7 @@ class Pman_Core_NotifySend extends Pman
                   //  'debug' => true
                 ));
             $res = $mailer->send($p->email, $email['headers'], $email['body']);
-            
-            
-            
+             
             
             if ($res === true) {
                 // success....
@@ -347,7 +350,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");