DataObjects/core.sql

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index ebdfd01..f8bf392 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -46,6 +46,11 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             
             $this->selectAs($jt, 'person_id_%s', 'join_person_id_id');
         
+            if (method_exists($jt,'nameColumn')) {
+                $this->selectAdd("join_person_id_id.{$jt->nameColumn()} as person_id_name");
+            }
+        
+        
         } else {
             $jt = DB_DataObject::factory('Person');
             $this->whereAdd("
@@ -229,7 +234,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         if(!empty($q['query']['on_table'])) {
             $tnb = $this->escape($q['query']['on_table']);
-            $this->whereAdd("Events.on_table LIKE '%{$act}%'");
+            $this->whereAdd("Events.on_table LIKE '%{$tnb}%'");
         } 
     }
       
@@ -284,7 +289,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         } 
           
         $this->person_name = $au && !empty($au->name) ? $au->name : '';
-        $this->person_id = $au ? $au->id : -1;
+        if (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;
+        }
         $this->person_table = $au ? $au->tableName() : '';
         $this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
         if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {