DataObjects/ProjectDirectory.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 9d47bff..b4a8d2a 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -109,6 +109,23 @@ class Pman_Core_NotifySend extends Pman
         
         
         $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)) {
@@ -209,12 +226,14 @@ 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)) {
@@ -436,8 +455,8 @@ class Pman_Core_NotifySend extends Pman
         }
                 
         if (!method_exists($object, 'toEmail')) {
-            var_Dump($object);
-            exit;
+            //var_Dump($object);
+            //exit;
         }
         return $object->toEmail($rcpt, $last_sent_date, $notify, $force);
     }