summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2018-10-18 02:40:38 +0200
committeremkael <emkael@tlen.pl>2018-10-18 02:40:38 +0200
commiteab8a101e7a3fcbb41e01a574985e06c5a3775de (patch)
tree60f201da5984b0c3638d10da02bba42b61aa3177
parent7f38be342c1495aeca418286c15c25c18ac9e142 (diff)
Updating Smarty
-rw-r--r--lib/smarty3/Autoloader.php41
-rw-r--r--lib/smarty3/Smarty.class.php776
-rw-r--r--lib/smarty3/SmartyBC.class.php68
-rw-r--r--lib/smarty3/bootstrap.php16
-rw-r--r--lib/smarty3/debug.tpl6
-rw-r--r--lib/smarty3/plugins/block.textformat.php57
-rw-r--r--lib/smarty3/plugins/function.counter.php21
-rw-r--r--lib/smarty3/plugins/function.cycle.php53
-rw-r--r--lib/smarty3/plugins/function.fetch.php69
-rw-r--r--lib/smarty3/plugins/function.html_checkboxes.php213
-rw-r--r--lib/smarty3/plugins/function.html_image.php64
-rw-r--r--lib/smarty3/plugins/function.html_options.php142
-rw-r--r--lib/smarty3/plugins/function.html_radios.php186
-rw-r--r--lib/smarty3/plugins/function.html_select_date.php171
-rw-r--r--lib/smarty3/plugins/function.html_select_time.php168
-rw-r--r--lib/smarty3/plugins/function.html_table.php72
-rw-r--r--lib/smarty3/plugins/function.mailto.php62
-rw-r--r--lib/smarty3/plugins/function.math.php78
-rw-r--r--lib/smarty3/plugins/modifier.capitalize.php82
-rw-r--r--lib/smarty3/plugins/modifier.date_format.php46
-rw-r--r--lib/smarty3/plugins/modifier.debug_print_var.php51
-rw-r--r--lib/smarty3/plugins/modifier.escape.php145
-rw-r--r--lib/smarty3/plugins/modifier.mb_wordwrap.php71
-rw-r--r--lib/smarty3/plugins/modifier.regex_replace.php15
-rw-r--r--lib/smarty3/plugins/modifier.replace.php15
-rw-r--r--lib/smarty3/plugins/modifier.spacify.php7
-rw-r--r--lib/smarty3/plugins/modifier.truncate.php24
-rw-r--r--lib/smarty3/plugins/modifiercompiler.cat.php15
-rw-r--r--lib/smarty3/plugins/modifiercompiler.count_characters.php10
-rw-r--r--lib/smarty3/plugins/modifiercompiler.count_paragraphs.php9
-rw-r--r--lib/smarty3/plugins/modifiercompiler.count_sentences.php7
-rw-r--r--lib/smarty3/plugins/modifiercompiler.count_words.php5
-rw-r--r--lib/smarty3/plugins/modifiercompiler.default.php7
-rw-r--r--lib/smarty3/plugins/modifiercompiler.escape.php53
-rw-r--r--lib/smarty3/plugins/modifiercompiler.from_charset.php7
-rw-r--r--lib/smarty3/plugins/modifiercompiler.indent.php7
-rw-r--r--lib/smarty3/plugins/modifiercompiler.lower.php6
-rw-r--r--lib/smarty3/plugins/modifiercompiler.noprint.php7
-rw-r--r--lib/smarty3/plugins/modifiercompiler.string_format.php5
-rw-r--r--lib/smarty3/plugins/modifiercompiler.strip.php11
-rw-r--r--lib/smarty3/plugins/modifiercompiler.strip_tags.php7
-rw-r--r--lib/smarty3/plugins/modifiercompiler.to_charset.php7
-rw-r--r--lib/smarty3/plugins/modifiercompiler.unescape.php12
-rw-r--r--lib/smarty3/plugins/modifiercompiler.upper.php5
-rw-r--r--lib/smarty3/plugins/modifiercompiler.wordwrap.php26
-rw-r--r--lib/smarty3/plugins/outputfilter.trimwhitespace.php48
-rw-r--r--lib/smarty3/plugins/shared.escape_special_chars.php8
-rw-r--r--lib/smarty3/plugins/shared.literal_compiler_param.php9
-rw-r--r--lib/smarty3/plugins/shared.make_timestamp.php28
-rw-r--r--lib/smarty3/plugins/shared.mb_str_replace.php12
-rw-r--r--lib/smarty3/plugins/shared.mb_unicode.php15
-rw-r--r--lib/smarty3/plugins/variablefilter.htmlspecialchars.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_cacheresource.php19
-rw-r--r--lib/smarty3/sysplugins/smarty_cacheresource_custom.php128
-rw-r--r--lib/smarty3/sysplugins/smarty_cacheresource_keyvaluestore.php217
-rw-r--r--lib/smarty3/sysplugins/smarty_data.php8
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_block.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_cacheresource_file.php51
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_append.php5
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_assign.php22
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_block.php146
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_block_child.php24
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_block_parent.php31
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_break.php70
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_call.php12
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_capture.php39
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_child.php79
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_config_load.php16
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_continue.php60
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_debug.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_eval.php12
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_extends.php64
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_for.php42
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_foreach.php89
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_function.php123
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_if.php91
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_include.php98
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_include_php.php19
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_insert.php33
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_ldelim.php5
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_make_nocache.php10
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_nocache.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_parent.php31
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_block_plugin.php51
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_foreachsection.php87
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_function_plugin.php28
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_modifier.php69
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_object_block_function.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_object_function.php27
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_php.php129
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_print_expression.php81
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_registered_block.php8
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_registered_function.php45
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_private_special_variable.php36
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_rdelim.php12
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_section.php181
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_setfilter.php8
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_shared_inheritance.php29
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compile_while.php34
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_compilebase.php47
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_config_file_compiler.php54
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_configfilelexer.php625
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_configfileparser.php1122
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_data.php117
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_debug.php73
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_errorhandler.php113
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_extension_handler.php174
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_addautoloadfilters.php27
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_adddefaultmodifiers.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_append.php20
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_appendbyref.php13
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_assignbyref.php10
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_assignglobal.php13
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_clearallassign.php3
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_clearallcache.php11
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_clearassign.php5
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_clearcache.php28
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_clearcompiledtemplate.php75
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_clearconfig.php4
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_compileallconfig.php23
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_compilealltemplates.php69
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_configload.php56
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_createdata.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_getautoloadfilters.php10
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_getconfigvariable.php34
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_getconfigvars.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_getdebugtemplate.php4
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_getdefaultmodifiers.php4
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_getglobal.php10
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_getregisteredobject.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_getstreamvariable.php5
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_gettags.php13
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_gettemplatevars.php39
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_literals.php100
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_loadfilter.php12
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_loadplugin.php14
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_mustcompile.php7
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_registercacheresource.php14
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_registerclass.php8
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_registerdefaultconfighandler.php10
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php30
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_registerfilter.php17
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_registerobject.php44
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_registerplugin.php31
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_registerresource.php16
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_setautoloadfilters.php24
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_setdebugtemplate.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_setdefaultmodifiers.php8
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_unloadfilter.php13
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_unregistercacheresource.php8
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_unregisterfilter.php9
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_unregisterobject.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_unregisterplugin.php8
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_method_unregisterresource.php6
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_nocache_insert.php22
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_parsetree.php8
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_parsetree_code.php2
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_parsetree_dq.php24
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_parsetree_tag.php4
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_parsetree_template.php33
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_resource_eval.php17
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_resource_extends.php12
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_resource_file.php170
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_resource_php.php81
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_resource_registered.php28
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_resource_stream.php8
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_resource_string.php21
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_cachemodify.php14
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_cacheresourcefile.php139
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_capture.php39
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_codeframe.php94
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_filterhandler.php12
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_foreach.php119
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_getincludepath.php21
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_inheritance.php81
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_make_nocache.php14
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_tplfunction.php86
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_updatecache.php152
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_updatescope.php36
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_runtime_writefile.php29
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_smartytemplatecompiler.php34
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_template.php296
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_templatebase.php164
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_templatecompilerbase.php1257
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_templatelexer.php1100
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_templateparser.php5422
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_testinstall.php396
-rw-r--r--lib/smarty3/sysplugins/smarty_internal_undefined.php40
-rw-r--r--lib/smarty3/sysplugins/smarty_resource.php230
-rw-r--r--lib/smarty3/sysplugins/smarty_resource_custom.php12
-rw-r--r--lib/smarty3/sysplugins/smarty_resource_recompiled.php12
-rw-r--r--lib/smarty3/sysplugins/smarty_resource_uncompiled.php2
-rw-r--r--lib/smarty3/sysplugins/smarty_security.php293
-rw-r--r--lib/smarty3/sysplugins/smarty_template_cached.php25
-rw-r--r--lib/smarty3/sysplugins/smarty_template_compiled.php162
-rw-r--r--lib/smarty3/sysplugins/smarty_template_config.php19
-rw-r--r--lib/smarty3/sysplugins/smarty_template_resource_base.php16
-rw-r--r--lib/smarty3/sysplugins/smarty_template_source.php27
-rw-r--r--lib/smarty3/sysplugins/smarty_undefined_variable.php16
-rw-r--r--lib/smarty3/sysplugins/smarty_variable.php3
-rw-r--r--lib/smarty3/sysplugins/smartycompilerexception.php3
-rw-r--r--lib/smarty3/sysplugins/smartyexception.php3
203 files changed, 10806 insertions, 8658 deletions
diff --git a/lib/smarty3/Autoloader.php b/lib/smarty3/Autoloader.php
index e888553..e4dc450 100644
--- a/lib/smarty3/Autoloader.php
+++ b/lib/smarty3/Autoloader.php
@@ -2,20 +2,21 @@
/**
* Smarty Autoloader
*
- * @package Smarty
+ * @package Smarty
*/
/**
* Smarty Autoloader
*
- * @package Smarty
- * @author Uwe Tews
+ * @package Smarty
+ * @author Uwe Tews
* Usage:
- * require_once '...path/Autoloader.php';
- * Smarty_Autoloader::register();
- * $smarty = new Smarty();
- * Note: This autoloader is not needed if you use Composer.
- * Composer will automatically add the classes of the Smarty package to it common autoloader.
+ * require_once '...path/Autoloader.php';
+ * Smarty_Autoloader::register();
+ * or
+ * include '...path/bootstrap.php';
+ *
+ * $smarty = new Smarty();
*/
class Smarty_Autoloader
{
@@ -24,14 +25,14 @@ class Smarty_Autoloader
*
* @var string
*/
- public static $SMARTY_DIR = '';
+ public static $SMARTY_DIR = null;
/**
* Filepath to Smarty internal plugins
*
* @var string
*/
- public static $SMARTY_SYSPLUGINS_DIR = '';
+ public static $SMARTY_SYSPLUGINS_DIR = null;
/**
* Array with Smarty core classes and their filename
@@ -53,8 +54,8 @@ class Smarty_Autoloader
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
+ 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' ])) {
@@ -75,7 +76,7 @@ class Smarty_Autoloader
self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
- if (version_compare(phpversion(), '5.3.0', '>=')) {
+ if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
} else {
spl_autoload_register(array(__CLASS__, 'autoload'));
@@ -89,18 +90,20 @@ class Smarty_Autoloader
*/
public static function autoload($class)
{
- $_class = strtolower($class);
- if (strpos($_class, 'smarty') !== 0) {
+ if ($class[ 0 ] !== 'S' && strpos($class, 'Smarty') !== 0) {
return;
}
- $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
- if (is_file($file)) {
- include $file;
- } else if (isset(self::$rootClasses[ $_class ])) {
+ $_class = strtolower($class);
+ if (isset(self::$rootClasses[ $_class ])) {
$file = self::$SMARTY_DIR . self::$rootClasses[ $_class ];
if (is_file($file)) {
include $file;
}
+ } else {
+ $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
+ if (is_file($file)) {
+ include $file;
+ }
}
return;
}
diff --git a/lib/smarty3/Smarty.class.php b/lib/smarty3/Smarty.class.php
index 8d18450..a896992 100644
--- a/lib/smarty3/Smarty.class.php
+++ b/lib/smarty3/Smarty.class.php
@@ -21,41 +21,44 @@
* smarty-discussion-subscribe@googlegroups.com
*
* @link http://www.smarty.net/
- * @copyright 2016 New Digital Group, Inc.
- * @copyright 2016 Uwe Tews
+ * @copyright 2018 New Digital Group, Inc.
+ * @copyright 2018 Uwe Tews
* @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
+ * @author Uwe Tews <uwe dot tews at gmail dot com>
* @author Rodney Rehm
* @package Smarty
- * @version 3.1.30
+ * @version 3.1.33
*/
-
-/**
- * define shorthand directory separator constant
- */
-if (!defined('DS')) {
- define('DS', DIRECTORY_SEPARATOR);
-}
-
/**
* set SMARTY_DIR to absolute path to Smarty library files.
* Sets SMARTY_DIR only if user application has not already defined it.
*/
if (!defined('SMARTY_DIR')) {
- define('SMARTY_DIR', dirname(__FILE__) . DS);
+ /**
+ *
+ */
+ define('SMARTY_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR);
}
-
/**
* set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
* Sets SMARTY_SYSPLUGINS_DIR only if user application has not already defined it.
*/
if (!defined('SMARTY_SYSPLUGINS_DIR')) {
- define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DS);
+ /**
+ *
+ */
+ define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR);
}
if (!defined('SMARTY_PLUGINS_DIR')) {
- define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
+ /**
+ *
+ */
+ define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DIRECTORY_SEPARATOR);
}
if (!defined('SMARTY_MBSTRING')) {
+ /**
+ *
+ */
define('SMARTY_MBSTRING', function_exists('mb_get_info'));
}
if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
@@ -71,25 +74,16 @@ if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
*/
define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
}
-
/**
- * 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
+ * Load Smarty_Autoloader
*/
-if (!class_exists('Smarty_Autoloader', false)) {
- if (!class_exists('Smarty_Internal_Data', true)) {
- require_once dirname(__FILE__) . '/Autoloader.php';
- Smarty_Autoloader::registerBC();
- }
+if (!class_exists('Smarty_Autoloader')) {
+ include dirname(__FILE__) . '/bootstrap.php';
}
-
/**
* 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_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';
@@ -97,6 +91,7 @@ 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';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_resource_file.php';
/**
* This is the main Smarty class
@@ -108,133 +103,76 @@ require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_resource_base.php';
*
* @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(string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, int $max_errors = null)
- * @method int compileAllConfig(string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, int $max_errors = null)
+ * @method int compileAllTemplates(string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, $max_errors = null)
+ * @method int compileAllConfig(string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, $max_errors = null)
* @method int clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
*/
class Smarty extends Smarty_Internal_TemplateBase
{
- /**#@+
- * constant definitions
- */
-
/**
* smarty version
*/
- const SMARTY_VERSION = '3.1.30';
-
+ const SMARTY_VERSION = '3.1.33';
/**
* define variable scopes
*/
- const SCOPE_LOCAL = 1;
-
- const SCOPE_PARENT = 2;
-
+ const SCOPE_LOCAL = 1;
+ const SCOPE_PARENT = 2;
const SCOPE_TPL_ROOT = 4;
-
- const SCOPE_ROOT = 8;
-
- const SCOPE_SMARTY = 16;
-
- const SCOPE_GLOBAL = 32;
-
+ const SCOPE_ROOT = 8;
+ const SCOPE_SMARTY = 16;
+ const SCOPE_GLOBAL = 32;
/**
* define caching modes
*/
- const CACHING_OFF = 0;
-
+ const CACHING_OFF = 0;
const CACHING_LIFETIME_CURRENT = 1;
-
- const CACHING_LIFETIME_SAVED = 2;
-
+ const CACHING_LIFETIME_SAVED = 2;
/**
* define constant for clearing cache files be saved expiration dates
*/
- const CLEAR_EXPIRED = - 1;
-
+ const CLEAR_EXPIRED = -1;
/**
* define compile check modes
*/
- const COMPILECHECK_OFF = 0;
-
- const COMPILECHECK_ON = 1;
-
+ 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_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
-
+ 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_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_FUNCTION = 'function';
+ const PLUGIN_BLOCK = 'block';
+ const PLUGIN_COMPILER = 'compiler';
+ const PLUGIN_MODIFIER = 'modifier';
const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
/**
- * Resource caching modes
- * (not used since 3.1.30)
- */
- 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
-
- /**#@-*/
-
- /**
* assigned global tpl vars
*/
public static $global_tpl_vars = array();
/**
- * 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();
-
- /**
* Flag denoting if Multibyte String functions are available
*/
public static $_MBSTRING = SMARTY_MBSTRING;
@@ -260,10 +198,6 @@ class Smarty extends Smarty_Internal_TemplateBase
*/
public static $_IS_WINDOWS = false;
- /**#@+
- * variables
- */
-
/**
* auto literal on delimiters with whitespace
*
@@ -286,20 +220,6 @@ class Smarty extends Smarty_Internal_TemplateBase
public $use_include_path = false;
/**
- * template directory
- *
- * @var array
- */
- protected $template_dir = array('./templates/');
-
- /**
- * flags for normalized template directory entries
- *
- * @var array
- */
- protected $_processedTemplateDir = array();
-
- /**
* flag if template_dir is normalized
*
* @var bool
@@ -314,20 +234,6 @@ class Smarty extends Smarty_Internal_TemplateBase
public $_joined_template_dir = null;
/**
- * config directory
- *
- * @var array
- */
- protected $config_dir = array('./configs/');
-
- /**
- * flags for normalized template directory entries
- *
- * @var array
- */
- protected $_processedConfigDir = array();
-
- /**
* flag if config_dir is normalized
*
* @var bool
@@ -363,13 +269,6 @@ class Smarty extends Smarty_Internal_TemplateBase
public $default_plugin_handler_func = null;
/**
- * compile directory
- *
- * @var string
- */
- protected $compile_dir = './templates_c/';
-
- /**
* flag if template_dir is normalized
*
* @var bool
@@ -377,13 +276,6 @@ class Smarty extends Smarty_Internal_TemplateBase
public $_compileDirNormalized = false;
/**
- * plugins directory
- *
- * @var array
- */
- protected $plugins_dir = array();
-
- /**
* flag if plugins_dir is normalized
*
* @var bool
@@ -391,13 +283,6 @@ class Smarty extends Smarty_Internal_TemplateBase
public $_pluginsDirNormalized = false;
/**
- * cache directory
- *
- * @var string
- */
- protected $cache_dir = './cache/';
-
- /**
* flag if template_dir is normalized
*
* @var bool
@@ -412,13 +297,6 @@ class Smarty extends Smarty_Internal_TemplateBase
public $force_compile = false;
/**
- * check template for modifications?
- *
- * @var boolean
- */
- public $compile_check = true;
-
- /**
* use sub dirs for compiled/cached files?
*
* @var boolean
@@ -439,6 +317,15 @@ class Smarty extends Smarty_Internal_TemplateBase
*/
public $merge_compiled_includes = false;
+ /*
+ * flag for behaviour when extends: resource and {extends} tag are used simultaneous
+ * if false disable execution of {extends} in templates called by extends resource.
+ * (behaviour as versions < 3.1.28)
+ *
+ * @var boolean
+ */
+ public $extends_recursion = true;
+
/**
* force cache file creation
*
@@ -460,9 +347,13 @@ class Smarty extends Smarty_Internal_TemplateBase
*/
public $right_delimiter = "}";
- /**#@+
- * security
+ /**
+ * array of strings which shall be treated as literal by compiler
+ *
+ * @var array string
*/
+ public $literals = array();
+
/**
* class name
* This should be instance of Smarty_Security.
@@ -493,7 +384,6 @@ class Smarty extends Smarty_Internal_TemplateBase
*/
public $allow_php_templates = false;
- /**#@-*/
/**
* debug mode
* Setting this to true enables the debug-console.
@@ -536,10 +426,6 @@ class Smarty extends Smarty_Internal_TemplateBase
*/
public $error_reporting = null;
- /**#@+
- * config var settings
- */
-
/**
* Controls whether variables with the same name overwrite each other.
*
@@ -561,12 +447,6 @@ class Smarty extends Smarty_Internal_TemplateBase
*/
public $config_read_hidden = false;
- /**#@-*/
-
- /**#@+
- * resource locking
- */
-
/**
* locking concurrent compiles
*
@@ -588,8 +468,6 @@ class Smarty extends Smarty_Internal_TemplateBase
*/
public $locking_timeout = 10;
- /**#@-*/
-
/**
* resource type used if none given
* Must be an valid key of $registered_resources.
@@ -719,40 +597,90 @@ class Smarty extends Smarty_Internal_TemplateBase
public $_debug = null;
/**
+ * template directory
+ *
+ * @var array
+ */
+ protected $template_dir = array('./templates/');
+
+ /**
+ * flags for normalized template directory entries
+ *
+ * @var array
+ */
+ protected $_processedTemplateDir = array();
+
+ /**
+ * config directory
+ *
+ * @var array
+ */
+ protected $config_dir = array('./configs/');
+
+ /**
+ * flags for normalized template directory entries
+ *
+ * @var array
+ */
+ protected $_processedConfigDir = array();
+
+ /**
+ * compile directory
+ *
+ * @var string
+ */
+ protected $compile_dir = './templates_c/';
+
+ /**
+ * plugins directory
+ *
+ * @var array
+ */
+ protected $plugins_dir = array();
+
+ /**
+ * cache directory
+ *
+ * @var string
+ */
+ protected $cache_dir = './cache/';
+
+ /**
* removed properties
*
* @var string[]
*/
- private $obsoleteProperties = array('resource_caching', 'template_resource_caching', 'direct_access_security',
- '_dir_perms', '_file_perms', 'plugin_search_order',
- 'inheritance_merge_compiled_includes', 'resource_cache_mode',);
+ protected $obsoleteProperties = array(
+ 'resource_caching', 'template_resource_caching', 'direct_access_security',
+ '_dir_perms', '_file_perms', 'plugin_search_order',
+ 'inheritance_merge_compiled_includes', 'resource_cache_mode',
+ );
/**
* List of private properties which will call getter/setter on a direct access
*
* @var string[]
*/
- private $accessMap = array('template_dir' => 'TemplateDir', 'config_dir' => 'ConfigDir',
- 'plugins_dir' => 'PluginsDir', 'compile_dir' => 'CompileDir',
- 'cache_dir' => 'CacheDir',);
-
- /**#@-*/
+ protected $accessMap = array(
+ 'template_dir' => 'TemplateDir', 'config_dir' => 'ConfigDir',
+ 'plugins_dir' => 'PluginsDir', 'compile_dir' => 'CompileDir',
+ 'cache_dir' => 'CacheDir',
+ );
/**
* Initialize new Smarty object
*/
public function __construct()
{
+ $this->_clearTemplateCache();
parent::__construct();
if (is_callable('mb_internal_encoding')) {
mb_internal_encoding(Smarty::$_CHARSET);
}
$this->start_time = microtime(true);
-
if (isset($_SERVER[ 'SCRIPT_NAME' ])) {
Smarty::$global_tpl_vars[ 'SCRIPT_NAME' ] = new Smarty_Variable($_SERVER[ 'SCRIPT_NAME' ]);
}
-
// 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
@@ -762,11 +690,33 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
+ * Enable error handler to mute expected messages
+ *
+ * @return boolean
+ * @deprecated
+ */
+ public static function muteExpectedErrors()
+ {
+ return Smarty_Internal_ErrorHandler::muteExpectedErrors();
+ }
+
+ /**
+ * Disable error handler muting expected messages
+ *
+ * @deprecated
+ */
+ public static function unmuteExpectedErrors()
+ {
+ restore_error_handler();
+ }
+
+ /**
* Check if a template resource exists
*
- * @param string $resource_name template name
+ * @param string $resource_name template name
*
- * @return boolean status
+ * @return bool status
+ * @throws \SmartyException
*/
public function templateExists($resource_name)
{
@@ -778,10 +728,10 @@ class Smarty extends Smarty_Internal_TemplateBase
/**
* Loads security class and enables security
*
- * @param string|Smarty_Security $security_class if a string is used, it must be class-name
+ * @param string|Smarty_Security $security_class if a string is used, it must be class-name
*
* @return Smarty current Smarty instance for chaining
- * @throws SmartyException when an invalid class name is provided
+ * @throws \SmartyException
*/
public function enableSecurity($security_class = null)
{
@@ -797,37 +747,15 @@ class Smarty extends Smarty_Internal_TemplateBase
public function disableSecurity()
{
$this->security_policy = null;
-
- return $this;
- }
-
- /**
- * 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
- */
- public function setTemplateDir($template_dir, $isConfig = false)
- {
- if ($isConfig) {
- $this->config_dir = array();
- $this->_processedConfigDir = array();
- } else {
- $this->template_dir = array();
- $this->_processedTemplateDir = array();
- }
- $this->addTemplateDir($template_dir, null, $isConfig);
return $this;
}
/**
* Add template directory(s)
*
- * @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
+ * @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
*/
@@ -882,7 +810,7 @@ class Smarty extends Smarty_Internal_TemplateBase
$dir = &$this->template_dir;
}
if ($isConfig ? !$this->_configDirNormalized : !$this->_templateDirNormalized) {
- $this->_nomalizeTemplateConfig($isConfig);
+ $this->_normalizeTemplateConfig($isConfig);
}
if ($index !== null) {
return isset($dir[ $index ]) ? $dir[ $index ] : null;
@@ -891,15 +819,24 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
- * Set config directory
+ * Set template directory
*
- * @param $config_dir
+ * @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 setConfigDir($config_dir)
+ public function setTemplateDir($template_dir, $isConfig = false)
{
- return $this->setTemplateDir($config_dir, true);
+ if ($isConfig) {
+ $this->config_dir = array();
+ $this->_processedConfigDir = array();
+ } else {
+ $this->template_dir = array();
+ $this->_processedTemplateDir = array();
+ }
+ $this->addTemplateDir($template_dir, null, $isConfig);
+ return $this;
}
/**
@@ -928,23 +865,21 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
- * Set plugins directory
+ * Set config directory
*
- * @param string|array $plugins_dir directory(s) of plugins
+ * @param $config_dir
*
* @return Smarty current Smarty instance for chaining
*/
- public function setPluginsDir($plugins_dir)
+ public function setConfigDir($config_dir)
{
- $this->plugins_dir = (array) $plugins_dir;
- $this->_pluginsDirNormalized = false;
- return $this;
+ return $this->setTemplateDir($config_dir, true);
}
/**
* Adds directory of plugin files
*
- * @param null|array $plugins_dir
+ * @param null|array|string $plugins_dir
*
* @return Smarty current Smarty instance for chaining
*/
@@ -953,7 +888,7 @@ class Smarty extends Smarty_Internal_TemplateBase
if (empty($this->plugins_dir)) {
$this->plugins_dir[] = SMARTY_PLUGINS_DIR;
}
- $this->plugins_dir = array_merge($this->plugins_dir, (array) $plugins_dir);
+ $this->plugins_dir = array_merge($this->plugins_dir, (array)$plugins_dir);
$this->_pluginsDirNormalized = false;
return $this;
}
@@ -971,10 +906,10 @@ class Smarty extends Smarty_Internal_TemplateBase
}
if (!$this->_pluginsDirNormalized) {
if (!is_array($this->plugins_dir)) {
- $this->plugins_dir = (array) $this->plugins_dir;
+ $this->plugins_dir = (array)$this->plugins_dir;
}
foreach ($this->plugins_dir as $k => $v) {
- $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, "/\\") . DS, true);
+ $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, '/\\') . DIRECTORY_SEPARATOR, true);
}
$this->_cache[ 'plugin_files' ] = array();
$this->_pluginsDirNormalized = true;
@@ -983,15 +918,16 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
+ * Set plugins directory
*
- * @param string $compile_dir directory to store compiled templates in
+ * @param string|array $plugins_dir directory(s) of plugins
*
- * @return Smarty current Smarty instance for chaining
+ * @return Smarty current Smarty instance for chaining
*/
- public function setCompileDir($compile_dir)
+ public function setPluginsDir($plugins_dir)
{
- $this->_normalizeDir('compile_dir', $compile_dir);
- $this->_compileDirNormalized = true;
+ $this->plugins_dir = (array)$plugins_dir;
+ $this->_pluginsDirNormalized = false;
return $this;
}
@@ -1010,16 +946,15 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
- * Set cache directory
*
- * @param string $cache_dir directory to store cached templates in
+ * @param string $compile_dir directory to store compiled templates in
*
* @return Smarty current Smarty instance for chaining
*/
- public function setCacheDir($cache_dir)
+ public function setCompileDir($compile_dir)
{
- $this->_normalizeDir('cache_dir', $cache_dir);
- $this->_cacheDirNormalized = true;
+ $this->_normalizeDir('compile_dir', $compile_dir);
+ $this->_compileDirNormalized = true;
return $this;
}
@@ -1038,58 +973,30 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
- * Normalize and set directory string
- *
- * @param string $dirName cache_dir or compile_dir
- * @param string $dir filepath of folder
- */
- private function _normalizeDir($dirName, $dir)
- {
- $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DS, true);
- if (!isset(Smarty::$_muted_directories[ $this->{$dirName} ])) {
- Smarty::$_muted_directories[ $this->{$dirName} ] = null;
- }
- }
-
- /**
- * Normalize template_dir or config_dir
+ * Set cache directory
*
- * @param bool $isConfig true for config_dir
+ * @param string $cache_dir directory to store cached templates in
*
+ * @return Smarty current Smarty instance for chaining
*/
- private function _nomalizeTemplateConfig($isConfig)
+ public function setCacheDir($cache_dir)
{
- if ($isConfig) {
- $processed = &$this->_processedConfigDir;
- $dir = &$this->config_dir;
- } else {
- $processed = &$this->_processedTemplateDir;
- $dir = &$this->template_dir;
- }
- if (!is_array($dir)) {
- $dir = (array) $dir;
- }
- foreach ($dir as $k => $v) {
- if (!isset($processed[ $k ])) {
- $dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . DS, true);
- $processed[ $k ] = true;
- }
- }
- $isConfig ? $this->_configDirNormalized = true : $this->_templateDirNormalized = true;
- $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
- $this->_joined_template_dir = join('#', $this->template_dir);
+ $this->_normalizeDir('cache_dir', $cache_dir);
+ $this->_cacheDirNormalized = true;
+ return $this;
}
/**
* creates a template object
*
- * @param string $template the resource handle of the template file
- * @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 boolean $do_clone flag is Smarty object shall be cloned
+ * @param string $template the resource handle of the template file
+ * @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 boolean $do_clone flag is Smarty object shall be cloned
*
- * @return object template object
+ * @return \Smarty_Internal_Template template object
+ * @throws \SmartyException
*/
public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
{
@@ -1103,14 +1010,20 @@ class Smarty extends Smarty_Internal_TemplateBase
} else {
$data = null;
}
+ if (!$this->_templateDirNormalized) {
+ $this->_normalizeTemplateConfig(false);
+ }
$_templateId = $this->_getTemplateId($template, $cache_id, $compile_id);
$tpl = null;
- if ($this->caching && isset($this->_cache[ 'isCached' ][ $_templateId ])) {
- $tpl = $do_clone ? clone $this->_cache[ 'isCached' ][ $_templateId ] :
- $this->_cache[ 'isCached' ][ $_templateId ];
+ if ($this->caching && isset(Smarty_Internal_Template::$isCacheTplObj[ $_templateId ])) {
+ $tpl = $do_clone ? clone Smarty_Internal_Template::$isCacheTplObj[ $_templateId ] :
+ Smarty_Internal_Template::$isCacheTplObj[ $_templateId ];
+ $tpl->inheritance = null;
+ $tpl->tpl_vars = $tpl->config_vars = array();
+ } elseif (!$do_clone && isset(Smarty_Internal_Template::$tplObjCache[ $_templateId ])) {
+ $tpl = clone Smarty_Internal_Template::$tplObjCache[ $_templateId ];
+ $tpl->inheritance = null;
$tpl->tpl_vars = $tpl->config_vars = array();
- } else if (!$do_clone && isset($this->_cache[ 'tplObjects' ][ $_templateId ])) {
- $tpl = clone $this->_cache[ 'tplObjects' ][ $_templateId ];
} else {
/* @var Smarty_Internal_Template $tpl */
$tpl = new $this->template_class($template, $this, null, $cache_id, $compile_id, null, null);
@@ -1127,10 +1040,10 @@ class Smarty extends Smarty_Internal_TemplateBase
$tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val);
}
}
- if ($this->debugging || $this->debugging_ctrl == 'URL') {
+ if ($this->debugging || $this->debugging_ctrl === 'URL') {
$tpl->smarty->_debug = new Smarty_Internal_Debug();
// check URL debugging control
- if (!$this->debugging && $this->debugging_ctrl == 'URL') {
+ if (!$this->debugging && $this->debugging_ctrl === 'URL') {
$tpl->smarty->_debug->debugUrl($tpl->smarty);
}
}
@@ -1142,11 +1055,11 @@ class Smarty extends Smarty_Internal_TemplateBase
* class name format: Smarty_PluginType_PluginName
* plugin filename format: plugintype.pluginname.php
*
- * @param string $plugin_name class plugin name to load
- * @param bool $check check if already loaded
+ * @param string $plugin_name class plugin name to load
+ * @param bool $check check if already loaded
*
- * @throws SmartyException
* @return string |boolean filepath of loaded file or false
+ * @throws \SmartyException
*/
public function loadPlugin($plugin_name, $check = true)
{
@@ -1163,16 +1076,20 @@ class Smarty extends Smarty_Internal_TemplateBase
* @param \Smarty_Internal_Template $template
*
* @return string
- */
- public function _getTemplateId($template_name, $cache_id = null, $compile_id = null, $caching = null,
- Smarty_Internal_Template $template = null)
- {
+ * @throws \SmartyException
+ */
+ public function _getTemplateId(
+ $template_name,
+ $cache_id = null,
+ $compile_id = null,
+ $caching = null,
+ Smarty_Internal_Template $template = null
+ ) {
$template_name = (strpos($template_name, ':') === false) ? "{$this->default_resource_type}:{$template_name}" :
$template_name;
$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);
-
+ $caching = (int)($caching === null ? $this->caching : $caching);
if ((isset($template) && strpos($template_name, ':.') !== false) || $this->allow_ambiguous_resources) {
$_templateId =
Smarty_Resource::getUniqueTemplateName((isset($template) ? $template : $this), $template_name) .
@@ -1191,47 +1108,43 @@ class Smarty extends Smarty_Internal_TemplateBase
* - remove /./ and /../
* - make it absolute if required
*
- * @param string $path file path
- * @param bool $realpath if true - convert to absolute
- * false - convert to relative
- * null - keep as it is but remove /./ /../
+ * @param string $path file path
+ * @param bool $realpath if true - convert to absolute
+ * false - convert to relative
+ * null - keep as it is but
+ * remove /./ /../
*
* @return string
*/
public function _realpath($path, $realpath = null)
{
- $nds = DS == '/' ? '\\' : '/';
- // normalize DS
- $path = str_replace($nds, DS, $path);
- preg_match('%^(?<root>(?:[[:alpha:]]:[\\\\]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(?:[[:print:]]*))$%',
- $path, $parts);
+ $nds = array('/' => '\\', '\\' => '/');
+ preg_match(
+ '%^(?<root>(?:[[:alpha:]]:[\\\\/]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(.*))$%u',
+ $path,
+ $parts
+ );
$path = $parts[ 'path' ];
- if ($parts[ 'root' ] == '\\') {
+ if ($parts[ 'root' ] === '\\') {
$parts[ 'root' ] = substr(getcwd(), 0, 2) . $parts[ 'root' ];
} else {
if ($realpath !== null && !$parts[ 'root' ]) {
- $path = getcwd() . DS . $path;
+ $path = getcwd() . DIRECTORY_SEPARATOR . $path;
}
}
- // remove noop 'DS DS' and 'DS.DS' patterns
- $path = preg_replace('#([\\\\/]([.]?[\\\\/])+)#', DS, $path);
- // resolve '..DS' pattern, smallest first
- if (strpos($path, '..' . DS) != false &&
- preg_match_all('#(([.]?[\\\\/])*([.][.])[\\\\/]([.]?[\\\\/])*)+#', $path, $match)
- ) {
- $counts = array();
- foreach ($match[ 0 ] as $m) {
- $counts[] = (int) ((strlen($m) - 1) / 3);
- }
- sort($counts);
- foreach ($counts as $count) {
- $path = preg_replace('#(([\\\\/]([.]?[\\\\/])*[^\\\\/.]+){' . $count .
- '}[\\\\/]([.]?[\\\\/])*([.][.][\\\\/]([.]?[\\\\/])*){' . $count . '})(?=[^.])#',
- DS, $path);
- }
- }
-
- return $parts[ 'root' ] . $path;
+ // normalize DIRECTORY_SEPARATOR
+ $path = str_replace($nds[ DIRECTORY_SEPARATOR ], DIRECTORY_SEPARATOR, $path);
+ $parts[ 'root' ] = str_replace($nds[ DIRECTORY_SEPARATOR ], DIRECTORY_SEPARATOR, $parts[ 'root' ]);
+ do {
+ $path = preg_replace(
+ array('#[\\\\/]{2}#', '#[\\\\/][.][\\\\/]#', '#[\\\\/]([^\\\\/.]+)[\\\\/][.][.][\\\\/]#'),
+ DIRECTORY_SEPARATOR,
+ $path,
+ -1,
+ $count
+ );
+ } while ($count > 0);
+ return $realpath !== false ? $parts[ 'root' ] . $path : str_ireplace(getcwd(), '.', $parts[ 'root' ] . $path);
}
/**
@@ -1239,16 +1152,8 @@ class Smarty extends Smarty_Internal_TemplateBase
*/
public function _clearTemplateCache()
{
- $this->_cache[ 'isCached' ] = array();
- $this->_cache[ 'tplObjects' ] = array();
- }
-
- /**
- * @param boolean $compile_check
- */
- public function setCompileCheck($compile_check)
- {
- $this->compile_check = $compile_check;
+ Smarty_Internal_Template::$isCacheTplObj = array();
+ Smarty_Internal_Template::$tplObjCache = array();
}
/**
@@ -1276,9 +1181,21 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
+ * Return auto_literal flag
+ *
+ * @return boolean
+ */
+ public function getAutoLiteral()
+ {
+ return $this->auto_literal;
+ }
+
+ /**
+ * Set auto_literal flag
+ *
* @param boolean $auto_literal
*/
- public function setAutoLiteral($auto_literal)
+ public function setAutoLiteral($auto_literal = true)
{
$this->auto_literal = $auto_literal;
}
@@ -1300,6 +1217,18 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
+ * Get left delimiter
+ *
+ * @return string
+ */
+ public function getLeftDelimiter()
+ {
+ return $this->left_delimiter;
+ }
+
+ /**
+ * Set left delimiter
+ *
* @param string $left_delimiter
*/
public function setLeftDelimiter($left_delimiter)
@@ -1308,7 +1237,19 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
- * @param string $right_delimiter
+ * Get right delimiter
+ *
+ * @return string $right_delimiter
+ */
+ public function getRightDelimiter()
+ {
+ return $this->right_delimiter;
+ }
+
+ /**
+ * Set right delimiter
+ *
+ * @param string
*/
public function setRightDelimiter($right_delimiter)
{
@@ -1382,11 +1323,21 @@ class Smarty extends Smarty_Internal_TemplateBase
}
/**
+ * Get Smarty object
+ *
+ * @return Smarty
+ */
+ public function _getSmartyObj()
+ {
+ return $this;
+ }
+
+ /**
* <<magic>> Generic getter.
* Calls the appropriate getter function.
* Issues an E_USER_NOTICE if no valid getter is found.
*
- * @param string $name property name
+ * @param string $name property name
*
* @return mixed
*/
@@ -1412,6 +1363,7 @@ class Smarty extends Smarty_Internal_TemplateBase
*
* @param string $name property name
* @param mixed $value parameter passed to setter
+ *
*/
public function __set($name, $value)
{
@@ -1420,110 +1372,54 @@ class Smarty extends Smarty_Internal_TemplateBase
$this->{$method}($value);
} elseif (in_array($name, $this->obsoleteProperties)) {
return;
+ } elseif (is_object($value) && method_exists($value, $name)) {
+ $this->$name = $value;
} else {
- if (is_object($value) && method_exists($value, $name)) {
- $this->$name = $value;
- } else {
- trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
- }
+ trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
}
}
/**
- * Error Handler to mute expected messages
- *
- * @link http://php.net/set_error_handler
- *
- * @param integer $errno Error level
- * @param $errstr
- * @param $errfile
- * @param $errline
- * @param $errcontext
+ * Normalize and set directory string
*
- * @return bool|void
+ * @param string $dirName cache_dir or compile_dir
+ * @param string $dir filepath of folder
*/
- public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
+ private function _normalizeDir($dirName, $dir)
{
- $_is_muted_directory = false;
-
- // add the SMARTY_DIR to the list of muted directories
- 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),);
- }
- }
-
- // walk the muted directories and test against $errfile
- foreach (Smarty::$_muted_directories as $key => &$dir) {
- if (!$dir) {
- // resolve directory and length for speedy comparisons
- $file = realpath($key);
- if ($file === false) {
- // this directory does not exist, remove and skip it
- unset(Smarty::$_muted_directories[ $key ]);
- continue;
- }
- $dir = array('file' => $file, 'length' => strlen($file),);
- }
- if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) {
- $_is_muted_directory = true;
- break;
- }
- }
- // pass to next error handler if this error did not occur inside SMARTY_DIR
- // 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);
- } else {
- return false;
+ $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DIRECTORY_SEPARATOR, true);
+ if (class_exists('Smarty_Internal_ErrorHandler', false)) {
+ if (!isset(Smarty_Internal_ErrorHandler::$mutedDirectories[ $this->{$dirName} ])) {
+ Smarty_Internal_ErrorHandler::$mutedDirectories[ $this->{$dirName} ] = null;
}
}
- return;
}
/**
- * Enable error handler to mute expected messages
+ * Normalize template_dir or config_dir
*
- * @return void
+ * @param bool $isConfig true for config_dir
*/
- public static function muteExpectedErrors()
+ private function _normalizeTemplateConfig($isConfig)
{
- /*
- error muting is done because some people implemented custom error_handlers using
- http://php.net/set_error_handler and for some reason did not understand the following paragraph:
-
- It is important to remember that the standard PHP error handler is completely bypassed for the
- error types specified by error_types unless the callback function returns FALSE.
- error_reporting() settings will have no effect and your error handler will be called regardless -
- however you are still able to read the current value of error_reporting and act appropriately.
- Of particular note is that this value will be 0 if the statement that caused the error was
- prepended by the @ error-control operator.
-
- Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
- - @filemtime() is almost twice as fast as using an additional file_exists()
- - between file_exists() and filemtime() a possible race condition is opened,
- which does not exist using the simple @filemtime() approach.
- */
- $error_handler = array('Smarty', 'mutingErrorHandler');
- $previous = set_error_handler($error_handler);
-
- // avoid dead loops
- if ($previous !== $error_handler) {
- Smarty::$_previous_error_handler = $previous;
+ if ($isConfig) {
+ $processed = &$this->_processedConfigDir;
+ $dir = &$this->config_dir;
+ } else {
+ $processed = &$this->_processedTemplateDir;
+ $dir = &$this->template_dir;
}
- }
-
- /**
- * Disable error handler muting expected messages
- *
- * @return void
- */
- public static function unmuteExpectedErrors()
- {
- restore_error_handler();
+ if (!is_array($dir)) {
+ $dir = (array)$dir;
+ }
+ foreach ($dir as $k => $v) {
+ if (!isset($processed[ $k ])) {
+ $dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . DIRECTORY_SEPARATOR, true);
+ $processed[ $k ] = true;
+ }
+ }
+ $isConfig ? $this->_configDirNormalized = true : $this->_templateDirNormalized = true;
+ $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
+ $this->_joined_template_dir = join('#', $this->template_dir);
}
}
diff --git a/lib/smarty3/SmartyBC.class.php b/lib/smarty3/SmartyBC.class.php
index 3955e4f..836f981 100644
--- a/lib/smarty3/SmartyBC.class.php
+++ b/lib/smarty3/SmartyBC.class.php
@@ -28,7 +28,7 @@
/**
* @ignore
*/
-require_once(dirname(__FILE__) . '/Smarty.class.php');
+require_once dirname(__FILE__) . '/Smarty.class.php';
/**
* Smarty Backward Compatibility Wrapper Class
@@ -53,7 +53,6 @@ class SmartyBC extends Smarty
/**
* Initialize new SmartyBC object
- *
*/
public function __construct()
{
@@ -100,6 +99,8 @@ class SmartyBC extends Smarty
* @param string $function_impl the name of the PHP function to register
* @param bool $cacheable
* @param mixed $cache_attrs
+ *
+ * @throws \SmartyException
*/
public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
{
@@ -125,12 +126,16 @@ class SmartyBC extends Smarty
* @param boolean $smarty_args smarty argument format, else traditional
* @param array $block_methods list of methods that are block format
*
- * @throws SmartyException
+ * @throws SmartyException
* @internal param array $block_functs list of methods that are block format
*/
- public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true,
- $block_methods = array())
- {
+ public function register_object(
+ $object,
+ $object_impl,
+ $allowed = array(),
+ $smarty_args = true,
+ $block_methods = array()
+ ) {
settype($allowed, 'array');
settype($smarty_args, 'boolean');
$this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
@@ -153,6 +158,8 @@ class SmartyBC extends Smarty
* @param string $block_impl PHP function to register
* @param bool $cacheable
* @param mixed $cache_attrs
+ *
+ * @throws \SmartyException
*/
public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
{
@@ -175,6 +182,8 @@ class SmartyBC extends Smarty
* @param string $function name of template function
* @param string $function_impl name of PHP function to register
* @param bool $cacheable
+ *
+ * @throws \SmartyException
*/
public function register_compiler_function($function, $function_impl, $cacheable = true)
{
@@ -196,6 +205,8 @@ class SmartyBC extends Smarty
*
* @param string $modifier name of template modifier
* @param string $modifier_impl name of PHP function to register
+ *
+ * @throws \SmartyException
*/
public function register_modifier($modifier, $modifier_impl)
{
@@ -238,6 +249,8 @@ class SmartyBC extends Smarty
* to a template before compiling
*
* @param callable $function
+ *
+ * @throws \SmartyException
*/
public function register_prefilter($function)
{
@@ -259,6 +272,8 @@ class SmartyBC extends Smarty
* to a compiled template after compilation
*
* @param callable $function
+ *
+ * @throws \SmartyException
*/
public function register_postfilter($function)
{
@@ -280,6 +295,8 @@ class SmartyBC extends Smarty
* to a template output
*
* @param callable $function
+ *
+ * @throws \SmartyException
*/
public function register_outputfilter($function)
{
@@ -301,6 +318,8 @@ class SmartyBC extends Smarty
*
* @param string $type filter type
* @param string $name filter name
+ *
+ * @throws \SmartyException
*/
public function load_filter($type, $name)
{
@@ -310,10 +329,10 @@ class SmartyBC extends Smarty
/**
* clear cached content for the given template and cache id
*
- * @param string $tpl_file name of template file
- * @param string $cache_id name of cache_id
- * @param string $compile_id name of compile_id
- * @param string $exp_time expiration time
+ * @param string $tpl_file name of template file
+ * @param string $cache_id name of cache_id
+ * @param string $compile_id name of compile_id
+ * @param string $exp_time expiration time
*
* @return boolean
*/
@@ -325,7 +344,7 @@ class SmartyBC extends Smarty
/**
* clear the entire contents of cache (all templates)
*
- * @param string $exp_time expire time
+ * @param string $exp_time expire time
*
* @return boolean
*/
@@ -337,11 +356,13 @@ class SmartyBC extends Smarty
/**
* test to see if valid cache exists for this template
*
- * @param string $tpl_file name of template file
- * @param string $cache_id
- * @param string $compile_id
+ * @param string $tpl_file name of template file
+ * @param string $cache_id
+ * @param string $compile_id
*
- * @return boolean
+ * @return bool
+ * @throws \Exception
+ * @throws \SmartyException
*/
public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
{
@@ -361,9 +382,9 @@ class SmartyBC extends Smarty
* or all compiled template files if one is not specified.
* This function is for advanced use only, not normally needed.
*
- * @param string $tpl_file
- * @param string $compile_id
- * @param string $exp_time
+ * @param string $tpl_file
+ * @param string $compile_id
+ * @param string $exp_time
*
* @return boolean results of {@link smarty_core_rm_auto()}
*/
@@ -375,9 +396,10 @@ class SmartyBC extends Smarty
/**
* Checks whether requested template exists.
*
- * @param string $tpl_file
+ * @param string $tpl_file
*
- * @return boolean
+ * @return bool
+ * @throws \SmartyException
*/
public function template_exists($tpl_file)
{
@@ -387,7 +409,7 @@ class SmartyBC extends Smarty
/**
* Returns an array containing template variables
*
- * @param string $name
+ * @param string $name
*
* @return array
*/
@@ -399,7 +421,7 @@ class SmartyBC extends Smarty
/**
* Returns an array containing config variables
*
- * @param string $name
+ * @param string $name
*
* @return array
*/
@@ -423,7 +445,7 @@ class SmartyBC extends Smarty
/**
* return a reference to a registered object
*
- * @param string $name
+ * @param string $name
*
* @return object
*/
diff --git a/lib/smarty3/bootstrap.php b/lib/smarty3/bootstrap.php
new file mode 100644
index 0000000..2c83046
--- /dev/null
+++ b/lib/smarty3/bootstrap.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * This file is part of the Smarty package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+/**
+ * Load and register Smarty Autoloader
+ */
+if (!class_exists('Smarty_Autoloader')) {
+ include dirname(__FILE__) . '/Autoloader.php';
+}
+Smarty_Autoloader::register(true);
diff --git a/lib/smarty3/debug.tpl b/lib/smarty3/debug.tpl
index 5526cbc..edc7bef 100644
--- a/lib/smarty3/debug.tpl
+++ b/lib/smarty3/debug.tpl
@@ -113,10 +113,10 @@
<div>
{foreach $template_data as $template}
<font color=brown>{$template.name}</font>
- <br>&nbsp;&nbsp;<span class="exectime">
+ <br />&nbsp;&nbsp;<span class="exectime">
(compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
</span>
- <br>
+ <br />
{/foreach}
</div>
{/if}
@@ -127,7 +127,7 @@
{foreach $assigned_vars as $vars}
<tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
<td><h3><font color=blue>${$vars@key}</font></h3>
- {if isset($vars['nocache'])}<b>Nocache</b></br>{/if}
+ {if isset($vars['nocache'])}<b>Nocache</b><br />{/if}
{if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
</td>
<td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
diff --git a/lib/smarty3/plugins/block.textformat.php b/lib/smarty3/plugins/block.textformat.php
index e9f5fe2..5e49463 100644
--- a/lib/smarty3/plugins/block.textformat.php
+++ b/lib/smarty3/plugins/block.textformat.php
@@ -5,22 +5,20 @@
* @package Smarty
* @subpackage PluginsBlock
*/
-
/**
* Smarty {textformat}{/textformat} block plugin
- * Type: block function<br>
- * Name: textformat<br>
+ * Type: block function
+ * Name: textformat
* Purpose: format text a certain way with preset styles
- * or custom wrap/indent settings<br>
+ * or custom wrap/indent settings
* Params:
- * <pre>
+ *
* - style - string (email)
* - indent - integer (0)
* - wrap - integer (80)
* - wrap_char - string ("\n")
* - indent_char - string (" ")
* - wrap_boundary - boolean (true)
- * </pre>
*
* @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
* (Smarty online manual)
@@ -32,13 +30,23 @@
*
* @return string content re-formatted
* @author Monte Ohrt <monte at ohrt dot com>
+ * @throws \SmartyException
*/
-function smarty_block_textformat($params, $content, $template, &$repeat)
+function smarty_block_textformat($params, $content, Smarty_Internal_Template $template, &$repeat)
{
if (is_null($content)) {
return;
}
-
+ if (Smarty::$_MBSTRING) {
+ $template->_checkPlugins(
+ array(
+ array(
+ 'function' => 'smarty_modifier_mb_wordwrap',
+ 'file' => SMARTY_PLUGINS_DIR . 'modifier.mb_wordwrap.php'
+ )
+ )
+ );
+ }
$style = null;
$indent = 0;
$indent_first = 0;
@@ -47,53 +55,55 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
$wrap_char = "\n";
$wrap_cut = false;
$assign = null;
-
foreach ($params as $_key => $_val) {
switch ($_key) {
case 'style':
case 'indent_char':
case 'wrap_char':
case 'assign':
- $$_key = (string) $_val;
+ $$_key = (string)$_val;
break;
-
case 'indent':
case 'indent_first':
case 'wrap':
- $$_key = (int) $_val;
+ $$_key = (int)$_val;
break;
-
case 'wrap_cut':
- $$_key = (bool) $_val;
+ $$_key = (bool)$_val;
break;
-
default:
- trigger_error("textformat: unknown attribute '$_key'");
+ trigger_error("textformat: unknown attribute '{$_key}'");
}
}
-
- if ($style == 'email') {
+ if ($style === 'email') {
$wrap = 72;
}
// split into paragraphs
$_paragraphs = preg_split('![\r\n]{2}!', $content);
-
foreach ($_paragraphs as &$_paragraph) {
if (!$_paragraph) {
continue;
}
// convert mult. spaces & special chars to single space
$_paragraph =
- preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER, '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER),
- array(' ', ''), $_paragraph);
+ preg_replace(
+ array(
+ '!\s+!' . Smarty::$_UTF8_MODIFIER,
+ '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER
+ ),
+ array(
+ ' ',
+ ''
+ ),
+ $_paragraph
+ );
// indent first line
if ($indent_first > 0) {
$_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
}
// wordwrap sentences
if (Smarty::$_MBSTRING) {
- require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php');
- $_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+ $_paragraph = smarty_modifier_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
} else {
$_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
}
@@ -103,7 +113,6 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
}
}
$_output = implode($wrap_char . $wrap_char, $_paragraphs);
-
if ($assign) {
$template->assign($assign, $_output);
} else {
diff --git a/lib/smarty3/plugins/function.counter.php b/lib/smarty3/plugins/function.counter.php
index bcc8f49..a4129e7 100644
--- a/lib/smarty3/plugins/function.counter.php
+++ b/lib/smarty3/plugins/function.counter.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
/**
* Smarty {counter} function plugin
- * Type: function<br>
- * Name: counter<br>
+ * Type: function
+ * Name: counter
* Purpose: print out a counter value
*
* @author Monte Ohrt <monte at ohrt dot com>
@@ -24,50 +23,40 @@
function smarty_function_counter($params, $template)
{
static $counters = array();
-
$name = (isset($params[ 'name' ])) ? $params[ 'name' ] : 'default';
if (!isset($counters[ $name ])) {
$counters[ $name ] = array('start' => 1, 'skip' => 1, 'direction' => 'up', 'count' => 1);
}
$counter =& $counters[ $name ];
-
if (isset($params[ 'start' ])) {
- $counter[ 'start' ] = $counter[ 'count' ] = (int) $params[ 'start' ];
+ $counter[ 'start' ] = $counter[ 'count' ] = (int)$params[ 'start' ];
}
-
if (!empty($params[ 'assign' ])) {
$counter[ 'assign' ] = $params[ 'assign' ];
}
-
if (isset($counter[ 'assign' ])) {
$template->assign($counter[ 'assign' ], $counter[ 'count' ]);
}
-
if (isset($params[ 'print' ])) {
- $print = (bool) $params[ 'print' ];
+ $print = (bool)$params[ 'print' ];
} else {
$print = empty($counter[ 'assign' ]);
}
-
if ($print) {
$retval = $counter[ 'count' ];
} else {
$retval = null;
}
-
if (isset($params[ 'skip' ])) {
$counter[ 'skip' ] = $params[ 'skip' ];
}
-
if (isset($params[ 'direction' ])) {
$counter[ 'direction' ] = $params[ 'direction' ];
}
-
- if ($counter[ 'direction' ] == "down") {
+ if ($counter[ 'direction' ] === 'down') {
$counter[ 'count' ] -= $counter[ 'skip' ];
} else {
$counter[ 'count' ] += $counter[ 'skip' ];
}
-
return $retval;
}
diff --git a/lib/smarty3/plugins/function.cycle.php b/lib/smarty3/plugins/function.cycle.php
index a76d49a..07ffcc5 100644
--- a/lib/smarty3/plugins/function.cycle.php
+++ b/lib/smarty3/plugins/function.cycle.php
@@ -5,15 +5,14 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
/**
* Smarty {cycle} function plugin
- * Type: function<br>
- * Name: cycle<br>
- * Date: May 3, 2002<br>
- * Purpose: cycle through given values<br>
+ * Type: function
+ * Name: cycle
+ * Date: May 3, 2002
+ * Purpose: cycle through given values
* Params:
- * <pre>
+ *
* - name - name of cycle (optional)
* - values - comma separated list of values to cycle, or an array of values to cycle
* (this can be left out for subsequent calls)
@@ -22,84 +21,72 @@
* - advance - boolean - whether or not to advance the cycle
* - delimiter - the value delimiter, default is ","
* - assign - boolean, assigns to template var instead of printed.
- * </pre>
- * Examples:<br>
- * <pre>
+ *
+ * Examples:
+ *
* {cycle values="#eeeeee,#d0d0d0d"}
* {cycle name=row values="one,two,three" reset=true}
* {cycle name=row}
- * </pre>
*
- * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
+ * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
* (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credit to Mark Priatel <mpriatel@rogers.com>
- * @author credit to Gerard <gerard@interfold.com>
- * @author credit to Jason Sweat <jsweat_php@yahoo.com>
- * @version 1.3
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author credit to Mark Priatel <mpriatel@rogers.com>
+ * @author credit to Gerard <gerard@interfold.com>
+ * @author credit to Jason Sweat <jsweat_php@yahoo.com>
+ * @version 1.3
*
* @param array $params parameters
* @param Smarty_Internal_Template $template template object
*
* @return string|null
*/
-
function smarty_function_cycle($params, $template)
{
static $cycle_vars;
-
$name = (empty($params[ 'name' ])) ? 'default' : $params[ 'name' ];
- $print = (isset($params[ 'print' ])) ? (bool) $params[ 'print' ] : true;
- $advance = (isset($params[ 'advance' ])) ? (bool) $params[ 'advance' ] : true;
- $reset = (isset($params[ 'reset' ])) ? (bool) $params[ 'reset' ] : false;
-
+ $print = (isset($params[ 'print' ])) ? (bool)$params[ 'print' ] : true;
+ $advance = (isset($params[ 'advance' ])) ? (bool)$params[ 'advance' ] : true;
+ $reset = (isset($params[ 'reset' ])) ? (bool)$params[ 'reset' ] : false;
if (!isset($params[ 'values' ])) {
if (!isset($cycle_vars[ $name ][ 'values' ])) {
- trigger_error("cycle: missing 'values' parameter");
-
+ trigger_error('cycle: missing \'values\' parameter');
return;
}
} else {
- if (isset($cycle_vars[ $name ][ 'values' ]) && $cycle_vars[ $name ][ 'values' ] != $params[ 'values' ]) {
+ if (isset($cycle_vars[ $name ][ 'values' ]) && $cycle_vars[ $name ][ 'values' ] !== $params[ 'values' ]) {
$cycle_vars[ $name ][ 'index' ] = 0;
}
$cycle_vars[ $name ][ 'values' ] = $params[ 'values' ];
}
-
if (isset($params[ 'delimiter' ])) {
$cycle_vars[ $name ][ 'delimiter' ] = $params[ 'delimiter' ];
} elseif (!isset($cycle_vars[ $name ][ 'delimiter' ])) {
$cycle_vars[ $name ][ 'delimiter' ] = ',';
}
-
if (is_array($cycle_vars[ $name ][ 'values' ])) {
$cycle_array = $cycle_vars[ $name ][ 'values' ];
} else {
$cycle_array = explode($cycle_vars[ $name ][ 'delimiter' ], $cycle_vars[ $name ][ 'values' ]);
}
-
if (!isset($cycle_vars[ $name ][ 'index' ]) || $reset) {
$cycle_vars[ $name ][ 'index' ] = 0;
}
-
if (isset($params[ 'assign' ])) {
$print = false;
$template->assign($params[ 'assign' ], $cycle_array[ $cycle_vars[ $name ][ 'index' ] ]);
}
-
if ($print) {
$retval = $cycle_array[ $cycle_vars[ $name ][ 'index' ] ];
} else {
$retval = null;
}
-
if ($advance) {
if ($cycle_vars[ $name ][ 'index' ] >= count($cycle_array) - 1) {
$cycle_vars[ $name ][ 'index' ] = 0;
} else {
- $cycle_vars[ $name ][ 'index' ] ++;
+ $cycle_vars[ $name ][ 'index' ]++;
}
}
-
return $retval;
}
diff --git a/lib/smarty3/plugins/function.fetch.php b/lib/smarty3/plugins/function.fetch.php
index cb60dd9..768761b 100644
--- a/lib/smarty3/plugins/function.fetch.php
+++ b/lib/smarty3/plugins/function.fetch.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
/**
* Smarty {fetch} plugin
- * Type: function<br>
- * Name: fetch<br>
+ * Type: function
+ * Name: fetch
* Purpose: fetch file, web or ftp data and display results
*
* @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
@@ -25,21 +24,17 @@
function smarty_function_fetch($params, $template)
{
if (empty($params[ 'file' ])) {
- trigger_error("[plugin] fetch parameter 'file' cannot be empty", E_USER_NOTICE);
-
+ trigger_error('[plugin] fetch parameter \'file\' cannot be empty', E_USER_NOTICE);
return;
}
-
// strip file protocol
if (stripos($params[ 'file' ], 'file://') === 0) {
$params[ 'file' ] = substr($params[ 'file' ], 7);
}
-
$protocol = strpos($params[ 'file' ], '://');
if ($protocol !== false) {
$protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
}
-
if (isset($template->smarty->security_policy)) {
if ($protocol) {
// remote resource (or php stream, …)
@@ -53,17 +48,16 @@ function smarty_function_fetch($params, $template)
}
}
}
-
$content = '';
- if ($protocol == 'http') {
+ if ($protocol === 'http') {
// http fetch
if ($uri_parts = parse_url($params[ 'file' ])) {
// set defaults
$host = $server_name = $uri_parts[ 'host' ];
$timeout = 30;
- $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
- $agent = "Smarty Template Engine " . Smarty::SMARTY_VERSION;
- $referer = "";
+ $accept = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
+ $agent = 'Smarty Template Engine ' . Smarty::SMARTY_VERSION;
+ $referer = '';
$uri = !empty($uri_parts[ 'path' ]) ? $uri_parts[ 'path' ] : '/';
$uri .= !empty($uri_parts[ 'query' ]) ? '?' . $uri_parts[ 'query' ] : '';
$_is_proxy = false;
@@ -81,72 +75,68 @@ function smarty_function_fetch($params, $template)
// loop through parameters, setup headers
foreach ($params as $param_key => $param_value) {
switch ($param_key) {
- case "file":
- case "assign":
- case "assign_headers":
+ case 'file':
+ case 'assign':
+ case 'assign_headers':
break;
- case "user":
+ case 'user':
if (!empty($param_value)) {
$user = $param_value;
}
break;
- case "pass":
+ case 'pass':
if (!empty($param_value)) {
$pass = $param_value;
}
break;
- case "accept":
+ case 'accept':
if (!empty($param_value)) {
$accept = $param_value;
}
break;
- case "header":
+ case 'header':
if (!empty($param_value)) {
if (!preg_match('![\w\d-]+: .+!', $param_value)) {
- trigger_error("[plugin] invalid header format '" . $param_value . "'", E_USER_NOTICE);
-
+ trigger_error("[plugin] invalid header format '{$param_value}'", E_USER_NOTICE);
return;
} else {
$extra_headers[] = $param_value;
}
}
break;
- case "proxy_host":
+ case 'proxy_host':
if (!empty($param_value)) {
$proxy_host = $param_value;
}
break;
- case "proxy_port":
+ case 'proxy_port':
if (!preg_match('!\D!', $param_value)) {
- $proxy_port = (int) $param_value;
+ $proxy_port = (int)$param_value;
} else {
- trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE);
-
+ trigger_error("[plugin] invalid value for attribute '{$param_key }'", E_USER_NOTICE);
return;
}
break;
- case "agent":
+ case 'agent':
if (!empty($param_value)) {
$agent = $param_value;
}
break;
- case "referer":
+ case 'referer':
if (!empty($param_value)) {
$referer = $param_value;
}
break;
- case "timeout":
+ case 'timeout':
if (!preg_match('!\D!', $param_value)) {
- $timeout = (int) $param_value;
+ $timeout = (int)$param_value;
} else {
- trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE);
-
+ trigger_error("[plugin] invalid value for attribute '{$param_key}'", E_USER_NOTICE);
return;
}
break;
default:
- trigger_error("[plugin] unrecognized attribute '" . $param_key . "'", E_USER_NOTICE);
-
+ trigger_error("[plugin] unrecognized attribute '{$param_key}'", E_USER_NOTICE);
return;
}
}
@@ -156,10 +146,8 @@ function smarty_function_fetch($params, $template)
} else {
$fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
}
-
if (!$fp) {
trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
-
return;
} else {
if ($_is_proxy) {
@@ -185,25 +173,21 @@ function smarty_function_fetch($params, $template)
}
}
if (!empty($user) && !empty($pass)) {
- fputs($fp, "Authorization: BASIC " . base64_encode("$user:$pass") . "\r\n");
+ fputs($fp, 'Authorization: BASIC ' . base64_encode("$user:$pass") . "\r\n");
}
-
fputs($fp, "\r\n");
while (!feof($fp)) {
$content .= fgets($fp, 4096);
}
fclose($fp);
$csplit = preg_split("!\r\n\r\n!", $content, 2);
-
$content = $csplit[ 1 ];
-
if (!empty($params[ 'assign_headers' ])) {
$template->assign($params[ 'assign_headers' ], preg_split("!\r\n!", $csplit[ 0 ]));
}
}
} else {
trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
-
return;
}
} else {
@@ -212,7 +196,6 @@ function smarty_function_fetch($params, $template)
throw new SmartyException("{fetch} cannot read resource '" . $params[ 'file' ] . "'");
}
}
-
if (!empty($params[ 'assign' ])) {
$template->assign($params[ 'assign' ], $content);
} else {
diff --git a/lib/smarty3/plugins/function.html_checkboxes.php b/lib/smarty3/plugins/function.html_checkboxes.php
index 33f2efe..302358e 100644
--- a/lib/smarty3/plugins/function.html_checkboxes.php
+++ b/lib/smarty3/plugins/function.html_checkboxes.php
@@ -5,22 +5,21 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
/**
* Smarty {html_checkboxes} function plugin
- * File: function.html_checkboxes.php<br>
- * Type: function<br>
- * Name: html_checkboxes<br>
- * Date: 24.Feb.2003<br>
- * Purpose: Prints out a list of checkbox input types<br>
+ * File: function.html_checkboxes.php
+ * Type: function
+ * Name: html_checkboxes
+ * Date: 24.Feb.2003
+ * Purpose: Prints out a list of checkbox input types
* Examples:
- * <pre>
+ *
* {html_checkboxes values=$ids output=$names}
* {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
* {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
+ *
* Params:
- * <pre>
+ *
* - name (optional) - string default "checkbox"
* - values (required) - array
* - options (optional) - associative array
@@ -29,24 +28,30 @@
* - output (optional) - the output next to each checkbox
* - assign (optional) - assign the output as an array to this variable
* - escape (optional) - escape the content (not value), defaults to true
- * </pre>
*
- * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
* (Smarty online manual)
- * @author Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte at ohrt dot com>
- * @version 1.0
+ * @author Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author credits to Monte Ohrt <monte at ohrt dot com>
+ * @version 1.0
*
- * @param array $params parameters
- * @param object $template template object
+ * @param array $params parameters
+ * @param Smarty_Internal_Template $template template object
*
* @return string
- * @uses smarty_function_escape_special_chars()
+ * @uses smarty_function_escape_special_chars()
+ * @throws \SmartyException
*/
-function smarty_function_html_checkboxes($params, $template)
+function smarty_function_html_checkboxes($params, Smarty_Internal_Template $template)
{
- require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
+ $template->_checkPlugins(
+ array(
+ array(
+ 'function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+ )
+ )
+ );
$name = 'checkbox';
$values = null;
$options = null;
@@ -56,120 +61,132 @@ function smarty_function_html_checkboxes($params, $template)
$labels = true;
$label_ids = false;
$output = null;
-
$extra = '';
-
foreach ($params as $_key => $_val) {
switch ($_key) {
case 'name':
case 'separator':
- $$_key = (string) $_val;
+ $$_key = (string)$_val;
break;
-
case 'escape':
case 'labels':
case 'label_ids':
- $$_key = (bool) $_val;
+ $$_key = (bool)$_val;
break;
-
case 'options':
- $$_key = (array) $_val;
+ $$_key = (array)$_val;
break;
-
case 'values':
case 'output':
- $$_key = array_values((array) $_val);
+ $$_key = array_values((array)$_val);
break;
-
case 'checked':
case 'selected':
if (is_array($_val)) {
$selected = array();
foreach ($_val as $_sel) {
if (is_object($_sel)) {
- if (method_exists($_sel, "__toString")) {
- $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
+ if (method_exists($_sel, '__toString')) {
+ $_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
} else {
- trigger_error("html_checkboxes: selected attribute contains an object of class '" .
- get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
+ trigger_error(
+ 'html_checkboxes: selected attribute contains an object of class \'' .
+ get_class($_sel) . '\' without __toString() method',
+ E_USER_NOTICE
+ );
continue;
}
} else {
- $_sel = smarty_function_escape_special_chars((string) $_sel);
+ $_sel = smarty_function_escape_special_chars((string)$_sel);
}
$selected[ $_sel ] = true;
}
} elseif (is_object($_val)) {
- if (method_exists($_val, "__toString")) {
- $selected = smarty_function_escape_special_chars((string) $_val->__toString());
+ if (method_exists($_val, '__toString')) {
+ $selected = smarty_function_escape_special_chars((string)$_val->__toString());
} else {
- trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) .
- "' without __toString() method", E_USER_NOTICE);
+ trigger_error(
+ 'html_checkboxes: selected attribute is an object of class \'' . get_class($_val) .
+ '\' without __toString() method',
+ E_USER_NOTICE
+ );
}
} else {
- $selected = smarty_function_escape_special_chars((string) $_val);
+ $selected = smarty_function_escape_special_chars((string)$_val);
}
break;
-
case 'checkboxes':
- trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
- E_USER_WARNING);
- $options = (array) $_val;
+ trigger_error(
+ 'html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
+ E_USER_WARNING
+ );
+ $options = (array)$_val;
break;
-
case 'assign':
break;
-
case 'strict':
break;
-
case 'disabled':
case 'readonly':
if (!empty($params[ 'strict' ])) {
if (!is_scalar($_val)) {
- trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
- E_USER_NOTICE);
+ trigger_error(
+ "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+ E_USER_NOTICE
+ );
}
-
if ($_val === true || $_val === $_key) {
$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
}
-
break;
}
// omit break; to fall through!
-
+ // no break
default:
if (!is_array($_val)) {
$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
} else {
- trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+ trigger_error("html_checkboxes: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
}
break;
}
}
-
if (!isset($options) && !isset($values)) {
return '';
} /* raise error here? */
-
$_html_result = array();
-
if (isset($options)) {
foreach ($options as $_key => $_val) {
$_html_result[] =
- smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
- $label_ids, $escape);
+ smarty_function_html_checkboxes_output(
+ $name,
+ $_key,
+ $_val,
+ $selected,
+ $extra,
+ $separator,
+ $labels,
+ $label_ids,
+ $escape
+ );
}
} else {
foreach ($values as $_i => $_key) {
$_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
$_html_result[] =
- smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
- $label_ids, $escape);
+ smarty_function_html_checkboxes_output(
+ $name,
+ $_key,
+ $_val,
+ $selected,
+ $extra,
+ $separator,
+ $labels,
+ $label_ids,
+ $escape
+ );
}
}
-
if (!empty($params[ 'assign' ])) {
$template->assign($params[ 'assign' ], $_html_result);
} else {
@@ -177,59 +194,82 @@ function smarty_function_html_checkboxes($params, $template)
}
}
-function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels,
- $label_ids, $escape = true)
-{
+/**
+ * @param $name
+ * @param $value
+ * @param $output
+ * @param $selected
+ * @param $extra
+ * @param $separator
+ * @param $labels
+ * @param $label_ids
+ * @param bool $escape
+ *
+ * @return string
+ */
+function smarty_function_html_checkboxes_output(
+ $name,
+ $value,
+ $output,
+ $selected,
+ $extra,
+ $separator,
+ $labels,
+ $label_ids,
+ $escape = true
+) {
$_output = '';
-
if (is_object($value)) {
- if (method_exists($value, "__toString")) {
- $value = (string) $value->__toString();
+ if (method_exists($value, '__toString')) {
+ $value = (string)$value->__toString();
} else {
- trigger_error("html_options: value is an object of class '" . get_class($value) .
- "' without __toString() method", E_USER_NOTICE);
-
+ trigger_error(
+ 'html_options: value is an object of class \'' . get_class($value) .
+ '\' without __toString() method',
+ E_USER_NOTICE
+ );
return '';
}
} else {
- $value = (string) $value;
+ $value = (string)$value;
}
-
if (is_object($output)) {
- if (method_exists($output, "__toString")) {
- $output = (string) $output->__toString();
+ if (method_exists($output, '__toString')) {
+ $output = (string)$output->__toString();
} else {
- trigger_error("html_options: output is an object of class '" . get_class($output) .
- "' without __toString() method", E_USER_NOTICE);
-
+ trigger_error(
+ 'html_options: output is an object of class \'' . get_class($output) .
+ '\' without __toString() method',
+ E_USER_NOTICE
+ );
return '';
}
} else {
- $output = (string) $output;
+ $output = (string)$output;
}
-
if ($labels) {
if ($label_ids) {
- $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
- $name . '_' . $value));
+ $_id = smarty_function_escape_special_chars(
+ preg_replace(
+ '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER,
+ '_',
+ $name . '_' . $value
+ )
+ );
$_output .= '<label for="' . $_id . '">';
} else {
$_output .= '<label>';
}
}
-
$name = smarty_function_escape_special_chars($name);
$value = smarty_function_escape_special_chars($value);
if ($escape) {
$output = smarty_function_escape_special_chars($output);
}
-
$_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
-
if ($labels && $label_ids) {
$_output .= ' id="' . $_id . '"';
}
-
if (is_array($selected)) {
if (isset($selected[ $value ])) {
$_output .= ' checked="checked"';
@@ -237,13 +277,10 @@ function smarty_function_html_checkboxes_output($name, $value, $output, $selecte
} elseif ($value === $selected) {
$_output .= ' checked="checked"';
}
-
$_output .= $extra . ' />' . $output;
if ($labels) {
$_output .= '</label>';
}
-
$_output .= $separator;
-
return $_output;
}
diff --git a/lib/smarty3/plugins/function.html_image.php b/lib/smarty3/plugins/function.html_image.php
index 854af61..ad468e4 100644
--- a/lib/smarty3/plugins/function.html_image.php
+++ b/lib/smarty3/plugins/function.html_image.php
@@ -5,23 +5,21 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
/**
* Smarty {html_image} function plugin
- * Type: function<br>
- * Name: html_image<br>
- * Date: Feb 24, 2003<br>
- * Purpose: format HTML tags for the image<br>
- * Examples: {html_image file="/images/masthead.gif"}<br>
- * Output: <img src="/images/masthead.gif" width=400 height=23><br>
+ * Type: function
+ * Name: html_image
+ * Date: Feb 24, 2003
+ * Purpose: format HTML tags for the image
+ * Examples: {html_image file="/images/masthead.gif"}
+ * Output: <img src="/images/masthead.gif" width=400 height=23>
* Params:
- * <pre>
+ *
* - file - (required) - file (and path) of image
* - height - (optional) - image height (default actual height)
* - width - (optional) - image width (default actual width)
* - basedir - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
* - path_prefix - prefix for path output (optional, default empty)
- * </pre>
*
* @link http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
* (Smarty online manual)
@@ -36,10 +34,16 @@
* @return string
* @uses smarty_function_escape_special_chars()
*/
-function smarty_function_html_image($params, $template)
+function smarty_function_html_image($params, Smarty_Internal_Template $template)
{
- require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
+ $template->_checkPlugins(
+ array(
+ array(
+ 'function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+ )
+ )
+ );
$alt = '';
$file = '';
$height = '';
@@ -59,53 +63,50 @@ function smarty_function_html_image($params, $template)
case 'basedir':
$$_key = $_val;
break;
-
case 'alt':
if (!is_array($_val)) {
$$_key = smarty_function_escape_special_chars($_val);
} else {
- throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+ throw new SmartyException(
+ "html_image: extra attribute '{$_key}' cannot be an array",
+ E_USER_NOTICE
+ );
}
break;
-
case 'link':
case 'href':
$prefix = '<a href="' . $_val . '">';
$suffix = '</a>';
break;
-
default:
if (!is_array($_val)) {
$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
} else {
- throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+ throw new SmartyException(
+ "html_image: extra attribute '{$_key}' cannot be an array",
+ E_USER_NOTICE
+ );
}
break;
}
}
-
if (empty($file)) {
- trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
-
+ trigger_error('html_image: missing \'file\' parameter', E_USER_NOTICE);
return;
}
-
- if ($file[ 0 ] == '/') {
+ if ($file[ 0 ] === '/') {
$_image_path = $basedir . $file;
} else {
$_image_path = $file;
}
-
// strip file protocol
if (stripos($params[ 'file' ], 'file://') === 0) {
$params[ 'file' ] = substr($params[ 'file' ], 7);
}
-
$protocol = strpos($params[ 'file' ], '://');
if ($protocol !== false) {
$protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
}
-
if (isset($template->smarty->security_policy)) {
if ($protocol) {
// remote resource (or php stream, …)
@@ -119,25 +120,20 @@ function smarty_function_html_image($params, $template)
}
}
}
-
if (!isset($params[ 'width' ]) || !isset($params[ 'height' ])) {
// FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
if (!$_image_data = @getimagesize($_image_path)) {
if (!file_exists($_image_path)) {
- trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
-
+ trigger_error("html_image: unable to find '{$_image_path}'", E_USER_NOTICE);
return;
} elseif (!is_readable($_image_path)) {
- trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
-
+ trigger_error("html_image: unable to read '{$_image_path}'", E_USER_NOTICE);
return;
} else {
- trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
-
+ trigger_error("html_image: '{$_image_path}' is not a valid image file", E_USER_NOTICE);
return;
}
}
-
if (!isset($params[ 'width' ])) {
$width = $_image_data[ 0 ];
}
@@ -145,7 +141,6 @@ function smarty_function_html_image($params, $template)
$height = $_image_data[ 1 ];
}
}
-
if (isset($params[ 'dpi' ])) {
if (strstr($_SERVER[ 'HTTP_USER_AGENT' ], 'Mac')) {
// FIXME: (rodneyrehm) wrong dpi assumption
@@ -158,7 +153,6 @@ function smarty_function_html_image($params, $template)
$width = round($width * $_resize);
$height = round($height * $_resize);
}
-
return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' .
$height . '"' . $extra . ' />' . $suffix;
}
diff --git a/lib/smarty3/plugins/function.html_options.php b/lib/smarty3/plugins/function.html_options.php
index 20e6677..6907e8e 100644
--- a/lib/smarty3/plugins/function.html_options.php
+++ b/lib/smarty3/plugins/function.html_options.php
@@ -5,15 +5,14 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
/**
* Smarty {html_options} function plugin
- * Type: function<br>
- * Name: html_options<br>
+ * Type: function
+ * Name: html_options
* Purpose: Prints the list of <option> tags generated from
- * the passed parameters<br>
+ * the passed parameters
* Params:
- * <pre>
+ *
* - name (optional) - string default "select"
* - values (required) - if no options supplied) - array
* - options (required) - if no values supplied) - associative array
@@ -21,22 +20,30 @@
* - output (required) - if not options supplied) - array
* - id (optional) - string default not set
* - class (optional) - string default not set
- * </pre>
*
- * @link http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
+ * @link http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
* (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
*
- * @param array $params parameters
+ * @param array $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
*
* @return string
- * @uses smarty_function_escape_special_chars()
+ * @uses smarty_function_escape_special_chars()
+ * @throws \SmartyException
*/
-function smarty_function_html_options($params)
+function smarty_function_html_options($params, Smarty_Internal_Template $template)
{
- require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
+ $template->_checkPlugins(
+ array(
+ array(
+ 'function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+ )
+ )
+ );
$name = null;
$values = null;
$options = null;
@@ -44,93 +51,88 @@ function smarty_function_html_options($params)
$output = null;
$id = null;
$class = null;
-
$extra = '';
-
foreach ($params as $_key => $_val) {
switch ($_key) {
case 'name':
case 'class':
case 'id':
- $$_key = (string) $_val;
+ $$_key = (string)$_val;
break;
-
case 'options':
- $options = (array) $_val;
+ $options = (array)$_val;
break;
-
case 'values':
case 'output':
- $$_key = array_values((array) $_val);
+ $$_key = array_values((array)$_val);
break;
-
case 'selected':
if (is_array($_val)) {
$selected = array();
foreach ($_val as $_sel) {
if (is_object($_sel)) {
- if (method_exists($_sel, "__toString")) {
- $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
+ if (method_exists($_sel, '__toString')) {
+ $_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
} else {
- trigger_error("html_options: selected attribute contains an object of class '" .
- get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
+ trigger_error(
+ 'html_options: selected attribute contains an object of class \'' .
+ get_class($_sel) . '\' without __toString() method',
+ E_USER_NOTICE
+ );
continue;
}
} else {
- $_sel = smarty_function_escape_special_chars((string) $_sel);
+ $_sel = smarty_function_escape_special_chars((string)$_sel);
}
$selected[ $_sel ] = true;
}
} elseif (is_object($_val)) {
- if (method_exists($_val, "__toString")) {
- $selected = smarty_function_escape_special_chars((string) $_val->__toString());
+ if (method_exists($_val, '__toString')) {
+ $selected = smarty_function_escape_special_chars((string)$_val->__toString());
} else {
- trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) .
- "' without __toString() method", E_USER_NOTICE);
+ trigger_error(
+ 'html_options: selected attribute is an object of class \'' . get_class($_val) .
+ '\' without __toString() method',
+ E_USER_NOTICE
+ );
}
} else {
- $selected = smarty_function_escape_special_chars((string) $_val);
+ $selected = smarty_function_escape_special_chars((string)$_val);
}
break;
-
case 'strict':
break;
-
case 'disabled':
case 'readonly':
if (!empty($params[ 'strict' ])) {
if (!is_scalar($_val)) {
- trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
- E_USER_NOTICE);
+ trigger_error(
+ "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+ E_USER_NOTICE
+ );
}
-
if ($_val === true || $_val === $_key) {
$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
}
-
break;
}
// omit break; to fall through!
-
+ // no break
default:
if (!is_array($_val)) {
$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
} else {
- trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+ trigger_error("html_options: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
}
break;
}
}
-
if (!isset($options) && !isset($values)) {
/* raise error here? */
-
return '';
}
-
$_html_result = '';
$_idx = 0;
-
if (isset($options)) {
foreach ($options as $_key => $_val) {
$_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
@@ -141,7 +143,6 @@ function smarty_function_html_options($params)
$_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
}
}
-
if (!empty($name)) {
$_html_class = !empty($class) ? ' class="' . $class . '"' : '';
$_html_id = !empty($id) ? ' id="' . $id . '"' : '';
@@ -149,10 +150,19 @@ function smarty_function_html_options($params)
'<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
'</select>' . "\n";
}
-
return $_html_result;
}
+/**
+ * @param $key
+ * @param $value
+ * @param $selected
+ * @param $id
+ * @param $class
+ * @param $idx
+ *
+ * @return string
+ */
function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
{
if (!is_array($value)) {
@@ -168,30 +178,47 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c
$_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
$_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
if (is_object($value)) {
- if (method_exists($value, "__toString")) {
- $value = smarty_function_escape_special_chars((string) $value->__toString());
+ if (method_exists($value, '__toString')) {
+ $value = smarty_function_escape_special_chars((string)$value->__toString());
} else {
- trigger_error("html_options: value is an object of class '" . get_class($value) .
- "' without __toString() method", E_USER_NOTICE);
-
+ trigger_error(
+ 'html_options: value is an object of class \'' . get_class($value) .
+ '\' without __toString() method',
+ E_USER_NOTICE
+ );
return '';
}
} else {
- $value = smarty_function_escape_special_chars((string) $value);
+ $value = smarty_function_escape_special_chars((string)$value);
}
$_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
- $idx ++;
+ $idx++;
} else {
$_idx = 0;
$_html_result =
- smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null,
- $class, $_idx);
- $idx ++;
+ smarty_function_html_options_optgroup(
+ $key,
+ $value,
+ $selected,
+ !empty($id) ? ($id . '-' . $idx) : null,
+ $class,
+ $_idx
+ );
+ $idx++;
}
-
return $_html_result;
}
+/**
+ * @param $key
+ * @param $values
+ * @param $selected
+ * @param $id
+ * @param $class
+ * @param $idx
+ *
+ * @return string
+ */
function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
{
$optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
@@ -199,6 +226,5 @@ function smarty_function_html_options_optgroup($key, $values, $selected, $id, $c
$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
}
$optgroup_html .= "</optgroup>\n";
-
return $optgroup_html;
}
diff --git a/lib/smarty3/plugins/function.html_radios.php b/lib/smarty3/plugins/function.html_radios.php
index 53b342d..5e83458 100644
--- a/lib/smarty3/plugins/function.html_radios.php
+++ b/lib/smarty3/plugins/function.html_radios.php
@@ -5,16 +5,15 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
/**
* Smarty {html_radios} function plugin
- * File: function.html_radios.php<br>
- * Type: function<br>
- * Name: html_radios<br>
- * Date: 24.Feb.2003<br>
- * Purpose: Prints out a list of radio input types<br>
+ * File: function.html_radios.php
+ * Type: function
+ * Name: html_radios
+ * Date: 24.Feb.2003
+ * Purpose: Prints out a list of radio input types
* Params:
- * <pre>
+ *
* - name (optional) - string default "radio"
* - values (required) - array
* - options (required) - associative array
@@ -23,13 +22,12 @@
* - output (optional) - the output next to each radio button
* - assign (optional) - assign the output as an array to this variable
* - escape (optional) - escape the content (not value), defaults to true
- * </pre>
+ *
* Examples:
- * <pre>
+ *
* {html_radios values=$ids output=$names}
* {html_radios values=$ids name='box' separator='<br>' output=$names}
* {html_radios values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
*
* @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
* (Smarty online manual)
@@ -42,11 +40,18 @@
*
* @return string
* @uses smarty_function_escape_special_chars()
+ * @throws \SmartyException
*/
-function smarty_function_html_radios($params, $template)
+function smarty_function_html_radios($params, Smarty_Internal_Template $template)
{
- require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
+ $template->_checkPlugins(
+ array(
+ array(
+ 'function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+ )
+ )
+ );
$name = 'radio';
$values = null;
$options = null;
@@ -57,106 +62,115 @@ function smarty_function_html_radios($params, $template)
$label_ids = false;
$output = null;
$extra = '';
-
foreach ($params as $_key => $_val) {
switch ($_key) {
case 'name':
case 'separator':
- $$_key = (string) $_val;
+ $$_key = (string)$_val;
break;
-
case 'checked':
case 'selected':
if (is_array($_val)) {
trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
} elseif (is_object($_val)) {
- if (method_exists($_val, "__toString")) {
- $selected = smarty_function_escape_special_chars((string) $_val->__toString());
+ if (method_exists($_val, '__toString')) {
+ $selected = smarty_function_escape_special_chars((string)$_val->__toString());
} else {
- trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) .
- "' without __toString() method", E_USER_NOTICE);
+ trigger_error(
+ 'html_radios: selected attribute is an object of class \'' . get_class($_val) .
+ '\' without __toString() method',
+ E_USER_NOTICE
+ );
}
} else {
- $selected = (string) $_val;
+ $selected = (string)$_val;
}
break;
-
case 'escape':
case 'labels':
case 'label_ids':
- $$_key = (bool) $_val;
+ $$_key = (bool)$_val;
break;
-
case 'options':
- $$_key = (array) $_val;
+ $$_key = (array)$_val;
break;
-
case 'values':
case 'output':
- $$_key = array_values((array) $_val);
+ $$_key = array_values((array)$_val);
break;
-
case 'radios':
- trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
- E_USER_WARNING);
- $options = (array) $_val;
+ trigger_error(
+ 'html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
+ E_USER_WARNING
+ );
+ $options = (array)$_val;
break;
-
case 'assign':
break;
-
case 'strict':
break;
-
case 'disabled':
case 'readonly':
if (!empty($params[ 'strict' ])) {
if (!is_scalar($_val)) {
- trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
- E_USER_NOTICE);
+ trigger_error(
+ "html_options: {$_key} attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+ E_USER_NOTICE
+ );
}
-
if ($_val === true || $_val === $_key) {
$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
}
-
break;
}
// omit break; to fall through!
-
+ // no break
default:
if (!is_array($_val)) {
$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
} else {
- trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+ trigger_error("html_radios: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
}
break;
}
}
-
if (!isset($options) && !isset($values)) {
/* raise error here? */
-
return '';
}
-
$_html_result = array();
-
if (isset($options)) {
foreach ($options as $_key => $_val) {
$_html_result[] =
- smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
- $label_ids, $escape);
+ smarty_function_html_radios_output(
+ $name,
+ $_key,
+ $_val,
+ $selected,
+ $extra,
+ $separator,
+ $labels,
+ $label_ids,
+ $escape
+ );
}
} else {
foreach ($values as $_i => $_key) {
$_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
$_html_result[] =
- smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
- $label_ids, $escape);
+ smarty_function_html_radios_output(
+ $name,
+ $_key,
+ $_val,
+ $selected,
+ $extra,
+ $separator,
+ $labels,
+ $label_ids,
+ $escape
+ );
}
}
-
if (!empty($params[ 'assign' ])) {
$template->assign($params[ 'assign' ], $_html_result);
} else {
@@ -164,69 +178,89 @@ function smarty_function_html_radios($params, $template)
}
}
-function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids,
- $escape)
-{
+/**
+ * @param $name
+ * @param $value
+ * @param $output
+ * @param $selected
+ * @param $extra
+ * @param $separator
+ * @param $labels
+ * @param $label_ids
+ * @param $escape
+ *
+ * @return string
+ */
+function smarty_function_html_radios_output(
+ $name,
+ $value,
+ $output,
+ $selected,
+ $extra,
+ $separator,
+ $labels,
+ $label_ids,
+ $escape
+) {
$_output = '';
-
if (is_object($value)) {
- if (method_exists($value, "__toString")) {
- $value = (string) $value->__toString();
+ if (method_exists($value, '__toString')) {
+ $value = (string)$value->__toString();
} else {
- trigger_error("html_options: value is an object of class '" . get_class($value) .
- "' without __toString() method", E_USER_NOTICE);
-
+ trigger_error(
+ 'html_options: value is an object of class \'' . get_class($value) .
+ '\' without __toString() method',
+ E_USER_NOTICE
+ );
return '';
}
} else {
- $value = (string) $value;
+ $value = (string)$value;
}
-
if (is_object($output)) {
- if (method_exists($output, "__toString")) {
- $output = (string) $output->__toString();
+ if (method_exists($output, '__toString')) {
+ $output = (string)$output->__toString();
} else {
- trigger_error("html_options: output is an object of class '" . get_class($output) .
- "' without __toString() method", E_USER_NOTICE);
-
+ trigger_error(
+ 'html_options: output is an object of class \'' . get_class($output) .
+ '\' without __toString() method',
+ E_USER_NOTICE
+ );
return '';
}
} else {
- $output = (string) $output;
+ $output = (string)$output;
}
-
if ($labels) {
if ($label_ids) {
- $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
- $name . '_' . $value));
+ $_id = smarty_function_escape_special_chars(
+ preg_replace(
+ '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER,
+ '_',
+ $name . '_' . $value
+ )
+ );
$_output .= '<label for="' . $_id . '">';
} else {
$_output .= '<label>';
}
}
-
$name = smarty_function_escape_special_chars($name);
$value = smarty_function_escape_special_chars($value);
if ($escape) {
$output = smarty_function_escape_special_chars($output);
}
-
$_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
-
if ($labels && $label_ids) {
$_output .= ' id="' . $_id . '"';
}
-
if ($value === $selected) {
$_output .= ' checked="checked"';
}
-
$_output .= $extra . ' />' . $output;
if ($labels) {
$_output .= '</label>';
}
-
$_output .= $separator;
-
return $_output;
}
diff --git a/lib/smarty3/plugins/function.html_select_date.php b/lib/smarty3/plugins/function.html_select_date.php
index 8191700..86403e3 100644
--- a/lib/smarty3/plugins/function.html_select_date.php
+++ b/lib/smarty3/plugins/function.html_select_date.php
@@ -5,23 +5,13 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
/**
* Smarty {html_select_date} plugin
- * Type: function<br>
- * Name: html_select_date<br>
+ * Type: function
+ * Name: html_select_date
* Purpose: Prints the dropdowns for date selection.
* ChangeLog:
- * <pre>
+ *
* - 1.0 initial release
* - 1.1 added support for +/- N syntax for begin
* and end year values. (Monte)
@@ -37,45 +27,54 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
* of 0000-00-00 dates (cybot, boots)
* - 2.0 complete rewrite for performance,
* added attributes month_names, *_id
- * </pre>
*
- * @link http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
+ * @link http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
* (Smarty online manual)
- * @version 2.0
- * @author Andrei Zmievski
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Rodney Rehm
+ * @version 2.0
+ * @author Andrei Zmievski
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Rodney Rehm
+ *
+ * @param array $params parameters
*
- * @param array $params parameters
+ * @param \Smarty_Internal_Template $template
*
* @return string
+ * @throws \SmartyException
*/
-function smarty_function_html_select_date($params)
+function smarty_function_html_select_date($params, Smarty_Internal_Template $template)
{
+ $template->_checkPlugins(
+ array(
+ array(
+ 'function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+ )
+ )
+ );
// generate timestamps used for month names only
static $_month_timestamps = null;
static $_current_year = null;
if ($_month_timestamps === null) {
$_current_year = date('Y');
$_month_timestamps = array();
- for ($i = 1; $i <= 12; $i ++) {
+ for ($i = 1; $i <= 12; $i++) {
$_month_timestamps[ $i ] = mktime(0, 0, 0, $i, 1, 2000);
}
}
-
/* Default values. */
- $prefix = "Date_";
+ $prefix = 'Date_';
$start_year = null;
$end_year = null;
$display_days = true;
$display_months = true;
$display_years = true;
- $month_format = "%B";
+ $month_format = '%B';
/* Write months as numbers by default GL */
- $month_value_format = "%m";
- $day_format = "%02d";
+ $month_value_format = '%m';
+ $day_format = '%02d';
/* Write day values using this format MB */
- $day_value_format = "%d";
+ $day_value_format = '%d';
$year_as_text = false;
/* Display years in reverse order? Ie. 2000,1999,.... */
$reverse_years = false;
@@ -111,23 +110,28 @@ function smarty_function_html_select_date($params)
$day_id = null;
$month_id = null;
$year_id = null;
-
foreach ($params as $_key => $_value) {
switch ($_key) {
case 'time':
if (!is_array($_value) && $_value !== null) {
+ $template->_checkPlugins(
+ array(
+ array(
+ 'function' => 'smarty_make_timestamp',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
+ )
+ )
+ );
$time = smarty_make_timestamp($_value);
}
break;
-
case 'month_names':
- if (is_array($_value) && count($_value) == 12) {
+ if (is_array($_value) && count($_value) === 12) {
$$_key = $_value;
} else {
- trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
+ trigger_error('html_select_date: month_names must be an array of 12 strings', E_USER_NOTICE);
}
break;
-
case 'prefix':
case 'field_array':
case 'start_year':
@@ -154,33 +158,34 @@ function smarty_function_html_select_date($params)
case 'month_id':
case 'day_id':
case 'year_id':
- $$_key = (string) $_value;
+ $$_key = (string)$_value;
break;
-
case 'display_days':
case 'display_months':
case 'display_years':
case 'year_as_text':
case 'reverse_years':
- $$_key = (bool) $_value;
+ $$_key = (bool)$_value;
break;
-
default:
if (!is_array($_value)) {
$extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
} else {
- trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+ trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
}
break;
}
}
-
// Note: date() is faster than strftime()
// Note: explode(date()) is faster than date() date() date()
if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
if (isset($params[ 'time' ][ $prefix . 'Year' ])) {
// $_REQUEST[$field_array] given
- foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+ foreach (array(
+ 'Y' => 'Year',
+ 'm' => 'Month',
+ 'd' => 'Day'
+ ) as $_elementKey => $_elementName) {
$_variableName = '_' . strtolower($_elementName);
$$_variableName =
isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
@@ -188,7 +193,11 @@ function smarty_function_html_select_date($params)
}
} elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Year' ])) {
// $_REQUEST given
- foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+ foreach (array(
+ 'Y' => 'Year',
+ 'm' => 'Month',
+ 'd' => 'Day'
+ ) as $_elementKey => $_elementName) {
$_variableName = '_' . strtolower($_elementName);
$$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
$params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
@@ -206,30 +215,30 @@ function smarty_function_html_select_date($params)
} else {
list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
}
-
// make syntax "+N" or "-N" work with $start_year and $end_year
// Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
- foreach (array('start', 'end') as $key) {
+ foreach (array(
+ 'start',
+ 'end'
+ ) as $key) {
$key .= '_year';
$t = $$key;
if ($t === null) {
- $$key = (int) $_current_year;
- } elseif ($t[ 0 ] == '+') {
- $$key = (int) ($_current_year + (int) trim(substr($t, 1)));
- } elseif ($t[ 0 ] == '-') {
- $$key = (int) ($_current_year - (int) trim(substr($t, 1)));
+ $$key = (int)$_current_year;
+ } elseif ($t[ 0 ] === '+') {
+ $$key = (int)($_current_year + (int)trim(substr($t, 1)));
+ } elseif ($t[ 0 ] === '-') {
+ $$key = (int)($_current_year - (int)trim(substr($t, 1)));
} else {
- $$key = (int) $$key;
+ $$key = (int)$$key;
}
}
-
// flip for ascending or descending
if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
$t = $end_year;
$end_year = $start_year;
$start_year = $t;
}
-
// generate year <select> or <input>
if ($display_years) {
$_extra = '';
@@ -240,7 +249,6 @@ function smarty_function_html_select_date($params)
if ($year_extra) {
$_extra .= ' ' . $year_extra;
}
-
if ($year_as_text) {
$_html_years =
'<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
@@ -248,31 +256,29 @@ function smarty_function_html_select_date($params)
} else {
$_html_years = '<select name="' . $_name . '"';
if ($year_id !== null || $all_id !== null) {
- $_html_years .= ' id="' . smarty_function_escape_special_chars($year_id !== null ?
- ($year_id ? $year_id : $_name) :
- ($all_id ? ($all_id . $_name) :
- $_name)) . '"';
+ $_html_years .= ' id="' . smarty_function_escape_special_chars(
+ $year_id !== null ?
+ ($year_id ? $year_id : $_name) :
+ ($all_id ? ($all_id . $_name) :
+ $_name)
+ ) . '"';
}
if ($year_size) {
$_html_years .= ' size="' . $year_size . '"';
}
$_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
-
if (isset($year_empty) || isset($all_empty)) {
$_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' .
$option_separator;
}
-
- $op = $start_year > $end_year ? - 1 : 1;
+ $op = $start_year > $end_year ? -1 : 1;
for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
$_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i .
'</option>' . $option_separator;
}
-
$_html_years .= '</select>';
}
}
-
// generate month <select> or <input>
if ($display_months) {
$_extra = '';
@@ -283,36 +289,33 @@ function smarty_function_html_select_date($params)
if ($month_extra) {
$_extra .= ' ' . $month_extra;
}
-
$_html_months = '<select name="' . $_name . '"';
if ($month_id !== null || $all_id !== null) {
- $_html_months .= ' id="' . smarty_function_escape_special_chars($month_id !== null ?
- ($month_id ? $month_id : $_name) :
- ($all_id ? ($all_id . $_name) :
- $_name)) . '"';
+ $_html_months .= ' id="' . smarty_function_escape_special_chars(
+ $month_id !== null ?
+ ($month_id ? $month_id : $_name) :
+ ($all_id ? ($all_id . $_name) :
+ $_name)
+ ) . '"';
}
if ($month_size) {
$_html_months .= ' size="' . $month_size . '"';
}
$_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
-
if (isset($month_empty) || isset($all_empty)) {
$_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' .
$option_separator;
}
-
- for ($i = 1; $i <= 12; $i ++) {
+ for ($i = 1; $i <= 12; $i++) {
$_val = sprintf('%02d', $i);
$_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
- ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
- $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
+ ($month_format === '%m' ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
+ $_value = $month_value_format === '%m' ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
$_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
'>' . $_text . '</option>' . $option_separator;
}
-
$_html_months .= '</select>';
}
-
// generate day <select> or <input>
if ($display_days) {
$_extra = '';
@@ -323,37 +326,34 @@ function smarty_function_html_select_date($params)
if ($day_extra) {
$_extra .= ' ' . $day_extra;
}
-
$_html_days = '<select name="' . $_name . '"';
if ($day_id !== null || $all_id !== null) {
$_html_days .= ' id="' .
- smarty_function_escape_special_chars($day_id !== null ? ($day_id ? $day_id : $_name) :
- ($all_id ? ($all_id . $_name) : $_name)) . '"';
+ smarty_function_escape_special_chars(
+ $day_id !== null ? ($day_id ? $day_id : $_name) :
+ ($all_id ? ($all_id . $_name) : $_name)
+ ) . '"';
}
if ($day_size) {
$_html_days .= ' size="' . $day_size . '"';
}
$_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
-
if (isset($day_empty) || isset($all_empty)) {
$_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' .
$option_separator;
}
-
- for ($i = 1; $i <= 31; $i ++) {
+ for ($i = 1; $i <= 31; $i++) {
$_val = sprintf('%02d', $i);
- $_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
- $_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i);
+ $_text = $day_format === '%02d' ? $_val : sprintf($day_format, $i);
+ $_value = $day_value_format === '%02d' ? $_val : sprintf($day_value_format, $i);
$_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' .
$_text . '</option>' . $option_separator;
}
-
$_html_days .= '</select>';
}
-
// order the fields for output
$_html = '';
- for ($i = 0; $i <= 2; $i ++) {
+ for ($i = 0; $i <= 2; $i++) {
switch ($field_order[ $i ]) {
case 'Y':
case 'y':
@@ -364,7 +364,6 @@ function smarty_function_html_select_date($params)
$_html .= $_html_years;
}
break;
-
case 'm':
case 'M':
if (isset($_html_months)) {
@@ -374,7 +373,6 @@ function smarty_function_html_select_date($params)
$_html .= $_html_months;
}
break;
-
case 'd':
case 'D':
if (isset($_html_days)) {
@@ -386,6 +384,5 @@ function smarty_function_html_select_date($params)
break;
}
}
-
return $_html;
}
diff --git a/lib/smarty3/plugins/function.html_select_time.php b/lib/smarty3/plugins/function.html_select_time.php
index 4a3639b..cb047bc 100644
--- a/lib/smarty3/plugins/function.html_select_time.php
+++ b/lib/smarty3/plugins/function.html_select_time.php
@@ -5,153 +5,147 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
/**
* Smarty {html_select_time} function plugin
- * Type: function<br>
- * Name: html_select_time<br>
+ * Type: function
+ * Name: html_select_time
* Purpose: Prints the dropdowns for time selection
*
- * @link http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
+ * @link http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
* (Smarty online manual)
- * @author Roberto Berto <roberto@berto.net>
- * @author Monte Ohrt <monte AT ohrt DOT com>
+ * @author Roberto Berto <roberto@berto.net>
+ * @author Monte Ohrt <monte AT ohrt DOT com>
+ *
+ * @param array $params parameters
*
- * @param array $params parameters
+ * @param \Smarty_Internal_Template $template
*
* @return string
- * @uses smarty_make_timestamp()
+ * @uses smarty_make_timestamp()
+ * @throws \SmartyException
*/
-function smarty_function_html_select_time($params)
+function smarty_function_html_select_time($params, Smarty_Internal_Template $template)
{
- $prefix = "Time_";
+ $template->_checkPlugins(
+ array(
+ array(
+ 'function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+ )
+ )
+ );
+ $prefix = 'Time_';
$field_array = null;
$field_separator = "\n";
$option_separator = "\n";
$time = null;
-
$display_hours = true;
$display_minutes = true;
$display_seconds = true;
$display_meridian = true;
-
$hour_format = '%02d';
$hour_value_format = '%02d';
$minute_format = '%02d';
$minute_value_format = '%02d';
$second_format = '%02d';
$second_value_format = '%02d';
-
$hour_size = null;
$minute_size = null;
$second_size = null;
$meridian_size = null;
-
$all_empty = null;
$hour_empty = null;
$minute_empty = null;
$second_empty = null;
$meridian_empty = null;
-
$all_id = null;
$hour_id = null;
$minute_id = null;
$second_id = null;
$meridian_id = null;
-
$use_24_hours = true;
$minute_interval = 1;
$second_interval = 1;
-
$extra_attrs = '';
$all_extra = null;
$hour_extra = null;
$minute_extra = null;
$second_extra = null;
$meridian_extra = null;
-
foreach ($params as $_key => $_value) {
switch ($_key) {
case 'time':
if (!is_array($_value) && $_value !== null) {
+ $template->_checkPlugins(
+ array(
+ array(
+ 'function' => 'smarty_make_timestamp',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
+ )
+ )
+ );
$time = smarty_make_timestamp($_value);
}
break;
-
case 'prefix':
case 'field_array':
-
case 'field_separator':
case 'option_separator':
-
case 'all_extra':
case 'hour_extra':
case 'minute_extra':
case 'second_extra':
case 'meridian_extra':
-
case 'all_empty':
case 'hour_empty':
case 'minute_empty':
case 'second_empty':
case 'meridian_empty':
-
case 'all_id':
case 'hour_id':
case 'minute_id':
case 'second_id':
case 'meridian_id':
-
case 'hour_format':
case 'hour_value_format':
case 'minute_format':
case 'minute_value_format':
case 'second_format':
case 'second_value_format':
- $$_key = (string) $_value;
+ $$_key = (string)$_value;
break;
-
case 'display_hours':
case 'display_minutes':
case 'display_seconds':
case 'display_meridian':
case 'use_24_hours':
- $$_key = (bool) $_value;
+ $$_key = (bool)$_value;
break;
-
case 'minute_interval':
case 'second_interval':
-
case 'hour_size':
case 'minute_size':
case 'second_size':
case 'meridian_size':
- $$_key = (int) $_value;
+ $$_key = (int)$_value;
break;
-
default:
if (!is_array($_value)) {
$extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
} else {
- trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+ trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
}
break;
}
}
-
if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
if (isset($params[ 'time' ][ $prefix . 'Hour' ])) {
// $_REQUEST[$field_array] given
- foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+ foreach (array(
+ 'H' => 'Hour',
+ 'i' => 'Minute',
+ 's' => 'Second'
+ ) as $_elementKey => $_elementName) {
$_variableName = '_' . strtolower($_elementName);
$$_variableName =
isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
@@ -164,7 +158,11 @@ function smarty_function_html_select_time($params)
list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
} elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Hour' ])) {
// $_REQUEST given
- foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+ foreach (array(
+ 'H' => 'Hour',
+ 'i' => 'Minute',
+ 's' => 'Second'
+ ) as $_elementKey => $_elementName) {
$_variableName = '_' . strtolower($_elementName);
$$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
$params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
@@ -186,7 +184,6 @@ function smarty_function_html_select_time($params)
} else {
list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
}
-
// generate hour <select>
if ($display_hours) {
$_html_hours = '';
@@ -198,42 +195,37 @@ function smarty_function_html_select_time($params)
if ($hour_extra) {
$_extra .= ' ' . $hour_extra;
}
-
$_html_hours = '<select name="' . $_name . '"';
if ($hour_id !== null || $all_id !== null) {
$_html_hours .= ' id="' .
- smarty_function_escape_special_chars($hour_id !== null ? ($hour_id ? $hour_id : $_name) :
- ($all_id ? ($all_id . $_name) : $_name)) . '"';
+ smarty_function_escape_special_chars(
+ $hour_id !== null ? ($hour_id ? $hour_id : $_name) :
+ ($all_id ? ($all_id . $_name) : $_name)
+ ) . '"';
}
if ($hour_size) {
$_html_hours .= ' size="' . $hour_size . '"';
}
$_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
-
if (isset($hour_empty) || isset($all_empty)) {
$_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' .
$option_separator;
}
-
$start = $use_24_hours ? 0 : 1;
$end = $use_24_hours ? 23 : 12;
- for ($i = $start; $i <= $end; $i ++) {
+ for ($i = $start; $i <= $end; $i++) {
$_val = sprintf('%02d', $i);
- $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
- $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
-
+ $_text = $hour_format === '%02d' ? $_val : sprintf($hour_format, $i);
+ $_value = $hour_value_format === '%02d' ? $_val : sprintf($hour_value_format, $i);
if (!$use_24_hours) {
$_hour12 = $_hour == 0 ? 12 : ($_hour <= 12 ? $_hour : $_hour - 12);
}
-
$selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
$_html_hours .= '<option value="' . $_value . '"' . ($selected ? ' selected="selected"' : '') . '>' .
$_text . '</option>' . $option_separator;
}
-
$_html_hours .= '</select>';
}
-
// generate minute <select>
if ($display_minutes) {
$_html_minutes = '';
@@ -245,36 +237,33 @@ function smarty_function_html_select_time($params)
if ($minute_extra) {
$_extra .= ' ' . $minute_extra;
}
-
$_html_minutes = '<select name="' . $_name . '"';
if ($minute_id !== null || $all_id !== null) {
- $_html_minutes .= ' id="' . smarty_function_escape_special_chars($minute_id !== null ?
- ($minute_id ? $minute_id : $_name) :
- ($all_id ? ($all_id . $_name) :
- $_name)) . '"';
+ $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
+ $minute_id !== null ?
+ ($minute_id ? $minute_id : $_name) :
+ ($all_id ? ($all_id . $_name) :
+ $_name)
+ ) . '"';
}
if ($minute_size) {
$_html_minutes .= ' size="' . $minute_size . '"';
}
$_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
-
if (isset($minute_empty) || isset($all_empty)) {
$_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' .
$option_separator;
}
-
$selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
for ($i = 0; $i <= 59; $i += $minute_interval) {
$_val = sprintf('%02d', $i);
- $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
- $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
+ $_text = $minute_format === '%02d' ? $_val : sprintf($minute_format, $i);
+ $_value = $minute_value_format === '%02d' ? $_val : sprintf($minute_value_format, $i);
$_html_minutes .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
'>' . $_text . '</option>' . $option_separator;
}
-
$_html_minutes .= '</select>';
}
-
// generate second <select>
if ($display_seconds) {
$_html_seconds = '';
@@ -286,36 +275,33 @@ function smarty_function_html_select_time($params)
if ($second_extra) {
$_extra .= ' ' . $second_extra;
}
-
$_html_seconds = '<select name="' . $_name . '"';
if ($second_id !== null || $all_id !== null) {
- $_html_seconds .= ' id="' . smarty_function_escape_special_chars($second_id !== null ?
- ($second_id ? $second_id : $_name) :
- ($all_id ? ($all_id . $_name) :
- $_name)) . '"';
+ $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
+ $second_id !== null ?
+ ($second_id ? $second_id : $_name) :
+ ($all_id ? ($all_id . $_name) :
+ $_name)
+ ) . '"';
}
if ($second_size) {
$_html_seconds .= ' size="' . $second_size . '"';
}
$_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
-
if (isset($second_empty) || isset($all_empty)) {
$_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' .
$option_separator;
}
-
$selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
for ($i = 0; $i <= 59; $i += $second_interval) {
$_val = sprintf('%02d', $i);
- $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
- $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
+ $_text = $second_format === '%02d' ? $_val : sprintf($second_format, $i);
+ $_value = $second_value_format === '%02d' ? $_val : sprintf($second_value_format, $i);
$_html_seconds .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
'>' . $_text . '</option>' . $option_separator;
}
-
$_html_seconds .= '</select>';
}
-
// generate meridian <select>
if ($display_meridian && !$use_24_hours) {
$_html_meridian = '';
@@ -327,33 +313,36 @@ function smarty_function_html_select_time($params)
if ($meridian_extra) {
$_extra .= ' ' . $meridian_extra;
}
-
$_html_meridian = '<select name="' . $_name . '"';
if ($meridian_id !== null || $all_id !== null) {
- $_html_meridian .= ' id="' . smarty_function_escape_special_chars($meridian_id !== null ?
- ($meridian_id ? $meridian_id :
- $_name) :
- ($all_id ? ($all_id . $_name) :
- $_name)) . '"';
+ $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
+ $meridian_id !== null ?
+ ($meridian_id ? $meridian_id :
+ $_name) :
+ ($all_id ? ($all_id . $_name) :
+ $_name)
+ ) . '"';
}
if ($meridian_size) {
$_html_meridian .= ' size="' . $meridian_size . '"';
}
$_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
-
if (isset($meridian_empty) || isset($all_empty)) {
$_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) .
'</option>' . $option_separator;
}
-
$_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .
'>AM</option>' . $option_separator . '<option value="pm"' .
($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator .
'</select>';
}
-
$_html = '';
- foreach (array('_html_hours', '_html_minutes', '_html_seconds', '_html_meridian') as $k) {
+ foreach (array(
+ '_html_hours',
+ '_html_minutes',
+ '_html_seconds',
+ '_html_meridian'
+ ) as $k) {
if (isset($$k)) {
if ($_html) {
$_html .= $field_separator;
@@ -361,6 +350,5 @@ function smarty_function_html_select_time($params)
$_html .= $$k;
}
}
-
return $_html;
}
diff --git a/lib/smarty3/plugins/function.html_table.php b/lib/smarty3/plugins/function.html_table.php
index 42e23e7..ae61e83 100644
--- a/lib/smarty3/plugins/function.html_table.php
+++ b/lib/smarty3/plugins/function.html_table.php
@@ -5,15 +5,14 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
/**
* Smarty {html_table} function plugin
- * Type: function<br>
- * Name: html_table<br>
- * Date: Feb 17, 2003<br>
- * Purpose: make an html table from an array of data<br>
+ * Type: function
+ * Name: html_table
+ * Date: Feb 17, 2003
+ * Purpose: make an html table from an array of data
* Params:
- * <pre>
+ *
* - loop - array to loop through
* - cols - number of columns, comma separated list of column names
* or array of column names
@@ -28,19 +27,18 @@
* - hdir - horizontal direction (default: "right", means left-to-right)
* - inner - inner loop (default "cols": print $loop line by line,
* $loop will be printed column by column otherwise)
- * </pre>
+ *
* Examples:
- * <pre>
+ *
* {table loop=$data}
* {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
* {table loop=$data cols="first,second,third" tr_attr=$colors}
- * </pre>
*
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credit to Messju Mohr <messju at lammfellpuschen dot de>
- * @author credit to boots <boots dot smarty at yahoo dot com>
- * @version 1.1
- * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author credit to Messju Mohr <messju at lammfellpuschen dot de>
+ * @author credit to boots <boots dot smarty at yahoo dot com>
+ * @version 1.1
+ * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
* (Smarty online manual)
*
* @param array $params parameters
@@ -61,19 +59,15 @@ function smarty_function_html_table($params)
$inner = 'cols';
$caption = '';
$loop = null;
-
if (!isset($params[ 'loop' ])) {
trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
-
return;
}
-
foreach ($params as $_key => $_value) {
switch ($_key) {
case 'loop':
- $$_key = (array) $_value;
+ $$_key = (array)$_value;
break;
-
case 'cols':
if (is_array($_value) && !empty($_value)) {
$cols = $_value;
@@ -82,25 +76,22 @@ function smarty_function_html_table($params)
$cols = explode(',', $_value);
$cols_count = count($cols);
} elseif (!empty($_value)) {
- $cols_count = (int) $_value;
+ $cols_count = (int)$_value;
} else {
$cols_count = $cols;
}
break;
-
case 'rows':
- $$_key = (int) $_value;
+ $$_key = (int)$_value;
break;
-
case 'table_attr':
case 'trailpad':
case 'hdir':
case 'vdir':
case 'inner':
case 'caption':
- $$_key = (string) $_value;
+ $$_key = (string)$_value;
break;
-
case 'tr_attr':
case 'td_attr':
case 'th_attr':
@@ -108,7 +99,6 @@ function smarty_function_html_table($params)
break;
}
}
-
$loop_count = count($loop);
if (empty($params[ 'rows' ])) {
/* no rows specified */
@@ -119,37 +109,30 @@ function smarty_function_html_table($params)
$cols_count = ceil($loop_count / $rows);
}
}
-
$output = "<table $table_attr>\n";
-
if (!empty($caption)) {
$output .= '<caption>' . $caption . "</caption>\n";
}
-
if (is_array($cols)) {
- $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
+ $cols = ($hdir === 'right') ? $cols : array_reverse($cols);
$output .= "<thead><tr>\n";
-
- for ($r = 0; $r < $cols_count; $r ++) {
+ for ($r = 0; $r < $cols_count; $r++) {
$output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
$output .= $cols[ $r ];
$output .= "</th>\n";
}
$output .= "</tr></thead>\n";
}
-
$output .= "<tbody>\n";
- for ($r = 0; $r < $rows; $r ++) {
+ for ($r = 0; $r < $rows; $r++) {
$output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
- $rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
-
- for ($c = 0; $c < $cols_count; $c ++) {
- $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
- if ($inner != 'cols') {
+ $rx = ($vdir === 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
+ for ($c = 0; $c < $cols_count; $c++) {
+ $x = ($hdir === 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
+ if ($inner !== 'cols') {
/* shuffle x to loop over rows*/
$x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
}
-
if ($x < $loop_count) {
$output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
} else {
@@ -160,10 +143,16 @@ function smarty_function_html_table($params)
}
$output .= "</tbody>\n";
$output .= "</table>\n";
-
return $output;
}
+/**
+ * @param $name
+ * @param $var
+ * @param $no
+ *
+ * @return string
+ */
function smarty_function_html_table_cycle($name, $var, $no)
{
if (!is_array($var)) {
@@ -171,6 +160,5 @@ function smarty_function_html_table_cycle($name, $var, $no)
} else {
$ret = $var[ $no % count($var) ];
}
-
return ($ret) ? ' ' . $ret : '';
}
diff --git a/lib/smarty3/plugins/function.mailto.php b/lib/smarty3/plugins/function.mailto.php
index 9d2a5d2..27351df 100644
--- a/lib/smarty3/plugins/function.mailto.php
+++ b/lib/smarty3/plugins/function.mailto.php
@@ -5,44 +5,42 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
/**
* Smarty {mailto} function plugin
- * Type: function<br>
- * Name: mailto<br>
+ * Type: function
+ * Name: mailto
* Date: May 21, 2002
- * Purpose: automate mailto address link creation, and optionally encode them.<br>
+ * Purpose: automate mailto address link creation, and optionally encode them.
* Params:
- * <pre>
+ *
* - address - (required) - e-mail address
* - text - (optional) - text to display, default is address
* - encode - (optional) - can be one of:
* * none : no encoding (default)
* * javascript : encode with javascript
* * javascript_charcode : encode with javascript charcode
- * * hex : encode with hexidecimal (no javascript)
+ * * hex : encode with hexadecimal (no javascript)
* - cc - (optional) - address(es) to carbon copy
* - bcc - (optional) - address(es) to blind carbon copy
* - subject - (optional) - e-mail subject
* - newsgroups - (optional) - newsgroup(s) to post to
* - followupto - (optional) - address(es) to follow up to
* - extra - (optional) - extra tags for the href link
- * </pre>
+ *
* Examples:
- * <pre>
+ *
* {mailto address="me@domain.com"}
* {mailto address="me@domain.com" encode="javascript"}
* {mailto address="me@domain.com" encode="hex"}
* {mailto address="me@domain.com" subject="Hello to you!"}
* {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
* {mailto address="me@domain.com" extra='class="mailto"'}
- * </pre>
*
- * @link http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
+ * @link http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
* (Smarty online manual)
- * @version 1.2
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credits to Jason Sweat (added cc, bcc and subject functionality)
+ * @version 1.2
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author credits to Jason Sweat (added cc, bcc and subject functionality)
*
* @param array $params parameters
*
@@ -53,15 +51,12 @@ function smarty_function_mailto($params)
static $_allowed_encoding =
array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
$extra = '';
-
if (empty($params[ 'address' ])) {
trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
-
return;
} else {
$address = $params[ 'address' ];
}
-
$text = $address;
// netscape and mozilla do not decode %40 (@) in BCC field (bug?)
// so, don't encode it.
@@ -77,61 +72,52 @@ function smarty_function_mailto($params)
$mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
}
break;
-
case 'subject':
case 'newsgroups':
$mail_parms[] = $var . '=' . rawurlencode($value);
break;
-
case 'extra':
case 'text':
$$var = $value;
-
+ // no break
default:
}
}
-
if ($mail_parms) {
$address .= '?' . join('&', $mail_parms);
}
-
$encode = (empty($params[ 'encode' ])) ? 'none' : $params[ 'encode' ];
if (!isset($_allowed_encoding[ $encode ])) {
- trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
- E_USER_WARNING);
-
+ trigger_error(
+ "mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
+ E_USER_WARNING
+ );
return;
}
// FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
- if ($encode == 'javascript') {
+ if ($encode === 'javascript') {
$string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-
$js_encode = '';
- for ($x = 0, $_length = strlen($string); $x < $_length; $x ++) {
+ for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
$js_encode .= '%' . bin2hex($string[ $x ]);
}
-
return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
- } elseif ($encode == 'javascript_charcode') {
+ } elseif ($encode === 'javascript_charcode') {
$string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
- for ($x = 0, $y = strlen($string); $x < $y; $x ++) {
+ for ($x = 0, $y = strlen($string); $x < $y; $x++) {
$ord[] = ord($string[ $x ]);
}
-
$_ret = "<script type=\"text/javascript\" language=\"javascript\">\n" . "{document.write(String.fromCharCode(" .
implode(',', $ord) . "))" . "}\n" . "</script>\n";
-
return $_ret;
- } elseif ($encode == 'hex') {
+ } elseif ($encode === 'hex') {
preg_match('!^(.*)(\?.*)$!', $address, $match);
if (!empty($match[ 2 ])) {
trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
-
return;
}
$address_encode = '';
- for ($x = 0, $_length = strlen($address); $x < $_length; $x ++) {
+ for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) {
$address_encode .= '%' . bin2hex($address[ $x ]);
} else {
@@ -139,12 +125,10 @@ function smarty_function_mailto($params)
}
}
$text_encode = '';
- for ($x = 0, $_length = strlen($text); $x < $_length; $x ++) {
+ for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
$text_encode .= '&#x' . bin2hex($text[ $x ]) . ';';
}
-
$mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
-
return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
} else {
// no encoding
diff --git a/lib/smarty3/plugins/function.math.php b/lib/smarty3/plugins/function.math.php
index 655fe72..7348d96 100644
--- a/lib/smarty3/plugins/function.math.php
+++ b/lib/smarty3/plugins/function.math.php
@@ -6,16 +6,15 @@
* @package Smarty
* @subpackage PluginsFunction
*/
-
/**
* Smarty {math} function plugin
- * Type: function<br>
- * Name: math<br>
+ * Type: function
+ * Name: math
* Purpose: handle math computations in template
*
- * @link http://www.smarty.net/manual/en/language.function.math.php {math}
+ * @link http://www.smarty.net/manual/en/language.function.math.php {math}
* (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Monte Ohrt <monte at ohrt dot com>
*
* @param array $params parameters
* @param Smarty_Internal_Template $template template object
@@ -25,69 +24,78 @@
function smarty_function_math($params, $template)
{
static $_allowed_funcs =
- array('int' => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
- 'log' => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true, 'rand' => true,
- 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true, 'tan' => true);
+ array(
+ 'int' => true,
+ 'abs' => true,
+ 'ceil' => true,
+ 'cos' => true,
+ 'exp' => true,
+ 'floor' => true,
+ 'log' => true,
+ 'log10' => true,
+ 'max' => true,
+ 'min' => true,
+ 'pi' => true,
+ 'pow' => true,
+ 'rand' => true,
+ 'round' => true,
+ 'sin' => true,
+ 'sqrt' => true,
+ 'srand' => true,
+ 'tan' => true
+ );
// be sure equation parameter is present
if (empty($params[ 'equation' ])) {
trigger_error("math: missing equation parameter", E_USER_WARNING);
-
return;
}
-
$equation = $params[ 'equation' ];
-
// make sure parenthesis are balanced
- if (substr_count($equation, "(") != substr_count($equation, ")")) {
+ if (substr_count($equation, '(') !== substr_count($equation, ')')) {
trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
-
return;
}
-
// disallow backticks
if (strpos($equation, '`') !== false) {
trigger_error("math: backtick character not allowed in equation", E_USER_WARNING);
-
return;
}
-
// also disallow dollar signs
if (strpos($equation, '$') !== false) {
trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING);
-
return;
}
-
+ foreach ($params as $key => $val) {
+ if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+ // make sure value is not empty
+ if (strlen($val) === 0) {
+ trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING);
+ return;
+ }
+ if (!is_numeric($val)) {
+ trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING);
+ return;
+ }
+ }
+ }
// match all vars in equation, make sure all are passed
preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match);
-
foreach ($match[ 1 ] as $curr_var) {
if ($curr_var && !isset($params[ $curr_var ]) && !isset($_allowed_funcs[ $curr_var ])) {
- trigger_error("math: function call $curr_var not allowed", E_USER_WARNING);
-
+ trigger_error(
+ "math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'",
+ E_USER_WARNING
+ );
return;
}
}
-
foreach ($params as $key => $val) {
- if ($key != "equation" && $key != "format" && $key != "assign") {
- // make sure value is not empty
- if (strlen($val) == 0) {
- trigger_error("math: parameter $key is empty", E_USER_WARNING);
-
- return;
- }
- if (!is_numeric($val)) {
- trigger_error("math: parameter $key: is not numeric", E_USER_WARNING);
-
- return;
- }
+ if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
$equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
}
}
$smarty_math_result = null;
eval("\$smarty_math_result = " . $equation . ";");
-
if (empty($params[ 'format' ])) {
if (empty($params[ 'assign' ])) {
return $smarty_math_result;
diff --git a/lib/smarty3/plugins/modifier.capitalize.php b/lib/smarty3/plugins/modifier.capitalize.php
index 6513a04..c5fc400 100644
--- a/lib/smarty3/plugins/modifier.capitalize.php
+++ b/lib/smarty3/plugins/modifier.capitalize.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifier
*/
-
/**
* Smarty capitalize modifier plugin
- * Type: modifier<br>
- * Name: capitalize<br>
+ * Type: modifier
+ * Name: capitalize
* Purpose: capitalize words in the string
* {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
*
@@ -29,50 +28,75 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
$upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
} else {
// uppercase word breaks
- $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
- 'smarty_mod_cap_mbconvert_cb', $string);
+ $upper_string = preg_replace_callback(
+ "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
+ 'smarty_mod_cap_mbconvert_cb',
+ $string
+ );
}
// check uc_digits case
if (!$uc_digits) {
- if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches,
- PREG_OFFSET_CAPTURE)) {
+ if (preg_match_all(
+ "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER,
+ $string,
+ $matches,
+ PREG_OFFSET_CAPTURE
+ )
+ ) {
foreach ($matches[ 1 ] as $match) {
$upper_string =
- substr_replace($upper_string, mb_strtolower($match[ 0 ], Smarty::$_CHARSET), $match[ 1 ],
- strlen($match[ 0 ]));
+ substr_replace(
+ $upper_string,
+ mb_strtolower($match[ 0 ], Smarty::$_CHARSET),
+ $match[ 1 ],
+ strlen($match[ 0 ])
+ );
}
}
}
$upper_string =
- preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb',
- $upper_string);
+ preg_replace_callback(
+ "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER,
+ 'smarty_mod_cap_mbconvert2_cb',
+ $upper_string
+ );
return $upper_string;
}
-
// lowercase first
if ($lc_rest) {
$string = strtolower($string);
}
// uppercase (including hyphenated words)
$upper_string =
- preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb',
- $string);
+ preg_replace_callback(
+ "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
+ 'smarty_mod_cap_ucfirst_cb',
+ $string
+ );
// check uc_digits case
if (!$uc_digits) {
- if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches,
- PREG_OFFSET_CAPTURE)) {
+ if (preg_match_all(
+ "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER,
+ $string,
+ $matches,
+ PREG_OFFSET_CAPTURE
+ )
+ ) {
foreach ($matches[ 1 ] as $match) {
$upper_string =
substr_replace($upper_string, strtolower($match[ 0 ]), $match[ 1 ], strlen($match[ 0 ]));
}
}
}
- $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb',
- $upper_string);
+ $upper_string = preg_replace_callback(
+ "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER,
+ 'smarty_mod_cap_ucfirst2_cb',
+ $upper_string
+ );
return $upper_string;
}
-/*
+/**
*
* Bug: create_function() use exhausts memory when used in long loops
* Fix: use declared functions for callbacks instead of using create_function()
@@ -80,21 +104,41 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
*
* @author Kyle Renfrow
*/
+/**
+ * @param $matches
+ *
+ * @return string
+ */
function smarty_mod_cap_mbconvert_cb($matches)
{
return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
}
+/**
+ * @param $matches
+ *
+ * @return string
+ */
function smarty_mod_cap_mbconvert2_cb($matches)
{
return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
}
+/**
+ * @param $matches
+ *
+ * @return string
+ */
function smarty_mod_cap_ucfirst_cb($matches)
{
return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
}
+/**
+ * @param $matches
+ *
+ * @return string
+ */
function smarty_mod_cap_ucfirst2_cb($matches)
{
return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));
diff --git a/lib/smarty3/plugins/modifier.date_format.php b/lib/smarty3/plugins/modifier.date_format.php
index 28d6ff0..23b6943 100644
--- a/lib/smarty3/plugins/modifier.date_format.php
+++ b/lib/smarty3/plugins/modifier.date_format.php
@@ -5,13 +5,12 @@
* @package Smarty
* @subpackage PluginsModifier
*/
-
/**
* Smarty date_format modifier plugin
- * Type: modifier<br>
- * Name: date_format<br>
- * Purpose: format datestamps via strftime<br>
- * Input:<br>
+ * Type: modifier
+ * Name: date_format
+ * Purpose: format datestamps via strftime
+ * Input:
* - string: input date string
* - format: strftime format for output
* - default_date: default date if $string is empty
@@ -35,18 +34,40 @@ function smarty_modifier_date_format($string, $format = null, $default_date = ''
/**
* require_once the {@link shared.make_timestamp.php} plugin
*/
- require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
- if ($string != '' && $string != '0000-00-00' && $string != '0000-00-00 00:00:00') {
+ static $is_loaded = false;
+ if (!$is_loaded) {
+ if (!is_callable('smarty_make_timestamp')) {
+ include_once SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php';
+ }
+ $is_loaded = true;
+ }
+ if ($string !== '' && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
$timestamp = smarty_make_timestamp($string);
- } elseif ($default_date != '') {
+ } elseif ($default_date !== '') {
$timestamp = smarty_make_timestamp($default_date);
} else {
return;
}
- if ($formatter == 'strftime' || ($formatter == 'auto' && strpos($format, '%') !== false)) {
- if (DS == '\\') {
- $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
- $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
+ if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) {
+ if (Smarty::$_IS_WINDOWS) {
+ $_win_from = array(
+ '%D',
+ '%h',
+ '%n',
+ '%r',
+ '%R',
+ '%t',
+ '%T'
+ );
+ $_win_to = array(
+ '%m/%d/%y',
+ '%b',
+ "\n",
+ '%I:%M:%S %p',
+ '%H:%M',
+ "\t",
+ '%H:%M:%S'
+ );
if (strpos($format, '%e') !== false) {
$_win_from[] = '%e';
$_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
@@ -57,7 +78,6 @@ function smarty_modifier_date_format($string, $format = null, $default_date = ''
}
$format = str_replace($_win_from, $_win_to, $format);
}
-
return strftime($format, $timestamp);
} else {
return date($format, $timestamp);
diff --git a/lib/smarty3/plugins/modifier.debug_print_var.php b/lib/smarty3/plugins/modifier.debug_print_var.php
index 34f85dc..78397d0 100644
--- a/lib/smarty3/plugins/modifier.debug_print_var.php
+++ b/lib/smarty3/plugins/modifier.debug_print_var.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage Debug
*/
-
/**
* Smarty debug_print_var modifier plugin
- * Type: modifier<br>
- * Name: debug_print_var<br>
+ * Type: modifier
+ * Name: debug_print_var
* Purpose: formats variable contents for display in the console
*
* @author Monte Ohrt <monte at ohrt dot com>
@@ -26,40 +25,38 @@ function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth =
{
$_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
switch (gettype($var)) {
- case 'array' :
+ case 'array':
$results = '<b>Array (' . count($var) . ')</b>';
- if ($depth == $max) {
+ if ($depth === $max) {
break;
}
foreach ($var as $curr_key => $curr_val) {
$results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b>' . strtr($curr_key, $_replace) .
'</b> =&gt; ' .
- smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
- $depth --;
+ smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
+ $depth--;
}
break;
-
- case 'object' :
+ case 'object':
$object_vars = get_object_vars($var);
$results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
if (in_array($var, $objects)) {
$results .= ' called recursive';
break;
}
- if ($depth == $max) {
+ if ($depth === $max) {
break;
}
$objects[] = $var;
foreach ($object_vars as $curr_key => $curr_val) {
$results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b> -&gt;' . strtr($curr_key, $_replace) .
- '</b> = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
- $depth --;
+ '</b> = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
+ $depth--;
}
break;
-
- case 'boolean' :
- case 'NULL' :
- case 'resource' :
+ case 'boolean':
+ case 'NULL':
+ case 'resource':
if (true === $var) {
$results = 'true';
} elseif (false === $var) {
@@ -67,17 +64,15 @@ function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth =
} elseif (null === $var) {
$results = 'null';
} else {
- $results = htmlspecialchars((string) $var);
+ $results = htmlspecialchars((string)$var);
}
$results = '<i>' . $results . '</i>';
break;
-
- case 'integer' :
- case 'float' :
- $results = htmlspecialchars((string) $var);
+ case 'integer':
+ case 'float':
+ $results = htmlspecialchars((string)$var);
break;
-
- case 'string' :
+ case 'string':
$results = strtr($var, $_replace);
if (Smarty::$_MBSTRING) {
if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
@@ -88,13 +83,11 @@ function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth =
$results = substr($var, 0, $length - 3) . '...';
}
}
-
$results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, Smarty::$_CHARSET);
break;
-
- case 'unknown type' :
- default :
- $results = strtr((string) $var, $_replace);
+ case 'unknown type':
+ default:
+ $results = strtr((string)$var, $_replace);
if (Smarty::$_MBSTRING) {
if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
$results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
@@ -104,9 +97,7 @@ function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth =
$results = substr($results, 0, $length - 3) . '...';
}
}
-
$results = htmlspecialchars($results, ENT_QUOTES, Smarty::$_CHARSET);
}
-
return $results;
}
diff --git a/lib/smarty3/plugins/modifier.escape.php b/lib/smarty3/plugins/modifier.escape.php
index b9842aa..150901c 100644
--- a/lib/smarty3/plugins/modifier.escape.php
+++ b/lib/smarty3/plugins/modifier.escape.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifier
*/
-
/**
* Smarty escape modifier plugin
- * Type: modifier<br>
- * Name: escape<br>
+ * Type: modifier
+ * Name: escape
* Purpose: escape string for output
*
* @link http://www.smarty.net/docs/en/language.modifier.escape
@@ -25,14 +24,14 @@
function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
{
static $_double_encode = null;
+ static $is_loaded_1 = false;
+ static $is_loaded_2 = false;
if ($_double_encode === null) {
$_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
}
-
if (!$char_set) {
$char_set = Smarty::$_CHARSET;
}
-
switch ($esc_type) {
case 'html':
if ($_double_encode) {
@@ -46,12 +45,21 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
// php <5.2.3 - prevent double encoding
$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
$string = htmlspecialchars($string, ENT_QUOTES, $char_set);
- $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-
+ $string = str_replace(
+ array(
+ '%%%SMARTY_START%%%',
+ '%%%SMARTY_END%%%'
+ ),
+ array(
+ '&',
+ ';'
+ ),
+ $string
+ );
return $string;
}
}
-
+ // no break
case 'htmlall':
if (Smarty::$_MBSTRING) {
// mb_convert_encoding ignores htmlspecialchars()
@@ -67,16 +75,23 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
$string = htmlspecialchars($string, ENT_QUOTES, $char_set);
$string =
- str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-
+ str_replace(
+ array(
+ '%%%SMARTY_START%%%',
+ '%%%SMARTY_END%%%'
+ ),
+ array(
+ '&',
+ ';'
+ ),
+ $string
+ );
return $string;
}
}
-
// htmlentities() won't convert everything, so use mb_convert_encoding
return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
}
-
// no MBString fallback
if ($_double_encode) {
return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
@@ -86,90 +101,134 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
} else {
$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
$string = htmlentities($string, ENT_QUOTES, $char_set);
- $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-
+ $string = str_replace(
+ array(
+ '%%%SMARTY_START%%%',
+ '%%%SMARTY_END%%%'
+ ),
+ array(
+ '&',
+ ';'
+ ),
+ $string
+ );
return $string;
}
}
-
+ // no break
case 'url':
return rawurlencode($string);
-
case 'urlpathinfo':
return str_replace('%2F', '/', rawurlencode($string));
-
case 'quotes':
// escape unescaped single quotes
return preg_replace("%(?<!\\\\)'%", "\\'", $string);
-
case 'hex':
// escape every byte into hex
// Note that the UTF-8 encoded character ä will be represented as %c3%a4
$return = '';
$_length = strlen($string);
- for ($x = 0; $x < $_length; $x ++) {
+ for ($x = 0; $x < $_length; $x++) {
$return .= '%' . bin2hex($string[ $x ]);
}
-
return $return;
-
case 'hexentity':
$return = '';
if (Smarty::$_MBSTRING) {
- require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
+ if (!$is_loaded_1) {
+ if (!is_callable('smarty_mb_to_unicode')) {
+ include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
+ }
+ $is_loaded_1 = true;
+ }
$return = '';
foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
$return .= '&#x' . strtoupper(dechex($unicode)) . ';';
}
-
return $return;
}
// no MBString fallback
$_length = strlen($string);
- for ($x = 0; $x < $_length; $x ++) {
+ for ($x = 0; $x < $_length; $x++) {
$return .= '&#x' . bin2hex($string[ $x ]) . ';';
}
-
return $return;
-
case 'decentity':
$return = '';
if (Smarty::$_MBSTRING) {
- require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
+ if (!$is_loaded_1) {
+ if (!is_callable('smarty_mb_to_unicode')) {
+ include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
+ }
+ $is_loaded_1 = true;
+ }
$return = '';
foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
$return .= '&#' . $unicode . ';';
}
-
return $return;
}
// no MBString fallback
$_length = strlen($string);
- for ($x = 0; $x < $_length; $x ++) {
+ for ($x = 0; $x < $_length; $x++) {
$return .= '&#' . ord($string[ $x ]) . ';';
}
-
return $return;
-
case 'javascript':
// escape quotes and backslashes, newlines, etc.
- return strtr($string, array('\\' => '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n',
- '</' => '<\/'));
-
+ return strtr(
+ $string,
+ array(
+ '\\' => '\\\\',
+ "'" => "\\'",
+ '"' => '\\"',
+ "\r" => '\\r',
+ "\n" => '\\n',
+ '</' => '<\/'
+ )
+ );
case 'mail':
if (Smarty::$_MBSTRING) {
- require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-
- return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
+ if (!$is_loaded_2) {
+ if (!is_callable('smarty_mb_str_replace')) {
+ include_once SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php';
+ }
+ $is_loaded_2 = true;
+ }
+ return smarty_mb_str_replace(
+ array(
+ '@',
+ '.'
+ ),
+ array(
+ ' [AT] ',
+ ' [DOT] '
+ ),
+ $string
+ );
}
// no MBString fallback
- return str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
-
+ return str_replace(
+ array(
+ '@',
+ '.'
+ ),
+ array(
+ ' [AT] ',
+ ' [DOT] '
+ ),
+ $string
+ );
case 'nonstd':
// escape non-standard chars, such as ms document quotes
$return = '';
if (Smarty::$_MBSTRING) {
- require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
+ if (!$is_loaded_1) {
+ if (!is_callable('smarty_mb_to_unicode')) {
+ include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
+ }
+ $is_loaded_1 = true;
+ }
foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
if ($unicode >= 126) {
$return .= '&#' . $unicode . ';';
@@ -177,12 +236,10 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
$return .= chr($unicode);
}
}
-
return $return;
}
-
$_length = strlen($string);
- for ($_i = 0; $_i < $_length; $_i ++) {
+ for ($_i = 0; $_i < $_length; $_i++) {
$_ord = ord(substr($string, $_i, 1));
// non-standard char, escape it
if ($_ord >= 126) {
@@ -191,9 +248,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
$return .= substr($string, $_i, 1);
}
}
-
return $return;
-
default:
return $string;
}
diff --git a/lib/smarty3/plugins/modifier.mb_wordwrap.php b/lib/smarty3/plugins/modifier.mb_wordwrap.php
new file mode 100644
index 0000000..1cd625b
--- /dev/null
+++ b/lib/smarty3/plugins/modifier.mb_wordwrap.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty wordwrap modifier plugin
+ * Type: modifier
+ * Name: mb_wordwrap
+ * Purpose: Wrap a string to a given number of characters
+ *
+ * @link http://php.net/manual/en/function.wordwrap.php for similarity
+ *
+ * @param string $str the string to wrap
+ * @param int $width the width of the output
+ * @param string $break the character used to break the line
+ * @param boolean $cut ignored parameter, just for the sake of
+ *
+ * @return string wrapped string
+ * @author Rodney Rehm
+ */
+function smarty_modifier_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
+{
+ // break words into tokens using white space as a delimiter
+ $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+ $length = 0;
+ $t = '';
+ $_previous = false;
+ $_space = false;
+ foreach ($tokens as $_token) {
+ $token_length = mb_strlen($_token, Smarty::$_CHARSET);
+ $_tokens = array($_token);
+ if ($token_length > $width) {
+ if ($cut) {
+ $_tokens = preg_split(
+ '!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER,
+ $_token,
+ -1,
+ PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE
+ );
+ }
+ }
+ foreach ($_tokens as $token) {
+ $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
+ $token_length = mb_strlen($token, Smarty::$_CHARSET);
+ $length += $token_length;
+ if ($length > $width) {
+ // remove space before inserted break
+ if ($_previous) {
+ $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
+ }
+ if (!$_space) {
+ // add the break before the token
+ if (!empty($t)) {
+ $t .= $break;
+ }
+ $length = $token_length;
+ }
+ } elseif ($token === "\n") {
+ // hard break must reset counters
+ $length = 0;
+ }
+ $_previous = $_space;
+ // add the token
+ $t .= $token;
+ }
+ }
+ return $t;
+}
diff --git a/lib/smarty3/plugins/modifier.regex_replace.php b/lib/smarty3/plugins/modifier.regex_replace.php
index 85f41fd..7eb5506 100644
--- a/lib/smarty3/plugins/modifier.regex_replace.php
+++ b/lib/smarty3/plugins/modifier.regex_replace.php
@@ -5,16 +5,15 @@
* @package Smarty
* @subpackage PluginsModifier
*/
-
/**
* Smarty regex_replace modifier plugin
- * Type: modifier<br>
- * Name: regex_replace<br>
+ * Type: modifier
+ * Name: regex_replace
* Purpose: regular expression search/replace
*
- * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
+ * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
* regex_replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Monte Ohrt <monte at ohrt dot com>
*
* @param string $string input string
* @param string|array $search regular expression(s) to search for
@@ -23,7 +22,7 @@
*
* @return string
*/
-function smarty_modifier_regex_replace($string, $search, $replace, $limit = - 1)
+function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
{
if (is_array($search)) {
foreach ($search as $idx => $s) {
@@ -32,7 +31,6 @@ function smarty_modifier_regex_replace($string, $search, $replace, $limit = - 1)
} else {
$search = _smarty_regex_replace_check($search);
}
-
return preg_replace($search, $replace, $string, $limit);
}
@@ -51,8 +49,7 @@ function _smarty_regex_replace_check($search)
}
// remove eval-modifier from $search
if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[ 1 ], 'e') !== false)) {
- $search = substr($search, 0, - strlen($match[ 1 ])) . preg_replace('![e\s]+!', '', $match[ 1 ]);
+ $search = substr($search, 0, -strlen($match[ 1 ])) . preg_replace('![e\s]+!', '', $match[ 1 ]);
}
-
return $search;
}
diff --git a/lib/smarty3/plugins/modifier.replace.php b/lib/smarty3/plugins/modifier.replace.php
index aa5e857..a98f5a4 100644
--- a/lib/smarty3/plugins/modifier.replace.php
+++ b/lib/smarty3/plugins/modifier.replace.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifier
*/
-
/**
* Smarty replace modifier plugin
- * Type: modifier<br>
- * Name: replace<br>
+ * Type: modifier
+ * Name: replace
* Purpose: simple search/replace
*
* @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
@@ -24,11 +23,15 @@
*/
function smarty_modifier_replace($string, $search, $replace)
{
+ static $is_loaded = false;
if (Smarty::$_MBSTRING) {
- require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-
+ if (!$is_loaded) {
+ if (!is_callable('smarty_mb_str_replace')) {
+ include_once SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php';
+ }
+ $is_loaded = true;
+ }
return smarty_mb_str_replace($search, $replace, $string);
}
-
return str_replace($search, $replace, $string);
}
diff --git a/lib/smarty3/plugins/modifier.spacify.php b/lib/smarty3/plugins/modifier.spacify.php
index e5c41ad..98efd4b 100644
--- a/lib/smarty3/plugins/modifier.spacify.php
+++ b/lib/smarty3/plugins/modifier.spacify.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifier
*/
-
/**
* Smarty spacify modifier plugin
- * Type: modifier<br>
- * Name: spacify<br>
+ * Type: modifier
+ * Name: spacify
* Purpose: add spaces between characters in a string
*
* @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
@@ -23,5 +22,5 @@
function smarty_modifier_spacify($string, $spacify_char = ' ')
{
// well… what about charsets besides latin and UTF-8?
- return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, - 1, PREG_SPLIT_NO_EMPTY));
+ return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
}
diff --git a/lib/smarty3/plugins/modifier.truncate.php b/lib/smarty3/plugins/modifier.truncate.php
index 6fe8442..bb881bf 100644
--- a/lib/smarty3/plugins/modifier.truncate.php
+++ b/lib/smarty3/plugins/modifier.truncate.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifier
*/
-
/**
* Smarty truncate modifier plugin
- * Type: modifier<br>
- * Name: truncate<br>
+ * Type: modifier
+ * Name: truncate
* Purpose: Truncate a string to a certain length if necessary,
* optionally splitting in the middle of a word, and
* appending the $etc string or inserting $etc into the middle.
@@ -27,28 +26,27 @@
*/
function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
{
- if ($length == 0) {
+ if ($length === 0) {
return '';
}
-
if (Smarty::$_MBSTRING) {
if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
$length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
if (!$break_words && !$middle) {
- $string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '',
- mb_substr($string, 0, $length + 1, Smarty::$_CHARSET));
+ $string = preg_replace(
+ '/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER,
+ '',
+ mb_substr($string, 0, $length + 1, Smarty::$_CHARSET)
+ );
}
if (!$middle) {
return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
}
-
return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc .
- mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET);
+ mb_substr($string, -$length / 2, $length, Smarty::$_CHARSET);
}
-
return $string;
}
-
// no MBString fallback
if (isset($string[ $length ])) {
$length -= min($length, strlen($etc));
@@ -58,9 +56,7 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
if (!$middle) {
return substr($string, 0, $length) . $etc;
}
-
- return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
+ return substr($string, 0, $length / 2) . $etc . substr($string, -$length / 2);
}
-
return $string;
}
diff --git a/lib/smarty3/plugins/modifiercompiler.cat.php b/lib/smarty3/plugins/modifiercompiler.cat.php
index db9d81f..21d0e66 100644
--- a/lib/smarty3/plugins/modifiercompiler.cat.php
+++ b/lib/smarty3/plugins/modifiercompiler.cat.php
@@ -5,19 +5,18 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty cat modifier plugin
- * Type: modifier<br>
- * Name: cat<br>
- * Date: Feb 24, 2003<br>
- * Purpose: catenate a value to a variable<br>
- * Input: string to catenate<br>
+ * Type: modifier
+ * Name: cat
+ * Date: Feb 24, 2003
+ * Purpose: catenate a value to a variable
+ * Input: string to catenate
* Example: {$var|cat:"foo"}
*
- * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
+ * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
* (Smarty online manual)
- * @author Uwe Tews
+ * @author Uwe Tews
*
* @param array $params parameters
*
diff --git a/lib/smarty3/plugins/modifiercompiler.count_characters.php b/lib/smarty3/plugins/modifiercompiler.count_characters.php
index 0a3ce25..6c44278 100644
--- a/lib/smarty3/plugins/modifiercompiler.count_characters.php
+++ b/lib/smarty3/plugins/modifiercompiler.count_characters.php
@@ -5,14 +5,14 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty count_characters modifier plugin
- * Type: modifier<br>
- * Name: count_characteres<br>
+ * Type: modifier
+ * Name: count_characters
* Purpose: count the number of characters in a text
*
- * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
+ * manual)
* @author Uwe Tews
*
* @param array $params parameters
@@ -21,7 +21,7 @@
*/
function smarty_modifiercompiler_count_characters($params)
{
- if (!isset($params[ 1 ]) || $params[ 1 ] != 'true') {
+ if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
}
if (Smarty::$_MBSTRING) {
diff --git a/lib/smarty3/plugins/modifiercompiler.count_paragraphs.php b/lib/smarty3/plugins/modifiercompiler.count_paragraphs.php
index f7f4477..e214a56 100644
--- a/lib/smarty3/plugins/modifiercompiler.count_paragraphs.php
+++ b/lib/smarty3/plugins/modifiercompiler.count_paragraphs.php
@@ -5,16 +5,15 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty count_paragraphs modifier plugin
- * Type: modifier<br>
- * Name: count_paragraphs<br>
+ * Type: modifier
+ * Name: count_paragraphs
* Purpose: count the number of paragraphs in a text
*
- * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
* count_paragraphs (Smarty online manual)
- * @author Uwe Tews
+ * @author Uwe Tews
*
* @param array $params parameters
*
diff --git a/lib/smarty3/plugins/modifiercompiler.count_sentences.php b/lib/smarty3/plugins/modifiercompiler.count_sentences.php
index 2003292..0277456 100644
--- a/lib/smarty3/plugins/modifiercompiler.count_sentences.php
+++ b/lib/smarty3/plugins/modifiercompiler.count_sentences.php
@@ -5,16 +5,15 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty count_sentences modifier plugin
- * Type: modifier<br>
+ * Type: modifier
* Name: count_sentences
* Purpose: count the number of sentences in a text
*
- * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
* count_sentences (Smarty online manual)
- * @author Uwe Tews
+ * @author Uwe Tews
*
* @param array $params parameters
*
diff --git a/lib/smarty3/plugins/modifiercompiler.count_words.php b/lib/smarty3/plugins/modifiercompiler.count_words.php
index f20a197..6d889da 100644
--- a/lib/smarty3/plugins/modifiercompiler.count_words.php
+++ b/lib/smarty3/plugins/modifiercompiler.count_words.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty count_words modifier plugin
- * Type: modifier<br>
- * Name: count_words<br>
+ * Type: modifier
+ * Name: count_words
* Purpose: count the number of words in a text
*
* @link http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
diff --git a/lib/smarty3/plugins/modifiercompiler.default.php b/lib/smarty3/plugins/modifiercompiler.default.php
index 2c4c00a..ae886c4 100644
--- a/lib/smarty3/plugins/modifiercompiler.default.php
+++ b/lib/smarty3/plugins/modifiercompiler.default.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty default modifier plugin
- * Type: modifier<br>
- * Name: default<br>
+ * Type: modifier
+ * Name: default
* Purpose: designate default value for empty variables
*
* @link http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
@@ -25,11 +24,9 @@ function smarty_modifiercompiler_default($params)
if (!isset($params[ 1 ])) {
$params[ 1 ] = "''";
}
-
array_shift($params);
foreach ($params as $param) {
$output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
}
-
return $output;
}
diff --git a/lib/smarty3/plugins/modifiercompiler.escape.php b/lib/smarty3/plugins/modifiercompiler.escape.php
index 4816106..e0763ad 100644
--- a/lib/smarty3/plugins/modifiercompiler.escape.php
+++ b/lib/smarty3/plugins/modifiercompiler.escape.php
@@ -5,42 +5,43 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php');
-
/**
* Smarty escape modifier plugin
- * Type: modifier<br>
- * Name: escape<br>
+ * Type: modifier
+ * Name: escape
* Purpose: escape string for output
*
* @link http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
* @author Rodney Rehm
*
- * @param array $params parameters
- * @param $compiler
+ * @param array $params parameters
+ * @param Smarty_Internal_TemplateCompilerBase $compiler
*
* @return string with compiled code
+ * @throws \SmartyException
*/
-function smarty_modifiercompiler_escape($params, $compiler)
+function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
{
static $_double_encode = null;
+ static $is_loaded = false;
+ $compiler->template->_checkPlugins(
+ array(
+ array(
+ 'function' => 'smarty_literal_compiler_param',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
+ )
+ )
+ );
if ($_double_encode === null) {
$_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
}
-
try {
$esc_type = smarty_literal_compiler_param($params, 1, 'html');
$char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
$double_encode = smarty_literal_compiler_param($params, 3, true);
-
if (!$char_set) {
$char_set = Smarty::$_CHARSET;
}
-
switch ($esc_type) {
case 'html':
if ($_double_encode) {
@@ -51,7 +52,7 @@ function smarty_modifiercompiler_escape($params, $compiler)
} else {
// fall back to modifier.escape.php
}
-
+ // no break
case 'htmlall':
if (Smarty::$_MBSTRING) {
if ($_double_encode) {
@@ -67,7 +68,6 @@ function smarty_modifiercompiler_escape($params, $compiler)
// fall back to modifier.escape.php
}
}
-
// no MBString fallback
if ($_double_encode) {
// php >=5.2.3 - go native
@@ -79,39 +79,34 @@ function smarty_modifiercompiler_escape($params, $compiler)
} else {
// fall back to modifier.escape.php
}
-
+ // no break
case 'url':
return 'rawurlencode(' . $params[ 0 ] . ')';
-
case 'urlpathinfo':
return 'str_replace("%2F", "/", rawurlencode(' . $params[ 0 ] . '))';
-
case 'quotes':
// escape unescaped single quotes
return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[ 0 ] . ')';
-
case 'javascript':
// escape quotes and backslashes, newlines, etc.
- return 'strtr(' . $params[ 0 ] .
+ return 'strtr(' .
+ $params[ 0 ] .
', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
}
- }
- catch (SmartyException $e) {
+ } catch (SmartyException $e) {
// pass through to regular plugin fallback
}
-
// could not optimize |escape call, so fallback to regular plugin
if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
- $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+ $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] =
SMARTY_PLUGINS_DIR . 'modifier.escape.php';
- $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+ $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] =
'smarty_modifier_escape';
} else {
- $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+ $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] =
SMARTY_PLUGINS_DIR . 'modifier.escape.php';
- $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+ $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] =
'smarty_modifier_escape';
}
-
return 'smarty_modifier_escape(' . join(', ', $params) . ')';
}
diff --git a/lib/smarty3/plugins/modifiercompiler.from_charset.php b/lib/smarty3/plugins/modifiercompiler.from_charset.php
index e25a957..acce778 100644
--- a/lib/smarty3/plugins/modifiercompiler.from_charset.php
+++ b/lib/smarty3/plugins/modifiercompiler.from_charset.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty from_charset modifier plugin
- * Type: modifier<br>
- * Name: from_charset<br>
+ * Type: modifier
+ * Name: from_charset
* Purpose: convert character encoding from $charset to internal encoding
*
* @author Rodney Rehm
@@ -24,10 +23,8 @@ function smarty_modifiercompiler_from_charset($params)
// FIXME: (rodneyrehm) shouldn't this throw an error?
return $params[ 0 ];
}
-
if (!isset($params[ 1 ])) {
$params[ 1 ] = '"ISO-8859-1"';
}
-
return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
}
diff --git a/lib/smarty3/plugins/modifiercompiler.indent.php b/lib/smarty3/plugins/modifiercompiler.indent.php
index 851f184..2088ad6 100644
--- a/lib/smarty3/plugins/modifiercompiler.indent.php
+++ b/lib/smarty3/plugins/modifiercompiler.indent.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty indent modifier plugin
- * Type: modifier<br>
- * Name: indent<br>
+ * Type: modifier
+ * Name: indent
* Purpose: indent lines of text
*
* @link http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
@@ -19,7 +18,6 @@
*
* @return string with compiled code
*/
-
function smarty_modifiercompiler_indent($params)
{
if (!isset($params[ 1 ])) {
@@ -28,6 +26,5 @@ function smarty_modifiercompiler_indent($params)
if (!isset($params[ 2 ])) {
$params[ 2 ] = "' '";
}
-
return 'preg_replace(\'!^!m\',str_repeat(' . $params[ 2 ] . ',' . $params[ 1 ] . '),' . $params[ 0 ] . ')';
}
diff --git a/lib/smarty3/plugins/modifiercompiler.lower.php b/lib/smarty3/plugins/modifiercompiler.lower.php
index a335eff..0d899a0 100644
--- a/lib/smarty3/plugins/modifiercompiler.lower.php
+++ b/lib/smarty3/plugins/modifiercompiler.lower.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty lower modifier plugin
- * Type: modifier<br>
- * Name: lower<br>
+ * Type: modifier
+ * Name: lower
* Purpose: convert string to lowercase
*
* @link http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
@@ -20,7 +19,6 @@
*
* @return string with compiled code
*/
-
function smarty_modifiercompiler_lower($params)
{
if (Smarty::$_MBSTRING) {
diff --git a/lib/smarty3/plugins/modifiercompiler.noprint.php b/lib/smarty3/plugins/modifiercompiler.noprint.php
index 4906908..1275190 100644
--- a/lib/smarty3/plugins/modifiercompiler.noprint.php
+++ b/lib/smarty3/plugins/modifiercompiler.noprint.php
@@ -5,14 +5,13 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty noprint modifier plugin
- * Type: modifier<br>
- * Name: noprint<br>
+ * Type: modifier
+ * Name: noprint
* Purpose: return an empty string
*
- * @author Uwe Tews
+ * @author Uwe Tews
* @return string with compiled code
*/
function smarty_modifiercompiler_noprint()
diff --git a/lib/smarty3/plugins/modifiercompiler.string_format.php b/lib/smarty3/plugins/modifiercompiler.string_format.php
index bcf9883..6630943 100644
--- a/lib/smarty3/plugins/modifiercompiler.string_format.php
+++ b/lib/smarty3/plugins/modifiercompiler.string_format.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty string_format modifier plugin
- * Type: modifier<br>
- * Name: string_format<br>
+ * Type: modifier
+ * Name: string_format
* Purpose: format strings via sprintf
*
* @link http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
diff --git a/lib/smarty3/plugins/modifiercompiler.strip.php b/lib/smarty3/plugins/modifiercompiler.strip.php
index 8173eed..04ea332 100644
--- a/lib/smarty3/plugins/modifiercompiler.strip.php
+++ b/lib/smarty3/plugins/modifiercompiler.strip.php
@@ -5,14 +5,13 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty strip modifier plugin
- * Type: modifier<br>
- * Name: strip<br>
+ * Type: modifier
+ * Name: strip
* Purpose: Replace all repeated spaces, newlines, tabs
- * with a single space or supplied replacement string.<br>
- * Example: {$var|strip} {$var|strip:"&nbsp;"}<br>
+ * with a single space or supplied replacement string.
+ * Example: {$var|strip} {$var|strip:"&nbsp;"}
* Date: September 25th, 2002
*
* @link http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
@@ -22,12 +21,10 @@
*
* @return string with compiled code
*/
-
function smarty_modifiercompiler_strip($params)
{
if (!isset($params[ 1 ])) {
$params[ 1 ] = "' '";
}
-
return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
}
diff --git a/lib/smarty3/plugins/modifiercompiler.strip_tags.php b/lib/smarty3/plugins/modifiercompiler.strip_tags.php
index e56bf93..1bca1a2 100644
--- a/lib/smarty3/plugins/modifiercompiler.strip_tags.php
+++ b/lib/smarty3/plugins/modifiercompiler.strip_tags.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty strip_tags modifier plugin
- * Type: modifier<br>
- * Name: strip_tags<br>
+ * Type: modifier
+ * Name: strip_tags
* Purpose: strip html tags from text
*
* @link http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
@@ -21,7 +20,7 @@
*/
function smarty_modifiercompiler_strip_tags($params)
{
- if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') == 'true') {
+ if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
} else {
return 'strip_tags(' . $params[ 0 ] . ')';
diff --git a/lib/smarty3/plugins/modifiercompiler.to_charset.php b/lib/smarty3/plugins/modifiercompiler.to_charset.php
index fea8d82..d652eab 100644
--- a/lib/smarty3/plugins/modifiercompiler.to_charset.php
+++ b/lib/smarty3/plugins/modifiercompiler.to_charset.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty to_charset modifier plugin
- * Type: modifier<br>
- * Name: to_charset<br>
+ * Type: modifier
+ * Name: to_charset
* Purpose: convert character encoding from internal encoding to $charset
*
* @author Rodney Rehm
@@ -24,10 +23,8 @@ function smarty_modifiercompiler_to_charset($params)
// FIXME: (rodneyrehm) shouldn't this throw an error?
return $params[ 0 ];
}
-
if (!isset($params[ 1 ])) {
$params[ 1 ] = '"ISO-8859-1"';
}
-
return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 1 ] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
}
diff --git a/lib/smarty3/plugins/modifiercompiler.unescape.php b/lib/smarty3/plugins/modifiercompiler.unescape.php
index a3409bc..05beb81 100644
--- a/lib/smarty3/plugins/modifiercompiler.unescape.php
+++ b/lib/smarty3/plugins/modifiercompiler.unescape.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty unescape modifier plugin
- * Type: modifier<br>
- * Name: unescape<br>
+ * Type: modifier
+ * Name: unescape
* Purpose: unescape html entities
*
* @author Rodney Rehm
@@ -26,24 +25,19 @@ function smarty_modifiercompiler_unescape($params)
if (!isset($params[ 2 ])) {
$params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
} else {
- $params[ 2 ] = "'" . $params[ 2 ] . "'";
+ $params[ 2 ] = "'{$params[ 2 ]}'";
}
-
switch (trim($params[ 1 ], '"\'')) {
case 'entity':
case 'htmlall':
if (Smarty::$_MBSTRING) {
return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'HTML-ENTITIES\')';
}
-
return 'html_entity_decode(' . $params[ 0 ] . ', ENT_NOQUOTES, ' . $params[ 2 ] . ')';
-
case 'html':
return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
-
case 'url':
return 'rawurldecode(' . $params[ 0 ] . ')';
-
default:
return $params[ 0 ];
}
diff --git a/lib/smarty3/plugins/modifiercompiler.upper.php b/lib/smarty3/plugins/modifiercompiler.upper.php
index a083c4f..ea4e95b 100644
--- a/lib/smarty3/plugins/modifiercompiler.upper.php
+++ b/lib/smarty3/plugins/modifiercompiler.upper.php
@@ -5,11 +5,10 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty upper modifier plugin
- * Type: modifier<br>
- * Name: lower<br>
+ * Type: modifier
+ * Name: lower
* Purpose: convert string to uppercase
*
* @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
diff --git a/lib/smarty3/plugins/modifiercompiler.wordwrap.php b/lib/smarty3/plugins/modifiercompiler.wordwrap.php
index 9184973..8565f14 100644
--- a/lib/smarty3/plugins/modifiercompiler.wordwrap.php
+++ b/lib/smarty3/plugins/modifiercompiler.wordwrap.php
@@ -5,22 +5,22 @@
* @package Smarty
* @subpackage PluginsModifierCompiler
*/
-
/**
* Smarty wordwrap modifier plugin
- * Type: modifier<br>
- * Name: wordwrap<br>
+ * Type: modifier
+ * Name: wordwrap
* Purpose: wrap a string of text at a given length
*
* @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
* @author Uwe Tews
*
- * @param array $params parameters
- * @param $compiler
+ * @param array $params parameters
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler
*
* @return string with compiled code
+ * @throws \SmartyException
*/
-function smarty_modifiercompiler_wordwrap($params, $compiler)
+function smarty_modifiercompiler_wordwrap($params, Smarty_Internal_TemplateCompilerBase $compiler)
{
if (!isset($params[ 1 ])) {
$params[ 1 ] = 80;
@@ -33,19 +33,7 @@ function smarty_modifiercompiler_wordwrap($params, $compiler)
}
$function = 'wordwrap';
if (Smarty::$_MBSTRING) {
- if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
- $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ 'wordwrap' ][ 'modifier' ][ 'file' ] =
- SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
- $compiler->template->required_plugins[ 'nocache' ][ 'wordwrap' ][ 'modifier' ][ 'function' ] =
- 'smarty_mb_wordwrap';
- } else {
- $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'wordwrap' ][ 'modifier' ][ 'file' ] =
- SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
- $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'wordwrap' ][ 'modifier' ][ 'function' ] =
- 'smarty_mb_wordwrap';
- }
- $function = 'smarty_mb_wordwrap';
+ $function = $compiler->getPlugin('mb_wordwrap', 'modifier');
}
-
return $function . '(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
}
diff --git a/lib/smarty3/plugins/outputfilter.trimwhitespace.php b/lib/smarty3/plugins/outputfilter.trimwhitespace.php
index 1a67123..7e4503a 100644
--- a/lib/smarty3/plugins/outputfilter.trimwhitespace.php
+++ b/lib/smarty3/plugins/outputfilter.trimwhitespace.php
@@ -5,85 +5,85 @@
* @package Smarty
* @subpackage PluginsFilter
*/
-
/**
* Smarty trimwhitespace outputfilter plugin
* Trim unnecessary whitespace from HTML markup.
*
- * @author Rodney Rehm
+ * @author Rodney Rehm
*
* @param string $source input string
*
* @return string filtered output
- * @todo substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
+ * @todo substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
*/
function smarty_outputfilter_trimwhitespace($source)
{
$store = array();
$_store = 0;
$_offset = 0;
-
// Unify Line-Breaks to \n
- $source = preg_replace("/\015\012|\015|\012/", "\n", $source);
-
+ $source = preg_replace('/\015\012|\015|\012/', "\n", $source);
// capture Internet Explorer and KnockoutJS Conditional Comments
- if (preg_match_all('#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is', $source, $matches,
- PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+ if (preg_match_all(
+ '#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is',
+ $source,
+ $matches,
+ PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+ )
+ ) {
foreach ($matches as $match) {
$store[] = $match[ 0 ][ 0 ];
$_length = strlen($match[ 0 ][ 0 ]);
$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
-
$_offset += $_length - strlen($replace);
- $_store ++;
+ $_store++;
}
}
-
// Strip all HTML-Comments
// yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
$source = preg_replace('#<!--.*?-->#ms', '', $source);
-
// capture html elements not to be messed with
$_offset = 0;
- if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
- $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+ if (preg_match_all(
+ '#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+ $source,
+ $matches,
+ PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+ )
+ ) {
foreach ($matches as $match) {
$store[] = $match[ 0 ][ 0 ];
$_length = strlen($match[ 0 ][ 0 ]);
$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
-
$_offset += $_length - strlen($replace);
- $_store ++;
+ $_store++;
}
}
-
$expressions = array(// replace multiple spaces between tags by a single space
// can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
- '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2',
+ '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2',
// remove spaces between attributes (but not in attribute values!)
'#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
// note: for some very weird reason trim() seems to remove spaces inside attributes.
// maybe a \0 byte or something is interfering?
- '#^\s+<#Ss' => '<', '#>\s+$#Ss' => '>',);
-
+ '#^\s+<#Ss' => '<',
+ '#>\s+$#Ss' => '>',
+ );
$source = preg_replace(array_keys($expressions), array_values($expressions), $source);
// note: for some very weird reason trim() seems to remove spaces inside attributes.
// maybe a \0 byte or something is interfering?
// $source = trim( $source );
-
$_offset = 0;
if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
foreach ($matches as $match) {
$_length = strlen($match[ 0 ][ 0 ]);
$replace = $store[ $match[ 1 ][ 0 ] ];
$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
-
$_offset += strlen($replace) - $_length;
- $_store ++;
+ $_store++;
}
}
-
return $source;
}
diff --git a/lib/smarty3/plugins/shared.escape_special_chars.php b/lib/smarty3/plugins/shared.escape_special_chars.php
index b68fe4b..6b18d3e 100644
--- a/lib/smarty3/plugins/shared.escape_special_chars.php
+++ b/lib/smarty3/plugins/shared.escape_special_chars.php
@@ -5,16 +5,15 @@
* @package Smarty
* @subpackage PluginsShared
*/
-
/**
* escape_special_chars common function
- * Function: smarty_function_escape_special_chars<br>
+ * Function: smarty_function_escape_special_chars
* Purpose: used by other smarty functions to escape
* special chars except for already escaped ones
*
- * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Monte Ohrt <monte at ohrt dot com>
*
- * @param string $string text that should by escaped
+ * @param string $string text that should by escaped
*
* @return string
*/
@@ -29,6 +28,5 @@ function smarty_function_escape_special_chars($string)
$string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
}
}
-
return $string;
}
diff --git a/lib/smarty3/plugins/shared.literal_compiler_param.php b/lib/smarty3/plugins/shared.literal_compiler_param.php
index 8a3711d..65caf03 100644
--- a/lib/smarty3/plugins/shared.literal_compiler_param.php
+++ b/lib/smarty3/plugins/shared.literal_compiler_param.php
@@ -5,7 +5,6 @@
* @package Smarty
* @subpackage PluginsShared
*/
-
/**
* evaluate compiler parameter
*
@@ -25,12 +24,12 @@ function smarty_literal_compiler_param($params, $index, $default = null)
}
// test if param is a literal
if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[ $index ])) {
- throw new SmartyException('$param[' . $index .
- '] is not a literal and is thus not evaluatable at compile time');
+ throw new SmartyException(
+ '$param[' . $index .
+ '] is not a literal and is thus not evaluatable at compile time'
+ );
}
-
$t = null;
eval("\$t = " . $params[ $index ] . ";");
-
return $t;
}
diff --git a/lib/smarty3/plugins/shared.make_timestamp.php b/lib/smarty3/plugins/shared.make_timestamp.php
index 67f8624..9626dc6 100644
--- a/lib/smarty3/plugins/shared.make_timestamp.php
+++ b/lib/smarty3/plugins/shared.make_timestamp.php
@@ -5,12 +5,11 @@
* @package Smarty
* @subpackage PluginsShared
*/
-
/**
- * Function: smarty_make_timestamp<br>
+ * Function: smarty_make_timestamp
* Purpose: used by other smarty functions to make a timestamp from a string.
*
- * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Monte Ohrt <monte at ohrt dot com>
*
* @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
*
@@ -21,25 +20,30 @@ function smarty_make_timestamp($string)
if (empty($string)) {
// use "now":
return time();
- } elseif ($string instanceof DateTime ||
- (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)
+ } elseif ($string instanceof DateTime
+ || (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)
) {
- return (int) $string->format('U'); // PHP 5.2 BC
- } elseif (strlen($string) == 14 && ctype_digit($string)) {
+ return (int)$string->format('U'); // PHP 5.2 BC
+ } elseif (strlen($string) === 14 && ctype_digit($string)) {
// it is mysql timestamp format of YYYYMMDDHHMMSS?
- return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2), substr($string, 4, 2),
- substr($string, 6, 2), substr($string, 0, 4));
+ return mktime(
+ substr($string, 8, 2),
+ substr($string, 10, 2),
+ substr($string, 12, 2),
+ substr($string, 4, 2),
+ substr($string, 6, 2),
+ substr($string, 0, 4)
+ );
} elseif (is_numeric($string)) {
// it is a numeric string, we handle it as timestamp
- return (int) $string;
+ return (int)$string;
} else {
// strtotime should handle it
$time = strtotime($string);
- if ($time == - 1 || $time === false) {
+ if ($time === -1 || $time === false) {
// strtotime() was not able to parse $string, use "now":
return time();
}
-
return $time;
}
}
diff --git a/lib/smarty3/plugins/shared.mb_str_replace.php b/lib/smarty3/plugins/shared.mb_str_replace.php
index 0c3ffe2..206cf9e 100644
--- a/lib/smarty3/plugins/shared.mb_str_replace.php
+++ b/lib/smarty3/plugins/shared.mb_str_replace.php
@@ -6,14 +6,13 @@
* @subpackage PluginsShared
*/
if (!function_exists('smarty_mb_str_replace')) {
-
/**
* Multibyte string replace
*
- * @param string $search the string to be searched
- * @param string $replace the replacement string
- * @param string $subject the source string
- * @param int &$count number of matches found
+ * @param string|string[] $search the string to be searched
+ * @param string|string[] $replace the replacement string
+ * @param string $subject the source string
+ * @param int &$count number of matches found
*
* @return string replaced string
* @author Rodney Rehm
@@ -37,7 +36,7 @@ if (!function_exists('smarty_mb_str_replace')) {
}
} else {
$n = max(count($search), count($replace));
- while ($n --) {
+ while ($n--) {
$subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
$count += $c;
next($search);
@@ -49,7 +48,6 @@ if (!function_exists('smarty_mb_str_replace')) {
$count = count($parts) - 1;
$subject = implode($replace, $parts);
}
-
return $subject;
}
}
diff --git a/lib/smarty3/plugins/shared.mb_unicode.php b/lib/smarty3/plugins/shared.mb_unicode.php
index 0f790b5..7d12065 100644
--- a/lib/smarty3/plugins/shared.mb_unicode.php
+++ b/lib/smarty3/plugins/shared.mb_unicode.php
@@ -5,7 +5,6 @@
* @package Smarty
* @subpackage PluginsShared
*/
-
/**
* convert characters to their decimal unicode equivalents
*
@@ -20,12 +19,11 @@
function smarty_mb_to_unicode($string, $encoding = null)
{
if ($encoding) {
- $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
+ $expanded = mb_convert_encoding($string, 'UTF-32BE', $encoding);
} else {
- $expanded = mb_convert_encoding($string, "UTF-32BE");
+ $expanded = mb_convert_encoding($string, 'UTF-32BE');
}
-
- return unpack("N*", $expanded);
+ return unpack('N*', $expanded);
}
/**
@@ -45,10 +43,9 @@ function smarty_mb_from_unicode($unicode, $encoding = null)
if (!$encoding) {
$encoding = mb_internal_encoding();
}
- foreach ((array) $unicode as $utf32be) {
- $character = pack("N*", $utf32be);
- $t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
+ foreach ((array)$unicode as $utf32be) {
+ $character = pack('N*', $utf32be);
+ $t .= mb_convert_encoding($character, $encoding, 'UTF-32BE');
}
-
return $t;
}
diff --git a/lib/smarty3/plugins/variablefilter.htmlspecialchars.php b/lib/smarty3/plugins/variablefilter.htmlspecialchars.php
index aecd1e7..3c85295 100644
--- a/lib/smarty3/plugins/variablefilter.htmlspecialchars.php
+++ b/lib/smarty3/plugins/variablefilter.htmlspecialchars.php
@@ -5,15 +5,15 @@
* @package Smarty
* @subpackage PluginsFilter
*/
-
/**
* Smarty htmlspecialchars variablefilter plugin
*
- * @param string $source input string
+ * @param string $source input string
+ * @param \Smarty_Internal_Template $template
*
* @return string filtered output
*/
-function smarty_variablefilter_htmlspecialchars($source)
+function smarty_variablefilter_htmlspecialchars($source, Smarty_Internal_Template $template)
{
return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
}
diff --git a/lib/smarty3/sysplugins/smarty_cacheresource.php b/lib/smarty3/sysplugins/smarty_cacheresource.php
index 2a4552c..91e9f39 100644
--- a/lib/smarty3/sysplugins/smarty_cacheresource.php
+++ b/lib/smarty3/sysplugins/smarty_cacheresource.php
@@ -25,12 +25,12 @@ abstract class Smarty_CacheResource
/**
* populate Cached Object with meta data from Resource
*
- * @param Smarty_Template_Cached $cached cached object
+ * @param \Smarty_Template_Cached $cached cached object
* @param Smarty_Internal_Template $_template template object
*
* @return void
*/
- abstract public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
+ abstract public function populate(\Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
/**
* populate Cached Object with timestamp and exists from Resource
@@ -50,8 +50,11 @@ abstract class Smarty_CacheResource
*
* @return boolean true or false if the cached content does not exist
*/
- abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null,
- $update = false);
+ abstract public function process(
+ Smarty_Internal_Template $_template,
+ Smarty_Template_Cached $cached = null,
+ $update = false
+ );
/**
* Write the rendered template output to cache
@@ -66,11 +69,11 @@ abstract class Smarty_CacheResource
/**
* Read cached template from cache
*
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Internal_Template $_template template object
*
* @return string content
*/
- abstract function readCachedContent(Smarty_Internal_Template $_template);
+ abstract public function readCachedContent(Smarty_Internal_Template $_template);
/**
* Return cached content
@@ -87,7 +90,6 @@ abstract class Smarty_CacheResource
$unifunc($_template);
return ob_get_clean();
}
-
return null;
}
@@ -133,7 +135,6 @@ abstract class Smarty_CacheResource
}
sleep(1);
}
-
return $hadLock;
}
@@ -193,12 +194,10 @@ abstract class Smarty_CacheResource
if (!isset($type)) {
$type = $smarty->caching_type;
}
-
// try smarty's cache
if (isset($smarty->_cache[ 'cacheresource_handlers' ][ $type ])) {
return $smarty->_cache[ 'cacheresource_handlers' ][ $type ];
}
-
// try registered resource
if (isset($smarty->registered_cache_resources[ $type ])) {
// do not cache these instances as they may vary from instance to instance
diff --git a/lib/smarty3/sysplugins/smarty_cacheresource_custom.php b/lib/smarty3/sysplugins/smarty_cacheresource_custom.php
index 8f1290e..68ad112 100644
--- a/lib/smarty3/sysplugins/smarty_cacheresource_custom.php
+++ b/lib/smarty3/sysplugins/smarty_cacheresource_custom.php
@@ -18,12 +18,12 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
/**
* fetch cached content and its modification time from data source
*
- * @param string $id unique cache content identifier
- * @param string $name template name
- * @param string $cache_id cache id
- * @param string $compile_id compile id
- * @param string $content cached content
- * @param integer $mtime cache modification timestamp (epoch)
+ * @param string $id unique cache content identifier
+ * @param string $name template name
+ * @param string $cache_id cache id
+ * @param string $compile_id compile id
+ * @param string $content cached content
+ * @param integer $mtime cache modification timestamp (epoch)
*
* @return void
*/
@@ -34,10 +34,10 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
* {@internal implementing this method is optional.
* Only implement it if modification times can be accessed faster than loading the complete cached content.}}
*
- * @param string $id unique cache content identifier
- * @param string $name template name
- * @param string $cache_id cache id
- * @param string $compile_id compile id
+ * @param string $id unique cache content identifier
+ * @param string $name template name
+ * @param string $cache_id cache id
+ * @param string $compile_id compile id
*
* @return integer|boolean timestamp (epoch) the template was modified, or false if not found
*/
@@ -49,12 +49,12 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
/**
* Save content to cache
*
- * @param string $id unique cache content identifier
- * @param string $name template name
- * @param string $cache_id cache id
- * @param string $compile_id compile id
- * @param integer|null $exp_time seconds till expiration or null
- * @param string $content content to cache
+ * @param string $id unique cache content identifier
+ * @param string $name template name
+ * @param string $cache_id cache id
+ * @param string $compile_id compile id
+ * @param integer|null $exp_time seconds till expiration or null
+ * @param string $content content to cache
*
* @return boolean success
*/
@@ -63,10 +63,10 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
/**
* Delete content from cache
*
- * @param string|null $name template name
- * @param string|null $cache_id cache id
- * @param string|null $compile_id compile id
- * @param integer|null $exp_time seconds till expiration time in seconds or null
+ * @param string|null $name template name
+ * @param string|null $cache_id cache id
+ * @param string|null $compile_id compile id
+ * @param integer|null $exp_time seconds till expiration time in seconds or null
*
* @return integer number of deleted caches
*/
@@ -75,8 +75,8 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
/**
* populate Cached Object with meta data from Resource
*
- * @param Smarty_Template_Cached $cached cached object
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Template_Cached $cached cached object
+ * @param Smarty_Internal_Template $_template template object
*
* @return void
*/
@@ -106,12 +106,17 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
if ($mtime !== null) {
$cached->timestamp = $mtime;
$cached->exists = !!$cached->timestamp;
-
return;
}
$timestamp = null;
- $this->fetch($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id, $cached->content,
- $timestamp);
+ $this->fetch(
+ $cached->filepath,
+ $cached->source->name,
+ $cached->cache_id,
+ $cached->compile_id,
+ $cached->content,
+ $timestamp
+ );
$cached->timestamp = isset($timestamp) ? $timestamp : false;
$cached->exists = !!$cached->timestamp;
}
@@ -120,50 +125,63 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
* Read the cached template and process the header
*
* @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
- * @param Smarty_Template_Cached $cached cached object
+ * @param Smarty_Template_Cached $cached cached object
* @param boolean $update flag if called because cache update
*
* @return boolean true or false if the cached content does not exist
*/
- public function process(Smarty_Internal_Template $_smarty_tpl, Smarty_Template_Cached $cached = null,
- $update = false)
- {
+ public function process(
+ Smarty_Internal_Template $_smarty_tpl,
+ Smarty_Template_Cached $cached = null,
+ $update = false
+ ) {
if (!$cached) {
$cached = $_smarty_tpl->cached;
}
$content = $cached->content ? $cached->content : null;
$timestamp = $cached->timestamp ? $cached->timestamp : null;
if ($content === null || !$timestamp) {
- $this->fetch($_smarty_tpl->cached->filepath, $_smarty_tpl->source->name, $_smarty_tpl->cache_id,
- $_smarty_tpl->compile_id, $content, $timestamp);
+ $this->fetch(
+ $_smarty_tpl->cached->filepath,
+ $_smarty_tpl->source->name,
+ $_smarty_tpl->cache_id,
+ $_smarty_tpl->compile_id,
+ $content,
+ $timestamp
+ );
}
if (isset($content)) {
- eval("?>" . $content);
+ eval('?>' . $content);
$cached->content = null;
return true;
}
-
return false;
}
/**
* Write the rendered template output to cache
*
- * @param Smarty_Internal_Template $_template template object
- * @param string $content content to cache
+ * @param Smarty_Internal_Template $_template template object
+ * @param string $content content to cache
*
* @return boolean success
*/
public function writeCachedContent(Smarty_Internal_Template $_template, $content)
{
- return $this->save($_template->cached->filepath, $_template->source->name, $_template->cache_id,
- $_template->compile_id, $_template->cache_lifetime, $content);
+ return $this->save(
+ $_template->cached->filepath,
+ $_template->source->name,
+ $_template->cache_id,
+ $_template->compile_id,
+ $_template->cache_lifetime,
+ $content
+ );
}
/**
* Read cached template from cache
*
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Internal_Template $_template template object
*
* @return string|boolean content
*/
@@ -173,8 +191,14 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
$timestamp = null;
if ($content === null) {
$timestamp = null;
- $this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id,
- $_template->compile_id, $content, $timestamp);
+ $this->fetch(
+ $_template->cached->filepath,
+ $_template->source->name,
+ $_template->cache_id,
+ $_template->compile_id,
+ $content,
+ $timestamp
+ );
}
if (isset($content)) {
return $content;
@@ -185,8 +209,8 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
/**
* Empty cache
*
- * @param Smarty $smarty Smarty object
- * @param integer $exp_time expiration time (number of seconds, not timestamp)
+ * @param Smarty $smarty Smarty object
+ * @param integer $exp_time expiration time (number of seconds, not timestamp)
*
* @return integer number of cache files deleted
*/
@@ -198,18 +222,18 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
/**
* Empty cache for a specific template
*
- * @param Smarty $smarty Smarty object
- * @param string $resource_name template name
- * @param string $cache_id cache id
- * @param string $compile_id compile id
- * @param integer $exp_time expiration time (number of seconds, not timestamp)
+ * @param Smarty $smarty Smarty object
+ * @param string $resource_name template name
+ * @param string $cache_id cache id
+ * @param string $compile_id compile id
+ * @param integer $exp_time expiration time (number of seconds, not timestamp)
*
- * @return integer number of cache files deleted
+ * @return int number of cache files deleted
+ * @throws \SmartyException
*/
public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
{
$cache_name = null;
-
if (isset($resource_name)) {
$source = Smarty_Template_Source::load(null, $smarty, $resource_name);
if ($source->exists) {
@@ -218,15 +242,14 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
return 0;
}
}
-
return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
}
/**
* Check is cache is locked for this template
*
- * @param Smarty $smarty Smarty object
- * @param Smarty_Template_Cached $cached cached object
+ * @param Smarty $smarty Smarty object
+ * @param Smarty_Template_Cached $cached cached object
*
* @return boolean true or false if cache is locked
*/
@@ -234,7 +257,6 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
{
$id = $cached->lock_id;
$name = $cached->source->name . '.lock';
-
$mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
if ($mtime === null) {
$this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
diff --git a/lib/smarty3/sysplugins/smarty_cacheresource_keyvaluestore.php b/lib/smarty3/sysplugins/smarty_cacheresource_keyvaluestore.php
index bab1b5c..59bf1d4 100644
--- a/lib/smarty3/sysplugins/smarty_cacheresource_keyvaluestore.php
+++ b/lib/smarty3/sysplugins/smarty_cacheresource_keyvaluestore.php
@@ -47,8 +47,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
/**
* populate Cached Object with meta data from Resource
*
- * @param Smarty_Template_Cached $cached cached object
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Template_Cached $cached cached object
+ * @param Smarty_Internal_Template $_template template object
*
* @return void
*/
@@ -56,26 +56,32 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
{
$cached->filepath = $_template->source->uid . '#' . $this->sanitize($cached->source->resource) . '#' .
$this->sanitize($cached->cache_id) . '#' . $this->sanitize($cached->compile_id);
-
$this->populateTimestamp($cached);
}
/**
* populate Cached Object with timestamp and exists from Resource
*
- * @param Smarty_Template_Cached $cached cached object
+ * @param Smarty_Template_Cached $cached cached object
*
* @return void
*/
public function populateTimestamp(Smarty_Template_Cached $cached)
{
- if (!$this->fetch($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id, $content,
- $timestamp, $cached->source->uid)
+ if (!$this->fetch(
+ $cached->filepath,
+ $cached->source->name,
+ $cached->cache_id,
+ $cached->compile_id,
+ $content,
+ $timestamp,
+ $cached->source->uid
+ )
) {
return;
}
$cached->content = $content;
- $cached->timestamp = (int) $timestamp;
+ $cached->timestamp = (int)$timestamp;
$cached->exists = !!$cached->timestamp;
}
@@ -83,54 +89,60 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
* Read the cached template and process the header
*
* @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
- * @param Smarty_Template_Cached $cached cached object
+ * @param Smarty_Template_Cached $cached cached object
* @param boolean $update flag if called because cache update
*
* @return boolean true or false if the cached content does not exist
*/
- public function process(Smarty_Internal_Template $_smarty_tpl, Smarty_Template_Cached $cached = null,
- $update = false)
- {
+ public function process(
+ Smarty_Internal_Template $_smarty_tpl,
+ Smarty_Template_Cached $cached = null,
+ $update = false
+ ) {
if (!$cached) {
$cached = $_smarty_tpl->cached;
}
$content = $cached->content ? $cached->content : null;
$timestamp = $cached->timestamp ? $cached->timestamp : null;
if ($content === null || !$timestamp) {
- if (!$this->fetch($_smarty_tpl->cached->filepath, $_smarty_tpl->source->name, $_smarty_tpl->cache_id,
- $_smarty_tpl->compile_id, $content, $timestamp, $_smarty_tpl->source->uid)
+ if (!$this->fetch(
+ $_smarty_tpl->cached->filepath,
+ $_smarty_tpl->source->name,
+ $_smarty_tpl->cache_id,
+ $_smarty_tpl->compile_id,
+ $content,
+ $timestamp,
+ $_smarty_tpl->source->uid
+ )
) {
return false;
}
}
if (isset($content)) {
- eval("?>" . $content);
-
+ eval('?>' . $content);
return true;
}
-
return false;
}
/**
* Write the rendered template output to cache
*
- * @param Smarty_Internal_Template $_template template object
- * @param string $content content to cache
+ * @param Smarty_Internal_Template $_template template object
+ * @param string $content content to cache
*
* @return boolean success
*/
public function writeCachedContent(Smarty_Internal_Template $_template, $content)
{
$this->addMetaTimestamp($content);
-
return $this->write(array($_template->cached->filepath => $content), $_template->cache_lifetime);
}
/**
* Read cached template from cache
*
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Internal_Template $_template template object
*
* @return string|false content
*/
@@ -139,8 +151,15 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
$content = $_template->cached->content ? $_template->cached->content : null;
$timestamp = null;
if ($content === null) {
- if (!$this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id,
- $_template->compile_id, $content, $timestamp, $_template->source->uid)
+ if (!$this->fetch(
+ $_template->cached->filepath,
+ $_template->source->name,
+ $_template->cache_id,
+ $_template->compile_id,
+ $content,
+ $timestamp,
+ $_template->source->uid
+ )
) {
return false;
}
@@ -155,35 +174,36 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
* Empty cache
* {@internal the $exp_time argument is ignored altogether }}
*
- * @param Smarty $smarty Smarty object
- * @param integer $exp_time expiration time [being ignored]
+ * @param Smarty $smarty Smarty object
+ * @param integer $exp_time expiration time [being ignored]
*
* @return integer number of cache files deleted [always -1]
- * @uses purge() to clear the whole store
- * @uses invalidate() to mark everything outdated if purge() is inapplicable
+ * @uses purge() to clear the whole store
+ * @uses invalidate() to mark everything outdated if purge() is inapplicable
*/
public function clearAll(Smarty $smarty, $exp_time = null)
{
if (!$this->purge()) {
$this->invalidate(null);
}
- return - 1;
+ return -1;
}
/**
* Empty cache for a specific template
* {@internal the $exp_time argument is ignored altogether}}
*
- * @param Smarty $smarty Smarty object
- * @param string $resource_name template name
- * @param string $cache_id cache id
- * @param string $compile_id compile id
- * @param integer $exp_time expiration time [being ignored]
+ * @param Smarty $smarty Smarty object
+ * @param string $resource_name template name
+ * @param string $cache_id cache id
+ * @param string $compile_id compile id
+ * @param integer $exp_time expiration time [being ignored]
*
- * @return integer number of cache files deleted [always -1]
- * @uses buildCachedFilepath() to generate the CacheID
- * @uses invalidate() to mark CacheIDs parent chain as outdated
- * @uses delete() to remove CacheID from cache
+ * @return int number of cache files deleted [always -1]
+ * @throws \SmartyException
+ * @uses buildCachedFilepath() to generate the CacheID
+ * @uses invalidate() to mark CacheIDs parent chain as outdated
+ * @uses delete() to remove CacheID from cache
*/
public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
{
@@ -192,18 +212,17 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
$this->sanitize($compile_id);
$this->delete(array($cid));
$this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
- return - 1;
+ return -1;
}
/**
* Get template's unique ID
*
- * @param Smarty $smarty Smarty object
- * @param string $resource_name template name
+ * @param Smarty $smarty Smarty object
+ * @param string $resource_name template name
*
* @return string filepath of cache file
* @throws \SmartyException
- *
*/
protected function getTemplateUid(Smarty $smarty, $resource_name)
{
@@ -219,7 +238,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
/**
* Sanitize CacheID components
*
- * @param string $string CacheID component to sanitize
+ * @param string $string CacheID component to sanitize
*
* @return string sanitized CacheID component
*/
@@ -235,23 +254,28 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
/**
* Fetch and prepare a cache object.
*
- * @param string $cid CacheID to fetch
- * @param string $resource_name template name
- * @param string $cache_id cache id
- * @param string $compile_id compile id
- * @param string $content cached content
- * @param integer &$timestamp cached timestamp (epoch)
- * @param string $resource_uid resource's uid
+ * @param string $cid CacheID to fetch
+ * @param string $resource_name template name
+ * @param string $cache_id cache id
+ * @param string $compile_id compile id
+ * @param string $content cached content
+ * @param integer &$timestamp cached timestamp (epoch)
+ * @param string $resource_uid resource's uid
*
* @return boolean success
*/
- protected function fetch($cid, $resource_name = null, $cache_id = null, $compile_id = null, &$content = null,
- &$timestamp = null, $resource_uid = null)
- {
+ protected function fetch(
+ $cid,
+ $resource_name = null,
+ $cache_id = null,
+ $compile_id = null,
+ &$content = null,
+ &$timestamp = null,
+ $resource_uid = null
+ ) {
$t = $this->read(array($cid));
$content = !empty($t[ $cid ]) ? $t[ $cid ] : null;
$timestamp = null;
-
if ($content && ($timestamp = $this->getMetaTimestamp($content))) {
$invalidated =
$this->getLatestInvalidationTimestamp($cid, $resource_name, $cache_id, $compile_id, $resource_uid);
@@ -260,7 +284,6 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
$content = null;
}
}
-
return !!$content;
}
@@ -272,15 +295,15 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
*/
protected function addMetaTimestamp(&$content)
{
- $mt = explode(" ", microtime());
- $ts = pack("NN", $mt[ 1 ], (int) ($mt[ 0 ] * 100000000));
+ $mt = explode(' ', microtime());
+ $ts = pack('NN', $mt[ 1 ], (int)($mt[ 0 ] * 100000000));
$content = $ts . $content;
}
/**
* Extract the timestamp the $content was cached
*
- * @param string &$content the cached content
+ * @param string &$content the cached content
*
* @return float the microtime the content was cached
*/
@@ -297,17 +320,21 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
/**
* Invalidate CacheID
*
- * @param string $cid CacheID
- * @param string $resource_name template name
- * @param string $cache_id cache id
- * @param string $compile_id compile id
- * @param string $resource_uid source's uid
+ * @param string $cid CacheID
+ * @param string $resource_name template name
+ * @param string $cache_id cache id
+ * @param string $compile_id compile id
+ * @param string $resource_uid source's uid
*
* @return void
*/
- protected function invalidate($cid = null, $resource_name = null, $cache_id = null, $compile_id = null,
- $resource_uid = null)
- {
+ protected function invalidate(
+ $cid = null,
+ $resource_name = null,
+ $cache_id = null,
+ $compile_id = null,
+ $resource_uid = null
+ ) {
$now = microtime(true);
$key = null;
// invalidate everything
@@ -338,17 +365,21 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
/**
* Determine the latest timestamp known to the invalidation chain
*
- * @param string $cid CacheID to determine latest invalidation timestamp of
- * @param string $resource_name template name
- * @param string $cache_id cache id
- * @param string $compile_id compile id
- * @param string $resource_uid source's filepath
+ * @param string $cid CacheID to determine latest invalidation timestamp of
+ * @param string $resource_name template name
+ * @param string $cache_id cache id
+ * @param string $compile_id compile id
+ * @param string $resource_uid source's filepath
*
* @return float the microtime the CacheID was invalidated
*/
- protected function getLatestInvalidationTimestamp($cid, $resource_name = null, $cache_id = null, $compile_id = null,
- $resource_uid = null)
- {
+ protected function getLatestInvalidationTimestamp(
+ $cid,
+ $resource_name = null,
+ $cache_id = null,
+ $compile_id = null,
+ $resource_uid = null
+ ) {
// abort if there is no CacheID
if (false && !$cid) {
return 0;
@@ -357,33 +388,35 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
return 0;
}
-
// there are no InValidationKeys
if (!($values = $this->read($_cid))) {
return 0;
}
// make sure we're dealing with floats
$values = array_map('floatval', $values);
-
return max($values);
}
/**
* Translate a CacheID into the list of applicable InvalidationKeys.
- * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
+ * Splits 'some|chain|into|an|array' into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
*
- * @param string $cid CacheID to translate
- * @param string $resource_name template name
- * @param string $cache_id cache id
- * @param string $compile_id compile id
- * @param string $resource_uid source's filepath
+ * @param string $cid CacheID to translate
+ * @param string $resource_name template name
+ * @param string $cache_id cache id
+ * @param string $compile_id compile id
+ * @param string $resource_uid source's filepath
*
* @return array list of InvalidationKeys
- * @uses $invalidationKeyPrefix to prepend to each InvalidationKey
+ * @uses $invalidationKeyPrefix to prepend to each InvalidationKey
*/
- protected function listInvalidationKeys($cid, $resource_name = null, $cache_id = null, $compile_id = null,
- $resource_uid = null)
- {
+ protected function listInvalidationKeys(
+ $cid,
+ $resource_name = null,
+ $cache_id = null,
+ $compile_id = null,
+ $resource_uid = null
+ ) {
$t = array('IVK#ALL');
$_name = $_compile = '#';
if ($resource_name) {
@@ -415,17 +448,16 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
$t[] = 'IVK#CACHE#' . $part;
$t[] = 'IVK#CID' . $_name . $part . $_compile;
// skip past delimiter position
- $i ++;
+ $i++;
}
-
return $t;
}
/**
* Check is cache is locked for this template
*
- * @param Smarty $smarty Smarty object
- * @param Smarty_Template_Cached $cached cached object
+ * @param Smarty $smarty Smarty object
+ * @param Smarty_Template_Cached $cached cached object
*
* @return boolean true or false if cache is locked
*/
@@ -433,7 +465,6 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
{
$key = 'LOCK#' . $cached->filepath;
$data = $this->read(array($key));
-
return $data && time() - $data[ $key ] < $smarty->locking_timeout;
}
@@ -470,7 +501,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
/**
* Read values for a set of keys from cache
*
- * @param array $keys list of keys to fetch
+ * @param array $keys list of keys to fetch
*
* @return array list of values with the given keys used as indexes
*/
@@ -479,8 +510,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
/**
* Save values for a set of keys to cache
*
- * @param array $keys list of values to save
- * @param int $expire expiration time
+ * @param array $keys list of values to save
+ * @param int $expire expiration time
*
* @return boolean true on success, false on failure
*/
@@ -489,7 +520,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
/**
* Remove values from cache
*
- * @param array $keys list of keys to delete
+ * @param array $keys list of keys to delete
*
* @return boolean true on success, false on failure
*/
diff --git a/lib/smarty3/sysplugins/smarty_data.php b/lib/smarty3/sysplugins/smarty_data.php
index b9f5de9..2545ed3 100644
--- a/lib/smarty3/sysplugins/smarty_data.php
+++ b/lib/smarty3/sysplugins/smarty_data.php
@@ -22,7 +22,7 @@ class Smarty_Data extends Smarty_Internal_Data
*
* @var int
*/
- static $count = 0;
+ public static $count = 0;
/**
* Data block name
@@ -50,7 +50,7 @@ class Smarty_Data extends Smarty_Internal_Data
public function __construct($_parent = null, $smarty = null, $name = null)
{
parent::__construct();
- self::$count ++;
+ self::$count++;
$this->dataObjectName = 'Data_object ' . (isset($name) ? "'{$name}'" : self::$count);
$this->smarty = $smarty;
if (is_object($_parent)) {
@@ -61,8 +61,8 @@ class Smarty_Data extends Smarty_Internal_Data
foreach ($_parent as $_key => $_val) {
$this->tpl_vars[ $_key ] = new Smarty_Variable($_val);
}
- } elseif ($_parent != null) {
- throw new SmartyException("Wrong type for template variables");
+ } elseif ($_parent !== null) {
+ throw new SmartyException('Wrong type for template variables');
}
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_block.php b/lib/smarty3/sysplugins/smarty_internal_block.php
index a33ad1b..9956d64 100644
--- a/lib/smarty3/sysplugins/smarty_internal_block.php
+++ b/lib/smarty3/sysplugins/smarty_internal_block.php
@@ -38,7 +38,7 @@ class Smarty_Internal_Block
public $prepend = false;
/**
- * Block calls {$smarty.block.child}
+ * Block calls $smarty.block.child
*
* @var bool
*/
@@ -67,7 +67,7 @@ class Smarty_Internal_Block
/**
* Smarty_Internal_Block constructor.
- * - if outer level {block} of child template ($state == 1) save it as child root block
+ * - if outer level {block} of child template ($state === 1) save it as child root block
* - otherwise process inheritance and render
*
* @param string $name block name
@@ -87,4 +87,4 @@ class Smarty_Internal_Block
public function callBlock(Smarty_Internal_Template $tpl)
{
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_cacheresource_file.php b/lib/smarty3/sysplugins/smarty_internal_cacheresource_file.php
index bf93a4c..6161844 100644
--- a/lib/smarty3/sysplugins/smarty_internal_cacheresource_file.php
+++ b/lib/smarty3/sysplugins/smarty_internal_cacheresource_file.php
@@ -29,20 +29,31 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
{
$source = &$_template->source;
$smarty = &$_template->smarty;
- $_compile_dir_sep = $smarty->use_sub_dirs ? DS : '^';
+ $_compile_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
$_filepath = sha1($source->uid . $smarty->_joined_template_dir);
$cached->filepath = $smarty->getCacheDir();
if (isset($_template->cache_id)) {
- $cached->filepath .= preg_replace(array('![^\w|]+!', '![|]+!'), array('_', $_compile_dir_sep),
- $_template->cache_id) . $_compile_dir_sep;
+ $cached->filepath .= preg_replace(
+ array(
+ '![^\w|]+!',
+ '![|]+!'
+ ),
+ array(
+ '_',
+ $_compile_dir_sep
+ ),
+ $_template->cache_id
+ ) . $_compile_dir_sep;
}
if (isset($_template->compile_id)) {
$cached->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . $_compile_dir_sep;
}
// if use_sub_dirs, break file into directories
if ($smarty->use_sub_dirs) {
- $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DS . $_filepath[ 2 ] . $_filepath[ 3 ] . DS .
- $_filepath[ 4 ] . $_filepath[ 5 ] . DS;
+ $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] .
+ $_filepath[ 3 ] .
+ DIRECTORY_SEPARATOR .
+ $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
}
$cached->filepath .= $_filepath;
$basename = $source->handler->getBasename($source);
@@ -83,12 +94,14 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
*
* @return boolean true or false if the cached content does not exist
*/
- public function process(Smarty_Internal_Template $_smarty_tpl, Smarty_Template_Cached $cached = null,
- $update = false)
- {
+ public function process(
+ Smarty_Internal_Template $_smarty_tpl,
+ Smarty_Template_Cached $cached = null,
+ $update = false
+ ) {
$_smarty_tpl->cached->valid = false;
if ($update && defined('HHVM_VERSION')) {
- eval("?>" . file_get_contents($_smarty_tpl->cached->filepath));
+ eval('?>' . file_get_contents($_smarty_tpl->cached->filepath));
return true;
} else {
return @include $_smarty_tpl->cached->filepath;
@@ -101,14 +114,20 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
* @param Smarty_Internal_Template $_template template object
* @param string $content content to cache
*
- * @return boolean success
+ * @return bool success
+ * @throws \SmartyException
*/
public function writeCachedContent(Smarty_Internal_Template $_template, $content)
{
- if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath, $content,
- $_template->smarty) === true
+ if ($_template->smarty->ext->_writeFile->writeFile(
+ $_template->cached->filepath,
+ $content,
+ $_template->smarty
+ ) === true
) {
- if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
+ if (function_exists('opcache_invalidate')
+ && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api'))) < 1
+ ) {
opcache_invalidate($_template->cached->filepath, true);
} elseif (function_exists('apc_compile_file')) {
apc_compile_file($_template->cached->filepath);
@@ -126,7 +145,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
/**
* Read cached template from cache
*
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Internal_Template $_template template object
*
* @return string content
*/
@@ -148,7 +167,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
*/
public function clearAll(Smarty $smarty, $exp_time = null)
{
- return Smarty_Internal_Extension_Clear::clear($smarty, null, null, null, $exp_time);
+ return $smarty->ext->_cacheResourceFile->clear($smarty, null, null, null, $exp_time);
}
/**
@@ -164,7 +183,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
*/
public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
{
- return Smarty_Internal_Extension_Clear::clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+ return $smarty->ext->_cacheResourceFile->clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
}
/**
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_append.php b/lib/smarty3/sysplugins/smarty_internal_compile_append.php
index 8539d6b..1a9befb 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_append.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_append.php
@@ -19,11 +19,12 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
/**
* Compiles code for the {append} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $parameter array with compilation parameter
*
* @return string compiled code
+ * @throws \SmartyCompilerException
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
{
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_assign.php b/lib/smarty3/sysplugins/smarty_internal_compile_assign.php
index 3bd3384..4b99848 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_assign.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_assign.php
@@ -24,21 +24,23 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
*/
public $option_flags = array('nocache', 'noscope');
- /**
+ /**
* Valid scope names
*
* @var array
*/
- public $valid_scopes = array('local' => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
- 'root' => Smarty::SCOPE_ROOT, 'global' => Smarty::SCOPE_GLOBAL,
- 'tpl_root' => Smarty::SCOPE_TPL_ROOT, 'smarty' => Smarty::SCOPE_SMARTY);
+ public $valid_scopes = array(
+ 'local' => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
+ 'root' => Smarty::SCOPE_ROOT, 'global' => Smarty::SCOPE_GLOBAL,
+ 'tpl_root' => Smarty::SCOPE_TPL_ROOT, 'smarty' => Smarty::SCOPE_SMARTY
+ );
/**
* Compiles code for the {assign} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $parameter array with compilation parameter
*
* @return string compiled code
* @throws \SmartyCompilerException
@@ -66,12 +68,12 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
}
// scope setup
if ($_attr[ 'noscope' ]) {
- $_scope = - 1;
+ $_scope = -1;
} else {
$_scope = $compiler->convertScope($_attr, $this->valid_scopes);
}
// optional parameter
- $_params = "";
+ $_params = '';
if ($_nocache || $_scope) {
$_params .= ' ,' . var_export($_nocache, true);
}
@@ -85,9 +87,9 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
$output .= "settype(\$_tmp_array, 'array');\n";
$output .= "}\n";
$output .= "\$_tmp_array{$parameter['smarty_internal_index']} = {$_attr['value']};\n";
- $output .= "\$_smarty_tpl->_assignInScope({$_var}, \$_tmp_array{$_params});\n?>";
+ $output .= "\$_smarty_tpl->_assignInScope({$_var}, \$_tmp_array{$_params});?>";
} else {
- $output = "<?php \$_smarty_tpl->_assignInScope({$_var}, {$_attr['value']}{$_params});\n?>";
+ $output = "<?php \$_smarty_tpl->_assignInScope({$_var}, {$_attr['value']}{$_params});?>";
}
return $output;
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_block.php b/lib/smarty3/sysplugins/smarty_internal_compile_block.php
index e287894..8ff15d8 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_block.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_block.php
@@ -1,5 +1,5 @@
<?php
-/*
+/**
* This file is part of Smarty.
*
* (c) 2015 Uwe Tews
@@ -48,34 +48,18 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher
public $optional_attributes = array('assign');
/**
- * nesting level of block tags
- *
- * @var int
- */
- public static $blockTagNestingLevel = 0;
-
- /**
- * Saved compiler object
- *
- * @var Smarty_Internal_TemplateCompilerBase
- */
- public $compiler = null;
-
- /**
* Compiles code for the {block} tag
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
- *
- * @return bool true
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+ * @param array $parameter array with compilation parameter
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
{
if (!isset($compiler->_cache[ 'blockNesting' ])) {
$compiler->_cache[ 'blockNesting' ] = 0;
}
- if ($compiler->_cache[ 'blockNesting' ] == 0) {
+ if ($compiler->_cache[ 'blockNesting' ] === 0) {
// make sure that inheritance gets initialized in template code
$this->registerInit($compiler);
$this->option_flags = array('hide', 'nocache', 'append', 'prepend');
@@ -84,80 +68,40 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher
}
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
- $compiler->_cache[ 'blockNesting' ] ++;
+ ++$compiler->_cache[ 'blockNesting' ];
+ $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(mt_rand(), true));
$compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
+ $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ] = $_className;
$compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
- $this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
- $compiler->template->compiled->has_nocache_code,
- $compiler->template->caching));
- // must whole block be nocache ?
- if ($compiler->tag_nocache) {
- $i = 0;
- }
+ $compiler->_cache[ 'blockParams' ][ 1 ][ 'subBlocks' ][ trim($_attr[ 'name' ], '"\'') ][] = $_className;
+ $this->openTag(
+ $compiler,
+ 'block',
+ array(
+ $_attr, $compiler->nocache, $compiler->parser->current_buffer,
+ $compiler->template->compiled->has_nocache_code,
+ $compiler->template->caching
+ )
+ );
+ $compiler->saveRequiredPlugins(true);
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
- // $compiler->suppressNocacheProcessing = true;
- if ($_attr[ 'nocache' ] === true) {
- //$compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->taglineno);
- }
$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
$compiler->template->compiled->has_nocache_code = false;
$compiler->suppressNocacheProcessing = true;
}
-
- /**
- * Compile saved child block source
- *
- * @param \Smarty_Internal_TemplateCompilerBase compiler object
- * @param string $_name optional name of child block
- *
- * @return string compiled code of child block
- */
- static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
- {
- if (!isset($compiler->_cache[ 'blockNesting' ])) {
- $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
- $compiler->parser->lex->taglineno);
- }
- $compiler->has_code = true;
- $compiler->suppressNocacheProcessing = true;
- $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
- $output = "<?php \n\$_smarty_tpl->inheritance->callChild(\$_smarty_tpl, \$this);\n?>\n";
- return $output;
- }
-
- /**
- * Compile $smarty.block.parent
- *
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param string $_name optional name of child block
- *
- * @return string compiled code of child block
- */
- static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
- {
- if (!isset($compiler->_cache[ 'blockNesting' ])) {
- $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
- $compiler->parser->lex->taglineno);
- }
- $compiler->suppressNocacheProcessing = true;
- $compiler->has_code = true;
- $output = "<?php \n\$_smarty_tpl->inheritance->callParent(\$_smarty_tpl, \$this);\n?>\n";
- return $output;
- }
}
/**
* Smarty Internal Plugin Compile BlockClose Class
- *
*/
class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_Inheritance
{
/**
* Compiles code for the {/block} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $parameter array with compilation parameter
*
* @return bool true
*/
@@ -171,25 +115,25 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_
$_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
unset($_attr[ 'assign' ], $_attr[ 'name' ]);
foreach ($_attr as $name => $stat) {
- if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
+ if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat !== 'false')) {
$_block[ $name ] = 'true';
}
}
- $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
+ $_className = $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ];
// get compiled block code
$_functionCode = $compiler->parser->current_buffer;
// setup buffer for template function code
$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-
$output = "<?php\n";
$output .= "/* {block {$_name}} */\n";
$output .= "class {$_className} extends Smarty_Internal_Block\n";
$output .= "{\n";
foreach ($_block as $property => $value) {
- $output .= "public \${$property} = {$value};\n";
+ $output .= "public \${$property} = " . var_export($value, true) . ";\n";
}
$output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\n";
- //$output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n";
+ $output .= $compiler->compileRequiredPlugins();
+ $compiler->restoreRequiredPlugins();
if ($compiler->template->compiled->has_nocache_code) {
$output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
}
@@ -197,9 +141,13 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_
$output .= "ob_start();\n";
}
$output .= "?>\n";
- $compiler->parser->current_buffer->append_subtree($compiler->parser,
- new Smarty_Internal_ParseTree_Tag($compiler->parser,
- $output));
+ $compiler->parser->current_buffer->append_subtree(
+ $compiler->parser,
+ new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ $output
+ )
+ );
$compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
$output = "<?php\n";
if (isset($_assign)) {
@@ -209,35 +157,29 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_
$output .= "}\n";
$output .= "/* {/block {$_name}} */\n\n";
$output .= "?>\n";
- $compiler->parser->current_buffer->append_subtree($compiler->parser,
- new Smarty_Internal_ParseTree_Tag($compiler->parser,
- $output));
- $compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+ $compiler->parser->current_buffer->append_subtree(
+ $compiler->parser,
+ new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ $output
+ )
+ );
+ $compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
- // nocache plugins must be copied
- if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
- foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
- foreach ($tmp as $type => $data) {
- $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
- $data;
- }
- }
- }
-
// restore old status
$compiler->template->compiled->has_nocache_code = $_has_nocache_code;
$compiler->tag_nocache = $compiler->nocache;
$compiler->nocache = $_nocache;
$compiler->parser->current_buffer = $_buffer;
$output = "<?php \n";
- if ($compiler->_cache[ 'blockNesting' ] == 1) {
+ if ($compiler->_cache[ 'blockNesting' ] === 1) {
$output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
} else {
$output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
}
$output .= "?>\n";
- $compiler->_cache[ 'blockNesting' ] --;
- if ($compiler->_cache[ 'blockNesting' ] == 0) {
+ --$compiler->_cache[ 'blockNesting' ];
+ if ($compiler->_cache[ 'blockNesting' ] === 0) {
unset($compiler->_cache[ 'blockNesting' ]);
}
$compiler->has_code = true;
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_block_child.php b/lib/smarty3/sysplugins/smarty_internal_compile_block_child.php
new file mode 100644
index 0000000..588d186
--- /dev/null
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_block_child.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Child Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Block_Child extends Smarty_Internal_Compile_Child
+{
+ /**
+ * Tag name
+ *
+ * @var string
+ */
+ public $tag = 'block_child';
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_block_parent.php b/lib/smarty3/sysplugins/smarty_internal_compile_block_parent.php
new file mode 100644
index 0000000..97f11ca
--- /dev/null
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_block_parent.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Parent Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Block_Parent extends Smarty_Internal_Compile_Child
+{
+ /**
+ * Tag name
+ *
+ * @var string
+ */
+ public $tag = 'block_parent';
+
+ /**
+ * Block type
+ *
+ * @var string
+ */
+ public $blockType = 'Parent';
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_break.php b/lib/smarty3/sysplugins/smarty_internal_compile_break.php
index 0555ecc..1ee8d75 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_break.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_break.php
@@ -33,45 +33,85 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
public $shorttag_order = array('levels');
/**
+ * Tag name may be overloaded by Smarty_Internal_Compile_Continue
+ *
+ * @var string
+ */
+ public $tag = 'break';
+
+ /**
* Compiles code for the {break} tag
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
* @throws \SmartyCompilerException
*/
- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+ {
+ list($levels, $foreachLevels) = $this->checkLevels($args, $compiler);
+ $output = "<?php ";
+ if ($foreachLevels > 0 && $this->tag === 'continue') {
+ $foreachLevels--;
+ }
+ if ($foreachLevels > 0) {
+ /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
+ $foreachCompiler = $compiler->getTagCompiler('foreach');
+ $output .= $foreachCompiler->compileRestore($foreachLevels);
+ }
+ $output .= "{$this->tag} {$levels};?>";
+ return $output;
+ }
+
+ /**
+ * check attributes and return array of break and foreach levels
+ *
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+ *
+ * @return array
+ * @throws \SmartyCompilerException
+ */
+ public function checkLevels($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
if ($_attr[ 'nocache' ] === true) {
$compiler->trigger_template_error('nocache option not allowed', null, true);
}
-
if (isset($_attr[ 'levels' ])) {
if (!is_numeric($_attr[ 'levels' ])) {
$compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
}
- $_levels = $_attr[ 'levels' ];
+ $levels = $_attr[ 'levels' ];
} else {
- $_levels = 1;
+ $levels = 1;
}
- $level_count = $_levels;
+ $level_count = $levels;
$stack_count = count($compiler->_tag_stack) - 1;
+ $foreachLevels = 0;
+ $lastTag = '';
while ($level_count > 0 && $stack_count >= 0) {
if (isset($_is_loopy[ $compiler->_tag_stack[ $stack_count ][ 0 ] ])) {
- $level_count --;
+ $lastTag = $compiler->_tag_stack[ $stack_count ][ 0 ];
+ if ($level_count === 0) {
+ break;
+ }
+ $level_count--;
+ if ($compiler->_tag_stack[ $stack_count ][ 0 ] === 'foreach') {
+ $foreachLevels++;
+ }
}
- $stack_count --;
+ $stack_count--;
}
- if ($level_count != 0) {
- $compiler->trigger_template_error("cannot break {$_levels} level(s)", null, true);
+ if ($level_count !== 0) {
+ $compiler->trigger_template_error("cannot {$this->tag} {$levels} level(s)", null, true);
}
-
- return "<?php break {$_levels};?>";
+ if ($lastTag === 'foreach' && $this->tag === 'break' && $foreachLevels > 0) {
+ $foreachLevels--;
+ }
+ return array($levels, $foreachLevels);
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_call.php b/lib/smarty3/sysplugins/smarty_internal_compile_call.php
index 33480de..445cabc 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_call.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_call.php
@@ -43,8 +43,8 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
/**
* Compiles the calls of user defined tags defined by {function}
*
- * @param array $args array with attributes from parser
- * @param object $compiler compiler object
+ * @param array $args array with attributes from parser
+ * @param object $compiler compiler object
*
* @return string compiled code
*/
@@ -57,7 +57,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
// output will be stored in a smarty variable instead of being displayed
$_assign = $_attr[ 'assign' ];
}
- //$_name = trim($_attr['name'], "'\"");
+ //$_name = trim($_attr['name'], "''");
$_name = $_attr[ 'name' ];
unset($_attr[ 'name' ], $_attr[ 'assign' ], $_attr[ 'nocache' ]);
// set flag (compiled code of {function} must be included in cache file
@@ -74,15 +74,15 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
$_paramsArray[] = "'$_key'=>$_value";
}
}
- $_params = 'array(' . implode(",", $_paramsArray) . ')';
+ $_params = 'array(' . implode(',', $_paramsArray) . ')';
//$compiler->suppressNocacheProcessing = true;
// was there an assign attribute
if (isset($_assign)) {
$_output =
- "<?php ob_start();\n\$_smarty_tpl->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
+ "<?php ob_start();\n\$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
} else {
$_output =
- "<?php \$_smarty_tpl->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
+ "<?php \$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
}
return $_output;
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_capture.php b/lib/smarty3/sysplugins/smarty_internal_compile_capture.php
index e43a7c5..a4ffbc9 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_capture.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_capture.php
@@ -35,29 +35,27 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
/**
* Compiles code for the {$smarty.capture.xxx}
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase$compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+ * @param array $parameter array with compilation parameter
*
* @return string compiled code
- * @throws \SmartyCompilerException
*/
- public static function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter = null)
- {
- $tag = trim($parameter[ 0 ], '"\'');
- $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
- if (!$name) {
- $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
- }
- return "\$_smarty_tpl->smarty->ext->_capture->getBuffer(\$_smarty_tpl, '{$name}')";
+ public static function compileSpecialVariable(
+ $args,
+ Smarty_Internal_TemplateCompilerBase $compiler,
+ $parameter = null
+ ) {
+ return '$_smarty_tpl->smarty->ext->_capture->getBuffer($_smarty_tpl' .
+ (isset($parameter[ 1 ]) ? ", {$parameter[ 1 ]})" : ')');
}
/**
* Compiles code for the {capture} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param null $parameter
+ * @param null $parameter
*
* @return string compiled code
*/
@@ -65,16 +63,13 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args, $parameter, 'capture');
-
$buffer = isset($_attr[ 'name' ]) ? $_attr[ 'name' ] : "'default'";
$assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : 'null';
$append = isset($_attr[ 'append' ]) ? $_attr[ 'append' ] : 'null';
-
$compiler->_cache[ 'capture_stack' ][] = array($compiler->nocache);
// maybe nocache because of nocache variables
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
- $_output = "<?php \$_smarty_tpl->smarty->ext->_capture->open(\$_smarty_tpl, $buffer, $assign, $append);\n?>\n";
-
+ $_output = "<?php \$_smarty_tpl->smarty->ext->_capture->open(\$_smarty_tpl, $buffer, $assign, $append);?>";
return $_output;
}
}
@@ -90,9 +85,9 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
/**
* Compiles code for the {/capture} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param null $parameter
+ * @param null $parameter
*
* @return string compiled code
*/
@@ -104,9 +99,7 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
if ($compiler->nocache) {
$compiler->tag_nocache = true;
}
-
list($compiler->nocache) = array_pop($compiler->_cache[ 'capture_stack' ]);
-
- return "<?php \$_smarty_tpl->smarty->ext->_capture->close(\$_smarty_tpl);\n?>\n";
+ return "<?php \$_smarty_tpl->smarty->ext->_capture->close(\$_smarty_tpl);?>";
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_child.php b/lib/smarty3/sysplugins/smarty_internal_compile_child.php
new file mode 100644
index 0000000..f728c18
--- /dev/null
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_child.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Child Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Child extends Smarty_Internal_CompileBase
+{
+ /**
+ * Attribute definition: Overwrites base class.
+ *
+ * @var array
+ * @see Smarty_Internal_CompileBase
+ */
+ public $optional_attributes = array('assign');
+
+ /**
+ * Tag name
+ *
+ * @var string
+ */
+ public $tag = 'child';
+
+ /**
+ * Block type
+ *
+ * @var string
+ */
+ public $blockType = 'Child';
+
+ /**
+ * Compiles code for the {child} tag
+ *
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+ * @param array $parameter array with compilation parameter
+ *
+ * @return string compiled code
+ * @throws \SmartyCompilerException
+ */
+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+ {
+ // check and get attributes
+ $_attr = $this->getAttributes($compiler, $args);
+ $tag = isset($parameter[ 0 ]) ? "'{$parameter[0]}'" : "'{{$this->tag}}'";
+ if (!isset($compiler->_cache[ 'blockNesting' ])) {
+ $compiler->trigger_template_error(
+ "{$tag} used outside {block} tags ",
+ $compiler->parser->lex->taglineno
+ );
+ }
+ $compiler->has_code = true;
+ $compiler->suppressNocacheProcessing = true;
+ if ($this->blockType === 'Child') {
+ $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
+ }
+ $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
+ $output = "<?php \n";
+ if (isset($_assign)) {
+ $output .= "ob_start();\n";
+ }
+ $output .= '$_smarty_tpl->inheritance->call' . $this->blockType . '($_smarty_tpl, $this' .
+ ($this->blockType === 'Child' ? '' : ", {$tag}") . ");\n";
+ if (isset($_assign)) {
+ $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+ }
+ $output .= "?>\n";
+ return $output;
+ }
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_config_load.php b/lib/smarty3/sysplugins/smarty_internal_compile_config_load.php
index d59ea3f..8fe64ee 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_config_load.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_config_load.php
@@ -53,14 +53,16 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
*
* @var array
*/
- public $valid_scopes = array('local' => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
- 'root' => Smarty::SCOPE_ROOT, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
- 'smarty' => Smarty::SCOPE_SMARTY);
+ public $valid_scopes = array(
+ 'local' => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
+ 'root' => Smarty::SCOPE_ROOT, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
+ 'smarty' => Smarty::SCOPE_SMARTY, 'global' => Smarty::SCOPE_SMARTY
+ );
/**
* Compiles code for the {config_load} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
@@ -70,11 +72,9 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
if ($_attr[ 'nocache' ] === true) {
$compiler->trigger_template_error('nocache option not allowed', null, true);
}
-
// save possible attributes
$conf_file = $_attr[ 'file' ];
if (isset($_attr[ 'section' ])) {
@@ -84,15 +84,13 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
}
// scope setup
if ($_attr[ 'noscope' ]) {
- $_scope = - 1;
+ $_scope = -1;
} else {
$_scope = $compiler->convertScope($_attr, $this->valid_scopes);
}
-
// create config object
$_output =
"<?php\n\$_smarty_tpl->smarty->ext->configLoad->_loadConfigFile(\$_smarty_tpl, {$conf_file}, {$section}, {$_scope});\n?>\n";
-
return $_output;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_continue.php b/lib/smarty3/sysplugins/smarty_internal_compile_continue.php
index ac41f41..e545728 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_continue.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_continue.php
@@ -14,64 +14,12 @@
* @package Smarty
* @subpackage Compiler
*/
-class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
+class Smarty_Internal_Compile_Continue extends Smarty_Internal_Compile_Break
{
/**
- * Attribute definition: Overwrites base class.
+ * Tag name
*
- * @var array
- * @see Smarty_Internal_CompileBase
+ * @var string
*/
- public $optional_attributes = array('levels');
-
- /**
- * Attribute definition: Overwrites base class.
- *
- * @var array
- * @see Smarty_Internal_CompileBase
- */
- public $shorttag_order = array('levels');
-
- /**
- * Compiles code for the {continue} tag
- *
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
- *
- * @return string compiled code
- * @throws \SmartyCompilerException
- */
- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
- {
- static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
- // check and get attributes
- $_attr = $this->getAttributes($compiler, $args);
-
- if ($_attr[ 'nocache' ] === true) {
- $compiler->trigger_template_error('nocache option not allowed', null, true);
- }
-
- if (isset($_attr[ 'levels' ])) {
- if (!is_numeric($_attr[ 'levels' ])) {
- $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
- }
- $_levels = $_attr[ 'levels' ];
- } else {
- $_levels = 1;
- }
- $level_count = $_levels;
- $stack_count = count($compiler->_tag_stack) - 1;
- while ($level_count > 0 && $stack_count >= 0) {
- if (isset($_is_loopy[ $compiler->_tag_stack[ $stack_count ][ 0 ] ])) {
- $level_count --;
- }
- $stack_count --;
- }
- if ($level_count != 0) {
- $compiler->trigger_template_error("cannot continue {$_levels} level(s)", null, true);
- }
-
- return "<?php continue {$_levels};?>";
- }
+ public $tag = 'continue';
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_debug.php b/lib/smarty3/sysplugins/smarty_internal_compile_debug.php
index 1668e72..7994166 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_debug.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_debug.php
@@ -20,8 +20,8 @@ class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
/**
* Compiles code for the {debug} tag
*
- * @param array $args array with attributes from parser
- * @param object $compiler compiler object
+ * @param array $args array with attributes from parser
+ * @param object $compiler compiler object
*
* @return string compiled code
*/
@@ -29,10 +29,8 @@ class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
// compile always as nocache
$compiler->tag_nocache = true;
-
// display debug template
$_output =
"<?php \$_smarty_debug = new Smarty_Internal_Debug;\n \$_smarty_debug->display_debug(\$_smarty_tpl);\n";
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_eval.php b/lib/smarty3/sysplugins/smarty_internal_compile_eval.php
index 97a3c29..8e0174e 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_eval.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_eval.php
@@ -43,8 +43,8 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
/**
* Compiles code for the {eval} tag
*
- * @param array $args array with attributes from parser
- * @param object $compiler compiler object
+ * @param array $args array with attributes from parser
+ * @param object $compiler compiler object
*
* @return string compiled code
*/
@@ -56,17 +56,15 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
// output will be stored in a smarty variable instead of being displayed
$_assign = $_attr[ 'assign' ];
}
-
// create template object
- $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'." . $_attr[ 'var' ] .
- ", \$_smarty_tpl->smarty, \$_smarty_tpl);";
+ $_output =
+ "\$_template = new {$compiler->smarty->template_class}('eval:'.{$_attr[ 'var' ]}, \$_smarty_tpl->smarty, \$_smarty_tpl);";
//was there an assign attribute?
if (isset($_assign)) {
$_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
} else {
- $_output .= "echo \$_template->fetch();";
+ $_output .= 'echo $_template->fetch();';
}
-
return "<?php $_output ?>";
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_extends.php b/lib/smarty3/sysplugins/smarty_internal_compile_extends.php
index 949875c..d72d2b7 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_extends.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_extends.php
@@ -1,5 +1,4 @@
<?php
-
/**
* Smarty Internal Plugin Compile extend
* Compiles the {extends} tag
@@ -64,18 +63,18 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inh
// add code to initialize inheritance
$this->registerInit($compiler, true);
$file = trim($_attr[ 'file' ], '\'"');
- if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
+ if (strlen($file) > 8 && substr($file, 0, 8) === 'extends:') {
// generate code for each template
$files = array_reverse(explode('|', substr($file, 8)));
$i = 0;
foreach ($files as $file) {
- if ($file[ 0 ] == '"') {
+ if ($file[ 0 ] === '"') {
$file = trim($file, '".');
} else {
$file = "'{$file}'";
}
- $i ++;
- if ($i == count($files) && isset($_attr[ 'extends_resource' ])) {
+ $i++;
+ if ($i === count($files) && isset($_attr[ 'extends_resource' ])) {
$this->compileEndChild($compiler);
}
$this->compileInclude($compiler, $file);
@@ -84,8 +83,7 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inh
$this->compileEndChild($compiler);
}
} else {
- $this->compileEndChild($compiler);
- $this->compileInclude($compiler, $_attr[ 'file' ]);
+ $this->compileEndChild($compiler, $_attr[ 'file' ]);
}
$compiler->has_code = false;
return '';
@@ -95,40 +93,66 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inh
* Add code for inheritance endChild() method to end of template
*
* @param \Smarty_Internal_TemplateCompilerBase $compiler
+ * @param null|string $template optional inheritance parent template
+ *
+ * @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
- private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler)
+ private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler, $template = null)
{
- $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
- "<?php \$_smarty_tpl->inheritance->endChild();\n?>\n");
+ $inlineUids = '';
+ if (isset($template) && $compiler->smarty->merge_compiled_includes) {
+ $code = $compiler->compileTag('include', array($template, array('scope' => 'parent')));
+ if (preg_match('/([,][\s]*[\'][a-z0-9]+[\'][,][\s]*[\']content.*[\'])[)]/', $code, $match)) {
+ $inlineUids = $match[ 1 ];
+ }
+ }
+ $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ '<?php $_smarty_tpl->inheritance->endChild($_smarty_tpl' .
+ (isset($template) ?
+ ", {$template}{$inlineUids}" :
+ '') . ");\n?>"
+ );
}
/**
* Add code for including subtemplate to end of template
*
* @param \Smarty_Internal_TemplateCompilerBase $compiler
- * @param string $file subtemplate name
+ * @param string $template subtemplate name
+ *
+ * @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
- private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $file)
+ private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $template)
{
- $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
- $compiler->compileTag('include',
- array($file,
- array('scope' => 'parent'))));
+ $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ $compiler->compileTag(
+ 'include',
+ array(
+ $template,
+ array('scope' => 'parent')
+ )
+ )
+ );
}
/**
* Create source code for {extends} from source components array
*
- * @param []\Smarty_Internal_Template_Source $components
+ * @param \Smarty_Internal_Template $template
*
* @return string
*/
- public static function extendsSourceArrayCode($components)
+ public static function extendsSourceArrayCode(Smarty_Internal_Template $template)
{
$resources = array();
- foreach ($components as $source) {
+ foreach ($template->source->components as $source) {
$resources[] = $source->resource;
}
- return '{extends file=\'extends:' . join('|', $resources) . '\' extends_resource=true}';
+ return $template->smarty->left_delimiter . 'extends file=\'extends:' . join('|', $resources) .
+ '\' extends_resource=true' . $template->smarty->right_delimiter;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_for.php b/lib/smarty3/sysplugins/smarty_internal_compile_for.php
index e5e7c61..3f113e5 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_for.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_for.php
@@ -26,16 +26,16 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
* The parser is generating different sets of attribute by which this compiler can
* determine which syntax is used.
*
- * @param array $args array with attributes from parser
- * @param object $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param object $compiler compiler object
+ * @param array $parameter array with compilation parameter
*
* @return string compiled code
*/
public function compile($args, $compiler, $parameter)
{
- $compiler->loopNesting ++;
- if ($parameter == 0) {
+ $compiler->loopNesting++;
+ if ($parameter === 0) {
$this->required_attributes = array('start', 'to');
$this->optional_attributes = array('max', 'step');
} else {
@@ -45,9 +45,8 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
$this->mapCache = array();
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
$output = "<?php\n";
- if ($parameter == 1) {
+ if ($parameter === 1) {
foreach ($_attr[ 'start' ] as $_statement) {
if (is_array($_statement[ 'var' ])) {
$var = $_statement[ 'var' ][ 'var' ];
@@ -89,11 +88,10 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
}
$output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
$output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
- $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration == 1;";
- $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration == \$_smarty_tpl->tpl_vars[$var]->total;";
+ $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration === 1;";
+ $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration === \$_smarty_tpl->tpl_vars[$var]->total;";
}
- $output .= "?>";
-
+ $output .= '?>';
$this->openTag($compiler, 'for', array('for', $compiler->nocache));
// maybe nocache because of nocache variables
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
@@ -113,9 +111,9 @@ class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
/**
* Compiles code for the {forelse} tag
*
- * @param array $args array with attributes from parser
- * @param object $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param object $compiler compiler object
+ * @param array $parameter array with compilation parameter
*
* @return string compiled code
*/
@@ -123,10 +121,8 @@ class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
$this->openTag($compiler, 'forelse', array('forelse', $nocache));
-
return "<?php }} else { ?>";
}
}
@@ -142,29 +138,27 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
/**
* Compiles code for the {/for} tag
*
- * @param array $args array with attributes from parser
- * @param object $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param object $compiler compiler object
+ * @param array $parameter array with compilation parameter
*
* @return string compiled code
*/
public function compile($args, $compiler, $parameter)
{
- $compiler->loopNesting --;
+ $compiler->loopNesting--;
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
// must endblock be nocache?
if ($compiler->nocache) {
$compiler->tag_nocache = true;
}
-
list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
-
$output = "<?php }\n";
- if ($openTag != 'forelse') {
+ if ($openTag !== 'forelse') {
$output .= "}\n";
}
- $output .= "?>\n";
+ $output .= "?>";
return $output;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_foreach.php b/lib/smarty3/sysplugins/smarty_internal_compile_foreach.php
index 56d760c..78b45ea 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_foreach.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_foreach.php
@@ -78,16 +78,16 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
/**
* Compiles code for the {foreach} tag
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
* @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
- $compiler->loopNesting ++;
+ $compiler->loopNesting++;
// init
$this->isNamed = false;
// check and get attributes
@@ -118,15 +118,17 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
$fromName = $compiler->getVariableName($_attr[ 'from' ]);
if ($fromName) {
foreach (array('item', 'key') as $a) {
- if (isset($attributes[ $a ]) && $attributes[ $a ] == $fromName) {
- $compiler->trigger_template_error("'{$a}' and 'from' may not have same variable name '{$fromName}'",
- null, true);
+ if (isset($attributes[ $a ]) && $attributes[ $a ] === $fromName) {
+ $compiler->trigger_template_error(
+ "'{$a}' and 'from' may not have same variable name '{$fromName}'",
+ null,
+ true
+ );
}
}
}
-
$itemVar = "\$_smarty_tpl->tpl_vars['{$item}']";
- $local = '$__foreach_' . $attributes[ 'item' ] . '_' . $this->counter ++ . '_';
+ $local = '$__foreach_' . $attributes[ 'item' ] . '_' . $this->counter++ . '_';
// search for used tag attributes
$itemAttr = array();
$namedAttr = array();
@@ -137,7 +139,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
if (!empty($this->matchResults[ 'named' ])) {
$namedAttr = $this->matchResults[ 'named' ];
}
- if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) {
+ if (isset($_attr[ 'properties' ]) && preg_match_all('/[\'](.*?)[\']/', $_attr[ 'properties' ], $match)) {
foreach ($match[ 1 ] as $prop) {
if (in_array($prop, $this->itemProperties)) {
$itemAttr[ $prop ] = true;
@@ -187,8 +189,11 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
}
$needTotal = isset($itemAttr[ 'total' ]);
// Register tag
- $this->openTag($compiler, 'foreach',
- array('foreach', $compiler->nocache, $local, $itemVar, empty($itemAttr) ? 1 : 2));
+ $this->openTag(
+ $compiler,
+ 'foreach',
+ array('foreach', $compiler->nocache, $local, $itemVar, empty($itemAttr) ? 1 : 2)
+ );
// maybe nocache because of nocache variables
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
// generate output code
@@ -229,9 +234,9 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
$output .= "{$itemVar}->first = !{$itemVar}->index;\n";
}
if (isset($itemAttr[ 'last' ])) {
- $output .= "{$itemVar}->last = {$itemVar}->iteration == {$itemVar}->total;\n";
+ $output .= "{$itemVar}->last = {$itemVar}->iteration === {$itemVar}->total;\n";
}
- if ($this->isNamed) {
+ if (isset($foreachVar)) {
if (isset($namedAttr[ 'iteration' ])) {
$output .= "{$foreachVar}->value['iteration']++;\n";
}
@@ -242,16 +247,27 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
$output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n";
}
if (isset($namedAttr[ 'last' ])) {
- $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] == {$foreachVar}->value['total'];\n";
+ $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] === {$foreachVar}->value['total'];\n";
}
}
if (!empty($itemAttr)) {
$output .= "{$local}saved = {$itemVar};\n";
}
- $output .= "?>";
-
+ $output .= '?>';
return $output;
}
+
+ /**
+ * Compiles code for to restore saved template variables
+ *
+ * @param int $levels number of levels to restore
+ *
+ * @return string compiled code
+ */
+ public function compileRestore($levels)
+ {
+ return "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl, {$levels});";
+ }
}
/**
@@ -265,24 +281,22 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
/**
* Compiles code for the {foreachelse} tag
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
*/
- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
list($openTag, $nocache, $local, $itemVar, $restore) = $this->closeTag($compiler, array('foreach'));
$this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $itemVar, 0));
$output = "<?php\n";
- if ($restore == 2) {
+ if ($restore === 2) {
$output .= "{$itemVar} = {$local}saved;\n";
}
- $output .= "}\n} else {\n?>\n";
+ $output .= "}\n} else {\n?>";
return $output;
}
}
@@ -298,33 +312,34 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
/**
* Compiles code for the {/foreach} tag
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
+ * @throws \SmartyCompilerException
*/
- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
- $compiler->loopNesting --;
+ $compiler->loopNesting--;
// must endblock be nocache?
if ($compiler->nocache) {
$compiler->tag_nocache = true;
}
-
- list($openTag, $compiler->nocache, $local, $itemVar, $restore) =
- $this->closeTag($compiler, array('foreach', 'foreachelse'));
+ list(
+ $openTag, $compiler->nocache, $local, $itemVar, $restore
+ ) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
$output = "<?php\n";
-
- if ($restore == 2) {
+ if ($restore === 2) {
$output .= "{$itemVar} = {$local}saved;\n";
}
if ($restore > 0) {
$output .= "}\n";
}
$output .= "}\n";
- $output .= "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl);\n";
- $output .= "?>\n";
+ /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
+ $foreachCompiler = $compiler->getTagCompiler('foreach');
+ $output .= $foreachCompiler->compileRestore(1);
+ $output .= "?>";
return $output;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_function.php b/lib/smarty3/sysplugins/smarty_internal_compile_function.php
index c861443..6e408ca 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_function.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_function.php
@@ -16,7 +16,6 @@
*/
class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
{
-
/**
* Attribute definition: Overwrites base class.
*
@@ -44,30 +43,31 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
/**
* Compiles code for the {function} tag
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return bool true
* @throws \SmartyCompilerException
*/
- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
if ($_attr[ 'nocache' ] === true) {
$compiler->trigger_template_error('nocache option not allowed', null, true);
}
unset($_attr[ 'nocache' ]);
- $_name = trim($_attr[ 'name' ], "'\"");
+ $_name = trim($_attr[ 'name' ], '\'"');
$compiler->parent_compiler->tpl_function[ $_name ] = array();
- $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
- $compiler->template->caching);
+ $save = array(
+ $_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
+ $compiler->template->caching
+ );
$this->openTag($compiler, 'function', $save);
// Init temporary context
$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
$compiler->template->compiled->has_nocache_code = false;
+ $compiler->saveRequiredPlugins(true);
return true;
}
}
@@ -80,7 +80,6 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
*/
class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
{
-
/**
* Compiler object
*
@@ -91,18 +90,17 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
/**
* Compiles code for the {/function} tag
*
- * @param array $args array with attributes from parser
- * @param object|\Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param object|\Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return bool true
*/
- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
$this->compiler = $compiler;
$saved_data = $this->closeTag($compiler, array('function'));
$_attr = $saved_data[ 0 ];
- $_name = trim($_attr[ 'name' ], "'\"");
+ $_name = trim($_attr[ 'name' ], '\'"');
$compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
$compiler->parent_compiler->template->compiled->filepath;
$compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
@@ -118,7 +116,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
}
}
if (!empty($_paramsArray)) {
- $_params = 'array(' . implode(",", $_paramsArray) . ')';
+ $_params = 'array(' . implode(',', $_paramsArray) . ')';
$_paramsCode = "\$params = array_merge($_params, \$params);\n";
} else {
$_paramsCode = '';
@@ -126,7 +124,6 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
$_functionCode = $compiler->parser->current_buffer;
// setup buffer for template function code
$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-
$_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
$_funcNameCaching = $_funcName . '_nocache';
if ($compiler->template->compiled->has_nocache_code) {
@@ -134,65 +131,80 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
$output = "<?php\n";
$output .= "/* {$_funcNameCaching} */\n";
$output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
- $output .= "function {$_funcNameCaching} (\$_smarty_tpl,\$params) {\n";
+ $output .= "function {$_funcNameCaching} (Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
$output .= "ob_start();\n";
+ $output .= $compiler->compileRequiredPlugins();
$output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
$output .= $_paramsCode;
- $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}";
+ $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n";
$output .= "\$params = var_export(\$params, true);\n";
$output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
- $output .= "\\\$_smarty_tpl->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
- $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n\";?>";
- $compiler->parser->current_buffer->append_subtree($compiler->parser,
- new Smarty_Internal_ParseTree_Tag($compiler->parser,
- $output));
+ $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
+ $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";?>";
+ $compiler->parser->current_buffer->append_subtree(
+ $compiler->parser,
+ new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ $output
+ )
+ );
$compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
$output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
- $output .= "\\\$_smarty_tpl->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
+ $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
$output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
$output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
$output .= "}\n}\n";
$output .= "/*/ {$_funcName}_nocache */\n\n";
$output .= "?>\n";
- $compiler->parser->current_buffer->append_subtree($compiler->parser,
- new Smarty_Internal_ParseTree_Tag($compiler->parser,
- $output));
- $_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser,
- preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
- array($this, 'removeNocache'),
- $_functionCode->to_smarty_php($compiler->parser)));
+ $compiler->parser->current_buffer->append_subtree(
+ $compiler->parser,
+ new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ $output
+ )
+ );
+ $_functionCode = new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ preg_replace_callback(
+ "/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+ array($this, 'removeNocache'),
+ $_functionCode->to_smarty_php($compiler->parser)
+ )
+ );
}
$compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
$output = "<?php\n";
$output .= "/* {$_funcName} */\n";
$output .= "if (!function_exists('{$_funcName}')) {\n";
- $output .= "function {$_funcName}(\$_smarty_tpl,\$params) {\n";
+ $output .= "function {$_funcName}(Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
$output .= $_paramsCode;
- $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}?>";
- $compiler->parser->current_buffer->append_subtree($compiler->parser,
- new Smarty_Internal_ParseTree_Tag($compiler->parser,
- $output));
+ $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n";
+ $output .= $compiler->compileCheckPlugins(array_merge($compiler->required_plugins[ 'compiled' ],
+ $compiler->required_plugins[ 'nocache' ]));
+ $output .= "?>\n";
+ $compiler->parser->current_buffer->append_subtree(
+ $compiler->parser,
+ new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ $output
+ )
+ );
$compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
$output = "<?php\n}}\n";
$output .= "/*/ {$_funcName} */\n\n";
$output .= "?>\n";
- $compiler->parser->current_buffer->append_subtree($compiler->parser,
- new Smarty_Internal_ParseTree_Tag($compiler->parser,
- $output));
+ $compiler->parser->current_buffer->append_subtree(
+ $compiler->parser,
+ new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ $output
+ )
+ );
$compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
- // nocache plugins must be copied
- if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
- foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
- foreach ($tmp as $type => $data) {
- $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
- $data;
- }
- }
- }
// restore old buffer
-
$compiler->parser->current_buffer = $saved_data[ 1 ];
// restore old status
+ $compiler->restoreRequiredPlugins();
$compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
$compiler->template->caching = $saved_data[ 3 ];
return true;
@@ -200,16 +212,19 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
/**
* Remove nocache code
- *
+ *
* @param $match
*
* @return string
*/
- function removeNocache($match)
+ public function removeNocache($match)
{
$code =
- preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
- '', $match[ 0 ]);
+ preg_replace(
+ "/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+ '',
+ $match[ 0 ]
+ );
$code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
return $code;
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_if.php b/lib/smarty3/sysplugins/smarty_internal_compile_if.php
index f50750a..df3dc3f 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_if.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_if.php
@@ -33,33 +33,36 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
$this->openTag($compiler, 'if', array(1, $compiler->nocache));
// must whole block be nocache ?
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
- if (!array_key_exists("if condition", $parameter)) {
- $compiler->trigger_template_error("missing if condition", null, true);
+ if (!isset($parameter[ 'if condition' ])) {
+ $compiler->trigger_template_error('missing if condition', null, true);
}
-
if (is_array($parameter[ 'if condition' ])) {
+ if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+ $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+ } else {
+ $var = $parameter[ 'if condition' ][ 'var' ];
+ }
if ($compiler->nocache) {
// create nocache var to make it know for further compiling
- if (is_array($parameter[ 'if condition' ][ 'var' ])) {
- $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
- } else {
- $var = $parameter[ 'if condition' ][ 'var' ];
- }
$compiler->setNocacheInVariable($var);
}
- $assignCompiler = new Smarty_Internal_Compile_Assign();
+ $prefixVar = $compiler->getNewPrefixVariable();
+ $_output = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
$assignAttr = array();
- $assignAttr[][ 'value' ] = $parameter[ 'if condition' ][ 'value' ];
+ $assignAttr[][ 'value' ] = $prefixVar;
+ $assignCompiler = new Smarty_Internal_Compile_Assign();
if (is_array($parameter[ 'if condition' ][ 'var' ])) {
$assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
- $_output = $assignCompiler->compile($assignAttr, $compiler,
- array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ]));
+ $_output .= $assignCompiler->compile(
+ $assignAttr,
+ $compiler,
+ array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
+ );
} else {
$assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
- $_output = $assignCompiler->compile($assignAttr, $compiler, array());
+ $_output .= $assignCompiler->compile($assignAttr, $compiler, array());
}
- $_output .= "<?php if (" . $parameter[ 'if condition' ][ 'value' ] . ") {?>";
+ $_output .= "<?php if ({$prefixVar}) {?>";
return $_output;
} else {
return "<?php if ({$parameter['if condition']}) {?>";
@@ -78,18 +81,16 @@ class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
/**
* Compiles code for the {else} tag
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
*/
- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
$this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
-
- return "<?php } else { ?>";
+ return '<?php } else { ?>';
}
}
@@ -115,47 +116,48 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
-
- if (!array_key_exists("if condition", $parameter)) {
- $compiler->trigger_template_error("missing elseif condition", null, true);
+ if (!isset($parameter[ 'if condition' ])) {
+ $compiler->trigger_template_error('missing elseif condition', null, true);
}
-
$assignCode = '';
+ $var = '';
if (is_array($parameter[ 'if condition' ])) {
$condition_by_assign = true;
+ if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+ $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+ } else {
+ $var = $parameter[ 'if condition' ][ 'var' ];
+ }
if ($compiler->nocache) {
// create nocache var to make it know for further compiling
- if (is_array($parameter[ 'if condition' ][ 'var' ])) {
- $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
- } else {
- $var = $parameter[ 'if condition' ][ 'var' ];
- }
$compiler->setNocacheInVariable($var);
}
+ $prefixVar = $compiler->getNewPrefixVariable();
+ $assignCode = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
$assignCompiler = new Smarty_Internal_Compile_Assign();
$assignAttr = array();
- $assignAttr[][ 'value' ] = $parameter[ 'if condition' ][ 'value' ];
+ $assignAttr[][ 'value' ] = $prefixVar;
if (is_array($parameter[ 'if condition' ][ 'var' ])) {
$assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
- $assignCode = $assignCompiler->compile($assignAttr, $compiler,
- array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ]));
+ $assignCode .= $assignCompiler->compile(
+ $assignAttr,
+ $compiler,
+ array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
+ );
} else {
$assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
- $assignCode = $assignCompiler->compile($assignAttr, $compiler, array());
+ $assignCode .= $assignCompiler->compile($assignAttr, $compiler, array());
}
} else {
$condition_by_assign = false;
}
-
$prefixCode = $compiler->getPrefixCode();
if (empty($prefixCode)) {
if ($condition_by_assign) {
$this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
$_output = $compiler->appendCode("<?php } else {\n?>", $assignCode);
- return $compiler->appendCode($_output,
- "<?php if (" . $parameter[ 'if condition' ][ 'value' ] . ") {\n?>");
+ return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
} else {
$this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
return "<?php } elseif ({$parameter['if condition']}) {?>";
@@ -165,8 +167,7 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
$this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
if ($condition_by_assign) {
$_output = $compiler->appendCode($_output, $assignCode);
- return $compiler->appendCode($_output,
- "<?php if (" . $parameter[ 'if condition' ][ 'value' ] . ") {\n?>");
+ return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
} else {
return $compiler->appendCode($_output, "<?php if ({$parameter['if condition']}) {?>");
}
@@ -185,13 +186,12 @@ class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
/**
* Compiles code for the {/if} tag
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
*/
- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
// must endblock be nocache?
if ($compiler->nocache) {
@@ -199,10 +199,9 @@ class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
}
list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif'));
$tmp = '';
- for ($i = 0; $i < $nesting; $i ++) {
+ for ($i = 0; $i < $nesting; $i++) {
$tmp .= '}';
}
-
return "<?php {$tmp}?>";
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_include.php b/lib/smarty3/sysplugins/smarty_internal_compile_include.php
index 3c840e6..716c91d 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_include.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_include.php
@@ -58,26 +58,28 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
*
* @var array
*/
- public $valid_scopes = array('parent' => Smarty::SCOPE_PARENT, 'root' => Smarty::SCOPE_ROOT,
- 'global' => Smarty::SCOPE_GLOBAL, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
- 'smarty' => Smarty::SCOPE_SMARTY);
+ public $valid_scopes = array(
+ 'parent' => Smarty::SCOPE_PARENT, 'root' => Smarty::SCOPE_ROOT,
+ 'global' => Smarty::SCOPE_GLOBAL, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
+ 'smarty' => Smarty::SCOPE_SMARTY
+ );
/**
* Compiles code for the {include} tag
*
- * @param array $args array with attributes from parser
- * @param Smarty_Internal_SmartyTemplateCompiler $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param Smarty_Internal_SmartyTemplateCompiler $compiler compiler object
*
- * @throws SmartyCompilerException
- * @return string compiled code
+ * @return string
+ * @throws \Exception
+ * @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
- public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler, $parameter)
+ public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler)
{
$uid = $t_hash = null;
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
$fullResourceName = $source_resource = $_attr[ 'file' ];
$variable_template = false;
$cache_tpl = false;
@@ -90,11 +92,11 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
$variable_template = true;
}
if (!$variable_template) {
- if ($type != 'string') {
+ if ($type !== 'string') {
$fullResourceName = "{$type}:{$name}";
$compiled = $compiler->parent_compiler->template->compiled;
if (isset($compiled->includes[ $fullResourceName ])) {
- $compiled->includes[ $fullResourceName ] ++;
+ $compiled->includes[ $fullResourceName ]++;
$cache_tpl = true;
} else {
if ("{$compiler->template->source->type}:{$compiler->template->source->name}" ==
@@ -107,7 +109,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
$compiled->includes[ $fullResourceName ] = 1;
}
}
- $fullResourceName = '"' . $fullResourceName . '"';
+ $fullResourceName = $match[ 1 ] . $fullResourceName . $match[ 1 ];
}
}
if (empty($match[ 5 ])) {
@@ -116,10 +118,8 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
} else {
$variable_template = true;
}
-
// scope setup
$_scope = $compiler->convertScope($_attr, $this->valid_scopes);
-
// set flag to cache subtemplate object when called within loop or template name is variable.
if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) {
$_cache_tpl = 'true';
@@ -128,18 +128,14 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
}
// assume caching is off
$_caching = Smarty::CACHING_OFF;
-
$call_nocache = $compiler->tag_nocache || $compiler->nocache;
-
// caching was on and {include} is not in nocache mode
if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
$_caching = self::CACHING_NOCACHE_CODE;
}
-
// flag if included template code should be merged into caller
$merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr[ 'inline' ] === true) &&
!$compiler->template->source->handler->recompiled;
-
if ($merge_compiled_includes) {
// variable template name ?
if ($variable_template) {
@@ -150,7 +146,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
$merge_compiled_includes = false;
}
}
-
/*
* if the {include} tag provides individual parameter for caching or compile_id
* the subtemplate must not be included into the common cache file and is treated like
@@ -158,7 +153,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
*
*/
if ($_attr[ 'nocache' ] !== true && $_attr[ 'caching' ]) {
- $_caching = $_new_caching = (int) $_attr[ 'caching' ];
+ $_caching = $_new_caching = (int)$_attr[ 'caching' ];
$call_nocache = true;
} else {
$_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
@@ -182,7 +177,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
} else {
$_compile_id = '$_smarty_tpl->compile_id';
}
-
// if subtemplate will be called in nocache mode do not merge
if ($compiler->template->caching && $call_nocache) {
$merge_compiled_includes = false;
@@ -200,7 +194,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
$_assign = $_attr[ 'assign' ];
}
}
-
$has_compiled_template = false;
if ($merge_compiled_includes) {
$c_id = isset($_attr[ 'compile_id' ]) ? $_attr[ 'compile_id' ] : $compiler->template->compile_id;
@@ -208,9 +201,14 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
$t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
$compiler->smarty->allow_ambiguous_resources = true;
/* @var Smarty_Internal_Template $tpl */
- $tpl = new $compiler->smarty->template_class (trim($fullResourceName, '"\''), $compiler->smarty,
- $compiler->template, $compiler->template->cache_id, $c_id,
- $_caching);
+ $tpl = new $compiler->smarty->template_class(
+ trim($fullResourceName, '"\''),
+ $compiler->smarty,
+ $compiler->template,
+ $compiler->template->cache_id,
+ $c_id,
+ $_caching
+ );
$uid = $tpl->source->type . $tpl->source->uid;
if (!isset($compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ])) {
$has_compiled_template = $this->compileInlineTemplate($compiler, $tpl, $t_hash);
@@ -232,17 +230,17 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
$_vars = 'array(' . join(',', $_pairs) . ')';
}
$update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache &&
- $_compile_id != '$_smarty_tpl->compile_id';
+ $_compile_id !== '$_smarty_tpl->compile_id';
if ($has_compiled_template && !$call_nocache) {
$_output = "<?php\n";
if ($update_compile_id) {
$_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
}
- if (!empty($_attr) && $_caching == 9999 && $compiler->template->caching) {
+ if (!empty($_attr) && $_caching === 9999 && $compiler->template->caching) {
$_vars_nc = "foreach ($_vars as \$ik => \$iv) {\n";
$_vars_nc .= "\$_smarty_tpl->tpl_vars[\$ik] = new Smarty_Variable(\$iv);\n";
$_vars_nc .= "}\n";
- $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, - 3);
+ $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, -3);
}
if (isset($_assign)) {
$_output .= "ob_start();\n";
@@ -254,11 +252,9 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
if ($update_compile_id) {
$_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
}
- $_output .= "?>\n";
-
+ $_output .= "?>";
return $_output;
}
-
if ($call_nocache) {
$compiler->tag_nocache = true;
}
@@ -277,7 +273,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
if ($update_compile_id) {
$_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
}
- $_output .= "?>\n";
+ $_output .= "?>";
return $_output;
}
@@ -286,17 +282,20 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
*
* @param \Smarty_Internal_SmartyTemplateCompiler $compiler
* @param \Smarty_Internal_Template $tpl
- * @param string $t_hash
+ * @param string $t_hash
*
* @return bool
+ * @throws \Exception
+ * @throws \SmartyException
*/
- public function compileInlineTemplate(Smarty_Internal_SmartyTemplateCompiler $compiler,
- Smarty_Internal_Template $tpl, $t_hash)
- {
+ public function compileInlineTemplate(
+ Smarty_Internal_SmartyTemplateCompiler $compiler,
+ Smarty_Internal_Template $tpl,
+ $t_hash
+ ) {
$uid = $tpl->source->type . $tpl->source->uid;
if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
- $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] =
- $tpl->source->uid;
+ $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] = $tpl->source->uid;
if (isset($compiler->template->inheritance)) {
$tpl->inheritance = clone $compiler->template->inheritance;
}
@@ -310,30 +309,33 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
$tpl->mustCompile = true;
$compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'nocache_hash' ] =
$tpl->compiled->nocache_hash;
- if ($compiler->template->source->type == 'file') {
- $sourceInfo = $compiler->template->source->filepath;
+ if ($tpl->source->type === 'file') {
+ $sourceInfo = $tpl->source->filepath;
} else {
- $basename = $compiler->template->source->handler->getBasename($compiler->template->source);
- $sourceInfo = $compiler->template->source->type . ':' .
- ($basename ? $basename : $compiler->template->source->name);
+ $basename = $tpl->source->handler->getBasename($tpl->source);
+ $sourceInfo = $tpl->source->type . ':' .
+ ($basename ? $basename : $tpl->source->name);
}
// get compiled code
$compiled_code = "<?php\n\n";
$compiled_code .= "/* Start inline template \"{$sourceInfo}\" =============================*/\n";
- $compiled_code .= "function {$tpl->compiled->unifunc} (\$_smarty_tpl) {\n";
+ $compiled_code .= "function {$tpl->compiled->unifunc} (Smarty_Internal_Template \$_smarty_tpl) {\n";
$compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
$compiled_code .= "<?php\n";
$compiled_code .= "}\n?>\n";
$compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
$compiled_code .= "<?php\n\n";
$compiled_code .= "/* End inline template \"{$sourceInfo}\" =============================*/\n";
- $compiled_code .= "?>";
+ $compiled_code .= '?>';
unset($tpl->compiler);
if ($tpl->compiled->has_nocache_code) {
// replace nocache_hash
$compiled_code =
- str_replace("{$tpl->compiled->nocache_hash}", $compiler->template->compiled->nocache_hash,
- $compiled_code);
+ str_replace(
+ "{$tpl->compiled->nocache_hash}",
+ $compiler->template->compiled->nocache_hash,
+ $compiled_code
+ );
$compiler->template->compiled->has_nocache_code = true;
}
$compiler->parent_compiler->mergedSubTemplatesCode[ $tpl->compiled->unifunc ] = $compiled_code;
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_include_php.php b/lib/smarty3/sysplugins/smarty_internal_compile_include_php.php
index a2edd42..1b0fdaa 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_include_php.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_include_php.php
@@ -43,7 +43,7 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
/**
* Compiles code for the {include_php} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string
@@ -57,8 +57,10 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
}
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
- /** @var Smarty_Internal_Template $_smarty_tpl
+ /**
+ *
+ *
+ * @var Smarty_Internal_Template $_smarty_tpl
* used in evaluated code
*/
$_smarty_tpl = $compiler->template;
@@ -74,8 +76,8 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
$_dir = $compiler->smarty->trusted_dir;
}
if (!empty($_dir)) {
- foreach ((array) $_dir as $_script_dir) {
- $_path = $compiler->smarty->_realpath($_script_dir . DS . $_file, true);
+ foreach ((array)$_dir as $_script_dir) {
+ $_path = $compiler->smarty->_realpath($_script_dir . DIRECTORY_SEPARATOR . $_file, true);
if (file_exists($_path)) {
$_filepath = $_path;
break;
@@ -83,25 +85,22 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
}
}
}
- if ($_filepath == false) {
+ if ($_filepath === false) {
$compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true);
}
-
if (isset($compiler->smarty->security_policy)) {
$compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
}
-
if (isset($_attr[ 'assign' ])) {
// output will be stored in a smarty variable instead of being displayed
$_assign = $_attr[ 'assign' ];
}
$_once = '_once';
if (isset($_attr[ 'once' ])) {
- if ($_attr[ 'once' ] == 'false') {
+ if ($_attr[ 'once' ] === 'false') {
$_once = '';
}
}
-
if (isset($_assign)) {
return "<?php ob_start();\ninclude{$_once} ('{$_filepath}');\n\$_smarty_tpl->assign({$_assign},ob_get_clean());\n?>";
} else {
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_insert.php b/lib/smarty3/sysplugins/smarty_internal_compile_insert.php
index 5ef0ac2..56fbc56 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_insert.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_insert.php
@@ -1,5 +1,4 @@
<?php
-
/**
* Smarty Internal Plugin Compile Insert
* Compiles the {insert} tag
@@ -44,19 +43,17 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
/**
* Compiles code for the {insert} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
* @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
- //Does tag create output
- $compiler->has_output = isset($_attr[ 'assign' ]) ? false : true;
-
$nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache);
if (!$nocacheParam) {
// do not compile as nocache code
@@ -66,7 +63,6 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
$_smarty_tpl = $compiler->template;
$_name = null;
$_script = null;
-
$_output = '<?php ';
// save possible attributes
eval('$_name = @' . $_attr[ 'name' ] . ';');
@@ -74,7 +70,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
// output will be stored in a smarty variable instead of being displayed
$_assign = $_attr[ 'assign' ];
// create variable to make sure that the compiler knows about its nocache status
- $var = trim($_attr[ 'assign' ], "'");
+ $var = trim($_attr[ 'assign' ], '\'');
if (isset($compiler->template->tpl_vars[ $var ])) {
$compiler->template->tpl_vars[ $var ]->nocache = true;
} else {
@@ -96,8 +92,8 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
$_dir = $compiler->smarty instanceof SmartyBC ? $compiler->smarty->trusted_dir : null;
}
if (!empty($_dir)) {
- foreach ((array) $_dir as $_script_dir) {
- $_script_dir = rtrim($_script_dir, '/\\') . DS;
+ foreach ((array)$_dir as $_script_dir) {
+ $_script_dir = rtrim($_script_dir, '/\\') . DIRECTORY_SEPARATOR;
if (file_exists($_script_dir . $_script)) {
$_filepath = $_script_dir . $_script;
break;
@@ -105,15 +101,18 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
}
}
}
- if ($_filepath == false) {
+ if ($_filepath === false) {
$compiler->trigger_template_error("{insert} missing script file '{$_script}'", null, true);
}
// code for script file loading
$_output .= "require_once '{$_filepath}' ;";
- require_once $_filepath;
+ include_once $_filepath;
if (!is_callable($_function)) {
- $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'",
- null, true);
+ $compiler->trigger_template_error(
+ " {insert} function '{$_function}' is not callable in script file '{$_script}'",
+ null,
+ true
+ );
}
} else {
$_filepath = 'null';
@@ -122,8 +121,11 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
if (!is_callable($_function)) {
// try plugin
if (!$_function = $compiler->getPlugin($_name, 'insert')) {
- $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", null,
- true);
+ $compiler->trigger_template_error(
+ "{insert} no function or plugin found for '{$_name}'",
+ null,
+ true
+ );
}
}
}
@@ -149,7 +151,6 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
$_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
}
}
-
return $_output;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_ldelim.php b/lib/smarty3/sysplugins/smarty_internal_compile_ldelim.php
index 7251dcd..5493d4e 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_ldelim.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_ldelim.php
@@ -20,7 +20,7 @@ class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
* Compiles code for the {ldelim} tag
* This tag does output the left delimiter
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
@@ -32,9 +32,6 @@ class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
if ($_attr[ 'nocache' ] === true) {
$compiler->trigger_template_error('nocache option not allowed', null, true);
}
- // this tag does not return compiled code
- $compiler->has_code = true;
-
return $compiler->smarty->left_delimiter;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_make_nocache.php b/lib/smarty3/sysplugins/smarty_internal_compile_make_nocache.php
index 720dd68..8a34ccd 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_make_nocache.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_make_nocache.php
@@ -41,20 +41,18 @@ class Smarty_Internal_Compile_Make_Nocache extends Smarty_Internal_CompileBase
/**
* Compiles code for the {make_nocache} tag
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
- * @throws \SmartyCompilerException
*/
- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
if ($compiler->template->caching) {
$output = "<?php \$_smarty_tpl->smarty->ext->_make_nocache->save(\$_smarty_tpl, {$_attr[ 'var' ]});\n?>\n";
- $compiler->has_code = true;
+ $compiler->template->compiled->has_nocache_code = true;
$compiler->suppressNocacheProcessing = true;
return $output;
} else {
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_nocache.php b/lib/smarty3/sysplugins/smarty_internal_compile_nocache.php
index b29a993..12f64ed 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_nocache.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_nocache.php
@@ -27,7 +27,7 @@ class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
* Compiles code for the {nocache} tag
* This tag does not generate compiled output. It only sets a compiler flag.
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return bool
@@ -40,7 +40,6 @@ class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
$compiler->nocache = true;
// this tag does not return compiled code
$compiler->has_code = false;
-
return true;
}
}
@@ -57,7 +56,7 @@ class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
* Compiles code for the {/nocache} tag
* This tag does not generate compiled output. It only sets a compiler flag.
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return bool
@@ -69,7 +68,6 @@ class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
list($compiler->nocache) = $this->closeTag($compiler, array('nocache'));
// this tag does not return compiled code
$compiler->has_code = false;
-
return true;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_parent.php b/lib/smarty3/sysplugins/smarty_internal_compile_parent.php
new file mode 100644
index 0000000..ff23edf
--- /dev/null
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_parent.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Parent Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Parent extends Smarty_Internal_Compile_Child
+{
+ /**
+ * Tag name
+ *
+ * @var string
+ */
+ public $tag = 'parent';
+
+ /**
+ * Block type
+ *
+ * @var string
+ */
+ public $blockType = 'Parent';
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_block_plugin.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_block_plugin.php
index 165d211..199a296 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_block_plugin.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_block_plugin.php
@@ -34,25 +34,26 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
/**
* Compiles code for the execution of block plugin
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
- * @param string $tag name of block plugin
- * @param string $function PHP function name
+ * @param array $parameter array with compilation parameter
+ * @param string $tag name of block plugin
+ * @param string $function PHP function name
*
* @return string compiled code
+ * @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function = null)
{
- if (!isset($tag[ 5 ]) || substr($tag, - 5) != 'close') {
+ if (!isset($tag[ 5 ]) || substr($tag, -5) !== 'close') {
// opening tag of block plugin
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
- $this->nesting ++;
+ $this->nesting++;
unset($_attr[ 'nocache' ]);
list($callback, $_paramsArray, $callable) = $this->setup($compiler, $_attr, $tag, $function);
- $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
+ $_params = 'array(' . implode(',', $_paramsArray) . ')';
// compile code
$output = "<?php ";
if (is_array($callback)) {
@@ -63,7 +64,7 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
$output .= "if (!is_callable({$callable})) {\nthrow new SmartyException('block tag \'{$tag}\' not callable or registered');\n}\n";
}
$output .= "\$_smarty_tpl->smarty->_cache['_tag_stack'][] = array('{$tag}', {$_params});\n";
- $output .= "\$_block_repeat{$this->nesting}=true;\necho {$callback}({$_params}, null, \$_smarty_tpl, \$_block_repeat{$this->nesting});\nwhile (\$_block_repeat{$this->nesting}) {\nob_start();\n?>";
+ $output .= "\$_block_repeat=true;\necho {$callback}({$_params}, null, \$_smarty_tpl, \$_block_repeat);\nwhile (\$_block_repeat) {\nob_start();?>";
$this->openTag($compiler, $tag, array($_params, $compiler->nocache, $callback));
// maybe nocache because of nocache variables or nocache plugin
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
@@ -73,9 +74,7 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
$compiler->tag_nocache = true;
}
// closing tag of block plugin, restore nocache
- list($_params, $compiler->nocache, $callback) = $this->closeTag($compiler, substr($tag, 0, - 5));
- //Does tag create output
- $compiler->has_output = isset($_params[ 'assign' ]) ? false : true;
+ list($_params, $compiler->nocache, $callback) = $this->closeTag($compiler, substr($tag, 0, -5));
// compile code
if (!isset($parameter[ 'modifier_list' ])) {
$mod_pre = $mod_post = $mod_content = '';
@@ -84,27 +83,29 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
$mod_content2 = "\$_block_content{$this->nesting}";
$mod_content = "\$_block_content{$this->nesting} = ob_get_clean();\n";
$mod_pre = "ob_start();\n";
- $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(),
- array('modifierlist' => $parameter[ 'modifier_list' ],
- 'value' => 'ob_get_clean()')) . ";\n";
+ $mod_post = 'echo ' . $compiler->compileTag(
+ 'private_modifier',
+ array(),
+ array(
+ 'modifierlist' => $parameter[ 'modifier_list' ],
+ 'value' => 'ob_get_clean()'
+ )
+ ) . ";\n";
}
- $output = "<?php " . $mod_content . "\$_block_repeat{$this->nesting}=false;\n" . $mod_pre .
- "echo {$callback}({$_params}, " . $mod_content2 .
- ", \$_smarty_tpl, \$_block_repeat{$this->nesting});\n" . $mod_post . "}\n";
- $output .= "array_pop(\$_smarty_tpl->smarty->_cache['_tag_stack']);";
- $output .= "?>";
- $this->nesting --;
+ $output =
+ "<?php {$mod_content}\$_block_repeat=false;\n{$mod_pre}echo {$callback}({$_params}, {$mod_content2}, \$_smarty_tpl, \$_block_repeat);\n{$mod_post}}\n";
+ $output .= 'array_pop($_smarty_tpl->smarty->_cache[\'_tag_stack\']);?>';
}
- return $output . "\n";
+ return $output;
}
/**
* Setup callback and parameter array
*
* @param \Smarty_Internal_TemplateCompilerBase $compiler
- * @param array $_attr attributes
- * @param string $tag
- * @param string $function
+ * @param array $_attr attributes
+ * @param string $tag
+ * @param string $function
*
* @return array
*/
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_foreachsection.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_foreachsection.php
index bf569be..d3aab24 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_foreachsection.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_foreachsection.php
@@ -16,28 +16,6 @@
*/
class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_CompileBase
{
-
- /**
- * Preg search pattern
- *
- * @var string
- */
- private $propertyPreg = '';
-
- /**
- * Offsets in preg match result
- *
- * @var array
- */
- private $resultOffsets = array();
-
- /**
- * Start offset
- *
- * @var int
- */
- private $startOffset = 0;
-
/**
* Name of this tag
*
@@ -72,18 +50,41 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com
public $matchResults = array();
/**
+ * Preg search pattern
+ *
+ * @var string
+ */
+ private $propertyPreg = '';
+
+ /**
+ * Offsets in preg match result
+ *
+ * @var array
+ */
+ private $resultOffsets = array();
+
+ /**
+ * Start offset
+ *
+ * @var int
+ */
+ private $startOffset = 0;
+
+ /**
* Scan sources for used tag attributes
*
- * @param array $attributes
+ * @param array $attributes
* @param \Smarty_Internal_TemplateCompilerBase $compiler
+ *
+ * @throws \SmartyException
*/
public function scanForProperties($attributes, Smarty_Internal_TemplateCompilerBase $compiler)
{
$this->propertyPreg = '~(';
- $this->startOffset = 0;
+ $this->startOffset = 1;
$this->resultOffsets = array();
$this->matchResults = array('named' => array(), 'item' => array());
- if ($this->isNamed) {
+ if (isset($attributes[ 'name' ])) {
$this->buildPropertyPreg(true, $attributes);
}
if (isset($this->itemProperties)) {
@@ -110,18 +111,19 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com
public function buildPropertyPreg($named, $attributes)
{
if ($named) {
- $this->resultOffsets[ 'named' ] = $this->startOffset + 3;
- $this->propertyPreg .= "([\$]smarty[.]{$this->tagName}[.]{$attributes['name']}[.](";
+ $this->resultOffsets[ 'named' ] = $this->startOffset = $this->startOffset + 3;
+ $this->propertyPreg .= "(([\$]smarty[.]{$this->tagName}[.]" .
+ ($this->tagName === 'section' ? "|[\[]\s*" : '') .
+ "){$attributes['name']}[.](";
$properties = $this->nameProperties;
} else {
- $this->resultOffsets[ 'item' ] = $this->startOffset + 3;
+ $this->resultOffsets[ 'item' ] = $this->startOffset = $this->startOffset + 2;
$this->propertyPreg .= "([\$]{$attributes['item']}[@](";
$properties = $this->itemProperties;
}
- $this->startOffset += count($properties) + 2;
$propName = reset($properties);
while ($propName) {
- $this->propertyPreg .= "({$propName})";
+ $this->propertyPreg .= "{$propName}";
$propName = next($properties);
if ($propName) {
$this->propertyPreg .= '|';
@@ -137,11 +139,11 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com
*/
public function matchProperty($source)
{
- preg_match_all($this->propertyPreg, $source, $match, PREG_SET_ORDER);
+ preg_match_all($this->propertyPreg, $source, $match);
foreach ($this->resultOffsets as $key => $offset) {
- foreach ($match as $m) {
- if (isset($m[ $offset ]) && !empty($m[ $offset ])) {
- $this->matchResults[ $key ][ strtolower($m[ $offset ]) ] = true;
+ foreach ($match[ $offset ] as $m) {
+ if (!empty($m)) {
+ $this->matchResults[ $key ][ strtolower($m) ] = true;
}
}
}
@@ -161,6 +163,8 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com
* Find matches in all parent template source
*
* @param \Smarty_Internal_TemplateCompilerBase $compiler
+ *
+ * @throws \SmartyException
*/
public function matchParentTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
{
@@ -171,13 +175,16 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com
if ($compiler !== $nextCompiler) {
// get template source
$_content = $nextCompiler->template->source->getContent();
- if ($_content != '') {
+ if ($_content !== '') {
// run pre filter if required
if ((isset($nextCompiler->smarty->autoload_filters[ 'pre' ]) ||
isset($nextCompiler->smarty->registered_filters[ 'pre' ]))
) {
- $_content = $nextCompiler->smarty->ext->_filterHandler->runFilter('pre', $_content,
- $nextCompiler->template);
+ $_content = $nextCompiler->smarty->ext->_filterHandler->runFilter(
+ 'pre',
+ $_content,
+ $nextCompiler->template
+ );
}
$this->matchProperty($_content);
}
@@ -197,9 +204,9 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com
/**
* Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $parameter array with compilation parameter
*
* @return string compiled code
* @throws \SmartyCompilerException
@@ -218,4 +225,4 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com
$tagVar = "'__smarty_{$tag}_{$name}'";
return "(isset(\$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}']) ? \$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}'] : null)";
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_function_plugin.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_function_plugin.php
index e7934e1..0558234 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_function_plugin.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_function_plugin.php
@@ -35,19 +35,20 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
/**
* Compiles code for the execution of function plugin
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
- * @param string $tag name of function plugin
- * @param string $function PHP function name
+ * @param array $parameter array with compilation parameter
+ * @param string $tag name of function plugin
+ * @param string $function PHP function name
*
* @return string compiled code
+ * @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function)
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
unset($_attr[ 'nocache' ]);
// convert attributes into parameter array string
$_paramsArray = array();
@@ -58,17 +59,20 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
$_paramsArray[] = "'$_key'=>$_value";
}
}
- $_params = 'array(' . implode(",", $_paramsArray) . ')';
+ $_params = 'array(' . implode(',', $_paramsArray) . ')';
// compile code
$output = "{$function}({$_params},\$_smarty_tpl)";
if (!empty($parameter[ 'modifierlist' ])) {
- $output = $compiler->compileTag('private_modifier', array(),
- array('modifierlist' => $parameter[ 'modifierlist' ],
- 'value' => $output));
+ $output = $compiler->compileTag(
+ 'private_modifier',
+ array(),
+ array(
+ 'modifierlist' => $parameter[ 'modifierlist' ],
+ 'value' => $output
+ )
+ );
}
- //Does tag create output
- $compiler->has_output = isset($_attr[ 'assign' ]) ? false : true;
- $output = "<?php " . ($compiler->has_output ? "echo " : '') . "{$output};?>\n";
+ $output = "<?php echo {$output};?>\n";
return $output;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_modifier.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_modifier.php
index 2ee88db..72773ff 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_modifier.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_modifier.php
@@ -1,5 +1,4 @@
<?php
-
/**
* Smarty Internal Plugin Compile Modifier
* Compiles code for modifier execution
@@ -20,12 +19,13 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
/**
* Compiles code for modifier execution
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $parameter array with compilation parameter
*
* @return string compiled code
* @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
{
@@ -34,6 +34,7 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
$output = $parameter[ 'value' ];
// loop over list of modifiers
foreach ($parameter[ 'modifierlist' ] as $single_modifier) {
+ /* @var string $modifier */
$modifier = $single_modifier[ 0 ];
$single_modifier[ 0 ] = $output;
$params = implode(',', $single_modifier);
@@ -48,28 +49,28 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
case 1:
// registered modifier
if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ])) {
- $function =
- $compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ];
- if (!is_array($function)) {
- $output = "{$function}({$params})";
- } else {
- if (is_object($function[ 0 ])) {
- $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' .
- $modifier . '\'][0][0]->' . $function[ 1 ] . '(' . $params . ')';
- } else {
- $output = $function[ 0 ] . '::' . $function[ 1 ] . '(' . $params . ')';
- }
+ if (is_callable($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ])) {
+ $output =
+ sprintf(
+ 'call_user_func_array($_smarty_tpl->registered_plugins[ \'%s\' ][ %s ][ 0 ], array( %s ))',
+ Smarty::PLUGIN_MODIFIER,
+ var_export($modifier, true),
+ $params
+ );
+ $compiler->known_modifier_type[ $modifier ] = $type;
+ break 2;
}
- $compiler->known_modifier_type[ $modifier ] = $type;
- break 2;
}
break;
case 2:
// registered modifier compiler
if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIERCOMPILER ][ $modifier ][ 0 ])) {
$output =
- call_user_func($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIERCOMPILER ][ $modifier ][ 0 ],
- $single_modifier, $compiler->smarty);
+ call_user_func(
+ $compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIERCOMPILER ][ $modifier ][ 0 ],
+ $single_modifier,
+ $compiler->smarty
+ );
$compiler->known_modifier_type[ $modifier ] = $type;
break 2;
}
@@ -78,8 +79,8 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
// modifiercompiler plugin
if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
// check if modifier allowed
- if (!is_object($compiler->smarty->security_policy) ||
- $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+ if (!is_object($compiler->smarty->security_policy)
+ || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
) {
$plugin = 'smarty_modifiercompiler_' . $modifier;
$output = $plugin($single_modifier, $compiler);
@@ -92,8 +93,8 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
// modifier plugin
if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
// check if modifier allowed
- if (!is_object($compiler->smarty->security_policy) ||
- $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+ if (!is_object($compiler->smarty->security_policy)
+ || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
) {
$output = "{$function}({$params})";
}
@@ -105,8 +106,8 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
// PHP function
if (is_callable($modifier)) {
// check if modifier allowed
- if (!is_object($compiler->smarty->security_policy) ||
- $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
+ if (!is_object($compiler->smarty->security_policy)
+ || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
) {
$output = "{$modifier}({$params})";
}
@@ -116,27 +117,28 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
break;
case 6:
// default plugin handler
- if (isset($compiler->default_handler_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ]) ||
- (is_callable($compiler->smarty->default_plugin_handler_func) &&
- $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))
+ if (isset($compiler->default_handler_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ])
+ || (is_callable($compiler->smarty->default_plugin_handler_func)
+ && $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))
) {
$function = $compiler->default_handler_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ];
// check if modifier allowed
- if (!is_object($compiler->smarty->security_policy) ||
- $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+ if (!is_object($compiler->smarty->security_policy)
+ || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
) {
if (!is_array($function)) {
$output = "{$function}({$params})";
} else {
if (is_object($function[ 0 ])) {
- $output = $function[ 0 ] . '->'. $function[ 1 ] . '(' . $params . ')';
+ $output = $function[ 0 ] . '->' . $function[ 1 ] . '(' . $params . ')';
} else {
$output = $function[ 0 ] . '::' . $function[ 1 ] . '(' . $params . ')';
}
}
}
- if (isset($compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ]) ||
- isset($compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ])
+ if (isset($compiler->required_plugins[ 'nocache' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ])
+ ||
+ isset($compiler->required_plugins[ 'compiled' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ])
) {
// was a plugin
$compiler->known_modifier_type[ $modifier ] = 4;
@@ -148,10 +150,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
}
}
if (!isset($compiler->known_modifier_type[ $modifier ])) {
- $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", null, true);
+ $compiler->trigger_template_error("unknown modifier '{$modifier}'", null, true);
}
}
-
return $output;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_object_block_function.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_object_block_function.php
index 5c7fb62..baac51b 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_object_block_function.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_object_block_function.php
@@ -20,9 +20,9 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
* Setup callback and parameter array
*
* @param \Smarty_Internal_TemplateCompilerBase $compiler
- * @param array $_attr attributes
- * @param string $tag
- * @param string $method
+ * @param array $_attr attributes
+ * @param string $tag
+ * @param string $method
*
* @return array
*/
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_object_function.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_object_function.php
index 7f78a42..2a763c6 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_object_function.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_object_function.php
@@ -27,21 +27,20 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
/**
* Compiles code for the execution of function plugin
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
- * @param string $tag name of function
- * @param string $method name of method to call
+ * @param array $parameter array with compilation parameter
+ * @param string $tag name of function
+ * @param string $method name of method to call
*
* @return string compiled code
+ * @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method)
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
- //Does tag create output
- $compiler->has_output = isset($_attr[ 'assign' ]) ? false : true;
-
unset($_attr[ 'nocache' ]);
$_assign = null;
if (isset($_attr[ 'assign' ])) {
@@ -60,10 +59,10 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
$_paramsArray[] = "'$_key'=>$_value";
}
}
- $_params = 'array(' . implode(",", $_paramsArray) . ')';
+ $_params = 'array(' . implode(',', $_paramsArray) . ')';
$output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
} else {
- $_params = implode(",", $_attr);
+ $_params = implode(',', $_attr);
$output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
}
} else {
@@ -71,12 +70,12 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
$output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}";
}
if (!empty($parameter[ 'modifierlist' ])) {
- $output = $compiler->compileTag('private_modifier', array(),
- array('modifierlist' => $parameter[ 'modifierlist' ], 'value' => $output));
+ $output = $compiler->compileTag(
+ 'private_modifier',
+ array(),
+ array('modifierlist' => $parameter[ 'modifierlist' ], 'value' => $output)
+ );
}
- //Does tag create output
- $compiler->has_output = isset($_attr[ 'assign' ]) ? false : true;
-
if (empty($_assign)) {
return "<?php echo {$output};?>\n";
} else {
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_php.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_php.php
index 65d16a9..a3cf0a2 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_php.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_php.php
@@ -16,7 +16,6 @@
*/
class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
{
-
/**
* Attribute definition: Overwrites base class.
*
@@ -40,45 +39,57 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
$compiler->has_code = false;
- if ($_attr[ 'type' ] == 'xml') {
+ if ($_attr[ 'type' ] === 'xml') {
$compiler->tag_nocache = true;
- $save = $compiler->template->compiled->has_nocache_code;
$output = addcslashes($_attr[ 'code' ], "'\\");
- $compiler->parser->current_buffer->append_subtree($compiler->parser,
- new Smarty_Internal_ParseTree_Tag($compiler->parser,
- $compiler->processNocacheCode("<?php echo '" .
- $output .
- "';?>",
- true)));
- $compiler->template->compiled->has_nocache_code = $save;
+ $compiler->parser->current_buffer->append_subtree(
+ $compiler->parser,
+ new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ $compiler->processNocacheCode(
+ "<?php echo '{$output}';?>",
+ true
+ )
+ )
+ );
return '';
}
- if ($_attr[ 'type' ] != 'tag') {
- if ($compiler->php_handling == Smarty::PHP_REMOVE) {
+ if ($_attr[ 'type' ] !== 'tag') {
+ if ($compiler->php_handling === Smarty::PHP_REMOVE) {
return '';
- } elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
+ } elseif ($compiler->php_handling === Smarty::PHP_QUOTE) {
$output =
- preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
- array($this, 'quote'), $_attr[ 'code' ]);
- $compiler->parser->current_buffer->append_subtree($compiler->parser,
- new Smarty_Internal_ParseTree_Text($output));
+ preg_replace_callback(
+ '#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
+ array($this, 'quote'),
+ $_attr[ 'code' ]
+ );
+ $compiler->parser->current_buffer->append_subtree(
+ $compiler->parser,
+ new Smarty_Internal_ParseTree_Text($output)
+ );
return '';
- } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr[ 'type' ] == 'unmatched') {
+ } elseif ($compiler->php_handling === Smarty::PHP_PASSTHRU || $_attr[ 'type' ] === 'unmatched') {
$compiler->tag_nocache = true;
- $save = $compiler->template->compiled->has_nocache_code;
$output = addcslashes($_attr[ 'code' ], "'\\");
- $compiler->parser->current_buffer->append_subtree($compiler->parser,
- new Smarty_Internal_ParseTree_Tag($compiler->parser,
- $compiler->processNocacheCode("<?php echo '" .
- $output .
- "';?>",
- true)));
- $compiler->template->compiled->has_nocache_code = $save;
+ $compiler->parser->current_buffer->append_subtree(
+ $compiler->parser,
+ new Smarty_Internal_ParseTree_Tag(
+ $compiler->parser,
+ $compiler->processNocacheCode(
+ "<?php echo '{$output}';?>",
+ true
+ )
+ )
+ );
return '';
- } elseif ($compiler->php_handling == Smarty::PHP_ALLOW) {
+ } elseif ($compiler->php_handling === Smarty::PHP_ALLOW) {
if (!($compiler->smarty instanceof SmartyBC)) {
- $compiler->trigger_template_error('$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it',
- null, true);
+ $compiler->trigger_template_error(
+ '$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it',
+ null,
+ true
+ );
}
$compiler->has_code = true;
return $_attr[ 'code' ];
@@ -88,21 +99,27 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
} else {
$compiler->has_code = true;
if (!($compiler->smarty instanceof SmartyBC)) {
- $compiler->trigger_template_error('{php}{/php} tags not allowed. Use SmartyBC to enable them', null,
- true);
+ $compiler->trigger_template_error(
+ '{php}{/php} tags not allowed. Use SmartyBC to enable them',
+ null,
+ true
+ );
}
$ldel = preg_quote($compiler->smarty->left_delimiter, '#');
$rdel = preg_quote($compiler->smarty->right_delimiter, '#');
preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
if (!empty($match[ 2 ])) {
- if ('nocache' == trim($match[ 2 ])) {
+ if ('nocache' === trim($match[ 2 ])) {
$compiler->tag_nocache = true;
} else {
- $compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", null, true);
+ $compiler->trigger_template_error("illegal value of option flag '{$match[2]}'", null, true);
}
}
- return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
- array('<?php ', '?>'), $_attr[ 'code' ]);
+ return preg_replace(
+ array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
+ array('<?php ', '?>'),
+ $_attr[ 'code' ]
+ );
}
}
@@ -111,9 +128,11 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
*
* This code has been moved from lexer here fo easier debugging and maintenance
*
- * @param $lex
+ * @param Smarty_Internal_Templatelexer $lex
+ *
+ * @throws \SmartyCompilerException
*/
- public function parsePhp($lex)
+ public function parsePhp(Smarty_Internal_Templatelexer $lex)
{
$lex->token = Smarty_Internal_Templateparser::TP_PHP;
$close = 0;
@@ -121,7 +140,7 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
$closeTag = '?>';
if (strpos($lex->value, '<?xml') === 0) {
$lex->is_xml = true;
- $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+ $lex->phpType = 'xml';
return;
} elseif (strpos($lex->value, '<?') === 0) {
$lex->phpType = 'php';
@@ -133,7 +152,7 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
} elseif (strpos($lex->value, '?>') === 0) {
if ($lex->is_xml) {
$lex->is_xml = false;
- $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+ $lex->phpType = 'xml';
return;
}
$lex->phpType = 'unmatched';
@@ -146,16 +165,18 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
return;
}
$closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
- if ($lex->value == $closeTag) {
+ if ($lex->value === $closeTag) {
$lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
}
$lex->phpType = 'tag';
}
- if ($lex->phpType == 'unmatched') {
+ if ($lex->phpType === 'unmatched') {
return;
}
- if (($lex->phpType == 'php' || $lex->phpType == 'asp') &&
- ($lex->compiler->php_handling == Smarty::PHP_PASSTHRU || $lex->compiler->php_handling == Smarty::PHP_QUOTE)
+ if (($lex->phpType === 'php' || $lex->phpType === 'asp')
+ &&
+ ($lex->compiler->php_handling === Smarty::PHP_PASSTHRU ||
+ $lex->compiler->php_handling === Smarty::PHP_QUOTE)
) {
return;
}
@@ -167,15 +188,21 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
$lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
}
while ($body) {
- if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
- $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+ if (preg_match(
+ '~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
+ $lex->data,
+ $match,
+ PREG_OFFSET_CAPTURE,
+ $start
+ )
+ ) {
$value = $match[ 0 ][ 0 ];
$from = $pos = $match[ 0 ][ 1 ];
if ($pos > $close) {
$body = false;
} else {
$start = $pos + strlen($value);
- $phpCommentStart = $value == '/*';
+ $phpCommentStart = $value === '/*';
if ($phpCommentStart) {
$phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
if ($phpCommentEnd) {
@@ -184,8 +211,14 @@ class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
}
}
while ($close > $pos && $close < $start) {
- if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE,
- $from)) {
+ if (preg_match(
+ '~' . preg_quote($closeTag, '~') . '~i',
+ $lex->data,
+ $match,
+ PREG_OFFSET_CAPTURE,
+ $from
+ )
+ ) {
$close = $match[ 0 ][ 1 ];
$from = $close + strlen($match[ 0 ][ 0 ]);
} else {
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_print_expression.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_print_expression.php
index 811996b..23cae8a 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_print_expression.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -49,9 +49,14 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
$output = $parameter[ 'value' ];
// tag modifier
if (!empty($parameter[ 'modifierlist' ])) {
- $output = $compiler->compileTag('private_modifier', array(),
- array('modifierlist' => $parameter[ 'modifierlist' ],
- 'value' => $output));
+ $output = $compiler->compileTag(
+ 'private_modifier',
+ array(),
+ array(
+ 'modifierlist' => $parameter[ 'modifierlist' ],
+ 'value' => $output
+ )
+ );
}
if (isset($_attr[ 'assign' ])) {
// assign output to variable
@@ -64,19 +69,27 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
if (empty($compiler->default_modifier_list)) {
$modifierlist = array();
foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) {
- preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/',
- $single_default_modifier, $mod_array);
- for ($i = 0, $count = count($mod_array[ 0 ]); $i < $count; $i ++) {
- if ($mod_array[ 0 ][ $i ] != ':') {
+ preg_match_all(
+ '/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/',
+ $single_default_modifier,
+ $mod_array
+ );
+ for ($i = 0, $count = count($mod_array[ 0 ]); $i < $count; $i++) {
+ if ($mod_array[ 0 ][ $i ] !== ':') {
$modifierlist[ $key ][] = $mod_array[ 0 ][ $i ];
}
}
}
$compiler->default_modifier_list = $modifierlist;
}
- $output = $compiler->compileTag('private_modifier', array(),
- array('modifierlist' => $compiler->default_modifier_list,
- 'value' => $output));
+ $output = $compiler->compileTag(
+ 'private_modifier',
+ array(),
+ array(
+ 'modifierlist' => $compiler->default_modifier_list,
+ 'value' => $output
+ )
+ );
}
// autoescape html
if ($compiler->template->smarty->escape_html) {
@@ -85,7 +98,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
// loop over registered filters
if (!empty($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ])) {
foreach ($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ] as $key =>
- $function) {
+ $function) {
if (!is_array($function)) {
$output = "{$function}({$output},\$_smarty_tpl)";
} elseif (is_object($function[ 0 ])) {
@@ -98,33 +111,32 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
}
// auto loaded filters
if (isset($compiler->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ])) {
- foreach ((array) $compiler->template->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ] as $name)
- {
- $result = $this->compile_output_filter($compiler, $name, $output);
+ foreach ((array)$compiler->template->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ] as $name) {
+ $result = $this->compile_variable_filter($compiler, $name, $output);
if ($result !== false) {
$output = $result;
} else {
// not found, throw exception
- throw new SmartyException("Unable to load filter '{$name}'");
+ throw new SmartyException("Unable to load variable filter '{$name}'");
}
}
}
foreach ($compiler->variable_filters as $filter) {
- if (count($filter) == 1 &&
- ($result = $this->compile_output_filter($compiler, $filter[ 0 ], $output)) !== false
+ if (count($filter) === 1
+ && ($result = $this->compile_variable_filter($compiler, $filter[ 0 ], $output)) !== false
) {
$output = $result;
} else {
- $output = $compiler->compileTag('private_modifier', array(),
- array('modifierlist' => array($filter), 'value' => $output));
+ $output = $compiler->compileTag(
+ 'private_modifier',
+ array(),
+ array('modifierlist' => array($filter), 'value' => $output)
+ );
}
}
}
-
- $compiler->has_output = true;
- $output = "<?php echo {$output};?>";
+ $output = "<?php echo {$output};?>\n";
}
-
return $output;
}
@@ -134,26 +146,13 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
* @param string $output embedded output
*
* @return string
+ * @throws \SmartyException
*/
- private function compile_output_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output)
+ private function compile_variable_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output)
{
- $plugin_name = "smarty_variablefilter_{$name}";
- $path = $compiler->smarty->loadPlugin($plugin_name);
- if ($path) {
- /**
- if ($compiler->template->caching) {
- $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $name ][ Smarty::FILTER_VARIABLE ][ 'file' ] =
- $path;
- $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $name ][ Smarty::FILTER_VARIABLE ][ 'function' ] =
- $plugin_name;
- } else {
- $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $name ][ Smarty::FILTER_VARIABLE ][ 'file' ] =
- $path;
- $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $name ][ Smarty::FILTER_VARIABLE ][ 'function' ] =
- $plugin_name;
- }
- * */
- return "{$plugin_name}({$output},\$_smarty_tpl)";
+ $function = $compiler->getPlugin($name, 'variablefilter');
+ if ($function) {
+ return "{$function}({$output},\$_smarty_tpl)";
} else {
// not found
return false;
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_registered_block.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_registered_block.php
index 987bc96..0f818d1 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_registered_block.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_registered_block.php
@@ -20,9 +20,9 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
* Setup callback, parameter array and nocache mode
*
* @param \Smarty_Internal_TemplateCompilerBase $compiler
- * @param array $_attr attributes
- * @param string $tag
- * @param null $function
+ * @param array $_attr attributes
+ * @param string $tag
+ * @param null $function
*
* @return array
*/
@@ -61,7 +61,7 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
if (is_int($_key)) {
$_paramsArray[] = "$_key=>$_value";
} elseif ($compiler->template->caching && in_array($_key, $tag_info[ 2 ])) {
- $_value = str_replace("'", "^#^", $_value);
+ $_value = str_replace('\'', "^#^", $_value);
$_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
} else {
$_paramsArray[] = "'$_key'=>$_value";
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_registered_function.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_registered_function.php
index b3edb68..2591107 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_registered_function.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_registered_function.php
@@ -27,12 +27,14 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
/**
* Compiles code for the execution of a registered function
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
- * @param string $tag name of function
+ * @param array $parameter array with compilation parameter
+ * @param string $tag name of function
*
* @return string compiled code
+ * @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag)
{
@@ -41,10 +43,12 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
unset($_attr[ 'nocache' ]);
if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
$tag_info = $compiler->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ];
+ $is_registered = true;
} else {
$tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ];
+ $is_registered = false;
}
- // not cachable?
+ // not cacheable?
$compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[ 1 ];
// convert attributes into parameter array string
$_paramsArray = array();
@@ -52,31 +56,36 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
if (is_int($_key)) {
$_paramsArray[] = "$_key=>$_value";
} elseif ($compiler->template->caching && in_array($_key, $tag_info[ 2 ])) {
- $_value = str_replace("'", "^#^", $_value);
+ $_value = str_replace('\'', "^#^", $_value);
$_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
} else {
$_paramsArray[] = "'$_key'=>$_value";
}
}
- $_params = 'array(' . implode(",", $_paramsArray) . ')';
- $function = $tag_info[ 0 ];
+ $_params = 'array(' . implode(',', $_paramsArray) . ')';
// compile code
- if (!is_array($function)) {
- $output = "{$function}({$_params},\$_smarty_tpl)";
- } elseif (is_object($function[ 0 ])) {
+ if ($is_registered) {
$output =
- "\$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl)";
+ "call_user_func_array( \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0], array( {$_params},\$_smarty_tpl ) )";
} else {
- $output = "{$function[0]}::{$function[1]}({$_params},\$_smarty_tpl)";
+ $function = $tag_info[ 0 ];
+ if (!is_array($function)) {
+ $output = "{$function}({$_params},\$_smarty_tpl)";
+ } else {
+ $output = "{$function[0]}::{$function[1]}({$_params},\$_smarty_tpl)";
+ }
}
if (!empty($parameter[ 'modifierlist' ])) {
- $output = $compiler->compileTag('private_modifier', array(),
- array('modifierlist' => $parameter[ 'modifierlist' ],
- 'value' => $output));
+ $output = $compiler->compileTag(
+ 'private_modifier',
+ array(),
+ array(
+ 'modifierlist' => $parameter[ 'modifierlist' ],
+ 'value' => $output
+ )
+ );
}
- //Does tag create output
- $compiler->has_output = isset($_attr[ 'assign' ]) ? false : true;
- $output = "<?php " . ($compiler->has_output ? "echo " : '') . "{$output};?>\n";
+ $output = "<?php echo {$output};?>\n";
return $output;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_private_special_variable.php b/lib/smarty3/sysplugins/smarty_internal_compile_private_special_variable.php
index 0c6be44..b317c9f 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_private_special_variable.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -19,9 +19,9 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
/**
* Compiles code for the special $smarty variables
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param $parameter
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+ * @param $parameter
*
* @return string compiled code
* @throws \SmartyCompilerException
@@ -33,8 +33,8 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
if ($variable === false) {
$compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
}
- if (!isset($compiler->smarty->security_policy) ||
- $compiler->smarty->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)
+ if (!isset($compiler->smarty->security_policy)
+ || $compiler->smarty->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)
) {
switch ($variable) {
case 'foreach':
@@ -43,7 +43,11 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
$class = 'Smarty_Internal_Compile_' . ucfirst($variable);
Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ] = new $class;
}
- return Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ]->compileSpecialVariable(array(), $compiler, $_index);
+ return Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ]->compileSpecialVariable(
+ array(),
+ $compiler,
+ $_index
+ );
case 'capture':
if (class_exists('Smarty_Internal_Compile_Capture')) {
return Smarty_Internal_Compile_Capture::compileSpecialVariable(array(), $compiler, $_index);
@@ -52,8 +56,8 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
case 'now':
return 'time()';
case 'cookies':
- if (isset($compiler->smarty->security_policy) &&
- !$compiler->smarty->security_policy->allow_super_globals
+ if (isset($compiler->smarty->security_policy)
+ && !$compiler->smarty->security_policy->allow_super_globals
) {
$compiler->trigger_template_error("(secure mode) super globals not permitted");
break;
@@ -66,30 +70,25 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
case 'server':
case 'session':
case 'request':
- if (isset($compiler->smarty->security_policy) &&
- !$compiler->smarty->security_policy->allow_super_globals
+ if (isset($compiler->smarty->security_policy)
+ && !$compiler->smarty->security_policy->allow_super_globals
) {
$compiler->trigger_template_error("(secure mode) super globals not permitted");
break;
}
$compiled_ref = '$_' . strtoupper($variable);
break;
-
case 'template':
return 'basename($_smarty_tpl->source->filepath)';
-
case 'template_object':
return '$_smarty_tpl';
-
case 'current_dir':
return 'dirname($_smarty_tpl->source->filepath)';
-
case 'version':
return "Smarty::SMARTY_VERSION";
-
case 'const':
- if (isset($compiler->smarty->security_policy) &&
- !$compiler->smarty->security_policy->allow_constants
+ if (isset($compiler->smarty->security_policy)
+ && !$compiler->smarty->security_policy->allow_constants
) {
$compiler->trigger_template_error("(secure mode) constants not permitted");
break;
@@ -99,13 +98,14 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
} else {
return "@constant({$_index[1]})";
}
-
+ // no break
case 'config':
if (isset($_index[ 2 ])) {
return "(is_array(\$tmp = \$_smarty_tpl->smarty->ext->configload->_getConfigVariable(\$_smarty_tpl, $_index[1])) ? \$tmp[$_index[2]] : null)";
} else {
return "\$_smarty_tpl->smarty->ext->configload->_getConfigVariable(\$_smarty_tpl, $_index[1])";
}
+ // no break
case 'ldelim':
return "\$_smarty_tpl->smarty->left_delimiter";
case 'rdelim':
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_rdelim.php b/lib/smarty3/sysplugins/smarty_internal_compile_rdelim.php
index 2e6b43c..1cc340c 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_rdelim.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_rdelim.php
@@ -14,13 +14,13 @@
* @package Smarty
* @subpackage Compiler
*/
-class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase
+class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_Compile_Ldelim
{
/**
* Compiles code for the {rdelim} tag
* This tag does output the right delimiter.
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
@@ -28,13 +28,7 @@ class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
- $_attr = $this->getAttributes($compiler, $args);
- if ($_attr[ 'nocache' ] === true) {
- $compiler->trigger_template_error('nocache option not allowed', null, true);
- }
- // this tag does not return compiled code
- $compiler->has_code = true;
-
+ parent::compile($args, $compiler);
return $compiler->smarty->right_delimiter;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_section.php b/lib/smarty3/sysplugins/smarty_internal_compile_section.php
index c3701fc..0dee208 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_section.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_section.php
@@ -59,8 +59,10 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
*
* @var array
*/
- public $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'rownum', 'index_prev',
- 'index_next', 'loop');
+ public $nameProperties = array(
+ 'first', 'last', 'index', 'iteration', 'show', 'total', 'rownum', 'index_prev',
+ 'index_next', 'loop'
+ );
/**
* {section} tag has no item properties
@@ -79,15 +81,16 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
/**
* Compiles code for the {section} tag
*
- * @param array $args array with attributes from parser
- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+ * @param array $args array with attributes from parser
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
* @throws \SmartyCompilerException
+ * @throws \SmartyException
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
- $compiler->loopNesting ++;
+ $compiler->loopNesting++;
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
$attributes = array('name' => $compiler->getId($_attr[ 'name' ]));
@@ -97,21 +100,19 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
$compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
}
}
- $local = "\$__section_{$attributes['name']}_" . $this->counter ++ . '_';
+ $local = "\$__section_{$attributes['name']}_" . $this->counter++ . '_';
$sectionVar = "\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']";
$this->openTag($compiler, 'section', array('section', $compiler->nocache, $local, $sectionVar));
// maybe nocache because of nocache variables
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
- $initLocal =
- array('saved' => "isset(\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']) ? \$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}'] : false",);
+ $initLocal = array();
$initNamedProperty = array();
$initFor = array();
$incFor = array();
$cmpFor = array();
- $propValue = array('index' => "{$sectionVar}->value['index']", 'show' => 'true', 'step' => 1,
- 'iteration' => "{$local}iteration",
-
+ $propValue = array(
+ 'index' => "{$sectionVar}->value['index']", 'show' => 'true', 'step' => 1,
+ 'iteration' => "{$local}iteration",
);
$propType = array('index' => 2, 'iteration' => 2, 'show' => 0, 'step' => 0,);
// search for used tag attributes
@@ -134,18 +135,13 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
switch ($attr_name) {
case 'loop':
if (is_numeric($attr_value)) {
- $v = (int) $attr_value;
+ $v = (int)$attr_value;
$t = 0;
} else {
$v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
$t = 1;
}
- if (isset($namedAttr[ 'loop' ])) {
- $initNamedProperty[ 'loop' ] = "'loop' => {$v}";
- if ($t == 1) {
- $v = "{$sectionVar}->value['loop']";
- }
- } elseif ($t == 1) {
+ if ($t === 1) {
$initLocal[ 'loop' ] = $v;
$v = "{$local}loop";
}
@@ -161,20 +157,19 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
break;
case 'step':
if (is_numeric($attr_value)) {
- $v = (int) $attr_value;
- $v = ($v == 0) ? 1 : $v;
+ $v = (int)$attr_value;
+ $v = ($v === 0) ? 1 : $v;
$t = 0;
break;
}
- $initLocal[ 'step' ] = "((int)@$attr_value) == 0 ? 1 : (int)@$attr_value";
+ $initLocal[ 'step' ] = "((int)@$attr_value) === 0 ? 1 : (int)@$attr_value";
$v = "{$local}step";
$t = 2;
break;
-
case 'max':
case 'start':
if (is_numeric($attr_value)) {
- $v = (int) $attr_value;
+ $v = (int)$attr_value;
$t = 0;
break;
}
@@ -182,13 +177,12 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
$t = 3;
break;
}
- if ($t == 3 && $compiler->getId($attr_value)) {
+ if ($t === 3 && $compiler->getId($attr_value)) {
$t = 1;
}
$propValue[ $attr_name ] = $v;
$propType[ $attr_name ] = $t;
}
-
if (isset($namedAttr[ 'step' ])) {
$initNamedProperty[ 'step' ] = $propValue[ 'step' ];
}
@@ -197,23 +191,21 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
}
$incFor[ 'iteration' ] = "{$propValue['iteration']}++";
$initFor[ 'iteration' ] = "{$propValue['iteration']} = 1";
-
- if ($propType[ 'step' ] == 0) {
- if ($propValue[ 'step' ] == 1) {
+ if ($propType[ 'step' ] === 0) {
+ if ($propValue[ 'step' ] === 1) {
$incFor[ 'index' ] = "{$sectionVar}->value['index']++";
} elseif ($propValue[ 'step' ] > 1) {
$incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}";
} else {
- $incFor[ 'index' ] = "{$sectionVar}->value['index'] -= " . - $propValue[ 'step' ];
+ $incFor[ 'index' ] = "{$sectionVar}->value['index'] -= " . -$propValue[ 'step' ];
}
} else {
$incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}";
}
-
if (!isset($propValue[ 'max' ])) {
$propValue[ 'max' ] = $propValue[ 'loop' ];
$propType[ 'max' ] = $propType[ 'loop' ];
- } elseif ($propType[ 'max' ] != 0) {
+ } elseif ($propType[ 'max' ] !== 0) {
$propValue[ 'max' ] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
$propType[ 'max' ] = 1;
} else {
@@ -222,15 +214,14 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
$propType[ 'max' ] = $propType[ 'loop' ];
}
}
-
if (!isset($propValue[ 'start' ])) {
$start_code =
array(1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue[ 'loop' ], 5 => ' - 1');
- if ($propType[ 'loop' ] == 0) {
+ if ($propType[ 'loop' ] === 0) {
$start_code[ 5 ] = '';
$start_code[ 4 ] = $propValue[ 'loop' ] - 1;
}
- if ($propType[ 'step' ] == 0) {
+ if ($propType[ 'step' ] === 0) {
if ($propValue[ 'step' ] > 0) {
$start_code = array(1 => '0');
$propType[ 'start' ] = 0;
@@ -244,13 +235,15 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
$propValue[ 'start' ] = join('', $start_code);
} else {
$start_code =
- array(1 => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ", 4 => '0',
- 5 => ' : ', 6 => '-1', 7 => ', ', 8 => "{$propValue['start']} + {$propValue['loop']}", 10 => ')',
- 11 => ' : ', 12 => 'min(', 13 => $propValue[ 'start' ], 14 => ', ',
- 15 => "{$propValue['step']} > 0 ? ", 16 => $propValue[ 'loop' ], 17 => ' : ',
- 18 => $propType[ 'loop' ] == 0 ? $propValue[ 'loop' ] - 1 : "{$propValue['loop']} - 1",
- 19 => ')');
- if ($propType[ 'step' ] == 0) {
+ array(
+ 1 => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ", 4 => '0',
+ 5 => ' : ', 6 => '-1', 7 => ', ', 8 => "{$propValue['start']} + {$propValue['loop']}", 10 => ')',
+ 11 => ' : ', 12 => 'min(', 13 => $propValue[ 'start' ], 14 => ', ',
+ 15 => "{$propValue['step']} > 0 ? ", 16 => $propValue[ 'loop' ], 17 => ' : ',
+ 18 => $propType[ 'loop' ] === 0 ? $propValue[ 'loop' ] - 1 : "{$propValue['loop']} - 1",
+ 19 => ')'
+ );
+ if ($propType[ 'step' ] === 0) {
$start_code[ 3 ] = $start_code[ 5 ] = $start_code[ 15 ] = $start_code[ 17 ] = '';
if ($propValue[ 'step' ] > 0) {
$start_code[ 6 ] = $start_code[ 18 ] = '';
@@ -258,72 +251,85 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
$start_code[ 4 ] = $start_code[ 16 ] = '';
}
}
- if ($propType[ 'start' ] == 0) {
- if ($propType[ 'loop' ] == 0) {
+ if ($propType[ 'start' ] === 0) {
+ if ($propType[ 'loop' ] === 0) {
$start_code[ 8 ] = $propValue[ 'start' ] + $propValue[ 'loop' ];
}
$propType[ 'start' ] = $propType[ 'step' ] + $propType[ 'loop' ];
$start_code[ 1 ] = '';
if ($propValue[ 'start' ] < 0) {
- for ($i = 11; $i <= 19; $i ++) {
+ for ($i = 11; $i <= 19; $i++) {
$start_code[ $i ] = '';
}
- if ($propType[ 'start' ] == 0) {
- $start_code = array(max($propValue[ 'step' ] > 0 ? 0 : - 1,
- $propValue[ 'start' ] + $propValue[ 'loop' ]));
+ if ($propType[ 'start' ] === 0) {
+ $start_code = array(
+ max(
+ $propValue[ 'step' ] > 0 ? 0 : -1,
+ $propValue[ 'start' ] + $propValue[ 'loop' ]
+ )
+ );
}
} else {
- for ($i = 1; $i <= 11; $i ++) {
+ for ($i = 1; $i <= 11; $i++) {
$start_code[ $i ] = '';
}
- if ($propType[ 'start' ] == 0) {
+ if ($propType[ 'start' ] === 0) {
$start_code =
- array(min($propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] : $propValue[ 'loop' ] - 1,
- $propValue[ 'start' ]));
+ array(
+ min(
+ $propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] : $propValue[ 'loop' ] - 1,
+ $propValue[ 'start' ]
+ )
+ );
}
}
}
$propValue[ 'start' ] = join('', $start_code);
}
- if ($propType[ 'start' ] != 0) {
+ if ($propType[ 'start' ] !== 0) {
$initLocal[ 'start' ] = $propValue[ 'start' ];
$propValue[ 'start' ] = "{$local}start";
}
-
$initFor[ 'index' ] = "{$sectionVar}->value['index'] = {$propValue['start']}";
-
if (!isset($_attr[ 'start' ]) && !isset($_attr[ 'step' ]) && !isset($_attr[ 'max' ])) {
$propValue[ 'total' ] = $propValue[ 'loop' ];
$propType[ 'total' ] = $propType[ 'loop' ];
} else {
$propType[ 'total' ] =
$propType[ 'start' ] + $propType[ 'loop' ] + $propType[ 'step' ] + $propType[ 'max' ];
- if ($propType[ 'total' ] == 0) {
+ if ($propType[ 'total' ] === 0) {
$propValue[ 'total' ] =
- min(ceil(($propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] - $propValue[ 'start' ] :
- (int) $propValue[ 'start' ] + 1) / abs($propValue[ 'step' ])), $propValue[ 'max' ]);
+ min(
+ ceil(
+ ($propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] - $propValue[ 'start' ] :
+ (int)$propValue[ 'start' ] + 1) / abs($propValue[ 'step' ])
+ ),
+ $propValue[ 'max' ]
+ );
} else {
- $total_code = array(1 => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
- 5 => $propValue[ 'loop' ], 6 => ' - ', 7 => $propValue[ 'start' ], 8 => ' : ',
- 9 => $propValue[ 'start' ], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
- 14 => $propValue[ 'step' ], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",);
+ $total_code = array(
+ 1 => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
+ 5 => $propValue[ 'loop' ], 6 => ' - ', 7 => $propValue[ 'start' ], 8 => ' : ',
+ 9 => $propValue[ 'start' ], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
+ 14 => $propValue[ 'step' ], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",
+ );
if (!isset($propValue[ 'max' ])) {
$total_code[ 1 ] = $total_code[ 17 ] = '';
}
- if ($propType[ 'loop' ] + $propType[ 'start' ] == 0) {
+ if ($propType[ 'loop' ] + $propType[ 'start' ] === 0) {
$total_code[ 5 ] = $propValue[ 'loop' ] - $propValue[ 'start' ];
$total_code[ 6 ] = $total_code[ 7 ] = '';
}
- if ($propType[ 'start' ] == 0) {
- $total_code[ 9 ] = (int) $propValue[ 'start' ] + 1;
+ if ($propType[ 'start' ] === 0) {
+ $total_code[ 9 ] = (int)$propValue[ 'start' ] + 1;
$total_code[ 10 ] = '';
}
- if ($propType[ 'step' ] == 0) {
+ if ($propType[ 'step' ] === 0) {
$total_code[ 13 ] = $total_code[ 15 ] = '';
- if ($propValue[ 'step' ] == 1 || $propValue[ 'step' ] == - 1) {
+ if ($propValue[ 'step' ] === 1 || $propValue[ 'step' ] === -1) {
$total_code[ 2 ] = $total_code[ 12 ] = $total_code[ 14 ] = $total_code[ 16 ] = '';
} elseif ($propValue[ 'step' ] < 0) {
- $total_code[ 14 ] = - $propValue[ 'step' ];
+ $total_code[ 14 ] = -$propValue[ 'step' ];
}
$total_code[ 4 ] = '';
if ($propValue[ 'step' ] > 0) {
@@ -335,9 +341,8 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
$propValue[ 'total' ] = join('', $total_code);
}
}
-
if (isset($namedAttr[ 'loop' ])) {
- $initNamedProperty[ 'loop' ] = "'loop' => {$propValue['total']}";
+ $initNamedProperty[ 'loop' ] = "'loop' => {$propValue['loop']}";
}
if (isset($namedAttr[ 'total' ])) {
$initNamedProperty[ 'total' ] = "'total' => {$propValue['total']}";
@@ -348,18 +353,15 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
$initLocal[ 'total' ] = $propValue[ 'total' ];
$propValue[ 'total' ] = "{$local}total";
}
-
$cmpFor[ 'iteration' ] = "{$propValue['iteration']} <= {$propValue['total']}";
-
foreach ($initLocal as $key => $code) {
$output .= "{$local}{$key} = {$code};\n";
}
-
$_vars = 'array(' . join(', ', $initNamedProperty) . ')';
$output .= "{$sectionVar} = new Smarty_Variable({$_vars});\n";
- $cond_code = "{$propValue['total']} != 0";
- if ($propType[ 'total' ] == 0) {
- if ($propValue[ 'total' ] == 0) {
+ $cond_code = "{$propValue['total']} !== 0";
+ if ($propType[ 'total' ] === 0) {
+ if ($propValue[ 'total' ] === 0) {
$cond_code = 'false';
} else {
$cond_code = 'true';
@@ -368,7 +370,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
if ($propType[ 'show' ] > 0) {
$output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n";
$output .= "if ({$local}show) {\n";
- } elseif ($propValue[ 'show' ] == 'true') {
+ } elseif ($propValue[ 'show' ] === 'true') {
$output .= "if ({$cond_code}) {\n";
} else {
$output .= "if (false) {\n";
@@ -387,13 +389,12 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
$output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n";
}
if (isset($namedAttr[ 'first' ])) {
- $output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} == 1);\n";
+ $output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} === 1);\n";
}
if (isset($namedAttr[ 'last' ])) {
- $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} == {$propValue['total']});\n";
+ $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} === {$propValue['total']});\n";
}
- $output .= "?>";
-
+ $output .= '?>';
return $output;
}
}
@@ -409,7 +410,7 @@ class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
/**
* Compiles code for the {sectionelse} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
@@ -418,10 +419,8 @@ class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
-
list($openTag, $nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section'));
$this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache, $local, $sectionVar));
-
return "<?php }} else {\n ?>";
}
}
@@ -437,33 +436,27 @@ class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
/**
* Compiles code for the {/section} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
- $compiler->loopNesting --;
+ $compiler->loopNesting--;
// must endblock be nocache?
if ($compiler->nocache) {
$compiler->tag_nocache = true;
}
-
list($openTag, $compiler->nocache, $local, $sectionVar) =
$this->closeTag($compiler, array('section', 'sectionelse'));
-
$output = "<?php\n";
- if ($openTag == 'sectionelse') {
+ if ($openTag === 'sectionelse') {
$output .= "}\n";
} else {
$output .= "}\n}\n";
}
- $output .= "if ({$local}saved) {\n";
- $output .= "{$sectionVar} = {$local}saved;\n";
- $output .= "}\n";
- $output .= "?>";
-
+ $output .= '?>';
return $output;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_setfilter.php b/lib/smarty3/sysplugins/smarty_internal_compile_setfilter.php
index 1f3ba8d..70e2e2f 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_setfilter.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_setfilter.php
@@ -19,9 +19,9 @@ class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
/**
* Compiles code for setfilter tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $parameter array with compilation parameter
*
* @return string compiled code
*/
@@ -31,7 +31,6 @@ class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
$compiler->variable_filters = $parameter[ 'modifier_list' ];
// this tag does not return compiled code
$compiler->has_code = false;
-
return true;
}
}
@@ -48,7 +47,7 @@ class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
* Compiles code for the {/setfilter} tag
* This tag does not generate compiled output. It resets variable filter.
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
@@ -64,7 +63,6 @@ class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
}
// this tag does not return compiled code
$compiler->has_code = false;
-
return true;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_shared_inheritance.php b/lib/smarty3/sysplugins/smarty_internal_compile_shared_inheritance.php
index c955765..d90262e 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_shared_inheritance.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_shared_inheritance.php
@@ -17,30 +17,33 @@
class Smarty_Internal_Compile_Shared_Inheritance extends Smarty_Internal_CompileBase
{
/**
- * Register post compile callback to compile inheritance initialization code
+ * Compile inheritance initialization code as prefix
*
* @param \Smarty_Internal_TemplateCompilerBase $compiler
* @param bool|false $initChildSequence if true force child template
*/
- public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+ public static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
{
- if ($initChildSequence || !isset($compiler->_cache[ 'inheritanceInit' ])) {
- $compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
- array($initChildSequence), 'inheritanceInit', $initChildSequence);
-
- $compiler->_cache[ 'inheritanceInit' ] = true;
- }
+ $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " .
+ var_export($initChildSequence, true) . ");\n?>\n";
}
/**
- * Compile inheritance initialization code as prefix
+ * Register post compile callback to compile inheritance initialization code
*
* @param \Smarty_Internal_TemplateCompilerBase $compiler
* @param bool|false $initChildSequence if true force child template
*/
- static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+ public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
{
- $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " .
- var_export($initChildSequence, true) . ");\n?>\n";
+ if ($initChildSequence || !isset($compiler->_cache[ 'inheritanceInit' ])) {
+ $compiler->registerPostCompileCallback(
+ array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
+ array($initChildSequence),
+ 'inheritanceInit',
+ $initChildSequence
+ );
+ $compiler->_cache[ 'inheritanceInit' ] = true;
+ }
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_compile_while.php b/lib/smarty3/sysplugins/smarty_internal_compile_while.php
index 30d8309..5aa3a73 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compile_while.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compile_while.php
@@ -19,29 +19,26 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
/**
* Compiles code for the {while} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
- * @param array $parameter array with compilation parameter
+ * @param array $parameter array with compilation parameter
*
* @return string compiled code
* @throws \SmartyCompilerException
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
{
- $compiler->loopNesting ++;
+ $compiler->loopNesting++;
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
$this->openTag($compiler, 'while', $compiler->nocache);
-
- if (!array_key_exists("if condition", $parameter)) {
- $compiler->trigger_template_error("missing while condition", null, true);
+ if (!array_key_exists('if condition', $parameter)) {
+ $compiler->trigger_template_error('missing while condition', null, true);
}
-
// maybe nocache because of nocache variables
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
if (is_array($parameter[ 'if condition' ])) {
if ($compiler->nocache) {
- $_nocache = ',true';
// create nocache var to make it know for further compiling
if (is_array($parameter[ 'if condition' ][ 'var' ])) {
$var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
@@ -49,23 +46,24 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
$var = $parameter[ 'if condition' ][ 'var' ];
}
$compiler->setNocacheInVariable($var);
- } else {
- $_nocache = '';
}
+ $prefixVar = $compiler->getNewPrefixVariable();
$assignCompiler = new Smarty_Internal_Compile_Assign();
$assignAttr = array();
- $assignAttr[][ 'value' ] = $parameter[ 'if condition' ][ 'value' ];
+ $assignAttr[][ 'value' ] = $prefixVar;
if (is_array($parameter[ 'if condition' ][ 'var' ])) {
$assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
- $_output = "<?php while (" . $parameter[ 'if condition' ][ 'value' ] . ") {?>";
- $_output .= $assignCompiler->compile($assignAttr, $compiler,
- array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ]));
+ $_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
+ $_output .= $assignCompiler->compile(
+ $assignAttr,
+ $compiler,
+ array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
+ );
} else {
$assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
- $_output = "<?php while (" . $parameter[ 'if condition' ][ 'value' ] . ") {?>";
+ $_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
$_output .= $assignCompiler->compile($assignAttr, $compiler, array());
}
-
return $_output;
} else {
return "<?php\n while ({$parameter['if condition']}) {?>";
@@ -84,14 +82,14 @@ class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase
/**
* Compiles code for the {/while} tag
*
- * @param array $args array with attributes from parser
+ * @param array $args array with attributes from parser
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
*
* @return string compiled code
*/
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
{
- $compiler->loopNesting --;
+ $compiler->loopNesting--;
// must endblock be nocache?
if ($compiler->nocache) {
$compiler->tag_nocache = true;
diff --git a/lib/smarty3/sysplugins/smarty_internal_compilebase.php b/lib/smarty3/sysplugins/smarty_internal_compilebase.php
index 08aab6f..2a32e43 100644
--- a/lib/smarty3/sysplugins/smarty_internal_compilebase.php
+++ b/lib/smarty3/sysplugins/smarty_internal_compilebase.php
@@ -45,15 +45,15 @@ abstract class Smarty_Internal_CompileBase
public $option_flags = array('nocache');
/**
- * Mapping array for boolqn option value
- *
+ * Mapping array for boolean option value
+ *
* @var array
*/
public $optionMap = array(1 => true, 0 => false, 'true' => true, 'false' => false);
/**
* Mapping array with attributes as key
- *
+ *
* @var array
*/
public $mapCache = array();
@@ -65,8 +65,8 @@ abstract class Smarty_Internal_CompileBase
* the corresponding list. The keyword '_any' specifies that any attribute will be accepted
* as valid
*
- * @param object $compiler compiler object
- * @param array $attributes attributes applied to the tag
+ * @param object $compiler compiler object
+ * @param array $attributes attributes applied to the tag
*
* @return array of mapped attributes for further processing
*/
@@ -103,8 +103,12 @@ abstract class Smarty_Internal_CompileBase
if (isset($this->optionMap[ $v ])) {
$_indexed_attr[ $k ] = $this->optionMap[ $v ];
} else {
- $compiler->trigger_template_error("illegal value '" . var_export($v, true) .
- "' for option flag '{$k}'", null, true);
+ $compiler->trigger_template_error(
+ "illegal value '" . var_export($v, true) .
+ "' for option flag '{$k}'",
+ null,
+ true
+ );
}
}
// must be named attribute
@@ -117,19 +121,25 @@ abstract class Smarty_Internal_CompileBase
// check if all required attributes present
foreach ($this->required_attributes as $attr) {
if (!isset($_indexed_attr[ $attr ])) {
- $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true);
+ $compiler->trigger_template_error("missing '{$attr}' attribute", null, true);
}
}
// check for not allowed attributes
- if ($this->optional_attributes != array('_any')) {
+ if ($this->optional_attributes !== array('_any')) {
if (!isset($this->mapCache[ 'all' ])) {
$this->mapCache[ 'all' ] =
- array_fill_keys(array_merge($this->required_attributes, $this->optional_attributes,
- $this->option_flags), true);
+ array_fill_keys(
+ array_merge(
+ $this->required_attributes,
+ $this->optional_attributes,
+ $this->option_flags
+ ),
+ true
+ );
}
foreach ($_indexed_attr as $key => $dummy) {
if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) {
- $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true);
+ $compiler->trigger_template_error("unexpected '{$key}' attribute", null, true);
}
}
}
@@ -162,8 +172,8 @@ abstract class Smarty_Internal_CompileBase
* Pop closing tag
* Raise an error if this stack-top doesn't match with expected opening tags
*
- * @param object $compiler compiler object
- * @param array|string $expectedTag the expected opening tag names
+ * @param object $compiler compiler object
+ * @param array|string $expectedTag the expected opening tag names
*
* @return mixed any type the opening tag's name or saved data
*/
@@ -173,7 +183,7 @@ abstract class Smarty_Internal_CompileBase
// get stacked info
list($_openTag, $_data) = array_pop($compiler->_tag_stack);
// open tag must match with the expected ones
- if (in_array($_openTag, (array) $expectedTag)) {
+ if (in_array($_openTag, (array)$expectedTag)) {
if (is_null($_data)) {
// return opening tag
return $_openTag;
@@ -183,14 +193,11 @@ abstract class Smarty_Internal_CompileBase
}
}
// wrong nesting of tags
- $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag .
- "{$compiler->smarty->right_delimiter} tag");
-
+ $compiler->trigger_template_error("unclosed '{$compiler->smarty->left_delimiter}{$_openTag}{$compiler->smarty->right_delimiter}' tag");
return;
}
// wrong nesting of tags
- $compiler->trigger_template_error("unexpected closing tag", null, true);
-
+ $compiler->trigger_template_error('unexpected closing tag', null, true);
return;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_config_file_compiler.php b/lib/smarty3/sysplugins/smarty_internal_config_file_compiler.php
index 1afb92c..a842fa8 100644
--- a/lib/smarty3/sysplugins/smarty_internal_config_file_compiler.php
+++ b/lib/smarty3/sysplugins/smarty_internal_config_file_compiler.php
@@ -97,46 +97,59 @@ class Smarty_Internal_Config_File_Compiler
* @param Smarty_Internal_Template $template
*
* @return bool true if compiling succeeded, false if it failed
+ * @throws \SmartyException
*/
public function compileTemplate(Smarty_Internal_Template $template)
{
$this->template = $template;
$this->template->compiled->file_dependency[ $this->template->source->uid ] =
- array($this->template->source->filepath, $this->template->source->getTimeStamp(),
- $this->template->source->type);
+ array(
+ $this->template->source->filepath,
+ $this->template->source->getTimeStamp(),
+ $this->template->source->type
+ );
if ($this->smarty->debugging) {
- if (!isset( $this->smarty->_debug)) {
- $this->smarty->_debug = new Smarty_Internal_Debug();
+ if (!isset($this->smarty->_debug)) {
+ $this->smarty->_debug = new Smarty_Internal_Debug();
}
$this->smarty->_debug->start_compile($this->template);
}
// init the lexer/parser to compile the config file
- /* @var Smarty_Internal_ConfigFileLexer $lex */
- $lex = new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $template->source->getContent()) . "\n",
- $this);
- /* @var Smarty_Internal_ConfigFileParser $parser */
- $parser = new $this->parser_class($lex, $this);
-
- if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+ /* @var Smarty_Internal_ConfigFileLexer $this ->lex */
+ $this->lex = new $this->lexer_class(
+ str_replace(
+ array(
+ "\r\n",
+ "\r"
+ ),
+ "\n",
+ $template->source->getContent()
+ ) . "\n",
+ $this
+ );
+ /* @var Smarty_Internal_ConfigFileParser $this ->parser */
+ $this->parser = new $this->parser_class($this->lex, $this);
+ if (function_exists('mb_internal_encoding')
+ && function_exists('ini_get')
+ && ((int)ini_get('mbstring.func_overload')) & 2
+ ) {
$mbEncoding = mb_internal_encoding();
mb_internal_encoding('ASCII');
} else {
$mbEncoding = null;
}
-
if ($this->smarty->_parserdebug) {
- $parser->PrintTrace();
+ $this->parser->PrintTrace();
}
// get tokens from lexer and parse them
- while ($lex->yylex()) {
+ while ($this->lex->yylex()) {
if ($this->smarty->_parserdebug) {
- echo "<br>Parsing {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
+ echo "<br>Parsing {$this->parser->yyTokenName[$this->lex->token]} Token {$this->lex->value} Line {$this->lex->line} \n";
}
- $parser->doParse($lex->token, $lex->value);
+ $this->parser->doParse($this->lex->token, $this->lex->value);
}
// finish parsing process
- $parser->doParse(0, 0);
-
+ $this->parser->doParse(0, 0);
if ($mbEncoding) {
mb_internal_encoding($mbEncoding);
}
@@ -147,8 +160,7 @@ class Smarty_Internal_Config_File_Compiler
$template_header =
"<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
"\n";
- $template_header .= " compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
-
+ $template_header .= " compiled from '{$this->template->source->filepath}' */ ?>\n";
$code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
var_export($this->config_data, true) . '); ?>';
return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
@@ -166,8 +178,6 @@ class Smarty_Internal_Config_File_Compiler
*/
public function trigger_config_file_error($args = null)
{
- $this->lex = Smarty_Internal_Configfilelexer::instance();
- $this->parser = Smarty_Internal_Configfileparser::instance();
// get config source line which has error
$line = $this->lex->line;
if (isset($args)) {
diff --git a/lib/smarty3/sysplugins/smarty_internal_configfilelexer.php b/lib/smarty3/sysplugins/smarty_internal_configfilelexer.php
index ed5aa24..afb3efc 100644
--- a/lib/smarty3/sysplugins/smarty_internal_configfilelexer.php
+++ b/lib/smarty3/sysplugins/smarty_internal_configfilelexer.php
@@ -1,96 +1,133 @@
<?php
/**
-* Smarty Internal Plugin Configfilelexer
-*
-* This is the lexer to break the config file source into tokens
-* @package Smarty
-* @subpackage Config
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Configfilelexer
+ *
+ * This is the lexer to break the config file source into tokens
+ *
+ * @package Smarty
+ * @subpackage Config
+ * @author Uwe Tews
+ */
+
/**
-* Smarty_Internal_Configfilelexer
-*
-* This is the config file lexer.
-* It is generated from the smarty_internal_configfilelexer.plex file
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty_Internal_Configfilelexer
+ *
+ * This is the config file lexer.
+ * It is generated from the smarty_internal_configfilelexer.plex file
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
class Smarty_Internal_Configfilelexer
{
+ const START = 1;
+ const VALUE = 2;
+ const NAKED_STRING_VALUE = 3;
+ const COMMENT = 4;
+ const SECTION = 5;
+ const TRIPPLE = 6;
+
/**
* Source
*
* @var string
*/
public $data;
+
+ /**
+ * Source length
+ *
+ * @var int
+ */
+ public $dataLength = null;
+
/**
* byte counter
*
* @var int
*/
public $counter;
+
/**
* token number
*
* @var int
*/
public $token;
+
/**
* token value
*
* @var string
*/
public $value;
+
/**
* current line
*
* @var int
*/
public $line;
+
/**
* state number
*
* @var int
*/
public $state = 1;
+
/**
* Smarty object
*
* @var Smarty
*/
public $smarty = null;
- /**
- * compiler object
- *
- * @var Smarty_Internal_Config_File_Compiler
- */
- private $compiler = null;
- /**
- * copy of config_booleanize
- *
- * @var bool
- */
- private $configBooleanize = false;
+
/**
* trace file
*
* @var resource
*/
public $yyTraceFILE;
+
/**
* trace prompt
*
* @var string
*/
public $yyTracePrompt;
+
/**
* state names
*
* @var array
*/
- public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
+ public $state_name = array(
+ 1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE'
+ );
+
+ /**
+ * token names
+ *
+ * @var array
+ */
+ public $smarty_token_names = array( // Text for parser error messages
+ );
+
+ /**
+ * compiler object
+ *
+ * @var Smarty_Internal_Config_File_Compiler
+ */
+ private $compiler = null;
+
+ /**
+ * copy of config_booleanize
+ *
+ * @var bool
+ */
+ private $configBooleanize = false;
/**
* storage for assembled token patterns
@@ -98,19 +135,20 @@ class Smarty_Internal_Configfilelexer
* @var string
*/
private $yy_global_pattern1 = null;
+
private $yy_global_pattern2 = null;
+
private $yy_global_pattern3 = null;
+
private $yy_global_pattern4 = null;
+
private $yy_global_pattern5 = null;
+
private $yy_global_pattern6 = null;
- /**
- * token names
- *
- * @var array
- */
- public $smarty_token_names = array( // Text for parser error messages
- );
+ private $_yy_state = 1;
+
+ private $_yy_stack = array();
/**
* constructor
@@ -118,14 +156,13 @@ class Smarty_Internal_Configfilelexer
* @param string $data template source
* @param Smarty_Internal_Config_File_Compiler $compiler
*/
- function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
+ public function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
{
- // set instance object
- self::instance($this);
$this->data = $data . "\n"; //now all lines are \n-terminated
+ $this->dataLength = strlen($data);
$this->counter = 0;
if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
- $this->counter += strlen($match[0]);
+ $this->counter += strlen($match[ 0 ]);
}
$this->line = 1;
$this->compiler = $compiler;
@@ -133,14 +170,10 @@ class Smarty_Internal_Configfilelexer
$this->configBooleanize = $this->smarty->config_booleanize;
}
- public static function &instance($new_instance = null)
+ public function replace($input)
{
- static $instance = null;
- if (isset($new_instance) && is_object($new_instance)) {
- $instance = $new_instance;
- }
- return $instance;
- }
+ return $input;
+ } // end function
public function PrintTrace()
{
@@ -148,11 +181,6 @@ class Smarty_Internal_Configfilelexer
$this->yyTracePrompt = '<br>';
}
-
-
- private $_yy_state = 1;
- private $_yy_stack = array();
-
public function yylex()
{
return $this->{'yylex' . $this->_yy_state}();
@@ -161,57 +189,85 @@ class Smarty_Internal_Configfilelexer
public function yypushstate($state)
{
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+ fprintf(
+ $this->yyTraceFILE,
+ "%sState push %s\n",
+ $this->yyTracePrompt,
+ isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+ );
}
array_push($this->_yy_stack, $this->_yy_state);
$this->_yy_state = $state;
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+ fprintf(
+ $this->yyTraceFILE,
+ "%snew State %s\n",
+ $this->yyTracePrompt,
+ isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+ );
}
}
public function yypopstate()
{
- if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+ if ($this->yyTraceFILE) {
+ fprintf(
+ $this->yyTraceFILE,
+ "%sState pop %s\n",
+ $this->yyTracePrompt,
+ isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+ );
}
- $this->_yy_state = array_pop($this->_yy_stack);
+ $this->_yy_state = array_pop($this->_yy_stack);
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+ fprintf(
+ $this->yyTraceFILE,
+ "%snew State %s\n",
+ $this->yyTracePrompt,
+ isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+ );
}
-
}
public function yybegin($state)
{
- $this->_yy_state = $state;
+ $this->_yy_state = $state;
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+ fprintf(
+ $this->yyTraceFILE,
+ "%sState set %s\n",
+ $this->yyTracePrompt,
+ isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+ );
}
}
-
-
-
public function yylex1()
{
if (!isset($this->yy_global_pattern1)) {
- $this->yy_global_pattern1 = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS";
+ $this->yy_global_pattern1 =
+ $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state START');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state START');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -229,87 +285,89 @@ class Smarty_Internal_Configfilelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
+ }
- } // end function
-
-
- const START = 1;
- function yy_r1_1()
+ public function yy_r1_1()
{
-
- $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
- $this->yypushstate(self::COMMENT);
+ $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+ $this->yypushstate(self::COMMENT);
}
- function yy_r1_2()
- {
- $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
- $this->yypushstate(self::SECTION);
- }
- function yy_r1_3()
+ public function yy_r1_2()
{
-
- $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+ $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+ $this->yypushstate(self::SECTION);
}
- function yy_r1_4()
- {
- $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
- $this->yypushstate(self::VALUE);
- }
- function yy_r1_5()
+ public function yy_r1_3()
{
-
- return false;
+ $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
}
- function yy_r1_6()
- {
- $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
- }
- function yy_r1_7()
+ public function yy_r1_4()
{
+ $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+ $this->yypushstate(self::VALUE);
+ } // end function
- $this->token = Smarty_Internal_Configfileparser::TPC_ID;
- }
- function yy_r1_8()
+ public function yy_r1_5()
{
+ return false;
+ }
- $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+ public function yy_r1_6()
+ {
+ $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
}
+ public function yy_r1_7()
+ {
+ $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+ }
+ public function yy_r1_8()
+ {
+ $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+ }
public function yylex2()
{
if (!isset($this->yy_global_pattern2)) {
- $this->yy_global_pattern2 = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
+ $this->yy_global_pattern2 =
+ $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state VALUE');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state VALUE');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -327,104 +385,106 @@ class Smarty_Internal_Configfilelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
+ }
- } // end function
-
-
- const VALUE = 2;
- function yy_r2_1()
+ public function yy_r2_1()
{
-
- return false;
+ return false;
}
- function yy_r2_2()
- {
- $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
- $this->yypopstate();
- }
- function yy_r2_3()
+ public function yy_r2_2()
{
-
- $this->token = Smarty_Internal_Configfileparser::TPC_INT;
- $this->yypopstate();
+ $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+ $this->yypopstate();
}
- function yy_r2_4()
- {
- $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
- $this->yypushstate(self::TRIPPLE);
- }
- function yy_r2_5()
+ public function yy_r2_3()
{
-
- $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
- $this->yypopstate();
+ $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+ $this->yypopstate();
}
- function yy_r2_6()
- {
- $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
- $this->yypopstate();
- }
- function yy_r2_7()
+ public function yy_r2_4()
{
+ $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+ $this->yypushstate(self::TRIPPLE);
+ }
- if (!$this->configBooleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
- $this->yypopstate();
- $this->yypushstate(self::NAKED_STRING_VALUE);
- return true; //reprocess in new state
- } else {
- $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+ public function yy_r2_5()
+ {
+ $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
$this->yypopstate();
}
- }
- function yy_r2_8()
- {
- $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
- $this->yypopstate();
- }
- function yy_r2_9()
+ public function yy_r2_6()
{
+ $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+ $this->yypopstate();
+ } // end function
- $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
- $this->value = "";
- $this->yypopstate();
+ public function yy_r2_7()
+ {
+ if (!$this->configBooleanize ||
+ !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no'))) {
+ $this->yypopstate();
+ $this->yypushstate(self::NAKED_STRING_VALUE);
+ return true; //reprocess in new state
+ } else {
+ $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+ $this->yypopstate();
+ }
}
+ public function yy_r2_8()
+ {
+ $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+ $this->yypopstate();
+ }
+ public function yy_r2_9()
+ {
+ $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+ $this->value = '';
+ $this->yypopstate();
+ } // end function
public function yylex3()
{
if (!isset($this->yy_global_pattern3)) {
- $this->yy_global_pattern3 = "/\G([^\n]+?(?=[ \t\r]*\n))/isS";
+ $this->yy_global_pattern3 = $this->replace("/\G([^\n]+?(?=[ \t\r]*\n))/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state NAKED_STRING_VALUE');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state NAKED_STRING_VALUE');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -442,50 +502,51 @@ class Smarty_Internal_Configfilelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
+ }
- } // end function
-
-
- const NAKED_STRING_VALUE = 3;
- function yy_r3_1()
+ public function yy_r3_1()
{
-
- $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
- $this->yypopstate();
+ $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+ $this->yypopstate();
}
-
-
public function yylex4()
{
if (!isset($this->yy_global_pattern4)) {
- $this->yy_global_pattern4 = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
+ $this->yy_global_pattern4 = $this->replace("/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state COMMENT');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state COMMENT');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -503,60 +564,61 @@ class Smarty_Internal_Configfilelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
+ }
- } // end function
-
-
- const COMMENT = 4;
- function yy_r4_1()
+ public function yy_r4_1()
{
-
- return false;
+ return false;
}
- function yy_r4_2()
- {
- $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
- }
- function yy_r4_3()
+ public function yy_r4_2()
{
+ $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+ } // end function
- $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
- $this->yypopstate();
+ public function yy_r4_3()
+ {
+ $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+ $this->yypopstate();
}
-
-
public function yylex5()
{
if (!isset($this->yy_global_pattern5)) {
- $this->yy_global_pattern5 = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS";
+ $this->yy_global_pattern5 = $this->replace("/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state SECTION');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state SECTION');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -574,54 +636,56 @@ class Smarty_Internal_Configfilelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
-
- } // end function
-
-
- const SECTION = 5;
- function yy_r5_1()
- {
-
- $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
}
- function yy_r5_2()
- {
- $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
- $this->yypopstate();
+ public function yy_r5_1()
+ {
+ $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
}
+ public function yy_r5_2()
+ {
+ $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+ $this->yypopstate();
+ } // end function
public function yylex6()
{
if (!isset($this->yy_global_pattern6)) {
- $this->yy_global_pattern6 = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS";
+ $this->yy_global_pattern6 = $this->replace("/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern6,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state TRIPPLE');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state TRIPPLE');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -639,42 +703,37 @@ class Smarty_Internal_Configfilelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
+ }
- } // end function
-
-
- const TRIPPLE = 6;
- function yy_r6_1()
+ public function yy_r6_1()
{
-
- $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
- $this->yypopstate();
- $this->yypushstate(self::START);
+ $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+ $this->yypopstate();
+ $this->yypushstate(self::START);
}
- function yy_r6_2()
- {
- $to = strlen($this->data);
- preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
- if (isset($match[0][1])) {
- $to = $match[0][1];
- } else {
- $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
- }
- $this->value = substr($this->data,$this->counter,$to-$this->counter);
- $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+ public function yy_r6_2()
+ {
+ $to = strlen($this->data);
+ preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+ if (isset($match[ 0 ][ 1 ])) {
+ $to = $match[ 0 ][ 1 ];
+ } else {
+ $this->compiler->trigger_config_file_error('missing or misspelled literal closing tag');
+ }
+ $this->value = substr($this->data, $this->counter, $to - $this->counter);
+ $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
}
-
-
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_configfileparser.php b/lib/smarty3/sysplugins/smarty_internal_configfileparser.php
index 0907d89..36fdb76 100644
--- a/lib/smarty3/sysplugins/smarty_internal_configfileparser.php
+++ b/lib/smarty3/sysplugins/smarty_internal_configfileparser.php
@@ -1,68 +1,4 @@
<?php
-class TPC_yyToken implements ArrayAccess
-{
- public $string = '';
- public $metadata = array();
-
- public function __construct($s, $m = array())
- {
- if ($s instanceof TPC_yyToken) {
- $this->string = $s->string;
- $this->metadata = $s->metadata;
- } else {
- $this->string = (string) $s;
- if ($m instanceof TPC_yyToken) {
- $this->metadata = $m->metadata;
- } elseif (is_array($m)) {
- $this->metadata = $m;
- }
- }
- }
-
- public function __toString()
- {
- return $this->string;
- }
-
- public function offsetExists($offset)
- {
- return isset($this->metadata[$offset]);
- }
-
- public function offsetGet($offset)
- {
- return $this->metadata[$offset];
- }
-
- public function offsetSet($offset, $value)
- {
- if ($offset === null) {
- if (isset($value[0])) {
- $x = ($value instanceof TPC_yyToken) ?
- $value->metadata : $value;
- $this->metadata = array_merge($this->metadata, $x);
-
- return;
- }
- $offset = count($this->metadata);
- }
- if ($value === null) {
- return;
- }
- if ($value instanceof TPC_yyToken) {
- if ($value->metadata) {
- $this->metadata[$offset] = $value->metadata;
- }
- } elseif ($value) {
- $this->metadata[$offset] = $value;
- }
- }
-
- public function offsetUnset($offset)
- {
- unset($this->metadata[$offset]);
- }
-}
class TPC_yyStackEntry
{
@@ -71,23 +7,213 @@ class TPC_yyStackEntry
** number for the token at this stack level */
public $minor; /* The user-supplied minor token value. This
** is the value of the token */
-};
-
+}
-#line 12 "./lexer/smarty_internal_configfileparser.y"
+// line 12 "../smarty/lexer/smarty_internal_configfileparser.y"
/**
-* Smarty Internal Plugin Configfileparse
-*
-* This is the config file parser.
-* It is generated from the smarty_internal_configfileparser.y file
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Configfileparse
+ *
+ * This is the config file parser.
+ * It is generated from the smarty_internal_configfileparser.y file
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
class Smarty_Internal_Configfileparser
{
-#line 25 "./lexer/smarty_internal_configfileparser.y"
+ // line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
+ const TPC_OPENB = 1;
+ const TPC_SECTION = 2;
+ const TPC_CLOSEB = 3;
+ const TPC_DOT = 4;
+ const TPC_ID = 5;
+ const TPC_EQUAL = 6;
+ const TPC_FLOAT = 7;
+ const TPC_INT = 8;
+ const TPC_BOOL = 9;
+ const TPC_SINGLE_QUOTED_STRING = 10;
+ const TPC_DOUBLE_QUOTED_STRING = 11;
+ const TPC_TRIPPLE_QUOTES = 12;
+ const TPC_TRIPPLE_TEXT = 13;
+ const TPC_TRIPPLE_QUOTES_END = 14;
+ const TPC_NAKED_STRING = 15;
+ const TPC_OTHER = 16;
+ const TPC_NEWLINE = 17;
+ const TPC_COMMENTSTART = 18;
+ const YY_NO_ACTION = 60;
+ const YY_ACCEPT_ACTION = 59;
+ const YY_ERROR_ACTION = 58;
+ const YY_SZ_ACTTAB = 38;
+ const YY_SHIFT_USE_DFLT = -8;
+ const YY_SHIFT_MAX = 19;
+ const YY_REDUCE_USE_DFLT = -17;
+ const YY_REDUCE_MAX = 10;
+ const YYNOCODE = 29;
+ const YYSTACKDEPTH = 100;
+ const YYNSTATE = 36;
+ const YYNRULE = 22;
+ const YYERRORSYMBOL = 19;
+ const YYERRSYMDT = 'yy0';
+ const YYFALLBACK = 0;
+
+ public static $yy_action = array(
+ 32, 31, 30, 29, 35, 13, 19, 3, 24, 26,
+ 59, 9, 14, 1, 16, 25, 11, 28, 25, 11,
+ 17, 27, 34, 20, 18, 15, 23, 5, 6, 22,
+ 10, 8, 4, 12, 2, 33, 7, 21,
+ );
+
+ public static $yy_lookahead = array(
+ 7, 8, 9, 10, 11, 12, 5, 23, 15, 16,
+ 20, 21, 2, 23, 4, 17, 18, 14, 17, 18,
+ 13, 14, 25, 26, 15, 2, 17, 3, 3, 17,
+ 25, 25, 6, 1, 23, 27, 22, 24,
+ );
+
+ public static $yy_shift_ofst = array(
+ -8, 1, 1, 1, -7, -2, -2, 32, -8, -8,
+ -8, 9, 10, 7, 25, 24, 23, 3, 12, 26,
+ );
+
+ public static $yy_reduce_ofst = array(
+ -10, -3, -3, -3, 8, 6, 5, 13, 11, 14,
+ -16,
+ );
+
+ public static $yyExpectedTokens = array(
+ array(),
+ array(5, 17, 18,),
+ array(5, 17, 18,),
+ array(5, 17, 18,),
+ array(7, 8, 9, 10, 11, 12, 15, 16,),
+ array(17, 18,),
+ array(17, 18,),
+ array(1,),
+ array(),
+ array(),
+ array(),
+ array(15, 17,),
+ array(2, 4,),
+ array(13, 14,),
+ array(3,),
+ array(3,),
+ array(2,),
+ array(14,),
+ array(17,),
+ array(6,),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ );
+
+ public static $yy_default = array(
+ 44, 37, 41, 40, 58, 58, 58, 36, 44, 39,
+ 44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+ 43, 38, 57, 56, 53, 55, 54, 52, 51, 49,
+ 48, 47, 46, 45, 42, 50,
+ );
+
+ public static $yyFallback = array();
+
+ public static $yyRuleName = array(
+ 'start ::= global_vars sections',
+ 'global_vars ::= var_list',
+ 'sections ::= sections section',
+ 'sections ::=',
+ 'section ::= OPENB SECTION CLOSEB newline var_list',
+ 'section ::= OPENB DOT SECTION CLOSEB newline var_list',
+ 'var_list ::= var_list newline',
+ 'var_list ::= var_list var',
+ 'var_list ::=',
+ 'var ::= ID EQUAL value',
+ 'value ::= FLOAT',
+ 'value ::= INT',
+ 'value ::= BOOL',
+ 'value ::= SINGLE_QUOTED_STRING',
+ 'value ::= DOUBLE_QUOTED_STRING',
+ 'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
+ 'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
+ 'value ::= NAKED_STRING',
+ 'value ::= OTHER',
+ 'newline ::= NEWLINE',
+ 'newline ::= COMMENTSTART NEWLINE',
+ 'newline ::= COMMENTSTART NAKED_STRING NEWLINE',
+ );
+
+ public static $yyRuleInfo = array(
+ array(0 => 20, 1 => 2),
+ array(0 => 21, 1 => 1),
+ array(0 => 22, 1 => 2),
+ array(0 => 22, 1 => 0),
+ array(0 => 24, 1 => 5),
+ array(0 => 24, 1 => 6),
+ array(0 => 23, 1 => 2),
+ array(0 => 23, 1 => 2),
+ array(0 => 23, 1 => 0),
+ array(0 => 26, 1 => 3),
+ array(0 => 27, 1 => 1),
+ array(0 => 27, 1 => 1),
+ array(0 => 27, 1 => 1),
+ array(0 => 27, 1 => 1),
+ array(0 => 27, 1 => 1),
+ array(0 => 27, 1 => 3),
+ array(0 => 27, 1 => 2),
+ array(0 => 27, 1 => 1),
+ array(0 => 27, 1 => 1),
+ array(0 => 25, 1 => 1),
+ array(0 => 25, 1 => 2),
+ array(0 => 25, 1 => 3),
+ );
+
+ public static $yyReduceMap = array(
+ 0 => 0,
+ 2 => 0,
+ 3 => 0,
+ 19 => 0,
+ 20 => 0,
+ 21 => 0,
+ 1 => 1,
+ 4 => 4,
+ 5 => 5,
+ 6 => 6,
+ 7 => 7,
+ 8 => 8,
+ 9 => 9,
+ 10 => 10,
+ 11 => 11,
+ 12 => 12,
+ 13 => 13,
+ 14 => 14,
+ 15 => 15,
+ 16 => 16,
+ 17 => 17,
+ 18 => 17,
+ );
+
+ /**
+ * helper map
+ *
+ * @var array
+ */
+ private static $escapes_single = array(
+ '\\' => '\\',
+ '\'' => '\''
+ );
/**
* result status
@@ -95,59 +221,82 @@ class Smarty_Internal_Configfileparser
* @var bool
*/
public $successful = true;
+
/**
* return value
*
* @var mixed
*/
public $retvalue = 0;
+
/**
* @var
*/
public $yymajor;
+
/**
- * lexer object
+ * compiler object
*
- * @var Smarty_Internal_Configfilelexer
+ * @var Smarty_Internal_Config_File_Compiler
*/
- private $lex;
+ public $compiler = null;
+
/**
- * internal error flag
+ * smarty object
*
- * @var bool
+ * @var Smarty
*/
- private $internalError = false;
+ public $smarty = null;
+
+ public $yyTraceFILE;
+
+ public $yyTracePrompt;
+
+ public $yyidx;
+
+ public $yyerrcnt;
+
+ public $yystack = array();
+
+ public $yyTokenName = array(
+ '$', 'OPENB', 'SECTION', 'CLOSEB',
+ 'DOT', 'ID', 'EQUAL', 'FLOAT',
+ 'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING',
+ 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING',
+ 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error',
+ 'start', 'global_vars', 'sections', 'var_list',
+ 'section', 'newline', 'var', 'value',
+ );
+
/**
- * compiler object
+ * lexer object
*
- * @var Smarty_Internal_Config_File_Compiler
+ * @var Smarty_Internal_Configfilelexer
*/
- public $compiler = null;
+ private $lex;
+
/**
- * smarty object
+ * internal error flag
*
- * @var Smarty
+ * @var bool
*/
- public $smarty = null;
+ private $internalError = false;
+
/**
* copy of config_overwrite property
*
* @var bool
*/
private $configOverwrite = false;
+
/**
* copy of config_read_hidden property
*
* @var bool
*/
private $configReadHidden = false;
- /**
- * helper map
- *
- * @var array
- */
- private static $escapes_single = Array('\\' => '\\',
- '\'' => '\'');
+
+ private $_retvalue;
/**
* constructor
@@ -155,10 +304,8 @@ class Smarty_Internal_Configfileparser
* @param Smarty_Internal_Configfilelexer $lex
* @param Smarty_Internal_Config_File_Compiler $compiler
*/
- function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+ public function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
{
- // set instance object
- self::instance($this);
$this->lex = $lex;
$this->smarty = $compiler->smarty;
$this->compiler = $compiler;
@@ -166,36 +313,12 @@ class Smarty_Internal_Configfileparser
$this->configReadHidden = $this->smarty->config_read_hidden;
}
- /**
- * @param null $new_instance
- *
- * @return null
- */
- public static function &instance($new_instance = null)
- {
- static $instance = null;
- if (isset($new_instance) && is_object($new_instance)) {
- $instance = $new_instance;
- }
- return $instance;
- }
-
- /**
- * parse optional boolean keywords
- *
- * @param string $str
- *
- * @return bool
- */
- private function parse_bool($str)
+ public static function yy_destructor($yymajor, $yypminor)
{
- $str = strtolower($str);
- if (in_array($str, array('on', 'yes', 'true'))) {
- $res = true;
- } else {
- $res = false;
+ switch ($yymajor) {
+ default:
+ break; /* If no destructor action specified: do nothing */
}
- return $res;
}
/**
@@ -210,21 +333,18 @@ class Smarty_Internal_Configfileparser
private static function parse_single_quoted_string($qstr)
{
$escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
-
- $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
-
- $str = "";
+ $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $str = '';
foreach ($ss as $s) {
- if (strlen($s) === 2 && $s[0] === '\\') {
- if (isset(self::$escapes_single[$s[1]])) {
- $s = self::$escapes_single[$s[1]];
+ if (strlen($s) === 2 && $s[ 0 ] === '\\') {
+ if (isset(self::$escapes_single[ $s[ 1 ] ])) {
+ $s = self::$escapes_single[ $s[ 1 ] ];
}
}
$str .= $s;
}
return $str;
- }
-
+ } /* Index of top element in stack */
/**
* parse double quoted string
*
@@ -236,8 +356,7 @@ class Smarty_Internal_Configfileparser
{
$inner_str = substr($qstr, 1, strlen($qstr) - 2);
return stripcslashes($inner_str);
- }
-
+ } /* Shifts left before out of the error */
/**
* parse triple quoted string
*
@@ -248,158 +367,7 @@ class Smarty_Internal_Configfileparser
private static function parse_tripple_double_quoted_string($qstr)
{
return stripcslashes($qstr);
- }
-
- /**
- * set a config variable in target array
- *
- * @param array $var
- * @param array $target_array
- */
- private function set_var(Array $var, Array &$target_array)
- {
- $key = $var["key"];
- $value = $var["value"];
-
- if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
- $target_array['vars'][$key] = $value;
- } else {
- settype($target_array['vars'][$key], 'array');
- $target_array['vars'][$key][] = $value;
- }
- }
-
- /**
- * add config variable to global vars
- *
- * @param array $vars
- */
- private function add_global_vars(Array $vars)
- {
- if (!isset($this->compiler->config_data['vars'])) {
- $this->compiler->config_data['vars'] = Array();
- }
- foreach ($vars as $var) {
- $this->set_var($var, $this->compiler->config_data);
- }
- }
-
- /**
- * add config variable to section
- *
- * @param string $section_name
- * @param array $vars
- */
- private function add_section_vars($section_name, Array $vars)
- {
- if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
- $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
- }
- foreach ($vars as $var) {
- $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
- }
- }
-
- const TPC_OPENB = 1;
- const TPC_SECTION = 2;
- const TPC_CLOSEB = 3;
- const TPC_DOT = 4;
- const TPC_ID = 5;
- const TPC_EQUAL = 6;
- const TPC_FLOAT = 7;
- const TPC_INT = 8;
- const TPC_BOOL = 9;
- const TPC_SINGLE_QUOTED_STRING = 10;
- const TPC_DOUBLE_QUOTED_STRING = 11;
- const TPC_TRIPPLE_QUOTES = 12;
- const TPC_TRIPPLE_TEXT = 13;
- const TPC_TRIPPLE_QUOTES_END = 14;
- const TPC_NAKED_STRING = 15;
- const TPC_OTHER = 16;
- const TPC_NEWLINE = 17;
- const TPC_COMMENTSTART = 18;
- const YY_NO_ACTION = 60;
- const YY_ACCEPT_ACTION = 59;
- const YY_ERROR_ACTION = 58;
-
- const YY_SZ_ACTTAB = 38;
-static public $yy_action = array(
- 32, 31, 30, 29, 35, 13, 19, 3, 24, 26,
- 59, 9, 14, 1, 16, 25, 11, 28, 25, 11,
- 17, 27, 34, 20, 18, 15, 23, 5, 6, 22,
- 10, 8, 4, 12, 2, 33, 7, 21,
- );
- static public $yy_lookahead = array(
- 7, 8, 9, 10, 11, 12, 5, 23, 15, 16,
- 20, 21, 2, 23, 4, 17, 18, 14, 17, 18,
- 13, 14, 25, 26, 15, 2, 17, 3, 3, 17,
- 25, 25, 6, 1, 23, 27, 22, 24,
-);
- const YY_SHIFT_USE_DFLT = -8;
- const YY_SHIFT_MAX = 19;
- static public $yy_shift_ofst = array(
- -8, 1, 1, 1, -7, -2, -2, 32, -8, -8,
- -8, 9, 10, 7, 25, 24, 23, 3, 12, 26,
-);
- const YY_REDUCE_USE_DFLT = -17;
- const YY_REDUCE_MAX = 10;
- static public $yy_reduce_ofst = array(
- -10, -3, -3, -3, 8, 6, 5, 13, 11, 14,
- -16,
-);
- static public $yyExpectedTokens = array(
- array(),
- array(5, 17, 18, ),
- array(5, 17, 18, ),
- array(5, 17, 18, ),
- array(7, 8, 9, 10, 11, 12, 15, 16, ),
- array(17, 18, ),
- array(17, 18, ),
- array(1, ),
- array(),
- array(),
- array(),
- array(15, 17, ),
- array(2, 4, ),
- array(13, 14, ),
- array(3, ),
- array(3, ),
- array(2, ),
- array(14, ),
- array(17, ),
- array(6, ),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
-);
- static public $yy_default = array(
- 44, 37, 41, 40, 58, 58, 58, 36, 44, 39,
- 44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
- 43, 38, 57, 56, 53, 55, 54, 52, 51, 49,
- 48, 47, 46, 45, 42, 50,
-);
- const YYNOCODE = 29;
- const YYSTACKDEPTH = 100;
- const YYNSTATE = 36;
- const YYNRULE = 22;
- const YYERRORSYMBOL = 19;
- const YYERRSYMDT = 'yy0';
- const YYFALLBACK = 0;
- public static $yyFallback = array(
- );
+ } /* The parser's stack */
public function Trace($TraceFILE, $zTracePrompt)
{
if (!$TraceFILE) {
@@ -417,63 +385,15 @@ static public $yy_action = array(
$this->yyTracePrompt = '<br>';
}
- public $yyTraceFILE;
- public $yyTracePrompt;
- public $yyidx; /* Index of top element in stack */
- public $yyerrcnt; /* Shifts left before out of the error */
- public $yystack = array(); /* The parser's stack */
-
- public $yyTokenName = array(
- '$', 'OPENB', 'SECTION', 'CLOSEB',
- 'DOT', 'ID', 'EQUAL', 'FLOAT',
- 'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING',
- 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING',
- 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error',
- 'start', 'global_vars', 'sections', 'var_list',
- 'section', 'newline', 'var', 'value',
- );
-
- public static $yyRuleName = array(
- 'start ::= global_vars sections',
- 'global_vars ::= var_list',
- 'sections ::= sections section',
- 'sections ::=',
- 'section ::= OPENB SECTION CLOSEB newline var_list',
- 'section ::= OPENB DOT SECTION CLOSEB newline var_list',
- 'var_list ::= var_list newline',
- 'var_list ::= var_list var',
- 'var_list ::=',
- 'var ::= ID EQUAL value',
- 'value ::= FLOAT',
- 'value ::= INT',
- 'value ::= BOOL',
- 'value ::= SINGLE_QUOTED_STRING',
- 'value ::= DOUBLE_QUOTED_STRING',
- 'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
- 'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
- 'value ::= NAKED_STRING',
- 'value ::= OTHER',
- 'newline ::= NEWLINE',
- 'newline ::= COMMENTSTART NEWLINE',
- 'newline ::= COMMENTSTART NAKED_STRING NEWLINE',
- );
-
public function tokenName($tokenType)
{
if ($tokenType === 0) {
return 'End of Input';
}
if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
- return $this->yyTokenName[$tokenType];
+ return $this->yyTokenName[ $tokenType ];
} else {
- return "Unknown";
- }
- }
-
- public static function yy_destructor($yymajor, $yypminor)
- {
- switch ($yymajor) {
- default: break; /* If no destructor action specified: do nothing */
+ return 'Unknown';
}
}
@@ -484,20 +404,21 @@ static public $yy_action = array(
}
$yytos = array_pop($this->yystack);
if ($this->yyTraceFILE && $this->yyidx >= 0) {
- fwrite($this->yyTraceFILE,
- $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
- "\n");
+ fwrite(
+ $this->yyTraceFILE,
+ $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] .
+ "\n"
+ );
}
$yymajor = $yytos->major;
self::yy_destructor($yymajor, $yytos->minor);
$this->yyidx--;
-
return $yymajor;
}
public function __destruct()
{
- while ($this->yystack !== Array()) {
+ while ($this->yystack !== array()) {
$this->yy_pop_parser_stack();
}
if (is_resource($this->yyTraceFILE)) {
@@ -509,14 +430,14 @@ static public $yy_action = array(
{
static $res3 = array();
static $res4 = array();
- $state = $this->yystack[$this->yyidx]->stateno;
- $expected = self::$yyExpectedTokens[$state];
- if (isset($res3[$state][$token])) {
- if ($res3[$state][$token]) {
+ $state = $this->yystack[ $this->yyidx ]->stateno;
+ $expected = self::$yyExpectedTokens[ $state ];
+ if (isset($res3[ $state ][ $token ])) {
+ if ($res3[ $state ][ $token ]) {
return $expected;
}
} else {
- if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+ if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
return $expected;
}
}
@@ -528,7 +449,7 @@ static public $yy_action = array(
// reduce action
$done = 0;
do {
- if ($done++ == 100) {
+ if ($done++ === 100) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
// too much recursion prevents proper detection
@@ -536,20 +457,22 @@ static public $yy_action = array(
return array_unique($expected);
}
$yyruleno = $yyact - self::YYNSTATE;
- $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+ $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
$nextstate = $this->yy_find_reduce_action(
- $this->yystack[$this->yyidx]->stateno,
- self::$yyRuleInfo[$yyruleno][0]);
- if (isset(self::$yyExpectedTokens[$nextstate])) {
- $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
- if (isset($res4[$nextstate][$token])) {
- if ($res4[$nextstate][$token]) {
+ $this->yystack[ $this->yyidx ]->stateno,
+ self::$yyRuleInfo[ $yyruleno ][ 0 ]
+ );
+ if (isset(self::$yyExpectedTokens[ $nextstate ])) {
+ $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
+ if (isset($res4[ $nextstate ][ $token ])) {
+ if ($res4[ $nextstate ][ $token ]) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
return array_unique($expected);
}
} else {
- if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+ if ($res4[ $nextstate ][ $token ] =
+ in_array($token, self::$yyExpectedTokens[ $nextstate ], true)) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
return array_unique($expected);
@@ -561,10 +484,10 @@ static public $yy_action = array(
$this->yyidx++;
$x = new TPC_yyStackEntry;
$x->stateno = $nextstate;
- $x->major = self::$yyRuleInfo[$yyruleno][0];
- $this->yystack[$this->yyidx] = $x;
+ $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+ $this->yystack[ $this->yyidx ] = $x;
continue 2;
- } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+ } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
// the last token was just ignored, we can't accept
@@ -583,9 +506,8 @@ static public $yy_action = array(
}
break;
} while (true);
- $this->yyidx = $yyidx;
- $this->yystack = $stack;
-
+ $this->yyidx = $yyidx;
+ $this->yystack = $stack;
return array_unique($expected);
}
@@ -596,16 +518,16 @@ static public $yy_action = array(
if ($token === 0) {
return true; // 0 is not part of this
}
- $state = $this->yystack[$this->yyidx]->stateno;
- if (isset($res[$state][$token])) {
- if ($res[$state][$token]) {
+ $state = $this->yystack[ $this->yyidx ]->stateno;
+ if (isset($res[ $state ][ $token ])) {
+ if ($res[ $state ][ $token ]) {
return true;
}
} else {
- if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+ if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
return true;
}
- }
+ }
$stack = $this->yystack;
$yyidx = $this->yyidx;
do {
@@ -614,7 +536,7 @@ static public $yy_action = array(
// reduce action
$done = 0;
do {
- if ($done++ == 100) {
+ if ($done++ === 100) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
// too much recursion prevents proper detection
@@ -622,18 +544,21 @@ static public $yy_action = array(
return true;
}
$yyruleno = $yyact - self::YYNSTATE;
- $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+ $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
$nextstate = $this->yy_find_reduce_action(
- $this->yystack[$this->yyidx]->stateno,
- self::$yyRuleInfo[$yyruleno][0]);
- if (isset($res2[$nextstate][$token])) {
- if ($res2[$nextstate][$token]) {
+ $this->yystack[ $this->yyidx ]->stateno,
+ self::$yyRuleInfo[ $yyruleno ][ 0 ]
+ );
+ if (isset($res2[ $nextstate ][ $token ])) {
+ if ($res2[ $nextstate ][ $token ]) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
return true;
}
} else {
- if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+ if ($res2[ $nextstate ][ $token ] =
+ (isset(self::$yyExpectedTokens[ $nextstate ]) &&
+ in_array($token, self::$yyExpectedTokens[ $nextstate ], true))) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
return true;
@@ -644,10 +569,10 @@ static public $yy_action = array(
$this->yyidx++;
$x = new TPC_yyStackEntry;
$x->stateno = $nextstate;
- $x->major = self::$yyRuleInfo[$yyruleno][0];
- $this->yystack[$this->yyidx] = $x;
+ $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+ $this->yystack[ $this->yyidx ] = $x;
continue 2;
- } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+ } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
if (!$token) {
@@ -672,66 +597,61 @@ static public $yy_action = array(
} while (true);
$this->yyidx = $yyidx;
$this->yystack = $stack;
-
return true;
}
- public function yy_find_shift_action($iLookAhead)
+ public function yy_find_shift_action($iLookAhead)
{
- $stateno = $this->yystack[$this->yyidx]->stateno;
-
+ $stateno = $this->yystack[ $this->yyidx ]->stateno;
/* if ($this->yyidx < 0) return self::YY_NO_ACTION; */
- if (!isset(self::$yy_shift_ofst[$stateno])) {
+ if (!isset(self::$yy_shift_ofst[ $stateno ])) {
// no shift actions
- return self::$yy_default[$stateno];
+ return self::$yy_default[ $stateno ];
}
- $i = self::$yy_shift_ofst[$stateno];
+ $i = self::$yy_shift_ofst[ $stateno ];
if ($i === self::YY_SHIFT_USE_DFLT) {
- return self::$yy_default[$stateno];
+ return self::$yy_default[ $stateno ];
}
- if ($iLookAhead == self::YYNOCODE) {
+ if ($iLookAhead === self::YYNOCODE) {
return self::YY_NO_ACTION;
}
$i += $iLookAhead;
if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
- self::$yy_lookahead[$i] != $iLookAhead) {
+ self::$yy_lookahead[ $i ] != $iLookAhead) {
if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
- && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+ && ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0) {
if ($this->yyTraceFILE) {
- fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " .
- $this->yyTokenName[$iLookAhead] . " => " .
- $this->yyTokenName[$iFallback] . "\n");
+ fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+ $this->yyTokenName[ $iLookAhead ] . ' => ' .
+ $this->yyTokenName[ $iFallback ] . "\n");
}
-
return $this->yy_find_shift_action($iFallback);
}
-
- return self::$yy_default[$stateno];
+ return self::$yy_default[ $stateno ];
} else {
- return self::$yy_action[$i];
+ return self::$yy_action[ $i ];
}
}
public function yy_find_reduce_action($stateno, $iLookAhead)
{
/* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
- if (!isset(self::$yy_reduce_ofst[$stateno])) {
- return self::$yy_default[$stateno];
+ if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
+ return self::$yy_default[ $stateno ];
}
- $i = self::$yy_reduce_ofst[$stateno];
- if ($i == self::YY_REDUCE_USE_DFLT) {
- return self::$yy_default[$stateno];
+ $i = self::$yy_reduce_ofst[ $stateno ];
+ if ($i === self::YY_REDUCE_USE_DFLT) {
+ return self::$yy_default[ $stateno ];
}
- if ($iLookAhead == self::YYNOCODE) {
+ if ($iLookAhead === self::YYNOCODE) {
return self::YY_NO_ACTION;
}
$i += $iLookAhead;
if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
- self::$yy_lookahead[$i] != $iLookAhead) {
- return self::$yy_default[$stateno];
+ self::$yy_lookahead[ $i ] != $iLookAhead) {
+ return self::$yy_default[ $stateno ];
} else {
- return self::$yy_action[$i];
+ return self::$yy_action[ $i ];
}
}
@@ -746,11 +666,9 @@ static public $yy_action = array(
while ($this->yyidx >= 0) {
$this->yy_pop_parser_stack();
}
-#line 255 "./lexer/smarty_internal_configfileparser.y"
-
- $this->internalError = true;
- $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
-
+ // line 239 "../smarty/lexer/smarty_internal_configfileparser.y"
+ $this->internalError = true;
+ $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
return;
}
$yytos = new TPC_yyStackEntry;
@@ -759,162 +677,158 @@ static public $yy_action = array(
$yytos->minor = $yypMinor;
$this->yystack[] = $yytos;
if ($this->yyTraceFILE && $this->yyidx > 0) {
- fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
- $yyNewState);
+ fprintf(
+ $this->yyTraceFILE,
+ "%sShift %d\n",
+ $this->yyTracePrompt,
+ $yyNewState
+ );
fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
for ($i = 1; $i <= $this->yyidx; $i++) {
- fprintf($this->yyTraceFILE, " %s",
- $this->yyTokenName[$this->yystack[$i]->major]);
+ fprintf(
+ $this->yyTraceFILE,
+ " %s",
+ $this->yyTokenName[ $this->yystack[ $i ]->major ]
+ );
}
- fwrite($this->yyTraceFILE,"\n");
+ fwrite($this->yyTraceFILE, "\n");
}
}
- public static $yyRuleInfo = array(
- array( 0 => 20, 1 => 2 ),
- array( 0 => 21, 1 => 1 ),
- array( 0 => 22, 1 => 2 ),
- array( 0 => 22, 1 => 0 ),
- array( 0 => 24, 1 => 5 ),
- array( 0 => 24, 1 => 6 ),
- array( 0 => 23, 1 => 2 ),
- array( 0 => 23, 1 => 2 ),
- array( 0 => 23, 1 => 0 ),
- array( 0 => 26, 1 => 3 ),
- array( 0 => 27, 1 => 1 ),
- array( 0 => 27, 1 => 1 ),
- array( 0 => 27, 1 => 1 ),
- array( 0 => 27, 1 => 1 ),
- array( 0 => 27, 1 => 1 ),
- array( 0 => 27, 1 => 3 ),
- array( 0 => 27, 1 => 2 ),
- array( 0 => 27, 1 => 1 ),
- array( 0 => 27, 1 => 1 ),
- array( 0 => 25, 1 => 1 ),
- array( 0 => 25, 1 => 2 ),
- array( 0 => 25, 1 => 3 ),
- );
-
- public static $yyReduceMap = array(
- 0 => 0,
- 2 => 0,
- 3 => 0,
- 19 => 0,
- 20 => 0,
- 21 => 0,
- 1 => 1,
- 4 => 4,
- 5 => 5,
- 6 => 6,
- 7 => 7,
- 8 => 8,
- 9 => 9,
- 10 => 10,
- 11 => 11,
- 12 => 12,
- 13 => 13,
- 14 => 14,
- 15 => 15,
- 16 => 16,
- 17 => 17,
- 18 => 17,
- );
-#line 261 "./lexer/smarty_internal_configfileparser.y"
- function yy_r0(){
- $this->_retvalue = null;
- }
-#line 266 "./lexer/smarty_internal_configfileparser.y"
- function yy_r1(){
- $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
- $this->_retvalue = null;
- }
-#line 280 "./lexer/smarty_internal_configfileparser.y"
- function yy_r4(){
- $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
- $this->_retvalue = null;
+ public function yy_r0()
+ {
+ $this->_retvalue = null;
}
-#line 285 "./lexer/smarty_internal_configfileparser.y"
- function yy_r5(){
- if ($this->configReadHidden) {
- $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+
+ public function yy_r1()
+ {
+ $this->add_global_vars($this->yystack[ $this->yyidx + 0 ]->minor);
+ $this->_retvalue = null;
}
- $this->_retvalue = null;
+
+ public function yy_r4()
+ {
+ $this->add_section_vars($this->yystack[ $this->yyidx + -3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+ $this->_retvalue = null;
}
-#line 293 "./lexer/smarty_internal_configfileparser.y"
- function yy_r6(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+
+ // line 245 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r5()
+ {
+ if ($this->configReadHidden) {
+ $this->add_section_vars(
+ $this->yystack[ $this->yyidx + -3 ]->minor,
+ $this->yystack[ $this->yyidx + 0 ]->minor
+ );
+ }
+ $this->_retvalue = null;
}
-#line 297 "./lexer/smarty_internal_configfileparser.y"
- function yy_r7(){
- $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
+
+ // line 250 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r6()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
}
-#line 301 "./lexer/smarty_internal_configfileparser.y"
- function yy_r8(){
- $this->_retvalue = Array();
+
+ // line 264 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r7()
+ {
+ $this->_retvalue =
+ array_merge($this->yystack[ $this->yyidx + -1 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor));
}
-#line 307 "./lexer/smarty_internal_configfileparser.y"
- function yy_r9(){
- $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
+
+ // line 269 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r8()
+ {
+ $this->_retvalue = array();
}
-#line 312 "./lexer/smarty_internal_configfileparser.y"
- function yy_r10(){
- $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
+
+ // line 277 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r9()
+ {
+ $this->_retvalue =
+ array(
+ 'key' => $this->yystack[ $this->yyidx + -2 ]->minor,
+ 'value' => $this->yystack[ $this->yyidx + 0 ]->minor
+ );
}
-#line 316 "./lexer/smarty_internal_configfileparser.y"
- function yy_r11(){
- $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
+
+ // line 281 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r10()
+ {
+ $this->_retvalue = (float)$this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 320 "./lexer/smarty_internal_configfileparser.y"
- function yy_r12(){
- $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
+
+ // line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r11()
+ {
+ $this->_retvalue = (int)$this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 324 "./lexer/smarty_internal_configfileparser.y"
- function yy_r13(){
- $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+
+ // line 291 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r12()
+ {
+ $this->_retvalue = $this->parse_bool($this->yystack[ $this->yyidx + 0 ]->minor);
}
-#line 328 "./lexer/smarty_internal_configfileparser.y"
- function yy_r14(){
- $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+
+ // line 296 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r13()
+ {
+ $this->_retvalue = self::parse_single_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
}
-#line 332 "./lexer/smarty_internal_configfileparser.y"
- function yy_r15(){
- $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
+
+ // line 300 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r14()
+ {
+ $this->_retvalue = self::parse_double_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
}
-#line 336 "./lexer/smarty_internal_configfileparser.y"
- function yy_r16(){
- $this->_retvalue = '';
+
+ // line 304 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r15()
+ {
+ $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[ $this->yyidx + -1 ]->minor);
}
-#line 340 "./lexer/smarty_internal_configfileparser.y"
- function yy_r17(){
- $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+
+ // line 308 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r16()
+ {
+ $this->_retvalue = '';
}
- private $_retvalue;
+ // line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
+ public function yy_r17()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+ // line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
public function yy_reduce($yyruleno)
{
if ($this->yyTraceFILE && $yyruleno >= 0
- && $yyruleno < count(self::$yyRuleName)) {
- fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
- $this->yyTracePrompt, $yyruleno,
- self::$yyRuleName[$yyruleno]);
+ && $yyruleno < count(self::$yyRuleName)) {
+ fprintf(
+ $this->yyTraceFILE,
+ "%sReduce (%d) [%s].\n",
+ $this->yyTracePrompt,
+ $yyruleno,
+ self::$yyRuleName[ $yyruleno ]
+ );
}
-
$this->_retvalue = $yy_lefthand_side = null;
- if (isset(self::$yyReduceMap[$yyruleno])) {
+ if (isset(self::$yyReduceMap[ $yyruleno ])) {
// call the action
$this->_retvalue = null;
- $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+ $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
$yy_lefthand_side = $this->_retvalue;
}
- $yygoto = self::$yyRuleInfo[$yyruleno][0];
- $yysize = self::$yyRuleInfo[$yyruleno][1];
+ $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+ $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
$this->yyidx -= $yysize;
for ($i = $yysize; $i; $i--) {
// pop all of the right-hand side parameters
array_pop($this->yystack);
}
- $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+ $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
if ($yyact < self::YYNSTATE) {
if (!$this->yyTraceFILE && $yysize) {
$this->yyidx++;
@@ -922,51 +836,52 @@ static public $yy_action = array(
$x->stateno = $yyact;
$x->major = $yygoto;
$x->minor = $yy_lefthand_side;
- $this->yystack[$this->yyidx] = $x;
+ $this->yystack[ $this->yyidx ] = $x;
} else {
$this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
}
- } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
+ } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
$this->yy_accept();
}
}
+ // line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
public function yy_parse_failed()
{
if ($this->yyTraceFILE) {
fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
- } while ($this->yyidx >= 0) {
+ }
+ while ($this->yyidx >= 0) {
$this->yy_pop_parser_stack();
}
}
+ // line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
public function yy_syntax_error($yymajor, $TOKEN)
{
-#line 248 "./lexer/smarty_internal_configfileparser.y"
-
- $this->internalError = true;
- $this->yymajor = $yymajor;
- $this->compiler->trigger_config_file_error();
+ // line 232 "../smarty/lexer/smarty_internal_configfileparser.y"
+ $this->internalError = true;
+ $this->yymajor = $yymajor;
+ $this->compiler->trigger_config_file_error();
}
public function yy_accept()
{
if ($this->yyTraceFILE) {
fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
- } while ($this->yyidx >= 0) {
+ }
+ while ($this->yyidx >= 0) {
$this->yy_pop_parser_stack();
}
-#line 241 "./lexer/smarty_internal_configfileparser.y"
-
- $this->successful = !$this->internalError;
- $this->internalError = false;
- $this->retvalue = $this->_retvalue;
+ // line 225 "../smarty/lexer/smarty_internal_configfileparser.y"
+ $this->successful = !$this->internalError;
+ $this->internalError = false;
+ $this->retvalue = $this->_retvalue;
}
public function doParse($yymajor, $yytokenvalue)
{
$yyerrorhit = 0; /* True if yymajor has invoked an error */
-
if ($this->yyidx === null || $this->yyidx < 0) {
$this->yyidx = 0;
$this->yyerrcnt = -1;
@@ -976,17 +891,19 @@ static public $yy_action = array(
$this->yystack = array();
$this->yystack[] = $x;
}
- $yyendofinput = ($yymajor==0);
-
+ $yyendofinput = ($yymajor == 0);
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sInput %s\n",
- $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+ fprintf(
+ $this->yyTraceFILE,
+ "%sInput %s\n",
+ $this->yyTracePrompt,
+ $this->yyTokenName[ $yymajor ]
+ );
}
-
do {
$yyact = $this->yy_find_shift_action($yymajor);
if ($yymajor < self::YYERRORSYMBOL &&
- !$this->yy_is_expected_token($yymajor)) {
+ !$this->yy_is_expected_token($yymajor)) {
// force a syntax error
$yyact = self::YY_ERROR_ACTION;
}
@@ -1000,35 +917,42 @@ static public $yy_action = array(
}
} elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
$this->yy_reduce($yyact - self::YYNSTATE);
- } elseif ($yyact == self::YY_ERROR_ACTION) {
+ } elseif ($yyact === self::YY_ERROR_ACTION) {
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
- $this->yyTracePrompt);
+ fprintf(
+ $this->yyTraceFILE,
+ "%sSyntax Error!\n",
+ $this->yyTracePrompt
+ );
}
if (self::YYERRORSYMBOL) {
if ($this->yyerrcnt < 0) {
$this->yy_syntax_error($yymajor, $yytokenvalue);
}
- $yymx = $this->yystack[$this->yyidx]->major;
- if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
+ $yymx = $this->yystack[ $this->yyidx ]->major;
+ if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
- $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+ fprintf(
+ $this->yyTraceFILE,
+ "%sDiscard input token %s\n",
+ $this->yyTracePrompt,
+ $this->yyTokenName[ $yymajor ]
+ );
}
$this->yy_destructor($yymajor, $yytokenvalue);
$yymajor = self::YYNOCODE;
} else {
while ($this->yyidx >= 0 &&
- $yymx != self::YYERRORSYMBOL &&
- ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
- ){
+ $yymx !== self::YYERRORSYMBOL &&
+ ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+ ) {
$this->yy_pop_parser_stack();
}
- if ($this->yyidx < 0 || $yymajor==0) {
+ if ($this->yyidx < 0 || $yymajor == 0) {
$this->yy_destructor($yymajor, $yytokenvalue);
$this->yy_parse_failed();
$yymajor = self::YYNOCODE;
- } elseif ($yymx != self::YYERRORSYMBOL) {
+ } elseif ($yymx !== self::YYERRORSYMBOL) {
$u2 = 0;
$this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
}
@@ -1050,7 +974,73 @@ static public $yy_action = array(
$this->yy_accept();
$yymajor = self::YYNOCODE;
}
- } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
+ } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
}
-}
+ /**
+ * parse optional boolean keywords
+ *
+ * @param string $str
+ *
+ * @return bool
+ */
+ private function parse_bool($str)
+ {
+ $str = strtolower($str);
+ if (in_array($str, array('on', 'yes', 'true'))) {
+ $res = true;
+ } else {
+ $res = false;
+ }
+ return $res;
+ }
+
+ /**
+ * set a config variable in target array
+ *
+ * @param array $var
+ * @param array $target_array
+ */
+ private function set_var(array $var, array &$target_array)
+ {
+ $key = $var[ 'key' ];
+ $value = $var[ 'value' ];
+ if ($this->configOverwrite || !isset($target_array[ 'vars' ][ $key ])) {
+ $target_array[ 'vars' ][ $key ] = $value;
+ } else {
+ settype($target_array[ 'vars' ][ $key ], 'array');
+ $target_array[ 'vars' ][ $key ][] = $value;
+ }
+ }
+
+ /**
+ * add config variable to global vars
+ *
+ * @param array $vars
+ */
+ private function add_global_vars(array $vars)
+ {
+ if (!isset($this->compiler->config_data[ 'vars' ])) {
+ $this->compiler->config_data[ 'vars' ] = array();
+ }
+ foreach ($vars as $var) {
+ $this->set_var($var, $this->compiler->config_data);
+ }
+ }
+
+ /**
+ * add config variable to section
+ *
+ * @param string $section_name
+ * @param array $vars
+ */
+ private function add_section_vars($section_name, array $vars)
+ {
+ if (!isset($this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ])) {
+ $this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ] = array();
+ }
+ foreach ($vars as $var) {
+ $this->set_var($var, $this->compiler->config_data[ 'sections' ][ $section_name ]);
+ }
+ }
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_data.php b/lib/smarty3/sysplugins/smarty_internal_data.php
index 59366b7..98e3e57 100644
--- a/lib/smarty3/sysplugins/smarty_internal_data.php
+++ b/lib/smarty3/sysplugins/smarty_internal_data.php
@@ -14,10 +14,13 @@
* @package Smarty
* @subpackage Template
*
- * @property int $scope
+ * @property int $scope
+ * @property Smarty $smarty
* The following methods will be dynamically loaded by the extension handler when they are called.
* They are located in a corresponding Smarty_Internal_Method_xxxx class
*
+ * @method mixed _getConfigVariable(string $varName, bool $errorEnable = true)
+ * @method mixed getConfigVariable(string $varName, bool $errorEnable = true)
* @method mixed getConfigVars(string $varName = null, bool $searchParents = true)
* @method mixed getGlobal(string $varName = null)
* @method mixed getStreamVariable(string $variable)
@@ -26,7 +29,7 @@
* @method Smarty_Internal_Data clearConfig(string $varName = null)
* @method Smarty_Internal_Data configLoad(string $config_file, mixed $sections = null, string $scope = 'local')
*/
-class Smarty_Internal_Data
+abstract class Smarty_Internal_Data
{
/**
* This object type (Smarty = 1, template = 2, data = 4)
@@ -52,7 +55,7 @@ class Smarty_Internal_Data
/**
* parent template (if any)
*
- * @var Smarty|Smarty_Internal_Template|Smarty_Internal_Data
+ * @var Smarty|Smarty_Internal_Template|Smarty_Data
*/
public $parent = null;
@@ -84,9 +87,9 @@ class Smarty_Internal_Data
/**
* assigns a Smarty variable
*
- * @param array|string $tpl_var the template variable name(s)
- * @param mixed $value the value to assign
- * @param boolean $nocache if true any output of this variable will be not cached
+ * @param array|string $tpl_var the template variable name(s)
+ * @param mixed $value the value to assign
+ * @param boolean $nocache if true any output of this variable will be not cached
*
* @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
* chaining
@@ -98,9 +101,13 @@ class Smarty_Internal_Data
$this->assign($_key, $_val, $nocache);
}
} else {
- if ($tpl_var != '') {
- if ($this->_objType == 2) {
- /** @var Smarty_Internal_Template $this */
+ if ($tpl_var !== '') {
+ if ($this->_objType === 2) {
+ /**
+ *
+ *
+ * @var Smarty_Internal_Template $this
+ */
$this->_assignInScope($tpl_var, $value, $nocache);
} else {
$this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
@@ -116,11 +123,11 @@ class Smarty_Internal_Data
* @api Smarty::append()
* @link http://www.smarty.net/docs/en/api.append.tpl
*
- * @param array|string $tpl_var the template variable name(s)
- * @param mixed $value the value to append
- * @param bool $merge flag if array elements shall be merged
- * @param bool $nocache if true any output of this variable will
- * be not cached
+ * @param array|string $tpl_var the template variable name(s)
+ * @param mixed $value the value to append
+ * @param bool $merge flag if array elements shall be merged
+ * @param bool $nocache if true any output of this variable will
+ * be not cached
*
* @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
*/
@@ -132,9 +139,9 @@ class Smarty_Internal_Data
/**
* assigns a global Smarty variable
*
- * @param string $varName the global variable name
- * @param mixed $value the value to assign
- * @param boolean $nocache if true any output of this variable will be not cached
+ * @param string $varName the global variable name
+ * @param mixed $value the value to assign
+ * @param boolean $nocache if true any output of this variable will be not cached
*
* @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
*/
@@ -146,9 +153,9 @@ class Smarty_Internal_Data
/**
* appends values to template variables by reference
*
- * @param string $tpl_var the template variable name
- * @param mixed &$value the referenced value to append
- * @param boolean $merge flag if array elements shall be merged
+ * @param string $tpl_var the template variable name
+ * @param mixed &$value the referenced value to append
+ * @param boolean $merge flag if array elements shall be merged
*
* @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
*/
@@ -160,9 +167,9 @@ class Smarty_Internal_Data
/**
* assigns values to template variables by reference
*
- * @param string $tpl_var the template variable name
- * @param $value
- * @param boolean $nocache if true any output of this variable will be not cached
+ * @param string $tpl_var the template variable name
+ * @param $value
+ * @param boolean $nocache if true any output of this variable will be not cached
*
* @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
*/
@@ -177,9 +184,9 @@ class Smarty_Internal_Data
* @api Smarty::getTemplateVars()
* @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
*
- * @param string $varName variable name or null
+ * @param string $varName variable name or null
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr optional pointer to data object
- * @param bool $searchParents include parent templates?
+ * @param bool $searchParents include parent templates?
*
* @return mixed variable value or or array of variables
*/
@@ -191,17 +198,20 @@ class Smarty_Internal_Data
/**
* gets the object of a Smarty variable
*
- * @param string $variable the name of the Smarty variable
- * @param Smarty_Internal_Data $_ptr optional pointer to data object
- * @param boolean $searchParents search also in parent data
- * @param bool $error_enable
+ * @param string $variable the name of the Smarty variable
+ * @param Smarty_Internal_Data $_ptr optional pointer to data object
+ * @param boolean $searchParents search also in parent data
+ * @param bool $error_enable
*
- * @return Smarty_Variable|Smarty_Undefined_Variable the object of the variable
+ * @return Smarty_Variable|Smarty_Undefined_Variable the object of the variable
* @deprecated since 3.1.28 please use Smarty_Internal_Data::getTemplateVars() instead.
*/
- public function getVariable($variable = null, Smarty_Internal_Data $_ptr = null, $searchParents = true,
- $error_enable = true)
- {
+ public function getVariable(
+ $variable = null,
+ Smarty_Internal_Data $_ptr = null,
+ $searchParents = true,
+ $error_enable = true
+ ) {
return $this->ext->getTemplateVars->_getVariable($this, $variable, $_ptr, $searchParents, $error_enable);
}
@@ -228,13 +238,52 @@ class Smarty_Internal_Data
}
/**
+ * Return true if this instance is a Data obj
+ *
+ * @return bool
+ */
+ public function _isDataObj()
+ {
+ return $this->_objType === 4;
+ }
+
+ /**
+ * Return true if this instance is a template obj
+ *
+ * @return bool
+ */
+ public function _isTplObj()
+ {
+ return $this->_objType === 2;
+ }
+
+ /**
+ * Return true if this instance is a Smarty obj
+ *
+ * @return bool
+ */
+ public function _isSmartyObj()
+ {
+ return $this->_objType === 1;
+ }
+
+ /**
+ * Get Smarty object
+ *
+ * @return Smarty
+ */
+ public function _getSmartyObj()
+ {
+ return $this->smarty;
+ }
+
+ /**
* Handle unknown class methods
*
* @param string $name unknown method-name
* @param array $args argument array
*
* @return mixed
- * @throws SmartyException
*/
public function __call($name, $args)
{
diff --git a/lib/smarty3/sysplugins/smarty_internal_debug.php b/lib/smarty3/sysplugins/smarty_internal_debug.php
index d5cd60d..24b233e 100644
--- a/lib/smarty3/sysplugins/smarty_internal_debug.php
+++ b/lib/smarty3/sysplugins/smarty_internal_debug.php
@@ -52,9 +52,9 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
*/
public function start_template(Smarty_Internal_Template $template, $mode = null)
{
- if (isset($mode)) {
- $this->index ++;
- $this->offset ++;
+ if (isset($mode) && !$template->_isSubTpl()) {
+ $this->index++;
+ $this->offset++;
$this->template_data[ $this->index ] = null;
}
$key = $this->get_key($template);
@@ -117,7 +117,6 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
if (isset($this->ignore_uid[ $template->source->uid ])) {
return;
}
-
$key = $this->get_key($template);
}
$this->template_data[ $this->index ][ $key ][ 'compile_time' ] +=
@@ -193,42 +192,43 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
*
* @param Smarty_Internal_Template|Smarty $obj object to debug
* @param bool $full
+ *
+ * @throws \Exception
+ * @throws \SmartyException
*/
public function display_debug($obj, $full = false)
{
if (!$full) {
- $this->offset ++;
+ $this->offset++;
$savedIndex = $this->index;
$this->index = 9999;
}
- if ($obj->_objType == 1) {
- $smarty = $obj;
- } else {
- $smarty = $obj->smarty;
- }
+ $smarty = $obj->_getSmartyObj();
// create fresh instance of smarty for displaying the debug console
// to avoid problems if the application did overload the Smarty class
$debObj = new Smarty();
// copy the working dirs from application
$debObj->setCompileDir($smarty->getCompileDir());
// init properties by hand as user may have edited the original Smarty class
- $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ . '/../plugins' : $smarty->getPluginsDir());
+ $debObj->setPluginsDir(is_dir(dirname(__FILE__) . '/../plugins') ? dirname(__FILE__) .
+ '/../plugins' : $smarty->getPluginsDir());
$debObj->force_compile = false;
- $debObj->compile_check = true;
+ $debObj->compile_check = Smarty::COMPILECHECK_ON;
$debObj->left_delimiter = '{';
$debObj->right_delimiter = '}';
$debObj->security_policy = null;
$debObj->debugging = false;
$debObj->debugging_ctrl = 'NONE';
$debObj->error_reporting = E_ALL & ~E_NOTICE;
- $debObj->debug_tpl = isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
+ $debObj->debug_tpl =
+ isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . dirname(__FILE__) . '/../debug.tpl';
$debObj->registered_plugins = array();
$debObj->registered_resources = array();
$debObj->registered_filters = array();
$debObj->autoload_filters = array();
$debObj->default_modifiers = array();
$debObj->escape_html = true;
- $debObj->caching = false;
+ $debObj->caching = Smarty::CACHING_OFF;
$debObj->compile_id = null;
$debObj->cache_id = null;
// prepare information of assigned variables
@@ -238,12 +238,11 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
$_config_vars = $ptr->config_vars;
ksort($_config_vars);
$debugging = $smarty->debugging;
-
$_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
- if ($obj->_objType == 2) {
+ if ($obj->_isTplObj()) {
$_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
}
- if ($obj->_objType == 1 || $full) {
+ if ($obj->_objType === 1 || $full) {
$_template->assign('template_data', $this->template_data[ $this->index ]);
} else {
$_template->assign('template_data', null);
@@ -251,11 +250,11 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
$_template->assign('assigned_vars', $_assigned_vars);
$_template->assign('config_vars', $_config_vars);
$_template->assign('execution_time', microtime(true) - $smarty->start_time);
- $_template->assign('display_mode', $debugging == 2 || !$full);
+ $_template->assign('display_mode', $debugging === 2 || !$full);
$_template->assign('offset', $this->offset * 50);
echo $_template->fetch();
if (isset($full)) {
- $this->index --;
+ $this->index--;
}
if (!$full) {
$this->index = $savedIndex;
@@ -265,7 +264,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
/**
* Recursively gets variables from all template/data scopes
*
- * @param Smarty_Internal_Template|Smarty_Data $obj object to debug
+ * @param Smarty_Internal_Template|Smarty_Data $obj object to debug
*
* @return StdClass
*/
@@ -274,9 +273,9 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
$config_vars = array();
foreach ($obj->config_vars as $key => $var) {
$config_vars[ $key ][ 'value' ] = $var;
- if ($obj->_objType == 2) {
+ if ($obj->_isTplObj()) {
$config_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
- } elseif ($obj->_objType == 4) {
+ } elseif ($obj->_isDataObj()) {
$tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
} else {
$config_vars[ $key ][ 'scope' ] = 'Smarty object';
@@ -285,29 +284,28 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
$tpl_vars = array();
foreach ($obj->tpl_vars as $key => $var) {
foreach ($var as $varkey => $varvalue) {
- if ($varkey == 'value') {
+ if ($varkey === 'value') {
$tpl_vars[ $key ][ $varkey ] = $varvalue;
} else {
- if ($varkey == 'nocache') {
- if ($varvalue == true) {
+ if ($varkey === 'nocache') {
+ if ($varvalue === true) {
$tpl_vars[ $key ][ $varkey ] = $varvalue;
}
} else {
- if ($varkey != 'scope' || $varvalue !== 0) {
+ if ($varkey !== 'scope' || $varvalue !== 0) {
$tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
}
}
}
}
- if ($obj->_objType == 2) {
+ if ($obj->_isTplObj()) {
$tpl_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
- } elseif ($obj->_objType == 4) {
+ } elseif ($obj->_isDataObj()) {
$tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
} else {
$tpl_vars[ $key ][ 'scope' ] = 'Smarty object';
}
}
-
if (isset($obj->parent)) {
$parent = $this->get_debug_vars($obj->parent);
foreach ($parent->tpl_vars as $name => $pvar) {
@@ -316,7 +314,6 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
}
}
$tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
-
foreach ($parent->config_vars as $name => $pvar) {
if (isset($config_vars[ $name ]) && $config_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
$config_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
@@ -327,15 +324,15 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
foreach (Smarty::$global_tpl_vars as $key => $var) {
if (!array_key_exists($key, $tpl_vars)) {
foreach ($var as $varkey => $varvalue) {
- if ($varkey == 'value') {
+ if ($varkey === 'value') {
$tpl_vars[ $key ][ $varkey ] = $varvalue;
} else {
- if ($varkey == 'nocache') {
- if ($varvalue == true) {
+ if ($varkey === 'nocache') {
+ if ($varvalue === true) {
$tpl_vars[ $key ][ $varkey ] = $varvalue;
}
} else {
- if ($varkey != 'scope' || $varvalue !== 0) {
+ if ($varkey !== 'scope' || $varvalue !== 0) {
$tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
}
}
@@ -345,8 +342,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
}
}
}
-
- return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
+ return (object)array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
}
/**
@@ -360,7 +356,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
{
static $_is_stringy = array('string' => true, 'eval' => true);
// calculate Uid if not already done
- if ($template->source->uid == '') {
+ if ($template->source->uid === '') {
$template->source->filepath;
}
$key = $template->source->uid;
@@ -377,7 +373,6 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
$this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
$this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
$this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
-
return $key;
}
}
@@ -390,7 +385,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
public function ignore(Smarty_Internal_Template $template)
{
// calculate Uid if not already done
- if ($template->source->uid == '') {
+ if ($template->source->uid === '') {
$template->source->filepath;
}
$this->ignore_uid[ $template->source->uid ] = true;
diff --git a/lib/smarty3/sysplugins/smarty_internal_errorhandler.php b/lib/smarty3/sysplugins/smarty_internal_errorhandler.php
new file mode 100644
index 0000000..0ba0065
--- /dev/null
+++ b/lib/smarty3/sysplugins/smarty_internal_errorhandler.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * Smarty error handler
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Uwe Tews
+ *
+ * @deprecated
+Smarty does no longer use @filemtime()
+ */
+class Smarty_Internal_ErrorHandler
+{
+ /**
+ * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
+ */
+ public static $mutedDirectories = array();
+
+ /**
+ * error handler returned by set_error_handler() in self::muteExpectedErrors()
+ */
+ private static $previousErrorHandler = null;
+
+ /**
+ * Enable error handler to mute expected messages
+ *
+ */
+ public static function muteExpectedErrors()
+ {
+ /*
+ error muting is done because some people implemented custom error_handlers using
+ http://php.net/set_error_handler and for some reason did not understand the following paragraph:
+
+ It is important to remember that the standard PHP error handler is completely bypassed for the
+ error types specified by error_types unless the callback function returns FALSE.
+ error_reporting() settings will have no effect and your error handler will be called regardless -
+ however you are still able to read the current value of error_reporting and act appropriately.
+ Of particular note is that this value will be 0 if the statement that caused the error was
+ prepended by the @ error-control operator.
+
+ Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
+ - @filemtime() is almost twice as fast as using an additional file_exists()
+ - between file_exists() and filemtime() a possible race condition is opened,
+ which does not exist using the simple @filemtime() approach.
+ */
+ $error_handler = array('Smarty_Internal_ErrorHandler', 'mutingErrorHandler');
+ $previous = set_error_handler($error_handler);
+ // avoid dead loops
+ if ($previous !== $error_handler) {
+ self::$previousErrorHandler = $previous;
+ }
+ }
+
+ /**
+ * Error Handler to mute expected messages
+ *
+ * @link http://php.net/set_error_handler
+ *
+ * @param integer $errno Error level
+ * @param $errstr
+ * @param $errfile
+ * @param $errline
+ * @param $errcontext
+ *
+ * @return bool
+ */
+ public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
+ {
+ $_is_muted_directory = false;
+ // add the SMARTY_DIR to the list of muted directories
+ if (!isset(self::$mutedDirectories[ SMARTY_DIR ])) {
+ $smarty_dir = realpath(SMARTY_DIR);
+ if ($smarty_dir !== false) {
+ self::$mutedDirectories[ SMARTY_DIR ] =
+ array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
+ }
+ }
+ // walk the muted directories and test against $errfile
+ foreach (self::$mutedDirectories as $key => &$dir) {
+ if (!$dir) {
+ // resolve directory and length for speedy comparisons
+ $file = realpath($key);
+ if ($file === false) {
+ // this directory does not exist, remove and skip it
+ unset(self::$mutedDirectories[ $key ]);
+ continue;
+ }
+ $dir = array('file' => $file, 'length' => strlen($file),);
+ }
+ if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) {
+ $_is_muted_directory = true;
+ break;
+ }
+ }
+ // pass to next error handler if this error did not occur inside SMARTY_DIR
+ // or the error was within smarty but masked to be ignored
+ if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
+ if (self::$previousErrorHandler) {
+ return call_user_func(
+ self::$previousErrorHandler,
+ $errno,
+ $errstr,
+ $errfile,
+ $errline,
+ $errcontext
+ );
+ } else {
+ return false;
+ }
+ }
+ }
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_extension_handler.php b/lib/smarty3/sysplugins/smarty_internal_extension_handler.php
index edeb395..b076155 100644
--- a/lib/smarty3/sysplugins/smarty_internal_extension_handler.php
+++ b/lib/smarty3/sysplugins/smarty_internal_extension_handler.php
@@ -5,34 +5,39 @@
*
* Load extensions dynamically
*
- *
* @package Smarty
* @subpackage PluginsInternal
* @author Uwe Tews
*
- * @property Smarty_Internal_Runtime_TplFunction $_tplFunction
- * @property Smarty_Internal_Runtime_Foreach $_foreach
- * @property Smarty_Internal_Runtime_WriteFile $_writeFile
- * @property Smarty_Internal_Runtime_CodeFrame $_codeFrame
- * @property Smarty_Internal_Runtime_FilterHandler $_filterHandler
- * @property Smarty_Internal_Runtime_GetIncludePath $_getIncludePath
- * @property Smarty_Internal_Runtime_UpdateScope $_updateScope
- * @property Smarty_Internal_Runtime_CacheModify $_cacheModify
- * @property Smarty_Internal_Runtime_UpdateCache $_updateCache
- * @property Smarty_Internal_Method_GetTemplateVars $getTemplateVars
- * @property Smarty_Internal_Method_Append $append
- * @property Smarty_Internal_Method_AppendByRef $appendByRef
- * @property Smarty_Internal_Method_AssignGlobal $assignGlobal
- * @property Smarty_Internal_Method_AssignByRef $assignByRef
- * @property Smarty_Internal_Method_LoadFilter $loadFilter
- * @property Smarty_Internal_Method_LoadPlugin $loadPlugin
- * @property Smarty_Internal_Method_RegisterFilter $registerFilter
- * @property Smarty_Internal_Method_RegisterObject $registerObject
- * @property Smarty_Internal_Method_RegisterPlugin $registerPlugin
+ * Runtime extensions
+ * @property Smarty_Internal_Runtime_CacheModify $_cacheModify
+ * @property Smarty_Internal_Runtime_CacheResourceFile $_cacheResourceFile
+ * @property Smarty_Internal_Runtime_Capture $_capture
+ * @property Smarty_Internal_Runtime_CodeFrame $_codeFrame
+ * @property Smarty_Internal_Runtime_FilterHandler $_filterHandler
+ * @property Smarty_Internal_Runtime_Foreach $_foreach
+ * @property Smarty_Internal_Runtime_GetIncludePath $_getIncludePath
+ * @property Smarty_Internal_Runtime_Make_Nocache $_make_nocache
+ * @property Smarty_Internal_Runtime_UpdateCache $_updateCache
+ * @property Smarty_Internal_Runtime_UpdateScope $_updateScope
+ * @property Smarty_Internal_Runtime_TplFunction $_tplFunction
+ * @property Smarty_Internal_Runtime_WriteFile $_writeFile
+ *
+ * Method extensions
+ * @property Smarty_Internal_Method_GetTemplateVars $getTemplateVars
+ * @property Smarty_Internal_Method_Append $append
+ * @property Smarty_Internal_Method_AppendByRef $appendByRef
+ * @property Smarty_Internal_Method_AssignGlobal $assignGlobal
+ * @property Smarty_Internal_Method_AssignByRef $assignByRef
+ * @property Smarty_Internal_Method_LoadFilter $loadFilter
+ * @property Smarty_Internal_Method_LoadPlugin $loadPlugin
+ * @property Smarty_Internal_Method_RegisterFilter $registerFilter
+ * @property Smarty_Internal_Method_RegisterObject $registerObject
+ * @property Smarty_Internal_Method_RegisterPlugin $registerPlugin
+ * @property mixed|\Smarty_Template_Cached configLoad
*/
class Smarty_Internal_Extension_Handler
{
-
public $objType = null;
/**
@@ -41,9 +46,11 @@ class Smarty_Internal_Extension_Handler
*
* @var array
*/
- private $_property_info = array('AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
- 'DebugTemplate' => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
- 'TemplateVars' => 0,);#
+ private $_property_info = array(
+ 'AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
+ 'DebugTemplate' => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
+ 'TemplateVars' => 0, 'Literals' => 'Literals',
+ );//
private $resolvedProperties = array();
@@ -55,42 +62,72 @@ class Smarty_Internal_Extension_Handler
* @param array $args argument array
*
* @return mixed
- * @throws SmartyException
*/
public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
{
/* @var Smarty $data ->smarty */
$smarty = isset($data->smarty) ? $data->smarty : $data;
if (!isset($smarty->ext->$name)) {
- $class = 'Smarty_Internal_Method_' . ucfirst($name);
- if (preg_match('/^(set|get)([A-Z].*)$/', $name, $match)) {
- if (!isset($this->_property_info[ $prop = $match[ 2 ] ])) {
- // convert camel case to underscored name
- $this->resolvedProperties[ $prop ] = $pn = strtolower(join('_',
- preg_split('/([A-Z][^A-Z]*)/', $prop,
- - 1, PREG_SPLIT_NO_EMPTY |
- PREG_SPLIT_DELIM_CAPTURE)));
- $this->_property_info[ $prop ] = property_exists($data, $pn) ? 1 :
- ($data->_objType == 2 && property_exists($smarty, $pn) ? 2 : 0);
+ if (preg_match('/^((set|get)|(.*?))([A-Z].*)$/', $name, $match)) {
+ $basename = $this->upperCase($match[ 4 ]);
+ if (!isset($smarty->ext->$basename) && isset($this->_property_info[ $basename ])
+ && is_string($this->_property_info[ $basename ])
+ ) {
+ $class = 'Smarty_Internal_Method_' . $this->_property_info[ $basename ];
+ if (class_exists($class)) {
+ $classObj = new $class();
+ $methodes = get_class_methods($classObj);
+ foreach ($methodes as $method) {
+ $smarty->ext->$method = $classObj;
+ }
+ }
}
- if ($this->_property_info[ $prop ]) {
- $pn = $this->resolvedProperties[ $prop ];
- if ($match[ 1 ] == 'get') {
- return $this->_property_info[ $prop ] == 1 ? $data->$pn : $data->smarty->$pn;
- } else {
- return $this->_property_info[ $prop ] == 1 ? $data->$pn = $args[ 0 ] :
- $data->smarty->$pn = $args[ 0 ];
+ if (!empty($match[ 2 ]) && !isset($smarty->ext->$name)) {
+ $class = 'Smarty_Internal_Method_' . $this->upperCase($name);
+ if (!class_exists($class)) {
+ $objType = $data->_objType;
+ $propertyType = false;
+ if (!isset($this->resolvedProperties[ $match[ 0 ] ][ $objType ])) {
+ $property = isset($this->resolvedProperties[ 'property' ][ $basename ]) ?
+ $this->resolvedProperties[ 'property' ][ $basename ] :
+ $property = $this->resolvedProperties[ 'property' ][ $basename ] = strtolower(
+ join(
+ '_',
+ preg_split(
+ '/([A-Z][^A-Z]*)/',
+ $basename,
+ -1,
+ PREG_SPLIT_NO_EMPTY |
+ PREG_SPLIT_DELIM_CAPTURE
+ )
+ )
+ );
+ if ($property !== false) {
+ if (property_exists($data, $property)) {
+ $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 1;
+ } elseif (property_exists($smarty, $property)) {
+ $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 2;
+ } else {
+ $this->resolvedProperties[ 'property' ][ $basename ] = $property = false;
+ }
+ }
+ } else {
+ $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ];
+ $property = $this->resolvedProperties[ 'property' ][ $basename ];
+ }
+ if ($propertyType) {
+ $obj = $propertyType === 1 ? $data : $smarty;
+ if ($match[ 2 ] === 'get') {
+ return $obj->$property;
+ } elseif ($match[ 2 ] === 'set') {
+ return $obj->$property = $args[ 0 ];
+ }
+ }
}
- } elseif (!class_exists($class)) {
- throw new SmartyException("property '$pn' does not exist.");
}
}
- if (class_exists($class)) {
- $callback = array($smarty->ext->$name = new $class(), $name);
- }
- } else {
- $callback = array($smarty->ext->$name, $name);
}
+ $callback = array($smarty->ext->$name, $name);
array_unshift($args, $data);
if (isset($callback) && $callback[ 0 ]->objMap | $data->_objType) {
return call_user_func_array($callback, $args);
@@ -99,16 +136,17 @@ class Smarty_Internal_Extension_Handler
}
/**
- * set extension property
+ * Make first character of name parts upper case
*
- * @param string $property_name property name
- * @param mixed $value value
+ * @param string $name
*
- * @throws SmartyException
+ * @return string
*/
- public function __set($property_name, $value)
+ public function upperCase($name)
{
- $this->$property_name = $value;
+ $_name = explode('_', $name);
+ $_name = array_map('ucfirst', $_name);
+ return implode('_', $_name);
}
/**
@@ -117,31 +155,43 @@ class Smarty_Internal_Extension_Handler
* @param string $property_name property name
*
* @return mixed|Smarty_Template_Cached
- * @throws SmartyException
*/
public function __get($property_name)
{
// object properties of runtime template extensions will start with '_'
- if ($property_name[ 0 ] == '_') {
- $class = 'Smarty_Internal_Runtime_' . ucfirst(substr($property_name, 1));
+ if ($property_name[ 0 ] === '_') {
+ $class = 'Smarty_Internal_Runtime' . $this->upperCase($property_name);
} else {
- $class = 'Smarty_Internal_Method_' . ucfirst($property_name);
+ $class = 'Smarty_Internal_Method_' . $this->upperCase($property_name);
+ }
+ if (!class_exists($class)) {
+ return $this->$property_name = new Smarty_Internal_Undefined($class);
}
return $this->$property_name = new $class();
}
/**
+ * set extension property
+ *
+ * @param string $property_name property name
+ * @param mixed $value value
+ *
+ */
+ public function __set($property_name, $value)
+ {
+ $this->$property_name = $value;
+ }
+
+ /**
* Call error handler for undefined method
*
* @param string $name unknown method-name
* @param array $args argument array
*
* @return mixed
- * @throws SmartyException
*/
public function __call($name, $args)
{
return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), array($this));
}
-
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_addautoloadfilters.php b/lib/smarty3/sysplugins/smarty_internal_method_addautoloadfilters.php
index 67ce1a9..a05f55a 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_addautoloadfilters.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_addautoloadfilters.php
@@ -11,42 +11,43 @@
*/
class Smarty_Internal_Method_AddAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
{
-
/**
* Add autoload filters
*
* @api Smarty::setAutoloadFilters()
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @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 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|\Smarty_Internal_Template
+ * @throws \SmartyException
*/
public function addAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if ($type !== null) {
$this->_checkFilterType($type);
if (!empty($smarty->autoload_filters[ $type ])) {
- $smarty->autoload_filters[ $type ] = array_merge($smarty->autoload_filters[ $type ], (array) $filters);
+ $smarty->autoload_filters[ $type ] = array_merge($smarty->autoload_filters[ $type ], (array)$filters);
} else {
- $smarty->autoload_filters[ $type ] = (array) $filters;
+ $smarty->autoload_filters[ $type ] = (array)$filters;
}
} else {
- foreach ((array) $filters as $type => $value) {
+ foreach ((array)$filters as $type => $value) {
$this->_checkFilterType($type);
if (!empty($smarty->autoload_filters[ $type ])) {
$smarty->autoload_filters[ $type ] =
- array_merge($smarty->autoload_filters[ $type ], (array) $value);
+ array_merge($smarty->autoload_filters[ $type ], (array)$value);
} else {
- $smarty->autoload_filters[ $type ] = (array) $value;
+ $smarty->autoload_filters[ $type ] = (array)$value;
}
}
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_adddefaultmodifiers.php b/lib/smarty3/sysplugins/smarty_internal_method_adddefaultmodifiers.php
index 4cd01da..c3feb3d 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_adddefaultmodifiers.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_adddefaultmodifiers.php
@@ -24,14 +24,14 @@ class Smarty_Internal_Method_AddDefaultModifiers
* @api Smarty::addDefaultModifiers()
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param array|string $modifiers modifier or list of modifiers
+ * @param array|string $modifiers modifier or list of modifiers
* to add
*
* @return \Smarty|\Smarty_Internal_Template
*/
public function addDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if (is_array($modifiers)) {
$smarty->default_modifiers = array_merge($smarty->default_modifiers, $modifiers);
} else {
@@ -39,4 +39,4 @@ class Smarty_Internal_Method_AddDefaultModifiers
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_append.php b/lib/smarty3/sysplugins/smarty_internal_method_append.php
index b89aacf..881375e 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_append.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_append.php
@@ -25,10 +25,10 @@ class Smarty_Internal_Method_Append
* @link http://www.smarty.net/docs/en/api.append.tpl
*
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
- * @param array|string $tpl_var the template variable name(s)
- * @param mixed $value the value to append
- * @param bool $merge flag if array elements shall be merged
- * @param bool $nocache if true any output of this variable will
+ * @param array|string $tpl_var the template variable name(s)
+ * @param mixed $value the value to append
+ * @param bool $merge flag if array elements shall be merged
+ * @param bool $nocache if true any output of this variable will
* be not cached
*
* @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
@@ -38,12 +38,12 @@ class Smarty_Internal_Method_Append
if (is_array($tpl_var)) {
// $tpl_var is an array, ignore $value
foreach ($tpl_var as $_key => $_val) {
- if ($_key != '') {
+ if ($_key !== '') {
$this->append($data, $_key, $_val, $merge, $nocache);
}
}
} else {
- if ($tpl_var != '' && isset($value)) {
+ if ($tpl_var !== '' && isset($value)) {
if (!isset($data->tpl_vars[ $tpl_var ])) {
$tpl_var_inst = $data->ext->getTemplateVars->_getVariable($data, $tpl_var, null, true, false);
if ($tpl_var_inst instanceof Smarty_Undefined_Variable) {
@@ -52,8 +52,8 @@ class Smarty_Internal_Method_Append
$data->tpl_vars[ $tpl_var ] = clone $tpl_var_inst;
}
}
- if (!(is_array($data->tpl_vars[ $tpl_var ]->value) ||
- $data->tpl_vars[ $tpl_var ]->value instanceof ArrayAccess)
+ if (!(is_array($data->tpl_vars[ $tpl_var ]->value)
+ || $data->tpl_vars[ $tpl_var ]->value instanceof ArrayAccess)
) {
settype($data->tpl_vars[ $tpl_var ]->value, 'array');
}
@@ -65,10 +65,10 @@ class Smarty_Internal_Method_Append
$data->tpl_vars[ $tpl_var ]->value[] = $value;
}
}
- if ($data->_objType == 2 && $data->scope) {
+ if ($data->_isTplObj() && $data->scope) {
$data->ext->_updateScope->_updateScope($data, $tpl_var);
}
}
return $data;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_appendbyref.php b/lib/smarty3/sysplugins/smarty_internal_method_appendbyref.php
index 64190d1..c959044 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_appendbyref.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_appendbyref.php
@@ -11,7 +11,6 @@
*/
class Smarty_Internal_Method_AppendByRef
{
-
/**
* appends values to template variables by reference
*
@@ -19,15 +18,15 @@ class Smarty_Internal_Method_AppendByRef
* @link http://www.smarty.net/docs/en/api.append.by.ref.tpl
*
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
- * @param string $tpl_var the template variable name
- * @param mixed &$value the referenced value to append
- * @param bool $merge flag if array elements shall be merged
+ * @param string $tpl_var the template variable name
+ * @param mixed &$value the referenced value to append
+ * @param bool $merge flag if array elements shall be merged
*
* @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
*/
public static function appendByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $merge = false)
{
- if ($tpl_var != '' && isset($value)) {
+ if ($tpl_var !== '' && isset($value)) {
if (!isset($data->tpl_vars[ $tpl_var ])) {
$data->tpl_vars[ $tpl_var ] = new Smarty_Variable();
}
@@ -41,10 +40,10 @@ class Smarty_Internal_Method_AppendByRef
} else {
$data->tpl_vars[ $tpl_var ]->value[] = &$value;
}
- if ($data->_objType == 2 && $data->scope) {
+ if ($data->_isTplObj() && $data->scope) {
$data->ext->_updateScope->_updateScope($data, $tpl_var);
}
}
return $data;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_assignbyref.php b/lib/smarty3/sysplugins/smarty_internal_method_assignbyref.php
index 5e2a2a6..fa705bb 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_assignbyref.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_assignbyref.php
@@ -11,26 +11,26 @@
*/
class Smarty_Internal_Method_AssignByRef
{
-
/**
* assigns values to template variables by reference
*
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
* @param string $tpl_var the template variable name
* @param $value
- * @param boolean $nocache if true any output of this variable will be not cached
+ * @param boolean $nocache if true any output of this variable will
+ * be not cached
*
* @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
*/
public function assignByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $nocache)
{
- if ($tpl_var != '') {
+ if ($tpl_var !== '') {
$data->tpl_vars[ $tpl_var ] = new Smarty_Variable(null, $nocache);
$data->tpl_vars[ $tpl_var ]->value = &$value;
- if ($data->_objType == 2 && $data->scope) {
+ if ($data->_isTplObj() && $data->scope) {
$data->ext->_updateScope->_updateScope($data, $tpl_var);
}
}
return $data;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_assignglobal.php b/lib/smarty3/sysplugins/smarty_internal_method_assignglobal.php
index aae3ed7..08cfa46 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_assignglobal.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_assignglobal.php
@@ -22,22 +22,23 @@ class Smarty_Internal_Method_AssignGlobal
* assigns a global Smarty variable
*
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
- * @param string $varName the global variable name
- * @param mixed $value the value to assign
- * @param boolean $nocache if true any output of this variable will be not cached
+ * @param string $varName the global variable name
+ * @param mixed $value the value to assign
+ * @param boolean $nocache if true any output of this variable will
+ * be not cached
*
* @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
*/
public function assignGlobal(Smarty_Internal_Data $data, $varName, $value = null, $nocache = false)
{
- if ($varName != '') {
+ if ($varName !== '') {
Smarty::$global_tpl_vars[ $varName ] = new Smarty_Variable($value, $nocache);
$ptr = $data;
- while ($ptr->_objType == 2) {
+ while ($ptr->_isTplObj()) {
$ptr->tpl_vars[ $varName ] = clone Smarty::$global_tpl_vars[ $varName ];
$ptr = $ptr->parent;
}
}
return $data;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_clearallassign.php b/lib/smarty3/sysplugins/smarty_internal_method_clearallassign.php
index 1e5fec4..29ff2ff 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_clearallassign.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_clearallassign.php
@@ -31,7 +31,6 @@ class Smarty_Internal_Method_ClearAllAssign
public function clearAllAssign(Smarty_Internal_Data $data)
{
$data->tpl_vars = array();
-
return $data;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_clearallcache.php b/lib/smarty3/sysplugins/smarty_internal_method_clearallcache.php
index 5879f9a..30d55f7 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_clearallcache.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_clearallcache.php
@@ -24,11 +24,12 @@ class Smarty_Internal_Method_ClearAllCache
* @api Smarty::clearAllCache()
* @link http://www.smarty.net/docs/en/api.clear.all.cache.tpl
*
- * @param \Smarty $smarty
- * @param integer $exp_time expiration time
- * @param string $type resource type
+ * @param \Smarty $smarty
+ * @param integer $exp_time expiration time
+ * @param string $type resource type
*
- * @return integer number of cache files deleted
+ * @return int number of cache files deleted
+ * @throws \SmartyException
*/
public function clearAllCache(Smarty $smarty, $exp_time = null, $type = null)
{
@@ -37,4 +38,4 @@ class Smarty_Internal_Method_ClearAllCache
$_cache_resource = Smarty_CacheResource::load($smarty, $type);
return $_cache_resource->clearAll($smarty, $exp_time);
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_clearassign.php b/lib/smarty3/sysplugins/smarty_internal_method_clearassign.php
index 060a2ac..22bfa2d 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_clearassign.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_clearassign.php
@@ -25,7 +25,7 @@ class Smarty_Internal_Method_ClearAssign
* @link http://www.smarty.net/docs/en/api.clear.assign.tpl
*
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
- * @param string|array $tpl_var the template variable(s) to clear
+ * @param string|array $tpl_var the template variable(s) to clear
*
* @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
*/
@@ -38,7 +38,6 @@ class Smarty_Internal_Method_ClearAssign
} else {
unset($data->tpl_vars[ $tpl_var ]);
}
-
return $data;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_clearcache.php b/lib/smarty3/sysplugins/smarty_internal_method_clearcache.php
index 95649a7..a5dd4e2 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_clearcache.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_clearcache.php
@@ -24,21 +24,27 @@ class Smarty_Internal_Method_ClearCache
* @api Smarty::clearCache()
* @link http://www.smarty.net/docs/en/api.clear.cache.tpl
*
- * @param \Smarty $smarty
- * @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
+ * @param \Smarty $smarty
+ * @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
+ * @return int number of cache files deleted
+ * @throws \SmartyException
*/
- public function clearCache(Smarty $smarty, $template_name, $cache_id = null, $compile_id = null, $exp_time = null,
- $type = null)
- {
+ public function clearCache(
+ Smarty $smarty,
+ $template_name,
+ $cache_id = null,
+ $compile_id = null,
+ $exp_time = null,
+ $type = null
+ ) {
$smarty->_clearTemplateCache();
// load cache resource and call clear
$_cache_resource = Smarty_CacheResource::load($smarty, $type);
return $_cache_resource->clear($smarty, $template_name, $cache_id, $compile_id, $exp_time);
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/lib/smarty3/sysplugins/smarty_internal_method_clearcompiledtemplate.php
index 10ee279..bf49298 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_clearcompiledtemplate.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_clearcompiledtemplate.php
@@ -24,32 +24,32 @@ class Smarty_Internal_Method_ClearCompiledTemplate
* @api Smarty::clearCompiledTemplate()
* @link http://www.smarty.net/docs/en/api.clear.compiled.template.tpl
*
- * @param \Smarty $smarty
- * @param string $resource_name template name
- * @param string $compile_id compile id
- * @param integer $exp_time expiration time
+ * @param \Smarty $smarty
+ * @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
+ * @return int number of template files deleted
+ * @throws \SmartyException
*/
public function clearCompiledTemplate(Smarty $smarty, $resource_name = null, $compile_id = null, $exp_time = null)
{
// clear template objects cache
$smarty->_clearTemplateCache();
-
$_compile_dir = $smarty->getCompileDir();
- if ($_compile_dir == '/') { //We should never want to delete this!
+ if ($_compile_dir === '/') { //We should never want to delete this!
return 0;
}
$_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
- $_dir_sep = $smarty->use_sub_dirs ? DS : '^';
+ $_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
if (isset($resource_name)) {
$_save_stat = $smarty->caching;
- $smarty->caching = false;
+ $smarty->caching = Smarty::CACHING_OFF;
/* @var Smarty_Internal_Template $tpl */
- $tpl = new $smarty->template_class($resource_name, $smarty);
+ $tpl = $smarty->createTemplate($resource_name);
$smarty->caching = $_save_stat;
if (!$tpl->source->handler->uncompiled && !$tpl->source->handler->recompiled && $tpl->source->exists) {
- $_resource_part_1 = basename(str_replace('^', DS, $tpl->compiled->filepath));
+ $_resource_part_1 = basename(str_replace('^', DIRECTORY_SEPARATOR, $tpl->compiled->filepath));
$_resource_part_1_length = strlen($_resource_part_1);
} else {
return 0;
@@ -69,52 +69,63 @@ class Smarty_Internal_Method_ClearCompiledTemplate
try {
$_compileDirs = new RecursiveDirectoryIterator($_dir);
// NOTE: UnexpectedValueException thrown for PHP >= 5.3
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
return 0;
}
$_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
foreach ($_compile as $_file) {
- if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+ if (substr(basename($_file->getPathname()), 0, 1) === '.') {
continue;
}
-
- $_filepath = (string) $_file;
-
+ $_filepath = (string)$_file;
if ($_file->isDir()) {
if (!$_compile->isDot()) {
// delete folder if empty
@rmdir($_file->getPathname());
}
} else {
+ // delete only php files
+ if (substr($_filepath, -4) !== '.php') {
+ continue;
+ }
$unlink = false;
- if ((!isset($_compile_id) || (isset($_filepath[ $_compile_id_part_length ]) && $a =
- !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) &&
- (!isset($resource_name) || (isset($_filepath[ $_resource_part_1_length ]) &&
- substr_compare($_filepath, $_resource_part_1,
- - $_resource_part_1_length, $_resource_part_1_length) ==
- 0) || (isset($_filepath[ $_resource_part_2_length ]) &&
- substr_compare($_filepath, $_resource_part_2,
- - $_resource_part_2_length,
- $_resource_part_2_length) == 0))
+ if ((!isset($_compile_id) ||
+ (isset($_filepath[ $_compile_id_part_length ]) &&
+ $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
+ && (!isset($resource_name) || (isset($_filepath[ $_resource_part_1_length ])
+ && substr_compare(
+ $_filepath,
+ $_resource_part_1,
+ -$_resource_part_1_length,
+ $_resource_part_1_length
+ ) === 0) || (isset($_filepath[ $_resource_part_2_length ])
+ && substr_compare(
+ $_filepath,
+ $_resource_part_2,
+ -$_resource_part_2_length,
+ $_resource_part_2_length
+ ) === 0))
) {
if (isset($exp_time)) {
- if (time() - @filemtime($_filepath) >= $exp_time) {
+ if (is_file($_filepath) && time() - filemtime($_filepath) >= $exp_time) {
$unlink = true;
}
} else {
$unlink = true;
}
}
-
- if ($unlink && @unlink($_filepath)) {
- $_count ++;
- if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
+ if ($unlink && is_file($_filepath) && @unlink($_filepath)) {
+ $_count++;
+ if (function_exists('opcache_invalidate')
+ && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api')) < 1)
+ ) {
opcache_invalidate($_filepath, true);
+ } elseif (function_exists('apc_delete_file')) {
+ apc_delete_file($_filepath);
}
}
}
}
return $_count;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_clearconfig.php b/lib/smarty3/sysplugins/smarty_internal_method_clearconfig.php
index 3712478..15bf492 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_clearconfig.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_clearconfig.php
@@ -25,7 +25,7 @@ class Smarty_Internal_Method_ClearConfig
* @link http://www.smarty.net/docs/en/api.clear.config.tpl
*
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
- * @param string|null $name variable name or null
+ * @param string|null $name variable name or null
*
* @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
*/
@@ -38,4 +38,4 @@ class Smarty_Internal_Method_ClearConfig
}
return $data;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_compileallconfig.php b/lib/smarty3/sysplugins/smarty_internal_method_compileallconfig.php
index 767031b..3934ca0 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_compileallconfig.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_compileallconfig.php
@@ -11,23 +11,26 @@
*/
class Smarty_Internal_Method_CompileAllConfig extends Smarty_Internal_Method_CompileAllTemplates
{
-
/**
* Compile all config files
*
- * @api Smarty::compileAllConfig()
+ * @api Smarty::compileAllConfig()
*
* @param \Smarty $smarty passed smarty object
- * @param string $extension file extension
- * @param bool $force_compile force all to recompile
- * @param int $time_limit
- * @param int $max_errors
+ * @param string $extension file extension
+ * @param bool $force_compile force all to recompile
+ * @param int $time_limit
+ * @param int $max_errors
*
* @return int number of template files recompiled
*/
- public function compileAllConfig(Smarty $smarty, $extension = '.conf', $force_compile = false, $time_limit = 0,
- $max_errors = null)
- {
+ public function compileAllConfig(
+ Smarty $smarty,
+ $extension = '.conf',
+ $force_compile = false,
+ $time_limit = 0,
+ $max_errors = null
+ ) {
return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors, true);
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_compilealltemplates.php b/lib/smarty3/sysplugins/smarty_internal_method_compilealltemplates.php
index b38544e..5c046da 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_compilealltemplates.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_compilealltemplates.php
@@ -21,19 +21,23 @@ class Smarty_Internal_Method_CompileAllTemplates
/**
* Compile all template files
*
- * @api Smarty::compileAllTemplates()
+ * @api Smarty::compileAllTemplates()
*
* @param \Smarty $smarty passed smarty object
- * @param string $extension file extension
- * @param bool $force_compile force all to recompile
- * @param int $time_limit
- * @param int $max_errors
+ * @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
*/
- public function compileAllTemplates(Smarty $smarty, $extension = '.tpl', $force_compile = false, $time_limit = 0,
- $max_errors = null)
- {
+ public function compileAllTemplates(
+ Smarty $smarty,
+ $extension = '.tpl',
+ $force_compile = false,
+ $time_limit = 0,
+ $max_errors = null
+ ) {
return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors);
}
@@ -41,17 +45,22 @@ class Smarty_Internal_Method_CompileAllTemplates
* Compile all template or config files
*
* @param \Smarty $smarty
- * @param string $extension template file name extension
- * @param bool $force_compile force all to recompile
- * @param int $time_limit set maximum execution time
- * @param int $max_errors set maximum allowed errors
+ * @param string $extension template file name extension
+ * @param bool $force_compile force all to recompile
+ * @param int $time_limit set maximum execution time
+ * @param int $max_errors set maximum allowed errors
* @param bool $isConfig flag true if called for config files
*
* @return int number of template files compiled
*/
- protected function compileAll(Smarty $smarty, $extension, $force_compile, $time_limit, $max_errors,
- $isConfig = false)
- {
+ protected function compileAll(
+ Smarty $smarty,
+ $extension,
+ $force_compile,
+ $time_limit,
+ $max_errors,
+ $isConfig = false
+ ) {
// switch off time limit
if (function_exists('set_time_limit')) {
@set_time_limit($time_limit);
@@ -61,25 +70,28 @@ class Smarty_Internal_Method_CompileAllTemplates
$sourceDir = $isConfig ? $smarty->getConfigDir() : $smarty->getTemplateDir();
// loop over array of source directories
foreach ($sourceDir as $_dir) {
- $_dir_1 = new RecursiveDirectoryIterator($_dir, defined('FilesystemIterator::FOLLOW_SYMLINKS') ?
- FilesystemIterator::FOLLOW_SYMLINKS : 0);
+ $_dir_1 = new RecursiveDirectoryIterator(
+ $_dir,
+ defined('FilesystemIterator::FOLLOW_SYMLINKS') ?
+ FilesystemIterator::FOLLOW_SYMLINKS : 0
+ );
$_dir_2 = new RecursiveIteratorIterator($_dir_1);
foreach ($_dir_2 as $_fileinfo) {
$_file = $_fileinfo->getFilename();
- if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+ if (substr(basename($_fileinfo->getPathname()), 0, 1) === '.' || strpos($_file, '.svn') !== false) {
continue;
}
- if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
+ if (substr_compare($_file, $extension, -strlen($extension)) !== 0) {
continue;
}
- if ($_fileinfo->getPath() !== substr($_dir, 0, - 1)) {
- $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
+ if ($_fileinfo->getPath() !== substr($_dir, 0, -1)) {
+ $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DIRECTORY_SEPARATOR . $_file;
}
echo "\n<br>", $_dir, '---', $_file;
flush();
$_start_time = microtime(true);
$_smarty = clone $smarty;
- //
+ //
$_smarty->_cache = array();
$_smarty->ext = new Smarty_Internal_Extension_Handler();
$_smarty->ext->objType = $_smarty->_objType;
@@ -92,28 +104,27 @@ class Smarty_Internal_Method_CompileAllTemplates
$isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
if ($_tpl->mustCompile()) {
$_tpl->compileTemplateSource();
- $_count ++;
+ $_count++;
echo ' compiled in ', microtime(true) - $_start_time, ' seconds';
flush();
} else {
echo ' is up to date';
flush();
}
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
echo "\n<br> ------>Error: ", $e->getMessage(), "<br><br>\n";
- $_error_count ++;
+ $_error_count++;
}
// free memory
unset($_tpl);
$_smarty->_clearTemplateCache();
- if ($max_errors !== null && $_error_count == $max_errors) {
+ if ($max_errors !== null && $_error_count === $max_errors) {
echo "\n<br><br>too many errors\n";
- exit();
+ exit(1);
}
}
}
echo "\n<br>";
return $_count;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_configload.php b/lib/smarty3/sysplugins/smarty_internal_method_configload.php
index 2a38b18..2e62548 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_configload.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_configload.php
@@ -25,12 +25,12 @@ class Smarty_Internal_Method_ConfigLoad
* @link http://www.smarty.net/docs/en/api.config.load.tpl
*
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
- * @param string $config_file filename
- * @param mixed $sections array of section names, single
+ * @param string $config_file filename
+ * @param mixed $sections array of section names, single
* section or null
*
* @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
- * @throws \SmartyException
+ * @throws \Exception
*/
public function configLoad(Smarty_Internal_Data $data, $config_file, $sections = null)
{
@@ -45,28 +45,26 @@ class Smarty_Internal_Method_ConfigLoad
* @link http://www.smarty.net/docs/en/api.config.load.tpl
*
* @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
- * @param string $config_file filename
- * @param mixed $sections array of section names, single
+ * @param string $config_file filename
+ * @param mixed $sections array of section names, single
* section or null
* @param int $scope scope into which config variables
* shall be loaded
*
- * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
- * @throws \SmartyException
+ * @throws \Exception
*/
public function _loadConfigFile(Smarty_Internal_Data $data, $config_file, $sections = null, $scope = 0)
{
/* @var \Smarty $smarty */
- $smarty = isset($data->smarty) ? $data->smarty : $data;
+ $smarty = $data->_getSmartyObj();
/* @var \Smarty_Internal_Template $confObj */
- $confObj = new Smarty_Internal_Template($config_file, $smarty, $data);
+ $confObj = new Smarty_Internal_Template($config_file, $smarty, $data, null, null, null, null, true);
$confObj->caching = Smarty::CACHING_OFF;
- $confObj->source = Smarty_Template_Config::load($confObj);
$confObj->source->config_sections = $sections;
$confObj->source->scope = $scope;
$confObj->compiled = Smarty_Template_Compiled::load($confObj);
$confObj->compiled->render($confObj);
- if ($data->_objType == 2) {
+ if ($data->_isTplObj()) {
$data->compiled->file_dependency[ $confObj->source->uid ] =
array($confObj->source->filepath, $confObj->source->getTimeStamp(), $confObj->source->type);
}
@@ -76,28 +74,28 @@ class Smarty_Internal_Method_ConfigLoad
* load config variables into template object
*
* @param \Smarty_Internal_Template $tpl
- * @param array $new_config_vars
- *
+ * @param array $new_config_vars
*/
public function _loadConfigVars(Smarty_Internal_Template $tpl, $new_config_vars)
{
$this->_assignConfigVars($tpl->parent->config_vars, $tpl, $new_config_vars);
$tagScope = $tpl->source->scope;
if ($tagScope >= 0) {
- if ($tagScope == Smarty::SCOPE_LOCAL) {
+ if ($tagScope === Smarty::SCOPE_LOCAL) {
$this->_updateVarStack($tpl, $new_config_vars);
$tagScope = 0;
if (!$tpl->scope) {
return;
}
}
- if ($tpl->parent->_objType == 2 && ($tagScope || $tpl->parent->scope)) {
+ if ($tpl->parent->_isTplObj() && ($tagScope || $tpl->parent->scope)) {
$mergedScope = $tagScope | $tpl->scope;
if ($mergedScope) {
// update scopes
+ /* @var \Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $ptr */
foreach ($tpl->smarty->ext->_updateScope->_getAffectedScopes($tpl->parent, $mergedScope) as $ptr) {
$this->_assignConfigVars($ptr->config_vars, $tpl, $new_config_vars);
- if ($tagScope && $ptr->_objType == 2 && isset($tpl->_cache[ 'varStack' ])) {
+ if ($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) {
$this->_updateVarStack($tpl, $new_config_vars);
}
}
@@ -109,9 +107,9 @@ class Smarty_Internal_Method_ConfigLoad
/**
* Assign all config variables in given scope
*
- * @param array $config_vars config variables in scope
+ * @param array $config_vars config variables in scope
* @param \Smarty_Internal_Template $tpl
- * @param array $new_config_vars loaded config variables
+ * @param array $new_config_vars loaded config variables
*/
public function _assignConfigVars(&$config_vars, Smarty_Internal_Template $tpl, $new_config_vars)
{
@@ -120,19 +118,19 @@ class Smarty_Internal_Method_ConfigLoad
if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
$config_vars[ $variable ] = $value;
} else {
- $config_vars[ $variable ] = array_merge((array) $config_vars[ $variable ], (array) $value);
+ $config_vars[ $variable ] = array_merge((array)$config_vars[ $variable ], (array)$value);
}
}
// scan sections
$sections = $tpl->source->config_sections;
if (!empty($sections)) {
- foreach ((array) $sections as $tpl_section) {
+ foreach ((array)$sections as $tpl_section) {
if (isset($new_config_vars[ 'sections' ][ $tpl_section ])) {
foreach ($new_config_vars[ 'sections' ][ $tpl_section ][ 'vars' ] as $variable => $value) {
if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
$config_vars[ $variable ] = $value;
} else {
- $config_vars[ $variable ] = array_merge((array) $config_vars[ $variable ], (array) $value);
+ $config_vars[ $variable ] = array_merge((array)$config_vars[ $variable ], (array)$value);
}
}
}
@@ -151,22 +149,22 @@ class Smarty_Internal_Method_ConfigLoad
$i = 0;
while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
$this->_assignConfigVars($tpl->_cache[ 'varStack' ][ $i ][ 'config' ], $tpl, $config_vars);
- $i ++;
+ $i++;
}
}
/**
* gets a config variable value
*
- * @param \Smarty_Internal_Template $tpl template object
- * @param string $varName the name of the config variable
- * @param bool $errorEnable
+ * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+ * @param string $varName the name of the config variable
+ * @param bool $errorEnable
*
- * @return mixed the value of the config variable
+ * @return null|string the value of the config variable
*/
- public function _getConfigVariable(Smarty_Internal_Template $tpl, $varName, $errorEnable = true)
+ public function _getConfigVariable(Smarty_Internal_Data $data, $varName, $errorEnable = true)
{
- $_ptr = $tpl;
+ $_ptr = $data;
while ($_ptr !== null) {
if (isset($_ptr->config_vars[ $varName ])) {
// found it, return it
@@ -175,7 +173,7 @@ class Smarty_Internal_Method_ConfigLoad
// not found, try at parent
$_ptr = $_ptr->parent;
}
- if ($tpl->smarty->error_unassigned && $errorEnable) {
+ if ($data->smarty->error_unassigned && $errorEnable) {
// force a notice
$x = $$varName;
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_createdata.php b/lib/smarty3/sysplugins/smarty_internal_method_createdata.php
index 600bc77..f950975 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_createdata.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_createdata.php
@@ -29,16 +29,16 @@ class Smarty_Internal_Method_CreateData
* variables
* @param string $name optional data block name
*
- * @returns Smarty_Data data object
+ * @return \Smarty_Data data object
*/
public function createData(Smarty_Internal_TemplateBase $obj, Smarty_Internal_Data $parent = null, $name = null)
{
/* @var Smarty $smarty */
- $smarty = isset($this->smarty) ? $this->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
$dataObj = new Smarty_Data($parent, $smarty, $name);
if ($smarty->debugging) {
Smarty_Internal_Debug::register_data($dataObj);
}
return $dataObj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_getautoloadfilters.php b/lib/smarty3/sysplugins/smarty_internal_method_getautoloadfilters.php
index 87d4604..4145db1 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_getautoloadfilters.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_getautoloadfilters.php
@@ -11,27 +11,27 @@
*/
class Smarty_Internal_Method_GetAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
{
-
/**
* Get autoload filters
*
* @api Smarty::getAutoloadFilters()
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $type type of filter to get auto loads
+ * @param string $type type of filter to get auto loads
* for. Defaults to all autoload
* filters
*
- * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
+ * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
* was specified
+ * @throws \SmartyException
*/
public function getAutoloadFilters(Smarty_Internal_TemplateBase $obj, $type = null)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if ($type !== null) {
$this->_checkFilterType($type);
return isset($smarty->autoload_filters[ $type ]) ? $smarty->autoload_filters[ $type ] : array();
}
return $smarty->autoload_filters;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_getconfigvariable.php b/lib/smarty3/sysplugins/smarty_internal_method_getconfigvariable.php
new file mode 100644
index 0000000..b548151
--- /dev/null
+++ b/lib/smarty3/sysplugins/smarty_internal_method_getconfigvariable.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Smarty Method GetConfigVariable
+ *
+ * Smarty::getConfigVariable() method
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Uwe Tews
+ */
+class Smarty_Internal_Method_GetConfigVariable
+{
+ /**
+ * Valid for all objects
+ *
+ * @var int
+ */
+ public $objMap = 7;
+
+ /**
+ * gets a config variable value
+ *
+ * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+ * @param string $varName the name of the config variable
+ * @param bool $errorEnable
+ *
+ * @return null|string the value of the config variable
+ */
+ public function getConfigVariable(Smarty_Internal_Data $data, $varName = null, $errorEnable = true)
+ {
+ return $data->ext->configLoad->_getConfigVariable($data, $varName, $errorEnable);
+ }
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_getconfigvars.php b/lib/smarty3/sysplugins/smarty_internal_method_getconfigvars.php
index b75cf81..1d11e44 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_getconfigvars.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_getconfigvars.php
@@ -25,8 +25,8 @@ class Smarty_Internal_Method_GetConfigVars
* @link http://www.smarty.net/docs/en/api.get.config.vars.tpl
*
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
- * @param string $varname variable name or null
- * @param bool $search_parents include parent templates?
+ * @param string $varname variable name or null
+ * @param bool $search_parents include parent templates?
*
* @return mixed variable value or or array of variables
*/
@@ -55,4 +55,4 @@ class Smarty_Internal_Method_GetConfigVars
return $var_array;
}
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_getdebugtemplate.php b/lib/smarty3/sysplugins/smarty_internal_method_getdebugtemplate.php
index 40696c6..77d908c 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_getdebugtemplate.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_getdebugtemplate.php
@@ -29,7 +29,7 @@ class Smarty_Internal_Method_GetDebugTemplate
*/
public function getDebugTemplate(Smarty_Internal_TemplateBase $obj)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
return $smarty->debug_tpl;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_getdefaultmodifiers.php b/lib/smarty3/sysplugins/smarty_internal_method_getdefaultmodifiers.php
index 32e0cc4..57da85c 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_getdefaultmodifiers.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_getdefaultmodifiers.php
@@ -29,7 +29,7 @@ class Smarty_Internal_Method_GetDefaultModifiers
*/
public function getDefaultModifiers(Smarty_Internal_TemplateBase $obj)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
return $smarty->default_modifiers;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_getglobal.php b/lib/smarty3/sysplugins/smarty_internal_method_getglobal.php
index 7a8a9bc..2be11d7 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_getglobal.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_getglobal.php
@@ -21,12 +21,12 @@ class Smarty_Internal_Method_GetGlobal
/**
* Returns a single or all global variables
*
- * @api Smarty::getGlobal()
+ * @api Smarty::getGlobal()
*
* @param \Smarty_Internal_Data $data
- * @param string $varName variable name or null
+ * @param string $varName variable name or null
*
- * @return string variable value or or array of variables
+ * @return string|array variable value or or array of variables
*/
public function getGlobal(Smarty_Internal_Data $data, $varName = null)
{
@@ -38,10 +38,10 @@ class Smarty_Internal_Method_GetGlobal
}
} else {
$_result = array();
- foreach (Smarty::$global_tpl_vars AS $key => $var) {
+ foreach (Smarty::$global_tpl_vars as $key => $var) {
$_result[ $key ] = $var->value;
}
return $_result;
}
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_getregisteredobject.php b/lib/smarty3/sysplugins/smarty_internal_method_getregisteredobject.php
index 872dbd8..df6ede1 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_getregisteredobject.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_getregisteredobject.php
@@ -25,14 +25,14 @@ class Smarty_Internal_Method_GetRegisteredObject
* @link http://www.smarty.net/docs/en/api.get.registered.object.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $object_name object name
+ * @param string $object_name object name
*
* @return object
* @throws \SmartyException if no such object is found
*/
public function getRegisteredObject(Smarty_Internal_TemplateBase $obj, $object_name)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if (!isset($smarty->registered_objects[ $object_name ])) {
throw new SmartyException("'$object_name' is not a registered object");
}
@@ -41,4 +41,4 @@ class Smarty_Internal_Method_GetRegisteredObject
}
return $smarty->registered_objects[ $object_name ][ 0 ];
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_getstreamvariable.php b/lib/smarty3/sysplugins/smarty_internal_method_getstreamvariable.php
index b922fd0..8db39c5 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_getstreamvariable.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_getstreamvariable.php
@@ -24,7 +24,7 @@ class Smarty_Internal_Method_GetStreamVariable
* @api Smarty::getStreamVariable()
*
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
- * @param string $variable the stream of the variable
+ * @param string $variable the stream of the variable
*
* @return mixed
* @throws \SmartyException
@@ -38,7 +38,6 @@ class Smarty_Internal_Method_GetStreamVariable
$_result .= $current_line;
}
fclose($fp);
-
return $_result;
}
$smarty = isset($data->smarty) ? $data->smarty : $data;
@@ -48,4 +47,4 @@ class Smarty_Internal_Method_GetStreamVariable
return null;
}
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_gettags.php b/lib/smarty3/sysplugins/smarty_internal_method_gettags.php
index ea727fd..c07ae07 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_gettags.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_gettags.php
@@ -28,15 +28,16 @@ class Smarty_Internal_Method_GetTags
* @param null|string|Smarty_Internal_Template $template
*
* @return array of tag/attributes
+ * @throws \Exception
* @throws \SmartyException
*/
public function getTags(Smarty_Internal_TemplateBase $obj, $template = null)
{
/* @var Smarty $smarty */
- $smarty = isset($this->smarty) ? $this->smarty : $obj;
- if ($obj->_objType == 2 && !isset($template)) {
+ $smarty = $obj->_getSmartyObj();
+ if ($obj->_isTplObj() && !isset($template)) {
$tpl = clone $obj;
- } elseif (isset($template) && $template->_objType == 2) {
+ } elseif (isset($template) && $template->_isTplObj()) {
$tpl = clone $template;
} elseif (isset($template) && is_string($template)) {
/* @var Smarty_Internal_Template $tpl */
@@ -52,11 +53,11 @@ class Smarty_Internal_Method_GetTags
$tpl->_cache[ 'used_tags' ] = array();
$tpl->smarty->merge_compiled_includes = false;
$tpl->smarty->disableSecurity();
- $tpl->caching = false;
+ $tpl->caching = Smarty::CACHING_OFF;
$tpl->loadCompiler();
$tpl->compiler->compileTemplate($tpl);
return $tpl->_cache[ 'used_tags' ];
}
- throw new SmartyException("Missing template specification");
+ throw new SmartyException('Missing template specification');
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_gettemplatevars.php b/lib/smarty3/sysplugins/smarty_internal_method_gettemplatevars.php
index 1759646..9ef7d46 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_gettemplatevars.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_gettemplatevars.php
@@ -25,15 +25,18 @@ class Smarty_Internal_Method_GetTemplateVars
* @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
*
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
- * @param string $varName variable name or null
+ * @param string $varName variable name or null
* @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr optional pointer to data object
- * @param bool $searchParents include parent templates?
+ * @param bool $searchParents include parent templates?
*
* @return mixed variable value or or array of variables
*/
- public function getTemplateVars(Smarty_Internal_Data $data, $varName = null, Smarty_Internal_Data $_ptr = null,
- $searchParents = true)
- {
+ public function getTemplateVars(
+ Smarty_Internal_Data $data,
+ $varName = null,
+ Smarty_Internal_Data $_ptr = null,
+ $searchParents = true
+ ) {
if (isset($varName)) {
$_var = $this->_getVariable($data, $varName, $_ptr, $searchParents, false);
if (is_object($_var)) {
@@ -47,20 +50,20 @@ class Smarty_Internal_Method_GetTemplateVars
$_ptr = $data;
}
while ($_ptr !== null) {
- foreach ($_ptr->tpl_vars AS $key => $var) {
+ foreach ($_ptr->tpl_vars as $key => $var) {
if (!array_key_exists($key, $_result)) {
$_result[ $key ] = $var->value;
}
}
// not found, try at parent
- if ($searchParents) {
+ if ($searchParents && isset($_ptr->parent)) {
$_ptr = $_ptr->parent;
} else {
$_ptr = null;
}
}
if ($searchParents && isset(Smarty::$global_tpl_vars)) {
- foreach (Smarty::$global_tpl_vars AS $key => $var) {
+ foreach (Smarty::$global_tpl_vars as $key => $var) {
if (!array_key_exists($key, $_result)) {
$_result[ $key ] = $var->value;
}
@@ -81,9 +84,13 @@ class Smarty_Internal_Method_GetTemplateVars
*
* @return \Smarty_Variable
*/
- public function _getVariable(Smarty_Internal_Data $data, $varName, Smarty_Internal_Data $_ptr = null,
- $searchParents = true, $errorEnable = true)
- {
+ public function _getVariable(
+ Smarty_Internal_Data $data,
+ $varName,
+ Smarty_Internal_Data $_ptr = null,
+ $searchParents = true,
+ $errorEnable = true
+ ) {
if ($_ptr === null) {
$_ptr = $data;
}
@@ -93,7 +100,7 @@ class Smarty_Internal_Method_GetTemplateVars
return $_ptr->tpl_vars[ $varName ];
}
// not found, try at parent
- if ($searchParents) {
+ if ($searchParents && isset($_ptr->parent)) {
$_ptr = $_ptr->parent;
} else {
$_ptr = null;
@@ -103,14 +110,10 @@ class Smarty_Internal_Method_GetTemplateVars
// found it, return it
return Smarty::$global_tpl_vars[ $varName ];
}
- /* @var \Smarty $smarty */
- $smarty = isset($data->smarty) ? $data->smarty : $data;
- if ($smarty->error_unassigned && $errorEnable) {
+ if ($errorEnable && $data->_getSmartyObj()->error_unassigned) {
// force a notice
$x = $$varName;
}
-
return new Smarty_Undefined_Variable;
}
-
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_literals.php b/lib/smarty3/sysplugins/smarty_internal_method_literals.php
new file mode 100644
index 0000000..bfa3f58
--- /dev/null
+++ b/lib/smarty3/sysplugins/smarty_internal_method_literals.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Smarty Method GetLiterals
+ *
+ * Smarty::getLiterals() method
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Uwe Tews
+ */
+class Smarty_Internal_Method_Literals
+{
+ /**
+ * Valid for Smarty and template object
+ *
+ * @var int
+ */
+ public $objMap = 3;
+
+ /**
+ * Get literals
+ *
+ * @api Smarty::getLiterals()
+ *
+ * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+ *
+ * @return array list of literals
+ */
+ public function getLiterals(Smarty_Internal_TemplateBase $obj)
+ {
+ $smarty = $obj->_getSmartyObj();
+ return (array)$smarty->literals;
+ }
+
+ /**
+ * Add literals
+ *
+ * @api Smarty::addLiterals()
+ *
+ * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+ * @param array|string $literals literal or list of literals
+ * to addto add
+ *
+ * @return \Smarty|\Smarty_Internal_Template
+ * @throws \SmartyException
+ */
+ public function addLiterals(Smarty_Internal_TemplateBase $obj, $literals = null)
+ {
+ if (isset($literals)) {
+ $this->set($obj->_getSmartyObj(), (array)$literals);
+ }
+ return $obj;
+ }
+
+ /**
+ * Set literals
+ *
+ * @api Smarty::setLiterals()
+ *
+ * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+ * @param array|string $literals literal or list of literals
+ * to setto set
+ *
+ * @return \Smarty|\Smarty_Internal_Template
+ * @throws \SmartyException
+ */
+ public function setLiterals(Smarty_Internal_TemplateBase $obj, $literals = null)
+ {
+ $smarty = $obj->_getSmartyObj();
+ $smarty->literals = array();
+ if (!empty($literals)) {
+ $this->set($smarty, (array)$literals);
+ }
+ return $obj;
+ }
+
+ /**
+ * common setter for literals for easier handling of duplicates the
+ * Smarty::$literals array gets filled with identical key values
+ *
+ * @param \Smarty $smarty
+ * @param array $literals
+ *
+ * @throws \SmartyException
+ */
+ private function set(Smarty $smarty, $literals)
+ {
+ $literals = array_combine($literals, $literals);
+ $error = isset($literals[ $smarty->left_delimiter ]) ? array($smarty->left_delimiter) : array();
+ $error = isset($literals[ $smarty->right_delimiter ]) ? $error[] = $smarty->right_delimiter : $error;
+ if (!empty($error)) {
+ throw new SmartyException(
+ 'User defined literal(s) "' . $error .
+ '" may not be identical with left or right delimiter'
+ );
+ }
+ $smarty->literals = array_merge((array)$smarty->literals, (array)$literals);
+ }
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_loadfilter.php b/lib/smarty3/sysplugins/smarty_internal_method_loadfilter.php
index 4fdbdac..66d80d4 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_loadfilter.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_loadfilter.php
@@ -33,15 +33,15 @@ class Smarty_Internal_Method_LoadFilter
* @link http://www.smarty.net/docs/en/api.load.filter.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $type filter type
- * @param string $name filter name
+ * @param string $type filter type
+ * @param string $name filter name
*
* @return bool
* @throws SmartyException if filter could not be loaded
*/
public function loadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
$this->_checkFilterType($type);
$_plugin = "smarty_{$type}filter_{$name}";
$_filter_name = $_plugin;
@@ -58,7 +58,7 @@ class Smarty_Internal_Method_LoadFilter
return true;
}
}
- throw new SmartyException("{$type}filter \"{$name}\" not found or callable");
+ throw new SmartyException("{$type}filter '{$name}' not found or callable");
}
/**
@@ -71,7 +71,7 @@ class Smarty_Internal_Method_LoadFilter
public function _checkFilterType($type)
{
if (!isset($this->filterTypes[ $type ])) {
- throw new SmartyException("Illegal filter type \"{$type}\"");
+ throw new SmartyException("Illegal filter type '{$type}'");
}
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_loadplugin.php b/lib/smarty3/sysplugins/smarty_internal_method_loadplugin.php
index 50f3bfc..3bd659c 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_loadplugin.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_loadplugin.php
@@ -24,8 +24,8 @@ class Smarty_Internal_Method_LoadPlugin
* plugin filename format: plugintype.pluginname.php
*
* @param \Smarty $smarty
- * @param string $plugin_name class plugin name to load
- * @param bool $check check if already loaded
+ * @param string $plugin_name class plugin name to load
+ * @param bool $check check if already loaded
*
* @return bool|string
* @throws \SmartyException
@@ -50,7 +50,7 @@ class Smarty_Internal_Method_LoadPlugin
} else {
if (is_file($file)) {
$this->plugin_files[ $file ] = $file;
- require_once($file);
+ include_once $file;
return $file;
} else {
$this->plugin_files[ $file ] = false;
@@ -76,7 +76,7 @@ class Smarty_Internal_Method_LoadPlugin
}
}
$_file_names = array($_plugin_filename);
- if ($_lower_filename != $_plugin_filename) {
+ if ($_lower_filename !== $_plugin_filename) {
$_file_names[] = $_lower_filename;
}
$_p_dirs = $smarty->getPluginsDir();
@@ -87,7 +87,7 @@ class Smarty_Internal_Method_LoadPlugin
$file = $_plugin_dir . $name;
if (is_file($file)) {
$this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] = $file;
- require_once($file);
+ include_once $file;
return $file;
}
$this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] = false;
@@ -100,7 +100,7 @@ class Smarty_Internal_Method_LoadPlugin
$file = $smarty->ext->_getIncludePath->getIncludePath($_p_dirs, $_file_name, $smarty);
$this->plugin_files[ 'include_path' ][ $_lower_filename ] = $file;
if ($file !== false) {
- require_once($file);
+ include_once $file;
return $file;
}
}
@@ -108,4 +108,4 @@ class Smarty_Internal_Method_LoadPlugin
// no plugin loaded
return false;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_mustcompile.php b/lib/smarty3/sysplugins/smarty_internal_method_mustcompile.php
index 718b0a1..3931883 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_mustcompile.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_mustcompile.php
@@ -31,7 +31,7 @@ class Smarty_Internal_Method_MustCompile
public function mustCompile(Smarty_Internal_Template $_template)
{
if (!$_template->source->exists) {
- if (isset($_template->parent) && $_template->parent->_objType == 2) {
+ if ($_template->_isSubTpl()) {
$parent_resource = " in '$_template->parent->template_resource}'";
} else {
$parent_resource = '';
@@ -41,11 +41,10 @@ class Smarty_Internal_Method_MustCompile
if ($_template->mustCompile === null) {
$_template->mustCompile = (!$_template->source->handler->uncompiled &&
($_template->smarty->force_compile || $_template->source->handler->recompiled ||
- !$_template->compiled->exists || ($_template->smarty->compile_check &&
+ !$_template->compiled->exists || ($_template->compile_check &&
$_template->compiled->getTimeStamp() <
$_template->source->getTimeStamp())));
}
-
return $_template->mustCompile;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registercacheresource.php b/lib/smarty3/sysplugins/smarty_internal_method_registercacheresource.php
index a3ab426..6483656 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registercacheresource.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registercacheresource.php
@@ -25,16 +25,18 @@ class Smarty_Internal_Method_RegisterCacheResource
* @link http://www.smarty.net/docs/en/api.register.cacheresource.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $name name of resource type
+ * @param string $name name of resource type
* @param \Smarty_CacheResource $resource_handler
*
* @return \Smarty|\Smarty_Internal_Template
*/
- public function registerCacheResource(Smarty_Internal_TemplateBase $obj, $name,
- Smarty_CacheResource $resource_handler)
- {
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ public function registerCacheResource(
+ Smarty_Internal_TemplateBase $obj,
+ $name,
+ Smarty_CacheResource $resource_handler
+ ) {
+ $smarty = $obj->_getSmartyObj();
$smarty->registered_cache_resources[ $name ] = $resource_handler;
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registerclass.php b/lib/smarty3/sysplugins/smarty_internal_method_registerclass.php
index de89b4c..8d18547 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registerclass.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registerclass.php
@@ -25,8 +25,8 @@ class Smarty_Internal_Method_RegisterClass
* @link http://www.smarty.net/docs/en/api.register.class.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $class_name
- * @param string $class_impl the referenced PHP class to
+ * @param string $class_name
+ * @param string $class_impl the referenced PHP class to
* register
*
* @return \Smarty|\Smarty_Internal_Template
@@ -34,7 +34,7 @@ class Smarty_Internal_Method_RegisterClass
*/
public function registerClass(Smarty_Internal_TemplateBase $obj, $class_name, $class_impl)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
// test if exists
if (!class_exists($class_impl)) {
throw new SmartyException("Undefined class '$class_impl' in register template class");
@@ -43,4 +43,4 @@ class Smarty_Internal_Method_RegisterClass
$smarty->registered_classes[ $class_name ] = $class_impl;
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registerdefaultconfighandler.php b/lib/smarty3/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
index 370aa38..b340f17 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
@@ -21,22 +21,22 @@ class Smarty_Internal_Method_RegisterDefaultConfigHandler
/**
* Register config default handler
*
- * @api Smarty::registerDefaultConfigHandler()
+ * @api Smarty::registerDefaultConfigHandler()
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param callable $callback class/method name
+ * @param callable $callback class/method name
*
* @return \Smarty|\Smarty_Internal_Template
* @throws SmartyException if $callback is not callable
*/
public function registerDefaultConfigHandler(Smarty_Internal_TemplateBase $obj, $callback)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if (is_callable($callback)) {
$smarty->default_config_handler_func = $callback;
} else {
- throw new SmartyException("Default config handler not callable");
+ throw new SmartyException('Default config handler not callable');
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php b/lib/smarty3/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
index 80b801c..a9fb78d 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
@@ -25,14 +25,14 @@ class Smarty_Internal_Method_RegisterDefaultPluginHandler
* @link http://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param callable $callback class/method name
+ * @param callable $callback class/method name
*
* @return \Smarty|\Smarty_Internal_Template
* @throws SmartyException if $callback is not callable
*/
public function registerDefaultPluginHandler(Smarty_Internal_TemplateBase $obj, $callback)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if (is_callable($callback)) {
$smarty->default_plugin_handler_func = $callback;
} else {
@@ -40,4 +40,4 @@ class Smarty_Internal_Method_RegisterDefaultPluginHandler
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php b/lib/smarty3/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
index 73e8f62..cbc133c 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
@@ -21,21 +21,21 @@ class Smarty_Internal_Method_RegisterDefaultTemplateHandler
/**
* Register template default handler
*
- * @api Smarty::registerDefaultTemplateHandler()
+ * @api Smarty::registerDefaultTemplateHandler()
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param callable $callback class/method name
+ * @param callable $callback class/method name
*
* @return \Smarty|\Smarty_Internal_Template
* @throws SmartyException if $callback is not callable
*/
public function registerDefaultTemplateHandler(Smarty_Internal_TemplateBase $obj, $callback)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if (is_callable($callback)) {
$smarty->default_template_handler_func = $callback;
} else {
- throw new SmartyException("Default template handler not callable");
+ throw new SmartyException('Default template handler not callable');
}
return $obj;
}
@@ -55,16 +55,20 @@ class Smarty_Internal_Method_RegisterDefaultTemplateHandler
$default_handler = $source->smarty->default_template_handler_func;
}
$_content = $_timestamp = null;
- $_return = call_user_func_array($default_handler,
- array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty));
+ $_return = call_user_func_array(
+ $default_handler,
+ array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty)
+ );
if (is_string($_return)) {
$source->exists = is_file($_return);
if ($source->exists) {
$source->timestamp = filemtime($_return);
} else {
- throw new SmartyException("Default handler: Unable to load " .
- ($source->isConfig ? 'config' : 'template') .
- " default file '{$_return}' for '{$source->type}:{$source->name}'");
+ throw new SmartyException(
+ 'Default handler: Unable to load ' .
+ ($source->isConfig ? 'config' : 'template') .
+ " default file '{$_return}' for '{$source->type}:{$source->name}'"
+ );
}
$source->name = $source->filepath = $_return;
$source->uid = sha1($source->filepath);
@@ -75,8 +79,10 @@ class Smarty_Internal_Method_RegisterDefaultTemplateHandler
$source->handler = Smarty_Resource::load($source->smarty, 'eval');
} else {
$source->exists = false;
- throw new SmartyException('Default handler: No ' . ($source->isConfig ? 'config' : 'template') .
- " default content for '{$source->type}:{$source->name}'");
+ throw new SmartyException(
+ 'Default handler: No ' . ($source->isConfig ? 'config' : 'template') .
+ " default content for '{$source->type}:{$source->name}'"
+ );
}
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registerfilter.php b/lib/smarty3/sysplugins/smarty_internal_method_registerfilter.php
index 7c8a12a..c0f9fff 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registerfilter.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registerfilter.php
@@ -33,20 +33,20 @@ class Smarty_Internal_Method_RegisterFilter
* @link http://www.smarty.net/docs/en/api.register.filter.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $type filter type
- * @param callback $callback
- * @param string|null $name optional filter name
+ * @param string $type filter type
+ * @param callback $callback
+ * @param string|null $name optional filter name
*
* @return \Smarty|\Smarty_Internal_Template
* @throws \SmartyException
*/
public function registerFilter(Smarty_Internal_TemplateBase $obj, $type, $callback, $name = null)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
$this->_checkFilterType($type);
$name = isset($name) ? $name : $this->_getFilterName($callback);
if (!is_callable($callback)) {
- throw new SmartyException("{$type}filter \"{$name}\" not callable");
+ throw new SmartyException("{$type}filter '{$name}' not callable");
}
$smarty->registered_filters[ $type ][ $name ] = $callback;
return $obj;
@@ -55,7 +55,7 @@ class Smarty_Internal_Method_RegisterFilter
/**
* Return internal filter name
*
- * @param callback $function_name
+ * @param callback $function_name
*
* @return string internal filter name
*/
@@ -63,7 +63,6 @@ class Smarty_Internal_Method_RegisterFilter
{
if (is_array($function_name)) {
$_class_name = (is_object($function_name[ 0 ]) ? get_class($function_name[ 0 ]) : $function_name[ 0 ]);
-
return $_class_name . '_' . $function_name[ 1 ];
} elseif (is_string($function_name)) {
return $function_name;
@@ -82,7 +81,7 @@ class Smarty_Internal_Method_RegisterFilter
public function _checkFilterType($type)
{
if (!isset($this->filterTypes[ $type ])) {
- throw new SmartyException("Illegal filter type \"{$type}\"");
+ throw new SmartyException("Illegal filter type '{$type}'");
}
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registerobject.php b/lib/smarty3/sysplugins/smarty_internal_method_registerobject.php
index dcebd92..4646e4f 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registerobject.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registerobject.php
@@ -25,32 +25,44 @@ class Smarty_Internal_Method_RegisterObject
* @link http://www.smarty.net/docs/en/api.register.object.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $object_name
- * @param object $object the
+ * @param string $object_name
+ * @param object $object the
* referenced
- * PHP object to
+ * PHP
+ * object
+ * to
* register
- * @param array $allowed_methods_properties list of
+ *
+ * @param array $allowed_methods_properties list of
* allowed
* methods
- * (empty = all)
- * @param bool $format smarty
+ * (empty
+ * = all)
+ *
+ * @param bool $format smarty
* argument
- * format, else
+ * format,
+ * else
* traditional
- * @param array $block_methods list of
+ *
+ * @param array $block_methods list of
* block-methods
*
* @return \Smarty|\Smarty_Internal_Template
* @throws \SmartyException
*/
- public function registerObject(Smarty_Internal_TemplateBase $obj, $object_name, $object,
- $allowed_methods_properties = array(), $format = true, $block_methods = array())
- {
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ public function registerObject(
+ Smarty_Internal_TemplateBase $obj,
+ $object_name,
+ $object,
+ $allowed_methods_properties = array(),
+ $format = true,
+ $block_methods = array()
+ ) {
+ $smarty = $obj->_getSmartyObj();
// test if allowed methods callable
if (!empty($allowed_methods_properties)) {
- foreach ((array) $allowed_methods_properties as $method) {
+ foreach ((array)$allowed_methods_properties as $method) {
if (!is_callable(array($object, $method)) && !property_exists($object, $method)) {
throw new SmartyException("Undefined method or property '$method' in registered object");
}
@@ -58,7 +70,7 @@ class Smarty_Internal_Method_RegisterObject
}
// test if block methods callable
if (!empty($block_methods)) {
- foreach ((array) $block_methods as $method) {
+ foreach ((array)$block_methods as $method) {
if (!is_callable(array($object, $method))) {
throw new SmartyException("Undefined method '$method' in registered object");
}
@@ -66,7 +78,7 @@ class Smarty_Internal_Method_RegisterObject
}
// register the object
$smarty->registered_objects[ $object_name ] =
- array($object, (array) $allowed_methods_properties, (boolean) $format, (array) $block_methods);
+ array($object, (array)$allowed_methods_properties, (boolean)$format, (array)$block_methods);
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registerplugin.php b/lib/smarty3/sysplugins/smarty_internal_method_registerplugin.php
index b86abbf..f987f6d 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registerplugin.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registerplugin.php
@@ -25,27 +25,32 @@ class Smarty_Internal_Method_RegisterPlugin
* @link http://www.smarty.net/docs/en/api.register.plugin.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $type plugin type
- * @param string $name name of template tag
- * @param callback $callback PHP callback to register
- * @param bool $cacheable if true (default) this
+ * @param string $type plugin type
+ * @param string $name name of template tag
+ * @param callback $callback PHP callback to register
+ * @param bool $cacheable if true (default) this
* function is cache able
- * @param mixed $cache_attr caching attributes if any
+ * @param mixed $cache_attr caching attributes if any
*
* @return \Smarty|\Smarty_Internal_Template
* @throws SmartyException when the plugin tag is invalid
*/
- public function registerPlugin(Smarty_Internal_TemplateBase $obj, $type, $name, $callback, $cacheable = true,
- $cache_attr = null)
- {
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ public function registerPlugin(
+ Smarty_Internal_TemplateBase $obj,
+ $type,
+ $name,
+ $callback,
+ $cacheable = true,
+ $cache_attr = null
+ ) {
+ $smarty = $obj->_getSmartyObj();
if (isset($smarty->registered_plugins[ $type ][ $name ])) {
- throw new SmartyException("Plugin tag \"{$name}\" already registered");
+ throw new SmartyException("Plugin tag '{$name}' already registered");
} elseif (!is_callable($callback)) {
- throw new SmartyException("Plugin \"{$name}\" not callable");
+ throw new SmartyException("Plugin '{$name}' not callable");
} else {
- $smarty->registered_plugins[ $type ][ $name ] = array($callback, (bool) $cacheable, (array) $cache_attr);
+ $smarty->registered_plugins[ $type ][ $name ] = array($callback, (bool)$cacheable, (array)$cache_attr);
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registerresource.php b/lib/smarty3/sysplugins/smarty_internal_method_registerresource.php
index 31555b3..7c7d0f7 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registerresource.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registerresource.php
@@ -25,20 +25,22 @@ class Smarty_Internal_Method_RegisterResource
* @link http://www.smarty.net/docs/en/api.register.resource.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $name name of resource type
- * @param Smarty_Resource|array $resource_handler or instance of
- * Smarty_Resource, or
- * array of callbacks to
- * handle resource
+ * @param string $name name of resource type
+ * @param Smarty_Resource|array $resource_handler or instance of
+ * Smarty_Resource,
+ * or array of
+ * callbacks to
+ * handle
+ * resource
* (deprecated)
*
* @return \Smarty|\Smarty_Internal_Template
*/
public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
$smarty->registered_resources[ $name ] =
$resource_handler instanceof Smarty_Resource ? $resource_handler : array($resource_handler, false);
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_setautoloadfilters.php b/lib/smarty3/sysplugins/smarty_internal_method_setautoloadfilters.php
index 04a901a..2972f3c 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_setautoloadfilters.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_setautoloadfilters.php
@@ -31,25 +31,27 @@ class Smarty_Internal_Method_SetAutoloadFilters
* @api Smarty::setAutoloadFilters()
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @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 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|\Smarty_Internal_Template
+ * @throws \SmartyException
*/
public function setAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if ($type !== null) {
$this->_checkFilterType($type);
- $smarty->autoload_filters[ $type ] = (array) $filters;
+ $smarty->autoload_filters[ $type ] = (array)$filters;
} else {
- foreach ((array) $filters as $type => $value) {
+ foreach ((array)$filters as $type => $value) {
$this->_checkFilterType($type);
}
- $smarty->autoload_filters = (array) $filters;
+ $smarty->autoload_filters = (array)$filters;
}
return $obj;
}
@@ -64,7 +66,7 @@ class Smarty_Internal_Method_SetAutoloadFilters
public function _checkFilterType($type)
{
if (!isset($this->filterTypes[ $type ])) {
- throw new SmartyException("Illegal filter type \"{$type}\"");
+ throw new SmartyException("Illegal filter type '{$type}'");
}
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_setdebugtemplate.php b/lib/smarty3/sysplugins/smarty_internal_method_setdebugtemplate.php
index 4ff5d7f..cc9d23e 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_setdebugtemplate.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_setdebugtemplate.php
@@ -24,18 +24,18 @@ class Smarty_Internal_Method_SetDebugTemplate
* @api Smarty::setDebugTemplate()
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $tpl_name
+ * @param string $tpl_name
*
* @return \Smarty|\Smarty_Internal_Template
* @throws SmartyException if file is not readable
*/
public function setDebugTemplate(Smarty_Internal_TemplateBase $obj, $tpl_name)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if (!is_readable($tpl_name)) {
throw new SmartyException("Unknown file '{$tpl_name}'");
}
$smarty->debug_tpl = $tpl_name;
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_setdefaultmodifiers.php b/lib/smarty3/sysplugins/smarty_internal_method_setdefaultmodifiers.php
index 5a70728..eadc2de 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_setdefaultmodifiers.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_setdefaultmodifiers.php
@@ -24,15 +24,15 @@ class Smarty_Internal_Method_SetDefaultModifiers
* @api Smarty::setDefaultModifiers()
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param array|string $modifiers modifier or list of modifiers
+ * @param array|string $modifiers modifier or list of modifiers
* to set
*
* @return \Smarty|\Smarty_Internal_Template
*/
public function setDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
- $smarty->default_modifiers = (array) $modifiers;
+ $smarty = $obj->_getSmartyObj();
+ $smarty->default_modifiers = (array)$modifiers;
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_unloadfilter.php b/lib/smarty3/sysplugins/smarty_internal_method_unloadfilter.php
index 3ca0eae..55e1596 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_unloadfilter.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_unloadfilter.php
@@ -19,19 +19,20 @@ class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFil
* @link http://www.smarty.net/docs/en/api.unload.filter.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $type filter type
- * @param string $name filter name
+ * @param string $type filter type
+ * @param string $name filter name
*
- * @return bool
+ * @return Smarty_Internal_TemplateBase
+ * @throws \SmartyException
*/
public function unloadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
$this->_checkFilterType($type);
if (isset($smarty->registered_filters[ $type ])) {
$_filter_name = "smarty_{$type}filter_{$name}";
if (isset($smarty->registered_filters[ $type ][ $_filter_name ])) {
- unset ($smarty->registered_filters[ $type ][ $_filter_name ]);
+ unset($smarty->registered_filters[ $type ][ $_filter_name ]);
if (empty($smarty->registered_filters[ $type ])) {
unset($smarty->registered_filters[ $type ]);
}
@@ -39,4 +40,4 @@ class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFil
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_unregistercacheresource.php b/lib/smarty3/sysplugins/smarty_internal_method_unregistercacheresource.php
index 1168057..b999038 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_unregistercacheresource.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_unregistercacheresource.php
@@ -21,8 +21,8 @@ class Smarty_Internal_Method_UnregisterCacheResource
/**
* Registers a resource to fetch a template
*
- * @api Smarty::unregisterCacheResource()
- * @link http://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
+ * @api Smarty::unregisterCacheResource()
+ * @link http://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
* @param $name
@@ -31,10 +31,10 @@ class Smarty_Internal_Method_UnregisterCacheResource
*/
public function unregisterCacheResource(Smarty_Internal_TemplateBase $obj, $name)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if (isset($smarty->registered_cache_resources[ $name ])) {
unset($smarty->registered_cache_resources[ $name ]);
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_unregisterfilter.php b/lib/smarty3/sysplugins/smarty_internal_method_unregisterfilter.php
index ec69c55..9cb494a 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_unregisterfilter.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_unregisterfilter.php
@@ -19,14 +19,15 @@ class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_Reg
* @link http://www.smarty.net/docs/en/api.unregister.filter.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $type filter type
- * @param callback|string $callback
+ * @param string $type filter type
+ * @param callback|string $callback
*
* @return \Smarty|\Smarty_Internal_Template
+ * @throws \SmartyException
*/
public function unregisterFilter(Smarty_Internal_TemplateBase $obj, $type, $callback)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
$this->_checkFilterType($type);
if (isset($smarty->registered_filters[ $type ])) {
$name = is_string($callback) ? $callback : $this->_getFilterName($callback);
@@ -39,4 +40,4 @@ class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_Reg
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_unregisterobject.php b/lib/smarty3/sysplugins/smarty_internal_method_unregisterobject.php
index 56c531e..1e592b3 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_unregisterobject.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_unregisterobject.php
@@ -25,16 +25,16 @@ class Smarty_Internal_Method_UnregisterObject
* @link http://www.smarty.net/docs/en/api.unregister.object.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $object_name name of object
+ * @param string $object_name name of object
*
* @return \Smarty|\Smarty_Internal_Template
*/
public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if (isset($smarty->registered_objects[ $object_name ])) {
unset($smarty->registered_objects[ $object_name ]);
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_unregisterplugin.php b/lib/smarty3/sysplugins/smarty_internal_method_unregisterplugin.php
index 3fd8b14..f39e316 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_unregisterplugin.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_unregisterplugin.php
@@ -25,17 +25,17 @@ class Smarty_Internal_Method_UnregisterPlugin
* @link http://www.smarty.net/docs/en/api.unregister.plugin.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $type plugin type
- * @param string $name name of template tag
+ * @param string $type plugin type
+ * @param string $name name of template tag
*
* @return \Smarty|\Smarty_Internal_Template
*/
public function unregisterPlugin(Smarty_Internal_TemplateBase $obj, $type, $name)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if (isset($smarty->registered_plugins[ $type ][ $name ])) {
unset($smarty->registered_plugins[ $type ][ $name ]);
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_method_unregisterresource.php b/lib/smarty3/sysplugins/smarty_internal_method_unregisterresource.php
index f53d9bc..a79db42 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_unregisterresource.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_unregisterresource.php
@@ -25,16 +25,16 @@ class Smarty_Internal_Method_UnregisterResource
* @link http://www.smarty.net/docs/en/api.unregister.resource.tpl
*
* @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
- * @param string $type name of resource type
+ * @param string $type name of resource type
*
* @return \Smarty|\Smarty_Internal_Template
*/
public function unregisterResource(Smarty_Internal_TemplateBase $obj, $type)
{
- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
if (isset($smarty->registered_resources[ $type ])) {
unset($smarty->registered_resources[ $type ]);
}
return $obj;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_nocache_insert.php b/lib/smarty3/sysplugins/smarty_internal_nocache_insert.php
index 6762c28..88694dc 100644
--- a/lib/smarty3/sysplugins/smarty_internal_nocache_insert.php
+++ b/lib/smarty3/sysplugins/smarty_internal_nocache_insert.php
@@ -19,18 +19,18 @@ class Smarty_Internal_Nocache_Insert
/**
* Compiles code for the {insert} tag into cache file
*
- * @param string $_function insert function name
- * @param array $_attr array with parameter
- * @param Smarty_Internal_Template $_template template object
- * @param string $_script script name to load or 'null'
- * @param string $_assign optional variable name
+ * @param string $_function insert function name
+ * @param array $_attr array with parameter
+ * @param Smarty_Internal_Template $_template template object
+ * @param string $_script script name to load or 'null'
+ * @param string $_assign optional variable name
*
* @return string compiled code
*/
public static function compile($_function, $_attr, $_template, $_script, $_assign = null)
{
$_output = '<?php ';
- if ($_script != 'null') {
+ if ($_script !== 'null') {
// script which must be included
// code for script file loading
$_output .= "require_once '{$_script}';";
@@ -38,16 +38,14 @@ class Smarty_Internal_Nocache_Insert
// call insert
if (isset($_assign)) {
$_output .= "\$_smarty_tpl->assign('{$_assign}' , {$_function} (" . var_export($_attr, true) .
- ",\$_smarty_tpl), true);?>";
+ ',\$_smarty_tpl), true);?>';
} else {
- $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>";
+ $_output .= "echo {$_function}(" . var_export($_attr, true) . ',$_smarty_tpl);?>';
}
$_tpl = $_template;
- while (isset($_tpl->parent) && $_tpl->parent->_objType == 2) {
+ while ($_tpl->_isSubTpl()) {
$_tpl = $_tpl->parent;
}
-
- return "/*%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/" . $_output .
- "/*/%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/";
+ return "/*%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/{$_output}/*/%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/";
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_parsetree.php b/lib/smarty3/sysplugins/smarty_internal_parsetree.php
index 32c9df0..9f76785 100644
--- a/lib/smarty3/sysplugins/smarty_internal_parsetree.php
+++ b/lib/smarty3/sysplugins/smarty_internal_parsetree.php
@@ -1,7 +1,7 @@
<?php
/**
- * Smarty Internal Plugin Templateparser Parsetrees
- * These are classes to build parsetrees in the template parser
+ * Smarty Internal Plugin Templateparser Parsetree
+ * These are classes to build parsetree in the template parser
*
* @package Smarty
* @subpackage Compiler
@@ -16,7 +16,6 @@
*/
abstract class Smarty_Internal_ParseTree
{
-
/**
* Buffer content
*
@@ -48,7 +47,4 @@ abstract class Smarty_Internal_ParseTree
$this->data = null;
$this->subtrees = null;
}
-
}
-
-
diff --git a/lib/smarty3/sysplugins/smarty_internal_parsetree_code.php b/lib/smarty3/sysplugins/smarty_internal_parsetree_code.php
index d0f0b3f..7bd0bc4 100644
--- a/lib/smarty3/sysplugins/smarty_internal_parsetree_code.php
+++ b/lib/smarty3/sysplugins/smarty_internal_parsetree_code.php
@@ -37,6 +37,6 @@ class Smarty_Internal_ParseTree_Code extends Smarty_Internal_ParseTree
*/
public function to_smarty_php(Smarty_Internal_Templateparser $parser)
{
- return sprintf("(%s)", $this->data);
+ return sprintf('(%s)', $this->data);
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_parsetree_dq.php b/lib/smarty3/sysplugins/smarty_internal_parsetree_dq.php
index 8c2e0d9..8655f58 100644
--- a/lib/smarty3/sysplugins/smarty_internal_parsetree_dq.php
+++ b/lib/smarty3/sysplugins/smarty_internal_parsetree_dq.php
@@ -1,5 +1,4 @@
<?php
-
/**
* Double quoted string inside a tag.
*
@@ -40,17 +39,21 @@ class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
{
$last_subtree = count($this->subtrees) - 1;
- if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Smarty_Internal_ParseTree_Tag &&
- $this->subtrees[ $last_subtree ]->saved_block_nesting < $parser->block_nesting_level
+ if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Smarty_Internal_ParseTree_Tag
+ && $this->subtrees[ $last_subtree ]->saved_block_nesting < $parser->block_nesting_level
) {
if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
$this->subtrees[ $last_subtree ]->data =
- $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data,
- '<?php echo ' . $subtree->data . ';?>');
+ $parser->compiler->appendCode(
+ $this->subtrees[ $last_subtree ]->data,
+ '<?php echo ' . $subtree->data . ';?>'
+ );
} elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
$this->subtrees[ $last_subtree ]->data =
- $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data,
- '<?php echo "' . $subtree->data . '";?>');
+ $parser->compiler->appendCode(
+ $this->subtrees[ $last_subtree ]->data,
+ '<?php echo "' . $subtree->data . '";?>'
+ );
} else {
$this->subtrees[ $last_subtree ]->data =
$parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data, $subtree->data);
@@ -74,22 +77,19 @@ class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
{
$code = '';
foreach ($this->subtrees as $subtree) {
- if ($code !== "") {
- $code .= ".";
+ if ($code !== '') {
+ $code .= '.';
}
if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
$more_php = $subtree->assign_to_var($parser);
} else {
$more_php = $subtree->to_smarty_php($parser);
}
-
$code .= $more_php;
-
if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) {
$parser->compiler->has_variable_string = true;
}
}
-
return $code;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_parsetree_tag.php b/lib/smarty3/sysplugins/smarty_internal_parsetree_tag.php
index 9058aab..e6c7556 100644
--- a/lib/smarty3/sysplugins/smarty_internal_parsetree_tag.php
+++ b/lib/smarty3/sysplugins/smarty_internal_parsetree_tag.php
@@ -18,7 +18,6 @@
*/
class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
{
-
/**
* Saved block nesting level
*
@@ -62,8 +61,7 @@ class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
$var = $parser->compiler->getNewPrefixVariable();
$tmp = $parser->compiler->appendCode('<?php ob_start();?>', $this->data);
$tmp = $parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
- $parser->compiler->prefix_code[] = sprintf("%s", $tmp);
-
+ $parser->compiler->prefix_code[] = sprintf('%s', $tmp);
return $var;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_parsetree_template.php b/lib/smarty3/sysplugins/smarty_internal_parsetree_template.php
index f603235..8e716bd 100644
--- a/lib/smarty3/sysplugins/smarty_internal_parsetree_template.php
+++ b/lib/smarty3/sysplugins/smarty_internal_parsetree_template.php
@@ -18,17 +18,15 @@
*/
class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
{
-
/**
* Array of template elements
*
* @var array
*/
- public $subtrees = Array();
+ public $subtrees = array();
/**
* Create root of parse tree for template elements
- *
*/
public function __construct()
{
@@ -60,7 +58,7 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
public function append_array(Smarty_Internal_Templateparser $parser, $array = array())
{
if (!empty($array)) {
- $this->subtrees = array_merge($this->subtrees, (array) $array);
+ $this->subtrees = array_merge($this->subtrees, (array)$array);
}
}
@@ -73,7 +71,7 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
public function prepend_array(Smarty_Internal_Templateparser $parser, $array = array())
{
if (!empty($array)) {
- $this->subtrees = array_merge((array) $array, $this->subtrees);
+ $this->subtrees = array_merge((array)$array, $this->subtrees);
}
}
@@ -87,35 +85,38 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
public function to_smarty_php(Smarty_Internal_Templateparser $parser)
{
$code = '';
- for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key ++) {
+ for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
$subtree = $this->subtrees[ $key ]->to_smarty_php($parser);
while ($key + 1 < $cnt && ($this->subtrees[ $key + 1 ] instanceof Smarty_Internal_ParseTree_Text ||
- $this->subtrees[ $key + 1 ]->data == '')) {
- $key ++;
- if ($this->subtrees[ $key ]->data == '') {
+ $this->subtrees[ $key + 1 ]->data === '')) {
+ $key++;
+ if ($this->subtrees[ $key ]->data === '') {
continue;
}
$subtree .= $this->subtrees[ $key ]->to_smarty_php($parser);
}
- if ($subtree == '') {
+ if ($subtree === '') {
continue;
}
- $code .= preg_replace('/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/', "<?php echo '\$1'; ?>\n",
- $subtree);
+ $code .= preg_replace(
+ '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+ "<?php echo '\$1'; ?>\n",
+ $subtree
+ );
continue;
}
if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
$subtree = $this->subtrees[ $key ]->to_smarty_php($parser);
while ($key + 1 < $cnt && ($this->subtrees[ $key + 1 ] instanceof Smarty_Internal_ParseTree_Tag ||
- $this->subtrees[ $key + 1 ]->data == '')) {
- $key ++;
- if ($this->subtrees[ $key ]->data == '') {
+ $this->subtrees[ $key + 1 ]->data === '')) {
+ $key++;
+ if ($this->subtrees[ $key ]->data === '') {
continue;
}
$subtree = $parser->compiler->appendCode($subtree, $this->subtrees[ $key ]->to_smarty_php($parser));
}
- if ($subtree == '') {
+ if ($subtree === '') {
continue;
}
$code .= $subtree;
diff --git a/lib/smarty3/sysplugins/smarty_internal_resource_eval.php b/lib/smarty3/sysplugins/smarty_internal_resource_eval.php
index d3088bd..3b552a5 100644
--- a/lib/smarty3/sysplugins/smarty_internal_resource_eval.php
+++ b/lib/smarty3/sysplugins/smarty_internal_resource_eval.php
@@ -21,8 +21,8 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
/**
* populate Source Object with meta data from Resource
*
- * @param Smarty_Template_Source $source source object
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Template_Source $source source object
+ * @param Smarty_Internal_Template $_template template object
*
* @return void
*/
@@ -37,7 +37,7 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
*
* @uses decode() to decode base64 and urlencoded template_resources
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return string template source
*/
@@ -49,7 +49,7 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
/**
* decode base64 and urlencode
*
- * @param string $string template_resource to decode
+ * @param string $string template_resource to decode
*
* @return string decoded template_resource
*/
@@ -63,16 +63,15 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
return urldecode(substr($string, 10));
}
}
-
return $string;
}
/**
* modify resource_name according to resource handlers specifications
*
- * @param Smarty $smarty Smarty instance
- * @param string $resource_name resource_name to make unique
- * @param boolean $isConfig flag for config resource
+ * @param Smarty $smarty Smarty instance
+ * @param string $resource_name resource_name to make unique
+ * @param boolean $isConfig flag for config resource
*
* @return string unique resource name
*/
@@ -84,7 +83,7 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
/**
* Determine basename for compiled filename
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return string resource's basename
*/
diff --git a/lib/smarty3/sysplugins/smarty_internal_resource_extends.php b/lib/smarty3/sysplugins/smarty_internal_resource_extends.php
index 4a712e5..8094693 100644
--- a/lib/smarty3/sysplugins/smarty_internal_resource_extends.php
+++ b/lib/smarty3/sysplugins/smarty_internal_resource_extends.php
@@ -37,11 +37,12 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
$uid = '';
$sources = array();
$components = explode('|', $source->name);
+ $smarty = &$source->smarty;
$exists = true;
foreach ($components as $component) {
/* @var \Smarty_Template_Source $_s */
- $_s = Smarty_Template_Source::load(null, $source->smarty, $component);
- if ($_s->type == 'php') {
+ $_s = Smarty_Template_Source::load(null, $smarty, $component);
+ if ($_s->type === 'php') {
throw new SmartyException("Resource type {$_s->type} cannot be used with the extends resource type");
}
$sources[ $_s->uid ] = $_s;
@@ -85,11 +86,9 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
public function getContent(Smarty_Template_Source $source)
{
if (!$source->exists) {
- throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+ throw new SmartyException("Unable to load template '{$source->type}:{$source->name}'");
}
-
$_components = array_reverse($source->components);
-
$_content = '';
/* @var \Smarty_Template_Source $_s */
foreach ($_components as $_s) {
@@ -117,6 +116,9 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
*
* @return bool
*/
+ /**
+ * @return bool
+ */
public function checkTimestamps()
{
return false;
diff --git a/lib/smarty3/sysplugins/smarty_internal_resource_file.php b/lib/smarty3/sysplugins/smarty_internal_resource_file.php
index d763e44..ae20606 100644
--- a/lib/smarty3/sysplugins/smarty_internal_resource_file.php
+++ b/lib/smarty3/sysplugins/smarty_internal_resource_file.php
@@ -18,10 +18,82 @@
class Smarty_Internal_Resource_File extends Smarty_Resource
{
/**
+ * populate Source Object with meta data from Resource
+ *
+ * @param Smarty_Template_Source $source source object
+ * @param Smarty_Internal_Template $_template template object
+ *
+ * @throws \SmartyException
+ */
+ public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+ {
+ $source->filepath = $this->buildFilepath($source, $_template);
+ if ($source->filepath !== false) {
+ if (isset($source->smarty->security_policy) && is_object($source->smarty->security_policy)) {
+ $source->smarty->security_policy->isTrustedResourceDir($source->filepath, $source->isConfig);
+ }
+ $source->exists = true;
+ $source->uid = sha1(
+ $source->filepath . ($source->isConfig ? $source->smarty->_joined_config_dir :
+ $source->smarty->_joined_template_dir)
+ );
+ $source->timestamp = filemtime($source->filepath);
+ } else {
+ $source->timestamp = $source->exists = false;
+ }
+ }
+
+ /**
+ * populate Source Object with timestamp and exists from Resource
+ *
+ * @param Smarty_Template_Source $source source object
+ */
+ public function populateTimestamp(Smarty_Template_Source $source)
+ {
+ if (!$source->exists) {
+ $source->timestamp = $source->exists = is_file($source->filepath);
+ }
+ if ($source->exists) {
+ $source->timestamp = filemtime($source->filepath);
+ }
+ }
+
+ /**
+ * Load template's source from file into current template object
+ *
+ * @param Smarty_Template_Source $source source object
+ *
+ * @return string template source
+ * @throws SmartyException if source cannot be loaded
+ */
+ public function getContent(Smarty_Template_Source $source)
+ {
+ if ($source->exists) {
+ return file_get_contents($source->filepath);
+ }
+ throw new SmartyException(
+ 'Unable to read ' . ($source->isConfig ? 'config' : 'template') .
+ " {$source->type} '{$source->name}'"
+ );
+ }
+
+ /**
+ * Determine basename for compiled filename
+ *
+ * @param Smarty_Template_Source $source source object
+ *
+ * @return string resource's basename
+ */
+ public function getBasename(Smarty_Template_Source $source)
+ {
+ return basename($source->filepath);
+ }
+
+ /**
* build template filepath by traversing the template_dir array
*
- * @param Smarty_Template_Source $source source object
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Template_Source $source source object
+ * @param Smarty_Internal_Template $_template template object
*
* @return string fully qualified filepath
* @throws SmartyException
@@ -30,32 +102,32 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
{
$file = $source->name;
// absolute file ?
- if ($file[ 0 ] == '/' || $file[ 1 ] == ':') {
+ if ($file[ 0 ] === '/' || $file[ 1 ] === ':') {
$file = $source->smarty->_realpath($file, true);
return is_file($file) ? $file : false;
}
// go relative to a given template?
- if ($file[ 0 ] == '.' && $_template && isset($_template->parent) && $_template->parent->_objType == 2 &&
- preg_match('#^[.]{1,2}[\\\/]#', $file)
+ if ($file[ 0 ] === '.' && $_template && $_template->_isSubTpl()
+ && preg_match('#^[.]{1,2}[\\\/]#', $file)
) {
- if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' &&
- !isset($_template->parent->_cache[ 'allow_relative_path' ])
+ if ($_template->parent->source->type !== 'file' && $_template->parent->source->type !== 'extends'
+ && !isset($_template->parent->_cache[ 'allow_relative_path' ])
) {
throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
}
// normalize path
- $path = $source->smarty->_realpath(dirname($_template->parent->source->filepath) . DS . $file);
+ $path =
+ $source->smarty->_realpath(dirname($_template->parent->source->filepath) . DIRECTORY_SEPARATOR . $file);
// files relative to a template only get one shot
return is_file($path) ? $path : false;
}
- // normalize DS
- if (strpos($file, DS == '/' ? '\\' : '/') !== false) {
- $file = str_replace(DS == '/' ? '\\' : '/', DS, $file);
+ // normalize DIRECTORY_SEPARATOR
+ if (strpos($file, DIRECTORY_SEPARATOR === '/' ? '\\' : '/') !== false) {
+ $file = str_replace(DIRECTORY_SEPARATOR === '/' ? '\\' : '/', DIRECTORY_SEPARATOR, $file);
}
-
$_directories = $source->smarty->getTemplateDir(null, $source->isConfig);
// template_dir index?
- if ($file[ 0 ] == '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) {
+ if ($file[ 0 ] === '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) {
$file = $fileMatch[ 2 ];
$_indices = explode(',', $fileMatch[ 1 ]);
$_index_dirs = array();
@@ -66,7 +138,7 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
$_index_dirs[] = $_directories[ $index ];
} elseif (is_numeric($index)) {
// try numeric index
- $index = (int) $index;
+ $index = (int)$index;
if (isset($_directories[ $index ])) {
$_index_dirs[] = $_directories[ $index ];
} else {
@@ -85,12 +157,11 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
$_directories = $_index_dirs;
}
}
-
// relative file name?
foreach ($_directories as $_directory) {
$path = $_directory . $file;
if (is_file($path)) {
- return (strpos($path, '.' . DS) !== false) ? $source->smarty->_realpath($path) : $path;
+ return (strpos($path, '.' . DIRECTORY_SEPARATOR) !== false) ? $source->smarty->_realpath($path) : $path;
}
}
if (!isset($_index_dirs)) {
@@ -106,71 +177,4 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
}
return false;
}
-
- /**
- * populate Source Object with meta data from Resource
- *
- * @param Smarty_Template_Source $source source object
- * @param Smarty_Internal_Template $_template template object
- */
- public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
- {
- $source->filepath = $this->buildFilepath($source, $_template);
-
- if ($source->filepath !== false) {
- if (isset($source->smarty->security_policy) && is_object($source->smarty->security_policy)) {
- $source->smarty->security_policy->isTrustedResourceDir($source->filepath, $source->isConfig);
- }
- $source->exists = true;
- $source->uid = sha1($source->filepath . ($source->isConfig ? $source->smarty->_joined_config_dir :
- $source->smarty->_joined_template_dir));
- $source->timestamp = filemtime($source->filepath);
- } else {
- $source->timestamp = $source->exists = false;
- }
- }
-
- /**
- * populate Source Object with timestamp and exists from Resource
- *
- * @param Smarty_Template_Source $source source object
- */
- public function populateTimestamp(Smarty_Template_Source $source)
- {
- if (!$source->exists) {
- $source->timestamp = $source->exists = is_file($source->filepath);
- }
- if ($source->exists) {
- $source->timestamp = filemtime($source->filepath);
- }
- }
-
- /**
- * Load template's source from file into current template object
- *
- * @param Smarty_Template_Source $source source object
- *
- * @return string template source
- * @throws SmartyException if source cannot be loaded
- */
- public function getContent(Smarty_Template_Source $source)
- {
- if ($source->exists) {
- return file_get_contents($source->filepath);
- }
- throw new SmartyException('Unable to read ' . ($source->isConfig ? 'config' : 'template') .
- " {$source->type} '{$source->name}'");
- }
-
- /**
- * Determine basename for compiled filename
- *
- * @param Smarty_Template_Source $source source object
- *
- * @return string resource's basename
- */
- public function getBasename(Smarty_Template_Source $source)
- {
- return basename($source->filepath);
- }
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_resource_php.php b/lib/smarty3/sysplugins/smarty_internal_resource_php.php
index 3cff781..9d98ae1 100644
--- a/lib/smarty3/sysplugins/smarty_internal_resource_php.php
+++ b/lib/smarty3/sysplugins/smarty_internal_resource_php.php
@@ -19,31 +19,31 @@ class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File
public $uncompiled = true;
/**
- * container for short_open_tag directive's value before executing PHP templates
+ * Resource does implement populateCompiledFilepath() method
*
- * @var string
+ * @var bool
*/
- protected $short_open_tag;
+ public $hasCompiledHandler = true;
/**
- * Resource does implement populateCompiledFilepath() method
+ * container for short_open_tag directive's value before executing PHP templates
*
- * @var bool
+ * @var string
*/
- public $hasCompiledHandler = true;
+ protected $short_open_tag;
/**
* Create a new PHP Resource
*/
public function __construct()
{
- $this->short_open_tag = ini_get('short_open_tag');
+ $this->short_open_tag = function_exists('ini_get') ? ini_get('short_open_tag') : 1;
}
/**
* Load template's source from file into current template object
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return string template source
* @throws SmartyException if source cannot be loaded
@@ -57,10 +57,29 @@ class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File
}
/**
+ * populate compiled object with compiled filepath
+ *
+ * @param Smarty_Template_Compiled $compiled compiled object
+ * @param Smarty_Internal_Template $_template template object (is ignored)
+ */
+ public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+ {
+ $compiled->filepath = $_template->source->filepath;
+ $compiled->timestamp = $_template->source->timestamp;
+ $compiled->exists = $_template->source->exists;
+ $compiled->file_dependency[ $_template->source->uid ] =
+ array(
+ $compiled->filepath,
+ $compiled->timestamp,
+ $_template->source->type,
+ );
+ }
+
+ /**
* Render and output the template (without using the compiler)
*
- * @param Smarty_Template_Source $source source object
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Template_Source $source source object
+ * @param Smarty_Internal_Template $_template template object
*
* @return void
* @throws SmartyException if template cannot be loaded or allow_php_templates is disabled
@@ -68,40 +87,30 @@ class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File
public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
{
if (!$source->smarty->allow_php_templates) {
- throw new SmartyException("PHP templates are disabled");
+ throw new SmartyException('PHP templates are disabled');
}
if (!$source->exists) {
- $parentIsTpl = isset($this->parent) && $this->parent->_objType == 2;
- throw new SmartyException("Unable to load template {$source->type} '{$source->name}'" .
- ($parentIsTpl ? " in '{$this->parent->template_resource}'" : ''));
+ throw new SmartyException(
+ "Unable to load template '{$source->type}:{$source->name}'" .
+ ($_template->_isSubTpl() ? " in '{$_template->parent->template_resource}'" : '')
+ );
}
-
// prepare variables
extract($_template->getTemplateVars());
-
// include PHP template with short open tags enabled
- ini_set('short_open_tag', '1');
- /** @var Smarty_Internal_Template $_smarty_template
+ if (function_exists('ini_set')) {
+ ini_set('short_open_tag', '1');
+ }
+ /**
+ *
+ *
+ * @var Smarty_Internal_Template $_smarty_template
* used in included file
*/
$_smarty_template = $_template;
- include($source->filepath);
- ini_set('short_open_tag', $this->short_open_tag);
- }
-
- /**
- * populate compiled object with compiled filepath
- *
- * @param Smarty_Template_Compiled $compiled compiled object
- * @param Smarty_Internal_Template $_template template object (is ignored)
- */
- public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
- {
- $compiled->filepath = $_template->source->filepath;
- $compiled->timestamp = $_template->source->timestamp;
- $compiled->exists = $_template->source->exists;
- $compiled->file_dependency[ $_template->source->uid ] =
- array($compiled->filepath, $compiled->timestamp,
- $_template->source->type,);
+ include $source->filepath;
+ if (function_exists('ini_set')) {
+ ini_set('short_open_tag', $this->short_open_tag);
+ }
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_resource_registered.php b/lib/smarty3/sysplugins/smarty_internal_resource_registered.php
index 8535257..df52610 100644
--- a/lib/smarty3/sysplugins/smarty_internal_resource_registered.php
+++ b/lib/smarty3/sysplugins/smarty_internal_resource_registered.php
@@ -21,8 +21,8 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource
/**
* populate Source Object with meta data from Resource
*
- * @param Smarty_Template_Source $source source object
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Template_Source $source source object
+ * @param Smarty_Internal_Template $_template template object
*
* @return void
*/
@@ -37,7 +37,7 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource
/**
* populate Source Object with timestamp and exists from Resource
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return void
*/
@@ -50,7 +50,7 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource
/**
* Get timestamp (epoch) the template source was modified
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return integer|boolean timestamp (epoch) the template was modified, false if resources has no timestamp
*/
@@ -58,16 +58,17 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource
{
// return timestamp
$time_stamp = false;
- call_user_func_array($source->smarty->registered_resources[ $source->type ][ 0 ][ 1 ],
- array($source->name, &$time_stamp, $source->smarty));
-
- return is_numeric($time_stamp) ? (int) $time_stamp : $time_stamp;
+ call_user_func_array(
+ $source->smarty->registered_resources[ $source->type ][ 0 ][ 1 ],
+ array($source->name, &$time_stamp, $source->smarty)
+ );
+ return is_numeric($time_stamp) ? (int)$time_stamp : $time_stamp;
}
/**
* Load template's source by invoking the registered callback into current template object
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return string template source
* @throws SmartyException if source cannot be loaded
@@ -76,19 +77,20 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource
{
// return template string
$content = null;
- $t = call_user_func_array($source->smarty->registered_resources[ $source->type ][ 0 ][ 0 ],
- array($source->name, &$content, $source->smarty));
+ $t = call_user_func_array(
+ $source->smarty->registered_resources[ $source->type ][ 0 ][ 0 ],
+ array($source->name, &$content, $source->smarty)
+ );
if (is_bool($t) && !$t) {
throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
}
-
return $content;
}
/**
* Determine basename for compiled filename
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return string resource's basename
*/
diff --git a/lib/smarty3/sysplugins/smarty_internal_resource_stream.php b/lib/smarty3/sysplugins/smarty_internal_resource_stream.php
index b4248fb..9956bd0 100644
--- a/lib/smarty3/sysplugins/smarty_internal_resource_stream.php
+++ b/lib/smarty3/sysplugins/smarty_internal_resource_stream.php
@@ -45,7 +45,6 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
* @param Smarty_Template_Source $source source object
*
* @return string template source
- * @throws SmartyException if source cannot be loaded
*/
public function getContent(Smarty_Template_Source $source)
{
@@ -57,7 +56,6 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
$t .= $current_line;
}
fclose($fp);
-
return $t;
} else {
return false;
@@ -67,9 +65,9 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
/**
* modify resource_name according to resource handlers specifications
*
- * @param Smarty $smarty Smarty instance
- * @param string $resource_name resource_name to make unique
- * @param boolean $isConfig flag for config resource
+ * @param Smarty $smarty Smarty instance
+ * @param string $resource_name resource_name to make unique
+ * @param boolean $isConfig flag for config resource
*
* @return string unique resource name
*/
diff --git a/lib/smarty3/sysplugins/smarty_internal_resource_string.php b/lib/smarty3/sysplugins/smarty_internal_resource_string.php
index f2610d9..3fecbb7 100644
--- a/lib/smarty3/sysplugins/smarty_internal_resource_string.php
+++ b/lib/smarty3/sysplugins/smarty_internal_resource_string.php
@@ -21,8 +21,8 @@ class Smarty_Internal_Resource_String extends Smarty_Resource
/**
* populate Source Object with meta data from Resource
*
- * @param Smarty_Template_Source $source source object
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Template_Source $source source object
+ * @param Smarty_Internal_Template $_template template object
*
* @return void
*/
@@ -37,7 +37,7 @@ class Smarty_Internal_Resource_String extends Smarty_Resource
*
* @uses decode() to decode base64 and urlencoded template_resources
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return string template source
*/
@@ -49,7 +49,7 @@ class Smarty_Internal_Resource_String extends Smarty_Resource
/**
* decode base64 and urlencode
*
- * @param string $string template_resource to decode
+ * @param string $string template_resource to decode
*
* @return string decoded template_resource
*/
@@ -63,16 +63,15 @@ class Smarty_Internal_Resource_String extends Smarty_Resource
return urldecode(substr($string, 10));
}
}
-
return $string;
}
/**
* modify resource_name according to resource handlers specifications
*
- * @param Smarty $smarty Smarty instance
- * @param string $resource_name resource_name to make unique
- * @param boolean $isConfig flag for config resource
+ * @param Smarty $smarty Smarty instance
+ * @param string $resource_name resource_name to make unique
+ * @param boolean $isConfig flag for config resource
*
* @return string unique resource name
*/
@@ -85,7 +84,7 @@ class Smarty_Internal_Resource_String extends Smarty_Resource
* Determine basename for compiled filename
* Always returns an empty string.
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return string resource's basename
*/
@@ -99,9 +98,11 @@ class Smarty_Internal_Resource_String extends Smarty_Resource
*
* @return bool
*/
+ /**
+ * @return bool
+ */
public function checkTimestamps()
{
return false;
}
}
-
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_cachemodify.php b/lib/smarty3/sysplugins/smarty_internal_runtime_cachemodify.php
index a91874a..6e12d2a 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_cachemodify.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_cachemodify.php
@@ -6,7 +6,6 @@
* @package Smarty
* @subpackage PluginsInternal
* @author Uwe Tews
- *
**/
class Smarty_Internal_Runtime_CacheModify
{
@@ -15,7 +14,10 @@ class Smarty_Internal_Runtime_CacheModify
*
* @param \Smarty_Template_Cached $cached
* @param \Smarty_Internal_Template $_template
- * @param string $content
+ * @param string $content
+ *
+ * @throws \Exception
+ * @throws \SmartyException
*/
public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
{
@@ -29,17 +31,15 @@ class Smarty_Internal_Runtime_CacheModify
case 'fpm-fcgi': // php-fpm >= 5.3.3
header('Status: 304 Not Modified');
break;
-
case 'cli':
- if ( /* ^phpunit */
+ if (/* ^phpunit */
!empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
) {
$_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] = '304 Not Modified';
}
break;
-
default:
- if ( /* ^phpunit */
+ if (/* ^phpunit */
!empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
) {
$_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] = '304 Not Modified';
@@ -51,7 +51,7 @@ class Smarty_Internal_Runtime_CacheModify
} else {
switch (PHP_SAPI) {
case 'cli':
- if ( /* ^phpunit */
+ if (/* ^phpunit */
!empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
) {
$_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] =
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_cacheresourcefile.php b/lib/smarty3/sysplugins/smarty_internal_runtime_cacheresourcefile.php
new file mode 100644
index 0000000..2870964
--- /dev/null
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_cacheresourcefile.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Smarty cache resource file clear method
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Runtime Cache Resource File Class
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_CacheResourceFile
+{
+ /**
+ * Empty cache for a specific template
+ *
+ * @param Smarty $smarty
+ * @param string $resource_name template name
+ * @param string $cache_id cache id
+ * @param string $compile_id compile id
+ * @param integer $exp_time expiration time (number of seconds, not timestamp)
+ *
+ * @return integer number of cache files deleted
+ */
+ public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+ {
+ $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+ $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+ $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
+ $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
+ $_dir = $smarty->getCacheDir();
+ if ($_dir === '/') { //We should never want to delete this!
+ return 0;
+ }
+ $_dir_length = strlen($_dir);
+ if (isset($_cache_id)) {
+ $_cache_id_parts = explode('|', $_cache_id);
+ $_cache_id_parts_count = count($_cache_id_parts);
+ if ($smarty->use_sub_dirs) {
+ foreach ($_cache_id_parts as $id_part) {
+ $_dir .= $id_part . '/';
+ }
+ }
+ }
+ if (isset($resource_name)) {
+ $_save_stat = $smarty->caching;
+ $smarty->caching = Smarty::CACHING_LIFETIME_CURRENT;
+ $tpl = new $smarty->template_class($resource_name, $smarty);
+ $smarty->caching = $_save_stat;
+ // remove from template cache
+ $tpl->source; // have the template registered before unset()
+ if ($tpl->source->exists) {
+ $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
+ } else {
+ return 0;
+ }
+ }
+ $_count = 0;
+ $_time = time();
+ if (file_exists($_dir)) {
+ $_cacheDirs = new RecursiveDirectoryIterator($_dir);
+ $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
+ foreach ($_cache as $_file) {
+ if (substr(basename($_file->getPathname()), 0, 1) === '.') {
+ continue;
+ }
+ $_filepath = (string)$_file;
+ // directory ?
+ if ($_file->isDir()) {
+ if (!$_cache->isDot()) {
+ // delete folder if empty
+ @rmdir($_file->getPathname());
+ }
+ } else {
+ // delete only php files
+ if (substr($_filepath, -4) !== '.php') {
+ continue;
+ }
+ $_parts = explode($_dir_sep, str_replace('\\', '/', substr($_filepath, $_dir_length)));
+ $_parts_count = count($_parts);
+ // check name
+ if (isset($resource_name)) {
+ if ($_parts[ $_parts_count - 1 ] !== $_resourcename_parts) {
+ continue;
+ }
+ }
+ // check compile id
+ if (isset($_compile_id) && (!isset($_parts[ $_parts_count - 2 - $_compile_id_offset ])
+ || $_parts[ $_parts_count - 2 - $_compile_id_offset ] !== $_compile_id)
+ ) {
+ continue;
+ }
+ // check cache id
+ if (isset($_cache_id)) {
+ // count of cache id parts
+ $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset :
+ $_parts_count - 1 - $_compile_id_offset;
+ if ($_parts_count < $_cache_id_parts_count) {
+ continue;
+ }
+ for ($i = 0; $i < $_cache_id_parts_count; $i++) {
+ if ($_parts[ $i ] !== $_cache_id_parts[ $i ]) {
+ continue 2;
+ }
+ }
+ }
+ if (is_file($_filepath)) {
+ // expired ?
+ if (isset($exp_time)) {
+ if ($exp_time < 0) {
+ preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_filepath), $match);
+ if ($_time < (filemtime($_filepath) + $match[ 1 ])) {
+ continue;
+ }
+ } else {
+ if ($_time - filemtime($_filepath) < $exp_time) {
+ continue;
+ }
+ }
+ }
+ $_count += @unlink($_filepath) ? 1 : 0;
+ if (function_exists('opcache_invalidate')
+ && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+ ) {
+ opcache_invalidate($_filepath, true);
+ } elseif (function_exists('apc_delete_file')) {
+ apc_delete_file($_filepath);
+ }
+ }
+ }
+ }
+ }
+ return $_count;
+ }
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_capture.php b/lib/smarty3/sysplugins/smarty_internal_runtime_capture.php
index 69f1ce0..c9dca83 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_capture.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_capture.php
@@ -64,8 +64,12 @@ class Smarty_Internal_Runtime_Capture
if (!$this->isRegistered) {
$this->register($_template);
}
- $this->captureStack[] = array($buffer, $assign, $append);
- $this->captureCount ++;
+ $this->captureStack[] = array(
+ $buffer,
+ $assign,
+ $append
+ );
+ $this->captureCount++;
ob_start();
}
@@ -76,8 +80,14 @@ class Smarty_Internal_Runtime_Capture
*/
private function register(Smarty_Internal_Template $_template)
{
- $_template->startRenderCallbacks[] = array($this, 'startRender');
- $_template->endRenderCallbacks[] = array($this, 'endRender');
+ $_template->startRenderCallbacks[] = array(
+ $this,
+ 'startRender'
+ );
+ $_template->endRenderCallbacks[] = array(
+ $this,
+ 'endRender'
+ );
$this->startRender($_template);
$this->isRegistered = true;
}
@@ -104,7 +114,7 @@ class Smarty_Internal_Runtime_Capture
{
if ($this->captureCount) {
list($buffer, $assign, $append) = array_pop($this->captureStack);
- $this->captureCount --;
+ $this->captureCount--;
if (isset($assign)) {
$_template->assign($assign, ob_get_contents());
}
@@ -126,20 +136,24 @@ class Smarty_Internal_Runtime_Capture
*/
public function error(Smarty_Internal_Template $_template)
{
- throw new SmartyException("Not matching {capture}{/capture} in \"{$_template->template_resource}\"");
+ throw new SmartyException("Not matching {capture}{/capture} in '{$_template->template_resource}'");
}
/**
- * Return content of named capture buffer
+ * Return content of named capture buffer by key or as array
*
* @param \Smarty_Internal_Template $_template
- * @param $name
+ * @param string|null $name
*
- * @return null
+ * @return string|string[]|null
*/
- public function getBuffer(Smarty_Internal_Template $_template, $name)
+ public function getBuffer(Smarty_Internal_Template $_template, $name = null)
{
- return isset($this->namedBuffer[ $name ]) ? $this->namedBuffer[ $name ] : null;
+ if (isset($name)) {
+ return isset($this->namedBuffer[ $name ]) ? $this->namedBuffer[ $name ] : null;
+ } else {
+ return $this->namedBuffer;
+ }
}
/**
@@ -157,5 +171,4 @@ class Smarty_Internal_Runtime_Capture
$this->captureCount = array_pop($this->countStack);
}
}
-
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_codeframe.php b/lib/smarty3/sysplugins/smarty_internal_runtime_codeframe.php
index 66faf67..983ca61 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_codeframe.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_codeframe.php
@@ -25,9 +25,13 @@ class Smarty_Internal_Runtime_CodeFrame
*
* @return string
*/
- public function create(Smarty_Internal_Template $_template, $content = '', $functions = '', $cache = false,
- Smarty_Internal_TemplateCompilerBase $compiler = null)
- {
+ public function create(
+ Smarty_Internal_Template $_template,
+ $content = '',
+ $functions = '',
+ $cache = false,
+ Smarty_Internal_TemplateCompilerBase $compiler = null
+ ) {
// build property code
$properties[ 'version' ] = Smarty::SMARTY_VERSION;
$properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
@@ -35,64 +39,62 @@ class Smarty_Internal_Runtime_CodeFrame
$properties[ 'has_nocache_code' ] = $_template->compiled->has_nocache_code;
$properties[ 'file_dependency' ] = $_template->compiled->file_dependency;
$properties[ 'includes' ] = $_template->compiled->includes;
- } else {
+ } else {
$properties[ 'has_nocache_code' ] = $_template->cached->has_nocache_code;
$properties[ 'file_dependency' ] = $_template->cached->file_dependency;
$properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
}
$output = "<?php\n";
- $output .= "/* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
- "\n from \"" . $_template->source->filepath . "\" */\n\n";
+ $output .= "/* Smarty version {$properties[ 'version' ]}, created on " . strftime("%Y-%m-%d %H:%M:%S") .
+ "\n from '" . str_replace('*/', '* /', $_template->source->filepath) . "' */\n\n";
$output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
$dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
- ($cache ? 'true' : 'false') . ")";
+ ($cache ? 'true' : 'false') . ')';
$output .= "if ({$dec}) {\n";
$output .= "function {$properties['unifunc']} (Smarty_Internal_Template \$_smarty_tpl) {\n";
if (!$cache && !empty($compiler->tpl_function)) {
- $output .= "\$_smarty_tpl->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " .
- var_export($compiler->tpl_function, true) . ");\n";
+ $output .= '$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions($_smarty_tpl, ';
+ $output .= var_export($compiler->tpl_function, true);
+ $output .= ");\n";
}
- if ($cache && isset($_template->ext->_tplFunction)) {
- $output .= "\$_smarty_tpl->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " .
- var_export($_template->ext->_tplFunction->getTplFunction(), true) . ");\n";
-
- }
- // include code for plugins
- if (!$cache) {
- if (!empty($_template->compiled->required_plugins[ 'compiled' ])) {
- foreach ($_template->compiled->required_plugins[ 'compiled' ] as $tmp) {
- foreach ($tmp as $data) {
- $file = addslashes($data[ 'file' ]);
- if (is_array($data[ 'function' ])) {
- $output .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n";
- } else {
- $output .= "if (!is_callable('{$data['function']}')) require_once '{$file}';\n";
- }
- }
- }
- }
- if ($_template->caching && !empty($_template->compiled->required_plugins[ 'nocache' ])) {
- $_template->compiled->has_nocache_code = true;
- $output .= "echo '/*%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
- foreach ($_template->compiled->required_plugins[ 'nocache' ] as $tmp) {
- foreach ($tmp as $data) {
- $file = addslashes($data[ 'file' ]);
- if (is_array($data[ 'function' ])) {
- $output .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n");
- } else {
- $output .= addslashes("if (!is_callable('{$data['function']}')) require_once '{$file}';\n");
- }
- }
- }
- $output .= "?>/*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/';\n";
- }
+ if ($cache && isset($_template->smarty->ext->_tplFunction)) {
+ $output .= "\$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " .
+ var_export($_template->smarty->ext->_tplFunction->getTplFunction($_template), true) . ");\n";
}
- $output .= "?>\n";
+ $output .= "?>";
$output .= $content;
$output .= "<?php }\n?>";
$output .= $functions;
$output .= "<?php }\n";
// remove unneeded PHP tags
- return preg_replace(array('/\s*\?>[\n]?<\?php\s*/', '/\?>\s*$/'), array("\n", ''), $output);
+ if (preg_match('/\s*\?>[\n]?<\?php\s*/', $output)) {
+ $curr_split = preg_split(
+ '/\s*\?>[\n]?<\?php\s*/',
+ $output
+ );
+ preg_match_all(
+ '/\s*\?>[\n]?<\?php\s*/',
+ $output,
+ $curr_parts
+ );
+ $output = '';
+ foreach ($curr_split as $idx => $curr_output) {
+ $output .= $curr_output;
+ if (isset($curr_parts[ 0 ][ $idx ])) {
+ $output .= "\n";
+ }
+ }
+ }
+ if (preg_match('/\?>\s*$/', $output)) {
+ $curr_split = preg_split(
+ '/\?>\s*$/',
+ $output
+ );
+ $output = '';
+ foreach ($curr_split as $idx => $curr_output) {
+ $output .= $curr_output;
+ }
+ }
+ return $output;
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_filterhandler.php b/lib/smarty3/sysplugins/smarty_internal_runtime_filterhandler.php
index f6cfa7c..9f868e1 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_filterhandler.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_filterhandler.php
@@ -23,9 +23,9 @@ class Smarty_Internal_Runtime_FilterHandler
* plugin filename format: filtertype.filtername.php
* Smarty2 filter plugins could be used
*
- * @param string $type the type of filter ('pre','post','output') which shall run
- * @param string $content the content which shall be processed by the filters
- * @param Smarty_Internal_Template $template template object
+ * @param string $type the type of filter ('pre','post','output') which shall run
+ * @param string $content the content which shall be processed by the filters
+ * @param Smarty_Internal_Template $template template object
*
* @throws SmartyException
* @return string the filtered content
@@ -34,7 +34,7 @@ class Smarty_Internal_Runtime_FilterHandler
{
// loop over autoload filters of specified type
if (!empty($template->smarty->autoload_filters[ $type ])) {
- foreach ((array) $template->smarty->autoload_filters[ $type ] as $name) {
+ foreach ((array)$template->smarty->autoload_filters[ $type ] as $name) {
$plugin_name = "Smarty_{$type}filter_{$name}";
if (function_exists($plugin_name)) {
$callback = $plugin_name;
@@ -48,11 +48,11 @@ class Smarty_Internal_Runtime_FilterHandler
// loaded class of filter plugin
$callback = array($plugin_name, 'execute');
} else {
- throw new SmartyException("Auto load {$type}-filter plugin method \"{$plugin_name}::execute\" not callable");
+ throw new SmartyException("Auto load {$type}-filter plugin method '{$plugin_name}::execute' not callable");
}
} else {
// nothing found, throw exception
- throw new SmartyException("Unable to auto load {$type}-filter plugin \"{$plugin_name}\"");
+ throw new SmartyException("Unable to auto load {$type}-filter plugin '{$plugin_name}'");
}
$content = call_user_func($callback, $content, $template);
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_foreach.php b/lib/smarty3/sysplugins/smarty_internal_runtime_foreach.php
index bdefe69..badead1 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_foreach.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_foreach.php
@@ -6,11 +6,9 @@
* @package Smarty
* @subpackage PluginsInternal
* @author Uwe Tews
- *
*/
class Smarty_Internal_Runtime_Foreach
{
-
/**
* Stack of saved variables
*
@@ -34,39 +32,60 @@ class Smarty_Internal_Runtime_Foreach
*
* @return mixed $from
*/
- public function init(Smarty_Internal_Template $tpl, $from, $item, $needTotal = false, $key = null, $name = null,
- $properties = array())
- {
+ public function init(
+ Smarty_Internal_Template $tpl,
+ $from,
+ $item,
+ $needTotal = false,
+ $key = null,
+ $name = null,
+ $properties = array()
+ ) {
+ $needTotal = $needTotal || isset($properties[ 'total' ]);
$saveVars = array();
- if (!is_array($from) && !is_object($from)) {
- settype($from, 'array');
+ $total = null;
+ if (!is_array($from)) {
+ if (is_object($from)) {
+ if ($needTotal) {
+ $total = $this->count($from);
+ }
+ } else {
+ settype($from, 'array');
+ }
+ }
+ if (!isset($total)) {
+ $total = empty($from) ? 0 : ($needTotal ? count($from) : 1);
}
- $total = ($needTotal || isset($properties[ 'total' ])) ? $this->count($from) : 1;
if (isset($tpl->tpl_vars[ $item ])) {
- $saveVars[ $item ] = $tpl->tpl_vars[ $item ];
+ $saveVars[ 'item' ] = array(
+ $item,
+ $tpl->tpl_vars[ $item ]
+ );
}
$tpl->tpl_vars[ $item ] = new Smarty_Variable(null, $tpl->isRenderingCache);
- if (empty($from)) {
+ if ($total === 0) {
$from = null;
- $total = 0;
- if ($needTotal) {
- $tpl->tpl_vars[ $item ]->total = 0;
- }
} else {
if ($key) {
if (isset($tpl->tpl_vars[ $key ])) {
- $saveVars[ $key ] = $tpl->tpl_vars[ $key ];
+ $saveVars[ 'key' ] = array(
+ $key,
+ $tpl->tpl_vars[ $key ]
+ );
}
$tpl->tpl_vars[ $key ] = new Smarty_Variable(null, $tpl->isRenderingCache);
}
- if ($needTotal) {
- $tpl->tpl_vars[ $item ]->total = $total;
- }
+ }
+ if ($needTotal) {
+ $tpl->tpl_vars[ $item ]->total = $total;
}
if ($name) {
$namedVar = "__smarty_foreach_{$name}";
if (isset($tpl->tpl_vars[ $namedVar ])) {
- $saveVars[ $namedVar ] = $tpl->tpl_vars[ $namedVar ];
+ $saveVars[ 'named' ] = array(
+ $namedVar,
+ $tpl->tpl_vars[ $namedVar ]
+ );
}
$namedProp = array();
if (isset($properties[ 'total' ])) {
@@ -76,7 +95,7 @@ class Smarty_Internal_Runtime_Foreach
$namedProp[ 'iteration' ] = 0;
}
if (isset($properties[ 'index' ])) {
- $namedProp[ 'index' ] = - 1;
+ $namedProp[ 'index' ] = -1;
}
if (isset($properties[ 'show' ])) {
$namedProp[ 'show' ] = ($total > 0);
@@ -88,50 +107,56 @@ class Smarty_Internal_Runtime_Foreach
}
/**
- * Restore saved variables
- *
- * @param \Smarty_Internal_Template $tpl
- */
- public function restore(Smarty_Internal_Template $tpl)
- {
- foreach (array_pop($this->stack) as $k => $v) {
- $tpl->tpl_vars[ $k ] = $v;
- }
- }
-
- /*
- *
* [util function] counts an array, arrayAccess/traversable or PDOStatement object
*
- * @param mixed $value
+ * @param mixed $value
*
* @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
* for empty elements
*/
public function count($value)
{
- if (is_array($value) === true || $value instanceof Countable) {
- return count($value);
- } elseif ($value instanceof IteratorAggregate) {
+ if ($value instanceof IteratorAggregate) {
// Note: getIterator() returns a Traversable, not an Iterator
// thus rewind() and valid() methods may not be present
return iterator_count($value->getIterator());
} elseif ($value instanceof Iterator) {
- if ($value instanceof Generator) {
- return 1;
- }
- return iterator_count($value);
+ return $value instanceof Generator ? 1 : iterator_count($value);
+ } elseif ($value instanceof Countable) {
+ return count($value);
} elseif ($value instanceof PDOStatement) {
return $value->rowCount();
} elseif ($value instanceof Traversable) {
return iterator_count($value);
- } elseif ($value instanceof ArrayAccess) {
- if ($value->offsetExists(0)) {
- return 1;
+ }
+ return count((array)$value);
+ }
+
+ /**
+ * Restore saved variables
+ *
+ * will be called by {break n} or {continue n} for the required number of levels
+ *
+ * @param \Smarty_Internal_Template $tpl
+ * @param int $levels number of levels
+ */
+ public function restore(Smarty_Internal_Template $tpl, $levels = 1)
+ {
+ while ($levels) {
+ $saveVars = array_pop($this->stack);
+ if (!empty($saveVars)) {
+ if (isset($saveVars[ 'item' ])) {
+ $item = &$saveVars[ 'item' ];
+ $tpl->tpl_vars[ $item[ 0 ] ]->value = $item[ 1 ]->value;
+ }
+ if (isset($saveVars[ 'key' ])) {
+ $tpl->tpl_vars[ $saveVars[ 'key' ][ 0 ] ] = $saveVars[ 'key' ][ 1 ];
+ }
+ if (isset($saveVars[ 'named' ])) {
+ $tpl->tpl_vars[ $saveVars[ 'named' ][ 0 ] ] = $saveVars[ 'named' ][ 1 ];
+ }
}
- } elseif (is_object($value)) {
- return count($value);
+ $levels--;
}
- return 0;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_getincludepath.php b/lib/smarty3/sysplugins/smarty_internal_runtime_getincludepath.php
index 9eae182..5ae9830 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_getincludepath.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_getincludepath.php
@@ -39,7 +39,7 @@ class Smarty_Internal_Runtime_GetIncludePath
/**
* stream cache
*
- * @var string[]
+ * @var string[][]
*/
public $isFile = array();
@@ -81,13 +81,13 @@ class Smarty_Internal_Runtime_GetIncludePath
public function isNewIncludePath(Smarty $smarty)
{
$_i_path = get_include_path();
- if ($this->_include_path != $_i_path) {
+ if ($this->_include_path !== $_i_path) {
$this->_include_dirs = array();
$this->_include_path = $_i_path;
- $_dirs = (array) explode(PATH_SEPARATOR, $_i_path);
+ $_dirs = (array)explode(PATH_SEPARATOR, $_i_path);
foreach ($_dirs as $_path) {
if (is_dir($_path)) {
- $this->_include_dirs[] = $smarty->_realpath($_path . DS, true);
+ $this->_include_dirs[] = $smarty->_realpath($_path . DIRECTORY_SEPARATOR, true);
}
}
return true;
@@ -111,12 +111,11 @@ class Smarty_Internal_Runtime_GetIncludePath
/**
* Return full file path from PHP include_path
*
- * @param string[] $dirs
- * @param string $file
- * @param \Smarty $smarty
+ * @param string[] $dirs
+ * @param string $file
+ * @param \Smarty $smarty
*
* @return bool|string full filepath or false
- *
*/
public function getIncludePath($dirs, $file, Smarty $smarty)
{
@@ -128,7 +127,7 @@ class Smarty_Internal_Runtime_GetIncludePath
}
// try PHP include_path
foreach ($dirs as $dir) {
- $dir_n = isset($this->number[ $dir ]) ? $this->number[ $dir ] : $this->number[ $dir ] = $this->counter ++;
+ $dir_n = isset($this->number[ $dir ]) ? $this->number[ $dir ] : $this->number[ $dir ] = $this->counter++;
if (isset($this->isFile[ $dir_n ][ $file ])) {
if ($this->isFile[ $dir_n ][ $file ]) {
return $this->isFile[ $dir_n ][ $file ];
@@ -143,9 +142,9 @@ class Smarty_Internal_Runtime_GetIncludePath
$dir = $this->_user_dirs[ $dir_n ];
}
} else {
- if ($dir[ 0 ] == '/' || $dir[ 1 ] == ':') {
+ if ($dir[ 0 ] === '/' || $dir[ 1 ] === ':') {
$dir = str_ireplace(getcwd(), '.', $dir);
- if ($dir[ 0 ] == '/' || $dir[ 1 ] == ':') {
+ if ($dir[ 0 ] === '/' || $dir[ 1 ] === ':') {
$this->_user_dirs[ $dir_n ] = false;
continue;
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_inheritance.php b/lib/smarty3/sysplugins/smarty_internal_runtime_inheritance.php
index 36e8ab3..6392d4c 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_inheritance.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_inheritance.php
@@ -6,11 +6,9 @@
* @package Smarty
* @subpackage PluginsInternal
* @author Uwe Tews
- *
**/
class Smarty_Internal_Runtime_Inheritance
{
-
/**
* State machine
* - 0 idle next extends will create a new inheritance tree
@@ -42,11 +40,10 @@ class Smarty_Internal_Runtime_Inheritance
*
* @var int
*/
- public $tplIndex = - 1;
+ public $tplIndex = -1;
/**
* Array of template source objects
- * - key template index
*
* @var Smarty_Template_Source[]
*/
@@ -65,19 +62,17 @@ class Smarty_Internal_Runtime_Inheritance
* @param \Smarty_Internal_Template $tpl template object of caller
* @param bool $initChild if true init for child template
* @param array $blockNames outer level block name
- *
*/
public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array())
{
// if called while executing parent template it must be a sub-template with new inheritance root
- if ($initChild && $this->state == 3 && (strpos($tpl->template_resource, 'extendsall') === false)) {
+ if ($initChild && $this->state === 3 && (strpos($tpl->template_resource, 'extendsall') === false)) {
$tpl->inheritance = new Smarty_Internal_Runtime_Inheritance();
$tpl->inheritance->init($tpl, $initChild, $blockNames);
return;
}
- $this->tplIndex ++;
+ ++$this->tplIndex;
$this->sources[ $this->tplIndex ] = $tpl->source;
-
// start of child sub template(s)
if ($initChild) {
$this->state = 1;
@@ -85,12 +80,12 @@ class Smarty_Internal_Runtime_Inheritance
//grab any output of child templates
ob_start();
}
- $this->inheritanceLevel ++;
+ ++$this->inheritanceLevel;
// $tpl->startRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateStart');
// $tpl->endRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateEnd');
}
// if state was waiting for parent change state to parent
- if ($this->state == 2) {
+ if ($this->state === 2) {
$this->state = 3;
}
}
@@ -99,33 +94,58 @@ class Smarty_Internal_Runtime_Inheritance
* End of child template(s)
* - if outer level is reached flush output buffer and switch to wait for parent template state
*
+ * @param \Smarty_Internal_Template $tpl
+ * @param null|string $template optional name of inheritance parent template
+ * @param null|string $uid uid of inline template
+ * @param null|string $func function call name of inline template
+ *
+ * @throws \Exception
+ * @throws \SmartyException
*/
- public function endChild()
+ public function endChild(Smarty_Internal_Template $tpl, $template = null, $uid = null, $func = null)
{
- $this->inheritanceLevel --;
+ --$this->inheritanceLevel;
if (!$this->inheritanceLevel) {
ob_end_clean();
$this->state = 2;
}
+ if (isset($template) && (($tpl->parent->_isTplObj() && $tpl->parent->source->type !== 'extends')
+ || $tpl->smarty->extends_recursion)
+ ) {
+ $tpl->_subTemplateRender(
+ $template,
+ $tpl->cache_id,
+ $tpl->compile_id,
+ $tpl->caching ? 9999 : 0,
+ $tpl->cache_lifetime,
+ array(),
+ 2,
+ false,
+ $uid,
+ $func
+ );
+ }
}
/**
* Smarty_Internal_Block constructor.
- * - if outer level {block} of child template ($state == 1) save it as child root block
+ * - if outer level {block} of child template ($state === 1) save it as child root block
* - otherwise process inheritance and render
*
* @param \Smarty_Internal_Template $tpl
* @param $className
* @param string $name
* @param int|null $tplIndex index of outer level {block} if nested
+ *
+ * @throws \SmartyException
*/
public function instanceBlock(Smarty_Internal_Template $tpl, $className, $name, $tplIndex = null)
{
- $block = new $className($name, $tplIndex ? $tplIndex : $this->tplIndex);
+ $block = new $className($name, isset($tplIndex) ? $tplIndex : $this->tplIndex);
if (isset($this->childRoot[ $name ])) {
$block->child = $this->childRoot[ $name ];
}
- if ($this->state == 1) {
+ if ($this->state === 1) {
$this->childRoot[ $name ] = $block;
return;
}
@@ -145,9 +165,11 @@ class Smarty_Internal_Runtime_Inheritance
*
* @throws \SmartyException
*/
- public function process(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block,
- Smarty_Internal_Block $parent = null)
- {
+ public function process(
+ Smarty_Internal_Template $tpl,
+ Smarty_Internal_Block $block,
+ Smarty_Internal_Block $parent = null
+ ) {
if ($block->hide && !isset($block->child)) {
return;
}
@@ -156,7 +178,7 @@ class Smarty_Internal_Runtime_Inheritance
}
$block->parent = $parent;
if ($block->append && !$block->prepend && isset($parent)) {
- $this->callParent($tpl, $block);
+ $this->callParent($tpl, $block, '\'{block append}\'');
}
if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) {
$this->callBlock($block, $tpl);
@@ -164,10 +186,10 @@ class Smarty_Internal_Runtime_Inheritance
$this->process($tpl, $block->child, $block);
}
if ($block->prepend && isset($parent)) {
- $this->callParent($tpl, $block);
+ $this->callParent($tpl, $block, '{block prepend}');
if ($block->append) {
- if ($block->callsChild || !isset($block->child) ||
- ($block->child->hide && !isset($block->child->child))
+ if ($block->callsChild || !isset($block->child)
+ || ($block->child->hide && !isset($block->child->child))
) {
$this->callBlock($block, $tpl);
} else {
@@ -179,10 +201,13 @@ class Smarty_Internal_Runtime_Inheritance
}
/**
- * Render child on {$smarty.block.child}
+ * Render child on \$smarty.block.child
*
* @param \Smarty_Internal_Template $tpl
* @param \Smarty_Internal_Block $block
+ *
+ * @return null|string block content
+ * @throws \SmartyException
*/
public function callChild(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block)
{
@@ -192,23 +217,27 @@ class Smarty_Internal_Runtime_Inheritance
}
/**
- * Render parent on {$smarty.block.parent} or {block append/prepend} *
+ * Render parent block on \$smarty.block.parent or {block append/prepend}
*
* @param \Smarty_Internal_Template $tpl
* @param \Smarty_Internal_Block $block
+ * @param string $tag
*
+ * @return null|string block content
* @throws \SmartyException
*/
- public function callParent(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block)
+ public function callParent(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block, $tag)
{
if (isset($block->parent)) {
$this->callBlock($block->parent, $tpl);
} else {
- throw new SmartyException("inheritance: illegal {\$smarty.block.parent} or {block append/prepend} used in parent template '{$tpl->inheritance->sources[$block->tplIndex]->filepath}' block '{$block->name}'");
+ throw new SmartyException("inheritance: illegal '{$tag}' used in child template '{$tpl->inheritance->sources[$block->tplIndex]->filepath}' block '{$block->name}'");
}
}
/**
+ * render block
+ *
* @param \Smarty_Internal_Block $block
* @param \Smarty_Internal_Template $tpl
*/
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_make_nocache.php b/lib/smarty3/sysplugins/smarty_internal_runtime_make_nocache.php
index dd9e15f..5306914 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_make_nocache.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_make_nocache.php
@@ -6,11 +6,9 @@
* @package Smarty
* @subpackage PluginsInternal
* @author Uwe Tews
- *
*/
class Smarty_Internal_Runtime_Make_Nocache
{
-
/**
* Save current variable value while rendering compiled template and inject nocache code to
* assign variable value in cahed template
@@ -23,14 +21,14 @@ class Smarty_Internal_Runtime_Make_Nocache
public function save(Smarty_Internal_Template $tpl, $var)
{
if (isset($tpl->tpl_vars[ $var ])) {
- $export = preg_replace('/^Smarty_Variable::__set_state[(]|\s|[)]$/', '',
- var_export($tpl->tpl_vars[ $var ], true));
+ $export =
+ preg_replace('/^Smarty_Variable::__set_state[(]|[)]$/', '', var_export($tpl->tpl_vars[ $var ], true));
if (preg_match('/(\w+)::__set_state/', $export, $match)) {
throw new SmartyException("{make_nocache \${$var}} in template '{$tpl->source->name}': variable does contain object '{$match[1]}' not implementing method '__set_state'");
}
echo "/*%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/<?php " .
- addcslashes("\$_smarty_tpl->smarty->ext->_make_nocache->store(\$_smarty_tpl, '{$var}', " . $export,
- '\\') . ");?>\n/*/%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/";
+ addcslashes("\$_smarty_tpl->smarty->ext->_make_nocache->store(\$_smarty_tpl, '{$var}', ", '\\') .
+ $export . ");?>\n/*/%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/";
}
}
@@ -38,8 +36,8 @@ class Smarty_Internal_Runtime_Make_Nocache
* Store variable value saved while rendering compiled template in cached template context
*
* @param \Smarty_Internal_Template $tpl
- * @param string $var variable name
- * @param array $properties
+ * @param string $var variable name
+ * @param array $properties
*/
public function store(Smarty_Internal_Template $tpl, $var, $properties)
{
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_tplfunction.php b/lib/smarty3/sysplugins/smarty_internal_runtime_tplfunction.php
index f75028a..e5f8e48 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_tplfunction.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_tplfunction.php
@@ -1,23 +1,15 @@
<?php
/**
- * Tplfunc Runtime Methods callTemplateFunction
+ * TplFunction Runtime Methods callTemplateFunction
*
* @package Smarty
* @subpackage PluginsInternal
* @author Uwe Tews
- *
**/
class Smarty_Internal_Runtime_TplFunction
{
/**
- * Array of source information for known template functions
- *
- * @var array
- */
- private $tplFunctions = array();
-
- /**
* Call template function
*
* @param \Smarty_Internal_Template $tpl template object
@@ -29,26 +21,28 @@ class Smarty_Internal_Runtime_TplFunction
*/
public function callTemplateFunction(Smarty_Internal_Template $tpl, $name, $params, $nocache)
{
- if (isset($this->tplFunctions[ $name ])) {
+ $funcParam = isset($tpl->tplFunctions[ $name ]) ? $tpl->tplFunctions[ $name ] :
+ (isset($tpl->smarty->tplFunctions[ $name ]) ? $tpl->smarty->tplFunctions[ $name ] : null);
+ if (isset($funcParam)) {
if (!$tpl->caching || ($tpl->caching && $nocache)) {
- $function = $this->tplFunctions[ $name ][ 'call_name' ];
+ $function = $funcParam[ 'call_name' ];
} else {
- if (isset($this->tplFunctions[ $name ][ 'call_name_caching' ])) {
- $function = $this->tplFunctions[ $name ][ 'call_name_caching' ];
+ if (isset($funcParam[ 'call_name_caching' ])) {
+ $function = $funcParam[ 'call_name_caching' ];
} else {
- $function = $this->tplFunctions[ $name ][ 'call_name' ];
+ $function = $funcParam[ 'call_name' ];
}
}
if (function_exists($function)) {
$this->saveTemplateVariables($tpl, $name);
- $function ($tpl, $params);
+ $function($tpl, $params);
$this->restoreTemplateVariables($tpl, $name);
return;
}
// try to load template function dynamically
if ($this->addTplFuncToCache($tpl, $name, $function)) {
$this->saveTemplateVariables($tpl, $name);
- $function ($tpl, $params);
+ $function($tpl, $params);
$this->restoreTemplateVariables($tpl, $name);
return;
}
@@ -59,38 +53,45 @@ class Smarty_Internal_Runtime_TplFunction
/**
* Register template functions defined by template
*
- * @param \Smarty_Internal_Template $tpl
- * @param array $tplFunctions source information array of template functions defined in template
+ * @param \Smarty|\Smarty_Internal_Template|\Smarty_Internal_TemplateBase $obj
+ * @param array $tplFunctions source information array of
+ * template functions defined
+ * in template
+ * @param bool $override if true replace existing
+ * functions with same name
*/
- public function registerTplFunctions(Smarty_Internal_Template $tpl, $tplFunctions)
+ public function registerTplFunctions(Smarty_Internal_TemplateBase $obj, $tplFunctions, $override = true)
{
- $this->tplFunctions = array_merge($this->tplFunctions, $tplFunctions);
- $ptr = $tpl;
+ $obj->tplFunctions =
+ $override ? array_merge($obj->tplFunctions, $tplFunctions) : array_merge($tplFunctions, $obj->tplFunctions);
// make sure that the template functions are known in parent templates
- while (isset($ptr->parent) && $ptr->parent->_objType === 2 && !isset($ptr->ext->_tplFunction)) {
- $ptr->ext->_tplFunction = $this;
- $ptr = $ptr->parent;
+ if ($obj->_isSubTpl()) {
+ $obj->smarty->ext->_tplFunction->registerTplFunctions($obj->parent, $tplFunctions, false);
+ } else {
+ $obj->smarty->tplFunctions = $override ? array_merge($obj->smarty->tplFunctions, $tplFunctions) :
+ array_merge($tplFunctions, $obj->smarty->tplFunctions);
}
}
/**
* Return source parameter array for single or all template functions
*
- * @param null|string $name template function name
+ * @param \Smarty_Internal_Template $tpl template object
+ * @param null|string $name template function name
*
* @return array|bool|mixed
*/
- public function getTplFunction($name = null)
+ public function getTplFunction(Smarty_Internal_Template $tpl, $name = null)
{
if (isset($name)) {
- return $this->tplFunctions[ $name ] ? $this->tplFunctions[ $name ] : false;
+ return isset($tpl->tplFunctions[ $name ]) ? $tpl->tplFunctions[ $name ] :
+ (isset($tpl->smarty->tplFunctions[ $name ]) ? $tpl->smarty->tplFunctions[ $name ] : false);
} else {
- return $this->tplFunctions;
+ return empty($tpl->tplFunctions) ? $tpl->smarty->tplFunctions : $tpl->tplFunctions;
}
}
/**
- *
* Add template function to cache file for nocache calls
*
* @param Smarty_Internal_Template $tpl
@@ -101,7 +102,7 @@ class Smarty_Internal_Runtime_TplFunction
*/
public function addTplFuncToCache(Smarty_Internal_Template $tpl, $_name, $_function)
{
- $funcParam = $this->tplFunctions[ $_name ];
+ $funcParam = $tpl->tplFunctions[ $_name ];
if (is_file($funcParam[ 'compiled_filepath' ])) {
// read compiled file
$code = file_get_contents($funcParam[ 'compiled_filepath' ]);
@@ -120,19 +121,24 @@ class Smarty_Internal_Runtime_TplFunction
}
// add template function code to cache file
if (isset($tplPtr->cached)) {
- /* @var Smarty_CacheResource $cache */
- $cache = $tplPtr->cached;
- $content = $cache->read($tplPtr);
+ $content = $tplPtr->cached->read($tplPtr);
if ($content) {
// check if we must update file dependency
if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) {
$content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content);
}
- $tplPtr->smarty->ext->_updateCache->write($cache, $tplPtr,
- preg_replace('/\s*\?>\s*$/', "\n", $content) .
- "\n" . preg_replace(array('/^\s*<\?php\s+/',
- '/\s*\?>\s*$/',), "\n",
- $match[ 0 ]));
+ $tplPtr->smarty->ext->_updateCache->write(
+ $tplPtr,
+ preg_replace('/\s*\?>\s*$/', "\n", $content) .
+ "\n" . preg_replace(
+ array(
+ '/^\s*<\?php\s+/',
+ '/\s*\?>\s*$/',
+ ),
+ "\n",
+ $match[ 0 ]
+ )
+ );
}
}
return true;
@@ -146,7 +152,7 @@ class Smarty_Internal_Runtime_TplFunction
* Save current template variables on stack
*
* @param \Smarty_Internal_Template $tpl
- * @param string $name stack name
+ * @param string $name stack name
*/
public function saveTemplateVariables(Smarty_Internal_Template $tpl, $name)
{
@@ -158,7 +164,7 @@ class Smarty_Internal_Runtime_TplFunction
* Restore saved variables into template objects
*
* @param \Smarty_Internal_Template $tpl
- * @param string $name stack name
+ * @param string $name stack name
*/
public function restoreTemplateVariables(Smarty_Internal_Template $tpl, $name)
{
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_updatecache.php b/lib/smarty3/sysplugins/smarty_internal_runtime_updatecache.php
index 77d790e..c1abbb3 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_updatecache.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_updatecache.php
@@ -6,7 +6,6 @@
* @package Smarty
* @subpackage PluginsInternal
* @author Uwe Tews
- *
**/
class Smarty_Internal_Runtime_UpdateCache
{
@@ -15,63 +14,13 @@ class Smarty_Internal_Runtime_UpdateCache
*
* @param \Smarty_Template_Cached $cached
* @param Smarty_Internal_Template $_template
- * @param string $content
+ * @param string $content
*/
public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
{
}
/**
- * Sanitize content and write it to cache resource
- *
- * @param \Smarty_Template_Cached $cached
- * @param Smarty_Internal_Template $_template
- * @param bool $no_output_filter
- *
- * @throws \SmartyException
- */
- public function removeNoCacheHash(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template,
- $no_output_filter)
- {
- $content = ob_get_clean();
- unset($cached->hashes[ $_template->compiled->nocache_hash ]);
- if (!empty($cached->hashes)) {
- $hash_array = array();
- foreach ($cached->hashes as $hash => $foo) {
- $hash_array[] = "/{$hash}/";
- }
- $content = preg_replace($hash_array, $_template->compiled->nocache_hash, $content);
- }
- $_template->cached->has_nocache_code = false;
- // get text between non-cached items
- $cache_split =
- preg_split("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s",
- $content);
- // get non-cached items
- preg_match_all("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s",
- $content, $cache_parts);
- $content = '';
- // loop over items, stitch back together
- foreach ($cache_split as $curr_idx => $curr_split) {
- // escape PHP tags in template content
- $content .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/',
- "<?php echo '\$1'; ?>\n", $curr_split);
- if (isset($cache_parts[ 0 ][ $curr_idx ])) {
- $_template->cached->has_nocache_code = true;
- $content .= $cache_parts[ 1 ][ $curr_idx ];
- }
- }
- if (!$no_output_filter && !$_template->cached->has_nocache_code &&
- (isset($_template->smarty->autoload_filters[ 'output' ]) ||
- isset($_template->smarty->registered_filters[ 'output' ]))
- ) {
- $content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template);
- }
- // write cache file content
- $this->writeCachedContent($cached, $_template, $content);
- }
-
- /**
* Cache was invalid , so render from compiled and write to cache
*
* @param \Smarty_Template_Cached $cached
@@ -91,15 +40,15 @@ class Smarty_Internal_Runtime_UpdateCache
$_template->smarty->_debug->start_cache($_template);
}
$this->removeNoCacheHash($cached, $_template, $no_output_filter);
- $compile_check = $_template->smarty->compile_check;
- $_template->smarty->compile_check = false;
- if (isset($_template->parent) && $_template->parent->_objType == 2) {
+ $compile_check = (int)$_template->compile_check;
+ $_template->compile_check = Smarty::COMPILECHECK_OFF;
+ if ($_template->_isSubTpl()) {
$_template->compiled->unifunc = $_template->parent->compiled->unifunc;
}
if (!$_template->cached->processed) {
$_template->cached->process($_template, true);
}
- $_template->smarty->compile_check = $compile_check;
+ $_template->compile_check = $compile_check;
$cached->getRenderedTemplateCode($_template);
if ($_template->smarty->debugging) {
$_template->smarty->_debug->end_cache($_template);
@@ -107,38 +56,110 @@ class Smarty_Internal_Runtime_UpdateCache
}
/**
- * Writes the content to cache resource
+ * Sanitize content and write it to cache resource
*
* @param \Smarty_Template_Cached $cached
* @param Smarty_Internal_Template $_template
+ * @param bool $no_output_filter
+ *
+ * @throws \SmartyException
+ */
+ public function removeNoCacheHash(
+ Smarty_Template_Cached $cached,
+ Smarty_Internal_Template $_template,
+ $no_output_filter
+ ) {
+ $php_pattern = '/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/';
+ $content = ob_get_clean();
+ $hash_array = $cached->hashes;
+ $hash_array[ $_template->compiled->nocache_hash ] = true;
+ $hash_array = array_keys($hash_array);
+ $nocache_hash = '(' . implode('|', $hash_array) . ')';
+ $_template->cached->has_nocache_code = false;
+ // get text between non-cached items
+ $cache_split =
+ preg_split(
+ "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
+ $content
+ );
+ // get non-cached items
+ preg_match_all(
+ "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
+ $content,
+ $cache_parts
+ );
+ $content = '';
+ // loop over items, stitch back together
+ foreach ($cache_split as $curr_idx => $curr_split) {
+ if (preg_match($php_pattern, $curr_split)) {
+ // escape PHP tags in template content
+ $php_split = preg_split(
+ $php_pattern,
+ $curr_split
+ );
+ preg_match_all(
+ $php_pattern,
+ $curr_split,
+ $php_parts
+ );
+ foreach ($php_split as $idx_php => $curr_php) {
+ $content .= $curr_php;
+ if (isset($php_parts[ 0 ][ $idx_php ])) {
+ $content .= "<?php echo '{$php_parts[ 1 ][ $idx_php ]}'; ?>\n";
+ }
+ }
+ } else {
+ $content .= $curr_split;
+ }
+ if (isset($cache_parts[ 0 ][ $curr_idx ])) {
+ $_template->cached->has_nocache_code = true;
+ $content .= $cache_parts[ 2 ][ $curr_idx ];
+ }
+ }
+ if (!$no_output_filter && !$_template->cached->has_nocache_code
+ && (isset($_template->smarty->autoload_filters[ 'output' ])
+ || isset($_template->smarty->registered_filters[ 'output' ]))
+ ) {
+ $content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template);
+ }
+ // write cache file content
+ $this->writeCachedContent($_template, $content);
+ }
+
+ /**
+ * Writes the content to cache resource
+ *
+ * @param Smarty_Internal_Template $_template
* @param string $content
*
* @return bool
*/
- public function writeCachedContent(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+ public function writeCachedContent(Smarty_Internal_Template $_template, $content)
{
- if ($_template->source->handler->recompiled || !($_template->caching == Smarty::CACHING_LIFETIME_CURRENT ||
- $_template->caching == Smarty::CACHING_LIFETIME_SAVED)
+ if ($_template->source->handler->recompiled || !$_template->caching
) {
// don't write cache file
return false;
}
+ if (!isset($_template->cached)) {
+ $_template->loadCached();
+ }
$content = $_template->smarty->ext->_codeFrame->create($_template, $content, '', true);
- return $this->write($cached, $_template, $content);
+ return $this->write($_template, $content);
}
/**
* Write this cache object to handler
*
- * @param \Smarty_Template_Cached $cached
* @param Smarty_Internal_Template $_template template object
* @param string $content content to cache
*
* @return bool success
*/
- public function write(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+ public function write(Smarty_Internal_Template $_template, $content)
{
if (!$_template->source->handler->recompiled) {
+ $cached = $_template->cached;
if ($cached->handler->writeCachedContent($_template, $content)) {
$cached->content = null;
$cached->timestamp = time();
@@ -149,7 +170,6 @@ class Smarty_Internal_Runtime_UpdateCache
if ($_template->smarty->cache_locking) {
$cached->handler->releaseLock($_template->smarty, $cached);
}
-
return true;
}
$cached->content = null;
@@ -158,8 +178,6 @@ class Smarty_Internal_Runtime_UpdateCache
$cached->valid = false;
$cached->processed = false;
}
-
return false;
}
-
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_updatescope.php b/lib/smarty3/sysplugins/smarty_internal_runtime_updatescope.php
index 04f2d3d..2240f97 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_updatescope.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_updatescope.php
@@ -6,25 +6,24 @@
* @package Smarty
* @subpackage PluginsInternal
* @author Uwe Tews
- *
**/
class Smarty_Internal_Runtime_UpdateScope
{
-
/**
* Update new assigned template or config variable in other effected scopes
*
- * @param Smarty_Internal_Template $tpl data object
- * @param string|null $varName variable name
- * @param int $tagScope tag scope to which bubble up variable value
- *
+ * @param Smarty_Internal_Template $tpl data object
+ * @param string|null $varName variable name
+ * @param int $tagScope tag scope to which bubble up variable value
*/
public function _updateScope(Smarty_Internal_Template $tpl, $varName, $tagScope = 0)
{
if ($tagScope) {
$this->_updateVarStack($tpl, $varName);
$tagScope = $tagScope & ~Smarty::SCOPE_LOCAL;
- if (!$tpl->scope && !$tagScope) return;
+ if (!$tpl->scope && !$tagScope) {
+ return;
+ }
}
$mergedScope = $tagScope | $tpl->scope;
if ($mergedScope) {
@@ -34,8 +33,9 @@ class Smarty_Internal_Runtime_UpdateScope
// update scopes
foreach ($this->_getAffectedScopes($tpl, $mergedScope) as $ptr) {
$this->_updateVariableInOtherScope($ptr->tpl_vars, $tpl, $varName);
- if($tagScope && $ptr->_objType == 2 && isset($tpl->_cache[ 'varStack' ])) {
- $this->_updateVarStack($ptr, $varName); }
+ if ($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) {
+ $this->_updateVarStack($ptr, $varName);
+ }
}
}
}
@@ -52,7 +52,7 @@ class Smarty_Internal_Runtime_UpdateScope
{
$_stack = array();
$ptr = $tpl->parent;
- if ($mergedScope && isset($ptr) && $ptr->_objType == 2) {
+ if ($mergedScope && isset($ptr) && $ptr->_isTplObj()) {
$_stack[] = $ptr;
$mergedScope = $mergedScope & ~Smarty::SCOPE_PARENT;
if (!$mergedScope) {
@@ -61,9 +61,9 @@ class Smarty_Internal_Runtime_UpdateScope
}
$ptr = $ptr->parent;
}
- while (isset($ptr) && $ptr->_objType == 2) {
- $_stack[] = $ptr;
- $ptr = $ptr->parent;
+ while (isset($ptr) && $ptr->_isTplObj()) {
+ $_stack[] = $ptr;
+ $ptr = $ptr->parent;
}
if ($mergedScope & Smarty::SCOPE_SMARTY) {
if (isset($tpl->smarty)) {
@@ -71,7 +71,7 @@ class Smarty_Internal_Runtime_UpdateScope
}
} elseif ($mergedScope & Smarty::SCOPE_ROOT) {
while (isset($ptr)) {
- if ($ptr->_objType != 2) {
+ if (!$ptr->_isTplObj()) {
$_stack[] = $ptr;
break;
}
@@ -82,11 +82,11 @@ class Smarty_Internal_Runtime_UpdateScope
}
/**
- * Update varibale in other scope
+ * Update variable in other scope
*
- * @param array $tpl_vars template variable array
+ * @param array $tpl_vars template variable array
* @param \Smarty_Internal_Template $from
- * @param string $varName variable name
+ * @param string $varName variable name
*/
public function _updateVariableInOtherScope(&$tpl_vars, Smarty_Internal_Template $from, $varName)
{
@@ -109,7 +109,7 @@ class Smarty_Internal_Runtime_UpdateScope
$i = 0;
while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
$this->_updateVariableInOtherScope($tpl->_cache[ 'varStack' ][ $i ][ 'tpl' ], $tpl, $varName);
- $i ++;
+ $i++;
}
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_writefile.php b/lib/smarty3/sysplugins/smarty_internal_runtime_writefile.php
index cf35e3c..4383e6f 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_writefile.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_writefile.php
@@ -18,9 +18,9 @@ class Smarty_Internal_Runtime_WriteFile
/**
* Writes file in a safe way to disk
*
- * @param string $_filepath complete filepath
- * @param string $_contents file content
- * @param Smarty $smarty smarty instance
+ * @param string $_filepath complete filepath
+ * @param string $_contents file content
+ * @param Smarty $smarty smarty instance
*
* @throws SmartyException
* @return boolean true
@@ -35,20 +35,30 @@ class Smarty_Internal_Runtime_WriteFile
if ($_file_perms !== null) {
$old_umask = umask(0);
}
-
$_dirpath = dirname($_filepath);
// if subdirs, create dir structure
- if ($_dirpath !== '.' && !file_exists($_dirpath)) {
- mkdir($_dirpath, $_dir_perms, true);
+ if ($_dirpath !== '.') {
+ $i = 0;
+ // loop if concurrency problem occurs
+ // see https://bugs.php.net/bug.php?id=35326
+ while (!is_dir($_dirpath)) {
+ if (@mkdir($_dirpath, $_dir_perms, true)) {
+ break;
+ }
+ clearstatcache();
+ if (++$i === 3) {
+ error_reporting($_error_reporting);
+ throw new SmartyException("unable to create directory {$_dirpath}");
+ }
+ sleep(1);
+ }
}
-
// write to tmp file, then move to overt file lock race condition
- $_tmp_file = $_dirpath . DS . str_replace(array('.', ','), '_', uniqid('wrt', true));
+ $_tmp_file = $_dirpath . DIRECTORY_SEPARATOR . str_replace(array('.', ','), '_', uniqid('wrt', true));
if (!file_put_contents($_tmp_file, $_contents)) {
error_reporting($_error_reporting);
throw new SmartyException("unable to write file {$_tmp_file}");
}
-
/*
* Windows' rename() fails if the destination exists,
* Linux' rename() properly handles the overwrite.
@@ -85,7 +95,6 @@ class Smarty_Internal_Runtime_WriteFile
umask($old_umask);
}
error_reporting($_error_reporting);
-
return true;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_smartytemplatecompiler.php b/lib/smarty3/sysplugins/smarty_internal_smartytemplatecompiler.php
index 8cd37dd..21f4e3f 100644
--- a/lib/smarty3/sysplugins/smarty_internal_smartytemplatecompiler.php
+++ b/lib/smarty3/sysplugins/smarty_internal_smartytemplatecompiler.php
@@ -76,8 +76,8 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
/**
* method to compile a Smarty template
*
- * @param mixed $_content template source
- * @param bool $isTemplateSource
+ * @param mixed $_content template source
+ * @param bool $isTemplateSource
*
* @return bool true if compiling succeeded, false if it failed
* @throws \SmartyCompilerException
@@ -89,18 +89,32 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
then written to compiled files. */
// init the lexer/parser to compile the template
$this->parser =
- new $this->parser_class(new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $_content), $this),
- $this);
+ new $this->parser_class(
+ new $this->lexer_class(
+ str_replace(
+ array(
+ "\r\n",
+ "\r"
+ ),
+ "\n",
+ $_content
+ ),
+ $this
+ ),
+ $this
+ );
if ($isTemplateSource && $this->template->caching) {
$this->parser->insertPhpCode("<?php\n\$_smarty_tpl->compiled->nocache_hash = '{$this->nocache_hash}';\n?>\n");
}
- if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+ if (function_exists('mb_internal_encoding')
+ && function_exists('ini_get')
+ && ((int)ini_get('mbstring.func_overload')) & 2
+ ) {
$mbEncoding = mb_internal_encoding();
mb_internal_encoding('ASCII');
} else {
$mbEncoding = null;
}
-
if ($this->smarty->_parserdebug) {
$this->parser->PrintTrace();
$this->parser->lex->PrintTrace();
@@ -113,7 +127,6 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
}
$this->parser->doParse($this->parser->lex->token, $this->parser->lex->value);
}
-
// finish parsing process
$this->parser->doParse(0, 0);
if ($mbEncoding) {
@@ -123,8 +136,10 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
if (count($this->_tag_stack) > 0) {
// get stacked info
list($openTag, $_data) = array_pop($this->_tag_stack);
- $this->trigger_template_error("unclosed {$this->smarty->left_delimiter}" . $openTag .
- "{$this->smarty->right_delimiter} tag");
+ $this->trigger_template_error(
+ "unclosed {$this->smarty->left_delimiter}" . $openTag .
+ "{$this->smarty->right_delimiter} tag"
+ );
}
// call post compile callbacks
foreach ($this->postCompileCallbacks as $cb) {
@@ -144,7 +159,6 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
* @param array $parameter optional parameter array
* @param string $key optional key for callback
* @param bool $replace if true replace existing keyed callback
- *
*/
public function registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
{
diff --git a/lib/smarty3/sysplugins/smarty_internal_template.php b/lib/smarty3/sysplugins/smarty_internal_template.php
index e1732ca..bae22a7 100644
--- a/lib/smarty3/sysplugins/smarty_internal_template.php
+++ b/lib/smarty3/sysplugins/smarty_internal_template.php
@@ -17,6 +17,7 @@
* @property Smarty_Template_Compiled $compiled
* @property Smarty_Template_Cached $cached
* @property Smarty_Internal_TemplateCompilerBase $compiler
+ * @property mixed|\Smarty_Template_Cached registered_plugins
*
* The following methods will be dynamically loaded by the extension handler when they are called.
* They are located in a corresponding Smarty_Internal_Method_xxxx class
@@ -26,6 +27,29 @@
class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
{
/**
+ * Template object cache
+ *
+ * @var Smarty_Internal_Template[]
+ */
+ public static $tplObjCache = array();
+
+ /**
+ * Template object cache for Smarty::isCached() === true
+ *
+ * @var Smarty_Internal_Template[]
+ */
+ public static $isCacheTplObj = array();
+
+ /**
+ * Sub template Info Cache
+ * - index name
+ * - value use count
+ *
+ * @var int[]
+ */
+ public static $subTplInfo = array();
+
+ /**
* This object type (Smarty = 1, template = 2, data = 4)
*
* @var int
@@ -107,33 +131,41 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
* Some of the global Smarty settings copied to template scope
* It load the required template resources and caching plugins
*
- * @param string $template_resource template resource string
- * @param Smarty $smarty Smarty instance
- * @param \Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $_parent back pointer to parent object
- * with variables or null
- * @param mixed $_cache_id cache id or null
- * @param mixed $_compile_id compile id or null
- * @param bool $_caching use caching?
- * @param int $_cache_lifetime cache life-time in seconds
+ * @param string $template_resource template resource string
+ * @param Smarty $smarty Smarty instance
+ * @param null|\Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $_parent back pointer to parent
+ * object with variables or
+ * null
+ * @param mixed $_cache_id cache id or null
+ * @param mixed $_compile_id compile id or null
+ * @param bool|int|null $_caching use caching?
+ * @param int|null $_cache_lifetime cache life-time in
+ * seconds
+ * @param bool $_isConfig
*
* @throws \SmartyException
*/
- public function __construct($template_resource, Smarty $smarty, Smarty_Internal_Data $_parent = null,
- $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
- {
+ public function __construct(
+ $template_resource,
+ Smarty $smarty,
+ Smarty_Internal_Data $_parent = null,
+ $_cache_id = null,
+ $_compile_id = null,
+ $_caching = null,
+ $_cache_lifetime = null,
+ $_isConfig = false
+ ) {
$this->smarty = $smarty;
// Smarty parameter
$this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
$this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
- $this->caching = $_caching === null ? $this->smarty->caching : $_caching;
- if ($this->caching === true) {
- $this->caching = Smarty::CACHING_LIFETIME_CURRENT;
- }
+ $this->caching = (int)($_caching === null ? $this->smarty->caching : $_caching);
$this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime;
+ $this->compile_check = (int)$smarty->compile_check;
$this->parent = $_parent;
// Template resource
$this->template_resource = $template_resource;
- $this->source = Smarty_Template_Source::load($this);
+ $this->source = $_isConfig ? Smarty_Template_Config::load($this) : Smarty_Template_Source::load($this);
parent::__construct();
if ($smarty->security_policy && method_exists($smarty->security_policy, 'registerCallBacks')) {
$smarty->security_policy->registerCallBacks($this);
@@ -143,15 +175,15 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
/**
* render template
*
- * @param bool $no_output_filter if true do not run output filter
- * @param null|bool $display true: display, false: fetch null: sub-template
+ * @param bool $no_output_filter if true do not run output filter
+ * @param null|bool $display true: display, false: fetch null: sub-template
*
* @return string
+ * @throws \Exception
* @throws \SmartyException
*/
public function render($no_output_filter = true, $display = null)
{
- $parentIsTpl = isset($this->parent) && $this->parent->_objType == 2;
if ($this->smarty->debugging) {
if (!isset($this->smarty->_debug)) {
$this->smarty->_debug = new Smarty_Internal_Debug();
@@ -160,19 +192,19 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
}
// checks if template exists
if (!$this->source->exists) {
- throw new SmartyException("Unable to load template '{$this->source->type}:{$this->source->name}'" .
- ($parentIsTpl ? " in '{$this->parent->template_resource}'" : ''));
+ throw new SmartyException(
+ "Unable to load template '{$this->source->type}:{$this->source->name}'" .
+ ($this->_isSubTpl() ? " in '{$this->parent->template_resource}'" : '')
+ );
}
// disable caching for evaluated code
if ($this->source->handler->recompiled) {
- $this->caching = false;
+ $this->caching = Smarty::CACHING_OFF;
}
// read from cache or render
- $isCacheTpl =
- $this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED;
- if ($isCacheTpl) {
- if (!isset($this->cached) || $this->cached->cache_id !== $this->cache_id ||
- $this->cached->compile_id !== $this->compile_id
+ if ($this->caching === Smarty::CACHING_LIFETIME_CURRENT || $this->caching === Smarty::CACHING_LIFETIME_SAVED) {
+ if (!isset($this->cached) || $this->cached->cache_id !== $this->cache_id
+ || $this->cached->compile_id !== $this->compile_id
) {
$this->loadCached(true);
}
@@ -183,16 +215,18 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
}
$this->compiled->render($this);
}
-
// display or fetch
if ($display) {
if ($this->caching && $this->smarty->cache_modified_check) {
- $this->smarty->ext->_cacheModify->cacheModifiedCheck($this->cached, $this,
- isset($content) ? $content : ob_get_clean());
+ $this->smarty->ext->_cacheModify->cacheModifiedCheck(
+ $this->cached,
+ $this,
+ isset($content) ? $content : ob_get_clean()
+ );
} else {
- if ((!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled) &&
- !$no_output_filter && (isset($this->smarty->autoload_filters[ 'output' ]) ||
- isset($this->smarty->registered_filters[ 'output' ]))
+ if ((!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled)
+ && !$no_output_filter && (isset($this->smarty->autoload_filters[ 'output' ])
+ || isset($this->smarty->registered_filters[ 'output' ]))
) {
echo $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
} else {
@@ -212,19 +246,10 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
$this->smarty->_debug->display_debug($this, true);
}
}
- if ($parentIsTpl) {
- foreach ($this->compiled->required_plugins as $code => $tmp1) {
- foreach ($tmp1 as $name => $tmp) {
- foreach ($tmp as $type => $data) {
- $this->parent->compiled->required_plugins[ $code ][ $name ][ $type ] = $data;
- }
- }
- }
- }
- if (!$no_output_filter &&
- (!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled) &&
- (isset($this->smarty->autoload_filters[ 'output' ]) ||
- isset($this->smarty->registered_filters[ 'output' ]))
+ if (!$no_output_filter
+ && (!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled)
+ && (isset($this->smarty->autoload_filters[ 'output' ])
+ || isset($this->smarty->registered_filters[ 'output' ]))
) {
return $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
}
@@ -247,20 +272,31 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
* @param string $uid file dependency uid
* @param string $content_func function name
*
+ * @throws \Exception
+ * @throws \SmartyException
*/
- public function _subTemplateRender($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $scope,
- $forceTplCache, $uid = null, $content_func = null)
- {
+ public function _subTemplateRender(
+ $template,
+ $cache_id,
+ $compile_id,
+ $caching,
+ $cache_lifetime,
+ $data,
+ $scope,
+ $forceTplCache,
+ $uid = null,
+ $content_func = null
+ ) {
$tpl = clone $this;
$tpl->parent = $this;
$smarty = &$this->smarty;
$_templateId = $smarty->_getTemplateId($template, $cache_id, $compile_id, $caching, $tpl);
// recursive call ?
- if (isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId() != $_templateId) {
+ if (isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId() !== $_templateId) {
// already in template cache?
- if (isset($smarty->_cache[ 'tplObjects' ][ $_templateId ])) {
+ if (isset(self::$tplObjCache[ $_templateId ])) {
// copy data from cached object
- $cachedTpl = &$smarty->_cache[ 'tplObjects' ][ $_templateId ];
+ $cachedTpl = &self::$tplObjCache[ $_templateId ];
$tpl->templateId = $cachedTpl->templateId;
$tpl->template_resource = $cachedTpl->template_resource;
$tpl->cache_id = $cachedTpl->cache_id;
@@ -271,7 +307,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
} else {
unset($tpl->compiled);
}
- if ($caching != 9999 && isset($cachedTpl->cached)) {
+ if ($caching !== 9999 && isset($cachedTpl->cached)) {
$tpl->cached = $cachedTpl->cached;
} else {
unset($tpl->cached);
@@ -293,7 +329,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
$tpl->source = Smarty_Template_Source::load($tpl);
unset($tpl->compiled);
}
- if ($caching != 9999) {
+ if ($caching !== 9999) {
unset($tpl->cached);
}
}
@@ -305,23 +341,22 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
$tpl->cache_lifetime = $cache_lifetime;
// set template scope
$tpl->scope = $scope;
- if (!isset($smarty->_cache[ 'tplObjects' ][ $tpl->templateId ]) && !$tpl->source->handler->recompiled) {
+ if (!isset(self::$tplObjCache[ $tpl->templateId ]) && !$tpl->source->handler->recompiled) {
// check if template object should be cached
- if ($forceTplCache || (isset($smarty->_cache[ 'subTplInfo' ][ $tpl->template_resource ]) &&
- $smarty->_cache[ 'subTplInfo' ][ $tpl->template_resource ] > 1) ||
- ($tpl->_isParentTemplate() && isset($smarty->_cache[ 'tplObjects' ][ $tpl->parent->templateId ]))
+ if ($forceTplCache || (isset(self::$subTplInfo[ $tpl->template_resource ])
+ && self::$subTplInfo[ $tpl->template_resource ] > 1)
+ || ($tpl->_isSubTpl() && isset(self::$tplObjCache[ $tpl->parent->templateId ]))
) {
- $smarty->_cache[ 'tplObjects' ][ $tpl->templateId ] = $tpl;
+ self::$tplObjCache[ $tpl->templateId ] = $tpl;
}
}
-
if (!empty($data)) {
// set up variable values
foreach ($data as $_key => $_val) {
$tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val, $this->isRenderingCache);
}
}
- if ($tpl->caching == 9999) {
+ if ($tpl->caching === 9999) {
if (!isset($tpl->compiled)) {
$this->loadCompiled(true);
}
@@ -354,27 +389,26 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
/**
* Get called sub-templates and save call count
- *
*/
public function _subTemplateRegister()
{
foreach ($this->compiled->includes as $name => $count) {
- if (isset($this->smarty->_cache[ 'subTplInfo' ][ $name ])) {
- $this->smarty->_cache[ 'subTplInfo' ][ $name ] += $count;
+ if (isset(self::$subTplInfo[ $name ])) {
+ self::$subTplInfo[ $name ] += $count;
} else {
- $this->smarty->_cache[ 'subTplInfo' ][ $name ] = $count;
+ self::$subTplInfo[ $name ] = $count;
}
}
}
/**
- * Check if parent is template object
+ * Check if this is a sub template
*
- * @return bool true if parent is template
+ * @return bool true is sub template
*/
- public function _isParentTemplate()
+ public function _isSubTpl()
{
- return isset($this->parent) && $this->parent->_objType == 2;
+ return isset($this->parent) && $this->parent->_isTplObj();
}
/**
@@ -384,7 +418,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
* @param mixed $value value
* @param bool $nocache nocache flag
* @param int $scope scope into which variable shall be assigned
- *
*/
public function _assignInScope($varName, $value, $nocache = false, $scope = 0)
{
@@ -398,37 +431,77 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
$this->tpl_vars[ $varName ] = new Smarty_Variable($value, $nocache || $this->isRenderingCache);
}
if ($scope >= 0) {
- if (isset($scope) || isset($this->scope)) {
+ if ($scope > 0 || $this->scope > 0) {
$this->smarty->ext->_updateScope->_updateScope($this, $varName, $scope);
}
}
}
/**
+ * Check if plugins are callable require file otherwise
+ *
+ * @param array $plugins required plugins
+ *
+ * @throws \SmartyException
+ */
+ public function _checkPlugins($plugins)
+ {
+ static $checked = array();
+ foreach ($plugins as $plugin) {
+ $name = join('::', (array)$plugin[ 'function' ]);
+ if (!isset($checked[ $name ])) {
+ if (!is_callable($plugin[ 'function' ])) {
+ if (is_file($plugin[ 'file' ])) {
+ include_once $plugin[ 'file' ];
+ if (is_callable($plugin[ 'function' ])) {
+ $checked[ $name ] = true;
+ }
+ }
+ } else {
+ $checked[ $name ] = true;
+ }
+ }
+ if (!isset($checked[ $name ])) {
+ if (false !== $this->smarty->loadPlugin($name)) {
+ $checked[ $name ] = true;
+ } else {
+ throw new SmartyException("Plugin '{$name}' not callable");
+ }
+ }
+ }
+ }
+
+ /**
* This function is executed automatically when a compiled or cached template file is included
* - Decode saved properties from compiled template and cache files
* - Check if compiled or cache file is valid
*
* @param \Smarty_Internal_Template $tpl
- * @param array $properties special template properties
- * @param bool $cache flag if called from cache file
+ * @param array $properties special template properties
+ * @param bool $cache flag if called from cache file
*
* @return bool flag if compiled or cache file is valid
* @throws \SmartyException
*/
public function _decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
{
+ // on cache resources other than file check version stored in cache code
+ if (!isset($properties[ 'version' ]) || Smarty::SMARTY_VERSION !== $properties[ 'version' ]) {
+ if ($cache) {
+ $tpl->smarty->clearAllCache();
+ } else {
+ $tpl->smarty->clearCompiledTemplate();
+ }
+ return false;
+ }
$is_valid = true;
- if (Smarty::SMARTY_VERSION != $properties[ 'version' ]) {
- // new version must rebuild
- $is_valid = false;
- } elseif ($is_valid && !empty($properties[ 'file_dependency' ]) &&
- ((!$cache && $tpl->smarty->compile_check) || $tpl->smarty->compile_check == 1)
+ if (!empty($properties[ 'file_dependency' ])
+ && ((!$cache && $tpl->compile_check) || $tpl->compile_check === Smarty::COMPILECHECK_ON)
) {
// check file dependencies at compiled code
foreach ($properties[ 'file_dependency' ] as $_file_to_check) {
- if ($_file_to_check[ 2 ] == 'file' || $_file_to_check[ 2 ] == 'php') {
- if ($tpl->source->filepath == $_file_to_check[ 0 ]) {
+ if ($_file_to_check[ 2 ] === 'file' || $_file_to_check[ 2 ] === 'php') {
+ if ($tpl->source->filepath === $_file_to_check[ 0 ]) {
// do not recheck current template
continue;
//$mtime = $tpl->source->getTimeStamp();
@@ -453,8 +526,8 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
}
if ($cache) {
// CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
- if ($tpl->caching === Smarty::CACHING_LIFETIME_SAVED && $properties[ 'cache_lifetime' ] >= 0 &&
- (time() > ($tpl->cached->timestamp + $properties[ 'cache_lifetime' ]))
+ if ($tpl->caching === Smarty::CACHING_LIFETIME_SAVED && $properties[ 'cache_lifetime' ] >= 0
+ && (time() > ($tpl->cached->timestamp + $properties[ 'cache_lifetime' ]))
) {
$is_valid = false;
}
@@ -478,6 +551,8 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
/**
* Compiles the template
* If the template is not evaluated the compiled template is saved on disk
+ *
+ * @throws \Exception
*/
public function compileTemplateSource()
{
@@ -493,13 +568,14 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
*/
public function writeCachedContent($content)
{
- return $this->smarty->ext->_updateCache->writeCachedContent($this->cached, $this, $content);
+ return $this->smarty->ext->_updateCache->writeCachedContent($this, $content);
}
/**
* Get unique template id
*
* @return string
+ * @throws \SmartyException
*/
public function _getTemplateId()
{
@@ -509,10 +585,12 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
/**
* runtime error not matching capture tags
+ *
+ * @throws \SmartyException
*/
public function capture_error()
{
- throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\"");
+ throw new SmartyException("Not matching {capture} open/close in '{$this->template_resource}'");
}
/**
@@ -541,7 +619,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
/**
* Load inheritance object
- *
*/
public function _loadInheritance()
{
@@ -552,7 +629,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
/**
* Unload inheritance object
- *
*/
public function _cleanUp()
{
@@ -572,8 +648,11 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
$this->smarty->loadPlugin($this->source->compiler_class);
}
$this->compiler =
- new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class,
- $this->smarty);
+ new $this->source->compiler_class(
+ $this->source->template_lexer_class,
+ $this->source->template_parser_class,
+ $this->smarty
+ );
}
/**
@@ -583,7 +662,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
* @param array $args argument array
*
* @return mixed
- * @throws SmartyException
*/
public function __call($name, $args)
{
@@ -596,60 +674,58 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
}
/**
- * set Smarty property in template context
+ * get Smarty property in template context
*
* @param string $property_name property name
- * @param mixed $value value
*
+ * @return mixed|Smarty_Template_Cached
* @throws SmartyException
*/
- public function __set($property_name, $value)
+ public function __get($property_name)
{
switch ($property_name) {
case 'compiled':
+ $this->loadCompiled();
+ return $this->compiled;
case 'cached':
+ $this->loadCached();
+ return $this->cached;
case 'compiler':
- $this->$property_name = $value;
- return;
+ $this->loadCompiler();
+ return $this->compiler;
default:
// Smarty property ?
if (property_exists($this->smarty, $property_name)) {
- $this->smarty->$property_name = $value;
- return;
+ return $this->smarty->$property_name;
}
}
- throw new SmartyException("invalid template property '$property_name'.");
+ throw new SmartyException("template property '$property_name' does not exist.");
}
/**
- * get Smarty property in template context
+ * set Smarty property in template context
*
* @param string $property_name property name
+ * @param mixed $value value
*
- * @return mixed|Smarty_Template_Cached
* @throws SmartyException
*/
- public function __get($property_name)
+ public function __set($property_name, $value)
{
switch ($property_name) {
case 'compiled':
- $this->loadCompiled();
- return $this->compiled;
-
case 'cached':
- $this->loadCached();
- return $this->cached;
-
case 'compiler':
- $this->loadCompiler();
- return $this->compiler;
+ $this->$property_name = $value;
+ return;
default:
// Smarty property ?
if (property_exists($this->smarty, $property_name)) {
- return $this->smarty->$property_name;
+ $this->smarty->$property_name = $value;
+ return;
}
}
- throw new SmartyException("template property '$property_name' does not exist.");
+ throw new SmartyException("invalid template property '$property_name'.");
}
/**
diff --git a/lib/smarty3/sysplugins/smarty_internal_templatebase.php b/lib/smarty3/sysplugins/smarty_internal_templatebase.php
index 0b123f6..4476f12 100644
--- a/lib/smarty3/sysplugins/smarty_internal_templatebase.php
+++ b/lib/smarty3/sysplugins/smarty_internal_templatebase.php
@@ -11,20 +11,22 @@
/**
* Class with shared smarty/template methods
*
- * @package Smarty
- * @subpackage Template
+ * @package Smarty
+ * @subpackage Template
*
- * @property Smarty $smarty
+ * @property int $_objType
*
* The following methods will be dynamically loaded by the extension handler when they are called.
* They are located in a corresponding Smarty_Internal_Method_xxxx class
*
* @method Smarty_Internal_TemplateBase addAutoloadFilters(mixed $filters, string $type = null)
- * @method Smarty_Internal_TemplateBase addDefaultModifier(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase addDefaultModifiers(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase addLiterals(mixed $literals)
* @method Smarty_Internal_TemplateBase createData(Smarty_Internal_Data $parent = null, string $name = null)
* @method array getAutoloadFilters(string $type = null)
* @method string getDebugTemplate()
* @method array getDefaultModifier()
+ * @method array getLiterals()
* @method array getTags(mixed $template = null)
* @method object getRegisteredObject(string $object_name)
* @method Smarty_Internal_TemplateBase registerCacheResource(string $name, Smarty_CacheResource $resource_handler)
@@ -35,7 +37,8 @@
* @method Smarty_Internal_TemplateBase registerResource(string $name, mixed $resource_handler)
* @method Smarty_Internal_TemplateBase setAutoloadFilters(mixed $filters, string $type = null)
* @method Smarty_Internal_TemplateBase setDebugTemplate(string $tpl_name)
- * @method Smarty_Internal_TemplateBase setDefaultModifier(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase setDefaultModifiers(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase setLiterals(mixed $literals)
* @method Smarty_Internal_TemplateBase unloadFilter(string $type, string $name)
* @method Smarty_Internal_TemplateBase unregisterCacheResource(string $name)
* @method Smarty_Internal_TemplateBase unregisterObject(string $object_name)
@@ -64,9 +67,16 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
/**
* caching enabled
*
- * @var boolean
+ * @var int
+ */
+ public $caching = Smarty::CACHING_OFF;
+
+ /**
+ * check template for modifications?
+ *
+ * @var int
*/
- public $caching = false;
+ public $compile_check = Smarty::COMPILECHECK_ON;
/**
* cache lifetime in seconds
@@ -76,6 +86,13 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
public $cache_lifetime = 3600;
/**
+ * Array of source information for known template functions
+ *
+ * @var array
+ */
+ public $tplFunctions = array();
+
+ /**
* universal cache
*
* @var array()
@@ -85,10 +102,10 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
/**
* 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 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
*
* @throws Exception
* @throws SmartyException
@@ -107,6 +124,9 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
* @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
+ *
+ * @throws \Exception
+ * @throws \SmartyException
*/
public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
{
@@ -120,12 +140,15 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
* @api Smarty::isCached()
* @link http://www.smarty.net/docs/en/api.is.cached.tpl
*
- * @param null|string|\Smarty_Internal_Template $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 null|string|\Smarty_Internal_Template $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
*
- * @return boolean cache status
+ * @return bool cache status
+ * @throws \Exception
+ * @throws \SmartyException
*/
public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
{
@@ -135,11 +158,11 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
/**
* 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 string $function function type 0 = fetch, 1 = display, 2 = isCache
+ * @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 string $function function type 0 = fetch, 1 = display, 2 = isCache
*
* @return mixed
* @throws \Exception
@@ -147,42 +170,52 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
*/
private function _execute($template, $cache_id, $compile_id, $parent, $function)
{
- $smarty = $this->_objType == 1 ? $this : $this->smarty;
+ $smarty = $this->_getSmartyObj();
$saveVars = true;
if ($template === null) {
- if ($this->_objType != 2) {
+ if (!$this->_isTplObj()) {
throw new SmartyException($function . '():Missing \'$template\' parameter');
} else {
$template = $this;
}
} elseif (is_object($template)) {
- if (!isset($template->_objType) || $template->_objType != 2) {
+ /* @var Smarty_Internal_Template $template */
+ if (!isset($template->_objType) || !$template->_isTplObj()) {
throw new SmartyException($function . '():Template object expected');
}
} else {
// get template object
- /* @var Smarty_Internal_Template $template */
$saveVars = false;
-
$template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent ? $parent : $this, false);
- if ($this->_objType == 1) {
+ if ($this->_objType === 1) {
// set caching in template object
$template->caching = $this->caching;
}
}
+ // make sure we have integer values
+ $template->caching = (int)$template->caching;
// fetch template content
$level = ob_get_level();
try {
$_smarty_old_error_level =
isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
- if ($function == 2) {
+ if ($this->_objType === 2) {
+ /* @var Smarty_Internal_Template $this */
+ $template->tplFunctions = $this->tplFunctions;
+ $template->inheritance = $this->inheritance;
+ }
+ /* @var Smarty_Internal_Template $parent */
+ if (isset($parent->_objType) && ($parent->_objType === 2) && !empty($parent->tplFunctions)) {
+ $template->tplFunctions = array_merge($parent->tplFunctions, $template->tplFunctions);
+ }
+ if ($function === 2) {
if ($template->caching) {
// return cache status of template
if (!isset($template->cached)) {
$template->loadCached();
}
$result = $template->cached->isCached($template);
- $template->smarty->_cache[ 'isCached' ][ $template->_getTemplateId() ] = $template;
+ Smarty_Internal_Template::$isCacheTplObj[ $template->_getTemplateId() ] = $template;
} else {
return false;
}
@@ -202,10 +235,10 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
$template->tpl_vars = $savedTplVars;
$template->config_vars = $savedConfigVars;
} else {
- if (!$function && !isset($smarty->_cache[ 'tplObjects' ][ $template->templateId ])) {
+ if (!$function && !isset(Smarty_Internal_Template::$tplObjCache[ $template->templateId ])) {
$template->parent = null;
$template->tpl_vars = $template->config_vars = array();
- $smarty->_cache[ 'tplObjects' ][ $template->templateId ] = $template;
+ Smarty_Internal_Template::$tplObjCache[ $template->templateId ] = $template;
}
}
}
@@ -213,8 +246,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
error_reporting($_smarty_old_error_level);
}
return $result;
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
while (ob_get_level() > $level) {
ob_end_clean();
}
@@ -231,14 +263,14 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
* @api Smarty::registerPlugin()
* @link http://www.smarty.net/docs/en/api.register.plugin.tpl
*
- * @param string $type plugin type
- * @param string $name name of template tag
- * @param callback $callback PHP callback to register
- * @param bool $cacheable if true (default) this function is cache able
- * @param mixed $cache_attr caching attributes if any
+ * @param string $type plugin type
+ * @param string $name name of template tag
+ * @param callback $callback PHP callback to register
+ * @param bool $cacheable if true (default) this function is cache able
+ * @param mixed $cache_attr caching attributes if any
*
* @return \Smarty|\Smarty_Internal_Template
- * @throws SmartyException when the plugin tag is invalid
+ * @throws \SmartyException
*/
public function registerPlugin($type, $name, $callback, $cacheable = true, $cache_attr = null)
{
@@ -251,11 +283,11 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
* @api Smarty::loadFilter()
* @link http://www.smarty.net/docs/en/api.load.filter.tpl
*
- * @param string $type filter type
- * @param string $name filter name
+ * @param string $type filter type
+ * @param string $name filter name
*
* @return bool
- * @throws SmartyException if filter could not be loaded
+ * @throws \SmartyException
*/
public function loadFilter($type, $name)
{
@@ -268,9 +300,9 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
* @api Smarty::registerFilter()
* @link http://www.smarty.net/docs/en/api.register.filter.tpl
*
- * @param string $type filter type
- * @param callback $callback
- * @param string|null $name optional filter name
+ * @param string $type filter type
+ * @param callback $callback
+ * @param string|null $name optional filter name
*
* @return \Smarty|\Smarty_Internal_Template
* @throws \SmartyException
@@ -286,28 +318,46 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
* @api Smarty::registerObject()
* @link http://www.smarty.net/docs/en/api.register.object.tpl
*
- * @param string $object_name
- * @param object $object the referenced PHP object to register
- * @param array $allowed_methods_properties list of allowed methods (empty = all)
- * @param bool $format smarty argument format, else traditional
- * @param array $block_methods list of block-methods
+ * @param string $object_name
+ * @param object $object the referenced PHP object to register
+ * @param array $allowed_methods_properties list of allowed methods (empty = all)
+ * @param bool $format smarty argument format, else traditional
+ * @param array $block_methods list of block-methods
*
* @return \Smarty|\Smarty_Internal_Template
* @throws \SmartyException
*/
- public function registerObject($object_name, $object, $allowed_methods_properties = array(), $format = true,
- $block_methods = array())
+ public function registerObject(
+ $object_name,
+ $object,
+ $allowed_methods_properties = array(),
+ $format = true,
+ $block_methods = array()
+ ) {
+ return $this->ext->registerObject->registerObject(
+ $this,
+ $object_name,
+ $object,
+ $allowed_methods_properties,
+ $format,
+ $block_methods
+ );
+ }
+
+ /**
+ * @param int $compile_check
+ */
+ public function setCompileCheck($compile_check)
{
- return $this->ext->registerObject->registerObject($this, $object_name, $object, $allowed_methods_properties,
- $format, $block_methods);
+ $this->compile_check = (int)$compile_check;
}
/**
- * @param boolean $caching
+ * @param int $caching
*/
public function setCaching($caching)
{
- $this->caching = $caching;
+ $this->caching = (int)$caching;
}
/**
@@ -333,6 +383,4 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
{
$this->cache_id = $cache_id;
}
-
}
-
diff --git a/lib/smarty3/sysplugins/smarty_internal_templatecompilerbase.php b/lib/smarty3/sysplugins/smarty_internal_templatecompilerbase.php
index 053c853..a72f3a4 100644
--- a/lib/smarty3/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/lib/smarty3/sysplugins/smarty_internal_templatecompilerbase.php
@@ -1,5 +1,4 @@
<?php
-
/**
* Smarty Internal Plugin Smarty Template Compiler Base
* This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
@@ -17,11 +16,24 @@
*
* @property Smarty_Internal_SmartyTemplateCompiler $prefixCompiledCode = ''
* @property Smarty_Internal_SmartyTemplateCompiler $postfixCompiledCode = ''
- * @method registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
- * @method unregisterPostCompileCallback($key)
+ * @method registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+ * @method unregisterPostCompileCallback($key)
*/
abstract class Smarty_Internal_TemplateCompilerBase
{
+ /**
+ * compile tag objects cache
+ *
+ * @var array
+ */
+ public static $_tag_objects = array();
+
+ /**
+ * counter for prefix variable number
+ *
+ * @var int
+ */
+ public static $prefixVariableNumber = 0;
/**
* Smarty object
@@ -52,11 +64,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
public $suppressNocacheProcessing = false;
/**
- * compile tag objects cache
+ * caching enabled (copied from template object)
*
- * @var array
+ * @var int
*/
- static $_tag_objects = array();
+ public $caching = 0;
/**
* tag stack
@@ -66,6 +78,27 @@ abstract class Smarty_Internal_TemplateCompilerBase
public $_tag_stack = array();
/**
+ * tag stack count
+ *
+ * @var array
+ */
+ public $_tag_stack_count = array();
+
+ /**
+ * Plugins used by template
+ *
+ * @var array
+ */
+ public $required_plugins = array('compiled' => array(), 'nocache' => array());
+
+ /**
+ * Required plugins stack
+ *
+ * @var array
+ */
+ public $required_plugins_stack = array();
+
+ /**
* current template
*
* @var Smarty_Internal_Template
@@ -220,6 +253,13 @@ abstract class Smarty_Internal_TemplateCompilerBase
public $prefix_code = array();
/**
+ * used prefix variables by current compiled tag
+ *
+ * @var array
+ */
+ public $usedPrefixVariables = array();
+
+ /**
* Prefix code stack
*
* @var array
@@ -241,13 +281,6 @@ abstract class Smarty_Internal_TemplateCompilerBase
public $has_variable_string = false;
/**
- * Tag creates output
- *
- * @var bool
- */
- public $has_output = false;
-
- /**
* Stack for {setfilter} {/setfilter}
*
* @var array
@@ -280,7 +313,12 @@ abstract class Smarty_Internal_TemplateCompilerBase
*
* @var array
*/
- public $plugin_search_order = array('function', 'block', 'compiler', 'class');
+ public $plugin_search_order = array(
+ 'function',
+ 'block',
+ 'compiler',
+ 'class'
+ );
/**
* General storage area for tag compiler plugins
@@ -290,21 +328,39 @@ abstract class Smarty_Internal_TemplateCompilerBase
public $_cache = array();
/**
- * counter for prefix variable number
+ * Lexer preg pattern for left delimiter
+ *
+ * @var string
+ */
+ private $ldelPreg = '[{]';
+
+ /**
+ * Lexer preg pattern for right delimiter
+ *
+ * @var string
+ */
+ private $rdelPreg = '[}]';
+
+ /**
+ * Length of right delimiter
*
* @var int
*/
- public static $prefixVariableNumber = 0;
+ private $rdelLength = 0;
/**
- * method to compile a Smarty template
+ * Length of left delimiter
*
- * @param mixed $_content template source
- * @param bool $isTemplateSource
+ * @var int
+ */
+ private $ldelLength = 0;
+
+ /**
+ * Lexer preg pattern for user literals
*
- * @return bool true if compiling succeeded, false if it failed
+ * @var string
*/
- abstract protected function doCompile($_content, $isTemplateSource = false);
+ private $literalPreg = '';
/**
* Initialize compiler
@@ -314,29 +370,44 @@ abstract class Smarty_Internal_TemplateCompilerBase
public function __construct(Smarty $smarty)
{
$this->smarty = $smarty;
- $this->nocache_hash = str_replace(array('.', ','), '_', uniqid(rand(), true));
+ $this->nocache_hash = str_replace(
+ array(
+ '.',
+ ','
+ ),
+ '_',
+ uniqid(mt_rand(), true)
+ );
}
/**
* Method to compile a Smarty template
*
- * @param Smarty_Internal_Template $template template object to compile
- * @param bool $nocache true is shall be compiled in nocache mode
+ * @param Smarty_Internal_Template $template template object to compile
+ * @param bool $nocache true is shall be compiled in nocache mode
* @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
*
* @return bool true if compiling succeeded, false if it failed
* @throws \Exception
*/
- public function compileTemplate(Smarty_Internal_Template $template, $nocache = null,
- Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
- {
+ public function compileTemplate(
+ Smarty_Internal_Template $template,
+ $nocache = null,
+ Smarty_Internal_TemplateCompilerBase $parent_compiler = null
+ ) {
// get code frame of compiled template
- $_compiled_code = $template->smarty->ext->_codeFrame->create($template,
- $this->compileTemplateSource($template, $nocache,
- $parent_compiler),
- $this->postFilter($this->blockOrFunctionCode) .
- join('', $this->mergedSubTemplatesCode), false,
- $this);
+ $_compiled_code = $template->smarty->ext->_codeFrame->create(
+ $template,
+ $this->compileTemplateSource(
+ $template,
+ $nocache,
+ $parent_compiler
+ ),
+ $this->postFilter($this->blockOrFunctionCode) .
+ join('', $this->mergedSubTemplatesCode),
+ false,
+ $this
+ );
return $_compiled_code;
}
@@ -350,9 +421,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
* @return string
* @throws \Exception
*/
- public function compileTemplateSource(Smarty_Internal_Template $template, $nocache = null,
- Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
- {
+ public function compileTemplateSource(
+ Smarty_Internal_Template $template,
+ $nocache = null,
+ Smarty_Internal_TemplateCompilerBase $parent_compiler = null
+ ) {
try {
// save template object in compiler class
$this->template = $template;
@@ -377,6 +450,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
} else {
$this->nocache_hash = $template->compiled->nocache_hash;
}
+ $this->caching = $template->caching;
// flag for nocache sections
$this->nocache = $nocache;
$this->tag_nocache = false;
@@ -387,8 +461,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
// add file dependency
if ($this->smarty->merge_compiled_includes || $this->template->source->handler->checkTimestamps()) {
$this->parent_compiler->template->compiled->file_dependency[ $this->template->source->uid ] =
- array($this->template->source->filepath, $this->template->source->getTimeStamp(),
- $this->template->source->type,);
+ array(
+ $this->template->source->filepath,
+ $this->template->source->getTimeStamp(),
+ $this->template->source->type,
+ );
}
$this->smarty->_current_file = $this->template->source->filepath;
// get template source
@@ -396,14 +473,16 @@ abstract class Smarty_Internal_TemplateCompilerBase
// we have array of inheritance templates by extends: resource
// generate corresponding source code sequence
$_content =
- Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template->source->components);
+ Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template);
} else {
// get template source
$_content = $this->template->source->getContent();
}
$_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true));
- }
- catch (Exception $e) {
+ if (!empty($this->required_plugins[ 'compiled' ]) || !empty($this->required_plugins[ 'nocache' ])) {
+ $_compiled_code = '<?php ' . $this->compileRequiredPlugins() . "?>\n" . $_compiled_code;
+ }
+ } catch (Exception $e) {
if ($this->smarty->debugging) {
$this->smarty->_debug->end_compile($this->template);
}
@@ -433,8 +512,8 @@ abstract class Smarty_Internal_TemplateCompilerBase
public function postFilter($code)
{
// run post filter if on code
- if (!empty($code) &&
- (isset($this->smarty->autoload_filters[ 'post' ]) || isset($this->smarty->registered_filters[ 'post' ]))
+ if (!empty($code)
+ && (isset($this->smarty->autoload_filters[ 'post' ]) || isset($this->smarty->registered_filters[ 'post' ]))
) {
return $this->smarty->ext->_filterHandler->runFilter('post', $code, $this->template);
} else {
@@ -453,8 +532,8 @@ abstract class Smarty_Internal_TemplateCompilerBase
public function preFilter($_content)
{
// run pre filter if required
- if ($_content != '' &&
- ((isset($this->smarty->autoload_filters[ 'pre' ]) || isset($this->smarty->registered_filters[ 'pre' ])))
+ if ($_content !== ''
+ && ((isset($this->smarty->autoload_filters[ 'pre' ]) || isset($this->smarty->registered_filters[ 'pre' ])))
) {
return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template);
} else {
@@ -471,9 +550,9 @@ abstract class Smarty_Internal_TemplateCompilerBase
* Merge tag prefix code with saved one
* (required nested tags in attributes)
*
- * @param string $tag tag name
- * @param array $args array with tag attributes
- * @param array $parameter array with compilation parameter
+ * @param string $tag tag name
+ * @param array $args array with tag attributes
+ * @param array $parameter array with compilation parameter
*
* @throws SmartyCompilerException
* @throws SmartyException
@@ -489,256 +568,6 @@ abstract class Smarty_Internal_TemplateCompilerBase
}
/**
- * Compile Tag
- *
- * @param string $tag tag name
- * @param array $args array with tag attributes
- * @param array $parameter array with compilation parameter
- *
- * @throws SmartyCompilerException
- * @throws SmartyException
- * @return string compiled code
- */
- private function compileTag2($tag, $args, $parameter)
- {
- $plugin_type = '';
- // $args contains the attributes parsed and compiled by the lexer/parser
- // assume that tag does compile into code, but creates no HTML output
- $this->has_code = true;
- $this->has_output = false;
- // log tag/attributes
- if (isset($this->smarty->_cache[ 'get_used_tags' ])) {
- $this->template->_cache[ 'used_tags' ][] = array($tag, $args);
- }
- // check nocache option flag
- foreach ($args as $arg) {
- if (!is_array($arg)) {
- if ($arg == "'nocache'") {
- $this->tag_nocache = true;
- }
- } else {
- foreach ($arg as $k => $v) {
- if ($k == "'nocache'" && (trim($v, "'\" ") == 'true')) {
- $this->tag_nocache = true;
- }
- }
- }
- }
- // compile the smarty tag (required compile classes to compile the tag are auto loaded)
- if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
- if (isset($this->parent_compiler->tpl_function[ $tag ])) {
- // template defined by {template} tag
- $args[ '_attr' ][ 'name' ] = "'" . $tag . "'";
- $_output = $this->callTagCompiler('call', $args, $parameter);
- }
- }
- if ($_output !== false) {
- if ($_output !== true) {
- // did we get compiled code
- if ($this->has_code) {
- // Does it create output?
- if ($this->has_output) {
- $_output .= "\n";
- }
- // return compiled code
- return $_output;
- }
- }
- // tag did not produce compiled code
- return null;
- } else {
- // map_named attributes
- if (isset($args[ '_attr' ])) {
- foreach ($args[ '_attr' ] as $key => $attribute) {
- if (is_array($attribute)) {
- $args = array_merge($args, $attribute);
- }
- }
- }
- // not an internal compiler tag
- if (strlen($tag) < 6 || substr($tag, - 5) != 'close') {
- // check if tag is a registered object
- if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) {
- $method = $parameter[ 'object_method' ];
- if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ]) &&
- (empty($this->smarty->registered_objects[ $tag ][ 1 ]) ||
- in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ]))
- ) {
- return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
- } elseif (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) {
- return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
- $method);
- } else {
- // throw exception
- $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' .
- $tag . '"', null, true);
- }
- }
- // check if tag is registered
- foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK,) as $plugin_type)
- {
- if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) {
- // if compiler function plugin call it now
- if ($plugin_type == Smarty::PLUGIN_COMPILER) {
- $new_args = array();
- foreach ($args as $key => $mixed) {
- if (is_array($mixed)) {
- $new_args = array_merge($new_args, $mixed);
- } else {
- $new_args[ $key ] = $mixed;
- }
- }
- if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) {
- $this->tag_nocache = true;
- }
- return call_user_func_array($this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ],
- array($new_args, $this));
- }
- // compile registered function or block function
- if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) {
- return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
- $tag);
- }
- }
- }
- // check plugins from plugins folder
- foreach ($this->plugin_search_order as $plugin_type) {
- if ($plugin_type == Smarty::PLUGIN_COMPILER &&
- $this->smarty->loadPlugin('smarty_compiler_' . $tag) &&
- (!isset($this->smarty->security_policy) ||
- $this->smarty->security_policy->isTrustedTag($tag, $this))
- ) {
- $plugin = 'smarty_compiler_' . $tag;
- if (is_callable($plugin)) {
- // convert arguments format for old compiler plugins
- $new_args = array();
- foreach ($args as $key => $mixed) {
- if (is_array($mixed)) {
- $new_args = array_merge($new_args, $mixed);
- } else {
- $new_args[ $key ] = $mixed;
- }
- }
-
- return $plugin($new_args, $this->smarty);
- }
- if (class_exists($plugin, false)) {
- $plugin_object = new $plugin;
- if (method_exists($plugin_object, 'compile')) {
- return $plugin_object->compile($args, $this);
- }
- }
- throw new SmartyException("Plugin \"{$tag}\" not callable");
- } else {
- if ($function = $this->getPlugin($tag, $plugin_type)) {
- if (!isset($this->smarty->security_policy) ||
- $this->smarty->security_policy->isTrustedTag($tag, $this)
- ) {
- return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter,
- $tag, $function);
- }
- }
- }
- }
- if (is_callable($this->smarty->default_plugin_handler_func)) {
- $found = false;
- // look for already resolved tags
- foreach ($this->plugin_search_order as $plugin_type) {
- if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) {
- $found = true;
- break;
- }
- }
- if (!$found) {
- // call default handler
- foreach ($this->plugin_search_order as $plugin_type) {
- if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
- $found = true;
- break;
- }
- }
- }
- if ($found) {
- // if compiler function plugin call it now
- if ($plugin_type == Smarty::PLUGIN_COMPILER) {
- $new_args = array();
- foreach ($args as $mixed) {
- $new_args = array_merge($new_args, $mixed);
- }
- return call_user_func_array($this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ],
- array($new_args, $this));
- } else {
- return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
- $tag);
- }
- }
- }
- } else {
- // compile closing tag of block function
- $base_tag = substr($tag, 0, - 5);
- // check if closing tag is a registered object
- if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) {
- $method = $parameter[ 'object_method' ];
- if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) {
- return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
- $method);
- } else {
- // throw exception
- $this->trigger_template_error('not allowed closing tag method "' . $method .
- '" in registered object "' . $base_tag . '"', null, true);
- }
- }
- // registered block tag ?
- if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ]) ||
- isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
- ) {
- return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
- }
- // registered function tag ?
- if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
- return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
- }
- // block plugin?
- if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
- return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
- }
- // function plugin?
- if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) {
- if (!isset($this->smarty->security_policy) ||
- $this->smarty->security_policy->isTrustedTag($tag, $this)
- ) {
- return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function);
- }
- }
- // registered compiler plugin ?
- if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) {
- // if compiler function plugin call it now
- $args = array();
- if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) {
- $this->tag_nocache = true;
- }
- return call_user_func_array($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ],
- array($args, $this));
- }
- if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
- $plugin = 'smarty_compiler_' . $tag;
- if (is_callable($plugin)) {
- return $plugin($args, $this->smarty);
- }
- if (class_exists($plugin, false)) {
- $plugin_object = new $plugin;
- if (method_exists($plugin_object, 'compile')) {
- return $plugin_object->compile($args, $this);
- }
- }
- throw new SmartyException("Plugin \"{$tag}\" not callable");
- }
- }
- $this->trigger_template_error("unknown tag \"" . $tag . "\"", null, true);
- }
- }
-
- /**
* compile variable
*
* @param string $variable
@@ -747,12 +576,17 @@ abstract class Smarty_Internal_TemplateCompilerBase
*/
public function compileVariable($variable)
{
- if (strpos($variable, '(') == 0) {
+ if (!strpos($variable, '(')) {
// not a variable variable
$var = trim($variable, '\'');
$this->tag_nocache = $this->tag_nocache |
- $this->template->ext->getTemplateVars->_getVariable($this->template, $var, null, true,
- false)->nocache;
+ $this->template->ext->getTemplateVars->_getVariable(
+ $this->template,
+ $var,
+ null,
+ true,
+ false
+ )->nocache;
// todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache;
}
return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
@@ -772,6 +606,72 @@ abstract class Smarty_Internal_TemplateCompilerBase
}
/**
+ * compile PHP function call
+ *
+ * @param string $name
+ * @param array $parameter
+ *
+ * @return string
+ * @throws \SmartyCompilerException
+ */
+ public function compilePHPFunctionCall($name, $parameter)
+ {
+ if (!$this->smarty->security_policy || $this->smarty->security_policy->isTrustedPhpFunction($name, $this)) {
+ if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0
+ || strcasecmp($name, 'array') === 0 || is_callable($name)
+ ) {
+ $func_name = strtolower($name);
+ $par = implode(',', $parameter);
+ $parHasFuction = strpos($par, '(') !== false;
+ if ($func_name === 'isset') {
+ if (count($parameter) === 0) {
+ $this->trigger_template_error('Illegal number of parameter in "isset()"');
+ }
+ if ($parHasFuction) {
+ $pa = array();
+ foreach ($parameter as $p) {
+ $pa[] = (strpos($p, '(') === false) ? ('isset(' . $p . ')') : ('(' . $p . ' !== null )');
+ }
+ return '(' . implode(' && ', $pa) . ')';
+ } else {
+ $isset_par = str_replace("')->value", "',null,true,false)->value", $par);
+ }
+ return $name . '(' . $isset_par . ')';
+ } elseif (in_array(
+ $func_name,
+ array(
+ 'empty',
+ 'reset',
+ 'current',
+ 'end',
+ 'prev',
+ 'next'
+ )
+ )
+ ) {
+ if (count($parameter) !== 1) {
+ $this->trigger_template_error("Illegal number of parameter in '{$func_name()}'");
+ }
+ if ($func_name === 'empty') {
+ if ($parHasFuction && version_compare(PHP_VERSION, '5.5.0', '<')) {
+ return '(' . $parameter[ 0 ] . ' === false )';
+ } else {
+ return $func_name . '(' .
+ str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
+ }
+ } else {
+ return $func_name . '(' . $parameter[ 0 ] . ')';
+ }
+ } else {
+ return $name . '(' . implode(',', $parameter) . ')';
+ }
+ } else {
+ $this->trigger_template_error("unknown function '{$name}'");
+ }
+ }
+ }
+
+ /**
* This method is called from parser to process a text content section
* - remove text from inheritance child templates as they may generate output
* - strip text if strip is enabled
@@ -782,45 +682,54 @@ abstract class Smarty_Internal_TemplateCompilerBase
*/
public function processText($text)
{
- if ((string) $text != '') {
+ if ((string)$text != '') {
$store = array();
$_store = 0;
if ($this->parser->strip) {
if (strpos($text, '<') !== false) {
// capture html elements not to be messed with
$_offset = 0;
- if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
- $text, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+ if (preg_match_all(
+ '#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+ $text,
+ $matches,
+ PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+ )
+ ) {
foreach ($matches as $match) {
$store[] = $match[ 0 ][ 0 ];
$_length = strlen($match[ 0 ][ 0 ]);
$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
$text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
-
$_offset += $_length - strlen($replace);
- $_store ++;
+ $_store++;
}
}
$expressions = array(// replace multiple spaces between tags by a single space
- '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s' => '\1 \2',
+ '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s' => '\1 \2',
// remove newline between tags
- '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s' => '\1\2',
+ '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s' => '\1\2',
// remove multiple spaces between attributes (but not in attribute values!)
'#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
- '#>[\040\011]+$#Ss' => '> ', '#>[\040\011]*[\n]\s*$#Ss' => '>',
- $this->stripRegEx => '',);
-
+ '#>[\040\011]+$#Ss' => '> ',
+ '#>[\040\011]*[\n]\s*$#Ss' => '>',
+ $this->stripRegEx => '',
+ );
$text = preg_replace(array_keys($expressions), array_values($expressions), $text);
$_offset = 0;
- if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $text, $matches,
- PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+ if (preg_match_all(
+ '#@!@SMARTY:([0-9]+):SMARTY@!@#is',
+ $text,
+ $matches,
+ PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+ )
+ ) {
foreach ($matches as $match) {
$_length = strlen($match[ 0 ][ 0 ]);
$replace = $store[ $match[ 1 ][ 0 ] ];
$text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
-
$_offset += strlen($replace) - $_length;
- $_store ++;
+ $_store++;
}
}
} else {
@@ -838,149 +747,174 @@ abstract class Smarty_Internal_TemplateCompilerBase
* class name format: Smarty_Internal_Compile_TagName
* plugin filename format: Smarty_Internal_TagName.php
*
- * @param string $tag tag name
- * @param array $args list of tag attributes
- * @param mixed $param1 optional parameter
- * @param mixed $param2 optional parameter
- * @param mixed $param3 optional parameter
+ * @param string $tag tag name
+ * @param array $args list of tag attributes
+ * @param mixed $param1 optional parameter
+ * @param mixed $param2 optional parameter
+ * @param mixed $param3 optional parameter
*
- * @return string compiled code
+ * @return bool|string compiled code or false
+ * @throws \SmartyCompilerException
*/
public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
{
+ /* @var Smarty_Internal_CompileBase $tagCompiler */
+ $tagCompiler = $this->getTagCompiler($tag);
+ // compile this tag
+ return $tagCompiler === false ? false : $tagCompiler->compile($args, $this, $param1, $param2, $param3);
+ }
+
+ /**
+ * lazy loads internal compile plugin for tag compile objects cached for reuse.
+ *
+ * class name format: Smarty_Internal_Compile_TagName
+ * plugin filename format: Smarty_Internal_TagName.php
+ *
+ * @param string $tag tag name
+ *
+ * @return bool|\Smarty_Internal_CompileBase tag compiler object or false if not found
+ */
+ public function getTagCompiler($tag)
+ {
// re-use object if already exists
if (!isset(self::$_tag_objects[ $tag ])) {
// lazy load internal compiler plugin
$_tag = explode('_', $tag);
$_tag = array_map('ucfirst', $_tag);
$class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
- if (class_exists($class_name) &&
- (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
+ if (class_exists($class_name)
+ && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
) {
self::$_tag_objects[ $tag ] = new $class_name;
} else {
self::$_tag_objects[ $tag ] = false;
- return false;
}
}
- // compile this tag
- return self::$_tag_objects[ $tag ] === false ? false :
- self::$_tag_objects[ $tag ]->compile($args, $this, $param1, $param2, $param3);
+ return self::$_tag_objects[ $tag ];
}
/**
* Check for plugins and return function name
*
- * @param $plugin_name
- * @param string $plugin_type type of plugin
+ * @param $plugin_name
+ * @param string $plugin_type type of plugin
*
* @return string call name of function
+ * @throws \SmartyException
*/
public function getPlugin($plugin_name, $plugin_type)
{
$function = null;
- if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
- if (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+ if ($this->caching && ($this->nocache || $this->tag_nocache)) {
+ if (isset($this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
$function =
- $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
- } elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
- $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] =
- $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ];
+ $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+ } elseif (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+ $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] =
+ $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ];
$function =
- $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+ $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
}
} else {
- if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+ if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
$function =
- $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
- } elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
- $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] =
- $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ];
+ $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+ } elseif (isset($this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+ $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] =
+ $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ];
$function =
- $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+ $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
}
}
if (isset($function)) {
- if ($plugin_type == 'modifier') {
+ if ($plugin_type === 'modifier') {
$this->modifier_plugins[ $plugin_name ] = true;
}
-
return $function;
}
// loop through plugin dirs and find the plugin
$function = 'smarty_' . $plugin_type . '_' . $plugin_name;
$file = $this->smarty->loadPlugin($function, false);
-
if (is_string($file)) {
- if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
- $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+ if ($this->caching && ($this->nocache || $this->tag_nocache)) {
+ $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
$file;
- $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+ $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
$function;
} else {
- $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+ $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
$file;
- $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+ $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
$function;
}
- if ($plugin_type == 'modifier') {
+ if ($plugin_type === 'modifier') {
$this->modifier_plugins[ $plugin_name ] = true;
}
-
return $function;
}
if (is_callable($function)) {
// plugin function is defined in the script
return $function;
}
-
return false;
}
/**
* Check for plugins by default plugin handler
*
- * @param string $tag name of tag
- * @param string $plugin_type type of plugin
+ * @param string $tag name of tag
+ * @param string $plugin_type type of plugin
*
- * @return boolean true if found
+ * @return bool true if found
+ * @throws \SmartyCompilerException
*/
public function getPluginFromDefaultHandler($tag, $plugin_type)
{
$callback = null;
$script = null;
$cacheable = true;
- $result = call_user_func_array($this->smarty->default_plugin_handler_func,
- array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable,));
+ $result = call_user_func_array(
+ $this->smarty->default_plugin_handler_func,
+ array(
+ $tag,
+ $plugin_type,
+ $this->template,
+ &$callback,
+ &$script,
+ &$cacheable,
+ )
+ );
if ($result) {
$this->tag_nocache = $this->tag_nocache || !$cacheable;
if ($script !== null) {
if (is_file($script)) {
- if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
- $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] =
+ if ($this->caching && ($this->nocache || $this->tag_nocache)) {
+ $this->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] =
$script;
- $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] =
+ $this->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] =
$callback;
} else {
- $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] =
+ $this->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] =
$script;
- $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] =
+ $this->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] =
$callback;
}
- require_once $script;
+ include_once $script;
} else {
- $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
+ $this->trigger_template_error("Default plugin handler: Returned script file '{$script}' for '{$tag}' not found");
}
}
if (is_callable($callback)) {
- $this->default_handler_plugins[ $plugin_type ][ $tag ] = array($callback, true, array());
-
+ $this->default_handler_plugins[ $plugin_type ][ $tag ] = array(
+ $callback,
+ true,
+ array()
+ );
return true;
} else {
- $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable");
+ $this->trigger_template_error("Default plugin handler: Returned callback for '{$tag}' not callable");
}
}
-
return false;
}
@@ -994,9 +928,9 @@ abstract class Smarty_Internal_TemplateCompilerBase
*/
public function appendCode($left, $right)
{
- if (preg_match('/\s*\?>\s*$/', $left) && preg_match('/^\s*<\?php\s+/', $right)) {
- $left = preg_replace('/\s*\?>\s*$/', "\n", $left);
- $left .= preg_replace('/^\s*<\?php\s+/', '', $right);
+ if (preg_match('/\s*\?>\s?$/D', $left) && preg_match('/^<\?php\s+/', $right)) {
+ $left = preg_replace('/\s*\?>\s?$/D', "\n", $left);
+ $left .= preg_replace('/^<\?php\s+/', '', $right);
} else {
$left .= $right;
}
@@ -1009,8 +943,8 @@ abstract class Smarty_Internal_TemplateCompilerBase
* If the content is compiled code and it should be not cached the code is injected
* into the rendered output.
*
- * @param string $content content of template element
- * @param boolean $is_code true if content is compiled code
+ * @param string $content content of template element
+ * @param boolean $is_code true if content is compiled code
*
* @return string content
*/
@@ -1019,19 +953,19 @@ abstract class Smarty_Internal_TemplateCompilerBase
// If the template is not evaluated and we have a nocache section and or a nocache tag
if ($is_code && !empty($content)) {
// generate replacement code
- if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->template->caching &&
- !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
+ if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->caching
+ && !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
) {
$this->template->compiled->has_nocache_code = true;
$_output = addcslashes($content, '\'\\');
- $_output = str_replace("^#^", "'", $_output);
- $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output .
- "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
+ $_output = str_replace('^#^', '\'', $_output);
+ $_output =
+ "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/{$_output}/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
// make sure we include modifier plugins for nocache code
foreach ($this->modifier_plugins as $plugin_name => $dummy) {
- if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) {
- $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] =
- $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ];
+ if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) {
+ $this->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] =
+ $this->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ];
}
}
} else {
@@ -1043,7 +977,6 @@ abstract class Smarty_Internal_TemplateCompilerBase
$this->modifier_plugins = array();
$this->suppressNocacheProcessing = false;
$this->tag_nocache = false;
-
return $_output;
}
@@ -1106,11 +1039,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
{
$_scope = 0;
if (isset($_attr[ 'scope' ])) {
- $_scopeName = trim($_attr[ 'scope' ], "'\"");
+ $_scopeName = trim($_attr[ 'scope' ], '\'"');
if (is_numeric($_scopeName) && in_array($_scopeName, $validScopes)) {
$_scope = $_scopeName;
} elseif (is_string($_scopeName)) {
- $_scopeName = trim($_scopeName, "'\"");
+ $_scopeName = trim($_scopeName, '\'"');
$_scope = isset($validScopes[ $_scopeName ]) ? $validScopes[ $_scopeName ] : false;
} else {
$_scope = false;
@@ -1133,7 +1066,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
public function makeNocacheCode($code)
{
return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/<?php " .
- str_replace("^#^", "'", addcslashes($code, '\'\\')) .
+ str_replace('^#^', '\'', addcslashes($code, '\'\\')) .
"?>/*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n";
}
@@ -1143,8 +1076,8 @@ abstract class Smarty_Internal_TemplateCompilerBase
* In this case the parser is called to obtain information about expected tokens.
* If parameter $args contains a string this is used as error message
*
- * @param string $args individual error message or null
- * @param string $line line-number
+ * @param string $args individual error message or null
+ * @param string $line line-number
* @param null|bool $tagline if true the line number of last tag
*
* @throws \SmartyCompilerException when an unexpected token is found
@@ -1159,18 +1092,28 @@ abstract class Smarty_Internal_TemplateCompilerBase
// get template source line which has error
$line = $lex->line;
} else {
- $line = (int) $line;
+ $line = (int)$line;
}
-
- if (in_array($this->template->source->type, array('eval', 'string'))) {
- $templateName = $this->template->source->type . ':' . trim(preg_replace('![\t\r\n]+!', ' ',
- strlen($lex->data) > 40 ?
- substr($lex->data, 0, 40) .
- '...' : $lex->data));
+ if (in_array(
+ $this->template->source->type,
+ array(
+ 'eval',
+ 'string'
+ )
+ )
+ ) {
+ $templateName = $this->template->source->type . ':' . trim(
+ preg_replace(
+ '![\t\r\n]+!',
+ ' ',
+ strlen($lex->data) > 40 ?
+ substr($lex->data, 0, 40) .
+ '...' : $lex->data
+ )
+ );
} else {
$templateName = $this->template->source->type . ':' . $this->template->source->filepath;
}
-
// $line += $this->trace_line_offset;
$match = preg_split("/\n/", $lex->data);
$error_text =
@@ -1198,6 +1141,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
$error_text .= ', expected one of: ' . implode(' , ', $expect);
}
}
+ if ($this->smarty->_parserdebug) {
+ $this->parser->errorRunDown();
+ echo ob_get_clean();
+ flush();
+ }
$e = new SmartyCompilerException($error_text);
$e->line = $line;
$e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
@@ -1209,7 +1157,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
/**
* Return var_export() value with all white spaces removed
*
- * @param mixed $value
+ * @param mixed $value
*
* @return string
*/
@@ -1219,6 +1167,148 @@ abstract class Smarty_Internal_TemplateCompilerBase
}
/**
+ * enter double quoted string
+ * - save tag stack count
+ */
+ public function enterDoubleQuote()
+ {
+ array_push($this->_tag_stack_count, $this->getTagStackCount());
+ }
+
+ /**
+ * Return tag stack count
+ *
+ * @return int
+ */
+ public function getTagStackCount()
+ {
+ return count($this->_tag_stack);
+ }
+
+ /**
+ * @param $lexerPreg
+ *
+ * @return mixed
+ */
+ public function replaceDelimiter($lexerPreg)
+ {
+ return str_replace(
+ array('SMARTYldel', 'SMARTYliteral', 'SMARTYrdel', 'SMARTYautoliteral', 'SMARTYal'),
+ array(
+ $this->ldelPreg, $this->literalPreg, $this->rdelPreg,
+ $this->smarty->getAutoLiteral() ? '{1,}' : '{9}',
+ $this->smarty->getAutoLiteral() ? '' : '\\s*'
+ ),
+ $lexerPreg
+ );
+ }
+
+ /**
+ * Build lexer regular expressions for left and right delimiter and user defined literals
+ */
+ public function initDelimiterPreg()
+ {
+ $ldel = $this->smarty->getLeftDelimiter();
+ $this->ldelLength = strlen($ldel);
+ $this->ldelPreg = '';
+ foreach (str_split($ldel, 1) as $chr) {
+ $this->ldelPreg .= '[' . preg_quote($chr,'/') . ']';
+ }
+ $rdel = $this->smarty->getRightDelimiter();
+ $this->rdelLength = strlen($rdel);
+ $this->rdelPreg = '';
+ foreach (str_split($rdel, 1) as $chr) {
+ $this->rdelPreg .= '[' . preg_quote($chr,'/') . ']';
+ }
+ $literals = $this->smarty->getLiterals();
+ if (!empty($literals)) {
+ foreach ($literals as $key => $literal) {
+ $literalPreg = '';
+ foreach (str_split($literal, 1) as $chr) {
+ $literalPreg .= '[' . preg_quote($chr,'/') . ']';
+ }
+ $literals[ $key ] = $literalPreg;
+ }
+ $this->literalPreg = '|' . implode('|', $literals);
+ } else {
+ $this->literalPreg = '';
+ }
+ }
+
+ /**
+ * leave double quoted string
+ * - throw exception if block in string was not closed
+ *
+ * @throws \SmartyCompilerException
+ */
+ public function leaveDoubleQuote()
+ {
+ if (array_pop($this->_tag_stack_count) !== $this->getTagStackCount()) {
+ $tag = $this->getOpenBlockTag();
+ $this->trigger_template_error(
+ "unclosed '{{$tag}}' in doubled quoted string",
+ null,
+ true
+ );
+ }
+ }
+
+ /**
+ * Get left delimiter preg
+ *
+ * @return string
+ */
+ public function getLdelPreg()
+ {
+ return $this->ldelPreg;
+ }
+
+ /**
+ * Get right delimiter preg
+ *
+ * @return string
+ */
+ public function getRdelPreg()
+ {
+ return $this->rdelPreg;
+ }
+
+ /**
+ * Get length of left delimiter
+ *
+ * @return int
+ */
+ public function getLdelLength()
+ {
+ return $this->ldelLength;
+ }
+
+ /**
+ * Get length of right delimiter
+ *
+ * @return int
+ */
+ public function getRdelLength()
+ {
+ return $this->rdelLength;
+ }
+
+ /**
+ * Get name of current open block tag
+ *
+ * @return string|boolean
+ */
+ public function getOpenBlockTag()
+ {
+ $tagCount = $this->getTagStackCount();
+ if ($tagCount) {
+ return $this->_tag_stack[ $tagCount - 1 ][ 0 ];
+ } else {
+ return false;
+ }
+ }
+
+ /**
* Check if $value contains variable elements
*
* @param mixed $value
@@ -1251,7 +1341,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
*/
public function getNewPrefixVariable()
{
- self::$prefixVariableNumber ++;
+ ++self::$prefixVariableNumber;
return $this->getPrefixVariable();
}
@@ -1292,4 +1382,375 @@ abstract class Smarty_Internal_TemplateCompilerBase
return $code;
}
+ /**
+ * Save current required plugins
+ *
+ * @param bool $init if true init required plugins
+ */
+ public function saveRequiredPlugins($init = false)
+ {
+ $this->required_plugins_stack[] = $this->required_plugins;
+ if ($init) {
+ $this->required_plugins = array('compiled' => array(), 'nocache' => array());
+ }
+ }
+
+ /**
+ * Restore required plugins
+ */
+ public function restoreRequiredPlugins()
+ {
+ $this->required_plugins = array_pop($this->required_plugins_stack);
+ }
+
+ /**
+ * Compile code to call Smarty_Internal_Template::_checkPlugins()
+ * for required plugins
+ *
+ * @return string
+ */
+ public function compileRequiredPlugins()
+ {
+ $code = $this->compileCheckPlugins($this->required_plugins[ 'compiled' ]);
+ if ($this->caching && !empty($this->required_plugins[ 'nocache' ])) {
+ $code .= $this->makeNocacheCode($this->compileCheckPlugins($this->required_plugins[ 'nocache' ]));
+ }
+ return $code;
+ }
+
+ /**
+ * Compile code to call Smarty_Internal_Template::_checkPlugins
+ * - checks if plugin is callable require otherwise
+ *
+ * @param $requiredPlugins
+ *
+ * @return string
+ */
+ public function compileCheckPlugins($requiredPlugins)
+ {
+ if (!empty($requiredPlugins)) {
+ $plugins = array();
+ foreach ($requiredPlugins as $plugin) {
+ foreach ($plugin as $data) {
+ $plugins[] = $data;
+ }
+ }
+ return '$_smarty_tpl->_checkPlugins(' . $this->getVarExport($plugins) . ');' . "\n";
+ } else {
+ return '';
+ }
+ }
+
+ /**
+ * method to compile a Smarty template
+ *
+ * @param mixed $_content template source
+ * @param bool $isTemplateSource
+ *
+ * @return bool true if compiling succeeded, false if it failed
+ */
+ abstract protected function doCompile($_content, $isTemplateSource = false);
+
+ /**
+ * Compile Tag
+ *
+ * @param string $tag tag name
+ * @param array $args array with tag attributes
+ * @param array $parameter array with compilation parameter
+ *
+ * @throws SmartyCompilerException
+ * @throws SmartyException
+ * @return string compiled code
+ */
+ private function compileTag2($tag, $args, $parameter)
+ {
+ $plugin_type = '';
+ // $args contains the attributes parsed and compiled by the lexer/parser
+ // assume that tag does compile into code, but creates no HTML output
+ $this->has_code = true;
+ // log tag/attributes
+ if (isset($this->smarty->_cache[ 'get_used_tags' ])) {
+ $this->template->_cache[ 'used_tags' ][] = array(
+ $tag,
+ $args
+ );
+ }
+ // check nocache option flag
+ foreach ($args as $arg) {
+ if (!is_array($arg)) {
+ if ($arg === "'nocache'" || $arg === 'nocache') {
+ $this->tag_nocache = true;
+ }
+ } else {
+ foreach ($arg as $k => $v) {
+ if (($k === "'nocache'" || $k === 'nocache') && (trim($v, "'\" ") === 'true')) {
+ $this->tag_nocache = true;
+ }
+ }
+ }
+ }
+ // compile the smarty tag (required compile classes to compile the tag are auto loaded)
+ if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
+ if (isset($this->parent_compiler->tpl_function[ $tag ])
+ || (isset($this->template->smarty->ext->_tplFunction)
+ && $this->template->smarty->ext->_tplFunction->getTplFunction($this->template, $tag) !== false)
+ ) {
+ // template defined by {template} tag
+ $args[ '_attr' ][ 'name' ] = "'{$tag}'";
+ $_output = $this->callTagCompiler('call', $args, $parameter);
+ }
+ }
+ if ($_output !== false) {
+ if ($_output !== true) {
+ // did we get compiled code
+ if ($this->has_code) {
+ // return compiled code
+ return $_output;
+ }
+ }
+ // tag did not produce compiled code
+ return null;
+ } else {
+ // map_named attributes
+ if (isset($args[ '_attr' ])) {
+ foreach ($args[ '_attr' ] as $key => $attribute) {
+ if (is_array($attribute)) {
+ $args = array_merge($args, $attribute);
+ }
+ }
+ }
+ // not an internal compiler tag
+ if (strlen($tag) < 6 || substr($tag, -5) !== 'close') {
+ // check if tag is a registered object
+ if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) {
+ $method = $parameter[ 'object_method' ];
+ if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])
+ && (empty($this->smarty->registered_objects[ $tag ][ 1 ])
+ || in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ]))
+ ) {
+ return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
+ } elseif (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) {
+ return $this->callTagCompiler(
+ 'private_object_block_function',
+ $args,
+ $parameter,
+ $tag,
+ $method
+ );
+ } else {
+ // throw exception
+ $this->trigger_template_error(
+ 'not allowed method "' . $method . '" in registered object "' .
+ $tag . '"',
+ null,
+ true
+ );
+ }
+ }
+ // check if tag is registered
+ foreach (array(
+ Smarty::PLUGIN_COMPILER,
+ Smarty::PLUGIN_FUNCTION,
+ Smarty::PLUGIN_BLOCK,
+ ) as $plugin_type) {
+ if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) {
+ // if compiler function plugin call it now
+ if ($plugin_type === Smarty::PLUGIN_COMPILER) {
+ $new_args = array();
+ foreach ($args as $key => $mixed) {
+ if (is_array($mixed)) {
+ $new_args = array_merge($new_args, $mixed);
+ } else {
+ $new_args[ $key ] = $mixed;
+ }
+ }
+ if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) {
+ $this->tag_nocache = true;
+ }
+ return call_user_func_array(
+ $this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ],
+ array(
+ $new_args,
+ $this
+ )
+ );
+ }
+ // compile registered function or block function
+ if ($plugin_type === Smarty::PLUGIN_FUNCTION || $plugin_type === Smarty::PLUGIN_BLOCK) {
+ return $this->callTagCompiler(
+ 'private_registered_' . $plugin_type,
+ $args,
+ $parameter,
+ $tag
+ );
+ }
+ }
+ }
+ // check plugins from plugins folder
+ foreach ($this->plugin_search_order as $plugin_type) {
+ if ($plugin_type === Smarty::PLUGIN_COMPILER
+ && $this->smarty->loadPlugin('smarty_compiler_' . $tag)
+ && (!isset($this->smarty->security_policy)
+ || $this->smarty->security_policy->isTrustedTag($tag, $this))
+ ) {
+ $plugin = 'smarty_compiler_' . $tag;
+ if (is_callable($plugin)) {
+ // convert arguments format for old compiler plugins
+ $new_args = array();
+ foreach ($args as $key => $mixed) {
+ if (is_array($mixed)) {
+ $new_args = array_merge($new_args, $mixed);
+ } else {
+ $new_args[ $key ] = $mixed;
+ }
+ }
+ return $plugin($new_args, $this->smarty);
+ }
+ if (class_exists($plugin, false)) {
+ $plugin_object = new $plugin;
+ if (method_exists($plugin_object, 'compile')) {
+ return $plugin_object->compile($args, $this);
+ }
+ }
+ throw new SmartyException("Plugin '{$tag}' not callable");
+ } else {
+ if ($function = $this->getPlugin($tag, $plugin_type)) {
+ if (!isset($this->smarty->security_policy)
+ || $this->smarty->security_policy->isTrustedTag($tag, $this)
+ ) {
+ return $this->callTagCompiler(
+ 'private_' . $plugin_type . '_plugin',
+ $args,
+ $parameter,
+ $tag,
+ $function
+ );
+ }
+ }
+ }
+ }
+ if (is_callable($this->smarty->default_plugin_handler_func)) {
+ $found = false;
+ // look for already resolved tags
+ foreach ($this->plugin_search_order as $plugin_type) {
+ if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) {
+ $found = true;
+ break;
+ }
+ }
+ if (!$found) {
+ // call default handler
+ foreach ($this->plugin_search_order as $plugin_type) {
+ if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
+ $found = true;
+ break;
+ }
+ }
+ }
+ if ($found) {
+ // if compiler function plugin call it now
+ if ($plugin_type === Smarty::PLUGIN_COMPILER) {
+ $new_args = array();
+ foreach ($args as $key => $mixed) {
+ if (is_array($mixed)) {
+ $new_args = array_merge($new_args, $mixed);
+ } else {
+ $new_args[ $key ] = $mixed;
+ }
+ }
+ return call_user_func_array(
+ $this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ],
+ array(
+ $new_args,
+ $this
+ )
+ );
+ } else {
+ return $this->callTagCompiler(
+ 'private_registered_' . $plugin_type,
+ $args,
+ $parameter,
+ $tag
+ );
+ }
+ }
+ }
+ } else {
+ // compile closing tag of block function
+ $base_tag = substr($tag, 0, -5);
+ // check if closing tag is a registered object
+ if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) {
+ $method = $parameter[ 'object_method' ];
+ if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) {
+ return $this->callTagCompiler(
+ 'private_object_block_function',
+ $args,
+ $parameter,
+ $tag,
+ $method
+ );
+ } else {
+ // throw exception
+ $this->trigger_template_error(
+ 'not allowed closing tag method "' . $method .
+ '" in registered object "' . $base_tag . '"',
+ null,
+ true
+ );
+ }
+ }
+ // registered block tag ?
+ if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
+ || isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
+ ) {
+ return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
+ }
+ // registered function tag ?
+ if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
+ return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
+ }
+ // block plugin?
+ if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
+ return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
+ }
+ // function plugin?
+ if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) {
+ if (!isset($this->smarty->security_policy)
+ || $this->smarty->security_policy->isTrustedTag($tag, $this)
+ ) {
+ return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function);
+ }
+ }
+ // registered compiler plugin ?
+ if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) {
+ // if compiler function plugin call it now
+ $args = array();
+ if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) {
+ $this->tag_nocache = true;
+ }
+ return call_user_func_array(
+ $this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ],
+ array(
+ $args,
+ $this
+ )
+ );
+ }
+ if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
+ $plugin = 'smarty_compiler_' . $tag;
+ if (is_callable($plugin)) {
+ return $plugin($args, $this->smarty);
+ }
+ if (class_exists($plugin, false)) {
+ $plugin_object = new $plugin;
+ if (method_exists($plugin_object, 'compile')) {
+ return $plugin_object->compile($args, $this);
+ }
+ }
+ throw new SmartyException("Plugin '{$tag}' not callable");
+ }
+ }
+ $this->trigger_template_error("unknown tag '{$tag}'", null, true);
+ }
+ }
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_templatelexer.php b/lib/smarty3/sysplugins/smarty_internal_templatelexer.php
index be8a35d..c6c49ef 100644
--- a/lib/smarty3/sysplugins/smarty_internal_templatelexer.php
+++ b/lib/smarty3/sysplugins/smarty_internal_templatelexer.php
@@ -18,6 +18,12 @@
*/
class Smarty_Internal_Templatelexer
{
+ const TEXT = 1;
+ const TAG = 2;
+ const TAGBODY = 3;
+ const LITERAL = 4;
+ const DOUBLEQUOTEDSTRING = 5;
+
/**
* Source
*
@@ -26,6 +32,13 @@ class Smarty_Internal_Templatelexer
public $data;
/**
+ * Source length
+ *
+ * @var int
+ */
+ public $dataLength = null;
+
+ /**
* byte counter
*
* @var int
@@ -68,34 +81,6 @@ class Smarty_Internal_Templatelexer
public $phpType = '';
/**
- * escaped left delimiter
- *
- * @var string
- */
- public $ldel = '';
-
- /**
- * escaped left delimiter length
- *
- * @var int
- */
- public $ldel_length = 0;
-
- /**
- * escaped right delimiter
- *
- * @var string
- */
- public $rdel = '';
-
- /**
- * escaped right delimiter length
- *
- * @var int
- */
- public $rdel_length = 0;
-
- /**
* state number
*
* @var int
@@ -117,19 +102,6 @@ class Smarty_Internal_Templatelexer
public $compiler = null;
/**
- * literal tag nesting level
- *
- * @var int
- */
- private $literal_cnt = 0;
-
- /**
- * PHP start tag string
- *
- * @var string
- */
-
- /**
* trace file
*
* @var resource
@@ -144,10 +116,10 @@ class Smarty_Internal_Templatelexer
public $yyTracePrompt;
/**
- * XML flag true while processing xml
- *
- * @var bool
- */
+ * XML flag true while processing xml
+ *
+ * @var bool
+ */
public $is_xml = false;
/**
@@ -158,105 +130,149 @@ class Smarty_Internal_Templatelexer
public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
/**
- * storage for assembled token patterns
+ * token names
+ *
+ * @var array
+ */
+ public $smarty_token_names = array( // Text for parser error messages
+ 'NOT' => '(!,not)',
+ 'OPENP' => '(',
+ 'CLOSEP' => ')',
+ 'OPENB' => '[',
+ 'CLOSEB' => ']',
+ 'PTR' => '->',
+ 'APTR' => '=>',
+ 'EQUAL' => '=',
+ 'NUMBER' => 'number',
+ 'UNIMATH' => '+" , "-',
+ 'MATH' => '*" , "/" , "%',
+ 'INCDEC' => '++" , "--',
+ 'SPACE' => ' ',
+ 'DOLLAR' => '$',
+ 'SEMICOLON' => ';',
+ 'COLON' => ':',
+ 'DOUBLECOLON' => '::',
+ 'AT' => '@',
+ 'HATCH' => '#',
+ 'QUOTE' => '"',
+ 'BACKTICK' => '`',
+ 'VERT' => '"|" modifier',
+ 'DOT' => '.',
+ 'COMMA' => '","',
+ 'QMARK' => '"?"',
+ 'ID' => 'id, name',
+ 'TEXT' => 'text',
+ 'LDELSLASH' => '{/..} closing tag',
+ 'LDEL' => '{...} Smarty tag',
+ 'COMMENT' => 'comment',
+ 'AS' => 'as',
+ 'TO' => 'to',
+ 'PHP' => '"<?php", "<%", "{php}" tag',
+ 'LOGOP' => '"<", "==" ... logical operator',
+ 'TLOGOP' => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+ 'SCOND' => '"is even" ... if condition',
+ );
+
+ /**
+ * literal tag nesting level
+ *
+ * @var int
+ */
+ private $literal_cnt = 0;
+
+ /**
+ * preg token pattern for state TEXT
*
* @var string
*/
private $yy_global_pattern1 = null;
+ /**
+ * preg token pattern for state TAG
+ *
+ * @var string
+ */
private $yy_global_pattern2 = null;
+ /**
+ * preg token pattern for state TAGBODY
+ *
+ * @var string
+ */
private $yy_global_pattern3 = null;
+ /**
+ * preg token pattern for state LITERAL
+ *
+ * @var string
+ */
private $yy_global_pattern4 = null;
- private $yy_global_pattern5 = null;
-
/**
- * token names
+ * preg token pattern for state DOUBLEQUOTEDSTRING
*
- * @var array
+ * @var null
*/
- public $smarty_token_names = array( // Text for parser error messages
- 'NOT' => '(!,not)',
- 'OPENP' => '(',
- 'CLOSEP' => ')',
- 'OPENB' => '[',
- 'CLOSEB' => ']',
- 'PTR' => '->',
- 'APTR' => '=>',
- 'EQUAL' => '=',
- 'NUMBER' => 'number',
- 'UNIMATH' => '+" , "-',
- 'MATH' => '*" , "/" , "%',
- 'INCDEC' => '++" , "--',
- 'SPACE' => ' ',
- 'DOLLAR' => '$',
- 'SEMICOLON' => ';',
- 'COLON' => ':',
- 'DOUBLECOLON' => '::',
- 'AT' => '@',
- 'HATCH' => '#',
- 'QUOTE' => '"',
- 'BACKTICK' => '`',
- 'VERT' => '"|" modifier',
- 'DOT' => '.',
- 'COMMA' => '","',
- 'QMARK' => '"?"',
- 'ID' => 'id, name',
- 'TEXT' => 'text',
- 'LDELSLASH' => '{/..} closing tag',
- 'LDEL' => '{...} Smarty tag',
- 'COMMENT' => 'comment',
- 'AS' => 'as',
- 'TO' => 'to',
- 'PHP' => '"<?php", "<%", "{php}" tag',
- 'LOGOP' => '"<", "==" ... logical operator',
- 'TLOGOP' => '"lt", "eq" ... logical operator; "is div by" ... if condition',
- 'SCOND' => '"is even" ... if condition',
- );
+ private $yy_global_pattern5 = null;
+
+ private $_yy_state = 1;
+
+ private $_yy_stack = array();
/**
* constructor
*
- * @param string $data template source
+ * @param string $source template source
* @param Smarty_Internal_TemplateCompilerBase $compiler
*/
- function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler)
+ public function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler)
{
- $this->data = $data;
+ $this->data = $source;
+ $this->dataLength = strlen($this->data);
$this->counter = 0;
if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) {
- $this->counter += strlen($match[0]);
+ $this->counter += strlen($match[ 0 ]);
}
$this->line = 1;
- $this->smarty = $compiler->smarty;
+ $this->smarty = $compiler->template->smarty;
$this->compiler = $compiler;
- $this->ldel = preg_quote($this->smarty->left_delimiter, '/');
- $this->ldel_length = strlen($this->smarty->left_delimiter);
- $this->rdel = preg_quote($this->smarty->right_delimiter, '/');
- $this->rdel_length = strlen($this->smarty->right_delimiter);
- $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter;
- $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter;
+ $this->compiler->initDelimiterPreg();
+ $this->smarty_token_names[ 'LDEL' ] = $this->smarty->getLeftDelimiter();
+ $this->smarty_token_names[ 'RDEL' ] = $this->smarty->getRightDelimiter();
}
- public function PrintTrace()
- {
+ /**
+ * open lexer/parser trace file
+ *
+ */
+ public function PrintTrace()
+ {
$this->yyTraceFILE = fopen('php://output', 'w');
$this->yyTracePrompt = '<br>';
- }
+ }
- /*
- * Check if this tag is autoliteral
- */
- public function isAutoLiteral ()
- {
- return $this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false;
- }
+ /**
+ * replace placeholders with runtime preg code
+ *
+ * @param string $preg
+ *
+ * @return string
+ */
+ public function replace($preg)
+ {
+ return $this->compiler->replaceDelimiter($preg);
+ }
-
- private $_yy_state = 1;
- private $_yy_stack = array();
+ /**
+ * check if current value is an autoliteral left delimiter
+ *
+ * @return bool
+ */
+ public function isAutoLiteral()
+ {
+ return $this->smarty->getAutoLiteral() && isset($this->value[ $this->compiler->getLdelLength() ]) ?
+ strpos(" \n\t\r", $this->value[ $this->compiler->getLdelLength() ]) !== false : false;
+ } // end function
public function yylex()
{
@@ -266,56 +282,65 @@ class Smarty_Internal_Templatelexer
public function yypushstate($state)
{
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+ fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
+ isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
}
array_push($this->_yy_stack, $this->_yy_state);
$this->_yy_state = $state;
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+ fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+ isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
}
}
public function yypopstate()
{
- if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+ if ($this->yyTraceFILE) {
+ fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
+ isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
}
- $this->_yy_state = array_pop($this->_yy_stack);
+ $this->_yy_state = array_pop($this->_yy_stack);
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+ fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+ isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
}
-
}
public function yybegin($state)
{
- $this->_yy_state = $state;
+ $this->_yy_state = $state;
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+ fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
+ isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state);
}
}
-
-
public function yylex1()
{
if (!isset($this->yy_global_pattern1)) {
- $this->yy_global_pattern1 = "/\G([{][}])|\G(".$this->ldel."[*])|\G((".$this->ldel."\\s*php([ ].*?)?".$this->rdel.")|(".$this->ldel."\\s*[\/]php".$this->rdel."))|\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*)|\G(\\s*".$this->rdel.")|\G((<[?]((php\\s+|=)|\\s+))|(<[%])|(<[?]xml\\s+)|(<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|([?][>])|([%][>]))|\G([\S\s])/isS";
+ $this->yy_global_pattern1 =
+ $this->replace("/\G([{][}])|\G((SMARTYldel)SMARTYal[*])|\G((SMARTYldel)SMARTYalphp([ ].*?)?SMARTYrdel|(SMARTYldel)SMARTYal[\/]phpSMARTYrdel)|\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([<][?]((php\\s+|=)|\\s+)|[<][%]|[<][?]xml\\s+|[<]script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*[>]|[?][>]|[%][>])|\G((.*?)(?=((SMARTYldel)SMARTYal|[<][?]((php\\s+|=)|\\s+)|[<][%]|[<][?]xml\\s+|[<]script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*[>]|[?][>]|[%][>]SMARTYliteral))|[\s\S]+)/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state TEXT');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state TEXT');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -333,108 +358,102 @@ class Smarty_Internal_Templatelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
+ }
- } // end function
-
-
- const TEXT = 1;
- function yy_r1_1()
+ public function yy_r1_1()
{
+ $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- }
- function yy_r1_2()
+ public function yy_r1_2()
{
-
- preg_match("/[*]{$this->rdel}/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
- if (isset($match[0][1])) {
- $to = $match[0][1] + strlen($match[0][0]);
+ preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/", $this->data, $match, PREG_OFFSET_CAPTURE,
+ $this->counter);
+ if (isset($match[ 0 ][ 1 ])) {
+ $to = $match[ 0 ][ 1 ] + strlen($match[ 0 ][ 0 ]);
} else {
- $this->compiler->trigger_template_error ("missing or misspelled comment closing tag '*{$this->smarty->right_delimiter}'");
+ $this->compiler->trigger_template_error("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
}
- $this->value = substr($this->data,$this->counter,$to-$this->counter);
+ $this->value = substr($this->data, $this->counter, $to - $this->counter);
return false;
- }
- function yy_r1_3()
+ }
+
+ public function yy_r1_4()
{
+ $this->compiler->getTagCompiler('private_php')->parsePhp($this);
+ }
- $obj = new Smarty_Internal_Compile_Private_Php();
- $obj->parsePhp($this);
- }
- function yy_r1_7()
+ public function yy_r1_8()
{
+ $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+ }
- if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- } else {
- $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
- $this->yypushstate(self::LITERAL);
- }
- }
- function yy_r1_8()
+ public function yy_r1_10()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+ $this->yypushstate(self::LITERAL);
+ }
- if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- } else {
- $this->yypushstate(self::TAG);
- return true;
- }
- }
- function yy_r1_9()
+ public function yy_r1_12()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+ $this->yypushstate(self::LITERAL);
+ } // end function
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- }
- function yy_r1_10()
+ public function yy_r1_14()
{
+ $this->yypushstate(self::TAG);
+ return true;
+ }
- $obj = new Smarty_Internal_Compile_Private_Php();
- $obj->parsePhp($this);
- }
- function yy_r1_19()
+ public function yy_r1_16()
{
+ $this->compiler->getTagCompiler('private_php')->parsePhp($this);
+ }
- $to = strlen($this->data);
- preg_match("/($this->ldel)|(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<script\s+language\s*=\s*[\"']?\s*php\s*[\"']?\s*>)|([?][>])|([%][>])/i",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
- if (isset($match[0][1])) {
- $to = $match[0][1];
- }
- $this->value = substr($this->data,$this->counter,$to-$this->counter);
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- }
+ public function yy_r1_19()
+ {
+ $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+ }
-
public function yylex2()
{
if (!isset($this->yy_global_pattern2)) {
- $this->yy_global_pattern2 = "/\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s*setfilter\\s+)|\G(".$this->ldel."\\s*make_nocache\\s+)|\G(".$this->ldel."\\s*[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*".$this->rdel.")|\G(".$this->ldel."\\s*[\/](?:(?!block)[0-9]*[a-zA-Z_]\\w*)\\s*".$this->rdel.")|\G(".$this->ldel."\\s*[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*".$this->rdel.")|\G(".$this->ldel."\\s*[\/])|\G(".$this->ldel."\\s*)/isS";
+ $this->yy_global_pattern2 =
+ $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYalmake_nocache\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state TAG');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state TAG');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -452,120 +471,130 @@ class Smarty_Internal_Templatelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
+ }
- } // end function
-
-
- const TAG = 2;
- function yy_r2_1()
+ public function yy_r2_1()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+ $this->yybegin(self::TAGBODY);
+ $this->taglineno = $this->line;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
- $this->yybegin(self::TAGBODY);
- $this->taglineno = $this->line;
- }
- function yy_r2_3()
+ public function yy_r2_4()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+ $this->yybegin(self::TAGBODY);
+ $this->taglineno = $this->line;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
- $this->yybegin(self::TAGBODY);
- $this->taglineno = $this->line;
- }
- function yy_r2_4()
+ public function yy_r2_6()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+ $this->yybegin(self::TAGBODY);
+ $this->taglineno = $this->line;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
- $this->yybegin(self::TAGBODY);
- $this->taglineno = $this->line;
- }
- function yy_r2_5()
+ public function yy_r2_8()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+ $this->yybegin(self::TAGBODY);
+ $this->taglineno = $this->line;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
- $this->yybegin(self::TAGBODY);
- $this->taglineno = $this->line;
- }
- function yy_r2_6()
+ public function yy_r2_10()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
+ $this->yybegin(self::TAGBODY);
+ $this->taglineno = $this->line;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
- $this->yybegin(self::TAGBODY);
- $this->taglineno = $this->line;
- }
- function yy_r2_7()
+ public function yy_r2_12()
{
+ $this->yypopstate();
+ $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+ $this->taglineno = $this->line;
+ }
- $this->yypopstate();
- $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
- $this->taglineno = $this->line;
- }
- function yy_r2_9()
+ public function yy_r2_15()
{
+ $this->yypopstate();
+ $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+ $this->taglineno = $this->line;
+ }
- $this->yypopstate();
- $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
- $this->taglineno = $this->line;
- }
- function yy_r2_10()
+ public function yy_r2_18()
{
+ $this->yypopstate();
+ $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+ $this->taglineno = $this->line;
+ }
- if ($this->_yy_stack[count($this->_yy_stack)-1] == self::TEXT) {
+ public function yy_r2_20()
+ {
+ if ($this->_yy_stack[ count($this->_yy_stack) - 1 ] === self::TEXT) {
$this->yypopstate();
$this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
$this->taglineno = $this->line;
- } else {
- $this->value = $this->smarty->left_delimiter;
+ } else {
+ $this->value = $this->smarty->getLeftDelimiter();
$this->token = Smarty_Internal_Templateparser::TP_LDEL;
$this->yybegin(self::TAGBODY);
$this->taglineno = $this->line;
- }
- }
- function yy_r2_12()
- {
+ }
+ } // end function
- $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
- $this->yybegin(self::TAGBODY);
- $this->taglineno = $this->line;
- }
- function yy_r2_13()
+ public function yy_r2_23()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+ $this->yybegin(self::TAGBODY);
+ $this->taglineno = $this->line;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_LDEL;
- $this->yybegin(self::TAGBODY);
- $this->taglineno = $this->line;
- }
+ public function yy_r2_25()
+ {
+ $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+ $this->yybegin(self::TAGBODY);
+ $this->taglineno = $this->line;
+ }
-
public function yylex3()
{
if (!isset($this->yy_global_pattern3)) {
- $this->yy_global_pattern3 = "/\G(\\s*".$this->rdel.")|\G(".$this->ldel."\\s*)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+(is\\s+(not\\s+)?(odd|even|div)\\s+by)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G(([!]\\s*)|(not\\s+))|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|])|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS";
+ $this->yy_global_pattern3 =
+ $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state TAGBODY');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state TAGBODY');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -583,285 +612,279 @@ class Smarty_Internal_Templatelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
+ }
- } // end function
-
-
- const TAGBODY = 3;
- function yy_r3_1()
- {
-
- $this->token = Smarty_Internal_Templateparser::TP_RDEL;
- $this->yypopstate();
- }
- function yy_r3_2()
+ public function yy_r3_1()
{
+ $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+ $this->yypopstate();
+ }
- if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- } else {
- $this->yypushstate(self::TAG);
- return true;
- }
- }
- function yy_r3_3()
+ public function yy_r3_2()
{
+ $this->yypushstate(self::TAG);
+ return true;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
- $this->yypushstate(self::DOUBLEQUOTEDSTRING);
- }
- function yy_r3_4()
+ public function yy_r3_4()
{
+ $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+ $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+ $this->compiler->enterDoubleQuote();
+ }
- $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
- }
- function yy_r3_5()
+ public function yy_r3_5()
{
+ $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
- $this->taglineno = $this->line;
- }
- function yy_r3_7()
+ public function yy_r3_6()
{
+ $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
- }
- function yy_r3_8()
+ public function yy_r3_7()
{
+ $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
- }
- function yy_r3_9()
+ public function yy_r3_8()
{
+ $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_ISIN;
- }
- function yy_r3_10()
+ public function yy_r3_9()
{
+ $this->token = Smarty_Internal_Templateparser::TP_AS;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_AS;
- }
- function yy_r3_11()
+ public function yy_r3_10()
{
+ $this->token = Smarty_Internal_Templateparser::TP_TO;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_TO;
- }
- function yy_r3_12()
+ public function yy_r3_11()
{
+ $this->token = Smarty_Internal_Templateparser::TP_STEP;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_STEP;
- }
- function yy_r3_13()
+ public function yy_r3_12()
{
+ $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
- }
- function yy_r3_14()
+ public function yy_r3_13()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
- }
- function yy_r3_19()
+ public function yy_r3_15()
{
+ $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
- }
- function yy_r3_21()
+ public function yy_r3_17()
{
+ $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
- }
- function yy_r3_25()
+ public function yy_r3_20()
{
+ $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
- }
- function yy_r3_28()
+ public function yy_r3_23()
{
+ $this->token = Smarty_Internal_Templateparser::TP_NOT;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_NOT;
- }
- function yy_r3_31()
+ public function yy_r3_24()
{
+ $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
- }
- function yy_r3_35()
+ public function yy_r3_28()
{
+ $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_OPENP;
- }
- function yy_r3_36()
+ public function yy_r3_29()
{
+ $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
- }
- function yy_r3_37()
+ public function yy_r3_30()
{
+ $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_OPENB;
- }
- function yy_r3_38()
+ public function yy_r3_31()
{
+ $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
- }
- function yy_r3_39()
+ public function yy_r3_32()
{
+ $this->token = Smarty_Internal_Templateparser::TP_PTR;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_PTR;
- }
- function yy_r3_40()
+ public function yy_r3_33()
{
+ $this->token = Smarty_Internal_Templateparser::TP_APTR;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_APTR;
- }
- function yy_r3_41()
+ public function yy_r3_34()
{
+ $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
- }
- function yy_r3_42()
+ public function yy_r3_35()
{
+ $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
- }
- function yy_r3_44()
+ public function yy_r3_37()
{
+ $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
- }
- function yy_r3_46()
+ public function yy_r3_39()
{
+ $this->token = Smarty_Internal_Templateparser::TP_MATH;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_MATH;
- }
- function yy_r3_48()
+ public function yy_r3_41()
{
+ $this->token = Smarty_Internal_Templateparser::TP_AT;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_AT;
- }
- function yy_r3_49()
+ public function yy_r3_42()
{
+ $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_HATCH;
- }
- function yy_r3_50()
+ public function yy_r3_43()
{
+ // resolve conflicts with shorttag and right_delimiter starting with '='
+ if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) ===
+ $this->smarty->getRightDelimiter()) {
+ preg_match('/\s+/', $this->value, $match);
+ $this->value = $match[ 0 ];
+ $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+ } else {
+ $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+ }
+ }
- // resolve conflicts with shorttag and right_delimiter starting with '='
- if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) {
- preg_match("/\s+/",$this->value,$match);
- $this->value = $match[0];
- $this->token = Smarty_Internal_Templateparser::TP_SPACE;
- } else {
- $this->token = Smarty_Internal_Templateparser::TP_ATTR;
- }
- }
- function yy_r3_51()
+ public function yy_r3_44()
{
-
$this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
- }
- function yy_r3_54()
- {
+ }
- $this->token = Smarty_Internal_Templateparser::TP_ID;
- }
- function yy_r3_55()
+ public function yy_r3_47()
{
+ $this->token = Smarty_Internal_Templateparser::TP_ID;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
- }
- function yy_r3_56()
+ public function yy_r3_48()
{
+ $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
- $this->yypopstate();
- }
- function yy_r3_57()
+ public function yy_r3_49()
{
+ $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+ $this->yypopstate();
+ }
- $this->token = Smarty_Internal_Templateparser::TP_VERT;
- }
- function yy_r3_58()
+ public function yy_r3_50()
{
+ $this->token = Smarty_Internal_Templateparser::TP_VERT;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_DOT;
- }
- function yy_r3_59()
+ public function yy_r3_51()
{
+ $this->token = Smarty_Internal_Templateparser::TP_DOT;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_COMMA;
- }
- function yy_r3_60()
+ public function yy_r3_52()
{
+ $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
- }
- function yy_r3_61()
+ public function yy_r3_53()
{
+ $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
- }
- function yy_r3_62()
+ public function yy_r3_54()
{
+ $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_COLON;
- }
- function yy_r3_63()
+ public function yy_r3_55()
{
+ $this->token = Smarty_Internal_Templateparser::TP_COLON;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_QMARK;
- }
- function yy_r3_64()
+ public function yy_r3_56()
{
+ $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_HEX;
- }
- function yy_r3_65()
+ public function yy_r3_57()
{
+ $this->token = Smarty_Internal_Templateparser::TP_HEX;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_SPACE;
- }
- function yy_r3_66()
+ public function yy_r3_58()
{
+ $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+ } // end function
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- }
-
+ public function yy_r3_59()
+ {
+ $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+ }
-
public function yylex4()
{
if (!isset($this->yy_global_pattern4)) {
- $this->yy_global_pattern4 = "/\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*[\/]literal\\s*".$this->rdel.")|\G([\S\s])/isS";
+ $this->yy_global_pattern4 =
+ $this->replace("/\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((.*?)(?=(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel))/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state LITERAL');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state LITERAL');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -879,73 +902,68 @@ class Smarty_Internal_Templatelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
+ }
- } // end function
-
-
- const LITERAL = 4;
- function yy_r4_1()
+ public function yy_r4_1()
{
+ $this->literal_cnt++;
+ $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+ }
- $this->literal_cnt++;
- $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
- }
- function yy_r4_2()
+ public function yy_r4_3()
{
+ if ($this->literal_cnt) {
+ $this->literal_cnt--;
+ $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+ } else {
+ $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+ $this->yypopstate();
+ }
+ }
- if ($this->literal_cnt) {
- $this->literal_cnt--;
- $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
- } else {
- $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
- $this->yypopstate();
- }
- }
- function yy_r4_3()
+ public function yy_r4_5()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+ } // end function
- $to = strlen($this->data);
- preg_match("/{$this->ldel}[\/]?literal{$this->rdel}/i",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
- if (isset($match[0][1])) {
- $to = $match[0][1];
- } else {
- $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
- }
- $this->value = substr($this->data,$this->counter,$to-$this->counter);
- $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
- }
-
-
public function yylex5()
{
if (!isset($this->yy_global_pattern5)) {
- $this->yy_global_pattern5 = "/\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*[\/]literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*[\/])|\G(".$this->ldel."\\s*[0-9]*[a-zA-Z_]\\w*)|\G(".$this->ldel."\\s*)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|\G([\S\s])/isS";
+ $this->yy_global_pattern5 =
+ $this->replace("/\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=((SMARTYldel)SMARTYal|\\$|`\\$|\"SMARTYliteral)))/isS");
}
- if (!isset($this->dataLenght)) {
- $this->dataLenght = strlen($this->data);
+ if (!isset($this->dataLength)) {
+ $this->dataLength = strlen($this->data);
}
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
-
do {
- if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, null, $this->counter)) {
- $yymatches = array_filter($yymatches);
- if (empty($yymatches)) {
+ if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) {
+ if (!isset($yymatches[ 0 ][ 1 ])) {
+ $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+ } else {
+ $yymatches = array_filter($yymatches);
+ }
+ if (empty($yymatches)) {
throw new Exception('Error: lexing failed because a rule matched' .
- ' an empty string. Input "' . substr($this->data,
- $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+ ' an empty string. Input "' . substr(
+ $this->data,
+ $this->counter,
+ 5
+ ) . '... state DOUBLEQUOTEDSTRING');
}
next($yymatches); // skip global match
$this->token = key($yymatches); // token number
@@ -963,100 +981,80 @@ class Smarty_Internal_Templatelexer
} elseif ($r === false) {
$this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n");
- if ($this->counter >= $this->dataLenght) {
+ if ($this->counter >= $this->dataLength) {
return false; // end of input
}
// skip this token
continue;
- } } else {
+ }
+ } else {
throw new Exception('Unexpected input at line' . $this->line .
- ': ' . $this->data[$this->counter]);
+ ': ' . $this->data[ $this->counter ]);
}
break;
} while (true);
+ }
- } // end function
-
-
- const DOUBLEQUOTEDSTRING = 5;
- function yy_r5_1()
+ public function yy_r5_1()
{
+ $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- }
- function yy_r5_2()
+ public function yy_r5_3()
{
+ $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- }
- function yy_r5_3()
+ public function yy_r5_5()
{
+ $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+ }
- if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- } else {
- $this->yypushstate(self::TAG);
- return true;
- }
- }
- function yy_r5_4()
+ public function yy_r5_7()
{
+ $this->yypushstate(self::TAG);
+ return true;
+ }
- if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- } else {
- $this->yypushstate(self::TAG);
- return true;
- }
- }
- function yy_r5_5()
+ public function yy_r5_9()
{
+ $this->yypushstate(self::TAG);
+ return true;
+ }
- if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- } else {
- $this->token = Smarty_Internal_Templateparser::TP_LDEL;
- $this->taglineno = $this->line;
- $this->yypushstate(self::TAGBODY);
- }
- }
- function yy_r5_6()
+ public function yy_r5_11()
{
+ $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+ $this->taglineno = $this->line;
+ $this->yypushstate(self::TAGBODY);
+ }
- $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
- $this->yypopstate();
- }
- function yy_r5_7()
+ public function yy_r5_13()
{
+ $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+ $this->yypopstate();
+ }
- $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
- $this->value = substr($this->value,0,-1);
- $this->yypushstate(self::TAGBODY);
- $this->taglineno = $this->line;
- }
- function yy_r5_8()
+ public function yy_r5_14()
{
+ $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+ $this->value = substr($this->value, 0, -1);
+ $this->yypushstate(self::TAGBODY);
+ $this->taglineno = $this->line;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
- }
- function yy_r5_9()
+ public function yy_r5_15()
{
+ $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- }
- function yy_r5_10()
+ public function yy_r5_16()
{
+ $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+ }
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- }
- function yy_r5_14()
+ public function yy_r5_17()
{
-
- $to = strlen($this->data);
- $this->value = substr($this->data,$this->counter,$to-$this->counter);
- $this->token = Smarty_Internal_Templateparser::TP_TEXT;
- }
-
- }
-
- \ No newline at end of file
+ $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+ }
+}
diff --git a/lib/smarty3/sysplugins/smarty_internal_templateparser.php b/lib/smarty3/sysplugins/smarty_internal_templateparser.php
index 8503427..b008715 100644
--- a/lib/smarty3/sysplugins/smarty_internal_templateparser.php
+++ b/lib/smarty3/sysplugins/smarty_internal_templateparser.php
@@ -1,96 +1,1508 @@
<?php
-class TP_yyToken implements ArrayAccess
-{
- public $string = '';
- public $metadata = array();
-
- public function __construct($s, $m = array())
- {
- if ($s instanceof TP_yyToken) {
- $this->string = $s->string;
- $this->metadata = $s->metadata;
- } else {
- $this->string = (string) $s;
- if ($m instanceof TP_yyToken) {
- $this->metadata = $m->metadata;
- } elseif (is_array($m)) {
- $this->metadata = $m;
- }
- }
- }
-
- public function __toString()
- {
- return $this->string;
- }
-
- public function offsetExists($offset)
- {
- return isset($this->metadata[$offset]);
- }
-
- public function offsetGet($offset)
- {
- return $this->metadata[$offset];
- }
-
- public function offsetSet($offset, $value)
- {
- if ($offset === null) {
- if (isset($value[0])) {
- $x = ($value instanceof TP_yyToken) ?
- $value->metadata : $value;
- $this->metadata = array_merge($this->metadata, $x);
-
- return;
- }
- $offset = count($this->metadata);
- }
- if ($value === null) {
- return;
- }
- if ($value instanceof TP_yyToken) {
- if ($value->metadata) {
- $this->metadata[$offset] = $value->metadata;
- }
- } elseif ($value) {
- $this->metadata[$offset] = $value;
- }
- }
-
- public function offsetUnset($offset)
- {
- unset($this->metadata[$offset]);
- }
-}
class TP_yyStackEntry
{
public $stateno; /* The state-number */
public $major; /* The major token value. This is the code
- ** number for the token at this stack level */
- public $minor; /* The user-supplied minor token value. This
- ** is the value of the token */
-};
-
+ * number for the token at this stack level
+ */
+ public $minor; /* The user-supplied minor token value. This
+ * is the value of the token
+ */
+}
-#line 11 "./lexer/smarty_internal_templateparser.y"
+// line 11 "../smarty/lexer/smarty_internal_templateparser.y"
/**
-* Smarty Template Parser Class
-*
-* This is the template parser.
-* It is generated from the smarty_internal_templateparser.y file
-*
-* @author Uwe Tews <uwe.tews@googlemail.com>
-*/
+ * Smarty Template Parser Class
+ *
+ * This is the template parser.
+ * It is generated from the smarty_internal_templateparser.y file
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
class Smarty_Internal_Templateparser
{
-#line 23 "./lexer/smarty_internal_templateparser.y"
+ // line 23 "../smarty/lexer/smarty_internal_templateparser.y"
+ const ERR1 = 'Security error: Call to private object member not allowed';
+ const ERR2 = 'Security error: Call to dynamic object member not allowed';
+ const ERR3 = 'PHP in template not allowed. Use SmartyBC to enable it';
+ const TP_VERT = 1;
+ const TP_COLON = 2;
+ const TP_UNIMATH = 3;
+ const TP_PHP = 4;
+ const TP_TEXT = 5;
+ const TP_STRIPON = 6;
+ const TP_STRIPOFF = 7;
+ const TP_LITERALSTART = 8;
+ const TP_LITERALEND = 9;
+ const TP_LITERAL = 10;
+ const TP_SIMPELOUTPUT = 11;
+ const TP_SIMPLETAG = 12;
+ const TP_SMARTYBLOCKCHILDPARENT = 13;
+ const TP_LDEL = 14;
+ const TP_RDEL = 15;
+ const TP_DOLLARID = 16;
+ const TP_EQUAL = 17;
+ const TP_ID = 18;
+ const TP_PTR = 19;
+ const TP_LDELMAKENOCACHE = 20;
+ const TP_LDELIF = 21;
+ const TP_LDELFOR = 22;
+ const TP_SEMICOLON = 23;
+ const TP_INCDEC = 24;
+ const TP_TO = 25;
+ const TP_STEP = 26;
+ const TP_LDELFOREACH = 27;
+ const TP_SPACE = 28;
+ const TP_AS = 29;
+ const TP_APTR = 30;
+ const TP_LDELSETFILTER = 31;
+ const TP_CLOSETAG = 32;
+ const TP_LDELSLASH = 33;
+ const TP_ATTR = 34;
+ const TP_INTEGER = 35;
+ const TP_COMMA = 36;
+ const TP_OPENP = 37;
+ const TP_CLOSEP = 38;
+ const TP_MATH = 39;
+ const TP_ISIN = 40;
+ const TP_QMARK = 41;
+ const TP_NOT = 42;
+ const TP_TYPECAST = 43;
+ const TP_HEX = 44;
+ const TP_DOT = 45;
+ const TP_INSTANCEOF = 46;
+ const TP_SINGLEQUOTESTRING = 47;
+ const TP_DOUBLECOLON = 48;
+ const TP_NAMESPACE = 49;
+ const TP_AT = 50;
+ const TP_HATCH = 51;
+ const TP_OPENB = 52;
+ const TP_CLOSEB = 53;
+ const TP_DOLLAR = 54;
+ const TP_LOGOP = 55;
+ const TP_SLOGOP = 56;
+ const TP_TLOGOP = 57;
+ const TP_SINGLECOND = 58;
+ const TP_QUOTE = 59;
+ const TP_BACKTICK = 60;
+ const YY_NO_ACTION = 511;
+ const YY_ACCEPT_ACTION = 510;
+ const YY_ERROR_ACTION = 509;
+ const YY_SZ_ACTTAB = 2076;
+ const YY_SHIFT_USE_DFLT = -23;
+ const YY_SHIFT_MAX = 227;
+ const YY_REDUCE_USE_DFLT = -68;
+ const YY_REDUCE_MAX = 176;
+ const YYNOCODE = 108;
+ const YYSTACKDEPTH = 500;
+ const YYNSTATE = 323;
+ const YYNRULE = 186;
+ const YYERRORSYMBOL = 61;
+ const YYERRSYMDT = 'yy0';
+ const YYFALLBACK = 0;
+
+ public static $yy_action = array(
+ 42, 266, 267, 379, 115, 202, 27, 204, 260, 235,
+ 237, 1, 17, 125, 94, 182, 379, 215, 10, 79,
+ 317, 168, 379, 12, 107, 425, 308, 318, 224, 298,
+ 218, 129, 189, 292, 21, 203, 425, 27, 11, 39,
+ 38, 299, 219, 17, 213, 385, 191, 245, 77, 3,
+ 303, 315, 42, 385, 160, 385, 75, 29, 385, 95,
+ 260, 235, 237, 1, 385, 126, 385, 193, 385, 215,
+ 10, 79, 80, 290, 145, 226, 107, 148, 172, 150,
+ 224, 298, 218, 85, 217, 315, 21, 280, 101, 280,
+ 141, 39, 38, 299, 219, 20, 287, 183, 191, 232,
+ 77, 3, 42, 315, 16, 176, 316, 172, 75, 275,
+ 260, 235, 237, 1, 167, 128, 236, 193, 319, 215,
+ 10, 79, 345, 40, 14, 257, 107, 319, 345, 5,
+ 224, 298, 218, 89, 217, 315, 30, 292, 172, 203,
+ 74, 39, 38, 299, 219, 132, 287, 205, 191, 74,
+ 77, 3, 42, 315, 210, 194, 310, 99, 75, 345,
+ 260, 235, 237, 1, 425, 126, 87, 179, 319, 215,
+ 10, 79, 345, 95, 195, 425, 107, 272, 345, 176,
+ 224, 298, 218, 315, 199, 115, 21, 128, 278, 209,
+ 74, 39, 38, 299, 219, 94, 287, 226, 191, 129,
+ 77, 3, 42, 315, 277, 309, 11, 308, 75, 13,
+ 260, 235, 237, 1, 163, 127, 425, 193, 319, 215,
+ 10, 79, 77, 254, 19, 315, 107, 425, 137, 34,
+ 224, 298, 218, 196, 217, 33, 21, 220, 280, 159,
+ 74, 39, 38, 299, 219, 196, 287, 8, 191, 162,
+ 77, 3, 42, 315, 294, 222, 196, 438, 75, 378,
+ 260, 235, 237, 1, 438, 126, 16, 193, 271, 215,
+ 10, 79, 378, 172, 302, 315, 107, 175, 378, 267,
+ 224, 298, 218, 27, 178, 252, 21, 164, 296, 17,
+ 83, 39, 38, 299, 219, 196, 287, 205, 191, 170,
+ 77, 3, 42, 315, 270, 18, 144, 99, 75, 346,
+ 260, 235, 237, 1, 142, 126, 280, 177, 84, 215,
+ 10, 79, 346, 172, 280, 4, 107, 95, 346, 321,
+ 224, 298, 218, 438, 217, 131, 21, 321, 426, 24,
+ 438, 39, 38, 299, 219, 196, 287, 205, 191, 426,
+ 77, 3, 42, 315, 201, 9, 101, 99, 75, 381,
+ 260, 235, 237, 1, 149, 124, 102, 193, 22, 215,
+ 10, 79, 381, 315, 99, 231, 107, 311, 381, 425,
+ 224, 298, 218, 23, 217, 319, 7, 207, 196, 17,
+ 425, 39, 38, 299, 219, 307, 287, 36, 191, 154,
+ 77, 3, 42, 315, 161, 296, 227, 74, 75, 280,
+ 260, 235, 237, 1, 16, 91, 273, 76, 312, 215,
+ 10, 79, 317, 208, 190, 12, 107, 176, 196, 318,
+ 224, 298, 218, 135, 217, 321, 21, 196, 35, 95,
+ 263, 39, 38, 299, 219, 157, 287, 111, 191, 88,
+ 77, 3, 42, 315, 169, 280, 225, 15, 75, 285,
+ 260, 235, 237, 1, 155, 126, 226, 184, 101, 215,
+ 10, 79, 454, 172, 280, 454, 107, 246, 253, 454,
+ 224, 298, 218, 152, 217, 111, 21, 161, 296, 265,
+ 6, 39, 38, 299, 219, 269, 287, 203, 191, 119,
+ 77, 3, 42, 315, 158, 262, 321, 274, 75, 97,
+ 260, 235, 237, 1, 153, 128, 165, 193, 151, 215,
+ 10, 79, 317, 43, 280, 12, 107, 320, 280, 318,
+ 224, 298, 218, 8, 217, 171, 30, 306, 196, 36,
+ 172, 39, 38, 299, 219, 264, 287, 256, 191, 128,
+ 77, 288, 78, 315, 510, 90, 166, 296, 75, 41,
+ 37, 223, 104, 228, 250, 251, 255, 122, 226, 289,
+ 260, 235, 237, 1, 239, 233, 238, 240, 241, 215,
+ 10, 79, 229, 305, 77, 304, 107, 315, 281, 300,
+ 224, 298, 218, 261, 211, 203, 314, 28, 86, 108,
+ 140, 181, 96, 61, 214, 247, 317, 454, 94, 12,
+ 454, 297, 322, 318, 454, 29, 259, 192, 249, 248,
+ 308, 313, 138, 27, 302, 143, 130, 82, 95, 17,
+ 261, 211, 203, 314, 252, 86, 108, 286, 180, 96,
+ 50, 136, 139, 100, 152, 94, 454, 81, 297, 322,
+ 295, 321, 146, 259, 192, 249, 295, 308, 261, 295,
+ 203, 295, 295, 110, 295, 295, 197, 105, 64, 295,
+ 295, 295, 295, 94, 295, 295, 297, 322, 295, 295,
+ 295, 259, 192, 249, 261, 308, 203, 276, 295, 110,
+ 108, 295, 181, 96, 61, 187, 282, 295, 317, 94,
+ 295, 12, 297, 322, 295, 318, 295, 259, 192, 249,
+ 295, 308, 295, 291, 295, 295, 295, 295, 295, 260,
+ 235, 237, 2, 295, 293, 295, 295, 295, 215, 10,
+ 79, 295, 295, 295, 295, 107, 291, 206, 295, 224,
+ 298, 218, 260, 235, 237, 2, 295, 293, 295, 295,
+ 295, 215, 10, 79, 295, 295, 295, 295, 107, 295,
+ 295, 295, 224, 298, 218, 295, 295, 295, 26, 261,
+ 295, 203, 295, 295, 110, 295, 295, 197, 113, 60,
+ 295, 295, 295, 295, 94, 156, 295, 297, 322, 167,
+ 284, 26, 259, 192, 249, 280, 308, 295, 40, 14,
+ 257, 295, 261, 200, 203, 295, 295, 110, 295, 295,
+ 197, 105, 64, 172, 295, 295, 295, 94, 295, 295,
+ 297, 322, 295, 295, 295, 259, 192, 249, 295, 308,
+ 295, 295, 295, 295, 261, 295, 203, 295, 295, 98,
+ 283, 295, 197, 113, 51, 295, 201, 295, 295, 94,
+ 295, 295, 297, 322, 295, 295, 295, 259, 192, 249,
+ 261, 308, 203, 295, 295, 110, 295, 295, 197, 113,
+ 60, 295, 295, 295, 295, 94, 295, 295, 297, 322,
+ 295, 295, 295, 259, 192, 249, 295, 308, 261, 295,
+ 203, 295, 295, 110, 188, 295, 197, 113, 60, 196,
+ 31, 43, 295, 94, 295, 295, 297, 322, 295, 295,
+ 295, 259, 192, 249, 295, 308, 261, 295, 203, 295,
+ 295, 98, 198, 295, 197, 113, 45, 295, 109, 295,
+ 295, 94, 295, 295, 297, 322, 295, 41, 37, 259,
+ 192, 249, 261, 308, 203, 295, 295, 110, 295, 295,
+ 197, 113, 67, 233, 238, 240, 241, 94, 295, 295,
+ 297, 322, 295, 295, 295, 259, 192, 249, 295, 308,
+ 261, 295, 203, 295, 295, 110, 295, 295, 197, 113,
+ 57, 196, 295, 43, 295, 94, 295, 295, 297, 322,
+ 295, 295, 295, 259, 192, 249, 295, 308, 261, 295,
+ 203, 295, 295, 110, 295, 295, 197, 113, 46, 295,
+ 295, 295, 295, 94, 295, 295, 297, 322, 295, 41,
+ 37, 259, 192, 249, 261, 308, 203, 295, 295, 110,
+ 295, 295, 197, 113, 66, 233, 238, 240, 241, 94,
+ 301, 295, 297, 322, 295, 295, 295, 259, 192, 249,
+ 295, 308, 261, 295, 203, 295, 295, 110, 295, 295,
+ 197, 113, 72, 196, 295, 43, 295, 94, 295, 295,
+ 297, 322, 295, 295, 295, 259, 192, 249, 295, 308,
+ 261, 295, 203, 295, 295, 110, 295, 295, 197, 113,
+ 53, 295, 295, 295, 295, 94, 295, 295, 297, 322,
+ 230, 41, 37, 259, 192, 249, 261, 308, 203, 295,
+ 295, 110, 295, 295, 197, 113, 48, 233, 238, 240,
+ 241, 94, 295, 295, 297, 322, 295, 295, 295, 259,
+ 192, 249, 295, 308, 261, 295, 203, 295, 295, 110,
+ 295, 295, 185, 103, 49, 196, 295, 43, 295, 94,
+ 295, 295, 297, 322, 295, 295, 295, 259, 192, 249,
+ 295, 308, 261, 295, 203, 295, 295, 110, 295, 295,
+ 197, 113, 55, 134, 295, 295, 295, 94, 295, 295,
+ 297, 322, 295, 41, 37, 259, 192, 249, 261, 308,
+ 203, 295, 295, 110, 295, 295, 197, 113, 71, 233,
+ 238, 240, 241, 94, 295, 295, 297, 322, 295, 295,
+ 295, 259, 192, 249, 295, 308, 261, 295, 203, 295,
+ 295, 110, 295, 295, 197, 113, 59, 196, 295, 43,
+ 295, 94, 295, 295, 297, 322, 295, 295, 295, 259,
+ 192, 249, 295, 308, 261, 295, 203, 295, 295, 110,
+ 295, 295, 197, 113, 63, 295, 295, 295, 295, 94,
+ 295, 295, 297, 322, 216, 41, 37, 259, 192, 249,
+ 261, 308, 203, 295, 295, 110, 295, 295, 197, 113,
+ 62, 233, 238, 240, 241, 94, 295, 295, 297, 322,
+ 295, 295, 295, 259, 192, 249, 295, 308, 261, 295,
+ 203, 295, 295, 110, 295, 295, 197, 92, 69, 196,
+ 295, 43, 295, 94, 295, 295, 297, 322, 295, 295,
+ 295, 259, 192, 249, 295, 308, 261, 295, 203, 295,
+ 295, 110, 295, 295, 197, 113, 52, 295, 295, 295,
+ 295, 94, 295, 295, 297, 322, 295, 41, 37, 259,
+ 192, 249, 261, 308, 203, 295, 295, 110, 295, 295,
+ 197, 113, 65, 233, 238, 240, 241, 94, 295, 295,
+ 297, 322, 295, 196, 295, 259, 192, 249, 295, 308,
+ 261, 295, 203, 295, 295, 110, 295, 349, 197, 113,
+ 58, 221, 295, 295, 295, 94, 295, 295, 297, 322,
+ 27, 295, 295, 259, 192, 249, 17, 308, 261, 425,
+ 203, 295, 295, 110, 295, 295, 197, 113, 56, 295,
+ 425, 295, 295, 94, 295, 295, 297, 322, 295, 295,
+ 295, 259, 192, 249, 261, 308, 203, 295, 295, 110,
+ 295, 295, 197, 113, 44, 295, 295, 295, 295, 94,
+ 295, 295, 297, 322, 295, 295, 295, 259, 192, 249,
+ 295, 308, 261, 295, 203, 295, 295, 110, 295, 295,
+ 197, 93, 70, 295, 295, 295, 295, 94, 295, 295,
+ 297, 322, 295, 295, 295, 259, 192, 249, 295, 308,
+ 261, 295, 203, 295, 295, 110, 295, 295, 186, 113,
+ 54, 295, 295, 295, 295, 94, 295, 295, 297, 322,
+ 295, 295, 295, 259, 192, 249, 261, 308, 203, 295,
+ 295, 110, 295, 295, 197, 113, 73, 295, 295, 295,
+ 295, 94, 295, 295, 297, 322, 295, 295, 295, 259,
+ 192, 249, 295, 308, 261, 295, 203, 295, 295, 110,
+ 295, 295, 197, 113, 68, 295, 295, 295, 295, 94,
+ 295, 295, 297, 322, 295, 295, 295, 259, 192, 249,
+ 295, 308, 261, 295, 203, 295, 295, 110, 295, 295,
+ 197, 93, 47, 295, 295, 295, 295, 94, 295, 295,
+ 297, 322, 391, 391, 391, 259, 192, 249, 261, 308,
+ 203, 295, 295, 110, 295, 295, 197, 113, 51, 295,
+ 295, 295, 295, 94, 295, 295, 297, 322, 196, 295,
+ 43, 259, 192, 249, 295, 308, 295, 295, 425, 295,
+ 391, 391, 295, 295, 295, 261, 295, 203, 295, 425,
+ 110, 295, 295, 197, 118, 27, 391, 391, 391, 391,
+ 94, 17, 295, 295, 258, 295, 41, 37, 259, 192,
+ 249, 261, 308, 203, 295, 196, 110, 43, 295, 197,
+ 120, 295, 233, 238, 240, 241, 94, 295, 295, 295,
+ 243, 295, 295, 295, 259, 192, 249, 295, 308, 295,
+ 32, 295, 27, 212, 295, 295, 295, 295, 17, 295,
+ 295, 295, 454, 41, 37, 454, 295, 295, 295, 454,
+ 438, 295, 295, 295, 295, 295, 295, 295, 295, 233,
+ 238, 240, 241, 295, 295, 261, 295, 203, 295, 295,
+ 110, 295, 295, 197, 112, 295, 438, 295, 295, 438,
+ 94, 454, 212, 438, 268, 295, 295, 295, 259, 192,
+ 249, 454, 308, 212, 454, 295, 295, 34, 454, 438,
+ 295, 295, 454, 295, 295, 454, 295, 133, 4, 454,
+ 438, 167, 295, 295, 295, 295, 295, 280, 295, 295,
+ 40, 14, 257, 295, 295, 438, 295, 295, 438, 261,
+ 454, 203, 438, 295, 110, 172, 438, 197, 121, 438,
+ 261, 454, 203, 438, 94, 110, 295, 295, 197, 117,
+ 295, 295, 259, 192, 249, 94, 308, 295, 295, 295,
+ 295, 295, 295, 259, 192, 249, 261, 308, 203, 295,
+ 295, 110, 295, 295, 197, 116, 295, 261, 295, 203,
+ 295, 94, 110, 295, 295, 197, 114, 295, 295, 259,
+ 192, 249, 94, 308, 196, 295, 43, 295, 295, 295,
+ 259, 192, 249, 261, 308, 203, 295, 196, 110, 43,
+ 295, 197, 123, 295, 295, 295, 106, 295, 94, 295,
+ 196, 174, 43, 295, 295, 295, 259, 192, 249, 196,
+ 308, 43, 41, 37, 244, 295, 295, 295, 295, 295,
+ 295, 295, 295, 234, 295, 41, 37, 295, 233, 238,
+ 240, 241, 295, 295, 295, 295, 295, 295, 41, 37,
+ 295, 233, 238, 240, 241, 295, 295, 41, 37, 295,
+ 295, 295, 295, 295, 233, 238, 240, 241, 25, 196,
+ 295, 43, 295, 233, 238, 240, 241, 454, 295, 295,
+ 454, 295, 295, 279, 454, 438, 212, 295, 295, 295,
+ 295, 295, 295, 295, 295, 454, 295, 295, 454, 295,
+ 295, 295, 454, 438, 196, 295, 43, 41, 37, 295,
+ 295, 438, 295, 196, 438, 43, 454, 295, 438, 295,
+ 295, 295, 295, 233, 238, 240, 241, 173, 295, 438,
+ 295, 295, 438, 295, 454, 295, 438, 454, 295, 295,
+ 454, 295, 41, 37, 454, 438, 295, 295, 295, 295,
+ 295, 41, 37, 295, 295, 295, 242, 295, 233, 238,
+ 240, 241, 295, 295, 295, 295, 295, 233, 238, 240,
+ 241, 438, 295, 295, 438, 295, 454, 147, 438, 295,
+ 295, 167, 295, 295, 295, 295, 295, 280, 295, 295,
+ 40, 14, 257, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295, 295, 295, 172,
+ );
+
+ public static $yy_lookahead = array(
+ 3, 9, 10, 15, 71, 17, 28, 74, 11, 12,
+ 13, 14, 34, 16, 81, 18, 28, 20, 21, 22,
+ 11, 82, 34, 14, 27, 37, 93, 18, 31, 32,
+ 33, 45, 35, 66, 37, 68, 48, 28, 52, 42,
+ 43, 44, 45, 34, 47, 15, 49, 16, 51, 52,
+ 53, 54, 3, 23, 77, 25, 59, 17, 28, 19,
+ 11, 12, 13, 14, 34, 16, 36, 18, 38, 20,
+ 21, 22, 105, 106, 94, 45, 27, 73, 101, 73,
+ 31, 32, 33, 77, 35, 54, 37, 83, 48, 83,
+ 94, 42, 43, 44, 45, 14, 47, 16, 49, 18,
+ 51, 52, 3, 54, 36, 101, 38, 101, 59, 15,
+ 11, 12, 13, 14, 77, 16, 35, 18, 24, 20,
+ 21, 22, 28, 86, 87, 88, 27, 24, 34, 37,
+ 31, 32, 33, 82, 35, 54, 37, 66, 101, 68,
+ 46, 42, 43, 44, 45, 16, 47, 71, 49, 46,
+ 51, 52, 3, 54, 78, 79, 53, 81, 59, 15,
+ 11, 12, 13, 14, 37, 16, 37, 18, 24, 20,
+ 21, 22, 28, 19, 65, 48, 27, 106, 34, 101,
+ 31, 32, 33, 54, 35, 71, 37, 16, 74, 18,
+ 46, 42, 43, 44, 45, 81, 47, 45, 49, 45,
+ 51, 52, 3, 54, 90, 53, 52, 93, 59, 30,
+ 11, 12, 13, 14, 82, 16, 37, 18, 24, 20,
+ 21, 22, 51, 18, 14, 54, 27, 48, 73, 17,
+ 31, 32, 33, 1, 35, 14, 37, 16, 83, 18,
+ 46, 42, 43, 44, 45, 1, 47, 37, 49, 77,
+ 51, 52, 3, 54, 60, 50, 1, 45, 59, 15,
+ 11, 12, 13, 14, 52, 16, 36, 18, 38, 20,
+ 21, 22, 28, 101, 102, 54, 27, 8, 34, 10,
+ 31, 32, 33, 28, 35, 95, 37, 97, 98, 34,
+ 94, 42, 43, 44, 45, 1, 47, 71, 49, 77,
+ 51, 52, 3, 54, 78, 23, 73, 81, 59, 15,
+ 11, 12, 13, 14, 73, 16, 83, 18, 36, 20,
+ 21, 22, 28, 101, 83, 17, 27, 19, 34, 96,
+ 31, 32, 33, 45, 35, 16, 37, 96, 37, 41,
+ 52, 42, 43, 44, 45, 1, 47, 71, 49, 48,
+ 51, 52, 3, 54, 78, 37, 48, 81, 59, 15,
+ 11, 12, 13, 14, 71, 16, 48, 18, 17, 20,
+ 21, 22, 28, 54, 81, 24, 27, 70, 34, 37,
+ 31, 32, 33, 28, 35, 24, 37, 45, 1, 34,
+ 48, 42, 43, 44, 45, 53, 47, 2, 49, 73,
+ 51, 52, 3, 54, 97, 98, 19, 46, 59, 83,
+ 11, 12, 13, 14, 36, 16, 38, 18, 98, 20,
+ 21, 22, 11, 64, 65, 14, 27, 101, 1, 18,
+ 31, 32, 33, 94, 35, 96, 37, 1, 17, 19,
+ 92, 42, 43, 44, 45, 73, 47, 99, 49, 77,
+ 51, 52, 3, 54, 16, 83, 18, 30, 59, 70,
+ 11, 12, 13, 14, 73, 16, 45, 18, 48, 20,
+ 21, 22, 11, 101, 83, 14, 27, 35, 92, 18,
+ 31, 32, 33, 94, 35, 99, 37, 97, 98, 53,
+ 36, 42, 43, 44, 45, 66, 47, 68, 49, 18,
+ 51, 52, 3, 54, 94, 38, 96, 53, 59, 81,
+ 11, 12, 13, 14, 73, 16, 77, 18, 73, 20,
+ 21, 22, 11, 3, 83, 14, 27, 99, 83, 18,
+ 31, 32, 33, 37, 35, 18, 37, 18, 1, 2,
+ 101, 42, 43, 44, 45, 35, 47, 18, 49, 16,
+ 51, 18, 18, 54, 62, 63, 97, 98, 59, 39,
+ 40, 50, 18, 4, 5, 6, 7, 8, 45, 16,
+ 11, 12, 13, 14, 18, 55, 56, 57, 58, 20,
+ 21, 22, 49, 53, 51, 53, 27, 54, 18, 15,
+ 31, 32, 33, 66, 67, 68, 69, 25, 71, 72,
+ 51, 74, 75, 76, 18, 18, 11, 11, 81, 14,
+ 14, 84, 85, 18, 18, 17, 89, 90, 91, 9,
+ 93, 15, 51, 28, 102, 30, 81, 81, 19, 34,
+ 66, 67, 68, 69, 95, 71, 72, 83, 74, 75,
+ 76, 94, 94, 80, 94, 81, 50, 81, 84, 85,
+ 107, 96, 94, 89, 90, 91, 107, 93, 66, 107,
+ 68, 107, 107, 71, 107, 107, 74, 75, 76, 107,
+ 107, 107, 107, 81, 107, 107, 84, 85, 107, 107,
+ 107, 89, 90, 91, 66, 93, 68, 69, 107, 71,
+ 72, 107, 74, 75, 76, 103, 104, 107, 11, 81,
+ 107, 14, 84, 85, 107, 18, 107, 89, 90, 91,
+ 107, 93, 107, 5, 107, 107, 107, 107, 107, 11,
+ 12, 13, 14, 107, 16, 107, 107, 107, 20, 21,
+ 22, 107, 107, 107, 107, 27, 5, 50, 107, 31,
+ 32, 33, 11, 12, 13, 14, 107, 16, 107, 107,
+ 107, 20, 21, 22, 107, 107, 107, 107, 27, 107,
+ 107, 107, 31, 32, 33, 107, 107, 59, 60, 66,
+ 107, 68, 107, 107, 71, 107, 107, 74, 75, 76,
+ 107, 107, 107, 107, 81, 73, 107, 84, 85, 77,
+ 59, 60, 89, 90, 91, 83, 93, 107, 86, 87,
+ 88, 107, 66, 100, 68, 107, 107, 71, 107, 107,
+ 74, 75, 76, 101, 107, 107, 107, 81, 107, 107,
+ 84, 85, 107, 107, 107, 89, 90, 91, 107, 93,
+ 107, 107, 107, 107, 66, 107, 68, 107, 107, 71,
+ 104, 107, 74, 75, 76, 107, 78, 107, 107, 81,
+ 107, 107, 84, 85, 107, 107, 107, 89, 90, 91,
+ 66, 93, 68, 107, 107, 71, 107, 107, 74, 75,
+ 76, 107, 107, 107, 107, 81, 107, 107, 84, 85,
+ 107, 107, 107, 89, 90, 91, 107, 93, 66, 107,
+ 68, 107, 107, 71, 100, 107, 74, 75, 76, 1,
+ 2, 3, 107, 81, 107, 107, 84, 85, 107, 107,
+ 107, 89, 90, 91, 107, 93, 66, 107, 68, 107,
+ 107, 71, 100, 107, 74, 75, 76, 107, 78, 107,
+ 107, 81, 107, 107, 84, 85, 107, 39, 40, 89,
+ 90, 91, 66, 93, 68, 107, 107, 71, 107, 107,
+ 74, 75, 76, 55, 56, 57, 58, 81, 107, 107,
+ 84, 85, 107, 107, 107, 89, 90, 91, 107, 93,
+ 66, 107, 68, 107, 107, 71, 107, 107, 74, 75,
+ 76, 1, 107, 3, 107, 81, 107, 107, 84, 85,
+ 107, 107, 107, 89, 90, 91, 107, 93, 66, 107,
+ 68, 107, 107, 71, 107, 107, 74, 75, 76, 107,
+ 107, 107, 107, 81, 107, 107, 84, 85, 107, 39,
+ 40, 89, 90, 91, 66, 93, 68, 107, 107, 71,
+ 107, 107, 74, 75, 76, 55, 56, 57, 58, 81,
+ 60, 107, 84, 85, 107, 107, 107, 89, 90, 91,
+ 107, 93, 66, 107, 68, 107, 107, 71, 107, 107,
+ 74, 75, 76, 1, 107, 3, 107, 81, 107, 107,
+ 84, 85, 107, 107, 107, 89, 90, 91, 107, 93,
+ 66, 107, 68, 107, 107, 71, 107, 107, 74, 75,
+ 76, 107, 107, 107, 107, 81, 107, 107, 84, 85,
+ 38, 39, 40, 89, 90, 91, 66, 93, 68, 107,
+ 107, 71, 107, 107, 74, 75, 76, 55, 56, 57,
+ 58, 81, 107, 107, 84, 85, 107, 107, 107, 89,
+ 90, 91, 107, 93, 66, 107, 68, 107, 107, 71,
+ 107, 107, 74, 75, 76, 1, 107, 3, 107, 81,
+ 107, 107, 84, 85, 107, 107, 107, 89, 90, 91,
+ 107, 93, 66, 107, 68, 107, 107, 71, 107, 107,
+ 74, 75, 76, 29, 107, 107, 107, 81, 107, 107,
+ 84, 85, 107, 39, 40, 89, 90, 91, 66, 93,
+ 68, 107, 107, 71, 107, 107, 74, 75, 76, 55,
+ 56, 57, 58, 81, 107, 107, 84, 85, 107, 107,
+ 107, 89, 90, 91, 107, 93, 66, 107, 68, 107,
+ 107, 71, 107, 107, 74, 75, 76, 1, 107, 3,
+ 107, 81, 107, 107, 84, 85, 107, 107, 107, 89,
+ 90, 91, 107, 93, 66, 107, 68, 107, 107, 71,
+ 107, 107, 74, 75, 76, 107, 107, 107, 107, 81,
+ 107, 107, 84, 85, 38, 39, 40, 89, 90, 91,
+ 66, 93, 68, 107, 107, 71, 107, 107, 74, 75,
+ 76, 55, 56, 57, 58, 81, 107, 107, 84, 85,
+ 107, 107, 107, 89, 90, 91, 107, 93, 66, 107,
+ 68, 107, 107, 71, 107, 107, 74, 75, 76, 1,
+ 107, 3, 107, 81, 107, 107, 84, 85, 107, 107,
+ 107, 89, 90, 91, 107, 93, 66, 107, 68, 107,
+ 107, 71, 107, 107, 74, 75, 76, 107, 107, 107,
+ 107, 81, 107, 107, 84, 85, 107, 39, 40, 89,
+ 90, 91, 66, 93, 68, 107, 107, 71, 107, 107,
+ 74, 75, 76, 55, 56, 57, 58, 81, 107, 107,
+ 84, 85, 107, 1, 107, 89, 90, 91, 107, 93,
+ 66, 107, 68, 107, 107, 71, 107, 15, 74, 75,
+ 76, 19, 107, 107, 107, 81, 107, 107, 84, 85,
+ 28, 107, 107, 89, 90, 91, 34, 93, 66, 37,
+ 68, 107, 107, 71, 107, 107, 74, 75, 76, 107,
+ 48, 107, 107, 81, 107, 107, 84, 85, 107, 107,
+ 107, 89, 90, 91, 66, 93, 68, 107, 107, 71,
+ 107, 107, 74, 75, 76, 107, 107, 107, 107, 81,
+ 107, 107, 84, 85, 107, 107, 107, 89, 90, 91,
+ 107, 93, 66, 107, 68, 107, 107, 71, 107, 107,
+ 74, 75, 76, 107, 107, 107, 107, 81, 107, 107,
+ 84, 85, 107, 107, 107, 89, 90, 91, 107, 93,
+ 66, 107, 68, 107, 107, 71, 107, 107, 74, 75,
+ 76, 107, 107, 107, 107, 81, 107, 107, 84, 85,
+ 107, 107, 107, 89, 90, 91, 66, 93, 68, 107,
+ 107, 71, 107, 107, 74, 75, 76, 107, 107, 107,
+ 107, 81, 107, 107, 84, 85, 107, 107, 107, 89,
+ 90, 91, 107, 93, 66, 107, 68, 107, 107, 71,
+ 107, 107, 74, 75, 76, 107, 107, 107, 107, 81,
+ 107, 107, 84, 85, 107, 107, 107, 89, 90, 91,
+ 107, 93, 66, 107, 68, 107, 107, 71, 107, 107,
+ 74, 75, 76, 107, 107, 107, 107, 81, 107, 107,
+ 84, 85, 1, 2, 3, 89, 90, 91, 66, 93,
+ 68, 107, 107, 71, 107, 107, 74, 75, 76, 107,
+ 107, 107, 107, 81, 107, 107, 84, 85, 1, 107,
+ 3, 89, 90, 91, 107, 93, 107, 107, 37, 107,
+ 39, 40, 107, 107, 107, 66, 107, 68, 107, 48,
+ 71, 107, 107, 74, 75, 28, 55, 56, 57, 58,
+ 81, 34, 107, 107, 85, 107, 39, 40, 89, 90,
+ 91, 66, 93, 68, 107, 1, 71, 3, 107, 74,
+ 75, 107, 55, 56, 57, 58, 81, 107, 107, 107,
+ 85, 107, 107, 107, 89, 90, 91, 107, 93, 107,
+ 26, 107, 28, 2, 107, 107, 107, 107, 34, 107,
+ 107, 107, 11, 39, 40, 14, 107, 107, 107, 18,
+ 19, 107, 107, 107, 107, 107, 107, 107, 107, 55,
+ 56, 57, 58, 107, 107, 66, 107, 68, 107, 107,
+ 71, 107, 107, 74, 75, 107, 45, 107, 107, 48,
+ 81, 50, 2, 52, 53, 107, 107, 107, 89, 90,
+ 91, 11, 93, 2, 14, 107, 107, 17, 18, 19,
+ 107, 107, 11, 107, 107, 14, 107, 73, 17, 18,
+ 19, 77, 107, 107, 107, 107, 107, 83, 107, 107,
+ 86, 87, 88, 107, 107, 45, 107, 107, 48, 66,
+ 50, 68, 52, 107, 71, 101, 45, 74, 75, 48,
+ 66, 50, 68, 52, 81, 71, 107, 107, 74, 75,
+ 107, 107, 89, 90, 91, 81, 93, 107, 107, 107,
+ 107, 107, 107, 89, 90, 91, 66, 93, 68, 107,
+ 107, 71, 107, 107, 74, 75, 107, 66, 107, 68,
+ 107, 81, 71, 107, 107, 74, 75, 107, 107, 89,
+ 90, 91, 81, 93, 1, 107, 3, 107, 107, 107,
+ 89, 90, 91, 66, 93, 68, 107, 1, 71, 3,
+ 107, 74, 75, 107, 107, 107, 23, 107, 81, 107,
+ 1, 15, 3, 107, 107, 107, 89, 90, 91, 1,
+ 93, 3, 39, 40, 15, 107, 107, 107, 107, 107,
+ 107, 107, 107, 15, 107, 39, 40, 107, 55, 56,
+ 57, 58, 107, 107, 107, 107, 107, 107, 39, 40,
+ 107, 55, 56, 57, 58, 107, 107, 39, 40, 107,
+ 107, 107, 107, 107, 55, 56, 57, 58, 2, 1,
+ 107, 3, 107, 55, 56, 57, 58, 11, 107, 107,
+ 14, 107, 107, 15, 18, 19, 2, 107, 107, 107,
+ 107, 107, 107, 107, 107, 11, 107, 107, 14, 107,
+ 107, 107, 18, 19, 1, 107, 3, 39, 40, 107,
+ 107, 45, 107, 1, 48, 3, 50, 107, 52, 107,
+ 107, 107, 107, 55, 56, 57, 58, 15, 107, 45,
+ 107, 107, 48, 107, 50, 107, 52, 11, 107, 107,
+ 14, 107, 39, 40, 18, 19, 107, 107, 107, 107,
+ 107, 39, 40, 107, 107, 107, 53, 107, 55, 56,
+ 57, 58, 107, 107, 107, 107, 107, 55, 56, 57,
+ 58, 45, 107, 107, 48, 107, 50, 73, 52, 107,
+ 107, 77, 107, 107, 107, 107, 107, 83, 107, 107,
+ 86, 87, 88, 107, 107, 107, 107, 107, 107, 107,
+ 107, 107, 107, 107, 107, 101,
+ );
+
+ public static $yy_shift_ofst = array(
+ -23, 399, 399, 449, 49, 49, 449, 349, 49, 49,
+ 349, -3, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 149, 199, 299, 49, 149, 49, 49,
+ 49, 49, 49, 49, 249, 49, 99, 99, 499, 499,
+ 499, 499, 499, 499, 1664, 1617, 1617, 1144, 1982, 1973,
+ 1938, 1226, 1853, 1062, 980, 1879, 898, 1866, 1888, 1308,
+ 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
+ 1308, 1308, 520, 520, 533, 731, 1372, 171, 255, 129,
+ 708, 595, 9, 154, 129, 255, 308, 129, 255, 537,
+ 559, 1751, 244, 344, 511, 221, 294, 411, 40, 411,
+ -22, 438, 438, 436, 387, 427, 319, 355, -22, -22,
+ 420, 609, 232, 232, 232, 609, 232, 232, 232, 232,
+ -23, -23, -23, -23, 1740, 1691, 1954, 1936, 1996, 81,
+ 687, 461, 212, -22, 31, -14, -14, -22, 288, -14,
+ 288, -14, -22, 31, -22, -14, -14, -22, -22, 351,
+ -22, -22, -14, -22, -22, -22, -22, -22, -14, 210,
+ 232, 609, 232, 395, 609, 232, 609, 232, 395, 92,
+ 232, -23, -23, -23, -23, -23, -23, 1591, 30, -12,
+ 94, 144, 342, 596, 179, 103, 194, 454, 230, 152,
+ 269, 301, 318, 127, 282, -8, 205, 361, 378, 421,
+ 68, 467, 556, 606, 571, 598, 587, 586, 610, 549,
+ 572, 574, 570, 532, 530, 553, 298, 523, 544, 510,
+ 92, 534, 529, 519, 517, 496, 442, 481,
+ );
+
+ public static $yy_reduce_ofst = array(
+ 492, 527, 564, 592, 618, 703, 736, 768, 794, 822,
+ 850, 1068, 1096, 1122, 1150, 1286, 1204, 1232, 1260, 1040,
+ 1314, 1532, 1478, 1506, 1342, 1450, 1424, 1396, 1368, 1178,
+ 1014, 986, 932, 904, 876, 958, 1595, 1569, 1771, 1659,
+ 1760, 1734, 1723, 1797, 712, 1694, 1974, 37, 37, 37,
+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+ 37, 37, 37, 37, 114, -33, 372, -67, 6, 76,
+ 71, 233, 241, 190, 226, 4, 307, 276, 326, 172,
+ 429, 389, -23, -23, 339, 428, -23, 410, 390, 339,
+ 391, 386, 348, -23, 222, -23, 293, 155, 441, 445,
+ 390, 459, -23, -23, -23, 390, -23, -23, -23, 439,
+ -23, -23, 359, -23, 550, 550, 550, 550, 550, 545,
+ 555, 550, 550, 554, 566, 539, 539, 554, 547, 539,
+ 548, 539, 554, 546, 554, 539, 539, 554, 554, 563,
+ 554, 554, 539, 554, 554, 554, 554, 554, 539, 558,
+ 78, 320, 78, 522, 320, 78, 320, 78, 522, 196,
+ 78, 51, -61, -20, -4, 109, 132,
+ );
- const Err1 = "Security error: Call to private object member not allowed";
- const Err2 = "Security error: Call to dynamic object member not allowed";
- const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
+ public static $yyExpectedTokens = array(
+ array(),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(
+ 3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 53, 54, 59,
+ ),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 52, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,),
+ array(3, 11, 12, 13, 14, 16, 18, 20, 21, 22, 27, 31, 32, 33, 35, 37, 42, 43, 44, 45, 47, 49, 51, 54, 59,),
+ array(1, 3, 26, 28, 34, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 28, 34, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 28, 34, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 29, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 15, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 53, 55, 56, 57, 58,),
+ array(1, 3, 15, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 38, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 23, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 38, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58, 60,),
+ array(1, 3, 15, 39, 40, 55, 56, 57, 58,),
+ array(1, 2, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 15, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 15, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(1, 3, 39, 40, 55, 56, 57, 58,),
+ array(3, 39, 40, 55, 56, 57, 58,),
+ array(3, 39, 40, 55, 56, 57, 58,),
+ array(16, 18, 49, 51, 54,),
+ array(5, 11, 12, 13, 14, 16, 20, 21, 22, 27, 31, 32, 33, 59, 60,),
+ array(1, 15, 19, 28, 34, 37, 48,),
+ array(16, 18, 51, 54,),
+ array(1, 28, 34,),
+ array(16, 37, 54,),
+ array(5, 11, 12, 13, 14, 16, 20, 21, 22, 27, 31, 32, 33, 59, 60,),
+ array(11, 14, 18, 28, 30, 34,),
+ array(11, 14, 18, 28, 34,),
+ array(19, 45, 52,),
+ array(16, 37, 54,),
+ array(1, 28, 34,),
+ array(17, 19, 48,),
+ array(16, 37, 54,),
+ array(1, 28, 34,),
+ array(1, 2,),
+ array(4, 5, 6, 7, 8, 11, 12, 13, 14, 20, 21, 22, 27, 31, 32, 33,),
+ array(2, 11, 14, 17, 18, 19, 45, 48, 50, 52,),
+ array(1, 15, 28, 34,),
+ array(1, 15, 28, 34,),
+ array(11, 14, 18, 50,),
+ array(14, 16, 18, 54,),
+ array(1, 15, 28, 34,),
+ array(11, 14, 18,),
+ array(17, 19, 48,),
+ array(11, 14, 18,),
+ array(28, 34,),
+ array(16, 18,),
+ array(16, 18,),
+ array(1, 53,),
+ array(1, 19,),
+ array(1, 30,),
+ array(16, 54,),
+ array(28, 34,),
+ array(28, 34,),
+ array(28, 34,),
+ array(19, 48,),
+ array(19,),
+ array(1,),
+ array(1,),
+ array(1,),
+ array(19,),
+ array(1,),
+ array(1,),
+ array(1,),
+ array(1,),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(2, 11, 14, 17, 18, 19, 45, 48, 50, 52,),
+ array(2, 11, 14, 18, 19, 45, 48, 50, 52, 53,),
+ array(2, 11, 14, 18, 19, 45, 48, 50, 52,),
+ array(2, 11, 14, 18, 19, 45, 48, 50, 52,),
+ array(11, 14, 18, 19, 45, 48, 50, 52,),
+ array(14, 16, 18, 35, 54,),
+ array(11, 14, 18, 50,),
+ array(11, 14, 18,),
+ array(17, 45, 52,),
+ array(28, 34,),
+ array(16, 54,),
+ array(45, 52,),
+ array(45, 52,),
+ array(28, 34,),
+ array(45, 52,),
+ array(45, 52,),
+ array(45, 52,),
+ array(45, 52,),
+ array(28, 34,),
+ array(16, 54,),
+ array(28, 34,),
+ array(45, 52,),
+ array(45, 52,),
+ array(28, 34,),
+ array(28, 34,),
+ array(17, 24,),
+ array(28, 34,),
+ array(28, 34,),
+ array(45, 52,),
+ array(28, 34,),
+ array(28, 34,),
+ array(28, 34,),
+ array(28, 34,),
+ array(28, 34,),
+ array(45, 52,),
+ array(14, 37,),
+ array(1,),
+ array(19,),
+ array(1,),
+ array(2,),
+ array(19,),
+ array(1,),
+ array(19,),
+ array(1,),
+ array(2,),
+ array(37,),
+ array(1,),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(1, 2, 3, 37, 39, 40, 48, 55, 56, 57, 58,),
+ array(15, 23, 25, 28, 34, 36, 38, 45,),
+ array(15, 17, 28, 34, 37, 48,),
+ array(15, 24, 28, 34, 46,),
+ array(15, 24, 28, 34, 46,),
+ array(37, 45, 48, 53,),
+ array(11, 14, 18, 50,),
+ array(30, 37, 48,),
+ array(24, 46, 53,),
+ array(24, 46, 60,),
+ array(36, 53,),
+ array(36, 38,),
+ array(45, 53,),
+ array(8, 10,),
+ array(37, 48,),
+ array(37, 48,),
+ array(37, 48,),
+ array(23, 36,),
+ array(9, 10,),
+ array(18, 50,),
+ array(24, 46,),
+ array(36, 38,),
+ array(17, 45,),
+ array(36, 38,),
+ array(38,),
+ array(18,),
+ array(15,),
+ array(51,),
+ array(17,),
+ array(18,),
+ array(18,),
+ array(9,),
+ array(51,),
+ array(25,),
+ array(15,),
+ array(18,),
+ array(53,),
+ array(53,),
+ array(16,),
+ array(41,),
+ array(45,),
+ array(18,),
+ array(35,),
+ array(37,),
+ array(18,),
+ array(18,),
+ array(18,),
+ array(18,),
+ array(37,),
+ array(35,),
+ array(18,),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ array(),
+ );
+
+ public static $yy_default = array(
+ 334, 509, 509, 494, 509, 473, 509, 509, 473, 473,
+ 509, 509, 509, 509, 509, 509, 509, 509, 509, 509,
+ 509, 509, 509, 509, 509, 509, 509, 509, 509, 509,
+ 509, 509, 509, 509, 509, 509, 509, 509, 509, 509,
+ 509, 509, 509, 509, 375, 354, 375, 380, 509, 509,
+ 347, 509, 509, 509, 509, 509, 509, 509, 509, 397,
+ 472, 347, 471, 387, 497, 495, 382, 386, 359, 377,
+ 380, 496, 402, 401, 509, 509, 413, 509, 375, 509,
+ 509, 375, 375, 485, 509, 375, 428, 509, 375, 366,
+ 323, 427, 389, 389, 438, 509, 389, 438, 428, 438,
+ 375, 509, 509, 389, 369, 389, 509, 375, 375, 356,
+ 428, 482, 405, 389, 406, 428, 396, 392, 400, 371,
+ 480, 404, 332, 393, 427, 427, 427, 427, 427, 509,
+ 440, 438, 454, 355, 509, 436, 434, 365, 433, 432,
+ 431, 465, 364, 509, 363, 466, 463, 362, 352, 509,
+ 351, 357, 435, 344, 350, 358, 361, 348, 464, 438,
+ 422, 460, 367, 474, 486, 372, 483, 395, 475, 438,
+ 370, 479, 479, 438, 438, 332, 479, 413, 409, 413,
+ 403, 403, 413, 439, 413, 403, 403, 509, 509, 409,
+ 330, 423, 509, 413, 509, 509, 509, 403, 509, 409,
+ 509, 509, 509, 509, 509, 509, 509, 509, 509, 509,
+ 383, 509, 509, 418, 509, 509, 415, 409, 509, 509,
+ 454, 509, 509, 509, 509, 484, 411, 509, 324, 426,
+ 415, 360, 442, 487, 444, 336, 443, 337, 488, 376,
+ 489, 490, 452, 481, 459, 454, 410, 441, 328, 419,
+ 325, 326, 437, 420, 477, 327, 476, 398, 399, 414,
+ 335, 421, 388, 424, 412, 451, 329, 331, 449, 333,
+ 384, 469, 500, 468, 491, 505, 343, 416, 417, 506,
+ 374, 391, 492, 493, 498, 341, 373, 418, 425, 353,
+ 501, 508, 507, 504, 502, 499, 461, 390, 368, 408,
+ 338, 503, 478, 453, 447, 446, 429, 445, 430, 448,
+ 450, 342, 462, 339, 340, 455, 470, 458, 457, 407,
+ 467, 456, 394,
+ );
+
+ public static $yyFallback = array();
+
+ public static $yyRuleName = array(
+ 'start ::= template',
+ 'template ::= template PHP',
+ 'template ::= template TEXT',
+ 'template ::= template STRIPON',
+ 'template ::= template STRIPOFF',
+ 'template ::= template LITERALSTART literal_e2 LITERALEND',
+ 'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND',
+ 'literal_e2 ::= literal_e1',
+ 'literal_e1 ::= literal_e1 LITERAL',
+ 'literal_e1 ::=',
+ 'template ::= template smartytag',
+ 'template ::=',
+ 'smartytag ::= SIMPELOUTPUT',
+ 'smartytag ::= SIMPLETAG',
+ 'smartytag ::= SMARTYBLOCKCHILDPARENT',
+ 'smartytag ::= LDEL tagbody RDEL',
+ 'smartytag ::= tag RDEL',
+ 'tagbody ::= outattr',
+ 'tagbody ::= DOLLARID eqoutattr',
+ 'tagbody ::= varindexed eqoutattr',
+ 'eqoutattr ::= EQUAL outattr',
+ 'outattr ::= output attributes',
+ 'output ::= variable',
+ 'output ::= value',
+ 'output ::= expr',
+ 'tag ::= LDEL ID attributes',
+ 'tag ::= LDEL ID',
+ 'tag ::= LDEL ID modifierlist attributes',
+ 'tag ::= LDEL ID PTR ID attributes',
+ 'tag ::= LDEL ID PTR ID modifierlist attributes',
+ 'tag ::= LDELMAKENOCACHE DOLLARID',
+ 'tag ::= LDELIF expr',
+ 'tag ::= LDELIF expr attributes',
+ 'tag ::= LDELIF statement',
+ 'tag ::= LDELIF statement attributes',
+ 'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
+ 'foraction ::= EQUAL expr',
+ 'foraction ::= INCDEC',
+ 'tag ::= LDELFOR statement TO expr attributes',
+ 'tag ::= LDELFOR statement TO expr STEP expr attributes',
+ 'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
+ 'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
+ 'tag ::= LDELFOREACH attributes',
+ 'tag ::= LDELSETFILTER ID modparameters',
+ 'tag ::= LDELSETFILTER ID modparameters modifierlist',
+ 'smartytag ::= CLOSETAG',
+ 'tag ::= LDELSLASH ID',
+ 'tag ::= LDELSLASH ID modifierlist',
+ 'tag ::= LDELSLASH ID PTR ID',
+ 'tag ::= LDELSLASH ID PTR ID modifierlist',
+ 'attributes ::= attributes attribute',
+ 'attributes ::= attribute',
+ 'attributes ::=',
+ 'attribute ::= SPACE ID EQUAL ID',
+ 'attribute ::= ATTR expr',
+ 'attribute ::= ATTR value',
+ 'attribute ::= SPACE ID',
+ 'attribute ::= SPACE expr',
+ 'attribute ::= SPACE value',
+ 'attribute ::= SPACE INTEGER EQUAL expr',
+ 'statements ::= statement',
+ 'statements ::= statements COMMA statement',
+ 'statement ::= DOLLARID EQUAL INTEGER',
+ 'statement ::= DOLLARID EQUAL expr',
+ 'statement ::= varindexed EQUAL expr',
+ 'statement ::= OPENP statement CLOSEP',
+ 'expr ::= value',
+ 'expr ::= ternary',
+ 'expr ::= DOLLARID COLON ID',
+ 'expr ::= expr MATH value',
+ 'expr ::= expr UNIMATH value',
+ 'expr ::= array',
+ 'expr ::= expr modifierlist',
+ 'expr ::= expr tlop value',
+ 'expr ::= expr lop expr',
+ 'expr ::= expr scond',
+ 'expr ::= expr ISIN array',
+ 'expr ::= expr ISIN value',
+ 'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
+ 'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr',
+ 'value ::= variable',
+ 'value ::= UNIMATH value',
+ 'value ::= NOT value',
+ 'value ::= TYPECAST value',
+ 'value ::= variable INCDEC',
+ 'value ::= HEX',
+ 'value ::= INTEGER',
+ 'value ::= INTEGER DOT INTEGER',
+ 'value ::= INTEGER DOT',
+ 'value ::= DOT INTEGER',
+ 'value ::= ID',
+ 'value ::= function',
+ 'value ::= OPENP expr CLOSEP',
+ 'value ::= variable INSTANCEOF ns1',
+ 'value ::= variable INSTANCEOF variable',
+ 'value ::= SINGLEQUOTESTRING',
+ 'value ::= doublequoted_with_quotes',
+ 'value ::= varindexed DOUBLECOLON static_class_access',
+ 'value ::= smartytag',
+ 'value ::= value modifierlist',
+ 'value ::= NAMESPACE',
+ 'value ::= ns1 DOUBLECOLON static_class_access',
+ 'ns1 ::= ID',
+ 'ns1 ::= NAMESPACE',
+ 'variable ::= DOLLARID',
+ 'variable ::= varindexed',
+ 'variable ::= varvar AT ID',
+ 'variable ::= object',
+ 'variable ::= HATCH ID HATCH',
+ 'variable ::= HATCH ID HATCH arrayindex',
+ 'variable ::= HATCH variable HATCH',
+ 'variable ::= HATCH variable HATCH arrayindex',
+ 'varindexed ::= DOLLARID arrayindex',
+ 'varindexed ::= varvar arrayindex',
+ 'arrayindex ::= arrayindex indexdef',
+ 'arrayindex ::=',
+ 'indexdef ::= DOT DOLLARID',
+ 'indexdef ::= DOT varvar',
+ 'indexdef ::= DOT varvar AT ID',
+ 'indexdef ::= DOT ID',
+ 'indexdef ::= DOT INTEGER',
+ 'indexdef ::= DOT LDEL expr RDEL',
+ 'indexdef ::= OPENB ID CLOSEB',
+ 'indexdef ::= OPENB ID DOT ID CLOSEB',
+ 'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
+ 'indexdef ::= OPENB INTEGER CLOSEB',
+ 'indexdef ::= OPENB DOLLARID CLOSEB',
+ 'indexdef ::= OPENB variable CLOSEB',
+ 'indexdef ::= OPENB value CLOSEB',
+ 'indexdef ::= OPENB expr CLOSEB',
+ 'indexdef ::= OPENB CLOSEB',
+ 'varvar ::= DOLLARID',
+ 'varvar ::= DOLLAR',
+ 'varvar ::= varvar varvarele',
+ 'varvarele ::= ID',
+ 'varvarele ::= SIMPELOUTPUT',
+ 'varvarele ::= LDEL expr RDEL',
+ 'object ::= varindexed objectchain',
+ 'objectchain ::= objectelement',
+ 'objectchain ::= objectchain objectelement',
+ 'objectelement ::= PTR ID arrayindex',
+ 'objectelement ::= PTR varvar arrayindex',
+ 'objectelement ::= PTR LDEL expr RDEL arrayindex',
+ 'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
+ 'objectelement ::= PTR method',
+ 'function ::= ns1 OPENP params CLOSEP',
+ 'method ::= ID OPENP params CLOSEP',
+ 'method ::= DOLLARID OPENP params CLOSEP',
+ 'params ::= params COMMA expr',
+ 'params ::= expr',
+ 'params ::=',
+ 'modifierlist ::= modifierlist modifier modparameters',
+ 'modifierlist ::= modifier modparameters',
+ 'modifier ::= VERT AT ID',
+ 'modifier ::= VERT ID',
+ 'modparameters ::= modparameters modparameter',
+ 'modparameters ::=',
+ 'modparameter ::= COLON value',
+ 'modparameter ::= COLON array',
+ 'static_class_access ::= method',
+ 'static_class_access ::= method objectchain',
+ 'static_class_access ::= ID',
+ 'static_class_access ::= DOLLARID arrayindex',
+ 'static_class_access ::= DOLLARID arrayindex objectchain',
+ 'lop ::= LOGOP',
+ 'lop ::= SLOGOP',
+ 'tlop ::= TLOGOP',
+ 'scond ::= SINGLECOND',
+ 'array ::= OPENB arrayelements CLOSEB',
+ 'arrayelements ::= arrayelement',
+ 'arrayelements ::= arrayelements COMMA arrayelement',
+ 'arrayelements ::=',
+ 'arrayelement ::= value APTR expr',
+ 'arrayelement ::= ID APTR expr',
+ 'arrayelement ::= expr',
+ 'doublequoted_with_quotes ::= QUOTE QUOTE',
+ 'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
+ 'doublequoted ::= doublequoted doublequotedcontent',
+ 'doublequoted ::= doublequotedcontent',
+ 'doublequotedcontent ::= BACKTICK variable BACKTICK',
+ 'doublequotedcontent ::= BACKTICK expr BACKTICK',
+ 'doublequotedcontent ::= DOLLARID',
+ 'doublequotedcontent ::= LDEL variable RDEL',
+ 'doublequotedcontent ::= LDEL expr RDEL',
+ 'doublequotedcontent ::= smartytag',
+ 'doublequotedcontent ::= TEXT',
+ );
+
+ public static $yyRuleInfo = array(
+ array(0 => 62, 1 => 1),
+ array(0 => 63, 1 => 2),
+ array(0 => 63, 1 => 2),
+ array(0 => 63, 1 => 2),
+ array(0 => 63, 1 => 2),
+ array(0 => 63, 1 => 4),
+ array(0 => 64, 1 => 4),
+ array(0 => 64, 1 => 1),
+ array(0 => 65, 1 => 2),
+ array(0 => 65, 1 => 0),
+ array(0 => 63, 1 => 2),
+ array(0 => 63, 1 => 0),
+ array(0 => 66, 1 => 1),
+ array(0 => 66, 1 => 1),
+ array(0 => 66, 1 => 1),
+ array(0 => 66, 1 => 3),
+ array(0 => 66, 1 => 2),
+ array(0 => 67, 1 => 1),
+ array(0 => 67, 1 => 2),
+ array(0 => 67, 1 => 2),
+ array(0 => 70, 1 => 2),
+ array(0 => 69, 1 => 2),
+ array(0 => 72, 1 => 1),
+ array(0 => 72, 1 => 1),
+ array(0 => 72, 1 => 1),
+ array(0 => 68, 1 => 3),
+ array(0 => 68, 1 => 2),
+ array(0 => 68, 1 => 4),
+ array(0 => 68, 1 => 5),
+ array(0 => 68, 1 => 6),
+ array(0 => 68, 1 => 2),
+ array(0 => 68, 1 => 2),
+ array(0 => 68, 1 => 3),
+ array(0 => 68, 1 => 2),
+ array(0 => 68, 1 => 3),
+ array(0 => 68, 1 => 8),
+ array(0 => 80, 1 => 2),
+ array(0 => 80, 1 => 1),
+ array(0 => 68, 1 => 5),
+ array(0 => 68, 1 => 7),
+ array(0 => 68, 1 => 6),
+ array(0 => 68, 1 => 8),
+ array(0 => 68, 1 => 2),
+ array(0 => 68, 1 => 3),
+ array(0 => 68, 1 => 4),
+ array(0 => 66, 1 => 1),
+ array(0 => 68, 1 => 2),
+ array(0 => 68, 1 => 3),
+ array(0 => 68, 1 => 4),
+ array(0 => 68, 1 => 5),
+ array(0 => 73, 1 => 2),
+ array(0 => 73, 1 => 1),
+ array(0 => 73, 1 => 0),
+ array(0 => 83, 1 => 4),
+ array(0 => 83, 1 => 2),
+ array(0 => 83, 1 => 2),
+ array(0 => 83, 1 => 2),
+ array(0 => 83, 1 => 2),
+ array(0 => 83, 1 => 2),
+ array(0 => 83, 1 => 4),
+ array(0 => 79, 1 => 1),
+ array(0 => 79, 1 => 3),
+ array(0 => 78, 1 => 3),
+ array(0 => 78, 1 => 3),
+ array(0 => 78, 1 => 3),
+ array(0 => 78, 1 => 3),
+ array(0 => 76, 1 => 1),
+ array(0 => 76, 1 => 1),
+ array(0 => 76, 1 => 3),
+ array(0 => 76, 1 => 3),
+ array(0 => 76, 1 => 3),
+ array(0 => 76, 1 => 1),
+ array(0 => 76, 1 => 2),
+ array(0 => 76, 1 => 3),
+ array(0 => 76, 1 => 3),
+ array(0 => 76, 1 => 2),
+ array(0 => 76, 1 => 3),
+ array(0 => 76, 1 => 3),
+ array(0 => 84, 1 => 7),
+ array(0 => 84, 1 => 7),
+ array(0 => 75, 1 => 1),
+ array(0 => 75, 1 => 2),
+ array(0 => 75, 1 => 2),
+ array(0 => 75, 1 => 2),
+ array(0 => 75, 1 => 2),
+ array(0 => 75, 1 => 1),
+ array(0 => 75, 1 => 1),
+ array(0 => 75, 1 => 3),
+ array(0 => 75, 1 => 2),
+ array(0 => 75, 1 => 2),
+ array(0 => 75, 1 => 1),
+ array(0 => 75, 1 => 1),
+ array(0 => 75, 1 => 3),
+ array(0 => 75, 1 => 3),
+ array(0 => 75, 1 => 3),
+ array(0 => 75, 1 => 1),
+ array(0 => 75, 1 => 1),
+ array(0 => 75, 1 => 3),
+ array(0 => 75, 1 => 1),
+ array(0 => 75, 1 => 2),
+ array(0 => 75, 1 => 1),
+ array(0 => 75, 1 => 3),
+ array(0 => 90, 1 => 1),
+ array(0 => 90, 1 => 1),
+ array(0 => 74, 1 => 1),
+ array(0 => 74, 1 => 1),
+ array(0 => 74, 1 => 3),
+ array(0 => 74, 1 => 1),
+ array(0 => 74, 1 => 3),
+ array(0 => 74, 1 => 4),
+ array(0 => 74, 1 => 3),
+ array(0 => 74, 1 => 4),
+ array(0 => 71, 1 => 2),
+ array(0 => 71, 1 => 2),
+ array(0 => 94, 1 => 2),
+ array(0 => 94, 1 => 0),
+ array(0 => 95, 1 => 2),
+ array(0 => 95, 1 => 2),
+ array(0 => 95, 1 => 4),
+ array(0 => 95, 1 => 2),
+ array(0 => 95, 1 => 2),
+ array(0 => 95, 1 => 4),
+ array(0 => 95, 1 => 3),
+ array(0 => 95, 1 => 5),
+ array(0 => 95, 1 => 3),
+ array(0 => 95, 1 => 3),
+ array(0 => 95, 1 => 3),
+ array(0 => 95, 1 => 3),
+ array(0 => 95, 1 => 3),
+ array(0 => 95, 1 => 3),
+ array(0 => 95, 1 => 2),
+ array(0 => 81, 1 => 1),
+ array(0 => 81, 1 => 1),
+ array(0 => 81, 1 => 2),
+ array(0 => 96, 1 => 1),
+ array(0 => 96, 1 => 1),
+ array(0 => 96, 1 => 3),
+ array(0 => 93, 1 => 2),
+ array(0 => 97, 1 => 1),
+ array(0 => 97, 1 => 2),
+ array(0 => 98, 1 => 3),
+ array(0 => 98, 1 => 3),
+ array(0 => 98, 1 => 5),
+ array(0 => 98, 1 => 6),
+ array(0 => 98, 1 => 2),
+ array(0 => 89, 1 => 4),
+ array(0 => 99, 1 => 4),
+ array(0 => 99, 1 => 4),
+ array(0 => 100, 1 => 3),
+ array(0 => 100, 1 => 1),
+ array(0 => 100, 1 => 0),
+ array(0 => 77, 1 => 3),
+ array(0 => 77, 1 => 2),
+ array(0 => 101, 1 => 3),
+ array(0 => 101, 1 => 2),
+ array(0 => 82, 1 => 2),
+ array(0 => 82, 1 => 0),
+ array(0 => 102, 1 => 2),
+ array(0 => 102, 1 => 2),
+ array(0 => 92, 1 => 1),
+ array(0 => 92, 1 => 2),
+ array(0 => 92, 1 => 1),
+ array(0 => 92, 1 => 2),
+ array(0 => 92, 1 => 3),
+ array(0 => 87, 1 => 1),
+ array(0 => 87, 1 => 1),
+ array(0 => 86, 1 => 1),
+ array(0 => 88, 1 => 1),
+ array(0 => 85, 1 => 3),
+ array(0 => 103, 1 => 1),
+ array(0 => 103, 1 => 3),
+ array(0 => 103, 1 => 0),
+ array(0 => 104, 1 => 3),
+ array(0 => 104, 1 => 3),
+ array(0 => 104, 1 => 1),
+ array(0 => 91, 1 => 2),
+ array(0 => 91, 1 => 3),
+ array(0 => 105, 1 => 2),
+ array(0 => 105, 1 => 1),
+ array(0 => 106, 1 => 3),
+ array(0 => 106, 1 => 3),
+ array(0 => 106, 1 => 1),
+ array(0 => 106, 1 => 3),
+ array(0 => 106, 1 => 3),
+ array(0 => 106, 1 => 1),
+ array(0 => 106, 1 => 1),
+ );
+
+ public static $yyReduceMap = array(
+ 0 => 0,
+ 1 => 1,
+ 2 => 2,
+ 3 => 3,
+ 4 => 4,
+ 5 => 5,
+ 6 => 6,
+ 7 => 7,
+ 22 => 7,
+ 23 => 7,
+ 24 => 7,
+ 37 => 7,
+ 57 => 7,
+ 58 => 7,
+ 66 => 7,
+ 67 => 7,
+ 71 => 7,
+ 80 => 7,
+ 85 => 7,
+ 86 => 7,
+ 91 => 7,
+ 95 => 7,
+ 96 => 7,
+ 100 => 7,
+ 102 => 7,
+ 107 => 7,
+ 169 => 7,
+ 174 => 7,
+ 8 => 8,
+ 9 => 9,
+ 10 => 10,
+ 12 => 12,
+ 13 => 13,
+ 14 => 14,
+ 15 => 15,
+ 16 => 16,
+ 17 => 17,
+ 18 => 18,
+ 19 => 19,
+ 20 => 20,
+ 21 => 21,
+ 25 => 25,
+ 26 => 26,
+ 27 => 27,
+ 28 => 28,
+ 29 => 29,
+ 30 => 30,
+ 31 => 31,
+ 32 => 32,
+ 34 => 32,
+ 33 => 33,
+ 35 => 35,
+ 36 => 36,
+ 38 => 38,
+ 39 => 39,
+ 40 => 40,
+ 41 => 41,
+ 42 => 42,
+ 43 => 43,
+ 44 => 44,
+ 45 => 45,
+ 46 => 46,
+ 47 => 47,
+ 48 => 48,
+ 49 => 49,
+ 50 => 50,
+ 51 => 51,
+ 60 => 51,
+ 149 => 51,
+ 153 => 51,
+ 157 => 51,
+ 158 => 51,
+ 52 => 52,
+ 150 => 52,
+ 156 => 52,
+ 53 => 53,
+ 54 => 54,
+ 55 => 54,
+ 56 => 56,
+ 134 => 56,
+ 59 => 59,
+ 61 => 61,
+ 62 => 62,
+ 63 => 62,
+ 64 => 64,
+ 65 => 65,
+ 68 => 68,
+ 69 => 69,
+ 70 => 69,
+ 72 => 72,
+ 99 => 72,
+ 73 => 73,
+ 74 => 74,
+ 75 => 75,
+ 76 => 76,
+ 77 => 77,
+ 78 => 78,
+ 79 => 79,
+ 81 => 81,
+ 83 => 81,
+ 84 => 81,
+ 114 => 81,
+ 82 => 82,
+ 87 => 87,
+ 88 => 88,
+ 89 => 89,
+ 90 => 90,
+ 92 => 92,
+ 93 => 93,
+ 94 => 93,
+ 97 => 97,
+ 98 => 98,
+ 101 => 101,
+ 103 => 103,
+ 104 => 104,
+ 105 => 105,
+ 106 => 106,
+ 108 => 108,
+ 109 => 109,
+ 110 => 110,
+ 111 => 111,
+ 112 => 112,
+ 113 => 113,
+ 115 => 115,
+ 171 => 115,
+ 116 => 116,
+ 117 => 117,
+ 118 => 118,
+ 119 => 119,
+ 120 => 120,
+ 121 => 121,
+ 129 => 121,
+ 122 => 122,
+ 123 => 123,
+ 124 => 124,
+ 125 => 124,
+ 127 => 124,
+ 128 => 124,
+ 126 => 126,
+ 130 => 130,
+ 131 => 131,
+ 132 => 132,
+ 175 => 132,
+ 133 => 133,
+ 135 => 135,
+ 136 => 136,
+ 137 => 137,
+ 138 => 138,
+ 139 => 139,
+ 140 => 140,
+ 141 => 141,
+ 142 => 142,
+ 143 => 143,
+ 144 => 144,
+ 145 => 145,
+ 146 => 146,
+ 147 => 147,
+ 148 => 148,
+ 151 => 151,
+ 152 => 152,
+ 154 => 154,
+ 155 => 155,
+ 159 => 159,
+ 160 => 160,
+ 161 => 161,
+ 162 => 162,
+ 163 => 163,
+ 164 => 164,
+ 165 => 165,
+ 166 => 166,
+ 167 => 167,
+ 168 => 168,
+ 170 => 170,
+ 172 => 172,
+ 173 => 173,
+ 176 => 176,
+ 177 => 177,
+ 178 => 178,
+ 179 => 179,
+ 182 => 179,
+ 180 => 180,
+ 183 => 180,
+ 181 => 181,
+ 184 => 184,
+ 185 => 185,
+ );
/**
* result status
@@ -128,7 +1540,7 @@ class Smarty_Internal_Templateparser
/**
* root parse tree buffer
*
- * @var Smarty_Internal_ParseTree
+ * @var Smarty_Internal_ParseTree_Template
*/
public $root_buffer;
@@ -147,18 +1559,12 @@ class Smarty_Internal_Templateparser
public $lex;
/**
- * internal error flag
- *
- * @var bool
- */
- private $internalError = false;
-
- /**
* {strip} status
*
* @var bool
*/
public $strip = false;
+
/**
* compiler object
*
@@ -202,19 +1608,66 @@ class Smarty_Internal_Templateparser
public $template_prefix = array();
/**
- * security object
+ * template prefix array
*
* @var \Smarty_Internal_ParseTree[]
*/
public $template_postfix = array();
+ public $yyTraceFILE;
+
+ public $yyTracePrompt;
+
+ public $yyidx;
+
+ public $yyerrcnt;
+
+ public $yystack = array();
+
+ public $yyTokenName = array(
+ '$', 'VERT', 'COLON', 'UNIMATH',
+ 'PHP', 'TEXT', 'STRIPON', 'STRIPOFF',
+ 'LITERALSTART', 'LITERALEND', 'LITERAL', 'SIMPELOUTPUT',
+ 'SIMPLETAG', 'SMARTYBLOCKCHILDPARENT', 'LDEL', 'RDEL',
+ 'DOLLARID', 'EQUAL', 'ID', 'PTR',
+ 'LDELMAKENOCACHE', 'LDELIF', 'LDELFOR', 'SEMICOLON',
+ 'INCDEC', 'TO', 'STEP', 'LDELFOREACH',
+ 'SPACE', 'AS', 'APTR', 'LDELSETFILTER',
+ 'CLOSETAG', 'LDELSLASH', 'ATTR', 'INTEGER',
+ 'COMMA', 'OPENP', 'CLOSEP', 'MATH',
+ 'ISIN', 'QMARK', 'NOT', 'TYPECAST',
+ 'HEX', 'DOT', 'INSTANCEOF', 'SINGLEQUOTESTRING',
+ 'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH',
+ 'OPENB', 'CLOSEB', 'DOLLAR', 'LOGOP',
+ 'SLOGOP', 'TLOGOP', 'SINGLECOND', 'QUOTE',
+ 'BACKTICK', 'error', 'start', 'template',
+ 'literal_e2', 'literal_e1', 'smartytag', 'tagbody',
+ 'tag', 'outattr', 'eqoutattr', 'varindexed',
+ 'output', 'attributes', 'variable', 'value',
+ 'expr', 'modifierlist', 'statement', 'statements',
+ 'foraction', 'varvar', 'modparameters', 'attribute',
+ 'ternary', 'array', 'tlop', 'lop',
+ 'scond', 'function', 'ns1', 'doublequoted_with_quotes',
+ 'static_class_access', 'object', 'arrayindex', 'indexdef',
+ 'varvarele', 'objectchain', 'objectelement', 'method',
+ 'params', 'modifier', 'modparameter', 'arrayelements',
+ 'arrayelement', 'doublequoted', 'doublequotedcontent',
+ );
+
+ /**
+ * internal error flag
+ *
+ * @var bool
+ */
+ private $internalError = false; /* Index of top element in stack */
+ private $_retvalue; /* Shifts left before out of the error */
/**
* constructor
*
* @param Smarty_Internal_Templatelexer $lex
* @param Smarty_Internal_TemplateCompilerBase $compiler
*/
- function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
+ public function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
{
$this->lex = $lex;
$this->compiler = $compiler;
@@ -222,6 +1675,13 @@ class Smarty_Internal_Templateparser
$this->smarty = $this->template->smarty;
$this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
$this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
+ } /* The parser's stack */
+ public static function yy_destructor($yymajor, $yypminor)
+ {
+ switch ($yymajor) {
+ default:
+ break; /* If no destructor action specified: do nothing */
+ }
}
/**
@@ -234,7 +1694,21 @@ class Smarty_Internal_Templateparser
$this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
}
- /**
+ /**
+ * error rundown
+ *
+ */
+ public function errorRunDown()
+ {
+ while ($this->yystack !== array()) {
+ $this->yy_pop_parser_stack();
+ }
+ if (is_resource($this->yyTraceFILE)) {
+ fclose($this->yyTraceFILE);
+ }
+ }
+
+ /**
* merge PHP code with prefix code and return parse tree tag object
*
* @param string $code
@@ -243,931 +1717,15 @@ class Smarty_Internal_Templateparser
*/
public function mergePrefixCode($code)
{
- $tmp ='';
+ $tmp = '';
foreach ($this->compiler->prefix_code as $preCode) {
$tmp .= $preCode;
}
- $this->compiler->prefix_code=array();
+ $this->compiler->prefix_code = array();
$tmp .= $code;
- return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp,true));
- }
-
-
- const TP_VERT = 1;
- const TP_COLON = 2;
- const TP_PHP = 3;
- const TP_NOCACHE = 4;
- const TP_TEXT = 5;
- const TP_STRIPON = 6;
- const TP_STRIPOFF = 7;
- const TP_LITERALSTART = 8;
- const TP_LITERALEND = 9;
- const TP_LITERAL = 10;
- const TP_RDEL = 11;
- const TP_SIMPELOUTPUT = 12;
- const TP_LDEL = 13;
- const TP_DOLLARID = 14;
- const TP_EQUAL = 15;
- const TP_SIMPLETAG = 16;
- const TP_ID = 17;
- const TP_PTR = 18;
- const TP_LDELMAKENOCACHE = 19;
- const TP_LDELIF = 20;
- const TP_LDELFOR = 21;
- const TP_SEMICOLON = 22;
- const TP_INCDEC = 23;
- const TP_TO = 24;
- const TP_STEP = 25;
- const TP_LDELFOREACH = 26;
- const TP_SPACE = 27;
- const TP_AS = 28;
- const TP_APTR = 29;
- const TP_LDELSETFILTER = 30;
- const TP_SMARTYBLOCKCHILDPARENT = 31;
- const TP_CLOSETAG = 32;
- const TP_LDELSLASH = 33;
- const TP_ATTR = 34;
- const TP_INTEGER = 35;
- const TP_COMMA = 36;
- const TP_OPENP = 37;
- const TP_CLOSEP = 38;
- const TP_MATH = 39;
- const TP_UNIMATH = 40;
- const TP_ISIN = 41;
- const TP_QMARK = 42;
- const TP_NOT = 43;
- const TP_TYPECAST = 44;
- const TP_HEX = 45;
- const TP_DOT = 46;
- const TP_INSTANCEOF = 47;
- const TP_SINGLEQUOTESTRING = 48;
- const TP_DOUBLECOLON = 49;
- const TP_NAMESPACE = 50;
- const TP_AT = 51;
- const TP_HATCH = 52;
- const TP_OPENB = 53;
- const TP_CLOSEB = 54;
- const TP_DOLLAR = 55;
- const TP_LOGOP = 56;
- const TP_SLOGOP = 57;
- const TP_TLOGOP = 58;
- const TP_SINGLECOND = 59;
- const TP_QUOTE = 60;
- const TP_BACKTICK = 61;
- const YY_NO_ACTION = 534;
- const YY_ACCEPT_ACTION = 533;
- const YY_ERROR_ACTION = 532;
-
- const YY_SZ_ACTTAB = 2044;
-static public $yy_action = array(
- 251, 8, 133, 158, 281, 80, 321, 218, 5, 83,
- 119, 177, 280, 243, 108, 102, 150, 308, 227, 296,
- 289, 234, 223, 233, 322, 28, 299, 332, 39, 190,
- 137, 40, 43, 268, 230, 461, 282, 9, 205, 357,
- 82, 1, 461, 324, 190, 251, 8, 132, 79, 281,
- 197, 326, 218, 5, 83, 25, 85, 306, 212, 108,
- 27, 196, 13, 227, 277, 289, 234, 99, 204, 213,
- 28, 216, 208, 39, 106, 78, 40, 43, 268, 230,
- 219, 221, 267, 205, 119, 82, 1, 312, 324, 102,
- 251, 8, 135, 79, 281, 201, 183, 218, 5, 83,
- 334, 332, 324, 31, 108, 44, 30, 241, 227, 136,
- 289, 234, 254, 233, 23, 28, 136, 99, 39, 214,
- 192, 40, 43, 268, 230, 25, 282, 326, 205, 140,
- 82, 1, 13, 324, 461, 251, 8, 136, 79, 281,
- 201, 461, 218, 5, 83, 250, 212, 82, 109, 108,
- 324, 78, 94, 227, 82, 289, 234, 324, 233, 179,
- 33, 32, 18, 39, 99, 245, 40, 43, 268, 230,
- 324, 282, 25, 205, 272, 82, 1, 259, 324, 13,
- 251, 8, 135, 79, 281, 195, 7, 218, 5, 83,
- 327, 262, 263, 220, 108, 109, 223, 213, 227, 258,
- 289, 234, 106, 206, 181, 28, 6, 326, 39, 160,
- 449, 40, 43, 268, 230, 11, 282, 310, 205, 299,
- 82, 1, 449, 324, 300, 251, 8, 134, 79, 281,
- 201, 78, 218, 5, 83, 257, 182, 190, 331, 108,
- 17, 229, 95, 227, 155, 289, 234, 19, 233, 240,
- 28, 187, 292, 39, 29, 239, 40, 43, 268, 230,
- 192, 282, 176, 205, 156, 82, 1, 24, 324, 106,
- 251, 8, 135, 79, 281, 193, 324, 218, 5, 83,
- 180, 92, 324, 235, 108, 232, 192, 290, 227, 21,
- 289, 234, 232, 233, 308, 28, 298, 448, 39, 223,
- 329, 40, 43, 268, 230, 11, 282, 284, 205, 448,
- 82, 1, 11, 324, 317, 251, 8, 135, 79, 281,
- 201, 326, 218, 5, 83, 3, 477, 477, 186, 108,
- 236, 477, 141, 227, 304, 289, 234, 112, 194, 213,
- 28, 215, 99, 39, 106, 78, 40, 43, 268, 230,
- 22, 282, 192, 205, 448, 82, 1, 13, 324, 171,
- 251, 8, 135, 79, 281, 198, 448, 218, 5, 83,
- 137, 293, 14, 178, 108, 242, 294, 9, 227, 38,
- 289, 234, 120, 233, 189, 28, 185, 292, 39, 184,
- 292, 40, 43, 268, 230, 121, 282, 192, 205, 279,
- 82, 1, 103, 324, 309, 251, 8, 131, 79, 281,
- 201, 174, 218, 5, 83, 212, 38, 165, 115, 108,
- 287, 299, 154, 227, 295, 289, 234, 299, 233, 152,
- 4, 295, 212, 39, 149, 212, 40, 43, 268, 230,
- 295, 282, 363, 205, 299, 82, 1, 270, 324, 249,
- 251, 8, 136, 79, 281, 201, 120, 218, 5, 83,
- 330, 232, 175, 15, 108, 274, 212, 168, 227, 212,
- 289, 234, 299, 233, 2, 33, 401, 299, 39, 161,
- 212, 40, 43, 268, 230, 295, 282, 84, 205, 299,
- 82, 173, 401, 324, 35, 293, 14, 238, 79, 401,
- 294, 299, 264, 265, 261, 271, 273, 177, 212, 12,
- 25, 251, 8, 144, 295, 281, 32, 13, 218, 5,
- 83, 302, 252, 299, 169, 108, 325, 139, 183, 227,
- 244, 289, 234, 224, 299, 248, 295, 44, 30, 241,
- 223, 203, 323, 118, 73, 110, 41, 42, 37, 269,
- 102, 99, 192, 266, 320, 333, 247, 153, 275, 211,
- 260, 91, 332, 311, 316, 318, 319, 299, 324, 248,
- 34, 7, 202, 286, 223, 203, 145, 127, 49, 105,
- 276, 117, 109, 147, 102, 192, 402, 266, 320, 290,
- 217, 164, 275, 211, 260, 93, 332, 256, 248, 90,
- 116, 299, 402, 223, 203, 240, 127, 66, 110, 402,
- 212, 138, 448, 102, 107, 159, 266, 320, 89, 192,
- 369, 275, 211, 260, 448, 332, 278, 228, 88, 248,
- 146, 295, 210, 86, 223, 203, 25, 127, 57, 105,
- 87, 215, 143, 13, 102, 305, 448, 266, 320, 305,
- 305, 305, 275, 211, 260, 248, 332, 305, 448, 305,
- 223, 203, 305, 127, 66, 110, 212, 41, 42, 37,
- 102, 305, 305, 266, 320, 305, 359, 305, 275, 211,
- 260, 305, 332, 305, 311, 316, 318, 319, 248, 207,
- 305, 305, 25, 223, 203, 212, 127, 66, 110, 13,
- 212, 305, 305, 102, 305, 404, 266, 320, 305, 307,
- 404, 275, 211, 260, 305, 332, 251, 10, 315, 305,
- 281, 404, 209, 218, 5, 83, 404, 166, 404, 305,
- 108, 307, 288, 404, 227, 305, 289, 234, 251, 10,
- 315, 305, 281, 305, 326, 218, 5, 83, 25, 305,
- 305, 305, 108, 305, 305, 13, 227, 305, 289, 234,
- 305, 305, 162, 305, 301, 16, 183, 305, 78, 477,
- 477, 305, 299, 248, 477, 44, 30, 241, 223, 203,
- 305, 118, 73, 110, 305, 305, 303, 16, 102, 151,
- 192, 266, 320, 186, 305, 305, 275, 211, 260, 299,
- 332, 305, 305, 305, 248, 305, 305, 305, 477, 223,
- 203, 297, 127, 59, 110, 305, 305, 192, 305, 102,
- 142, 305, 266, 320, 183, 305, 305, 275, 211, 260,
- 299, 332, 248, 44, 30, 241, 305, 223, 203, 305,
- 127, 46, 110, 305, 305, 305, 305, 102, 192, 305,
- 266, 320, 305, 305, 305, 275, 211, 260, 248, 332,
- 212, 305, 305, 223, 203, 305, 127, 55, 110, 305,
- 283, 305, 305, 102, 170, 305, 266, 320, 183, 305,
- 305, 275, 211, 260, 299, 332, 248, 44, 30, 241,
- 305, 223, 203, 305, 127, 47, 110, 305, 41, 42,
- 37, 102, 192, 305, 266, 320, 305, 305, 305, 275,
- 211, 260, 305, 332, 248, 311, 316, 318, 319, 223,
- 203, 305, 127, 69, 110, 305, 305, 305, 305, 102,
- 305, 305, 266, 320, 305, 305, 305, 275, 211, 260,
- 248, 332, 212, 305, 305, 223, 203, 305, 127, 68,
- 110, 305, 191, 305, 305, 102, 157, 305, 266, 320,
- 183, 305, 305, 275, 211, 260, 299, 332, 248, 44,
- 30, 241, 305, 223, 203, 305, 127, 51, 110, 305,
- 41, 42, 37, 102, 192, 305, 266, 320, 305, 305,
- 305, 275, 211, 260, 305, 332, 248, 311, 316, 318,
- 319, 223, 203, 305, 127, 64, 110, 305, 305, 305,
- 305, 102, 305, 305, 266, 320, 305, 305, 305, 275,
- 211, 260, 248, 332, 212, 305, 305, 223, 203, 305,
- 127, 61, 110, 293, 14, 305, 305, 102, 294, 305,
- 266, 320, 305, 305, 305, 275, 211, 260, 305, 332,
- 248, 167, 305, 305, 305, 223, 96, 305, 81, 50,
- 104, 305, 41, 42, 37, 102, 305, 305, 266, 320,
- 305, 305, 237, 275, 211, 260, 305, 332, 248, 311,
- 316, 318, 319, 223, 199, 305, 113, 56, 110, 305,
- 305, 305, 305, 102, 305, 305, 266, 320, 305, 305,
- 305, 275, 211, 260, 248, 332, 212, 305, 305, 223,
- 97, 305, 81, 45, 104, 305, 305, 305, 305, 102,
- 163, 305, 266, 320, 183, 305, 305, 275, 211, 260,
- 299, 332, 248, 44, 30, 241, 305, 223, 203, 305,
- 127, 71, 110, 226, 41, 42, 37, 102, 192, 305,
- 266, 320, 305, 305, 305, 275, 211, 260, 305, 332,
- 248, 311, 316, 318, 319, 223, 203, 305, 127, 76,
- 110, 305, 305, 305, 305, 102, 293, 14, 266, 320,
- 305, 294, 305, 275, 211, 260, 248, 332, 212, 305,
- 305, 223, 203, 305, 100, 72, 110, 305, 188, 305,
- 305, 102, 305, 305, 266, 320, 305, 305, 305, 275,
- 211, 260, 305, 332, 248, 231, 305, 305, 305, 223,
- 203, 305, 127, 62, 110, 305, 41, 42, 37, 102,
- 305, 305, 266, 320, 305, 305, 305, 275, 211, 260,
- 305, 332, 248, 311, 316, 318, 319, 223, 203, 305,
- 127, 65, 110, 305, 305, 305, 305, 102, 305, 305,
- 266, 320, 305, 305, 305, 275, 211, 260, 248, 332,
- 212, 305, 305, 223, 203, 305, 127, 70, 110, 305,
- 305, 305, 305, 102, 305, 305, 266, 320, 305, 305,
- 305, 275, 211, 260, 305, 332, 248, 305, 305, 305,
- 305, 223, 200, 305, 127, 53, 110, 314, 41, 42,
- 37, 102, 305, 305, 266, 320, 305, 305, 305, 275,
- 211, 260, 305, 332, 248, 311, 316, 318, 319, 223,
- 203, 305, 127, 54, 110, 305, 305, 305, 305, 102,
- 305, 305, 266, 320, 305, 305, 305, 275, 211, 260,
- 248, 332, 212, 305, 305, 223, 203, 305, 127, 75,
- 110, 305, 313, 305, 305, 102, 305, 305, 266, 320,
- 305, 305, 305, 275, 211, 260, 305, 332, 248, 305,
- 305, 305, 305, 223, 203, 305, 111, 48, 110, 305,
- 41, 42, 37, 102, 305, 305, 266, 320, 305, 305,
- 305, 275, 211, 260, 305, 332, 248, 311, 316, 318,
- 319, 223, 203, 305, 127, 67, 110, 305, 305, 305,
- 305, 102, 305, 305, 266, 320, 305, 305, 305, 275,
- 211, 260, 248, 332, 212, 305, 305, 223, 203, 305,
- 98, 58, 110, 305, 305, 305, 305, 102, 305, 305,
- 266, 320, 305, 305, 305, 275, 211, 260, 305, 332,
- 248, 305, 305, 305, 305, 223, 203, 305, 127, 60,
- 110, 305, 41, 42, 37, 102, 305, 305, 266, 320,
- 305, 305, 305, 275, 211, 260, 305, 332, 248, 311,
- 316, 318, 319, 223, 203, 305, 101, 74, 110, 305,
- 305, 305, 305, 102, 305, 305, 266, 320, 305, 305,
- 305, 275, 211, 260, 248, 332, 305, 305, 305, 223,
- 203, 305, 127, 77, 110, 305, 305, 305, 305, 102,
- 305, 305, 266, 320, 305, 305, 305, 275, 211, 260,
- 305, 332, 248, 305, 305, 305, 305, 223, 203, 305,
- 127, 63, 110, 305, 305, 305, 305, 102, 305, 305,
- 266, 320, 212, 305, 305, 275, 211, 260, 305, 332,
- 248, 305, 212, 305, 305, 223, 203, 305, 127, 57,
- 110, 305, 291, 305, 305, 102, 305, 305, 266, 320,
- 305, 293, 14, 275, 211, 260, 294, 332, 25, 305,
- 41, 42, 37, 305, 305, 13, 25, 305, 148, 305,
- 41, 42, 37, 13, 448, 255, 305, 311, 316, 318,
- 319, 305, 305, 222, 305, 305, 448, 311, 316, 318,
- 319, 328, 248, 225, 212, 305, 305, 223, 203, 305,
- 130, 305, 110, 477, 477, 305, 31, 102, 477, 461,
- 305, 285, 305, 305, 305, 275, 211, 260, 36, 332,
- 25, 414, 414, 305, 293, 14, 305, 13, 305, 294,
- 305, 305, 41, 42, 37, 305, 305, 461, 305, 25,
- 461, 172, 477, 305, 461, 305, 13, 305, 305, 311,
- 316, 318, 319, 305, 305, 305, 305, 448, 305, 414,
- 414, 414, 305, 305, 305, 248, 305, 212, 305, 448,
- 223, 203, 305, 128, 305, 110, 414, 414, 414, 414,
- 102, 305, 305, 305, 246, 305, 305, 225, 275, 211,
- 260, 305, 332, 25, 305, 305, 305, 477, 477, 305,
- 13, 225, 477, 461, 305, 41, 42, 37, 305, 305,
- 305, 477, 477, 305, 20, 305, 477, 461, 305, 305,
- 305, 305, 311, 316, 318, 319, 305, 305, 305, 305,
- 305, 461, 305, 305, 461, 305, 477, 305, 461, 253,
- 305, 305, 305, 305, 305, 461, 305, 305, 461, 305,
- 477, 305, 461, 305, 248, 305, 305, 305, 305, 223,
- 203, 305, 124, 305, 110, 305, 305, 305, 305, 102,
- 305, 305, 305, 305, 305, 305, 305, 275, 211, 260,
- 305, 332, 305, 248, 305, 212, 305, 305, 223, 203,
- 305, 125, 305, 110, 305, 305, 305, 305, 102, 305,
- 305, 305, 305, 408, 305, 305, 275, 211, 260, 305,
- 332, 305, 248, 305, 408, 305, 408, 223, 203, 408,
- 122, 305, 110, 41, 42, 37, 408, 102, 408, 305,
- 408, 305, 305, 305, 305, 275, 211, 260, 232, 332,
- 311, 316, 318, 319, 248, 305, 305, 305, 305, 223,
- 203, 305, 126, 305, 110, 248, 305, 305, 305, 102,
- 223, 203, 305, 129, 305, 110, 305, 275, 211, 260,
- 102, 332, 305, 305, 305, 305, 305, 305, 275, 211,
- 260, 305, 332, 305, 248, 225, 305, 305, 305, 223,
- 203, 305, 123, 305, 110, 477, 477, 305, 305, 102,
- 477, 461, 26, 212, 305, 305, 305, 275, 211, 260,
- 305, 332, 477, 477, 305, 305, 305, 477, 461, 305,
- 305, 305, 305, 305, 114, 305, 305, 305, 305, 461,
- 305, 305, 461, 305, 477, 305, 461, 305, 305, 305,
- 305, 41, 42, 37, 305, 305, 461, 305, 305, 461,
- 305, 477, 305, 461, 305, 305, 305, 305, 311, 316,
- 318, 319, 477, 477, 305, 305, 305, 477, 461, 305,
- 305, 533, 52, 335, 262, 263, 220, 305, 305, 223,
- 305, 305, 305, 305, 305, 305, 305, 305, 305, 305,
- 305, 305, 305, 305, 305, 305, 461, 305, 305, 461,
- 305, 477, 305, 461,
- );
- static public $yy_lookahead = array(
- 12, 13, 14, 94, 16, 17, 72, 19, 20, 21,
- 76, 8, 9, 10, 26, 81, 73, 66, 30, 31,
- 32, 33, 71, 35, 90, 37, 83, 93, 40, 101,
- 46, 43, 44, 45, 46, 46, 48, 53, 50, 11,
- 52, 53, 53, 55, 101, 12, 13, 14, 60, 16,
- 17, 23, 19, 20, 21, 27, 105, 106, 1, 26,
- 13, 14, 34, 30, 17, 32, 33, 18, 35, 76,
- 37, 78, 79, 40, 81, 47, 43, 44, 45, 46,
- 72, 48, 35, 50, 76, 52, 53, 54, 55, 81,
- 12, 13, 14, 60, 16, 17, 77, 19, 20, 21,
- 98, 93, 55, 15, 26, 86, 87, 88, 30, 14,
- 32, 33, 17, 35, 15, 37, 14, 18, 40, 17,
- 101, 43, 44, 45, 46, 27, 48, 23, 50, 14,
- 52, 53, 34, 55, 46, 12, 13, 14, 60, 16,
- 17, 53, 19, 20, 21, 50, 1, 52, 49, 26,
- 55, 47, 37, 30, 52, 32, 33, 55, 35, 82,
- 37, 15, 13, 40, 18, 61, 43, 44, 45, 46,
- 55, 48, 27, 50, 67, 52, 53, 70, 55, 34,
- 12, 13, 14, 60, 16, 17, 37, 19, 20, 21,
- 65, 66, 67, 68, 26, 49, 71, 76, 30, 78,
- 32, 33, 81, 35, 82, 37, 36, 23, 40, 73,
- 37, 43, 44, 45, 46, 36, 48, 38, 50, 83,
- 52, 53, 49, 55, 54, 12, 13, 14, 60, 16,
- 17, 47, 19, 20, 21, 14, 77, 101, 54, 26,
- 13, 14, 82, 30, 17, 32, 33, 15, 35, 95,
- 37, 97, 98, 40, 15, 23, 43, 44, 45, 46,
- 101, 48, 77, 50, 76, 52, 53, 22, 55, 81,
- 12, 13, 14, 60, 16, 17, 55, 19, 20, 21,
- 14, 36, 55, 17, 26, 46, 101, 102, 30, 29,
- 32, 33, 46, 35, 66, 37, 17, 37, 40, 71,
- 54, 43, 44, 45, 46, 36, 48, 38, 50, 49,
- 52, 53, 36, 55, 38, 12, 13, 14, 60, 16,
- 17, 23, 19, 20, 21, 37, 12, 13, 77, 26,
- 51, 17, 94, 30, 106, 32, 33, 49, 35, 76,
- 37, 78, 18, 40, 81, 47, 43, 44, 45, 46,
- 27, 48, 101, 50, 37, 52, 53, 34, 55, 94,
- 12, 13, 14, 60, 16, 17, 49, 19, 20, 21,
- 46, 12, 13, 77, 26, 92, 17, 53, 30, 2,
- 32, 33, 99, 35, 17, 37, 97, 98, 40, 97,
- 98, 43, 44, 45, 46, 17, 48, 101, 50, 17,
- 52, 53, 81, 55, 17, 12, 13, 14, 60, 16,
- 17, 73, 19, 20, 21, 1, 2, 73, 17, 26,
- 99, 83, 94, 30, 96, 32, 33, 83, 35, 94,
- 37, 96, 1, 40, 73, 1, 43, 44, 45, 46,
- 96, 48, 11, 50, 83, 52, 53, 35, 55, 92,
- 12, 13, 14, 60, 16, 17, 99, 19, 20, 21,
- 17, 46, 73, 29, 26, 35, 1, 73, 30, 1,
- 32, 33, 83, 35, 37, 37, 11, 83, 40, 73,
- 1, 43, 44, 45, 46, 96, 48, 17, 50, 83,
- 52, 73, 27, 55, 42, 12, 13, 18, 60, 34,
- 17, 83, 3, 4, 5, 6, 7, 8, 1, 2,
- 27, 12, 13, 73, 96, 16, 15, 34, 19, 20,
- 21, 17, 54, 83, 73, 26, 54, 14, 77, 30,
- 11, 32, 33, 17, 83, 66, 96, 86, 87, 88,
- 71, 72, 54, 74, 75, 76, 39, 40, 41, 5,
- 81, 18, 101, 84, 85, 14, 17, 73, 89, 90,
- 91, 77, 93, 56, 57, 58, 59, 83, 55, 66,
- 24, 37, 103, 104, 71, 72, 52, 74, 75, 76,
- 38, 78, 49, 52, 81, 101, 11, 84, 85, 102,
- 15, 73, 89, 90, 91, 77, 93, 83, 66, 94,
- 80, 83, 27, 71, 72, 95, 74, 75, 76, 34,
- 1, 81, 37, 81, 69, 94, 84, 85, 81, 101,
- 11, 89, 90, 91, 49, 93, 9, 18, 81, 66,
- 94, 96, 100, 81, 71, 72, 27, 74, 75, 76,
- 81, 78, 94, 34, 81, 107, 37, 84, 85, 107,
- 107, 107, 89, 90, 91, 66, 93, 107, 49, 107,
- 71, 72, 107, 74, 75, 76, 1, 39, 40, 41,
- 81, 107, 107, 84, 85, 107, 11, 107, 89, 90,
- 91, 107, 93, 107, 56, 57, 58, 59, 66, 100,
- 107, 107, 27, 71, 72, 1, 74, 75, 76, 34,
- 1, 107, 107, 81, 107, 11, 84, 85, 107, 5,
- 11, 89, 90, 91, 107, 93, 12, 13, 14, 107,
- 16, 27, 100, 19, 20, 21, 27, 28, 34, 107,
- 26, 5, 11, 34, 30, 107, 32, 33, 12, 13,
- 14, 107, 16, 107, 23, 19, 20, 21, 27, 107,
- 107, 107, 26, 107, 107, 34, 30, 107, 32, 33,
- 107, 107, 73, 107, 60, 61, 77, 107, 47, 12,
- 13, 107, 83, 66, 17, 86, 87, 88, 71, 72,
- 107, 74, 75, 76, 107, 107, 60, 61, 81, 73,
- 101, 84, 85, 77, 107, 107, 89, 90, 91, 83,
- 93, 107, 107, 107, 66, 107, 107, 107, 51, 71,
- 72, 104, 74, 75, 76, 107, 107, 101, 107, 81,
- 73, 107, 84, 85, 77, 107, 107, 89, 90, 91,
- 83, 93, 66, 86, 87, 88, 107, 71, 72, 107,
- 74, 75, 76, 107, 107, 107, 107, 81, 101, 107,
- 84, 85, 107, 107, 107, 89, 90, 91, 66, 93,
- 1, 107, 107, 71, 72, 107, 74, 75, 76, 107,
- 11, 107, 107, 81, 73, 107, 84, 85, 77, 107,
- 107, 89, 90, 91, 83, 93, 66, 86, 87, 88,
- 107, 71, 72, 107, 74, 75, 76, 107, 39, 40,
- 41, 81, 101, 107, 84, 85, 107, 107, 107, 89,
- 90, 91, 107, 93, 66, 56, 57, 58, 59, 71,
- 72, 107, 74, 75, 76, 107, 107, 107, 107, 81,
- 107, 107, 84, 85, 107, 107, 107, 89, 90, 91,
- 66, 93, 1, 107, 107, 71, 72, 107, 74, 75,
- 76, 107, 11, 107, 107, 81, 73, 107, 84, 85,
- 77, 107, 107, 89, 90, 91, 83, 93, 66, 86,
- 87, 88, 107, 71, 72, 107, 74, 75, 76, 107,
- 39, 40, 41, 81, 101, 107, 84, 85, 107, 107,
- 107, 89, 90, 91, 107, 93, 66, 56, 57, 58,
- 59, 71, 72, 107, 74, 75, 76, 107, 107, 107,
- 107, 81, 107, 107, 84, 85, 107, 107, 107, 89,
- 90, 91, 66, 93, 1, 107, 107, 71, 72, 107,
- 74, 75, 76, 12, 13, 107, 107, 81, 17, 107,
- 84, 85, 107, 107, 107, 89, 90, 91, 107, 93,
- 66, 28, 107, 107, 107, 71, 72, 107, 74, 75,
- 76, 107, 39, 40, 41, 81, 107, 107, 84, 85,
- 107, 107, 51, 89, 90, 91, 107, 93, 66, 56,
- 57, 58, 59, 71, 72, 107, 74, 75, 76, 107,
- 107, 107, 107, 81, 107, 107, 84, 85, 107, 107,
- 107, 89, 90, 91, 66, 93, 1, 107, 107, 71,
- 72, 107, 74, 75, 76, 107, 107, 107, 107, 81,
- 73, 107, 84, 85, 77, 107, 107, 89, 90, 91,
- 83, 93, 66, 86, 87, 88, 107, 71, 72, 107,
- 74, 75, 76, 38, 39, 40, 41, 81, 101, 107,
- 84, 85, 107, 107, 107, 89, 90, 91, 107, 93,
- 66, 56, 57, 58, 59, 71, 72, 107, 74, 75,
- 76, 107, 107, 107, 107, 81, 12, 13, 84, 85,
- 107, 17, 107, 89, 90, 91, 66, 93, 1, 107,
- 107, 71, 72, 107, 74, 75, 76, 107, 11, 107,
- 107, 81, 107, 107, 84, 85, 107, 107, 107, 89,
- 90, 91, 107, 93, 66, 51, 107, 107, 107, 71,
- 72, 107, 74, 75, 76, 107, 39, 40, 41, 81,
- 107, 107, 84, 85, 107, 107, 107, 89, 90, 91,
- 107, 93, 66, 56, 57, 58, 59, 71, 72, 107,
- 74, 75, 76, 107, 107, 107, 107, 81, 107, 107,
- 84, 85, 107, 107, 107, 89, 90, 91, 66, 93,
- 1, 107, 107, 71, 72, 107, 74, 75, 76, 107,
- 107, 107, 107, 81, 107, 107, 84, 85, 107, 107,
- 107, 89, 90, 91, 107, 93, 66, 107, 107, 107,
- 107, 71, 72, 107, 74, 75, 76, 38, 39, 40,
- 41, 81, 107, 107, 84, 85, 107, 107, 107, 89,
- 90, 91, 107, 93, 66, 56, 57, 58, 59, 71,
- 72, 107, 74, 75, 76, 107, 107, 107, 107, 81,
- 107, 107, 84, 85, 107, 107, 107, 89, 90, 91,
- 66, 93, 1, 107, 107, 71, 72, 107, 74, 75,
- 76, 107, 11, 107, 107, 81, 107, 107, 84, 85,
- 107, 107, 107, 89, 90, 91, 107, 93, 66, 107,
- 107, 107, 107, 71, 72, 107, 74, 75, 76, 107,
- 39, 40, 41, 81, 107, 107, 84, 85, 107, 107,
- 107, 89, 90, 91, 107, 93, 66, 56, 57, 58,
- 59, 71, 72, 107, 74, 75, 76, 107, 107, 107,
- 107, 81, 107, 107, 84, 85, 107, 107, 107, 89,
- 90, 91, 66, 93, 1, 107, 107, 71, 72, 107,
- 74, 75, 76, 107, 107, 107, 107, 81, 107, 107,
- 84, 85, 107, 107, 107, 89, 90, 91, 107, 93,
- 66, 107, 107, 107, 107, 71, 72, 107, 74, 75,
- 76, 107, 39, 40, 41, 81, 107, 107, 84, 85,
- 107, 107, 107, 89, 90, 91, 107, 93, 66, 56,
- 57, 58, 59, 71, 72, 107, 74, 75, 76, 107,
- 107, 107, 107, 81, 107, 107, 84, 85, 107, 107,
- 107, 89, 90, 91, 66, 93, 107, 107, 107, 71,
- 72, 107, 74, 75, 76, 107, 107, 107, 107, 81,
- 107, 107, 84, 85, 107, 107, 107, 89, 90, 91,
- 107, 93, 66, 107, 107, 107, 107, 71, 72, 107,
- 74, 75, 76, 107, 107, 107, 107, 81, 107, 107,
- 84, 85, 1, 107, 107, 89, 90, 91, 107, 93,
- 66, 107, 1, 107, 107, 71, 72, 107, 74, 75,
- 76, 107, 11, 107, 107, 81, 107, 107, 84, 85,
- 107, 12, 13, 89, 90, 91, 17, 93, 27, 107,
- 39, 40, 41, 107, 107, 34, 27, 107, 29, 107,
- 39, 40, 41, 34, 37, 54, 107, 56, 57, 58,
- 59, 107, 107, 46, 107, 107, 49, 56, 57, 58,
- 59, 54, 66, 2, 1, 107, 107, 71, 72, 107,
- 74, 107, 76, 12, 13, 107, 15, 81, 17, 18,
- 107, 85, 107, 107, 107, 89, 90, 91, 25, 93,
- 27, 1, 2, 107, 12, 13, 107, 34, 107, 17,
- 107, 107, 39, 40, 41, 107, 107, 46, 107, 27,
- 49, 29, 51, 107, 53, 107, 34, 107, 107, 56,
- 57, 58, 59, 107, 107, 107, 107, 37, 107, 39,
- 40, 41, 107, 107, 107, 66, 107, 1, 107, 49,
- 71, 72, 107, 74, 107, 76, 56, 57, 58, 59,
- 81, 107, 107, 107, 85, 107, 107, 2, 89, 90,
- 91, 107, 93, 27, 107, 107, 107, 12, 13, 107,
- 34, 2, 17, 18, 107, 39, 40, 41, 107, 107,
- 107, 12, 13, 107, 15, 107, 17, 18, 107, 107,
- 107, 107, 56, 57, 58, 59, 107, 107, 107, 107,
- 107, 46, 107, 107, 49, 107, 51, 107, 53, 54,
- 107, 107, 107, 107, 107, 46, 107, 107, 49, 107,
- 51, 107, 53, 107, 66, 107, 107, 107, 107, 71,
- 72, 107, 74, 107, 76, 107, 107, 107, 107, 81,
- 107, 107, 107, 107, 107, 107, 107, 89, 90, 91,
- 107, 93, 107, 66, 107, 1, 107, 107, 71, 72,
- 107, 74, 107, 76, 107, 107, 107, 107, 81, 107,
- 107, 107, 107, 11, 107, 107, 89, 90, 91, 107,
- 93, 107, 66, 107, 22, 107, 24, 71, 72, 27,
- 74, 107, 76, 39, 40, 41, 34, 81, 36, 107,
- 38, 107, 107, 107, 107, 89, 90, 91, 46, 93,
- 56, 57, 58, 59, 66, 61, 107, 107, 107, 71,
- 72, 107, 74, 107, 76, 66, 107, 107, 107, 81,
- 71, 72, 107, 74, 107, 76, 107, 89, 90, 91,
- 81, 93, 107, 107, 107, 107, 107, 107, 89, 90,
- 91, 107, 93, 107, 66, 2, 107, 107, 107, 71,
- 72, 107, 74, 107, 76, 12, 13, 107, 107, 81,
- 17, 18, 2, 1, 107, 107, 107, 89, 90, 91,
- 107, 93, 12, 13, 107, 107, 107, 17, 18, 107,
- 107, 107, 107, 107, 22, 107, 107, 107, 107, 46,
- 107, 107, 49, 107, 51, 107, 53, 107, 107, 107,
- 107, 39, 40, 41, 107, 107, 46, 107, 107, 49,
- 107, 51, 107, 53, 107, 107, 107, 107, 56, 57,
- 58, 59, 12, 13, 107, 107, 107, 17, 18, 107,
- 107, 63, 64, 65, 66, 67, 68, 107, 107, 71,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 46, 107, 107, 49,
- 107, 51, 107, 53,
-);
- const YY_SHIFT_USE_DFLT = -17;
- const YY_SHIFT_MAX = 238;
- static public $yy_shift_ofst = array(
- 499, 348, 78, 78, 393, 393, 348, 78, -12, 33,
- -12, 78, 78, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 168, 78, 78, 168, 258, 78, 78, 78,
- 78, 303, 78, 78, 78, 213, 78, 123, 123, 438,
- 438, 438, 438, 438, 438, 1571, 1633, 1706, 1706, 1706,
- 1706, 1706, 499, 1824, 1187, 1269, 1561, 1105, 1023, 507,
- 1942, 941, 859, 1351, 1433, 1433, 1433, 1433, 1433, 1433,
- 1433, 1433, 1433, 1433, 1433, 1433, 628, 628, 95, 704,
- 609, 665, 102, 115, 145, 726, 1579, 1652, 483, 483,
- 324, 145, 115, 145, 115, 414, 28, 721, 699, 227,
- 465, 694, 1164, 359, 99, 146, 359, 3, 323, 266,
- 533, 431, 266, 468, 513, 479, 98, 98, 434, 49,
- 49, 57, 57, 57, 57, 57, 57, 57, 57, 57,
- -17, 1631, 1725, 1739, 1940, 1923, 1990, 47, 1021, 314,
- 88, -16, 98, -16, 98, -11, -16, -11, 221, 98,
- 98, 98, -16, 98, -16, 149, 232, 98, -16, -16,
- 98, 98, 98, 98, 98, 98, 221, 221, 98, 98,
- 98, -16, 221, 98, 98, 98, 57, 617, 57, 377,
- 437, 377, 57, 57, 49, 49, 57, 49, -17, -17,
- -17, -17, -17, 1660, 1832, 575, 757, 1577, 260, 184,
- 104, 317, 170, 298, 246, 173, 239, 276, 245, 179,
- 269, 288, 279, 501, 531, 542, 546, 539, 541, 524,
- 544, 488, 516, 519, 472, 504, 452, 367, 470, 437,
- 430, 443, 412, 415, 401, 534, 387, 382, 378,
-);
- const YY_REDUCE_USE_DFLT = -92;
- const YY_REDUCE_MAX = 192;
- static public $yy_reduce_ofst = array(
- 1948, 469, 622, 589, 563, 503, 707, 532, 984, 1012,
- 1038, 1066, 1094, 1120, 1148, 1176, 1230, 956, 1258, 1284,
- 1312, 1340, 1366, 902, 1394, 1422, 1448, 1476, 1504, 1202,
- 930, 874, 848, 792, 766, 738, 820, 1639, 1566, 1829,
- 1728, 1757, 1858, 1786, 1818, 883, 801, 451, 689, 747,
- 883, 1047, 125, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, -66, -49,
- 518, 716, 8, -7, 484, 228, 440, 418, 389, 344,
- 154, -57, 121, 136, 263, 185, 338, 338, 251, 321,
- 251, 251, 328, 335, 292, 292, 328, 107, 361, 283,
- 292, 251, 357, 251, 188, 159, 406, 394, 251, 292,
- 289, 296, 251, 251, 251, 251, 251, 251, 251, 251,
- 251, 265, 265, 265, 265, 265, 265, 530, 535, 265,
- 265, 510, 514, 510, 514, 548, 510, 536, 537, 514,
- 514, 514, 510, 514, 510, 521, 520, 514, 510, 510,
- 514, 514, 514, 514, 514, 514, 552, 559, 514, 514,
- 514, 510, 547, 514, 514, 514, -72, 545, -72, 487,
- 505, 487, -72, -72, 2, 2, -72, 2, -91, 160,
- 77, 238, 122,
-);
- static public $yyExpectedTokens = array(
- array(3, 4, 5, 6, 7, 8, 12, 13, 16, 19, 20, 21, 26, 30, 32, 33, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 31, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 54, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 31, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 53, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 55, 60, ),
- array(12, 13, 14, 16, 17, 19, 20, 21, 26, 30, 32, 33, 35, 37, 40, 43, 44, 45, 46, 48, 50, 52, 55, 60, ),
- array(1, 11, 27, 34, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 25, 27, 34, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 27, 34, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 27, 34, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 27, 34, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 27, 34, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 27, 34, 39, 40, 41, 56, 57, 58, 59, ),
- array(3, 4, 5, 6, 7, 8, 12, 13, 16, 19, 20, 21, 26, 30, 32, 33, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, 61, ),
- array(1, 11, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 38, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 54, 56, 57, 58, 59, ),
- array(1, 38, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 28, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 2, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 22, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 11, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 11, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 11, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(1, 39, 40, 41, 56, 57, 58, 59, ),
- array(39, 40, 41, 56, 57, 58, 59, ),
- array(39, 40, 41, 56, 57, 58, 59, ),
- array(14, 17, 50, 52, 55, ),
- array(5, 12, 13, 14, 16, 19, 20, 21, 26, 30, 32, 33, 60, 61, ),
- array(1, 11, 18, 27, 34, 37, 49, ),
- array(1, 11, 27, 34, ),
- array(14, 17, 52, 55, ),
- array(14, 37, 55, ),
- array(1, 27, 34, ),
- array(5, 12, 13, 14, 16, 19, 20, 21, 26, 30, 32, 33, 60, 61, ),
- array(12, 13, 17, 27, 29, 34, ),
- array(12, 13, 17, 27, 29, 34, ),
- array(12, 13, 17, 27, 34, ),
- array(12, 13, 17, 27, 34, ),
- array(18, 46, 53, ),
- array(1, 27, 34, ),
- array(14, 37, 55, ),
- array(1, 27, 34, ),
- array(14, 37, 55, ),
- array(1, 2, ),
- array(11, 23, 27, 34, 47, ),
- array(11, 23, 27, 34, 47, ),
- array(1, 11, 27, 28, 34, ),
- array(13, 14, 17, 55, ),
- array(1, 11, 27, 34, ),
- array(1, 11, 27, 34, ),
- array(12, 13, 17, 51, ),
- array(12, 13, 17, ),
- array(15, 18, 49, ),
- array(15, 18, 49, ),
- array(12, 13, 17, ),
- array(8, 9, 10, ),
- array(27, 34, ),
- array(14, 17, ),
- array(18, 49, ),
- array(1, 11, ),
- array(14, 17, ),
- array(1, 54, ),
- array(14, 55, ),
- array(1, 18, ),
- array(27, 34, ),
- array(27, 34, ),
- array(1, 29, ),
- array(18, ),
- array(18, ),
- array(1, ),
- array(1, ),
- array(1, ),
- array(1, ),
- array(1, ),
- array(1, ),
- array(1, ),
- array(1, ),
- array(1, ),
- array(),
- array(2, 12, 13, 15, 17, 18, 46, 49, 51, 53, ),
- array(2, 12, 13, 17, 18, 46, 49, 51, 53, 54, ),
- array(2, 12, 13, 15, 17, 18, 46, 49, 51, 53, ),
- array(2, 12, 13, 17, 18, 46, 49, 51, 53, ),
- array(2, 12, 13, 17, 18, 46, 49, 51, 53, ),
- array(12, 13, 17, 18, 46, 49, 51, 53, ),
- array(13, 14, 17, 35, 55, ),
- array(12, 13, 17, 51, ),
- array(12, 13, 17, ),
- array(15, 46, 53, ),
- array(46, 53, ),
- array(27, 34, ),
- array(46, 53, ),
- array(27, 34, ),
- array(46, 53, ),
- array(46, 53, ),
- array(46, 53, ),
- array(14, 55, ),
- array(27, 34, ),
- array(27, 34, ),
- array(27, 34, ),
- array(46, 53, ),
- array(27, 34, ),
- array(46, 53, ),
- array(13, 37, ),
- array(15, 23, ),
- array(27, 34, ),
- array(46, 53, ),
- array(46, 53, ),
- array(27, 34, ),
- array(27, 34, ),
- array(27, 34, ),
- array(27, 34, ),
- array(27, 34, ),
- array(27, 34, ),
- array(14, 55, ),
- array(14, 55, ),
- array(27, 34, ),
- array(27, 34, ),
- array(27, 34, ),
- array(46, 53, ),
- array(14, 55, ),
- array(27, 34, ),
- array(27, 34, ),
- array(27, 34, ),
- array(1, ),
- array(9, ),
- array(1, ),
- array(2, ),
- array(37, ),
- array(2, ),
- array(1, ),
- array(1, ),
- array(18, ),
- array(18, ),
- array(1, ),
- array(18, ),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(1, 2, 37, 39, 40, 41, 49, 56, 57, 58, 59, ),
- array(11, 22, 24, 27, 34, 36, 38, 46, ),
- array(11, 15, 27, 34, 37, 49, ),
- array(12, 13, 17, 51, ),
- array(37, 46, 49, 54, ),
- array(29, 37, 49, ),
- array(23, 47, 54, ),
- array(23, 47, 61, ),
- array(37, 49, ),
- array(36, 54, ),
- array(23, 47, ),
- array(46, 54, ),
- array(37, 49, ),
- array(15, 46, ),
- array(36, 38, ),
- array(22, 36, ),
- array(36, 38, ),
- array(36, 38, ),
- array(37, 49, ),
- array(17, 51, ),
- array(15, ),
- array(52, ),
- array(38, ),
- array(24, ),
- array(17, ),
- array(14, ),
- array(52, ),
- array(5, ),
- array(54, ),
- array(17, ),
- array(11, ),
- array(54, ),
- array(17, ),
- array(42, ),
- array(17, ),
- array(17, ),
- array(37, ),
- array(35, ),
- array(17, ),
- array(35, ),
- array(46, ),
- array(17, ),
- array(37, ),
- array(17, ),
- array(17, ),
- array(17, ),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
- array(),
-);
- static public $yy_default = array(
- 339, 517, 496, 496, 532, 532, 532, 496, 532, 532,
- 532, 532, 532, 532, 532, 532, 532, 532, 532, 532,
- 532, 532, 532, 532, 532, 532, 532, 532, 532, 532,
- 532, 532, 532, 532, 532, 532, 532, 532, 532, 532,
- 532, 532, 532, 532, 532, 532, 398, 398, 364, 374,
- 361, 398, 336, 532, 532, 532, 532, 532, 403, 532,
- 532, 532, 532, 532, 420, 518, 495, 519, 409, 410,
- 405, 494, 400, 520, 403, 379, 425, 424, 532, 532,
- 436, 412, 532, 532, 398, 532, 398, 398, 398, 398,
- 508, 398, 532, 398, 532, 388, 426, 426, 412, 532,
- 412, 412, 461, 461, 451, 451, 461, 532, 398, 532,
- 451, 412, 532, 412, 532, 392, 398, 376, 412, 451,
- 505, 394, 429, 416, 428, 415, 419, 412, 423, 427,
- 503, 450, 450, 450, 450, 450, 450, 532, 463, 461,
- 477, 488, 375, 457, 384, 456, 455, 454, 532, 383,
- 372, 360, 487, 371, 459, 461, 532, 362, 489, 486,
- 370, 378, 365, 366, 368, 385, 532, 532, 377, 382,
- 381, 458, 532, 386, 358, 387, 389, 352, 395, 497,
- 461, 498, 393, 418, 483, 506, 445, 509, 461, 502,
- 502, 461, 502, 436, 432, 436, 462, 436, 436, 426,
- 426, 436, 532, 426, 432, 446, 432, 532, 532, 532,
- 532, 532, 532, 532, 532, 532, 406, 532, 532, 532,
- 344, 441, 532, 532, 532, 532, 438, 532, 532, 477,
- 532, 532, 434, 432, 532, 507, 532, 532, 532, 380,
- 460, 421, 443, 354, 355, 525, 422, 399, 444, 447,
- 449, 356, 474, 472, 448, 475, 396, 477, 407, 351,
- 442, 345, 340, 341, 342, 343, 413, 466, 431, 346,
- 433, 347, 353, 348, 435, 437, 411, 465, 349, 464,
- 350, 367, 441, 482, 492, 504, 515, 490, 528, 391,
- 501, 529, 484, 481, 480, 479, 390, 516, 500, 397,
- 514, 521, 414, 522, 523, 526, 524, 531, 530, 499,
- 493, 510, 476, 467, 438, 527, 511, 491, 512, 513,
- 417, 440, 439, 470, 478, 469, 430, 338, 468, 471,
- 452, 473, 453, 373, 485, 337,
-);
- const YYNOCODE = 108;
- const YYSTACKDEPTH = 500;
- const YYNSTATE = 336;
- const YYNRULE = 196;
- const YYERRORSYMBOL = 62;
- const YYERRSYMDT = 'yy0';
- const YYFALLBACK = 0;
- public static $yyFallback = array(
- );
+ return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
+ }
+
public function Trace($TraceFILE, $zTracePrompt)
{
if (!$TraceFILE) {
@@ -1185,257 +1743,15 @@ static public $yy_action = array(
$this->yyTracePrompt = '<br>';
}
- public $yyTraceFILE;
- public $yyTracePrompt;
- public $yyidx; /* Index of top element in stack */
- public $yyerrcnt; /* Shifts left before out of the error */
- public $yystack = array(); /* The parser's stack */
-
- public $yyTokenName = array(
- '$', 'VERT', 'COLON', 'PHP',
- 'NOCACHE', 'TEXT', 'STRIPON', 'STRIPOFF',
- 'LITERALSTART', 'LITERALEND', 'LITERAL', 'RDEL',
- 'SIMPELOUTPUT', 'LDEL', 'DOLLARID', 'EQUAL',
- 'SIMPLETAG', 'ID', 'PTR', 'LDELMAKENOCACHE',
- 'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC',
- 'TO', 'STEP', 'LDELFOREACH', 'SPACE',
- 'AS', 'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT',
- 'CLOSETAG', 'LDELSLASH', 'ATTR', 'INTEGER',
- 'COMMA', 'OPENP', 'CLOSEP', 'MATH',
- 'UNIMATH', 'ISIN', 'QMARK', 'NOT',
- 'TYPECAST', 'HEX', 'DOT', 'INSTANCEOF',
- 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'NAMESPACE', 'AT',
- 'HATCH', 'OPENB', 'CLOSEB', 'DOLLAR',
- 'LOGOP', 'SLOGOP', 'TLOGOP', 'SINGLECOND',
- 'QUOTE', 'BACKTICK', 'error', 'start',
- 'template', 'template_element', 'smartytag', 'literal',
- 'text_content', 'literal_elements', 'literal_element', 'tag',
- 'variable', 'attributes', 'value', 'expr',
- 'varindexed', 'modifierlist', 'statement', 'statements',
- 'foraction', 'varvar', 'modparameters', 'attribute',
- 'ternary', 'array', 'tlop', 'lop',
- 'scond', 'function', 'ns1', 'doublequoted_with_quotes',
- 'static_class_access', 'object', 'arrayindex', 'indexdef',
- 'varvarele', 'objectchain', 'objectelement', 'method',
- 'params', 'modifier', 'modparameter', 'arrayelements',
- 'arrayelement', 'doublequoted', 'doublequotedcontent',
- );
-
- public static $yyRuleName = array(
- 'start ::= template',
- 'template ::= template_element',
- 'template ::= template template_element',
- 'template ::=',
- 'template_element ::= smartytag',
- 'template_element ::= literal',
- 'template_element ::= PHP',
- 'template_element ::= NOCACHE',
- 'template_element ::= text_content',
- 'text_content ::= TEXT',
- 'text_content ::= text_content TEXT',
- 'template_element ::= STRIPON',
- 'template_element ::= STRIPOFF',
- 'literal ::= LITERALSTART LITERALEND',
- 'literal ::= LITERALSTART literal_elements LITERALEND',
- 'literal_elements ::= literal_elements literal_element',
- 'literal_elements ::=',
- 'literal_element ::= literal',
- 'literal_element ::= LITERAL',
- 'smartytag ::= tag RDEL',
- 'smartytag ::= SIMPELOUTPUT',
- 'tag ::= LDEL variable',
- 'tag ::= LDEL variable attributes',
- 'tag ::= LDEL value',
- 'tag ::= LDEL value attributes',
- 'tag ::= LDEL expr',
- 'tag ::= LDEL expr attributes',
- 'tag ::= LDEL DOLLARID EQUAL value',
- 'tag ::= LDEL DOLLARID EQUAL expr',
- 'tag ::= LDEL DOLLARID EQUAL expr attributes',
- 'tag ::= LDEL varindexed EQUAL expr attributes',
- 'smartytag ::= SIMPLETAG',
- 'tag ::= LDEL ID attributes',
- 'tag ::= LDEL ID',
- 'tag ::= LDEL ID modifierlist attributes',
- 'tag ::= LDEL ID PTR ID attributes',
- 'tag ::= LDEL ID PTR ID modifierlist attributes',
- 'tag ::= LDELMAKENOCACHE DOLLARID',
- 'tag ::= LDELIF expr',
- 'tag ::= LDELIF expr attributes',
- 'tag ::= LDELIF statement',
- 'tag ::= LDELIF statement attributes',
- 'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
- 'foraction ::= EQUAL expr',
- 'foraction ::= INCDEC',
- 'tag ::= LDELFOR statement TO expr attributes',
- 'tag ::= LDELFOR statement TO expr STEP expr attributes',
- 'tag ::= LDELFOREACH attributes',
- 'tag ::= LDELFOREACH SPACE value AS varvar attributes',
- 'tag ::= LDELFOREACH SPACE value AS varvar APTR varvar attributes',
- 'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
- 'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
- 'tag ::= LDELSETFILTER ID modparameters',
- 'tag ::= LDELSETFILTER ID modparameters modifierlist',
- 'tag ::= LDEL SMARTYBLOCKCHILDPARENT',
- 'smartytag ::= CLOSETAG',
- 'tag ::= LDELSLASH ID',
- 'tag ::= LDELSLASH ID modifierlist',
- 'tag ::= LDELSLASH ID PTR ID',
- 'tag ::= LDELSLASH ID PTR ID modifierlist',
- 'attributes ::= attributes attribute',
- 'attributes ::= attribute',
- 'attributes ::=',
- 'attribute ::= SPACE ID EQUAL ID',
- 'attribute ::= ATTR expr',
- 'attribute ::= ATTR value',
- 'attribute ::= SPACE ID',
- 'attribute ::= SPACE expr',
- 'attribute ::= SPACE value',
- 'attribute ::= SPACE INTEGER EQUAL expr',
- 'statements ::= statement',
- 'statements ::= statements COMMA statement',
- 'statement ::= DOLLARID EQUAL INTEGER',
- 'statement ::= DOLLARID EQUAL expr',
- 'statement ::= varindexed EQUAL expr',
- 'statement ::= OPENP statement CLOSEP',
- 'expr ::= value',
- 'expr ::= ternary',
- 'expr ::= DOLLARID COLON ID',
- 'expr ::= expr MATH value',
- 'expr ::= expr UNIMATH value',
- 'expr ::= array',
- 'expr ::= expr modifierlist',
- 'expr ::= expr tlop value',
- 'expr ::= expr lop expr',
- 'expr ::= expr scond',
- 'expr ::= expr ISIN array',
- 'expr ::= expr ISIN value',
- 'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
- 'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr',
- 'value ::= variable',
- 'value ::= UNIMATH value',
- 'value ::= NOT value',
- 'value ::= TYPECAST value',
- 'value ::= variable INCDEC',
- 'value ::= HEX',
- 'value ::= INTEGER',
- 'value ::= INTEGER DOT INTEGER',
- 'value ::= INTEGER DOT',
- 'value ::= DOT INTEGER',
- 'value ::= ID',
- 'value ::= function',
- 'value ::= OPENP expr CLOSEP',
- 'value ::= variable INSTANCEOF ns1',
- 'value ::= variable INSTANCEOF variable',
- 'value ::= SINGLEQUOTESTRING',
- 'value ::= doublequoted_with_quotes',
- 'value ::= varindexed DOUBLECOLON static_class_access',
- 'value ::= smartytag',
- 'value ::= value modifierlist',
- 'value ::= NAMESPACE',
- 'value ::= ns1 DOUBLECOLON static_class_access',
- 'ns1 ::= ID',
- 'ns1 ::= NAMESPACE',
- 'variable ::= DOLLARID',
- 'variable ::= varindexed',
- 'variable ::= varvar AT ID',
- 'variable ::= object',
- 'variable ::= HATCH ID HATCH',
- 'variable ::= HATCH ID HATCH arrayindex',
- 'variable ::= HATCH variable HATCH',
- 'variable ::= HATCH variable HATCH arrayindex',
- 'varindexed ::= DOLLARID arrayindex',
- 'varindexed ::= varvar arrayindex',
- 'arrayindex ::= arrayindex indexdef',
- 'arrayindex ::=',
- 'indexdef ::= DOT DOLLARID',
- 'indexdef ::= DOT varvar',
- 'indexdef ::= DOT varvar AT ID',
- 'indexdef ::= DOT ID',
- 'indexdef ::= DOT INTEGER',
- 'indexdef ::= DOT LDEL expr RDEL',
- 'indexdef ::= OPENB ID CLOSEB',
- 'indexdef ::= OPENB ID DOT ID CLOSEB',
- 'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
- 'indexdef ::= OPENB INTEGER CLOSEB',
- 'indexdef ::= OPENB DOLLARID CLOSEB',
- 'indexdef ::= OPENB variable CLOSEB',
- 'indexdef ::= OPENB value CLOSEB',
- 'indexdef ::= OPENB expr CLOSEB',
- 'indexdef ::= OPENB CLOSEB',
- 'varvar ::= DOLLARID',
- 'varvar ::= DOLLAR',
- 'varvar ::= varvar varvarele',
- 'varvarele ::= ID',
- 'varvarele ::= SIMPELOUTPUT',
- 'varvarele ::= LDEL expr RDEL',
- 'object ::= varindexed objectchain',
- 'objectchain ::= objectelement',
- 'objectchain ::= objectchain objectelement',
- 'objectelement ::= PTR ID arrayindex',
- 'objectelement ::= PTR varvar arrayindex',
- 'objectelement ::= PTR LDEL expr RDEL arrayindex',
- 'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
- 'objectelement ::= PTR method',
- 'function ::= ns1 OPENP params CLOSEP',
- 'method ::= ID OPENP params CLOSEP',
- 'method ::= DOLLARID OPENP params CLOSEP',
- 'params ::= params COMMA expr',
- 'params ::= expr',
- 'params ::=',
- 'modifierlist ::= modifierlist modifier modparameters',
- 'modifierlist ::= modifier modparameters',
- 'modifier ::= VERT AT ID',
- 'modifier ::= VERT ID',
- 'modparameters ::= modparameters modparameter',
- 'modparameters ::=',
- 'modparameter ::= COLON value',
- 'modparameter ::= COLON array',
- 'static_class_access ::= method',
- 'static_class_access ::= method objectchain',
- 'static_class_access ::= ID',
- 'static_class_access ::= DOLLARID arrayindex',
- 'static_class_access ::= DOLLARID arrayindex objectchain',
- 'lop ::= LOGOP',
- 'lop ::= SLOGOP',
- 'tlop ::= TLOGOP',
- 'scond ::= SINGLECOND',
- 'array ::= OPENB arrayelements CLOSEB',
- 'arrayelements ::= arrayelement',
- 'arrayelements ::= arrayelements COMMA arrayelement',
- 'arrayelements ::=',
- 'arrayelement ::= value APTR expr',
- 'arrayelement ::= ID APTR expr',
- 'arrayelement ::= expr',
- 'doublequoted_with_quotes ::= QUOTE QUOTE',
- 'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
- 'doublequoted ::= doublequoted doublequotedcontent',
- 'doublequoted ::= doublequotedcontent',
- 'doublequotedcontent ::= BACKTICK variable BACKTICK',
- 'doublequotedcontent ::= BACKTICK expr BACKTICK',
- 'doublequotedcontent ::= DOLLARID',
- 'doublequotedcontent ::= LDEL variable RDEL',
- 'doublequotedcontent ::= LDEL expr RDEL',
- 'doublequotedcontent ::= smartytag',
- 'doublequotedcontent ::= TEXT',
- );
-
public function tokenName($tokenType)
{
if ($tokenType === 0) {
return 'End of Input';
}
if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
- return $this->yyTokenName[$tokenType];
+ return $this->yyTokenName[ $tokenType ];
} else {
- return "Unknown";
- }
- }
-
- public static function yy_destructor($yymajor, $yypminor)
- {
- switch ($yymajor) {
- default: break; /* If no destructor action specified: do nothing */
+ return 'Unknown';
}
}
@@ -1446,20 +1762,21 @@ static public $yy_action = array(
}
$yytos = array_pop($this->yystack);
if ($this->yyTraceFILE && $this->yyidx >= 0) {
- fwrite($this->yyTraceFILE,
- $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
- "\n");
+ fwrite(
+ $this->yyTraceFILE,
+ $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] .
+ "\n"
+ );
}
$yymajor = $yytos->major;
self::yy_destructor($yymajor, $yytos->minor);
$this->yyidx--;
-
return $yymajor;
}
public function __destruct()
{
- while ($this->yystack !== Array()) {
+ while ($this->yystack !== array()) {
$this->yy_pop_parser_stack();
}
if (is_resource($this->yyTraceFILE)) {
@@ -1471,14 +1788,14 @@ static public $yy_action = array(
{
static $res3 = array();
static $res4 = array();
- $state = $this->yystack[$this->yyidx]->stateno;
- $expected = self::$yyExpectedTokens[$state];
- if (isset($res3[$state][$token])) {
- if ($res3[$state][$token]) {
+ $state = $this->yystack[ $this->yyidx ]->stateno;
+ $expected = self::$yyExpectedTokens[ $state ];
+ if (isset($res3[ $state ][ $token ])) {
+ if ($res3[ $state ][ $token ]) {
return $expected;
}
} else {
- if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+ if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
return $expected;
}
}
@@ -1490,7 +1807,7 @@ static public $yy_action = array(
// reduce action
$done = 0;
do {
- if ($done++ == 100) {
+ if ($done++ === 100) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
// too much recursion prevents proper detection
@@ -1498,20 +1815,22 @@ static public $yy_action = array(
return array_unique($expected);
}
$yyruleno = $yyact - self::YYNSTATE;
- $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+ $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
$nextstate = $this->yy_find_reduce_action(
- $this->yystack[$this->yyidx]->stateno,
- self::$yyRuleInfo[$yyruleno][0]);
- if (isset(self::$yyExpectedTokens[$nextstate])) {
- $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
- if (isset($res4[$nextstate][$token])) {
- if ($res4[$nextstate][$token]) {
+ $this->yystack[ $this->yyidx ]->stateno,
+ self::$yyRuleInfo[ $yyruleno ][ 0 ]
+ );
+ if (isset(self::$yyExpectedTokens[ $nextstate ])) {
+ $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
+ if (isset($res4[ $nextstate ][ $token ])) {
+ if ($res4[ $nextstate ][ $token ]) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
return array_unique($expected);
}
} else {
- if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+ if ($res4[ $nextstate ][ $token ] =
+ in_array($token, self::$yyExpectedTokens[ $nextstate ], true)) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
return array_unique($expected);
@@ -1523,10 +1842,10 @@ static public $yy_action = array(
$this->yyidx++;
$x = new TP_yyStackEntry;
$x->stateno = $nextstate;
- $x->major = self::$yyRuleInfo[$yyruleno][0];
- $this->yystack[$this->yyidx] = $x;
+ $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+ $this->yystack[ $this->yyidx ] = $x;
continue 2;
- } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+ } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
// the last token was just ignored, we can't accept
@@ -1545,9 +1864,8 @@ static public $yy_action = array(
}
break;
} while (true);
- $this->yyidx = $yyidx;
- $this->yystack = $stack;
-
+ $this->yyidx = $yyidx;
+ $this->yystack = $stack;
return array_unique($expected);
}
@@ -1558,16 +1876,16 @@ static public $yy_action = array(
if ($token === 0) {
return true; // 0 is not part of this
}
- $state = $this->yystack[$this->yyidx]->stateno;
- if (isset($res[$state][$token])) {
- if ($res[$state][$token]) {
+ $state = $this->yystack[ $this->yyidx ]->stateno;
+ if (isset($res[ $state ][ $token ])) {
+ if ($res[ $state ][ $token ]) {
return true;
}
} else {
- if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+ if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
return true;
}
- }
+ }
$stack = $this->yystack;
$yyidx = $this->yyidx;
do {
@@ -1576,7 +1894,7 @@ static public $yy_action = array(
// reduce action
$done = 0;
do {
- if ($done++ == 100) {
+ if ($done++ === 100) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
// too much recursion prevents proper detection
@@ -1584,18 +1902,21 @@ static public $yy_action = array(
return true;
}
$yyruleno = $yyact - self::YYNSTATE;
- $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+ $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
$nextstate = $this->yy_find_reduce_action(
- $this->yystack[$this->yyidx]->stateno,
- self::$yyRuleInfo[$yyruleno][0]);
- if (isset($res2[$nextstate][$token])) {
- if ($res2[$nextstate][$token]) {
+ $this->yystack[ $this->yyidx ]->stateno,
+ self::$yyRuleInfo[ $yyruleno ][ 0 ]
+ );
+ if (isset($res2[ $nextstate ][ $token ])) {
+ if ($res2[ $nextstate ][ $token ]) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
return true;
}
} else {
- if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+ if ($res2[ $nextstate ][ $token ] =
+ (isset(self::$yyExpectedTokens[ $nextstate ]) &&
+ in_array($token, self::$yyExpectedTokens[ $nextstate ], true))) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
return true;
@@ -1606,10 +1927,10 @@ static public $yy_action = array(
$this->yyidx++;
$x = new TP_yyStackEntry;
$x->stateno = $nextstate;
- $x->major = self::$yyRuleInfo[$yyruleno][0];
- $this->yystack[$this->yyidx] = $x;
+ $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+ $this->yystack[ $this->yyidx ] = $x;
continue 2;
- } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+ } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
if (!$token) {
@@ -1634,69 +1955,65 @@ static public $yy_action = array(
} while (true);
$this->yyidx = $yyidx;
$this->yystack = $stack;
-
return true;
}
- public function yy_find_shift_action($iLookAhead)
+ public function yy_find_shift_action($iLookAhead)
{
- $stateno = $this->yystack[$this->yyidx]->stateno;
-
+ $stateno = $this->yystack[ $this->yyidx ]->stateno;
/* if ($this->yyidx < 0) return self::YY_NO_ACTION; */
- if (!isset(self::$yy_shift_ofst[$stateno])) {
+ if (!isset(self::$yy_shift_ofst[ $stateno ])) {
// no shift actions
- return self::$yy_default[$stateno];
+ return self::$yy_default[ $stateno ];
}
- $i = self::$yy_shift_ofst[$stateno];
+ $i = self::$yy_shift_ofst[ $stateno ];
if ($i === self::YY_SHIFT_USE_DFLT) {
- return self::$yy_default[$stateno];
+ return self::$yy_default[ $stateno ];
}
- if ($iLookAhead == self::YYNOCODE) {
+ if ($iLookAhead === self::YYNOCODE) {
return self::YY_NO_ACTION;
}
$i += $iLookAhead;
if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
- self::$yy_lookahead[$i] != $iLookAhead) {
+ self::$yy_lookahead[ $i ] != $iLookAhead) {
if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
- && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+ && ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0) {
if ($this->yyTraceFILE) {
- fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " .
- $this->yyTokenName[$iLookAhead] . " => " .
- $this->yyTokenName[$iFallback] . "\n");
+ fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+ $this->yyTokenName[ $iLookAhead ] . ' => ' .
+ $this->yyTokenName[ $iFallback ] . "\n");
}
-
return $this->yy_find_shift_action($iFallback);
}
-
- return self::$yy_default[$stateno];
+ return self::$yy_default[ $stateno ];
} else {
- return self::$yy_action[$i];
+ return self::$yy_action[ $i ];
}
}
public function yy_find_reduce_action($stateno, $iLookAhead)
{
/* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
- if (!isset(self::$yy_reduce_ofst[$stateno])) {
- return self::$yy_default[$stateno];
+ if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
+ return self::$yy_default[ $stateno ];
}
- $i = self::$yy_reduce_ofst[$stateno];
- if ($i == self::YY_REDUCE_USE_DFLT) {
- return self::$yy_default[$stateno];
+ $i = self::$yy_reduce_ofst[ $stateno ];
+ if ($i === self::YY_REDUCE_USE_DFLT) {
+ return self::$yy_default[ $stateno ];
}
- if ($iLookAhead == self::YYNOCODE) {
+ if ($iLookAhead === self::YYNOCODE) {
return self::YY_NO_ACTION;
}
$i += $iLookAhead;
if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
- self::$yy_lookahead[$i] != $iLookAhead) {
- return self::$yy_default[$stateno];
+ self::$yy_lookahead[ $i ] != $iLookAhead) {
+ return self::$yy_default[ $stateno ];
} else {
- return self::$yy_action[$i];
+ return self::$yy_action[ $i ];
}
}
+ // line 234 "../smarty/lexer/smarty_internal_templateparser.y"
public function yy_shift($yyNewState, $yyMajor, $yypMinor)
{
$this->yyidx++;
@@ -1708,11 +2025,9 @@ static public $yy_action = array(
while ($this->yyidx >= 0) {
$this->yy_pop_parser_stack();
}
-#line 207 "./lexer/smarty_internal_templateparser.y"
-
- $this->internalError = true;
- $this->compiler->trigger_template_error("Stack overflow in template parser");
-
+ // line 221 "../smarty/lexer/smarty_internal_templateparser.y"
+ $this->internalError = true;
+ $this->compiler->trigger_template_error('Stack overflow in template parser');
return;
}
$yytos = new TP_yyStackEntry;
@@ -1721,1215 +2036,1361 @@ static public $yy_action = array(
$yytos->minor = $yypMinor;
$this->yystack[] = $yytos;
if ($this->yyTraceFILE && $this->yyidx > 0) {
- fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
- $yyNewState);
+ fprintf(
+ $this->yyTraceFILE,
+ "%sShift %d\n",
+ $this->yyTracePrompt,
+ $yyNewState
+ );
fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
for ($i = 1; $i <= $this->yyidx; $i++) {
- fprintf($this->yyTraceFILE, " %s",
- $this->yyTokenName[$this->yystack[$i]->major]);
+ fprintf(
+ $this->yyTraceFILE,
+ " %s",
+ $this->yyTokenName[ $this->yystack[ $i ]->major ]
+ );
}
- fwrite($this->yyTraceFILE,"\n");
+ fwrite($this->yyTraceFILE, "\n");
}
}
- public static $yyRuleInfo = array(
- array( 0 => 63, 1 => 1 ),
- array( 0 => 64, 1 => 1 ),
- array( 0 => 64, 1 => 2 ),
- array( 0 => 64, 1 => 0 ),
- array( 0 => 65, 1 => 1 ),
- array( 0 => 65, 1 => 1 ),
- array( 0 => 65, 1 => 1 ),
- array( 0 => 65, 1 => 1 ),
- array( 0 => 65, 1 => 1 ),
- array( 0 => 68, 1 => 1 ),
- array( 0 => 68, 1 => 2 ),
- array( 0 => 65, 1 => 1 ),
- array( 0 => 65, 1 => 1 ),
- array( 0 => 67, 1 => 2 ),
- array( 0 => 67, 1 => 3 ),
- array( 0 => 69, 1 => 2 ),
- array( 0 => 69, 1 => 0 ),
- array( 0 => 70, 1 => 1 ),
- array( 0 => 70, 1 => 1 ),
- array( 0 => 66, 1 => 2 ),
- array( 0 => 66, 1 => 1 ),
- array( 0 => 71, 1 => 2 ),
- array( 0 => 71, 1 => 3 ),
- array( 0 => 71, 1 => 2 ),
- array( 0 => 71, 1 => 3 ),
- array( 0 => 71, 1 => 2 ),
- array( 0 => 71, 1 => 3 ),
- array( 0 => 71, 1 => 4 ),
- array( 0 => 71, 1 => 4 ),
- array( 0 => 71, 1 => 5 ),
- array( 0 => 71, 1 => 5 ),
- array( 0 => 66, 1 => 1 ),
- array( 0 => 71, 1 => 3 ),
- array( 0 => 71, 1 => 2 ),
- array( 0 => 71, 1 => 4 ),
- array( 0 => 71, 1 => 5 ),
- array( 0 => 71, 1 => 6 ),
- array( 0 => 71, 1 => 2 ),
- array( 0 => 71, 1 => 2 ),
- array( 0 => 71, 1 => 3 ),
- array( 0 => 71, 1 => 2 ),
- array( 0 => 71, 1 => 3 ),
- array( 0 => 71, 1 => 8 ),
- array( 0 => 80, 1 => 2 ),
- array( 0 => 80, 1 => 1 ),
- array( 0 => 71, 1 => 5 ),
- array( 0 => 71, 1 => 7 ),
- array( 0 => 71, 1 => 2 ),
- array( 0 => 71, 1 => 6 ),
- array( 0 => 71, 1 => 8 ),
- array( 0 => 71, 1 => 6 ),
- array( 0 => 71, 1 => 8 ),
- array( 0 => 71, 1 => 3 ),
- array( 0 => 71, 1 => 4 ),
- array( 0 => 71, 1 => 2 ),
- array( 0 => 66, 1 => 1 ),
- array( 0 => 71, 1 => 2 ),
- array( 0 => 71, 1 => 3 ),
- array( 0 => 71, 1 => 4 ),
- array( 0 => 71, 1 => 5 ),
- array( 0 => 73, 1 => 2 ),
- array( 0 => 73, 1 => 1 ),
- array( 0 => 73, 1 => 0 ),
- array( 0 => 83, 1 => 4 ),
- array( 0 => 83, 1 => 2 ),
- array( 0 => 83, 1 => 2 ),
- array( 0 => 83, 1 => 2 ),
- array( 0 => 83, 1 => 2 ),
- array( 0 => 83, 1 => 2 ),
- array( 0 => 83, 1 => 4 ),
- array( 0 => 79, 1 => 1 ),
- array( 0 => 79, 1 => 3 ),
- array( 0 => 78, 1 => 3 ),
- array( 0 => 78, 1 => 3 ),
- array( 0 => 78, 1 => 3 ),
- array( 0 => 78, 1 => 3 ),
- array( 0 => 75, 1 => 1 ),
- array( 0 => 75, 1 => 1 ),
- array( 0 => 75, 1 => 3 ),
- array( 0 => 75, 1 => 3 ),
- array( 0 => 75, 1 => 3 ),
- array( 0 => 75, 1 => 1 ),
- array( 0 => 75, 1 => 2 ),
- array( 0 => 75, 1 => 3 ),
- array( 0 => 75, 1 => 3 ),
- array( 0 => 75, 1 => 2 ),
- array( 0 => 75, 1 => 3 ),
- array( 0 => 75, 1 => 3 ),
- array( 0 => 84, 1 => 7 ),
- array( 0 => 84, 1 => 7 ),
- array( 0 => 74, 1 => 1 ),
- array( 0 => 74, 1 => 2 ),
- array( 0 => 74, 1 => 2 ),
- array( 0 => 74, 1 => 2 ),
- array( 0 => 74, 1 => 2 ),
- array( 0 => 74, 1 => 1 ),
- array( 0 => 74, 1 => 1 ),
- array( 0 => 74, 1 => 3 ),
- array( 0 => 74, 1 => 2 ),
- array( 0 => 74, 1 => 2 ),
- array( 0 => 74, 1 => 1 ),
- array( 0 => 74, 1 => 1 ),
- array( 0 => 74, 1 => 3 ),
- array( 0 => 74, 1 => 3 ),
- array( 0 => 74, 1 => 3 ),
- array( 0 => 74, 1 => 1 ),
- array( 0 => 74, 1 => 1 ),
- array( 0 => 74, 1 => 3 ),
- array( 0 => 74, 1 => 1 ),
- array( 0 => 74, 1 => 2 ),
- array( 0 => 74, 1 => 1 ),
- array( 0 => 74, 1 => 3 ),
- array( 0 => 90, 1 => 1 ),
- array( 0 => 90, 1 => 1 ),
- array( 0 => 72, 1 => 1 ),
- array( 0 => 72, 1 => 1 ),
- array( 0 => 72, 1 => 3 ),
- array( 0 => 72, 1 => 1 ),
- array( 0 => 72, 1 => 3 ),
- array( 0 => 72, 1 => 4 ),
- array( 0 => 72, 1 => 3 ),
- array( 0 => 72, 1 => 4 ),
- array( 0 => 76, 1 => 2 ),
- array( 0 => 76, 1 => 2 ),
- array( 0 => 94, 1 => 2 ),
- array( 0 => 94, 1 => 0 ),
- array( 0 => 95, 1 => 2 ),
- array( 0 => 95, 1 => 2 ),
- array( 0 => 95, 1 => 4 ),
- array( 0 => 95, 1 => 2 ),
- array( 0 => 95, 1 => 2 ),
- array( 0 => 95, 1 => 4 ),
- array( 0 => 95, 1 => 3 ),
- array( 0 => 95, 1 => 5 ),
- array( 0 => 95, 1 => 3 ),
- array( 0 => 95, 1 => 3 ),
- array( 0 => 95, 1 => 3 ),
- array( 0 => 95, 1 => 3 ),
- array( 0 => 95, 1 => 3 ),
- array( 0 => 95, 1 => 3 ),
- array( 0 => 95, 1 => 2 ),
- array( 0 => 81, 1 => 1 ),
- array( 0 => 81, 1 => 1 ),
- array( 0 => 81, 1 => 2 ),
- array( 0 => 96, 1 => 1 ),
- array( 0 => 96, 1 => 1 ),
- array( 0 => 96, 1 => 3 ),
- array( 0 => 93, 1 => 2 ),
- array( 0 => 97, 1 => 1 ),
- array( 0 => 97, 1 => 2 ),
- array( 0 => 98, 1 => 3 ),
- array( 0 => 98, 1 => 3 ),
- array( 0 => 98, 1 => 5 ),
- array( 0 => 98, 1 => 6 ),
- array( 0 => 98, 1 => 2 ),
- array( 0 => 89, 1 => 4 ),
- array( 0 => 99, 1 => 4 ),
- array( 0 => 99, 1 => 4 ),
- array( 0 => 100, 1 => 3 ),
- array( 0 => 100, 1 => 1 ),
- array( 0 => 100, 1 => 0 ),
- array( 0 => 77, 1 => 3 ),
- array( 0 => 77, 1 => 2 ),
- array( 0 => 101, 1 => 3 ),
- array( 0 => 101, 1 => 2 ),
- array( 0 => 82, 1 => 2 ),
- array( 0 => 82, 1 => 0 ),
- array( 0 => 102, 1 => 2 ),
- array( 0 => 102, 1 => 2 ),
- array( 0 => 92, 1 => 1 ),
- array( 0 => 92, 1 => 2 ),
- array( 0 => 92, 1 => 1 ),
- array( 0 => 92, 1 => 2 ),
- array( 0 => 92, 1 => 3 ),
- array( 0 => 87, 1 => 1 ),
- array( 0 => 87, 1 => 1 ),
- array( 0 => 86, 1 => 1 ),
- array( 0 => 88, 1 => 1 ),
- array( 0 => 85, 1 => 3 ),
- array( 0 => 103, 1 => 1 ),
- array( 0 => 103, 1 => 3 ),
- array( 0 => 103, 1 => 0 ),
- array( 0 => 104, 1 => 3 ),
- array( 0 => 104, 1 => 3 ),
- array( 0 => 104, 1 => 1 ),
- array( 0 => 91, 1 => 2 ),
- array( 0 => 91, 1 => 3 ),
- array( 0 => 105, 1 => 2 ),
- array( 0 => 105, 1 => 1 ),
- array( 0 => 106, 1 => 3 ),
- array( 0 => 106, 1 => 3 ),
- array( 0 => 106, 1 => 1 ),
- array( 0 => 106, 1 => 3 ),
- array( 0 => 106, 1 => 3 ),
- array( 0 => 106, 1 => 1 ),
- array( 0 => 106, 1 => 1 ),
- );
+ // line 242 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r0()
+ {
+ $this->root_buffer->prepend_array($this, $this->template_prefix);
+ $this->root_buffer->append_array($this, $this->template_postfix);
+ $this->_retvalue = $this->root_buffer->to_smarty_php($this);
+ }
- public static $yyReduceMap = array(
- 0 => 0,
- 1 => 1,
- 2 => 2,
- 4 => 4,
- 5 => 5,
- 6 => 6,
- 7 => 7,
- 8 => 8,
- 9 => 9,
- 17 => 9,
- 18 => 9,
- 44 => 9,
- 67 => 9,
- 68 => 9,
- 76 => 9,
- 77 => 9,
- 81 => 9,
- 90 => 9,
- 95 => 9,
- 96 => 9,
- 101 => 9,
- 105 => 9,
- 106 => 9,
- 110 => 9,
- 112 => 9,
- 117 => 9,
- 179 => 9,
- 184 => 9,
- 10 => 10,
- 11 => 11,
- 12 => 12,
- 13 => 13,
- 16 => 13,
- 14 => 14,
- 75 => 14,
- 15 => 15,
- 91 => 15,
- 93 => 15,
- 94 => 15,
- 124 => 15,
- 19 => 19,
- 20 => 20,
- 21 => 21,
- 23 => 21,
- 25 => 21,
- 22 => 22,
- 24 => 22,
- 26 => 22,
- 27 => 27,
- 28 => 27,
- 29 => 29,
- 30 => 30,
- 31 => 31,
- 32 => 32,
- 33 => 33,
- 34 => 34,
- 35 => 35,
- 36 => 36,
- 37 => 37,
- 38 => 38,
- 39 => 39,
- 41 => 39,
- 40 => 40,
- 42 => 42,
- 43 => 43,
- 45 => 45,
- 46 => 46,
- 47 => 47,
- 48 => 48,
- 50 => 48,
- 49 => 49,
- 51 => 49,
- 52 => 52,
- 53 => 53,
- 54 => 54,
- 55 => 55,
- 56 => 56,
- 57 => 57,
- 58 => 58,
- 59 => 59,
- 60 => 60,
- 61 => 61,
- 70 => 61,
- 159 => 61,
- 163 => 61,
- 167 => 61,
- 168 => 61,
- 62 => 62,
- 160 => 62,
- 166 => 62,
- 63 => 63,
- 64 => 64,
- 65 => 64,
- 66 => 66,
- 144 => 66,
- 69 => 69,
- 71 => 71,
- 72 => 72,
- 73 => 72,
- 74 => 74,
- 78 => 78,
- 79 => 79,
- 80 => 79,
- 82 => 82,
- 109 => 82,
- 83 => 83,
- 84 => 84,
- 85 => 85,
- 86 => 86,
- 87 => 87,
- 88 => 88,
- 89 => 89,
- 92 => 92,
- 97 => 97,
- 98 => 98,
- 99 => 99,
- 100 => 100,
- 102 => 102,
- 103 => 103,
- 104 => 103,
- 107 => 107,
- 108 => 108,
- 111 => 111,
- 113 => 113,
- 114 => 114,
- 115 => 115,
- 116 => 116,
- 118 => 118,
- 119 => 119,
- 120 => 120,
- 121 => 121,
- 122 => 122,
- 123 => 123,
- 125 => 125,
- 181 => 125,
- 126 => 126,
- 127 => 127,
- 128 => 128,
- 129 => 129,
- 130 => 130,
- 131 => 131,
- 139 => 131,
- 132 => 132,
- 133 => 133,
- 134 => 134,
- 135 => 134,
- 137 => 134,
- 138 => 134,
- 136 => 136,
- 140 => 140,
- 141 => 141,
- 142 => 142,
- 185 => 142,
- 143 => 143,
- 145 => 145,
- 146 => 146,
- 147 => 147,
- 148 => 148,
- 149 => 149,
- 150 => 150,
- 151 => 151,
- 152 => 152,
- 153 => 153,
- 154 => 154,
- 155 => 155,
- 156 => 156,
- 157 => 157,
- 158 => 158,
- 161 => 161,
- 162 => 162,
- 164 => 164,
- 165 => 165,
- 169 => 169,
- 170 => 170,
- 171 => 171,
- 172 => 172,
- 173 => 173,
- 174 => 174,
- 175 => 175,
- 176 => 176,
- 177 => 177,
- 178 => 178,
- 180 => 180,
- 182 => 182,
- 183 => 183,
- 186 => 186,
- 187 => 187,
- 188 => 188,
- 189 => 189,
- 190 => 189,
- 192 => 189,
- 191 => 191,
- 193 => 193,
- 194 => 194,
- 195 => 195,
- );
-#line 218 "./lexer/smarty_internal_templateparser.y"
- function yy_r0(){
- $this->root_buffer->prepend_array($this, $this->template_prefix);
- $this->root_buffer->append_array($this, $this->template_postfix);
- $this->_retvalue = $this->root_buffer->to_smarty_php($this);
- }
-#line 228 "./lexer/smarty_internal_templateparser.y"
- function yy_r1(){
- if ($this->yystack[$this->yyidx + 0]->minor != null) {
- $this->current_buffer->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
- }
- }
-#line 235 "./lexer/smarty_internal_templateparser.y"
- function yy_r2(){
- if ($this->yystack[$this->yyidx + 0]->minor != null) {
- // because of possible code injection
- $this->current_buffer->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
- }
- }
-#line 249 "./lexer/smarty_internal_templateparser.y"
- function yy_r4(){
- if ($this->compiler->has_code) {
- $this->_retvalue = $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor);
- } else {
- $this->_retvalue = null;
- }
- $this->compiler->has_variable_string = false;
- $this->block_nesting_level = count($this->compiler->_tag_stack);
- }
-#line 260 "./lexer/smarty_internal_templateparser.y"
- function yy_r5(){
- $this->_retvalue = new Smarty_Internal_ParseTree_Text($this->yystack[$this->yyidx + 0]->minor);
- }
-#line 264 "./lexer/smarty_internal_templateparser.y"
- function yy_r6(){
- $code = $this->compiler->compileTag('private_php',array(array('code' => $this->yystack[$this->yyidx + 0]->minor), array('type' => $this->lex->phpType )),array());
- if ($this->compiler->has_code && !empty($code)) {
- $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
- $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp.$code,true));
- } else {
- $this->_retvalue = null;
- }
- }
-#line 275 "./lexer/smarty_internal_templateparser.y"
- function yy_r7(){
- $this->compiler->tag_nocache = true;
- $save = $this->template->compiled->has_nocache_code;
- $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode("<?php echo '{$this->yystack[$this->yyidx + 0]->minor}';?>\n", true));
- $this->template->compiled->has_nocache_code = $save;
- }
-#line 282 "./lexer/smarty_internal_templateparser.y"
- function yy_r8(){
- $this->_retvalue = $this->compiler->processText($this->yystack[$this->yyidx + 0]->minor);
- }
-#line 286 "./lexer/smarty_internal_templateparser.y"
- function yy_r9(){
- $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
- }
-#line 290 "./lexer/smarty_internal_templateparser.y"
- function yy_r10(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + 0]->minor;
- }
-#line 295 "./lexer/smarty_internal_templateparser.y"
- function yy_r11(){
- $this->strip = true;
- }
-#line 299 "./lexer/smarty_internal_templateparser.y"
- function yy_r12(){
- $this->strip = false;
- }
-#line 304 "./lexer/smarty_internal_templateparser.y"
- function yy_r13(){
- $this->_retvalue = '';
- }
-#line 308 "./lexer/smarty_internal_templateparser.y"
- function yy_r14(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
- }
-#line 312 "./lexer/smarty_internal_templateparser.y"
- function yy_r15(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
- }
-#line 328 "./lexer/smarty_internal_templateparser.y"
- function yy_r19(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
- }
-#line 334 "./lexer/smarty_internal_templateparser.y"
- function yy_r20(){
- $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, -$this->lex->rdel_length), ' $');
- if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
- $this->_retvalue = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
- } else {
- $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
- }
- }
-#line 344 "./lexer/smarty_internal_templateparser.y"
- function yy_r21(){
- $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + 0]->minor));
- }
-#line 348 "./lexer/smarty_internal_templateparser.y"
- function yy_r22(){
- $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -1]->minor));
- }
-#line 371 "./lexer/smarty_internal_templateparser.y"
- function yy_r27(){
- $this->_retvalue = $this->compiler->compileTag('assign',array(array('value'=>$this->yystack[$this->yyidx + 0]->minor),array('var'=>'\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'')));
- }
-#line 379 "./lexer/smarty_internal_templateparser.y"
- function yy_r29(){
- $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>'\''.substr($this->yystack[$this->yyidx + -3]->minor,1).'\'')),$this->yystack[$this->yyidx + 0]->minor));
- }
-#line 383 "./lexer/smarty_internal_templateparser.y"
- function yy_r30(){
- $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>$this->yystack[$this->yyidx + -3]->minor['var'])),$this->yystack[$this->yyidx + 0]->minor),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -3]->minor['smarty_internal_index']));
- }
-#line 388 "./lexer/smarty_internal_templateparser.y"
- function yy_r31(){
- $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, -$this->lex->rdel_length));
- if ($tag == 'strip') {
- $this->strip = true;
- $this->_retvalue = null;;
- } else {
- if (defined($tag)) {
- if ($this->security) {
- $this->security->isTrustedConstant($tag, $this->compiler);
+ // line 251 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r1()
+ {
+ $code =
+ $this->compiler->compileTag('private_php',
+ array(array('code' => $this->yystack[ $this->yyidx + 0 ]->minor), array('type' => $this->lex->phpType)),
+ array());
+ if ($this->compiler->has_code && !empty($code)) {
+ $tmp = '';
+ foreach ($this->compiler->prefix_code as $code) {
+ $tmp .= $code;
}
- $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
+ $this->compiler->prefix_code = array();
+ $this->current_buffer->append_subtree($this,
+ new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $code, true)));
+ }
+ }
+
+ // line 255 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r2()
+ {
+ $this->current_buffer->append_subtree($this,
+ $this->compiler->processText($this->yystack[ $this->yyidx + 0 ]->minor));
+ }
+
+ // line 259 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r3()
+ {
+ $this->strip = true;
+ }
+
+ // line 264 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r4()
+ {
+ $this->strip = false;
+ }
+
+ // line 269 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r5()
+ {
+ $this->current_buffer->append_subtree($this,
+ new Smarty_Internal_ParseTree_Text($this->yystack[ $this->yyidx + -1 ]->minor));
+ }
+
+ // line 272 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r6()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -3 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor;
+ }
+
+ // line 276 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r7()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 281 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r8()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 285 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r9()
+ {
+ $this->_retvalue = '';
+ }
+
+ // line 297 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r10()
+ {
+ if ($this->compiler->has_code) {
+ $this->current_buffer->append_subtree($this,
+ $this->mergePrefixCode($this->yystack[ $this->yyidx + 0 ]->minor));
+ }
+ $this->compiler->has_variable_string = false;
+ $this->block_nesting_level = count($this->compiler->_tag_stack);
+ }
+
+ // line 307 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r12()
+ {
+ $var =
+ trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
+ -$this->compiler->getRdelLength()), ' $');
+ if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+ $this->_retvalue =
+ $this->compiler->compileTag('private_print_expression', array('nocache'),
+ array('value' => $this->compiler->compileVariable('\'' . $match[ 1 ] . '\'')));
+ } else {
+ $this->_retvalue =
+ $this->compiler->compileTag('private_print_expression', array(),
+ array('value' => $this->compiler->compileVariable('\'' . $var . '\'')));
+ }
+ }
+
+ // line 328 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r13()
+ {
+ $tag =
+ trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
+ -$this->compiler->getRdelLength()));
+ if ($tag == 'strip') {
+ $this->strip = true;
+ $this->_retvalue = null;;
} else {
- if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
- $this->_retvalue = $this->compiler->compileTag($match[1],array("'nocache'"));
+ if (defined($tag)) {
+ if ($this->security) {
+ $this->security->isTrustedConstant($tag, $this->compiler);
+ }
+ $this->_retvalue =
+ $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag));
} else {
- $this->_retvalue = $this->compiler->compileTag($tag,array());
+ if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+ $this->_retvalue = $this->compiler->compileTag($match[ 1 ], array('\'nocache\''));
+ } else {
+ $this->_retvalue = $this->compiler->compileTag($tag, array());
+ }
}
}
}
+
+ // line 339 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r14()
+ {
+ $j = strrpos($this->yystack[ $this->yyidx + 0 ]->minor, '.');
+ if ($this->yystack[ $this->yyidx + 0 ]->minor[ $j + 1 ] == 'c') {
+ // {$smarty.block.child}
+ $this->_retvalue =
+ $this->compiler->compileTag('child', array(), array($this->yystack[ $this->yyidx + 0 ]->minor));
+ } else {
+ // {$smarty.block.parent}
+ $this->_retvalue =
+ $this->compiler->compileTag('parent', array(), array($this->yystack[ $this->yyidx + 0 ]->minor));
+ }
+ }
+
+ // line 343 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r15()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
}
-#line 410 "./lexer/smarty_internal_templateparser.y"
- function yy_r32(){
- if (defined($this->yystack[$this->yyidx + -1]->minor)) {
+
+ // line 347 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r16()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+ }
+
+ // line 356 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r17()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ],
+ array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]));
+ }
+
+ // line 360 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r18()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('assign', array_merge(array(
+ array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]),
+ array('var' => '\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'')
+ ), $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]));
+ }
+
+ // line 364 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r19()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('assign', array_merge(array(
+ array('value' => $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ]),
+ array('var' => $this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ])
+ ), $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ]), array(
+ 'smarty_internal_index' => $this->yystack[ $this->yyidx +
+ -1 ]->minor[ 'smarty_internal_index' ]
+ ));
+ }
+
+ // line 368 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r20()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 383 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r21()
+ {
+ $this->_retvalue = array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+ }
+
+ // line 393 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r25()
+ {
+ if (defined($this->yystack[ $this->yyidx + -1 ]->minor)) {
if ($this->security) {
- $this->security->isTrustedConstant($this->yystack[$this->yyidx + -1]->minor, $this->compiler);
+ $this->security->isTrustedConstant($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler);
}
- $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -1]->minor));
+ $this->_retvalue =
+ $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
+ array('value' => $this->yystack[ $this->yyidx + -1 ]->minor));
} else {
- $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+ $this->_retvalue =
+ $this->compiler->compileTag($this->yystack[ $this->yyidx + -1 ]->minor,
+ $this->yystack[ $this->yyidx + 0 ]->minor);
}
}
-#line 420 "./lexer/smarty_internal_templateparser.y"
- function yy_r33(){
- if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+
+ // line 406 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r26()
+ {
+ if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
if ($this->security) {
- $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+ $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
}
- $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + 0]->minor));
+ $this->_retvalue =
+ $this->compiler->compileTag('private_print_expression', array(),
+ array('value' => $this->yystack[ $this->yyidx + 0 ]->minor));
} else {
- $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor,array());
+ $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor, array());
}
}
-#line 433 "./lexer/smarty_internal_templateparser.y"
- function yy_r34(){
- if (defined($this->yystack[$this->yyidx + -2]->minor)) {
+
+ // line 418 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r27()
+ {
+ if (defined($this->yystack[ $this->yyidx + -2 ]->minor)) {
if ($this->security) {
- $this->security->isTrustedConstant($this->yystack[$this->yyidx + -2]->minor, $this->compiler);
+ $this->security->isTrustedConstant($this->yystack[ $this->yyidx + -2 ]->minor, $this->compiler);
}
- $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
+ $this->_retvalue =
+ $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
+ array(
+ 'value' => $this->yystack[ $this->yyidx + -2 ]->minor,
+ 'modifierlist' => $this->yystack[ $this->yyidx + -1 ]->minor
+ ));
} else {
- $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + 0]->minor, array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
+ $this->_retvalue =
+ $this->compiler->compileTag($this->yystack[ $this->yyidx + -2 ]->minor,
+ $this->yystack[ $this->yyidx + 0 ]->minor,
+ array('modifierlist' => $this->yystack[ $this->yyidx + -1 ]->minor));
}
}
-#line 445 "./lexer/smarty_internal_templateparser.y"
- function yy_r35(){
- $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + 0]->minor,array('object_method'=>$this->yystack[$this->yyidx + -1]->minor));
- }
-#line 450 "./lexer/smarty_internal_templateparser.y"
- function yy_r36(){
- $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + 0]->minor,array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor, 'object_method'=>$this->yystack[$this->yyidx + -2]->minor));
- }
-#line 455 "./lexer/smarty_internal_templateparser.y"
- function yy_r37(){
- $this->_retvalue = $this->compiler->compileTag('make_nocache',array(array('var'=>'\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'')));
- }
-#line 460 "./lexer/smarty_internal_templateparser.y"
- function yy_r38(){
- $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->lex->ldel_length));
- $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
- }
-#line 465 "./lexer/smarty_internal_templateparser.y"
- function yy_r39(){
- $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length));
- $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + 0]->minor,array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
- }
-#line 470 "./lexer/smarty_internal_templateparser.y"
- function yy_r40(){
- $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->lex->ldel_length));
- $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
- }
-#line 481 "./lexer/smarty_internal_templateparser.y"
- function yy_r42(){
- $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -4]->minor),array('var'=>$this->yystack[$this->yyidx + -2]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),1);
- }
-#line 485 "./lexer/smarty_internal_templateparser.y"
- function yy_r43(){
- $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
- }
-#line 493 "./lexer/smarty_internal_templateparser.y"
- function yy_r45(){
- $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -3]->minor),array('to'=>$this->yystack[$this->yyidx + -1]->minor))),0);
- }
-#line 497 "./lexer/smarty_internal_templateparser.y"
- function yy_r46(){
- $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -5]->minor),array('to'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),0);
- }
-#line 502 "./lexer/smarty_internal_templateparser.y"
- function yy_r47(){
- $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + 0]->minor);
- }
-#line 507 "./lexer/smarty_internal_templateparser.y"
- function yy_r48(){
- $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -3]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor))));
- }
-#line 511 "./lexer/smarty_internal_templateparser.y"
- function yy_r49(){
- $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor),array('key'=>$this->yystack[$this->yyidx + -3]->minor))));
- }
-#line 524 "./lexer/smarty_internal_templateparser.y"
- function yy_r52(){
- $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + 0]->minor))));
- }
-#line 528 "./lexer/smarty_internal_templateparser.y"
- function yy_r53(){
- $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor)),$this->yystack[$this->yyidx + 0]->minor)));
- }
-#line 533 "./lexer/smarty_internal_templateparser.y"
- function yy_r54(){
- $j = strrpos($this->yystack[$this->yyidx + 0]->minor,'.');
- if ($this->yystack[$this->yyidx + 0]->minor[$j+1] == 'c') {
- // {$smarty.block.child}
- $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
- } else {
- // {$smarty.block.parent}
- $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler);
- }
- }
-#line 546 "./lexer/smarty_internal_templateparser.y"
- function yy_r55(){
- $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, -$this->lex->rdel_length), ' /');
- if ($tag == 'strip') {
- $this->strip = false;
- $this->_retvalue = null;
- } else {
- $this->_retvalue = $this->compiler->compileTag($tag.'close',array());
- }
- }
-#line 555 "./lexer/smarty_internal_templateparser.y"
- function yy_r56(){
- $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor.'close',array());
- }
-#line 559 "./lexer/smarty_internal_templateparser.y"
- function yy_r57(){
- $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
- }
-#line 564 "./lexer/smarty_internal_templateparser.y"
- function yy_r58(){
- $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + 0]->minor));
- }
-#line 568 "./lexer/smarty_internal_templateparser.y"
- function yy_r59(){
- $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + -1]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
- }
-#line 576 "./lexer/smarty_internal_templateparser.y"
- function yy_r60(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
- $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
- }
-#line 582 "./lexer/smarty_internal_templateparser.y"
- function yy_r61(){
- $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
- }
-#line 587 "./lexer/smarty_internal_templateparser.y"
- function yy_r62(){
- $this->_retvalue = array();
- }
-#line 592 "./lexer/smarty_internal_templateparser.y"
- function yy_r63(){
- if (defined($this->yystack[$this->yyidx + 0]->minor)) {
- if ($this->security) {
- $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+
+ // line 423 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r28()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag($this->yystack[ $this->yyidx + -3 ]->minor,
+ $this->yystack[ $this->yyidx + 0 ]->minor,
+ array('object_method' => $this->yystack[ $this->yyidx + -1 ]->minor));
+ }
+
+ // line 428 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r29()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag($this->yystack[ $this->yyidx + -4 ]->minor,
+ $this->yystack[ $this->yyidx + 0 ]->minor, array(
+ 'modifierlist' => $this->yystack[ $this->yyidx + -1 ]->minor,
+ 'object_method' => $this->yystack[ $this->yyidx + -2 ]->minor
+ ));
+ }
+
+ // line 433 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r30()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('make_nocache',
+ array(array('var' => '\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'')));
+ }
+
+ // line 438 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r31()
+ {
+ $tag = trim(substr($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler->getLdelLength()));
+ $this->_retvalue =
+ $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, array(),
+ array('if condition' => $this->yystack[ $this->yyidx + 0 ]->minor));
+ }
+
+ // line 443 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r32()
+ {
+ $tag = trim(substr($this->yystack[ $this->yyidx + -2 ]->minor, $this->compiler->getLdelLength()));
+ $this->_retvalue =
+ $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag,
+ $this->yystack[ $this->yyidx + 0 ]->minor,
+ array('if condition' => $this->yystack[ $this->yyidx + -1 ]->minor));
+ }
+
+ // line 454 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r33()
+ {
+ $tag = trim(substr($this->yystack[ $this->yyidx + -1 ]->minor, $this->compiler->getLdelLength()));
+ $this->_retvalue =
+ $this->compiler->compileTag(($tag === 'else if') ? 'elseif' : $tag, array(),
+ array('if condition' => $this->yystack[ $this->yyidx + 0 ]->minor));
+ }
+
+ // line 458 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r35()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
+ array('start' => $this->yystack[ $this->yyidx + -6 ]->minor),
+ array('ifexp' => $this->yystack[ $this->yyidx + -4 ]->minor),
+ array('var' => $this->yystack[ $this->yyidx + -2 ]->minor),
+ array('step' => $this->yystack[ $this->yyidx + -1 ]->minor)
+ )), 1);
+ }
+
+ // line 466 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r36()
+ {
+ $this->_retvalue = '=' . $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 470 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r38()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
+ array('start' => $this->yystack[ $this->yyidx + -3 ]->minor),
+ array('to' => $this->yystack[ $this->yyidx + -1 ]->minor)
+ )), 0);
+ }
+
+ // line 475 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r39()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
+ array('start' => $this->yystack[ $this->yyidx + -5 ]->minor),
+ array('to' => $this->yystack[ $this->yyidx + -3 ]->minor),
+ array('step' => $this->yystack[ $this->yyidx + -1 ]->minor)
+ )), 0);
+ }
+
+ // line 479 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r40()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
+ array('from' => $this->yystack[ $this->yyidx + -3 ]->minor),
+ array('item' => $this->yystack[ $this->yyidx + -1 ]->minor)
+ )));
+ }
+
+ // line 482 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r41()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor, array(
+ array('from' => $this->yystack[ $this->yyidx + -5 ]->minor),
+ array('item' => $this->yystack[ $this->yyidx + -1 ]->minor),
+ array('key' => $this->yystack[ $this->yyidx + -3 ]->minor)
+ )));
+ }
+
+ // line 487 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r42()
+ {
+ $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[ $this->yyidx + 0 ]->minor);
+ }
+
+ // line 491 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r43()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('setfilter', array(), array(
+ 'modifier_list' => array(
+ array_merge(array($this->yystack[ $this->yyidx + -1 ]->minor),
+ $this->yystack[ $this->yyidx + 0 ]->minor)
+ )
+ ));
+ }
+
+ // line 497 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r44()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('setfilter', array(), array(
+ 'modifier_list' => array_merge(array(
+ array_merge(array(
+ $this->yystack[ $this->yyidx +
+ -2 ]->minor
+ ), $this->yystack[ $this->yyidx + -1 ]->minor)
+ ), $this->yystack[ $this->yyidx + 0 ]->minor)
+ ));
+ }
+
+ // line 506 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r45()
+ {
+ $tag =
+ trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
+ -$this->compiler->getRdelLength()), ' /');
+ if ($tag === 'strip') {
+ $this->strip = false;
+ $this->_retvalue = null;
+ } else {
+ $this->_retvalue = $this->compiler->compileTag($tag . 'close', array());
}
- $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
- } else {
- $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'\''.$this->yystack[$this->yyidx + 0]->minor.'\'');
}
+
+ // line 510 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r46()
+ {
+ $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor . 'close', array());
+ }
+
+ // line 515 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r47()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag($this->yystack[ $this->yyidx + -1 ]->minor . 'close', array(),
+ array('modifier_list' => $this->yystack[ $this->yyidx + 0 ]->minor));
}
-#line 603 "./lexer/smarty_internal_templateparser.y"
- function yy_r64(){
- $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r\t")=>$this->yystack[$this->yyidx + 0]->minor);
+
+ // line 519 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r48()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag($this->yystack[ $this->yyidx + -2 ]->minor . 'close', array(),
+ array('object_method' => $this->yystack[ $this->yyidx + 0 ]->minor));
+ }
+
+ // line 527 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r49()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag($this->yystack[ $this->yyidx + -3 ]->minor . 'close', array(), array(
+ 'object_method' => $this->yystack[ $this->yyidx + -1 ]->minor,
+ 'modifier_list' => $this->yystack[ $this->yyidx + 0 ]->minor
+ ));
+ }
+
+ // line 533 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r50()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+ $this->_retvalue[] = $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 538 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r51()
+ {
+ $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
+ }
+
+ // line 543 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r52()
+ {
+ $this->_retvalue = array();
+ }
+
+ // line 554 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r53()
+ {
+ if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
+ if ($this->security) {
+ $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
+ }
+ $this->_retvalue =
+ array($this->yystack[ $this->yyidx + -2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor);
+ } else {
+ $this->_retvalue =
+ array(
+ $this->yystack[ $this->yyidx + -2 ]->minor => '\'' .
+ $this->yystack[ $this->yyidx + 0 ]->minor .
+ '\''
+ );
+ }
}
-#line 611 "./lexer/smarty_internal_templateparser.y"
- function yy_r66(){
- $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
+
+ // line 562 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r54()
+ {
+ $this->_retvalue =
+ array(
+ trim($this->yystack[ $this->yyidx + -1 ]->minor, " =\n\r\t") => $this->yystack[ $this->yyidx +
+ 0 ]->minor
+ );
}
-#line 623 "./lexer/smarty_internal_templateparser.y"
- function yy_r69(){
- $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+
+ // line 574 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r56()
+ {
+ $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\'';
}
-#line 636 "./lexer/smarty_internal_templateparser.y"
- function yy_r71(){
- $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
- $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
+
+ // line 587 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r59()
+ {
+ $this->_retvalue =
+ array($this->yystack[ $this->yyidx + -2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor);
}
-#line 641 "./lexer/smarty_internal_templateparser.y"
- function yy_r72(){
- $this->_retvalue = array('var' => '\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'', 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+
+ // line 592 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r61()
+ {
+ $this->yystack[ $this->yyidx + -2 ]->minor[] = $this->yystack[ $this->yyidx + 0 ]->minor;
+ $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor;
}
-#line 648 "./lexer/smarty_internal_templateparser.y"
- function yy_r74(){
- $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+
+ // line 599 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r62()
+ {
+ $this->_retvalue =
+ array(
+ 'var' => '\'' . substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) . '\'',
+ 'value' => $this->yystack[ $this->yyidx + 0 ]->minor
+ );
}
-#line 672 "./lexer/smarty_internal_templateparser.y"
- function yy_r78(){
- $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+
+ // line 603 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r64()
+ {
+ $this->_retvalue =
+ array(
+ 'var' => $this->yystack[ $this->yyidx + -2 ]->minor,
+ 'value' => $this->yystack[ $this->yyidx + 0 ]->minor
+ );
}
-#line 677 "./lexer/smarty_internal_templateparser.y"
- function yy_r79(){
- $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
+
+ // line 623 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r65()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
}
-#line 691 "./lexer/smarty_internal_templateparser.y"
- function yy_r82(){
- $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));
+
+ // line 628 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r68()
+ {
+ $this->_retvalue =
+ '$_smarty_tpl->getStreamVariable(\'' .
+ substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) .
+ '://' .
+ $this->yystack[ $this->yyidx + 0 ]->minor .
+ '\')';
}
-#line 697 "./lexer/smarty_internal_templateparser.y"
- function yy_r83(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor['pre']. $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor['op'].$this->yystack[$this->yyidx + 0]->minor .')';
+
+ // line 642 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r69()
+ {
+ $this->_retvalue =
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ trim($this->yystack[ $this->yyidx + -1 ]->minor) .
+ $this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 701 "./lexer/smarty_internal_templateparser.y"
- function yy_r84(){
- $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+
+ // line 648 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r72()
+ {
+ $this->_retvalue =
+ $this->compiler->compileTag('private_modifier', array(), array(
+ 'value' => $this->yystack[ $this->yyidx + -1 ]->minor,
+ 'modifierlist' => $this->yystack[ $this->yyidx + 0 ]->minor
+ ));
}
-#line 705 "./lexer/smarty_internal_templateparser.y"
- function yy_r85(){
- $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + -1]->minor . ')';
+
+ // line 652 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r73()
+ {
+ $this->_retvalue =
+ $this->yystack[ $this->yyidx + -1 ]->minor[ 'pre' ] .
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ $this->yystack[ $this->yyidx + -1 ]->minor[ 'op' ] .
+ $this->yystack[ $this->yyidx + 0 ]->minor .
+ ')';
}
-#line 709 "./lexer/smarty_internal_templateparser.y"
- function yy_r86(){
- $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
+
+ // line 656 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r74()
+ {
+ $this->_retvalue =
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ $this->yystack[ $this->yyidx + -1 ]->minor .
+ $this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 713 "./lexer/smarty_internal_templateparser.y"
- function yy_r87(){
- $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';
+
+ // line 660 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r75()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
}
-#line 721 "./lexer/smarty_internal_templateparser.y"
- function yy_r88(){
- $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '. $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'') . ' : '.$this->yystack[$this->yyidx + 0]->minor;
+
+ // line 664 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r76()
+ {
+ $this->_retvalue =
+ 'in_array(' .
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ ',' .
+ $this->yystack[ $this->yyidx + 0 ]->minor .
+ ')';
}
-#line 725 "./lexer/smarty_internal_templateparser.y"
- function yy_r89(){
- $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
+
+ // line 672 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r77()
+ {
+ $this->_retvalue =
+ 'in_array(' .
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ ',(array)' .
+ $this->yystack[ $this->yyidx + 0 ]->minor .
+ ')';
}
-#line 740 "./lexer/smarty_internal_templateparser.y"
- function yy_r92(){
- $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
+
+ // line 676 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r78()
+ {
+ $this->_retvalue =
+ $this->yystack[ $this->yyidx + -5 ]->minor .
+ ' ? ' .
+ $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + -2 ]->minor, 1) . '\'') .
+ ' : ' .
+ $this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 761 "./lexer/smarty_internal_templateparser.y"
- function yy_r97(){
- $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+
+ // line 686 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r79()
+ {
+ $this->_retvalue =
+ $this->yystack[ $this->yyidx + -5 ]->minor .
+ ' ? ' .
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ ' : ' .
+ $this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 765 "./lexer/smarty_internal_templateparser.y"
- function yy_r98(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
+
+ // line 691 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r81()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 769 "./lexer/smarty_internal_templateparser.y"
- function yy_r99(){
- $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
+
+ // line 712 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r82()
+ {
+ $this->_retvalue = '!' . $this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 774 "./lexer/smarty_internal_templateparser.y"
- function yy_r100(){
- if (defined($this->yystack[$this->yyidx + 0]->minor)) {
- if ($this->security) {
- $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+
+ // line 716 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r87()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 720 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r88()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . '.';
+ }
+
+ // line 725 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r89()
+ {
+ $this->_retvalue = '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 742 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r90()
+ {
+ if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
+ if ($this->security) {
+ $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
+ }
+ $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+ } else {
+ $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\'';
}
- $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
- } else {
- $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
- }
- }
-#line 791 "./lexer/smarty_internal_templateparser.y"
- function yy_r102(){
- $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";
- }
-#line 795 "./lexer/smarty_internal_templateparser.y"
- function yy_r103(){
- $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
- }
-#line 813 "./lexer/smarty_internal_templateparser.y"
- function yy_r107(){
- $prefixVar = $this->compiler->getNewPrefixVariable();
- if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') {
- $this->compiler->appendPrefixCode("<?php $prefixVar" .' = '. $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).';?>');
- } else {
- $this->compiler->appendPrefixCode("<?php $prefixVar" .' = '. $this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].';?>');
- }
- $this->_retvalue = $prefixVar .'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
- }
-#line 824 "./lexer/smarty_internal_templateparser.y"
- function yy_r108(){
- $prefixVar = $this->compiler->getNewPrefixVariable();
- $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[$this->yyidx + 0]->minor);
- $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php $prefixVar" .'=ob_get_clean();?>'));
- $this->_retvalue = $prefixVar;
- }
-#line 841 "./lexer/smarty_internal_templateparser.y"
- function yy_r111(){
- if (!in_array(strtolower($this->yystack[$this->yyidx + -2]->minor), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))) {
- if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
- $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+ }
+
+ // line 746 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r92()
+ {
+ $this->_retvalue = '(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
+ }
+
+ // line 764 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r93()
+ {
+ $this->_retvalue =
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ $this->yystack[ $this->yyidx + -1 ]->minor .
+ $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 775 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r97()
+ {
+ $prefixVar = $this->compiler->getNewPrefixVariable();
+ if ($this->yystack[ $this->yyidx + -2 ]->minor[ 'var' ] === '\'smarty\'') {
+ $this->compiler->appendPrefixCode("<?php {$prefixVar} = " .
+ $this->compiler->compileTag('private_special_variable', array(),
+ $this->yystack[ $this->yyidx +
+ -2 ]->minor[ 'smarty_internal_index' ]) .
+ ';?>');
} else {
- $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
- }
- } else {
- $this->compiler->trigger_template_error ("static class '".$this->yystack[$this->yyidx + -2]->minor."' is undefined or not allowed by security setting");
+ $this->compiler->appendPrefixCode("<?php {$prefixVar} = " .
+ $this->compiler->compileVariable($this->yystack[ $this->yyidx +
+ -2 ]->minor[ 'var' ]) .
+ $this->yystack[ $this->yyidx + -2 ]->minor[ 'smarty_internal_index' ] .
+ ';?>');
+ }
+ $this->_retvalue =
+ $prefixVar .
+ '::' .
+ $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
+ $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
}
+
+ // line 792 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r98()
+ {
+ $prefixVar = $this->compiler->getNewPrefixVariable();
+ $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[ $this->yyidx + 0 ]->minor);
+ $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
+ $this->_retvalue = $prefixVar;
}
-#line 860 "./lexer/smarty_internal_templateparser.y"
- function yy_r113(){
- $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+
+ // line 811 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r101()
+ {
+ if (!in_array(strtolower($this->yystack[ $this->yyidx + -2 ]->minor), array('self', 'parent')) &&
+ (!$this->security ||
+ $this->security->isTrustedStaticClassAccess($this->yystack[ $this->yyidx + -2 ]->minor,
+ $this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler))) {
+ if (isset($this->smarty->registered_classes[ $this->yystack[ $this->yyidx + -2 ]->minor ])) {
+ $this->_retvalue =
+ $this->smarty->registered_classes[ $this->yystack[ $this->yyidx + -2 ]->minor ] .
+ '::' .
+ $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
+ $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
+ } else {
+ $this->_retvalue =
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ '::' .
+ $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
+ $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
+ }
+ } else {
+ $this->compiler->trigger_template_error('static class \'' .
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ '\' is undefined or not allowed by security setting');
}
-#line 871 "./lexer/smarty_internal_templateparser.y"
- function yy_r114(){
- $this->_retvalue = $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'');
- }
-#line 874 "./lexer/smarty_internal_templateparser.y"
- function yy_r115(){
- if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
- $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
- $this->_retvalue = $smarty_var;
- } else {
- // used for array reset,next,prev,end,current
- $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
- $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
- $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
- }
- }
-#line 887 "./lexer/smarty_internal_templateparser.y"
- function yy_r116(){
- $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
- }
-#line 897 "./lexer/smarty_internal_templateparser.y"
- function yy_r118(){
- $this->_retvalue = $this->compiler->compileConfigVariable("'" . $this->yystack[$this->yyidx + -1]->minor . "'");
- }
-#line 901 "./lexer/smarty_internal_templateparser.y"
- function yy_r119(){
- $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable("'" . $this->yystack[$this->yyidx + -2]->minor . "'") . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' :null)';
- }
-#line 905 "./lexer/smarty_internal_templateparser.y"
- function yy_r120(){
- $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -1]->minor);
- }
-#line 909 "./lexer/smarty_internal_templateparser.y"
- function yy_r121(){
- $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -2]->minor) . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' : null)';
- }
-#line 913 "./lexer/smarty_internal_templateparser.y"
- function yy_r122(){
- $this->_retvalue = array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'', 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
- }
-#line 916 "./lexer/smarty_internal_templateparser.y"
- function yy_r123(){
- $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
- }
-#line 929 "./lexer/smarty_internal_templateparser.y"
- function yy_r125(){
- return;
- }
-#line 935 "./lexer/smarty_internal_templateparser.y"
- function yy_r126(){
- $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'').']';
- }
-#line 938 "./lexer/smarty_internal_templateparser.y"
- function yy_r127(){
- $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor).']';
- }
-#line 942 "./lexer/smarty_internal_templateparser.y"
- function yy_r128(){
- $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']';
- }
-#line 946 "./lexer/smarty_internal_templateparser.y"
- function yy_r129(){
- $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";
- }
-#line 950 "./lexer/smarty_internal_templateparser.y"
- function yy_r130(){
- $this->_retvalue = '['. $this->yystack[$this->yyidx + 0]->minor .']';
- }
-#line 955 "./lexer/smarty_internal_templateparser.y"
- function yy_r131(){
- $this->_retvalue = '['. $this->yystack[$this->yyidx + -1]->minor .']';
- }
-#line 960 "./lexer/smarty_internal_templateparser.y"
- function yy_r132(){
- $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
- }
-#line 964 "./lexer/smarty_internal_templateparser.y"
- function yy_r133(){
- $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
- }
-#line 967 "./lexer/smarty_internal_templateparser.y"
- function yy_r134(){
- $this->_retvalue = '['.$this->yystack[$this->yyidx + -1]->minor.']';
- }
-#line 973 "./lexer/smarty_internal_templateparser.y"
- function yy_r136(){
- $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'').']';;
- }
-#line 989 "./lexer/smarty_internal_templateparser.y"
- function yy_r140(){
- $this->_retvalue = '[]';
- }
-#line 999 "./lexer/smarty_internal_templateparser.y"
- function yy_r141(){
- $this->_retvalue = '\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'';
- }
-#line 1003 "./lexer/smarty_internal_templateparser.y"
- function yy_r142(){
- $this->_retvalue = "''";
- }
-#line 1008 "./lexer/smarty_internal_templateparser.y"
- function yy_r143(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
- }
-#line 1016 "./lexer/smarty_internal_templateparser.y"
- function yy_r145(){
- $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, -$this->lex->rdel_length), ' $');
- $this->_retvalue = $this->compiler->compileVariable('\''.$var.'\'');
- }
-#line 1022 "./lexer/smarty_internal_templateparser.y"
- function yy_r146(){
- $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
}
-#line 1029 "./lexer/smarty_internal_templateparser.y"
- function yy_r147(){
- if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') {
- $this->_retvalue = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
- } else {
- $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
+
+ // line 822 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r103()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
}
+
+ // line 825 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r104()
+ {
+ $this->_retvalue =
+ $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'');
}
-#line 1038 "./lexer/smarty_internal_templateparser.y"
- function yy_r148(){
- $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
- }
-#line 1043 "./lexer/smarty_internal_templateparser.y"
- function yy_r149(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
- }
-#line 1048 "./lexer/smarty_internal_templateparser.y"
- function yy_r150(){
- if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) == '_') {
- $this->compiler->trigger_template_error (self::Err1);
- }
- $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
- }
-#line 1055 "./lexer/smarty_internal_templateparser.y"
- function yy_r151(){
- if ($this->security) {
- $this->compiler->trigger_template_error (self::Err2);
- }
- $this->_retvalue = '->{'.$this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}';
+
+ // line 838 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r105()
+ {
+ if ($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ] === '\'smarty\'') {
+ $smarty_var =
+ $this->compiler->compileTag('private_special_variable', array(),
+ $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ]);
+ $this->_retvalue = $smarty_var;
+ } else {
+ // used for array reset,next,prev,end,current
+ $this->last_variable = $this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ];
+ $this->last_index = $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ];
+ $this->_retvalue =
+ $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ]) .
+ $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ];
+ }
}
-#line 1062 "./lexer/smarty_internal_templateparser.y"
- function yy_r152(){
- if ($this->security) {
- $this->compiler->trigger_template_error (self::Err2);
+
+ // line 848 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r106()
+ {
+ $this->_retvalue =
+ '$_smarty_tpl->tpl_vars[' .
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ ']->' .
+ $this->yystack[ $this->yyidx + 0 ]->minor;
}
- $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
- }
-#line 1069 "./lexer/smarty_internal_templateparser.y"
- function yy_r153(){
- if ($this->security) {
- $this->compiler->trigger_template_error (self::Err2);
+
+ // line 852 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r108()
+ {
+ $this->_retvalue =
+ $this->compiler->compileConfigVariable('\'' . $this->yystack[ $this->yyidx + -1 ]->minor . '\'');
}
- $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
- }
-#line 1077 "./lexer/smarty_internal_templateparser.y"
- function yy_r154(){
- $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
- }
-#line 1085 "./lexer/smarty_internal_templateparser.y"
- function yy_r155(){
- if (!$this->security || $this->security->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
- if (strcasecmp($this->yystack[$this->yyidx + -3]->minor,'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'array') === 0 || is_callable($this->yystack[$this->yyidx + -3]->minor)) {
- $func_name = strtolower($this->yystack[$this->yyidx + -3]->minor);
- if ($func_name == 'isset') {
- if (count($this->yystack[$this->yyidx + -1]->minor) == 0) {
- $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
- }
- $par = implode(',',$this->yystack[$this->yyidx + -1]->minor);
- if (strncasecmp($par,'$_smarty_tpl->smarty->ext->_config->_getConfigVariable',strlen('$_smarty_tpl->smarty->ext->_config->_getConfigVariable')) === 0) {
- $prefixVar = $this->compiler->getNewPrefixVariable();
- $this->compiler->appendPrefixCode("<?php $prefixVar" .'='.str_replace(')',', false)',$par).';?>');
- $isset_par = $prefixVar;
- } else {
- $isset_par=str_replace("')->value","',null,true,false)->value",$par);
- }
- $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $isset_par .")";
- } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
- if (count($this->yystack[$this->yyidx + -1]->minor) != 1) {
- $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
- }
- if ($func_name == 'empty') {
- $this->_retvalue = $func_name.'('.str_replace("')->value","',null,true,false)->value",$this->yystack[$this->yyidx + -1]->minor[0]).')';
- } else {
- $this->_retvalue = $func_name.'('.$this->yystack[$this->yyidx + -1]->minor[0].')';
- }
- } else {
- $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
- }
+
+ // line 856 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r109()
+ {
+ $this->_retvalue =
+ '(is_array($tmp = ' .
+ $this->compiler->compileConfigVariable('\'' . $this->yystack[ $this->yyidx + -2 ]->minor . '\'') .
+ ') ? $tmp' .
+ $this->yystack[ $this->yyidx + 0 ]->minor .
+ ' :null)';
+ }
+
+ // line 860 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r110()
+ {
+ $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + -1 ]->minor);
+ }
+
+ // line 864 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r111()
+ {
+ $this->_retvalue =
+ '(is_array($tmp = ' .
+ $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + -2 ]->minor) .
+ ') ? $tmp' .
+ $this->yystack[ $this->yyidx + 0 ]->minor .
+ ' : null)';
+ }
+
+ // line 867 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r112()
+ {
+ $this->_retvalue =
+ array(
+ 'var' => '\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'',
+ 'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor
+ );
+ }
+
+ // line 880 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r113()
+ {
+ $this->_retvalue =
+ array(
+ 'var' => $this->yystack[ $this->yyidx + -1 ]->minor,
+ 'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor
+ );
+ }
+
+ // line 886 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r115()
+ {
+ return;
+ }
+
+ // line 889 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r116()
+ {
+ $this->_retvalue =
+ '[' .
+ $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'') .
+ ']';
+ }
+
+ // line 893 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r117()
+ {
+ $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor) . ']';
+ }
+
+ // line 897 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r118()
+ {
+ $this->_retvalue =
+ '[' .
+ $this->compiler->compileVariable($this->yystack[ $this->yyidx + -2 ]->minor) .
+ '->' .
+ $this->yystack[ $this->yyidx + 0 ]->minor .
+ ']';
+ }
+
+ // line 901 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r119()
+ {
+ $this->_retvalue = '[\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\']';
+ }
+
+ // line 906 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r120()
+ {
+ $this->_retvalue = '[' . $this->yystack[ $this->yyidx + 0 ]->minor . ']';
+ }
+
+ // line 911 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r121()
+ {
+ $this->_retvalue = '[' . $this->yystack[ $this->yyidx + -1 ]->minor . ']';
+ }
+
+ // line 915 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r122()
+ {
+ $this->_retvalue =
+ '[' .
+ $this->compiler->compileTag('private_special_variable', array(),
+ '[\'section\'][\'' . $this->yystack[ $this->yyidx + -1 ]->minor . '\'][\'index\']') .
+ ']';
+ }
+
+ // line 918 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r123()
+ {
+ $this->_retvalue =
+ '[' .
+ $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' .
+ $this->yystack[ $this->yyidx +
+ -3 ]->minor .
+ '\'][\'' .
+ $this->yystack[ $this->yyidx +
+ -1 ]->minor .
+ '\']') .
+ ']';
+ }
+
+ // line 924 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r124()
+ {
+ $this->_retvalue = '[' . $this->yystack[ $this->yyidx + -1 ]->minor . ']';
+ }
+
+ // line 940 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r126()
+ {
+ $this->_retvalue =
+ '[' .
+ $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + -1 ]->minor, 1) . '\'') .
+ ']';
+ }
+
+ // line 950 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r130()
+ {
+ $this->_retvalue = '[]';
+ }
+
+ // line 954 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r131()
+ {
+ $this->_retvalue = '\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'';
+ }
+
+ // line 959 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r132()
+ {
+ $this->_retvalue = '\'\'';
+ }
+
+ // line 967 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r133()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 973 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r135()
+ {
+ $var =
+ trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler->getLdelLength(),
+ -$this->compiler->getRdelLength()), ' $');
+ $this->_retvalue = $this->compiler->compileVariable('\'' . $var . '\'');
+ }
+
+ // line 980 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r136()
+ {
+ $this->_retvalue = '(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
+ }
+
+ // line 989 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r137()
+ {
+ if ($this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ] === '\'smarty\'') {
+ $this->_retvalue =
+ $this->compiler->compileTag('private_special_variable', array(),
+ $this->yystack[ $this->yyidx + -1 ]->minor[ 'smarty_internal_index' ]) .
+ $this->yystack[ $this->yyidx + 0 ]->minor;
} else {
- $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\"");
+ $this->_retvalue =
+ $this->compiler->compileVariable($this->yystack[ $this->yyidx + -1 ]->minor[ 'var' ]) .
+ $this->yystack[ $this->yyidx + -1 ]->minor[ 'smarty_internal_index' ] .
+ $this->yystack[ $this->yyidx + 0 ]->minor;
}
}
+
+ // line 994 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r138()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 1124 "./lexer/smarty_internal_templateparser.y"
- function yy_r156(){
- if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) == '_') {
- $this->compiler->trigger_template_error (self::Err1);
- }
- $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
- }
-#line 1131 "./lexer/smarty_internal_templateparser.y"
- function yy_r157(){
- if ($this->security) {
- $this->compiler->trigger_template_error (self::Err2);
- }
- $prefixVar = $this->compiler->getNewPrefixVariable();
- $this->compiler->appendPrefixCode("<?php $prefixVar" .'='.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -3]->minor,1).'\'').';?>');
- $this->_retvalue = $prefixVar .'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
- }
-#line 1142 "./lexer/smarty_internal_templateparser.y"
- function yy_r158(){
- $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
- }
-#line 1159 "./lexer/smarty_internal_templateparser.y"
- function yy_r161(){
- $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));
- }
-#line 1163 "./lexer/smarty_internal_templateparser.y"
- function yy_r162(){
- $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
- }
-#line 1171 "./lexer/smarty_internal_templateparser.y"
- function yy_r164(){
- $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
- }
-#line 1179 "./lexer/smarty_internal_templateparser.y"
- function yy_r165(){
- $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
- }
-#line 1198 "./lexer/smarty_internal_templateparser.y"
- function yy_r169(){
- $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
- }
-#line 1203 "./lexer/smarty_internal_templateparser.y"
- function yy_r170(){
- $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
- }
-#line 1208 "./lexer/smarty_internal_templateparser.y"
- function yy_r171(){
- $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
- }
-#line 1213 "./lexer/smarty_internal_templateparser.y"
- function yy_r172(){
- $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
- }
-#line 1218 "./lexer/smarty_internal_templateparser.y"
- function yy_r173(){
- $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor, 'property');
- }
-#line 1224 "./lexer/smarty_internal_templateparser.y"
- function yy_r174(){
- $this->_retvalue = ' '. trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
- }
-#line 1228 "./lexer/smarty_internal_templateparser.y"
- function yy_r175(){
- static $lops = array(
- 'eq' => ' == ',
- 'ne' => ' != ',
- 'neq' => ' != ',
- 'gt' => ' > ',
- 'ge' => ' >= ',
- 'gte' => ' >= ',
- 'lt' => ' < ',
- 'le' => ' <= ',
- 'lte' => ' <= ',
- 'mod' => ' % ',
- 'and' => ' && ',
- 'or' => ' || ',
- 'xor' => ' xor ',
- );
- $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
- $this->_retvalue = $lops[$op];
- }
-#line 1247 "./lexer/smarty_internal_templateparser.y"
- function yy_r176(){
- static $tlops = array(
- 'isdivby' => array('op' => ' % ', 'pre' => '!('),
- 'isnotdivby' => array('op' => ' % ', 'pre' => '('),
- 'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
- 'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
- 'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
- 'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
- );
- $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
- $this->_retvalue = $tlops[$op];
- }
-#line 1260 "./lexer/smarty_internal_templateparser.y"
- function yy_r177(){
- static $scond = array (
- 'iseven' => '!(1 & ',
- 'isnoteven' => '(1 & ',
- 'isodd' => '(1 & ',
- 'isnotodd' => '!(1 & ',
+
+ // line 999 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r139()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 1006 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r140()
+ {
+ if ($this->security && substr($this->yystack[ $this->yyidx + -1 ]->minor, 0, 1) === '_') {
+ $this->compiler->trigger_template_error(self::ERR1);
+ }
+ $this->_retvalue =
+ '->' . $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 1013 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r141()
+ {
+ if ($this->security) {
+ $this->compiler->trigger_template_error(self::ERR2);
+ }
+ $this->_retvalue =
+ '->{' .
+ $this->compiler->compileVariable($this->yystack[ $this->yyidx + -1 ]->minor) .
+ $this->yystack[ $this->yyidx + 0 ]->minor .
+ '}';
+ }
+
+ // line 1020 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r142()
+ {
+ if ($this->security) {
+ $this->compiler->trigger_template_error(self::ERR2);
+ }
+ $this->_retvalue =
+ '->{' . $this->yystack[ $this->yyidx + -2 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor . '}';
+ }
+
+ // line 1028 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r143()
+ {
+ if ($this->security) {
+ $this->compiler->trigger_template_error(self::ERR2);
+ }
+ $this->_retvalue =
+ '->{\'' .
+ $this->yystack[ $this->yyidx + -4 ]->minor .
+ '\'.' .
+ $this->yystack[ $this->yyidx + -2 ]->minor .
+ $this->yystack[ $this->yyidx + 0 ]->minor .
+ '}';
+ }
+
+ // line 1036 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r144()
+ {
+ $this->_retvalue = '->' . $this->yystack[ $this->yyidx + 0 ]->minor;
+ }
+
+ // line 1044 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r145()
+ {
+ $this->_retvalue =
+ $this->compiler->compilePHPFunctionCall($this->yystack[ $this->yyidx + -3 ]->minor,
+ $this->yystack[ $this->yyidx + -1 ]->minor);
+ }
+
+ // line 1051 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r146()
+ {
+ if ($this->security && substr($this->yystack[ $this->yyidx + -3 ]->minor, 0, 1) === '_') {
+ $this->compiler->trigger_template_error(self::ERR1);
+ }
+ $this->_retvalue =
+ $this->yystack[ $this->yyidx + -3 ]->minor .
+ '(' .
+ implode(',', $this->yystack[ $this->yyidx + -1 ]->minor) .
+ ')';
+ }
+
+ // line 1062 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r147()
+ {
+ if ($this->security) {
+ $this->compiler->trigger_template_error(self::ERR2);
+ }
+ $prefixVar = $this->compiler->getNewPrefixVariable();
+ $this->compiler->appendPrefixCode("<?php {$prefixVar} = " .
+ $this->compiler->compileVariable('\'' .
+ substr($this->yystack[ $this->yyidx +
+ -3 ]->minor, 1) .
+ '\'') .
+ ';?>');
+ $this->_retvalue = $prefixVar . '(' . implode(',', $this->yystack[ $this->yyidx + -1 ]->minor) . ')';
+ }
+
+ // line 1079 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r148()
+ {
+ $this->_retvalue =
+ array_merge($this->yystack[ $this->yyidx + -2 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor));
+ }
+
+ // line 1083 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r151()
+ {
+ $this->_retvalue =
+ array_merge($this->yystack[ $this->yyidx + -2 ]->minor, array(
+ array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor)
+ ));
+ }
+
+ // line 1091 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r152()
+ {
+ $this->_retvalue =
+ array(array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor));
+ }
+
+ // line 1099 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r154()
+ {
+ $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
+ }
+
+ // line 1118 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r155()
+ {
+ $this->_retvalue =
+ array_merge($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+ }
+
+ // line 1123 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r159()
+ {
+ $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '', 'method');
+ }
+
+ // line 1128 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r160()
+ {
+ $this->_retvalue =
+ array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'method');
+ }
+
+ // line 1133 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r161()
+ {
+ $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '');
+ }
+
+ // line 1138 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r162()
+ {
+ $this->_retvalue =
+ array($this->yystack[ $this->yyidx + -1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'property');
+ }
+
+ // line 1144 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r163()
+ {
+ $this->_retvalue =
+ array(
+ $this->yystack[ $this->yyidx + -2 ]->minor,
+ $this->yystack[ $this->yyidx + -1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor, 'property'
+ );
+ }
+
+ // line 1148 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r164()
+ {
+ $this->_retvalue = ' ' . trim($this->yystack[ $this->yyidx + 0 ]->minor) . ' ';
+ }
+
+ // line 1167 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r165()
+ {
+ static $lops = array(
+ 'eq' => ' == ',
+ 'ne' => ' != ',
+ 'neq' => ' != ',
+ 'gt' => ' > ',
+ 'ge' => ' >= ',
+ 'gte' => ' >= ',
+ 'lt' => ' < ',
+ 'le' => ' <= ',
+ 'lte' => ' <= ',
+ 'mod' => ' % ',
+ 'and' => ' && ',
+ 'or' => ' || ',
+ 'xor' => ' xor ',
);
- $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
- $this->_retvalue = $scond[$op];
+ $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor));
+ $this->_retvalue = $lops[ $op ];
}
-#line 1274 "./lexer/smarty_internal_templateparser.y"
- function yy_r178(){
- $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
+
+ // line 1180 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r166()
+ {
+ static $tlops = array(
+ 'isdivby' => array('op' => ' % ', 'pre' => '!('),
+ 'isnotdivby' => array('op' => ' % ', 'pre' => '('),
+ 'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
+ 'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+ 'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
+ 'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
+ );
+ $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor));
+ $this->_retvalue = $tlops[ $op ];
}
-#line 1282 "./lexer/smarty_internal_templateparser.y"
- function yy_r180(){
- $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
+
+ // line 1194 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r167()
+ {
+ static $scond = array(
+ 'iseven' => '!(1 & ',
+ 'isnoteven' => '(1 & ',
+ 'isodd' => '(1 & ',
+ 'isnotodd' => '!(1 & ',
+ );
+ $op = strtolower(str_replace(' ', '', $this->yystack[ $this->yyidx + 0 ]->minor));
+ $this->_retvalue = $scond[ $op ];
}
-#line 1290 "./lexer/smarty_internal_templateparser.y"
- function yy_r182(){
- $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
+
+ // line 1202 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r168()
+ {
+ $this->_retvalue = 'array(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')';
}
-#line 1294 "./lexer/smarty_internal_templateparser.y"
- function yy_r183(){
- $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
+
+ // line 1210 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r170()
+ {
+ $this->_retvalue = $this->yystack[ $this->yyidx + -2 ]->minor . ',' . $this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 1310 "./lexer/smarty_internal_templateparser.y"
- function yy_r186(){
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php($this);
+
+ // line 1214 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r172()
+ {
+ $this->_retvalue =
+ $this->yystack[ $this->yyidx + -2 ]->minor . '=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 1315 "./lexer/smarty_internal_templateparser.y"
- function yy_r187(){
- $this->yystack[$this->yyidx + -1]->minor->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
- $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+
+ // line 1230 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r173()
+ {
+ $this->_retvalue =
+ '\'' . $this->yystack[ $this->yyidx + -2 ]->minor . '\'=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
}
-#line 1320 "./lexer/smarty_internal_templateparser.y"
- function yy_r188(){
- $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[$this->yyidx + 0]->minor);
+
+ // line 1236 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r176()
+ {
+ $this->compiler->leaveDoubleQuote();
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor->to_smarty_php($this);
}
-#line 1324 "./lexer/smarty_internal_templateparser.y"
- function yy_r189(){
- $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)'.$this->yystack[$this->yyidx + -1]->minor);
+
+ // line 1241 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r177()
+ {
+ $this->yystack[ $this->yyidx + -1 ]->minor->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor);
+ $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+ }
+
+ // line 1245 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r178()
+ {
+ $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[ $this->yyidx + 0 ]->minor);
}
-#line 1332 "./lexer/smarty_internal_templateparser.y"
- function yy_r191(){
- $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
+
+ // line 1249 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r179()
+ {
+ $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[ $this->yyidx + -1 ]->minor);
}
-#line 1340 "./lexer/smarty_internal_templateparser.y"
- function yy_r193(){
- $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)('.$this->yystack[$this->yyidx + -1]->minor.')');
+
+ // line 1253 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r180()
+ {
+ $this->_retvalue =
+ new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')');
}
-#line 1344 "./lexer/smarty_internal_templateparser.y"
- function yy_r194(){
- $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + 0]->minor);
+
+ // line 1265 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r181()
+ {
+ $this->_retvalue =
+ new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' .
+ substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) .
+ '\']->value');
}
-#line 1348 "./lexer/smarty_internal_templateparser.y"
- function yy_r195(){
- $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[$this->yyidx + 0]->minor);
+
+ // line 1269 "../smarty/lexer/smarty_internal_templateparser.y"
+ public function yy_r184()
+ {
+ $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[ $this->yyidx + 0 ]->minor);
}
- private $_retvalue;
+ public function yy_r185()
+ {
+ $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[ $this->yyidx + 0 ]->minor);
+ }
public function yy_reduce($yyruleno)
{
if ($this->yyTraceFILE && $yyruleno >= 0
- && $yyruleno < count(self::$yyRuleName)) {
- fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
- $this->yyTracePrompt, $yyruleno,
- self::$yyRuleName[$yyruleno]);
+ && $yyruleno < count(self::$yyRuleName)) {
+ fprintf(
+ $this->yyTraceFILE,
+ "%sReduce (%d) [%s].\n",
+ $this->yyTracePrompt,
+ $yyruleno,
+ self::$yyRuleName[ $yyruleno ]
+ );
}
-
$this->_retvalue = $yy_lefthand_side = null;
- if (isset(self::$yyReduceMap[$yyruleno])) {
+ if (isset(self::$yyReduceMap[ $yyruleno ])) {
// call the action
$this->_retvalue = null;
- $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+ $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
$yy_lefthand_side = $this->_retvalue;
}
- $yygoto = self::$yyRuleInfo[$yyruleno][0];
- $yysize = self::$yyRuleInfo[$yyruleno][1];
+ $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+ $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
$this->yyidx -= $yysize;
for ($i = $yysize; $i; $i--) {
// pop all of the right-hand side parameters
array_pop($this->yystack);
}
- $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+ $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
if ($yyact < self::YYNSTATE) {
if (!$this->yyTraceFILE && $yysize) {
$this->yyidx++;
@@ -2937,11 +3398,11 @@ static public $yy_action = array(
$x->stateno = $yyact;
$x->major = $yygoto;
$x->minor = $yy_lefthand_side;
- $this->yystack[$this->yyidx] = $x;
+ $this->yystack[ $this->yyidx ] = $x;
} else {
$this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
}
- } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
+ } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
$this->yy_accept();
}
}
@@ -2950,38 +3411,37 @@ static public $yy_action = array(
{
if ($this->yyTraceFILE) {
fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
- } while ($this->yyidx >= 0) {
+ }
+ while ($this->yyidx >= 0) {
$this->yy_pop_parser_stack();
}
}
public function yy_syntax_error($yymajor, $TOKEN)
{
-#line 200 "./lexer/smarty_internal_templateparser.y"
-
- $this->internalError = true;
- $this->yymajor = $yymajor;
- $this->compiler->trigger_template_error();
+ // line 214 "../smarty/lexer/smarty_internal_templateparser.y"
+ $this->internalError = true;
+ $this->yymajor = $yymajor;
+ $this->compiler->trigger_template_error();
}
public function yy_accept()
{
if ($this->yyTraceFILE) {
fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
- } while ($this->yyidx >= 0) {
+ }
+ while ($this->yyidx >= 0) {
$this->yy_pop_parser_stack();
}
-#line 193 "./lexer/smarty_internal_templateparser.y"
-
- $this->successful = !$this->internalError;
- $this->internalError = false;
- $this->retvalue = $this->_retvalue;
+ // line 207 "../smarty/lexer/smarty_internal_templateparser.y"
+ $this->successful = !$this->internalError;
+ $this->internalError = false;
+ $this->retvalue = $this->_retvalue;
}
public function doParse($yymajor, $yytokenvalue)
{
$yyerrorhit = 0; /* True if yymajor has invoked an error */
-
if ($this->yyidx === null || $this->yyidx < 0) {
$this->yyidx = 0;
$this->yyerrcnt = -1;
@@ -2991,17 +3451,19 @@ static public $yy_action = array(
$this->yystack = array();
$this->yystack[] = $x;
}
- $yyendofinput = ($yymajor==0);
-
+ $yyendofinput = ($yymajor == 0);
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sInput %s\n",
- $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+ fprintf(
+ $this->yyTraceFILE,
+ "%sInput %s\n",
+ $this->yyTracePrompt,
+ $this->yyTokenName[ $yymajor ]
+ );
}
-
do {
$yyact = $this->yy_find_shift_action($yymajor);
if ($yymajor < self::YYERRORSYMBOL &&
- !$this->yy_is_expected_token($yymajor)) {
+ !$this->yy_is_expected_token($yymajor)) {
// force a syntax error
$yyact = self::YY_ERROR_ACTION;
}
@@ -3015,35 +3477,42 @@ static public $yy_action = array(
}
} elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
$this->yy_reduce($yyact - self::YYNSTATE);
- } elseif ($yyact == self::YY_ERROR_ACTION) {
+ } elseif ($yyact === self::YY_ERROR_ACTION) {
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
- $this->yyTracePrompt);
+ fprintf(
+ $this->yyTraceFILE,
+ "%sSyntax Error!\n",
+ $this->yyTracePrompt
+ );
}
if (self::YYERRORSYMBOL) {
if ($this->yyerrcnt < 0) {
$this->yy_syntax_error($yymajor, $yytokenvalue);
}
- $yymx = $this->yystack[$this->yyidx]->major;
- if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
+ $yymx = $this->yystack[ $this->yyidx ]->major;
+ if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
if ($this->yyTraceFILE) {
- fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
- $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+ fprintf(
+ $this->yyTraceFILE,
+ "%sDiscard input token %s\n",
+ $this->yyTracePrompt,
+ $this->yyTokenName[ $yymajor ]
+ );
}
$this->yy_destructor($yymajor, $yytokenvalue);
$yymajor = self::YYNOCODE;
} else {
while ($this->yyidx >= 0 &&
- $yymx != self::YYERRORSYMBOL &&
- ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
- ){
+ $yymx !== self::YYERRORSYMBOL &&
+ ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+ ) {
$this->yy_pop_parser_stack();
}
- if ($this->yyidx < 0 || $yymajor==0) {
+ if ($this->yyidx < 0 || $yymajor == 0) {
$this->yy_destructor($yymajor, $yytokenvalue);
$this->yy_parse_failed();
$yymajor = self::YYNOCODE;
- } elseif ($yymx != self::YYERRORSYMBOL) {
+ } elseif ($yymx !== self::YYERRORSYMBOL) {
$u2 = 0;
$this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
}
@@ -3065,7 +3534,6 @@ static public $yy_action = array(
$this->yy_accept();
$yymajor = self::YYNOCODE;
}
- } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
+ } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
}
}
-
diff --git a/lib/smarty3/sysplugins/smarty_internal_testinstall.php b/lib/smarty3/sysplugins/smarty_internal_testinstall.php
index ca2b954..504a458 100644
--- a/lib/smarty3/sysplugins/smarty_internal_testinstall.php
+++ b/lib/smarty3/sysplugins/smarty_internal_testinstall.php
@@ -21,22 +21,19 @@ class Smarty_Internal_TestInstall
* If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
*
* @param \Smarty $smarty
- * @param array $errors array to push results into rather than outputting them
+ * @param array $errors array to push results into rather than outputting them
*
* @return bool status, true if everything is fine, false else
*/
public static function testInstall(Smarty $smarty, &$errors = null)
{
$status = true;
-
if ($errors === null) {
echo "<PRE>\n";
echo "Smarty Installation test...\n";
echo "Testing template directory...\n";
}
-
$_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
// test if all registered template_dir are accessible
foreach ($smarty->getTemplateDir() as $template_dir) {
$_template_dir = $template_dir;
@@ -50,12 +47,10 @@ class Smarty_Internal_TestInstall
} else {
$template_dir = $smarty->ext->_getIncludePath->getIncludePath($_template_dir, null, $smarty);
}
-
if ($template_dir !== false) {
if ($errors === null) {
echo "$template_dir is OK.\n";
}
-
continue;
} else {
$status = false;
@@ -66,7 +61,6 @@ class Smarty_Internal_TestInstall
} else {
$errors[ 'template_dir' ] = $message;
}
-
continue;
}
} else {
@@ -77,11 +71,9 @@ class Smarty_Internal_TestInstall
} else {
$errors[ 'template_dir' ] = $message;
}
-
continue;
}
}
-
if (!is_dir($template_dir)) {
$status = false;
$message = "FAILED: $template_dir is not a directory";
@@ -104,11 +96,9 @@ class Smarty_Internal_TestInstall
}
}
}
-
if ($errors === null) {
echo "Testing compile directory...\n";
}
-
// test if registered compile_dir is accessible
$__compile_dir = $smarty->getCompileDir();
$_compile_dir = realpath($__compile_dir);
@@ -149,11 +139,9 @@ class Smarty_Internal_TestInstall
echo "{$_compile_dir} is OK.\n";
}
}
-
if ($errors === null) {
echo "Testing plugins directory...\n";
}
-
// test if all registered plugins_dir are accessible
// and if core plugins directory is still registered
$_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
@@ -170,12 +158,10 @@ class Smarty_Internal_TestInstall
} else {
$plugin_dir = $smarty->ext->_getIncludePath->getIncludePath($_plugin_dir, null, $smarty);
}
-
if ($plugin_dir !== false) {
if ($errors === null) {
echo "$plugin_dir is OK.\n";
}
-
continue;
} else {
$status = false;
@@ -185,7 +171,6 @@ class Smarty_Internal_TestInstall
} else {
$errors[ 'plugins_dir' ] = $message;
}
-
continue;
}
} else {
@@ -196,11 +181,9 @@ class Smarty_Internal_TestInstall
} else {
$errors[ 'plugins_dir' ] = $message;
}
-
continue;
}
}
-
if (!is_dir($plugin_dir)) {
$status = false;
$message = "FAILED: $plugin_dir is not a directory";
@@ -237,11 +220,9 @@ class Smarty_Internal_TestInstall
$errors[ 'plugins_dir' ] = $message;
}
}
-
if ($errors === null) {
echo "Testing cache directory...\n";
}
-
// test if all registered cache_dir is accessible
$__cache_dir = $smarty->getCacheDir();
$_cache_dir = realpath($__cache_dir);
@@ -282,11 +263,9 @@ class Smarty_Internal_TestInstall
echo "{$_cache_dir} is OK.\n";
}
}
-
if ($errors === null) {
echo "Testing configs directory...\n";
}
-
// test if all registered config_dir are accessible
foreach ($smarty->getConfigDir() as $config_dir) {
$_config_dir = $config_dir;
@@ -299,12 +278,10 @@ class Smarty_Internal_TestInstall
} else {
$config_dir = $smarty->ext->_getIncludePath->getIncludePath($_config_dir, null, $smarty);
}
-
if ($config_dir !== false) {
if ($errors === null) {
echo "$config_dir is OK.\n";
}
-
continue;
} else {
$status = false;
@@ -314,7 +291,6 @@ class Smarty_Internal_TestInstall
} else {
$errors[ 'config_dir' ] = $message;
}
-
continue;
}
} else {
@@ -325,11 +301,9 @@ class Smarty_Internal_TestInstall
} else {
$errors[ 'config_dir' ] = $message;
}
-
continue;
}
}
-
if (!is_dir($config_dir)) {
$status = false;
$message = "FAILED: $config_dir is not a directory";
@@ -352,150 +326,167 @@ class Smarty_Internal_TestInstall
}
}
}
-
if ($errors === null) {
echo "Testing sysplugin files...\n";
}
// test if sysplugins are available
$source = SMARTY_SYSPLUGINS_DIR;
if (is_dir($source)) {
- $expectedSysplugins = array('smartycompilerexception.php' => true, 'smartyexception.php' => true,
- 'smarty_cacheresource.php' => true, 'smarty_cacheresource_custom.php' => true,
- 'smarty_cacheresource_keyvaluestore.php' => true, 'smarty_data.php' => true,
- 'smarty_internal_block.php' => true,
- 'smarty_internal_cacheresource_file.php' => true,
- 'smarty_internal_compilebase.php' => true,
- 'smarty_internal_compile_append.php' => true,
- 'smarty_internal_compile_assign.php' => true,
- 'smarty_internal_compile_block.php' => true,
- 'smarty_internal_compile_break.php' => true,
- 'smarty_internal_compile_call.php' => true,
- 'smarty_internal_compile_capture.php' => true,
- 'smarty_internal_compile_config_load.php' => true,
- 'smarty_internal_compile_continue.php' => true,
- 'smarty_internal_compile_debug.php' => true,
- 'smarty_internal_compile_eval.php' => true,
- 'smarty_internal_compile_extends.php' => true,
- 'smarty_internal_compile_for.php' => true,
- 'smarty_internal_compile_foreach.php' => true,
- 'smarty_internal_compile_function.php' => true,
- 'smarty_internal_compile_if.php' => true,
- 'smarty_internal_compile_include.php' => true,
- 'smarty_internal_compile_include_php.php' => true,
- 'smarty_internal_compile_insert.php' => true,
- 'smarty_internal_compile_ldelim.php' => true,
- 'smarty_internal_compile_make_nocache.php' => true,
- 'smarty_internal_compile_nocache.php' => true,
- 'smarty_internal_compile_private_block_plugin.php' => true,
- 'smarty_internal_compile_private_foreachsection.php' => true,
- 'smarty_internal_compile_private_function_plugin.php' => true,
- 'smarty_internal_compile_private_modifier.php' => true,
- 'smarty_internal_compile_private_object_block_function.php' => true,
- 'smarty_internal_compile_private_object_function.php' => true,
- 'smarty_internal_compile_private_php.php' => true,
- 'smarty_internal_compile_private_print_expression.php' => true,
- 'smarty_internal_compile_private_registered_block.php' => true,
- 'smarty_internal_compile_private_registered_function.php' => true,
- 'smarty_internal_compile_private_special_variable.php' => true,
- 'smarty_internal_compile_rdelim.php' => true,
- 'smarty_internal_compile_section.php' => true,
- 'smarty_internal_compile_setfilter.php' => true,
- 'smarty_internal_compile_shared_inheritance.php' => true,
- 'smarty_internal_compile_while.php' => true,
- 'smarty_internal_configfilelexer.php' => true,
- 'smarty_internal_configfileparser.php' => true,
- 'smarty_internal_config_file_compiler.php' => true,
- 'smarty_internal_data.php' => true, 'smarty_internal_debug.php' => true,
- 'smarty_internal_extension_clear.php' => true,
- 'smarty_internal_extension_handler.php' => true,
- 'smarty_internal_method_addautoloadfilters.php' => true,
- 'smarty_internal_method_adddefaultmodifiers.php' => true,
- 'smarty_internal_method_append.php' => true,
- 'smarty_internal_method_appendbyref.php' => true,
- 'smarty_internal_method_assignbyref.php' => true,
- 'smarty_internal_method_assignglobal.php' => true,
- 'smarty_internal_method_clearallassign.php' => true,
- 'smarty_internal_method_clearallcache.php' => true,
- 'smarty_internal_method_clearassign.php' => true,
- 'smarty_internal_method_clearcache.php' => true,
- 'smarty_internal_method_clearcompiledtemplate.php' => true,
- 'smarty_internal_method_clearconfig.php' => true,
- 'smarty_internal_method_compileallconfig.php' => true,
- 'smarty_internal_method_compilealltemplates.php' => true,
- 'smarty_internal_method_configload.php' => true,
- 'smarty_internal_method_createdata.php' => true,
- 'smarty_internal_method_getautoloadfilters.php' => true,
- 'smarty_internal_method_getconfigvars.php' => true,
- 'smarty_internal_method_getdebugtemplate.php' => true,
- 'smarty_internal_method_getdefaultmodifiers.php' => true,
- 'smarty_internal_method_getglobal.php' => true,
- 'smarty_internal_method_getregisteredobject.php' => true,
- 'smarty_internal_method_getstreamvariable.php' => true,
- 'smarty_internal_method_gettags.php' => true,
- 'smarty_internal_method_gettemplatevars.php' => true,
- 'smarty_internal_method_loadfilter.php' => true,
- 'smarty_internal_method_loadplugin.php' => true,
- 'smarty_internal_method_mustcompile.php' => true,
- 'smarty_internal_method_registercacheresource.php' => true,
- 'smarty_internal_method_registerclass.php' => true,
- 'smarty_internal_method_registerdefaultconfighandler.php' => true,
- 'smarty_internal_method_registerdefaultpluginhandler.php' => true,
- 'smarty_internal_method_registerdefaulttemplatehandler.php' => true,
- 'smarty_internal_method_registerfilter.php' => true,
- 'smarty_internal_method_registerobject.php' => true,
- 'smarty_internal_method_registerplugin.php' => true,
- 'smarty_internal_method_registerresource.php' => true,
- 'smarty_internal_method_setautoloadfilters.php' => true,
- 'smarty_internal_method_setdebugtemplate.php' => true,
- 'smarty_internal_method_setdefaultmodifiers.php' => true,
- 'smarty_internal_method_unloadfilter.php' => true,
- 'smarty_internal_method_unregistercacheresource.php' => true,
- 'smarty_internal_method_unregisterfilter.php' => true,
- 'smarty_internal_method_unregisterobject.php' => true,
- 'smarty_internal_method_unregisterplugin.php' => true,
- 'smarty_internal_method_unregisterresource.php' => true,
- 'smarty_internal_nocache_insert.php' => true,
- 'smarty_internal_parsetree.php' => true,
- 'smarty_internal_parsetree_code.php' => true,
- 'smarty_internal_parsetree_dq.php' => true,
- 'smarty_internal_parsetree_dqcontent.php' => true,
- 'smarty_internal_parsetree_tag.php' => true,
- 'smarty_internal_parsetree_template.php' => true,
- 'smarty_internal_parsetree_text.php' => true,
- 'smarty_internal_resource_eval.php' => true,
- 'smarty_internal_resource_extends.php' => true,
- 'smarty_internal_resource_file.php' => true,
- 'smarty_internal_resource_php.php' => true,
- 'smarty_internal_resource_registered.php' => true,
- 'smarty_internal_resource_stream.php' => true,
- 'smarty_internal_resource_string.php' => true,
- 'smarty_internal_runtime_cachemodify.php' => true,
- 'smarty_internal_runtime_capture.php' => true,
- 'smarty_internal_runtime_codeframe.php' => true,
- 'smarty_internal_runtime_filterhandler.php' => true,
- 'smarty_internal_runtime_foreach.php' => true,
- 'smarty_internal_runtime_getincludepath.php' => true,
- 'smarty_internal_runtime_inheritance.php' => true,
- 'smarty_internal_runtime_make_nocache.php' => true,
- 'smarty_internal_runtime_tplfunction.php' => true,
- 'smarty_internal_runtime_updatecache.php' => true,
- 'smarty_internal_runtime_updatescope.php' => true,
- 'smarty_internal_runtime_writefile.php' => true,
- 'smarty_internal_smartytemplatecompiler.php' => true,
- 'smarty_internal_template.php' => true,
- 'smarty_internal_templatebase.php' => true,
- 'smarty_internal_templatecompilerbase.php' => true,
- 'smarty_internal_templatelexer.php' => true,
- 'smarty_internal_templateparser.php' => true,
- 'smarty_internal_testinstall.php' => true,
- 'smarty_internal_undefined.php' => true, 'smarty_resource.php' => true,
- 'smarty_resource_custom.php' => true, 'smarty_resource_recompiled.php' => true,
- 'smarty_resource_uncompiled.php' => true, 'smarty_security.php' => true,
- 'smarty_template_cached.php' => true, 'smarty_template_compiled.php' => true,
- 'smarty_template_config.php' => true,
- 'smarty_template_resource_base.php' => true,
- 'smarty_template_source.php' => true, 'smarty_undefined_variable.php' => true,
- 'smarty_variable.php' => true,);
+ $expectedSysplugins = array(
+ 'smartycompilerexception.php' => true,
+ 'smartyexception.php' => true,
+ 'smarty_cacheresource.php' => true,
+ 'smarty_cacheresource_custom.php' => true,
+ 'smarty_cacheresource_keyvaluestore.php' => true,
+ 'smarty_data.php' => true,
+ 'smarty_internal_block.php' => true,
+ 'smarty_internal_cacheresource_file.php' => true,
+ 'smarty_internal_compilebase.php' => true,
+ 'smarty_internal_compile_append.php' => true,
+ 'smarty_internal_compile_assign.php' => true,
+ 'smarty_internal_compile_block.php' => true,
+ 'smarty_internal_compile_block_child.php' => true,
+ 'smarty_internal_compile_block_parent.php' => true,
+ 'smarty_internal_compile_child.php' => true,
+ 'smarty_internal_compile_parent.php' => true,
+ 'smarty_internal_compile_break.php' => true,
+ 'smarty_internal_compile_call.php' => true,
+ 'smarty_internal_compile_capture.php' => true,
+ 'smarty_internal_compile_config_load.php' => true,
+ 'smarty_internal_compile_continue.php' => true,
+ 'smarty_internal_compile_debug.php' => true,
+ 'smarty_internal_compile_eval.php' => true,
+ 'smarty_internal_compile_extends.php' => true,
+ 'smarty_internal_compile_for.php' => true,
+ 'smarty_internal_compile_foreach.php' => true,
+ 'smarty_internal_compile_function.php' => true,
+ 'smarty_internal_compile_if.php' => true,
+ 'smarty_internal_compile_include.php' => true,
+ 'smarty_internal_compile_include_php.php' => true,
+ 'smarty_internal_compile_insert.php' => true,
+ 'smarty_internal_compile_ldelim.php' => true,
+ 'smarty_internal_compile_make_nocache.php' => true,
+ 'smarty_internal_compile_nocache.php' => true,
+ 'smarty_internal_compile_private_block_plugin.php' => true,
+ 'smarty_internal_compile_private_foreachsection.php' => true,
+ 'smarty_internal_compile_private_function_plugin.php' => true,
+ 'smarty_internal_compile_private_modifier.php' => true,
+ 'smarty_internal_compile_private_object_block_function.php' => true,
+ 'smarty_internal_compile_private_object_function.php' => true,
+ 'smarty_internal_compile_private_php.php' => true,
+ 'smarty_internal_compile_private_print_expression.php' => true,
+ 'smarty_internal_compile_private_registered_block.php' => true,
+ 'smarty_internal_compile_private_registered_function.php' => true,
+ 'smarty_internal_compile_private_special_variable.php' => true,
+ 'smarty_internal_compile_rdelim.php' => true,
+ 'smarty_internal_compile_section.php' => true,
+ 'smarty_internal_compile_setfilter.php' => true,
+ 'smarty_internal_compile_shared_inheritance.php' => true,
+ 'smarty_internal_compile_while.php' => true,
+ 'smarty_internal_configfilelexer.php' => true,
+ 'smarty_internal_configfileparser.php' => true,
+ 'smarty_internal_config_file_compiler.php' => true,
+ 'smarty_internal_data.php' => true,
+ 'smarty_internal_debug.php' => true,
+ 'smarty_internal_errorhandler.php' => true,
+ 'smarty_internal_extension_handler.php' => true,
+ 'smarty_internal_method_addautoloadfilters.php' => true,
+ 'smarty_internal_method_adddefaultmodifiers.php' => true,
+ 'smarty_internal_method_append.php' => true,
+ 'smarty_internal_method_appendbyref.php' => true,
+ 'smarty_internal_method_assignbyref.php' => true,
+ 'smarty_internal_method_assignglobal.php' => true,
+ 'smarty_internal_method_clearallassign.php' => true,
+ 'smarty_internal_method_clearallcache.php' => true,
+ 'smarty_internal_method_clearassign.php' => true,
+ 'smarty_internal_method_clearcache.php' => true,
+ 'smarty_internal_method_clearcompiledtemplate.php' => true,
+ 'smarty_internal_method_clearconfig.php' => true,
+ 'smarty_internal_method_compileallconfig.php' => true,
+ 'smarty_internal_method_compilealltemplates.php' => true,
+ 'smarty_internal_method_configload.php' => true,
+ 'smarty_internal_method_createdata.php' => true,
+ 'smarty_internal_method_getautoloadfilters.php' => true,
+ 'smarty_internal_method_getconfigvariable.php' => true,
+ 'smarty_internal_method_getconfigvars.php' => true,
+ 'smarty_internal_method_getdebugtemplate.php' => true,
+ 'smarty_internal_method_getdefaultmodifiers.php' => true,
+ 'smarty_internal_method_getglobal.php' => true,
+ 'smarty_internal_method_getregisteredobject.php' => true,
+ 'smarty_internal_method_getstreamvariable.php' => true,
+ 'smarty_internal_method_gettags.php' => true,
+ 'smarty_internal_method_gettemplatevars.php' => true,
+ 'smarty_internal_method_literals.php' => true,
+ 'smarty_internal_method_loadfilter.php' => true,
+ 'smarty_internal_method_loadplugin.php' => true,
+ 'smarty_internal_method_mustcompile.php' => true,
+ 'smarty_internal_method_registercacheresource.php' => true,
+ 'smarty_internal_method_registerclass.php' => true,
+ 'smarty_internal_method_registerdefaultconfighandler.php' => true,
+ 'smarty_internal_method_registerdefaultpluginhandler.php' => true,
+ 'smarty_internal_method_registerdefaulttemplatehandler.php' => true,
+ 'smarty_internal_method_registerfilter.php' => true,
+ 'smarty_internal_method_registerobject.php' => true,
+ 'smarty_internal_method_registerplugin.php' => true,
+ 'smarty_internal_method_registerresource.php' => true,
+ 'smarty_internal_method_setautoloadfilters.php' => true,
+ 'smarty_internal_method_setdebugtemplate.php' => true,
+ 'smarty_internal_method_setdefaultmodifiers.php' => true,
+ 'smarty_internal_method_unloadfilter.php' => true,
+ 'smarty_internal_method_unregistercacheresource.php' => true,
+ 'smarty_internal_method_unregisterfilter.php' => true,
+ 'smarty_internal_method_unregisterobject.php' => true,
+ 'smarty_internal_method_unregisterplugin.php' => true,
+ 'smarty_internal_method_unregisterresource.php' => true,
+ 'smarty_internal_nocache_insert.php' => true,
+ 'smarty_internal_parsetree.php' => true,
+ 'smarty_internal_parsetree_code.php' => true,
+ 'smarty_internal_parsetree_dq.php' => true,
+ 'smarty_internal_parsetree_dqcontent.php' => true,
+ 'smarty_internal_parsetree_tag.php' => true,
+ 'smarty_internal_parsetree_template.php' => true,
+ 'smarty_internal_parsetree_text.php' => true,
+ 'smarty_internal_resource_eval.php' => true,
+ 'smarty_internal_resource_extends.php' => true,
+ 'smarty_internal_resource_file.php' => true,
+ 'smarty_internal_resource_php.php' => true,
+ 'smarty_internal_resource_registered.php' => true,
+ 'smarty_internal_resource_stream.php' => true,
+ 'smarty_internal_resource_string.php' => true,
+ 'smarty_internal_runtime_cachemodify.php' => true,
+ 'smarty_internal_runtime_cacheresourcefile.php' => true,
+ 'smarty_internal_runtime_capture.php' => true,
+ 'smarty_internal_runtime_codeframe.php' => true,
+ 'smarty_internal_runtime_filterhandler.php' => true,
+ 'smarty_internal_runtime_foreach.php' => true,
+ 'smarty_internal_runtime_getincludepath.php' => true,
+ 'smarty_internal_runtime_inheritance.php' => true,
+ 'smarty_internal_runtime_make_nocache.php' => true,
+ 'smarty_internal_runtime_tplfunction.php' => true,
+ 'smarty_internal_runtime_updatecache.php' => true,
+ 'smarty_internal_runtime_updatescope.php' => true,
+ 'smarty_internal_runtime_writefile.php' => true,
+ 'smarty_internal_smartytemplatecompiler.php' => true,
+ 'smarty_internal_template.php' => true,
+ 'smarty_internal_templatebase.php' => true,
+ 'smarty_internal_templatecompilerbase.php' => true,
+ 'smarty_internal_templatelexer.php' => true,
+ 'smarty_internal_templateparser.php' => true,
+ 'smarty_internal_testinstall.php' => true,
+ 'smarty_internal_undefined.php' => true,
+ 'smarty_resource.php' => true,
+ 'smarty_resource_custom.php' => true,
+ 'smarty_resource_recompiled.php' => true,
+ 'smarty_resource_uncompiled.php' => true,
+ 'smarty_security.php' => true,
+ 'smarty_template_cached.php' => true,
+ 'smarty_template_compiled.php' => true,
+ 'smarty_template_config.php' => true,
+ 'smarty_template_resource_base.php' => true,
+ 'smarty_template_source.php' => true,
+ 'smarty_undefined_variable.php' => true,
+ 'smarty_variable.php' => true,
+ );
$iterator = new DirectoryIterator($source);
foreach ($iterator as $file) {
if (!$file->isDot()) {
@@ -525,36 +516,61 @@ class Smarty_Internal_TestInstall
$errors[ 'sysplugins_dir_constant' ] = $message;
}
}
-
if ($errors === null) {
echo "Testing plugin files...\n";
}
// test if core plugins are available
$source = SMARTY_PLUGINS_DIR;
if (is_dir($source)) {
- $expectedPlugins =
- array('block.textformat.php' => true, 'function.counter.php' => true, 'function.cycle.php' => true,
- 'function.fetch.php' => true, 'function.html_checkboxes.php' => true,
- 'function.html_image.php' => true, 'function.html_options.php' => true,
- 'function.html_radios.php' => true, 'function.html_select_date.php' => true,
- 'function.html_select_time.php' => true, 'function.html_table.php' => true,
- 'function.mailto.php' => true, 'function.math.php' => true, 'modifier.capitalize.php' => true,
- 'modifier.date_format.php' => true, 'modifier.debug_print_var.php' => true,
- 'modifier.escape.php' => true, 'modifier.regex_replace.php' => true,
- 'modifier.replace.php' => true, 'modifier.spacify.php' => true, 'modifier.truncate.php' => true,
- 'modifiercompiler.cat.php' => true, 'modifiercompiler.count_characters.php' => true,
- 'modifiercompiler.count_paragraphs.php' => true, 'modifiercompiler.count_sentences.php' => true,
- 'modifiercompiler.count_words.php' => true, 'modifiercompiler.default.php' => true,
- 'modifiercompiler.escape.php' => true, 'modifiercompiler.from_charset.php' => true,
- 'modifiercompiler.indent.php' => true, 'modifiercompiler.lower.php' => true,
- 'modifiercompiler.noprint.php' => true, 'modifiercompiler.string_format.php' => true,
- 'modifiercompiler.strip.php' => true, 'modifiercompiler.strip_tags.php' => true,
- 'modifiercompiler.to_charset.php' => true, 'modifiercompiler.unescape.php' => true,
- 'modifiercompiler.upper.php' => true, 'modifiercompiler.wordwrap.php' => true,
- 'outputfilter.trimwhitespace.php' => true, 'shared.escape_special_chars.php' => true,
- 'shared.literal_compiler_param.php' => true, 'shared.make_timestamp.php' => true,
- 'shared.mb_str_replace.php' => true, 'shared.mb_unicode.php' => true,
- 'shared.mb_wordwrap.php' => true, 'variablefilter.htmlspecialchars.php' => true,);
+ $expectedPlugins = array(
+ 'block.textformat.php' => true,
+ 'function.counter.php' => true,
+ 'function.cycle.php' => true,
+ 'function.fetch.php' => true,
+ 'function.html_checkboxes.php' => true,
+ 'function.html_image.php' => true,
+ 'function.html_options.php' => true,
+ 'function.html_radios.php' => true,
+ 'function.html_select_date.php' => true,
+ 'function.html_select_time.php' => true,
+ 'function.html_table.php' => true,
+ 'function.mailto.php' => true,
+ 'function.math.php' => true,
+ 'modifier.capitalize.php' => true,
+ 'modifier.date_format.php' => true,
+ 'modifier.debug_print_var.php' => true,
+ 'modifier.escape.php' => true,
+ 'modifier.mb_wordwrap.php' => true,
+ 'modifier.regex_replace.php' => true,
+ 'modifier.replace.php' => true,
+ 'modifier.spacify.php' => true,
+ 'modifier.truncate.php' => true,
+ 'modifiercompiler.cat.php' => true,
+ 'modifiercompiler.count_characters.php' => true,
+ 'modifiercompiler.count_paragraphs.php' => true,
+ 'modifiercompiler.count_sentences.php' => true,
+ 'modifiercompiler.count_words.php' => true,
+ 'modifiercompiler.default.php' => true,
+ 'modifiercompiler.escape.php' => true,
+ 'modifiercompiler.from_charset.php' => true,
+ 'modifiercompiler.indent.php' => true,
+ 'modifiercompiler.lower.php' => true,
+ 'modifiercompiler.noprint.php' => true,
+ 'modifiercompiler.string_format.php' => true,
+ 'modifiercompiler.strip.php' => true,
+ 'modifiercompiler.strip_tags.php' => true,
+ 'modifiercompiler.to_charset.php' => true,
+ 'modifiercompiler.unescape.php' => true,
+ 'modifiercompiler.upper.php' => true,
+ 'modifiercompiler.wordwrap.php' => true,
+ 'outputfilter.trimwhitespace.php' => true,
+ 'shared.escape_special_chars.php' => true,
+ 'shared.literal_compiler_param.php' => true,
+ 'shared.make_timestamp.php' => true,
+ 'shared.mb_str_replace.php' => true,
+ 'shared.mb_unicode.php' => true,
+ 'variablefilter.htmlspecialchars.php' => true,
+ );
$iterator = new DirectoryIterator($source);
foreach ($iterator as $file) {
if (!$file->isDot()) {
@@ -584,12 +600,10 @@ class Smarty_Internal_TestInstall
$errors[ 'plugins_dir_constant' ] = $message;
}
}
-
if ($errors === null) {
echo "Tests complete.\n";
echo "</PRE>\n";
}
-
return $status;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_internal_undefined.php b/lib/smarty3/sysplugins/smarty_internal_undefined.php
index 23563e0..7df0acc 100644
--- a/lib/smarty3/sysplugins/smarty_internal_undefined.php
+++ b/lib/smarty3/sysplugins/smarty_internal_undefined.php
@@ -1,9 +1,9 @@
<?php
/**
- * Smarty Method AppendByRef
+ * Smarty Internal Undefined
*
- * Smarty::appendByRef() method
+ * Class to handle undefined method calls or calls to obsolete runtime extensions
*
* @package Smarty
* @subpackage PluginsInternal
@@ -11,17 +11,31 @@
*/
class Smarty_Internal_Undefined
{
+ /**
+ * Name of undefined extension class
+ *
+ * @var string|null
+ */
+ public $class = null;
/**
- * This function is executed automatically when a compiled or cached template file is included
- * - Decode saved properties from compiled template and cache files
- * - Check if compiled or cache file is valid
+ * Smarty_Internal_Undefined constructor.
*
- * @param \Smarty_Internal_Template $tpl
- * @param array $properties special template properties
- * @param bool $cache flag if called from cache file
+ * @param null|string $class name of undefined extension class
+ */
+ public function __construct($class = null)
+ {
+ $this->class = $class;
+ }
+
+ /**
+ * Wrapper for obsolete class Smarty_Internal_Runtime_ValidateCompiled
+ *
+ * @param \Smarty_Internal_Template $tpl
+ * @param array $properties special template properties
+ * @param bool $cache flag if called from cache file
*
- * @return bool flag if compiled or cache file is valid
+ * @return bool false
*/
public function decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
{
@@ -44,6 +58,10 @@ class Smarty_Internal_Undefined
*/
public function __call($name, $args)
{
- throw new SmartyException(get_class($args[ 0 ]) . "->{$name}() undefined method");
+ if (isset($this->class)) {
+ throw new SmartyException("undefined extension class '{$this->class}'");
+ } else {
+ throw new SmartyException(get_class($args[ 0 ]) . "->{$name}() undefined method");
+ }
}
-} \ No newline at end of file
+}
diff --git a/lib/smarty3/sysplugins/smarty_resource.php b/lib/smarty3/sysplugins/smarty_resource.php
index 0c9ba75..aae7e42 100644
--- a/lib/smarty3/sysplugins/smarty_resource.php
+++ b/lib/smarty3/sysplugins/smarty_resource.php
@@ -21,6 +21,20 @@
abstract class Smarty_Resource
{
/**
+ * resource types provided by the core
+ *
+ * @var array
+ */
+ public static $sysplugins = array(
+ 'file' => 'smarty_internal_resource_file.php',
+ 'string' => 'smarty_internal_resource_string.php',
+ 'extends' => 'smarty_internal_resource_extends.php',
+ 'stream' => 'smarty_internal_resource_stream.php',
+ 'eval' => 'smarty_internal_resource_eval.php',
+ 'php' => 'smarty_internal_resource_php.php'
+ );
+
+ /**
* Source is bypassing compiler
*
* @var boolean
@@ -35,18 +49,6 @@ abstract class Smarty_Resource
public $recompiled = false;
/**
- * resource types provided by the core
- *
- * @var array
- */
- public static $sysplugins = array('file' => 'smarty_internal_resource_file.php',
- 'string' => 'smarty_internal_resource_string.php',
- 'extends' => 'smarty_internal_resource_extends.php',
- 'stream' => 'smarty_internal_resource_stream.php',
- 'eval' => 'smarty_internal_resource_eval.php',
- 'php' => 'smarty_internal_resource_php.php');
-
- /**
* Flag if resource does implement populateCompiledFilepath() method
*
* @var bool
@@ -54,74 +56,10 @@ abstract class Smarty_Resource
public $hasCompiledHandler = false;
/**
- * Load template's source into current template object
- *
- * @param Smarty_Template_Source $source source object
- *
- * @return string template source
- * @throws SmartyException if source cannot be loaded
- */
- abstract public function getContent(Smarty_Template_Source $source);
-
- /**
- * populate Source Object with meta data from Resource
- *
- * @param Smarty_Template_Source $source source object
- * @param Smarty_Internal_Template $_template template object
- */
- abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
-
- /**
- * populate Source Object with timestamp and exists from Resource
- *
- * @param Smarty_Template_Source $source source object
- */
- public function populateTimestamp(Smarty_Template_Source $source)
- {
- // intentionally left blank
- }
-
- /**
- * modify resource_name according to resource handlers specifications
- *
- * @param Smarty $smarty Smarty instance
- * @param string $resource_name resource_name to make unique
- * @param boolean $isConfig flag for config resource
- *
- * @return string unique resource name
- */
- public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
- {
- if ($isConfig) {
- if (!isset($smarty->_joined_config_dir)) {
- $smarty->getTemplateDir(null, true);
- }
- return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name;
- } else {
- if (!isset($smarty->_joined_template_dir)) {
- $smarty->getTemplateDir();
- }
- return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name;
- }
- }
-
- /**
- * Determine basename for compiled filename
- *
- * @param Smarty_Template_Source $source source object
- *
- * @return string resource's basename
- */
- public function getBasename(Smarty_Template_Source $source)
- {
- return basename(preg_replace('![^\w]+!', '_', $source->name));
- }
-
- /**
* Load Resource Handler
*
- * @param Smarty $smarty smarty object
- * @param string $type name of the resource
+ * @param Smarty $smarty smarty object
+ * @param string $type name of the resource
*
* @throws SmartyException
* @return Smarty_Resource Resource Handler
@@ -132,34 +70,34 @@ abstract class Smarty_Resource
if (isset($smarty->_cache[ 'resource_handlers' ][ $type ])) {
return $smarty->_cache[ 'resource_handlers' ][ $type ];
}
-
// try registered resource
if (isset($smarty->registered_resources[ $type ])) {
return $smarty->_cache[ 'resource_handlers' ][ $type ] =
$smarty->registered_resources[ $type ] instanceof Smarty_Resource ?
$smarty->registered_resources[ $type ] : new Smarty_Internal_Resource_Registered();
}
-
// try sysplugins dir
if (isset(self::$sysplugins[ $type ])) {
$_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
}
-
// try plugins dir
$_resource_class = 'Smarty_Resource_' . ucfirst($type);
if ($smarty->loadPlugin($_resource_class)) {
if (class_exists($_resource_class, false)) {
return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
} else {
- $smarty->registerResource($type,
- array("smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
- "smarty_resource_{$type}_secure", "smarty_resource_{$type}_trusted"));
+ $smarty->registerResource(
+ $type,
+ array(
+ "smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
+ "smarty_resource_{$type}_secure", "smarty_resource_{$type}_trusted"
+ )
+ );
// give it another try, now that the resource is registered properly
return self::load($smarty, $type);
}
}
-
// try streams
$_known_stream = stream_get_wrappers();
if (in_array($type, $_known_stream)) {
@@ -169,19 +107,18 @@ abstract class Smarty_Resource
}
return $smarty->_cache[ 'resource_handlers' ][ $type ] = new Smarty_Internal_Resource_Stream();
}
-
// TODO: try default_(template|config)_handler
-
// give up
throw new SmartyException("Unknown resource type '{$type}'");
}
/**
* extract resource_type and resource_name from template_resource and config_resource
+ *
* @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
*
- * @param string $resource_name template_resource or config_resource to parse
- * @param string $default_resource the default resource_type defined in $smarty
+ * @param string $resource_name template_resource or config_resource to parse
+ * @param string $default_resource the default resource_type defined in $smarty
*
* @return array with parsed resource name and type
*/
@@ -202,53 +139,124 @@ abstract class Smarty_Resource
/**
* modify template_resource according to resource handlers specifications
*
- * @param \Smarty_Internal_Template|\Smarty $obj Smarty instance
- * @param string $template_resource template_resource to extract resource handler and name of
+ * @param \Smarty_Internal_Template|\Smarty $obj Smarty instance
+ * @param string $template_resource template_resource to extract resource handler and
+ * name of
*
* @return string unique resource name
+ * @throws \SmartyException
*/
public static function getUniqueTemplateName($obj, $template_resource)
{
- $smarty = $obj->_objType == 2 ? $obj->smarty : $obj;
+ $smarty = $obj->_getSmartyObj();
list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
// TODO: optimize for Smarty's internal resource types
$resource = Smarty_Resource::load($smarty, $type);
// go relative to a given template?
- $_file_is_dotted = $name[ 0 ] == '.' && ($name[ 1 ] == '.' || $name[ 1 ] == '/');
- if ($obj->_objType == 2 && $_file_is_dotted &&
- ($obj->source->type == 'file' || $obj->parent->source->type == 'extends')
+ $_file_is_dotted = $name[ 0 ] === '.' && ($name[ 1 ] === '.' || $name[ 1 ] === '/');
+ if ($obj->_isTplObj() && $_file_is_dotted
+ && ($obj->source->type === 'file' || $obj->parent->source->type === 'extends')
) {
- $name = $smarty->_realpath(dirname($obj->parent->source->filepath) . DS . $name);
+ $name = $smarty->_realpath(dirname($obj->parent->source->filepath) . DIRECTORY_SEPARATOR . $name);
}
return $resource->buildUniqueResourceName($smarty, $name);
}
+ /**
+ * initialize Source Object for given resource
+ * wrapper for backward compatibility to versions < 3.1.22
+ * Either [$_template] or [$smarty, $template_resource] must be specified
+ *
+ * @param Smarty_Internal_Template $_template template object
+ * @param Smarty $smarty smarty object
+ * @param string $template_resource resource identifier
+ *
+ * @return \Smarty_Template_Source Source Object
+ * @throws \SmartyException
+ */
+ public static function source(
+ Smarty_Internal_Template $_template = null,
+ Smarty $smarty = null,
+ $template_resource = null
+ ) {
+ return Smarty_Template_Source::load($_template, $smarty, $template_resource);
+ }
+
+ /**
+ * Load template's source into current template object
+ *
+ * @param Smarty_Template_Source $source source object
+ *
+ * @return string template source
+ * @throws SmartyException if source cannot be loaded
+ */
+ abstract public function getContent(Smarty_Template_Source $source);
+
+ /**
+ * populate Source Object with meta data from Resource
+ *
+ * @param Smarty_Template_Source $source source object
+ * @param Smarty_Internal_Template $_template template object
+ */
+ abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
+
+ /**
+ * populate Source Object with timestamp and exists from Resource
+ *
+ * @param Smarty_Template_Source $source source object
+ */
+ public function populateTimestamp(Smarty_Template_Source $source)
+ {
+ // intentionally left blank
+ }
+
+ /**
+ * modify resource_name according to resource handlers specifications
+ *
+ * @param Smarty $smarty Smarty instance
+ * @param string $resource_name resource_name to make unique
+ * @param boolean $isConfig flag for config resource
+ *
+ * @return string unique resource name
+ */
+ public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+ {
+ if ($isConfig) {
+ if (!isset($smarty->_joined_config_dir)) {
+ $smarty->getTemplateDir(null, true);
+ }
+ return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name;
+ } else {
+ if (!isset($smarty->_joined_template_dir)) {
+ $smarty->getTemplateDir();
+ }
+ return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name;
+ }
+ }
+
/*
* Check if resource must check time stamps when when loading complied or cached templates.
* Resources like 'extends' which use source components my disable timestamp checks on own resource.
*
* @return bool
*/
- public function checkTimestamps()
+ /**
+ * Determine basename for compiled filename
+ *
+ * @param Smarty_Template_Source $source source object
+ *
+ * @return string resource's basename
+ */
+ public function getBasename(Smarty_Template_Source $source)
{
- return true;
+ return basename(preg_replace('![^\w]+!', '_', $source->name));
}
/**
- * initialize Source Object for given resource
- * wrapper for backward compatibility to versions < 3.1.22
- * Either [$_template] or [$smarty, $template_resource] must be specified
- *
- * @param Smarty_Internal_Template $_template template object
- * @param Smarty $smarty smarty object
- * @param string $template_resource resource identifier
- *
- * @return Smarty_Template_Source Source Object
+ * @return bool
*/
- public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
- $template_resource = null)
+ public function checkTimestamps()
{
- return Smarty_Template_Source::load($_template, $smarty, $template_resource);
+ return true;
}
}
-
diff --git a/lib/smarty3/sysplugins/smarty_resource_custom.php b/lib/smarty3/sysplugins/smarty_resource_custom.php
index 619f2d6..8d66be3 100644
--- a/lib/smarty3/sysplugins/smarty_resource_custom.php
+++ b/lib/smarty3/sysplugins/smarty_resource_custom.php
@@ -30,7 +30,7 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource
* {@internal implementing this method is optional.
* Only implement it if modification times can be accessed faster than loading the complete template source.}}
*
- * @param string $name template name
+ * @param string $name template name
*
* @return integer|boolean timestamp (epoch) the template was modified, or false if not found
*/
@@ -47,9 +47,8 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource
*/
public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
{
- $source->filepath = $source->type . ':' . $source->name;
+ $source->filepath = $source->type . ':' . substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25);
$source->uid = sha1($source->type . ':' . $source->name);
-
$mtime = $this->fetchTimestamp($source->name);
if ($mtime !== null) {
$source->timestamp = $mtime;
@@ -66,7 +65,7 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource
/**
* Load template's source into current template object
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return string template source
* @throws SmartyException if source cannot be loaded
@@ -77,19 +76,18 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource
if (isset($content)) {
return $content;
}
-
throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
}
/**
* Determine basename for compiled filename
*
- * @param Smarty_Template_Source $source source object
+ * @param Smarty_Template_Source $source source object
*
* @return string resource's basename
*/
public function getBasename(Smarty_Template_Source $source)
{
- return basename($source->name);
+ return basename(substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25));
}
}
diff --git a/lib/smarty3/sysplugins/smarty_resource_recompiled.php b/lib/smarty3/sysplugins/smarty_resource_recompiled.php
index 7e51d1b..760c4dd 100644
--- a/lib/smarty3/sysplugins/smarty_resource_recompiled.php
+++ b/lib/smarty3/sysplugins/smarty_resource_recompiled.php
@@ -49,9 +49,8 @@ abstract class Smarty_Resource_Recompiled extends Smarty_Resource
$_smarty_tpl->loadCompiler();
// call compiler
try {
- eval("?>" . $_smarty_tpl->compiler->compileTemplate($_smarty_tpl));
- }
- catch (Exception $e) {
+ eval('?>' . $_smarty_tpl->compiler->compileTemplate($_smarty_tpl));
+ } catch (Exception $e) {
unset($_smarty_tpl->compiler);
while (ob_get_level() > $level) {
ob_end_clean();
@@ -68,8 +67,8 @@ abstract class Smarty_Resource_Recompiled extends Smarty_Resource
/**
* populate Compiled Object with compiled filepath
*
- * @param Smarty_Template_Compiled $compiled compiled object
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Template_Compiled $compiled compiled object
+ * @param Smarty_Internal_Template $_template template object
*
* @return void
*/
@@ -85,6 +84,9 @@ abstract class Smarty_Resource_Recompiled extends Smarty_Resource
*
* @return bool
*/
+ /**
+ * @return bool
+ */
public function checkTimestamps()
{
return false;
diff --git a/lib/smarty3/sysplugins/smarty_resource_uncompiled.php b/lib/smarty3/sysplugins/smarty_resource_uncompiled.php
index 554f3ae..a11e2c1 100644
--- a/lib/smarty3/sysplugins/smarty_resource_uncompiled.php
+++ b/lib/smarty3/sysplugins/smarty_resource_uncompiled.php
@@ -29,7 +29,7 @@ abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
* @var bool
*/
public $hasCompiledHandler = true;
-
+
/**
* populate compiled object with compiled filepath
*
diff --git a/lib/smarty3/sysplugins/smarty_security.php b/lib/smarty3/sysplugins/smarty_security.php
index f2f98f4..441a7e2 100644
--- a/lib/smarty3/sysplugins/smarty_security.php
+++ b/lib/smarty3/sysplugins/smarty_security.php
@@ -6,12 +6,12 @@
* @subpackage Security
* @author Uwe Tews
*/
-
-/*
+/**
* FIXME: Smarty_Security API
* - getter and setter instead of public properties would allow cultivating an internal cache properly
- * - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir are immutable
- * the cache is killed every time either of the variables change. That means that two distinct Smarty objects with differing
+ * - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir
+ * are immutable the cache is killed every time either of the variables change. That means that two distinct
+ * Smarty objects with differing
* $template_dir or $config_dir should NOT share the same Smarty_Security instance,
* as this would lead to (severe) performance penalty! how should this be handled?
*/
@@ -258,63 +258,54 @@ class Smarty_Security
public function __construct($smarty)
{
$this->smarty = $smarty;
- $this->smarty->_cache[ 'template_dir_new' ] = true;
- $this->smarty->_cache[ 'config_dir_new' ] = true;
}
/**
* Check if PHP function is trusted.
*
- * @param string $function_name
- * @param object $compiler compiler object
+ * @param string $function_name
+ * @param object $compiler compiler object
*
* @return boolean true if function is trusted
- * @throws SmartyCompilerException if php function is not trusted
*/
public function isTrustedPhpFunction($function_name, $compiler)
{
- if (isset($this->php_functions) &&
- (empty($this->php_functions) || in_array($function_name, $this->php_functions))
+ if (isset($this->php_functions)
+ && (empty($this->php_functions) || in_array($function_name, $this->php_functions))
) {
return true;
}
-
$compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
-
return false; // should not, but who knows what happens to the compiler in the future?
}
/**
* Check if static class is trusted.
*
- * @param string $class_name
- * @param object $compiler compiler object
+ * @param string $class_name
+ * @param object $compiler compiler object
*
* @return boolean true if class is trusted
- * @throws SmartyCompilerException if static class is not trusted
*/
public function isTrustedStaticClass($class_name, $compiler)
{
- if (isset($this->static_classes) &&
- (empty($this->static_classes) || in_array($class_name, $this->static_classes))
+ if (isset($this->static_classes)
+ && (empty($this->static_classes) || in_array($class_name, $this->static_classes))
) {
return true;
}
-
$compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
-
return false; // should not, but who knows what happens to the compiler in the future?
}
/**
* Check if static class method/property is trusted.
*
- * @param string $class_name
- * @param string $params
- * @param object $compiler compiler object
+ * @param string $class_name
+ * @param string $params
+ * @param object $compiler compiler object
*
* @return boolean true if class method is trusted
- * @throws SmartyCompilerException if static class method is not trusted
*/
public function isTrustedStaticClassAccess($class_name, $params, $compiler)
{
@@ -322,7 +313,7 @@ class Smarty_Security
// fall back
return $this->isTrustedStaticClass($class_name, $compiler);
}
- if ($params[ 2 ] == 'method') {
+ if ($params[ 2 ] === 'method') {
$allowed = $this->trusted_static_methods;
$name = substr($params[ 0 ], 0, strpos($params[ 0 ], '('));
} else {
@@ -335,8 +326,8 @@ class Smarty_Security
// fall back
return $this->isTrustedStaticClass($class_name, $compiler);
}
- if (isset($allowed[ $class_name ]) &&
- (empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
+ if (isset($allowed[ $class_name ])
+ && (empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
) {
return true;
}
@@ -348,42 +339,43 @@ class Smarty_Security
/**
* Check if PHP modifier is trusted.
*
- * @param string $modifier_name
- * @param object $compiler compiler object
+ * @param string $modifier_name
+ * @param object $compiler compiler object
*
* @return boolean true if modifier is trusted
- * @throws SmartyCompilerException if modifier is not trusted
*/
public function isTrustedPhpModifier($modifier_name, $compiler)
{
- if (isset($this->php_modifiers) &&
- (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
+ if (isset($this->php_modifiers)
+ && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
) {
return true;
}
-
$compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
-
return false; // should not, but who knows what happens to the compiler in the future?
}
/**
* Check if tag is trusted.
*
- * @param string $tag_name
- * @param object $compiler compiler object
+ * @param string $tag_name
+ * @param object $compiler compiler object
*
* @return boolean true if tag is trusted
- * @throws SmartyCompilerException if modifier is not trusted
*/
public function isTrustedTag($tag_name, $compiler)
{
// check for internal always required tags
- if (in_array($tag_name,
- array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin',
- 'private_object_block_function', 'private_object_function', 'private_registered_function',
- 'private_registered_block', 'private_special_variable', 'private_print_expression',
- 'private_modifier'))) {
+ if (in_array(
+ $tag_name,
+ array(
+ 'assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin',
+ 'private_object_block_function', 'private_object_function', 'private_registered_function',
+ 'private_registered_block', 'private_special_variable', 'private_print_expression',
+ 'private_modifier'
+ )
+ )
+ ) {
return true;
}
// check security settings
@@ -398,39 +390,38 @@ class Smarty_Security
} else {
$compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
}
-
return false; // should not, but who knows what happens to the compiler in the future?
}
/**
* Check if special $smarty variable is trusted.
*
- * @param string $var_name
- * @param object $compiler compiler object
+ * @param string $var_name
+ * @param object $compiler compiler object
*
* @return boolean true if tag is trusted
- * @throws SmartyCompilerException if modifier is not trusted
*/
public function isTrustedSpecialSmartyVar($var_name, $compiler)
{
if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
return true;
} else {
- $compiler->trigger_template_error("special variable '\$smarty.{$var_name}' not allowed by security setting",
- null, true);
+ $compiler->trigger_template_error(
+ "special variable '\$smarty.{$var_name}' not allowed by security setting",
+ null,
+ true
+ );
}
-
return false; // should not, but who knows what happens to the compiler in the future?
}
/**
* Check if modifier plugin is trusted.
*
- * @param string $modifier_name
- * @param object $compiler compiler object
+ * @param string $modifier_name
+ * @param object $compiler compiler object
*
* @return boolean true if tag is trusted
- * @throws SmartyCompilerException if modifier is not trusted
*/
public function isTrustedModifier($modifier_name, $compiler)
{
@@ -443,26 +434,31 @@ class Smarty_Security
if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
return true;
} else {
- $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", null,
- true);
+ $compiler->trigger_template_error(
+ "modifier '{$modifier_name}' disabled by security setting",
+ null,
+ true
+ );
}
- } elseif (in_array($modifier_name, $this->allowed_modifiers) &&
- !in_array($modifier_name, $this->disabled_modifiers)
+ } elseif (in_array($modifier_name, $this->allowed_modifiers)
+ && !in_array($modifier_name, $this->disabled_modifiers)
) {
return true;
} else {
- $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", null,
- true);
+ $compiler->trigger_template_error(
+ "modifier '{$modifier_name}' not allowed by security setting",
+ null,
+ true
+ );
}
-
return false; // should not, but who knows what happens to the compiler in the future?
}
/**
* Check if constants are enabled or trusted
*
- * @param string $const constant name
- * @param object $compiler compiler object
+ * @param string $const constant name
+ * @param object $compiler compiler object
*
* @return bool
*/
@@ -472,7 +468,7 @@ class Smarty_Security
return true;
}
if (!empty($this->trusted_constants)) {
- if (!in_array($const, $this->trusted_constants)) {
+ if (!in_array(strtolower($const), $this->trusted_constants)) {
$compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
return false;
}
@@ -488,7 +484,7 @@ class Smarty_Security
/**
* Check if stream is trusted.
*
- * @param string $stream_name
+ * @param string $stream_name
*
* @return boolean true if stream is trusted
* @throws SmartyException if stream is not trusted
@@ -498,14 +494,13 @@ class Smarty_Security
if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
return true;
}
-
throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
}
/**
* Check if directory of file resource is trusted.
*
- * @param string $filepath
+ * @param string $filepath
* @param null|bool $isConfig
*
* @return bool true if directory is trusted
@@ -514,60 +509,36 @@ class Smarty_Security
public function isTrustedResourceDir($filepath, $isConfig = null)
{
if ($this->_include_path_status !== $this->smarty->use_include_path) {
- foreach ($this->_include_dir as $directory) {
- unset($this->_resource_dir[ $directory ]);
- }
- if ($this->smarty->use_include_path) {
- $this->_include_dir = array();
- $_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty);
- foreach ($_dirs as $directory) {
- $this->_include_dir[] = $directory;
- $this->_resource_dir[ $directory ] = true;
- }
+ $_dir =
+ $this->smarty->use_include_path ? $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty) : array();
+ if ($this->_include_dir !== $_dir) {
+ $this->_updateResourceDir($this->_include_dir, $_dir);
+ $this->_include_dir = $_dir;
}
$this->_include_path_status = $this->smarty->use_include_path;
}
- if ($isConfig !== true &&
- (!isset($this->smarty->_cache[ 'template_dir_new' ]) || $this->smarty->_cache[ 'template_dir_new' ])
- ) {
- $_dir = $this->smarty->getTemplateDir();
- if ($this->_template_dir !== $_dir) {
- foreach ($this->_template_dir as $directory) {
- unset($this->_resource_dir[ $directory ]);
- }
- foreach ($_dir as $directory) {
- $this->_resource_dir[ $directory ] = true;
- }
- $this->_template_dir = $_dir;
- }
- $this->smarty->_cache[ 'template_dir_new' ] = false;
+ $_dir = $this->smarty->getTemplateDir();
+ if ($this->_template_dir !== $_dir) {
+ $this->_updateResourceDir($this->_template_dir, $_dir);
+ $this->_template_dir = $_dir;
}
- if ($isConfig !== false &&
- (!isset($this->smarty->_cache[ 'config_dir_new' ]) || $this->smarty->_cache[ 'config_dir_new' ])
- ) {
- $_dir = $this->smarty->getConfigDir();
- if ($this->_config_dir !== $_dir) {
- foreach ($this->_config_dir as $directory) {
- unset($this->_resource_dir[ $directory ]);
- }
- foreach ($_dir as $directory) {
- $this->_resource_dir[ $directory ] = true;
- }
- $this->_config_dir = $_dir;
- }
- $this->smarty->_cache[ 'config_dir_new' ] = false;
+ $_dir = $this->smarty->getConfigDir();
+ if ($this->_config_dir !== $_dir) {
+ $this->_updateResourceDir($this->_config_dir, $_dir);
+ $this->_config_dir = $_dir;
}
- if ($this->_secure_dir !== (array) $this->secure_dir) {
- foreach ($this->_secure_dir as $directory) {
- unset($this->_resource_dir[ $directory ]);
- }
- foreach ((array) $this->secure_dir as $directory) {
- $directory = $this->smarty->_realpath($directory . DS, true);
- $this->_resource_dir[ $directory ] = true;
+ if ($this->_secure_dir !== $this->secure_dir) {
+ $this->secure_dir = (array)$this->secure_dir;
+ foreach ($this->secure_dir as $k => $d) {
+ $this->secure_dir[ $k ] = $this->smarty->_realpath($d . DIRECTORY_SEPARATOR, true);
}
- $this->_secure_dir = (array) $this->secure_dir;
+ $this->_updateResourceDir($this->_secure_dir, $this->secure_dir);
+ $this->_secure_dir = $this->secure_dir;
+ }
+ $addPath = $this->_checkDir($filepath, $this->_resource_dir);
+ if ($addPath !== false) {
+ $this->_resource_dir = array_merge($this->_resource_dir, $addPath);
}
- $this->_resource_dir = $this->_checkDir($filepath, $this->_resource_dir);
return true;
}
@@ -577,11 +548,11 @@ class Smarty_Security
* So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
* is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
*
- * @param string $uri
+ * @param string $uri
*
* @return boolean true if URI is trusted
* @throws SmartyException if URI is not trusted
- * @uses $trusted_uri for list of patterns to match against $uri
+ * @uses $trusted_uri for list of patterns to match against $uri
*/
public function isTrustedUri($uri)
{
@@ -594,14 +565,13 @@ class Smarty_Security
}
}
}
-
throw new SmartyException("URI '{$uri}' not allowed by security setting");
}
/**
* Check if directory of file resource is trusted.
*
- * @param string $filepath
+ * @param string $filepath
*
* @return boolean true if directory is trusted
* @throws SmartyException if PHP directory is not trusted
@@ -611,63 +581,84 @@ class Smarty_Security
if (empty($this->trusted_dir)) {
throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
}
-
// check if index is outdated
if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
$this->_php_resource_dir = array();
-
$this->_trusted_dir = $this->trusted_dir;
- foreach ((array) $this->trusted_dir as $directory) {
- $directory = $this->smarty->_realpath($directory . DS, true);
+ foreach ((array)$this->trusted_dir as $directory) {
+ $directory = $this->smarty->_realpath($directory . '/', true);
$this->_php_resource_dir[ $directory ] = true;
}
}
-
- $this->_php_resource_dir =
- $this->_checkDir($this->smarty->_realpath($filepath, true), $this->_php_resource_dir);
+ $addPath = $this->_checkDir($filepath, $this->_php_resource_dir);
+ if ($addPath !== false) {
+ $this->_php_resource_dir = array_merge($this->_php_resource_dir, $addPath);
+ }
return true;
}
-
+
+ /**
+ * Remove old directories and its sub folders, add new directories
+ *
+ * @param array $oldDir
+ * @param array $newDir
+ */
+ private function _updateResourceDir($oldDir, $newDir)
+ {
+ foreach ($oldDir as $directory) {
+ // $directory = $this->smarty->_realpath($directory, true);
+ $length = strlen($directory);
+ foreach ($this->_resource_dir as $dir) {
+ if (substr($dir, 0, $length) === $directory) {
+ unset($this->_resource_dir[ $dir ]);
+ }
+ }
+ }
+ foreach ($newDir as $directory) {
+ // $directory = $this->smarty->_realpath($directory, true);
+ $this->_resource_dir[ $directory ] = true;
+ }
+ }
+
/**
* Check if file is inside a valid directory
*
* @param string $filepath
* @param array $dirs valid directories
*
- * @return array
+ * @return array|bool
* @throws \SmartyException
*/
private function _checkDir($filepath, $dirs)
{
- $directory = dirname($filepath) . DS;
+ $directory = dirname($this->smarty->_realpath($filepath, true)) . DIRECTORY_SEPARATOR;
$_directory = array();
- while (true) {
- // remember the directory to add it to _resource_dir in case we're successful
- $_directory[ $directory ] = true;
- // test if the directory is trusted
- if (isset($dirs[ $directory ])) {
- // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
- $dirs = array_merge($dirs, $_directory);
-
- return $dirs;
- }
- // abort if we've reached root
- if (!preg_match('#[\\\/][^\\\/]+[\\\/]$#', $directory)) {
- break;
+ if (!preg_match('#[\\\\/][.][.][\\\\/]#', $directory)) {
+ while (true) {
+ // test if the directory is trusted
+ if (isset($dirs[ $directory ])) {
+ return $_directory;
+ }
+ // abort if we've reached root
+ if (!preg_match('#[\\\\/][^\\\\/]+[\\\\/]$#', $directory)) {
+ // give up
+ break;
+ }
+ // remember the directory to add it to _resource_dir in case we're successful
+ $_directory[ $directory ] = true;
+ // bubble up one level
+ $directory = preg_replace('#[\\\\/][^\\\\/]+[\\\\/]$#', DIRECTORY_SEPARATOR, $directory);
}
- // bubble up one level
- $directory = preg_replace('#[\\\/][^\\\/]+[\\\/]$#', DS, $directory);
}
-
// give up
- throw new SmartyException("directory '{$filepath}' not allowed by security setting");
+ throw new SmartyException(sprintf('Smarty Security: not trusted file path \'%s\' ', $filepath));
}
/**
* Loads security class and enables security
*
- * @param \Smarty $smarty
- * @param string|Smarty_Security $security_class if a string is used, it must be class-name
+ * @param \Smarty $smarty
+ * @param string|Smarty_Security $security_class if a string is used, it must be class-name
*
* @return \Smarty current Smarty instance for chaining
* @throws \SmartyException when an invalid class name is provided
@@ -676,11 +667,11 @@ class Smarty_Security
{
if ($security_class instanceof Smarty_Security) {
$smarty->security_policy = $security_class;
- return;
+ return $smarty;
} elseif (is_object($security_class)) {
throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
}
- if ($security_class == null) {
+ if ($security_class === null) {
$security_class = $smarty->security_class;
}
if (!class_exists($security_class)) {
@@ -690,8 +681,9 @@ class Smarty_Security
} else {
$smarty->security_policy = new $security_class($smarty);
}
- return;
+ return $smarty;
}
+
/**
* Start template processing
*
@@ -701,19 +693,18 @@ class Smarty_Security
*/
public function startTemplate($template)
{
- if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
+ if ($this->max_template_nesting > 0 && $this->_current_template_nesting++ >= $this->max_template_nesting) {
throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
}
}
/**
* Exit template processing
- *
*/
public function endTemplate()
{
if ($this->max_template_nesting > 0) {
- $this->_current_template_nesting --;
+ $this->_current_template_nesting--;
}
}
diff --git a/lib/smarty3/sysplugins/smarty_template_cached.php b/lib/smarty3/sysplugins/smarty_template_cached.php
index 58f0daf..508d27f 100644
--- a/lib/smarty3/sysplugins/smarty_template_cached.php
+++ b/lib/smarty3/sysplugins/smarty_template_cached.php
@@ -83,6 +83,8 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
* create Cached Object container
*
* @param Smarty_Internal_Template $_template template object
+ *
+ * @throws \SmartyException
*/
public function __construct(Smarty_Internal_Template $_template)
{
@@ -90,7 +92,7 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
$this->cache_id = $_template->cache_id;
$this->source = $_template->source;
if (!class_exists('Smarty_CacheResource', false)) {
- require SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
+ include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
}
$this->handler = Smarty_CacheResource::load($_template->smarty);
}
@@ -100,13 +102,12 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
*
* @return Smarty_Template_Cached
*/
- static function load(Smarty_Internal_Template $_template)
+ public static function load(Smarty_Internal_Template $_template)
{
$_template->cached = new Smarty_Template_Cached($_template);
$_template->cached->handler->populate($_template->cached, $_template);
// caching enabled ?
- if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT ||
- $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->handler->recompiled
+ if (!$_template->caching || $_template->source->handler->recompiled
) {
$_template->cached->valid = false;
}
@@ -117,7 +118,7 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
* Render cache template
*
* @param \Smarty_Internal_Template $_template
- * @param bool $no_output_filter
+ * @param bool $no_output_filter
*
* @throws \Exception
*/
@@ -162,14 +163,14 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
} else {
$this->valid = true;
}
- if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT &&
- $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
+ if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_CURRENT
+ && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
) {
// lifetime expired
$this->valid = false;
}
- if ($this->valid && $_template->smarty->compile_check == 1 &&
- $_template->source->getTimeStamp() > $this->timestamp
+ if ($this->valid && $_template->compile_check === Smarty::COMPILECHECK_ON
+ && $_template->source->getTimeStamp() > $this->timestamp
) {
$this->valid = false;
}
@@ -203,9 +204,9 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
} else {
return $this->valid;
}
- if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED &&
- $_template->cached->cache_lifetime >= 0 &&
- (time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))
+ if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED
+ && $_template->cached->cache_lifetime >= 0
+ && (time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))
) {
$this->valid = false;
}
diff --git a/lib/smarty3/sysplugins/smarty_template_compiled.php b/lib/smarty3/sysplugins/smarty_template_compiled.php
index 832c8e1..37d8f0a 100644
--- a/lib/smarty3/sysplugins/smarty_template_compiled.php
+++ b/lib/smarty3/sysplugins/smarty_template_compiled.php
@@ -7,11 +7,10 @@
* @package Smarty
* @subpackage TemplateResources
* @author Rodney Rehm
- * @property string $content compiled content
+ * @property string $content compiled content
*/
class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
{
-
/**
* nocache hash
*
@@ -22,11 +21,11 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
/**
* get a Compiled Object of this source
*
- * @param Smarty_Internal_Template $_template template object
+ * @param Smarty_Internal_Template $_template template object
*
* @return Smarty_Template_Compiled compiled object
*/
- static function load($_template)
+ public static function load($_template)
{
$compiled = new Smarty_Template_Compiled();
if ($_template->source->handler->hasCompiledHandler) {
@@ -49,19 +48,22 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
$this->filepath = $smarty->getCompileDir();
if (isset($_template->compile_id)) {
$this->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) .
- ($smarty->use_sub_dirs ? DS : '^');
+ ($smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^');
}
// if use_sub_dirs, break file into directories
if ($smarty->use_sub_dirs) {
- $this->filepath .= $source->uid[ 0 ] . $source->uid[ 1 ] . DS . $source->uid[ 2 ] . $source->uid[ 3 ] . DS .
- $source->uid[ 4 ] . $source->uid[ 5 ] . DS;
+ $this->filepath .= $source->uid[ 0 ] . $source->uid[ 1 ] . DIRECTORY_SEPARATOR . $source->uid[ 2 ] .
+ $source->uid[ 3 ] . DIRECTORY_SEPARATOR . $source->uid[ 4 ] . $source->uid[ 5 ] .
+ DIRECTORY_SEPARATOR;
}
$this->filepath .= $source->uid . '_';
if ($source->isConfig) {
- $this->filepath .= (int) $smarty->config_read_hidden + (int) $smarty->config_booleanize * 2 +
- (int) $smarty->config_overwrite * 4;
+ $this->filepath .= (int)$smarty->config_read_hidden + (int)$smarty->config_booleanize * 2 +
+ (int)$smarty->config_overwrite * 4;
} else {
- $this->filepath .= (int) $smarty->merge_compiled_includes + (int) $smarty->escape_html * 2;
+ $this->filepath .= (int)$smarty->merge_compiled_includes + (int)$smarty->escape_html * 2 +
+ (($smarty->merge_compiled_includes && $source->type === 'extends') ?
+ (int)$smarty->extends_recursion * 4 : 0);
}
$this->filepath .= '.' . $source->type;
$basename = $source->handler->getBasename($source);
@@ -79,64 +81,6 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
}
/**
- * load compiled template or compile from source
- *
- * @param Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
- *
- * @throws Exception
- */
- public function process(Smarty_Internal_Template $_smarty_tpl)
- {
- $source = &$_smarty_tpl->source;
- $smarty = &$_smarty_tpl->smarty;
- if ($source->handler->recompiled) {
- $source->handler->process($_smarty_tpl);
- } elseif (!$source->handler->uncompiled) {
- if (!$this->exists || $smarty->force_compile ||
- ($smarty->compile_check && $source->getTimeStamp() > $this->getTimeStamp())
- ) {
- $this->compileTemplateSource($_smarty_tpl);
- $compileCheck = $smarty->compile_check;
- $smarty->compile_check = false;
- $this->loadCompiledTemplate($_smarty_tpl);
- $smarty->compile_check = $compileCheck;
- } else {
- $_smarty_tpl->mustCompile = true;
- @include($this->filepath);
- if ($_smarty_tpl->mustCompile) {
- $this->compileTemplateSource($_smarty_tpl);
- $compileCheck = $smarty->compile_check;
- $smarty->compile_check = false;
- $this->loadCompiledTemplate($_smarty_tpl);
- $smarty->compile_check = $compileCheck;
- }
- }
- $_smarty_tpl->_subTemplateRegister();
- $this->processed = true;
- }
- }
-
- /**
- * Load fresh compiled template by including the PHP file
- * HHVM requires a work around because of a PHP incompatibility
- *
- * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
- */
- private function loadCompiledTemplate(Smarty_Internal_Template $_smarty_tpl)
- {
- if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
- opcache_invalidate($this->filepath, true);
- } elseif (function_exists('apc_compile_file')) {
- apc_compile_file($this->filepath);
- }
- if (defined('HHVM_VERSION')) {
- eval("?>" . file_get_contents($this->filepath));
- } else {
- include($this->filepath);
- }
- }
-
- /**
* render compiled template code
*
* @param Smarty_Internal_Template $_template
@@ -178,6 +122,44 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
}
/**
+ * load compiled template or compile from source
+ *
+ * @param Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+ *
+ * @throws Exception
+ */
+ public function process(Smarty_Internal_Template $_smarty_tpl)
+ {
+ $source = &$_smarty_tpl->source;
+ $smarty = &$_smarty_tpl->smarty;
+ if ($source->handler->recompiled) {
+ $source->handler->process($_smarty_tpl);
+ } elseif (!$source->handler->uncompiled) {
+ if (!$this->exists || $smarty->force_compile
+ || ($_smarty_tpl->compile_check && $source->getTimeStamp() > $this->getTimeStamp())
+ ) {
+ $this->compileTemplateSource($_smarty_tpl);
+ $compileCheck = $_smarty_tpl->compile_check;
+ $_smarty_tpl->compile_check = Smarty::COMPILECHECK_OFF;
+ $this->loadCompiledTemplate($_smarty_tpl);
+ $_smarty_tpl->compile_check = $compileCheck;
+ } else {
+ $_smarty_tpl->mustCompile = true;
+ @include $this->filepath;
+ if ($_smarty_tpl->mustCompile) {
+ $this->compileTemplateSource($_smarty_tpl);
+ $compileCheck = $_smarty_tpl->compile_check;
+ $_smarty_tpl->compile_check = Smarty::COMPILECHECK_OFF;
+ $this->loadCompiledTemplate($_smarty_tpl);
+ $_smarty_tpl->compile_check = $compileCheck;
+ }
+ }
+ $_smarty_tpl->_subTemplateRegister();
+ $this->processed = true;
+ }
+ }
+
+ /**
* compile template from source
*
* @param Smarty_Internal_Template $_template
@@ -191,12 +173,23 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
$this->nocache_hash = null;
$this->unifunc = null;
// compile locking
- if ($saved_timestamp = $this->getTimeStamp()) {
+ if ($saved_timestamp = (!$_template->source->handler->recompiled && is_file($this->filepath))) {
+ $saved_timestamp = $this->getTimeStamp();
touch($this->filepath);
}
- // call compiler
- $_template->loadCompiler();
- $this->write($_template, $_template->compiler->compileTemplate($_template));
+ // compile locking
+ try {
+ // call compiler
+ $_template->loadCompiler();
+ $this->write($_template, $_template->compiler->compileTemplate($_template));
+ } catch (Exception $e) {
+ // restore old timestamp in case of error
+ if ($saved_timestamp && is_file($this->filepath)) {
+ touch($this->filepath, $saved_timestamp);
+ }
+ unset($_template->compiler);
+ throw $e;
+ }
// release compiler object to free memory
unset($_template->compiler);
}
@@ -207,7 +200,8 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
* @param Smarty_Internal_Template $_template template object
* @param string $code compiled code
*
- * @return boolean success
+ * @return bool success
+ * @throws \SmartyException
*/
public function write(Smarty_Internal_Template $_template, $code)
{
@@ -238,4 +232,26 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
}
return isset($this->content) ? $this->content : false;
}
+
+ /**
+ * Load fresh compiled template by including the PHP file
+ * HHVM requires a work around because of a PHP incompatibility
+ *
+ * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+ */
+ private function loadCompiledTemplate(Smarty_Internal_Template $_smarty_tpl)
+ {
+ if (function_exists('opcache_invalidate')
+ && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+ ) {
+ opcache_invalidate($this->filepath, true);
+ } elseif (function_exists('apc_compile_file')) {
+ apc_compile_file($this->filepath);
+ }
+ if (defined('HHVM_VERSION')) {
+ eval('?>' . file_get_contents($this->filepath));
+ } else {
+ include $this->filepath;
+ }
+ }
}
diff --git a/lib/smarty3/sysplugins/smarty_template_config.php b/lib/smarty3/sysplugins/smarty_template_config.php
index 44cdba6..850ae32 100644
--- a/lib/smarty3/sysplugins/smarty_template_config.php
+++ b/lib/smarty3/sysplugins/smarty_template_config.php
@@ -14,7 +14,6 @@
* @package Smarty
* @subpackage TemplateResources
* @author Uwe Tews
- *
*/
class Smarty_Template_Config extends Smarty_Template_Source
{
@@ -64,16 +63,18 @@ class Smarty_Template_Config extends Smarty_Template_Source
* initialize Source Object for given resource
* Either [$_template] or [$smarty, $template_resource] must be specified
*
- * @param Smarty_Internal_Template $_template template object
- * @param Smarty $smarty smarty object
- * @param string $template_resource resource identifier
+ * @param Smarty_Internal_Template $_template template object
+ * @param Smarty $smarty smarty object
+ * @param string $template_resource resource identifier
*
* @return Smarty_Template_Config Source Object
* @throws SmartyException
*/
- public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
- $template_resource = null)
- {
+ public static function load(
+ Smarty_Internal_Template $_template = null,
+ Smarty $smarty = null,
+ $template_resource = null
+ ) {
static $_incompatible_resources = array('extends' => true, 'php' => true);
if ($_template) {
$smarty = $_template->smarty;
@@ -82,11 +83,11 @@ class Smarty_Template_Config extends Smarty_Template_Source
if (empty($template_resource)) {
throw new SmartyException('Source: Missing name');
}
- // parse resource_name, load resource handler
+ // parse resource_name, load resource handler
list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $smarty->default_config_type);
// make sure configs are not loaded via anything smarty can't handle
if (isset($_incompatible_resources[ $type ])) {
- throw new SmartyException ("Unable to use resource '{$type}' for config");
+ throw new SmartyException("Unable to use resource '{$type}' for config");
}
$source = new Smarty_Template_Config($smarty, $template_resource, $type, $name);
$source->handler->populate($source, $_template);
diff --git a/lib/smarty3/sysplugins/smarty_template_resource_base.php b/lib/smarty3/sysplugins/smarty_template_resource_base.php
index 6cc008a..52bfba2 100644
--- a/lib/smarty3/sysplugins/smarty_template_resource_base.php
+++ b/lib/smarty3/sysplugins/smarty_template_resource_base.php
@@ -73,16 +73,11 @@ abstract class Smarty_Template_Resource_Base
public $content = null;
/**
- * required plugins
+ * Included sub templates
+ * - index name
+ * - value use count
*
- * @var array
- */
- public $required_plugins = array();
-
- /**
- * Included subtemplates
- *
- * @var array
+ * @var int[]
*/
public $includes = array();
@@ -130,8 +125,7 @@ abstract class Smarty_Template_Resource_Base
call_user_func($callback, $_template);
}
$_template->isRenderingCache = false;
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
$_template->isRenderingCache = false;
while (ob_get_level() > $level) {
ob_end_clean();
diff --git a/lib/smarty3/sysplugins/smarty_template_source.php b/lib/smarty3/sysplugins/smarty_template_source.php
index fdb3dea..16b47f2 100644
--- a/lib/smarty3/sysplugins/smarty_template_source.php
+++ b/lib/smarty3/sysplugins/smarty_template_source.php
@@ -7,7 +7,6 @@
* @package Smarty
* @subpackage TemplateResources
* @author Rodney Rehm
- *
*/
class Smarty_Template_Source
{
@@ -126,12 +125,13 @@ class Smarty_Template_Source
/**
* create Source Object container
*
- * @param Smarty_Resource $handler Resource Handler this source object communicates with
- * @param Smarty $smarty Smarty instance this source object belongs to
- * @param string $resource full template_resource
- * @param string $type type of resource
- * @param string $name resource name
+ * @param Smarty $smarty Smarty instance this source object belongs to
+ * @param string $resource full template_resource
+ * @param string $type type of resource
+ * @param string $name resource name
*
+ * @throws \SmartyException
+ * @internal param \Smarty_Resource $handler Resource Handler this source object communicates with
*/
public function __construct(Smarty $smarty, $resource, $type, $name)
{
@@ -148,16 +148,18 @@ class Smarty_Template_Source
* initialize Source Object for given resource
* Either [$_template] or [$smarty, $template_resource] must be specified
*
- * @param Smarty_Internal_Template $_template template object
- * @param Smarty $smarty smarty object
- * @param string $template_resource resource identifier
+ * @param Smarty_Internal_Template $_template template object
+ * @param Smarty $smarty smarty object
+ * @param string $template_resource resource identifier
*
* @return Smarty_Template_Source Source Object
* @throws SmartyException
*/
- public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
- $template_resource = null)
- {
+ public static function load(
+ Smarty_Internal_Template $_template = null,
+ Smarty $smarty = null,
+ $template_resource = null
+ ) {
if ($_template) {
$smarty = $_template->smarty;
$template_resource = $_template->template_resource;
@@ -202,6 +204,7 @@ class Smarty_Template_Source
* Get source content
*
* @return string
+ * @throws \SmartyException
*/
public function getContent()
{
diff --git a/lib/smarty3/sysplugins/smarty_undefined_variable.php b/lib/smarty3/sysplugins/smarty_undefined_variable.php
index 88bc6f6..6d31a8a 100644
--- a/lib/smarty3/sysplugins/smarty_undefined_variable.php
+++ b/lib/smarty3/sysplugins/smarty_undefined_variable.php
@@ -7,22 +7,18 @@
* @package Smarty
* @subpackage Template
*/
-class Smarty_Undefined_Variable
+class Smarty_Undefined_Variable extends Smarty_Variable
{
/**
- * Returns FALSE for 'nocache' and NULL otherwise.
+ * Returns null for not existing properties
*
- * @param string $name
+ * @param string $name
*
- * @return bool
+ * @return null
*/
public function __get($name)
{
- if ($name == 'nocache') {
- return false;
- } else {
- return null;
- }
+ return null;
}
/**
@@ -32,6 +28,6 @@ class Smarty_Undefined_Variable
*/
public function __toString()
{
- return "";
+ return '';
}
}
diff --git a/lib/smarty3/sysplugins/smarty_variable.php b/lib/smarty3/sysplugins/smarty_variable.php
index 0b17bc7..914d99b 100644
--- a/lib/smarty3/sysplugins/smarty_variable.php
+++ b/lib/smarty3/sysplugins/smarty_variable.php
@@ -42,7 +42,6 @@ class Smarty_Variable
*/
public function __toString()
{
- return (string) $this->value;
+ return (string)$this->value;
}
}
-
diff --git a/lib/smarty3/sysplugins/smartycompilerexception.php b/lib/smarty3/sysplugins/smartycompilerexception.php
index 763bab1..f7ad39b 100644
--- a/lib/smarty3/sysplugins/smartycompilerexception.php
+++ b/lib/smarty3/sysplugins/smartycompilerexception.php
@@ -7,6 +7,9 @@
*/
class SmartyCompilerException extends SmartyException
{
+ /**
+ * @return string
+ */
public function __toString()
{
return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
diff --git a/lib/smarty3/sysplugins/smartyexception.php b/lib/smarty3/sysplugins/smartyexception.php
index 431d8f8..7f7b9aa 100644
--- a/lib/smarty3/sysplugins/smartyexception.php
+++ b/lib/smarty3/sysplugins/smartyexception.php
@@ -9,6 +9,9 @@ class SmartyException extends Exception
{
public static $escape = false;
+ /**
+ * @return string
+ */
public function __toString()
{
return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';