Mark tests that use sleep calls as slow, so we can ignore them when running unit tests in development

existant -> existent

.gitattributes

@@ -0,0 +1,19 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+*.php text eol=lf
+*.y   text eol=lf
+*.lex text eol=lf
+
+# exclude from git export
+/tests export-ignore
+/utilities/ export-ignore
+
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/make-release.sh export-ignore
+/phpunit.sh export-ignore
+/phpunit.xml export-ignore
+/TODO.md export-ignore
+/travis.ini export-ignore

.gitignore

@@ -0,0 +1,13 @@
+
+.idea/
+
+# Smarty
+lexer/*.php
+lexer/*.php.bak
+lexer/*.out
+utilies/*.php
+
+# Dev
+phpunit*
+vendor/*
+composer.lock

.travis.yml

@@ -0,0 +1,39 @@
+language: php
+os: linux
+dist: xenial
+
+install:
+  - travis_retry composer install
+
+jobs:
+  include:
+   - php: 5.3 # Composer and PHPUnit require PHP 5.3.2+ to run, so we cannot test below 5.3
+     dist: precise # PHP 5.3 is supported only on Precise.
+   - php: 5.4
+     dist: trusty  # PHP 5.4 is supported only on Trusty.
+   - php: 5.5
+     dist: trusty  # PHP 5.5 is supported only on Trusty.
+   - php: 5.6
+   - php: 7.0
+   - php: 7.1
+   - php: 7.2
+   - php: 7.3
+   - php: 7.4
+   - php: nightly
+     install: travis_retry composer config platform.php 7.4.0 && composer install
+  fast_finish: true
+  allow_failures:
+   - php: nightly # PHP 8 is still in beta
+
+services:
+  - memcached
+  - mysql
+
+before_script:
+  - mysql -e "create database IF NOT EXISTS test;" -uroot
+
+before_install:
+  - phpenv config-rm xdebug.ini || return 0
+
+script:
+  - ./phpunit.sh

3.1.16_RELEASE_NOTES.txt

@@ -1,35 +0,0 @@
-In Smarty 3.1 template inheritance is a compile time process. All the extending of {block} tags 
-is done at compile time and the parent and child templates are compiled in a single compiled template.
-{include} subtemplate could also {block} tags. Such subtemplate could not compiled by it's own because
-it could be used in other context where the {block} extended with a different result. For that reasion
-the compiled code of {include} subtemplates gets also merged in compiled inheritance template.
-
-Merging the code into a single compile template has some drawbacks.
-1. You could not use variable file names in {include} Smarty would use the {include} of compilation time.
-2. You could not use individual compile_id in {include}
-3. Seperate caching of subtemplate was not possible
-4. Any change of the template directory structure between calls was not necessarily seen.
-
-Starting with 3.1.15 some of the above conditions got checked and resulted in an exception. It turned out
-that a couple of users did use some of above and now got exceptions.
-
-To resolve this starting with 3.1.16 there is a new configuration parameter $inheritance_merge_compiled_includes.
-For most backward compatibility its default setting is true.
-With this setting all {include} subtemplate will be merge into the compiled inheritance template, but the above cases
-could be rejected by exception.
-
-
-If $smarty->inheritance_merge_compiled_includes = false; {include} subtemplate will not be merged. 
-You must now manually merge all {include} subtemplate which do contain {block} tags. This is done by setting the "inline" option.
-{include file='foo.bar' inline}
-
-1. In case of a variable file name like {include file=$foo inline} you must you the variable in a compile_id  $smarty->compile_id = $foo;
-2. If you use individual compile_id in {include file='foo.tpl' compile_id=$bar inline} it must be used in the 
-   global compile_id as well  $smarty->compile_id = $foo;
-3. If call templates with different template_dir configurations and a parent could same named child template from different folders
-   you must make the folder name part of the compile_id.
-
-
-In the upcomming major release Smarty 3.2 inheritance will no longer be a compile time process. 
-All restrictions will be then removed.
-

COMPOSER_RELEASE_NOTES.txt

@@ -0,0 +1,31 @@
+
+
+Starting with Smarty 3.1.21 Composer has been configured to load the packages from github.
+
+*******************************************************************************
+*                                                                             *
+*  NOTE: Because of this change you must clear your local composer cache with *
+*                 the "composer clearcache" command                           *
+*                                                                             *
+*******************************************************************************
+
+To get the latest stable version use
+    "require": {
+        "smarty/smarty": "~3.1"
+    }
+in your composer.json file.
+
+To get the trunk version use
+    "require": {
+        "smarty/smarty": "~3.1@dev"
+    }
+
+The "smarty/smarty" package will start at libs/....   subfolder.
+
+To retrieve the development and documentation folders add
+    "require-dev": {
+        "smarty/smarty-dev": "~3.1@dev"
+    }
+
+If you are using (include) the composer generated autoloader.php which is located
+in the /vendor folder it is no longer needed to require the Smarty.class.php file.

INHERITANCE_RELEASE_NOTES.txt

@@ -0,0 +1,91 @@
+3.1.3"
+New tags for inheritance parent and chilD
+{parent}  == {$smarty.block.parent}
+{child}  == {$smarty.block.child}
+Both tags support the assign attribute like
+{child assign=foo}
+
+3.1.31
+New tags for inheritance parent and child
+{block_parent}  == {$smarty.block.parent}
+{block_child}  == {$smarty.block.child}
+
+Since 3.1.28 you can mix inheritance by extends resource with the {extends} tag.
+A template called by extends resource can extend a subtemplate or chain buy the {extends} tag.
+Since 3.1.31 this feature can be turned off by setting the new Smarty property Smarty::$extends_recursion to false.
+
+3.1.28
+Starting with version 3.1.28 template inheritance is no longer a compile time process.
+All {block} tag parent/child relations are resolved at run time.
+This does resolve all known existing restrictions (see below).
+
+The $smarty::$inheritance_merge_compiled_includes property has been removed.
+Any access to it is ignored.
+
+New features:
+
+Any code outside root {block} tags in child templates is now executed but any output will be ignored.
+
+   {extends 'foo.tpl'}
+   {$bar = 'on'}           // assigns variable $bar seen in parent templates
+   {block 'buh'}{/block}
+
+   {extends 'foo.tpl'}
+   {$bar}           // the output of variable bar is ignored
+   {block 'buh'}{/block}
+
+{block} tags can be dynamically en/disabled by conditions.
+
+   {block 'root'}
+      {if $foo}
+         {block 'v1'}
+             ....
+         {/block}
+      {else}
+         {block 'v1'}
+             ....
+         {/block}
+      {/if}
+   {/block}
+
+{block} tags can have variable names.
+
+   {block $foo}
+        ....
+   {/block}
+
+Starting with 3.1.28 you can mix inheritance by extends resource with the {extends} tag.
+A template called by extends resource can extend a subtemplate or chain buy the {extends} tag.
+
+NOTE There is a BC break. If you used the extends resource {extends} tags have been ignored.
+
+THE FOLLOWING RESTRICTIONS ARE NO LONGER EXISTING:
+In Smarty 3.1 template inheritance is a compile time process. All the extending of {block} tags
+is done at compile time and the parent and child templates are compiled in a single compiled template.
+{include} subtemplate could also {block} tags. Such subtemplate could not compiled by it's own because
+it could be used in other context where the {block} extended with a different result. For that reasion
+the compiled code of {include} subtemplates gets also merged in compiled inheritance template.
+
+Merging the code into a single compile template has some drawbacks.
+1. You could not use variable file names in {include} Smarty would use the {include} of compilation time.
+2. You could not use individual compile_id in {include}
+3. Separate caching of subtemplate was not possible
+4. Any change of the template directory structure between calls was not necessarily seen.
+
+Starting with 3.1.15 some of the above conditions got checked and resulted in an exception. It turned out
+that a couple of users did use some of above and now got exceptions.
+
+To resolve this starting with 3.1.16 there is a new configuration parameter $inheritance_merge_compiled_includes.
+For most backward compatibility its default setting is true.
+With this setting all {include} subtemplate will be merge into the compiled inheritance template, but the above cases
+could be rejected by exception.
+
+
+If $smarty->inheritance_merge_compiled_includes = false; {include} subtemplate will not be merged.You must now manually merge all {include} subtemplate which do contain {block} tags. This is done by setting the "inline" option.
+{include file='foo.bar' inline}
+
+1. In case of a variable file name like {include file=$foo inline} you must use the variable in a compile_id  $smarty->compile_id = $foo;
+2. If you use individual compile_id in {include file='foo.tpl' compile_id=$bar inline} it must be used in the   global compile_id as well  $smarty->compile_id = $bar;
+3. If call templates with different template_dir configurations and a parent could same named child template from different folders
+   you must make the folder name part of the compile_id.
+

LICENSE

@@ -1,3 +1,17 @@
+Smarty: the PHP compiling template engine
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ See the GNU Lesser General Public License below for more details.
+
+
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -162,4 +176,4 @@ General Public License ever published by the Free Software Foundation.
 whether future versions of the GNU Lesser General Public License shall
 apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
-Library.
+Library.

NEW_FEATURES.txt

@@ -0,0 +1,291 @@
+
+
+This file contains a brief description of new features which have been added to Smarty 3.1
+
+Smarty 3.1.33-dev
+    Variable capture name in Smarty special variable
+    ================================================
+    {$smarty.capture.$foo} can now be used to access the content of a named
+     capture block
+
+Smarty 3.1.32
+    New tags for inheritance parent and child
+    =========================================
+    {parent}  == {$smarty.block.parent}
+    {child}  == {$smarty.block.child}
+    Both tags support the assign attribute like
+    {child assign=foo}
+
+    Deprecate functions Smarty::muteExpectedErrors() and Smarty::unmuteExpectedErrors()
+    ===================================================================================
+    These functions to start a special error handler are no longer needed as Smarty does
+    no longer use error suppression like @filemtime().
+    For backward compatibility the functions still can be called.
+
+    Using literals containing Smarty's left and right delimiter
+    ===========================================================
+    New Methods
+        $smarty->setLiterals(array $literals)
+        $smarty->addLiterals(array $literals)
+    to define literals  containing Smarty delimiter. This can avoid the need for extreme usage
+    of {literal} {/literal} tags.
+    A) Treat '{{' and '}}' as literal
+    If Smarty::$auto_literal is enabled
+        {{ foo }}
+    will be treated now as literal. (This does apply for any number of delimiter repeatations).
+    However {{foo}} is not an literal but will be interpreted as a recursive Smarty tag.
+    If you use
+         $smarty->setLiterals(array('{{','}}'));
+         {{foo}}  is now a literal as well.
+    NOTE: In the last example nested Smarty tags starting with '{{' or ending with '}}' will not
+    work any longer, but this should be very very raw occouring restriction.
+    B) Example 2
+    Assume your delimiter are '<-' , '->' and '<--' , '-->' shall be literals 
+          $smarty->setLiterals(array('<--','-->'));
+
+
+    The capture buffers can now be accessed as array
+    ================================================
+    {capture name='foo'}
+        bah
+     {\capture}
+     {capture name='buh'}
+       blar
+     {\capture}
+     {foreach $smarty.capture as $name => $buffer}
+        ....
+      {/foreach}
+
+Smarty 3.1.31
+    New tags for inheritance parent and child
+    =========================================
+    {block_parent}  == {$smarty.block.parent}
+    {block_child}  == {$smarty.block.child}
+
+Smarty 3.1.30
+
+    Loop optimization {foreach} and {section}
+    =========================================
+    Smarty does optimize the {foreach} and {section} loops by removing code for not needed loop
+    properties.
+    The compiler collects needed properties by scanning the current template for $item@property,
+    $smarty.foreach.name.property and $smarty.section.name.property.
+    The compiler does not know if additional properties will be needed outside the current template scope.
+    Additional properties can be generated by adding them with the property attribute.
+
+    Example:
+        index.tpl
+        {foreach $from as $item properties=[iteration, index]}
+            {include 'sub.tpl'}
+            {$item.total}
+        {/foreach}
+
+        sub.tpl
+        {$item.index} {$item.iteration} {$item.total}
+
+    In above example code for the 'total' property is automatically generated as $item.total is used in
+    index.tpl. Code for 'iteration' and 'index' must be added with properties=[iteration, index].
+
+    New tag {make_nocache}
+    ======================
+    Syntax: {make_nocache $foo}
+
+    This tag makes a variable which does exists normally only while rendering the compiled template
+    available in the cached template for use in not cached expressions.
+
+    Expample:
+        {foreach from=$list item=item}
+            <li>{$item.name} {make_nocache $item}{if $current==$item.id} ACTIVE{/if}</li>
+        {/foreach}
+
+    The {foreach} loop is rendered while processing the compiled template, but $current is a nocache
+    variable. Normally the {if $current==$item.id} would fail as the $item variable is unknown in the     cached template. {make_nocache $item} does make the current $item value known in thee cached template.
+
+    {make_nocache} is ignored when caching is disabled or the variable does exists as nocache variable.
+
+    NOTE: if the variable value does contain objects these must have the __set_state method implemented.
+
+
+    Scope Attributes
+    ================
+    The scope handling has been updated to cover all cases of variable assignments in templates.
+
+    The tags {assign}, {append} direct assignments like {$foo = ...}, {$foo[...]= ...} support
+    the following optional scope attributes:
+    scope='parent'    - the variable will be assigned in the current template and if the template
+                        was included by {include} the calling template
+    scope='tpl_root'  - the variable will be assigned in the outermost root template called by $smarty->display()
+                        or $smarty->fetch() and is bubbled up all {include} sub-templates to the current template.
+    scope='smarty'    - the variable will be assigned in the Smarty object and is bubbled up all {include} sub-templates
+                        to the current template.
+    scope='global'    - the variable will be assigned as Smarty object global variable and is bubbled up all {include}
+                        sub-templates to the current template.
+    scope='root'      - the variable will be assigned if a data object was used for variable definitions in the data
+                        object or in the Smarty object otherwise and is bubbled up all {include} sub-templates to the
+                        current template.
+    scope='local'     - this scope has only a meaning if the tag is called within a template {function}.
+                        The variable will be assigned in the local scope of the template function and the
+                        template which did call the template function.
+
+
+    The {config_load} tag supports all of the above except the global scope.
+
+    The scope attribute can be used also with the {include} tag.
+    Supported scope are parent, tpl_root, smarty, global and root.
+    A scope used together with the {include} tag will cause that with some exceptions any variable
+    assignment within that sub-template will update/assign the variable in other scopes according
+    to the above rules. It does include also variables assigned by plugins, tags supporting the assign=foo     attribute and direct assignments in {if} and {while} like {if $foo=$bar}.
+    Excluded are the key and value variables of {foreach}, {for} loop variables , variables passed by attributes
+    in {include} and direct increments/decrements like {$foo++}, {$foo--}
+
+    Note: The scopes should be used only to the extend really need. If a variable value assigned in an included
+          sub-template should be returned to the calling sub-template just use {$foo='bar' scope='parent'}.
+          Use scopes only with variables for which it's realy needed. Avoid general scope settings with the
+          {include} tag as it can have a performance impact.
+
+     The {assign}, {append}, {config_load} and {$foo...=...} tags have a new option flag 'noscope'.Thi
+     Example: {$foo='bar' noscope}  This will assign $foo only in the current template and any scope settings
+               at {include} is ignored.
+
+
+    Caching
+    =======
+    Caching does now observe the template_dir setting and will create separate cache files if required
+
+    Compiled Templates
+    ==================
+    The template_dir setting is now encoded in the uid of the file name.
+    The content of the compiled template may depend on the template_dir search order
+    {include .... inline} is used or $smarty->merge_compiled_includes is enabled
+
+    APC
+    ===
+    If APC is enabled force an apc_compile_file() when compiled or cached template was updated
+
+Smarty 3.1.28
+
+    OPCACHE
+    =======
+    Smarty does now invalidate automatically updated and cleared compiled or cached template files in OPCACHE.
+    Correct operation is no longer dependent on OPCACHE configuration settings.
+
+    Template inheritance
+    ====================
+    Template inheritance is now processed in run time.
+    See the INHERITANCE_RELEASE_NOTES
+
+    Modifier regex_replace
+    ======================
+    An optional limit parameter was added
+
+    fetch() and display()
+    =====================
+    The fetch() and display() methods of the template object accept now optionally the same parameter
+    as the corresponding Smarty methods to get the content of another template.
+    Example:
+        $template->display();           Does display template of template object
+        $template->display('foo.tpl');  Does display template 'foo.bar'     
+        
+    File: resource
+    ==============
+    Multiple template_dir entries can now be selected  by a comma separated list of indices.
+    The template_dir array is searched in the order of the indices. (Could be used to change the default search order)
+    Example:
+        $smarty->display('[1],[0]foo.bar');
+
+    Filter support
+    ==============
+    Optional filter names
+      An optional filter name was added to $smarty->registerFilter(). It can be used to unregister a filter by name.
+      - $smarty->registerFilter('output', $callback, 'name');
+        $smarty->unregister('output', 'name');
+
+    Closures
+      $smarty->registerFilter() does now accept closures.
+      - $smarty->registerFilter('pre', function($source) {return $source;});
+      If no optional filter name was specified it gets the default name 'closure'.
+      If you register multiple closures register each with a unique filter name.
+      - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_1');
+      - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_2');
+
+
+Smarty 3.1.22
+
+    Namespace support within templates
+    ==================================
+    Within templates you can now use namespace specifications on:
+     - Constants                like    foo\bar\FOO
+     - Class names              like    foo\bar\Baz::FOO, foo\bar\Baz::$foo, foo\bar\Baz::foo()
+     - PHP function names       like    foo\bar\baz()
+
+    Security
+    ========
+    - disable special $smarty variable -
+    The Smarty_Security class has the new property $disabled_special_smarty_vars.
+    It's an array which can be loaded with the $smarty special variable names like
+    'template_object', 'template', 'current_dir' and others which will be disabled.
+    Note: That this security check is performed at compile time.
+
+    - limit template nesting -
+    Property $max_template_nesting of Smarty_Security does set the maximum template nesting level.
+    The main template is level 1. The nesting level is checked at run time. When the maximum will be exceeded
+    an Exception will be thrown. The default setting is 0 which does disable this check.
+
+    - trusted static methods -
+   The Smarty_Security class has the new property $trusted_static_methods to restrict access to static methods.
+   It's an nested array of trusted class and method names.
+         Format:
+         array (
+                    'class_1' => array('method_1', 'method_2'), // allowed methods
+                    'class_2' => array(),                       // all methods of class allowed
+               )
+   To disable access for all methods of all classes set $trusted_static_methods = null;
+   The default value is an empty array() which does enables all methods of all classes, but for backward compatibility
+   the setting of $static_classes will be checked.
+   Note: That this security check is performed at compile time.
+
+    - trusted static properties -
+   The Smarty_Security class has the new property $trusted_static_properties to restrict access to static properties.
+   It's an nested array of trusted class and property names.
+         Format:
+         array (
+                    'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+                    'class_2' => array(),                   // all properties of class allowed
+                }
+   To disable access for all properties of all classes set $trusted_static_properties = null;
+   The default value is an empty array() which does enables all properties of all classes, but for backward compatibility
+   the setting of $static_classes will be checked.
+   Note: That this security check is performed at compile time.
+
+    - trusted constants .
+   The Smarty_Security class has the new property $trusted_constants to restrict access to constants.
+   It's an array of trusted constant names.
+         Format:
+         array (
+                    'SMARTY_DIR' , // allowed constant
+                }
+   If the array is empty (default) the usage of constants  can be controlled with the
+   Smarty_Security::$allow_constants property (default true)
+
+
+
+    Compiled Templates
+    ==================
+    Smarty does now automatically detects a change of the $merge_compiled_includes and $escape_html
+    property and creates different compiled templates files depending on the setting.
+
+    Same applies to config files and the $config_overwrite, $config_booleanize and
+    $config_read_hidden properties.
+
+    Debugging
+    =========
+    The layout of the debug window has been changed for better readability
+
+    New class constants
+        Smarty::DEBUG_OFF
+        Smarty::DEBUG_ON
+        Smarty::DEBUG_INDIVIDUAL
+    have been introduced for setting the $debugging property.
+
+    Smarty::DEBUG_INDIVIDUAL will create for each display() and fetch() call an individual debug window.
+

README

@@ -176,7 +176,7 @@ backward compatible with Smarty 2, except for the following items:
 
 
 There are many things that are new to Smarty 3. Here are the notable items:
-   
+
 LEXER/PARSER
 ============
 
@@ -197,8 +197,8 @@ is still supported for BC.
 Examples:
 {$x+$y}                           will output the sum of x and y.
 {$foo = strlen($bar)}             function in assignment
-{assign var=foo value= $x+$y}     in attributes 
-{$foo = myfunct( ($x+$y)*3 )}     as function parameter 
+{assign var=foo value= $x+$y}     in attributes
+{$foo = myfunct( ($x+$y)*3 )}     as function parameter
 {$foo[$x+3]}                      as array index
 
 Smarty tags can be used as values within other tags.
@@ -239,18 +239,18 @@ Examples:
 
 The original "dot" notation stays, and with improvements.
 Examples:
-{$foo.a.b.c}        =>  $foo['a']['b']['c'] 
+{$foo.a.b.c}        =>  $foo['a']['b']['c']
 {$foo.a.$b.c}       =>  $foo['a'][$b]['c']        with variable index
 {$foo.a.{$b+4}.c}   =>  $foo['a'][$b+4]['c']       with expression as index
 {$foo.a.{$b.c}}     =>  $foo['a'][$b['c']]         with nested index
 
-note that { and } are used to address ambiguties when nesting the dot syntax. 
+note that { and } are used to address ambiguties when nesting the dot syntax.
 
 Variable names themselves can be variable and contain expressions.
 Examples:
 $foo         normal variable
-$foo_{$bar}  variable name containing other variable 
-$foo_{$x+$y} variable name containing expressions 
+$foo_{$bar}  variable name containing other variable
+$foo_{$x+$y} variable name containing expressions
 $foo_{$bar}_buh_{$blar}  variable name with multiple segments
 {$foo_{$x}}  will output the variable $foo_1 if $x has a value of 1.
 
@@ -260,12 +260,12 @@ Example: {$object->method1($x)->method2($y)}
 {for} tag added for looping (replacement for {section} tag):
 {for $x=0, $y=count($foo); $x<$y; $x++}  ....  {/for}
 Any number of statements can be used separated by comma as the first
-inital expression at {for}.
+initial expression at {for}.
 
 {for $x = $start to $end step $step} ... {/for}is in the SVN now .
 You can use also
 {for $x = $start to $end} ... {/for}
-In this case the step value will be automaticall 1 or -1 depending on the start and end values.
+In this case the step value will be automatically 1 or -1 depending on the start and end values.
 Instead of $start and $end you can use any valid expression.
 Inside the loop the following special vars can be accessed:
 $x@iteration = number of iteration
@@ -290,7 +290,7 @@ $var@last           true on last iteration
 
 The Smarty 2 {foreach} tag syntax is still supported.
 
-NOTE: {$bar[foo]} still indicates a variable inside of a {section} named foo. 
+NOTE: {$bar[foo]} still indicates a variable inside of a {section} named foo.
 If you want to access an array element with index foo, you must use quotes
 such as {$bar['foo']}, or use the dot syntax {$bar.foo}.
 
@@ -377,12 +377,12 @@ $smarty->display('string:This is my template, {$foo}!'); // php
 VARIABLE SCOPE / VARIABLE STORAGE
 =================================
 
-In Smarty 2, all assigned variables were stored within the Smarty object. 
-Therefore, all variables assigned in PHP were accessible by all subsequent 
+In Smarty 2, all assigned variables were stored within the Smarty object.
+Therefore, all variables assigned in PHP were accessible by all subsequent
 fetch and display template calls.
 
-In Smarty 3, we have the choice to assign variables to the main Smarty object, 
-to user-created data objects, and to user-created template objects. 
+In Smarty 3, we have the choice to assign variables to the main Smarty object,
+to user-created data objects, and to user-created template objects.
 These objects can be chained. The object at the end of a chain can access all
 variables belonging to that template and all variables within the parent objects.
 The Smarty object can only be the root of a chain, but a chain can be isolated
@@ -396,7 +396,7 @@ global variables.
 A Smarty data object can be created as follows:
 $data = $smarty->createData();    // create root data object
 $data->assign('foo','bar');       // assign variables as usual
-$data->config_load('my.conf');									 // load config file    
+$data->config_load('my.conf');									 // load config file
 
 $data= $smarty->createData($smarty);  // create data object having a parent link to
 the Smarty object
@@ -414,7 +414,7 @@ The first parameter can be a template name, a smarty object or a data object.
 Examples:
 $tpl = $smarty->createTemplate('mytpl.tpl'); // create template object not linked to any parent
 $tpl->assign('foo','bar');                   // directly assign variables
-$tpl->config_load('my.conf');									 // load config file    
+$tpl->config_load('my.conf');									 // load config file
 
 $tpl = $smarty->createTemplate('mytpl.tpl',$smarty);  // create template having a parent link to the Smarty object
 $tpl = $smarty->createTemplate('mytpl.tpl',$data);    // create template having a parent link to the $data object
@@ -424,31 +424,31 @@ If the $parent parameter is not specified in these method calls, the template ob
 is will link back to the Smarty object as it's parent.
 
 If a template is called by an {include...} tag from another template, the
-subtemplate links back to the calling template as it's parent. 
+subtemplate links back to the calling template as it's parent.
 
 All variables assigned locally or from a parent template are accessible. If the
 template creates or modifies a variable by using the {assign var=foo...} or
 {$foo=...} tags, these new values are only known locally (local scope). When the
 template exits, none of the new variables or modifications can be seen in the
-parent template(s). This is same behavior as in Smarty 2. 
+parent template(s). This is same behavior as in Smarty 2.
 
 With Smarty 3, we can assign variables with a scope attribute which allows the
 availablility of these new variables or modifications globally (ie in the parent
 templates.)
 
-Possible scopes are local, parent, root and global. 
+Possible scopes are local, parent, root and global.
 Examples:
 {assign var=foo value='bar'}       // no scope is specified, the default 'local'
 {$foo='bar'}                       // same, local scope
 {assign var=foo value='bar' scope='local'} // same, local scope
 
-{assign var=foo value='bar' scope='parent'} // Values will be available to the parent object 
+{assign var=foo value='bar' scope='parent'} // Values will be available to the parent object
 {$foo='bar' scope='parent'}                 // (normally the calling template)
 
-{assign var=foo value='bar' scope='root'}   // Values will be exported up to the root object, so they can 
+{assign var=foo value='bar' scope='root'}   // Values will be exported up to the root object, so they can
 {$foo='bar' scope='root'}                   // be seen from all templates using the same root.
 
-{assign var=foo value='bar' scope='global'} // Values will be exported to global variable storage, 
+{assign var=foo value='bar' scope='global'} // Values will be exported to global variable storage,
 {$foo='bar' scope='global'}                 // they are available to any and all templates.
 
 
@@ -460,19 +460,20 @@ included template.
 PLUGINS
 =======
 
-Smarty3 are following the same coding rules as in Smarty2. 
-The only difference is that the template object is passed as additional third parameter.
+Smarty 3 plugins follow the same coding rules as in Smarty 2.
+The main difference is that the template object is now passed in place of the smarty object.
+The smarty object can be still be accessed through $template->smarty.
 
-smarty_plugintype_name (array $params, object $smarty, object $template)
+smarty_plugintype_name (array $params, Smarty_Internal_Template $template)
 
-The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty2 internals.
+The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty 2 internals.
 
 
 TEMPLATE INHERITANCE:
 =====================
 
 With template inheritance you can define blocks, which are areas that can be
-overriden by child templates, so your templates could look like this: 
+overridden by child templates, so your templates could look like this:
 
 parent.tpl:
 <html>
@@ -490,14 +491,14 @@ parent.tpl:
 </html>
 
 child.tpl:
-{extends file='parent.tpl'} 
+{extends file='parent.tpl'}
 {block name='title'}
 Child title
 {/block}
 
 grandchild.tpl:
-{extends file='child.tpl'} 
-{block name='title'}Home - {$smarty.block.parent}{/block} 
+{extends file='child.tpl'}
+{block name='title'}Home - {$smarty.block.parent}{/block}
 {block name='page-title'}My home{/block}
 {block name='content'}
   {foreach $images as $img}
@@ -507,10 +508,10 @@ grandchild.tpl:
 
 We redefined all the blocks here, however in the title block we used {$smarty.block.parent},
 which tells Smarty to insert the default content from the parent template in its place.
-The content block was overriden to display the image files, and page-title has also be 
-overriden to display a completely different title. 
+The content block was overridden to display the image files, and page-title has also be
+overridden to display a completely different title.
 
-If we render grandchild.tpl we will get this: 
+If we render grandchild.tpl we will get this:
 <html>
   <head>
     <title>Home - Child title</title>
@@ -528,8 +529,8 @@ If we render grandchild.tpl we will get this:
 NOTE: In the child templates everything outside the {extends} or {block} tag sections
 is ignored.
 
-The inheritance tree can be as big as you want (meaning you can extend a file that 
-extends another one that extends another one and so on..), but be aware that all files 
+The inheritance tree can be as big as you want (meaning you can extend a file that
+extends another one that extends another one and so on..), but be aware that all files
 have to be checked for modifications at runtime so the more inheritance the more overhead you add.
 
 Instead of defining the parent/child relationships with the {extends} tag in the child template you
@@ -537,7 +538,7 @@ can use the resource as follow:
 
 $smarty->display('extends:parent.tpl|child.tpl|grandchild.tpl');
 
-Child {block} tags may optionally have a append or prepend attribute. In this case the parent block content 
+Child {block} tags may optionally have a append or prepend attribute. In this case the parent block content
 is appended or prepended to the child block content.
 
 {block name='title' append} My title {/block}

README.md

@@ -1,28 +1,78 @@
-#Smarty 3 template engine
-##Distribution repository
-Starting with Smarty 3.1.21 Composer has been configured to load the packages from github.
- 
-**NOTE: Because of this change you must clear your local composer cache with the "composer clearcache" command**
+# Smarty 3 template engine
+[smarty.net](https://www.smarty.net/) 
 
-To get the latest stable version use
+[![Build Status](https://travis-ci.org/smarty-php/smarty.svg?branch=master)](https://travis-ci.org/smarty-php/smarty)
 
-	"require": {
-	   "smarty/smarty": "~3.1"
-	}
+## Documentation
 
-in your composer.json file.
- 
- To get the trunk version use
+For documentation see 
+[www.smarty.net/docs/en/](https://www.smarty.net/docs/en/) 
+
+## Requirements
+
+Smarty can be run with PHP 5.2 to PHP 7.4.
+
+## Distribution repository
+
+> Smarty 3.1.28 introduces run time template inheritance
+
+> Read the NEW_FEATURES and INHERITANCE_RELEASE_NOTES file for recent extensions to Smarty 3.1 functionality
+
+Smarty versions 3.1.11 or later are now on github and can be installed with Composer.
 
-	"require": {
-	   "smarty/smarty": "~3.1@dev"
-	}
 
 The "smarty/smarty" package will start at libs/....   subfolder.
 
-To retrieve the development and documentation folders add
+To get the latest stable version of Smarty 3.1 use:
 
-     "require-dev": {
-         "smarty/smarty-dev": "~3.1@dev"
-     }
+```json
+"require": {
+    "smarty/smarty": "~3.1"
+}
+```
 
+in your composer.json file.
+
+To get the trunk version use:
+
+```json
+"require": {
+    "smarty/smarty": "~3.1@dev"
+}
+```
+
+For a specific version use something like:
+
+```json
+"require": {
+    "smarty/smarty": "3.1.19"
+}
+```
+
+PHPUnit test can be installed by corresponding composer entries like:
+
+```json
+"require": {
+    "smarty/smarty-phpunit": "3.1.19"
+}
+```
+
+Similar applies for the lexer/parser generator.
+
+```json
+"require": {
+    "smarty/smarty-lexer": "3.1.19"
+}
+```
+
+Or you could use:
+
+```json
+"require": {
+    "smarty/smarty-dev": "3.1.19"
+}
+```
+
+Which is a wrapper to install all 3 packages.
+
+Composer can also be used for Smarty2 versions 2.6.24 to 2.6.30.

SMARTY_2_BC_NOTES.txt

@@ -2,8 +2,8 @@
 
 == Syntax ==
 
-Smarty 3 API has a new syntax. Much of the Smarty 2 syntax is supported 
-by a wrapper but deprecated. See the README that comes with Smarty 3 for more 
+Smarty 3 API has a new syntax. Much of the Smarty 2 syntax is supported
+by a wrapper but deprecated. See the README that comes with Smarty 3 for more
 information.
 
 The {$array|@mod} syntax has always been a bit confusing, where an "@" is required
@@ -32,9 +32,9 @@ Makes Javascript/CSS easier to work with, eliminating the need for {literal}.
 This can be disabled by setting $smarty->auto_literal = false;
 
 == Unquoted Strings ==
-Smarty 2 was a bit more forgiving (and ambiguous) when it comes to unquoted strings 
-in parameters. Smarty3 is more restrictive. You can still pass strings without quotes 
-so long as they contain no special characters. (anything outside of A-Za-z0-9_) 
+Smarty 2 was a bit more forgiving (and ambiguous) when it comes to unquoted strings
+in parameters. Smarty3 is more restrictive. You can still pass strings without quotes
+so long as they contain no special characters. (anything outside of A-Za-z0-9_)
 
 For example filename strings must be quoted
 <source lang="smarty">
@@ -42,16 +42,16 @@ For example filename strings must be quoted
 </source>
 
 == Extending the Smarty class ==
-Smarty 3 makes use of the __construct method for initialization. If you are extending 
-the Smarty class, its constructor is not called implicitly if the your child class defines 
-its own constructor. In order to run Smarty's constructor, a call to parent::__construct() 
-within your child constructor is required. 
+Smarty 3 makes use of the __construct method for initialization. If you are extending
+the Smarty class, its constructor is not called implicitly if the your child class defines
+its own constructor. In order to run Smarty's constructor, a call to parent::__construct()
+within your child constructor is required.
 
 <source lang="php">
 class MySmarty extends Smarty {
    function __construct() {
        parent::__construct();
-    
+
        // your initialization code goes here
 
    }
@@ -59,36 +59,36 @@ class MySmarty extends Smarty {
 </source>
 
 == Autoloader ==
-Smarty 3 does register its own autoloader with spl_autoload_register. If your code has 
-an existing __autoload function then this function must be explicitly registered on 
-the __autoload stack. See http://us3.php.net/manual/en/function.spl-autoload-register.php 
+Smarty 3 does register its own autoloader with spl_autoload_register. If your code has
+an existing __autoload function then this function must be explicitly registered on
+the __autoload stack. See http://us3.php.net/manual/en/function.spl-autoload-register.php
 for further details.
 
 == Plugin Filenames ==
-Smarty 3 optionally supports the PHP spl_autoloader. The autoloader requires filenames 
-to be lower case. Because of this, Smarty plugin file names must also be lowercase. 
+Smarty 3 optionally supports the PHP spl_autoloader. The autoloader requires filenames
+to be lower case. Because of this, Smarty plugin file names must also be lowercase.
 In Smarty 2, mixed case file names did work.
 
 == Scope of Special Smarty Variables ==
-In Smarty 2 the special Smarty variables $smarty.section... and $smarty.foreach... 
-had global scope. If you had loops with the same name in subtemplates you could accidentally 
+In Smarty 2 the special Smarty variables $smarty.section... and $smarty.foreach...
+had global scope. If you had loops with the same name in subtemplates you could accidentally
 overwrite values of parent template.
 
-In Smarty 3 these special Smarty variable have only local scope in the template which 
-is defining the loop. If you need their value in a subtemplate you have to pass them 
+In Smarty 3 these special Smarty variable have only local scope in the template which
+is defining the loop. If you need their value in a subtemplate you have to pass them
 as parameter.
 <source lang="smarty">
 {include file='path/foo.tpl' index=$smarty.section.foo.index}
 </source>
 
 == SMARTY_RESOURCE_CHAR_SET ==
-Smarty 3 sets the constant SMARTY_RESOURCE_CHAR_SET to utf-8 as default template charset. 
-This is now used also on modifiers like escape as default charset. If your templates use 
-other charsets make sure that you define the constant accordingly. Otherwise you may not 
+Smarty 3 sets the constant SMARTY_RESOURCE_CHAR_SET to utf-8 as default template charset.
+This is now used also on modifiers like escape as default charset. If your templates use
+other charsets make sure that you define the constant accordingly. Otherwise you may not
 get any output.
 
 == newline at {if} tags ==
-A \n was added to the compiled code of the {if},{else},{elseif},{/if} tags to get output of newlines as expected by the template source. 
+A \n was added to the compiled code of the {if},{else},{elseif},{/if} tags to get output of newlines as expected by the template source.
 If one of the {if} tags is at the line end you will now get a newline in the HTML output.
 
 == trigger_error() ==
@@ -96,7 +96,7 @@ The API function trigger_error() has been removed because it did just map to PHP
 However it's still included in the Smarty2 API wrapper.
 
 == Smarty constants ==
-The constants 
+The constants
 SMARTY_PHP_PASSTHRU
 SMARTY_PHP_QUOTE
 SMARTY_PHP_REMOVE

SMARTY_3.0_BC_NOTES.txt

@@ -1,14 +1,14 @@
 == Smarty2 backward compatibility ==
-All Smarty2 specific API functions and deprecated functionallity has been moved
+All Smarty2 specific API functions and deprecated functionality has been moved
 to the SmartyBC class.
 
 == {php} Tag ==
-The {php} tag is no longer available in the standard Smarty calls. 
-The use of {php} tags is deprecated and only available in the SmartyBC class. 
+The {php} tag is no longer available in the standard Smarty calls.
+The use of {php} tags is deprecated and only available in the SmartyBC class.
 
 == {include_php} Tag ==
-The {include_php} tag is no longer available in the standard Smarty calls. 
-The use of {include_php} tags is deprecated and only available in the SmartyBC class. 
+The {include_php} tag is no longer available in the standard Smarty calls.
+The use of {include_php} tags is deprecated and only available in the SmartyBC class.
 
 == php template resource ==
 The support of the php template resource is removed.

SMARTY_3.1_NOTES.txt

@@ -50,7 +50,7 @@ The escape modifier now knows the $double_encode option, which will
 prevent entities from being encoded again.
 
 The capitalize modifier now know the $lc_rest option, which makes sure
-all letters following a captial letter are lower-cased.
+all letters following a capital letter are lower-cased.
 
 The count_sentences modifier now accepts (.?!) as
 legitimate endings of a sentence - previously only (.) was
@@ -62,7 +62,7 @@ entity.
 
   default_template_handler_func
 
-The invocation of $smarty->$default_template_handler_func had to be 
+The invocation of $smarty->$default_template_handler_func had to be
 altered. Instead of a Smarty_Internal_Template, the fifth argument is
 now provided with the Smarty instance. New footprint:
 
@@ -71,14 +71,14 @@ now provided with the Smarty instance. New footprint:
  * Default Template Handler
  *
  * called when Smarty's file: resource is unable to load a requested file
- * 
+ *
  * @param string   $type     resource type (e.g. "file", "string", "eval", "resource")
  * @param string   $name     resource name (e.g. "foo/bar.tpl")
  * @param string  &$content  template's content
  * @param integer &$modified template's modification time
  * @param Smarty   $smarty   Smarty instance
- * @return string|boolean   path to file or boolean true if $content and $modified 
- *                          have been filled, boolean false if no default template 
+ * @return string|boolean   path to file or boolean true if $content and $modified
+ *                          have been filled, boolean false if no default template
  *                          could be loaded
  */
 function default_template_handler_func($type, $name, &$content, &$modified, Smarty $smarty) {
@@ -126,7 +126,7 @@ run on variable output.
 SYNTAX:
 {setfilter filter1|filter2|filter3....}
 Smarty3 will lookup up matching filters in the following search order:
-1. varibale filter plugin in plugins_dir.
+1. variable filter plugin in plugins_dir.
 2. a valid modifier. A modifier specification will also accept
 additional parameter like filter2:'foo'
 3. a PHP function
@@ -186,8 +186,8 @@ Note that old-fashioned registration of $cache_handler is not possible
 anymore. As the functionality had not been ported to Smarty 3.0.x
 properly, it has been dropped from 3.1 completely.
 
-Locking facilities have been implemented to avoid concurrent cache 
-generation. Enable cache locking by setting 
+Locking facilities have been implemented to avoid concurrent cache
+generation. Enable cache locking by setting
 $smarty->cache_locking = true;
 
   Relative Paths in Templates (File-Resource)
@@ -258,7 +258,7 @@ default_config_handler_func() has been introduced.
 
   default_plugin_handler_func()
 
-An optional default_plugin_handler_func() can be defined which gets called 
+An optional default_plugin_handler_func() can be defined which gets called
 by the compiler on tags which can't be resolved internally or by plugins.
 The default_plugin_handler() can map tags to plugins on the fly.
 

TODO.md

@@ -0,0 +1,2 @@
+# Pre-release Todos
+

composer.json

@@ -2,7 +2,9 @@
     "name": "smarty/smarty",
     "type": "library",
     "description": "Smarty - the compiling PHP template engine",
-    "keywords": ["templating"],
+    "keywords": [
+        "templating"
+    ],
     "homepage": "http://www.smarty.net",
     "license": "LGPL-3.0",
     "authors": [
@@ -21,7 +23,7 @@
     ],
     "support": {
         "irc": "irc://irc.freenode.org/smarty",
-        "issues": "http://code.google.com/p/smarty-php/issues/list",
+        "issues": "https://github.com/smarty-php/smarty/issues",
         "forum": "http://www.smarty.net/forums/"
     },
     "require": {
@@ -29,15 +31,16 @@
     },
     "autoload": {
         "classmap": [
-            "libs/Smarty.class.php",
-            "libs/SmartyBC.class.php",
-            "libs/sysplugins/smarty_security.php"
+            "libs/"
         ]
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.1.x-dev"
         }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
+        "smarty/smarty-lexer": "^3.1"
     }
-
 }

demo/index.php

@@ -1,30 +1,35 @@
 <?php
- /**
+/**
  * Example Application
-
+ *
  * @package Example-application
  */
-
 require '../libs/Smarty.class.php';
-
 $smarty = new Smarty;
-
 //$smarty->force_compile = true;
 $smarty->debugging = true;
 $smarty->caching = true;
 $smarty->cache_lifetime = 120;
-
-$smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill",true);
-$smarty->assign("FirstName",array("John","Mary","James","Henry"));
-$smarty->assign("LastName",array("Doe","Smith","Johnson","Case"));
-$smarty->assign("Class",array(array("A","B","C","D"), array("E", "F", "G", "H"),
-      array("I", "J", "K", "L"), array("M", "N", "O", "P")));
-
-$smarty->assign("contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"),
-      array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")));
-
-$smarty->assign("option_values", array("NY","NE","KS","IA","OK","TX"));
-$smarty->assign("option_output", array("New York","Nebraska","Kansas","Iowa","Oklahoma","Texas"));
+$smarty->assign("Name", "Fred Irving Johnathan Bradley Peppergill", true);
+$smarty->assign("FirstName", array("John", "Mary", "James", "Henry"));
+$smarty->assign("LastName", array("Doe", "Smith", "Johnson", "Case"));
+$smarty->assign(
+    "Class",
+    array(
+        array("A", "B", "C", "D"),
+        array("E", "F", "G", "H"),
+        array("I", "J", "K", "L"),
+        array("M", "N", "O", "P")
+    )
+);
+$smarty->assign(
+    "contacts",
+    array(
+        array("phone" => "1", "fax" => "2", "cell" => "3"),
+        array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")
+    )
+);
+$smarty->assign("option_values", array("NY", "NE", "KS", "IA", "OK", "TX"));
+$smarty->assign("option_output", array("New York", "Nebraska", "Kansas", "Iowa", "Oklahoma", "Texas"));
 $smarty->assign("option_selected", "NE");
-
 $smarty->display('index.tpl');

demo/plugins/cacheresource.apc.php

@@ -2,15 +2,20 @@
 
 /**
  * APC CacheResource
- *
  * CacheResource Implementation based on the KeyValueStore API to use
  * memcache as the storage resource for Smarty's output caching.
  * *
+ *
  * @package CacheResource-examples
- * @author Uwe Tews
+ * @author  Uwe Tews
  */
 class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
 {
+    /**
+     * Smarty_CacheResource_Apc constructor.
+     *
+     * @throws \Exception
+     */
     public function __construct()
     {
         // test if APC is present
@@ -22,7 +27,8 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
     /**
      * 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
      * @return boolean true on success, false on failure
      */
@@ -31,32 +37,32 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
         $_res = array();
         $res = apc_fetch($keys);
         foreach ($res as $k => $v) {
-            $_res[$k] = $v;
+            $_res[ $k ] = $v;
         }
-
         return $_res;
     }
 
     /**
      * 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
      */
-    protected function write(array $keys, $expire=null)
+    protected function write(array $keys, $expire = null)
     {
         foreach ($keys as $k => $v) {
             apc_store($k, $v, $expire);
         }
-
         return true;
     }
 
     /**
      * 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
      */
     protected function delete(array $keys)
@@ -64,7 +70,6 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
         foreach ($keys as $k) {
             apc_delete($k);
         }
-
         return true;
     }
 

demo/plugins/cacheresource.memcache.php

@@ -2,75 +2,80 @@
 
 /**
  * Memcache CacheResource
- *
  * CacheResource Implementation based on the KeyValueStore API to use
  * memcache as the storage resource for Smarty's output caching.
- *
  * Note that memcache has a limitation of 256 characters per cache-key.
  * To avoid complications all cache-keys are translated to a sha1 hash.
  *
  * @package CacheResource-examples
- * @author Rodney Rehm
+ * @author  Rodney Rehm
  */
 class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
 {
     /**
      * memcache instance
+     *
      * @var Memcache
      */
     protected $memcache = null;
 
+    /**
+     * Smarty_CacheResource_Memcache constructor.
+     */
     public function __construct()
     {
-        $this->memcache = new Memcache();
-        $this->memcache->addServer( '127.0.0.1', 11211 );
+        if (class_exists('Memcached')) {
+            $this->memcache = new Memcached();
+        } else {
+            $this->memcache = new Memcache();
+        }
+        $this->memcache->addServer('127.0.0.1', 11211);
     }
 
     /**
      * 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
      * @return boolean true on success, false on failure
      */
     protected function read(array $keys)
     {
-        $_keys = $lookup = array();
-        foreach ($keys as $k) {
-            $_k = sha1($k);
-            $_keys[] = $_k;
-            $lookup[$_k] = $k;
+        $res = array();
+        foreach ($keys as $key) {
+            $k = sha1($key);
+            $res[$key] = $this->memcache->get($k);
         }
-        $_res = array();
-        $res = $this->memcache->get($_keys);
-        foreach ($res as $k => $v) {
-            $_res[$lookup[$k]] = $v;
-        }
-
-        return $_res;
+        return $res;
     }
 
     /**
      * 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
      */
-    protected function write(array $keys, $expire=null)
+    protected function write(array $keys, $expire = null)
     {
         foreach ($keys as $k => $v) {
             $k = sha1($k);
-            $this->memcache->set($k, $v, 0, $expire);
+            if (class_exists('Memcached')) {
+                $this->memcache->set($k, $v, $expire);
+            } else {
+                $this->memcache->set($k, $v, 0, $expire);
+            }
         }
-
         return true;
     }
 
     /**
      * 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
      */
     protected function delete(array $keys)
@@ -79,7 +84,6 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
             $k = sha1($k);
             $this->memcache->delete($k);
         }
-
         return true;
     }
 

demo/plugins/cacheresource.mysql.php

@@ -2,10 +2,8 @@
 
 /**
  * MySQL CacheResource
- *
  * CacheResource Implementation based on the Custom API to use
  * MySQL as the storage resource for Smarty's output caching.
- *
  * Table definition:
  * <pre>CREATE TABLE IF NOT EXISTS `output_cache` (
  *   `id` CHAR(40) NOT NULL COMMENT 'sha1 hash',
@@ -22,16 +20,35 @@
  * ) ENGINE = InnoDB;</pre>
  *
  * @package CacheResource-examples
- * @author Rodney Rehm
+ * @author  Rodney Rehm
  */
 class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
 {
-    // PDO instance
+    /**
+     * @var \PDO
+     */
     protected $db;
+
+    /**
+     * @var \PDOStatement
+     */
     protected $fetch;
+
+    /**
+     * @var \PDOStatement
+     */
     protected $fetchTimestamp;
+
+    /**
+     * @var \PDOStatement
+     */
     protected $save;
 
+    /**
+     * Smarty_CacheResource_Mysql constructor.
+     *
+     * @throws \SmartyException
+     */
     public function __construct()
     {
         try {
@@ -41,19 +58,22 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
         }
         $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
         $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
-        $this->save = $this->db->prepare('REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
-            VALUES  (:id, :name, :cache_id, :compile_id, :content)');
+        $this->save = $this->db->prepare(
+            'REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
+            VALUES  (:id, :name, :cache_id, :compile_id, :content)'
+        );
     }
 
     /**
      * 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
      */
     protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
@@ -62,8 +82,8 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
         $row = $this->fetch->fetch();
         $this->fetch->closeCursor();
         if ($row) {
-            $content = $row['content'];
-            $mtime = strtotime($row['modified']);
+            $content = $row[ 'content' ];
+            $mtime = strtotime($row[ 'modified' ]);
         } else {
             $content = null;
             $mtime = null;
@@ -73,11 +93,14 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
     /**
      * Fetch cached content's modification timestamp from data source
      *
-     * @note 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
+     * @note 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
+     *
      * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
      */
     protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
@@ -85,41 +108,41 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
         $this->fetchTimestamp->execute(array('id' => $id));
         $mtime = strtotime($this->fetchTimestamp->fetchColumn());
         $this->fetchTimestamp->closeCursor();
-
         return $mtime;
     }
 
     /**
      * 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 time in seconds 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 time in seconds or null
+     * @param string       $content    content to cache
+     *
      * @return boolean      success
      */
     protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
     {
-        $this->save->execute(array(
-            'id' => $id,
-            'name' => $name,
-            'cache_id' => $cache_id,
-            'compile_id' => $compile_id,
-            'content' => $content,
-        ));
-
+        $this->save->execute(
+            array('id' => $id,
+                  'name' => $name,
+                  'cache_id' => $cache_id,
+                  'compile_id' => $compile_id,
+                  'content' => $content,)
+        );
         return !!$this->save->rowCount();
     }
 
     /**
      * Delete content from cache
      *
-     * @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       $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
+     *
      * @return integer      number of deleted caches
      */
     protected function delete($name, $cache_id, $compile_id, $exp_time)
@@ -128,7 +151,6 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
         if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
             // returning the number of deleted caches would require a second query to count them
             $query = $this->db->query('TRUNCATE TABLE output_cache');
-
             return -1;
         }
         // build the filter
@@ -147,12 +169,15 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
         }
         // equal test cache_id and match sub-groups
         if ($cache_id !== null) {
-            $where[] = '(cache_id = '. $this->db->quote($cache_id)
-                . ' OR cache_id LIKE '. $this->db->quote($cache_id .'|%') .')';
+            $where[] =
+                '(cache_id = ' .
+                $this->db->quote($cache_id) .
+                ' OR cache_id LIKE ' .
+                $this->db->quote($cache_id . '|%') .
+                ')';
         }
         // run delete query
         $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
-
         return $query->rowCount();
     }
 }

demo/plugins/cacheresource.pdo.php

@@ -0,0 +1,346 @@
+<?php
+
+/**
+ * PDO Cache Handler
+ * Allows you to store Smarty Cache files into your db.
+ * Example table :
+ * CREATE TABLE `smarty_cache` (
+ * `id` char(40) NOT NULL COMMENT 'sha1 hash',
+ * `name` varchar(250) NOT NULL,
+ * `cache_id` varchar(250) DEFAULT NULL,
+ * `compile_id` varchar(250) DEFAULT NULL,
+ * `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ * `expire` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ * `content` mediumblob NOT NULL,
+ * PRIMARY KEY (`id`),
+ * KEY `name` (`name`),
+ * KEY `cache_id` (`cache_id`),
+ * KEY `compile_id` (`compile_id`),
+ * KEY `modified` (`modified`),
+ * KEY `expire` (`expire`)
+ * ) ENGINE=InnoDB
+ * Example usage :
+ *      $cnx    =   new PDO("mysql:host=localhost;dbname=mydb", "username", "password");
+ *      $smarty->setCachingType('pdo');
+ *      $smarty->loadPlugin('Smarty_CacheResource_Pdo');
+ *      $smarty->registerCacheResource('pdo', new Smarty_CacheResource_Pdo($cnx, 'smarty_cache'));
+ *
+ * @author Beno!t POLASZEK - 2014
+ */
+class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
+{
+    /**
+     * @var string[]
+     */
+    protected $fetchStatements = array('default' => 'SELECT %2$s
+                                                                                    FROM %1$s 
+                                                                                    WHERE 1 
+                                                                                    AND id          = :id 
+                                                                                    AND cache_id    IS NULL 
+                                                                                    AND compile_id  IS NULL',
+                                       'withCacheId' => 'SELECT %2$s
+                                                                                FROM %1$s 
+                                                                                WHERE 1 
+                                                                                AND id          = :id 
+                                                                                AND cache_id    = :cache_id 
+                                                                                AND compile_id  IS NULL',
+                                       'withCompileId' => 'SELECT %2$s
+                                                                                FROM %1$s 
+                                                                                WHERE 1 
+                                                                                AND id          = :id 
+                                                                                AND compile_id  = :compile_id 
+                                                                                AND cache_id    IS NULL',
+                                       'withCacheIdAndCompileId' => 'SELECT %2$s
+                                                                                FROM %1$s 
+                                                                                WHERE 1 
+                                                                                AND id          = :id 
+                                                                                AND cache_id    = :cache_id 
+                                                                                AND compile_id  = :compile_id');
+
+    /**
+     * @var string
+     */
+    protected $insertStatement = 'INSERT INTO %s
+
+                                                SET id          =   :id, 
+                                                    name        =   :name, 
+                                                    cache_id    =   :cache_id, 
+                                                    compile_id  =   :compile_id, 
+                                                    modified    =   CURRENT_TIMESTAMP, 
+                                                    expire      =   DATE_ADD(CURRENT_TIMESTAMP, INTERVAL :expire SECOND), 
+                                                    content     =   :content 
+
+                                                ON DUPLICATE KEY UPDATE 
+                                                    name        =   :name, 
+                                                    cache_id    =   :cache_id, 
+                                                    compile_id  =   :compile_id, 
+                                                    modified    =   CURRENT_TIMESTAMP, 
+                                                    expire      =   DATE_ADD(CURRENT_TIMESTAMP, INTERVAL :expire SECOND), 
+                                                    content     =   :content';
+
+    /**
+     * @var string
+     */
+    protected $deleteStatement = 'DELETE FROM %1$s WHERE %2$s';
+
+    /**
+     * @var string
+     */
+    protected $truncateStatement = 'TRUNCATE TABLE %s';
+
+    /**
+     * @var string
+     */
+    protected $fetchColumns = 'modified, content';
+
+    /**
+     * @var string
+     */
+    protected $fetchTimestampColumns = 'modified';
+
+    /**
+     * @var \PDO
+     */
+    protected $pdo;
+
+    /**
+     * @var
+     */
+    protected $table;
+
+    /**
+     * @var null
+     */
+    protected $database;
+
+    /**
+     * Constructor
+     *
+     * @param PDO    $pdo      PDO : active connection
+     * @param string $table    : table (or view) name
+     * @param string $database : optional - if table is located in another db
+     *
+     * @throws \SmartyException
+     */
+    public function __construct(PDO $pdo, $table, $database = null)
+    {
+        if (is_null($table)) {
+            throw new SmartyException("Table name for caching can't be null");
+        }
+        $this->pdo = $pdo;
+        $this->table = $table;
+        $this->database = $database;
+        $this->fillStatementsWithTableName();
+    }
+
+    /**
+     * Fills the table name into the statements.
+     *
+     * @return $this Current Instance
+     * @access protected
+     */
+    protected function fillStatementsWithTableName()
+    {
+        foreach ($this->fetchStatements as &$statement) {
+            $statement = sprintf($statement, $this->getTableName(), '%s');
+        }
+        $this->insertStatement = sprintf($this->insertStatement, $this->getTableName());
+        $this->deleteStatement = sprintf($this->deleteStatement, $this->getTableName(), '%s');
+        $this->truncateStatement = sprintf($this->truncateStatement, $this->getTableName());
+        return $this;
+    }
+
+    /**
+     * Gets the fetch statement, depending on what you specify
+     *
+     * @param string      $columns    : the column(s) name(s) you want to retrieve from the database
+     * @param string      $id         unique cache content identifier
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
+     *
+     * @access protected
+     * @return \PDOStatement
+     */
+    protected function getFetchStatement($columns, $id, $cache_id = null, $compile_id = null)
+    {
+        $args = array();
+        if (!is_null($cache_id) && !is_null($compile_id)) {
+            $query = $this->fetchStatements[ 'withCacheIdAndCompileId' ] and
+            $args = array('id' => $id, 'cache_id' => $cache_id, 'compile_id' => $compile_id);
+        } elseif (is_null($cache_id) && !is_null($compile_id)) {
+            $query = $this->fetchStatements[ 'withCompileId' ] and
+            $args = array('id' => $id, 'compile_id' => $compile_id);
+        } elseif (!is_null($cache_id) && is_null($compile_id)) {
+            $query = $this->fetchStatements[ 'withCacheId' ] and $args = array('id' => $id, 'cache_id' => $cache_id);
+        } else {
+            $query = $this->fetchStatements[ 'default' ] and $args = array('id' => $id);
+        }
+        $query = sprintf($query, $columns);
+        $stmt = $this->pdo->prepare($query);
+        foreach ($args as $key => $value) {
+            $stmt->bindValue($key, $value);
+        }
+        return $stmt;
+    }
+
+    /**
+     * fetch cached content and its modification time from data source
+     *
+     * @param string      $id         unique cache content identifier
+     * @param string      $name       template name
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
+     * @param string      $content    cached content
+     * @param integer     $mtime      cache modification timestamp (epoch)
+     *
+     * @return void
+     * @access protected
+     */
+    protected function fetch($id, $name, $cache_id = null, $compile_id = null, &$content, &$mtime)
+    {
+        $stmt = $this->getFetchStatement($this->fetchColumns, $id, $cache_id, $compile_id);
+        $stmt->execute();
+        $row = $stmt->fetch();
+        $stmt->closeCursor();
+        if ($row) {
+            $content = $this->outputContent($row[ 'content' ]);
+            $mtime = strtotime($row[ 'modified' ]);
+        } else {
+            $content = null;
+            $mtime = null;
+        }
+    }
+
+    /**
+     * Fetch cached content's modification timestamp from data source
+     * {@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|null $cache_id   cache id
+     * @param string|null $compile_id compile id
+     *
+     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     * @access protected
+     */
+    //    protected function fetchTimestamp($id, $name, $cache_id = null, $compile_id = null) {
+    //        $stmt       =   $this->getFetchStatement($this->fetchTimestampColumns, $id, $cache_id, $compile_id);
+    //        $stmt       ->  execute();
+    //        $mtime      =   strtotime($stmt->fetchColumn());
+    //        $stmt       ->  closeCursor();
+    //        return $mtime;
+    //    }
+    /**
+     * Save content to cache
+     *
+     * @param string       $id         unique cache content identifier
+     * @param string       $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       $content    content to cache
+     *
+     * @return boolean success
+     * @access protected
+     */
+    protected function save($id, $name, $cache_id = null, $compile_id = null, $exp_time, $content)
+    {
+        $stmt = $this->pdo->prepare($this->insertStatement);
+        $stmt->bindValue('id', $id);
+        $stmt->bindValue('name', $name);
+        $stmt->bindValue('cache_id', $cache_id, (is_null($cache_id)) ? PDO::PARAM_NULL : PDO::PARAM_STR);
+        $stmt->bindValue('compile_id', $compile_id, (is_null($compile_id)) ? PDO::PARAM_NULL : PDO::PARAM_STR);
+        $stmt->bindValue('expire', (int)$exp_time, PDO::PARAM_INT);
+        $stmt->bindValue('content', $this->inputContent($content));
+        $stmt->execute();
+        return !!$stmt->rowCount();
+    }
+
+    /**
+     * Encodes the content before saving to database
+     *
+     * @param string $content
+     *
+     * @return string $content
+     * @access protected
+     */
+    protected function inputContent($content)
+    {
+        return $content;
+    }
+
+    /**
+     * Decodes the content before saving to database
+     *
+     * @param string $content
+     *
+     * @return string $content
+     * @access protected
+     */
+    protected function outputContent($content)
+    {
+        return $content;
+    }
+
+    /**
+     * 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|-1 $exp_time   seconds till expiration or null
+     *
+     * @return integer number of deleted caches
+     * @access             protected
+     */
+    protected function delete($name = null, $cache_id = null, $compile_id = null, $exp_time = null)
+    {
+        // delete the whole cache
+        if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
+            // returning the number of deleted caches would require a second query to count them
+            $this->pdo->query($this->truncateStatement);
+            return -1;
+        }
+        // build the filter
+        $where = array();
+        // equal test name
+        if ($name !== null) {
+            $where[] = 'name = ' . $this->pdo->quote($name);
+        }
+        // equal test cache_id and match sub-groups
+        if ($cache_id !== null) {
+            $where[] =
+                '(cache_id = ' .
+                $this->pdo->quote($cache_id) .
+                ' OR cache_id LIKE ' .
+                $this->pdo->quote($cache_id . '|%') .
+                ')';
+        }
+        // equal test compile_id
+        if ($compile_id !== null) {
+            $where[] = 'compile_id = ' . $this->pdo->quote($compile_id);
+        }
+        // for clearing expired caches
+        if ($exp_time === Smarty::CLEAR_EXPIRED) {
+            $where[] = 'expire < CURRENT_TIMESTAMP';
+        } // range test expiration time
+        elseif ($exp_time !== null) {
+            $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
+        }
+        // run delete query
+        $query = $this->pdo->query(sprintf($this->deleteStatement, join(' AND ', $where)));
+        return $query->rowCount();
+    }
+
+    /**
+     * Gets the formatted table name
+     *
+     * @return string
+     * @access protected
+     */
+    protected function getTableName()
+    {
+        return (is_null($this->database)) ? "`{$this->table}`" : "`{$this->database}`.`{$this->table}`";
+    }
+}

demo/plugins/cacheresource.pdo_gzip.php

@@ -0,0 +1,42 @@
+<?php
+require_once 'cacheresource.pdo.php';
+
+/**
+ * PDO Cache Handler with GZIP support
+ * Example usage :
+ *      $cnx    =   new PDO("mysql:host=localhost;dbname=mydb", "username", "password");
+ *      $smarty->setCachingType('pdo_gzip');
+ *      $smarty->loadPlugin('Smarty_CacheResource_Pdo_Gzip');
+ *      $smarty->registerCacheResource('pdo_gzip', new Smarty_CacheResource_Pdo_Gzip($cnx, 'smarty_cache'));
+ *
+ * @require Smarty_CacheResource_Pdo class
+ * @author  Beno!t POLASZEK - 2014
+ */
+class Smarty_CacheResource_Pdo_Gzip extends Smarty_CacheResource_Pdo
+{
+    /**
+     * Encodes the content before saving to database
+     *
+     * @param string $content
+     *
+     * @return string $content
+     * @access protected
+     */
+    protected function inputContent($content)
+    {
+        return gzdeflate($content);
+    }
+
+    /**
+     * Decodes the content before saving to database
+     *
+     * @param string $content
+     *
+     * @return string $content
+     * @access protected
+     */
+    protected function outputContent($content)
+    {
+        return gzinflate($content);
+    }
+}

demo/plugins/resource.extendsall.php

@@ -2,57 +2,61 @@
 
 /**
  * Extends All Resource
- *
  * Resource Implementation modifying the extends-Resource to walk
  * through the template_dirs and inherit all templates of the same name
  *
  * @package Resource-examples
- * @author Rodney Rehm
+ * @author  Rodney Rehm
  */
 class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends
 {
     /**
      * 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
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $uid = '';
         $sources = array();
-        $exists = true;
-        foreach ($_template->smarty->getTemplateDir() as $key => $directory) {
+        $timestamp = 0;
+        foreach ($source->smarty->getTemplateDir() as $key => $directory) {
             try {
-                $s = Smarty_Resource::source(null, $source->smarty, '[' . $key . ']' . $source->name );
+                $s = Smarty_Resource::source(null, $source->smarty, 'file:' . '[' . $key . ']' . $source->name);
                 if (!$s->exists) {
                     continue;
                 }
-                $sources[$s->uid] = $s;
+                $sources[ $s->uid ] = $s;
                 $uid .= $s->filepath;
-            } catch (SmartyException $e) {}
+                $timestamp = $s->timestamp > $timestamp ? $s->timestamp : $timestamp;
+            } catch (SmartyException $e) {
+            }
         }
-
         if (!$sources) {
             $source->exists = false;
-            $source->template = $_template;
-
             return;
         }
-
         $sources = array_reverse($sources, true);
         reset($sources);
         $s = current($sources);
-
         $source->components = $sources;
         $source->filepath = $s->filepath;
-        $source->uid = sha1($uid);
-        $source->exists = $exists;
-        if ($_template && $_template->smarty->compile_check) {
-            $source->timestamp = $s->timestamp;
-        }
-        // need the template at getContent()
-        $source->template = $_template;
+        $source->uid = sha1($uid . $source->smarty->_joined_template_dir);
+        $source->exists = true;
+        $source->timestamp = $timestamp;
+    }
+
+    /**
+     * Disable timestamp checks for extendsall resource.
+     * The individual source components will be checked.
+     *
+     * @return bool false
+     */
+    public function checkTimestamps()
+    {
+        return false;
     }
 }

demo/plugins/resource.mysql.php

@@ -2,10 +2,8 @@
 
 /**
  * MySQL Resource
- *
  * Resource Implementation based on the Custom API to use
  * MySQL as the storage resource for Smarty's templates and configs.
- *
  * Table definition:
  * <pre>CREATE TABLE IF NOT EXISTS `templates` (
  *   `name` varchar(100) NOT NULL,
@@ -13,22 +11,42 @@
  *   `source` text,
  *   PRIMARY KEY (`name`)
  * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
- *
  * Demo data:
- * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
+ * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello
+ * world"}{$x}');</pre>
+ *
  *
  * @package Resource-examples
- * @author Rodney Rehm
+ * @author  Rodney Rehm
  */
 class Smarty_Resource_Mysql extends Smarty_Resource_Custom
 {
-    // PDO instance
+    /**
+     * PDO instance
+     *
+     * @var \PDO
+     */
     protected $db;
-    // prepared fetch() statement
+
+    /**
+     * prepared fetch() statement
+     *
+     * @var \PDOStatement
+     */
     protected $fetch;
-    // prepared fetchTimestamp() statement
+
+    /**
+     * prepared fetchTimestamp() statement
+     *
+     * @var \PDOStatement
+     */
     protected $mtime;
 
+    /**
+     * Smarty_Resource_Mysql constructor.
+     *
+     * @throws \SmartyException
+     */
     public function __construct()
     {
         try {
@@ -43,9 +61,10 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom
     /**
      * Fetch a template and its modification time from database
      *
-     * @param  string  $name   template name
-     * @param  string  $source template source
-     * @param  integer $mtime  template modification timestamp (epoch)
+     * @param string  $name   template name
+     * @param string  $source template source
+     * @param integer $mtime  template modification timestamp (epoch)
+     *
      * @return void
      */
     protected function fetch($name, &$source, &$mtime)
@@ -54,8 +73,8 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom
         $row = $this->fetch->fetch();
         $this->fetch->closeCursor();
         if ($row) {
-            $source = $row['source'];
-            $mtime = strtotime($row['modified']);
+            $source = $row[ 'source' ];
+            $mtime = strtotime($row[ 'modified' ]);
         } else {
             $source = null;
             $mtime = null;
@@ -65,8 +84,11 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom
     /**
      * Fetch a template's modification time from database
      *
-     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
-     * @param  string  $name template name
+     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than
+     *       loading the comple template source.
+     *
+     * @param string $name template name
+     *
      * @return integer timestamp (epoch) the template was modified
      */
     protected function fetchTimestamp($name)
@@ -74,7 +96,6 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom
         $this->mtime->execute(array('name' => $name));
         $mtime = $this->mtime->fetchColumn();
         $this->mtime->closeCursor();
-
         return strtotime($mtime);
     }
 }

demo/plugins/resource.mysqls.php

@@ -2,13 +2,10 @@
 
 /**
  * MySQL Resource
- *
  * Resource Implementation based on the Custom API to use
  * MySQL as the storage resource for Smarty's templates and configs.
- *
  * Note that this MySQL implementation fetches the source and timestamps in
  * a single database query, instead of two separate like resource.mysql.php does.
- *
  * Table definition:
  * <pre>CREATE TABLE IF NOT EXISTS `templates` (
  *   `name` varchar(100) NOT NULL,
@@ -16,20 +13,35 @@
  *   `source` text,
  *   PRIMARY KEY (`name`)
  * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
- *
  * Demo data:
- * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
+ * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello
+ * world"}{$x}');</pre>
+ *
  *
  * @package Resource-examples
- * @author Rodney Rehm
+ * @author  Rodney Rehm
  */
 class Smarty_Resource_Mysqls extends Smarty_Resource_Custom
 {
-    // PDO instance
+    /**
+     * PDO instance
+     *
+     * @var \PDO
+     */
     protected $db;
-    // prepared fetch() statement
+
+    /**
+     * prepared fetch() statement
+     *
+     * @var \PDOStatement
+     */
     protected $fetch;
 
+    /**
+     * Smarty_Resource_Mysqls constructor.
+     *
+     * @throws \SmartyException
+     */
     public function __construct()
     {
         try {
@@ -43,9 +55,10 @@ class Smarty_Resource_Mysqls extends Smarty_Resource_Custom
     /**
      * Fetch a template and its modification time from database
      *
-     * @param  string  $name   template name
-     * @param  string  $source template source
-     * @param  integer $mtime  template modification timestamp (epoch)
+     * @param string  $name   template name
+     * @param string  $source template source
+     * @param integer $mtime  template modification timestamp (epoch)
+     *
      * @return void
      */
     protected function fetch($name, &$source, &$mtime)
@@ -54,8 +67,8 @@ class Smarty_Resource_Mysqls extends Smarty_Resource_Custom
         $row = $this->fetch->fetch();
         $this->fetch->closeCursor();
         if ($row) {
-            $source = $row['source'];
-            $mtime = strtotime($row['modified']);
+            $source = $row[ 'source' ];
+            $mtime = strtotime($row[ 'modified' ]);
         } else {
             $source = null;
             $mtime = null;

demo/templates/index.tpl

@@ -4,18 +4,18 @@
 <PRE>
 
 {* bold and title are read from the config file *}
-{if #bold#}<b>{/if}
-{* capitalize the first letters of each word of the title *}
-Title: {#title#|capitalize}
-{if #bold#}</b>{/if}
+    {if #bold#}<b>{/if}
+        {* capitalize the first letters of each word of the title *}
+        Title: {#title#|capitalize}
+        {if #bold#}</b>{/if}
 
-The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
+    The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
 
-The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME}
+    The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME}
 
-Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
+    Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
 
-The value of {ldelim}$Name{rdelim} is <b>{$Name}</b>
+    The value of {ldelim}$Name{rdelim} is <b>{$Name}</b>
 
 variable modifier example of {ldelim}$Name|upper{rdelim}
 
@@ -24,59 +24,64 @@ variable modifier example of {ldelim}$Name|upper{rdelim}
 
 An example of a section loop:
 
-{section name=outer 
-loop=$FirstName}
-{if $smarty.section.outer.index is odd by 2}
-	{$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
-{else}
-	{$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
-{/if}
-{sectionelse}
-	none
-{/section}
+    {section name=outer
+    loop=$FirstName}
+        {if $smarty.section.outer.index is odd by 2}
+            {$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
+        {else}
+            {$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
+        {/if}
+        {sectionelse}
+        none
+    {/section}
 
-An example of section looped key values:
+    An example of section looped key values:
 
-{section name=sec1 loop=$contacts}
-	phone: {$contacts[sec1].phone}<br>
-	fax: {$contacts[sec1].fax}<br>
-	cell: {$contacts[sec1].cell}<br>
-{/section}
-<p>
+    {section name=sec1 loop=$contacts}
+        phone: {$contacts[sec1].phone}
+        <br>
 
-testing strip tags
-{strip}
+            fax: {$contacts[sec1].fax}
+        <br>
+
+            cell: {$contacts[sec1].cell}
+        <br>
+    {/section}
+    <p>
+
+        testing strip tags
+        {strip}
 <table border=0>
-	<tr>
-		<td>
-			<A HREF="{$SCRIPT_NAME}">
-			<font color="red">This is a  test     </font>
-			</A>
-		</td>
-	</tr>
+    <tr>
+        <td>
+            <A HREF="{$SCRIPT_NAME}">
+                <font color="red">This is a test </font>
+            </A>
+        </td>
+    </tr>
 </table>
-{/strip}
+    {/strip}
 
 </PRE>
 
 This is an example of the html_select_date function:
 
 <form>
-{html_select_date start_year=1998 end_year=2010}
+    {html_select_date start_year=1998 end_year=2010}
 </form>
 
 This is an example of the html_select_time function:
 
 <form>
-{html_select_time use_24_hours=false}
+    {html_select_time use_24_hours=false}
 </form>
 
 This is an example of the html_options function:
 
 <form>
-<select name=states>
-{html_options values=$option_values selected=$option_selected output=$option_output}
-</select>
+    <select name=states>
+        {html_options values=$option_values selected=$option_selected output=$option_output}
+    </select>
 </form>
 
 {include file="footer.tpl"}

lexer/smarty_internal_configfilelexer.plex

@@ -0,0 +1,318 @@
+<?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_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
+{
+    /**
+     * 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');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @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
+    );
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    public function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        $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->line = 1;
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
+    }
+
+   public function replace ($input) {
+        return $input;
+   }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+
+/*!lex2php
+%input $this->data
+%counter $this->counter
+%token $this->token
+%value $this->value
+%line $this->line
+commentstart = /#|;/
+openB = /\[/
+closeB = /\]/
+section = /.*?(?=[\.=\[\]\r\n])/
+equal = /=/
+whitespace = /[ \t\r]+/
+dot = /\./
+id = /[0-9]*[a-zA-Z_]\w*/
+newline = /\n/
+single_quoted_string = /'[^'\\]*(?:\\.[^'\\]*)*'(?=[ \t\r]*[\n#;])/
+double_quoted_string = /"[^"\\]*(?:\\.[^"\\]*)*"(?=[ \t\r]*[\n#;])/
+tripple_quotes = /"""/
+tripple_quotes_end = /"""(?=[ \t\r]*[\n#;])/
+text = /[\S\s]/
+float = /\d+\.\d+(?=[ \t\r]*[\n#;])/
+int = /\d+(?=[ \t\r]*[\n#;])/
+maybe_bool = /[a-zA-Z]+(?=[ \t\r]*[\n#;])/
+naked_string = /[^\n]+?(?=[ \t\r]*\n)/
+*/
+
+/*!lex2php
+%statename START
+
+commentstart {
+    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+    $this->yypushstate(self::COMMENT);
+}
+openB {
+    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+    $this->yypushstate(self::SECTION);
+}
+closeB {
+    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+}
+equal {
+    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+    $this->yypushstate(self::VALUE);
+}
+whitespace {
+    return false;
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+}
+id {
+    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+}
+text {
+    $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+}
+
+*/
+
+/*!lex2php
+%statename VALUE
+
+whitespace {
+    return false;
+}
+float {
+    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+    $this->yypopstate();
+}
+int {
+    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+    $this->yypopstate();
+}
+tripple_quotes {
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+    $this->yypushstate(self::TRIPPLE);
+}
+single_quoted_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+    $this->yypopstate();
+}
+double_quoted_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+}
+maybe_bool {
+    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();
+    }
+}
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->value = '';
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename NAKED_STRING_VALUE
+
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename COMMENT
+
+whitespace {
+    return false;
+}
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename SECTION
+
+dot {
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+}
+section {
+    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+    $this->yypopstate();
+}
+
+*/
+/*!lex2php
+%statename TRIPPLE
+
+tripple_quotes_end {
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+    $this->yypopstate();
+    $this->yypushstate(self::START);
+}
+text {
+  $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;
+}
+*/
+
+}

lexer/smarty_internal_configfileparser.y

@@ -0,0 +1,346 @@
+/**
+* Smarty Internal Plugin Configfileparser
+*
+* This is the config file parser
+* 
+* 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews
+*/
+%name TPC_
+%declare_class {
+/**
+* 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
+}
+%include_class
+{
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+    /**
+     * @var
+     */
+    public $yymajor;
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Configfilelexer
+     */
+    private $lex;
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    public $compiler = null;
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * 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('\\' => '\\',
+                                           '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Configfilelexer      $lex
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    public function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        $this->lex = $lex;
+        $this->smarty = $compiler->smarty;
+        $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    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 = '';
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
+                }
+            }
+            $str .= $s;
+        }
+        return $str;
+    }
+
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
+        return stripcslashes($inner_str);
+    }
+
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    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]);
+        }
+    }
+}
+
+%token_prefix TPC_
+
+%parse_accept
+{
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+}
+
+%syntax_error
+{
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_config_file_error();
+}
+
+%stack_overflow
+{
+    $this->internalError = true;
+    $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
+}
+
+// Complete config file
+start(res) ::= global_vars sections. {
+    res = null;
+}
+
+// Global vars
+global_vars(res) ::= var_list(vl). {
+    $this->add_global_vars(vl);
+    res = null;
+}
+
+// Sections
+sections(res) ::= sections section. {
+    res = null;
+}
+
+sections(res) ::= . {
+    res = null;
+}
+
+section(res) ::= OPENB SECTION(i) CLOSEB newline var_list(vars). {
+    $this->add_section_vars(i, vars);
+    res = null;
+}
+
+section(res) ::= OPENB DOT SECTION(i) CLOSEB newline var_list(vars). {
+    if ($this->configReadHidden) {
+        $this->add_section_vars(i, vars);
+    }
+    res = null;
+}
+
+// Var list
+var_list(res) ::= var_list(vl) newline. {
+    res = vl;
+}
+
+var_list(res) ::= var_list(vl) var(v). {
+    res = array_merge(vl, array(v));
+}
+
+var_list(res) ::= . {
+    res = array();
+}
+
+
+// Var
+var(res) ::= ID(id) EQUAL value(v). {
+    res = array('key' => id, 'value' => v);
+}
+
+
+value(res) ::= FLOAT(i). {
+    res = (float) i;
+}
+
+value(res) ::= INT(i). {
+    res = (int) i;
+}
+
+value(res) ::= BOOL(i). {
+    res = $this->parse_bool(i);
+}
+
+value(res) ::= SINGLE_QUOTED_STRING(i). {
+    res = self::parse_single_quoted_string(i);
+}
+
+value(res) ::= DOUBLE_QUOTED_STRING(i). {
+    res = self::parse_double_quoted_string(i);
+}
+
+value(res) ::= TRIPPLE_QUOTES(i) TRIPPLE_TEXT(c) TRIPPLE_QUOTES_END(ii). {
+    res = self::parse_tripple_double_quoted_string(c);
+}
+
+value(res) ::= TRIPPLE_QUOTES(i) TRIPPLE_QUOTES_END(ii). {
+    res = '';
+}
+
+value(res) ::= NAKED_STRING(i). {
+    res = i;
+}
+
+// NOTE: this is not a valid rule
+// It is added hier to produce a usefull error message on a missing '=';
+value(res) ::= OTHER(i). {
+    res = i;
+}
+
+
+// Newline and comments
+newline(res) ::= NEWLINE. {
+    res = null;
+}
+
+newline(res) ::= COMMENTSTART NEWLINE. {
+    res = null;
+}
+
+newline(res) ::= COMMENTSTART NAKED_STRING NEWLINE. {
+    res = null;
+}

lexer/smarty_internal_templatelexer.plex

@@ -0,0 +1,696 @@
+<?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_Templatelexer
+ * This is the template file lexer.
+ * It is generated from the smarty_internal_templatelexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Templatelexer
+{
+    /**
+     * 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;
+
+    /**
+     * tag start line
+     *
+     * @var
+     */
+    public $taglineno;
+
+    /**
+     * php code type
+     *
+     * @var string
+     */
+    public $phpType = '';
+
+   /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+     * XML flag true while processing xml
+     *
+     * @var bool
+     */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * 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;
+
+    /**
+     * preg token pattern for state DOUBLEQUOTEDSTRING
+     *
+     * @var null
+     */
+    private $yy_global_pattern5 = null;
+
+    /**
+     * preg token pattern for text
+     *
+     * @var null
+     */
+    private $yy_global_text = null;
+
+    /**
+     * preg token pattern for literal
+     *
+     * @var null
+     */
+    private $yy_global_literal = null;
+
+    /**
+     * constructor
+     *
+     * @param   string                             $source template source
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $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->line = 1;
+        $this->smarty = $compiler->template->smarty;
+        $this->compiler = $compiler;
+        $this->compiler->initDelimiterPreg();
+        $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter();
+        $this->smarty_token_names['RDEL'] = $this->smarty->getRightDelimiter();
+    }
+
+    /**
+     * open lexer/parser trace file
+     *
+     */
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+   /**
+     * replace placeholders with runtime preg  code
+     *
+     * @param string $preg
+     *
+     * @return string
+     */
+   public function replace($preg)
+   {
+        return $this->compiler->replaceDelimiter($preg);
+   }
+
+    /**
+     * 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;
+    }
+
+     /*!lex2php
+     %input $this->data
+     %counter $this->counter
+     %token $this->token
+     %value $this->value
+     %line $this->line
+     userliteral = ~(SMARTYldel)SMARTYautoliteral\s+SMARTYliteral~
+     char = ~[\S\s]~
+     textdoublequoted = ~([^"\\]*?)((?:\\.[^"\\]*?)*?)(?=((SMARTYldel)SMARTYal|\$|`\$|"SMARTYliteral))~
+     namespace = ~([0-9]*[a-zA-Z_]\w*)?(\\[0-9]*[a-zA-Z_]\w*)+~
+     emptyjava = ~[{][}]~
+     phptag = ~(SMARTYldel)SMARTYalphp([ ].*?)?SMARTYrdel|(SMARTYldel)SMARTYal[/]phpSMARTYrdel~
+     phpstart = ~[<][?]((php\s+|=)|\s+)|[<][%]|[<][?]xml\s+|[<]script\s+language\s*=\s*["']?\s*php\s*["']?\s*[>]|[?][>]|[%][>]~
+     slash = ~[/]~
+     ldel = ~(SMARTYldel)SMARTYal~
+     rdel = ~\s*SMARTYrdel~
+     nocacherdel = ~(\s+nocache)?\s*SMARTYrdel~
+     smartyblockchildparent = ~[\$]smarty\.block\.(child|parent)~
+     integer = ~\d+~
+     hex =  ~0[xX][0-9a-fA-F]+~
+     math = ~\s*([*]{1,2}|[%/^&]|[<>]{2})\s*~
+     comment = ~(SMARTYldel)SMARTYal[*]~
+     incdec = ~([+]|[-]){2}~
+     unimath = ~\s*([+]|[-])\s*~
+     openP = ~\s*[(]\s*~
+     closeP = ~\s*[)]~
+     openB = ~\[\s*~
+     closeB = ~\s*\]~
+     dollar = ~[$]~
+     dot = ~[.]~
+     comma = ~\s*[,]\s*~
+     doublecolon = ~[:]{2}~
+     colon = ~\s*[:]\s*~
+     at = ~[@]~
+     hatch = ~[#]~
+     semicolon = ~\s*[;]\s*~
+     equal = ~\s*[=]\s*~
+     space = ~\s+~
+     ptr = ~\s*[-][>]\s*~
+     aptr = ~\s*[=][>]\s*~
+     singlequotestring = ~'[^'\\]*(?:\\.[^'\\]*)*'~
+     backtick = ~[`]~
+     vert = ~[|][@]?~
+     qmark = ~\s*[?]\s*~
+     constant = ~[_]+[A-Z0-9][0-9A-Z_]*|[A-Z][0-9A-Z_]*(?![0-9A-Z_]*[a-z])~
+     attr = ~\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\s*[=]\s*~
+     id = ~[0-9]*[a-zA-Z_]\w*~
+     literal = ~literal~
+     strip = ~strip~
+     lop = ~\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\s*~
+     slop = ~\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\s+~
+     tlop = ~\s+is\s+(not\s+)?(odd|even|div)\s+by\s+~
+     scond = ~\s+is\s+(not\s+)?(odd|even)~
+     isin = ~\s+is\s+in\s+~
+     as = ~\s+as\s+~
+     to = ~\s+to\s+~
+     step = ~\s+step\s+~
+     if = ~(if|elseif|else if|while)\s+~
+     for = ~for\s+~
+     makenocache = ~make_nocache\s+~
+     array = ~array~
+     foreach = ~foreach(?![^\s])~
+     setfilter = ~setfilter\s+~
+     instanceof = ~\s+instanceof\s+~
+     not = ~[!]\s*|not\s+~
+     typecast = ~[(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\s*~
+     double_quote = ~["]~
+     */
+     /*!lex2php
+     %statename TEXT
+     emptyjava {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     comment {
+       $to = $this->dataLength;
+       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->getRightDelimiter()}'");
+        }
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        return false;
+     }
+     phptag {
+        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
+     }
+     userliteral {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel literal rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+        $this->yypushstate(self::LITERAL);
+     }
+     ldel slash literal rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+        $this->yypushstate(self::LITERAL);
+     }
+     ldel {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     phpstart {
+        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
+     }
+     char {
+       if (!isset($this->yy_global_text)) {
+           $this->yy_global_text = $this->replace('/(SMARTYldel)SMARTYal|[<][?]((php\s+|=)|\s+)|[<][%]|[<][?]xml\s+|[<]script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*[>]|[?][>]|[%][>]SMARTYliteral/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_text, $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;
+     }
+     */
+     /*!lex2php
+     %statename TAG
+     ldel if {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel for {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel foreach {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel setfilter {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel makenocache {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel id nocacherdel {
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
+     }
+     ldel smartyblockchildparent rdel {
+         $this->yypopstate();
+         $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+         $this->taglineno = $this->line;
+     }
+     ldel slash id rdel {
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+     }
+     ldel dollar id nocacherdel {
+        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->getLeftDelimiter();
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+        }
+     }
+     ldel slash {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel {
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     */
+     /*!lex2php
+     %statename TAGBODY
+     rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->yypopstate();
+     }
+     ldel {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     double_quote {
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+        $this->compiler->enterDoubleQuote();
+     }
+     singlequotestring {
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+     }
+     dollar id {
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+     }
+     dollar {
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+     }
+     isin {
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+     }
+     as {
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
+     }
+     to {
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
+     }
+     step {
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
+     }
+     instanceof {
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+     }
+     lop {
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+     }
+     slop {
+        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+     }
+     tlop {
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+     }
+     scond {
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+     }
+     not{
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+     }
+     typecast {
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+     }
+     openP {
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+     }
+     closeP {
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+     }
+     openB {
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+     }
+     closeB {
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+     }
+     ptr {
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
+     }
+     aptr {
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
+     }
+     equal {
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+     }
+     incdec {
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+     }
+     unimath {
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+     }
+     math {
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
+     }
+     at {
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
+     }
+     array openP {
+        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
+     }
+     hatch {
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+     }
+     attr {
+        // 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;
+        }
+     }
+     namespace {
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+     }
+     id {
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
+     }
+     integer {
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+     }
+     backtick {
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->yypopstate();
+     }
+     vert {
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+     }
+     dot {
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
+     }
+     comma {
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+     }
+     semicolon {
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+     }
+     doublecolon {
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+     }
+     colon {
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
+     }
+     qmark {
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+     }
+     hex {
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
+     }
+     space {
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+     }
+     char {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     */
+
+     /*!lex2php
+     %statename LITERAL
+     ldel literal rdel {
+        $this->literal_cnt++;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+     }
+     ldel slash literal rdel {
+        if ($this->literal_cnt) {
+             $this->literal_cnt--;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+            $this->yypopstate();
+        }
+     }
+     char {
+       if (!isset($this->yy_global_literal)) {
+           $this->yy_global_literal = $this->replace('/(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_literal, $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;
+     }
+     */
+     /*!lex2php
+     %statename DOUBLEQUOTEDSTRING
+     userliteral {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel literal rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel slash literal rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel slash {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     ldel id {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     ldel {
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->taglineno = $this->line;
+        $this->yypushstate(self::TAGBODY);
+     }
+     double_quote {
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypopstate();
+     }
+     backtick dollar {
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->value = substr($this->value,0,-1);
+        $this->yypushstate(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     dollar id {
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+     }
+     dollar {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     textdoublequoted {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     char {
+        $to = $this->dataLength;
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+    */
+  }
+
+     

libs/Autoloader.php

@@ -0,0 +1,110 @@
+<?php
+/**
+ * Smarty Autoloader
+ *
+ * @package Smarty
+ */
+
+/**
+ * Smarty Autoloader
+ *
+ * @package Smarty
+ * @author  Uwe Tews
+ *             Usage:
+ *                  require_once '...path/Autoloader.php';
+ *                  Smarty_Autoloader::register();
+ *             or
+ *                  include '...path/bootstrap.php';
+ *
+ *                  $smarty = new Smarty();
+ */
+class Smarty_Autoloader
+{
+    /**
+     * Filepath to Smarty root
+     *
+     * @var string
+     */
+    public static $SMARTY_DIR = null;
+
+    /**
+     * Filepath to Smarty internal plugins
+     *
+     * @var string
+     */
+    public static $SMARTY_SYSPLUGINS_DIR = null;
+
+    /**
+     * Array with Smarty core classes and their filename
+     *
+     * @var array
+     */
+    public static $rootClasses = array('smarty' => 'Smarty.class.php', 'smartybc' => 'SmartyBC.class.php',);
+
+    /**
+     * Registers Smarty_Autoloader backward compatible to older installations.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function registerBC($prepend = false)
+    {
+        /**
+         * register the class 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
+        ) {
+            $registeredAutoLoadFunctions = spl_autoload_functions();
+            if (!isset($registeredAutoLoadFunctions[ 'spl_autoload' ])) {
+                spl_autoload_register();
+            }
+        } else {
+            self::register($prepend);
+        }
+    }
+
+    /**
+     * Registers Smarty_Autoloader as an SPL autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function register($prepend = false)
+    {
+        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(PHP_VERSION, '5.3.0', '>=')) {
+            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
+        } else {
+            spl_autoload_register(array(__CLASS__, 'autoload'));
+        }
+    }
+
+    /**
+     * Handles auto loading of classes.
+     *
+     * @param string $class A class name.
+     */
+    public static function autoload($class)
+    {
+        if ($class[ 0 ] !== 'S' || strpos($class, 'Smarty') !== 0) {
+            return;
+        }
+        $_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;
+    }
+}

libs/SmartyBC.class.php

@@ -3,39 +3,35 @@
  * Project:     Smarty: the PHP compiling template engine
  * File:        SmartyBC.class.php
  * SVN:         $Id: $
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
+ * version 3.0 of the License, or (at your option) any later version.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  * For questions, help, comments, discussion, etc., please join the
  * Smarty mailing list. Send a blank e-mail to
  * smarty-discussion-subscribe@googlegroups.com
  *
- * @link http://www.smarty.net/
+ * @link      http://www.smarty.net/
  * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @author Rodney Rehm
- * @package Smarty
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews
+ * @author    Rodney Rehm
+ * @package   Smarty
  */
 /**
  * @ignore
  */
-require(dirname(__FILE__) . '/Smarty.class.php');
+require_once dirname(__FILE__) . '/Smarty.class.php';
 
 /**
- * Smarty Backward Compatability Wrapper Class
+ * Smarty Backward Compatibility Wrapper Class
  *
  * @package Smarty
  */
@@ -43,20 +39,24 @@ class SmartyBC extends Smarty
 {
     /**
      * Smarty 2 BC
+     *
      * @var string
      */
     public $_version = self::SMARTY_VERSION;
 
     /**
-     * Initialize new SmartyBC object
+     * This is an array of directories where trusted php scripts reside.
      *
-     * @param array $options options to set during initialization, e.g. array( 'forceCompile' => false )
+     * @var array
      */
-    public function __construct(array $options=array())
+    public $trusted_dir = array();
+
+    /**
+     * Initialize new SmartyBC object
+     */
+    public function __construct()
     {
-        parent::__construct($options);
-        // register {php} tag
-        $this->registerPlugin('block', 'php', 'smarty_php_tag');
+        parent::__construct();
     }
 
     /**
@@ -99,14 +99,16 @@ 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)
+    public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
     {
         $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
     }
 
     /**
-     * Unregisters custom function
+     * Unregister custom function
      *
      * @param string $function name of template function
      */
@@ -118,21 +120,29 @@ class SmartyBC extends Smarty
     /**
      * Registers object to be used in templates
      *
-     * @param string  $object       name of template object
-     * @param object  $object_impl  the referenced PHP object to register
-     * @param array   $allowed      list of allowed methods (empty = all)
-     * @param boolean $smarty_args  smarty argument format, else traditional
-     * @param array   $block_functs list of methods that are block format
+     * @param string  $object        name of template object
+     * @param object  $object_impl   the referenced PHP object to register
+     * @param array   $allowed       list of allowed methods (empty = all)
+     * @param boolean $smarty_args   smarty argument format, else traditional
+     * @param array   $block_methods list of methods that are block format
+     *
+     * @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);
     }
 
     /**
-     * Unregisters object
+     * Unregister object
      *
      * @param string $object name of template object
      */
@@ -144,18 +154,20 @@ class SmartyBC extends Smarty
     /**
      * Registers block function to be used in templates
      *
-     * @param string $block       name of template block
-     * @param string $block_impl  PHP function to register
+     * @param string $block      name of template block
+     * @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)
+    public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
     {
         $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
     }
 
     /**
-     * Unregisters block function
+     * Unregister block function
      *
      * @param string $block name of template function
      */
@@ -170,14 +182,16 @@ 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)
+    public function register_compiler_function($function, $function_impl, $cacheable = true)
     {
         $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
     }
 
     /**
-     * Unregisters compiler function
+     * Unregister compiler function
      *
      * @param string $function name of template function
      */
@@ -191,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)
     {
@@ -198,7 +214,7 @@ class SmartyBC extends Smarty
     }
 
     /**
-     * Unregisters modifier
+     * Unregister modifier
      *
      * @param string $modifier name of template modifier
      */
@@ -219,7 +235,7 @@ class SmartyBC extends Smarty
     }
 
     /**
-     * Unregisters a resource
+     * Unregister a resource
      *
      * @param string $type name of resource
      */
@@ -233,6 +249,8 @@ class SmartyBC extends Smarty
      * to a template before compiling
      *
      * @param callable $function
+     *
+     * @throws \SmartyException
      */
     public function register_prefilter($function)
     {
@@ -240,7 +258,7 @@ class SmartyBC extends Smarty
     }
 
     /**
-     * Unregisters a prefilter function
+     * Unregister a prefilter function
      *
      * @param callable $function
      */
@@ -254,6 +272,8 @@ class SmartyBC extends Smarty
      * to a compiled template after compilation
      *
      * @param callable $function
+     *
+     * @throws \SmartyException
      */
     public function register_postfilter($function)
     {
@@ -261,7 +281,7 @@ class SmartyBC extends Smarty
     }
 
     /**
-     * Unregisters a postfilter function
+     * Unregister a postfilter function
      *
      * @param callable $function
      */
@@ -275,6 +295,8 @@ class SmartyBC extends Smarty
      * to a template output
      *
      * @param callable $function
+     *
+     * @throws \SmartyException
      */
     public function register_outputfilter($function)
     {
@@ -282,7 +304,7 @@ class SmartyBC extends Smarty
     }
 
     /**
-     * Unregisters an outputfilter function
+     * Unregister an outputfilter function
      *
      * @param callable $function
      */
@@ -296,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)
     {
@@ -305,10 +329,11 @@ 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
      */
     public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
@@ -319,7 +344,8 @@ 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
      */
     public function clear_all_cache($exp_time = null)
@@ -330,10 +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
-     * @return boolean
+     * @param string $tpl_file name of template file
+     * @param string $cache_id
+     * @param string $compile_id
+     *
+     * @return bool
+     * @throws \Exception
+     * @throws \SmartyException
      */
     public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
     {
@@ -353,9 +382,10 @@ 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()}
      */
     public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
@@ -366,8 +396,10 @@ class SmartyBC extends Smarty
     /**
      * Checks whether requested template exists.
      *
-     * @param  string  $tpl_file
-     * @return boolean
+     * @param string $tpl_file
+     *
+     * @return bool
+     * @throws \SmartyException
      */
     public function template_exists($tpl_file)
     {
@@ -377,10 +409,11 @@ class SmartyBC extends Smarty
     /**
      * Returns an array containing template variables
      *
-     * @param  string $name
+     * @param string $name
+     *
      * @return array
      */
-    public function get_template_vars($name=null)
+    public function get_template_vars($name = null)
     {
         return $this->getTemplateVars($name);
     }
@@ -388,10 +421,11 @@ class SmartyBC extends Smarty
     /**
      * Returns an array containing config variables
      *
-     * @param  string $name
+     * @param string $name
+     *
      * @return array
      */
-    public function get_config_vars($name=null)
+    public function get_config_vars($name = null)
     {
         return $this->getConfigVars($name);
     }
@@ -411,7 +445,8 @@ class SmartyBC extends Smarty
     /**
      * return a reference to a registered object
      *
-     * @param  string $name
+     * @param string $name
+     *
      * @return object
      */
     public function get_registered_object($name)
@@ -439,21 +474,4 @@ class SmartyBC extends Smarty
     {
         trigger_error("Smarty error: $error_msg", $error_type);
     }
-
-}
-
-/**
- * Smarty {php}{/php} block function
- *
- * @param array   $params   parameter list
- * @param string  $content  contents of the block
- * @param object  $template template object
- * @param boolean &$repeat  repeat flag
- * @return string content re-formatted
- */
-function smarty_php_tag($params, $content, $template, &$repeat)
-{
-    eval($content);
-
-    return '';
 }

libs/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);

libs/debug.tpl

@@ -1,133 +1,160 @@
 {capture name='_smarty_debug' assign=debug_output}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-    <title>Smarty Debug Console</title>
-<style type="text/css">
-{literal}
-body, h1, h2, td, th, p {
-    font-family: sans-serif;
-    font-weight: normal;
-    font-size: 0.9em;
-    margin: 1px;
-    padding: 0;
-}
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <head>
+        <title>Smarty Debug Console</title>
+        <style type="text/css">
+            {literal}
+            body, h1, h2, h3, td, th, p {
+                font-family: sans-serif;
+                font-weight: normal;
+                font-size: 0.9em;
+                margin: 1px;
+                padding: 0;
+            }
 
-h1 {
-    margin: 0;
-    text-align: left;
-    padding: 2px;
-    background-color: #f0c040;
-    color:  black;
-    font-weight: bold;
-    font-size: 1.2em;
- }
+            h1 {
+                margin: 0;
+                text-align: left;
+                padding: 2px;
+                background-color: #f0c040;
+                color: black;
+                font-weight: bold;
+                font-size: 1.2em;
+            }
 
-h2 {
-    background-color: #9B410E;
-    color: white;
-    text-align: left;
-    font-weight: bold;
-    padding: 2px;
-    border-top: 1px solid black;
-}
+            h2 {
+                background-color: #9B410E;
+                color: white;
+                text-align: left;
+                font-weight: bold;
+                padding: 2px;
+                border-top: 1px solid black;
+            }
+            h3 {
+                text-align: left;
+                font-weight: bold;
+                color: black;
+                font-size: 0.7em;
+                padding: 2px;
+            }
 
-body {
-    background: black; 
-}
+            body {
+                background: black;
+            }
 
-p, table, div {
-    background: #f0ead8;
-} 
+            p, table, div {
+                background: #f0ead8;
+            }
 
-p {
-    margin: 0;
-    font-style: italic;
-    text-align: center;
-}
+            p {
+                margin: 0;
+                font-style: italic;
+                text-align: center;
+            }
 
-table {
-    width: 100%;
-}
+            table {
+                width: 100%;
+            }
 
-th, td {
-    font-family: monospace;
-    vertical-align: top;
-    text-align: left;
-    width: 50%;
-}
+            th, td {
+                font-family: monospace;
+                vertical-align: top;
+                text-align: left;
+            }
 
-td {
-    color: green;
-}
+            td {
+                color: green;
+            }
 
-.odd {
-    background-color: #eeeeee;
-}
+            .odd {
+                background-color: #eeeeee;
+            }
 
-.even {
-    background-color: #fafafa;
-}
+            .even {
+                background-color: #fafafa;
+            }
 
-.exectime {
-    font-size: 0.8em;
-    font-style: italic;
-}
+            .exectime {
+                font-size: 0.8em;
+                font-style: italic;
+            }
 
-#table_assigned_vars th {
-    color: blue;
-}
+            #bold div {
+                color: black;
+                font-weight: bold;
+            }
+            #blue h3 {
+                color: blue;
+            }
+            #normal div {
+                color: black;
+                font-weight: normal;
+            }
+            #table_assigned_vars th {
+                color: blue;
+                font-weight: bold;
+            }
 
-#table_config_vars th {
-    color: maroon;
-}
-{/literal}
-</style>
-</head>
-<body>
+            #table_config_vars th {
+                color: maroon;
+            }
 
-<h1>Smarty Debug Console  -  {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
+            {/literal}
+        </style>
+    </head>
+    <body>
 
-{if !empty($template_data)}
-<h2>included templates &amp; config files (load time in seconds)</h2>
+    <h1>Smarty {Smarty::SMARTY_VERSION} Debug Console
+        -  {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
 
-<div>
-{foreach $template_data as $template}
-  <font color=brown>{$template.name}</font>
-  <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>
-{/foreach}
-</div>
-{/if}
+    {if !empty($template_data)}
+        <h2>included templates &amp; config files (load time in seconds)</h2>
+        <div>
+            {foreach $template_data as $template}
+                <font color=brown>{$template.name}</font>
+                <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 />
+            {/foreach}
+        </div>
+    {/if}
 
-<h2>assigned template variables</h2>
+    <h2>assigned template variables</h2>
 
-<table id="table_assigned_vars">
-    {foreach $assigned_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>${$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var nofilter}</td></tr>
-    {/foreach}
-</table>
+    <table id="table_assigned_vars">
+        {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['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>
+                <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
+         {/foreach}
+    </table>
 
-<h2>assigned config file variables (outer template scope)</h2>
+    <h2>assigned config file variables</h2>
 
-<table id="table_config_vars">
-    {foreach $config_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>{$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var nofilter}</td></tr>
-    {/foreach}
+    <table id="table_config_vars">
+        {foreach $config_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['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
+            </tr>
+        {/foreach}
 
-</table>
-</body>
-</html>
+    </table>
+    </body>
+    </html>
 {/capture}
 <script type="text/javascript">
-{$id = $template_name|default:''|md5}
-    _smarty_console = window.open("","console{$id}","width=680,height=600,resizable,scrollbars=yes");
+    {$id = '__Smarty__'}
+    {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
+    _smarty_console = window.open("", "console{$id}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
     _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
     _smarty_console.document.close();
 </script>

libs/plugins/block.textformat.php

@@ -2,42 +2,51 @@
 /**
  * Smarty plugin to format text blocks
  *
- * @package Smarty
+ * @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)
+ * @link   http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
+ *         (Smarty online manual)
+ *
  * @param array                    $params   parameters
  * @param string                   $content  contents of the block
  * @param Smarty_Internal_Template $template template object
  * @param boolean                  &$repeat  repeat flag
+ *
  * @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;
@@ -46,52 +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);
-    $_output = '';
-
     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);
+        $_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);
         }
@@ -101,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 {

libs/plugins/function.counter.php

@@ -1,76 +1,62 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @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>
- * @link http://www.smarty.net/manual/en/language.function.counter.php {counter}
- *       (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.function.counter.php {counter}
+ *         (Smarty online manual)
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
  * @return string|null
  */
 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
-            );
+    $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 =& $counters[ $name ];
+    if (isset($params[ 'start' ])) {
+        $counter[ 'start' ] = $counter[ 'count' ] = (int)$params[ 'start' ];
     }
-
-    if (!empty($params['assign'])) {
-        $counter['assign'] = $params['assign'];
+    if (!empty($params[ 'assign' ])) {
+        $counter[ 'assign' ] = $params[ 'assign' ];
     }
-
-    if (isset($counter['assign'])) {
-        $template->assign($counter['assign'], $counter['count']);
+    if (isset($counter[ 'assign' ])) {
+        $template->assign($counter[ 'assign' ], $counter[ 'count' ]);
     }
-
-    if (isset($params['print'])) {
-        $print = (bool) $params['print'];
+    if (isset($params[ 'print' ])) {
+        $print = (bool)$params[ 'print' ];
     } else {
-        $print = empty($counter['assign']);
+        $print = empty($counter[ 'assign' ]);
     }
-
     if ($print) {
-        $retval = $counter['count'];
+        $retval = $counter[ 'count' ];
     } else {
         $retval = null;
     }
-
-    if (isset($params['skip'])) {
-        $counter['skip'] = $params['skip'];
+    if (isset($params[ 'skip' ])) {
+        $counter[ 'skip' ] = $params[ 'skip' ];
     }
-
-    if (isset($params['direction'])) {
-        $counter['direction'] = $params['direction'];
+    if (isset($params[ 'direction' ])) {
+        $counter[ 'direction' ] = $params[ 'direction' ];
+    }
+    if ($counter[ 'direction' ] === 'down') {
+        $counter[ 'count' ] -= $counter[ 'skip' ];
+    } else {
+        $counter[ 'count' ] += $counter[ 'skip' ];
     }
-
-    if ($counter['direction'] == "down")
-        $counter['count'] -= $counter['skip'];
-    else
-        $counter['count'] += $counter['skip'];
-
     return $retval;
-
 }

libs/plugins/function.cycle.php

@@ -2,19 +2,17 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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)
@@ -23,83 +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}
- *       (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
+ * @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
+ *
  * @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;
-
-    if (!isset($params['values'])) {
-        if (!isset($cycle_vars[$name]['values'])) {
-            trigger_error("cycle: missing 'values' parameter");
-
+    $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;
+    if (!isset($params[ 'values' ])) {
+        if (!isset($cycle_vars[ $name ][ 'values' ])) {
+            trigger_error('cycle: missing \'values\' parameter');
             return;
         }
     } else {
-        if(isset($cycle_vars[$name]['values'])
-            && $cycle_vars[$name]['values'] != $params['values'] ) {
-            $cycle_vars[$name]['index'] = 0;
+        if (isset($cycle_vars[ $name ][ 'values' ]) && $cycle_vars[ $name ][ 'values' ] !== $params[ 'values' ]) {
+            $cycle_vars[ $name ][ 'index' ] = 0;
         }
-        $cycle_vars[$name]['values'] = $params['values'];
+        $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 (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'];
+    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']);
+        $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($cycle_vars[ $name ][ 'index' ]) || $reset) {
+        $cycle_vars[ $name ][ 'index' ] = 0;
     }
-
-    if (isset($params['assign'])) {
+    if (isset($params[ 'assign' ])) {
         $print = false;
-        $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
+        $template->assign($params[ 'assign' ], $cycle_array[ $cycle_vars[ $name ][ 'index' ] ]);
     }
-
     if ($print) {
-        $retval = $cycle_array[$cycle_vars[$name]['index']];
+        $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;
+        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;
 }

libs/plugins/function.fetch.php

@@ -2,166 +2,156 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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}
- *       (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
+ *         (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
+ * @throws SmartyException
  * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
  */
 function smarty_function_fetch($params, $template)
 {
-    if (empty($params['file'])) {
-        trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE);
-
+    if (empty($params[ 'file' ])) {
+        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);
+    if (stripos($params[ 'file' ], 'file://') === 0) {
+        $params[ 'file' ] = substr($params[ 'file' ], 7);
     }
-
-    $protocol = strpos($params['file'], '://');
+    $protocol = strpos($params[ 'file' ], '://');
     if ($protocol !== false) {
-        $protocol = strtolower(substr($params['file'], 0, $protocol));
+        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
     }
-
     if (isset($template->smarty->security_policy)) {
         if ($protocol) {
             // remote resource (or php stream, …)
-            if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
                 return;
             }
         } else {
             // local file
-            if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedResourceDir($params[ 'file' ])) {
                 return;
             }
         }
     }
-
     $content = '';
-    if ($protocol == 'http') {
+    if ($protocol === 'http') {
         // http fetch
-        if ($uri_parts = parse_url($params['file'])) {
+        if ($uri_parts = parse_url($params[ 'file' ])) {
             // set defaults
-            $host = $server_name = $uri_parts['host'];
+            $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 = "";
-            $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
-            $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
+            $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;
-            if (empty($uri_parts['port'])) {
+            if (empty($uri_parts[ 'port' ])) {
                 $port = 80;
             } else {
-                $port = $uri_parts['port'];
+                $port = $uri_parts[ 'port' ];
             }
-            if (!empty($uri_parts['user'])) {
-                $user = $uri_parts['user'];
+            if (!empty($uri_parts[ 'user' ])) {
+                $user = $uri_parts[ 'user' ];
             }
-            if (!empty($uri_parts['pass'])) {
-                $pass = $uri_parts['pass'];
+            if (!empty($uri_parts[ 'pass' ])) {
+                $pass = $uri_parts[ 'pass' ];
             }
             // 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);
-
+                            if (!preg_match('![\w\d-]+: .+!', $param_value)) {
+                                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;
                 }
             }
             if (!empty($proxy_host) && !empty($proxy_port)) {
                 $_is_proxy = true;
-                $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
+                $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
             } else {
-                $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
+                $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
             }
-
             if (!$fp) {
-                trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE);
-
+                trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
                 return;
             } else {
                 if ($_is_proxy) {
-                    fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
+                    fputs($fp, 'GET ' . $params[ 'file' ] . " HTTP/1.0\r\n");
                 } else {
                     fputs($fp, "GET $uri HTTP/1.0\r\n");
                 }
@@ -179,40 +169,35 @@ function smarty_function_fetch($params, $template)
                 }
                 if (isset($extra_headers) && is_array($extra_headers)) {
                     foreach ($extra_headers as $curr_header) {
-                        fputs($fp, $curr_header."\r\n");
+                        fputs($fp, $curr_header . "\r\n");
                     }
                 }
                 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);
+                    $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]));
+                $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);
-
+            trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
             return;
         }
     } else {
-        $content = @file_get_contents($params['file']);
+        $content = @file_get_contents($params[ 'file' ]);
         if ($content === false) {
-            throw new SmartyException("{fetch} cannot read resource '" . $params['file'] ."'");
+            throw new SmartyException("{fetch} cannot read resource '" . $params[ 'file' ] . "'");
         }
     }
-
-    if (!empty($params['assign'])) {
-        $template->assign($params['assign'], $content);
+    if (!empty($params[ 'assign' ])) {
+        $template->assign($params[ 'assign' ], $content);
     } else {
         return $content;
     }

libs/plugins/function.html_checkboxes.php

@@ -2,26 +2,24 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
@@ -30,22 +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}
- *      (Smarty online manual)
- * @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
+ * @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
+ *
+ * @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;
@@ -55,181 +61,226 @@ 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;
+                        $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 'strict':
+                break;
             case 'disabled':
             case 'readonly':
-                if (!empty($params['strict'])) {
+                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!
-
+            // omit break; to fall through!
+            // no break
             default:
                 if (!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_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? */
-
+    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);
+        foreach ($options as $_key => $_val) {
+            $_html_result[] =
+                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);
+        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
+                );
         }
     }
-
-    if (!empty($params['assign'])) {
-        $template->assign($params['assign'], $_html_result);
+    if (!empty($params[ 'assign' ])) {
+        $template->assign($params[ 'assign' ], $_html_result);
     } else {
         return implode("\n", $_html_result);
     }
-
 }
 
-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])) {
+        if (isset($selected[ $value ])) {
             $_output .= ' checked="checked"';
         }
     } elseif ($value === $selected) {
         $_output .= ' checked="checked"';
     }
-
     $_output .= $extra . ' />' . $output;
     if ($labels) {
         $_output .= '</label>';
     }
-
-    $_output .=  $separator;
-
+    $_output .= $separator;
     return $_output;
 }

libs/plugins/function.html_image.php

@@ -2,42 +2,48 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credits to Duda <duda@big.hu>
+ * @link    http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
+ *          (Smarty online manual)
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Duda <duda@big.hu>
  * @version 1.0
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
+ * @throws SmartyException
  * @return string
- * @uses smarty_function_escape_special_chars()
+ * @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 = '';
@@ -46,7 +52,7 @@ function smarty_function_html_image($params, $template)
     $prefix = '';
     $suffix = '';
     $path_prefix = '';
-    $basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : '';
+    $basedir = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? $_SERVER[ 'DOCUMENT_ROOT' ] : '';
     foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'file':
@@ -57,105 +63,96 @@ 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);
+    if (stripos($params[ 'file' ], 'file://') === 0) {
+        $params[ 'file' ] = substr($params[ 'file' ], 7);
     }
-
-    $protocol = strpos($params['file'], '://');
+    $protocol = strpos($params[ 'file' ], '://');
     if ($protocol !== false) {
-        $protocol = strtolower(substr($params['file'], 0, $protocol));
+        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
     }
-
     if (isset($template->smarty->security_policy)) {
         if ($protocol) {
             // remote resource (or php stream, …)
-            if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
                 return;
             }
         } else {
             // local file
-            if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
                 return;
             }
         }
     }
-
-    if (!isset($params['width']) || !isset($params['height'])) {
+    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];
+        if (!isset($params[ 'width' ])) {
+            $width = $_image_data[ 0 ];
         }
-        if (!isset($params['height'])) {
-            $height = $_image_data[1];
+        if (!isset($params[ 'height' ])) {
+            $height = $_image_data[ 1 ];
         }
     }
-
-    if (isset($params['dpi'])) {
-        if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
+    if (isset($params[ 'dpi' ])) {
+        if (strstr($_SERVER[ 'HTTP_USER_AGENT' ], 'Mac')) {
             // FIXME: (rodneyrehm) wrong dpi assumption
             // don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
             $dpi_default = 72;
         } else {
             $dpi_default = 96;
         }
-        $_resize = $dpi_default / $params['dpi'];
+        $_resize = $dpi_default / $params[ 'dpi' ];
         $width = round($width * $_resize);
         $height = round($height * $_resize);
     }
-
-    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
+    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' .
+           $height . '"' . $extra . ' />' . $suffix;
 }

libs/plugins/function.html_options.php

@@ -2,19 +2,17 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
@@ -22,21 +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}
- *      (Smarty online manual)
+ * @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>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ *
+ * @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, $template)
+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,145 +51,174 @@ function smarty_function_html_options($params, $template)
     $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;
+                        $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 'strict':
+                break;
             case 'disabled':
             case 'readonly':
-                if (!empty($params['strict'])) {
+                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!
-
+            // 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);
         }
     } else {
         foreach ($values as $_i => $_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
             $_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.'"' : '';
-        $_html_result = '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
+        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
+        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
+        $_html_result =
+            '<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)) {
         $_key = smarty_function_escape_special_chars($key);
         $_html_result = '<option value="' . $_key . '"';
         if (is_array($selected)) {
-            if (isset($selected[$_key])) {
+            if (isset($selected[ $_key ])) {
                 $_html_result .= ' selected="selected"';
             }
         } elseif ($_key === $selected) {
             $_html_result .= ' selected="selected"';
         }
-        $_html_class = !empty($class) ? ' class="'.$class.' option"' : '';
-        $_html_id = !empty($id) ? ' id="'.$id.'-'.$idx.'"' : '';
+        $_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++;
     } else {
         $_idx = 0;
-        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx);
+        $_html_result =
+            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";
@@ -190,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;
 }

libs/plugins/function.html_radios.php

@@ -2,20 +2,18 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
@@ -24,28 +22,36 @@
  * - 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)
- * @author Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte at ohrt dot com>
+ * @link    http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
+ *          (Smarty online manual)
+ * @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 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_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;
@@ -56,164 +62,205 @@ 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 'strict':
+                break;
             case 'disabled':
             case 'readonly':
-                if (!empty($params['strict'])) {
+                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!
-
+            // 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);
+            $_html_result[] =
+                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);
+            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_html_result[] =
+                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);
+    if (!empty($params[ 'assign' ])) {
+        $template->assign($params[ 'assign' ], $_html_result);
     } else {
         return implode("\n", $_html_result);
     }
 }
 
-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;
 }

libs/plugins/function.html_select_date.php

@@ -2,28 +2,16 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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)
@@ -39,20 +27,31 @@ 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}
- *      (Smarty online manual)
+ * @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
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @author  Andrei Zmievski
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  Rodney Rehm
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
+ *
  * @return string
+ * @throws \SmartyException
  */
-function smarty_function_html_select_date($params, $template)
+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;
@@ -60,23 +59,22 @@ function smarty_function_html_select_date($params, $template)
         $_current_year = date('Y');
         $_month_timestamps = array();
         for ($i = 1; $i <= 12; $i++) {
-            $_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
+            $_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;
@@ -112,23 +110,28 @@ function smarty_function_html_select_date($params, $template)
     $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':
@@ -155,48 +158,50 @@ function smarty_function_html_select_date($params, $template)
             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'])) {
+    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]
-                    : date($_elementKey);
+                $$_variableName =
+                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+                        date($_elementKey);
             }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
-        } elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
+        } 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);
+                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
+                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
             }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
         } else {
             // no date found, use NOW
             list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
@@ -210,33 +215,32 @@ function smarty_function_html_select_date($params, $template)
     } 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 + trim(substr($t, 1)));
-        } elseif ($t[0] == '-') {
-            $$key = (int) ($_current_year - 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) {
-        $_html_years = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
         if ($all_extra) {
@@ -245,39 +249,38 @@ function smarty_function_html_select_date($params, $template)
         if ($year_extra) {
             $_extra .= ' ' . $year_extra;
         }
-
         if ($year_as_text) {
-            $_html_years = '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra . $extra_attrs . ' />';
+            $_html_years =
+                '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
+                $extra_attrs . ' />';
         } 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 )
-                ) . '"';
+                        $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;
+                $_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' .
+                                $option_separator;
             }
-
             $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;
+            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) {
-        $_html_month = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
         if ($all_extra) {
@@ -286,37 +289,35 @@ function smarty_function_html_select_date($params, $template)
         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 )
-            ) . '"';
+                    $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;
+            $_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' .
+                             $option_separator;
         }
-
         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]);
-            $_html_months .= '<option value="' . $_value . '"'
-                . ($_val == $_month ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
+            $_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 ]);
+            $_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
+                             '>' . $_text . '</option>' . $option_separator;
         }
-
         $_html_months .= '</select>';
     }
-
     // generate day <select> or <input>
     if ($display_days) {
-        $_html_day = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
         if ($all_extra) {
@@ -325,38 +326,35 @@ function smarty_function_html_select_date($params, $template)
         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 )
-            ) . '"';
+            $_html_days .= ' id="' .
+                           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;
+            $_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' .
+                           $option_separator;
         }
-
         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);
-            $_html_days .= '<option value="' . $_value . '"'
-                . ($_val == $_day ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
+            $_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++) {
-        switch ($field_order[$i]) {
+    for ($i = 0; $i <= 2; $i++) {
+        switch ($field_order[ $i ]) {
             case 'Y':
             case 'y':
                 if (isset($_html_years)) {
@@ -365,8 +363,7 @@ function smarty_function_html_select_date($params, $template)
                     }
                     $_html .= $_html_years;
                 }
-            break;
-
+                break;
             case 'm':
             case 'M':
                 if (isset($_html_months)) {
@@ -375,8 +372,7 @@ function smarty_function_html_select_date($params, $template)
                     }
                     $_html .= $_html_months;
                 }
-            break;
-
+                break;
             case 'd':
             case 'D':
                 if (isset($_html_days)) {
@@ -385,9 +381,8 @@ function smarty_function_html_select_date($params, $template)
                     }
                     $_html .= $_html_days;
                 }
-            break;
+                break;
         }
     }
-
     return $_html;
 }

libs/plugins/function.html_select_time.php

@@ -2,178 +2,174 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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}
- *          (Smarty online manual)
+ * @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>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ *
+ * @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, $template)
+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'])) {
+    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]
-                    : date($_elementKey);
+                $$_variableName =
+                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+                        date($_elementKey);
             }
-            $_meridian = isset($params['time'][$prefix . 'Meridian'])
-                ? (' ' . $params['time'][$prefix . 'Meridian'])
-                : '';
-            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
+            $_meridian =
+                isset($params[ 'time' ][ $prefix . 'Meridian' ]) ? (' ' . $params[ 'time' ][ $prefix . 'Meridian' ]) :
+                    '';
+            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
             list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
+        } 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);
+                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
+                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
             }
-            $_meridian = isset($params['time'][$field_array][$prefix . 'Meridian'])
-                ? (' ' . $params['time'][$field_array][$prefix . 'Meridian'])
-                : '';
-            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
+            $_meridian = isset($params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) ?
+                (' ' . $params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) : '';
+            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
             list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
         } else {
             // no date found, use NOW
@@ -188,7 +184,6 @@ function smarty_function_html_select_time($params, $template)
     } else {
         list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
     }
-
     // generate hour <select>
     if ($display_hours) {
         $_html_hours = '';
@@ -200,44 +195,37 @@ function smarty_function_html_select_time($params, $template)
         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 )
-            ) . '"';
+            $_html_hours .= ' id="' .
+                            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;
+            $_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);
+                $_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 .= '<option value="' . $_value . '"' . ($selected ? ' selected="selected"' : '') . '>' .
+                            $_text . '</option>' . $option_separator;
         }
-
         $_html_hours .= '</select>';
     }
-
     // generate minute <select>
     if ($display_minutes) {
         $_html_minutes = '';
@@ -249,35 +237,33 @@ function smarty_function_html_select_time($params, $template)
         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 )
-            ) . '"';
+                    $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;
+            $_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) {
+        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);
-            $_html_minutes .= '<option value="' . $_value . '"'
-                . ($selected === $i ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
+            $_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 = '';
@@ -289,35 +275,33 @@ function smarty_function_html_select_time($params, $template)
         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 )
-            ) . '"';
+                    $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;
+            $_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) {
+        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);
-            $_html_seconds .= '<option value="' . $_value . '"'
-                . ($selected === $i ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
+            $_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 = '';
@@ -329,29 +313,36 @@ function smarty_function_html_select_time($params, $template)
         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 )
-            ) . '"';
+                    $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="">' . (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_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;
@@ -359,6 +350,5 @@ function smarty_function_html_select_time($params, $template)
             $_html .= $$k;
         }
     }
-
     return $_html;
 }

libs/plugins/function.html_table.php

@@ -2,19 +2,17 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
@@ -29,25 +27,25 @@
  * - 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>
+ * @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
- * @param Smarty_Internal_Template $template template object
+ * @link    http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ *           (Smarty online manual)
+ *
+ * @param array $params parameters
+ *
  * @return string
  */
-function smarty_function_html_table($params, $template)
+function smarty_function_html_table($params)
 {
     $table_attr = 'border="1"';
     $tr_attr = '';
@@ -61,19 +59,15 @@ function smarty_function_html_table($params, $template)
     $inner = 'cols';
     $caption = '';
     $loop = null;
-
-    if (!isset($params['loop'])) {
-        trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING);
-
+    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, $template)
                     $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,50 +99,42 @@ function smarty_function_html_table($params, $template)
                 break;
         }
     }
-
     $loop_count = count($loop);
-    if (empty($params['rows'])) {
+    if (empty($params[ 'rows' ])) {
         /* no rows specified */
         $rows = ceil($loop_count / $cols_count);
-    } elseif (empty($params['cols'])) {
-        if (!empty($params['rows'])) {
+    } elseif (empty($params[ 'cols' ])) {
+        if (!empty($params[ 'rows' ])) {
             /* no cols specified, but rows */
             $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++) {
             $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[$r];
+            $output .= $cols[ $r ];
             $output .= "</th>\n";
         }
         $output .= "</tr></thead>\n";
     }
-
     $output .= "<tbody>\n";
     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;
-
+        $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') {
+            $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";
+                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
             } else {
                 $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
             }
@@ -160,17 +143,22 @@ function smarty_function_html_table($params, $template)
     }
     $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)) {
         $ret = $var;
     } else {
-        $ret = $var[$no % count($var)];
+        $ret = $var[ $no % count($var) ];
     }
-
     return ($ret) ? ' ' . $ret : '';
 }

libs/plugins/function.mailto.php

@@ -2,65 +2,61 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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}
- *          (Smarty online manual)
+ * @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)
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Jason Sweat (added cc, bcc and subject functionality)
+ *
+ * @param array $params parameters
+ *
  * @return string
  */
-function smarty_function_mailto($params, $template)
+function smarty_function_mailto($params)
 {
-    static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
+    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);
-
+    if (empty($params[ 'address' ])) {
+        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
         return;
     } else {
-        $address = $params['address'];
+        $address = $params[ 'address' ];
     }
-
     $text = $address;
     // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
     // so, don't encode it.
@@ -72,80 +68,67 @@ function smarty_function_mailto($params, $template)
             case 'cc':
             case 'bcc':
             case 'followupto':
-                if (!empty($value))
+                if (!empty($value)) {
                     $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);
-
+    $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
+        );
         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++) {
-            $js_encode .= '%' . bin2hex($string[$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++) {
-            $ord[] = ord($string[$x]);
+            $ord[] = ord($string[ $x ]);
         }
-
-        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n"
-            . "{document.write(String.fromCharCode("
-            . implode(',', $ord)
-            . "))"
-            . "}\n"
-            . "</script>\n";
-
+        $_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);
-
+        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++) {
-            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[$x])) {
-                $address_encode .= '%' . bin2hex($address[$x]);
+            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) {
+                $address_encode .= '%' . bin2hex($address[ $x ]);
             } else {
-                $address_encode .= $address[$x];
+                $address_encode .= $address[ $x ];
             }
         }
         $text_encode = '';
         for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
-            $text_encode .= '&#x' . bin2hex($text[$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

libs/plugins/function.math.php

@@ -1,90 +1,112 @@
 <?php
 /**
  * Smarty plugin
- *
  * This plugin is only for Smarty2 BC
- * @package Smarty
+ *
+ * @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}
- *          (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
+ * @link   http://www.smarty.net/manual/en/language.function.math.php {math}
+ *           (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
  * @return string|null
  */
 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
-    );
+    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
+        );
     // be sure equation parameter is present
-    if (empty($params['equation'])) {
-        trigger_error("math: missing equation parameter",E_USER_WARNING);
-
+    if (empty($params[ 'equation' ])) {
+        trigger_error("math: missing equation parameter", E_USER_WARNING);
         return;
     }
-
-    $equation = $params['equation'];
-
+    $equation = $params[ 'equation' ];
     // make sure parenthesis are balanced
-    if (substr_count($equation,"(") != substr_count($equation,")")) {
-        trigger_error("math: unbalanced parenthesis",E_USER_WARNING);
-
+    if (substr_count($equation, '(') !== substr_count($equation, ')')) {
+        trigger_error("math: unbalanced parenthesis", 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][a-zA-Z0-9_]*)!",$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);
-
-            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") {
+        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);
-
+            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);
-
+                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, or missing parameter '{$curr_var}'",
+                E_USER_WARNING
+            );
+            return;
+        }
+    }
+    foreach ($params as $key => $val) {
+        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'])) {
+    eval("\$smarty_math_result = " . $equation . ";");
+    if (empty($params[ 'format' ])) {
+        if (empty($params[ 'assign' ])) {
             return $smarty_math_result;
         } else {
-            $template->assign($params['assign'],$smarty_math_result);
+            $template->assign($params[ 'assign' ], $smarty_math_result);
         }
     } else {
-        if (empty($params['assign'])) {
-            printf($params['format'],$smarty_math_result);
+        if (empty($params[ 'assign' ])) {
+            printf($params[ 'format' ], $smarty_math_result);
         } else {
-            $template->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
+            $template->assign($params[ 'assign' ], sprintf($params[ 'format' ], $smarty_math_result));
         }
     }
 }

libs/plugins/modifier.capitalize.php

@@ -2,22 +2,20 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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 }}
  *
  * @param string  $string    string to capitalize
  * @param boolean $uc_digits also capitalize "x123" to "X123"
  * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
+ *
  * @return string capitalized string
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Rodney Rehm
@@ -27,42 +25,78 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
     if (Smarty::$_MBSTRING) {
         if ($lc_rest) {
             // uppercase (including hyphenated words)
-            $upper_string = mb_convert_case( $string, MB_CASE_TITLE, Smarty::$_CHARSET );
+            $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)) {
-                foreach($matches[1] as $match) {
-                    $upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0]));
+            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 ])
+                        );
                 }
-            } 
+            }
         }
-        $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb', $upper_string);
+        $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); 
+    $upper_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)) {
-            foreach($matches[1] as $match) {
-                $upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0]));
+        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()
@@ -70,18 +104,42 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
  *
  * @author Kyle Renfrow
  */
-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_mbconvert_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
 }
 
-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_mbconvert2_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
 }
 
-function smarty_mod_cap_ucfirst_cb($matches){
-  return stripslashes($matches[1]).ucfirst(stripslashes($matches[2]));
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_ucfirst_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
 }
 
-function smarty_mod_cap_ucfirst2_cb($matches){
-  return stripslashes($matches[1]).ucfirst(stripslashes($matches[3]));
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_ucfirst2_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));
 }

libs/plugins/modifier.date_format.php

@@ -2,50 +2,72 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
  *
- * @link http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string $string       input date string
  * @param string $format       strftime format for output
  * @param string $default_date default date if $string is empty
  * @param string $formatter    either 'strftime' or 'auto'
+ *
  * @return string |void
- * @uses smarty_make_timestamp()
+ * @uses   smarty_make_timestamp()
  */
-function smarty_modifier_date_format($string, $format=null, $default_date='', $formatter='auto')
+function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
 {
     if ($format === null) {
         $format = Smarty::$_DATE_FORMAT;
     }
     /**
-    * Include 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') {
+     * require_once the {@link shared.make_timestamp.php} plugin
+     */
+    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 (!empty($string) && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
         $timestamp = smarty_make_timestamp($string);
-    } elseif ($default_date != '') {
+    } elseif (!empty($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));
@@ -56,7 +78,6 @@ function smarty_modifier_date_format($string, $format=null, $default_date='', $f
             }
             $format = str_replace($_win_from, $_win_to, $format);
         }
-
         return strftime($format, $timestamp);
     } else {
         return date($format, $timestamp);

libs/plugins/modifier.debug_print_var.php

@@ -2,55 +2,61 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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>
+ *
  * @param array|object $var     variable to be formatted
- * @param integer      $depth   maximum recursion depth if $var is an array
- * @param integer      $length  maximum string length if $var is a string
+ * @param int          $max     maximum recursion depth if $var is an array or object
+ * @param int          $length  maximum string length if $var is a string
+ * @param int          $depth   actual recursion depth
+ * @param array        $objects processed objects in actual depth to prevent recursive object processing
+ *
  * @return string
  */
-function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
+function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
 {
-    $_replace = array("\n" => '<i>\n</i>',
-        "\r" => '<i>\r</i>',
-        "\t" => '<i>\t</i>'
-        );
-
+    $_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
     switch (gettype($var)) {
-        case 'array' :
+        case 'array':
             $results = '<b>Array (' . count($var) . ')</b>';
+            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, ++$depth, $length);
+                $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--;
             }
             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) {
+                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, ++$depth, $length);
+                $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--;
             }
             break;
-
-        case 'boolean' :
-        case 'NULL' :
-        case 'resource' :
+        case 'boolean':
+        case 'NULL':
+        case 'resource':
             if (true === $var) {
                 $results = 'true';
             } elseif (false === $var) {
@@ -58,34 +64,30 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
             } 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) {
                     $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
                 }
             } else {
-                if (isset($var[$length])) {
+                if (isset($var[ $length ])) {
                     $results = substr($var, 0, $length - 3) . '...';
                 }
             }
-
-            $results = htmlspecialchars('"' . $results . '"');
+            $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) . '...';
@@ -95,9 +97,7 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
                     $results = substr($results, 0, $length - 3) . '...';
                 }
             }
-
-            $results = htmlspecialchars($results);
+            $results = htmlspecialchars($results, ENT_QUOTES, Smarty::$_CHARSET);
     }
-
     return $results;
 }

libs/plugins/modifier.escape.php

@@ -2,36 +2,36 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @link   http://www.smarty.net/docs/en/language.modifier.escape
  * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string  $string        input string
  * @param string  $esc_type      escape type
  * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
  * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
+ *
  * @return string escaped input string
  */
 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) {
@@ -45,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()
@@ -65,16 +74,24 @@ 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;
                     }
                 }
-
                 // 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);
@@ -84,89 +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++) {
-                $return .= '%' . bin2hex($string[$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++) {
-                $return .= '&#x' . bin2hex($string[$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++) {
-                $return .= '&#' . ord($string[$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 . ';';
@@ -174,10 +236,8 @@ 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++) {
                 $_ord = ord(substr($string, $_i, 1));
@@ -188,9 +248,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                     $return .= substr($string, $_i, 1);
                 }
             }
-
             return $return;
-
         default:
             return $string;
     }

libs/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;
+}

libs/plugins/modifier.regex_replace.php

@@ -2,40 +2,41 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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>
- * @param string       $string   input string
- * @param string|array $search   regular expression(s) to search for
- * @param string|array $replace  string(s) that should be replaced
+ *
+ * @param string       $string  input string
+ * @param string|array $search  regular expression(s) to search for
+ * @param string|array $replace string(s) that should be replaced
+ * @param int          $limit   the maximum number of replacements
+ *
  * @return string
  */
-function smarty_modifier_regex_replace($string, $search, $replace)
+function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
 {
     if (is_array($search)) {
         foreach ($search as $idx => $s) {
-            $search[$idx] = _smarty_regex_replace_check($s);
+            $search[ $idx ] = _smarty_regex_replace_check($s);
         }
     } else {
         $search = _smarty_regex_replace_check($search);
     }
-
-    return preg_replace($search, $replace, $string);
+    return preg_replace($search, $replace, $string, $limit);
 }
 
 /**
  * @param  string $search string(s) that should be replaced
+ *
  * @return string
  * @ignore
  */
@@ -43,13 +44,12 @@ function _smarty_regex_replace_check($search)
 {
     // null-byte injection detection
     // anything behind the first null-byte is ignored
-    if (($pos = strpos($search,"\0")) !== false) {
-        $search = substr($search,0,$pos);
+    if (($pos = strpos($search, "\0")) !== false) {
+        $search = substr($search, 0, $pos);
     }
     // 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]);
+    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 ]);
     }
-
     return $search;
 }

libs/plugins/modifier.replace.php

@@ -1,32 +1,37 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @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)
+ * @link   http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Uwe Tews
+ *
  * @param string $string  input string
  * @param string $search  text to search for
  * @param string $replace replacement text
+ *
  * @return string
  */
 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);
 }

libs/plugins/modifier.spacify.php

@@ -1,21 +1,22 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @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)
+ * @link   http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string $string       input string
  * @param string $spacify_char string to insert between characters.
+ *
  * @return string
  */
 function smarty_modifier_spacify($string, $spacify_char = ' ')

libs/plugins/modifier.truncate.php

@@ -2,51 +2,53 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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.
  *
- * @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
+ * @link   http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string  $string      input string
  * @param integer $length      length of truncated text
  * @param string  $etc         end string
  * @param boolean $break_words truncate at word boundary
  * @param boolean $middle      truncate in the middle of text
+ *
  * @return string truncated string
  */
 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);
+            return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc .
+                   mb_substr($string, -$length / 2, $length, Smarty::$_CHARSET);
         }
-
         return $string;
     }
-
     // no MBString fallback
-    if (isset($string[$length])) {
+    if (isset($string[ $length ])) {
         $length -= min($length, strlen($etc));
         if (!$break_words && !$middle) {
             $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
@@ -54,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;
 }

libs/plugins/modifiercompiler.cat.php

@@ -2,27 +2,27 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
- *          (Smarty online manual)
- * @author   Uwe Tews
+ * @link   http://smarty.php.net/manual/en/language.modifier.cat.php cat
+ *           (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_cat($params, $compiler)
+function smarty_modifiercompiler_cat($params)
 {
-    return '('.implode(').(', $params).')';
+    return '(' . implode(').(', $params) . ')';
 }

libs/plugins/modifiercompiler.count_characters.php

@@ -2,30 +2,31 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_characters($params, $compiler)
+function smarty_modifiercompiler_count_characters($params)
 {
-    if (!isset($params[1]) || $params[1] != 'true') {
-        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';
+    if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
+        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
     }
     if (Smarty::$_MBSTRING) {
-        return 'mb_strlen(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+        return 'mb_strlen(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
     }
     // no MBString fallback
-    return 'strlen(' . $params[0] . ')';
+    return 'strlen(' . $params[ 0 ] . ')';
 }

libs/plugins/modifiercompiler.count_paragraphs.php

@@ -2,25 +2,25 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_paragraphs($params, $compiler)
+function smarty_modifiercompiler_count_paragraphs($params)
 {
     // count \r or \n characters
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';
+    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
 }

libs/plugins/modifiercompiler.count_sentences.php

@@ -2,25 +2,25 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_sentences($params, $compiler)
+function smarty_modifiercompiler_count_sentences($params)
 {
     // find periods, question marks, exclamation marks with a word before but not after.
-    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[0] . ', $tmp)';
+    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
 }

libs/plugins/modifiercompiler.count_words.php

@@ -2,29 +2,30 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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)
+ * @link   http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
-*/
-function smarty_modifiercompiler_count_words($params, $compiler)
+ */
+function smarty_modifiercompiler_count_words($params)
 {
     if (Smarty::$_MBSTRING) {
         // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
         // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
-        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
+        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' .
+               $params[ 0 ] . ', $tmp)';
     }
     // no MBString fallback
-    return 'str_word_count(' . $params[0] . ')';
+    return 'str_word_count(' . $params[ 0 ] . ')';
 }

libs/plugins/modifiercompiler.default.php

@@ -2,33 +2,31 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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)
+ * @link   http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_default ($params, $compiler)
+function smarty_modifiercompiler_default($params)
 {
-    $output = $params[0];
-    if (!isset($params[1])) {
-        $params[1] = "''";
+    $output = $params[ 0 ];
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = "''";
     }
-
     array_shift($params);
     foreach ($params as $param) {
         $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
     }
-
     return $output;
 }

libs/plugins/modifiercompiler.escape.php

@@ -2,123 +2,111 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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)
+ * @link   http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
  * @author Rodney Rehm
- * @param array $params parameters
+ *
+ * @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) {
-                    return 'htmlspecialchars('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ', '
-                        . var_export($double_encode, true) . ')';
+                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                           var_export($double_encode, true) . ')';
                 } elseif ($double_encode) {
-                    return 'htmlspecialchars('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ')';
+                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
                 } else {
                     // fall back to modifier.escape.php
                 }
-
+            // no break
             case 'htmlall':
                 if (Smarty::$_MBSTRING) {
                     if ($_double_encode) {
                         // php >=5.2.3 - go native
-                        return 'mb_convert_encoding(htmlspecialchars('
-                            . $params[0] .', ENT_QUOTES, '
-                            . var_export($char_set, true) . ', '
-                            . var_export($double_encode, true)
-                            . '), "HTML-ENTITIES", '
-                            . var_export($char_set, true) . ')';
+                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
+                               var_export($char_set, true) . ', ' . var_export($double_encode, true) .
+                               '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
                     } elseif ($double_encode) {
                         // php <5.2.3 - only handle double encoding
-                        return 'mb_convert_encoding(htmlspecialchars('
-                            . $params[0] .', ENT_QUOTES, '
-                            . var_export($char_set, true)
-                            . '), "HTML-ENTITIES", '
-                            . var_export($char_set, true) . ')';
+                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
+                               var_export($char_set, true) . '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
                     } else {
                         // fall back to modifier.escape.php
                     }
                 }
-
                 // no MBString fallback
                 if ($_double_encode) {
                     // php >=5.2.3 - go native
-                    return 'htmlentities('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ', '
-                        . var_export($double_encode, true) . ')';
+                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                           var_export($double_encode, true) . ')';
                 } elseif ($double_encode) {
                     // php <5.2.3 - only handle double encoding
-                    return 'htmlentities('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ')';
+                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
                 } else {
                     // fall back to modifier.escape.php
                 }
-
+            // no break
             case 'url':
-                return 'rawurlencode(' . $params[0] . ')';
-
+                return 'rawurlencode(' . $params[ 0 ] . ')';
             case 'urlpathinfo':
-                return 'str_replace("%2F", "/", rawurlencode(' . $params[0] . '))';
-
+                return 'str_replace("%2F", "/", rawurlencode(' . $params[ 0 ] . '))';
             case 'quotes':
                 // escape unescaped single quotes
-                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[0] . ')';
-
+                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[ 0 ] . ')';
             case 'javascript':
                 // escape quotes and backslashes, newlines, etc.
-                return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
-
+                return 'strtr(' .
+                       $params[ 0 ] .
+                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
         }
     } 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->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
+        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+            SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+            'smarty_modifier_escape';
     } else {
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
+        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+            SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+            'smarty_modifier_escape';
     }
-
-    return 'smarty_modifier_escape(' . join( ', ', $params ) . ')';
+    return 'smarty_modifier_escape(' . join(', ', $params) . ')';
 }

libs/plugins/modifiercompiler.from_charset.php

@@ -2,31 +2,29 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_from_charset($params, $compiler)
+function smarty_modifiercompiler_from_charset($params)
 {
     if (!Smarty::$_MBSTRING) {
         // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[0];
+        return $params[ 0 ];
     }
-
-    if (!isset($params[1])) {
-        $params[1] = '"ISO-8859-1"';
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = '"ISO-8859-1"';
     }
-
-    return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';
+    return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
 }

libs/plugins/modifiercompiler.indent.php

@@ -1,31 +1,30 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @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)
+ * @link   http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-
-function smarty_modifiercompiler_indent($params, $compiler)
+function smarty_modifiercompiler_indent($params)
 {
-    if (!isset($params[1])) {
-        $params[1] = 4;
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = 4;
     }
-    if (!isset($params[2])) {
-        $params[2] = "' '";
+    if (!isset($params[ 2 ])) {
+        $params[ 2 ] = "' '";
     }
-
-    return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')';
+    return 'preg_replace(\'!^!m\',str_repeat(' . $params[ 2 ] . ',' . $params[ 1 ] . '),' . $params[ 0 ] . ')';
 }

libs/plugins/modifiercompiler.lower.php

@@ -1,29 +1,29 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @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)
+ * @link   http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-
-function smarty_modifiercompiler_lower($params, $compiler)
+function smarty_modifiercompiler_lower($params)
 {
     if (Smarty::$_MBSTRING) {
-        return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ;
+        return 'mb_strtolower(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
     }
     // no MBString fallback
-    return 'strtolower(' . $params[0] . ')';
+    return 'strtolower(' . $params[ 0 ] . ')';
 }

libs/plugins/modifiercompiler.noprint.php

@@ -2,22 +2,19 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
- * @param array $params parameters
+ * @author Uwe Tews
  * @return string with compiled code
  */
-function smarty_modifiercompiler_noprint($params, $compiler)
+function smarty_modifiercompiler_noprint()
 {
     return "''";
 }

libs/plugins/modifiercompiler.string_format.php

@@ -2,23 +2,23 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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)
+ * @link   http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_string_format($params, $compiler)
+function smarty_modifiercompiler_string_format($params)
 {
-    return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
+    return 'sprintf(' . $params[ 1 ] . ',' . $params[ 0 ] . ')';
 }

libs/plugins/modifiercompiler.strip.php

@@ -2,31 +2,29 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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)
+ * @link   http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-
-function smarty_modifiercompiler_strip($params, $compiler)
+function smarty_modifiercompiler_strip($params)
 {
-    if (!isset($params[1])) {
-        $params[1] = "' '";
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = "' '";
     }
-
     return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
 }

libs/plugins/modifiercompiler.strip_tags.php

@@ -2,27 +2,27 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
+ * @link   http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_strip_tags($params, $compiler)
+function smarty_modifiercompiler_strip_tags($params)
 {
- if (!isset($params[1]) || $params[1] === true ||  trim($params[1],'"') == 'true') {
-         return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
+    if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
+        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
     } else {
-        return 'strip_tags(' . $params[0] . ')';
+        return 'strip_tags(' . $params[ 0 ] . ')';
     }
 }

libs/plugins/modifiercompiler.to_charset.php

@@ -2,31 +2,29 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_to_charset($params, $compiler)
+function smarty_modifiercompiler_to_charset($params)
 {
     if (!Smarty::$_MBSTRING) {
         // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[0];
+        return $params[ 0 ];
     }
-
-    if (!isset($params[1])) {
-        $params[1] = '"ISO-8859-1"';
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = '"ISO-8859-1"';
     }
-
-    return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
+    return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 1 ] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
 }

libs/plugins/modifiercompiler.unescape.php

@@ -2,48 +2,43 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_unescape($params, $compiler)
+function smarty_modifiercompiler_unescape($params)
 {
-    if (!isset($params[1])) {
-        $params[1] = 'html';
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = 'html';
     }
-    if (!isset($params[2])) {
-        $params[2] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
+    if (!isset($params[ 2 ])) {
+        $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
     } else {
-        $params[2] = "'" . $params[2] . "'";
+        $params[ 2 ] = "'{$params[ 2 ]}'";
     }
-
-    switch (trim($params[1], '"\'')) {
+    switch (trim($params[ 1 ], '"\'')) {
         case 'entity':
         case 'htmlall':
             if (Smarty::$_MBSTRING) {
-                return 'mb_convert_encoding(' . $params[0] . ', ' . $params[2] . ', \'HTML-ENTITIES\')';
+                return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'HTML-ENTITIES\')';
             }
-
-            return 'html_entity_decode(' . $params[0] . ', ENT_NOQUOTES, ' . $params[2] . ')';
-
+            return 'html_entity_decode(' . $params[ 0 ] . ', ENT_NOQUOTES, ' . $params[ 2 ] . ')';
         case 'html':
-            return 'htmlspecialchars_decode(' . $params[0] . ', ENT_QUOTES)';
-
+            return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
         case 'url':
-            return 'rawurldecode(' . $params[0] . ')';
-
+            return 'rawurldecode(' . $params[ 0 ] . ')';
         default:
-            return $params[0];
+            return $params[ 0 ];
     }
 }

libs/plugins/modifiercompiler.upper.php

@@ -2,27 +2,27 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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)
+ * @link   http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_upper($params, $compiler)
+function smarty_modifiercompiler_upper($params)
 {
     if (Smarty::$_MBSTRING) {
-        return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ;
+        return 'mb_strtoupper(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
     }
     // no MBString fallback
-    return 'strtoupper(' . $params[0] . ')';
+    return 'strtoupper(' . $params[ 0 ] . ')';
 }

libs/plugins/modifiercompiler.wordwrap.php

@@ -2,44 +2,38 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @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)
+ * @link   http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
  * @author Uwe Tews
- * @param array $params parameters
+ *
+ * @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;
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = 80;
     }
-    if (!isset($params[2])) {
-        $params[2] = '"\n"';
+    if (!isset($params[ 2 ])) {
+        $params[ 2 ] = '"\n"';
     }
-    if (!isset($params[3])) {
-        $params[3] = 'false';
+    if (!isset($params[ 3 ])) {
+        $params[ 3 ] = 'false';
     }
     $function = 'wordwrap';
     if (Smarty::$_MBSTRING) {
-    if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-            $compiler->template->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->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
-            $compiler->template->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] . ')';
+    return $function . '(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
 }

libs/plugins/outputfilter.trimwhitespace.php

@@ -2,89 +2,88 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFilter
  */
-
 /**
  * Smarty trimwhitespace outputfilter plugin
- *
  * Trim unnecessary whitespace from HTML markup.
  *
- * @author   Rodney Rehm
- * @param string                   $source input string
- * @param Smarty_Internal_Template $smarty Smarty object
+ * @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, Smarty_Internal_Template $smarty)
+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);
-
-    // capture Internet Explorer Conditional Comments
-    if (preg_match_all('#<!--\[[^\]]+\]>.*?<!\[[^\]]+\]-->#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+    $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
+    )
+    ) {
         foreach ($matches as $match) {
-            $store[] = $match[0][0];
-            $_length = strlen($match[0][0]);
+            $store[] = $match[ 0 ][ 0 ];
+            $_length = strlen($match[ 0 ][ 0 ]);
             $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
-
+            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
             $_offset += $_length - strlen($replace);
             $_store++;
         }
     }
-
     // Strip all HTML-Comments
     // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
-    $source = preg_replace( '#<!--.*?-->#ms', '', $source );
-
+    $source = preg_replace('#<!--.*?-->#ms', '', $source);
     // capture html elements not to be messed with
     $_offset = 0;
-    if (preg_match_all('#<(script|pre|textarea)[^>]*>.*?</\\1>#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]);
+            $store[] = $match[ 0 ][ 0 ];
+            $_length = strlen($match[ 0 ][ 0 ]);
             $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
-
+            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
             $_offset += $_length - strlen($replace);
             $_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',
-        // remove spaces between attributes (but not in attribute values!)
-        '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4',
-        // 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' => '>',
+    $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',
+                         // 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'                                                               => '>',
     );
-
-    $source = preg_replace( array_keys($expressions), array_values($expressions), $source );
+    $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);
-
+            $_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++;
         }
     }
-
     return $source;
 }

libs/plugins/shared.escape_special_chars.php

@@ -2,50 +2,31 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
-
-if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
-    /**
-     * escape_special_chars common function
-     *
-     * Function: smarty_function_escape_special_chars<br>
-     * Purpose:  used by other smarty functions to escape
-     *           special chars except for already escaped ones
-     *
-     * @author   Monte Ohrt <monte at ohrt dot com>
-     * @param  string $string text that should by escaped
-     * @return string
-     */
-    function smarty_function_escape_special_chars($string)
-    {
-        if (!is_array($string)) {
+/**
+ * escape_special_chars common function
+ * 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>
+ *
+ * @param string $string text that should by escaped
+ *
+ * @return string
+ */
+function smarty_function_escape_special_chars($string)
+{
+    if (!is_array($string)) {
+        if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
             $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
-        }
-
-        return $string;
-    }
-} else {
-    /**
-     * escape_special_chars common function
-     *
-     * Function: smarty_function_escape_special_chars<br>
-     * Purpose:  used by other smarty functions to escape
-     *           special chars except for already escaped ones
-     *
-     * @author   Monte Ohrt <monte at ohrt dot com>
-     * @param  string $string text that should by escaped
-     * @return string
-     */
-    function smarty_function_escape_special_chars($string)
-    {
-        if (!is_array($string)) {
+        } else {
             $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
             $string = htmlspecialchars($string);
             $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
         }
-
-        return $string;
     }
+    return $string;
 }

libs/plugins/shared.literal_compiler_param.php

@@ -2,33 +2,34 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
-
 /**
  * evaluate compiler parameter
  *
  * @param array   $params  parameter array as given to the compiler function
  * @param integer $index   array index of the parameter to convert
  * @param mixed   $default value to be returned if the parameter is not present
+ *
  * @return mixed evaluated value of parameter or $default
  * @throws SmartyException if parameter is not a literal (but an expression, variable, …)
  * @author Rodney Rehm
  */
-function smarty_literal_compiler_param($params, $index, $default=null)
+function smarty_literal_compiler_param($params, $index, $default = null)
 {
     // not set, go default
-    if (!isset($params[$index])) {
+    if (!isset($params[ $index ])) {
         return $default;
     }
     // 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');
+    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'
+        );
     }
-
     $t = null;
-    eval("\$t = " . $params[$index] . ";");
-
+    eval("\$t = " . $params[ $index ] . ";");
     return $t;
 }

libs/plugins/shared.make_timestamp.php

@@ -2,16 +2,17 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @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>
- * @param DateTime|int|string $string  date object, timestamp or string that can be converted using strtotime()
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
+ *
  * @return int
  */
 function smarty_make_timestamp($string)
@@ -19,23 +20,30 @@ function smarty_make_timestamp($string)
     if (empty($string)) {
         // use "now":
         return time();
-    } elseif ($string instanceof DateTime) {
-        return $string->getTimestamp();
-    } elseif (strlen($string) == 14 && ctype_digit($string)) {
+    } 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)) {
         // 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;
     }
 }

libs/plugins/shared.mb_str_replace.php

@@ -2,22 +2,22 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @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
      */
-    function smarty_mb_str_replace($search, $replace, $subject, &$count=0)
+    function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
     {
         if (!is_array($search) && is_array($replace)) {
             return false;
@@ -25,7 +25,7 @@ if (!function_exists('smarty_mb_str_replace')) {
         if (is_array($subject)) {
             // call mb_replace for each single string in $subject
             foreach ($subject as &$string) {
-                $string = &smarty_mb_str_replace($search, $replace, $string, $c);
+                $string = smarty_mb_str_replace($search, $replace, $string, $c);
                 $count += $c;
             }
         } elseif (is_array($search)) {
@@ -48,8 +48,6 @@ if (!function_exists('smarty_mb_str_replace')) {
             $count = count($parts) - 1;
             $subject = implode($replace, $parts);
         }
-
         return $subject;
     }
-
 }

libs/plugins/shared.mb_unicode.php

@@ -2,49 +2,50 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
-
 /**
  * convert characters to their decimal unicode equivalents
  *
- * @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ *
  * @param string $string   characters to calculate unicode of
  * @param string $encoding encoding of $string, if null mb_internal_encoding() is used
+ *
  * @return array sequence of unicodes
  * @author Rodney Rehm
  */
-function smarty_mb_to_unicode($string, $encoding=null)
+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);
 }
 
 /**
  * convert unicodes to the character of given encoding
  *
- * @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ *
  * @param integer|array $unicode  single unicode or list of unicodes to convert
  * @param string        $encoding encoding of returned string, if null mb_internal_encoding() is used
+ *
  * @return string unicode as character sequence in given $encoding
  * @author Rodney Rehm
  */
-function smarty_mb_from_unicode($unicode, $encoding=null)
+function smarty_mb_from_unicode($unicode, $encoding = null)
 {
     $t = '';
     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;
 }

libs/plugins/shared.mb_wordwrap.php

@@ -1,82 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package Smarty
- * @subpackage PluginsShared
- */
-
-if (!function_exists('smarty_mb_wordwrap')) {
-
-    /**
-     * 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_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;
-
-        foreach ($tokens as $_token) {
-            $token_length = mb_strlen($_token, Smarty::$_CHARSET);
-            $_tokens = array($_token);
-            if ($token_length > $width) {
-                // remove last space
-                $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
-                $_previous = false;
-                $length = 0;
-
-                if ($cut) {
-                    $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-                    // broken words go on a new line
-                    $t .= $break;
-                }
-            }
-
-            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 && $token_length < $width) {
-                        $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
-                    }
-
-                    // add the break before the token
-                    $t .= $break;
-                    $length = $token_length;
-
-                    // skip space after inserting a break
-                    if ($_space) {
-                        $length = 0;
-                        continue;
-                    }
-                } elseif ($token == "\n") {
-                    // hard break must reset counters
-                    $_previous = 0;
-                    $length = 0;
-                } else {
-                    // remember if we had a space or not
-                    $_previous = $_space;
-                }
-                // add the token
-                $t .= $token;
-            }
-        }
-
-        return $t;
-    }
-
-}

libs/plugins/variablefilter.htmlspecialchars.php

@@ -2,18 +2,18 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFilter
  */
-
 /**
  * Smarty htmlspecialchars variablefilter plugin
  *
- * @param string                   $source input string
- * @param Smarty_Internal_Template $smarty Smarty object
+ * @param string                    $source input string
+ * @param \Smarty_Internal_Template $template
+ *
  * @return string filtered output
  */
-function smarty_variablefilter_htmlspecialchars($source, $smarty)
+function smarty_variablefilter_htmlspecialchars($source, Smarty_Internal_Template $template)
 {
     return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
 }

libs/sysplugins/smarty_cacheresource.php

@@ -1,108 +1,127 @@
 <?php
 /**
-* Smarty Internal Plugin
-*
-* @package Smarty
-* @subpackage Cacher
-*/
+ * Smarty Internal Plugin
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
 
 /**
-* Cache Handler API
-*
-* @package Smarty
-* @subpackage Cacher
-* @author Rodney Rehm
-*/
+ * Cache Handler API
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Rodney Rehm
+ */
 abstract class Smarty_CacheResource
 {
     /**
-    * cache for Smarty_CacheResource instances
-    * @var array
-    */
-    public static $resources = array();
+     * resource types provided by the core
+     *
+     * @var array
+     */
+    protected static $sysplugins = array('file' => 'smarty_internal_cacheresource_file.php',);
 
     /**
-    * resource types provided by the core
-    * @var array
-    */
-    protected static $sysplugins = array(
-        'file' => true,
-    );
+     * populate Cached Object with meta data from Resource
+     *
+     * @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);
 
     /**
-    * populate Cached Object with meta data from Resource
-    *
-    * @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);
-
-    /**
-    * populate Cached Object with timestamp and exists from Resource
-    *
-    * @param Smarty_Template_Cached $source cached object
-    * @return void
-    */
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return void
+     */
     abstract public function populateTimestamp(Smarty_Template_Cached $cached);
 
     /**
-    * Read the cached template and process header
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param Smarty_Template_Cached $cached cached object
-    * @return booelan true or false if the cached content does not exist
-    */
-    abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null);
+     * Read the cached template and process header
+     *
+     * @param Smarty_Internal_Template $_template template 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
+     */
+    abstract public function process(
+        Smarty_Internal_Template $_template,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    );
 
     /**
-    * Write the rendered template output to cache
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content to cache
-    * @return boolean success
-    */
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean success
+     */
     abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
 
     /**
-    * Return cached content
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content of cache
-    */
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    abstract public function readCachedContent(Smarty_Internal_Template $_template);
+
+    /**
+     * Return cached content
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return null|string
+     */
     public function getCachedContent(Smarty_Internal_Template $_template)
     {
         if ($_template->cached->handler->process($_template)) {
             ob_start();
-            $_template->properties['unifunc']($_template);
-
+            $unifunc = $_template->cached->unifunc;
+            $unifunc($_template);
             return ob_get_clean();
         }
-
         return null;
     }
 
     /**
-    * Empty cache
-    *
-    * @param Smarty $smarty Smarty object
-    * @param integer $exp_time expiration time (number of seconds, not timestamp)
-    * @return integer number of cache files deleted
-    */
-    abstract public function clearAll(Smarty $smarty, $exp_time=null);
+     * Empty cache
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clearAll(Smarty $smarty, $exp_time = null);
 
     /**
-    * 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)
-    * @return integer number of cache files deleted
-    */
+     * 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)
+     *
+     * @return integer number of cache files deleted
+     */
     abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
 
+    /**
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool|null
+     */
     public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // theoretically locking_timeout should be checked against time_limit (max_execution_time)
@@ -116,22 +135,45 @@ abstract class Smarty_CacheResource
             }
             sleep(1);
         }
-
         return $hadLock;
     }
 
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // check if lock exists
         return false;
     }
 
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // create lock
         return true;
     }
 
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // release lock
@@ -139,251 +181,39 @@ abstract class Smarty_CacheResource
     }
 
     /**
-    * Load Cache Resource Handler
-    *
-    * @param Smarty $smarty Smarty object
-    * @param string $type name of the cache resource
-    * @return Smarty_CacheResource Cache Resource Handler
-    */
+     * Load Cache Resource Handler
+     *
+     * @param Smarty $smarty Smarty object
+     * @param string $type   name of the cache resource
+     *
+     * @throws SmartyException
+     * @return Smarty_CacheResource Cache Resource Handler
+     */
     public static function load(Smarty $smarty, $type = null)
     {
         if (!isset($type)) {
             $type = $smarty->caching_type;
         }
-
         // try smarty's cache
-        if (isset($smarty->_cacheresource_handlers[$type])) {
-            return $smarty->_cacheresource_handlers[$type];
+        if (isset($smarty->_cache[ 'cacheresource_handlers' ][ $type ])) {
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ];
         }
-
         // try registered resource
-        if (isset($smarty->registered_cache_resources[$type])) {
+        if (isset($smarty->registered_cache_resources[ $type ])) {
             // do not cache these instances as they may vary from instance to instance
-            return $smarty->_cacheresource_handlers[$type] = $smarty->registered_cache_resources[$type];
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = $smarty->registered_cache_resources[ $type ];
         }
         // try sysplugins dir
-        if (isset(self::$sysplugins[$type])) {
-            if (!isset(self::$resources[$type])) {
-                $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
-                self::$resources[$type] = new $cache_resource_class();
-            }
-
-            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
+        if (isset(self::$sysplugins[ $type ])) {
+            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
         }
         // try plugins dir
         $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
         if ($smarty->loadPlugin($cache_resource_class)) {
-            if (!isset(self::$resources[$type])) {
-                self::$resources[$type] = new $cache_resource_class();
-            }
-
-            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
         }
         // give up
         throw new SmartyException("Unable to load cache resource '{$type}'");
     }
-
-    /**
-    * Invalid Loaded Cache Files
-    *
-    * @param Smarty $smarty Smarty object
-    */
-    public static function invalidLoadedCache(Smarty $smarty)
-    {
-        foreach ($smarty->template_objects as $tpl) {
-            if (isset($tpl->cached)) {
-                $tpl->cached->valid = false;
-                $tpl->cached->processed = false;
-            }
-        }
-    }
-}
-
-/**
-* Smarty Resource Data Object
-*
-* Cache Data Container for Template Files
-*
-* @package Smarty
-* @subpackage TemplateResources
-* @author Rodney Rehm
-*/
-class Smarty_Template_Cached
-{
-    /**
-    * Source Filepath
-    * @var string
-    */
-    public $filepath = false;
-
-    /**
-    * Source Content
-    * @var string
-    */
-    public $content = null;
-
-    /**
-    * Source Timestamp
-    * @var integer
-    */
-    public $timestamp = false;
-
-    /**
-    * Source Existence
-    * @var boolean
-    */
-    public $exists = false;
-
-    /**
-    * Cache Is Valid
-    * @var boolean
-    */
-    public $valid = false;
-
-    /**
-    * Cache was processed
-    * @var boolean
-    */
-    public $processed = false;
-
-    /**
-    * CacheResource Handler
-    * @var Smarty_CacheResource
-    */
-    public $handler = null;
-
-    /**
-    * Template Compile Id (Smarty_Internal_Template::$compile_id)
-    * @var string
-    */
-    public $compile_id = null;
-
-    /**
-    * Template Cache Id (Smarty_Internal_Template::$cache_id)
-    * @var string
-    */
-    public $cache_id = null;
-
-    /**
-    * Id for cache locking
-    * @var string
-    */
-    public $lock_id = null;
-
-    /**
-    * flag that cache is locked by this instance
-    * @var bool
-    */
-    public $is_locked = false;
-
-    /**
-    * Source Object
-    * @var Smarty_Template_Source
-    */
-    public $source = null;
-
-    /**
-    * create Cached Object container
-    *
-    * @param Smarty_Internal_Template $_template template object
-    */
-    public function __construct(Smarty_Internal_Template $_template)
-    {
-        $this->compile_id = $_template->compile_id;
-        $this->cache_id = $_template->cache_id;
-        $this->source = $_template->source;
-        $_template->cached = $this;
-        $smarty = $_template->smarty;
-
-        //
-        // load resource handler
-        //
-        $this->handler = $handler = Smarty_CacheResource::load($smarty); // Note: prone to circular references
-
-        //
-        //    check if cache is valid
-        //
-        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) {
-            $handler->populate($this, $_template);
-
-            return;
-        }
-        while (true) {
-            while (true) {
-                $handler->populate($this, $_template);
-                if ($this->timestamp === false || $smarty->force_compile || $smarty->force_cache) {
-                    $this->valid = false;
-                } else {
-                    $this->valid = true;
-                }
-                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->cache_locking) {
-                    break;
-                }
-                if (!$this->handler->locked($_template->smarty, $this)) {
-                    $this->handler->acquireLock($_template->smarty, $this);
-                    break 2;
-                }
-            }
-            if ($this->valid) {
-                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
-                    // load cache file for the following checks
-                    if ($smarty->debugging) {
-                        Smarty_Internal_Debug::start_cache($_template);
-                    }
-                    if ($handler->process($_template, $this) === false) {
-                        $this->valid = false;
-                    } else {
-                        $this->processed = true;
-                    }
-                    if ($smarty->debugging) {
-                        Smarty_Internal_Debug::end_cache($_template);
-                    }
-                } else {
-                    continue;
-                }
-            } else {
-                return;
-            }
-            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) {
-                $this->valid = false;
-            }
-            if (!$this->valid && $_template->smarty->cache_locking) {
-                $this->handler->acquireLock($_template->smarty, $this);
-
-                return;
-            } else {
-                return;
-            }
-        }
-    }
-
-    /**
-    * Write this cache object to handler
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content to cache
-    * @return boolean success
-    */
-    public function write(Smarty_Internal_Template $_template, $content)
-    {
-        if (!$_template->source->recompiled) {
-            if ($this->handler->writeCachedContent($_template, $content)) {
-                $this->timestamp = time();
-                $this->exists = true;
-                $this->valid = true;
-                if ($_template->smarty->cache_locking) {
-                    $this->handler->releaseLock($_template->smarty, $this);
-                }
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
 }

libs/sysplugins/smarty_cacheresource_custom.php

@@ -2,58 +2,60 @@
 /**
  * Smarty Internal Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
  */
 
 /**
  * Cache Handler API
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
 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
      */
     abstract protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
 
     /**
      * Fetch cached content's modification timestamp from data source
-     *
      * {@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
      */
     protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
     {
-        return null;
+        return false;
     }
 
     /**
      * 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
      */
     abstract protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
@@ -61,10 +63,11 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     /**
      * Delete content from cache
      *
-     * @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 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
      */
     abstract protected function delete($name, $cache_id, $compile_id, $exp_time);
@@ -72,36 +75,48 @@ 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
      */
     public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
         $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
-        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w\|]+!', '_', $cached->compile_id) : null;
-
-        $cached->filepath = sha1($cached->source->filepath . $_cache_id . $_compile_id);
+        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w]+!', '_', $cached->compile_id) : null;
+        $path = $cached->source->uid . $_cache_id . $_compile_id;
+        $cached->filepath = sha1($path);
+        if ($_template->smarty->cache_locking) {
+            $cached->lock_id = sha1('lock.' . $path);
+        }
         $this->populateTimestamp($cached);
     }
 
     /**
      * populate Cached Object with timestamp and exists from Resource
      *
-     * @param  Smarty_Template_Cached $source cached object
+     * @param Smarty_Template_Cached $cached
+     *
      * @return void
      */
     public function populateTimestamp(Smarty_Template_Cached $cached)
     {
-        $mtime = $this->fetchTimestamp($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id);
+        $mtime =
+            $this->fetchTimestamp($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id);
         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;
     }
@@ -109,18 +124,73 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     /**
      * Read the cached template and process the header
      *
-     * @param  Smarty_Internal_Template $_template template object
-     * @param  Smarty_Template_Cached   $cached    cached object
-     * @return booelan                  true or false if the cached content does not exist
+     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     * @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 $_template, Smarty_Template_Cached $cached=null)
-    {
+    public function process(
+        Smarty_Internal_Template $_smarty_tpl,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    ) {
         if (!$cached) {
-            $cached = $_template->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
+            );
+        }
+        if (isset($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
+     *
+     * @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
+        );
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string|boolean  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            $timestamp = null;
             $this->fetch(
                 $_template->cached->filepath,
                 $_template->source->name,
@@ -131,83 +201,67 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
             );
         }
         if (isset($content)) {
-            $_smarty_tpl = $_template;
-            eval("?>" . $content);
-
-            return true;
+            return $content;
         }
-
         return false;
     }
 
-    /**
-     * Write the rendered template output 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->properties['cache_lifetime'],
-            $content
-        );
-    }
-
     /**
      * 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
      */
-    public function clearAll(Smarty $smarty, $exp_time=null)
+    public function clearAll(Smarty $smarty, $exp_time = null)
     {
-        $this->cache = array();
-
         return $this->delete(null, null, null, $exp_time);
     }
 
     /**
      * 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)
-     * @return integer number of cache files deleted
+     * @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 int number of cache files deleted
+     * @throws \SmartyException
      */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        $this->cache = array();
-
-        return $this->delete($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) {
+                $cache_name = $source->name;
+            } else {
+                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
-     * @return booelan                true or false if cache is locked
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
-        $id = $cached->filepath;
+        $id = $cached->lock_id;
         $name = $cached->source->name . '.lock';
-
-        $mtime = $this->fetchTimestamp($id, $name, null, null);
+        $mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
         if ($mtime === null) {
-            $this->fetch($id, $name, null, null, $content, $mtime);
+            $this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
         }
-
-        return $mtime && time() - $mtime < $smarty->locking_timeout;
+        return $mtime && ($t = time()) - $mtime < $smarty->locking_timeout;
     }
 
     /**
@@ -215,14 +269,15 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
      *
      * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $cached->is_locked = true;
-
-        $id = $cached->filepath;
+        $id = $cached->lock_id;
         $name = $cached->source->name . '.lock';
-        $this->save($id, $name, null, null, $smarty->locking_timeout, '');
+        $this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, '');
     }
 
     /**
@@ -230,12 +285,13 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
      *
      * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $cached->is_locked = false;
-
         $name = $cached->source->name . '.lock';
-        $this->delete($name, null, null, null);
+        $this->delete($name, $cached->cache_id, $cached->compile_id, null);
     }
 }

libs/sysplugins/smarty_cacheresource_keyvaluestore.php

@@ -2,44 +2,44 @@
 /**
  * Smarty Internal Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
  */
 
 /**
  * Smarty Cache Handler Base for Key/Value Storage Implementations
- *
  * This class implements the functionality required to use simple key/value stores
  * for hierarchical cache groups. key/value stores like memcache or APC do not support
  * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
  * is no problem to filesystem and RDBMS implementations.
- *
  * This implementation is based on the concept of invalidation. While one specific cache
  * can be identified and cleared, any range of caches cannot be identified. For this reason
  * each level of the cache group hierarchy can have its own value in the store. These values
  * are nothing but microtimes, telling us when a particular cache group was cleared for the
  * last time. These keys are evaluated for every cache read to determine if the cache has
  * been invalidated since it was created and should hence be treated as inexistent.
- *
  * Although deep hierarchies are possible, they are not recommended. Try to keep your
  * cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
  * »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
  * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
  * consider using »a|b|c|$page-$items-$whatever« instead.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
 abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
 {
     /**
      * cache for contents
+     *
      * @var array
      */
     protected $contents = array();
+
     /**
      * cache for timestamps
+     *
      * @var array
      */
     protected $timestamps = array();
@@ -47,264 +47,317 @@ 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
      */
     public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
-        $cached->filepath = $_template->source->uid
-                . '#' . $this->sanitize($cached->source->name)
-                . '#' . $this->sanitize($cached->cache_id)
-                . '#' . $this->sanitize($cached->compile_id);
-
+        $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->exists = $cached->timestamp;
+        $cached->timestamp = (int)$timestamp;
+        $cached->exists = !!$cached->timestamp;
     }
 
     /**
      * Read the cached template and process the header
      *
-     * @param  Smarty_Internal_Template $_template template object
-     * @param  Smarty_Template_Cached   $cached    cached object
-     * @return booelan                  true or false if the cached content does not exist
+     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     * @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 $_template, Smarty_Template_Cached $cached=null)
-    {
+    public function process(
+        Smarty_Internal_Template $_smarty_tpl,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    ) {
         if (!$cached) {
-            $cached = $_template->cached;
+            $cached = $_smarty_tpl->cached;
         }
         $content = $cached->content ? $cached->content : null;
         $timestamp = $cached->timestamp ? $cached->timestamp : null;
         if ($content === null || !$timestamp) {
-            if (!$this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp, $_template->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)) {
-            $_smarty_tpl = $_template;
-            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);
+    }
 
-        return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']);
+    /**
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string|false  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $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
+            )
+            ) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
     }
 
     /**
      * 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)
+    public function clearAll(Smarty $smarty, $exp_time = null)
     {
         if (!$this->purge()) {
             $this->invalidate(null);
         }
-
         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]
-     * @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
+     * @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 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)
     {
-        $uid = $this->getTemplateUid($smarty, $resource_name, $cache_id, $compile_id);
-        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id);
+        $uid = $this->getTemplateUid($smarty, $resource_name);
+        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' .
+               $this->sanitize($compile_id);
         $this->delete(array($cid));
         $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
-
         return -1;
     }
+
     /**
      * Get template's unique ID
      *
-     * @param  Smarty $smarty        Smarty object
-     * @param  string $resource_name template name
-     * @param  string $cache_id      cache id
-     * @param  string $compile_id    compile id
+     * @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, $cache_id, $compile_id)
+    protected function getTemplateUid(Smarty $smarty, $resource_name)
     {
-        $uid = '';
         if (isset($resource_name)) {
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            if ($tpl->source->exists) {
-                $uid = $tpl->source->uid;
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                return $source->uid;
             }
-
-            // remove from template cache
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
         }
-
-        return $uid;
+        return '';
     }
 
     /**
      * Sanitize CacheID components
      *
-     * @param  string $string CacheID component to sanitize
+     * @param string $string CacheID component to sanitize
+     *
      * @return string sanitized CacheID component
      */
     protected function sanitize($string)
     {
-        // some poeple smoke bad weed
         $string = trim($string, '|');
         if (!$string) {
-            return null;
+            return '';
         }
-
         return preg_replace('#[^\w\|]+#S', '_', $string);
     }
 
     /**
      * 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;
+        $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);
+            $invalidated =
+                $this->getLatestInvalidationTimestamp($cid, $resource_name, $cache_id, $compile_id, $resource_uid);
             if ($invalidated > $timestamp) {
                 $timestamp = null;
                 $content = null;
             }
         }
-
         return !!$content;
     }
 
     /**
      * Add current microtime to the beginning of $cache_content
-     *
      * {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
      *
      * @param string &$content the content to be cached
      */
     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
      */
     protected function getMetaTimestamp(&$content)
     {
-        $s = unpack("N", substr($content, 0, 4));
-        $m = unpack("N", substr($content, 4, 4));
-        $content = substr($content, 8);
-
-        return $s[1] + ($m[1] / 100000000);
+        extract(unpack('N1s/N1m/a*content', $content));
+        /**
+         * @var  int $s
+         * @var  int $m
+         */
+        return $s + ($m / 100000000);
     }
 
     /**
      * 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
         if (!$resource_name && !$cache_id && !$compile_id) {
             $key = 'IVK#ALL';
-        }
-        // invalidate all caches by template
-        else if ($resource_name && !$cache_id && !$compile_id) {
-            $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
-        }
-        // invalidate all caches by cache group
-        else if (!$resource_name && $cache_id && !$compile_id) {
-            $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
-        }
-        // invalidate all caches by compile id
-        else if (!$resource_name && !$cache_id && $compile_id) {
-            $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
-        }
-        // invalidate by combination
+        } // invalidate all caches by template
         else {
-            $key = 'IVK#CID#' . $cid;
+            if ($resource_name && !$cache_id && !$compile_id) {
+                $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
+            } // invalidate all caches by cache group
+            else {
+                if (!$resource_name && $cache_id && !$compile_id) {
+                    $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
+                } // invalidate all caches by compile id
+                else {
+                    if (!$resource_name && !$cache_id && $compile_id) {
+                        $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
+                    } // invalidate by combination
+                    else {
+                        $key = 'IVK#CID#' . $cid;
+                    }
+                }
+            }
         }
         $this->write(array($key => $now));
     }
@@ -312,15 +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;
@@ -329,32 +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) {
@@ -366,7 +428,6 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
             $t[] = 'IVK#COMPILE' . $_compile;
         }
         $_name .= '#';
-        // some poeple smoke bad weed
         $cid = trim($cache_id, '|');
         if (!$cid) {
             return $t;
@@ -389,23 +450,22 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
             // skip past delimiter position
             $i++;
         }
-
         return $t;
     }
 
     /**
      * Check is cache is locked for this template
      *
-     * @param  Smarty                 $smarty Smarty object
-     * @param  Smarty_Template_Cached $cached cached object
-     * @return booelan                true or false if cache is locked
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $key = 'LOCK#' . $cached->filepath;
         $data = $this->read(array($key));
-
-        return $data && time() - $data[$key] < $smarty->locking_timeout;
+        return $data && time() - $data[ $key ] < $smarty->locking_timeout;
     }
 
     /**
@@ -413,6 +473,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      *
      * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -426,6 +488,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      *
      * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -437,7 +501,8 @@ 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
      */
     abstract protected function read(array $keys);
@@ -445,16 +510,18 @@ 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
      */
-    abstract protected function write(array $keys, $expire=null);
+    abstract protected function write(array $keys, $expire = null);
 
     /**
      * 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
      */
     abstract protected function delete(array $keys);
@@ -468,5 +535,4 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
     {
         return false;
     }
-
 }

libs/sysplugins/smarty_config_source.php

@@ -1,94 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-
-/**
- * Smarty Resource Data Object
- *
- * Meta Data Container for Config Files
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- *
- * @property string $content
- * @property int    $timestamp
- * @property bool   $exists
- */
-class Smarty_Config_Source extends Smarty_Template_Source
-{
-    /**
-     * create Config 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 config_resource
-     * @param string          $type            type of resource
-     * @param string          $name            resource name
-     * @param string          $unique_resource unqiue resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        // Note: these may be ->config_compiler_class etc in the future
-        //$this->config_compiler_class = $handler->config_compiler_class;
-        //$this->config_lexer_class = $handler->config_lexer_class;
-        //$this->config_parser_class = $handler->config_parser_class;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->unique_resource = $unique_resource;
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     *
-     * @param  string          $property_name valid: content, timestamp, exists
-     * @param  mixed           $value         newly assigned value (not check for correct type)
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'content':
-            case 'timestamp':
-            case 'exists':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("invalid config property '$property_name'.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param  string          $property_name valid: content, timestamp, exists
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("config property '$property_name' does not exist.");
-        }
-    }
-
-}

libs/sysplugins/smarty_data.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Smarty Plugin Data
+ * This file contains the data object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * class for the Smarty data object
+ * The Smarty data object will hold Smarty variables in the current scope
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Data extends Smarty_Internal_Data
+{
+    /**
+     * Counter
+     *
+     * @var int
+     */
+    public static $count = 0;
+
+    /**
+     * Data block name
+     *
+     * @var string
+     */
+    public $dataObjectName = '';
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * create Smarty data object
+     *
+     * @param Smarty|array                    $_parent parent template
+     * @param Smarty|Smarty_Internal_Template $smarty  global smarty instance
+     * @param string                          $name    optional data block name
+     *
+     * @throws SmartyException
+     */
+    public function __construct($_parent = null, $smarty = null, $name = null)
+    {
+        parent::__construct();
+        self::$count++;
+        $this->dataObjectName = 'Data_object ' . (isset($name) ? "'{$name}'" : self::$count);
+        $this->smarty = $smarty;
+        if (is_object($_parent)) {
+            // when object set up back pointer
+            $this->parent = $_parent;
+        } elseif (is_array($_parent)) {
+            // set up variable values
+            foreach ($_parent as $_key => $_val) {
+                $this->tpl_vars[ $_key ] = new Smarty_Variable($_val);
+            }
+        } elseif ($_parent !== null) {
+            throw new SmartyException('Wrong type for template variables');
+        }
+    }
+}

libs/sysplugins/smarty_internal_block.php

@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Smarty {block} tag class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Block
+{
+    /**
+     * Block name
+     *
+     * @var string
+     */
+    public $name = '';
+
+    /**
+     * Hide attribute
+     *
+     * @var bool
+     */
+    public $hide = false;
+
+    /**
+     * Append attribute
+     *
+     * @var bool
+     */
+    public $append = false;
+
+    /**
+     * prepend attribute
+     *
+     * @var bool
+     */
+    public $prepend = false;
+
+    /**
+     * Block calls $smarty.block.child
+     *
+     * @var bool
+     */
+    public $callsChild = false;
+
+    /**
+     * Inheritance child block
+     *
+     * @var Smarty_Internal_Block|null
+     */
+    public $child = null;
+
+    /**
+     * Inheritance calling parent block
+     *
+     * @var Smarty_Internal_Block|null
+     */
+    public $parent = null;
+
+    /**
+     * Inheritance Template index
+     *
+     * @var int
+     */
+    public $tplIndex = 0;
+
+    /**
+     * Smarty_Internal_Block constructor.
+     * - 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
+     * @param int|null $tplIndex index of outer level {block} if nested
+     */
+    public function __construct($name, $tplIndex)
+    {
+        $this->name = $name;
+        $this->tplIndex = $tplIndex;
+    }
+
+    /**
+     * Compiled block code overloaded by {block} class
+     *
+     * @param \Smarty_Internal_Template $tpl
+     */
+    public function callBlock(Smarty_Internal_Template $tpl)
+    {
+    }
+}

libs/sysplugins/smarty_internal_cacheresource_file.php

@@ -1,277 +1,239 @@
 <?php
-    /**
-    * Smarty Internal Plugin CacheResource File
-    *
-    * @package Smarty
-    * @subpackage Cacher
-    * @author Uwe Tews
-    * @author Rodney Rehm
-    */
+/**
+ * Smarty Internal Plugin CacheResource File
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
 
+/**
+ * This class does contain all necessary methods for the HTML cache on file system
+ * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
+class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
+{
     /**
-    * This class does contain all necessary methods for the HTML cache on file system
-    *
-    * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
-    *
-    * @package Smarty
-    * @subpackage Cacher
-    */
-    class Smarty_Internal_CacheResource_File 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
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
-        /**
-        * populate Cached Object with meta data from Resource
-        *
-        * @param Smarty_Template_Cached   $cached    cached object
-        * @param Smarty_Internal_Template $_template template object
-        * @return void
-        */
-        public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-        {
-            $_source_file_path = str_replace(':', '.', $_template->source->filepath);
-            $_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
-            $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-            $_filepath = $_template->source->uid;
-            // if use_sub_dirs, break file into directories
-            if ($_template->smarty->use_sub_dirs) {
-                $_filepath = substr($_filepath, 0, 2) . DS
-                . substr($_filepath, 2, 2) . DS
-                . substr($_filepath, 4, 2) . DS
-                . $_filepath;
-            }
-            $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-            if (isset($_cache_id)) {
-                $_cache_id = str_replace('|', $_compile_dir_sep, $_cache_id) . $_compile_dir_sep;
-            } else {
-                $_cache_id = '';
-            }
-            if (isset($_compile_id)) {
-                $_compile_id = $_compile_id . $_compile_dir_sep;
-            } else {
-                $_compile_id = '';
-            }
-            $_cache_dir = $_template->smarty->getCacheDir();
-            if ($_template->smarty->cache_locking) {
-                // create locking file name
-                // relative file name?
-                if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_cache_dir)) {
-                    $_lock_dir = rtrim(getcwd(), '/\\') . DS . $_cache_dir;
-                } else {
-                    $_lock_dir = $_cache_dir;
-                }
-                $cached->lock_id = $_lock_dir.sha1($_cache_id.$_compile_id.$_template->source->uid).'.lock';
-            }
-            $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
-            $cached->timestamp = @filemtime($cached->filepath);
-            $cached->exists = !!$cached->timestamp;
+        $source = &$_template->source;
+        $smarty = &$_template->smarty;
+        $_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;
         }
-
-        /**
-        * populate Cached Object with timestamp and exists from Resource
-        *
-        * @param Smarty_Template_Cached $cached cached object
-        * @return void
-        */
-        public function populateTimestamp(Smarty_Template_Cached $cached)
-        {
-            $cached->timestamp = @filemtime($cached->filepath);
-            $cached->exists = !!$cached->timestamp;
+        if (isset($_template->compile_id)) {
+            $cached->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . $_compile_dir_sep;
         }
-
-        /**
-        * Read the cached template and process its header
-        *
-        * @param Smarty_Internal_Template $_template template object
-        * @param Smarty_Template_Cached $cached cached object
-        * @return booelan true or false if the cached content does not exist
-        */
-        public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
-        {
-            $_smarty_tpl = $_template;
-
-            return @include $_template->cached->filepath;
+        // if use_sub_dirs, break file into directories
+        if ($smarty->use_sub_dirs) {
+            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] .
+                                 $_filepath[ 3 ] .
+                                 DIRECTORY_SEPARATOR .
+                                 $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
         }
-
-        /**
-        * Write the rendered template output 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)
-        {
-            if (Smarty_Internal_Write_File::writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
-                $_template->cached->timestamp = @filemtime($_template->cached->filepath);
-                $_template->cached->exists = !!$_template->cached->timestamp;
-                if ($_template->cached->exists) {
-                    return true;
-                }
-            }
-
-            return false;
+        $cached->filepath .= $_filepath;
+        $basename = $source->handler->getBasename($source);
+        if (!empty($basename)) {
+            $cached->filepath .= '.' . $basename;
         }
-
-        /**
-        * Empty cache
-        *
-        * @param Smarty_Internal_Template $_template template object
-        * @param integer                  $exp_time  expiration time (number of seconds, not timestamp)
-        * @return integer number of cache files deleted
-        */
-        public function clearAll(Smarty $smarty, $exp_time = null)
-        {
-            return $this->clear($smarty, null, null, null, $exp_time);
+        if ($smarty->cache_locking) {
+            $cached->lock_id = $cached->filepath . '.lock';
         }
-
-        /**
-        * Empty cache for a specific template
-        *
-        * @param Smarty  $_template     template 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
-        */
-        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();
-            $_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 . DS;
-                    }
-                }
-            }
-            if (isset($resource_name)) {
-                $_save_stat = $smarty->caching;
-                $smarty->caching = true;
-                $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 ($smarty->allow_ambiguous_resources) {
-                    $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-                } else {
-                    $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-                }
-                if (isset($_templateId[150])) {
-                    $_templateId = sha1($_templateId);
-                }
-                unset($smarty->template_objects[$_templateId]);
-
-                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) == '.' || strpos($_file, '.svn') !== false) continue;
-                    // directory ?
-                    if ($_file->isDir()) {
-                        if (!$_cache->isDot()) {
-                            // delete folder if empty
-                            @rmdir($_file->getPathname());
-                        }
-                    } else {
-                        $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string) $_file, $_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;
-                            }
-                        }
-                        // expired ?
-                        if (isset($exp_time)) {
-                            if ($exp_time < 0) {
-                                preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match);
-                                if ($_time < (@filemtime($_file) + $match[1])) {
-                                    continue;
-                                }
-                            } else {
-                                if ($_time - @filemtime($_file) < $exp_time) {
-                                    continue;
-                                }
-                            }
-                        }
-                        $_count += @unlink((string) $_file) ? 1 : 0;
-                    }
-                }
-            }
-
-            return $_count;
-        }
-
-        /**
-        * Check is cache is locked for this template
-        *
-        * @param Smarty $smarty Smarty object
-        * @param Smarty_Template_Cached $cached cached object
-        * @return booelan true or false if cache is locked
-        */
-        public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-        {
-            if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-                clearstatcache(true, $cached->lock_id);
-            } else {
-                clearstatcache();
-            }
-            $t = @filemtime($cached->lock_id);
-
-            return $t && (time() - $t < $smarty->locking_timeout);
-        }
-
-        /**
-        * Lock cache for this template
-        *
-        * @param Smarty $smarty Smarty object
-        * @param Smarty_Template_Cached $cached cached object
-        */
-        public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-        {
-            $cached->is_locked = true;
-            touch($cached->lock_id);
-        }
-
-        /**
-        * Unlock cache for this template
-        *
-        * @param Smarty $smarty Smarty object
-        * @param Smarty_Template_Cached $cached cached object
-        */
-        public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-        {
-            $cached->is_locked = false;
-            @unlink($cached->lock_id);
+        $cached->filepath .= '.php';
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
         }
     }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Cached $cached)
+    {
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
+    }
+
+    /**
+     * Read the cached template and process its 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 bool                      $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
+    ) {
+        $_smarty_tpl->cached->valid = false;
+        if ($update && defined('HHVM_VERSION')) {
+            eval('?>' . file_get_contents($_smarty_tpl->cached->filepath));
+            return true;
+        } else {
+            return @include $_smarty_tpl->cached->filepath;
+        }
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @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 (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);
+            }
+            $cached = $_template->cached;
+            $cached->timestamp = $cached->exists = is_file($cached->filepath);
+            if ($cached->exists) {
+                $cached->timestamp = filemtime($cached->filepath);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        if (is_file($_template->cached->filepath)) {
+            return file_get_contents($_template->cached->filepath);
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearAll(Smarty $smarty, $exp_time = null)
+    {
+        return $smarty->ext->_cacheResourceFile->clear($smarty, null, null, null, $exp_time);
+    }
+
+    /**
+     * 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)
+    {
+        return $smarty->ext->_cacheResourceFile->clear($smarty, $resource_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
+     *
+     * @return boolean true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            clearstatcache(true, $cached->lock_id);
+        } else {
+            clearstatcache();
+        }
+        if (is_file($cached->lock_id)) {
+            $t = filemtime($cached->lock_id);
+            return $t && (time() - $t < $smarty->locking_timeout);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = true;
+        touch($cached->lock_id);
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = false;
+        @unlink($cached->lock_id);
+    }
+}

libs/sysplugins/smarty_internal_compile_append.php

@@ -1,18 +1,17 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Append
- *
  * Compiles the {append} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Append Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
 class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
@@ -20,25 +19,28 @@ 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  object $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 function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // the following must be assigned at runtime because it will be overwritten in parent class
         $this->required_attributes = array('var', 'value');
         $this->shorttag_order = array('var', 'value');
         $this->optional_attributes = array('scope', 'index');
+        $this->mapCache = array();
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         // map to compile assign attributes
-        if (isset($_attr['index'])) {
-            $_params['smarty_internal_index'] = '[' . $_attr['index'] . ']';
-            unset($_attr['index']);
+        if (isset($_attr[ 'index' ])) {
+            $_params[ 'smarty_internal_index' ] = '[' . $_attr[ 'index' ] . ']';
+            unset($_attr[ 'index' ]);
         } else {
-            $_params['smarty_internal_index'] = '[]';
+            $_params[ 'smarty_internal_index' ] = '[]';
         }
         $_new_attr = array();
         foreach ($_attr as $key => $value) {
@@ -47,5 +49,4 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
         // call compile assign
         return parent::compile($_new_attr, $compiler, $_params);
     }
-
 }

libs/sysplugins/smarty_internal_compile_assign.php

@@ -1,87 +1,96 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Assign
- *
  * Compiles the {assign} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Assign Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
 class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
 {
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see 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
+    );
+
     /**
      * Compiles code for the {assign} 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 \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
         $this->required_attributes = array('var', 'value');
         $this->shorttag_order = array('var', 'value');
         $this->optional_attributes = array('scope');
-        $_nocache = 'null';
-        $_scope = Smarty::SCOPE_LOCAL;
+        $this->mapCache = array();
+        $_nocache = false;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         // nocache ?
+        if ($_var = $compiler->getId($_attr[ 'var' ])) {
+            $_var = "'{$_var}'";
+        } else {
+            $_var = $_attr[ 'var' ];
+        }
         if ($compiler->tag_nocache || $compiler->nocache) {
-            $_nocache = 'true';
+            $_nocache = true;
             // create nocache var to make it know for further compiling
-            if (isset($compiler->template->tpl_vars[trim($_attr['var'], "'")])) {
-                $compiler->template->tpl_vars[trim($_attr['var'], "'")]->nocache = true;
-            } else {
-                $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
-            }
+            $compiler->setNocacheInVariable($_attr[ 'var' ]);
         }
         // scope setup
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_scope = Smarty::SCOPE_GLOBAL;
-            } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
-            }
-        }
-        // compiled output
-        if (isset($parameter['smarty_internal_index'])) {
-            $output = "<?php \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
+        if ($_attr[ 'noscope' ]) {
+            $_scope = -1;
         } else {
-            // implement Smarty2's behaviour of variables assigned by reference
-            if ($compiler->template->smarty instanceof SmartyBC) {
-                $output = "<?php if (isset(\$_smarty_tpl->tpl_vars[$_attr[var]])) {\$_smarty_tpl->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-                $output .= "\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value = $_attr[value]; \$_smarty_tpl->tpl_vars[$_attr[var]]->nocache = $_nocache; \$_smarty_tpl->tpl_vars[$_attr[var]]->scope = $_scope;";
-                $output .= "\n} else \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
-            } else {
-                $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
-            }
+            $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
         }
-        if ($_scope == Smarty::SCOPE_PARENT) {
-            $output .= "\nif (\$_smarty_tpl->parent != null) \$_smarty_tpl->parent->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }";
+        // optional parameter
+        $_params = '';
+        if ($_nocache || $_scope) {
+            $_params .= ' ,' . var_export($_nocache, true);
         }
-        if ($_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
+        if ($_scope) {
+            $_params .= ' ,' . $_scope;
+        }
+        if (isset($parameter[ 'smarty_internal_index' ])) {
+            $output =
+                "<?php \$_tmp_array = isset(\$_smarty_tpl->tpl_vars[{$_var}]) ? \$_smarty_tpl->tpl_vars[{$_var}]->value : array();\n";
+            $output .= "if (!(is_array(\$_tmp_array) || \$_tmp_array instanceof ArrayAccess)) {\n";
+            $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});?>";
+        } else {
+            $output = "<?php \$_smarty_tpl->_assignInScope({$_var}, {$_attr['value']}{$_params});?>";
         }
-        $output .= '?>';
-
         return $output;
     }
-
 }

libs/sysplugins/smarty_internal_compile_block.php

@@ -1,25 +1,20 @@
 <?php
-
 /**
- * Smarty Internal Plugin Compile Block
+ * This file is part of Smarty.
  *
- * Compiles the {block}{/block} tags
+ * (c) 2015 Uwe Tews
  *
- * @package Smarty
- * @subpackage Compiler
- * @author 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 Class
  *
- * @package Smarty
- * @subpackage Compiler
+ * @author Uwe Tews <uwe.tews@googlemail.com>
  */
-class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase
+class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inheritance
 {
-
-    const parent = '____SMARTY_BLOCK_PARENT____';
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -42,7 +37,7 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $option_flags = array('hide', 'append', 'prepend', 'nocache');
+    public $option_flags = array('hide', 'nocache');
 
     /**
      * Attribute definition: Overwrites base class.
@@ -50,380 +45,145 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $optional_attributes = array('internal_file', 'internal_uid', 'internal_line');
-    /**
-     * nested child block names
-     *
-     * @var array
-     */
-    public static $nested_block_names = array();
-
-    /**
-     * child block source buffer
-     *
-     * @var array
-     */
-    public static $block_data = array();
+    public $optional_attributes = array('assign');
 
     /**
      * Compiles code for the {block} tag
      *
-     * @param array $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return boolean 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, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
+        if (!isset($compiler->_cache[ 'blockNesting' ])) {
+            $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');
+        } else {
+            $this->option_flags = array('hide', 'nocache');
+        }
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        $_name = trim($_attr['name'], "\"'");
-
-        // check if we process an inheritance child template
-        if ($compiler->inheritance_child) {
-            array_unshift(self::$nested_block_names, $_name);
-            $this->template->block_data[$_name]['source'] = '';
-            // build {block} for child block
-            self::$block_data[$_name]['source'] =
-                "{$compiler->smarty->left_delimiter}private_child_block name={$_attr['name']} file='{$compiler->template->source->filepath}'" .
-                " uid='{$compiler->template->source->uid}' line={$compiler->lex->line}";
-            if ($_attr['nocache']) {
-                self::$block_data[$_name]['source'] .= ' nocache';
-            }
-            self::$block_data[$_name]['source'] .= $compiler->smarty->right_delimiter;
-
-            $save = array($_attr, $compiler->inheritance);
-            $this->openTag($compiler, 'block', $save);
-            // set flag for {block} tag
-            $compiler->inheritance = true;
-            $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            $compiler->has_code = false;
-            return;
-        }
-        // must merge includes
-        if ($_attr['nocache'] == true) {
-            $compiler->tag_nocache = true;
-        }
-        $save = array($_attr, $compiler->inheritance, $compiler->parser->current_buffer, $compiler->nocache);
-        $this->openTag($compiler, 'block', $save);
-        $compiler->inheritance = true;
+        ++$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();
+        $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->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->has_code = false;
-
-        return true;
+        $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 object $compiler  compiler object
-     * @param string $_name     optional name of child block
-     * @return string   compiled code of child block
-     */
-    static function compileChildBlock($compiler, $_name = null)
-    {
-        if ($compiler->inheritance_child) {
-            $name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-            if (isset($compiler->template->block_data[$name1])) {
-                //  replace inner block name with generic
-                Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= $compiler->template->block_data[$name1]['source'];
-                Smarty_Internal_Compile_Block::$block_data[$name1]['child'] = true;
-            }
-            $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            $compiler->has_code = false;
-            return;
-        }
-        // if called by {$smarty.block.child} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (--$stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
-                    break;
-                }
-            }
-        }
-        if ($_name == null) {
-            $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ', $compiler->lex->taglineno);
-        }
-        // undefined child?
-        if (!isset($compiler->template->block_data[$_name]['source'])) {
-            $compiler->popTrace();
-            return '';
-        }
-        // flag that child is already compile by {$smarty.block.child} inclusion
-        $compiler->template->block_data[$_name]['compiled'] = true;
-        $_tpl = new Smarty_Internal_template('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id,
-            $compiler->template->compile_id, $compiler->template->caching, $compiler->template->cache_lifetime);
-        if ($compiler->smarty->debugging) {
-            Smarty_Internal_Debug::ignore($_tpl);
-        }
-        $_tpl->tpl_vars = $compiler->template->tpl_vars;
-        $_tpl->variable_filters = $compiler->template->variable_filters;
-        $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-        $_tpl->allow_relative_path = true;
-        $_tpl->compiler->inheritance = true;
-        $_tpl->compiler->suppressHeader = true;
-        $_tpl->compiler->suppressFilter = true;
-        $_tpl->compiler->suppressTemplatePropertyHeader = true;
-        $_tpl->compiler->suppressMergedTemplates = true;
-        $nocache = $compiler->nocache || $compiler->tag_nocache;
-        if (strpos($compiler->template->block_data[$_name]['source'], self::parent) !== false) {
-            $_output = str_replace(self::parent, $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl, $nocache));
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
-            $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache) . $compiler->parser->current_buffer->to_smarty_php();
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
-            $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl, $nocache);
-        } elseif (!empty($compiler->template->block_data[$_name])) {
-            $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache);
-        }
-        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
-        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
-        $compiler->merged_templates = array_merge($compiler->merged_templates, $_tpl->compiler->merged_templates);
-        $compiler->template->variable_filters = $_tpl->variable_filters;
-        if ($_tpl->has_nocache_code) {
-            $compiler->template->has_nocache_code = true;
-        }
-        foreach ($_tpl->required_plugins as $key => $tmp1) {
-            if ($compiler->nocache && $compiler->template->caching) {
-                $code = 'nocache';
-            } else {
-                $code = $key;
-            }
-            foreach ($tmp1 as $name => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->template->required_plugins[$code][$name][$type] = $data;
-                }
-            }
-        }
-        unset($_tpl);
-        $compiler->has_code = true;
-        return $_output;
-    }
-
-    /**
-     * Compile $smarty.block.parent
-     *
-     * @param object $compiler  compiler object
-     * @param string $_name     optional name of child block
-     * @return string   compiled code of schild block
-     */
-    static function compileParentBlock($compiler, $_name = null)
-    {
-        // if called by {$smarty.block.parent} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (--$stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
-                    break;
-                }
-            }
-        }
-        if ($_name == null) {
-            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ', $compiler->lex->taglineno);
-        }
-        if (empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
-            $compiler->trigger_template_error(' illegal {$smarty.block.parent} in parent template ', $compiler->lex->taglineno);
-        }
-        Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= Smarty_Internal_Compile_Block::parent;
-        $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-        $compiler->has_code = false;
-        return;
-    }
-
-    /**
-     * Process block source
-     *
-     * @param string $source    source text
-     * @return ''
-     */
-    static function blockSource($compiler, $source)
-    {
-        Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= $source;
-    }
-
 }
 
-
 /**
  * Smarty Internal Plugin Compile BlockClose Class
- *
- * @package Smarty
- * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase
+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 object $compiler compiler object
-     * @return string compiled code
+     * @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
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $compiler->has_code = true;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $saved_data = $this->closeTag($compiler, array('block'));
-        $_name = trim($saved_data[0]['name'], "\"'");
-        // reset flag for {block} tag
-        $compiler->inheritance = $saved_data[1];
-        // check if we process an inheritance child template
-        if ($compiler->inheritance_child) {
-            $name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-            Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= "{$compiler->smarty->left_delimiter}/private_child_block{$compiler->smarty->right_delimiter}";
-            $level = count(Smarty_Internal_Compile_Block::$nested_block_names);
-            array_shift(Smarty_Internal_Compile_Block::$nested_block_names);
-            if (!empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
-                $name2 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-                if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
-                    if (isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child']) || !isset($compiler->template->block_data[$name1])) {
-                        Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                    } else {
-                        if ($compiler->template->block_data[$name1]['mode'] == 'append') {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'] . Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                        } else {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'];
-                        }
-                    }
-                }
-                unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
-                $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            } else {
-                if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
-                    if (isset($compiler->template->block_data[$name1]) && !isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child'])) {
-                        if (strpos($compiler->template->block_data[$name1]['source'], Smarty_Internal_Compile_Block::parent) !== false) {
-                            $compiler->template->block_data[$name1]['source'] =
-                                str_replace(Smarty_Internal_Compile_Block::parent, Smarty_Internal_Compile_Block::$block_data[$name1]['source'], $compiler->template->block_data[$name1]['source']);
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
-                            $compiler->template->block_data[$name1]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'append') {
-                            $compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
-                        }
-                    } else {
-                        $compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                    }
-                    $compiler->template->block_data[$name1]['mode'] = 'replace';
-                    if ($saved_data[0]['append']) {
-                        $compiler->template->block_data[$name1]['mode'] = 'append';
-                    }
-                    if ($saved_data[0]['prepend']) {
-                        $compiler->template->block_data[$name1]['mode'] = 'prepend';
-                    }
-                }
-                unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
-                $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
+        list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
+        // init block parameter
+        $_block = $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ];
+        unset($compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ]);
+        $_name = $_attr[ 'name' ];
+        $_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')) {
+                $_block[ $name ] = 'true';
             }
-            $compiler->has_code = false;
-            return;
         }
-        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
-            $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
+        $_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} = " . var_export($value, true) . ";\n";
+        }
+        $output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\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";
+        }
+        if (isset($_assign)) {
+            $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, $_functionCode);
+        $output = "<?php\n";
+        if (isset($_assign)) {
+            $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        $output .= "}\n";
+        $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 .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        // 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) {
+            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
         } else {
-            if ($saved_data[0]['hide'] && !isset($compiler->template->block_data[$_name]['source'])) {
-                $_output = '';
-            } else {
-                $_output = $compiler->parser->current_buffer->to_smarty_php();
-            }
+            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
         }
-        unset($compiler->template->block_data[$_name]['compiled']);
-        // reset flags
-        $compiler->parser->current_buffer = $saved_data[2];
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
+        $output .= "?>\n";
+        --$compiler->_cache[ 'blockNesting' ];
+        if ($compiler->_cache[ 'blockNesting' ] === 0) {
+            unset($compiler->_cache[ 'blockNesting' ]);
         }
-        $compiler->nocache = $saved_data[3];
-        // $_output content has already nocache code processed
+        $compiler->has_code = true;
         $compiler->suppressNocacheProcessing = true;
-
-        return $_output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Child Block Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Child_Block extends Smarty_Internal_CompileBase
-{
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name', 'file', 'uid', 'line');
-
-
-    /**
-     * Compiles code for the {private_child_block} tag
-     *
-     * @param array $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return boolean true
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        // must merge includes
-        if ($_attr['nocache'] == true) {
-            $compiler->tag_nocache = true;
-        }
-        $save = array($_attr, $compiler->nocache);
-
-        // set trace back to child block
-        $compiler->pushTrace(trim($_attr['file'], "\"'"), trim($_attr['uid'], "\"'"), $_attr['line'] - $compiler->lex->line);
-
-        $this->openTag($compiler, 'private_child_block', $save);
-
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $compiler->has_code = false;
-
-        return true;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Child Block Close Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Child_Blockclose extends Smarty_Internal_CompileBase
-{
-
-
-    /**
-     * Compiles code for the {/private_child_block} tag
-     *
-     * @param array $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return boolean true
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $saved_data = $this->closeTag($compiler, array('private_child_block'));
-
-        // end of child block
-        $compiler->popTrace();
-
-        $compiler->nocache = $saved_data[1];
-        $compiler->has_code = false;
-
-        return true;
+        return $output;
     }
 }

libs/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';
+}

libs/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';
+}

libs/sysplugins/smarty_internal_compile_break.php

@@ -1,17 +1,17 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Break
- *
  * Compiles the {break} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
+
 /**
  * Smarty Internal Plugin Compile Break Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
 class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('levels');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -31,45 +32,86 @@ 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  object $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, $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', $compiler->lex->taglineno);
+        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', $compiler->lex->taglineno);
+        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]])) {
+            if (isset($_is_loopy[ $compiler->_tag_stack[ $stack_count ][ 0 ] ])) {
+                $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--;
         }
-        if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
+        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);
     }
-
 }

libs/sysplugins/smarty_internal_compile_call.php

@@ -1,18 +1,17 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Function_Call
- *
  * Compiles the calls of user defined tags defined by {function}
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Function_Call Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
 class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -31,6 +31,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -42,9 +43,9 @@ 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  $parameter array with compilation parameter
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -52,17 +53,15 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         // save possible attributes
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of beind displayed
-            $_assign = $_attr['assign'];
+        if (isset($_attr[ 'assign' ])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr[ 'assign' ];
         }
-        $_name = $_attr['name'];
-        if ($compiler->compiles_template_function) {
-            $compiler->called_functions[] = trim($_name, "'\"");
-        }
-        unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
+        //$_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
-        if ($compiler->nocache || $compiler->tag_nocache) {
+        if (!$compiler->template->caching || $compiler->nocache || $compiler->tag_nocache) {
             $_nocache = 'true';
         } else {
             $_nocache = 'false';
@@ -75,55 +74,16 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
                 $_paramsArray[] = "'$_key'=>$_value";
             }
         }
-        if (isset($compiler->template->properties['function'][$_name]['parameter'])) {
-            foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        } elseif (isset($compiler->smarty->template_functions[$_name]['parameter'])) {
-            foreach ($compiler->smarty->template_functions[$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        }
-        //varibale name?
-        if (!(strpos($_name, '$') === false)) {
-            $call_cache = $_name;
-            $call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp';
-        } else {
-            $_name = trim($_name, "'\"");
-            $call_cache = "'{$_name}'";
-            $call_function = 'smarty_template_function_' . $_name;
-        }
-
-        $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        $_hash = str_replace('-', '_', $compiler->template->properties['nocache_hash']);
+        $_params = 'array(' . implode(',', $_paramsArray) . ')';
+        //$compiler->suppressNocacheProcessing = true;
         // was there an assign attribute
         if (isset($_assign)) {
-            if ($compiler->template->caching) {
-                $_output = "<?php ob_start(); Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            } else {
-                $_output = "<?php ob_start(); {$call_function}(\$_smarty_tpl,{$_params}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            }
+            $_output =
+                "<?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 {
-            if ($compiler->template->caching) {
-                $_output = "<?php Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache});?>\n";
-            } else {
-                $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
-            }
+            $_output =
+                "<?php \$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
         }
-
         return $_output;
     }
-
 }

libs/sysplugins/smarty_internal_compile_capture.php

@@ -1,18 +1,17 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Capture
- *
  * Compiles the {capture} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Capture Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
 class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -33,35 +33,51 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
     public $optional_attributes = array('name', 'assign', 'append');
 
     /**
-     * Compiles code for the {capture} tag
+     * 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  object $compiler compiler object
      * @return string compiled code
      */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $buffer = isset($_attr['name']) ? $_attr['name'] : "'default'";
-        $assign = isset($_attr['assign']) ? $_attr['assign'] : 'null';
-        $append = isset($_attr['append']) ? $_attr['append'] : 'null';
-
-        $compiler->_capture_stack[0][] = array($buffer, $assign, $append, $compiler->nocache);
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $_output = "<?php \$_smarty_tpl->_capture_stack[0][] = array($buffer, $assign, $append); ob_start(); ?>";
-
-        return $_output;
+    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 \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param null                                  $parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter = null)
+    {
+        // 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);?>";
+        return $_output;
+    }
 }
 
 /**
  * Smarty Internal Plugin Compile Captureclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
 class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
@@ -69,29 +85,21 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {/capture} tag
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param null                                  $parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+        $_attr = $this->getAttributes($compiler, $args, $parameter, '/capture');
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;
         }
-
-        list($buffer, $assign, $append, $compiler->nocache) = array_pop($compiler->_capture_stack[0]);
-
-        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_capture_stack[0]);\n";
-        $_output .= "if (!empty(\$_capture_buffer)) {\n";
-        $_output .= " if (isset(\$_capture_assign)) \$_smarty_tpl->assign(\$_capture_assign, ob_get_contents());\n";
-        $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n";
-        $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n";
-        $_output .= "} else \$_smarty_tpl->capture_error();?>";
-
-        return $_output;
+        list($compiler->nocache) = array_pop($compiler->_cache[ 'capture_stack' ]);
+        return "<?php \$_smarty_tpl->smarty->ext->_capture->close(\$_smarty_tpl);?>";
     }
-
 }

libs/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;
+    }
+}

libs/sysplugins/smarty_internal_compile_config_load.php

@@ -1,18 +1,17 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Config Load
- *
  * Compiles the {config load} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Config Load Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
 class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
@@ -24,13 +23,15 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $shorttag_order = array('file','section');
+    public $shorttag_order = array('file', 'section');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -39,45 +40,57 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('section', 'scope');
 
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see 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, '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  object $compiler compiler object
+     * @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, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        static $_is_legal_scope = array('local' => true,'parent' => true,'root' => true,'global' => true);
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
-
-        // save posible attributes
-        $conf_file = $_attr['file'];
-        if (isset($_attr['section'])) {
-            $section = $_attr['section'];
+        // save possible attributes
+        $conf_file = $_attr[ 'file' ];
+        if (isset($_attr[ 'section' ])) {
+            $section = $_attr[ 'section' ];
         } else {
             $section = 'null';
         }
-        $scope = 'local';
         // scope setup
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if (isset($_is_legal_scope[$_attr['scope']])) {
-                $scope = $_attr['scope'];
-           } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
-           }
+        if ($_attr[ 'noscope' ]) {
+            $_scope = -1;
+        } else {
+            $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
         }
         // create config object
-        $_output = "<?php  \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);";
-        $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>";
-
+        $_output =
+            "<?php\n\$_smarty_tpl->smarty->ext->configLoad->_loadConfigFile(\$_smarty_tpl, {$conf_file}, {$section}, {$_scope});\n?>\n";
         return $_output;
     }
-
 }