From 18ff7e0419aebe37fcebdbfb180550acb118c0cb Mon Sep 17 00:00:00 2001
From: Andreas Unterkircher <unki@netshadow.at>
Date: Sun, 30 Dec 2007 12:01:31 +0100
Subject: issue82, switch picture handling to URI which is necessary for newer
 f-spot version's. for older database version's (< 9), the URI will be
 generated with file:///dir/name. Still needs to be tested with a older
 database version

---
 phpfspot_img.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpfspot_img.php')

diff --git a/phpfspot_img.php b/phpfspot_img.php
index ce3731b..8251b8e 100644
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -68,7 +68,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 {
@@ -103,7 +103,8 @@ 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");
-- 
cgit v1.2.3-18-g5258