Changeset 2530

Timestamp:

04/18/2008 02:38:38 AM (7 months ago)

Author:

armen

Message:

Re structured smarty config file.

Location:

trunk/modules/smarty

Files:

• config/smarty.php (modified) (1 diff)
• libraries/MY_Controller.php (modified) (2 diffs)
• libraries/MY_Smarty.php (modified) (2 diffs)

trunk/modules/smarty/config/smarty.php

@@ -5 +5 @@
         'integration'           => TRUE,        // Enable/Disable Smarty integration
         'templates_ext'         => 'tpl',
-        'cache_path'            => APPPATH.'cache/',
         'global_templates_path' => APPPATH.'views/',
+        'cache_path'            => APPPATH.'cache/smarty_cache/',
+        'compile_path'          => APPPATH.'cache/smarty_compile/',
+        'configs_path'          => APPPATH.'views/smarty_configs/',
+        'plugins_path'          => APPPATH.'views/smarty_plugins/',
+        'debug_tpl'             => APPPATH.'views/debug.tpl',
         'debugging_ctrl'        => FALSE,
         'debugging'             => TRUE,

trunk/modules/smarty/libraries/MY_Controller.php

@@ -7 +7 @@
                 parent::__construct();
         
-                if (Config::item('smarty.integration') == TRUE) {
+                if (Config::item('smarty.integration') == TRUE)
+                {
                         $this->MY_Smarty = new MY_Smarty;
                 }
@@ -22 +23 @@
                         if (is_array($vars) AND count($vars) > 0) 
                         {
-                                foreach ($vars as $key => $val) 
+                                foreach ($vars AS $key => $val)
                                 {
                                         $this->MY_Smarty->assign($key, $val);

trunk/modules/smarty/libraries/MY_Smarty.php

@@ -14 +14 @@
                 parent::Smarty();
 
-                $this->cache_dir      = Config::item('smarty.cache_path') . 'smarty_cache/';
-                $this->compile_dir    = Config::item('smarty.cache_path') . 'smarty_compile/';
-                $this->config_dir     = Config::item('smarty.global_templates_path') . 'smarty_configs/';
-                $this->plugins_dir[]  = Config::item('smarty.global_templates_path') . 'smarty_plugins/';
-                $this->debug_tpl      = Config::item('smarty.global_templates_path') . 'debug.tpl';
+                $this->cache_dir      = Config::item('smarty.cache_path');
+                $this->compile_dir    = Config::item('smarty.compile_path');
+                $this->config_dir     = Config::item('smarty.configs_path');
+                $this->plugins_dir[]  = Config::item('smarty.plugins_path');
+                $this->debug_tpl      = Config::item('smarty.debug_tpl');
                 $this->debugging_ctrl = Config::item('smarty.debugging_ctrl');
                 $this->debugging      = Config::item('smarty.debugging');
@@ -26 +26 @@
 
                 // check if cache directory is exists
-                $this->checkDirectory(Config::item('smarty.cache_path'));
+                $this->checkDirectory($this->cache_dir);
 
                 // check if smarty_compile directory is exists