aboutsummaryrefslogtreecommitdiffstats
path: root/library/Smarty/libs/Smarty.class.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-12-06 20:12:05 +0100
committerMario Vavti <mario@mariovavti.com>2015-12-06 20:12:05 +0100
commitc23ce16cafb826c8bb4fe7aaf2a5525b29052b23 (patch)
tree2230b03cfa6b74f3898b57bee647bc6276fd5a53 /library/Smarty/libs/Smarty.class.php
parent78a70fed2f7cf9a53e6e4fab516b00cece12fbf0 (diff)
downloadvolse-hubzilla-c23ce16cafb826c8bb4fe7aaf2a5525b29052b23.tar.gz
volse-hubzilla-c23ce16cafb826c8bb4fe7aaf2a5525b29052b23.tar.bz2
volse-hubzilla-c23ce16cafb826c8bb4fe7aaf2a5525b29052b23.zip
update smarty library - seems to bring some performance improvement
Diffstat (limited to 'library/Smarty/libs/Smarty.class.php')
-rw-r--r--library/Smarty/libs/Smarty.class.php840
1 files changed, 481 insertions, 359 deletions
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
*
@@ -493,18 +540,13 @@ 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.
*
* @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;
}
@@ -1152,6 +1150,39 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
+ * 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
*
* @param array|string $modifiers modifier or list of modifiers to set
@@ -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';
- }
-}