X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_img.php;h=69f579bf20c04f32b16dc48228cf90ba3e8ce1d0;hp=e3b0852108f5bdb49e469b0a68939f3188f9b422;hb=4a4043f64bbb3b6757ff1d3edd81ec36a796cf00;hpb=836e04ea5fc6b0d32d4d57f1af66d1a9aaf423a1

diff --git a/phpfspot_img.php b/phpfspot_img.php
index e3b0852..69f579b 100644
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -21,22 +21,31 @@ 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("test1");
+         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);