DataObjects/Core_watch.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index bdf5b95..3e2680f 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -79,15 +79,17 @@ 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]}";
+            
             header ('Content-Type: image/jpeg');
             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{
-                $fh = fopen($file.'.jpg','r');
+                $file = "{$popts['event_log_dir']}/{$bits[1]}.jpg";
+                $fh = fopen($file,'r');
                 echo fread($fh,filesize($file));
             }
             exit;
@@ -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();
         }