DataObjects/Core_notify.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index e82bb42..05b5f67 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -35,9 +35,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     //  ------------ROO HOOKS------------------------------------
     function applyFilters($q, $au ,$roo)
     {
-     
         $tn = $this->tableName();
-        
         // if not empty on_table
         if(!empty($q['person_table'])){
             $jt = DB_DataObject::factory($q['person_table']);
@@ -285,6 +283,10 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $this->person_id = $au ? $au->id : -1;
         $this->person_table = $au ? $au->tableName() : '';
         $this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            $this->ipaddr = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        }
+        
         $this->action = $act;
         $this->on_table = $obj ? $obj->tableName() : '';
         $pk = $obj ? $obj->keys()  : false;
@@ -385,21 +387,28 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         // Remove all the password from logs...
         $p =  empty($_POST) ? array() : $_POST;
-        foreach(array('passwd', 'password', 'passwd2', 'password2') as $rm) {
+        foreach(array('passwd', 'password','passwd1',  'passwd2','password1', 'password2') as $rm) {
             if (isset($p[$rm])) {
-                $p['passwd'] = '******';
+                $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 . '.file_'. $i.'.jpg';
-            $nf = $ff->Pman['event_log_dir']. '/'. $this->id . ".file_$i.jpg";
+            
+             
+            $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");
             }
@@ -407,11 +416,13 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         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,
         )));
         
+        
     }