X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_img.php;h=b6952041dcedc69b0451baac8302aca8363eea62;hp=3a2a322d4cebc03e5bfa52c88d9970fcda187539;hb=3eb8cfe677dbd50680ffd1ebcc14aa733feba5b3;hpb=61f2970e221f8612e51e7802cc127819c4caa369

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 3a2a322..b695204 100644
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -1,13 +1,44 @@
 <?php
 
-require_once "phpfspot_db.php";
+/***************************************************************************
+ *
+ * phpfspot, presents your F-Spot photo collection in Web browsers.
+ *
+ * Copyright (c) by Andreas Unterkircher
+ *
+ *  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";
 
+/**
+ * PHPFSPOT_IMG class
+ *
+ * handles phpfspot's photos. It will output either the photo binaries
+ * or can also show error messages as a on-the-fly generated picture.
+ * @package phpfspot
+ */
 class PHPFSPOT_IMG {
    
-   var $db;
-   var $parent;
+   private $db;
+   private $parent;
 
+   /**
+    * PHPFSPOT_IMG class constructor
+    */
    public function __construct()
    {
       $this->parent = new PHPFSPOT;
@@ -15,99 +46,192 @@ 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.
+    * @param integer $idx
+    * @param integer $width
+    */
+   public function showImg($idx, $width = 0, $version = NULL)
    {
-      $details = $this->parent->get_photo_details($idx);
+      if($idx == 'rand')
+         $idx = $this->parent->get_random_photo();
 
-		foreach(Array($this->parent->cfg->thumb_width, $this->parent->cfg->photo_width) as $resolution)
-		  $this->resize_image($this->parent->translate_path($details['directory_path'])  ."/". $details['name'], $resolution);
+      /* 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);
 
-      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'];
+      $details = $this->parent->get_photo_details($idx, $version);
 
+      if(!$details) {
+         $this->parent->showTextImage("The image (". $idx .") you requested is unknown");
+         return;
+      }
 
-      $tmp = getimagesize($fullpath);
-      $mime = $tmp['mime'];
+      /* 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(!$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);
+         }
+         /* 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);
+         }
+      }
+
+      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");
+         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);
 
-   } // show()
-
-   public function resize_image($image, $width)
+   } // 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)
    {
-      $src_img = @imagecreatefromjpeg($image);
-        
-      if($src_img)
-      {
-         /* grabs the height and width */
-         $new_w = imagesx($src_img);
-         $new_h = imagesy($src_img);
-                
-         // If requested width is more then the actual image width,
-         // do not generate a thumbnail
-         
-         if($width >= $new_w) {
-            imagedestroy($src_img);
-            return;
-         }
-                
-         /* calculates aspect ratio */
-         $aspect_ratio = $new_h / $new_w;
-                
-         /* sets new size */
-         $new_w = $width;
-         $new_h = abs($new_w * $aspect_ratio);
-                
-         /* creates new image of that size */
-         $dst_img = imagecreatetruecolor($new_w,$new_h);
-
-         imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255));
-                
-         /* copies resized portion of original image into new image */
-         imagecopyresampled($dst_img,$src_img,0,0,0,0,$new_w,$new_h,imagesx($src_img),imagesy($src_img));
-                
-         /* write down new generated file */
-         
-         if(!file_exists(dirname($image) ."/thumbs"))
-            mkdir(dirname($image) ."/thumbs");
-
-         $newfile = dirname($image) ."/thumbs/". $width ."_". basename($image);
-         imagejpeg($dst_img, $newfile, 75);
-                
-         /* free your mind */
-         imagedestroy($dst_img);
-         imagedestroy($src_img);
+      $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;
       }
 
-   } // resize_image()
-}
+      /* if no entry for this photo is yet in the database, create thumb */
+      if(!$this->parent->getMD5($idx)) {
+         $this->parent->gen_thumb($idx);
+      }
 
-if(isset($_GET['idx']) && is_numeric($_GET['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");
+         return;
+      }
+
+      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);
+
+   } // showTagImg()
+
+} // PHPFSPOT_IMG()
+
+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'];
    else
-      $width = "";
+      $width = NULL;
+
+   if(isset($_GET['version']) && is_numeric($_GET['version']))
+      $version = $_GET['version'];
+   else
+      $version = NULL;
+
+   $img->showImg($_GET['idx'], $width, $version);
+
+   exit(0);
+}
+
+if(isset($_GET['tagidx']) && is_numeric($_GET['tagidx'])) {
 
    $img = new PHPFSPOT_IMG;
-   $img->show($_GET['idx'], $width);
+   $img->showTagImg($_GET['tagidx']);
+
+   exit(0);
+
 }
 
 ?>