Process/Php7.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 43348b1..54984b9 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -278,7 +278,7 @@ class Pman_Core_Images extends Pman
         
         require_once 'File/Convert.php';
         if (!file_exists($img->getStoreName())) {
-            print_r($img->getStoreName());exit;
+//            print_r($img);exit;
             header('Location: ' . $this->rootURL . '/Pman/templates/images/file-broken.png?reason=' .
                 urlencode("Original file was missing : " . $img->getStoreName()));
     
@@ -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");
@@ -538,18 +537,23 @@ class Pman_Core_Images extends Pman
             $user = getenv('USERNAME'); // windows.
         }
         $ff = HTML_FlexyFramework::get();
-        $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");
+        }
+        
         $filesJ = json_decode(file_get_contents($file));
 
-        //print_r($filesJ);
-
         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);