DataObjects/Core_person_signup.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index fa20c96..9f7a7da 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -39,15 +39,32 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         // 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();
             
             $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");
+            }
+            
+            if (method_exists($jt,'emailColumn')) {
+                $this->selectAdd("join_person_id_id.{$jt->emailColumn()} as person_id_email");
+            }
+        
+        
         } 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
@@ -227,7 +244,11 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $this->whereAdd("Events.action LIKE '%{$act}%'");
         }
         
-            
+        if(!empty($q['query']['on_table'])) {
+            $tnb = $this->escape($q['query']['on_table']);
+            $this->whereAdd("Events.on_table LIKE '%{$tnb}%'");
+        } 
+        
     }
       
     
@@ -281,7 +302,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'])) {
@@ -358,14 +384,32 @@ 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)
     {
         $this->writeEventLog();
     }
     
-    function writeEventLog()
+    function writeEventLog($extra_data  = '')
     {
         $ff  = HTML_FlexyFramework::get();
         if (empty($ff->Pman['event_log_dir'])) {
@@ -414,17 +458,63 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                 print_r("failed to copy {$f['tmp_name']}...\n");
             }
         }
-        
-        file_put_contents($file, json_encode(array(
+        $out = array(
             'REQUEST_URI' => empty($_SERVER['REQUEST_URI']) ? 'cli' : $_SERVER['REQUEST_URI'],
             'HTTP_USER_AGENT' => empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT'],
             'GET' => empty($_GET) ? array() : $_GET,
             'POST' =>$p,
             'FILES' => $files,
-        )));
+        );
+        if (!empty($extra_data)) {
+            $out['EXTRA'] = $extra_data;
+        }
+        
+        file_put_contents($file, json_encode($out));
         
         
     }
     
+    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;
+    }
 }