issue28, use getimagesize if no exif data is available

[phpfspot.git] / phpfspot_img.php

diff --git a/phpfspot_img.php b/phpfspot_img.php
index e3b0852108f5bdb49e469b0a68939f3188f9b422..052a45f4099c686bdc0cd561cf482ce6ee8ded90 100644 (file)
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -21,27 +21,41 @@ class PHPFSPOT_IMG {
 
    public function show($idx, $width = 0)
    {
-      $this->parent->gen_thumb($idx);
-
       $details = $this->parent->get_photo_details($idx);
+   
+      if(!$details) {
+         $this->parent->showTextImage("The image you requested is unknown");
+         return;
+      }
 
+      /* show original photo */
       if($width == 0) {
          $fullpath = $this->parent->translate_path($details['directory_path'])  ."/". $details['name'];
       }
+      /* show thumbnail */
       else {
-         $fullpath = $this->parent->translate_path($details['directory_path'])  ."/thumbs/". $width ."_". $details['name'];
+         $fullpath = $this->parent->cfg->base_path ."/thumbs/". $width ."_". $this->parent->getMD5($idx);
+         if(!file_exists($fullpath)) 
+            $this->parent->gen_thumb($idx, 0, 1);
       }
 
       if(!file_exists($fullpath)) {
-         $this->parent->gen_thumb($idx, 0, 1);
+         $this->parent->showTextImage("File ". $fullpath ." does not exist");
+         return;
       }
       if(!is_readable($fullpath)) {
-         die("File ". $fullpath ." is not readable. Check the permissions");
+         $this->parent->showTextImage("File ". $fullpath ." is not readable. Check the permissions");
+         return;
       }
 
       $tmp = getimagesize($fullpath);
       $mime = $tmp['mime'];
 
+      if(!$this->parent->checkifImageSupported($mime)) {
+         $this->parent->showTextImage("Unsupported Image Type");
+         return;
+      }
+
       Header("Content-Type: ". $mime);
       Header("Content-Length: ". filesize($fullpath));
       Header("Content-Transfer-Encoding: binary\n");