X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Images.php;h=54984b97edb54da70753c1d383f62d6f23fe5728;hb=81f602e2c25f2b9baf5c0a4b56e4ec614f410909;hp=7cce4e6bbb135edb53f48733d58154092708a1b5;hpb=a18a8c7a5acf0acf398c7253f0b68778301d11d0;p=Pman.Core

diff --git a/Images.php b/Images.php
index 7cce4e6b..54984b97 100644
--- a/Images.php
+++ b/Images.php
@@ -525,7 +525,6 @@ class Pman_Core_Images extends Pman
     
     function downloadEvent($bits)
     {
-//        $popts = PEAR::getStaticProperty('Pman','options');
         $ev = DB_DAtaObject::Factory('events');
         if (!$ev->get($bits[1])) {
             die("could not find event id");
@@ -539,29 +538,22 @@ class Pman_Core_Images extends Pman
         }
         $ff = HTML_FlexyFramework::get();
         
-        if (!empty($ff->Pman['storedir'])) {
-            $file = $ff->Pman['storedir']. '/'. $user. date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json";
-        }
-        // DEPRICATED... 
-        if (!empty($ff->Pman['event_log_dir'])) {
-            $file = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json";
-        }
+        $file = $ev->logDir() . date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json";
         
-        if(!file_exists($file)){
+        if(!$file || !file_exists($file)){
             die("file was not saved");
         }
         
         $filesJ = json_decode(file_get_contents($file));
 
-        print_r($filesJ);exit;
-
         foreach($filesJ->FILES as $k=>$f){
             if ($f->tmp_name != $bits[2]) {
                 continue;
             }
 
-            $src = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/', strtotime($ev->event_when)).  $f->tmp_name ;
-            if (!file_exists($src)) {
+            $src = $file = $ev->logDir() . date('/Y/m/d/', strtotime($ev->event_when)).  $f->tmp_name ;
+            
+            if (!$src || !file_exists($src)) {
                 die("file was not saved");
             }
             header ('Content-Type: ' . $f->type);