X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_img.php;h=3599b2b3a89dbf30e7406e389973df148a5d516f;hp=5747b736a4d36defaa611f3c875a6facaa80cf30;hb=d774bea5f0bc063be6426668e19faf02167f3d65;hpb=fd68fbf3364faf0ef72b4a717e891743c17e9f27

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 5747b73..3599b2b 100644
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -2,8 +2,9 @@
 
 /***************************************************************************
  *
- * Copyright (c) by Andreas Unterkircher, unki@netshadow.at
- * All rights reserved
+ * 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
@@ -23,10 +24,17 @@
 
 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
@@ -53,8 +61,10 @@ class PHPFSPOT_IMG {
     * 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 show($idx, $width = 0)
+   public function showImg($idx, $width = 0)
    {
       if($idx == 'rand')
          $idx = $this->parent->get_random_photo();
@@ -68,7 +78,7 @@ class PHPFSPOT_IMG {
 
       /* no width specified - show photo in its original size */
       if($width == 0) {
-         $fullpath = $this->parent->translate_path($details['directory_path'])  ."/". $details['name'];
+         $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri'], 'fullpath'));
       }
       /* show thumbnail */
       else {
@@ -76,7 +86,7 @@ class PHPFSPOT_IMG {
          if(!$this->parent->getMD5($idx)) {
             $this->parent->gen_thumb($idx);
          }
-         $fullpath = $this->parent->cfg->base_path ."/thumbs/". $width ."_". $this->parent->getMD5($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);
@@ -90,10 +100,72 @@ 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);
+      }
+      $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;
+      }
+
+      $mime = $this->parent->get_mime_info($fullpath);
 
       if(!$this->parent->checkifImageSupported($mime)) {
          $this->parent->showTextImage("Unsupported Image Type");
@@ -103,29 +175,42 @@ class PHPFSPOT_IMG {
       Header("Content-Type: ". $mime);
       Header("Content-Length: ". filesize($fullpath));
       Header("Content-Transfer-Encoding: binary\n");
-      Header("Content-Disposition: inline; filename=\"". $details['name'] ."\"");
+      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()
+   } // 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'])) 
-      $img->show($_GET['idx'], $_GET['width']);
+      $img->showImg($_GET['idx'], $_GET['width']);
    else
-      $img->show($_GET['idx']);
+      $img->showImg($_GET['idx']);
+
+   exit(0);
 }
 
+if(isset($_GET['tagidx']) && is_numeric($_GET['tagidx'])) {
+
+   $img = new PHPFSPOT_IMG;
+   $img->showTagImg($_GET['tagidx']);
+
+   exit(0);
+
+}
+
+
 ?>