DataObjects/Core_notify.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index b263226..b10e1c5 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -36,12 +36,13 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     function applyFilters($q, $au ,$roo)
     {
         $tn = $this->tableName();
-        print_r($_DB_DATAOBJECT);exit;
         // if not empty on_table
         if(!empty($q['person_table'])){
             $jt = DB_DataObject::factory($q['person_table']);
-        
-            $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.id=Events.person_id)";
+            
+            $keys = $jt->keys();
+            
+            $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
             $this->selectAdd();
             $this->selectAs();
             
@@ -50,6 +51,10 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (method_exists($jt,'nameColumn')) {
                 $this->selectAdd("join_person_id_id.{$jt->nameColumn()} as person_id_name");
             }
+            
+            if (method_exists($jt,'emailColumn')) {
+                $this->selectAdd("join_person_id_id.{$jt->emailColumn()} as person_id_email");
+            }
         
         
         } else {
@@ -297,11 +302,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         } 
           
         $this->person_name = $au && !empty($au->name) ? $au->name : '';
-        if (isset($au->id) && empty($au->id)) {
+        if (empty($au) || (isset($au->id) && empty($au->id))) {
             // not authenticated - and a standard id based object
             $this->person_id = 0;
         } else {
-            $this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
+            $col = $au->tableName() == "Person" ? 'person_id' : $au->tableName() . '_id';
+            // does $col exist?
+            $cols = $this->table();
+            $col = isset($cols[$col]) ? $col : 'person_id'; // for BC.... - revert to using person_id
+            $this->{$col} = $au->pid();
+            //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
         }
         $this->person_table = $au ? $au->tableName() : '';
         $this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
@@ -404,6 +414,43 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $this->writeEventLog();
     }
     
+    static $deleted = array();
+    
+    
+    // log deleting of a record so that it can be written later..
+    function logDeletedRecord($obj = false, $reset = false)
+    {
+        
+        if(!empty($reset)){
+            self::$deleted = array();
+        }
+        
+        
+        if (is_array($obj)) {
+            $ret = false;
+            foreach($obj as $o) {
+                $aret = $this->logDeletedRecord($o);
+                $ret = $ret ? $ret : $aret;
+            }
+            return true;
+        }
+        
+        if(empty($obj) || !is_a($obj, 'DB_DataObject')){
+            return false;
+        }
+        
+        
+        $del = $obj->toArray();
+        $del['_table'] = $obj->tableName();
+
+        if(method_exists($obj, 'toDeletedArray')){
+            $del = $obj->toDeletedArray();
+        }
+        
+        self::$deleted[] = $del;
+        return true;
+    }
+    
     function writeEventLog($extra_data  = '')
     {
         $ff  = HTML_FlexyFramework::get();
@@ -459,7 +506,11 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             'GET' => empty($_GET) ? array() : $_GET,
             'POST' =>$p,
             'FILES' => $files,
+            
         );
+        if (!empty(self::$deleted)) {
+            $out['DELETED_DATAOBJECTS'] = self::$deleted;
+        }
         if (!empty($extra_data)) {
             $out['EXTRA'] = $extra_data;
         }