DataObjects/Core_watch.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 975c88f..3e2680f 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -59,7 +59,7 @@ class Pman_Core_Images extends Pman
         
         $bits= explode('/', $s);
         $id = 0;
-        print_r($bits);exit;
+        
         // without id as first part...
         if (!empty($bits[0]) && $bits[0] == 'Thumb') {
             $this->thumb = true;
@@ -79,18 +79,20 @@ class Pman_Core_Images extends Pman
             
         } else if (!empty($bits[0]) && $bits[0] == 'events') {
             $popts = PEAR::getStaticProperty('Pman','options');
-            $file = "{$popts['event_log_dir']}/{$bits[1]}.jpg";
+            
             header ('Content-Type: image/jpeg');
-        if(isset($bits[2]) == 'download' && $bits[0] == 'events'){
-            header("Content-Disposition: attachment; filename=\"".basename($file)."\";" );
-            ob_clean();
-            flush();
-            readfile($file);
-        }else{
-            $fh = fopen($file,'r');
-            echo fread($fh,filesize($file));
-        }
-        exit;
+            if(!empty($bits[2]) && $bits[2] == 'download'){
+                $file = "{$popts['event_log_dir']}/{$bits[1]}";
+                header("Content-Disposition: attachment; filename=\"".basename($file)."\";" );
+                ob_clean();
+                flush();
+                readfile($file);
+            }else{
+                $file = "{$popts['event_log_dir']}/{$bits[1]}.jpg";
+                $fh = fopen($file,'r');
+                echo fread($fh,filesize($file));
+            }
+            exit;
         } else {
         
             $id = empty($bits[0]) ? 0 :  $bits[0];
@@ -230,11 +232,19 @@ class Pman_Core_Images extends Pman
         //echo "SKALING?  $this->size";
         // acutally if we generated the image, then we do not need to validate the size..
         
+        
+        
         // if the mimetype is not converted..
         // then the filename should be original.{size}.jpeg
         $fn = $img->getStoreName() . '.'. $this->size . '.jpeg'; // thumbs are currenly all jpeg.!???
-      // var_dump($fn);
+        
         if (!file_exists($fn)) {
+            $fn = $img->getStoreName()  . '.'. $this->size . '.'. $img->fileExt();
+            $this->as_mimetype = $img->mimetype;
+        }
+        
+        if (!file_exists($fn)) {            
+            
             $this->validateSize();
         }