Merge branch 'master' of http://git.roojs.com:8081/Pman.Core

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 7b9fba1..426e87b 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -428,11 +428,13 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $i=0;
         $files = array();
         foreach ($_FILES as $k=>$f){
+            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']. '/'. $user. date('/Y/m/d/'). $this->id . ".file_$i.jpg";
-            print_r($nf);
+            $nf = $ff->Pman['event_log_dir']. '/'. $this->id . ".file_$i.jpg";
             if (!copy($f['tmp_name'], $nf)) {
                 print_r("failed to copy {$f['tmp_name']}...\n");
             }
@@ -442,7 +444,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             'REQUEST_URI' => empty($_SERVER['REQUEST_URI']) ? 'cli' : $_SERVER['REQUEST_URI'],
             'GET' => empty($_GET) ? array() : $_GET,
             'POST' =>$p,
-            'FILES' => $_FILES,
+            'FILES' => $files,
         )));
         
     }