DataObjects/core.sql

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 91b8f44..2cec333 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']);
@@ -49,6 +47,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $this->selectAs($jt, 'person_id_%s', 'join_person_id_id');
         
         } else {
+            $jt = DB_DataObject::factory('Person');
             $this->whereAdd("
                     person_table  = '{$jt->tableName()}'
                     OR
@@ -386,19 +385,26 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $p =  empty($_POST) ? array() : $_POST;
         foreach(array('passwd', 'password', 'passwd2', '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");
             }