Merge commit 'origin/master' into nefformat

1 files changed, 31 insertions, 14 deletions

diff --git a/phpfspot_tmpl.php b/phpfspot_tmpl.php
index 3fdf2ac..bf0f835 100644
--- a/phpfspot_tmpl.php
+++ b/phpfspot_tmpl.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
@@ -21,36 +22,52 @@
  *
  ***************************************************************************/
 
+/**
+ * PHPFSPOT_TMPL class
+ *
+ * Extends Smarty base class with some additional functions
+ * @package phpfspot
+ */
 class PHPFSPOT_TMPL extends Smarty {
 
-   var $parent;
-
-   public function __construct($parent)
+   /**
+    * PHPFSPOT_TMPL constructor
+    * @access public
+    */
+   public function __construct()
    {
-      if(!file_exists($parent->cfg->base_path .'/themes/'. $parent->cfg->theme_name .'/templates')) {
-         print "No templates found in ". $parent->cfg->base_path .'/themes/'. $parent->cfg->theme_name .'/templates';
+      global $phpfspot;
+
+      if(!file_exists($phpfspot->cfg->base_path .'/themes/'. $phpfspot->cfg->theme_name .'/templates')) {
+         print "No templates found in ". $phpfspot->cfg->base_path .'/themes/'. $phpfspot->cfg->theme_name .'/templates';
          exit(1);
       }
 
       $this->Smarty();
-      $this->template_dir = $parent->cfg->base_path .'/themes/'. $parent->cfg->theme_name .'/templates';
-      $this->compile_dir  = $parent->cfg->base_path .'/templates_c';
-      $this->config_dir   = $parent->cfg->base_path .'/smarty_config';
-      $this->cache_dir    = $parent->cfg->base_path .'/smarty_cache';
+      $this->template_dir = $phpfspot->cfg->base_path .'/themes/'. $phpfspot->cfg->theme_name .'/templates';
+      $this->compile_dir  = $phpfspot->cfg->base_path .'/templates_c';
+      $this->config_dir   = $phpfspot->cfg->base_path .'/smarty_config';
+      $this->cache_dir    = $phpfspot->cfg->base_path .'/smarty_cache';
 
-      if(isset($parent->cfg->use_lightbox) && $parent->cfg->use_lightbox == true)
+      if(isset($phpfspot->cfg->use_lightbox) && $phpfspot->cfg->use_lightbox == true)
          $this->assign('use_lightbox', 'true');
-      if(isset($parent->cfg->use_autocomplete) && $parent->cfg->use_autocomplete == true)
+      if(isset($phpfspot->cfg->use_autocomplete) && $phpfspot->cfg->use_autocomplete == true)
          $this->assign('use_autocomplete', 'true');
 
    } // __construct()
 
+   /**
+    * show template
+    *
+    * outputs the requested template
+    * @param string $template
+    */
    public function show($template)
    {
       $this->display($template);
 
    } // show()
 
-}
+} // PHPFSPOT_TMPL()
 
 ?>