DataObjects/Core_company.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 7105ab0..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'];
@@ -458,14 +459,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         self::$extra_data = $data;
     }
     
-    function writeEventLog($extra_data  = false)
+    function logDir()
     {
         $ff  = HTML_FlexyFramework::get();
-        if (empty($ff->Pman['event_log_dir'])) {
-            return false;
-        }
-        
-        // add user (eg. www-data or local user if not..)
         if (function_exists('posix_getpwuid')) {
             $uinfo = posix_getpwuid( posix_getuid () ); 
          
@@ -473,10 +469,33 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         } else {
             $user = getenv('USERNAME'); // windows.
         }
+        
+        // DEPRICATED...
+        if (!empty($ff->Pman['event_log_dir'])) {
+            return $ff->Pman['event_log_dir'] . '/'.$user;
+        }
+        if (!empty($ff->Pman['storedir'])) {
+            return $ff->Pman['storedir'] .'/Events/'.$user;
+        
+        }
+        return false;
+    }
+    
+    
+    
+    function writeEventLog($extra_data  = false)
+    {
+        $logdir = $this->logDir();
+        if (!$logdir) {
+            return false;
+        }
+        
+         
         //print_r($this);
-        $file = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/'). $this->id . ".json";
+        $file = $logdir.  date('/Y/m/d/'). $this->id . ".json";
         if (!file_exists(dirname($file))) {
-            mkdir(dirname($file),0700,true);
+            mkdir(dirname($file),0700,true); // this might fail if it does not have correct permissions..
+            
         }
         
         // Remove all the password from logs...
@@ -502,7 +521,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             
              
             $files[$k]['tmp_name'] =  $this->id . '-'. $i;
-            $nf = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/').   $files[$k]['tmp_name']; 
+            $nf = $logdir .   date('/Y/m/d/').   $files[$k]['tmp_name']; 
             if (!copy($f['tmp_name'], $nf)) {
                 print_r("failed to copy {$f['tmp_name']}...\n");
             }
@@ -577,22 +596,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     
     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 () ); 
+        $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;
         }
@@ -673,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');
+        
+    }
 }