X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_img.php;h=8251b8e1c757bde355dc8e614d3eb8f702ede046;hp=986fbccbb251a20930bccdf3abacfd4cfbb9189e;hb=18ff7e0419aebe37fcebdbfb180550acb118c0cb;hpb=abc9aff6834b750927ebcf6f7644479a839c3a7f

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 986fbcc..8251b8e 100644
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -1,6 +1,26 @@
 <?php
 
-require_once "phpfspot_db.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 {
@@ -8,6 +28,9 @@ class PHPFSPOT_IMG {
    var $db;
    var $parent;
 
+   /**
+    * PHPFSPOT_IMG class constructor
+    */
    public function __construct()
    {
       $this->parent = new PHPFSPOT;
@@ -15,35 +38,79 @@ class PHPFSPOT_IMG {
 
    } // __construct()
 
+   /**
+    * PHPFSPOT_IMG class destructor
+    */
    public function __destruct()
    {
 
    } // __desctruct()
 
-   public function show($idx, $width = "")
+   /**
+    * 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)
    {
-      $details = $this->parent->get_photo_details($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);
-
-      if($width == "")
-         $fullpath = $this->parent->translate_path($details['directory_path'])  ."/". $details['name'];
-      else
-         $fullpath = $this->parent->translate_path($details['directory_path'])  ."/thumbs/". $width ."_". $details['name'];
+      if($idx == 'rand')
+         $idx = $this->parent->get_random_photo();
 
+      $details = $this->parent->get_photo_details($idx);
+   
+      if(!$details) {
+         $this->parent->showTextImage("The image (". $idx .") you requested is unknown");
+         return;
+      }
+
+      /* no width specified - show photo in its original size */
+      if($width == 0) {
+         $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri'], 'fullpath'));
+      }
+      /* 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->get_thumb_path($width, $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->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;
+      }
 
       $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");                                
-   
+      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);
@@ -52,15 +119,14 @@ class PHPFSPOT_IMG {
 
 }
 
-if(isset($_GET['idx']) && is_numeric($_GET['idx'])) {
+if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand')) {
+
+   $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']);
 }
 
 ?>