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

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 60b7c82b..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,21 +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() : '';
-            $col = $this->person_table  == "Person" ? 'person_id' : $person_table . '_id';
-            $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;
@@ -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;
+    }
+    
 }