DataObjects/Core_curr_rate.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 3bf8e71..3001e28 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -46,8 +46,19 @@ 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');
+            $person = 'Person';
+            $cfg = HTML_FlexyFramework::get()->Pman;
+            if (!empty($cfg['authTable'])) {
+                $person =$cfg['authTable'];
+            }
+            
+            $jt = DB_DataObject::factory($person);
             $this->whereAdd("
                     person_table  = '{$jt->tableName()}'
                     OR
@@ -231,6 +242,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $tnb = $this->escape($q['query']['on_table']);
             $this->whereAdd("Events.on_table LIKE '%{$tnb}%'");
         } 
+        
     }
       
     
@@ -284,7 +296,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'])) {
@@ -361,7 +378,25 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     
     }
     
-    
+    function beforeInsert($request,$roo)
+    {
+        if(empty($this->event_when)){
+            $this->event_when = $this->sqlValue("NOW()");
+        }
+        
+        if(empty($this->person_id)){
+            $this->person_id = $roo->authUser->id;
+            $this->person_name = $roo->authUser->name;
+            $this->person_table = $roo->authUser->tableName();
+        }
+        
+        if(empty($this->ipaddr)){
+            $this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
+            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                $this->ipaddr = $_SERVER['HTTP_X_FORWARDED_FOR'];
+            }
+        }
+    }
     
     function onInsert($request,$roo)
     {
@@ -429,5 +464,47 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
     }
     
+    function toRooSingleArray($au, $q)
+    {
+        $ret = $this->toArray();
+        
+        if(empty($q['_retrieve_source'])){
+            return $ret;
+        }
+        
+        $file = $this->retrieveEventLog();
+        
+        if(!$file){
+            return "No records?!";
+        }
+        
+        $source = json_decode(file_get_contents($file));
+        
+        return $source;
+    }
     
+    function retrieveEventLog()
+    {
+        $ff  = HTML_FlexyFramework::get();
+        if (empty($ff->Pman['event_log_dir'])) {
+            return false;
+        }
+        
+        if (function_exists('posix_getpwuid')) {
+            $uinfo = posix_getpwuid( posix_getuid () ); 
+         
+            $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";
+        if (!file_exists(dirname($file))) {
+            return false;
+        }
+        
+        return $file;
+    }
 }