show meaningful error message for invalid width, resolves #74

[phpfspot.git] / phpfspot_img.php

diff --git a/phpfspot_img.php b/phpfspot_img.php
index f3eb3088f4b363030ccb11b88b7c4a080768dd58..bb7e93f15f0c5890f8bf8b0e0f57496b7bdcdabc 100644 (file)
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -64,13 +64,17 @@ class PHPFSPOT_IMG {
     * @param integer $idx
     * @param integer $width
     */
-   public function show($idx, $width = 0)
+   public function showImg($idx, $width = 0, $version = NULL)
    {
       if($idx == 'rand')
          $idx = $this->parent->get_random_photo();
 
-      $details = $this->parent->get_photo_details($idx);
-   
+      /* display the lastest available version, if a wrong version has been requested */
+      if(!isset($version) || !$this->parent->is_valid_version($idx, $version))
+         $version = $this->parent->get_latest_version($idx);
+
+      $details = $this->parent->get_photo_details($idx, $version);
+
       if(!$details) {
          $this->parent->showTextImage("The image (". $idx .") you requested is unknown");
          return;
@@ -82,11 +86,19 @@ class PHPFSPOT_IMG {
       }
       /* show thumbnail */
       else {
-         /* if no entry for this photo is yet in the database, create thumb */
+
+         if(!$this->parent->is_valid_width($width)) {
+            $this->parent->showTextImage("Requested width ". $width ."px is not valid!");
+            return;
+         }
+         /* check for an entry if we already handled this photo before. If not,
+            create a thumbnail for it.
+         */
          if(!$this->parent->getMD5($idx)) {
             $this->parent->gen_thumb($idx);
          }
-         $fullpath = $this->parent->get_thumb_path($width, $idx);
+         /* get the full filesystem path to the thumbnail */
+         $fullpath = $this->parent->get_thumb_path($width, $idx, $version);
          /* if the thumb file does not exist, create it */
          if(!file_exists($fullpath)) {
             $this->parent->gen_thumb($idx);
@@ -100,10 +112,75 @@ class PHPFSPOT_IMG {
       if(!is_readable($fullpath)) {
          $this->parent->showTextImage("File ". basename($fullpath) ." is not readable. Check the permissions");
          return;
+      } 
+      $mime = $this->parent->get_mime_info($fullpath);
+
+      if(!$this->parent->checkifImageSupported($mime)) {
+         $this->parent->showTextImage("Unsupported Image Type");
+         return;
       }
 
-      $tmp = getimagesize($fullpath);
-      $mime = $tmp['mime'];
+      Header("Content-Type: ". $mime);
+      Header("Content-Length: ". filesize($fullpath));
+      Header("Content-Transfer-Encoding: binary\n");
+      Header("Content-Disposition: inline; filename=\"". $this->parent->parse_uri($details['uri'], 'filename') ."\"");
+      Header("Content-Description: ". $this->parent->parse_uri($details['uri'], 'filename'));
+      Header("Accept-Ranges: bytes");
+      Header("Connection: close");
+      Header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+      Header("Cache-Control: no-cache");
+      Header("Pragma: no-cache");
+
+      $file = fopen($fullpath, "rb");
+      fpassthru($file);
+      @fclose($file);
+
+   } // showImg()
+
+   /**
+    * sends a random photo of the requested tag to the browser
+    *
+    * this function will send a random photo to the client.
+    * It is selected out by the provided $tagidx. It also try's
+    * to create on-the-fly missing thumbnails via PHPFSPOT
+    * gen_thumbs function.
+    * @param integer $idx
+    */
+   public function showTagImg($tagidx)
+   {
+      $idx = $this->parent->get_random_tag_photo($tagidx);
+      $width = 30;
+
+      $details = $this->parent->get_photo_details($idx);
+
+      if(!$details) {
+         $this->parent->showTextImage("The image (". $idx .") you requested is unknown");
+         return;
+      }
+
+      /* if no entry for this photo is yet in the database, create thumb */
+      if(!$this->parent->getMD5($idx)) {
+         $this->parent->gen_thumb($idx);
+      }
+
+      $version = $this->parent­>get_latest_version($idx);
+
+      $fullpath = $this->parent->get_thumb_path($width, $idx, $version);
+      /* if the thumb file does not exist, create it */
+      if(!file_exists($fullpath)) {
+         $this->parent->gen_thumb($idx);
+      }
+
+      if(!file_exists($fullpath)) {
+         $this->parent->showTextImage("File ". basename($fullpath) ." does not exist");
+         return;
+      }
+      if(!is_readable($fullpath)) {
+         $this->parent->showTextImage("File ". basename($fullpath) ." is not readable. Check the permissions");
+         return;
+      }
+
+      $mime = $this->parent->get_mime_info($fullpath);
 
       if(!$this->parent->checkifImageSupported($mime)) {
          $this->parent->showTextImage("Unsupported Image Type");
@@ -120,12 +197,12 @@ class PHPFSPOT_IMG {
       Header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
       Header("Cache-Control: no-cache");
       Header("Pragma: no-cache");
-         
+
       $file = fopen($fullpath, "rb");
       fpassthru($file);
       @fclose($file);
 
-   } // show()
+   } // showTagImg()
 
 } // PHPFSPOT_IMG()
 
@@ -134,9 +211,27 @@ if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand'))
    $img = new PHPFSPOT_IMG;
 
    if(isset($_GET['width']) && is_numeric($_GET['width'])) 
-      $img->show($_GET['idx'], $_GET['width']);
+      $width = $_GET['width'];
+   else
+      $width = NULL;
+
+   if(isset($_GET['version']) && is_numeric($_GET['version']))
+      $version = $_GET['version'];
    else
-      $img->show($_GET['idx']);
+      $version = NULL;
+
+   $img->showImg($_GET['idx'], $width, $version);
+
+   exit(0);
+}
+
+if(isset($_GET['tagidx']) && is_numeric($_GET['tagidx'])) {
+
+   $img = new PHPFSPOT_IMG;
+   $img->showTagImg($_GET['tagidx']);
+
+   exit(0);
+
 }
 
 ?>