X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_img.php;h=5ef76b4ea97a9e95c3595ba4c6930846b8f5427c;hp=a96d5e6f41c1d4ed86dd46933c36bdb9faf441e2;hb=6198d8ac0ce0623ebb56dba2fed19e4e759682c0;hpb=758887b79c875b31b86d427e27f515e2c3d2a257 diff --git a/phpfspot_img.php b/phpfspot_img.php index a96d5e6..5ef76b4 100644 --- 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,17 @@ 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,30 +61,40 @@ 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) + public function showImg($idx, $width = 0, $version = NULL) { if($idx == 'rand') $idx = $this->parent->get_random_photo(); - $details = $this->parent->get_photo_details($idx); - + /* display the lastest available version, if a wrong version has been requested */ + if(!isset($version) || !$this->parent->is_valid_version($idx, $version)) + $version = $this->parent->get_latest_version($idx); + + $details = $this->parent->get_photo_details($idx, $version); + 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'], 'fullpath')); } /* show thumbnail */ else { - /* if no entry for this photo is yet in the database, create thumb */ + + /* check for an entry if we already handled this photo before. If not, + create a thumbnail for it. + */ if(!$this->parent->getMD5($idx)) { $this->parent->gen_thumb($idx); } - $fullpath = $this->parent->cfg->base_path ."/thumbs/". $width ."_". $this->parent->getMD5($idx); + /* get the full filesystem path to the thumbnail */ + $fullpath = $this->parent->get_thumb_path($width, $idx, $version); /* if the thumb file does not exist, create it */ if(!file_exists($fullpath)) { $this->parent->gen_thumb($idx); @@ -90,10 +108,75 @@ class PHPFSPOT_IMG { if(!is_readable($fullpath)) { $this->parent->showTextImage("File ". basename($fullpath) ." is not readable. Check the permissions"); return; + } + $mime = $this->parent->get_mime_info($fullpath); + + if(!$this->parent->checkifImageSupported($mime)) { + $this->parent->showTextImage("Unsupported Image Type"); + return; } - $tmp = getimagesize($fullpath); - $mime = $tmp['mime']; + Header("Content-Type: ". $mime); + Header("Content-Length: ". filesize($fullpath)); + Header("Content-Transfer-Encoding: binary\n"); + 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); + + } // showImg() + + /** + * sends a random photo of the requested tag to the browser + * + * this function will send a random photo to the client. + * It is selected out by the provided $tagidx. It also try's + * to create on-the-fly missing thumbnails via PHPFSPOT + * gen_thumbs function. + * @param integer $idx + */ + public function showTagImg($tagidx) + { + $idx = $this->parent->get_random_tag_photo($tagidx); + $width = 30; + + $details = $this->parent->get_photo_details($idx); + + if(!$details) { + $this->parent->showTextImage("The image (". $idx .") you requested is unknown"); + return; + } + + /* if no entry for this photo is yet in the database, create thumb */ + if(!$this->parent->getMD5($idx)) { + $this->parent->gen_thumb($idx); + } + + $version = $this->parent­>get_latest_version($idx); + + $fullpath = $this->parent->get_thumb_path($width, $idx, $version); + /* if the thumb file does not exist, create it */ + if(!file_exists($fullpath)) { + $this->parent->gen_thumb($idx); + } + + if(!file_exists($fullpath)) { + $this->parent->showTextImage("File ". basename($fullpath) ." does not exist"); + return; + } + if(!is_readable($fullpath)) { + $this->parent->showTextImage("File ". basename($fullpath) ." is not readable. Check the permissions"); + return; + } + + $mime = $this->parent->get_mime_info($fullpath); if(!$this->parent->checkifImageSupported($mime)) { $this->parent->showTextImage("Unsupported Image Type"); @@ -103,26 +186,48 @@ 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() + } // showTagImg() -} +} // PHPFSPOT_IMG() if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand')) { $img = new PHPFSPOT_IMG; if(isset($_GET['width']) && is_numeric($_GET['width'])) - $img->show($_GET['idx'], $_GET['width']); + $width = $_GET['width']; + else + $width = NULL; + + if(isset($_GET['version']) && is_numeric($_GET['version'])) + $version = $_GET['version']; else - $img->show($_GET['idx']); + $version = NULL; + + $img->showImg($_GET['idx'], $width, $version); + + exit(0); +} + +if(isset($_GET['tagidx']) && is_numeric($_GET['tagidx'])) { + + $img = new PHPFSPOT_IMG; + $img->showTagImg($_GET['tagidx']); + + exit(0); + } ?>