fixed syntax error

[phpfspot.git] / phpfspot_img.php

diff --git a/phpfspot_img.php b/phpfspot_img.php
index e2e0325eb2271b288b01db982d529e091c679e2f..c21ff593c3e2be2e74f03f3cffc950f8d1b79486 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,23 +19,46 @@ class PHPFSPOT_IMG {
 
    } // __desctruct()
 
-   public function show($idx, $width = "")
+   public function show($idx, $width = 0)
    {
-      $this->parent->gen_thumbs($idx);
+      $details = $this->parent->get_photo_details($idx);
+   
+      if(!$details) {
+         $this->parent->showTextImage("The image you requested is unknown");
+         return;
+      }
 
-      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'];
 
+      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");              
-      $user_agent = strtolower ($_SERVER["HTTP_USER_AGENT"]);     
       Header("Content-Disposition: inline; filename=\"". $details['name'] ."\"");
       Header("Accept-Ranges: bytes");                             
       Header("Connection: close");