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

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index dc6bfcab..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,20 +50,28 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     
     function person($set = false)
     {
+        $def_pt = 'core_person';
+        
         if ($set !== false) {
             $this->person_table = is_object($set) ? $set->tableName() : '';
-            $this->person_id = is_object($set) ? $set->id : $set;
+            
+            
+            
+            $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;
@@ -208,23 +216,22 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         if ($this->msgid != '') {
             return 1;
         }
+        
         // msgid is empty now..
-        if ($this->event_id > 0 && strtotime($this->act_when) < time()) {
+        // 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;
         }
-        return 0; // pending
-            
-            $this->whereAdd("msgid  = '' AND event_id > 0 AND act_when < NOW()");
-            
-            break;
-        case 'PENDING';
-            $this->whereAdd('event_id = 0 OR (event_id  > 0 AND act_when > NOW() )');
-            break;
         
-        case 'OPENED';
-            $this->whereAdd('is_open > 0');
-            break;
+        // event id is empty, and act_when is in the past... not sent yet..
         
+        return 0; // pending
         
         
     }
@@ -311,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;
+    }
+    
 }