register PHPFSPOT as global variable instead hand-over via classes

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>

diff --git a/phpfspot.class.php b/phpfspot.class.php
index d192d0d6445acee4f4a5f3ab69d03ca73e215329..b1093fc8fa1281fd2cb6460acb0ad7cd495c15e7 100644 (file)
--- 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 6794233bcfa5f88c05803c2a7b32b57978302b78..e8bb48a5a5e7bec4d95765a75934f6eb2562bdcf 100644 (file)
--- 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()