From c23ce16cafb826c8bb4fe7aaf2a5525b29052b23 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 6 Dec 2015 20:12:05 +0100
Subject: update smarty library - seems to bring some performance improvement

---
 library/Smarty/libs/Smarty.class.php | 840 ++++++++++++++++++++---------------
 1 file changed, 481 insertions(+), 359 deletions(-)

(limited to 'library/Smarty/libs/Smarty.class.php')

diff --git a/library/Smarty/libs/Smarty.class.php b/library/Smarty/libs/Smarty.class.php
index 832b0d309..1f0f2634a 100644
--- a/library/Smarty/libs/Smarty.class.php
+++ b/library/Smarty/libs/Smarty.class.php
@@ -2,15 +2,17 @@
 /**
  * Project:     Smarty: the PHP compiling template engine
  * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 4897 2014-10-14 22:29:58Z Uwe.Tews@googlemail.com $
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -19,12 +21,13 @@
  * smarty-discussion-subscribe@googlegroups.com
  *
  * @link      http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
+ * @copyright 2015 New Digital Group, Inc.
+ * @copyright 2015 Uwe Tews
  * @author    Monte Ohrt <monte at ohrt dot com>
  * @author    Uwe Tews
  * @author    Rodney Rehm
  * @package   Smarty
- * @version   3.1.21
+ * @version   3.1.27
  */
 
 /**
@@ -53,7 +56,7 @@ if (!defined('SMARTY_PLUGINS_DIR')) {
     define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
 }
 if (!defined('SMARTY_MBSTRING')) {
-    define('SMARTY_MBSTRING', function_exists('mb_split'));
+    define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
 if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
     // UTF-8 can only be done properly when mbstring is available!
@@ -70,31 +73,29 @@ if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
 }
 
 /**
- * register the class autoloader
+ * Try loading the Smarty_Internal_Data class
+ * If we fail we must load Smarty's autoloader.
+ * Otherwise we may have a global autoloader like Composer
  */
-if (!defined('SMARTY_SPL_AUTOLOAD')) {
-    define('SMARTY_SPL_AUTOLOAD', 0);
-}
-
-if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false) {
-    $registeredAutoLoadFunctions = spl_autoload_functions();
-    if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
-        spl_autoload_register();
+if (!class_exists('Smarty_Autoloader', false)) {
+    if (!class_exists('Smarty_Internal_Data', true)) {
+        require_once 'Autoloader.php';
+        Smarty_Autoloader::registerBC();
     }
-} else {
-    spl_autoload_register('smartyAutoload');
 }
 
 /**
  * Load always needed external class files
  */
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_resource_file.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_cacheresource_file.php';
+
+if (!class_exists('Smarty_Internal_Data', false)) {
+    require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
+}
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_variable.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_source.php';
 
 /**
  * This is the main Smarty class
@@ -110,21 +111,28 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = 'Smarty-3.1.21-dev';
+    const SMARTY_VERSION = '3.1.27';
 
     /**
      * define variable scopes
      */
     const SCOPE_LOCAL = 0;
+
     const SCOPE_PARENT = 1;
+
     const SCOPE_ROOT = 2;
+
     const SCOPE_GLOBAL = 3;
+
     /**
      * define caching modes
      */
     const CACHING_OFF = 0;
+
     const CACHING_LIFETIME_CURRENT = 1;
+
     const CACHING_LIFETIME_SAVED = 2;
+
     /**
      * define constant for clearing cache files be saved expiration datees
      */
@@ -134,29 +142,53 @@ class Smarty extends Smarty_Internal_TemplateBase
      * define compile check modes
      */
     const COMPILECHECK_OFF = 0;
+
     const COMPILECHECK_ON = 1;
+
     const COMPILECHECK_CACHEMISS = 2;
+
+    /**
+     * define debug modes
+     */
+    const DEBUG_OFF = 0;
+
+    const DEBUG_ON = 1;
+
+    const DEBUG_INDIVIDUAL = 2;
+
     /**
      * modes for handling of "<?php ... ?>" tags in templates.
      */
     const PHP_PASSTHRU = 0; //-> print tags as plain text
+
     const PHP_QUOTE = 1; //-> escape tags as entities
+
     const PHP_REMOVE = 2; //-> escape tags as entities
+
     const PHP_ALLOW = 3; //-> escape tags as entities
+
     /**
      * filter types
      */
     const FILTER_POST = 'post';
+
     const FILTER_PRE = 'pre';
+
     const FILTER_OUTPUT = 'output';
+
     const FILTER_VARIABLE = 'variable';
+
     /**
      * plugin types
      */
     const PLUGIN_FUNCTION = 'function';
+
     const PLUGIN_BLOCK = 'block';
+
     const PLUGIN_COMPILER = 'compiler';
+
     const PLUGIN_MODIFIER = 'modifier';
+
     const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
 
     /**#@-*/
@@ -170,23 +202,28 @@ class Smarty extends Smarty_Internal_TemplateBase
      * error handler returned by set_error_hanlder() in Smarty::muteExpectedErrors()
      */
     public static $_previous_error_handler = null;
+
     /**
      * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
      */
-    public static $_muted_directories = array();
+    public static $_muted_directories = array('./templates_c/' => null, './cache/' => null);
+
     /**
      * Flag denoting if Multibyte String functions are available
      */
     public static $_MBSTRING = SMARTY_MBSTRING;
+
     /**
      * The character set to adhere to (e.g. "UTF-8")
      */
     public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
+
     /**
      * The date format to be used internally
      * (accepts date() and strftime())
      */
     public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
+
     /**
      * Flag denoting if PCRE should run in UTF-8 mode
      */
@@ -207,158 +244,154 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $auto_literal = true;
+
     /**
      * display error on not assigned variables
      *
      * @var boolean
      */
     public $error_unassigned = false;
+
     /**
      * look up relative filepaths in include_path
      *
      * @var boolean
      */
     public $use_include_path = false;
+
     /**
      * template directory
      *
      * @var array
      */
-    private $template_dir = array();
+    private $template_dir = array('./templates/');
+
     /**
      * joined template directory string used in cache keys
      *
      * @var string
      */
-    public $joined_template_dir = null;
+    public $joined_template_dir = './templates/';
+
     /**
      * joined config directory string used in cache keys
      *
      * @var string
      */
-    public $joined_config_dir = null;
+    public $joined_config_dir = './configs/';
+
     /**
      * default template handler
      *
      * @var callable
      */
     public $default_template_handler_func = null;
+
     /**
      * default config handler
      *
      * @var callable
      */
     public $default_config_handler_func = null;
+
     /**
      * default plugin handler
      *
      * @var callable
      */
     public $default_plugin_handler_func = null;
+
     /**
      * compile directory
      *
      * @var string
      */
-    private $compile_dir = null;
+    private $compile_dir = './templates_c/';
+
     /**
      * plugins directory
      *
      * @var array
      */
-    private $plugins_dir = array();
+    private $plugins_dir = null;
+
     /**
      * cache directory
      *
      * @var string
      */
-    private $cache_dir = null;
+    private $cache_dir = './cache/';
+
     /**
      * config directory
      *
      * @var array
      */
-    private $config_dir = array();
+    private $config_dir = array('./configs/');
+
     /**
      * force template compiling?
      *
      * @var boolean
      */
     public $force_compile = false;
+
     /**
      * check template for modifications?
      *
      * @var boolean
      */
     public $compile_check = true;
+
     /**
      * use sub dirs for compiled/cached files?
      *
      * @var boolean
      */
     public $use_sub_dirs = false;
+
     /**
      * allow ambiguous resources (that are made unique by the resource handler)
      *
      * @var boolean
      */
     public $allow_ambiguous_resources = false;
-    /**
-     * caching enabled
-     *
-     * @var boolean
-     */
-    public $caching = false;
+
     /**
      * merge compiled includes
      *
      * @var boolean
      */
     public $merge_compiled_includes = false;
+
     /**
      * template inheritance merge compiled includes
      *
      * @var boolean
      */
     public $inheritance_merge_compiled_includes = true;
-    /**
-     * cache lifetime in seconds
-     *
-     * @var integer
-     */
-    public $cache_lifetime = 3600;
+
     /**
      * force cache file creation
      *
      * @var boolean
      */
     public $force_cache = false;
-    /**
-     * Set this if you want different sets of cache files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $cache_id = null;
-    /**
-     * Set this if you want different sets of compiled files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $compile_id = null;
+
     /**
      * template left-delimiter
      *
      * @var string
      */
     public $left_delimiter = "{";
+
     /**
      * template right-delimiter
      *
      * @var string
      */
     public $right_delimiter = "}";
+
     /**#@+
      * security
      */
@@ -370,24 +403,28 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @see Smarty_Security
      */
     public $security_class = 'Smarty_Security';
+
     /**
      * implementation of security class
      *
      * @var Smarty_Security
      */
     public $security_policy = null;
+
     /**
      * controls handling of PHP-blocks
      *
      * @var integer
      */
     public $php_handling = self::PHP_PASSTHRU;
+
     /**
      * controls if the php template file resource is allowed
      *
      * @var bool
      */
     public $allow_php_templates = false;
+
     /**
      * Should compiled-templates be prevented from being called directly?
      * {@internal
@@ -397,6 +434,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $direct_access_security = true;
+
     /**#@-*/
     /**
      * debug mode
@@ -405,6 +443,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $debugging = false;
+
     /**
      * This determines if debugging is enable-able from the browser.
      * <ul>
@@ -415,26 +454,30 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var string
      */
     public $debugging_ctrl = 'NONE';
+
     /**
      * Name of debugging URL-param.
      * Only used when $debugging_ctrl is set to 'URL'.
      * The name of the URL-parameter that activates debugging.
      *
-     * @var type
+     * @var string
      */
     public $smarty_debug_id = 'SMARTY_DEBUG';
+
     /**
      * Path of debug template.
      *
      * @var string
      */
     public $debug_tpl = null;
+
     /**
      * When set, smarty uses this value as error_reporting-level.
      *
      * @var int
      */
     public $error_reporting = null;
+
     /**
      * Internal flag for getTags()
      *
@@ -452,12 +495,14 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $config_overwrite = true;
+
     /**
      * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
      *
      * @var boolean
      */
     public $config_booleanize = true;
+
     /**
      * Controls whether hidden config sections/vars are read from the file.
      *
@@ -477,12 +522,14 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $compile_locking = true;
+
     /**
      * Controls whether cache resources should emply locking mechanism
      *
      * @var boolean
      */
     public $cache_locking = false;
+
     /**
      * seconds to wait for acquiring a lock before ignoring the write lock
      *
@@ -492,12 +539,6 @@ class Smarty extends Smarty_Internal_TemplateBase
 
     /**#@-*/
 
-    /**
-     * global template functions
-     *
-     * @var array
-     */
-    public $template_functions = array();
     /**
      * resource type used if none given
      * Must be an valid key of $registered_resources.
@@ -505,6 +546,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var string
      */
     public $default_resource_type = 'file';
+
     /**
      * caching type
      * Must be an element of $cache_resource_types.
@@ -512,256 +554,284 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var string
      */
     public $caching_type = 'file';
+
     /**
      * internal config properties
      *
      * @var array
      */
     public $properties = array();
+
     /**
      * config type
      *
      * @var string
      */
     public $default_config_type = 'file';
+
+    /**
+     * cached template objects
+     *
+     * @var array
+     */
+    public $source_objects = array();
+
     /**
      * cached template objects
      *
      * @var array
      */
     public $template_objects = array();
+
+    /**
+     * enable resource caching
+     *
+     * @var bool
+     */
+    public $resource_caching = false;
+
+    /**
+     * enable template resource caching
+     *
+     * @var bool
+     */
+    public $template_resource_caching = true;
+
     /**
      * check If-Modified-Since headers
      *
      * @var boolean
      */
     public $cache_modified_check = false;
+
     /**
      * registered plugins
      *
      * @var array
      */
     public $registered_plugins = array();
+
     /**
      * plugin search order
      *
      * @var array
      */
     public $plugin_search_order = array('function', 'block', 'compiler', 'class');
+
     /**
      * registered objects
      *
      * @var array
      */
     public $registered_objects = array();
+
     /**
      * registered classes
      *
      * @var array
      */
     public $registered_classes = array();
+
     /**
      * registered filters
      *
      * @var array
      */
     public $registered_filters = array();
+
     /**
      * registered resources
      *
      * @var array
      */
     public $registered_resources = array();
+
     /**
      * resource handler cache
      *
      * @var array
      */
     public $_resource_handlers = array();
+
     /**
      * registered cache resources
      *
      * @var array
      */
     public $registered_cache_resources = array();
+
     /**
      * cache resource handler cache
      *
      * @var array
      */
     public $_cacheresource_handlers = array();
+
     /**
      * autoload filter
      *
      * @var array
      */
     public $autoload_filters = array();
+
     /**
      * default modifier
      *
      * @var array
      */
     public $default_modifiers = array();
+
     /**
      * autoescape variable output
      *
      * @var boolean
      */
     public $escape_html = false;
+
     /**
      * global internal smarty vars
      *
      * @var array
      */
     public static $_smarty_vars = array();
+
     /**
      * start time for execution time calculation
      *
      * @var int
      */
     public $start_time = 0;
+
     /**
      * default file permissions
      *
      * @var int
      */
     public $_file_perms = 0644;
+
     /**
      * default dir permissions
      *
      * @var int
      */
     public $_dir_perms = 0771;
+
     /**
      * block tag hierarchy
      *
      * @var array
      */
     public $_tag_stack = array();
-    /**
-     * self pointer to Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty;
+
     /**
      * required by the compiler for BC
      *
      * @var string
      */
     public $_current_file = null;
+
     /**
      * internal flag to enable parser debugging
      *
      * @var bool
      */
     public $_parserdebug = false;
-    /**
-     * Saved parameter of merged templates during compilation
-     *
-     * @var array
-     */
-    public $merged_templates_func = array();
 
     /**
      * Cache of is_file results of loadPlugin()
-     * 
+     *
      * @var array
      */
-    public static $_is_file_cache= array();
+    public $_is_file_cache = array();
 
     /**#@-*/
 
     /**
      * Initialize new Smarty object
-
      */
     public function __construct()
     {
-        // selfpointer needed by some other class methods
-        $this->smarty = $this;
         if (is_callable('mb_internal_encoding')) {
             mb_internal_encoding(Smarty::$_CHARSET);
         }
         $this->start_time = microtime(true);
-        // set default dirs
-        $this->setTemplateDir('.' . DS . 'templates' . DS)
-            ->setCompileDir('.' . DS . 'templates_c' . DS)
-            ->setPluginsDir(SMARTY_PLUGINS_DIR)
-            ->setCacheDir('.' . DS . 'cache' . DS)
-            ->setConfigDir('.' . DS . 'configs' . DS);
-
-        $this->debug_tpl = 'file:' . dirname(__FILE__) . '/debug.tpl';
+        // check default dirs for overloading
+        if ($this->template_dir[0] !== './templates/' || isset($this->template_dir[1])) {
+            $this->setTemplateDir($this->template_dir);
+        }
+        if ($this->config_dir[0] !== './configs/' || isset($this->config_dir[1])) {
+            $this->setConfigDir($this->config_dir);
+        }
+        if ($this->compile_dir !== './templates_c/') {
+            unset(self::$_muted_directories['./templates_c/']);
+            $this->setCompileDir($this->compile_dir);
+        }
+        if ($this->cache_dir !== './cache/') {
+            unset(self::$_muted_directories['./cache/']);
+            $this->setCacheDir($this->cache_dir);
+        }
+        if (isset($this->plugins_dir)) {
+            $this->setPluginsDir($this->plugins_dir);
+        } else {
+            $this->setPluginsDir(SMARTY_PLUGINS_DIR);
+        }
         if (isset($_SERVER['SCRIPT_NAME'])) {
-            $this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
+            Smarty::$global_tpl_vars['SCRIPT_NAME'] = new Smarty_Variable($_SERVER['SCRIPT_NAME']);
         }
-    }
 
-    /**
-     * Class destructor
-     */
-    public function __destruct()
-    {
-        // intentionally left blank
-    }
+        // Check if we're running on windows
+        Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
 
-    /**
-     * <<magic>> set selfpointer on cloned object
-     */
-    public function __clone()
-    {
-        $this->smarty = $this;
+        // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
+        if (Smarty::$_CHARSET !== 'UTF-8') {
+            Smarty::$_UTF8_MODIFIER = '';
+        }
     }
 
     /**
-     * <<magic>> Generic getter.
-     * Calls the appropriate getter function.
-     * Issues an E_USER_NOTICE if no valid getter is found.
+     * fetches a rendered Smarty template
      *
-     * @param  string $name property name
+     * @param  string $template         the resource handle of the template file or template object
+     * @param  mixed  $cache_id         cache id to be used with this template
+     * @param  mixed  $compile_id       compile id to be used with this template
+     * @param  object $parent           next higher level of Smarty variables
+     * @param  bool   $display          true: display, false: fetch
+     * @param  bool   $merge_tpl_vars   not used - left for BC
+     * @param  bool   $no_output_filter not used - left for BC
      *
-     * @return mixed
+     * @throws Exception
+     * @throws SmartyException
+     * @return string rendered template output
      */
-    public function __get($name)
+    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)
     {
-        $allowed = array(
-            'template_dir' => 'getTemplateDir',
-            'config_dir'   => 'getConfigDir',
-            'plugins_dir'  => 'getPluginsDir',
-            'compile_dir'  => 'getCompileDir',
-            'cache_dir'    => 'getCacheDir',
-        );
-
-        if (isset($allowed[$name])) {
-            return $this->{$allowed[$name]}();
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        if ($cache_id !== null && is_object($cache_id)) {
+            $parent = $cache_id;
+            $cache_id = null;
         }
+        if ($parent === null) {
+            $parent = $this;
+        }
+        // get template object
+        $_template = is_object($template) ? $template : $this->createTemplate($template, $cache_id, $compile_id, $parent, false);
+        // set caching in template object
+        $_template->caching = $this->caching;
+        // fetch template content
+        return $_template->render(true, false, $display);
     }
 
     /**
-     * <<magic>> Generic setter.
-     * Calls the appropriate setter function.
-     * Issues an E_USER_NOTICE if no valid setter is found.
+     * displays a Smarty template
      *
-     * @param string $name  property name
-     * @param mixed  $value parameter passed to setter
+     * @param string $template   the resource handle of the template file or template object
+     * @param mixed  $cache_id   cache id to be used with this template
+     * @param mixed  $compile_id compile id to be used with this template
+     * @param object $parent     next higher level of Smarty variables
      */
-    public function __set($name, $value)
+    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
     {
-        $allowed = array(
-            'template_dir' => 'setTemplateDir',
-            'config_dir'   => 'setConfigDir',
-            'plugins_dir'  => 'setPluginsDir',
-            'compile_dir'  => 'setCompileDir',
-            'cache_dir'    => 'setCacheDir',
-        );
-
-        if (isset($allowed[$name])) {
-            $this->{$allowed[$name]}($value);
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-        }
+        // display template
+        $this->fetch($template, $cache_id, $compile_id, $parent, true);
     }
 
     /**
@@ -899,11 +969,9 @@ class Smarty extends Smarty_Internal_TemplateBase
     {
         $this->template_dir = array();
         foreach ((array) $template_dir as $k => $v) {
-            $this->template_dir[$k] = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
+            $this->template_dir[$k] = rtrim($v, '/\\') . DS;
         }
-
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
-
+        $this->joined_template_dir = join(' # ', $this->template_dir);
         return $this;
     }
 
@@ -918,32 +986,8 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function addTemplateDir($template_dir, $key = null)
     {
-        // make sure we're dealing with an array
-        $this->template_dir = (array) $this->template_dir;
-
-        if (is_array($template_dir)) {
-            foreach ($template_dir as $k => $v) {
-                $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->template_dir[] = $v;
-                } else {
-                    // string indexes are overridden
-                    $this->template_dir[$k] = $v;
-                }
-            }
-        } else {
-            $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($template_dir, '/\\')) . DS;
-            if ($key !== null) {
-                // override directory at specified index
-                $this->template_dir[$key] = $v;
-            } else {
-                // append new directory
-                $this->template_dir[] = $v;
-            }
-        }
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
-
+        $this->_addDir('template_dir', $template_dir, $key);
+        $this->joined_template_dir = join(' # ', $this->template_dir);
         return $this;
     }
 
@@ -959,7 +1003,6 @@ class Smarty extends Smarty_Internal_TemplateBase
         if ($index !== null) {
             return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null;
         }
-
         return (array) $this->template_dir;
     }
 
@@ -974,51 +1017,24 @@ class Smarty extends Smarty_Internal_TemplateBase
     {
         $this->config_dir = array();
         foreach ((array) $config_dir as $k => $v) {
-            $this->config_dir[$k] = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
+            $this->config_dir[$k] = rtrim($v, '/\\') . DS;
         }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-
+        $this->joined_config_dir = join(' # ', $this->config_dir);
         return $this;
     }
 
     /**
      * Add config directory(s)
      *
-     * @param string|array        $config_dir directory(s) of config sources
-     * @param mixed $key        key of the array element to assign the config dir to
+     * @param string|array $config_dir directory(s) of config sources
+     * @param mixed        $key        key of the array element to assign the config dir to
      *
      * @return Smarty current Smarty instance for chaining
      */
     public function addConfigDir($config_dir, $key = null)
     {
-        // make sure we're dealing with an array
-        $this->config_dir = (array) $this->config_dir;
-
-        if (is_array($config_dir)) {
-            foreach ($config_dir as $k => $v) {
-                $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->config_dir[] = $v;
-                } else {
-                    // string indexes are overridden
-                    $this->config_dir[$k] = $v;
-                }
-            }
-        } else {
-            $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($config_dir, '/\\')) . DS;
-            if ($key !== null) {
-                // override directory at specified index
-                $this->config_dir[$key] = rtrim($v, '/\\') . DS;
-            } else {
-                // append new directory
-                $this->config_dir[] = rtrim($v, '/\\') . DS;
-            }
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-
+        $this->_addDir('config_dir', $config_dir, $key);
+        $this->joined_config_dir = join(' # ', $this->config_dir);
         return $this;
     }
 
@@ -1034,7 +1050,6 @@ class Smarty extends Smarty_Internal_TemplateBase
         if ($index !== null) {
             return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null;
         }
-
         return (array) $this->config_dir;
     }
 
@@ -1048,10 +1063,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     public function setPluginsDir($plugins_dir)
     {
         $this->plugins_dir = array();
-        foreach ((array) $plugins_dir as $k => $v) {
-            $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-
+        $this->addPluginsDir($plugins_dir);
         return $this;
     }
 
@@ -1066,24 +1078,11 @@ class Smarty extends Smarty_Internal_TemplateBase
     {
         // make sure we're dealing with an array
         $this->plugins_dir = (array) $this->plugins_dir;
-
-        if (is_array($plugins_dir)) {
-            foreach ($plugins_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->plugins_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } else {
-            // append new directory
-            $this->plugins_dir[] = rtrim($plugins_dir, '/\\') . DS;
+        foreach ((array) $plugins_dir as $v) {
+            $this->plugins_dir[] = rtrim($v, '/\\') . DS;
         }
-
         $this->plugins_dir = array_unique($this->plugins_dir);
-
+        $this->_is_file_cache = array();
         return $this;
     }
 
@@ -1137,7 +1136,6 @@ class Smarty extends Smarty_Internal_TemplateBase
         if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
             Smarty::$_muted_directories[$this->cache_dir] = null;
         }
-
         return $this;
     }
 
@@ -1151,6 +1149,39 @@ class Smarty extends Smarty_Internal_TemplateBase
         return $this->cache_dir;
     }
 
+    /**
+     * add directories to given property name
+     *
+     * @param string       $dirName directory property name
+     * @param string|array $dir     directory string or array of strings
+     * @param mixed        $key     optional key
+     */
+    private function _addDir($dirName, $dir, $key = null)
+    {
+        // make sure we're dealing with an array
+        $this->$dirName = (array) $this->$dirName;
+
+        if (is_array($dir)) {
+            foreach ($dir as $k => $v) {
+                if (is_int($k)) {
+                    // indexes are not merged but appended
+                    $this->{$dirName}[] = rtrim($v, '/\\') . DS;
+                } else {
+                    // string indexes are overridden
+                    $this->{$dirName}[$k] = rtrim($v, '/\\') . DS;
+                }
+            }
+        } else {
+            if ($key !== null) {
+                // override directory at specified index
+                $this->{$dirName}[$key] = rtrim($dir, '/\\') . DS;
+            } else {
+                // append new directory
+                $this->{$dirName}[] = rtrim($dir, '/\\') . DS;
+            }
+        }
+    }
+
     /**
      * Set default modifiers
      *
@@ -1197,7 +1228,8 @@ class Smarty extends Smarty_Internal_TemplateBase
      * Set autoload filters
      *
      * @param  array  $filters filters to load automatically
-     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
+     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters'
+     *                         keys as the appropriate types
      *
      * @return Smarty current Smarty instance for chaining
      */
@@ -1216,7 +1248,8 @@ class Smarty extends Smarty_Internal_TemplateBase
      * Add autoload filters
      *
      * @param  array  $filters filters to load automatically
-     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
+     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters'
+     *                         keys as the appropriate types
      *
      * @return Smarty current Smarty instance for chaining
      */
@@ -1246,7 +1279,8 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @param  string $type type of filter to get autoloads for. Defaults to all autoload filters
      *
-     * @return array  array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified
+     * @return array  array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
+     *                was specified
      */
     public function getAutoloadFilters($type = null)
     {
@@ -1308,48 +1342,34 @@ class Smarty extends Smarty_Internal_TemplateBase
         } else {
             $data = null;
         }
-        // default to cache_id and compile_id of Smarty object
-        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
-        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
-        // already in template cache?
-        if ($this->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id;
-        } else {
-            $_templateId = $this->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-        }
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
-        }
-        if ($do_clone) {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
+        $_templateId = $this->getTemplateId($template, $cache_id, $compile_id);
+        if (isset($this->template_objects[$_templateId])) {
+            if ($do_clone) {
                 $tpl = clone $this->template_objects[$_templateId];
                 $tpl->smarty = clone $tpl->smarty;
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
             } else {
-                $tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
+                $tpl = $this->template_objects[$_templateId];
             }
+            $tpl->parent = $parent;
+            $tpl->tpl_vars = array();
+            $tpl->config_vars = array();
         } else {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = $this->template_objects[$_templateId];
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
+            $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
+            if ($do_clone) {
+                $tpl->smarty = clone $tpl->smarty;
             }
+            $tpl->templateId = $_templateId;
         }
         // fill data if present
         if (!empty($data) && is_array($data)) {
             // set up variable values
             foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
+                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
             }
         }
-
+        if ($this->debugging) {
+            Smarty_Internal_Debug::register_template($tpl);
+        }
         return $tpl;
     }
 
@@ -1380,7 +1400,7 @@ class Smarty extends Smarty_Internal_TemplateBase
         // if type is "internal", get plugin from sysplugins
         if (strtolower($_name_parts[1]) == 'internal') {
             $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
-            if (isset(self::$_is_file_cache[$file]) ? self::$_is_file_cache[$file] : self::$_is_file_cache[$file] = is_file($file)) {
+            if (isset($this->_is_file_cache[$file]) ? $this->_is_file_cache[$file] : $this->_is_file_cache[$file] = is_file($file)) {
                 require_once($file);
                 return $file;
             } else {
@@ -1394,12 +1414,9 @@ class Smarty extends Smarty_Internal_TemplateBase
 
         // loop through plugin dirs and find the plugin
         foreach ($this->getPluginsDir() as $_plugin_dir) {
-            $names = array(
-                $_plugin_dir . $_plugin_filename,
-                $_plugin_dir . strtolower($_plugin_filename),
-            );
+            $names = array($_plugin_dir . $_plugin_filename, $_plugin_dir . strtolower($_plugin_filename),);
             foreach ($names as $file) {
-                if (isset(self::$_is_file_cache[$file]) ? self::$_is_file_cache[$file] : self::$_is_file_cache[$file] = is_file($file)) {
+                if (isset($this->_is_file_cache[$file]) ? $this->_is_file_cache[$file] : $this->_is_file_cache[$file] = is_file($file)) {
                     require_once($file);
                     return $file;
                 }
@@ -1488,7 +1505,202 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function testInstall(&$errors = null)
     {
-        return Smarty_Internal_Utility::testInstall($this, $errors);
+        return Smarty_Internal_TestInstall::testInstall($this, $errors);
+    }
+
+    /**
+     * @param boolean $compile_check
+     */
+    public function setCompileCheck($compile_check)
+    {
+        $this->compile_check = $compile_check;
+    }
+
+    /**
+     * @param boolean $use_sub_dirs
+     */
+    public function setUseSubDirs($use_sub_dirs)
+    {
+        $this->use_sub_dirs = $use_sub_dirs;
+    }
+
+    /**
+     * @param boolean $caching
+     */
+    public function setCaching($caching)
+    {
+        $this->caching = $caching;
+    }
+
+    /**
+     * @param int $cache_lifetime
+     */
+    public function setCacheLifetime($cache_lifetime)
+    {
+        $this->cache_lifetime = $cache_lifetime;
+    }
+
+    /**
+     * @param string $compile_id
+     */
+    public function setCompileId($compile_id)
+    {
+        $this->compile_id = $compile_id;
+    }
+
+    /**
+     * @param string $cache_id
+     */
+    public function setCacheId($cache_id)
+    {
+        $this->cache_id = $cache_id;
+    }
+
+    /**
+     * @param int $error_reporting
+     */
+    public function setErrorReporting($error_reporting)
+    {
+        $this->error_reporting = $error_reporting;
+    }
+
+    /**
+     * @param boolean $escape_html
+     */
+    public function setEscapeHtml($escape_html)
+    {
+        $this->escape_html = $escape_html;
+    }
+
+    /**
+     * @param boolean $auto_literal
+     */
+    public function setAutoLiteral($auto_literal)
+    {
+        $this->auto_literal = $auto_literal;
+    }
+
+    /**
+     * @param boolean $force_compile
+     */
+    public function setForceCompile($force_compile)
+    {
+        $this->force_compile = $force_compile;
+    }
+
+    /**
+     * @param boolean $merge_compiled_includes
+     */
+    public function setMergeCompiledIncludes($merge_compiled_includes)
+    {
+        $this->merge_compiled_includes = $merge_compiled_includes;
+    }
+
+    /**
+     * @param string $left_delimiter
+     */
+    public function setLeftDelimiter($left_delimiter)
+    {
+        $this->left_delimiter = $left_delimiter;
+    }
+
+    /**
+     * @param string $right_delimiter
+     */
+    public function setRightDelimiter($right_delimiter)
+    {
+        $this->right_delimiter = $right_delimiter;
+    }
+
+    /**
+     * @param boolean $debugging
+     */
+    public function setDebugging($debugging)
+    {
+        $this->debugging = $debugging;
+    }
+
+    /**
+     * @param boolean $config_overwrite
+     */
+    public function setConfigOverwrite($config_overwrite)
+    {
+        $this->config_overwrite = $config_overwrite;
+    }
+
+    /**
+     * @param boolean $config_booleanize
+     */
+    public function setConfigBooleanize($config_booleanize)
+    {
+        $this->config_booleanize = $config_booleanize;
+    }
+
+    /**
+     * @param boolean $config_read_hidden
+     */
+    public function setConfigReadHidden($config_read_hidden)
+    {
+        $this->config_read_hidden = $config_read_hidden;
+    }
+
+    /**
+     * @param boolean $compile_locking
+     */
+    public function setCompileLocking($compile_locking)
+    {
+        $this->compile_locking = $compile_locking;
+    }
+
+    /**
+     * Class destructor
+     */
+    public function __destruct()
+    {
+        // intentionally left blank
+    }
+
+    /**
+     * <<magic>> Generic getter.
+     * Calls the appropriate getter function.
+     * Issues an E_USER_NOTICE if no valid getter is found.
+     *
+     * @param  string $name property name
+     *
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        $allowed = array('template_dir' => 'getTemplateDir', 'config_dir' => 'getConfigDir',
+                         'plugins_dir'  => 'getPluginsDir', 'compile_dir' => 'getCompileDir',
+                         'cache_dir'    => 'getCacheDir',);
+
+        if (isset($allowed[$name])) {
+            return $this->{$allowed[$name]}();
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        }
+    }
+
+    /**
+     * <<magic>> Generic setter.
+     * Calls the appropriate setter function.
+     * Issues an E_USER_NOTICE if no valid setter is found.
+     *
+     * @param string $name  property name
+     * @param mixed  $value parameter passed to setter
+     */
+    public function __set($name, $value)
+    {
+        $allowed = array('template_dir' => 'setTemplateDir', 'config_dir' => 'setConfigDir',
+                         'plugins_dir'  => 'setPluginsDir', 'compile_dir' => 'setCompileDir',
+                         'cache_dir'    => 'setCacheDir',);
+
+        if (isset($allowed[$name])) {
+            $this->{$allowed[$name]}($value);
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        }
     }
 
     /**
@@ -1512,10 +1724,8 @@ class Smarty extends Smarty_Internal_TemplateBase
         if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) {
             $smarty_dir = realpath(SMARTY_DIR);
             if ($smarty_dir !== false) {
-                Smarty::$_muted_directories[SMARTY_DIR] = array(
-                    'file'   => $smarty_dir,
-                    'length' => strlen($smarty_dir),
-                );
+                Smarty::$_muted_directories[SMARTY_DIR] = array('file'   => $smarty_dir,
+                                                                'length' => strlen($smarty_dir),);
             }
         }
 
@@ -1529,10 +1739,7 @@ class Smarty extends Smarty_Internal_TemplateBase
                     unset(Smarty::$_muted_directories[$key]);
                     continue;
                 }
-                $dir = array(
-                    'file'   => $file,
-                    'length' => strlen($file),
-                );
+                $dir = array('file' => $file, 'length' => strlen($file),);
             }
             if (!strncmp($errfile, $dir['file'], $dir['length'])) {
                 $_is_muted_directory = true;
@@ -1593,88 +1800,3 @@ class Smarty extends Smarty_Internal_TemplateBase
         restore_error_handler();
     }
 }
-
-// Check if we're running on windows
-Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-
-// let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
-if (Smarty::$_CHARSET !== 'UTF-8') {
-    Smarty::$_UTF8_MODIFIER = '';
-}
-
-/**
- * Smarty exception class
- *
- * @package Smarty
- */
-class SmartyException extends Exception
-{
-    public static $escape = false;
-
-    public function __toString()
-    {
-        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
-    }
-}
-
-/**
- * Smarty compiler exception class
- *
- * @package Smarty
- */
-class SmartyCompilerException extends SmartyException
-{
-    public function __toString()
-    {
-        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
-    }
-
-    /**
-     * The line number of the template error
-     *
-     * @type int|null
-     */
-    public $line = null;
-    /**
-     * The template source snippet relating to the error
-     *
-     * @type string|null
-     */
-    public $source = null;
-    /**
-     * The raw text of the error message
-     *
-     * @type string|null
-     */
-    public $desc = null;
-    /**
-     * The resource identifier or template name
-     *
-     * @type string|null
-     */
-    public $template = null;
-}
-
-/**
- * Autoloader
- */
-function smartyAutoload($class)
-{
-    $_class = strtolower($class);
-    static $_classes = array(
-        'smarty_config_source'               => true,
-        'smarty_config_compiled'             => true,
-        'smarty_security'                    => true,
-        'smarty_cacheresource'               => true,
-        'smarty_cacheresource_custom'        => true,
-        'smarty_cacheresource_keyvaluestore' => true,
-        'smarty_resource'                    => true,
-        'smarty_resource_custom'             => true,
-        'smarty_resource_uncompiled'         => true,
-        'smarty_resource_recompiled'         => true,
-    );
-
-    if (!strncmp($_class, 'smarty_internal_', 16) || isset($_classes[$_class])) {
-        include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-    }
-}
-- 
cgit v1.2.3


From 26c465ad0c1d5b6801507ed190430f44ac92c672 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 6 Dec 2015 21:09:58 +0100
Subject: update smarty to 3.1.28-dev which fixes a bug where changes in a
 template are only visible on the second pageload which is annoying for
 developing

---
 library/Smarty/libs/Smarty.class.php | 865 +++++++++++------------------------
 1 file changed, 267 insertions(+), 598 deletions(-)

(limited to 'library/Smarty/libs/Smarty.class.php')

diff --git a/library/Smarty/libs/Smarty.class.php b/library/Smarty/libs/Smarty.class.php
index 1f0f2634a..ac09d0a43 100644
--- a/library/Smarty/libs/Smarty.class.php
+++ b/library/Smarty/libs/Smarty.class.php
@@ -27,7 +27,7 @@
  * @author    Uwe Tews
  * @author    Rodney Rehm
  * @package   Smarty
- * @version   3.1.27
+ * @version   3.1.28-dev
  */
 
 /**
@@ -79,7 +79,7 @@ if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
  */
 if (!class_exists('Smarty_Autoloader', false)) {
     if (!class_exists('Smarty_Internal_Data', true)) {
-        require_once 'Autoloader.php';
+        require_once dirname(__FILE__) . '/Autoloader.php';
         Smarty_Autoloader::registerBC();
     }
 }
@@ -87,20 +87,27 @@ if (!class_exists('Smarty_Autoloader', false)) {
 /**
  * Load always needed external class files
  */
-
 if (!class_exists('Smarty_Internal_Data', false)) {
     require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
 }
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_extension_handler.php';
 require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
 require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
 require_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
 require_once SMARTY_SYSPLUGINS_DIR . 'smarty_variable.php';
 require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_source.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_resource_base.php';
 
 /**
  * This is the main Smarty class
  *
  * @package Smarty
+ *
+ * @method int clearAllCache(int $exp_time = null, string $type = null)
+ * @method int clearCache(string $template_name, string $cache_id = null, string $compile_id = null, int $exp_time = null, string $type = null)
+ * @method int compileAllTemplates(Smarty $smarty, string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, int $max_errors = null)
+ * @method int compileAllConfig(Smarty $smarty, string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, int $max_errors = null)
+ *
  */
 class Smarty extends Smarty_Internal_TemplateBase
 {
@@ -111,18 +118,24 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.27';
+    const SMARTY_VERSION = '3.1.28-dev/77';
 
     /**
      * define variable scopes
      */
     const SCOPE_LOCAL = 0;
 
-    const SCOPE_PARENT = 1;
+    const SCOPE_PARENT = 2;
+
+    const SCOPE_TPL_ROOT = 4;
+
+    const SCOPE_ROOT = 8;
+
+    const SCOPE_SMARTY = 16;
 
-    const SCOPE_ROOT = 2;
+    const SCOPE_GLOBAL = 32;
 
-    const SCOPE_GLOBAL = 3;
+    const SCOPE_BUBBLE_UP = 64;
 
     /**
      * define caching modes
@@ -134,7 +147,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     const CACHING_LIFETIME_SAVED = 2;
 
     /**
-     * define constant for clearing cache files be saved expiration datees
+     * define constant for clearing cache files be saved expiration dates
      */
     const CLEAR_EXPIRED = - 1;
 
@@ -191,6 +204,17 @@ class Smarty extends Smarty_Internal_TemplateBase
 
     const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
 
+    /**
+     * Resource caching modes
+     */
+    const RESOURCE_CACHE_OFF = 0;
+
+    const RESOURCE_CACHE_AUTOMATIC = 1; // cache template objects by rules
+
+    const RESOURCE_CACHE_TEMPLATE = 2; // cache all template objects
+
+    const RESOURCE_CACHE_ON = 4;    // cache source and compiled resources
+
     /**#@-*/
 
     /**
@@ -199,14 +223,14 @@ class Smarty extends Smarty_Internal_TemplateBase
     public static $global_tpl_vars = array();
 
     /**
-     * error handler returned by set_error_hanlder() in Smarty::muteExpectedErrors()
+     * error handler returned by set_error_handler() in Smarty::muteExpectedErrors()
      */
     public static $_previous_error_handler = null;
 
     /**
      * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
      */
-    public static $_muted_directories = array('./templates_c/' => null, './cache/' => null);
+    public static $_muted_directories = array();
 
     /**
      * Flag denoting if Multibyte String functions are available
@@ -239,7 +263,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
 
     /**
-     * auto literal on delimiters with whitspace
+     * auto literal on delimiters with whitespace
      *
      * @var boolean
      */
@@ -253,7 +277,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     public $error_unassigned = false;
 
     /**
-     * look up relative filepaths in include_path
+     * look up relative file path in include_path
      *
      * @var boolean
      */
@@ -271,14 +295,14 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @var string
      */
-    public $joined_template_dir = './templates/';
+    public $_joined_template_dir = null;
 
     /**
      * joined config directory string used in cache keys
      *
      * @var string
      */
-    public $joined_config_dir = './configs/';
+    public $_joined_config_dir = null;
 
     /**
      * default template handler
@@ -364,13 +388,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $merge_compiled_includes = false;
 
-    /**
-     * template inheritance merge compiled includes
-     *
-     * @var boolean
-     */
-    public $inheritance_merge_compiled_includes = true;
-
     /**
      * force cache file creation
      *
@@ -425,16 +442,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $allow_php_templates = false;
 
-    /**
-     * Should compiled-templates be prevented from being called directly?
-     * {@internal
-     * Currently used by Smarty_Internal_Template only.
-     * }}
-     *
-     * @var boolean
-     */
-    public $direct_access_security = true;
-
     /**#@-*/
     /**
      * debug mode
@@ -478,13 +485,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $error_reporting = null;
 
-    /**
-     * Internal flag for getTags()
-     *
-     * @var boolean
-     */
-    public $get_used_tags = false;
-
     /**#@+
      * config var settings
      */
@@ -524,7 +524,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     public $compile_locking = true;
 
     /**
-     * Controls whether cache resources should emply locking mechanism
+     * Controls whether cache resources should use locking mechanism
      *
      * @var boolean
      */
@@ -555,13 +555,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $caching_type = 'file';
 
-    /**
-     * internal config properties
-     *
-     * @var array
-     */
-    public $properties = array();
-
     /**
      * config type
      *
@@ -569,33 +562,12 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $default_config_type = 'file';
 
-    /**
-     * cached template objects
-     *
-     * @var array
-     */
-    public $source_objects = array();
-
-    /**
-     * cached template objects
-     *
-     * @var array
-     */
-    public $template_objects = array();
-
     /**
      * enable resource caching
      *
      * @var bool
      */
-    public $resource_caching = false;
-
-    /**
-     * enable template resource caching
-     *
-     * @var bool
-     */
-    public $template_resource_caching = true;
+    public $resource_cache_mode = 1;
 
     /**
      * check If-Modified-Since headers
@@ -611,13 +583,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $registered_plugins = array();
 
-    /**
-     * plugin search order
-     *
-     * @var array
-     */
-    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
-
     /**
      * registered objects
      *
@@ -646,13 +611,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $registered_resources = array();
 
-    /**
-     * resource handler cache
-     *
-     * @var array
-     */
-    public $_resource_handlers = array();
-
     /**
      * registered cache resources
      *
@@ -660,13 +618,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $registered_cache_resources = array();
 
-    /**
-     * cache resource handler cache
-     *
-     * @var array
-     */
-    public $_cacheresource_handlers = array();
-
     /**
      * autoload filter
      *
@@ -688,13 +639,6 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $escape_html = false;
 
-    /**
-     * global internal smarty vars
-     *
-     * @var array
-     */
-    public static $_smarty_vars = array();
-
     /**
      * start time for execution time calculation
      *
@@ -703,46 +647,45 @@ class Smarty extends Smarty_Internal_TemplateBase
     public $start_time = 0;
 
     /**
-     * default file permissions
-     *
-     * @var int
-     */
-    public $_file_perms = 0644;
-
-    /**
-     * default dir permissions
+     * required by the compiler for BC
      *
-     * @var int
+     * @var string
      */
-    public $_dir_perms = 0771;
+    public $_current_file = null;
 
     /**
-     * block tag hierarchy
+     * internal flag to enable parser debugging
      *
-     * @var array
+     * @var bool
      */
-    public $_tag_stack = array();
+    public $_parserdebug = false;
 
     /**
-     * required by the compiler for BC
+     * This object type (Smarty = 1, template = 2, data = 4)
      *
-     * @var string
+     * @var int
      */
-    public $_current_file = null;
+    public $_objType = 1;
 
     /**
-     * internal flag to enable parser debugging
+     * Debug object
      *
-     * @var bool
+     * @var Smarty_Internal_Debug
      */
-    public $_parserdebug = false;
+    public $_debug = null;
 
     /**
-     * Cache of is_file results of loadPlugin()
+     * removed properties
      *
      * @var array
      */
-    public $_is_file_cache = array();
+    private static $obsoleteProperties = array('resource_caching', 'template_resource_caching',
+                                               'direct_access_security', '_dir_perms', '_file_perms',
+                                               'plugin_search_order', 'inheritance_merge_compiled_includes');
+
+    private static $accessMap = array('template_dir' => 'getTemplateDir', 'config_dir' => 'getConfigDir',
+                                      'plugins_dir'  => 'getPluginsDir', 'compile_dir' => 'getCompileDir',
+                                      'cache_dir'    => 'getCacheDir',);
 
     /**#@-*/
 
@@ -751,30 +694,12 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function __construct()
     {
+        parent::__construct();
         if (is_callable('mb_internal_encoding')) {
             mb_internal_encoding(Smarty::$_CHARSET);
         }
         $this->start_time = microtime(true);
-        // check default dirs for overloading
-        if ($this->template_dir[0] !== './templates/' || isset($this->template_dir[1])) {
-            $this->setTemplateDir($this->template_dir);
-        }
-        if ($this->config_dir[0] !== './configs/' || isset($this->config_dir[1])) {
-            $this->setConfigDir($this->config_dir);
-        }
-        if ($this->compile_dir !== './templates_c/') {
-            unset(self::$_muted_directories['./templates_c/']);
-            $this->setCompileDir($this->compile_dir);
-        }
-        if ($this->cache_dir !== './cache/') {
-            unset(self::$_muted_directories['./cache/']);
-            $this->setCacheDir($this->cache_dir);
-        }
-        if (isset($this->plugins_dir)) {
-            $this->setPluginsDir($this->plugins_dir);
-        } else {
-            $this->setPluginsDir(SMARTY_PLUGINS_DIR);
-        }
+
         if (isset($_SERVER['SCRIPT_NAME'])) {
             Smarty::$global_tpl_vars['SCRIPT_NAME'] = new Smarty_Variable($_SERVER['SCRIPT_NAME']);
         }
@@ -788,52 +713,6 @@ class Smarty extends Smarty_Internal_TemplateBase
         }
     }
 
-    /**
-     * fetches a rendered Smarty template
-     *
-     * @param  string $template         the resource handle of the template file or template object
-     * @param  mixed  $cache_id         cache id to be used with this template
-     * @param  mixed  $compile_id       compile id to be used with this template
-     * @param  object $parent           next higher level of Smarty variables
-     * @param  bool   $display          true: display, false: fetch
-     * @param  bool   $merge_tpl_vars   not used - left for BC
-     * @param  bool   $no_output_filter not used - left for BC
-     *
-     * @throws Exception
-     * @throws SmartyException
-     * @return string rendered template output
-     */
-    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)
-    {
-        if ($cache_id !== null && is_object($cache_id)) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if ($parent === null) {
-            $parent = $this;
-        }
-        // get template object
-        $_template = is_object($template) ? $template : $this->createTemplate($template, $cache_id, $compile_id, $parent, false);
-        // set caching in template object
-        $_template->caching = $this->caching;
-        // fetch template content
-        return $_template->render(true, false, $display);
-    }
-
-    /**
-     * displays a Smarty template
-     *
-     * @param string $template   the resource handle of the template file or template object
-     * @param mixed  $cache_id   cache id to be used with this template
-     * @param mixed  $compile_id compile id to be used with this template
-     * @param object $parent     next higher level of Smarty variables
-     */
-    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
-    {
-        // display template
-        $this->fetch($template, $cache_id, $compile_id, $parent, true);
-    }
-
     /**
      * Check if a template resource exists
      *
@@ -843,14 +722,9 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function templateExists($resource_name)
     {
-        // create template object
-        $save = $this->template_objects;
-        $tpl = new $this->template_class($resource_name, $this);
-        // check if it does exists
-        $result = $tpl->source->exists;
-        $this->template_objects = $save;
-
-        return $result;
+        // create source object
+        $source = Smarty_Template_Source::load(null, $this, $resource_name);
+        return $source->exists;
     }
 
     /**
@@ -878,43 +752,6 @@ class Smarty extends Smarty_Internal_TemplateBase
         }
     }
 
-    /**
-     * Empty cache folder
-     *
-     * @param  integer $exp_time expiration time
-     * @param  string  $type     resource type
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearAllCache($exp_time = null, $type = null)
-    {
-        // load cache resource and call clearAll
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-
-        return $_cache_resource->clearAll($this, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param  string  $template_name template name
-     * @param  string  $cache_id      cache id
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
-     * @param  string  $type          resource type
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
-    {
-        // load cache resource and call clear
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-
-        return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
-    }
-
     /**
      * Loads security class and enables security
      *
@@ -925,24 +762,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function enableSecurity($security_class = null)
     {
-        if ($security_class instanceof Smarty_Security) {
-            $this->security_policy = $security_class;
-
-            return $this;
-        } elseif (is_object($security_class)) {
-            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
-        }
-        if ($security_class == null) {
-            $security_class = $this->security_class;
-        }
-        if (!class_exists($security_class)) {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
-            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
-        } else {
-            $this->security_policy = new $security_class($this);
-        }
-
+        Smarty_Security::enableSecurity($this, $security_class);
         return $this;
     }
 
@@ -962,16 +782,18 @@ class Smarty extends Smarty_Internal_TemplateBase
      * Set template directory
      *
      * @param  string|array $template_dir directory(s) of template sources
+     * @param bool          $isConfig     true for config_dir
      *
-     * @return Smarty       current Smarty instance for chaining
+     * @return \Smarty current Smarty instance for chaining
      */
-    public function setTemplateDir($template_dir)
+    public function setTemplateDir($template_dir, $isConfig = false)
     {
-        $this->template_dir = array();
-        foreach ((array) $template_dir as $k => $v) {
-            $this->template_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-        $this->joined_template_dir = join(' # ', $this->template_dir);
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        $joined = '_joined_' . $type;
+        $this->{$type} = (array) $template_dir;
+        $this->{$joined} = join(' # ', $this->{$type});
+        $this->_cache[$type . '_new'] = true;
+        $this->_cache[$type] = false;
         return $this;
     }
 
@@ -980,30 +802,53 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @param  string|array $template_dir directory(s) of template sources
      * @param  string       $key          of the array element to assign the template dir to
+     * @param bool          $isConfig     true for config_dir
      *
      * @return Smarty          current Smarty instance for chaining
-     * @throws SmartyException when the given template directory is not valid
      */
-    public function addTemplateDir($template_dir, $key = null)
+    public function addTemplateDir($template_dir, $key = null, $isConfig = false)
     {
-        $this->_addDir('template_dir', $template_dir, $key);
-        $this->joined_template_dir = join(' # ', $this->template_dir);
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        $joined = '_joined_' . $type;
+        if (!isset($this->_cache[$type])) {
+            $this->{$type} = (array) $this->{$type};
+            $this->{$joined} = join(' # ', $this->{$type});
+            $this->_cache[$type . '_new'] = true;
+            $this->_cache[$type] = false;
+        }
+        $this->{$joined} .= ' # ' . join(' # ', (array) $template_dir);
+        $this->_addDir($type, $template_dir, $key);
         return $this;
     }
 
     /**
      * Get template directories
      *
-     * @param mixed $index index of directory to get, null to get all
+     * @param mixed $index    index of directory to get, null to get all
+     * @param bool  $isConfig true for config_dir
      *
-     * @return array|string list of template directories, or directory of $index
+     * @return array list of template directories, or directory of $index
      */
-    public function getTemplateDir($index = null)
+    public function getTemplateDir($index = null, $isConfig = false)
     {
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        if (!isset($this->_cache[$type])) {
+            $joined = '_joined_' . $type;
+            $this->{$type} = (array) $this->{$type};
+            $this->{$joined} = join(' # ', $this->{$type});
+            $this->_cache[$type] = false;
+        }
+        if ($this->_cache[$type] == false) {
+            foreach ($this->{$type} as $k => $v) {
+                $this->{$type}[$k] = $this->_realpath($v . DS, true);
+            }
+            $this->_cache[$type . '_new'] = true;
+            $this->_cache[$type] = true;
+        }
         if ($index !== null) {
-            return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null;
+            return isset($this->{$type}[$index]) ? $this->{$type}[$index] : null;
         }
-        return (array) $this->template_dir;
+        return $this->{$type};
     }
 
     /**
@@ -1015,12 +860,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function setConfigDir($config_dir)
     {
-        $this->config_dir = array();
-        foreach ((array) $config_dir as $k => $v) {
-            $this->config_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-        $this->joined_config_dir = join(' # ', $this->config_dir);
-        return $this;
+        return $this->setTemplateDir($config_dir, true);
     }
 
     /**
@@ -1033,9 +873,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function addConfigDir($config_dir, $key = null)
     {
-        $this->_addDir('config_dir', $config_dir, $key);
-        $this->joined_config_dir = join(' # ', $this->config_dir);
-        return $this;
+        return $this->addTemplateDir($config_dir, $key, true);
     }
 
     /**
@@ -1043,14 +881,11 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @param mixed $index index of directory to get, null to get all
      *
-     * @return array|string configuration directory
+     * @return array configuration directory
      */
     public function getConfigDir($index = null)
     {
-        if ($index !== null) {
-            return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null;
-        }
-        return (array) $this->config_dir;
+        return $this->getTemplateDir($index, true);
     }
 
     /**
@@ -1062,8 +897,10 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function setPluginsDir($plugins_dir)
     {
-        $this->plugins_dir = array();
-        $this->addPluginsDir($plugins_dir);
+        $this->plugins_dir = (array) $plugins_dir;
+        if (isset($this->_cache['plugins_dir'])) {
+            unset($this->_cache['plugins_dir']);
+        }
         return $this;
     }
 
@@ -1076,13 +913,13 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function addPluginsDir($plugins_dir)
     {
-        // make sure we're dealing with an array
-        $this->plugins_dir = (array) $this->plugins_dir;
-        foreach ((array) $plugins_dir as $v) {
-            $this->plugins_dir[] = rtrim($v, '/\\') . DS;
+        if (!isset($this->plugins_dir)) {
+            $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
+        }
+        $this->plugins_dir = array_merge((array) $this->plugins_dir, (array) $plugins_dir);
+        if (isset($this->_cache['plugins_dir'])) {
+            unset($this->_cache['plugins_dir']);
         }
-        $this->plugins_dir = array_unique($this->plugins_dir);
-        $this->_is_file_cache = array();
         return $this;
     }
 
@@ -1093,7 +930,21 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function getPluginsDir()
     {
-        return (array) $this->plugins_dir;
+        if (!isset($this->_cache['plugins_dir'])) {
+            if (!isset($this->plugins_dir)) {
+                $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
+            } else {
+                $plugins_dir = (array) $this->plugins_dir;
+                $this->plugins_dir = array();
+                foreach ($plugins_dir as $v) {
+                    $this->plugins_dir[] = $this->_realpath($v . DS, true);
+                }
+                $this->plugins_dir = array_unique($this->plugins_dir);
+            }
+            $this->_cache['plugin_files'] = array();
+            $this->_cache['plugins_dir'] = true;
+        }
+        return $this->plugins_dir;
     }
 
     /**
@@ -1105,11 +956,11 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function setCompileDir($compile_dir)
     {
-        $this->compile_dir = rtrim($compile_dir, '/\\') . DS;
+        $this->compile_dir = $this->_realpath($compile_dir . DS, true);
         if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
             Smarty::$_muted_directories[$this->compile_dir] = null;
         }
-
+        $this->_cache['compile_dir'] = true;
         return $this;
     }
 
@@ -1120,6 +971,13 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function getCompileDir()
     {
+        if (!isset($this->_cache['compile_dir'])) {
+            $this->compile_dir = $this->_realpath($this->compile_dir . DS, true);
+            if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
+                Smarty::$_muted_directories[$this->compile_dir] = null;
+            }
+            $this->_cache['compile_dir'] = true;
+        }
         return $this->compile_dir;
     }
 
@@ -1132,10 +990,11 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function setCacheDir($cache_dir)
     {
-        $this->cache_dir = rtrim($cache_dir, '/\\') . DS;
+        $this->cache_dir = $this->_realpath($cache_dir . DS, true);
         if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
             Smarty::$_muted_directories[$this->cache_dir] = null;
         }
+        $this->_cache['cache_dir'] = true;
         return $this;
     }
 
@@ -1146,6 +1005,13 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function getCacheDir()
     {
+        if (!isset($this->_cache['cache_dir'])) {
+            $this->cache_dir = $this->_realpath($this->cache_dir . DS, true);
+            if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
+                Smarty::$_muted_directories[$this->cache_dir] = null;
+            }
+            $this->_cache['cache_dir'] = true;
+        }
         return $this->cache_dir;
     }
 
@@ -1158,165 +1024,28 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     private function _addDir($dirName, $dir, $key = null)
     {
-        // make sure we're dealing with an array
-        $this->$dirName = (array) $this->$dirName;
-
+        $rp = $this->_cache[$dirName];
         if (is_array($dir)) {
             foreach ($dir as $k => $v) {
+                $path = $rp ? $this->_realpath($v . DS, true) : $v;
                 if (is_int($k)) {
                     // indexes are not merged but appended
-                    $this->{$dirName}[] = rtrim($v, '/\\') . DS;
+                    $this->{$dirName}[] = $path;
                 } else {
                     // string indexes are overridden
-                    $this->{$dirName}[$k] = rtrim($v, '/\\') . DS;
+                    $this->{$dirName}[$k] = $path;
                 }
             }
         } else {
+            $path = $rp ? $this->_realpath($dir . DS, true) : $dir;
             if ($key !== null) {
                 // override directory at specified index
-                $this->{$dirName}[$key] = rtrim($dir, '/\\') . DS;
+                $this->{$dirName}[$key] = $path;
             } else {
                 // append new directory
-                $this->{$dirName}[] = rtrim($dir, '/\\') . DS;
-            }
-        }
-    }
-
-    /**
-     * Set default modifiers
-     *
-     * @param  array|string $modifiers modifier or list of modifiers to set
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setDefaultModifiers($modifiers)
-    {
-        $this->default_modifiers = (array) $modifiers;
-
-        return $this;
-    }
-
-    /**
-     * Add default modifiers
-     *
-     * @param  array|string $modifiers modifier or list of modifiers to add
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function addDefaultModifiers($modifiers)
-    {
-        if (is_array($modifiers)) {
-            $this->default_modifiers = array_merge($this->default_modifiers, $modifiers);
-        } else {
-            $this->default_modifiers[] = $modifiers;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get default modifiers
-     *
-     * @return array list of default modifiers
-     */
-    public function getDefaultModifiers()
-    {
-        return $this->default_modifiers;
-    }
-
-    /**
-     * Set autoload filters
-     *
-     * @param  array  $filters filters to load automatically
-     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters'
-     *                         keys as the appropriate types
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setAutoloadFilters($filters, $type = null)
-    {
-        if ($type !== null) {
-            $this->autoload_filters[$type] = (array) $filters;
-        } else {
-            $this->autoload_filters = (array) $filters;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add autoload filters
-     *
-     * @param  array  $filters filters to load automatically
-     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters'
-     *                         keys as the appropriate types
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addAutoloadFilters($filters, $type = null)
-    {
-        if ($type !== null) {
-            if (!empty($this->autoload_filters[$type])) {
-                $this->autoload_filters[$type] = array_merge($this->autoload_filters[$type], (array) $filters);
-            } else {
-                $this->autoload_filters[$type] = (array) $filters;
-            }
-        } else {
-            foreach ((array) $filters as $key => $value) {
-                if (!empty($this->autoload_filters[$key])) {
-                    $this->autoload_filters[$key] = array_merge($this->autoload_filters[$key], (array) $value);
-                } else {
-                    $this->autoload_filters[$key] = (array) $value;
-                }
+                $this->{$dirName}[] = $path;
             }
         }
-
-        return $this;
-    }
-
-    /**
-     * Get autoload filters
-     *
-     * @param  string $type type of filter to get autoloads for. Defaults to all autoload filters
-     *
-     * @return array  array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
-     *                was specified
-     */
-    public function getAutoloadFilters($type = null)
-    {
-        if ($type !== null) {
-            return isset($this->autoload_filters[$type]) ? $this->autoload_filters[$type] : array();
-        }
-
-        return $this->autoload_filters;
-    }
-
-    /**
-     * return name of debugging template
-     *
-     * @return string
-     */
-    public function getDebugTemplate()
-    {
-        return $this->debug_tpl;
-    }
-
-    /**
-     * set the debug template
-     *
-     * @param  string $tpl_name
-     *
-     * @return Smarty          current Smarty instance for chaining
-     * @throws SmartyException if file is not readable
-     */
-    public function setDebugTemplate($tpl_name)
-    {
-        if (!is_readable($tpl_name)) {
-            throw new SmartyException("Unknown file '{$tpl_name}'");
-        }
-        $this->debug_tpl = $tpl_name;
-
-        return $this;
     }
 
     /**
@@ -1342,23 +1071,21 @@ class Smarty extends Smarty_Internal_TemplateBase
         } else {
             $data = null;
         }
-        $_templateId = $this->getTemplateId($template, $cache_id, $compile_id);
-        if (isset($this->template_objects[$_templateId])) {
-            if ($do_clone) {
-                $tpl = clone $this->template_objects[$_templateId];
-                $tpl->smarty = clone $tpl->smarty;
-            } else {
-                $tpl = $this->template_objects[$_templateId];
-            }
+        if ($this->caching &&
+            isset($this->_cache['isCached'][$_templateId = $this->_getTemplateId($template, $cache_id, $compile_id)])
+        ) {
+            $tpl = $do_clone ? clone $this->_cache['isCached'][$_templateId] : $this->_cache['isCached'][$_templateId];
             $tpl->parent = $parent;
             $tpl->tpl_vars = array();
             $tpl->config_vars = array();
         } else {
-            $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
-            if ($do_clone) {
-                $tpl->smarty = clone $tpl->smarty;
-            }
-            $tpl->templateId = $_templateId;
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id, null, null);
+        }
+        if ($do_clone) {
+            $tpl->smarty = clone $tpl->smarty;
+        } elseif ($parent === null) {
+            $tpl->parent = $this;
         }
         // fill data if present
         if (!empty($data) && is_array($data)) {
@@ -1368,7 +1095,7 @@ class Smarty extends Smarty_Internal_TemplateBase
             }
         }
         if ($this->debugging) {
-            Smarty_Internal_Debug::register_template($tpl);
+            $tpl->smarty->_debug = new Smarty_Internal_Debug();
         }
         return $tpl;
     }
@@ -1386,126 +1113,72 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function loadPlugin($plugin_name, $check = true)
     {
-        // if function or class exists, exit silently (already loaded)
-        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
-            return true;
-        }
-        // Plugin name is expected to be: Smarty_[Type]_[Name]
-        $_name_parts = explode('_', $plugin_name, 3);
-        // class name must have three parts to be valid plugin
-        // count($_name_parts) < 3 === !isset($_name_parts[2])
-        if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') {
-            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
-        }
-        // if type is "internal", get plugin from sysplugins
-        if (strtolower($_name_parts[1]) == 'internal') {
-            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
-            if (isset($this->_is_file_cache[$file]) ? $this->_is_file_cache[$file] : $this->_is_file_cache[$file] = is_file($file)) {
-                require_once($file);
-                return $file;
-            } else {
-                return false;
-            }
-        }
-        // plugin filename is expected to be: [type].[name].php
-        $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php";
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // loop through plugin dirs and find the plugin
-        foreach ($this->getPluginsDir() as $_plugin_dir) {
-            $names = array($_plugin_dir . $_plugin_filename, $_plugin_dir . strtolower($_plugin_filename),);
-            foreach ($names as $file) {
-                if (isset($this->_is_file_cache[$file]) ? $this->_is_file_cache[$file] : $this->_is_file_cache[$file] = is_file($file)) {
-                    require_once($file);
-                    return $file;
-                }
-                if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $file = stream_resolve_include_path($file);
-                    } else {
-                        $file = Smarty_Internal_Get_Include_Path::getIncludePath($file);
-                    }
-
-                    if ($file !== false) {
-                        require_once($file);
-
-                        return $file;
-                    }
-                }
-            }
-        }
-        // no plugin loaded
-        return false;
+        return $this->ext->loadPlugin->loadPlugin($this, $plugin_name, $check);
     }
 
     /**
-     * Compile all template files
+     * Get unique template id
      *
-     * @param  string $extension     file extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit
-     * @param  int    $max_errors
+     * @param string     $template_name
+     * @param null|mixed $cache_id
+     * @param null|mixed $compile_id
+     * @param null       $caching
      *
-     * @return integer number of template files recompiled
-     */
-    public function compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
-    {
-        return Smarty_Internal_Utility::compileAllTemplates($extension, $force_compile, $time_limit, $max_errors, $this);
-    }
-
-    /**
-     * Compile all config files
-     *
-     * @param  string $extension     file extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit
-     * @param  int    $max_errors
-     *
-     * @return integer number of template files recompiled
+     * @return string
      */
-    public function compileAllConfig($extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
+    public function _getTemplateId($template_name, $cache_id = null, $compile_id = null, $caching = null)
     {
-        return Smarty_Internal_Utility::compileAllConfig($extension, $force_compile, $time_limit, $max_errors, $this);
-    }
+        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
+        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
+        $caching = (int) ($caching === null ? $this->caching : $caching);
 
-    /**
-     * Delete compiled template file
-     *
-     * @param  string  $resource_name template name
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
-     *
-     * @return integer number of template files deleted
-     */
-    public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
-    {
-        return Smarty_Internal_Utility::clearCompiledTemplate($resource_name, $compile_id, $exp_time, $this);
+        if ($this->allow_ambiguous_resources) {
+            $_templateId =
+                Smarty_Resource::getUniqueTemplateName($this, $template_name) . "#{$cache_id}#{$compile_id}#{$caching}";
+        } else {
+            $_templateId = $this->_joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}#{$caching}";
+        }
+        if (isset($_templateId[150])) {
+            $_templateId = sha1($_templateId);
+        }
+        return $_templateId;
     }
 
     /**
-     * Return array of tag/attributes of all tags used by an template
+     * Normalize path
+     *  - remove /./ and /../
+     *  - make it absolute if required
      *
-     * @param Smarty_Internal_Template $template
+     * @param string $path     file path
+     * @param bool   $realpath leave $path relative
      *
-     * @return array  of tag/attributes
+     * @return string
      */
-    public function getTags(Smarty_Internal_Template $template)
+    public function _realpath($path, $realpath = null)
     {
-        return Smarty_Internal_Utility::getTags($template);
-    }
+        static $pattern = null;
+        static $nds = null;
+        if ($pattern == null) {
+            $nds = DS == '/' ? '\\' : '/';
+            $ds = '\\' . DS;
+            $pattern =
+                "#([{$ds}]+[^{$ds}]+[{$ds}]+[.]([{$ds}]+[.])*[.][{$ds}]+([.][{$ds}]+)*)|([{$ds}]+([.][{$ds}]+)+)|[{$ds}]{2,}#";
+        }
+        // normalize DS
+        if (strpos($path, $nds) !== false) {
+            $path = str_replace($nds, DS, $path);
+        }
 
-    /**
-     * Run installation test
-     *
-     * @param  array $errors Array to write errors into, rather than outputting them
-     *
-     * @return boolean true if setup is fine, false if something is wrong
-     */
-    public function testInstall(&$errors = null)
-    {
-        return Smarty_Internal_TestInstall::testInstall($this, $errors);
+        if ($realpath === true && $path[0] !== '/' && $path[1] !== ':') {
+            $path = getcwd() . DS . $path;
+        }
+        while ((strpos($path, '.' . DS) !== false) || (strpos($path, DS . DS) !== false)) {
+            $path = preg_replace($pattern, DS, $path);
+        }
+        if ($realpath === false && ($path[0] == '/' || $path[1] == ':')) {
+            $path = str_ireplace(getcwd(), '.', $path);
+        }
+        return $path;
     }
 
     /**
@@ -1524,38 +1197,6 @@ class Smarty extends Smarty_Internal_TemplateBase
         $this->use_sub_dirs = $use_sub_dirs;
     }
 
-    /**
-     * @param boolean $caching
-     */
-    public function setCaching($caching)
-    {
-        $this->caching = $caching;
-    }
-
-    /**
-     * @param int $cache_lifetime
-     */
-    public function setCacheLifetime($cache_lifetime)
-    {
-        $this->cache_lifetime = $cache_lifetime;
-    }
-
-    /**
-     * @param string $compile_id
-     */
-    public function setCompileId($compile_id)
-    {
-        $this->compile_id = $compile_id;
-    }
-
-    /**
-     * @param string $cache_id
-     */
-    public function setCacheId($cache_id)
-    {
-        $this->cache_id = $cache_id;
-    }
-
     /**
      * @param int $error_reporting
      */
@@ -1652,12 +1293,38 @@ class Smarty extends Smarty_Internal_TemplateBase
         $this->compile_locking = $compile_locking;
     }
 
+    /**
+     * @param string $default_resource_type
+     */
+    public function setDefaultResourceType($default_resource_type)
+    {
+        $this->default_resource_type = $default_resource_type;
+    }
+
+    /**
+     * @param string $caching_type
+     */
+    public function setCachingType($caching_type)
+    {
+        $this->caching_type = $caching_type;
+    }
+
+    /**
+     * Test install
+     *
+     * @param null $errors
+     */
+    public function testInstall(&$errors = null)
+    {
+        Smarty_Internal_TestInstall::testInstall($this, $errors);
+    }
+
     /**
      * Class destructor
      */
     public function __destruct()
     {
-        // intentionally left blank
+        $i = 0;// intentionally left blank
     }
 
     /**
@@ -1671,12 +1338,11 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function __get($name)
     {
-        $allowed = array('template_dir' => 'getTemplateDir', 'config_dir' => 'getConfigDir',
-                         'plugins_dir'  => 'getPluginsDir', 'compile_dir' => 'getCompileDir',
-                         'cache_dir'    => 'getCacheDir',);
 
-        if (isset($allowed[$name])) {
-            return $this->{$allowed[$name]}();
+        if (isset(self::$accessMap[$name])) {
+            return $this->{self::$accessMap[$name]}();
+        } elseif (in_array($name, self::$obsoleteProperties)) {
+            return null;
         } else {
             trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
         }
@@ -1692,14 +1358,16 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function __set($name, $value)
     {
-        $allowed = array('template_dir' => 'setTemplateDir', 'config_dir' => 'setConfigDir',
-                         'plugins_dir'  => 'setPluginsDir', 'compile_dir' => 'setCompileDir',
-                         'cache_dir'    => 'setCacheDir',);
-
-        if (isset($allowed[$name])) {
-            $this->{$allowed[$name]}($value);
+        if (isset(self::$accessMap[$name])) {
+            $this->{self::$accessMap[$name]}($value);
+        } elseif (in_array($name, self::$obsoleteProperties)) {
+            return;
         } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+            if (is_object($value) && method_exists($value, $name)) {
+                $this->$name = $value;
+            } else {
+                trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+            }
         }
     }
 
@@ -1724,8 +1392,8 @@ class Smarty extends Smarty_Internal_TemplateBase
         if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) {
             $smarty_dir = realpath(SMARTY_DIR);
             if ($smarty_dir !== false) {
-                Smarty::$_muted_directories[SMARTY_DIR] = array('file'   => $smarty_dir,
-                                                                'length' => strlen($smarty_dir),);
+                Smarty::$_muted_directories[SMARTY_DIR] =
+                    array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
             }
         }
 
@@ -1751,7 +1419,8 @@ class Smarty extends Smarty_Internal_TemplateBase
         // or the error was within smarty but masked to be ignored
         if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
             if (Smarty::$_previous_error_handler) {
-                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline, $errcontext);
+                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline,
+                                      $errcontext);
             } else {
                 return false;
             }
-- 
cgit v1.2.3