fix conflict in phpfspot_tmpl.php

[phpfspot.git] / phpfspot_img.php

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 43107ac25bc8ce1c9514cf082cb2e55bd4b0312e..461f5c61a253083db259baca67b330007b1e0668 100644 (file)
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -24,10 +24,18 @@
 
 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
@@ -54,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)
    {
@@ -69,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 {
@@ -118,7 +128,7 @@ class PHPFSPOT_IMG {
 
    } // show()
 
-}
+} // PHPFSPOT_IMG()
 
 if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand')) {