X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=dbf012bb5b2c3aa37b43af22c5e35ffea6d2847f;hp=6cc632ab553d517b8366eb262da5abcb37b4b76b;hb=HEAD;hpb=581a3326f8c30baf3b33873f2335042753295d2b

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 6cc632ab..2570c860 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -43,8 +43,8 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     public $evtype;                         // event type (or method to call)fall
     public $act_start;
     public $person_table;
-
-
+    public $to_email;
+ 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     
@@ -237,6 +237,11 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     
     function applyFilters($q, $au, $roo)
     {
+        
+        if (!empty($q['search']['contains'])) {
+            $this->whereAdd("join_event_id_id.remarks LIKE '%".$this->escape($q['search']['contains']) ."%'");
+            
+        }
         if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events',  'core_watch'))) {
             // this will only work on tables not joined to ours.
             
@@ -274,6 +279,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
                     break;
                 case 'PENDING';
                     $this->whereAdd('event_id = 0 OR (event_id  > 0 AND act_when > NOW() )');
+                    $this->whereAdd("sent < '2000-01-01'");
                     break;
                 
                 case 'OPENED';
@@ -329,7 +335,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         }
         
         try {
-            $send->get($this->id, array());
+            $send->get($this->id, array('force' => 1));
         } catch (Exception $e) {
             ob_end_clean();
             return $e;
@@ -339,5 +345,24 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         
         return true;
     }
+    // after called do not rely on content as it includes NOW()
+    function flagDone($event,$msgid)
+    {
+        $ww = clone($this);
+        if(strtotime($this->act_when) > strtotime("NOW")){
+            $this->act_when = $this->sqlValue('NOW()');
+        }
+        $this->sent = empty($this->sent) || strtotime($this->sent) < 1 ? $this->sqlValue('NOW()') :$this->sent; // do not update if sent.....
+        $this->msgid = $msgid;
+        $this->event_id = $event->id;
+        $this->update($ww);
+    }
+    
+    function flagLater($when)
+    {
+        $ww = clone($this);
+        $this->act_when = $when;
+        $this->update($ww);
+    }
     
 }