Fix #5700 - Order Follow up Table

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 707a6d6..68cc362 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -176,8 +176,6 @@ class Pman_Core_Images extends Pman
             
         }
         
-        
-       
         $img = DB_DataObjecT::factory('Images');
          
         if (!$id || !$img->get($id)) {
@@ -196,15 +194,13 @@ class Pman_Core_Images extends Pman
             if ($comp->comptype != 'OWNER') {
                 $this->imgErr("not-owner-company",$s);
             }
+            
             return $this->serve($img);
-        
             
         }
         
-        
         if(!$this->hasPermission($img)){
             $this->imgErr("access to this image/file has been denied.",$s);
-            
         }
         
         $this->serve($img);
@@ -465,7 +461,8 @@ class Pman_Core_Images extends Pman
         $id = $umatch[2];
         $hash = '';
         if (!empty($umatch[3]) && strpos($umatch[3],'#')) {
-            $hash = '#'. array_pop(explode('#',$umatch[3]));
+            $hh = explode('#',$umatch[3]);
+            $hash = '#'. array_pop($hh);
         }
         
         
@@ -525,7 +522,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 +535,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 +548,9 @@ class Pman_Core_Images extends Pman
                 continue;
             }
 
-            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";
-            }
-
-            $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);