diff options
| author | Andreas Unterkircher <unki@netshadow.at> | 2008-04-12 12:19:50 +0200 |
|---|---|---|
| committer | Andreas Unterkircher <unki@netshadow.at> | 2008-04-12 12:58:36 +0200 |
| commit | ae99d62da68f045e253c21f4db1ccee8d68b29ca (patch) | |
| tree | 8c171b714de620edcf02758e9e308ab484ed1b44 | |
| parent | 36ef21a5707926b0a65ca2537c4aa662f33d757c (diff) | |
register PHPFSPOT as global variable instead hand-over via classes
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
| -rw-r--r-- | phpfspot.class.php | 10 | ||||
| -rw-r--r-- | phpfspot_tmpl.php | 22 |
2 files changed, 20 insertions, 12 deletions
diff --git a/phpfspot.class.php b/phpfspot.class.php index d192d0d..b1093fc 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -46,6 +46,14 @@ class PHPFSPOT { */ public function __construct() { + /** + * register PHPFSPOT class global + * + * @global PHPFSPOT $GLOBALS['phpfspot'] + * @name $phpfspot + */ + $GLOBALS['phpfspot'] =& $this; + $this->cfg = new PHPFSPOT_CFG; /* verify config settings */ @@ -132,7 +140,7 @@ class PHPFSPOT { /* overload Smarty class with our own template handler */ require_once "phpfspot_tmpl.php"; - $this->tmpl = new PHPFSPOT_TMPL($this); + $this->tmpl = new PHPFSPOT_TMPL(); /* check if all necessary indices exist */ $this->checkDbIndices(); 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() |