DataObjects/Core_company.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index c562f7b..521ead8 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -7,7 +7,7 @@
  *
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Events extends DB_DataObject 
 {
@@ -61,7 +61,8 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             }
         
         } else {
-            $person = 'Person';
+            
+            $person = $au->tableName(); //'Person';  -- projects may not use person as the auth table...
             $cfg = HTML_FlexyFramework::get()->Pman;
             if (!empty($cfg['authTable'])) {
                 $person =$cfg['authTable'];
@@ -595,23 +596,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     
     function retrieveEventLog()
     {
-        $ff  = HTML_FlexyFramework::get();
-        $logdir = $this->
-        if (empty($ff->Pman['event_log_dir'])) {
-            return false;
-        }
         
-        if (function_exists('posix_getpwuid')) {
-            $uinfo = posix_getpwuid( posix_getuid () ); 
+        $logdir = $this->logDir();
+        if (!$logdir) {
+            return false;
          
-            $user = $uinfo['name'];
-        } else {
-            $user = getenv('USERNAME'); // windows.
         }
         
         $date = date('/Y/m/d/', strtotime($this->event_when));
         
-        $file = $ff->Pman['event_log_dir']. '/'. $user. $date. $this->id . ".json";
+        $file = $logdir. $date. $this->id . ".json";
         if (!file_exists(dirname($file))) {
             return false;
         }
@@ -692,4 +686,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         $roo->jok('RESTORE');
     }
+    function selectAddPersonEmail()
+    {
+        $this->selectAdd('join_person_id_id.email as email');
+        
+    }
 }