alphabetic tag search order

[phpfspot.git] / phpfspot_img.php

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 986fbccbb251a20930bccdf3abacfd4cfbb9189e..e3b0852108f5bdb49e469b0a68939f3188f9b422 100644 (file)
--- 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,25 @@ class PHPFSPOT_IMG {
 
    } // __desctruct()
 
-   public function show($idx, $width = "")
+   public function show($idx, $width = 0)
    {
-      $details = $this->parent->get_photo_details($idx);
+      $this->parent->gen_thumb($idx);
 
-      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);
+      $details = $this->parent->get_photo_details($idx);
 
-      if($width == "")
+      if($width == 0) {
          $fullpath = $this->parent->translate_path($details['directory_path'])  ."/". $details['name'];
-      else
+      }
+      else {
          $fullpath = $this->parent->translate_path($details['directory_path'])  ."/thumbs/". $width ."_". $details['name'];
+      }
 
+      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'];
@@ -39,7 +45,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");