projects
/
phpfspot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
issue90, display also photos which are not tagged
[phpfspot.git]
/
phpfspot_img.php
diff --git
a/phpfspot_img.php
b/phpfspot_img.php
index ce3731b3fe92522a855efff12618b31c1793444c..8251b8e1c757bde355dc8e614d3eb8f702ede046 100644
(file)
--- 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) {
/* 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 {
}
/* 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-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("Accept-Ranges: bytes");
Header("Connection: close");
Header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");