translate_path() only needs one parameters. remove unused second one

[phpfspot.git] / phpfspot_img.php

diff --git a/phpfspot_img.php b/phpfspot_img.php
index a96d5e6f41c1d4ed86dd46933c36bdb9faf441e2..461f5c61a253083db259baca67b330007b1e0668 100644 (file)
--- 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,18 @@
 
 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,6 +62,8 @@ 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)
    {
@@ -62,13 +73,13 @@ class PHPFSPOT_IMG {
       $details = $this->parent->get_photo_details($idx);
    
       if(!$details) {
-         $this->parent->showTextImage("The image you requested is unknown");
+         $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($details['directory_path'])  ."/". $details['name'];
+         $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri']));
       }
       /* show thumbnail */
       else {
@@ -76,7 +87,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);
@@ -103,17 +114,21 @@ 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()
 
-}
+} // PHPFSPOT_IMG()
 
 if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand')) {