DataObjects/I18n.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index d1a9cc6..3001e28 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -472,10 +472,15 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             return $ret;
         }
         
+        $file = $this->retrieveEventLog();
         
-        $source = json_decode($json);
+        if(!$file){
+            return "No records?!";
+        }
+        
+        $source = json_decode(file_get_contents($file));
         
-        return 'HERE IS THE RESOURCE';
+        return $source;
     }
     
     function retrieveEventLog()
@@ -493,46 +498,13 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $user = getenv('USERNAME'); // windows.
         }
         
-        $file = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/'). $this->id . ".json";
+        $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;
         }
         
-        // Remove all the password from logs...
-        $p =  empty($_POST) ? array() : $_POST;
-        foreach(array('passwd', 'password','passwd1',  'passwd2','password1', 'password2') as $rm) {
-            if (isset($p[$rm])) {
-                $p[$rm] = '******';
-            }
-        }
-        
-        
-        $i=0;
-        $files = array();
-         
-        $i = 0;
-        foreach ($_FILES as $k=>$f){
-            // does not handle any other file[] arrary very well..
-            if (empty($f['tmp_name']) || !file_exists($f['tmp_name'])) {
-                continue;
-            }
-            $i++;
-            $files[$k] = $f;
-            
-             
-            $files[$k]['tmp_name'] =  $this->id . '-'. $i;
-            $nf = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/').   $files[$k]['tmp_name']; 
-            if (!copy($f['tmp_name'], $nf)) {
-                print_r("failed to copy {$f['tmp_name']}...\n");
-            }
-        }
-        
-        file_put_contents($file, json_encode(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,
-        )));
+        return $file;
     }
 }