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_tmpl.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'phpfspot_tmpl.php') diff --git a/phpfspot_tmpl.php b/phpfspot_tmpl.php index 3fdf2ac..6794233 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 -- cgit v1.2.3-18-g5258 From 9b5884120e78b7e2ce35d37bdb72da7ec721452d Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:19:50 +0200 Subject: register PHPFSPOT as global variable instead hand-over via classes Signed-off-by: Andreas Unterkircher --- phpfspot_tmpl.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'phpfspot_tmpl.php') diff --git a/phpfspot_tmpl.php b/phpfspot_tmpl.php index 6794233..e8bb48a 100644 --- a/phpfspot_tmpl.php +++ b/phpfspot_tmpl.php @@ -24,24 +24,24 @@ class PHPFSPOT_TMPL extends Smarty { - var $parent; - - public function __construct($parent) + 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() -- cgit v1.2.3-18-g5258 From ae99d62da68f045e253c21f4db1ccee8d68b29ca Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:19:50 +0200 Subject: register PHPFSPOT as global variable instead hand-over via classes Signed-off-by: Andreas Unterkircher --- phpfspot_tmpl.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'phpfspot_tmpl.php') diff --git a/phpfspot_tmpl.php b/phpfspot_tmpl.php index 6794233..e8bb48a 100644 --- a/phpfspot_tmpl.php +++ b/phpfspot_tmpl.php @@ -24,24 +24,24 @@ class PHPFSPOT_TMPL extends Smarty { - var $parent; - - public function __construct($parent) + 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() -- 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_tmpl.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'phpfspot_tmpl.php') diff --git a/phpfspot_tmpl.php b/phpfspot_tmpl.php index e8bb48a..f6d3ce8 100644 --- a/phpfspot_tmpl.php +++ b/phpfspot_tmpl.php @@ -22,8 +22,17 @@ * ***************************************************************************/ +/** + * PHPFSPOT_TMPL class + * + * Extends Smarty base class with some additional functions + * @package phpfspot + */ class PHPFSPOT_TMPL extends Smarty { + /** + * class constructor + */ public function __construct() { global $phpfspot; @@ -46,12 +55,18 @@ class PHPFSPOT_TMPL extends Smarty { } // __construct() + /** + * show template + * + * outputs the requested template + * @param string $template + */ public function show($template) { $this->display($template); } // show() -} +} // PHPFSPOT_TMPL() ?> -- cgit v1.2.3-18-g5258