DataObjects/I18n.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index b518d48..9f7a7da 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -39,8 +39,10 @@ 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();
             
@@ -49,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 {
@@ -403,7 +409,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $this->writeEventLog();
     }
     
-    function writeEventLog()
+    function writeEventLog($extra_data  = '')
     {
         $ff  = HTML_FlexyFramework::get();
         if (empty($ff->Pman['event_log_dir'])) {
@@ -452,14 +458,18 @@ 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));
         
         
     }
@@ -475,10 +485,10 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $file = $this->retrieveEventLog();
         
         if(!$file){
-            return 'No record?!';
+            return "No records?!";
         }
         
-        $source = json_decode(file_get_contents($file))->source;
+        $source = json_decode(file_get_contents($file));
         
         return $source;
     }