X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=729f0a82dbe8c703513a651f1cc27eed86e3063a;hp=40063d01ec20fca4c25d0a912f778a3dea562fdf;hb=5d4ac076dc4f620fbb91944eead3e0af66216a03;hpb=d5c316b8731df481bcae7f51cdffd7d3dd0abd41

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 40063d01..729f0a82 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -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 
 {
@@ -50,14 +50,30 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     
     function person($set = false)
     {
+        $def_pt = 'core_person';
+        
         if ($set !== false) {
-            $this->person_id = is_object($set) ? $set->id : $set;
+            $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';
+            
+            $this->{$col} = is_object($set) ? $set->id : $set;
             return;
         }
+        static $cache  =array();
+        $person_table = empty($this->person_table) ? $def_pt  : strtolower($this->person_table);
+        $col = $person_table == $def_pt  ? 'person_id' : $person_table . '_id';
         
-        $person_table = 
-        $c = DB_DataObject::Factory('Person');
-        $c->get($this->person_id);
+        if (isset($cache[$person_table .':'. $this->{$col}])) {
+            return $cache[$person_table .':'. $this->{$col}];
+        }
+        
+        $c = DB_DataObject::Factory($person_table == 'person' ? 'core_person' : $person_table);
+        $c->get($this->{$col});
+        $cache[$person_table .':'. $this->{$col}] = $c;
         return $c;
         
     }
@@ -82,6 +98,24 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         return false;
         
     }
+    
+    function lookup($obj, $person, $evtype='')
+    {
+        $x = DB_DataObject::Factory($this->tableName());
+        $x->object($obj);
+        $x->person($person);
+        if (!empty($evtype)) {
+            $x->evtype = $evtype;
+        }
+        if ($x->count() != 1) {
+            return false;
+        }
+        $x->find(true);
+        return $x;
+        
+    }
+    
+    
     function beforeDelete($dependants_array, $roo) {
         if ($this->delivered()) {
             $roo->jerr("you can not delete a record of a successfull delivery");
@@ -166,8 +200,43 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
                 return  $p. $this->event()->remarks;
         }
         
+    }
+    /**
+     * current state of process
+     *
+     * 0 = pending
+     * 1 = delivered
+     * -1 = failed
+     *
+     *
+     */
+    function state()
+    {
+           
+        if ($this->msgid != '') {
+            return 1;
+        }
+        
+        // msgid is empty now..
+        // if act_when is greater than now, then it's still pending.
+        if (strtotime($this->act_when) > time()) {
+            return 0; 
+        }
+        
+        // event id can be filled in with a failed attempt.
+        
+        if ($this->event_id > 0) {
+            return -1;
+        }
+        
+        // event id is empty, and act_when is in the past... not sent yet..
+        
+        return 0; // pending
+        
+        
     }
     
+    
     function applyFilters($q, $au, $roo)
     {
         if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events',  'core_watch'))) {
@@ -249,4 +318,23 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         
     }
     
+    function sendManual()
+    {   
+        require_once 'Pman/Core/NotifySend.php';
+        
+        $send = new Pman_Core_NotifySend();
+        $send->error_handler = 'exception';
+        
+        try {
+            $send->get($this->id, array());
+        } catch (Exception $e) {
+            ob_end_clean();
+            return $e;
+        }
+        
+        ob_end_clean();
+        
+        return true;
+    }
+    
 }