projects
/
phpfspot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
underbar.png
[phpfspot.git]
/
phpfspot_img.php
diff --git
a/phpfspot_img.php
b/phpfspot_img.php
index 8251b8e1c757bde355dc8e614d3eb8f702ede046..bc8d3d11badc4b22067eba044e8c15deaf50c8f4 100644
(file)
--- 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
*
* 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";
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 {
class PHPFSPOT_IMG {
-
var
$db;
-
var
$parent;
+
private
$db;
+
private
$parent;
/**
* PHPFSPOT_IMG class constructor
/**
* PHPFSPOT_IMG class constructor
@@
-53,6
+61,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.
* 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 show($idx, $width = 0)
{
@@
-90,10
+100,8
@@
class PHPFSPOT_IMG {
if(!is_readable($fullpath)) {
$this->parent->showTextImage("File ". basename($fullpath) ." is not readable. Check the permissions");
return;
if(!is_readable($fullpath)) {
$this->parent->showTextImage("File ". basename($fullpath) ." is not readable. Check the permissions");
return;
- }
-
- $tmp = getimagesize($fullpath);
- $mime = $tmp['mime'];
+ }
+ $mime = $this->parent->get_mime_info($fullpath);
if(!$this->parent->checkifImageSupported($mime)) {
$this->parent->showTextImage("Unsupported Image Type");
if(!$this->parent->checkifImageSupported($mime)) {
$this->parent->showTextImage("Unsupported Image Type");
@@
-117,7
+125,7
@@
class PHPFSPOT_IMG {
} // show()
} // show()
-}
+}
// PHPFSPOT_IMG()
if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand')) {
if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand')) {