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

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 986fbcc..69f579b 100644
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once "phpfspot_db.php";
 require_once "phpfspot.class.php";
 
 class PHPFSPOT_IMG {
@@ -20,18 +19,34 @@ class PHPFSPOT_IMG {
 
    } // __desctruct()
 
-   public function show($idx, $width = "")
+   public function show($idx, $width = 0)
    {
       $details = $this->parent->get_photo_details($idx);
+   
+      if(!$details) {
+         $this->parent->showTextImage("The image you requested is unknown");
+         return;
+      }
 
-      foreach(Array($this->parent->cfg->thumb_width, $this->parent->cfg->photo_width) as $resolution)
-         $this->parent->resize_image($this->parent->translate_path($details['directory_path'])  ."/". $details['name'], $resolution);
-
-      if($width == "")
+      /* show original photo */
+      if($width == 0) {
          $fullpath = $this->parent->translate_path($details['directory_path'])  ."/". $details['name'];
-      else
-         $fullpath = $this->parent->translate_path($details['directory_path'])  ."/thumbs/". $width ."_". $details['name'];
-
+      }
+      /* show thumbnail */
+      else {
+         $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->showTextImage("test1");
+         return;
+      }
+      if(!is_readable($fullpath)) {
+         $this->parent->showTextImage("File ". $fullpath ." is not readable. Check the permissions");
+         return;
+      }
 
       $tmp = getimagesize($fullpath);
       $mime = $tmp['mime'];
@@ -39,7 +54,6 @@ class PHPFSPOT_IMG {
       Header("Content-Type: ". $mime);
       Header("Content-Length: ". filesize($fullpath));
       Header("Content-Transfer-Encoding: binary\n");              
-      $user_agent = strtolower ($_SERVER["HTTP_USER_AGENT"]);     
       Header("Content-Disposition: inline; filename=\"". $details['name'] ."\"");
       Header("Accept-Ranges: bytes");                             
       Header("Connection: close");