From 7617d4479b5891e905956afa3e62d26df1271bf4 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 10:08:40 +0200 Subject: update GPL header and remove authors email address from it Signed-off-by: Andreas Unterkircher --- 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 8251b8e..43107ac 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 -- cgit v1.2.3-18-g5258 From 2765fc086522b5fb9f209bdfe266e577fc65ca84 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:23:12 +0200 Subject: added phpDocumentor tags to parts of the code Signed-off-by: Andreas Unterkircher --- phpfspot_img.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'phpfspot_img.php') diff --git a/phpfspot_img.php b/phpfspot_img.php index 43107ac..8379b83 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -24,6 +24,14 @@ 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; -- cgit v1.2.3-18-g5258 From 7688cbcdf666c2c538bc35cbc4efbe929a8fa9da Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:57:55 +0200 Subject: further pimped code for phpDocumentor Signed-off-by: Andreas Unterkircher --- phpfspot_img.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'phpfspot_img.php') diff --git a/phpfspot_img.php b/phpfspot_img.php index 8379b83..f298b00 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -34,8 +34,8 @@ require_once "phpfspot.class.php"; */ class PHPFSPOT_IMG { - var $db; - var $parent; + private $db; + private $parent; /** * PHPFSPOT_IMG class constructor @@ -62,6 +62,8 @@ 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) { @@ -126,7 +128,7 @@ class PHPFSPOT_IMG { } // show() -} +} // PHPFSPOT_IMG() if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand')) { -- cgit v1.2.3-18-g5258 From 14eb0419012155b6d36f25dd9bd1d2ba683dbed7 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:28:49 +0200 Subject: translate_path() only needs one parameters. remove unused second one Signed-off-by: Andreas Unterkircher --- phpfspot_img.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpfspot_img.php') diff --git a/phpfspot_img.php b/phpfspot_img.php index f298b00..461f5c6 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -79,7 +79,7 @@ class PHPFSPOT_IMG { /* no width specified - show photo in its original size */ if($width == 0) { - $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri'], 'fullpath')); + $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri'])); } /* show thumbnail */ else { -- cgit v1.2.3-18-g5258 From 55677896eb839e20542440e51c5737a318240dab Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 18:40:20 +0200 Subject: update documentation Signed-off-by: Andreas Unterkircher --- phpfspot_img.php | 1 - 1 file changed, 1 deletion(-) (limited to 'phpfspot_img.php') diff --git a/phpfspot_img.php b/phpfspot_img.php index 461f5c6..412c5f2 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -29,7 +29,6 @@ require_once "phpfspot.class.php"; * * 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 { -- cgit v1.2.3-18-g5258 From cd7402eecd6b5e50dcc62d8394342e6717c359e5 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 19:30:12 +0200 Subject: parse_uri() needs two parameters Signed-off-by: Andreas Unterkircher --- phpfspot_img.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpfspot_img.php') diff --git a/phpfspot_img.php b/phpfspot_img.php index 412c5f2..f3eb308 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -78,7 +78,7 @@ class PHPFSPOT_IMG { /* no width specified - show photo in its original size */ if($width == 0) { - $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri'])); + $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri'], 'fullpath')); } /* show thumbnail */ else { -- cgit v1.2.3-18-g5258