projects
/
phpfspot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
issue43, also return a thumbnail if requested width is below image size
[phpfspot.git]
/
phpfspot_img.php
diff --git
a/phpfspot_img.php
b/phpfspot_img.php
index 69f579bf20c04f32b16dc48228cf90ba3e8ce1d0..de677e558c56fe3ae76cbfcadd9d266520f17f11 100644
(file)
--- a/
phpfspot_img.php
+++ b/
phpfspot_img.php
@@
-28,35
+28,46
@@
class PHPFSPOT_IMG {
return;
}
return;
}
- /*
show original photo
*/
+ /*
no width specified - show photo in its original size
*/
if($width == 0) {
$fullpath = $this->parent->translate_path($details['directory_path']) ."/". $details['name'];
}
/* show thumbnail */
else {
if($width == 0) {
$fullpath = $this->parent->translate_path($details['directory_path']) ."/". $details['name'];
}
/* show thumbnail */
else {
+ /* 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->cfg->base_path ."/thumbs/". $width ."_". $this->parent->getMD5($idx);
$fullpath = $this->parent->cfg->base_path ."/thumbs/". $width ."_". $this->parent->getMD5($idx);
- if(!file_exists($fullpath))
- $this->parent->gen_thumb($idx, 0, 1);
+ /* if the thumb file does not exist, create it */
+ if(!file_exists($fullpath)) {
+ $this->parent->gen_thumb($idx);
+ }
}
if(!file_exists($fullpath)) {
}
if(!file_exists($fullpath)) {
- $this->parent->showTextImage("
test1
");
+ $this->parent->showTextImage("
File ". basename($fullpath) ." does not exist
");
return;
}
if(!is_readable($fullpath)) {
return;
}
if(!is_readable($fullpath)) {
- $this->parent->showTextImage("File ".
$fullpath
." is not readable. Check the permissions");
+ $this->parent->showTextImage("File ".
basename($fullpath)
." is not readable. Check the permissions");
return;
}
$tmp = getimagesize($fullpath);
$mime = $tmp['mime'];
return;
}
$tmp = getimagesize($fullpath);
$mime = $tmp['mime'];
+ if(!$this->parent->checkifImageSupported($mime)) {
+ $this->parent->showTextImage("Unsupported Image Type");
+ return;
+ }
+
Header("Content-Type: ". $mime);
Header("Content-Length: ". filesize($fullpath));
Header("Content-Type: ". $mime);
Header("Content-Length: ". filesize($fullpath));
- Header("Content-Transfer-Encoding: binary\n");
+ Header("Content-Transfer-Encoding: binary\n");
Header("Content-Disposition: inline; filename=\"". $details['name'] ."\"");
Header("Content-Disposition: inline; filename=\"". $details['name'] ."\"");
- Header("Accept-Ranges: bytes");
- Header("Connection: close");
+ Header("Accept-Ranges: bytes");
+ Header("Connection: close");
$file = fopen($fullpath, "rb");
fpassthru($file);
$file = fopen($fullpath, "rb");
fpassthru($file);
@@
-68,13
+79,12
@@
class PHPFSPOT_IMG {
if(isset($_GET['idx']) && is_numeric($_GET['idx'])) {
if(isset($_GET['idx']) && is_numeric($_GET['idx'])) {
+ $img = new PHPFSPOT_IMG;
+
if(isset($_GET['width']) && is_numeric($_GET['width']))
if(isset($_GET['width']) && is_numeric($_GET['width']))
- $
width = $_GET['width']
;
+ $
img->show($_GET['idx'], $_GET['width'])
;
else
else
- $width = "";
-
- $img = new PHPFSPOT_IMG;
- $img->show($_GET['idx'], $width);
+ $img->show($_GET['idx']);
}
?>
}
?>