X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=dbf012bb5b2c3aa37b43af22c5e35ffea6d2847f;hp=21d8f9f24d60d4239486d2c90499c1e2f486c711;hb=HEAD;hpb=0657eda06d59999b891ee686a284ba0e020dfae3

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 21d8f9f2..2570c860 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * Table is designed to be used with a mailer to notify or issue
+ * Table iend designed to be used with a mailer to notify or issue
  * emails (or maybe others later??)
  *
  *
@@ -20,7 +20,7 @@ CREATE TABLE  core_notify  (
 );
 **/
 
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_notify extends DB_DataObject 
 {
@@ -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
     
@@ -55,8 +55,6 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         if ($set !== false) {
             $this->person_table = is_object($set) ? $set->tableName() : '';
             
-            
-            
             $person_table = empty($this->person_table) ? $def_pt  : strtolower($this->person_table);
             $col = $person_table  == $def_pt ? 'person_id' : $person_table . '_id';
             
@@ -239,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.
             
@@ -276,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';
@@ -318,17 +322,21 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         
     }
     
-    function sendManual()
+    function sendManual($debug=false)
     {   
         require_once 'Pman/Core/NotifySend.php';
         
         $send = new Pman_Core_NotifySend();
         $send->error_handler = 'exception';
         
-        try {
+        if ($debug) {
             $send->get($this->id, array());
+            return true;
+        }
+        
+        try {
+            $send->get($this->id, array('force' => 1));
         } catch (Exception $e) {
-            print_R($e);exit;
             ob_end_clean();
             return $e;
         }
@@ -337,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);
+    }
     
 }