X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_img.php;h=194b534ba63e61d9258ea0a1ce621d35673581f4;hp=061f56d4f62ec1709aa9ba4f504b56c1f72ca33f;hb=360b97e6da3d53e9ff5f5a92b6388a9a82824c24;hpb=3b285de30751d2dec0e242dcc50aa67147ada191

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 061f56d..194b534 100644
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -1,5 +1,26 @@
 <?php
 
+/***************************************************************************
+ *
+ * Copyright (c) by Andreas Unterkircher, unki@netshadow.at
+ * All rights reserved
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ ***************************************************************************/
+
 require_once "phpfspot.class.php";
 
 class PHPFSPOT_IMG {
@@ -7,6 +28,9 @@ class PHPFSPOT_IMG {
    var $db;
    var $parent;
 
+   /**
+    * PHPFSPOT_IMG class constructor
+    */
    public function __construct()
    {
       $this->parent = new PHPFSPOT;
@@ -14,42 +38,71 @@ class PHPFSPOT_IMG {
 
    } // __construct()
 
+   /**
+    * PHPFSPOT_IMG class destructor
+    */
    public function __destruct()
    {
 
    } // __desctruct()
 
+   /**
+    * sends the specified image to the browser
+    *
+    * this function will send the specified image to 
+    * the client - in the specified width. it also try's
+    * to create on-the-fly missing thumbnails via PHPFSPOT
+    * gen_thumbs function.
+    */
    public function show($idx, $width = 0)
    {
-      $this->parent->gen_thumb($idx);
-
       $details = $this->parent->get_photo_details($idx);
+   
+      if(!$details) {
+         $this->parent->showTextImage("The image you requested is unknown");
+         return;
+      }
 
-      /* show original photo */
+      /* no width specified - show photo in its original size */
       if($width == 0) {
          $fullpath = $this->parent->translate_path($details['directory_path'])  ."/". $details['name'];
       }
       /* show thumbnail */
       else {
+         /* if no entry for this photo is yet in the database, create thumb */
+         if(!$this->parent->getMD5($idx)) {
+            $this->parent->gen_thumb($idx);
+         }
          $fullpath = $this->parent->cfg->base_path ."/thumbs/". $width ."_". $this->parent->getMD5($idx);
+         /* if the thumb file does not exist, create it */
+         if(!file_exists($fullpath)) {
+            $this->parent->gen_thumb($idx);
+         }
       }
 
       if(!file_exists($fullpath)) {
-         $this->parent->gen_thumb($idx, 0, 1);
+         $this->parent->showTextImage("File ". basename($fullpath) ." does not exist");
+         return;
       }
       if(!is_readable($fullpath)) {
-         die("File ". $fullpath ." is not readable. Check the permissions");
+         $this->parent->showTextImage("File ". basename($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");              
+      Header("Content-Transfer-Encoding: binary\n");
       Header("Content-Disposition: inline; filename=\"". $details['name'] ."\"");
-      Header("Accept-Ranges: bytes");                             
-      Header("Connection: close");                                
+      Header("Accept-Ranges: bytes");
+      Header("Connection: close");
    
       $file = fopen($fullpath, "rb");
       fpassthru($file);
@@ -61,13 +114,12 @@ class PHPFSPOT_IMG {
 
 if(isset($_GET['idx']) && is_numeric($_GET['idx'])) {
 
+   $img = new PHPFSPOT_IMG;
+
    if(isset($_GET['width']) && is_numeric($_GET['width'])) 
-      $width = $_GET['width'];
+      $img->show($_GET['idx'], $_GET['width']);
    else
-      $width = "";
-
-   $img = new PHPFSPOT_IMG;
-   $img->show($_GET['idx'], $width);
+      $img->show($_GET['idx']);
 }
 
 ?>