/***************************************************************************
*
- * 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
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
* 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)
{
/* 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 {
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);
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");
} // show()
-}
+} // PHPFSPOT_IMG()
if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand')) {