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

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 5c510a18..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,34 +43,33 @@ 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
     
-            
-    
-    
     function person($set = false)
     {
+        $def_pt = 'core_person';
+        
         if ($set !== false) {
             $this->person_table = is_object($set) ? $set->tableName() : '';
             
-            $person_table = empty($this->person_table) ? 'Person' : $this->person_table;
-            $col = $person_table  == "Person" ? 'person_id' : $person_table . '_id';
+            $person_table = empty($this->person_table) ? $def_pt  : strtolower($this->person_table);
+            $col = $person_table  == $def_pt ? 'person_id' : $person_table . '_id';
             
             $this->{$col} = is_object($set) ? $set->id : $set;
             return;
         }
         static $cache  =array();
-        $person_table = empty($this->person_table) ? 'Person' : $this->person_table;
-        $col = $person_table == "Person" ? 'person_id' : $person_table . '_id';
+        $person_table = empty($this->person_table) ? $def_pt  : strtolower($this->person_table);
+        $col = $person_table == $def_pt  ? 'person_id' : $person_table . '_id';
         
         if (isset($cache[$person_table .':'. $this->{$col}])) {
             return $cache[$person_table .':'. $this->{$col}];
         }
         
-        $c = DB_DataObject::Factory($person_table);
+        $c = DB_DataObject::Factory($person_table == 'person' ? 'core_person' : $person_table);
         $c->get($this->{$col});
         $cache[$person_table .':'. $this->{$col}] = $c;
         return $c;
@@ -238,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.
             
@@ -275,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';
@@ -317,4 +322,47 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         
     }
     
+    function sendManual($debug=false)
+    {   
+        require_once 'Pman/Core/NotifySend.php';
+        
+        $send = new Pman_Core_NotifySend();
+        $send->error_handler = 'exception';
+        
+        if ($debug) {
+            $send->get($this->id, array());
+            return true;
+        }
+        
+        try {
+            $send->get($this->id, array('force' => 1));
+        } catch (Exception $e) {
+            ob_end_clean();
+            return $e;
+        }
+        
+        ob_end_clean();
+        
+        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);
+    }
+    
 }