X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Images.php;h=54984b97edb54da70753c1d383f62d6f23fe5728;hb=b341a92085a9d4a5cfb1d2043e599420472aa6c8;hp=6f915300aba53f5fc4b05a9e78aa407faf9cd25a;hpb=b328375543240c883d880be1cf940590331aa9da;p=Pman.Core

diff --git a/Images.php b/Images.php
index 6f915300..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,15 +538,7 @@ class Pman_Core_Images extends Pman
         }
         $ff = HTML_FlexyFramework::get();
         
-        $file = false;
-        
-        if (!empty($ff->Pman['storedir'])) {
-            $file = $ff->Pman['storedir']. '/Events/'. $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 || !file_exists($file)){
             die("file was not saved");
@@ -560,16 +551,8 @@ class Pman_Core_Images extends Pman
                 continue;
             }
 
-            $src = false;
+            $src = $file = $ev->logDir() . date('/Y/m/d/', strtotime($ev->event_when)).  $f->tmp_name ;
             
-            if (!empty($ff->Pman['storedir'])) {
-                $src = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/', strtotime($ev->event_when)).  $f->tmp_name ;
-            }
-            // DEPRICATED... 
-            if (!empty($ff->Pman['event_log_dir'])) {
-                $src = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/', strtotime($ev->event_when)).  $f->tmp_name ;
-            }
-
             if (!$src || !file_exists($src)) {
                 die("file was not saved");
             }