fix php7.4 deprecation and remove php7.4 from travis allow_failures since php7.4 is current stable

Revert "Reinstitute the phpunit/phpunit dependency the right way."

.gitattributes

@@ -6,12 +6,11 @@
 *.lex text eol=lf
 
 # exclude from git export
-/tests export-ignore
-/utilities/ export-ignore
-
-/.gitattributes export-ignore
+/travis.ini export-ignore
+/myconfig.ini export-ignore
+/.travis.yml export-ignore
 /.gitignore export-ignore
-/make-release.sh export-ignore
-/phpunit.sh export-ignore
-/phpunit.xml export-ignore
-/TODO.md export-ignore
+/.gitattributes export-ignore
+/lexer/ export-ignore
+/utilities/ export-ignore
+/error_reporting.ini export-ignore

.github/workflows/ci.yml

@@ -1,73 +0,0 @@
-# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
-
-on:
-  - pull_request
-  - push
-
-name: CI
-
-jobs:
-  tests:
-    name: Tests
-
-    runs-on: ${{ matrix.os }}
-
-    env:
-      PHP_EXTENSIONS: dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
-      PHP_INI_VALUES: assert.exception=1, zend.assertions=1
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-
-        php-version:
-          - "7.1"
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
-
-        compiler:
-          - default
-
-        include:
-          - os: ubuntu-latest
-            php-version: "8.0"
-            compiler: jit
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Override PHP ini values for JIT compiler
-      if: matrix.compiler == 'jit'
-      run: echo "PHP_INI_VALUES::assert.exception=1, zend.assertions=1, opcache.enable=1, opcache.enable_cli=1, opcache.optimization_level=-1, opcache.jit=1255, opcache.jit_buffer_size=32M" >> $GITHUB_ENV
-
-    - name: Install PHP with extensions
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-version }}
-        coverage: pcov
-        extensions: ${{ env.PHP_EXTENSIONS }}
-        ini-values: ${{ env.PHP_INI_VALUES }}
-
-    - name: Validate composer.json and composer.lock
-      run: composer validate
-
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
-      with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-php-${{ matrix.php-version }}-
-
-    - name: Install dependencies
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --prefer-dist --no-progress --no-suggest
-
-    - name: Run tests with phpunit
-      run: ./phpunit.sh

.gitignore

@@ -9,6 +9,5 @@ utilies/*.php
 
 # Dev
 phpunit*
-.phpunit.result.cache
 vendor/*
 composer.lock

.travis.yml

@@ -0,0 +1,34 @@
+
+language: php
+
+sudo: false
+
+dist: trusty
+
+matrix:
+  include:
+   - php: 7.0
+   - php: 7.1
+   - php: 7.2
+   - php: 7.3
+   - php: 7.4
+   - php: nightly
+  fast_finish: true
+  allow_failures:
+   - php: nightly
+
+services:
+  - memcached
+  - mysql
+
+before_script:
+    - mysql -e "create database IF NOT EXISTS test;" -uroot
+
+before_install:
+    - phpenv config-rm xdebug.ini || return 0
+
+install:
+    - travis_retry composer install
+
+script:
+   - ./phpunit.sh

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

@@ -3,7 +3,7 @@ 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.
+ version 2.1 of the License, or (at your option) any later version.
 
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of

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

@@ -0,0 +1,575 @@
+Smarty 3.x
+
+Author: Monte Ohrt <monte at ohrt dot com >
+Author: Uwe Tews
+
+AN INTRODUCTION TO SMARTY 3
+
+NOTICE FOR 3.1 release:
+
+Please see the SMARTY_3.1_NOTES.txt file that comes with the distribution.
+
+NOTICE for 3.0.5 release:
+
+Smarty now follows the PHP error_reporting level by default. If PHP does not mask E_NOTICE and you try to access an unset template variable, you will now get an E_NOTICE warning. To revert to the old behavior:
+
+$smarty->error_reporting = E_ALL & ~E_NOTICE;
+
+NOTICE for 3.0 release:
+
+IMPORTANT: Some API adjustments have been made between the RC4 and 3.0 release.
+We felt it is better to make these now instead of after a 3.0 release, then have to
+immediately deprecate APIs in 3.1. Online documentation has been updated
+to reflect these changes. Specifically:
+
+---- API CHANGES RC4 -> 3.0 ----
+
+$smarty->register->*
+$smarty->unregister->*
+$smarty->utility->*
+$samrty->cache->*
+
+Have all been changed to local method calls such as:
+
+$smarty->clearAllCache()
+$smarty->registerFoo()
+$smarty->unregisterFoo()
+$smarty->testInstall()
+etc.
+
+Registration of function, block, compiler, and modifier plugins have been
+consolidated under two API calls:
+
+$smarty->registerPlugin(...)
+$smarty->unregisterPlugin(...)
+
+Registration of pre, post, output and variable filters have been
+consolidated under two API calls:
+
+$smarty->registerFilter(...)
+$smarty->unregisterFilter(...)
+
+Please refer to the online documentation for all specific changes:
+
+http://www.smarty.net/documentation
+
+----
+
+The Smarty 3 API has been refactored to a syntax geared
+for consistency and modularity. The Smarty 2 API syntax is still supported, but
+will throw a deprecation notice. You can disable the notices, but it is highly
+recommended to adjust your syntax to Smarty 3, as the Smarty 2 syntax must run
+through an extra rerouting wrapper.
+
+Basically, all Smarty methods now follow the "fooBarBaz" camel case syntax. Also,
+all Smarty properties now have getters and setters. So for example, the property
+$smarty->cache_dir can be set with $smarty->setCacheDir('foo/') and can be
+retrieved with $smarty->getCacheDir().
+
+Some of the Smarty 3 APIs have been revoked such as the "is*" methods that were
+just duplicate functions of the now available "get*" methods.
+
+Here is a rundown of the Smarty 3 API:
+
+$smarty->fetch($template, $cache_id = null, $compile_id = null, $parent = null)
+$smarty->display($template, $cache_id = null, $compile_id = null, $parent = null)
+$smarty->isCached($template, $cache_id = null, $compile_id = null)
+$smarty->createData($parent = null)
+$smarty->createTemplate($template, $cache_id = null, $compile_id = null, $parent = null)
+$smarty->enableSecurity()
+$smarty->disableSecurity()
+$smarty->setTemplateDir($template_dir)
+$smarty->addTemplateDir($template_dir)
+$smarty->templateExists($resource_name)
+$smarty->loadPlugin($plugin_name, $check = true)
+$smarty->loadFilter($type, $name)
+$smarty->setExceptionHandler($handler)
+$smarty->addPluginsDir($plugins_dir)
+$smarty->getGlobal($varname = null)
+$smarty->getRegisteredObject($name)
+$smarty->getDebugTemplate()
+$smarty->setDebugTemplate($tpl_name)
+$smarty->assign($tpl_var, $value = null, $nocache = false)
+$smarty->assignGlobal($varname, $value = null, $nocache = false)
+$smarty->assignByRef($tpl_var, &$value, $nocache = false)
+$smarty->append($tpl_var, $value = null, $merge = false, $nocache = false)
+$smarty->appendByRef($tpl_var, &$value, $merge = false)
+$smarty->clearAssign($tpl_var)
+$smarty->clearAllAssign()
+$smarty->configLoad($config_file, $sections = null)
+$smarty->getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true)
+$smarty->getConfigVariable($variable)
+$smarty->getStreamVariable($variable)
+$smarty->getConfigVars($varname = null)
+$smarty->clearConfig($varname = null)
+$smarty->getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
+$smarty->clearAllCache($exp_time = null, $type = null)
+$smarty->clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
+
+$smarty->registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = array())
+
+$smarty->registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
+
+$smarty->registerFilter($type, $function_name)
+$smarty->registerResource($resource_type, $function_names)
+$smarty->registerDefaultPluginHandler($function_name)
+$smarty->registerDefaultTemplateHandler($function_name)
+
+$smarty->unregisterPlugin($type, $tag)
+$smarty->unregisterObject($object_name)
+$smarty->unregisterFilter($type, $function_name)
+$smarty->unregisterResource($resource_type)
+
+$smarty->compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
+$smarty->clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
+$smarty->testInstall()
+
+// then all the getters/setters, available for all properties. Here are a few:
+
+$caching = $smarty->getCaching();      // get $smarty->caching
+$smarty->setCaching(true);             // set $smarty->caching
+$smarty->setDeprecationNotices(false); // set $smarty->deprecation_notices
+$smarty->setCacheId($id);              // set $smarty->cache_id
+$debugging = $smarty->getDebugging();  // get $smarty->debugging
+
+
+FILE STRUCTURE
+
+The Smarty 3 file structure is similar to Smarty 2:
+
+/libs/
+  Smarty.class.php
+/libs/sysplugins/
+  internal.*
+/libs/plugins/
+  function.mailto.php
+  modifier.escape.php
+  ...
+
+A lot of Smarty 3 core functionality lies in the sysplugins directory; you do
+not need to change any files here. The /libs/plugins/ folder is where Smarty
+plugins are located. You can add your own here, or create a separate plugin
+directory, just the same as Smarty 2. You will still need to create your own
+/cache/, /templates/, /templates_c/, /configs/ folders. Be sure /cache/ and
+/templates_c/ are writable.
+
+The typical way to use Smarty 3 should also look familiar:
+
+require('Smarty.class.php');
+$smarty = new Smarty;
+$smarty->assign('foo','bar');
+$smarty->display('index.tpl');
+
+
+However, Smarty 3 works completely different on the inside. Smarty 3 is mostly
+backward compatible with Smarty 2, except for the following items:
+
+*) Smarty 3 is PHP 5 only. It will not work with PHP 4.
+*) The {php} tag is disabled by default. Enable with $smarty->allow_php_tag=true.
+*) Delimiters surrounded by whitespace are no longer treated as Smarty tags.
+   Therefore, { foo } will not compile as a tag, you must use {foo}. This change
+   Makes Javascript/CSS easier to work with, eliminating the need for {literal}.
+   This can be disabled by setting $smarty->auto_literal = false;
+*) The Smarty 3 API is a bit different. Many Smarty 2 API calls are deprecated
+   but still work. You will want to update your calls to Smarty 3 for maximum
+   efficiency.
+
+
+There are many things that are new to Smarty 3. Here are the notable items:
+
+LEXER/PARSER
+============
+
+Smarty 3 now uses a lexing tokenizer for its parser/compiler. Basically, this
+means Smarty has some syntax additions that make life easier such as in-template
+math, shorter/intuitive function parameter options, infinite function recursion,
+more accurate error handling, etc.
+
+
+WHAT IS NEW IN SMARTY TEMPLATE SYNTAX
+=====================================
+
+Smarty 3 allows expressions almost anywhere. Expressions can include PHP
+functions as long as they are not disabled by the security policy, object
+methods and properties, etc. The {math} plugin is no longer necessary but
+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
+{$foo[$x+3]}                      as array index
+
+Smarty tags can be used as values within other tags.
+Example:  {$foo={counter}+3}
+
+Smarty tags can also be used inside double quoted strings.
+Example:  {$foo="this is message {counter}"}
+
+You can define arrays within templates.
+Examples:
+{assign var=foo value=[1,2,3]}
+{assign var=foo value=['y'=>'yellow','b'=>'blue']}
+Arrays can be nested.
+{assign var=foo value=[1,[9,8],3]}
+
+There is a new short syntax supported for assigning variables.
+Example: {$foo=$bar+2}
+
+You can assign a value to a specific array element. If the variable exists but
+is not an array, it is converted to an array before the new values are assigned.
+Examples:
+{$foo['bar']=1}
+{$foo['bar']['blar']=1}
+
+You can append values to an array. If the variable exists but is not an array,
+it is converted to an array before the new values are assigned.
+Example: {$foo[]=1}
+
+You can use a PHP-like syntax for accessing array elements, as well as the
+original "dot" notation.
+Examples:
+{$foo[1]}             normal access
+{$foo['bar']}
+{$foo['bar'][1]}
+{$foo[$x+$x]}         index may contain any expression
+{$foo[$bar[1]]}       nested index
+{$foo[section_name]}  smarty section access, not array access!
+
+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']        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.
+
+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}_buh_{$blar}  variable name with multiple segments
+{$foo_{$x}}  will output the variable $foo_1 if $x has a value of 1.
+
+Object method chaining is implemented.
+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
+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 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
+$x@total = total number of iterations
+$x@first = true on first iteration
+$x@last = true on last iteration
+
+
+The Smarty 2 {section} syntax is still supported.
+
+New shorter {foreach} syntax to loop over an array.
+Example: {foreach $myarray as $var}...{/foreach}
+
+Within the foreach loop, properties are access via:
+
+$var@key            foreach $var array key
+$var@iteration      foreach current iteration count (1,2,3...)
+$var@index          foreach current index count (0,1,2...)
+$var@total          foreach $var array total
+$var@first          true on first iteration
+$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.
+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}.
+
+while block tag is now implemented:
+{while $foo}...{/while}
+{while $x lt 10}...{/while}
+
+Direct access to PHP functions:
+Just as you can use PHP functions as modifiers directly, you can now access
+PHP functions directly, provided they are permitted by security settings:
+{time()}
+
+There is a new {function}...{/function} block tag to implement a template function.
+This enables reuse of code sequences like a plugin function. It can call itself recursively.
+Template function must be called with the new {call name=foo...} tag.
+
+Example:
+
+Template file:
+{function name=menu level=0}
+  <ul class="level{$level}">
+  {foreach $data as $entry}
+    {if is_array($entry)}
+      <li>{$entry@key}</li>
+       {call name=menu data=$entry level=$level+1}
+    {else}
+      <li>{$entry}</li>
+    {/if}
+  {/foreach}
+  </ul>
+{/function}
+
+{$menu = ['item1','item2','item3' => ['item3-1','item3-2','item3-3' =>
+  ['item3-3-1','item3-3-2']],'item4']}
+
+{call name=menu data=$menu}
+
+
+Generated output:
+    * item1
+    * item2
+    * item3
+          o item3-1
+          o item3-2
+          o item3-3
+                + item3-3-1
+                + item3-3-2
+    * item4
+
+The function tag itself must have the "name" attribute. This name is the tag
+name when calling the function. The function tag may have any number of
+additional attributes. These will be default settings for local variables.
+
+New {nocache} block function:
+{nocache}...{/nocache} will declare a section of the template to be non-cached
+when template caching is enabled.
+
+New nocache attribute:
+You can declare variable/function output as non-cached with the nocache attribute.
+Examples:
+
+{$foo nocache=true}
+{$foo nocache} /* same */
+
+{foo bar="baz" nocache=true}
+{foo bar="baz" nocache} /* same */
+
+{time() nocache=true}
+{time() nocache} /* same */
+
+Or you can also assign the variable in your script as nocache:
+$smarty->assign('foo',$something,true); // third param is nocache setting
+{$foo} /* non-cached */
+
+$smarty.current_dir returns the directory name of the current template.
+
+You can use strings directly as templates with the "string" resource type.
+Examples:
+$smarty->display('string:This is my template, {$foo}!'); // php
+{include file="string:This is my template, {$foo}!"} // template
+
+
+
+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
+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.
+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
+from the Smarty object.
+
+All known Smarty assignment interfaces will work on the data and template objects.
+
+Besides the above mentioned objects, there is also a special storage area for
+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= $smarty->createData($smarty);  // create data object having a parent link to
+the Smarty object
+
+$data2= $smarty->createData($data);   // create data object having a parent link to
+the $data data object
+
+A template object can be created by using the createTemplate method. It has the
+same parameter assignments as the fetch() or display() method.
+Function definition:
+function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null)
+
+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 = $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
+
+The standard fetch() and display() methods will implicitly create a template object.
+If the $parent parameter is not specified in these method calls, the template object
+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.
+
+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.
+
+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.
+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
+{$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
+{$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,
+{$foo='bar' scope='global'}                 // they are available to any and all templates.
+
+
+The scope attribute can also be attached to the {include...} tag. In this case,
+the specified scope will be the default scope for all assignments within the
+included template.
+
+
+PLUGINS
+=======
+
+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, Smarty_Internal_Template $template)
+
+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
+overridden by child templates, so your templates could look like this:
+
+parent.tpl:
+<html>
+  <head>
+    <title>{block name='title'}My site name{/block}</title>
+  </head>
+  <body>
+    <h1>{block name='page-title'}Default page title{/block}</h1>
+    <div id="content">
+      {block name='content'}
+        Default content
+      {/block}
+    </div>
+  </body>
+</html>
+
+child.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}
+{block name='page-title'}My home{/block}
+{block name='content'}
+  {foreach $images as $img}
+    <img src="{$img.url}" alt="{$img.description}" />
+  {/foreach}
+{/block}
+
+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 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:
+<html>
+  <head>
+    <title>Home - Child title</title>
+  </head>
+  <body>
+    <h1>My home</h1>
+    <div id="content">
+      <img src="/example.jpg" alt="image" />
+      <img src="/example2.jpg" alt="image" />
+      <img src="/example3.jpg" alt="image" />
+    </div>
+  </body>
+</html>
+
+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
+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
+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
+is appended or prepended to the child block content.
+
+{block name='title' append} My title {/block}
+
+
+PHP STREAMS:
+============
+
+(see online documentation)
+
+VARIBLE FILTERS:
+================
+
+(see online documentation)
+
+
+STATIC CLASS ACCESS AND NAMESPACE SUPPORT
+=========================================
+
+You can register a class with optional namespace for the use in the template like:
+
+$smarty->register->templateClass('foo','name\name2\myclass');
+
+In the template you can use it like this:
+{foo::method()}  etc.
+
+
+=======================
+
+Please look through it and send any questions/suggestions/etc to the forums.
+
+http://www.phpinsider.com/smarty-forum/viewtopic.php?t=14168
+
+Monte and Uwe

README.md

@@ -1,28 +1,78 @@
-# Smarty template engine
-Smarty is a template engine for PHP, facilitating the separation of presentation (HTML/CSS) from application logic. 
+# Smarty 3 template engine
+[smarty.net](https://www.smarty.net/) 
 
-![CI](https://github.com/smarty-php/smarty/workflows/CI/badge.svg)
+[![Build Status](https://travis-ci.org/smarty-php/smarty.svg?branch=master)](https://travis-ci.org/smarty-php/smarty)
 
 ## Documentation
-Read the [documentation](https://www.smarty.net/docs/en/) to find out how to use it. 
+
+For documentation see 
+[www.smarty.net/docs/en/](https://www.smarty.net/docs/en/) 
 
 ## Requirements
-Smarty can be run with PHP 7.1 to PHP 8.0.
 
-## Installation
-Smarty versions 3.1.11 or later can be installed with [Composer](https://getcomposer.org/).
+Smarty can be run with PHP 5.2 to PHP 7.4.
 
-To get the latest stable version of Smarty use:
-```bash
-composer require smarty/smarty
-````
+## Distribution repository
 
-To get the latest, unreleased version, use:
-```bash
-composer require smarty/smarty:dev-master
-````
+> Smarty 3.1.28 introduces run time template inheritance
 
-To get the previous stable version of Smarty, Smarty 3, use:
-```bash
-composer require smarty/smarty:^3
-````
+> 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.
+
+
+The "smarty/smarty" package will start at libs/....   subfolder.
+
+To get the latest stable version of Smarty 3.1 use:
+
+```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.

SECURITY.md

@@ -1,19 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Smarty currently supports the latest minor version of Smarty 3 and Smarty 4. (Smarty 4 has not been released yet.)
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 4.0.x   | :white_check_mark: |
-| 3.1.x   | :white_check_mark: |
-| < 3.1   | :x:                |
-
-## Reporting a Vulnerability
-
- If you have discovered a security issue with Smarty, please contact us at mail [at] simonwisselink.nl. Do not 
- disclose your findings publicly and PLEASE PLEASE do not file an Issue.
- 
-We will try to confirm the vulnerability and develop a fix if appropriate. When we release the fix, we will publish 
-a security release. Please let us know if you want to be credited.

SMARTY_2_BC_NOTES.txt

@@ -0,0 +1,109 @@
+= Known incompatibilities with Smarty 2 =
+
+== 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
+information.
+
+The {$array|@mod} syntax has always been a bit confusing, where an "@" is required
+to apply a modifier to an array instead of the individual elements. Normally you
+always want the modifier to apply to the variable regardless of its type. In Smarty 3,
+{$array|mod} and {$array|@mod} behave identical. It is safe to drop the "@" and the
+modifier will still apply to the array. If you really want the modifier to apply to
+each array element, you must loop the array in-template, or use a custom modifier that
+supports array iteration. Most smarty functions already escape values where necessary
+such as {html_options}
+
+== PHP Version ==
+Smarty 3 is PHP 5 only. It will not work with PHP 4.
+
+== {php} Tag ==
+The {php} tag is disabled by default. The use of {php} tags is
+deprecated. It can be enabled with $smarty->allow_php_tag=true.
+
+But if you scatter PHP code which belongs together into several
+{php} tags it may not work any longer.
+
+== Delimiters and whitespace ==
+Delimiters surrounded by whitespace are no longer treated as Smarty tags.
+Therefore, { foo } will not compile as a tag, you must use {foo}. This change
+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_)
+
+For example filename strings must be quoted
+<source lang="smarty">
+{include file='path/foo.tpl'}
+</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.
+
+<source lang="php">
+class MySmarty extends Smarty {
+   function __construct() {
+       parent::__construct();
+
+       // your initialization code goes here
+
+   }
+}
+</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
+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.
+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
+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
+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
+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.
+If one of the {if} tags is at the line end you will now get a newline in the HTML output.
+
+== trigger_error() ==
+The API function trigger_error() has been removed because it did just map to PHP trigger_error.
+However it's still included in the Smarty2 API wrapper.
+
+== Smarty constants ==
+The constants
+SMARTY_PHP_PASSTHRU
+SMARTY_PHP_QUOTE
+SMARTY_PHP_REMOVE
+SMARTY_PHP_ALLOW
+have been replaced with class constants
+Smarty::PHP_PASSTHRU
+Smarty::PHP_QUOTE
+Smarty::PHP_REMOVE
+Smarty::PHP_ALLOW
+

SMARTY_3.0_BC_NOTES.txt

@@ -0,0 +1,24 @@
+== Smarty2 backward compatibility ==
+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.
+
+== {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.
+
+== php template resource ==
+The support of the php template resource is removed.
+
+== $cache_dir, $compile_dir, $config_dir, $template_dir access ==
+The mentioned properties can't be accessed directly any longer. You must use
+corresponding getter/setters like addConfigDir(), setConfigDir(), getConfigDir()
+
+== obsolete Smarty class properties ==
+The following no longer used properties are removed:
+$allow_php_tag
+$allow_php_template
+$deprecation_notices

SMARTY_3.1_NOTES.txt

@@ -0,0 +1,306 @@
+Smarty 3.1 Notes
+================
+
+Smarty 3.1 is a departure from 2.0 compatibility. Most notably, all
+backward compatibility has been moved to a separate class file named
+SmartyBC.class.php. If you require compatibility with 2.0, you will
+need to use this class.
+
+Some differences from 3.0 are also present. 3.1 begins the journey of
+requiring setters/getters for property access. So far this is only
+implemented on the five directory properties: template_dir,
+plugins_dir, configs_dir, compile_dir and cache_dir. These properties
+are now protected, it is required to use the setters/getters instead.
+That said, direct property access will still work, however slightly
+slower since they will now fall through __set() and __get() and in
+turn passed through the setter/getter methods. 3.2 will exhibit a full
+list of setter/getter methods for all (currently) public properties,
+so code-completion in your IDE will work as expected.
+
+There is absolutely no PHP allowed in templates any more. All
+deprecated features of Smarty 2.0 are gone. Again, use the SmartyBC
+class if you need any backward compatibility.
+
+Internal Changes
+
+  Full UTF-8 Compatibility
+
+The plugins shipped with Smarty 3.1 have been rewritten to fully
+support UTF-8 strings if Multibyte String is available. Without
+MBString UTF-8 cannot be handled properly. For those rare cases where
+templates themselves have to juggle encodings, the new modifiers
+to_charset and from_charset may come in handy.
+
+  Plugin API and Performance
+
+All Plugins (modifiers, functions, blocks, resources,
+default_template_handlers, etc) are now receiving the
+Smarty_Internal_Template instance, where they were supplied with the
+Smarty instance in Smarty 3.0. *. As The Smarty_Internal_Template
+mimics the behavior of Smarty, this API simplification should not
+require any changes to custom plugins.
+
+The plugins shipped with Smarty 3.1 have been rewritten for better
+performance. Most notably {html_select_date} and {html_select_time}
+have been improved vastly. Performance aside, plugins have also been
+reviewed and generalized in their API. {html_select_date} and
+{html_select_time} now share almost all available options.
+
+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 capital letter are lower-cased.
+
+The count_sentences modifier now accepts (.?!) as
+legitimate endings of a sentence - previously only (.) was
+accepted
+
+The new unescape modifier is there to reverse the effects of the
+escape modifier. This applies to the escape formats html, htmlall and
+entity.
+
+  default_template_handler_func
+
+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:
+
+
+/**
+ * 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
+ *                          could be loaded
+ */
+function default_template_handler_func($type, $name, &$content, &$modified, Smarty $smarty) {
+    if (false) {
+        // return corrected filepath
+        return "/tmp/some/foobar.tpl";
+    } elseif (false) {
+        // return a template directly
+        $content = "the template source";
+        $modified = time();
+        return true;
+    } else {
+        // tell smarty that we failed
+        return false;
+    }
+}
+
+  Stuff done to the compiler
+
+Many performance improvements have happened internally. One notable
+improvement is that all compiled templates are now handled as PHP
+functions. This speeds up repeated templates tremendously, as each one
+calls an (in-memory) PHP function instead of performing another file
+include/scan.
+
+New Features
+
+  Template syntax
+
+ {block}..{/block}
+
+The {block} tag has a new hide option flag. It does suppress the block
+content if no corresponding child block exists.
+EXAMPLE:
+parent.tpl
+{block name=body hide} child content "{$smarty.block.child}" was
+inserted {block}
+In the above example the whole block will be suppressed if no child
+block "body" is existing.
+
+ {setfilter}..{/setfilter}
+
+The new {setfilter} block tag allows the definition of filters which
+run on variable output.
+SYNTAX:
+{setfilter filter1|filter2|filter3....}
+Smarty3 will lookup up matching filters in the following search order:
+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
+{/setfilter} will turn previous filter setting off again.
+{setfilter} tags can be nested.
+EXAMPLE:
+{setfilter filter1}
+  {$foo}
+  {setfilter filter2}
+    {$bar}
+  {/setfilter}
+  {$buh}
+{/setfilter}
+{$blar}
+In the above example filter1 will run on the output of $foo, filter2
+on $bar, filter1 again on $buh and no filter on $blar.
+NOTES:
+- {$foo nofilter} will suppress the filters
+- These filters will run in addition to filters defined by
+registerFilter('variable',...), autoLoadFilter('variable',...) and
+defined default modifier.
+- {setfilter} will effect only the current template, not included
+subtemplates.
+
+  Resource API
+
+Smarty 3.1 features a new approach to resource management. The
+Smarty_Resource API allows simple, yet powerful integration of custom
+resources for templates and configuration files. It offers simple
+functions for loading data from a custom resource (e.g. database) as
+well as define new template types adhering to the special
+non-compiling (e,g, plain php) and non-compile-caching (e.g. eval:
+resource type) resources.
+
+See demo/plugins/resource.mysql.php for an example custom database
+resource.
+
+Note that old-fashioned registration of callbacks for resource
+management has been deprecated but is still possible with SmartyBC.
+
+  CacheResource API
+
+In line with the Resource API, the CacheResource API offers a more
+comfortable handling of output-cache data. With the
+Smarty_CacheResource_Custom accessing databases is made simple. With
+the introduction of Smarty_CacheResource_KeyValueStore the
+implementation of resources like memcache or APC became a no-brainer;
+simple hash-based storage systems are now supporting hierarchical
+output-caches.
+
+See demo/plugins/cacheresource.mysql.php for an example custom
+database CacheResource.
+See demo/plugins/cacheresource.memcache.php for an example custom
+memcache CacheResource using the KeyValueStore helper.
+
+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
+$smarty->cache_locking = true;
+
+  Relative Paths in Templates (File-Resource)
+
+As of Smarty 3.1 {include file="../foo.tpl"} and {include
+file="./foo.tpl"} will resolve relative to the template they're in.
+Relative paths are available with {include file="..."} and
+{extends file="..."}. As $smarty->fetch('../foo.tpl') and
+$smarty->fetch('./foo.tpl') cannot be relative to a template, an
+exception is thrown.
+
+  Addressing a specific $template_dir
+
+Smarty 3.1 introduces the $template_dir index notation.
+$smarty->fetch('[foo]bar.tpl') and {include file="[foo]bar.tpl"}
+require the template bar.tpl to be loaded from $template_dir['foo'];
+Smarty::setTemplateDir() and Smarty::addTemplateDir() offer ways to
+define indexes along with the actual directories.
+
+  Mixing Resources in extends-Resource
+
+Taking the php extends: template resource one step further, it is now
+possible to mix resources within an extends: call like
+$smarty->fetch("extends:file:foo.tpl|db:bar.tpl");
+
+To make eval: and string: resources available to the inheritance
+chain, eval:base64:TPL_STRING and eval:urlencode:TPL_STRING have been
+introduced. Supplying the base64 or urlencode flags will trigger
+decoding the TPL_STRING in with either base64_decode() or urldecode().
+
+  extends-Resource in template inheritance
+
+Template based inheritance may now inherit from php's extends:
+resource like {extends file="extends:foo.tpl|db:bar.tpl"}.
+
+  New Smarty property escape_html
+
+$smarty->escape_html = true will autoescape all template variable
+output by calling htmlspecialchars({$output}, ENT_QUOTES,
+SMARTY_RESOURCE_CHAR_SET).
+NOTE:
+This is a compile time option. If you change the setting you must make
+sure that the templates get recompiled.
+
+  New option at Smarty property compile_check
+
+The automatic recompilation of modified templates can now be
+controlled by the following settings:
+$smarty->compile_check = COMPILECHECK_OFF (false) - template files
+will not be checked
+$smarty->compile_check = COMPILECHECK_ON (true) - template files will
+always be checked
+$smarty->compile_check = COMPILECHECK_CACHEMISS - template files will
+be checked if caching is enabled and there is no existing cache file
+or it has expired
+
+  Automatic recompilation on Smarty version change
+
+Templates will now be automatically recompiled on Smarty version
+changes to avoide incompatibillities in the compiled code. Compiled
+template checked against the current setting of the SMARTY_VERSION
+constant.
+
+  default_config_handler_func()
+
+Analogous to the default_template_handler_func()
+default_config_handler_func() has been introduced.
+
+  default_plugin_handler_func()
+
+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.
+
+New getters/setters
+
+The following setters/getters will be part of the official
+documentation, and will be strongly recommended. Direct property
+access will still work for the foreseeable future... it will be
+transparently routed through the setters/getters, and consequently a
+bit slower.
+
+array|string getTemplateDir( [string $index] )
+replaces $smarty->template_dir; and $smarty->template_dir[$index];
+Smarty setTemplateDir( array|string $path )
+replaces $smarty->template_dir = "foo"; and $smarty->template_dir =
+array("foo", "bar");
+Smarty addTemplateDir( array|string $path, [string $index])
+replaces $smarty->template_dir[] = "bar"; and
+$smarty->template_dir[$index] = "bar";
+
+array|string getConfigDir( [string $index] )
+replaces $smarty->config_dir; and $smarty->config_dir[$index];
+Smarty setConfigDir( array|string $path )
+replaces $smarty->config_dir = "foo"; and $smarty->config_dir =
+array("foo", "bar");
+Smarty addConfigDir( array|string $path, [string $index])
+replaces $smarty->config_dir[] = "bar"; and
+$smarty->config_dir[$index] = "bar";
+
+array getPluginsDir()
+replaces $smarty->plugins_dir;
+Smarty setPluginsDir( array|string $path )
+replaces $smarty->plugins_dir = "foo";
+Smarty addPluginsDir( array|string $path )
+replaces $smarty->plugins_dir[] = "bar";
+
+string getCompileDir()
+replaces $smarty->compile_dir;
+Smarty setCompileDir( string $path )
+replaces $smarty->compile_dir = "foo";
+
+string getCacheDir()
+replaces $smarty->cache_dir;
+Smarty setCacheDir( string $path )
+replaces $smarty->cache_dir;

TODO.md

@@ -0,0 +1,69 @@
+# Todo
+
+## Add unit test for strip issue in correct branch
+tests/UnitTests/TemplateSource/TagTests/Strip/CompileStripTest.php 
+```
+@@ -76,6 +76,7 @@ class CompileStripTest extends PHPUnit_Smarty
+                      array("{'Var'}\n <b></b> <c></c>", 'Var<b></b> <c></c>', '', $i ++),
+                      array("\n<b></b>  <c></c>", '<b></b> <c></c>', '', $i ++),
+                      array("\n<b></b>\n  <c></c>", '<b></b><c></c>', '', $i ++),
++                     array("\n<b>\n  {* a comment *}\n   <c>", '<b><c>', '', $i ++),
+
+         );
+     }
+```
+
+## Add unit test for isset issue in correct branch
+tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php
+```php
+    /**
+     * test PHP isset() on (non-)variables
+     * @dataProvider        dataTestIsset3
+     * @param string $strTemplate template to test
+     * @param string $result expected result
+     */
+    public function testIsset3($strTemplate, $result)
+    {
+        $this->smarty->disableSecurity();
+
+        $this->smarty->assign('varobject', new TestIsset());
+        $this->smarty->assign('vararray', $vararray = [
+            'keythatexists' => false,
+            'keywitharray' => [1 => 1],
+            'keywithobject' => new TestIsset()]
+        );
+
+        $this->smarty->assign('key', 'A');
+        $this->smarty->assign('_varsimpleA', 1);
+        $this->smarty->assign('varsimpleB', 0);
+        $this->smarty->assign('varsimpleC', null);
+
+        $this->assertEquals($result, $this->smarty->fetch('string:' . $strTemplate));
+    }
+
+    /**
+     * Data provider for testIsset3
+     */
+    public function dataTestIsset3()
+    {
+        return array(
+            array('{if isset($varobject->arr)}true{else}false{/if}', 'true'),
+            array('{if isset($vararray["keywitharray"])}true{else}false{/if}', 'true'),
+            array('{if isset($vararray["keythatexists"])}true{else}false{/if}', 'true'),
+            array('{if isset($vararray["nonexistingkey"])}true{else}false{/if}', 'false'),
+            array('{if isset($_GET["sscr6hr6cz34j6"])}true{else}false{/if}', 'false'),
+            array('{if isset(count([\'hi\']))}true{else}false{/if}', 'true'),
+            array('{if isset($vararray[\'keywitharray\'][intval(\'1\')])}true{else}false{/if}', 'true'),
+            array('{if isset($vararray[\'keywithobject\']->arr[\'isSet\'])}true{else}false{/if}', 'true'),
+            array('{if isset($vararray[\'keywithobject\']->arr[\'isNull\'])}true{else}false{/if}', 'false'),
+            array('{if isset($varobject->arr[\'isSet\'])}true{else}false{/if}', 'true'),
+            array('{if isset($varobject->arr[\'isNull\'])}true{else}false{/if}', 'false'),
+            array('{if isset($_varsimpleA)}true{else}false{/if}', 'true'),
+            array('{if isset($varsimpleB)}true{else}false{/if}', 'true'),
+            array('{if isset($varsimpleC)}true{else}false{/if}', 'false'),
+            array('{if isset($_varsimpleA && varsimpleB)}true{else}false{/if}', 'true'),
+            array('{if isset($_varsimpleA && varsimpleC)}true{else}false{/if}', 'true'),
+            array('{if isset($_varsimple{$key})}true{else}false{/if}', 'true'),
+        );
+    }
+```

change_log.txt

@@ -1,78 +1,6 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-## [4.0.0] - 2021-11-25
-
-## [4.0.0-rc.0] - 2021-10-13
-
-### Added
-- You can now use `$smarty->muteUndefinedOrNullWarnings()` to activate convert warnings about undefined or null template vars to notices when running PHP8
-
-### Changed
-- Switch CI from Travis to Github CI
-- Updated unit tests to avoid skipped and risky test warnings
-
-### Removed
-- Dropped support for PHP7.0 and below, so Smarty now requires PHP >=7.1
-- Dropped support for php asp tags in templates (removed from php since php7.0)
-- Dropped deprecated API calls that where only accessible through SmartyBC
-- Dropped support for {php} and {include_php} tags and embedded PHP in templates. Embedded PHP will now be passed through as is.
-- Removed all PHP_VERSION_ID and compare_version checks and conditional code blocks that are now no longer required
-- Dropped deprecated SMARTY_RESOURCE_CHAR_SET and SMARTY_RESOURCE_DATE_FORMAT constants
-- Dropped deprecated Smarty::muteExpectedErrors and Smarty::unmuteExpectedErrors API methods
-- Dropped deprecated $smarty->getVariable() method. Use $smarty->getTemplateVars() instead.
-- $smarty->registerResource() no longer accepts an array of callback functions
-
-## [3.1.40] - 2021-10-13
-
-### Changed
-- modifier escape now triggers a E_USER_NOTICE when an unsupported escape type is used https://github.com/smarty-php/smarty/pull/649
-
-### Security
-- More advanced javascript escaping to handle https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements thanks to m-haritonov
-
-## [3.1.39] - 2021-02-17
-
-### Security
-- Prevent access to `$smarty.template_object` in sandbox mode. This addresses CVE-2021-26119.
-- Fixed code injection vulnerability by using illegal function names in `{function name='blah'}{/function}`. This addresses CVE-2021-26120.
-
-## [3.1.38] - 2021-01-08
-
-### Fixed
-- Smarty::SMARTY_VERSION wasn't updated https://github.com/smarty-php/smarty/issues/628
-
-## [3.1.37] - 2021-01-07
-
-### Changed
-- Changed error handlers and handling of undefined constants for php8-compatibility (set $errcontext argument optional) https://github.com/smarty-php/smarty/issues/605
-- Changed expected error levels in unit tests for php8-compatibility
-- Travis unit tests now run for all php versions >= 5.3, including php8
-- Travis runs on Xenial where possible
-
-### Fixed
-- PHP5.3 compatibility fixes
-- Brought lexer source functionally up-to-date with compiled version
-
-## [3.1.36] - 2020-04-14
-
-### Fixed
- - Smarty::SMARTY_VERSION wasn't updated in v3.1.35 https://github.com/smarty-php/smarty/issues/584
-
-## [3.1.35] - 2020-04-14
- - remove whitespaces after comments https://github.com/smarty-php/smarty/issues/447
  - fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506
- - fix files contained in git export archive for package maintainers https://github.com/smarty-php/smarty/issues/325
- - throw SmartyException when setting caching attributes for cacheable plugin https://github.com/smarty-php/smarty/issues/457
- - fix errors that occured where isset was replaced with null check such as https://github.com/smarty-php/smarty/issues/453
- - unit tests are now in the repository
 
-## 3.1.34 release - 05.11.2019
+===== 3.1.34 release ===== 05.11.2019
 13.01.2020
  - fix typo in exception message (JercSi)
  - fix typehint warning with callable (bets4breakfast)
@@ -81,8 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - fix wrong set/get methods for memcached (IT-Experte)
  - fix pborm assigning value to object variables in smarty_internal_compile_assign (Hunman)
  - exclude error_reporting.ini from git export (glensc)
-
-## 3.1.34-dev-6 -
+===== 3.1.34-dev-6 =====
 30.10.2018
  - bugfix a nested subblock in an inheritance child template was not replace by
    outer level block with same name in same child template https://github.com/smarty-php/smarty/issues/500
@@ -110,8 +37,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     could fail in version 3.1.32 and 3.1.33 because PHP preg_match() restrictions
     https://github.com/smarty-php/smarty/issues/488
 
-## 3.1.33 release - 12.09.2018
-## 3.1.33-dev-12 -
+===== 3.1.33 release ===== 12.09.2018
+===== 3.1.33-dev-12 =====
 03.09.2018
   - bugfix {foreach} using new style property access like {$item@property} on
     Smarty 2 style named foreach loop could produce errors https://github.com/smarty-php/smarty/issues/484
@@ -133,14 +60,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - bugfix/enhancement {capture} allow variable as capture block name in Smarty special variable
     like $smarty.capture.$foo https://github.com/smarty-php/smarty/issues/478 https://github.com/smarty-php/smarty/pull/481
 
-## 3.1.33-dev-6 -
+===== 3.1.33-dev-6 =====
 19.08.2018
   - fix PSR-2 coding standards and PHPDoc blocks https://github.com/smarty-php/smarty/pull/452
     https://github.com/smarty-php/smarty/pull/475
     https://github.com/smarty-php/smarty/pull/473
   - bugfix PHP5.2 compatibility https://github.com/smarty-php/smarty/pull/472
 
-## 3.1.33-dev-4 -
+===== 3.1.33-dev-4 =====
 17.05.2018
  - bugfix strip-block produces different output in Smarty v3.1.32 https://github.com/smarty-php/smarty/issues/436
  - bugfix Smarty::compileAllTemplates ignores `$extension` parameter https://github.com/smarty-php/smarty/issues/437
@@ -152,7 +79,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - bugfix  regarding Security Vulnerability did not solve the problem under Linux.
    Security issue CVE-2018-16831
 
-## 3.1.32 - (24.04.2018)
+===== 3.1.32 ===== (24.04.2018)
 24.04.2018
  - bugfix  possible Security Vulnerability in Smarty_Security class.
 
@@ -293,7 +220,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 13.4.2017
   - bugfix array_merge() parameter should be checked https://github.com/smarty-php/smarty/issues/350
 
-## 3.1.31 - (14.12.2016)
+===== 3.1.31 ===== (14.12.2016)
   23.11.2016
    - move template object cache into static variables
 
@@ -407,7 +334,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
            compiled or cached template files https://github.com/smarty-php/smarty/issues/269
   - optimization remove unneeded call to update acopes when {assign} scope and template scope was local (default)
 
-## 3.1.30 - (07.08.2016)
+===== 3.1.30 ===== (07.08.2016)
 
  07.08.2016
   - bugfix update of 04.08.2016 was incomplete
@@ -630,7 +557,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - optimization of filepath normalization
   - bugfix {strip} must remove all blanks between html tags https://github.com/smarty-php/smarty/issues/136
 
- - 3.1.29 - (21.12.2015)
+ ===== 3.1.29 ===== (21.12.2015)
  21.12.2015
   - optimization improve speed of filetime checks on extends and extendsall resource
 
@@ -666,7 +593,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - bugfix  {$smarty.config.foo} broken in 3.1.28 https://github.com/smarty-php/smarty/issues/120
   - bugfix  multiple calls of {section} with same name droped E_NOTICE error https://github.com/smarty-php/smarty/issues/118
 
- - 3.1.28 - (13.12.2015)
+ ===== 3.1.28 ===== (13.12.2015)
  13.12.2015
   - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819)
   - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811)
@@ -845,18 +772,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  19.06.2015
   - improvement allow closures as callback at $smarty->registerFilter() https://github.com/smarty-php/smarty/issues/59
 
- - 3.1.27- (18.06.2015)
+ ===== 3.1.27===== (18.06.2015)
  18.06.2015
   - bugfix another update on file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
 
- - 3.1.26- (18.06.2015)
+ ===== 3.1.26===== (18.06.2015)
  18.06.2015
   - bugfix file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
 
  17.06.2015
   - bugfix calling a plugin with nocache option but no other attributes like {foo nocache} caused call to undefined function https://github.com/smarty-php/smarty/issues/55
 
- - 3.1.25- (15.06.2015)
+ ===== 3.1.25===== (15.06.2015)
  15.06.2015
   - optimization of smarty_cachereource_keyvaluestore.php code
 
@@ -886,7 +813,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  24.05.2015
   - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42
 
- - 3.1.24- (23.05.2015)
+ ===== 3.1.24===== (23.05.2015)
  23.05.2015
   - improvement on php_handling to allow very large PHP sections, better error handling
   - improvement allow extreme large comment sections (forum 25538)
@@ -924,12 +851,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - bugfix access to undefined config variable like {#undef#} did fail https://github.com/smarty-php/smarty/issues/29
   - bugfix in nested {foreach} saved item attributes got overwritten https://github.com/smarty-php/smarty/issues/33
 
- - 3.1.23 - (12.05.2015)
+ ===== 3.1.23 ===== (12.05.2015)
  12.05.2015
   - bugfix of smaller performance issue introduce in 3.1.22 when caching is enabled
   - bugfix missig entry for smarty-temmplate-config in autoloader
 
- - 3.1.22 - tag was deleted because 3.1.22 did fail caused by the missing entry for smarty-temmplate-config in autoloader
+ ===== 3.1.22 ===== tag was deleted because 3.1.22 did fail caused by the missing entry for smarty-temmplate-config in autoloader
  10.05.2015
   - bugfix custom cache resource did not observe compile_id and cache_id when $cache_locking == true
   - bugfix cache lock was not handled correctly after timeout when $cache_locking == true
@@ -1081,7 +1008,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text
  - bugfix merge_compiled_includes option failed when caching  enables and same subtemplate was included cached and not cached
 
- - 3.1.21 - (18.10.2014)
+ ===== 3.1.21 ===== (18.10.2014)
  18.10.2014
   - composer moved to github
 
@@ -1104,7 +1031,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags
  - bugfix "<script language=php>" with $php_handling PHP_PASSTHRU was executed in {nocache} sections
 
- - 3.1.20 - (09.10.2014)
+ ===== 3.1.20 ===== (09.10.2014)
  08.10.2014
  - bugfix security mode of "<script language=php>" must be controlled by $php_handling property (Thue Kristensen)
 
@@ -1124,7 +1051,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  04.07.2014
  - bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)
 
- - 3.1.19 - (30.06.2014)
+ ===== 3.1.19 ===== (30.06.2014)
  20.06.2014
  - bugfix template variables could not be passed as parameter in {include} when the include was in a {nocache} section (topic 25131)
 
@@ -1151,7 +1078,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  18.04.2014
  - revert bugfix of 5.4.2014 because %-e date format is not supported on all operating systems
 
- - 3.1.18 - (07.04.2014)
+ ===== 3.1.18 ===== (07.04.2014)
  06.04.2014
  - bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187)
  - bugfix update of composer file (Issue 168 and 184)
@@ -1180,7 +1107,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  13.03.2014
  - bugfix clearXxx() change of 27.1.2014 did not work when specifing cache_id or compile_id  (forum topic 24868 and 24867)
 
- - 3.1.17 -
+ ===== 3.1.17 =====
  08.03.2014
  - bugfix relative file path {include} within {block} of child templates did throw exception on first call (Issue 177)
 
@@ -1211,7 +1138,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - bugfix Smarty_CacheResource_Custom did not handle template resource type specifications on clearCache() calls (Issue 169)
  - bugfix SmartyBC.class.php should use require_once to load Smarty.class.php (forum topic 24683)
 
- - 3.1.16 -
+ ===== 3.1.16 =====
  15.12.2013
  - bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161)
    Read 3.1.16_RELEASE_NOTES for more details
@@ -1244,7 +1171,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 03.10.2013
  - bugfix loops using modifier capitalize did eat up memory (issue 159)
 
- - Smarty 3.1.15 -
+ ===== Smarty 3.1.15 =====
 01.10.2013
  - use current delimiters in compiler error messages (issue 157)
  - improvement on performance when using error handler and multiple template folders (issue 152)
@@ -1308,7 +1235,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 2.7.2013
 - bugfix trimwhitespace would replace captured items in wrong order (forum topic 24387)
 
-## Smarty-3.1.14 -
+===== Smarty-3.1.14 =====
 27.06.2013
 - bugfix removed PHP 5.5 deprecated preg_replace /e option in modifier capitalize (forum topic 24389)
 
@@ -1341,7 +1268,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 24.01.2013
 - bugfix wrong tag type in smarty_internal_templatecompilerbase.php could cause wrong plugin search order (Forum Topic 24028)
 
-## Smarty-3.1.13 -
+===== Smarty-3.1.13 =====
 13.01.2013
 - enhancement allow to disable exception message escaping by SmartyException::$escape = false;  (Issue #130)
 
@@ -1372,7 +1299,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 01.11.2012
 - bugfix muteExcpetedErrors() would screw up for non-readable paths (Issue #118)
 
-## Smarty-3.1.12  -
+===== Smarty-3.1.12  =====
 14.09.2012
 - bugfix template inheritance failed to compile with delimiters {/ and /} (Forum Topic 23008)
 
@@ -1417,7 +1344,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bugfix the default plugin handler did create wrong compiled code for static class methods
   from external script files (issue 108)
 
-## Smarty-3.1.11 -
+===== Smarty-3.1.11 =====
 30.06.2012
 - bugfix {block.. hide} did not work as nested child (Forum Topic 22216)
 
@@ -1430,12 +1357,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 11.06.2012
 - bugfix the patch for Topic 21856 did break tabs between tag attributes (Forum Topic 22124)
 
-## Smarty-3.1.10  -
+===== Smarty-3.1.10  =====
 09.06.2012
 - bugfix the compiler did ignore registered compiler plugins for closing tags (Forum Topic 22094)
 - bugfix the patch for Topic 21856 did break multiline tags (Forum Topic 22124)
 
-## Smarty-3.1.9 -
+===== Smarty-3.1.9 =====
 07.06.2012
 - bugfix fetch() and display() with relative paths (Issue 104)
 - bugfix treat "0000-00-00" as 0 in modifier.date_format (Issue 103)
@@ -1489,7 +1416,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - enhancement the default plugin handler can now also resolve undefined modifier (Smarty::PLUGIN_MODIFIER)
   (Issue 85)
 
-## Smarty-3.1.8  -
+===== Smarty-3.1.8  =====
 19.02.2012
 - bugfix {include} could result in a fatal error if used in appended or prepended nested {block} tags
   (reported by mh and Issue 83)
@@ -1536,7 +1463,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bugfix template inheritance: {$smarty.block.child} in nested child {block} tags did not return
   content after {$smarty.block.child} (Forum Topic 20564)
 
-## Smarty-3.1.7 -
+===== Smarty-3.1.7 =====
 18.12.2011
 - bugfix strings ending with " in multiline strings of config files failed to compile (issue #67)
 - added chaining to Smarty_Internal_Templatebase
@@ -1561,7 +1488,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bugfix template inheritance: {$smarty.block.child} in nested child {block} tags did not return expected
   result (Forum Topic 20564)
 
-## Smarty-3.1.6  -
+===== Smarty-3.1.6  =====
 30.11.2011
 - bugfix is_cache() for individual cached subtemplates with $smarty->caching = CACHING_OFF did produce
   an exception (Forum Topic 20531)
@@ -1586,7 +1513,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bugfix Smarty_Resource::load() did not always return a proper resource handler (Forum Topic 20414)
 - added escape argument to html_checkboxes and html_radios (Forum Topic 20425)
 
-## Smarty-3.1.5  -
+===== Smarty-3.1.5  =====
 14.11.2011
 - bugfix allow space between function name and open bracket (forum topic 20375)
 
@@ -1618,7 +1545,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - revert PHP4 constructor message
 - fixed PHP4 constructor message
 
-## Smarty-3.1.4 -
+===== Smarty-3.1.4 =====
 19.10.2011
 - added exception when using PHP4 style constructor
 
@@ -1647,7 +1574,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bugfix <?xml> tag did create wrong output when caching enabled and the tag was in included subtemplate
 - bugfix Smarty_CacheResource_mysql example was missing strtotime() calls
 
-## Smarty-3.1.3  -
+===== Smarty-3.1.3  =====
 07.10.2011
 - improvement removed html comments from {mailto} (Forum Topic 20092)
 - bugfix testInstall() would not show path to internal plugins_dir (Forum Post 74627)
@@ -1674,7 +1601,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - add unloadFilter() method
 - bugfix has_nocache_code flag was not reset before compilation
 
-## Smarty-3.1.2  -
+===== Smarty-3.1.2  =====
 03.10.2011
 - improvement add internal $joined_template_dir property instead computing it on the fly several times
 
@@ -1714,7 +1641,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   extended Smarty class created problems
 - bugfix error muting was not implemented for cache locking
 
-## Smarty 3.1.1  -
+===== Smarty 3.1.1  =====
 22.09.2011
 - bugfix {foreachelse} does fail if {section} was nested inside {foreach}
 - bugfix debug.tpl did not display correctly when it was compiled with escape_html = true
@@ -1747,7 +1674,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bugfix lock_id for file resource would create invalid filepath
 - bugfix resource caching did not care about file.tpl in different template_dir
 
-## Smarty 3.1.0  -
+===== Smarty 3.1.0  =====
 15/09/2011
 - optimization of {foreach}; call internal _count() method only when "total" or "last" {foreach} properties are used
 
@@ -1840,7 +1767,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - update of README_3_1_DEV.txt and moved into the distribution folder
 - improvement show first characters of eval and string templates instead sha1 Uid in debug window
 
-## Smarty 3.1-RC1 -
+===== Smarty 3.1-RC1 =====
 25/06/2011
 - revert change of 17/06/2011. $_smarty varibale removed. call loadPlugin() from inside plugin code if required
 - code cleanup, remove no longer used properties and methods
@@ -2041,7 +1968,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 24/12/2010
 - optimize smarty_function_escape_special_chars() for PHP >= 5.2.3
 
-## SVN 3.0 trunk  -
+===== SVN 3.0 trunk  =====
 14/05/2011
 - bugfix error handling at stream resources
 
@@ -2101,7 +2028,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - removed obsolete {popup_init..} plugin from demo templates
 - bugfix replace $smarty->triggerError() by exception in smarty_internal_resource_extends.php
 
-## Smarty 3.0.7  -
+===== Smarty 3.0.7  =====
 09/02/2011
 - patched vulnerability when using {$smarty.template}
 
@@ -2155,7 +2082,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bugfix {$smarty.template} in child template did not return right content
 - bugfix Smarty3 did not search the PHP include_path for template files
 
-## Smarty 3.0.6  -
+===== Smarty 3.0.6  =====
 
 12/12/2010
 - bugfix fixed typo regarding yesterdays change to allow streamWrapper
@@ -2190,7 +2117,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bugfix on template inheritance when an {extends} tag was inserted by a prefilter
 - added error message for illegal variable file attributes at {extends...} tags
 
-## Smarty 3.0.5  -
+===== Smarty 3.0.5  =====
 
 
 19/11/2010
@@ -2217,7 +2144,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bugfix captured content could not be accessed globally
 - bugfix Smarty2 wrapper functions could not be call from within plugins
 
-## Smarty 3.0.4  -
+===== Smarty 3.0.4  =====
 
 14/11/2010
 - bugfix isset() did not allow multiple parameter
@@ -2230,7 +2157,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 				(introduced with 3.0.2)
 - code cleanup
 								
-## Smarty 3.0.3  -
+===== Smarty 3.0.3  =====
 
 13/11/2010
 - bugfix on {debug}
@@ -2239,7 +2166,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fixed internal_config (removed unwanted code line)
 - improvement  remove last linebreak from {function} definition
 
-## Smarty 3.0.2  -
+===== Smarty 3.0.2  =====
 
 12/11/2010
 - reactivated $error_reporting property handling
@@ -2249,7 +2176,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   with transparent access to Smarty object
 - fixed {config_load} scoping form compile time to run time
 
-## Smarty 3.0.0  -
+===== Smarty 3.0.0  =====
 
 
 
@@ -2291,7 +2218,7 @@ request_use_auto_globals
 - bugfix on template inheritance using nested eval or string resource in {extends} tags
 - bugfix on output buffer handling in isCached() method
 
-##  RC4 -
+=====  RC4 =====
 
 01/10/2010
 - added {break} and {continue} tags for flow control of {foreach},{section},{for} and {while} loops
@@ -2388,7 +2315,7 @@ request_use_auto_globals
 15/07/2010
 - bufix  {$smarty.template} does include now the relative path, not just filename
 
-##  RC3 -
+=====  RC3 =====
 
 
 
@@ -2442,7 +2369,7 @@ request_use_auto_globals
 - make handling of Smarty comments followed by newline BC to Smarty2
 
 
-##  RC2 -
+=====  RC2 =====
 
 
 
@@ -2514,7 +2441,7 @@ request_use_auto_globals
 - bugfix on {function} tag with name attribute in doublequoted strings
 - fix to make calling of template functions unambiguously by madatory usage of the {call} tag
 
-##  RC1 -
+=====  RC1 =====
 
 27/04/2010
 - change default of $debugging_ctrl to 'NONE'

composer.json

@@ -5,7 +5,7 @@
     "keywords": [
         "templating"
     ],
-    "homepage": "https://www.smarty.net",
+    "homepage": "http://www.smarty.net",
     "license": "LGPL-3.0",
     "authors": [
         {
@@ -19,18 +19,15 @@
         {
             "name": "Rodney Rehm",
             "email": "rodney.rehm@medialize.de"
-        },
-        {
-            "name": "Simon Wisselink",
-            "homepage": "https://www.iwink.nl/"
         }
     ],
     "support": {
+        "irc": "irc://irc.freenode.org/smarty",
         "issues": "https://github.com/smarty-php/smarty/issues",
-        "forum": "https://www.smarty.net/forums/"
+        "forum": "http://www.smarty.net/forums/"
     },
     "require": {
-        "php": "^7.1 || ^8.0"
+        "php": ">=5.2"
     },
     "autoload": {
         "classmap": [
@@ -39,11 +36,10 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "4.0.x-dev"
+            "dev-master": "3.1.x-dev"
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5 || ^7.5",
-        "smarty/smarty-lexer": "^3.1"
+        "phpunit/phpunit": "6.4.1"
     }
 }

error_reporting.ini

@@ -0,0 +1 @@
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT

lexer/smarty_internal_templatelexer.plex

@@ -289,6 +289,8 @@ class Smarty_Internal_Templatelexer
      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~
@@ -360,6 +362,9 @@ class Smarty_Internal_Templatelexer
         $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;
      }
@@ -375,9 +380,12 @@ class Smarty_Internal_Templatelexer
         $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/isS');
+           $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);

lexer/smarty_internal_templateparser.y

@@ -23,6 +23,7 @@ class Smarty_Internal_Templateparser
 {
     const ERR1 = 'Security error: Call to private object member not allowed';
     const ERR2 = 'Security error: Call to dynamic object member not allowed';
+    const ERR3 = 'PHP in template not allowed. Use SmartyBC to enable it';
 
     /**
      * result status
@@ -236,15 +237,19 @@ start(res)       ::= template. {
     res = $this->root_buffer->to_smarty_php($this);
 }
 
+
+                      // php tags
+template       ::= template PHP(B). {
+    $code = $this->compiler->compileTag('private_php',array(array('code' => B), array('type' => $this->lex->phpType )),array());
+    if ($this->compiler->has_code && !empty($code)) {
+        $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
+         $this->current_buffer->append_subtree($this,  new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp.$code,true)));
+    }
+}
+
                       // template text
 template       ::= template  TEXT(B). {
-         $text = $this->yystack[ $this->yyidx + 0 ]->minor;
-
-         if ((string)$text == '') {
-            $this->current_buffer->append_subtree($this, null);
-         }
-
-         $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($text, $this->strip));
+         $this->current_buffer->append_subtree($this, $this->compiler->processText(B));
 }
                       // strip on
 template       ::= template  STRIPON. {
@@ -303,7 +308,7 @@ smartytag(A)::= SIMPLETAG(B). {
     $tag = trim(substr(B, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
     if ($tag == 'strip') {
         $this->strip = true;
-        A = null;
+        A = null;;
     } else {
         if (defined($tag)) {
             if ($this->security) {

libs/Autoloader.php

@@ -39,7 +39,7 @@ class Smarty_Autoloader
      *
      * @var array
      */
-    public static $rootClasses = array('smarty' => 'Smarty.class.php');
+    public static $rootClasses = array('smarty' => 'Smarty.class.php', 'smartybc' => 'SmartyBC.class.php',);
 
     /**
      * Registers Smarty_Autoloader backward compatible to older installations.
@@ -76,7 +76,11 @@ class Smarty_Autoloader
         self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
         self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
             self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
-        spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
+        } else {
+            spl_autoload_register(array(__CLASS__, 'autoload'));
+        }
     }
 
     /**

libs/Smarty.class.php

@@ -6,7 +6,7 @@
  * 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.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,13 +20,14 @@
  * Smarty mailing list. Send a blank e-mail to
  * smarty-discussion-subscribe@googlegroups.com
  *
- * @link      https://www.smarty.net/
+ * @link      http://www.smarty.net/
  * @copyright 2018 New Digital Group, Inc.
  * @copyright 2018 Uwe Tews
  * @author    Monte Ohrt <monte at ohrt dot com>
  * @author    Uwe Tews   <uwe dot tews at gmail dot com>
  * @author    Rodney Rehm
  * @package   Smarty
+ * @version   3.1.34-dev
  */
 /**
  * set SMARTY_DIR to absolute path to Smarty library files.
@@ -60,6 +61,19 @@ if (!defined('SMARTY_MBSTRING')) {
      */
     define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
+if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
+    // UTF-8 can only be done properly when mbstring is available!
+    /**
+     * @deprecated in favor of Smarty::$_CHARSET
+     */
+    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
+}
+if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
+    /**
+     * @deprecated in favor of Smarty::$_DATE_FORMAT
+     */
+    define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
+}
 /**
  * Load Smarty_Autoloader
  */
@@ -98,7 +112,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '4.0.0';
+    const SMARTY_VERSION = '3.1.34-dev-7';
     /**
      * define variable scopes
      */
@@ -130,7 +144,13 @@ class Smarty extends Smarty_Internal_TemplateBase
     const DEBUG_OFF        = 0;
     const DEBUG_ON         = 1;
     const DEBUG_INDIVIDUAL = 2;
-
+    /**
+     * modes for handling of "<?php ... ?>" tags in templates.
+     */
+    const PHP_PASSTHRU = 0; //-> print tags as plain text
+    const PHP_QUOTE    = 1; //-> escape tags as entities
+    const PHP_REMOVE   = 2; //-> escape tags as entities
+    const PHP_ALLOW    = 3; //-> escape tags as entities
     /**
      * filter types
      */
@@ -160,13 +180,13 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * The character set to adhere to (e.g. "UTF-8")
      */
-    public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
+    public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
 
     /**
      * The date format to be used internally
      * (accepts date() and strftime())
      */
-    public static $_DATE_FORMAT = '%b %e, %Y';
+    public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
 
     /**
      * Flag denoting if PCRE should run in UTF-8 mode
@@ -350,6 +370,13 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public $security_policy = null;
 
+    /**
+     * controls handling of PHP-blocks
+     *
+     * @var integer
+     */
+    public $php_handling = self::PHP_PASSTHRU;
+
     /**
      * controls if the php template file resource is allowed
      *
@@ -640,12 +667,6 @@ class Smarty extends Smarty_Internal_TemplateBase
         'cache_dir'    => 'CacheDir',
     );
 
-    /**
-     * PHP7 Compatibility mode
-     * @var bool
-     */
-    private $isMutingUndefinedOrNullWarnings = false;
-
     /**
      * Initialize new Smarty object
      */
@@ -668,6 +689,27 @@ class Smarty extends Smarty_Internal_TemplateBase
         }
     }
 
+    /**
+     * Enable error handler to mute expected messages
+     *
+     * @return     boolean
+     * @deprecated
+     */
+    public static function muteExpectedErrors()
+    {
+        return Smarty_Internal_ErrorHandler::muteExpectedErrors();
+    }
+
+    /**
+     * Disable error handler muting expected messages
+     *
+     * @deprecated
+     */
+    public static function unmuteExpectedErrors()
+    {
+        restore_error_handler();
+    }
+
     /**
      * Check if a template resource exists
      *
@@ -758,7 +800,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @param mixed $index    index of directory to get, null to get all
      * @param bool  $isConfig true for config_dir
      *
-     * @return array|string list of template directories, or directory of $index
+     * @return array list of template directories, or directory of $index
      */
     public function getTemplateDir($index = null, $isConfig = false)
     {
@@ -1346,6 +1388,11 @@ class Smarty extends Smarty_Internal_TemplateBase
     private function _normalizeDir($dirName, $dir)
     {
         $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DIRECTORY_SEPARATOR, true);
+        if (class_exists('Smarty_Internal_ErrorHandler', false)) {
+            if (!isset(Smarty_Internal_ErrorHandler::$mutedDirectories[ $this->{$dirName} ])) {
+                Smarty_Internal_ErrorHandler::$mutedDirectories[ $this->{$dirName} ] = null;
+            }
+        }
     }
 
     /**
@@ -1375,23 +1422,4 @@ class Smarty extends Smarty_Internal_TemplateBase
         $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
             $this->_joined_template_dir = join('#', $this->template_dir);
     }
-
-    /**
-     * Activates PHP7 compatibility mode:
-     * - converts E_WARNINGS for "undefined array key" and "trying to read property of null" errors to E_NOTICE
-     *
-     * @void
-     */
-    public function muteUndefinedOrNullWarnings(): void {
-        $this->isMutingUndefinedOrNullWarnings = true;
-    }
-
-    /**
-     * Indicates if PHP7 compatibility mode is set.
-     * @bool
-     */
-    public function isMutingUndefinedOrNullWarnings(): bool {
-        return $this->isMutingUndefinedOrNullWarnings;
-    }
-
 }

libs/SmartyBC.class.php

@@ -0,0 +1,477 @@
+<?php
+/**
+ * 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.
+ * 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/
+ * @copyright 2008 New Digital Group, Inc.
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews
+ * @author    Rodney Rehm
+ * @package   Smarty
+ */
+/**
+ * @ignore
+ */
+require_once dirname(__FILE__) . '/Smarty.class.php';
+
+/**
+ * Smarty Backward Compatibility Wrapper Class
+ *
+ * @package Smarty
+ */
+class SmartyBC extends Smarty
+{
+    /**
+     * Smarty 2 BC
+     *
+     * @var string
+     */
+    public $_version = self::SMARTY_VERSION;
+
+    /**
+     * This is an array of directories where trusted php scripts reside.
+     *
+     * @var array
+     */
+    public $trusted_dir = array();
+
+    /**
+     * Initialize new SmartyBC object
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * wrapper for assign_by_ref
+     *
+     * @param string $tpl_var the template variable name
+     * @param mixed  &$value  the referenced value to assign
+     */
+    public function assign_by_ref($tpl_var, &$value)
+    {
+        $this->assignByRef($tpl_var, $value);
+    }
+
+    /**
+     * wrapper for append_by_ref
+     *
+     * @param string  $tpl_var the template variable name
+     * @param mixed   &$value  the referenced value to append
+     * @param boolean $merge   flag if array elements shall be merged
+     */
+    public function append_by_ref($tpl_var, &$value, $merge = false)
+    {
+        $this->appendByRef($tpl_var, $value, $merge);
+    }
+
+    /**
+     * clear the given assigned template variable.
+     *
+     * @param string $tpl_var the template variable to clear
+     */
+    public function clear_assign($tpl_var)
+    {
+        $this->clearAssign($tpl_var);
+    }
+
+    /**
+     * Registers custom function to be used in templates
+     *
+     * @param string $function      the name of the template function
+     * @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)
+    {
+        $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
+    }
+
+    /**
+     * Unregister custom function
+     *
+     * @param string $function name of template function
+     */
+    public function unregister_function($function)
+    {
+        $this->unregisterPlugin('function', $function);
+    }
+
+    /**
+     * 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_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()
+    ) {
+        settype($allowed, 'array');
+        settype($smarty_args, 'boolean');
+        $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
+    }
+
+    /**
+     * Unregister object
+     *
+     * @param string $object name of template object
+     */
+    public function unregister_object($object)
+    {
+        $this->unregisterObject($object);
+    }
+
+    /**
+     * Registers block function to be used in templates
+     *
+     * @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)
+    {
+        $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
+    }
+
+    /**
+     * Unregister block function
+     *
+     * @param string $block name of template function
+     */
+    public function unregister_block($block)
+    {
+        $this->unregisterPlugin('block', $block);
+    }
+
+    /**
+     * Registers compiler function
+     *
+     * @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)
+    {
+        $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
+    }
+
+    /**
+     * Unregister compiler function
+     *
+     * @param string $function name of template function
+     */
+    public function unregister_compiler_function($function)
+    {
+        $this->unregisterPlugin('compiler', $function);
+    }
+
+    /**
+     * Registers modifier to be used in templates
+     *
+     * @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)
+    {
+        $this->registerPlugin('modifier', $modifier, $modifier_impl);
+    }
+
+    /**
+     * Unregister modifier
+     *
+     * @param string $modifier name of template modifier
+     */
+    public function unregister_modifier($modifier)
+    {
+        $this->unregisterPlugin('modifier', $modifier);
+    }
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @param string $type      name of resource
+     * @param array  $functions array of functions to handle resource
+     */
+    public function register_resource($type, $functions)
+    {
+        $this->registerResource($type, $functions);
+    }
+
+    /**
+     * Unregister a resource
+     *
+     * @param string $type name of resource
+     */
+    public function unregister_resource($type)
+    {
+        $this->unregisterResource($type);
+    }
+
+    /**
+     * Registers a prefilter function to apply
+     * to a template before compiling
+     *
+     * @param callable $function
+     *
+     * @throws \SmartyException
+     */
+    public function register_prefilter($function)
+    {
+        $this->registerFilter('pre', $function);
+    }
+
+    /**
+     * Unregister a prefilter function
+     *
+     * @param callable $function
+     */
+    public function unregister_prefilter($function)
+    {
+        $this->unregisterFilter('pre', $function);
+    }
+
+    /**
+     * Registers a postfilter function to apply
+     * to a compiled template after compilation
+     *
+     * @param callable $function
+     *
+     * @throws \SmartyException
+     */
+    public function register_postfilter($function)
+    {
+        $this->registerFilter('post', $function);
+    }
+
+    /**
+     * Unregister a postfilter function
+     *
+     * @param callable $function
+     */
+    public function unregister_postfilter($function)
+    {
+        $this->unregisterFilter('post', $function);
+    }
+
+    /**
+     * Registers an output filter function to apply
+     * to a template output
+     *
+     * @param callable $function
+     *
+     * @throws \SmartyException
+     */
+    public function register_outputfilter($function)
+    {
+        $this->registerFilter('output', $function);
+    }
+
+    /**
+     * Unregister an outputfilter function
+     *
+     * @param callable $function
+     */
+    public function unregister_outputfilter($function)
+    {
+        $this->unregisterFilter('output', $function);
+    }
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @param string $type filter type
+     * @param string $name filter name
+     *
+     * @throws \SmartyException
+     */
+    public function load_filter($type, $name)
+    {
+        $this->loadFilter($type, $name);
+    }
+
+    /**
+     * 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
+     *
+     * @return boolean
+     */
+    public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
+    {
+        return $this->clearCache($tpl_file, $cache_id, $compile_id, $exp_time);
+    }
+
+    /**
+     * clear the entire contents of cache (all templates)
+     *
+     * @param string $exp_time expire time
+     *
+     * @return boolean
+     */
+    public function clear_all_cache($exp_time = null)
+    {
+        return $this->clearCache(null, null, null, $exp_time);
+    }
+
+    /**
+     * 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 bool
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
+    {
+        return $this->isCached($tpl_file, $cache_id, $compile_id);
+    }
+
+    /**
+     * clear all the assigned template variables.
+     */
+    public function clear_all_assign()
+    {
+        $this->clearAllAssign();
+    }
+
+    /**
+     * clears compiled version of specified template resource,
+     * 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
+     *
+     * @return boolean results of {@link smarty_core_rm_auto()}
+     */
+    public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
+    {
+        return $this->clearCompiledTemplate($tpl_file, $compile_id, $exp_time);
+    }
+
+    /**
+     * Checks whether requested template exists.
+     *
+     * @param string $tpl_file
+     *
+     * @return bool
+     * @throws \SmartyException
+     */
+    public function template_exists($tpl_file)
+    {
+        return $this->templateExists($tpl_file);
+    }
+
+    /**
+     * Returns an array containing template variables
+     *
+     * @param string $name
+     *
+     * @return array
+     */
+    public function get_template_vars($name = null)
+    {
+        return $this->getTemplateVars($name);
+    }
+
+    /**
+     * Returns an array containing config variables
+     *
+     * @param string $name
+     *
+     * @return array
+     */
+    public function get_config_vars($name = null)
+    {
+        return $this->getConfigVars($name);
+    }
+
+    /**
+     * load configuration values
+     *
+     * @param string $file
+     * @param string $section
+     * @param string $scope
+     */
+    public function config_load($file, $section = null, $scope = 'global')
+    {
+        $this->ConfigLoad($file, $section, $scope);
+    }
+
+    /**
+     * return a reference to a registered object
+     *
+     * @param string $name
+     *
+     * @return object
+     */
+    public function get_registered_object($name)
+    {
+        return $this->getRegisteredObject($name);
+    }
+
+    /**
+     * clear configuration values
+     *
+     * @param string $var
+     */
+    public function clear_config($var = null)
+    {
+        $this->clearConfig($var);
+    }
+
+    /**
+     * trigger Smarty error
+     *
+     * @param string  $error_msg
+     * @param integer $error_type
+     */
+    public function trigger_error($error_msg, $error_type = E_USER_WARNING)
+    {
+        trigger_error("Smarty error: $error_msg", $error_type);
+    }
+}

libs/plugins/block.textformat.php

@@ -20,7 +20,7 @@
  * - indent_char   - string (" ")
  * - wrap_boundary - boolean (true)
  *
- * @link   https://www.smarty.net/manual/en/language.function.textformat.php {textformat}
+ * @link   http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
  *         (Smarty online manual)
  *
  * @param array                    $params   parameters

libs/plugins/function.counter.php

@@ -12,7 +12,7 @@
  * Purpose:  print out a counter value
  *
  * @author Monte Ohrt <monte at ohrt dot com>
- * @link   https://www.smarty.net/manual/en/language.function.counter.php {counter}
+ * @link   http://www.smarty.net/manual/en/language.function.counter.php {counter}
  *         (Smarty online manual)
  *
  * @param array                    $params   parameters

libs/plugins/function.cycle.php

@@ -28,7 +28,7 @@
  * {cycle name=row values="one,two,three" reset=true}
  * {cycle name=row}
  *
- * @link    https://www.smarty.net/manual/en/language.function.cycle.php {cycle}
+ * @link    http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
  *           (Smarty online manual)
  * @author  Monte Ohrt <monte at ohrt dot com>
  * @author  credit to Mark Priatel <mpriatel@rogers.com>

libs/plugins/function.fetch.php

@@ -11,7 +11,7 @@
  * Name:     fetch
  * Purpose:  fetch file, web or ftp data and display results
  *
- * @link   https://www.smarty.net/manual/en/language.function.fetch.php {fetch}
+ * @link   http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
  *         (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *

libs/plugins/function.html_checkboxes.php

@@ -29,7 +29,7 @@
  * - assign     (optional) - assign the output as an array to this variable
  * - escape     (optional) - escape the content (not value), defaults to true
  *
- * @link    https://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ * @link    http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
  *             (Smarty online manual)
  * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
  * @author  credits to Monte Ohrt <monte at ohrt dot com>

libs/plugins/function.html_image.php

@@ -21,7 +21,7 @@
  * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
  * - path_prefix - prefix for path output (optional, default empty)
  *
- * @link    https://www.smarty.net/manual/en/language.function.html.image.php {html_image}
+ * @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>

libs/plugins/function.html_options.php

@@ -21,7 +21,7 @@
  * - id         (optional) - string default not set
  * - class      (optional) - string default not set
  *
- * @link   https://www.smarty.net/manual/en/language.function.html.options.php {html_image}
+ * @link   http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
  *           (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>

libs/plugins/function.html_radios.php

@@ -29,7 +29,7 @@
  * {html_radios values=$ids name='box' separator='<br>' output=$names}
  * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
  *
- * @link    https://www.smarty.net/manual/en/language.function.html.radios.php {html_radios}
+ * @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>

libs/plugins/function.html_select_date.php

@@ -28,7 +28,7 @@
  *            - 2.0 complete rewrite for performance,
  *              added attributes month_names, *_id
  *
- * @link    https://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
+ * @link    http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
  *           (Smarty online manual)
  * @version 2.0
  * @author  Andrei Zmievski

libs/plugins/function.html_select_time.php

@@ -11,7 +11,7 @@
  * Name:     html_select_time
  * Purpose:  Prints the dropdowns for time selection
  *
- * @link   https://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
+ * @link   http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
  *           (Smarty online manual)
  * @author Roberto Berto <roberto@berto.net>
  * @author Monte Ohrt <monte AT ohrt DOT com>

libs/plugins/function.html_table.php

@@ -38,7 +38,7 @@
  * @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    https://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ * @link    http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
  *           (Smarty online manual)
  *
  * @param array $params parameters

libs/plugins/function.mailto.php

@@ -36,7 +36,7 @@
  * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
  * {mailto address="me@domain.com" extra='class="mailto"'}
  *
- * @link    https://www.smarty.net/manual/en/language.function.mailto.php {mailto}
+ * @link    http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
  *           (Smarty online manual)
  * @version 1.2
  * @author  Monte Ohrt <monte at ohrt dot com>

libs/plugins/function.math.php

@@ -12,7 +12,7 @@
  * Name:     math
  * Purpose:  handle math computations in template
  *
- * @link   https://www.smarty.net/manual/en/language.function.math.php {math}
+ * @link   http://www.smarty.net/manual/en/language.function.math.php {math}
  *           (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  *

libs/plugins/modifier.date_format.php

@@ -15,7 +15,7 @@
  *          - format: strftime format for output
  *          - default_date: default date if $string is empty
  *
- * @link   https://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

libs/plugins/modifier.escape.php

@@ -11,7 +11,7 @@
  * Name:     escape
  * Purpose:  escape string for output
  *
- * @link   https://www.smarty.net/docs/en/language.modifier.escape
+ * @link   http://www.smarty.net/docs/en/language.modifier.escape
  * @author Monte Ohrt <monte at ohrt dot com>
  *
  * @param string  $string        input string
@@ -23,9 +23,12 @@
  */
 function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
 {
-    static $_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;
     }
@@ -181,11 +184,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                     '"'  => '\\"',
                     "\r" => '\\r',
                     "\n" => '\\n',
-                    '</' => '<\/',
-                    // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
-                    '<!--' => '<\!--',
-                    '<s'   => '<\s',
-                    '<S'   => '<\S'
+                    '</' => '<\/'
                 )
             );
         case 'mail':
@@ -251,7 +250,6 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
             }
             return $return;
         default:
-            trigger_error("escape: unsupported type: $esc_type - returning unmodified string", E_USER_NOTICE);
             return $string;
     }
 }

libs/plugins/modifier.mb_wordwrap.php

@@ -11,7 +11,7 @@
  * Name:     mb_wordwrap
  * Purpose:  Wrap a string to a given number of characters
  *
- * @link   https://php.net/manual/en/function.wordwrap.php for similarity
+ * @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

libs/plugins/modifier.regex_replace.php

@@ -11,7 +11,7 @@
  * Name:     regex_replace
  * Purpose:  regular expression search/replace
  *
- * @link   https://www.smarty.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>
  *

libs/plugins/modifier.replace.php

@@ -11,7 +11,7 @@
  * Name:     replace
  * Purpose:  simple search/replace
  *
- * @link   https://www.smarty.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
  *

libs/plugins/modifier.spacify.php

@@ -11,7 +11,7 @@
  * Name:     spacify
  * Purpose:  add spaces between characters in a string
  *
- * @link   https://www.smarty.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

libs/plugins/modifier.truncate.php

@@ -13,7 +13,7 @@
  *               optionally splitting in the middle of a word, and
  *               appending the $etc string or inserting $etc into the middle.
  *
- * @link   https://www.smarty.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

libs/plugins/modifiercompiler.cat.php

@@ -14,7 +14,7 @@
  * Input:    string to catenate
  * Example:  {$var|cat:"foo"}
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.cat.php cat
+ * @link   http://smarty.php.net/manual/en/language.modifier.cat.php cat
  *           (Smarty online manual)
  * @author Uwe Tews
  *

libs/plugins/modifiercompiler.count_characters.php

@@ -11,7 +11,7 @@
  * Name:     count_characters
  * Purpose:  count the number of characters in a text
  *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
+ * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
  *         manual)
  * @author Uwe Tews
  *

libs/plugins/modifiercompiler.count_paragraphs.php

@@ -11,7 +11,7 @@
  * Name:     count_paragraphs
  * Purpose:  count the number of paragraphs in a text
  *
- * @link   https://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
  *

libs/plugins/modifiercompiler.count_sentences.php

@@ -11,7 +11,7 @@
  * Name:     count_sentences
  * Purpose:  count the number of sentences in a text
  *
- * @link   https://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
  *

libs/plugins/modifiercompiler.count_words.php

@@ -11,7 +11,7 @@
  * Name:     count_words
  * Purpose:  count the number of words in a text
  *
- * @link   https://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

libs/plugins/modifiercompiler.default.php

@@ -11,7 +11,7 @@
  * Name:     default
  * Purpose:  designate default value for empty variables
  *
- * @link   https://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
@@ -26,7 +26,7 @@ function smarty_modifiercompiler_default($params)
     }
     array_shift($params);
     foreach ($params as $param) {
-        $output = '(($tmp = ' . $output . ' ?? null)===null||$tmp===\'\' ? ' . $param . ' ?? null : $tmp)';
+        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
     }
     return $output;
 }

libs/plugins/modifiercompiler.escape.php

@@ -11,7 +11,7 @@
  * Name:     escape
  * Purpose:  escape string for output
  *
- * @link   https://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
@@ -22,7 +22,7 @@
  */
 function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
-    static $_double_encode = true;
+    static $_double_encode = null;
     static $is_loaded = false;
     $compiler->template->_checkPlugins(
         array(
@@ -32,6 +32,9 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
             )
         )
     );
+    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);
@@ -86,10 +89,9 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
                 return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[ 0 ] . ')';
             case 'javascript':
                 // escape quotes and backslashes, newlines, etc.
-                // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
                 return 'strtr(' .
                        $params[ 0 ] .
-                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S" ))';
+                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
         }
     } catch (SmartyException $e) {
         // pass through to regular plugin fallback

libs/plugins/modifiercompiler.indent.php

@@ -11,7 +11,7 @@
  * Name:     indent
  * Purpose:  indent lines of text
  *
- * @link   https://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

libs/plugins/modifiercompiler.lower.php

@@ -11,7 +11,7 @@
  * Name:     lower
  * Purpose:  convert string to lowercase
  *
- * @link   https://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
  *

libs/plugins/modifiercompiler.string_format.php

@@ -11,7 +11,7 @@
  * Name:     string_format
  * Purpose:  format strings via sprintf
  *
- * @link   https://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

libs/plugins/modifiercompiler.strip.php

@@ -14,7 +14,7 @@
  * Example:  {$var|strip} {$var|strip:" "}
  * Date:     September 25th, 2002
  *
- * @link   https://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

libs/plugins/modifiercompiler.strip_tags.php

@@ -11,7 +11,7 @@
  * Name:     strip_tags
  * Purpose:  strip html tags from text
  *
- * @link   https://www.smarty.net/docs/en/language.modifier.strip.tags.tpl 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

libs/plugins/modifiercompiler.upper.php

@@ -11,7 +11,7 @@
  * Name:     lower
  * Purpose:  convert string to uppercase
  *
- * @link   https://www.smarty.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

libs/plugins/modifiercompiler.wordwrap.php

@@ -11,7 +11,7 @@
  * Name:     wordwrap
  * Purpose:  wrap a string of text at a given length
  *
- * @link   https://www.smarty.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

libs/plugins/outputfilter.trimwhitespace.php

@@ -41,7 +41,7 @@ function smarty_outputfilter_trimwhitespace($source)
         }
     }
     // Strip all HTML-Comments
-    // yes, even the ones in <script> - see https://stackoverflow.com/a/808850/515124
+    // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
     $source = preg_replace('#<!--.*?-->#ms', '', $source);
     // capture html elements not to be messed with
     $_offset = 0;

libs/plugins/shared.escape_special_chars.php

@@ -20,7 +20,13 @@
 function smarty_function_escape_special_chars($string)
 {
     if (!is_array($string)) {
-        $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
+        if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
+            $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
+        } 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;
 }

libs/sysplugins/smarty_internal_cacheresource_file.php

@@ -196,7 +196,11 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
-        clearstatcache(true, $cached->lock_id);
+        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);

libs/sysplugins/smarty_internal_compile_for.php

@@ -18,7 +18,7 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
 {
     /**
      * Compiles code for the {for} tag
-     * Smarty supports two different syntax's:
+     * Smarty 3 does implement two different syntax's:
      * - {for $var in $array}
      * For looping over arrays or iterators
      * - {for $x=0; $x<$y; $x++}

libs/sysplugins/smarty_internal_compile_foreach.php

@@ -219,9 +219,9 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
         if (isset($itemAttr[ 'index' ])) {
             $output .= "{$itemVar}->index = -1;\n";
         }
-        $output .= "{$itemVar}->do_else = true;\n";
+	    $output .= "{$itemVar}->do_else = true;\n";
         $output .= "if (\$_from !== null) foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
-        $output .= "{$itemVar}->do_else = false;\n";
+	    $output .= "{$itemVar}->do_else = false;\n";
         if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
             $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
         }

libs/sysplugins/smarty_internal_compile_function.php

@@ -58,11 +58,6 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
         }
         unset($_attr[ 'nocache' ]);
         $_name = trim($_attr[ 'name' ], '\'"');
-
-        if (!preg_match('/^[a-zA-Z0-9_\x80-\xff]+$/', $_name)) {
-	        $compiler->trigger_template_error("Function name contains invalid characters: {$_name}", null, true);
-        }
-
         $compiler->parent_compiler->tpl_function[ $_name ] = array();
         $save = array(
             $_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,

libs/sysplugins/smarty_internal_compile_include_php.php

@@ -0,0 +1,110 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Include PHP
+ * Compiles the {include_php} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Insert Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @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');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('once', 'assign');
+
+    /**
+     * Compiles code for the {include_php} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        if (!($compiler->smarty instanceof SmartyBC)) {
+            throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
+        }
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        /**
+         *
+         *
+         * @var Smarty_Internal_Template $_smarty_tpl
+         * used in evaluated code
+         */
+        $_smarty_tpl = $compiler->template;
+        $_filepath = false;
+        $_file = null;
+        eval('$_file = @' . $_attr[ 'file' ] . ';');
+        if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
+            $_filepath = $compiler->smarty->_realpath($_file, true);
+        } else {
+            if (isset($compiler->smarty->security_policy)) {
+                $_dir = $compiler->smarty->security_policy->trusted_dir;
+            } else {
+                $_dir = $compiler->smarty->trusted_dir;
+            }
+            if (!empty($_dir)) {
+                foreach ((array)$_dir as $_script_dir) {
+                    $_path = $compiler->smarty->_realpath($_script_dir . DIRECTORY_SEPARATOR . $_file, true);
+                    if (file_exists($_path)) {
+                        $_filepath = $_path;
+                        break;
+                    }
+                }
+            }
+        }
+        if ($_filepath === false) {
+            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true);
+        }
+        if (isset($compiler->smarty->security_policy)) {
+            $compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
+        }
+        if (isset($_attr[ 'assign' ])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr[ 'assign' ];
+        }
+        $_once = '_once';
+        if (isset($_attr[ 'once' ])) {
+            if ($_attr[ 'once' ] === 'false') {
+                $_once = '';
+            }
+        }
+        if (isset($_assign)) {
+            return "<?php ob_start();\ninclude{$_once} ('{$_filepath}');\n\$_smarty_tpl->assign({$_assign},ob_get_clean());\n?>";
+        } else {
+            return "<?php include{$_once} ('{$_filepath}');?>\n";
+        }
+    }
+}

libs/sysplugins/smarty_internal_compile_insert.php

@@ -89,7 +89,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
                 if (isset($compiler->smarty->security_policy)) {
                     $_dir = $compiler->smarty->security_policy->trusted_dir;
                 } else {
-                    $_dir = null;
+                    $_dir = $compiler->smarty instanceof SmartyBC ? $compiler->smarty->trusted_dir : null;
                 }
                 if (!empty($_dir)) {
                     foreach ((array)$_dir as $_script_dir) {

libs/sysplugins/smarty_internal_compile_private_php.php

@@ -0,0 +1,253 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile PHP Expression
+ * Compiles any tag which will output an expression or variable
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile PHP Expression Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('code', 'type');
+
+    /**
+     * Compiles code for generating output from any expression
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->has_code = false;
+        if ($_attr[ 'type' ] === 'xml') {
+            $compiler->tag_nocache = true;
+            $output = addcslashes($_attr[ 'code' ], "'\\");
+            $compiler->parser->current_buffer->append_subtree(
+                $compiler->parser,
+                new Smarty_Internal_ParseTree_Tag(
+                    $compiler->parser,
+                    $compiler->processNocacheCode(
+                        "<?php echo '{$output}';?>\n",
+                        true
+                    )
+                )
+            );
+            return '';
+        }
+        if ($_attr[ 'type' ] !== 'tag') {
+            if ($compiler->php_handling === Smarty::PHP_REMOVE) {
+                return '';
+            } elseif ($compiler->php_handling === Smarty::PHP_QUOTE) {
+                $output =
+                    preg_replace_callback(
+                        '#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
+                        array($this, 'quote'),
+                        $_attr[ 'code' ]
+                    );
+                $compiler->parser->current_buffer->append_subtree(
+                    $compiler->parser,
+                    new Smarty_Internal_ParseTree_Text($output)
+                );
+                return '';
+            } elseif ($compiler->php_handling === Smarty::PHP_PASSTHRU || $_attr[ 'type' ] === 'unmatched') {
+                $compiler->tag_nocache = true;
+                $output = addcslashes($_attr[ 'code' ], "'\\");
+                $compiler->parser->current_buffer->append_subtree(
+                    $compiler->parser,
+                    new Smarty_Internal_ParseTree_Tag(
+                        $compiler->parser,
+                        $compiler->processNocacheCode(
+                            "<?php echo '{$output}';?>\n",
+                            true
+                        )
+                    )
+                );
+                return '';
+            } elseif ($compiler->php_handling === Smarty::PHP_ALLOW) {
+                if (!($compiler->smarty instanceof SmartyBC)) {
+                    $compiler->trigger_template_error(
+                        '$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it',
+                        null,
+                        true
+                    );
+                }
+                $compiler->has_code = true;
+                return $_attr[ 'code' ];
+            } else {
+                $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
+            }
+        } else {
+            $compiler->has_code = true;
+            if (!($compiler->smarty instanceof SmartyBC)) {
+                $compiler->trigger_template_error(
+                    '{php}{/php} tags not allowed. Use SmartyBC to enable them',
+                    null,
+                    true
+                );
+            }
+            $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
+            $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
+            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
+            if (!empty($match[ 2 ])) {
+                if ('nocache' === trim($match[ 2 ])) {
+                    $compiler->tag_nocache = true;
+                } else {
+                    $compiler->trigger_template_error("illegal value of option flag '{$match[2]}'", null, true);
+                }
+            }
+            return preg_replace(
+                array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
+                array('<?php ', '?>'),
+                $_attr[ 'code' ]
+            );
+        }
+    }
+
+    /**
+     * Lexer code for PHP tags
+     *
+     * This code has been moved from lexer here fo easier debugging and maintenance
+     *
+     * @param Smarty_Internal_Templatelexer $lex
+     *
+     * @throws \SmartyCompilerException
+     */
+    public function parsePhp(Smarty_Internal_Templatelexer $lex)
+    {
+        $lex->token = Smarty_Internal_Templateparser::TP_PHP;
+        $close = 0;
+        $lex->taglineno = $lex->line;
+        $closeTag = '?>';
+        if (strpos($lex->value, '<?xml') === 0) {
+            $lex->is_xml = true;
+            $lex->phpType = 'xml';
+            return;
+        } elseif (strpos($lex->value, '<?') === 0) {
+            $lex->phpType = 'php';
+        } elseif (strpos($lex->value, '<%') === 0) {
+            $lex->phpType = 'asp';
+            $closeTag = '%>';
+        } elseif (strpos($lex->value, '%>') === 0) {
+            $lex->phpType = 'unmatched';
+        } elseif (strpos($lex->value, '?>') === 0) {
+            if ($lex->is_xml) {
+                $lex->is_xml = false;
+                $lex->phpType = 'xml';
+                return;
+            }
+            $lex->phpType = 'unmatched';
+        } elseif (strpos($lex->value, '<s') === 0) {
+            $lex->phpType = 'script';
+            $closeTag = '</script>';
+        } elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
+            if ($lex->isAutoLiteral()) {
+                $lex->token = Smarty_Internal_Templateparser::TP_TEXT;
+                return;
+            }
+            $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
+            if ($lex->value === $closeTag) {
+                $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
+            }
+            $lex->phpType = 'tag';
+        }
+        if ($lex->phpType === 'unmatched') {
+            return;
+        }
+        if (($lex->phpType === 'php' || $lex->phpType === 'asp')
+            &&
+            ($lex->compiler->php_handling === Smarty::PHP_PASSTHRU ||
+             $lex->compiler->php_handling === Smarty::PHP_QUOTE)
+        ) {
+            return;
+        }
+        $start = $lex->counter + strlen($lex->value);
+        $body = true;
+        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+            $close = $match[ 0 ][ 1 ];
+        } else {
+            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+        }
+        while ($body) {
+            if (preg_match(
+                '~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
+                $lex->data,
+                $match,
+                PREG_OFFSET_CAPTURE,
+                $start
+            )
+            ) {
+                $value = $match[ 0 ][ 0 ];
+                $from = $pos = $match[ 0 ][ 1 ];
+                if ($pos > $close) {
+                    $body = false;
+                } else {
+                    $start = $pos + strlen($value);
+                    $phpCommentStart = $value === '/*';
+                    if ($phpCommentStart) {
+                        $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
+                        if ($phpCommentEnd) {
+                            $pos2 = $match[ 0 ][ 1 ];
+                            $start = $pos2 + strlen($match[ 0 ][ 0 ]);
+                        }
+                    }
+                    while ($close > $pos && $close < $start) {
+                        if (preg_match(
+                            '~' . preg_quote($closeTag, '~') . '~i',
+                            $lex->data,
+                            $match,
+                            PREG_OFFSET_CAPTURE,
+                            $from
+                        )
+                        ) {
+                            $close = $match[ 0 ][ 1 ];
+                            $from = $close + strlen($match[ 0 ][ 0 ]);
+                        } else {
+                            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+                        }
+                    }
+                    if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
+                        $lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
+                        $lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
+                    }
+                }
+            } else {
+                $body = false;
+            }
+        }
+        $lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
+    }
+
+    /*
+     * Call back function for $php_handling = PHP_QUOTE
+     *
+     */
+    /**
+     * @param $match
+     *
+     * @return string
+     */
+    private function quote($match)
+    {
+        return htmlspecialchars($match[ 0 ], ENT_QUOTES);
+    }
+}

libs/sysplugins/smarty_internal_compile_private_special_variable.php

@@ -81,10 +81,6 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
                 case 'template':
                     return 'basename($_smarty_tpl->source->filepath)';
                 case 'template_object':
-                    if (isset($compiler->smarty->security_policy)) {
-                        $compiler->trigger_template_error("(secure mode) template_object not permitted");
-                        break;
-                    }
                     return '$_smarty_tpl';
                 case 'current_dir':
                     return 'dirname($_smarty_tpl->source->filepath)';
@@ -98,9 +94,9 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
                         break;
                     }
                     if (strpos($_index[ 1 ], '$') === false && strpos($_index[ 1 ], '\'') === false) {
-                        return "(defined('{$_index[1]}') ? constant('{$_index[1]}') : null)";
+                        return "@constant('{$_index[1]}')";
                     } else {
-                        return "(defined({$_index[1]}) ? constant({$_index[1]}) : null)";
+                        return "@constant({$_index[1]})";
                     }
                 // no break
                 case 'config':

libs/sysplugins/smarty_internal_config_file_compiler.php

@@ -115,7 +115,7 @@ class Smarty_Internal_Config_File_Compiler
             $this->smarty->_debug->start_compile($this->template);
         }
         // init the lexer/parser to compile the config file
-        /* @var Smarty_Internal_ConfigFileLexer $this->lex */
+        /* @var Smarty_Internal_ConfigFileLexer $this ->lex */
         $this->lex = new $this->lexer_class(
             str_replace(
                 array(
@@ -127,7 +127,7 @@ class Smarty_Internal_Config_File_Compiler
             ) . "\n",
             $this
         );
-        /* @var Smarty_Internal_ConfigFileParser $this->parser */
+        /* @var Smarty_Internal_ConfigFileParser $this ->parser */
         $this->parser = new $this->parser_class($this->lex, $this);
         if (function_exists('mb_internal_encoding')
             && function_exists('ini_get')

libs/sysplugins/smarty_internal_data.php

@@ -121,7 +121,7 @@ abstract class Smarty_Internal_Data
      * appends values to template variables
      *
      * @api  Smarty::append()
-     * @link https://www.smarty.net/docs/en/api.append.tpl
+     * @link http://www.smarty.net/docs/en/api.append.tpl
      *
      * @param array|string $tpl_var the template variable name(s)
      * @param mixed        $value   the value to append
@@ -182,7 +182,7 @@ abstract class Smarty_Internal_Data
      * Returns a single or all template variables
      *
      * @api  Smarty::getTemplateVars()
-     * @link https://www.smarty.net/docs/en/api.get.template.vars.tpl
+     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
      *
      * @param string                                                  $varName       variable name or null
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
@@ -195,6 +195,26 @@ abstract class Smarty_Internal_Data
         return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
     }
 
+    /**
+     * gets the object of a Smarty variable
+     *
+     * @param string               $variable      the name of the Smarty variable
+     * @param Smarty_Internal_Data $_ptr          optional pointer to data object
+     * @param boolean              $searchParents search also in parent data
+     * @param bool                 $error_enable
+     *
+     * @return     Smarty_Variable|Smarty_Undefined_Variable the object of the variable
+     * @deprecated since 3.1.28 please use Smarty_Internal_Data::getTemplateVars() instead.
+     */
+    public function getVariable(
+        $variable = null,
+        Smarty_Internal_Data $_ptr = null,
+        $searchParents = true,
+        $error_enable = true
+    ) {
+        return $this->ext->getTemplateVars->_getVariable($this, $variable, $_ptr, $searchParents, $error_enable);
+    }
+
     /**
      * Follow the parent chain an merge template and config variables
      *

libs/sysplugins/smarty_internal_errorhandler.php

@@ -1,60 +1,61 @@
 <?php
 
 /**
- * Smarty error handler to fix new error levels in PHP8 for backwards compatibility
+ * Smarty error handler
  *
  * @package    Smarty
  * @subpackage PluginsInternal
- * @author     Simon Wisselink
+ * @author     Uwe Tews
  *
+ * @deprecated
+Smarty does no longer use @filemtime()
  */
 class Smarty_Internal_ErrorHandler
 {
+    /**
+     * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
+     */
+    public static $mutedDirectories = array();
 
     /**
-     * Allows {$foo} where foo is unset.
-     * @var bool
+     * error handler returned by set_error_handler() in self::muteExpectedErrors()
      */
-    public $allowUndefinedVars = true;
+    private static $previousErrorHandler = null;
 
     /**
-     * Allows {$foo.bar} where bar is unset and {$foo.bar1.bar2} where either bar1 or bar2 is unset.
-     * @var bool
+     * Enable error handler to mute expected messages
+     *
      */
-    public $allowUndefinedArrayKeys = true;
-
-    private $previousErrorHandler = null;
-
-    /**
-     * Enable error handler to intercept errors
-     */
-    public function activate() {
+    public static function muteExpectedErrors()
+    {
         /*
-            Error muting is done because some people implemented custom error_handlers using
-            https://php.net/set_error_handler and for some reason did not understand the following paragraph:
+            error muting is done because some people implemented custom error_handlers using
+            http://php.net/set_error_handler and for some reason did not understand the following paragraph:
 
-            It is important to remember that the standard PHP error handler is completely bypassed for the
-            error types specified by error_types unless the callback function returns FALSE.
-            error_reporting() settings will have no effect and your error handler will be called regardless -
-            however you are still able to read the current value of error_reporting and act appropriately.
-            Of particular note is that this value will be 0 if the statement that caused the error was
-            prepended by the @ error-control operator.
+                It is important to remember that the standard PHP error handler is completely bypassed for the
+                error types specified by error_types unless the callback function returns FALSE.
+                error_reporting() settings will have no effect and your error handler will be called regardless -
+                however you are still able to read the current value of error_reporting and act appropriately.
+                Of particular note is that this value will be 0 if the statement that caused the error was
+                prepended by the @ error-control operator.
+
+            Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
+                - @filemtime() is almost twice as fast as using an additional file_exists()
+                - between file_exists() and filemtime() a possible race condition is opened,
+                  which does not exist using the simple @filemtime() approach.
         */
-        $this->previousErrorHandler = set_error_handler([$this, 'handleError']);
-    }
-
-    /**
-     * Disable error handler
-     */
-    public function deactivate() {
-        restore_error_handler();
-        $this->previousErrorHandler = null;
+        $error_handler = array('Smarty_Internal_ErrorHandler', 'mutingErrorHandler');
+        $previous = set_error_handler($error_handler);
+        // avoid dead loops
+        if ($previous !== $error_handler) {
+            self::$previousErrorHandler = $previous;
+        }
     }
 
     /**
      * Error Handler to mute expected messages
      *
-     * @link https://php.net/set_error_handler
+     * @link http://php.net/set_error_handler
      *
      * @param integer $errno Error level
      * @param         $errstr
@@ -64,21 +65,49 @@ class Smarty_Internal_ErrorHandler
      *
      * @return bool
      */
-    public function handleError($errno, $errstr, $errfile, $errline, $errcontext = [])
+    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
     {
-        if ($this->allowUndefinedVars && $errstr == 'Attempt to read property "value" on null') {
-            return; // suppresses this error
+        $_is_muted_directory = false;
+        // add the SMARTY_DIR to the list of muted directories
+        if (!isset(self::$mutedDirectories[ SMARTY_DIR ])) {
+            $smarty_dir = realpath(SMARTY_DIR);
+            if ($smarty_dir !== false) {
+                self::$mutedDirectories[ SMARTY_DIR ] =
+                    array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
+            }
         }
-
-        if ($this->allowUndefinedArrayKeys && preg_match(
-            '/^(Undefined array key|Trying to access array offset on value of type null)/',
-            $errstr
-        )) {
-            return; // suppresses this error
+        // walk the muted directories and test against $errfile
+        foreach (self::$mutedDirectories as $key => &$dir) {
+            if (!$dir) {
+                // resolve directory and length for speedy comparisons
+                $file = realpath($key);
+                if ($file === false) {
+                    // this directory does not exist, remove and skip it
+                    unset(self::$mutedDirectories[ $key ]);
+                    continue;
+                }
+                $dir = array('file' => $file, 'length' => strlen($file),);
+            }
+            if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) {
+                $_is_muted_directory = true;
+                break;
+            }
+        }
+        // pass to next error handler if this error did not occur inside SMARTY_DIR
+        // or the error was within smarty but masked to be ignored
+        if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
+            if (self::$previousErrorHandler) {
+                return call_user_func(
+                    self::$previousErrorHandler,
+                    $errno,
+                    $errstr,
+                    $errfile,
+                    $errline,
+                    $errcontext
+                );
+            } else {
+                return false;
+            }
         }
-
-        // pass all other errors through to the previous error handler or to the default PHP error handler
-        return $this->previousErrorHandler ?
-            call_user_func($this->previousErrorHandler, $errno, $errstr, $errfile, $errline, $errcontext) : false;
     }
 }

libs/sysplugins/smarty_internal_method_append.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_Append
      * appends values to template variables
      *
      * @api  Smarty::append()
-     * @link https://www.smarty.net/docs/en/api.append.tpl
+     * @link http://www.smarty.net/docs/en/api.append.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param array|string                                            $tpl_var the template variable name(s)

libs/sysplugins/smarty_internal_method_appendbyref.php

@@ -15,7 +15,7 @@ class Smarty_Internal_Method_AppendByRef
      * appends values to template variables by reference
      *
      * @api  Smarty::appendByRef()
-     * @link https://www.smarty.net/docs/en/api.append.by.ref.tpl
+     * @link http://www.smarty.net/docs/en/api.append.by.ref.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $tpl_var the template variable name

libs/sysplugins/smarty_internal_method_clearallassign.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearAllAssign
      * clear all the assigned template variables.
      *
      * @api  Smarty::clearAllAssign()
-     * @link https://www.smarty.net/docs/en/api.clear.all.assign.tpl
+     * @link http://www.smarty.net/docs/en/api.clear.all.assign.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      *

libs/sysplugins/smarty_internal_method_clearallcache.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearAllCache
      * Empty cache folder
      *
      * @api  Smarty::clearAllCache()
-     * @link https://www.smarty.net/docs/en/api.clear.all.cache.tpl
+     * @link http://www.smarty.net/docs/en/api.clear.all.cache.tpl
      *
      * @param \Smarty $smarty
      * @param integer $exp_time expiration time

libs/sysplugins/smarty_internal_method_clearassign.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearAssign
      * clear the given assigned template variable(s).
      *
      * @api  Smarty::clearAssign()
-     * @link https://www.smarty.net/docs/en/api.clear.assign.tpl
+     * @link http://www.smarty.net/docs/en/api.clear.assign.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string|array                                            $tpl_var the template variable(s) to clear

libs/sysplugins/smarty_internal_method_clearcache.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearCache
      * Empty cache for a specific template
      *
      * @api  Smarty::clearCache()
-     * @link https://www.smarty.net/docs/en/api.clear.cache.tpl
+     * @link http://www.smarty.net/docs/en/api.clear.cache.tpl
      *
      * @param \Smarty $smarty
      * @param string  $template_name template name

libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearCompiledTemplate
      * Delete compiled template file
      *
      * @api  Smarty::clearCompiledTemplate()
-     * @link https://www.smarty.net/docs/en/api.clear.compiled.template.tpl
+     * @link http://www.smarty.net/docs/en/api.clear.compiled.template.tpl
      *
      * @param \Smarty $smarty
      * @param string  $resource_name template name

libs/sysplugins/smarty_internal_method_clearconfig.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ClearConfig
      * clear a single or all config variables
      *
      * @api  Smarty::clearConfig()
-     * @link https://www.smarty.net/docs/en/api.clear.config.tpl
+     * @link http://www.smarty.net/docs/en/api.clear.config.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string|null                                             $name variable name or null

libs/sysplugins/smarty_internal_method_configload.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_ConfigLoad
      * load a config file, optionally load just selected sections
      *
      * @api  Smarty::configLoad()
-     * @link https://www.smarty.net/docs/en/api.config.load.tpl
+     * @link http://www.smarty.net/docs/en/api.config.load.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $config_file filename
@@ -42,7 +42,7 @@ class Smarty_Internal_Method_ConfigLoad
      * load a config file, optionally load just selected sections
      *
      * @api  Smarty::configLoad()
-     * @link https://www.smarty.net/docs/en/api.config.load.tpl
+     * @link http://www.smarty.net/docs/en/api.config.load.tpl
      *
      * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
      * @param string                                                  $config_file filename

libs/sysplugins/smarty_internal_method_createdata.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_CreateData
      * creates a data object
      *
      * @api  Smarty::createData()
-     * @link https://www.smarty.net/docs/en/api.create.data.tpl
+     * @link http://www.smarty.net/docs/en/api.create.data.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty      $obj
      * @param \Smarty_Internal_Template|\Smarty_Internal_Data|\Smarty_Data|\Smarty $parent next higher level of Smarty

libs/sysplugins/smarty_internal_method_getconfigvars.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetConfigVars
      * Returns a single or all config variables
      *
      * @api  Smarty::getConfigVars()
-     * @link https://www.smarty.net/docs/en/api.get.config.vars.tpl
+     * @link http://www.smarty.net/docs/en/api.get.config.vars.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $varname        variable name or null

libs/sysplugins/smarty_internal_method_getregisteredobject.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetRegisteredObject
      * return a reference to a registered object
      *
      * @api  Smarty::getRegisteredObject()
-     * @link https://www.smarty.net/docs/en/api.get.registered.object.tpl
+     * @link http://www.smarty.net/docs/en/api.get.registered.object.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $object_name object name

libs/sysplugins/smarty_internal_method_gettags.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetTags
      * Return array of tag/attributes of all tags used by an template
      *
      * @api  Smarty::getTags()
-     * @link https://www.smarty.net/docs/en/api.get.tags.tpl
+     * @link http://www.smarty.net/docs/en/api.get.tags.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param null|string|Smarty_Internal_Template                            $template

libs/sysplugins/smarty_internal_method_gettemplatevars.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_GetTemplateVars
      * Returns a single or all template variables
      *
      * @api  Smarty::getTemplateVars()
-     * @link https://www.smarty.net/docs/en/api.get.template.vars.tpl
+     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
      *
      * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
      * @param string                                                  $varName       variable name or null

libs/sysplugins/smarty_internal_method_loadfilter.php

@@ -30,7 +30,7 @@ class Smarty_Internal_Method_LoadFilter
      *
      * @api  Smarty::loadFilter()
      *
-     * @link https://www.smarty.net/docs/en/api.load.filter.tpl
+     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type

libs/sysplugins/smarty_internal_method_registercacheresource.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterCacheResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::registerCacheResource()
-     * @link https://www.smarty.net/docs/en/api.register.cacheresource.tpl
+     * @link http://www.smarty.net/docs/en/api.register.cacheresource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $name name of resource type

libs/sysplugins/smarty_internal_method_registerclass.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterClass
      * Registers static classes to be used in templates
      *
      * @api  Smarty::registerClass()
-     * @link https://www.smarty.net/docs/en/api.register.class.tpl
+     * @link http://www.smarty.net/docs/en/api.register.class.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $class_name

libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterDefaultPluginHandler
      * Registers a default plugin handler
      *
      * @api  Smarty::registerDefaultPluginHandler()
-     * @link https://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
+     * @link http://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param callable                                                        $callback class/method name

libs/sysplugins/smarty_internal_method_registerfilter.php

@@ -30,7 +30,7 @@ class Smarty_Internal_Method_RegisterFilter
      *
      * @api  Smarty::registerFilter()
      *
-     * @link https://www.smarty.net/docs/en/api.register.filter.tpl
+     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type

libs/sysplugins/smarty_internal_method_registerobject.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterObject
      * Registers object to be used in templates
      *
      * @api  Smarty::registerObject()
-     * @link https://www.smarty.net/docs/en/api.register.object.tpl
+     * @link http://www.smarty.net/docs/en/api.register.object.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $object_name

libs/sysplugins/smarty_internal_method_registerplugin.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_RegisterPlugin
      * Registers plugin to be used in templates
      *
      * @api  Smarty::registerPlugin()
-     * @link https://www.smarty.net/docs/en/api.register.plugin.tpl
+     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type       plugin type
@@ -48,8 +48,6 @@ class Smarty_Internal_Method_RegisterPlugin
             throw new SmartyException("Plugin tag '{$name}' already registered");
         } elseif (!is_callable($callback)) {
             throw new SmartyException("Plugin '{$name}' not callable");
-        } elseif ($cacheable && $cache_attr) {
-            throw new SmartyException("Cannot set caching attributes for plugin '{$name}' when it is cacheable.");
         } else {
             $smarty->registered_plugins[ $type ][ $name ] = array($callback, (bool)$cacheable, (array)$cache_attr);
         }

libs/sysplugins/smarty_internal_method_registerresource.php

@@ -22,18 +22,25 @@ class Smarty_Internal_Method_RegisterResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::registerResource()
-     * @link https://www.smarty.net/docs/en/api.register.resource.tpl
+     * @link http://www.smarty.net/docs/en/api.register.resource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $name             name of resource type
-     * @param Smarty_Resource                                           $resource_handler instance of Smarty_Resource
+     * @param Smarty_Resource|array                                           $resource_handler or instance of
+     *                                                                                          Smarty_Resource,
+     *                                                                                          or array of
+     *                                                                                          callbacks to
+     *                                                                                          handle
+     *                                                                                          resource
+     *                                                                                          (deprecated)
      *
      * @return \Smarty|\Smarty_Internal_Template
      */
-    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, Smarty_Resource $resource_handler)
+    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
     {
         $smarty = $obj->_getSmartyObj();
-        $smarty->registered_resources[ $name ] = $resource_handler;
+        $smarty->registered_resources[ $name ] =
+            $resource_handler instanceof Smarty_Resource ? $resource_handler : array($resource_handler, false);
         return $obj;
     }
 }

libs/sysplugins/smarty_internal_method_unloadfilter.php

@@ -16,7 +16,7 @@ class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFil
      *
      * @api  Smarty::unloadFilter()
      *
-     * @link https://www.smarty.net/docs/en/api.unload.filter.tpl
+     * @link http://www.smarty.net/docs/en/api.unload.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type

libs/sysplugins/smarty_internal_method_unregistercacheresource.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterCacheResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::unregisterCacheResource()
-     * @link https://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
+     * @link http://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param                                                                 $name

libs/sysplugins/smarty_internal_method_unregisterfilter.php

@@ -16,7 +16,7 @@ class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_Reg
      *
      * @api  Smarty::unregisterFilter()
      *
-     * @link https://www.smarty.net/docs/en/api.unregister.filter.tpl
+     * @link http://www.smarty.net/docs/en/api.unregister.filter.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type filter type

libs/sysplugins/smarty_internal_method_unregisterobject.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterObject
      * Registers plugin to be used in templates
      *
      * @api  Smarty::unregisterObject()
-     * @link https://www.smarty.net/docs/en/api.unregister.object.tpl
+     * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $object_name name of object

libs/sysplugins/smarty_internal_method_unregisterplugin.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterPlugin
      * Registers plugin to be used in templates
      *
      * @api  Smarty::unregisterPlugin()
-     * @link https://www.smarty.net/docs/en/api.unregister.plugin.tpl
+     * @link http://www.smarty.net/docs/en/api.unregister.plugin.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type plugin type

libs/sysplugins/smarty_internal_method_unregisterresource.php

@@ -22,7 +22,7 @@ class Smarty_Internal_Method_UnregisterResource
      * Registers a resource to fetch a template
      *
      * @api  Smarty::unregisterResource()
-     * @link https://www.smarty.net/docs/en/api.unregister.resource.tpl
+     * @link http://www.smarty.net/docs/en/api.unregister.resource.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
      * @param string                                                          $type name of resource type

libs/sysplugins/smarty_internal_parsetree_template.php

@@ -85,85 +85,45 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
     public function to_smarty_php(Smarty_Internal_Templateparser $parser)
     {
         $code = '';
-
-        foreach ($this->getChunkedSubtrees() as $chunk) {
-            $text = '';
-            switch ($chunk['mode']) {
-                case 'textstripped':
-                    foreach ($chunk['subtrees'] as $subtree) {
-                        $text .= $subtree->to_smarty_php($parser);
+        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
+            if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
+                $subtree = $this->subtrees[ $key ]->to_smarty_php($parser);
+                while ($key + 1 < $cnt && ($this->subtrees[ $key + 1 ] instanceof Smarty_Internal_ParseTree_Text ||
+                                           $this->subtrees[ $key + 1 ]->data === '')) {
+                    $key++;
+                    if ($this->subtrees[ $key ]->data === '') {
+                        continue;
                     }
-                    $code .= preg_replace(
-                        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
-                        "<?php echo '\$1'; ?>\n",
-                        $parser->compiler->processText($text)
-                    );
-                    break;
-                case 'text':
-                    foreach ($chunk['subtrees'] as $subtree) {
-                        $text .= $subtree->to_smarty_php($parser);
-                    }
-                    $code .= preg_replace(
-                        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
-                        "<?php echo '\$1'; ?>\n",
-                        $text
-                    );
-                    break;
-                case 'tag':
-                    foreach ($chunk['subtrees'] as $subtree) {
-                        $text = $parser->compiler->appendCode($text, $subtree->to_smarty_php($parser));
-                    }
-                    $code .= $text;
-                    break;
-                default:
-                    foreach ($chunk['subtrees'] as $subtree) {
-                        $text = $subtree->to_smarty_php($parser);
-                    }
-                    $code .= $text;
-
+                    $subtree .= $this->subtrees[ $key ]->to_smarty_php($parser);
+                }
+                if ($subtree === '') {
+                    continue;
+                }
+                $code .= preg_replace(
+                    '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+                    "<?php echo '\$1'; ?>\n",
+                    $subtree
+                );
+                continue;
             }
+            if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
+                $subtree = $this->subtrees[ $key ]->to_smarty_php($parser);
+                while ($key + 1 < $cnt && ($this->subtrees[ $key + 1 ] instanceof Smarty_Internal_ParseTree_Tag ||
+                                           $this->subtrees[ $key + 1 ]->data === '')) {
+                    $key++;
+                    if ($this->subtrees[ $key ]->data === '') {
+                        continue;
+                    }
+                    $subtree = $parser->compiler->appendCode($subtree, $this->subtrees[ $key ]->to_smarty_php($parser));
+                }
+                if ($subtree === '') {
+                    continue;
+                }
+                $code .= $subtree;
+                continue;
+            }
+            $code .= $this->subtrees[ $key ]->to_smarty_php($parser);
         }
         return $code;
     }
-
-    private function getChunkedSubtrees() {
-        $chunks = array();
-        $currentMode = null;
-        $currentChunk = array();
-        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
-
-            if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, array('textstripped', 'text', 'tag'))) {
-                continue;
-            }
-
-            if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text
-                && $this->subtrees[ $key ]->isToBeStripped()) {
-                $newMode = 'textstripped';
-            } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
-                $newMode = 'text';
-            } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
-                $newMode = 'tag';
-            } else {
-                $newMode = 'other';
-            }
-
-            if ($newMode == $currentMode) {
-                $currentChunk[] = $this->subtrees[ $key ];
-            } else {
-                $chunks[] = array(
-                    'mode' => $currentMode,
-                    'subtrees' => $currentChunk
-                );
-                $currentMode = $newMode;
-                $currentChunk = array($this->subtrees[ $key ]);
-            }
-        }
-        if ($currentMode && $currentChunk) {
-            $chunks[] = array(
-                'mode' => $currentMode,
-                'subtrees' => $currentChunk
-            );
-        }
-        return $chunks;
-    }
 }

libs/sysplugins/smarty_internal_parsetree_text.php

@@ -16,31 +16,14 @@
  */
 class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
 {
-
-    /**
-     * Wether this section should be stripped on output to smarty php
-     * @var bool
-     */
-    private $toBeStripped = false;
-
     /**
      * Create template text buffer
      *
      * @param string $data text
-     * @param bool $toBeStripped wether this section should be stripped on output to smarty php
      */
-    public function __construct($data, $toBeStripped = false)
+    public function __construct($data)
     {
         $this->data = $data;
-        $this->toBeStripped = $toBeStripped;
-    }
-
-    /**
-     * Wether this section should be stripped on output to smarty php
-     * @return bool
-     */
-    public function isToBeStripped() {
-        return $this->toBeStripped;
     }
 
     /**