X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_img.php;h=061f56d4f62ec1709aa9ba4f504b56c1f72ca33f;hp=0afdd7b2d8dc5f728492d0dffd32b8ff405bd143;hb=dc815d80d15437e0e6a56bfcfbff81b241cdd727;hpb=97515e0f70a469982927f9e617fff8e60c9593d3

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 0afdd7b..061f56d 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,17 +19,27 @@ class PHPFSPOT_IMG {
 
    } // __desctruct()
 
-   public function show($idx, $width = "")
+   public function show($idx, $width = 0)
    {
-      $this->parent->gen_thumbs($idx);
+      $this->parent->gen_thumb($idx);
 
       $details = $this->parent->get_photo_details($idx);
 
-      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(!is_readable($fullpath)) {
+         die("File ". $fullpath ." is not readable. Check the permissions");
+      }
 
       $tmp = getimagesize($fullpath);
       $mime = $tmp['mime'];
@@ -38,7 +47,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");