diff --git a/admin/cat_list.php b/admin/cat_list.php
index 3a6747006..0d7b38a0a 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -326,7 +326,8 @@ foreach ($categories as $category)
       'U_ADD_PHOTOS_ALBUM' => $base_url.'photos_add&album='.$category['id'],
       'U_MOVE' => $base_url.'albums#cat-'.$category['id'],
 
-      'IS_VIRTUAL' => empty($category['dir'])
+      'IS_VIRTUAL' => empty($category['dir']),
+      'CAT_ADMIN_ACCESS' => cat_admin_access($category['id']),
     );
 
   if (empty($category['dir']))
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index af8f7cb44..66c256882 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -187,6 +187,7 @@ $template->assign(
     'CAT_NAME'           => @htmlspecialchars($category['name']),
     'CAT_COMMENT'        => @htmlspecialchars($category['comment']),
     'IS_VISIBLE'          => boolean_to_string($category['visible']),
+    'CAT_ADMIN_ACCESS'   => cat_admin_access($category['id']),
 
     'U_DELETE' => $base_url.'albums',
 
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 94d1bec7d..38bec6c9c 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -64,7 +64,7 @@ jQuery(document).ready(function() {
 var nb_thumbs_page = {$nb_thumbs_page};
 var nb_thumbs_set = {$nb_thumbs_set};
 var applyOnDetails_pattern = "{'on the %d selected photos'|@translate}";
-var all_elements = [{if !empty($all_elements)}{','|@implode:$all_elements}{/if}];
+var all_elements = [{if !empty($all_elements)}{$all_elements|join:","}{/if}];
 
 var selectedMessage_pattern = "{'%d of %d photos selected'|@translate}";
 var selectedMessage_none = "{'No photo selected, %d photos in current set'|@translate}";
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index bb5497d15..75092fd45 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -236,7 +236,7 @@ pluginValues = [];
 					<span class="orphan-photo"></span>
 					{/if}
 					<div class="related-categories-container">
-						{foreach from=$element.related_categories item=$cat_path key=$key}
+						{foreach from=$element.related_categories item=cat_path key=key}
 						<div class="breadcrumb-item">
 							<span class="link-path">{$cat_path['name']}</span>
 							{if $cat_path['unlinkable']}
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index d68a98ef4..0d7853074 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -57,7 +57,7 @@ jQuery(document).ready(function(){
       <a href="{$category.U_EDIT}" class="actionEdit" {*title="{'Edit'|@translate}"*}><span class="icon-pencil tiptip" title="{'Edit'|@translate}"></span><span class="iconLegend">{'Edit'|@translate}</span></a>
       <a href="{$category.U_CHILDREN}" class="actionTitle" {*title="{'sub-albums'|@translate}"*}><span class="icon-sitemap tiptip" title="{'sub-albums'|@translate}"></span><span class="iconLegend">{'sub-albums'|@translate}</span></a>
       <a href="{$category.U_MOVE}" class="actionMove"><span class="icon-move tiptip" title="{'Move'|@translate}"></span><span class="iconLegend">{'Move'|@translate}</span></a>
-      {if cat_admin_access($category.ID)}
+      {if $CAT_ADMIN_ACCESS}
       <a href="{$category.U_JUMPTO}" class="actionGalery" {*title="{'Visit Gallery'|@translate}"*}><span class="icon-eye tiptip" title="{'Visit Gallery'|@translate}"></span><span class="iconLegend">{'Visit Gallery'|@translate}</span></a>
       {else}
       <span href="{$category.U_JUMPTO}" class="actionGalery" {*title="{'This album is private'|@translate}"*}><span class="icon-eye tiptip" title="{'This album is private'|@translate}"></span><span class="iconLegend">{'Visit Gallery'|@translate}</span></span>
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index 0eecebf6f..faf666c35 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -176,7 +176,7 @@ const str_modal_ab = '{'New parent album'|@translate}';
 
   <div class="cat-modify-footer">
    <div class="cat-modify-footer-start">
-    {if cat_admin_access($CAT_ID)}
+    {if $CAT_ADMIN_ACCESS}
       <a class="cat-modify-footer-see-out" href="{$U_JUMPTO}"><i class="icon-left-open"></i>{'Open in gallery'|translate}</a>
     {else}
     <a class="tiptip cat-modify-footer-see-out disabled" title="{'ACCESS_5'|translate}" href="#"><i class="icon-left-open"></i>{'Open in gallery'|translate}</a>
diff --git a/admin/themes/default/template/configuration_search.tpl b/admin/themes/default/template/configuration_search.tpl
index f5e542241..d5d8aaed8 100644
--- a/admin/themes/default/template/configuration_search.tpl
+++ b/admin/themes/default/template/configuration_search.tpl
@@ -77,7 +77,7 @@ for(const filter_name of filters_names){
   <fieldset class="searchConf">
     <legend><span class="icon-equalizer icon-blue rotate-element"></span>{'Filters'|translate}</legend>
     <ul>
-      {foreach from=$search.filters_names item=$filter_name}
+      {foreach from=$search.filters_names item=filter_name}
       <li class="filters-grid">
         <label class="font-checkbox">
           <span class="icon-check"></span>
diff --git a/admin/themes/default/template/picture_formats.tpl b/admin/themes/default/template/picture_formats.tpl
index 84f8296c8..a1e77d830 100644
--- a/admin/themes/default/template/picture_formats.tpl
+++ b/admin/themes/default/template/picture_formats.tpl
@@ -21,7 +21,7 @@
     </div>
 
     <div class="formats-list" {if (count($FORMATS) == 0)}style="display:none"{/if}>
-        {foreach from=$FORMATS item=$format}
+        {foreach from=$FORMATS item=format}
             <div class="format-card" data-id="{$format["format_id"]}" style="background-image: url('{$IMG_SQUARE_SRC}')">
                 <span class="format-card-size">{'%s MB'|@translate:$format["filesize"]}</span>
                 <div class="format-card-ext"><span>{$format["label"]}</span></div>
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 8c9c29a4f..814d7d7b5 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -174,12 +174,12 @@ const str_assoc_album_ab = '{'Associate to album'|translate|escape:javascript}';
       {/if}
       <br>
       <select class="invisible-related-categories-select" name="associate[]" multiple>
-      {foreach from=$related_categories item=$cat_path key=$key}
+      {foreach from=$related_categories item=cat_path key=key}
         <option selected value="{$key}"></option>
       {/foreach}
       </select>
       <div class="related-categories-container">
-      {foreach from=$related_categories item=$cat_path key=$key}
+      {foreach from=$related_categories item=cat_path key=key}
       <div class="breadcrumb-item"><span class="link-path">{$cat_path['name']}</span>{if $cat_path['unlinkable']}<span id={$key} class="icon-cancel-circled remove-item"></span>{else}<span id={$key} class="icon-help-circled help-item tiptip" title="{'This picture is physically linked to this album, you can\'t dissociate them'|translate}"></span>{/if}</div>
       {/foreach}
       </div>
diff --git a/admin/themes/default/template/plugins_new.tpl b/admin/themes/default/template/plugins_new.tpl
index 1483cc00c..4ddd6f00a 100644
--- a/admin/themes/default/template/plugins_new.tpl
+++ b/admin/themes/default/template/plugins_new.tpl
@@ -139,7 +139,7 @@ const str_from_begining = "{"since the beginning"|@translate}";
   data-revision="{$plugin.REVISION_DATE}"
   data-downloads="{$plugin.DOWNLOADS}"
   data-author="{$plugin.AUTHOR}"
-  data-tags="{implode(', ', $plugin.TAGS)}"
+  data-tags="{$plugin.TAGS|join:", "}"
 >
   <div class="pluginContent">
     <div class="pluginImage">
@@ -193,7 +193,7 @@ const str_from_begining = "{"since the beginning"|@translate}";
       </div>
     </div>
     <div class="pluginMoreInfo">
-      <div class="pluginTags tiptip" title="{'Tags'|@translate} : {implode(', ', $plugin.TAGS)}">
+      <div class="pluginTags tiptip" title="{'Tags'|@translate} : {$plugin.TAGS|join:", "}">
       {foreach from=$plugin.TAGS key=tag_id item=tag_label}
         <span data-id="{$tag_id}">{$tag_label}</span>
       {/foreach}
diff --git a/admin/themes/default/template/user_activity.tpl b/admin/themes/default/template/user_activity.tpl
index e23fec23f..3b1a316d1 100644
--- a/admin/themes/default/template/user_activity.tpl
+++ b/admin/themes/default/template/user_activity.tpl
@@ -135,7 +135,7 @@ var actionInfos_tags_moved = "{'%d tags moved'|translate}";
                     <option value="none">
                         <span class='username_filter'>---</span>
                     </option>
-                    {foreach from=$ulist item=$user}
+                    {foreach from=$ulist item=user}
                         <option value="{$user.id}">
                             <span class='username_filter'>{$user.username}</span>
                             <span class='nb_lines_str'>
@@ -153,7 +153,7 @@ var actionInfos_tags_moved = "{'%d tags moved'|translate}";
                     <option value="none">
                         <span class='action_filter'>---</span>
                     </option>
-                    {foreach from=$ACTIONS item=$action}
+                    {foreach from=$ACTIONS item=action}
                         <option value="{$action.value}">
                             <span class='action_filter'>
                                 {ucfirst($action.object)|translate}
diff --git a/include/smarty/CHANGELOG.md b/include/smarty/CHANGELOG.md
index 899cfd7e7..4ee214bac 100644
--- a/include/smarty/CHANGELOG.md
+++ b/include/smarty/CHANGELOG.md
@@ -6,6 +6,183 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.5.2] - 2025-08-26
+
+
+- Fixed escaping of array/object keys in debug_print_var
+
+## [5.5.1] - 2025-05-19
+- Fix missing support for loading modifiercompilers from plugin dir in BCPluginsAdapter [#1132](https://github.com/smarty-php/smarty/pull/1132)
+
+
+## [5.5.0] - 2025-05-03
+- Support trailing comma in array [#1013](https://github.com/smarty-php/smarty/issues/1013)
+
+
+## [5.4.5] - 2025-04-15
+- Fixed deprecation notice in StringEval in PHP8.4 [#1119](https://github.com/smarty-php/smarty/issues/1119)
+
+
+## [5.4.4] - 2025-04-13
+- Fix syntax error occurring when registering a function plugin that ends with the string 'close' [#1122](https://github.com/smarty-php/smarty/issues/1122)
+- Replace SMARTY_VERSION constant with $smarty.version in debug.tpl [#1073](https://github.com/smarty-php/smarty/issues/1073)
+
+
+## [5.4.3] - 2024-12-23
+- Fix PHP backtraces by qualifying/replacing `call_user_func_array` calls [#1074](https://github.com/smarty-php/smarty/issues/1074)
+
+
+## [5.4.2] - 2024-11-20
+
+
+- Support the deprecations introduced in PHP 8.4 and added tests for PHP 8.4 [#1043](https://github.com/smarty-php/smarty/pull/1043)
+
+## [5.4.1] - 2024-08-29
+
+
+- Enable (and fix) unit tests for Windows [#1046](https://github.com/smarty-php/smarty/pull/1046)
+- Fix the use of "extends:" to define the inheritance tree on Windows [#1018](https://github.com/smarty-php/smarty/issues/1018)
+
+## [5.4.0] - 2024-08-14
+- Fixing forced OpCache invalidation on every template include, which is resulting in fast raising wasted OpCache memory [#1007](https://github.com/smarty-php/smarty/issues/1007) 
+- Improvement of auto-escaping [#1030](https://github.com/smarty-php/smarty/pull/1030)
+
+
+## [5.3.1] - 2024-06-16
+- Fixed error when using section with nocache [#1034](https://github.com/smarty-php/smarty/issues/1034)
+
+
+## [5.3.0] - 2024-05-30
+- Fix warning when calling hasVariable for an undefined variable [#977](https://github.com/smarty-php/smarty/issues/977)
+- Added `$smarty->prependTemplateDir()` method [#1022](https://github.com/smarty-php/smarty/issues/1022)
+
+
+## [5.2.0] - 2024-05-28
+- Fixed a code injection vulnerability in extends-tag. This addresses CVE-2024-35226.
+- Added `$smarty->setCacheModifiedCheck()` setter for cache_modified_check
+- Added a PSR-4 loading script to allow Smarty to be used without Composer [#1017](https://github.com/smarty-php/smarty/pull/1017)
+
+
+## [5.1.0] - 2024-04-22
+- Prevent deprecation notices during compilation in PHP8.3 [#996](https://github.com/smarty-php/smarty/issues/996)
+- Fix that getTemplateVars would return an array of objects instead of the assigned variables values [#994](https://github.com/smarty-php/smarty/issues/994)
+- Fix Smarty::assign() not returning $this when called with an array as first parameter [#972](https://github.com/smarty-php/smarty/pull/972)
+- Documented support for `{if $element is in $array}` syntax [#937](https://github.com/smarty-php/smarty/issues/937)
+- Added support for `{if $element is not in $array}` syntax [#937](https://github.com/smarty-php/smarty/issues/937)
+- Using stream variables in templates now throws a deprecation notice [#933](https://github.com/smarty-php/smarty/pull/933)
+- Internal compiler classes always return a string (the internal has_code flag has been removed for simplicity) [#918](https://github.com/smarty-php/smarty/pull/918)
+- Fix invalid classnames in Runtime code for foreach [#1000](https://github.com/smarty-php/smarty/issues/1000)
+
+## [5.0.2] - 2024-03-28
+- Fix Smarty::assign() not returning $this when called with an array as first parameter [#972](https://github.com/smarty-php/smarty/pull/972)
+
+## [5.0.1] - 2024-03-27
+- Fix error in Smarty\Smarty::compileAllTemplates() by including missing FilesystemIterator class [#966](https://github.com/smarty-php/smarty/issues/966)  
+
+## [5.0.0] - 2024-03-25
+- Fixed that scoped variables would overwrite parent scope [#952](https://github.com/smarty-php/smarty/issues/952)
+- Removed publicly accessible `$tpl->_var_stack` variable
+
+### Fixed
+- Too many shorthand attributes error when using a modifier as a function with more than 3 parameters in an expression [#949](https://github.com/smarty-php/smarty/issues/949)
+
+### Removed
+- Dropped support for undocumented `{time()}` added in v5.0.0 since we already have the documented `{$smarty.now}`
+
+## [5.0.0-rc3] - 2024-02-26
+
+### Added
+- PHP8.3 support [#925](https://github.com/smarty-php/smarty/issues/925)
+- Backlink to GitHub in docs
+- Explain how to do escaping and set-up auto-escaping in docs [#865](https://github.com/smarty-php/smarty/issues/865)
+- Link to variable scope page in the documentation for the assign tag [#878](https://github.com/smarty-php/smarty/issues/878)
+- Add support for implode, substr and json_encode as modifiers/functions in templates [#939](https://github.com/smarty-php/smarty/issues/939)
+- Add template path to CompilerException to enable rich debug features [#935](https://github.com/smarty-php/smarty/issues/935)
+
+### Fixed
+- The {debug} tag was broken in v5 [#922](https://github.com/smarty-php/smarty/issues/922)
+- Documentation on `{if $x is even by $y}` syntax
+- Fix incorrect compilation of expressions when escape_html=true [#930](https://github.com/smarty-php/smarty/pull/930)
+
+## [5.0.0-rc2] - 2023-11-11
+
+### Fixed
+- Registered output filters wouldn't run [#899](https://github.com/smarty-php/smarty/issues/899)
+- Use of negative numbers in {math} equations [#895](https://github.com/smarty-php/smarty/issues/895)
+- Do not auto-html-escape custom function results [#906](https://github.com/smarty-php/smarty/issues/906)
+- Fix case-sensitive tag names [#907](https://github.com/smarty-php/smarty/issues/907)
+
+### Removed
+- Removed `$smarty->registered_filters` array
+
+## [5.0.0-rc1] - 2023-08-08
+
+### Added
+- Added support for PHP8.2
+- Added a new way to extend Smarty functionality using `Smarty::addExtension()` or `Smarty::setExtensions()`. Please see the docs for more information.
+- Custom tags can accept positional parameters, so you can write a block compiler that support this: `{trans "Jack" "dull boy"}All work and no play makes %s a %s.{/trans}` [#164](https://github.com/smarty-php/smarty/issues/164)
+- Full support for ternary operator: `{$test ? $a : $b}` and `{$var ?: $value_if_falsy}` [#881](https://github.com/smarty-php/smarty/issues/881)
+- Full support for null coalescing operator: `{$var ?? $value_if_null}` [#882](https://github.com/smarty-php/smarty/issues/882)
+
+### Changed
+- All Smarty code is now in the \Smarty namespace. For simple use-cases, you only need to add
+  `use \Smarty\Smarty;` to your script and everything will work. If you extend Smarty or use
+  Smarty plug-ins, please review your code to see if they assume specific class or method names.
+  E.g.: `Smarty_Internal_Template` is now `\Smarty\Template\`, `SmartyException` is now `\Smarty\Exception`.
+- Template variable scope bubbling has been simplified and made more consistent. 
+  The global scope now equals the Smarty scope in order to avoid global state side effects. Please read
+  the documentation for more details.
+- Lexers and Parsers PHP files are reliably generated from sources (.y and .plex) using the make file 
+- Smarty now always runs in multibyte mode, using `symfony/polyfill-mbstring` if required. Please use the
+  multibyte extension for optimal performance.
+- Smarty no longer calls `mb_internal_encoding()` and doesn't check for deprecated `mbstring.func_overload` ini directive [#480](https://github.com/smarty-php/smarty/issues/480)
+- Generated `<script>` tags lo longer have deprecated `type="text/javascript"` or `language="Javascript"` attributes [#815](https://github.com/smarty-php/smarty/issues/815)
+- Smarty will throw a compiler exception instead of silently ignoring a modifier on a function call, like this: `{include|dot:"x-template-id" file="included.dot.tpl"}` [#526](https://github.com/smarty-php/smarty/issues/526) 
+- The documentation was largely rewritten
+
+### Deprecated
+- `$smarty->getPluginsDir()`
+- `$smarty->loadFilter()`
+- `$smarty->setPluginsDir()`
+- `$smarty->assignGlobal()`
+- Using `$smarty->registerFilter()` for registering variable filters will trigger a notice.
+
+### Removed
+- Dropped support for PHP7.1
+- Removed `$smarty->left_delimiter` and `$smarty->right_delimiter`, use `$smarty->getLeftDelimiter()`/`$smarty->setLeftDelimiter()` and `$smarty->getRightDelimiter()`/`$smarty->setRightDelimiter()`
+- Removed support for the `$cache_attrs` parameter for registered plugins
+- Removed support for undocumented `{make_nocache}` tag
+- Removed support for deprecated `{insert}` tag, the 'insert' plugin type and the associated $smarty->trusted_dir variable
+- Removed the undocumented `{block_parent}` and `{parent}` alternatives to `{$smarty.block.parent}`
+- Removed the undocumented `{block_child}` and `{child}` alternatives to `{$smarty.block.child}`
+- Removed support for loading config files into a non-local scope using `{config_load}` from a template 
+- Removed `$smarty->autoload_filters` in favor of `$smarty->registerFilter()`
+- Removed `$smarty->trusted_dir` and `$smarty->allow_php_templates` since support for executing php scripts from templates has been dropped  
+- Removed `$smarty->php_functions` and `$smarty->php_modifiers`. 
+- You can no longer use native PHP-functions or userland functions in your templates without registering them. If you need a function in your templates,
+  register it first.
+- Removed support for `$smarty->getTags()`
+- Removed the abandoned `$smarty->direct_access_security` setting
+- Dropped support for `$smarty->plugins_dir` and `$smarty->use_include_path`. If you must, use `$smarty->addPluginsDir()` instead,
+  but it's better to use Smarty::addExtension() to add an extension or Smarty::registerPlugin to
+  quickly register a plugin using a callback function.
+- Removed constants such as SMARTY_DIR to prevent global side effects.
+- Removed direct access to `$smarty->template_dir`. Use `$smarty->setTemplateDir()`.
+- Removed direct access to `$smarty->cache_dir`. Use `$smarty->setCacheDir()`.
+- Removed direct access to `$smarty->compile_dir`. Use `$smarty->setCompileDir()`.
+- Removed `$smarty->loadPlugin()`, use `$smarty->registerPlugin()` instead.
+- Removed `$smarty->appendByRef()` and `$smarty->assignByRef()`.
+- Removed `$smarty->_current_file`
+- Removed `$smarty->allow_ambiguous_resources` (ambiguous resources handlers should still work)
+
+### Fixed
+- `|strip_tags` does not work if the input is 0 [#890](https://github.com/smarty-php/smarty/issues/890)
+
+## [4.3.2] - 2023-07-19
+
+### Fixed
+- `$smarty->muteUndefinedOrNullWarnings()` now also mutes PHP8 warnings for undefined properties
+
 ## [4.3.1] - 2023-03-28
 
 ### Security
@@ -1782,7 +1959,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 27.09.2011
 - bugfix possible warning "attempt to modify property of non-object" in {section} (issue #34)
-- added chaining to Smarty_Internal_Data so $smarty->assign('a',1)->assign('b',2); is possible now
+- added chaining to \Smarty\Data so $smarty->assign('a',1)->assign('b',2); is possible now
 - bugfix remove race condition when a custom resource did change timestamp during compilation
 - bugfix variable property did not work on objects variable in template
 - bugfix smarty_make_timestamp() failed to process DateTime objects properly
@@ -2117,7 +2294,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - optimize smarty_modified_escape for hex, hexentity, decentity.
 
 28/12/2010
-- changed $tpl_vars, $config_vars and $parent to belong to Smarty_Internal_Data
+- changed $tpl_vars, $config_vars and $parent to belong to \Smarty\Data
 - added Smarty::registerCacheResource() for dynamic cache resource object registration
 
 27/12/2010
diff --git a/include/smarty/README.md b/include/smarty/README.md
index 0ef3cfab6..1b44172dc 100644
--- a/include/smarty/README.md
+++ b/include/smarty/README.md
@@ -7,7 +7,7 @@ Smarty is a template engine for PHP, facilitating the separation of presentation
 Read the [documentation](https://smarty-php.github.io/smarty/) to find out how to use it. 
 
 ## Requirements
-Smarty can be run with PHP 7.1 to PHP 8.2.
+Smarty v5 can be run with PHP 7.2 to PHP 8.4.
 
 ## Installation
 Smarty versions 3.1.11 or later can be installed with [Composer](https://getcomposer.org/).
@@ -18,3 +18,11 @@ composer require smarty/smarty
 ````
 
 More in the [Getting Started](./docs/getting-started.md) section of the docs.
+
+## Sponsors
+
+Smarty is sponsored by:
+- Marc Laporte [@marclaporte](https://github.com/marclaporte)
+- [Temma](https://github.com/Digicreon/Temma), the MVC framework based on Smarty
+
+Thank you!
\ No newline at end of file
diff --git a/include/smarty/SECURITY.md b/include/smarty/SECURITY.md
index 80b5ef5c8..9685c254f 100644
--- a/include/smarty/SECURITY.md
+++ b/include/smarty/SECURITY.md
@@ -2,13 +2,13 @@
 
 ## Supported Versions
 
-Smarty currently supports the latest minor version of Smarty 3 and Smarty 4.
+Smarty currently supports the latest minor version of Smarty 4 and Smarty 5.
 
 | Version | Supported          |
 |---------|--------------------|
+| 5.0.x   | :white_check_mark: |
 | 4.3.x   | :white_check_mark: |
-| 3.1.x   | :white_check_mark: |
-| < 3.1   | :x:                |
+| < 4.3   | :x:                |
 
 ## Reporting a Vulnerability
 
diff --git a/include/smarty/libs/Autoloader.php b/include/smarty/libs/Autoloader.php
deleted file mode 100644
index da7e32abf..000000000
--- a/include/smarty/libs/Autoloader.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Smarty Autoloader
- *
- * @package Smarty
- */
-
-
-if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
-	include __DIR__ . '/functions.php';
-}
-
-/**
- * Smarty Autoloader
- *
- * @package Smarty
- * @author  Uwe Tews
- *             Usage:
- *                  require_once '...path/Autoloader.php';
- *                  Smarty_Autoloader::register();
- *             or
- *                  include '...path/bootstrap.php';
- *
- *                  $smarty = new Smarty();
- */
-class Smarty_Autoloader
-{
-    /**
-     * Filepath to Smarty root
-     *
-     * @var string
-     */
-    public static $SMARTY_DIR = null;
-
-    /**
-     * Filepath to Smarty internal plugins
-     *
-     * @var string
-     */
-    public static $SMARTY_SYSPLUGINS_DIR = null;
-
-    /**
-     * Array with Smarty core classes and their filename
-     *
-     * @var array
-     */
-    public static $rootClasses = array('smarty' => 'Smarty.class.php');
-
-    /**
-     * Registers Smarty_Autoloader backward compatible to older installations.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not.
-     */
-    public static function registerBC($prepend = false)
-    {
-        /**
-         * register the class autoloader
-         */
-        if (!defined('SMARTY_SPL_AUTOLOAD')) {
-            define('SMARTY_SPL_AUTOLOAD', 0);
-        }
-        if (SMARTY_SPL_AUTOLOAD
-            && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false
-        ) {
-            $registeredAutoLoadFunctions = spl_autoload_functions();
-            if (!isset($registeredAutoLoadFunctions[ 'spl_autoload' ])) {
-                spl_autoload_register();
-            }
-        } else {
-            self::register($prepend);
-        }
-    }
-
-    /**
-     * Registers Smarty_Autoloader as an SPL autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not.
-     */
-    public static function register($prepend = false)
-    {
-        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : __DIR__ . 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);
-    }
-
-    /**
-     * Handles auto loading of classes.
-     *
-     * @param string $class A class name.
-     */
-    public static function autoload($class)
-    {
-        if ($class[ 0 ] !== 'S' || strpos($class, 'Smarty') !== 0) {
-            return;
-        }
-        $_class = smarty_strtolower_ascii($class);
-        if (isset(self::$rootClasses[ $_class ])) {
-            $file = self::$SMARTY_DIR . self::$rootClasses[ $_class ];
-            if (is_file($file)) {
-                include $file;
-            }
-        } else {
-            $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-            if (is_file($file)) {
-                include $file;
-            }
-        }
-        return;
-    }
-}
diff --git a/include/smarty/libs/Smarty.class.php b/include/smarty/libs/Smarty.class.php
index 81dc6ab52..459fe2cfb 100644
--- a/include/smarty/libs/Smarty.class.php
+++ b/include/smarty/libs/Smarty.class.php
@@ -1,1405 +1,42 @@
 <?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        Smarty.class.php
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License 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      https://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
- */
-/**
- * set SMARTY_DIR to absolute path to Smarty library files.
- * Sets SMARTY_DIR only if user application has not already defined it.
- */
-if (!defined('SMARTY_DIR')) {
-    /**
-     *
-     */
-    define('SMARTY_DIR', __DIR__ . DIRECTORY_SEPARATOR);
-}
-/**
- * set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
- * Sets SMARTY_SYSPLUGINS_DIR only if user application has not already defined it.
- */
-if (!defined('SMARTY_SYSPLUGINS_DIR')) {
-    /**
-     *
-     */
-    define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR);
-}
-if (!defined('SMARTY_PLUGINS_DIR')) {
-    /**
-     *
-     */
-    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DIRECTORY_SEPARATOR);
-}
-if (!defined('SMARTY_MBSTRING')) {
-    /**
-     *
-     */
-    define('SMARTY_MBSTRING', function_exists('mb_get_info'));
-}
 
-/**
- * Load helper functions
- */
-if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
-    include __DIR__ . '/functions.php';
-}
-
-/**
- * Load Smarty_Autoloader
- */
-if (!class_exists('Smarty_Autoloader')) {
-    include __DIR__ . '/bootstrap.php';
-}
-
-/**
- * Load always needed external class files
- */
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_extension_handler.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_variable.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_source.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_resource_base.php';
-require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_resource_file.php';
-
-/**
- * This is the main Smarty class
- *
- * @package Smarty
- *
- * The following methods will be dynamically loaded by the extension handler when they are called.
- * They are located in a corresponding Smarty_Internal_Method_xxxx class
- *
- * @method int clearAllCache(int $exp_time = null, string $type = null)
- * @method int clearCache(string $template_name, string $cache_id = null, string $compile_id = null, int $exp_time = null, string $type = null)
- * @method int compileAllTemplates(string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, $max_errors = null)
- * @method int compileAllConfig(string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, $max_errors = null)
- * @method int clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
- */
-class Smarty extends Smarty_Internal_TemplateBase
-{
-    /**
-     * smarty version
-     */
-    const SMARTY_VERSION = '4.3.1';
-    /**
-     * define variable scopes
-     */
-    const SCOPE_LOCAL    = 1;
-    const SCOPE_PARENT   = 2;
-    const SCOPE_TPL_ROOT = 4;
-    const SCOPE_ROOT     = 8;
-    const SCOPE_SMARTY   = 16;
-    const SCOPE_GLOBAL   = 32;
-    /**
-     * define caching modes
-     */
-    const CACHING_OFF              = 0;
-    const CACHING_LIFETIME_CURRENT = 1;
-    const CACHING_LIFETIME_SAVED   = 2;
-    /**
-     * define constant for clearing cache files be saved expiration dates
-     */
-    const CLEAR_EXPIRED = -1;
-    /**
-     * define compile check modes
-     */
-    const COMPILECHECK_OFF       = 0;
-    const COMPILECHECK_ON        = 1;
-    const COMPILECHECK_CACHEMISS = 2;
-    /**
-     * define debug modes
-     */
-    const DEBUG_OFF        = 0;
-    const DEBUG_ON         = 1;
-    const DEBUG_INDIVIDUAL = 2;
-
-    /**
-     * filter types
-     */
-    const FILTER_POST     = 'post';
-    const FILTER_PRE      = 'pre';
-    const FILTER_OUTPUT   = 'output';
-    const FILTER_VARIABLE = 'variable';
-    /**
-     * plugin types
-     */
-    const PLUGIN_FUNCTION         = 'function';
-    const PLUGIN_BLOCK            = 'block';
-    const PLUGIN_COMPILER         = 'compiler';
-    const PLUGIN_MODIFIER         = 'modifier';
-    const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
-
-    /**
-     * assigned global tpl vars
-     */
-    public static $global_tpl_vars = array();
-
-    /**
-     * Flag denoting if Multibyte String functions are available
-     */
-    public static $_MBSTRING = SMARTY_MBSTRING;
-
-    /**
-     * The character set to adhere to (e.g. "UTF-8")
-     */
-    public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
-
-    /**
-     * The date format to be used internally
-     * (accepts date() and strftime())
-     */
-    public static $_DATE_FORMAT = '%b %e, %Y';
-
-    /**
-     * Flag denoting if PCRE should run in UTF-8 mode
-     */
-    public static $_UTF8_MODIFIER = 'u';
-
-    /**
-     * Flag denoting if operating system is windows
-     */
-    public static $_IS_WINDOWS = false;
-
-    /**
-     * auto literal on delimiters with whitespace
-     *
-     * @var boolean
-     */
-    public $auto_literal = true;
-
-    /**
-     * display error on not assigned variables
-     *
-     * @var boolean
-     */
-    public $error_unassigned = false;
-
-    /**
-     * look up relative file path in include_path
-     *
-     * @var boolean
-     */
-    public $use_include_path = false;
-
-    /**
-     * flag if template_dir is normalized
-     *
-     * @var bool
-     */
-    public $_templateDirNormalized = false;
-
-    /**
-     * joined template directory string used in cache keys
-     *
-     * @var string
-     */
-    public $_joined_template_dir = null;
-
-    /**
-     * flag if config_dir is normalized
-     *
-     * @var bool
-     */
-    public $_configDirNormalized = false;
-
-    /**
-     * joined config directory string used in cache keys
-     *
-     * @var string
-     */
-    public $_joined_config_dir = null;
-
-    /**
-     * default template handler
-     *
-     * @var callable
-     */
-    public $default_template_handler_func = null;
-
-    /**
-     * default config handler
-     *
-     * @var callable
-     */
-    public $default_config_handler_func = null;
-
-    /**
-     * default plugin handler
-     *
-     * @var callable
-     */
-    public $default_plugin_handler_func = null;
-
-    /**
-     * flag if template_dir is normalized
-     *
-     * @var bool
-     */
-    public $_compileDirNormalized = false;
-
-    /**
-     * flag if plugins_dir is normalized
-     *
-     * @var bool
-     */
-    public $_pluginsDirNormalized = false;
-
-    /**
-     * flag if template_dir is normalized
-     *
-     * @var bool
-     */
-    public $_cacheDirNormalized = false;
-
-    /**
-     * force template compiling?
-     *
-     * @var boolean
-     */
-    public $force_compile = false;
-
-    /**
-     * use sub dirs for compiled/cached files?
-     *
-     * @var boolean
-     */
-    public $use_sub_dirs = false;
-
-    /**
-     * allow ambiguous resources (that are made unique by the resource handler)
-     *
-     * @var boolean
-     */
-    public $allow_ambiguous_resources = false;
-
-    /**
-     * merge compiled includes
-     *
-     * @var boolean
-     */
-    public $merge_compiled_includes = false;
-
-    /*
-    * flag for behaviour when extends: resource  and {extends} tag are used simultaneous
-    *   if false disable execution of {extends} in templates called by extends resource.
-    *   (behaviour as versions < 3.1.28)
-    *
-    * @var boolean
-    */
-    public $extends_recursion = true;
-
-    /**
-     * force cache file creation
-     *
-     * @var boolean
-     */
-    public $force_cache = false;
-
-    /**
-     * template left-delimiter
-     *
-     * @var string
-     */
-    public $left_delimiter = "{";
-
-    /**
-     * template right-delimiter
-     *
-     * @var string
-     */
-    public $right_delimiter = "}";
-
-    /**
-     * array of strings which shall be treated as literal by compiler
-     *
-     * @var array string
-     */
-    public $literals = array();
-
-    /**
-     * class name
-     * This should be instance of Smarty_Security.
-     *
-     * @var string
-     * @see Smarty_Security
-     */
-    public $security_class = 'Smarty_Security';
-
-    /**
-     * implementation of security class
-     *
-     * @var Smarty_Security
-     */
-    public $security_policy = null;
-
-    /**
-     * controls if the php template file resource is allowed
-     *
-     * @var bool
-     */
-    public $allow_php_templates = false;
-
-    /**
-     * debug mode
-     * Setting this to true enables the debug-console.
-     *
-     * @var boolean
-     */
-    public $debugging = false;
-
-    /**
-     * This determines if debugging is enable-able from the browser.
-     * <ul>
-     *  <li>NONE => no debugging control allowed</li>
-     *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
-     * </ul>
-     *
-     * @var string
-     */
-    public $debugging_ctrl = 'NONE';
-
-    /**
-     * Name of debugging URL-param.
-     * Only used when $debugging_ctrl is set to 'URL'.
-     * The name of the URL-parameter that activates debugging.
-     *
-     * @var string
-     */
-    public $smarty_debug_id = 'SMARTY_DEBUG';
-
-    /**
-     * Path of debug template.
-     *
-     * @var string
-     */
-    public $debug_tpl = null;
-
-    /**
-     * When set, smarty uses this value as error_reporting-level.
-     *
-     * @var int
-     */
-    public $error_reporting = null;
-
-    /**
-     * Controls whether variables with the same name overwrite each other.
-     *
-     * @var boolean
-     */
-    public $config_overwrite = true;
-
-    /**
-     * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
-     *
-     * @var boolean
-     */
-    public $config_booleanize = true;
-
-    /**
-     * Controls whether hidden config sections/vars are read from the file.
-     *
-     * @var boolean
-     */
-    public $config_read_hidden = false;
-
-    /**
-     * locking concurrent compiles
-     *
-     * @var boolean
-     */
-    public $compile_locking = true;
-
-    /**
-     * Controls whether cache resources should use locking mechanism
-     *
-     * @var boolean
-     */
-    public $cache_locking = false;
-
-    /**
-     * seconds to wait for acquiring a lock before ignoring the write lock
-     *
-     * @var float
-     */
-    public $locking_timeout = 10;
-
-    /**
-     * resource type used if none given
-     * Must be an valid key of $registered_resources.
-     *
-     * @var string
-     */
-    public $default_resource_type = 'file';
-
-    /**
-     * caching type
-     * Must be an element of $cache_resource_types.
-     *
-     * @var string
-     */
-    public $caching_type = 'file';
-
-    /**
-     * config type
-     *
-     * @var string
-     */
-    public $default_config_type = 'file';
-
-    /**
-     * check If-Modified-Since headers
-     *
-     * @var boolean
-     */
-    public $cache_modified_check = false;
-
-    /**
-     * registered plugins
-     *
-     * @var array
-     */
-    public $registered_plugins = array();
-
-    /**
-     * registered objects
-     *
-     * @var array
-     */
-    public $registered_objects = array();
-
-    /**
-     * registered classes
-     *
-     * @var array
-     */
-    public $registered_classes = array();
-
-    /**
-     * registered filters
-     *
-     * @var array
-     */
-    public $registered_filters = array();
-
-    /**
-     * registered resources
-     *
-     * @var array
-     */
-    public $registered_resources = array();
-
-    /**
-     * registered cache resources
-     *
-     * @var array
-     */
-    public $registered_cache_resources = array();
-
-    /**
-     * autoload filter
-     *
-     * @var array
-     */
-    public $autoload_filters = array();
-
-    /**
-     * default modifier
-     *
-     * @var array
-     */
-    public $default_modifiers = array();
-
-    /**
-     * autoescape variable output
-     *
-     * @var boolean
-     */
-    public $escape_html = false;
-
-    /**
-     * start time for execution time calculation
-     *
-     * @var int
-     */
-    public $start_time = 0;
-
-    /**
-     * required by the compiler for BC
-     *
-     * @var string
-     */
-    public $_current_file = null;
-
-    /**
-     * internal flag to enable parser debugging
-     *
-     * @var bool
-     */
-    public $_parserdebug = false;
-
-    /**
-     * This object type (Smarty = 1, template = 2, data = 4)
-     *
-     * @var int
-     */
-    public $_objType = 1;
-
-    /**
-     * Debug object
-     *
-     * @var Smarty_Internal_Debug
-     */
-    public $_debug = null;
-
-    /**
-     * template directory
-     *
-     * @var array
-     */
-    protected $template_dir = array('./templates/');
-
-    /**
-     * flags for normalized template directory entries
-     *
-     * @var array
-     */
-    protected $_processedTemplateDir = array();
-
-    /**
-     * config directory
-     *
-     * @var array
-     */
-    protected $config_dir = array('./configs/');
-
-    /**
-     * flags for normalized template directory entries
-     *
-     * @var array
-     */
-    protected $_processedConfigDir = array();
-
-    /**
-     * compile directory
-     *
-     * @var string
-     */
-    protected $compile_dir = './templates_c/';
-
-    /**
-     * plugins directory
-     *
-     * @var array
-     */
-    protected $plugins_dir = array();
-
-    /**
-     * cache directory
-     *
-     * @var string
-     */
-    protected $cache_dir = './cache/';
-
-    /**
-     * removed properties
-     *
-     * @var string[]
-     */
-    protected $obsoleteProperties = array(
-        'resource_caching', 'template_resource_caching', 'direct_access_security',
-        '_dir_perms', '_file_perms', 'plugin_search_order',
-        'inheritance_merge_compiled_includes', 'resource_cache_mode',
-    );
-
-    /**
-     * List of private properties which will call getter/setter on a direct access
-     *
-     * @var string[]
-     */
-    protected $accessMap = array(
-        'template_dir' => 'TemplateDir', 'config_dir' => 'ConfigDir',
-        'plugins_dir'  => 'PluginsDir', 'compile_dir' => 'CompileDir',
-        'cache_dir'    => 'CacheDir',
-    );
-
-    /**
-     * PHP7 Compatibility mode
-     * @var bool
-     */
-    private $isMutingUndefinedOrNullWarnings = false;
-
-    /**
-     * Initialize new Smarty object
-     */
-    public function __construct()
-    {
-        $this->_clearTemplateCache();
-        parent::__construct();
-        if (is_callable('mb_internal_encoding')) {
-            mb_internal_encoding(Smarty::$_CHARSET);
-        }
-        $this->start_time = microtime(true);
-        if (isset($_SERVER[ 'SCRIPT_NAME' ])) {
-            Smarty::$global_tpl_vars[ 'SCRIPT_NAME' ] = new Smarty_Variable($_SERVER[ 'SCRIPT_NAME' ]);
-        }
-        // Check if we're running on windows
-        Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-        // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
-        if (Smarty::$_CHARSET !== 'UTF-8') {
-            Smarty::$_UTF8_MODIFIER = '';
-        }
-    }
-
-    /**
-     * Check if a template resource exists
-     *
-     * @param string $resource_name template name
-     *
-     * @return bool status
-     * @throws \SmartyException
-     */
-    public function templateExists($resource_name)
-    {
-        // create source object
-        $source = Smarty_Template_Source::load(null, $this, $resource_name);
-        return $source->exists;
-    }
-
-    /**
-     * Loads security class and enables security
-     *
-     * @param string|Smarty_Security $security_class if a string is used, it must be class-name
-     *
-     * @return Smarty                 current Smarty instance for chaining
-     * @throws \SmartyException
-     */
-    public function enableSecurity($security_class = null)
-    {
-        Smarty_Security::enableSecurity($this, $security_class);
-        return $this;
-    }
-
-    /**
-     * Disable security
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function disableSecurity()
-    {
-        $this->security_policy = null;
-        return $this;
-    }
-
-    /**
-     * Add template directory(s)
-     *
-     * @param string|array $template_dir directory(s) of template sources
-     * @param string       $key          of the array element to assign the template dir to
-     * @param bool         $isConfig     true for config_dir
-     *
-     * @return Smarty          current Smarty instance for chaining
-     */
-    public function addTemplateDir($template_dir, $key = null, $isConfig = false)
-    {
-        if ($isConfig) {
-            $processed = &$this->_processedConfigDir;
-            $dir = &$this->config_dir;
-            $this->_configDirNormalized = false;
-        } else {
-            $processed = &$this->_processedTemplateDir;
-            $dir = &$this->template_dir;
-            $this->_templateDirNormalized = false;
-        }
-        if (is_array($template_dir)) {
-            foreach ($template_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $dir[] = $v;
-                } else {
-                    // string indexes are overridden
-                    $dir[ $k ] = $v;
-                    unset($processed[ $key ]);
-                }
-            }
-        } else {
-            if ($key !== null) {
-                // override directory at specified index
-                $dir[ $key ] = $template_dir;
-                unset($processed[ $key ]);
-            } else {
-                // append new directory
-                $dir[] = $template_dir;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Get template directories
-     *
-     * @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
-     */
-    public function getTemplateDir($index = null, $isConfig = false)
-    {
-        if ($isConfig) {
-            $dir = &$this->config_dir;
-        } else {
-            $dir = &$this->template_dir;
-        }
-        if ($isConfig ? !$this->_configDirNormalized : !$this->_templateDirNormalized) {
-            $this->_normalizeTemplateConfig($isConfig);
-        }
-        if ($index !== null) {
-            return isset($dir[ $index ]) ? $dir[ $index ] : null;
-        }
-        return $dir;
-    }
-
-    /**
-     * Set template directory
-     *
-     * @param string|array $template_dir directory(s) of template sources
-     * @param bool         $isConfig     true for config_dir
-     *
-     * @return \Smarty current Smarty instance for chaining
-     */
-    public function setTemplateDir($template_dir, $isConfig = false)
-    {
-        if ($isConfig) {
-            $this->config_dir = array();
-            $this->_processedConfigDir = array();
-        } else {
-            $this->template_dir = array();
-            $this->_processedTemplateDir = array();
-        }
-        $this->addTemplateDir($template_dir, null, $isConfig);
-        return $this;
-    }
-
-    /**
-     * Add config directory(s)
-     *
-     * @param string|array $config_dir directory(s) of config sources
-     * @param mixed        $key        key of the array element to assign the config dir to
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addConfigDir($config_dir, $key = null)
-    {
-        return $this->addTemplateDir($config_dir, $key, true);
-    }
-
-    /**
-     * Get config directory
-     *
-     * @param mixed $index index of directory to get, null to get all
-     *
-     * @return array configuration directory
-     */
-    public function getConfigDir($index = null)
-    {
-        return $this->getTemplateDir($index, true);
-    }
-
-    /**
-     * Set config directory
-     *
-     * @param $config_dir
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setConfigDir($config_dir)
-    {
-        return $this->setTemplateDir($config_dir, true);
-    }
-
-    /**
-     * Adds directory of plugin files
-     *
-     * @param null|array|string $plugins_dir
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addPluginsDir($plugins_dir)
-    {
-        if (empty($this->plugins_dir)) {
-            $this->plugins_dir[] = SMARTY_PLUGINS_DIR;
-        }
-        $this->plugins_dir = array_merge($this->plugins_dir, (array)$plugins_dir);
-        $this->_pluginsDirNormalized = false;
-        return $this;
-    }
-
-    /**
-     * Get plugin directories
-     *
-     * @return array list of plugin directories
-     */
-    public function getPluginsDir()
-    {
-        if (empty($this->plugins_dir)) {
-            $this->plugins_dir[] = SMARTY_PLUGINS_DIR;
-            $this->_pluginsDirNormalized = false;
-        }
-        if (!$this->_pluginsDirNormalized) {
-            if (!is_array($this->plugins_dir)) {
-                $this->plugins_dir = (array)$this->plugins_dir;
-            }
-            foreach ($this->plugins_dir as $k => $v) {
-                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v ?? '', '/\\') . DIRECTORY_SEPARATOR, true);
-            }
-            $this->_cache[ 'plugin_files' ] = array();
-            $this->_pluginsDirNormalized = true;
-        }
-        return $this->plugins_dir;
-    }
-
-    /**
-     * Set plugins directory
-     *
-     * @param string|array $plugins_dir directory(s) of plugins
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setPluginsDir($plugins_dir)
-    {
-        $this->plugins_dir = (array)$plugins_dir;
-        $this->_pluginsDirNormalized = false;
-        return $this;
-    }
-
-    /**
-     * Get compiled directory
-     *
-     * @return string path to compiled templates
-     */
-    public function getCompileDir()
-    {
-        if (!$this->_compileDirNormalized) {
-            $this->_normalizeDir('compile_dir', $this->compile_dir);
-            $this->_compileDirNormalized = true;
-        }
-        return $this->compile_dir;
-    }
-
-    /**
-     *
-     * @param  string $compile_dir directory to store compiled templates in
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setCompileDir($compile_dir)
-    {
-        $this->_normalizeDir('compile_dir', $compile_dir);
-        $this->_compileDirNormalized = true;
-        return $this;
-    }
-
-    /**
-     * Get cache directory
-     *
-     * @return string path of cache directory
-     */
-    public function getCacheDir()
-    {
-        if (!$this->_cacheDirNormalized) {
-            $this->_normalizeDir('cache_dir', $this->cache_dir);
-            $this->_cacheDirNormalized = true;
-        }
-        return $this->cache_dir;
-    }
-
-    /**
-     * Set cache directory
-     *
-     * @param string $cache_dir directory to store cached templates in
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setCacheDir($cache_dir)
-    {
-        $this->_normalizeDir('cache_dir', $cache_dir);
-        $this->_cacheDirNormalized = true;
-        return $this;
-    }
-
-    /**
-     * creates a template object
-     *
-     * @param string  $template   the resource handle of the template file
-     * @param mixed   $cache_id   cache id to be used with this template
-     * @param mixed   $compile_id compile id to be used with this template
-     * @param object  $parent     next higher level of Smarty variables
-     * @param boolean $do_clone   flag is Smarty object shall be cloned
-     *
-     * @return \Smarty_Internal_Template template object
-     * @throws \SmartyException
-     */
-    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
-    {
-        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if ($parent !== null && is_array($parent)) {
-            $data = $parent;
-            $parent = null;
-        } else {
-            $data = null;
-        }
-        if (!$this->_templateDirNormalized) {
-            $this->_normalizeTemplateConfig(false);
-        }
-        $_templateId = $this->_getTemplateId($template, $cache_id, $compile_id);
-        $tpl = null;
-        if ($this->caching && isset(Smarty_Internal_Template::$isCacheTplObj[ $_templateId ])) {
-            $tpl = $do_clone ? clone Smarty_Internal_Template::$isCacheTplObj[ $_templateId ] :
-                Smarty_Internal_Template::$isCacheTplObj[ $_templateId ];
-            $tpl->inheritance = null;
-            $tpl->tpl_vars = $tpl->config_vars = array();
-        } elseif (!$do_clone && isset(Smarty_Internal_Template::$tplObjCache[ $_templateId ])) {
-            $tpl = clone Smarty_Internal_Template::$tplObjCache[ $_templateId ];
-            $tpl->inheritance = null;
-            $tpl->tpl_vars = $tpl->config_vars = array();
-        } else {
-            /* @var Smarty_Internal_Template $tpl */
-            $tpl = new $this->template_class($template, $this, null, $cache_id, $compile_id, null, null);
-            $tpl->templateId = $_templateId;
-        }
-        if ($do_clone) {
-            $tpl->smarty = clone $tpl->smarty;
-        }
-        $tpl->parent = $parent ? $parent : $this;
-        // fill data if present
-        if (!empty($data) && is_array($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val);
-            }
-        }
-        if ($this->debugging || $this->debugging_ctrl === 'URL') {
-            $tpl->smarty->_debug = new Smarty_Internal_Debug();
-            // check URL debugging control
-            if (!$this->debugging && $this->debugging_ctrl === 'URL') {
-                $tpl->smarty->_debug->debugUrl($tpl->smarty);
-            }
-        }
-        return $tpl;
-    }
-
-    /**
-     * Takes unknown classes and loads plugin files for them
-     * class name format: Smarty_PluginType_PluginName
-     * plugin filename format: plugintype.pluginname.php
-     *
-     * @param string $plugin_name class plugin name to load
-     * @param bool   $check       check if already loaded
-     *
-     * @return string |boolean filepath of loaded file or false
-     * @throws \SmartyException
-     */
-    public function loadPlugin($plugin_name, $check = true)
-    {
-        return $this->ext->loadPlugin->loadPlugin($this, $plugin_name, $check);
-    }
-
-    /**
-     * Get unique template id
-     *
-     * @param string                    $template_name
-     * @param null|mixed                $cache_id
-     * @param null|mixed                $compile_id
-     * @param null                      $caching
-     * @param \Smarty_Internal_Template $template
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function _getTemplateId(
-        $template_name,
-        $cache_id = null,
-        $compile_id = null,
-        $caching = null,
-        Smarty_Internal_Template $template = null
-    ) {
-        $template_name = (strpos($template_name, ':') === false) ? "{$this->default_resource_type}:{$template_name}" :
-            $template_name;
-        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
-        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
-        $caching = (int)($caching === null ? $this->caching : $caching);
-        if ((isset($template) && strpos($template_name, ':.') !== false) || $this->allow_ambiguous_resources) {
-            $_templateId =
-                Smarty_Resource::getUniqueTemplateName((isset($template) ? $template : $this), $template_name) .
-                "#{$cache_id}#{$compile_id}#{$caching}";
-        } else {
-            $_templateId = $this->_joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}#{$caching}";
-        }
-        if (isset($_templateId[ 150 ])) {
-            $_templateId = sha1($_templateId);
-        }
-        return $_templateId;
-    }
-
-    /**
-     * Normalize path
-     *  - remove /./ and /../
-     *  - make it absolute if required
-     *
-     * @param string $path     file path
-     * @param bool   $realpath if true - convert to absolute
-     *                         false - convert to relative
-     *                         null - keep as it is but
-     *                         remove /./ /../
-     *
-     * @return string
-     */
-    public function _realpath($path, $realpath = null)
-    {
-        $nds = array('/' => '\\', '\\' => '/');
-        preg_match(
-            '%^(?<root>(?:[[:alpha:]]:[\\\\/]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(.*))$%u',
-            $path,
-            $parts
-        );
-        $path = $parts[ 'path' ];
-        if ($parts[ 'root' ] === '\\') {
-            $parts[ 'root' ] = substr(getcwd(), 0, 2) . $parts[ 'root' ];
-        } else {
-            if ($realpath !== null && !$parts[ 'root' ]) {
-                $path = getcwd() . DIRECTORY_SEPARATOR . $path;
-            }
-        }
-        // normalize DIRECTORY_SEPARATOR
-        $path = str_replace($nds[ DIRECTORY_SEPARATOR ], DIRECTORY_SEPARATOR, $path);
-        $parts[ 'root' ] = str_replace($nds[ DIRECTORY_SEPARATOR ], DIRECTORY_SEPARATOR, $parts[ 'root' ]);
-        do {
-            $path = preg_replace(
-                array('#[\\\\/]{2}#', '#[\\\\/][.][\\\\/]#', '#[\\\\/]([^\\\\/.]+)[\\\\/][.][.][\\\\/]#'),
-                DIRECTORY_SEPARATOR,
-                $path,
-                -1,
-                $count
-            );
-        } while ($count > 0);
-        return $realpath !== false ? $parts[ 'root' ] . $path : str_ireplace(getcwd(), '.', $parts[ 'root' ] . $path);
-    }
-
-    /**
-     * Empty template objects cache
-     */
-    public function _clearTemplateCache()
-    {
-        Smarty_Internal_Template::$isCacheTplObj = array();
-        Smarty_Internal_Template::$tplObjCache = array();
-    }
-
-    /**
-     * @param boolean $use_sub_dirs
-     */
-    public function setUseSubDirs($use_sub_dirs)
-    {
-        $this->use_sub_dirs = $use_sub_dirs;
-    }
-
-    /**
-     * @param int $error_reporting
-     */
-    public function setErrorReporting($error_reporting)
-    {
-        $this->error_reporting = $error_reporting;
-    }
-
-    /**
-     * @param boolean $escape_html
-     */
-    public function setEscapeHtml($escape_html)
-    {
-        $this->escape_html = $escape_html;
-    }
-
-    /**
-     * Return auto_literal flag
-     *
-     * @return boolean
-     */
-    public function getAutoLiteral()
-    {
-        return $this->auto_literal;
-    }
-
-    /**
-     * Set auto_literal flag
-     *
-     * @param boolean $auto_literal
-     */
-    public function setAutoLiteral($auto_literal = true)
-    {
-        $this->auto_literal = $auto_literal;
-    }
-
-    /**
-     * @param boolean $force_compile
-     */
-    public function setForceCompile($force_compile)
-    {
-        $this->force_compile = $force_compile;
-    }
-
-    /**
-     * @param boolean $merge_compiled_includes
-     */
-    public function setMergeCompiledIncludes($merge_compiled_includes)
-    {
-        $this->merge_compiled_includes = $merge_compiled_includes;
-    }
-
-    /**
-     * Get left delimiter
-     *
-     * @return string
-     */
-    public function getLeftDelimiter()
-    {
-        return $this->left_delimiter;
-    }
-
-    /**
-     * Set left delimiter
-     *
-     * @param string $left_delimiter
-     */
-    public function setLeftDelimiter($left_delimiter)
-    {
-        $this->left_delimiter = $left_delimiter;
-    }
-
-    /**
-     * Get right delimiter
-     *
-     * @return string $right_delimiter
-     */
-    public function getRightDelimiter()
-    {
-        return $this->right_delimiter;
-    }
-
-    /**
-     * Set right delimiter
-     *
-     * @param string
-     */
-    public function setRightDelimiter($right_delimiter)
-    {
-        $this->right_delimiter = $right_delimiter;
-    }
-
-    /**
-     * @param boolean $debugging
-     */
-    public function setDebugging($debugging)
-    {
-        $this->debugging = $debugging;
-    }
-
-    /**
-     * @param boolean $config_overwrite
-     */
-    public function setConfigOverwrite($config_overwrite)
-    {
-        $this->config_overwrite = $config_overwrite;
-    }
-
-    /**
-     * @param boolean $config_booleanize
-     */
-    public function setConfigBooleanize($config_booleanize)
-    {
-        $this->config_booleanize = $config_booleanize;
-    }
-
-    /**
-     * @param boolean $config_read_hidden
-     */
-    public function setConfigReadHidden($config_read_hidden)
-    {
-        $this->config_read_hidden = $config_read_hidden;
-    }
-
-    /**
-     * @param boolean $compile_locking
-     */
-    public function setCompileLocking($compile_locking)
-    {
-        $this->compile_locking = $compile_locking;
-    }
-
-    /**
-     * @param string $default_resource_type
-     */
-    public function setDefaultResourceType($default_resource_type)
-    {
-        $this->default_resource_type = $default_resource_type;
-    }
-
-    /**
-     * @param string $caching_type
-     */
-    public function setCachingType($caching_type)
-    {
-        $this->caching_type = $caching_type;
-    }
-
-    /**
-     * Test install
-     *
-     * @param null $errors
-     */
-    public function testInstall(&$errors = null)
-    {
-        Smarty_Internal_TestInstall::testInstall($this, $errors);
-    }
-
-    /**
-     * Get Smarty object
-     *
-     * @return Smarty
-     */
-    public function _getSmartyObj()
-    {
-        return $this;
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     * Calls the appropriate getter function.
-     * Issues an E_USER_NOTICE if no valid getter is found.
-     *
-     * @param string $name property name
-     *
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (isset($this->accessMap[ $name ])) {
-            $method = 'get' . $this->accessMap[ $name ];
-            return $this->{$method}();
-        } elseif (isset($this->_cache[ $name ])) {
-            return $this->_cache[ $name ];
-        } elseif (in_array($name, $this->obsoleteProperties)) {
-            return null;
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-        }
-        return null;
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     * Calls the appropriate setter function.
-     * Issues an E_USER_NOTICE if no valid setter is found.
-     *
-     * @param string $name  property name
-     * @param mixed  $value parameter passed to setter
-     *
-     */
-    public function __set($name, $value)
-    {
-        if (isset($this->accessMap[ $name ])) {
-            $method = 'set' . $this->accessMap[ $name ];
-            $this->{$method}($value);
-        } elseif (in_array($name, $this->obsoleteProperties)) {
-            return;
-        } elseif (is_object($value) && method_exists($value, $name)) {
-            $this->$name = $value;
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-        }
-    }
-
-    /**
-     * Normalize and set directory string
-     *
-     * @param string $dirName cache_dir or compile_dir
-     * @param string $dir     filepath of folder
-     */
-    private function _normalizeDir($dirName, $dir)
-    {
-        $this->{$dirName} = $this->_realpath(rtrim($dir ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
-    }
-
-    /**
-     * Normalize template_dir or config_dir
-     *
-     * @param bool $isConfig true for config_dir
-     */
-    private function _normalizeTemplateConfig($isConfig)
-    {
-        if ($isConfig) {
-            $processed = &$this->_processedConfigDir;
-            $dir = &$this->config_dir;
-        } else {
-            $processed = &$this->_processedTemplateDir;
-            $dir = &$this->template_dir;
-        }
-        if (!is_array($dir)) {
-            $dir = (array)$dir;
-        }
-        foreach ($dir as $k => $v) {
-            if (!isset($processed[ $k ])) {
-                $dir[ $k ] = $v = $this->_realpath(rtrim($v ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
-                $processed[ $k ] = true;
-            }
-        }
-        $isConfig ? $this->_configDirNormalized = true : $this->_templateDirNormalized = true;
-        $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
-            $this->_joined_template_dir = join('#', $this->template_dir);
-    }
-
-    /**
-     * Mutes errors for "undefined index", "undefined array key" and "trying to read property of null".
-     *
-     * @void
-     */
-    public function muteUndefinedOrNullWarnings(): void {
-        $this->isMutingUndefinedOrNullWarnings = true;
-    }
-
-    /**
-     * Indicates if Smarty will mute errors for "undefined index", "undefined array key" and "trying to read property of null".
-     * @bool
-     */
-    public function isMutingUndefinedOrNullWarnings(): bool {
-        return $this->isMutingUndefinedOrNullWarnings;
-    }
-
-}
+/////////////////////////////////////////////////////////////////////
+// This is a stub PSR-4 loading script that gets all the pieces of //
+// Smarty 5.x loaded without requiring the use of composer. It's   //
+// not really a 'class' file, but the name is used so we're        //
+// backwards compatible with previous versions of Smarty.          //
+//                                                                 //
+// Example:                                                        //
+// require_once("/path/to/smarty/libs/Smarty.class.php");          //
+//                                                                 //
+// $smarty = new Smarty\Smarty;                                    //
+// $smarty->testInstall();                                         //
+/////////////////////////////////////////////////////////////////////
+
+define('__SMARTY_DIR', __DIR__ . '/../src/');
+
+// Global function declarations
+require_once(__SMARTY_DIR . "/functions.php");
+
+spl_autoload_register(function ($class) {
+	// Class prefix
+	$prefix = 'Smarty\\';
+
+	// Does the class use the namespace prefix?
+	$len = strlen($prefix);
+	if (strncmp($prefix, $class, $len) !== 0) {
+		// If not, move to the next registered autoloader
+		return;
+	}
+
+	// Hack off the prefix part
+	$relative_class = substr($class, $len);
+
+	// Build a path to the include file
+	$file = __SMARTY_DIR . str_replace('\\', '/', $relative_class) . '.php';
+
+	// If the file exists, require it
+	if (file_exists($file)) {
+		require_once($file);
+	}
+});
diff --git a/include/smarty/libs/bootstrap.php b/include/smarty/libs/bootstrap.php
deleted file mode 100644
index a226ac04e..000000000
--- a/include/smarty/libs/bootstrap.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * This file is part of the Smarty package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-/**
- * Load and register Smarty Autoloader
- */
-if (!class_exists('Smarty_Autoloader')) {
-    include __DIR__ . '/Autoloader.php';
-}
-Smarty_Autoloader::register(true);
diff --git a/include/smarty/libs/functions.php b/include/smarty/libs/functions.php
deleted file mode 100644
index bac00e521..000000000
--- a/include/smarty/libs/functions.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * This file is part of the Smarty package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-/**
- * Registers some helper/polyfill functions.
- */
-
-const SMARTY_HELPER_FUNCTIONS_LOADED = true;
-
-/**
- * Converts the first characters in $string to uppercase (A-Z) if it is an ASCII lowercase character (a-z).
- *
- * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
- *
- * @param $string
- *
- * @return string
- */
-function smarty_ucfirst_ascii($string): string {
-    return smarty_strtoupper_ascii(substr($string, 0, 1)) . substr($string, 1);
-}
-
-/**
- * Converts all uppercase ASCII characters (A-Z) in $string to lowercase (a-z).
- *
- * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
- *
- * @param $string
- *
- * @return string
- */
-function smarty_strtolower_ascii($string): string {
-    return strtr($string, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
-}
-
-/**
- * Converts all lowercase ASCII characters (a-z) in $string to uppercase (A-Z).
- *
- * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
- *
- * @param $string
- *
- * @return string
- */
-function smarty_strtoupper_ascii($string): string {
-    return strtr($string, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
-}
\ No newline at end of file
diff --git a/include/smarty/libs/plugins/block.textformat.php b/include/smarty/libs/plugins/block.textformat.php
deleted file mode 100644
index fed090e4d..000000000
--- a/include/smarty/libs/plugins/block.textformat.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Smarty plugin to format text blocks
- *
- * @package    Smarty
- * @subpackage PluginsBlock
- */
-/**
- * Smarty {textformat}{/textformat} block plugin
- * Type:     block function
- * Name:     textformat
- * Purpose:  format text a certain way with preset styles
- *           or custom wrap/indent settings
- * Params:
- *
- * - style         - string (email)
- * - indent        - integer (0)
- * - wrap          - integer (80)
- * - wrap_char     - string ("\n")
- * - indent_char   - string (" ")
- * - wrap_boundary - boolean (true)
- *
- * @link   https://www.smarty.net/manual/en/language.function.textformat.php {textformat}
- *         (Smarty online manual)
- *
- * @param array                    $params   parameters
- * @param string                   $content  contents of the block
- * @param Smarty_Internal_Template $template template object
- * @param boolean                  &$repeat  repeat flag
- *
- * @return string content re-formatted
- * @author Monte Ohrt <monte at ohrt dot com>
- * @throws \SmartyException
- */
-function smarty_block_textformat($params, $content, Smarty_Internal_Template $template, &$repeat)
-{
-    if (is_null($content)) {
-        return;
-    }
-    if (Smarty::$_MBSTRING) {
-        $template->_checkPlugins(
-            array(
-                array(
-                    'function' => 'smarty_modifier_mb_wordwrap',
-                    'file'     => SMARTY_PLUGINS_DIR . 'modifier.mb_wordwrap.php'
-                )
-            )
-        );
-    }
-    $style = null;
-    $indent = 0;
-    $indent_first = 0;
-    $indent_char = ' ';
-    $wrap = 80;
-    $wrap_char = "\n";
-    $wrap_cut = false;
-    $assign = null;
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'style':
-            case 'indent_char':
-            case 'wrap_char':
-            case 'assign':
-                $$_key = (string)$_val;
-                break;
-            case 'indent':
-            case 'indent_first':
-            case 'wrap':
-                $$_key = (int)$_val;
-                break;
-            case 'wrap_cut':
-                $$_key = (bool)$_val;
-                break;
-            default:
-                trigger_error("textformat: unknown attribute '{$_key}'");
-        }
-    }
-    if ($style === 'email') {
-        $wrap = 72;
-    }
-    // split into paragraphs
-    $_paragraphs = preg_split('![\r\n]{2}!', $content);
-    foreach ($_paragraphs as &$_paragraph) {
-        if (!$_paragraph) {
-            continue;
-        }
-        // convert mult. spaces & special chars to single space
-        $_paragraph =
-            preg_replace(
-                array(
-                    '!\s+!' . Smarty::$_UTF8_MODIFIER,
-                    '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER
-                ),
-                array(
-                    ' ',
-                    ''
-                ),
-                $_paragraph
-            );
-        // indent first line
-        if ($indent_first > 0) {
-            $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
-        }
-        // wordwrap sentences
-        if (Smarty::$_MBSTRING) {
-            $_paragraph = smarty_modifier_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
-        } else {
-            $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
-        }
-        // indent lines
-        if ($indent > 0) {
-            $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
-        }
-    }
-    $_output = implode($wrap_char . $wrap_char, $_paragraphs);
-    if ($assign) {
-        $template->assign($assign, $_output);
-    } else {
-        return $_output;
-    }
-}
diff --git a/include/smarty/libs/plugins/function.counter.php b/include/smarty/libs/plugins/function.counter.php
deleted file mode 100644
index 54795459c..000000000
--- a/include/smarty/libs/plugins/function.counter.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {counter} function plugin
- * Type:     function
- * Name:     counter
- * 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}
- *         (Smarty online manual)
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string|null
- */
-function smarty_function_counter($params, $template)
-{
-    static $counters = array();
-    $name = (isset($params[ 'name' ])) ? $params[ 'name' ] : 'default';
-    if (!isset($counters[ $name ])) {
-        $counters[ $name ] = array('start' => 1, 'skip' => 1, 'direction' => 'up', 'count' => 1);
-    }
-    $counter =& $counters[ $name ];
-    if (isset($params[ 'start' ])) {
-        $counter[ 'start' ] = $counter[ 'count' ] = (int)$params[ 'start' ];
-    }
-    if (!empty($params[ 'assign' ])) {
-        $counter[ 'assign' ] = $params[ 'assign' ];
-    }
-    if (isset($counter[ 'assign' ])) {
-        $template->assign($counter[ 'assign' ], $counter[ 'count' ]);
-    }
-    if (isset($params[ 'print' ])) {
-        $print = (bool)$params[ 'print' ];
-    } else {
-        $print = empty($counter[ 'assign' ]);
-    }
-    if ($print) {
-        $retval = $counter[ 'count' ];
-    } else {
-        $retval = null;
-    }
-    if (isset($params[ 'skip' ])) {
-        $counter[ 'skip' ] = $params[ 'skip' ];
-    }
-    if (isset($params[ 'direction' ])) {
-        $counter[ 'direction' ] = $params[ 'direction' ];
-    }
-    if ($counter[ 'direction' ] === 'down') {
-        $counter[ 'count' ] -= $counter[ 'skip' ];
-    } else {
-        $counter[ 'count' ] += $counter[ 'skip' ];
-    }
-    return $retval;
-}
diff --git a/include/smarty/libs/plugins/function.cycle.php b/include/smarty/libs/plugins/function.cycle.php
deleted file mode 100644
index 793569991..000000000
--- a/include/smarty/libs/plugins/function.cycle.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {cycle} function plugin
- * Type:     function
- * Name:     cycle
- * Date:     May 3, 2002
- * Purpose:  cycle through given values
- * Params:
- *
- * - name      - name of cycle (optional)
- * - values    - comma separated list of values to cycle, or an array of values to cycle
- *               (this can be left out for subsequent calls)
- * - reset     - boolean - resets given var to true
- * - print     - boolean - print var or not. default is true
- * - advance   - boolean - whether or not to advance the cycle
- * - delimiter - the value delimiter, default is ","
- * - assign    - boolean, assigns to template var instead of printed.
- *
- * Examples:
- *
- * {cycle values="#eeeeee,#d0d0d0d"}
- * {cycle name=row values="one,two,three" reset=true}
- * {cycle name=row}
- *
- * @link    https://www.smarty.net/manual/en/language.function.cycle.php {cycle}
- *           (Smarty online manual)
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  credit to Mark Priatel <mpriatel@rogers.com>
- * @author  credit to Gerard <gerard@interfold.com>
- * @author  credit to Jason Sweat <jsweat_php@yahoo.com>
- * @version 1.3
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string|null
- */
-function smarty_function_cycle($params, $template)
-{
-    static $cycle_vars;
-    $name = (empty($params[ 'name' ])) ? 'default' : $params[ 'name' ];
-    $print = (isset($params[ 'print' ])) ? (bool)$params[ 'print' ] : true;
-    $advance = (isset($params[ 'advance' ])) ? (bool)$params[ 'advance' ] : true;
-    $reset = (isset($params[ 'reset' ])) ? (bool)$params[ 'reset' ] : false;
-    if (!isset($params[ 'values' ])) {
-        if (!isset($cycle_vars[ $name ][ 'values' ])) {
-            trigger_error('cycle: missing \'values\' parameter');
-            return;
-        }
-    } else {
-        if (isset($cycle_vars[ $name ][ 'values' ]) && $cycle_vars[ $name ][ 'values' ] !== $params[ 'values' ]) {
-            $cycle_vars[ $name ][ 'index' ] = 0;
-        }
-        $cycle_vars[ $name ][ 'values' ] = $params[ 'values' ];
-    }
-    if (isset($params[ 'delimiter' ])) {
-        $cycle_vars[ $name ][ 'delimiter' ] = $params[ 'delimiter' ];
-    } elseif (!isset($cycle_vars[ $name ][ 'delimiter' ])) {
-        $cycle_vars[ $name ][ 'delimiter' ] = ',';
-    }
-    if (is_array($cycle_vars[ $name ][ 'values' ])) {
-        $cycle_array = $cycle_vars[ $name ][ 'values' ];
-    } else {
-        $cycle_array = explode($cycle_vars[ $name ][ 'delimiter' ], $cycle_vars[ $name ][ 'values' ]);
-    }
-    if (!isset($cycle_vars[ $name ][ 'index' ]) || $reset) {
-        $cycle_vars[ $name ][ 'index' ] = 0;
-    }
-    if (isset($params[ 'assign' ])) {
-        $print = false;
-        $template->assign($params[ 'assign' ], $cycle_array[ $cycle_vars[ $name ][ 'index' ] ]);
-    }
-    if ($print) {
-        $retval = $cycle_array[ $cycle_vars[ $name ][ 'index' ] ];
-    } else {
-        $retval = null;
-    }
-    if ($advance) {
-        if ($cycle_vars[ $name ][ 'index' ] >= count($cycle_array) - 1) {
-            $cycle_vars[ $name ][ 'index' ] = 0;
-        } else {
-            $cycle_vars[ $name ][ 'index' ]++;
-        }
-    }
-    return $retval;
-}
diff --git a/include/smarty/libs/plugins/function.fetch.php b/include/smarty/libs/plugins/function.fetch.php
deleted file mode 100644
index 4a3e88196..000000000
--- a/include/smarty/libs/plugins/function.fetch.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {fetch} plugin
- * Type:     function
- * Name:     fetch
- * Purpose:  fetch file, web or ftp data and display results
- *
- * @link   https://www.smarty.net/manual/en/language.function.fetch.php {fetch}
- *         (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @throws SmartyException
- * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
- */
-function smarty_function_fetch($params, $template)
-{
-    if (empty($params[ 'file' ])) {
-        trigger_error('[plugin] fetch parameter \'file\' cannot be empty', E_USER_NOTICE);
-        return;
-    }
-    // strip file protocol
-    if (stripos($params[ 'file' ], 'file://') === 0) {
-        $params[ 'file' ] = substr($params[ 'file' ], 7);
-    }
-    $protocol = strpos($params[ 'file' ], '://');
-    if ($protocol !== false) {
-        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
-    }
-    if (isset($template->smarty->security_policy)) {
-        if ($protocol) {
-            // remote resource (or php stream, …)
-            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
-                return;
-            }
-        } else {
-            // local file
-            if (!$template->smarty->security_policy->isTrustedResourceDir($params[ 'file' ])) {
-                return;
-            }
-        }
-    }
-    $content = '';
-    if ($protocol === 'http') {
-        // http fetch
-        if ($uri_parts = parse_url($params[ 'file' ])) {
-            // set defaults
-            $host = $server_name = $uri_parts[ 'host' ];
-            $timeout = 30;
-            $accept = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
-            $agent = 'Smarty Template Engine ' . Smarty::SMARTY_VERSION;
-            $referer = '';
-            $uri = !empty($uri_parts[ 'path' ]) ? $uri_parts[ 'path' ] : '/';
-            $uri .= !empty($uri_parts[ 'query' ]) ? '?' . $uri_parts[ 'query' ] : '';
-            $_is_proxy = false;
-            if (empty($uri_parts[ 'port' ])) {
-                $port = 80;
-            } else {
-                $port = $uri_parts[ 'port' ];
-            }
-            if (!empty($uri_parts[ 'user' ])) {
-                $user = $uri_parts[ 'user' ];
-            }
-            if (!empty($uri_parts[ 'pass' ])) {
-                $pass = $uri_parts[ 'pass' ];
-            }
-            // loop through parameters, setup headers
-            foreach ($params as $param_key => $param_value) {
-                switch ($param_key) {
-                    case 'file':
-                    case 'assign':
-                    case 'assign_headers':
-                        break;
-                    case 'user':
-                        if (!empty($param_value)) {
-                            $user = $param_value;
-                        }
-                        break;
-                    case 'pass':
-                        if (!empty($param_value)) {
-                            $pass = $param_value;
-                        }
-                        break;
-                    case 'accept':
-                        if (!empty($param_value)) {
-                            $accept = $param_value;
-                        }
-                        break;
-                    case 'header':
-                        if (!empty($param_value)) {
-                            if (!preg_match('![\w\d-]+: .+!', $param_value)) {
-                                trigger_error("[plugin] invalid header format '{$param_value}'", E_USER_NOTICE);
-                                return;
-                            } else {
-                                $extra_headers[] = $param_value;
-                            }
-                        }
-                        break;
-                    case 'proxy_host':
-                        if (!empty($param_value)) {
-                            $proxy_host = $param_value;
-                        }
-                        break;
-                    case 'proxy_port':
-                        if (!preg_match('!\D!', $param_value)) {
-                            $proxy_port = (int)$param_value;
-                        } else {
-                            trigger_error("[plugin] invalid value for attribute '{$param_key }'", E_USER_NOTICE);
-                            return;
-                        }
-                        break;
-                    case 'agent':
-                        if (!empty($param_value)) {
-                            $agent = $param_value;
-                        }
-                        break;
-                    case 'referer':
-                        if (!empty($param_value)) {
-                            $referer = $param_value;
-                        }
-                        break;
-                    case 'timeout':
-                        if (!preg_match('!\D!', $param_value)) {
-                            $timeout = (int)$param_value;
-                        } else {
-                            trigger_error("[plugin] invalid value for attribute '{$param_key}'", E_USER_NOTICE);
-                            return;
-                        }
-                        break;
-                    default:
-                        trigger_error("[plugin] unrecognized attribute '{$param_key}'", E_USER_NOTICE);
-                        return;
-                }
-            }
-            if (!empty($proxy_host) && !empty($proxy_port)) {
-                $_is_proxy = true;
-                $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
-            } else {
-                $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
-            }
-            if (!$fp) {
-                trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
-                return;
-            } else {
-                if ($_is_proxy) {
-                    fputs($fp, 'GET ' . $params[ 'file' ] . " HTTP/1.0\r\n");
-                } else {
-                    fputs($fp, "GET $uri HTTP/1.0\r\n");
-                }
-                if (!empty($host)) {
-                    fputs($fp, "Host: $host\r\n");
-                }
-                if (!empty($accept)) {
-                    fputs($fp, "Accept: $accept\r\n");
-                }
-                if (!empty($agent)) {
-                    fputs($fp, "User-Agent: $agent\r\n");
-                }
-                if (!empty($referer)) {
-                    fputs($fp, "Referer: $referer\r\n");
-                }
-                if (isset($extra_headers) && is_array($extra_headers)) {
-                    foreach ($extra_headers as $curr_header) {
-                        fputs($fp, $curr_header . "\r\n");
-                    }
-                }
-                if (!empty($user) && !empty($pass)) {
-                    fputs($fp, 'Authorization: BASIC ' . base64_encode("$user:$pass") . "\r\n");
-                }
-                fputs($fp, "\r\n");
-                while (!feof($fp)) {
-                    $content .= fgets($fp, 4096);
-                }
-                fclose($fp);
-                $csplit = preg_split("!\r\n\r\n!", $content, 2);
-                $content = $csplit[ 1 ];
-                if (!empty($params[ 'assign_headers' ])) {
-                    $template->assign($params[ 'assign_headers' ], preg_split("!\r\n!", $csplit[ 0 ]));
-                }
-            }
-        } else {
-            trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
-            return;
-        }
-    } else {
-        $content = @file_get_contents($params[ 'file' ]);
-        if ($content === false) {
-            throw new SmartyException("{fetch} cannot read resource '" . $params[ 'file' ] . "'");
-        }
-    }
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $content);
-    } else {
-        return $content;
-    }
-}
diff --git a/include/smarty/libs/plugins/function.html_checkboxes.php b/include/smarty/libs/plugins/function.html_checkboxes.php
deleted file mode 100644
index a8e7a07d8..000000000
--- a/include/smarty/libs/plugins/function.html_checkboxes.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {html_checkboxes} function plugin
- * File:       function.html_checkboxes.php
- * Type:       function
- * Name:       html_checkboxes
- * Date:       24.Feb.2003
- * Purpose:    Prints out a list of checkbox input types
- * Examples:
- *
- * {html_checkboxes values=$ids output=$names}
- * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
- * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
- *
- * Params:
- *
- * - name       (optional) - string default "checkbox"
- * - values     (required) - array
- * - options    (optional) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - output     (optional) - the output next to each checkbox
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
- *
- * @link    https://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *             (Smarty online manual)
- * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author  credits to Monte Ohrt <monte at ohrt dot com>
- * @version 1.0
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string
- * @uses    smarty_function_escape_special_chars()
- * @throws \SmartyException
- */
-function smarty_function_html_checkboxes($params, Smarty_Internal_Template $template)
-{
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
-    $name = 'checkbox';
-    $values = null;
-    $options = null;
-    $selected = array();
-    $separator = '';
-    $escape = true;
-    $labels = true;
-    $label_ids = false;
-    $output = null;
-    $extra = '';
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = (string)$_val;
-                break;
-            case 'escape':
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool)$_val;
-                break;
-            case 'options':
-                $$_key = (array)$_val;
-                break;
-            case 'values':
-            case 'output':
-                $$_key = array_values((array)$_val);
-                break;
-            case 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, '__toString')) {
-                                $_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
-                            } else {
-                                trigger_error(
-                                    'html_checkboxes: selected attribute contains an object of class \'' .
-                                    get_class($_sel) . '\' without __toString() method',
-                                    E_USER_NOTICE
-                                );
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string)$_sel);
-                        }
-                        $selected[ $_sel ] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, '__toString')) {
-                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
-                    } else {
-                        trigger_error(
-                            'html_checkboxes: selected attribute is an object of class \'' . get_class($_val) .
-                            '\' without __toString() method',
-                            E_USER_NOTICE
-                        );
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string)$_val);
-                }
-                break;
-            case 'checkboxes':
-                trigger_error(
-                    'html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
-                    E_USER_WARNING
-                );
-                $options = (array)$_val;
-                break;
-            case 'assign':
-                break;
-            case 'strict':
-                break;
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error(
-                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
-                            E_USER_NOTICE
-                        );
-                    }
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-                    break;
-                }
-            // omit break; to fall through!
-            // no break
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_checkboxes: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-    if (!isset($options) && !isset($values)) {
-        return '';
-    } /* raise error here? */
-    $_html_result = array();
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] =
-                smarty_function_html_checkboxes_output(
-                    $name,
-                    $_key,
-                    $_val,
-                    $selected,
-                    $extra,
-                    $separator,
-                    $labels,
-                    $label_ids,
-                    $escape
-                );
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result[] =
-                smarty_function_html_checkboxes_output(
-                    $name,
-                    $_key,
-                    $_val,
-                    $selected,
-                    $extra,
-                    $separator,
-                    $labels,
-                    $label_ids,
-                    $escape
-                );
-        }
-    }
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
-    } else {
-        return implode("\n", $_html_result);
-    }
-}
-
-/**
- * @param      $name
- * @param      $value
- * @param      $output
- * @param      $selected
- * @param      $extra
- * @param      $separator
- * @param      $labels
- * @param      $label_ids
- * @param bool $escape
- *
- * @return string
- */
-function smarty_function_html_checkboxes_output(
-    $name,
-    $value,
-    $output,
-    $selected,
-    $extra,
-    $separator,
-    $labels,
-    $label_ids,
-    $escape = true
-) {
-    $_output = '';
-    if (is_object($value)) {
-        if (method_exists($value, '__toString')) {
-            $value = (string)$value->__toString();
-        } else {
-            trigger_error(
-                'html_options: value is an object of class \'' . get_class($value) .
-                '\' without __toString() method',
-                E_USER_NOTICE
-            );
-            return '';
-        }
-    } else {
-        $value = (string)$value;
-    }
-    if (is_object($output)) {
-        if (method_exists($output, '__toString')) {
-            $output = (string)$output->__toString();
-        } else {
-            trigger_error(
-                'html_options: output is an object of class \'' . get_class($output) .
-                '\' without __toString() method',
-                E_USER_NOTICE
-            );
-            return '';
-        }
-    } else {
-        $output = (string)$output;
-    }
-    if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(
-                preg_replace(
-                    '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER,
-                    '_',
-                    $name . '_' . $value
-                )
-            );
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-    $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-    if (is_array($selected)) {
-        if (isset($selected[ $value ])) {
-            $_output .= ' checked="checked"';
-        }
-    } elseif ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-    $_output .= $separator;
-    return $_output;
-}
diff --git a/include/smarty/libs/plugins/function.html_image.php b/include/smarty/libs/plugins/function.html_image.php
deleted file mode 100644
index 71bc63864..000000000
--- a/include/smarty/libs/plugins/function.html_image.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {html_image} function plugin
- * Type:     function
- * Name:     html_image
- * Date:     Feb 24, 2003
- * Purpose:  format HTML tags for the image
- * Examples: {html_image file="/images/masthead.gif"}
- * Output:   <img src="/images/masthead.gif" width=400 height=23>
- * Params:
- *
- * - file        - (required) - file (and path) of image
- * - height      - (optional) - image height (default actual height)
- * - width       - (optional) - image width (default actual width)
- * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
- * - path_prefix - prefix for path output (optional, default empty)
- *
- * @link    https://www.smarty.net/manual/en/language.function.html.image.php {html_image}
- *          (Smarty online manual)
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  credits to Duda <duda@big.hu>
- * @version 1.0
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @throws SmartyException
- * @return string
- * @uses    smarty_function_escape_special_chars()
- */
-function smarty_function_html_image($params, Smarty_Internal_Template $template)
-{
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
-    $alt = '';
-    $file = '';
-    $height = '';
-    $width = '';
-    $extra = '';
-    $prefix = '';
-    $suffix = '';
-    $path_prefix = '';
-    $basedir = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? $_SERVER[ 'DOCUMENT_ROOT' ] : '';
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'file':
-            case 'height':
-            case 'width':
-            case 'dpi':
-            case 'path_prefix':
-            case 'basedir':
-                $$_key = $_val;
-                break;
-            case 'alt':
-                if (!is_array($_val)) {
-                    $$_key = smarty_function_escape_special_chars($_val);
-                } else {
-                    throw new SmartyException(
-                        "html_image: extra attribute '{$_key}' cannot be an array",
-                        E_USER_NOTICE
-                    );
-                }
-                break;
-            case 'link':
-            case 'href':
-                $prefix = '<a href="' . $_val . '">';
-                $suffix = '</a>';
-                break;
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    throw new SmartyException(
-                        "html_image: extra attribute '{$_key}' cannot be an array",
-                        E_USER_NOTICE
-                    );
-                }
-                break;
-        }
-    }
-    if (empty($file)) {
-        trigger_error('html_image: missing \'file\' parameter', E_USER_NOTICE);
-        return;
-    }
-    if ($file[ 0 ] === '/') {
-        $_image_path = $basedir . $file;
-    } else {
-        $_image_path = $file;
-    }
-    // strip file protocol
-    if (stripos($params[ 'file' ], 'file://') === 0) {
-        $params[ 'file' ] = substr($params[ 'file' ], 7);
-    }
-    $protocol = strpos($params[ 'file' ], '://');
-    if ($protocol !== false) {
-        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
-    }
-    if (isset($template->smarty->security_policy)) {
-        if ($protocol) {
-            // remote resource (or php stream, …)
-            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
-                return;
-            }
-        } else {
-            // local file
-            if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
-                return;
-            }
-        }
-    }
-    if (!isset($params[ 'width' ]) || !isset($params[ 'height' ])) {
-        // FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
-        if (!$_image_data = @getimagesize($_image_path)) {
-            if (!file_exists($_image_path)) {
-                trigger_error("html_image: unable to find '{$_image_path}'", E_USER_NOTICE);
-                return;
-            } elseif (!is_readable($_image_path)) {
-                trigger_error("html_image: unable to read '{$_image_path}'", E_USER_NOTICE);
-                return;
-            } else {
-                trigger_error("html_image: '{$_image_path}' is not a valid image file", E_USER_NOTICE);
-                return;
-            }
-        }
-        if (!isset($params[ 'width' ])) {
-            $width = $_image_data[ 0 ];
-        }
-        if (!isset($params[ 'height' ])) {
-            $height = $_image_data[ 1 ];
-        }
-    }
-    if (isset($params[ 'dpi' ])) {
-        if (strstr($_SERVER[ 'HTTP_USER_AGENT' ], 'Mac')) {
-            // FIXME: (rodneyrehm) wrong dpi assumption
-            // don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
-            $dpi_default = 72;
-        } else {
-            $dpi_default = 96;
-        }
-        $_resize = $dpi_default / $params[ 'dpi' ];
-        $width = round($width * $_resize);
-        $height = round($height * $_resize);
-    }
-    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' .
-           $height . '"' . $extra . ' />' . $suffix;
-}
diff --git a/include/smarty/libs/plugins/function.html_options.php b/include/smarty/libs/plugins/function.html_options.php
deleted file mode 100644
index 3e4335340..000000000
--- a/include/smarty/libs/plugins/function.html_options.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {html_options} function plugin
- * Type:     function
- * Name:     html_options
- * Purpose:  Prints the list of <option> tags generated from
- *           the passed parameters
- * Params:
- *
- * - name       (optional) - string default "select"
- * - values     (required) - if no options supplied) - array
- * - options    (required) - if no values supplied) - associative array
- * - selected   (optional) - string default not set
- * - output     (required) - if not options supplied) - array
- * - 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}
- *           (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
- *
- * @param array                     $params parameters
- *
- * @param \Smarty_Internal_Template $template
- *
- * @return string
- * @uses   smarty_function_escape_special_chars()
- * @throws \SmartyException
- */
-function smarty_function_html_options($params, Smarty_Internal_Template $template)
-{
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
-    $name = null;
-    $values = null;
-    $options = null;
-    $selected = null;
-    $output = null;
-    $id = null;
-    $class = null;
-    $extra = '';
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'class':
-            case 'id':
-                $$_key = (string)$_val;
-                break;
-            case 'options':
-                $options = (array)$_val;
-                break;
-            case 'values':
-            case 'output':
-                $$_key = array_values((array)$_val);
-                break;
-            case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, '__toString')) {
-                                $_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
-                            } else {
-                                trigger_error(
-                                    'html_options: selected attribute contains an object of class \'' .
-                                    get_class($_sel) . '\' without __toString() method',
-                                    E_USER_NOTICE
-                                );
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string)$_sel);
-                        }
-                        $selected[ $_sel ] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, '__toString')) {
-                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
-                    } else {
-                        trigger_error(
-                            'html_options: selected attribute is an object of class \'' . get_class($_val) .
-                            '\' without __toString() method',
-                            E_USER_NOTICE
-                        );
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string)$_val);
-                }
-                break;
-            case 'strict':
-                break;
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error(
-                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
-                            E_USER_NOTICE
-                        );
-                    }
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-                    break;
-                }
-            // omit break; to fall through!
-            // no break
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_options: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-        return '';
-    }
-    $_html_result = '';
-    $_idx = 0;
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        }
-    }
-    if (!empty($name)) {
-        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
-        $_html_result =
-            '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
-            '</select>' . "\n";
-    }
-    return $_html_result;
-}
-
-/**
- * @param $key
- * @param $value
- * @param $selected
- * @param $id
- * @param $class
- * @param $idx
- *
- * @return string
- */
-function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
-{
-    if (!is_array($value)) {
-        $_key = smarty_function_escape_special_chars($key);
-        $_html_result = '<option value="' . $_key . '"';
-        if (is_array($selected)) {
-            if (isset($selected[ $_key ])) {
-                $_html_result .= ' selected="selected"';
-            }
-        } elseif ($_key === $selected) {
-            $_html_result .= ' selected="selected"';
-        }
-        $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
-        if (is_object($value)) {
-            if (method_exists($value, '__toString')) {
-                $value = smarty_function_escape_special_chars((string)$value->__toString());
-            } else {
-                trigger_error(
-                    'html_options: value is an object of class \'' . get_class($value) .
-                    '\' without __toString() method',
-                    E_USER_NOTICE
-                );
-                return '';
-            }
-        } else {
-            $value = smarty_function_escape_special_chars((string)$value);
-        }
-        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx++;
-    } else {
-        $_idx = 0;
-        $_html_result =
-            smarty_function_html_options_optgroup(
-                $key,
-                $value,
-                $selected,
-                !empty($id) ? ($id . '-' . $idx) : null,
-                $class,
-                $_idx
-            );
-        $idx++;
-    }
-    return $_html_result;
-}
-
-/**
- * @param $key
- * @param $values
- * @param $selected
- * @param $id
- * @param $class
- * @param $idx
- *
- * @return string
- */
-function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
-{
-    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
-    foreach ($values as $key => $value) {
-        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
-    }
-    $optgroup_html .= "</optgroup>\n";
-    return $optgroup_html;
-}
diff --git a/include/smarty/libs/plugins/function.html_radios.php b/include/smarty/libs/plugins/function.html_radios.php
deleted file mode 100644
index 2223ff7ee..000000000
--- a/include/smarty/libs/plugins/function.html_radios.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {html_radios} function plugin
- * File:       function.html_radios.php
- * Type:       function
- * Name:       html_radios
- * Date:       24.Feb.2003
- * Purpose:    Prints out a list of radio input types
- * Params:
- *
- * - name       (optional) - string default "radio"
- * - values     (required) - array
- * - options    (required) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - output     (optional) - the output next to each radio button
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
- *
- * Examples:
- *
- * {html_radios values=$ids output=$names}
- * {html_radios values=$ids name='box' separator='<br>' output=$names}
- * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
- *
- * @link    https://www.smarty.net/manual/en/language.function.html.radios.php {html_radios}
- *          (Smarty online manual)
- * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author  credits to Monte Ohrt <monte at ohrt dot com>
- * @version 1.0
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string
- * @uses    smarty_function_escape_special_chars()
- * @throws \SmartyException
- */
-function smarty_function_html_radios($params, Smarty_Internal_Template $template)
-{
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
-    $name = 'radio';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $separator = '';
-    $escape = true;
-    $labels = true;
-    $label_ids = false;
-    $output = null;
-    $extra = '';
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = (string)$_val;
-                break;
-            case 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, '__toString')) {
-                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
-                    } else {
-                        trigger_error(
-                            'html_radios: selected attribute is an object of class \'' . get_class($_val) .
-                            '\' without __toString() method',
-                            E_USER_NOTICE
-                        );
-                    }
-                } else {
-                    $selected = (string)$_val;
-                }
-                break;
-            case 'escape':
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool)$_val;
-                break;
-            case 'options':
-                $$_key = (array)$_val;
-                break;
-            case 'values':
-            case 'output':
-                $$_key = array_values((array)$_val);
-                break;
-            case 'radios':
-                trigger_error(
-                    'html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
-                    E_USER_WARNING
-                );
-                $options = (array)$_val;
-                break;
-            case 'assign':
-                break;
-            case 'strict':
-                break;
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error(
-                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
-                            E_USER_NOTICE
-                        );
-                    }
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-                    break;
-                }
-            // omit break; to fall through!
-            // no break
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_radios: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-        return '';
-    }
-    $_html_result = array();
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] =
-                smarty_function_html_radios_output(
-                    $name,
-                    $_key,
-                    $_val,
-                    $selected,
-                    $extra,
-                    $separator,
-                    $labels,
-                    $label_ids,
-                    $escape
-                );
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result[] =
-                smarty_function_html_radios_output(
-                    $name,
-                    $_key,
-                    $_val,
-                    $selected,
-                    $extra,
-                    $separator,
-                    $labels,
-                    $label_ids,
-                    $escape
-                );
-        }
-    }
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
-    } else {
-        return implode("\n", $_html_result);
-    }
-}
-
-/**
- * @param $name
- * @param $value
- * @param $output
- * @param $selected
- * @param $extra
- * @param $separator
- * @param $labels
- * @param $label_ids
- * @param $escape
- *
- * @return string
- */
-function smarty_function_html_radios_output(
-    $name,
-    $value,
-    $output,
-    $selected,
-    $extra,
-    $separator,
-    $labels,
-    $label_ids,
-    $escape
-) {
-    $_output = '';
-    if (is_object($value)) {
-        if (method_exists($value, '__toString')) {
-            $value = (string)$value->__toString();
-        } else {
-            trigger_error(
-                'html_options: value is an object of class \'' . get_class($value) .
-                '\' without __toString() method',
-                E_USER_NOTICE
-            );
-            return '';
-        }
-    } else {
-        $value = (string)$value;
-    }
-    if (is_object($output)) {
-        if (method_exists($output, '__toString')) {
-            $output = (string)$output->__toString();
-        } else {
-            trigger_error(
-                'html_options: output is an object of class \'' . get_class($output) .
-                '\' without __toString() method',
-                E_USER_NOTICE
-            );
-            return '';
-        }
-    } else {
-        $output = (string)$output;
-    }
-    if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(
-                preg_replace(
-                    '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER,
-                    '_',
-                    $name . '_' . $value
-                )
-            );
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-    if ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-    $_output .= $separator;
-    return $_output;
-}
diff --git a/include/smarty/libs/plugins/function.html_select_date.php b/include/smarty/libs/plugins/function.html_select_date.php
deleted file mode 100644
index d9c571976..000000000
--- a/include/smarty/libs/plugins/function.html_select_date.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {html_select_date} plugin
- * Type:     function
- * Name:     html_select_date
- * Purpose:  Prints the dropdowns for date selection.
- * ChangeLog:
- *
- *            - 1.0 initial release
- *            - 1.1 added support for +/- N syntax for begin
- *              and end year values. (Monte)
- *            - 1.2 added support for yyyy-mm-dd syntax for
- *              time value. (Jan Rosier)
- *            - 1.3 added support for choosing format for
- *              month values (Gary Loescher)
- *            - 1.3.1 added support for choosing format for
- *              day values (Marcus Bointon)
- *            - 1.3.2 support negative timestamps, force year
- *              dropdown to include given date unless explicitly set (Monte)
- *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
- *              of 0000-00-00 dates (cybot, boots)
- *            - 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}
- *           (Smarty online manual)
- * @version 2.0
- * @author  Andrei Zmievski
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  Rodney Rehm
- *
- * @param array                     $params parameters
- *
- * @param \Smarty_Internal_Template $template
- *
- * @return string
- * @throws \SmartyException
- */
-function smarty_function_html_select_date($params, Smarty_Internal_Template $template)
-{
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
-    // generate timestamps used for month names only
-    static $_month_timestamps = null;
-    static $_current_year = null;
-    if ($_month_timestamps === null) {
-        $_current_year = date('Y');
-        $_month_timestamps = array();
-        for ($i = 1; $i <= 12; $i++) {
-            $_month_timestamps[ $i ] = mktime(0, 0, 0, $i, 1, 2000);
-        }
-    }
-    /* Default values. */
-    $prefix = 'Date_';
-    $start_year = null;
-    $end_year = null;
-    $display_days = true;
-    $display_months = true;
-    $display_years = true;
-    $month_format = '%B';
-    /* Write months as numbers by default  GL */
-    $month_value_format = '%m';
-    $day_format = '%02d';
-    /* Write day values using this format MB */
-    $day_value_format = '%d';
-    $year_as_text = false;
-    /* Display years in reverse order? Ie. 2000,1999,.... */
-    $reverse_years = false;
-    /* Should the select boxes be part of an array when returned from PHP?
-       e.g. setting it to "birthday", would create "birthday[Day]",
-       "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
-    $field_array = null;
-    /* <select size>'s of the different <select> tags.
-       If not set, uses default dropdown. */
-    $day_size = null;
-    $month_size = null;
-    $year_size = null;
-    /* Unparsed attributes common to *ALL* the <select>/<input> tags.
-       An example might be in the template: all_extra ='class ="foo"'. */
-    $all_extra = null;
-    /* Separate attributes for the tags. */
-    $day_extra = null;
-    $month_extra = null;
-    $year_extra = null;
-    /* Order in which to display the fields.
-       "D" -> day, "M" -> month, "Y" -> year. */
-    $field_order = 'MDY';
-    /* String printed between the different fields. */
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-
-    // $all_empty = null;
-    // $day_empty = null;
-    // $month_empty = null;
-    // $year_empty = null;
-    $extra_attrs = '';
-    $all_id = null;
-    $day_id = null;
-    $month_id = null;
-    $year_id = null;
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'time':
-                $$_key = $_value; // we'll handle conversion below
-                break;
-            case 'month_names':
-                if (is_array($_value) && count($_value) === 12) {
-                    $$_key = $_value;
-                } else {
-                    trigger_error('html_select_date: month_names must be an array of 12 strings', E_USER_NOTICE);
-                }
-                break;
-            case 'prefix':
-            case 'field_array':
-            case 'start_year':
-            case 'end_year':
-            case 'day_format':
-            case 'day_value_format':
-            case 'month_format':
-            case 'month_value_format':
-            case 'day_size':
-            case 'month_size':
-            case 'year_size':
-            case 'all_extra':
-            case 'day_extra':
-            case 'month_extra':
-            case 'year_extra':
-            case 'field_order':
-            case 'field_separator':
-            case 'option_separator':
-            case 'all_empty':
-            case 'month_empty':
-            case 'day_empty':
-            case 'year_empty':
-            case 'all_id':
-            case 'month_id':
-            case 'day_id':
-            case 'year_id':
-                $$_key = (string)$_value;
-                break;
-            case 'display_days':
-            case 'display_months':
-            case 'display_years':
-            case 'year_as_text':
-            case 'reverse_years':
-                $$_key = (bool)$_value;
-                break;
-            default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-                } else {
-                    trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-    // Note: date() is faster than strftime()
-    // Note: explode(date()) is faster than date() date() date()
-
-    if (isset($time) && is_array($time)) {
-        if (isset($time[$prefix . 'Year'])) {
-            // $_REQUEST[$field_array] given
-            foreach ([
-                         'Y' => 'Year',
-                         'm' => 'Month',
-                         'd' => 'Day'
-                     ] as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName =
-                    isset($time[$prefix . $_elementName]) ? $time[$prefix . $_elementName] :
-                        date($_elementKey);
-            }
-        } elseif (isset($time[$field_array][$prefix . 'Year'])) {
-            // $_REQUEST given
-            foreach ([
-                         'Y' => 'Year',
-                         'm' => 'Month',
-                         'd' => 'Day'
-                     ] as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($time[$field_array][$prefix . $_elementName]) ?
-                    $time[$field_array][$prefix . $_elementName] : date($_elementKey);
-            }
-        } else {
-            // no date found, use NOW
-            [$_year, $_month, $_day] = explode('-', date('Y-m-d'));
-        }
-    } elseif (isset($time) && preg_match("/(\d*)-(\d*)-(\d*)/", $time, $matches)) {
-        $_year = $_month = $_day = null;
-        if ($matches[1] > '') $_year = (int) $matches[1];
-        if ($matches[2] > '') $_month = (int) $matches[2];
-        if ($matches[3] > '') $_day = (int) $matches[3];
-    } elseif ($time === null) {
-        if (array_key_exists('time', $params)) {
-            $_year = $_month = $_day = null;
-        } else {
-            [$_year, $_month, $_day] = explode('-', date('Y-m-d'));
-        }
-    } else {
-        $template->_checkPlugins(
-            array(
-                array(
-                    'function' => 'smarty_make_timestamp',
-                    'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
-                )
-            )
-        );
-        $time = smarty_make_timestamp($time);
-        [$_year, $_month, $_day] = explode('-', date('Y-m-d', $time));
-    }
-
-    // make syntax "+N" or "-N" work with $start_year and $end_year
-    // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
-    foreach (array(
-        'start',
-        'end'
-    ) as $key) {
-        $key .= '_year';
-        $t = $$key;
-        if ($t === null) {
-            $$key = (int)$_current_year;
-        } elseif ($t[ 0 ] === '+') {
-            $$key = (int)($_current_year + (int)trim(substr($t, 1)));
-        } elseif ($t[ 0 ] === '-') {
-            $$key = (int)($_current_year - (int)trim(substr($t, 1)));
-        } else {
-            $$key = (int)$$key;
-        }
-    }
-    // flip for ascending or descending
-    if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
-        $t = $end_year;
-        $end_year = $start_year;
-        $start_year = $t;
-    }
-    // generate year <select> or <input>
-    if ($display_years) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($year_extra) {
-            $_extra .= ' ' . $year_extra;
-        }
-        if ($year_as_text) {
-            $_html_years =
-                '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
-                $extra_attrs . ' />';
-        } else {
-            $_html_years = '<select name="' . $_name . '"';
-            if ($year_id !== null || $all_id !== null) {
-                $_html_years .= ' id="' . smarty_function_escape_special_chars(
-                        $year_id !== null ?
-                            ($year_id ? $year_id : $_name) :
-                            ($all_id ? ($all_id . $_name) :
-                                $_name)
-                    ) . '"';
-            }
-            if ($year_size) {
-                $_html_years .= ' size="' . $year_size . '"';
-            }
-            $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
-            if (isset($year_empty) || isset($all_empty)) {
-                $_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' .
-                                $option_separator;
-            }
-            $op = $start_year > $end_year ? -1 : 1;
-            for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
-                $_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i .
-                                '</option>' . $option_separator;
-            }
-            $_html_years .= '</select>';
-        }
-    }
-    // generate month <select> or <input>
-    if ($display_months) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($month_extra) {
-            $_extra .= ' ' . $month_extra;
-        }
-        $_html_months = '<select name="' . $_name . '"';
-        if ($month_id !== null || $all_id !== null) {
-            $_html_months .= ' id="' . smarty_function_escape_special_chars(
-                    $month_id !== null ?
-                        ($month_id ? $month_id : $_name) :
-                        ($all_id ? ($all_id . $_name) :
-                            $_name)
-                ) . '"';
-        }
-        if ($month_size) {
-            $_html_months .= ' size="' . $month_size . '"';
-        }
-        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($month_empty) || isset($all_empty)) {
-            $_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' .
-                             $option_separator;
-        }
-        for ($i = 1; $i <= 12; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
-                ($month_format === '%m' ? $_val : @strftime($month_format, $_month_timestamps[ $i ]));
-            $_value = $month_value_format === '%m' ? $_val : @strftime($month_value_format, $_month_timestamps[ $i ]);
-            $_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
-                             '>' . $_text . '</option>' . $option_separator;
-        }
-        $_html_months .= '</select>';
-    }
-    // generate day <select> or <input>
-    if ($display_days) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($day_extra) {
-            $_extra .= ' ' . $day_extra;
-        }
-        $_html_days = '<select name="' . $_name . '"';
-        if ($day_id !== null || $all_id !== null) {
-            $_html_days .= ' id="' .
-                           smarty_function_escape_special_chars(
-                               $day_id !== null ? ($day_id ? $day_id : $_name) :
-                                   ($all_id ? ($all_id . $_name) : $_name)
-                           ) . '"';
-        }
-        if ($day_size) {
-            $_html_days .= ' size="' . $day_size . '"';
-        }
-        $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($day_empty) || isset($all_empty)) {
-            $_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' .
-                           $option_separator;
-        }
-        for ($i = 1; $i <= 31; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $day_format === '%02d' ? $_val : sprintf($day_format, $i);
-            $_value = $day_value_format === '%02d' ? $_val : sprintf($day_value_format, $i);
-            $_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' .
-                           $_text . '</option>' . $option_separator;
-        }
-        $_html_days .= '</select>';
-    }
-    // order the fields for output
-    $_html = '';
-    for ($i = 0; $i <= 2; $i++) {
-        switch ($field_order[ $i ]) {
-            case 'Y':
-            case 'y':
-                if (isset($_html_years)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_years;
-                }
-                break;
-            case 'm':
-            case 'M':
-                if (isset($_html_months)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_months;
-                }
-                break;
-            case 'd':
-            case 'D':
-                if (isset($_html_days)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_days;
-                }
-                break;
-        }
-    }
-    return $_html;
-}
diff --git a/include/smarty/libs/plugins/function.html_select_time.php b/include/smarty/libs/plugins/function.html_select_time.php
deleted file mode 100644
index 256b56b1c..000000000
--- a/include/smarty/libs/plugins/function.html_select_time.php
+++ /dev/null
@@ -1,354 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {html_select_time} function plugin
- * Type:     function
- * 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}
- *           (Smarty online manual)
- * @author Roberto Berto <roberto@berto.net>
- * @author Monte Ohrt <monte AT ohrt DOT com>
- *
- * @param array                     $params parameters
- *
- * @param \Smarty_Internal_Template $template
- *
- * @return string
- * @uses   smarty_make_timestamp()
- * @throws \SmartyException
- */
-function smarty_function_html_select_time($params, Smarty_Internal_Template $template)
-{
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
-    $prefix = 'Time_';
-    $field_array = null;
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-    $display_hours = true;
-    $display_minutes = true;
-    $display_seconds = true;
-    $display_meridian = true;
-    $hour_format = '%02d';
-    $hour_value_format = '%02d';
-    $minute_format = '%02d';
-    $minute_value_format = '%02d';
-    $second_format = '%02d';
-    $second_value_format = '%02d';
-    $hour_size = null;
-    $minute_size = null;
-    $second_size = null;
-    $meridian_size = null;
-    $all_empty = null;
-    $hour_empty = null;
-    $minute_empty = null;
-    $second_empty = null;
-    $meridian_empty = null;
-    $all_id = null;
-    $hour_id = null;
-    $minute_id = null;
-    $second_id = null;
-    $meridian_id = null;
-    $use_24_hours = true;
-    $minute_interval = 1;
-    $second_interval = 1;
-    $extra_attrs = '';
-    $all_extra = null;
-    $hour_extra = null;
-    $minute_extra = null;
-    $second_extra = null;
-    $meridian_extra = null;
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $template->_checkPlugins(
-                        array(
-                            array(
-                                'function' => 'smarty_make_timestamp',
-                                'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
-                            )
-                        )
-                    );
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
-            case 'prefix':
-            case 'field_array':
-            case 'field_separator':
-            case 'option_separator':
-            case 'all_extra':
-            case 'hour_extra':
-            case 'minute_extra':
-            case 'second_extra':
-            case 'meridian_extra':
-            case 'all_empty':
-            case 'hour_empty':
-            case 'minute_empty':
-            case 'second_empty':
-            case 'meridian_empty':
-            case 'all_id':
-            case 'hour_id':
-            case 'minute_id':
-            case 'second_id':
-            case 'meridian_id':
-            case 'hour_format':
-            case 'hour_value_format':
-            case 'minute_format':
-            case 'minute_value_format':
-            case 'second_format':
-            case 'second_value_format':
-                $$_key = (string)$_value;
-                break;
-            case 'display_hours':
-            case 'display_minutes':
-            case 'display_seconds':
-            case 'display_meridian':
-            case 'use_24_hours':
-                $$_key = (bool)$_value;
-                break;
-            case 'minute_interval':
-            case 'second_interval':
-            case 'hour_size':
-            case 'minute_size':
-            case 'second_size':
-            case 'meridian_size':
-                $$_key = (int)$_value;
-                break;
-            default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-                } else {
-                    trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
-        if (isset($params[ 'time' ][ $prefix . 'Hour' ])) {
-            // $_REQUEST[$field_array] given
-            foreach (array(
-                'H' => 'Hour',
-                'i' => 'Minute',
-                's' => 'Second'
-            ) as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName =
-                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
-                        date($_elementKey);
-            }
-            $_meridian =
-                isset($params[ 'time' ][ $prefix . 'Meridian' ]) ? (' ' . $params[ 'time' ][ $prefix . 'Meridian' ]) :
-                    '';
-            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Hour' ])) {
-            // $_REQUEST given
-            foreach (array(
-                'H' => 'Hour',
-                'i' => 'Minute',
-                's' => 'Second'
-            ) as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
-                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
-            }
-            $_meridian = isset($params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) ?
-                (' ' . $params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) : '';
-            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        if (array_key_exists('time', $params)) {
-            $_hour = $_minute = $_second = $time = null;
-        } else {
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
-        }
-    } else {
-        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-    }
-    // generate hour <select>
-    if ($display_hours) {
-        $_html_hours = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($hour_extra) {
-            $_extra .= ' ' . $hour_extra;
-        }
-        $_html_hours = '<select name="' . $_name . '"';
-        if ($hour_id !== null || $all_id !== null) {
-            $_html_hours .= ' id="' .
-                            smarty_function_escape_special_chars(
-                                $hour_id !== null ? ($hour_id ? $hour_id : $_name) :
-                                    ($all_id ? ($all_id . $_name) : $_name)
-                            ) . '"';
-        }
-        if ($hour_size) {
-            $_html_hours .= ' size="' . $hour_size . '"';
-        }
-        $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($hour_empty) || isset($all_empty)) {
-            $_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' .
-                            $option_separator;
-        }
-        $start = $use_24_hours ? 0 : 1;
-        $end = $use_24_hours ? 23 : 12;
-        for ($i = $start; $i <= $end; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $hour_format === '%02d' ? $_val : sprintf($hour_format, $i);
-            $_value = $hour_value_format === '%02d' ? $_val : sprintf($hour_value_format, $i);
-            if (!$use_24_hours) {
-                $_hour12 = $_hour == 0 ? 12 : ($_hour <= 12 ? $_hour : $_hour - 12);
-            }
-            $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
-            $_html_hours .= '<option value="' . $_value . '"' . ($selected ? ' selected="selected"' : '') . '>' .
-                            $_text . '</option>' . $option_separator;
-        }
-        $_html_hours .= '</select>';
-    }
-    // generate minute <select>
-    if ($display_minutes) {
-        $_html_minutes = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($minute_extra) {
-            $_extra .= ' ' . $minute_extra;
-        }
-        $_html_minutes = '<select name="' . $_name . '"';
-        if ($minute_id !== null || $all_id !== null) {
-            $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
-                    $minute_id !== null ?
-                        ($minute_id ? $minute_id : $_name) :
-                        ($all_id ? ($all_id . $_name) :
-                            $_name)
-                ) . '"';
-        }
-        if ($minute_size) {
-            $_html_minutes .= ' size="' . $minute_size . '"';
-        }
-        $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($minute_empty) || isset($all_empty)) {
-            $_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' .
-                              $option_separator;
-        }
-        $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
-        for ($i = 0; $i <= 59; $i += $minute_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $minute_format === '%02d' ? $_val : sprintf($minute_format, $i);
-            $_value = $minute_value_format === '%02d' ? $_val : sprintf($minute_value_format, $i);
-            $_html_minutes .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
-                              '>' . $_text . '</option>' . $option_separator;
-        }
-        $_html_minutes .= '</select>';
-    }
-    // generate second <select>
-    if ($display_seconds) {
-        $_html_seconds = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($second_extra) {
-            $_extra .= ' ' . $second_extra;
-        }
-        $_html_seconds = '<select name="' . $_name . '"';
-        if ($second_id !== null || $all_id !== null) {
-            $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
-                    $second_id !== null ?
-                        ($second_id ? $second_id : $_name) :
-                        ($all_id ? ($all_id . $_name) :
-                            $_name)
-                ) . '"';
-        }
-        if ($second_size) {
-            $_html_seconds .= ' size="' . $second_size . '"';
-        }
-        $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($second_empty) || isset($all_empty)) {
-            $_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' .
-                              $option_separator;
-        }
-        $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
-        for ($i = 0; $i <= 59; $i += $second_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $second_format === '%02d' ? $_val : sprintf($second_format, $i);
-            $_value = $second_value_format === '%02d' ? $_val : sprintf($second_value_format, $i);
-            $_html_seconds .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
-                              '>' . $_text . '</option>' . $option_separator;
-        }
-        $_html_seconds .= '</select>';
-    }
-    // generate meridian <select>
-    if ($display_meridian && !$use_24_hours) {
-        $_html_meridian = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($meridian_extra) {
-            $_extra .= ' ' . $meridian_extra;
-        }
-        $_html_meridian = '<select name="' . $_name . '"';
-        if ($meridian_id !== null || $all_id !== null) {
-            $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
-                    $meridian_id !== null ?
-                        ($meridian_id ? $meridian_id :
-                            $_name) :
-                        ($all_id ? ($all_id . $_name) :
-                            $_name)
-                ) . '"';
-        }
-        if ($meridian_size) {
-            $_html_meridian .= ' size="' . $meridian_size . '"';
-        }
-        $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($meridian_empty) || isset($all_empty)) {
-            $_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) .
-                               '</option>' . $option_separator;
-        }
-        $_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .
-                           '>AM</option>' . $option_separator . '<option value="pm"' .
-                           ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator .
-                           '</select>';
-    }
-    $_html = '';
-    foreach (array(
-        '_html_hours',
-        '_html_minutes',
-        '_html_seconds',
-        '_html_meridian'
-    ) as $k) {
-        if (isset($$k)) {
-            if ($_html) {
-                $_html .= $field_separator;
-            }
-            $_html .= $$k;
-        }
-    }
-    return $_html;
-}
diff --git a/include/smarty/libs/plugins/function.html_table.php b/include/smarty/libs/plugins/function.html_table.php
deleted file mode 100644
index 17b0586e2..000000000
--- a/include/smarty/libs/plugins/function.html_table.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {html_table} function plugin
- * Type:     function
- * Name:     html_table
- * Date:     Feb 17, 2003
- * Purpose:  make an html table from an array of data
- * Params:
- *
- * - loop       - array to loop through
- * - cols       - number of columns, comma separated list of column names
- *                or array of column names
- * - rows       - number of rows
- * - table_attr - table attributes
- * - th_attr    - table heading attributes (arrays are cycled)
- * - tr_attr    - table row attributes (arrays are cycled)
- * - td_attr    - table cell attributes (arrays are cycled)
- * - trailpad   - value to pad trailing cells with
- * - caption    - text for caption element
- * - vdir       - vertical direction (default: "down", means top-to-bottom)
- * - hdir       - horizontal direction (default: "right", means left-to-right)
- * - inner      - inner loop (default "cols": print $loop line by line,
- *                $loop will be printed column by column otherwise)
- *
- * Examples:
- *
- * {table loop=$data}
- * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
- * {table loop=$data cols="first,second,third" tr_attr=$colors}
- *
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  credit to Messju Mohr <messju at lammfellpuschen dot de>
- * @author  credit to boots <boots dot smarty at yahoo dot com>
- * @version 1.1
- * @link    https://www.smarty.net/manual/en/language.function.html.table.php {html_table}
- *           (Smarty online manual)
- *
- * @param array $params parameters
- *
- * @return string
- */
-function smarty_function_html_table($params)
-{
-    $table_attr = 'border="1"';
-    $tr_attr = '';
-    $th_attr = '';
-    $td_attr = '';
-    $cols = $cols_count = 3;
-    $rows = 3;
-    $trailpad = '&nbsp;';
-    $vdir = 'down';
-    $hdir = 'right';
-    $inner = 'cols';
-    $caption = '';
-    $loop = null;
-    if (!isset($params[ 'loop' ])) {
-        trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
-        return;
-    }
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'loop':
-                $$_key = (array)$_value;
-                break;
-            case 'cols':
-                if (is_array($_value) && !empty($_value)) {
-                    $cols = $_value;
-                    $cols_count = count($_value);
-                } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
-                    $cols = explode(',', $_value);
-                    $cols_count = count($cols);
-                } elseif (!empty($_value)) {
-                    $cols_count = (int)$_value;
-                } else {
-                    $cols_count = $cols;
-                }
-                break;
-            case 'rows':
-                $$_key = (int)$_value;
-                break;
-            case 'table_attr':
-            case 'trailpad':
-            case 'hdir':
-            case 'vdir':
-            case 'inner':
-            case 'caption':
-                $$_key = (string)$_value;
-                break;
-            case 'tr_attr':
-            case 'td_attr':
-            case 'th_attr':
-                $$_key = $_value;
-                break;
-        }
-    }
-    $loop_count = count($loop);
-    if (empty($params[ 'rows' ])) {
-        /* no rows specified */
-        $rows = ceil($loop_count / $cols_count);
-    } elseif (empty($params[ 'cols' ])) {
-        if (!empty($params[ 'rows' ])) {
-            /* no cols specified, but rows */
-            $cols_count = ceil($loop_count / $rows);
-        }
-    }
-    $output = "<table $table_attr>\n";
-    if (!empty($caption)) {
-        $output .= '<caption>' . $caption . "</caption>\n";
-    }
-    if (is_array($cols)) {
-        $cols = ($hdir === 'right') ? $cols : array_reverse($cols);
-        $output .= "<thead><tr>\n";
-        for ($r = 0; $r < $cols_count; $r++) {
-            $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[ $r ];
-            $output .= "</th>\n";
-        }
-        $output .= "</tr></thead>\n";
-    }
-    $output .= "<tbody>\n";
-    for ($r = 0; $r < $rows; $r++) {
-        $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx = ($vdir === 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
-        for ($c = 0; $c < $cols_count; $c++) {
-            $x = ($hdir === 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
-            if ($inner !== 'cols') {
-                /* shuffle x to loop over rows*/
-                $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
-            }
-            if ($x < $loop_count) {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
-            } else {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
-            }
-        }
-        $output .= "</tr>\n";
-    }
-    $output .= "</tbody>\n";
-    $output .= "</table>\n";
-    return $output;
-}
-
-/**
- * @param $name
- * @param $var
- * @param $no
- *
- * @return string
- */
-function smarty_function_html_table_cycle($name, $var, $no)
-{
-    if (!is_array($var)) {
-        $ret = $var;
-    } else {
-        $ret = $var[ $no % count($var) ];
-    }
-    return ($ret) ? ' ' . $ret : '';
-}
diff --git a/include/smarty/libs/plugins/function.mailto.php b/include/smarty/libs/plugins/function.mailto.php
deleted file mode 100644
index 671ac0694..000000000
--- a/include/smarty/libs/plugins/function.mailto.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {mailto} function plugin
- * Type:     function
- * Name:     mailto
- * Date:     May 21, 2002
- * Purpose:  automate mailto address link creation, and optionally encode them.
- * Params:
- *
- * - address    - (required) - e-mail address
- * - text       - (optional) - text to display, default is address
- * - encode     - (optional) - can be one of:
- *                             * none : no encoding (default)
- *                             * javascript : encode with javascript
- *                             * javascript_charcode : encode with javascript charcode
- *                             * hex : encode with hexadecimal (no javascript)
- * - cc         - (optional) - address(es) to carbon copy
- * - bcc        - (optional) - address(es) to blind carbon copy
- * - subject    - (optional) - e-mail subject
- * - newsgroups - (optional) - newsgroup(s) to post to
- * - followupto - (optional) - address(es) to follow up to
- * - extra      - (optional) - extra tags for the href link
- *
- * Examples:
- *
- * {mailto address="me@domain.com"}
- * {mailto address="me@domain.com" encode="javascript"}
- * {mailto address="me@domain.com" encode="hex"}
- * {mailto address="me@domain.com" subject="Hello to you!"}
- * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
- * {mailto address="me@domain.com" extra='class="mailto"'}
- *
- * @link    https://www.smarty.net/manual/en/language.function.mailto.php {mailto}
- *           (Smarty online manual)
- * @version 1.2
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  credits to Jason Sweat (added cc, bcc and subject functionality)
- *
- * @param array $params parameters
- *
- * @return string
- */
-function smarty_function_mailto($params)
-{
-    static $_allowed_encoding = [
-        'javascript' => true,
-        'javascript_charcode' => true,
-        'hex' => true,
-        'none' => true
-    ];
-
-    $extra = '';
-    if (empty($params[ 'address' ])) {
-        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
-        return;
-    } else {
-        $address = $params[ 'address' ];
-    }
-
-    $text = $address;
-
-    // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
-    // so, don't encode it.
-    $mail_parms = [];
-    foreach ($params as $var => $value) {
-        switch ($var) {
-            case 'cc':
-            case 'bcc':
-            case 'followupto':
-                if (!empty($value)) {
-                    $mail_parms[] = $var . '=' . str_replace(['%40', '%2C'], ['@', ','], rawurlencode($value));
-                }
-                break;
-            case 'subject':
-            case 'newsgroups':
-                $mail_parms[] = $var . '=' . rawurlencode($value);
-                break;
-            case 'extra':
-            case 'text':
-                $$var = $value;
-            // no break
-            default:
-        }
-    }
-
-    if ($mail_parms) {
-        $address .= '?' . join('&', $mail_parms);
-    }
-    $encode = (empty($params[ 'encode' ])) ? 'none' : $params[ 'encode' ];
-    if (!isset($_allowed_encoding[ $encode ])) {
-        trigger_error(
-            "mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
-            E_USER_WARNING
-        );
-        return;
-    }
-
-    $string = '<a href="mailto:' . htmlspecialchars($address, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, Smarty::$_CHARSET) .
-        '" ' . $extra . '>' . htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, Smarty::$_CHARSET) . '</a>';
-
-    if ($encode === 'javascript') {
-        $js_encode = '';
-        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
-            $js_encode .= '%' . bin2hex($string[ $x ]);
-        }
-        return '<script type="text/javascript">document.write(unescape(\'' . $js_encode . '\'))</script>';
-    } elseif ($encode === 'javascript_charcode') {
-        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
-            $ord[] = ord($string[ $x ]);
-        }
-        return '<script type="text/javascript">document.write(String.fromCharCode(' . implode(',', $ord) . '))</script>';
-    } elseif ($encode === 'hex') {
-        preg_match('!^(.*)(\?.*)$!', $address, $match);
-        if (!empty($match[ 2 ])) {
-            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
-            return;
-        }
-        $address_encode = '';
-        for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
-            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) {
-                $address_encode .= '%' . bin2hex($address[ $x ]);
-            } else {
-                $address_encode .= $address[ $x ];
-            }
-        }
-        $text_encode = '';
-        for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
-            $text_encode .= '&#x' . bin2hex($text[ $x ]) . ';';
-        }
-        $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
-        return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
-    } else {
-        // no encoding
-        return $string;
-    }
-}
diff --git a/include/smarty/libs/plugins/function.math.php b/include/smarty/libs/plugins/function.math.php
deleted file mode 100644
index f9cf67fe7..000000000
--- a/include/smarty/libs/plugins/function.math.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * This plugin is only for Smarty2 BC
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {math} function plugin
- * Type:     function
- * Name:     math
- * Purpose:  handle math computations in template
- *
- * @link   https://www.smarty.net/manual/en/language.function.math.php {math}
- *           (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string|null
- */
-function smarty_function_math($params, $template)
-{
-    static $_allowed_funcs =
-        array(
-            'int'   => true,
-            'abs'   => true,
-            'ceil'  => true,
-            'acos'   => true,
-            'acosh'   => true,
-            'cos'   => true,
-            'cosh'   => true,
-            'deg2rad'   => true,
-            'rad2deg'   => true,
-            'exp'   => true,
-            'floor' => true,
-            'log'   => true,
-            'log10' => true,
-            'max'   => true,
-            'min'   => true,
-            'pi'    => true,
-            'pow'   => true,
-            'rand'  => true,
-            'round' => true,
-            'asin'   => true,
-            'asinh'   => true,
-            'sin'   => true,
-            'sinh'   => true,
-            'sqrt'  => true,
-            'srand' => true,
-            'atan'   => true,
-            'atanh'   => true,
-            'tan'   => true,
-            'tanh'   => true
-        );
-
-    // be sure equation parameter is present
-    if (empty($params[ 'equation' ])) {
-        trigger_error("math: missing equation parameter", E_USER_WARNING);
-        return;
-    }
-    $equation = $params[ 'equation' ];
-
-    // Remove whitespaces
-    $equation = preg_replace('/\s+/', '', $equation);
-
-    // Adapted from https://www.php.net/manual/en/function.eval.php#107377
-    $number = '(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number
-    $functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))';
-    $operators = '[,+\/*\^%-]'; // Allowed math operators
-    $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)*\)|\((?1)*\)))(?:'.$operators.'(?1))?)+$/';
-
-    if (!preg_match($regexp, $equation)) {
-        trigger_error("math: illegal characters", E_USER_WARNING);
-        return;
-    }
-
-    // make sure parenthesis are balanced
-    if (substr_count($equation, '(') !== substr_count($equation, ')')) {
-        trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
-        return;
-    }
-
-    // disallow backticks
-    if (strpos($equation, '`') !== false) {
-        trigger_error("math: backtick character not allowed in equation", E_USER_WARNING);
-        return;
-    }
-
-    // also disallow dollar signs
-    if (strpos($equation, '$') !== false) {
-        trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING);
-        return;
-    }
-    foreach ($params as $key => $val) {
-        if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
-            // make sure value is not empty
-            if (strlen($val) === 0) {
-                trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING);
-                return;
-            }
-            if (!is_numeric($val)) {
-                trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING);
-                return;
-            }
-        }
-    }
-    // match all vars in equation, make sure all are passed
-    preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match);
-    foreach ($match[ 1 ] as $curr_var) {
-        if ($curr_var && !isset($params[ $curr_var ]) && !isset($_allowed_funcs[ $curr_var ])) {
-            trigger_error(
-                "math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'",
-                E_USER_WARNING
-            );
-            return;
-        }
-    }
-    foreach ($params as $key => $val) {
-        if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
-            $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
-        }
-    }
-    $smarty_math_result = null;
-    eval("\$smarty_math_result = " . $equation . ";");
-
-    if (empty($params[ 'format' ])) {
-        if (empty($params[ 'assign' ])) {
-            return $smarty_math_result;
-        } else {
-            $template->assign($params[ 'assign' ], $smarty_math_result);
-        }
-    } else {
-        if (empty($params[ 'assign' ])) {
-            printf($params[ 'format' ], $smarty_math_result);
-        } else {
-            $template->assign($params[ 'assign' ], sprintf($params[ 'format' ], $smarty_math_result));
-        }
-    }
-}
diff --git a/include/smarty/libs/plugins/modifier.capitalize.php b/include/smarty/libs/plugins/modifier.capitalize.php
deleted file mode 100644
index 2903d61d7..000000000
--- a/include/smarty/libs/plugins/modifier.capitalize.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-/**
- * Smarty capitalize modifier plugin
- * Type:     modifier
- * Name:     capitalize
- * Purpose:  capitalize words in the string
- * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
- *
- * @param string  $string    string to capitalize
- * @param boolean $uc_digits also capitalize "x123" to "X123"
- * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
- *
- * @return string capitalized string
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Rodney Rehm
- */
-function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
-{
-    $string = (string) $string;
-
-    if (Smarty::$_MBSTRING) {
-        if ($lc_rest) {
-            // uppercase (including hyphenated words)
-            $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
-        } else {
-            // uppercase word breaks
-            $upper_string = preg_replace_callback(
-                "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
-                'smarty_mod_cap_mbconvert_cb',
-                $string
-            );
-        }
-        // check uc_digits case
-        if (!$uc_digits) {
-            if (preg_match_all(
-                "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER,
-                $string,
-                $matches,
-                PREG_OFFSET_CAPTURE
-            )
-            ) {
-                foreach ($matches[ 1 ] as $match) {
-                    $upper_string =
-                        substr_replace(
-                            $upper_string,
-                            mb_strtolower($match[ 0 ], Smarty::$_CHARSET),
-                            $match[ 1 ],
-                            strlen($match[ 0 ])
-                        );
-                }
-            }
-        }
-        $upper_string =
-            preg_replace_callback(
-                "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER,
-                'smarty_mod_cap_mbconvert2_cb',
-                $upper_string
-            );
-        return $upper_string;
-    }
-    // lowercase first
-    if ($lc_rest) {
-        $string = strtolower($string);
-    }
-    // uppercase (including hyphenated words)
-    $upper_string =
-        preg_replace_callback(
-            "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
-            'smarty_mod_cap_ucfirst_cb',
-            $string
-        );
-    // check uc_digits case
-    if (!$uc_digits) {
-        if (preg_match_all(
-            "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER,
-            $string,
-            $matches,
-            PREG_OFFSET_CAPTURE
-        )
-        ) {
-            foreach ($matches[ 1 ] as $match) {
-                $upper_string =
-                    substr_replace($upper_string, strtolower($match[ 0 ]), $match[ 1 ], strlen($match[ 0 ]));
-            }
-        }
-    }
-    $upper_string = preg_replace_callback(
-        "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER,
-        'smarty_mod_cap_ucfirst2_cb',
-        $upper_string
-    );
-    return $upper_string;
-}
-
-/**
- *
- * Bug: create_function() use exhausts memory when used in long loops
- * Fix: use declared functions for callbacks instead of using create_function()
- * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3
- *
- * @author Kyle Renfrow
- */
-/**
- * @param $matches
- *
- * @return string
- */
-function smarty_mod_cap_mbconvert_cb($matches)
-{
-    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
-}
-
-/**
- * @param $matches
- *
- * @return string
- */
-function smarty_mod_cap_mbconvert2_cb($matches)
-{
-    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
-}
-
-/**
- * @param $matches
- *
- * @return string
- */
-function smarty_mod_cap_ucfirst_cb($matches)
-{
-    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
-}
-
-/**
- * @param $matches
- *
- * @return string
- */
-function smarty_mod_cap_ucfirst2_cb($matches)
-{
-    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));
-}
diff --git a/include/smarty/libs/plugins/modifier.count.php b/include/smarty/libs/plugins/modifier.count.php
deleted file mode 100644
index ca35fc115..000000000
--- a/include/smarty/libs/plugins/modifier.count.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-/**
- * Smarty count modifier plugin
- * Type:     modifier
- * Name:     count
- * Purpose:  counts all elements in an array or in a Countable object
- * Input:
- *          - Countable|array: array or object to count
- *          - mode: int defaults to 0 for normal count mode, if set to 1 counts recursive
-  *
- * @param mixed $arrayOrObject  input array/object
- * @param int $mode       count mode
- *
- * @return int
- */
-function smarty_modifier_count($arrayOrObject, $mode = 0)
-{
-    /*
-     * @see https://www.php.net/count
-     * > Prior to PHP 8.0.0, if the parameter was neither an array nor an object that implements the Countable interface,
-     * > 1 would be returned, unless value was null, in which case 0 would be returned.
-     */
-
-    if ($arrayOrObject instanceof Countable || is_array($arrayOrObject)) {
-        return count($arrayOrObject, (int) $mode);
-    } elseif ($arrayOrObject === null) {
-        return 0;
-    }
-    return 1;
-}
diff --git a/include/smarty/libs/plugins/modifier.date_format.php b/include/smarty/libs/plugins/modifier.date_format.php
deleted file mode 100644
index e3589fd07..000000000
--- a/include/smarty/libs/plugins/modifier.date_format.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-/**
- * Smarty date_format modifier plugin
- * Type:     modifier
- * Name:     date_format
- * Purpose:  format datestamps via strftime
- * Input:
- *          - string: input date string
- *          - format: strftime format for output
- *          - default_date: default date if $string is empty
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string $string       input date string
- * @param string $format       strftime format for output
- * @param string $default_date default date if $string is empty
- * @param string $formatter    either 'strftime' or 'auto'
- *
- * @return string |void
- * @uses   smarty_make_timestamp()
- */
-function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
-{
-    if ($format === null) {
-        $format = Smarty::$_DATE_FORMAT;
-    }
-    /**
-     * require_once the {@link shared.make_timestamp.php} plugin
-     */
-    static $is_loaded = false;
-    if (!$is_loaded) {
-        if (!is_callable('smarty_make_timestamp')) {
-            include_once SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php';
-        }
-        $is_loaded = true;
-    }
-    if (!empty($string) && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
-        $timestamp = smarty_make_timestamp($string);
-    } elseif (!empty($default_date)) {
-        $timestamp = smarty_make_timestamp($default_date);
-    } else {
-        return;
-    }
-    if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) {
-        if (Smarty::$_IS_WINDOWS) {
-            $_win_from = array(
-                '%D',
-                '%h',
-                '%n',
-                '%r',
-                '%R',
-                '%t',
-                '%T'
-            );
-            $_win_to = array(
-                '%m/%d/%y',
-                '%b',
-                "\n",
-                '%I:%M:%S %p',
-                '%H:%M',
-                "\t",
-                '%H:%M:%S'
-            );
-            if (strpos($format, '%e') !== false) {
-                $_win_from[] = '%e';
-                $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
-            }
-            if (strpos($format, '%l') !== false) {
-                $_win_from[] = '%l';
-                $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
-            }
-            $format = str_replace($_win_from, $_win_to, $format);
-        }
-        // @ to suppress deprecation errors when running in PHP8.1 or higher.
-        return @strftime($format, $timestamp);
-    } else {
-        return date($format, $timestamp);
-    }
-}
diff --git a/include/smarty/libs/plugins/modifier.debug_print_var.php b/include/smarty/libs/plugins/modifier.debug_print_var.php
deleted file mode 100644
index 78397d017..000000000
--- a/include/smarty/libs/plugins/modifier.debug_print_var.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage Debug
- */
-/**
- * Smarty debug_print_var modifier plugin
- * Type:     modifier
- * Name:     debug_print_var
- * Purpose:  formats variable contents for display in the console
- *
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param array|object $var     variable to be formatted
- * @param int          $max     maximum recursion depth if $var is an array or object
- * @param int          $length  maximum string length if $var is a string
- * @param int          $depth   actual recursion depth
- * @param array        $objects processed objects in actual depth to prevent recursive object processing
- *
- * @return string
- */
-function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
-{
-    $_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
-    switch (gettype($var)) {
-        case 'array':
-            $results = '<b>Array (' . count($var) . ')</b>';
-            if ($depth === $max) {
-                break;
-            }
-            foreach ($var as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b>' . strtr($curr_key, $_replace) .
-                            '</b> =&gt; ' .
-                            smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
-                $depth--;
-            }
-            break;
-        case 'object':
-            $object_vars = get_object_vars($var);
-            $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
-            if (in_array($var, $objects)) {
-                $results .= ' called recursive';
-                break;
-            }
-            if ($depth === $max) {
-                break;
-            }
-            $objects[] = $var;
-            foreach ($object_vars as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b> -&gt;' . strtr($curr_key, $_replace) .
-                            '</b> = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
-                $depth--;
-            }
-            break;
-        case 'boolean':
-        case 'NULL':
-        case 'resource':
-            if (true === $var) {
-                $results = 'true';
-            } elseif (false === $var) {
-                $results = 'false';
-            } elseif (null === $var) {
-                $results = 'null';
-            } else {
-                $results = htmlspecialchars((string)$var);
-            }
-            $results = '<i>' . $results . '</i>';
-            break;
-        case 'integer':
-        case 'float':
-            $results = htmlspecialchars((string)$var);
-            break;
-        case 'string':
-            $results = strtr($var, $_replace);
-            if (Smarty::$_MBSTRING) {
-                if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
-                    $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
-                }
-            } else {
-                if (isset($var[ $length ])) {
-                    $results = substr($var, 0, $length - 3) . '...';
-                }
-            }
-            $results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, Smarty::$_CHARSET);
-            break;
-        case 'unknown type':
-        default:
-            $results = strtr((string)$var, $_replace);
-            if (Smarty::$_MBSTRING) {
-                if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
-                    $results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
-                }
-            } else {
-                if (strlen($results) > $length) {
-                    $results = substr($results, 0, $length - 3) . '...';
-                }
-            }
-            $results = htmlspecialchars($results, ENT_QUOTES, Smarty::$_CHARSET);
-    }
-    return $results;
-}
diff --git a/include/smarty/libs/plugins/modifier.escape.php b/include/smarty/libs/plugins/modifier.escape.php
deleted file mode 100644
index e168679c3..000000000
--- a/include/smarty/libs/plugins/modifier.escape.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-/**
- * Smarty escape modifier plugin
- * Type:     modifier
- * Name:     escape
- * Purpose:  escape string for output
- *
- * @link   https://www.smarty.net/docs/en/language.modifier.escape
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string  $string        input string
- * @param string  $esc_type      escape type
- * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
- * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
- *
- * @return string escaped input string
- */
-function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
-{
-    static $is_loaded_1 = false;
-    static $is_loaded_2 = false;
-    if (!$char_set) {
-        $char_set = Smarty::$_CHARSET;
-    }
-
-    $string = (string)$string;
-
-    switch ($esc_type) {
-        case 'html':
-            return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-        // no break
-        case 'htmlall':
-            if (Smarty::$_MBSTRING) {
-                $string = mb_convert_encoding($string, 'UTF-8', $char_set);
-                return htmlentities($string, ENT_QUOTES, 'UTF-8', $double_encode);
-            }
-            // no MBString fallback
-            return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
-        // no break
-        case 'url':
-            return rawurlencode($string);
-        case 'urlpathinfo':
-            return str_replace('%2F', '/', rawurlencode($string));
-        case 'quotes':
-            // escape unescaped single quotes
-            return preg_replace("%(?<!\\\\)'%", "\\'", $string);
-        case 'hex':
-            // escape every byte into hex
-            // Note that the UTF-8 encoded character ä will be represented as %c3%a4
-            $return = '';
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
-                $return .= '%' . bin2hex($string[ $x ]);
-            }
-            return $return;
-        case 'hexentity':
-            $return = '';
-            if (Smarty::$_MBSTRING) {
-                if (!$is_loaded_1) {
-                    if (!is_callable('smarty_mb_to_unicode')) {
-                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
-                    }
-                    $is_loaded_1 = true;
-                }
-                $return = '';
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    $return .= '&#x' . strtoupper(dechex($unicode)) . ';';
-                }
-                return $return;
-            }
-            // no MBString fallback
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
-                $return .= '&#x' . bin2hex($string[ $x ]) . ';';
-            }
-            return $return;
-        case 'decentity':
-            $return = '';
-            if (Smarty::$_MBSTRING) {
-                if (!$is_loaded_1) {
-                    if (!is_callable('smarty_mb_to_unicode')) {
-                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
-                    }
-                    $is_loaded_1 = true;
-                }
-                $return = '';
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    $return .= '&#' . $unicode . ';';
-                }
-                return $return;
-            }
-            // no MBString fallback
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
-                $return .= '&#' . ord($string[ $x ]) . ';';
-            }
-            return $return;
-        case 'javascript':
-            // escape quotes and backslashes, newlines, etc.
-            return strtr(
-                $string,
-                array(
-                    '\\' => '\\\\',
-                    "'"  => "\\'",
-                    '"'  => '\\"',
-                    "\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':
-            if (Smarty::$_MBSTRING) {
-                if (!$is_loaded_2) {
-                    if (!is_callable('smarty_mb_str_replace')) {
-                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php';
-                    }
-                    $is_loaded_2 = true;
-                }
-                return smarty_mb_str_replace(
-                    array(
-                        '@',
-                        '.'
-                    ),
-                    array(
-                        ' [AT] ',
-                        ' [DOT] '
-                    ),
-                    $string
-                );
-            }
-            // no MBString fallback
-            return str_replace(
-                array(
-                    '@',
-                    '.'
-                ),
-                array(
-                    ' [AT] ',
-                    ' [DOT] '
-                ),
-                $string
-            );
-        case 'nonstd':
-            // escape non-standard chars, such as ms document quotes
-            $return = '';
-            if (Smarty::$_MBSTRING) {
-                if (!$is_loaded_1) {
-                    if (!is_callable('smarty_mb_to_unicode')) {
-                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
-                    }
-                    $is_loaded_1 = true;
-                }
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    if ($unicode >= 126) {
-                        $return .= '&#' . $unicode . ';';
-                    } else {
-                        $return .= chr($unicode);
-                    }
-                }
-                return $return;
-            }
-            $_length = strlen($string);
-            for ($_i = 0; $_i < $_length; $_i++) {
-                $_ord = ord(substr($string, $_i, 1));
-                // non-standard char, escape it
-                if ($_ord >= 126) {
-                    $return .= '&#' . $_ord . ';';
-                } else {
-                    $return .= substr($string, $_i, 1);
-                }
-            }
-            return $return;
-        default:
-            trigger_error("escape: unsupported type: $esc_type - returning unmodified string", E_USER_NOTICE);
-            return $string;
-    }
-}
diff --git a/include/smarty/libs/plugins/modifier.explode.php b/include/smarty/libs/plugins/modifier.explode.php
deleted file mode 100644
index 527d29771..000000000
--- a/include/smarty/libs/plugins/modifier.explode.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty explode modifier plugin
- * Type:     modifier
- * Name:     explode
- * Purpose:  split a string by a string
- *
- * @param string   $separator
- * @param string   $string
- * @param int|null $limit
- *
- * @return array
- */
-function smarty_modifier_explode($separator, $string, $limit = null)
-{
-    // provide $string default to prevent deprecation errors in PHP >=8.1
-    return explode($separator, $string ?? '', $limit ?? PHP_INT_MAX);
-}
diff --git a/include/smarty/libs/plugins/modifier.mb_wordwrap.php b/include/smarty/libs/plugins/modifier.mb_wordwrap.php
deleted file mode 100644
index 7c7bd875f..000000000
--- a/include/smarty/libs/plugins/modifier.mb_wordwrap.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-/**
- * Smarty wordwrap modifier plugin
- * Type:     modifier
- * Name:     mb_wordwrap
- * Purpose:  Wrap a string to a given number of characters
- *
- * @link   https://php.net/manual/en/function.wordwrap.php for similarity
- *
- * @param string  $str   the string to wrap
- * @param int     $width the width of the output
- * @param string  $break the character used to break the line
- * @param boolean $cut   ignored parameter, just for the sake of
- *
- * @return string  wrapped string
- * @author Rodney Rehm
- */
-function smarty_modifier_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
-{
-    // break words into tokens using white space as a delimiter
-    $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-    $length = 0;
-    $t = '';
-    $_previous = false;
-    $_space = false;
-    foreach ($tokens as $_token) {
-        $token_length = mb_strlen($_token, Smarty::$_CHARSET);
-        $_tokens = array($_token);
-        if ($token_length > $width) {
-            if ($cut) {
-                $_tokens = preg_split(
-                    '!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER,
-                    $_token,
-                    -1,
-                    PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE
-                );
-            }
-        }
-        foreach ($_tokens as $token) {
-            $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
-            $token_length = mb_strlen($token, Smarty::$_CHARSET);
-            $length += $token_length;
-            if ($length > $width) {
-                // remove space before inserted break
-                if ($_previous) {
-                    $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
-                }
-                if (!$_space) {
-                    // add the break before the token
-                    if (!empty($t)) {
-                        $t .= $break;
-                    }
-                    $length = $token_length;
-                }
-            } elseif ($token === "\n") {
-                // hard break must reset counters
-                $length = 0;
-            }
-            $_previous = $_space;
-            // add the token
-            $t .= $token;
-        }
-    }
-    return $t;
-}
diff --git a/include/smarty/libs/plugins/modifier.number_format.php b/include/smarty/libs/plugins/modifier.number_format.php
deleted file mode 100644
index 629966e75..000000000
--- a/include/smarty/libs/plugins/modifier.number_format.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty number_format modifier plugin
- * Type:     modifier
- * Name:     number_format
- * Purpose:  Format a number with grouped thousands
- *
- * @param float|null  $num
- * @param int         $decimals
- * @param string|null $decimal_separator
- * @param string|null $thousands_separator
- *
- * @return string
- */
-function smarty_modifier_number_format($num, int $decimals = 0, $decimal_separator = ".", $thousands_separator = ",")
-{
-    // provide $num default to prevent deprecation errors in PHP >=8.1
-    return number_format($num ?? 0.0, $decimals, $decimal_separator, $thousands_separator);
-}
diff --git a/include/smarty/libs/plugins/modifier.regex_replace.php b/include/smarty/libs/plugins/modifier.regex_replace.php
deleted file mode 100644
index cd57cdf33..000000000
--- a/include/smarty/libs/plugins/modifier.regex_replace.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-/**
- * Smarty regex_replace modifier plugin
- * Type:     modifier
- * Name:     regex_replace
- * Purpose:  regular expression search/replace
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.regex.replace.php
- *          regex_replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string       $string  input string
- * @param string|array $search  regular expression(s) to search for
- * @param string|array $replace string(s) that should be replaced
- * @param int          $limit   the maximum number of replacements
- *
- * @return string
- */
-function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
-{
-    if (is_array($search)) {
-        foreach ($search as $idx => $s) {
-            $search[ $idx ] = _smarty_regex_replace_check($s);
-        }
-    } else {
-        $search = _smarty_regex_replace_check($search);
-    }
-    return preg_replace($search, $replace, $string, $limit);
-}
-
-/**
- * @param  string $search string(s) that should be replaced
- *
- * @return string
- * @ignore
- */
-function _smarty_regex_replace_check($search)
-{
-    // null-byte injection detection
-    // anything behind the first null-byte is ignored
-    if (($pos = strpos($search, "\0")) !== false) {
-        $search = substr($search, 0, $pos);
-    }
-    // remove eval-modifier from $search
-    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[ 1 ], 'e') !== false)) {
-        $search = substr($search, 0, -strlen($match[ 1 ])) . preg_replace('![e\s]+!', '', $match[ 1 ]);
-    }
-    return $search;
-}
diff --git a/include/smarty/libs/plugins/modifier.replace.php b/include/smarty/libs/plugins/modifier.replace.php
deleted file mode 100644
index 71a7c632a..000000000
--- a/include/smarty/libs/plugins/modifier.replace.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-/**
- * Smarty replace modifier plugin
- * Type:     modifier
- * Name:     replace
- * Purpose:  simple search/replace
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- *
- * @param string $string  input string
- * @param string $search  text to search for
- * @param string $replace replacement text
- *
- * @return string
- */
-function smarty_modifier_replace($string, $search, $replace)
-{
-    static $is_loaded = false;
-    if (Smarty::$_MBSTRING) {
-        if (!$is_loaded) {
-            if (!is_callable('smarty_mb_str_replace')) {
-                include_once SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php';
-            }
-            $is_loaded = true;
-        }
-        return smarty_mb_str_replace($search, $replace, $string);
-    }
-    return str_replace($search, $replace, $string);
-}
diff --git a/include/smarty/libs/plugins/modifier.spacify.php b/include/smarty/libs/plugins/modifier.spacify.php
deleted file mode 100644
index 251dbe71b..000000000
--- a/include/smarty/libs/plugins/modifier.spacify.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-/**
- * Smarty spacify modifier plugin
- * Type:     modifier
- * 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)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string $string       input string
- * @param string $spacify_char string to insert between characters.
- *
- * @return string
- */
-function smarty_modifier_spacify($string, $spacify_char = ' ')
-{
-    // well… what about charsets besides latin and UTF-8?
-    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
-}
diff --git a/include/smarty/libs/plugins/modifier.truncate.php b/include/smarty/libs/plugins/modifier.truncate.php
deleted file mode 100644
index d253e4a61..000000000
--- a/include/smarty/libs/plugins/modifier.truncate.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-/**
- * Smarty truncate modifier plugin
- * Type:     modifier
- * Name:     truncate
- * Purpose:  Truncate a string to a certain length if necessary,
- *               optionally splitting in the middle of a word, and
- *               appending the $etc string or inserting $etc into the middle.
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string  $string      input string
- * @param integer $length      length of truncated text
- * @param string  $etc         end string
- * @param boolean $break_words truncate at word boundary
- * @param boolean $middle      truncate in the middle of text
- *
- * @return string truncated string
- */
-function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
-{
-    if ($length === 0 || $string === null) {
-        return '';
-    }
-    if (Smarty::$_MBSTRING) {
-        if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
-            $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
-            if (!$break_words && !$middle) {
-                $string = preg_replace(
-                    '/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER,
-                    '',
-                    mb_substr($string, 0, $length + 1, Smarty::$_CHARSET)
-                );
-            }
-            if (!$middle) {
-                return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
-            }
-            return mb_substr($string, 0, intval($length / 2), Smarty::$_CHARSET) . $etc .
-                   mb_substr($string, -intval($length / 2), $length, Smarty::$_CHARSET);
-        }
-        return $string;
-    }
-    // no MBString fallback
-    if (isset($string[ $length ])) {
-        $length -= min($length, strlen($etc));
-        if (!$break_words && !$middle) {
-            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
-        }
-        if (!$middle) {
-            return substr($string, 0, $length) . $etc;
-        }
-        return substr($string, 0, intval($length / 2)) . $etc . substr($string, -intval($length / 2));
-    }
-    return $string;
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.cat.php b/include/smarty/libs/plugins/modifiercompiler.cat.php
deleted file mode 100644
index 2c3a8b2a4..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.cat.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty cat modifier plugin
- * Type:     modifier
- * Name:     cat
- * Date:     Feb 24, 2003
- * Purpose:  catenate a value to a variable
- * Input:    string to catenate
- * Example:  {$var|cat:"foo"}
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.cat.php cat
- *           (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_cat($params)
-{
-    return '(' . implode(').(', $params) . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.count_characters.php b/include/smarty/libs/plugins/modifiercompiler.count_characters.php
deleted file mode 100644
index 7798cabc1..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.count_characters.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_characters modifier plugin
- * Type:     modifier
- * 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
- *         manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_characters($params)
-{
-    if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
-        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
-    }
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strlen((string) ' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strlen((string) ' . $params[ 0 ] . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php b/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
deleted file mode 100644
index 332402968..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_paragraphs modifier plugin
- * Type:     modifier
- * Name:     count_paragraphs
- * Purpose:  count the number of paragraphs in a text
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_paragraphs (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_paragraphs($params)
-{
-    // count \r or \n characters
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.count_sentences.php b/include/smarty/libs/plugins/modifiercompiler.count_sentences.php
deleted file mode 100644
index 30e36e5f0..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.count_sentences.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_sentences modifier plugin
- * Type:     modifier
- * Name:     count_sentences
- * Purpose:  count the number of sentences in a text
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_sentences (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_sentences($params)
-{
-    // find periods, question marks, exclamation marks with a word before but not after.
-    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.count_words.php b/include/smarty/libs/plugins/modifiercompiler.count_words.php
deleted file mode 100644
index 48a3daa17..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.count_words.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_words modifier plugin
- * Type:     modifier
- * 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)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_words($params)
-{
-    if (Smarty::$_MBSTRING) {
-        // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
-        // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
-        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' .
-               $params[ 0 ] . ', $tmp)';
-    }
-    // no MBString fallback
-    return 'str_word_count((string) ' . $params[ 0 ] . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.default.php b/include/smarty/libs/plugins/modifiercompiler.default.php
deleted file mode 100644
index dffa7a986..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.default.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty default modifier plugin
- * Type:     modifier
- * Name:     default
- * Purpose:  designate default value for empty variables
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_default($params)
-{
-    $output = $params[ 0 ];
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = "''";
-    }
-    array_shift($params);
-    foreach ($params as $param) {
-        $output = '(($tmp = ' . $output . ' ?? null)===null||$tmp===\'\' ? ' . $param . ' ?? null : $tmp)';
-    }
-    return $output;
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.escape.php b/include/smarty/libs/plugins/modifiercompiler.escape.php
deleted file mode 100644
index 21b1b4c2a..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.escape.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty escape modifier plugin
- * Type:     modifier
- * Name:     escape
- * Purpose:  escape string for output
- *
- * @link   https://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
- * @author Rodney Rehm
- *
- * @param array                                $params parameters
- * @param Smarty_Internal_TemplateCompilerBase $compiler
- *
- * @return string with compiled code
- * @throws SmartyException
- */
-function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
-{
-    $compiler->template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_literal_compiler_param',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
-            )
-        )
-    );
-    try {
-        $esc_type = smarty_literal_compiler_param($params, 1, 'html');
-        $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
-        $double_encode = smarty_literal_compiler_param($params, 3, true);
-        if (!$char_set) {
-            $char_set = Smarty::$_CHARSET;
-        }
-        switch ($esc_type) {
-            case 'html':
-                return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
-                    var_export($double_encode, true) . ')';
-            // no break
-            case 'htmlall':
-                if (Smarty::$_MBSTRING) {
-                    return 'htmlentities(mb_convert_encoding((string)' . $params[ 0 ] . ', \'UTF-8\', ' .
-                        var_export($char_set, true) . '), ENT_QUOTES, \'UTF-8\', ' .
-                        var_export($double_encode, true) . ')';
-                }
-                // no MBString fallback
-                return 'htmlentities((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
-                    var_export($double_encode, true) . ')';
-            // no break
-            case 'url':
-                return 'rawurlencode((string)' . $params[ 0 ] . ')';
-            case 'urlpathinfo':
-                return 'str_replace("%2F", "/", rawurlencode((string)' . $params[ 0 ] . '))';
-            case 'quotes':
-                // escape unescaped single quotes
-                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'", (string)' . $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((string)' .
-                       $params[ 0 ] .
-                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", 
-                       "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S",
-                       "`" => "\\\\`", "\${" => "\\\\\\$\\{"))';
-        }
-    } catch (SmartyException $e) {
-        // pass through to regular plugin fallback
-    }
-    // could not optimize |escape call, so fallback to regular plugin
-    if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] =
-            SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] =
-            'smarty_modifier_escape';
-    } else {
-        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] =
-            SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] =
-            'smarty_modifier_escape';
-    }
-    return 'smarty_modifier_escape(' . join(', ', $params) . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.from_charset.php b/include/smarty/libs/plugins/modifiercompiler.from_charset.php
deleted file mode 100644
index acce7784b..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.from_charset.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty from_charset modifier plugin
- * Type:     modifier
- * Name:     from_charset
- * Purpose:  convert character encoding from $charset to internal encoding
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_from_charset($params)
-{
-    if (!Smarty::$_MBSTRING) {
-        // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[ 0 ];
-    }
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = '"ISO-8859-1"';
-    }
-    return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.indent.php b/include/smarty/libs/plugins/modifiercompiler.indent.php
deleted file mode 100644
index 636f0edf1..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.indent.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty indent modifier plugin
- * Type:     modifier
- * Name:     indent
- * Purpose:  indent lines of text
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_indent($params)
-{
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = 4;
-    }
-    if (!isset($params[ 2 ])) {
-        $params[ 2 ] = "' '";
-    }
-    return 'preg_replace(\'!^!m\',str_repeat(' . $params[ 2 ] . ',' . $params[ 1 ] . '),' . $params[ 0 ] . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.lower.php b/include/smarty/libs/plugins/modifiercompiler.lower.php
deleted file mode 100644
index 4144e5619..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.lower.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty lower modifier plugin
- * Type:     modifier
- * Name:     lower
- * Purpose:  convert string to lowercase
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_lower($params)
-{
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strtolower((string) ' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strtolower((string) ' . $params[ 0 ] . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.nl2br.php b/include/smarty/libs/plugins/modifiercompiler.nl2br.php
deleted file mode 100644
index 308c00e42..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.nl2br.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty nl2br modifier plugin
- * Type:     modifier
- * Name:     nl2br
- * Purpose:  insert HTML line breaks before all newlines in a string
- *
- * @link   https://www.smarty.net/docs/en/language.modifier.nl2br.tpl nl2br (Smarty online manual)
-  *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_nl2br($params) {
-    return 'nl2br((string) ' . $params[0] . ', (bool) ' . ($params[1] ?? true) . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.noprint.php b/include/smarty/libs/plugins/modifiercompiler.noprint.php
deleted file mode 100644
index 1275190e0..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.noprint.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty noprint modifier plugin
- * Type:     modifier
- * Name:     noprint
- * Purpose:  return an empty string
- *
- * @author Uwe Tews
- * @return string with compiled code
- */
-function smarty_modifiercompiler_noprint()
-{
-    return "''";
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.round.php b/include/smarty/libs/plugins/modifiercompiler.round.php
deleted file mode 100644
index 97f072f00..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.round.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty round modifier plugin
- * Type:     modifier
- * Name:     round
- * Purpose:  Returns the rounded value of num to specified precision (number of digits after the decimal point)
- *
- * @link   https://www.smarty.net/docs/en/language.modifier.round.tpl round (Smarty online manual)
-  *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_round($params) {
-    return 'round((float) ' . $params[0] . ', (int) ' . ($params[1] ?? 0) . ', (int) ' . ($params[2] ?? PHP_ROUND_HALF_UP) . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.str_repeat.php b/include/smarty/libs/plugins/modifiercompiler.str_repeat.php
deleted file mode 100644
index 18eb7a762..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.str_repeat.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty str_repeat modifier plugin
- * Type:     modifier
- * Name:     str_repeat
- * Purpose:  returns string repeated times times
- *
- * @link   https://www.smarty.net/docs/en/language.modifier.str_repeat.tpl str_repeat (Smarty online manual)
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_str_repeat($params) {
-    return 'str_repeat((string) ' . $params[0] . ', (int) ' . $params[1] . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.string_format.php b/include/smarty/libs/plugins/modifiercompiler.string_format.php
deleted file mode 100644
index 8df5632c5..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.string_format.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty string_format modifier plugin
- * Type:     modifier
- * 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)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_string_format($params)
-{
-    return 'sprintf(' . $params[ 1 ] . ',' . $params[ 0 ] . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.strip.php b/include/smarty/libs/plugins/modifiercompiler.strip.php
deleted file mode 100644
index 51944bde6..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.strip.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty strip modifier plugin
- * Type:     modifier
- * Name:     strip
- * Purpose:  Replace all repeated spaces, newlines, tabs
- *              with a single space or supplied replacement string.
- * Example:  {$var|strip} {$var|strip:"&nbsp;"}
- * Date:     September 25th, 2002
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_strip($params)
-{
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = "' '";
-    }
-    return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.strip_tags.php b/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
deleted file mode 100644
index bd866a61f..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty strip_tags modifier plugin
- * Type:     modifier
- * 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)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_strip_tags($params)
-{
-    if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
-        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]} ?: '')";
-    } else {
-        return 'strip_tags((string) ' . $params[ 0 ] . ')';
-    }
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.strlen.php b/include/smarty/libs/plugins/modifiercompiler.strlen.php
deleted file mode 100644
index d43e8ef1c..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.strlen.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty strlen modifier plugin
- * Type:     modifier
- * Name:     strlen
- * Purpose:  return the length of the given string
- *
- * @link   https://www.smarty.net/docs/en/language.modifier.strlen.tpl strlen (Smarty online manual)
-  *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_strlen($params) {
-    return 'strlen((string) ' . $params[0] . ')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.to_charset.php b/include/smarty/libs/plugins/modifiercompiler.to_charset.php
deleted file mode 100644
index d652eab1b..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.to_charset.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty to_charset modifier plugin
- * Type:     modifier
- * Name:     to_charset
- * Purpose:  convert character encoding from internal encoding to $charset
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_to_charset($params)
-{
-    if (!Smarty::$_MBSTRING) {
-        // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[ 0 ];
-    }
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = '"ISO-8859-1"';
-    }
-    return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 1 ] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.unescape.php b/include/smarty/libs/plugins/modifiercompiler.unescape.php
deleted file mode 100644
index 9e1f06d67..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.unescape.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty unescape modifier plugin
- * Type:     modifier
- * Name:     unescape
- * Purpose:  unescape html entities
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- * @param Smarty_Internal_TemplateCompilerBase $compiler
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_unescape($params, Smarty_Internal_TemplateCompilerBase $compiler)
-{
-    $compiler->template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_literal_compiler_param',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
-            )
-        )
-    );
-
-    $esc_type = smarty_literal_compiler_param($params, 1, 'html');
-
-    if (!isset($params[ 2 ])) {
-        $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
-    }
-
-    switch ($esc_type) {
-        case 'entity':
-        case 'htmlall':
-            if (Smarty::$_MBSTRING) {
-                return 'html_entity_decode(mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'UTF-8\'), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
-            }
-            return 'html_entity_decode(' . $params[ 0 ] . ', ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
-        case 'html':
-            return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
-        case 'url':
-            return 'rawurldecode(' . $params[ 0 ] . ')';
-        default:
-            return $params[ 0 ];
-    }
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.upper.php b/include/smarty/libs/plugins/modifiercompiler.upper.php
deleted file mode 100644
index 96030518e..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.upper.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty upper modifier plugin
- * Type:     modifier
- * Name:     lower
- * Purpose:  convert string to uppercase
- *
- * @link   https://www.smarty.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_upper($params)
-{
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strtoupper((string) ' . $params[ 0 ] . ' ?? \'\', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strtoupper((string) ' . $params[ 0 ] . ' ?? \'\')';
-}
diff --git a/include/smarty/libs/plugins/modifiercompiler.wordwrap.php b/include/smarty/libs/plugins/modifiercompiler.wordwrap.php
deleted file mode 100644
index 49cb40b0f..000000000
--- a/include/smarty/libs/plugins/modifiercompiler.wordwrap.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty wordwrap modifier plugin
- * Type:     modifier
- * 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)
- * @author Uwe Tews
- *
- * @param array                                 $params parameters
- * @param \Smarty_Internal_TemplateCompilerBase $compiler
- *
- * @return string with compiled code
- * @throws \SmartyException
- */
-function smarty_modifiercompiler_wordwrap($params, Smarty_Internal_TemplateCompilerBase $compiler)
-{
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = 80;
-    }
-    if (!isset($params[ 2 ])) {
-        $params[ 2 ] = '"\n"';
-    }
-    if (!isset($params[ 3 ])) {
-        $params[ 3 ] = 'false';
-    }
-    $function = 'wordwrap';
-    if (Smarty::$_MBSTRING) {
-        $function = $compiler->getPlugin('mb_wordwrap', 'modifier');
-    }
-    return $function . '(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
-}
diff --git a/include/smarty/libs/plugins/outputfilter.trimwhitespace.php b/include/smarty/libs/plugins/outputfilter.trimwhitespace.php
deleted file mode 100644
index 180cdd081..000000000
--- a/include/smarty/libs/plugins/outputfilter.trimwhitespace.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFilter
- */
-/**
- * Smarty trimwhitespace outputfilter plugin
- * Trim unnecessary whitespace from HTML markup.
- *
- * @author Rodney Rehm
- *
- * @param string $source input string
- *
- * @return string filtered output
- * @todo   substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
- */
-function smarty_outputfilter_trimwhitespace($source)
-{
-    $store = array();
-    $_store = 0;
-    $_offset = 0;
-    // Unify Line-Breaks to \n
-    $source = preg_replace('/\015\012|\015|\012/', "\n", $source);
-    // capture Internet Explorer and KnockoutJS Conditional Comments
-    if (preg_match_all(
-        '#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is',
-        $source,
-        $matches,
-        PREG_OFFSET_CAPTURE | PREG_SET_ORDER
-    )
-    ) {
-        foreach ($matches as $match) {
-            $store[] = $match[ 0 ][ 0 ];
-            $_length = strlen($match[ 0 ][ 0 ]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
-            $_offset += $_length - strlen($replace);
-            $_store++;
-        }
-    }
-    // Strip all HTML-Comments
-    // yes, even the ones in <script> - see https://stackoverflow.com/a/808850/515124
-    $source = preg_replace('#<!--.*?-->#ms', '', $source);
-    // capture html elements not to be messed with
-    $_offset = 0;
-    if (preg_match_all(
-        '#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
-        $source,
-        $matches,
-        PREG_OFFSET_CAPTURE | PREG_SET_ORDER
-    )
-    ) {
-        foreach ($matches as $match) {
-            $store[] = $match[ 0 ][ 0 ];
-            $_length = strlen($match[ 0 ][ 0 ]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
-            $_offset += $_length - strlen($replace);
-            $_store++;
-        }
-    }
-    $expressions = array(// replace multiple spaces between tags by a single space
-                         // can't remove them entirely, because that might break poorly implemented CSS display:inline-block elements
-                         '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                                    => '\1 \2',
-                         // remove spaces between attributes (but not in attribute values!)
-                         '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
-                         // note: for some very weird reason trim() seems to remove spaces inside attributes.
-                         // maybe a \0 byte or something is interfering?
-                         '#^\s+<#Ss'                                                               => '<',
-                         '#>\s+$#Ss'                                                               => '>',
-    );
-    $source = preg_replace(array_keys($expressions), array_values($expressions), $source);
-    // note: for some very weird reason trim() seems to remove spaces inside attributes.
-    // maybe a \0 byte or something is interfering?
-    // $source = trim( $source );
-    $_offset = 0;
-    if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $_length = strlen($match[ 0 ][ 0 ]);
-            $replace = $store[ $match[ 1 ][ 0 ] ];
-            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
-            $_offset += strlen($replace) - $_length;
-            $_store++;
-        }
-    }
-    return $source;
-}
diff --git a/include/smarty/libs/plugins/shared.escape_special_chars.php b/include/smarty/libs/plugins/shared.escape_special_chars.php
deleted file mode 100644
index 355b02b57..000000000
--- a/include/smarty/libs/plugins/shared.escape_special_chars.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-/**
- * escape_special_chars common function
- * Function: smarty_function_escape_special_chars
- * Purpose:  used by other smarty functions to escape
- *           special chars except for already escaped ones
- *
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string $string text that should by escaped
- *
- * @return string
- */
-function smarty_function_escape_special_chars($string)
-{
-    if (!is_array($string)) {
-        $string = htmlspecialchars((string) $string, ENT_COMPAT, Smarty::$_CHARSET, false);
-    }
-    return $string;
-}
diff --git a/include/smarty/libs/plugins/shared.literal_compiler_param.php b/include/smarty/libs/plugins/shared.literal_compiler_param.php
deleted file mode 100644
index 65caf03c8..000000000
--- a/include/smarty/libs/plugins/shared.literal_compiler_param.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-/**
- * evaluate compiler parameter
- *
- * @param array   $params  parameter array as given to the compiler function
- * @param integer $index   array index of the parameter to convert
- * @param mixed   $default value to be returned if the parameter is not present
- *
- * @return mixed evaluated value of parameter or $default
- * @throws SmartyException if parameter is not a literal (but an expression, variable, …)
- * @author Rodney Rehm
- */
-function smarty_literal_compiler_param($params, $index, $default = null)
-{
-    // not set, go default
-    if (!isset($params[ $index ])) {
-        return $default;
-    }
-    // test if param is a literal
-    if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[ $index ])) {
-        throw new SmartyException(
-            '$param[' . $index .
-            '] is not a literal and is thus not evaluatable at compile time'
-        );
-    }
-    $t = null;
-    eval("\$t = " . $params[ $index ] . ";");
-    return $t;
-}
diff --git a/include/smarty/libs/plugins/shared.make_timestamp.php b/include/smarty/libs/plugins/shared.make_timestamp.php
deleted file mode 100644
index 9626dc68e..000000000
--- a/include/smarty/libs/plugins/shared.make_timestamp.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-/**
- * Function: smarty_make_timestamp
- * Purpose:  used by other smarty functions to make a timestamp from a string.
- *
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
- *
- * @return int
- */
-function smarty_make_timestamp($string)
-{
-    if (empty($string)) {
-        // use "now":
-        return time();
-    } elseif ($string instanceof DateTime
-              || (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)
-    ) {
-        return (int)$string->format('U'); // PHP 5.2 BC
-    } elseif (strlen($string) === 14 && ctype_digit($string)) {
-        // it is mysql timestamp format of YYYYMMDDHHMMSS?
-        return mktime(
-            substr($string, 8, 2),
-            substr($string, 10, 2),
-            substr($string, 12, 2),
-            substr($string, 4, 2),
-            substr($string, 6, 2),
-            substr($string, 0, 4)
-        );
-    } elseif (is_numeric($string)) {
-        // it is a numeric string, we handle it as timestamp
-        return (int)$string;
-    } else {
-        // strtotime should handle it
-        $time = strtotime($string);
-        if ($time === -1 || $time === false) {
-            // strtotime() was not able to parse $string, use "now":
-            return time();
-        }
-        return $time;
-    }
-}
diff --git a/include/smarty/libs/plugins/shared.mb_str_replace.php b/include/smarty/libs/plugins/shared.mb_str_replace.php
deleted file mode 100644
index 7e85f7aae..000000000
--- a/include/smarty/libs/plugins/shared.mb_str_replace.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-if (!function_exists('smarty_mb_str_replace')) {
-    /**
-     * Multibyte string replace
-     *
-     * @param string|string[] $search  the string to be searched
-     * @param string|string[] $replace the replacement string
-     * @param string          $subject the source string
-     * @param int             &$count  number of matches found
-     *
-     * @return string replaced string
-     * @author Rodney Rehm
-     */
-    function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
-    {
-        if (!is_array($search) && is_array($replace)) {
-            return false;
-        }
-        if (is_array($subject)) {
-            // call mb_replace for each single string in $subject
-            foreach ($subject as &$string) {
-                $string = smarty_mb_str_replace($search, $replace, $string, $c);
-                $count += $c;
-            }
-        } elseif (is_array($search)) {
-            if (!is_array($replace)) {
-                foreach ($search as &$string) {
-                    $subject = smarty_mb_str_replace($string, $replace, $subject, $c);
-                    $count += $c;
-                }
-            } else {
-                $n = max(count($search), count($replace));
-                while ($n--) {
-                    $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
-                    $count += $c;
-                    next($search);
-                    next($replace);
-                }
-            }
-        } else {
-            $mb_reg_charset = mb_regex_encoding();
-            // Check if mbstring regex is using UTF-8
-            $reg_is_unicode = !strcasecmp($mb_reg_charset, "UTF-8");
-            if(!$reg_is_unicode) {
-                // ...and set to UTF-8 if not
-                mb_regex_encoding("UTF-8");
-            }
-
-            // See if charset used by Smarty is matching one used by regex...
-            $current_charset = mb_regex_encoding();
-            $convert_result = (bool)strcasecmp(Smarty::$_CHARSET, $current_charset);
-            if($convert_result) {
-                // ...convert to it if not.
-                $subject = mb_convert_encoding($subject, $current_charset, Smarty::$_CHARSET);
-                $search = mb_convert_encoding($search, $current_charset, Smarty::$_CHARSET);
-                $replace = mb_convert_encoding($replace, $current_charset, Smarty::$_CHARSET);
-            }
-
-            $parts = mb_split(preg_quote($search), $subject ?? "") ?: array();
-            // If original regex encoding was not unicode...
-            if(!$reg_is_unicode) {
-                // ...restore original regex encoding to avoid breaking the system.
-                mb_regex_encoding($mb_reg_charset);
-            }
-            if($parts === false) {
-                // This exception is thrown if call to mb_split failed.
-                // Usually it happens, when $search or $replace are not valid for given mb_regex_encoding().
-                // There may be other cases for it to fail, please file an issue if you find a reproducible one.
-                throw new SmartyException("Source string is not a valid $current_charset sequence (probably)");
-            }
-
-            $count = count($parts) - 1;
-            $subject = implode($replace, $parts);
-            // Convert results back to charset used by Smarty, if needed.
-            if($convert_result) {
-                $subject = mb_convert_encoding($subject, Smarty::$_CHARSET, $current_charset);
-            }
-        }
-        return $subject;
-    }
-}
diff --git a/include/smarty/libs/plugins/shared.mb_unicode.php b/include/smarty/libs/plugins/shared.mb_unicode.php
deleted file mode 100644
index 7d1206506..000000000
--- a/include/smarty/libs/plugins/shared.mb_unicode.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-/**
- * convert characters to their decimal unicode equivalents
- *
- * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
- *
- * @param string $string   characters to calculate unicode of
- * @param string $encoding encoding of $string, if null mb_internal_encoding() is used
- *
- * @return array sequence of unicodes
- * @author Rodney Rehm
- */
-function smarty_mb_to_unicode($string, $encoding = null)
-{
-    if ($encoding) {
-        $expanded = mb_convert_encoding($string, 'UTF-32BE', $encoding);
-    } else {
-        $expanded = mb_convert_encoding($string, 'UTF-32BE');
-    }
-    return unpack('N*', $expanded);
-}
-
-/**
- * convert unicodes to the character of given encoding
- *
- * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
- *
- * @param integer|array $unicode  single unicode or list of unicodes to convert
- * @param string        $encoding encoding of returned string, if null mb_internal_encoding() is used
- *
- * @return string unicode as character sequence in given $encoding
- * @author Rodney Rehm
- */
-function smarty_mb_from_unicode($unicode, $encoding = null)
-{
-    $t = '';
-    if (!$encoding) {
-        $encoding = mb_internal_encoding();
-    }
-    foreach ((array)$unicode as $utf32be) {
-        $character = pack('N*', $utf32be);
-        $t .= mb_convert_encoding($character, $encoding, 'UTF-32BE');
-    }
-    return $t;
-}
diff --git a/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php b/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php
deleted file mode 100644
index 2eb12d20a..000000000
--- a/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFilter
- */
-/**
- * Smarty htmlspecialchars variablefilter plugin
- *
- * @param string                    $source input string
- * @param \Smarty_Internal_Template $template
- *
- * @return string filtered output
- */
-function smarty_variablefilter_htmlspecialchars($source, Smarty_Internal_Template $template)
-{
-    return htmlspecialchars((string) $source, ENT_QUOTES, Smarty::$_CHARSET);
-}
diff --git a/include/smarty/libs/sysplugins/smarty_cacheresource.php b/include/smarty/libs/sysplugins/smarty_cacheresource.php
deleted file mode 100644
index db68f9bfd..000000000
--- a/include/smarty/libs/sysplugins/smarty_cacheresource.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package    Smarty
- * @subpackage Cacher
- */
-
-/**
- * Cache Handler API
- *
- * @package    Smarty
- * @subpackage Cacher
- * @author     Rodney Rehm
- */
-abstract class Smarty_CacheResource
-{
-    /**
-     * resource types provided by the core
-     *
-     * @var array
-     */
-    protected static $sysplugins = array('file' => 'smarty_internal_cacheresource_file.php',);
-
-    /**
-     * populate Cached Object with meta data from Resource
-     *
-     * @param \Smarty_Template_Cached  $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    abstract public function populate(\Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
-
-    /**
-     * populate Cached Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return void
-     */
-    abstract public function populateTimestamp(Smarty_Template_Cached $cached);
-
-    /**
-     * Read the cached template and process header
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param boolean                  $update    flag if called because cache update
-     *
-     * @return boolean true or false if the cached content does not exist
-     */
-    abstract public function process(
-        Smarty_Internal_Template $_template,
-        Smarty_Template_Cached $cached = null,
-        $update = false
-    );
-
-    /**
-     * Write the rendered template output to cache
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     *
-     * @return boolean success
-     */
-    abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
-
-    /**
-     * Read cached template from cache
-     *
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return string  content
-     */
-    abstract public function readCachedContent(Smarty_Internal_Template $_template);
-
-    /**
-     * Return cached content
-     *
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return null|string
-     */
-    public function getCachedContent(Smarty_Internal_Template $_template)
-    {
-        if ($_template->cached->handler->process($_template)) {
-            ob_start();
-            $unifunc = $_template->cached->unifunc;
-            $unifunc($_template);
-            return ob_get_clean();
-        }
-        return null;
-    }
-
-    /**
-     * Empty cache
-     *
-     * @param Smarty  $smarty   Smarty object
-     * @param integer $exp_time expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    abstract public function clearAll(Smarty $smarty, $exp_time = null);
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param Smarty  $smarty        Smarty object
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
-
-    /**
-     * @param Smarty                 $smarty
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return bool|null
-     */
-    public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // theoretically locking_timeout should be checked against time_limit (max_execution_time)
-        $start = microtime(true);
-        $hadLock = null;
-        while ($this->hasLock($smarty, $cached)) {
-            $hadLock = true;
-            if (microtime(true) - $start > $smarty->locking_timeout) {
-                // abort waiting for lock release
-                return false;
-            }
-            sleep(1);
-        }
-        return $hadLock;
-    }
-
-    /**
-     * Check is cache is locked for this template
-     *
-     * @param Smarty                 $smarty
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return bool
-     */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // check if lock exists
-        return false;
-    }
-
-    /**
-     * Lock cache for this template
-     *
-     * @param Smarty                 $smarty
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return bool
-     */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // create lock
-        return true;
-    }
-
-    /**
-     * Unlock cache for this template
-     *
-     * @param Smarty                 $smarty
-     * @param Smarty_Template_Cached $cached
-     *
-     * @return bool
-     */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // release lock
-        return true;
-    }
-
-    /**
-     * Load Cache Resource Handler
-     *
-     * @param Smarty $smarty Smarty object
-     * @param string $type   name of the cache resource
-     *
-     * @throws SmartyException
-     * @return Smarty_CacheResource Cache Resource Handler
-     */
-    public static function load(Smarty $smarty, $type = null)
-    {
-        if (!isset($type)) {
-            $type = $smarty->caching_type;
-        }
-        // try smarty's cache
-        if (isset($smarty->_cache[ 'cacheresource_handlers' ][ $type ])) {
-            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ];
-        }
-        // try registered resource
-        if (isset($smarty->registered_cache_resources[ $type ])) {
-            // do not cache these instances as they may vary from instance to instance
-            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = $smarty->registered_cache_resources[ $type ];
-        }
-        // try sysplugins dir
-        if (isset(self::$sysplugins[ $type ])) {
-            $cache_resource_class = 'Smarty_Internal_CacheResource_' . smarty_ucfirst_ascii($type);
-            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
-        }
-        // try plugins dir
-        $cache_resource_class = 'Smarty_CacheResource_' . smarty_ucfirst_ascii($type);
-        if ($smarty->loadPlugin($cache_resource_class)) {
-            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
-        }
-        // give up
-        throw new SmartyException("Unable to load cache resource '{$type}'");
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_data.php b/include/smarty/libs/sysplugins/smarty_data.php
deleted file mode 100644
index 2545ed3a8..000000000
--- a/include/smarty/libs/sysplugins/smarty_data.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Smarty Plugin Data
- * This file contains the data object
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * class for the Smarty data object
- * The Smarty data object will hold Smarty variables in the current scope
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Data extends Smarty_Internal_Data
-{
-    /**
-     * Counter
-     *
-     * @var int
-     */
-    public static $count = 0;
-
-    /**
-     * Data block name
-     *
-     * @var string
-     */
-    public $dataObjectName = '';
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * create Smarty data object
-     *
-     * @param Smarty|array                    $_parent parent template
-     * @param Smarty|Smarty_Internal_Template $smarty  global smarty instance
-     * @param string                          $name    optional data block name
-     *
-     * @throws SmartyException
-     */
-    public function __construct($_parent = null, $smarty = null, $name = null)
-    {
-        parent::__construct();
-        self::$count++;
-        $this->dataObjectName = 'Data_object ' . (isset($name) ? "'{$name}'" : self::$count);
-        $this->smarty = $smarty;
-        if (is_object($_parent)) {
-            // when object set up back pointer
-            $this->parent = $_parent;
-        } elseif (is_array($_parent)) {
-            // set up variable values
-            foreach ($_parent as $_key => $_val) {
-                $this->tpl_vars[ $_key ] = new Smarty_Variable($_val);
-            }
-        } elseif ($_parent !== null) {
-            throw new SmartyException('Wrong type for template variables');
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
deleted file mode 100644
index c77ae9e17..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin CacheResource File
- *
- * @package    Smarty
- * @subpackage Cacher
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * This class does contain all necessary methods for the HTML cache on file system
- * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
- *
- * @package    Smarty
- * @subpackage Cacher
- */
-class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
-{
-    /**
-     * populate Cached Object with meta data from Resource
-     *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-    {
-        $source = &$_template->source;
-        $smarty = &$_template->smarty;
-        $_compile_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
-        $_filepath = sha1($source->uid . $smarty->_joined_template_dir);
-        $cached->filepath = $smarty->getCacheDir();
-        if (isset($_template->cache_id)) {
-            $cached->filepath .= preg_replace(
-                                     array(
-                                         '![^\w|]+!',
-                                         '![|]+!'
-                                     ),
-                                     array(
-                                         '_',
-                                         $_compile_dir_sep
-                                     ),
-                                     $_template->cache_id
-                                 ) . $_compile_dir_sep;
-        }
-        if (isset($_template->compile_id)) {
-            $cached->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . $_compile_dir_sep;
-        }
-        // if use_sub_dirs, break file into directories
-        if ($smarty->use_sub_dirs) {
-            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] .
-                                 $_filepath[ 3 ] .
-                                 DIRECTORY_SEPARATOR .
-                                 $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
-        }
-        $cached->filepath .= $_filepath;
-        $basename = $source->handler->getBasename($source);
-        if (!empty($basename)) {
-            $cached->filepath .= '.' . $basename;
-        }
-        if ($smarty->cache_locking) {
-            $cached->lock_id = $cached->filepath . '.lock';
-        }
-        $cached->filepath .= '.php';
-        $cached->timestamp = $cached->exists = is_file($cached->filepath);
-        if ($cached->exists) {
-            $cached->timestamp = filemtime($cached->filepath);
-        }
-    }
-
-    /**
-     * populate Cached Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Cached $cached)
-    {
-        $cached->timestamp = $cached->exists = is_file($cached->filepath);
-        if ($cached->exists) {
-            $cached->timestamp = filemtime($cached->filepath);
-        }
-    }
-
-    /**
-     * Read the cached template and process its header
-     *
-     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
-     * @param Smarty_Template_Cached    $cached      cached object
-     * @param bool                      $update      flag if called because cache update
-     *
-     * @return boolean true or false if the cached content does not exist
-     */
-    public function process(
-        Smarty_Internal_Template $_smarty_tpl,
-        Smarty_Template_Cached $cached = null,
-        $update = false
-    ) {
-        $_smarty_tpl->cached->valid = false;
-        if ($update && defined('HHVM_VERSION')) {
-            eval('?>' . file_get_contents($_smarty_tpl->cached->filepath));
-            return true;
-        } else {
-            return @include $_smarty_tpl->cached->filepath;
-        }
-    }
-
-    /**
-     * Write the rendered template output to cache
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     *
-     * @return bool success
-     * @throws \SmartyException
-     */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-    {
-        if ($_template->smarty->ext->_writeFile->writeFile(
-                $_template->cached->filepath,
-                $content,
-                $_template->smarty
-            ) === true
-        ) {
-            if (function_exists('opcache_invalidate')
-                && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api'))) < 1
-            ) {
-                opcache_invalidate($_template->cached->filepath, true);
-            } elseif (function_exists('apc_compile_file')) {
-                apc_compile_file($_template->cached->filepath);
-            }
-            $cached = $_template->cached;
-            $cached->timestamp = $cached->exists = is_file($cached->filepath);
-            if ($cached->exists) {
-                $cached->timestamp = filemtime($cached->filepath);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Read cached template from cache
-     *
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return string  content
-     */
-    public function readCachedContent(Smarty_Internal_Template $_template)
-    {
-        if (is_file($_template->cached->filepath)) {
-            return file_get_contents($_template->cached->filepath);
-        }
-        return false;
-    }
-
-    /**
-     * Empty cache
-     *
-     * @param Smarty  $smarty
-     * @param integer $exp_time expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearAll(Smarty $smarty, $exp_time = null)
-    {
-        return $smarty->ext->_cacheResourceFile->clear($smarty, null, null, null, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param Smarty  $smarty
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-    {
-        return $smarty->ext->_cacheResourceFile->clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * Check is cache is locked for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return boolean true or false if cache is locked
-     */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        clearstatcache(true, $cached->lock_id ?? '');
-        if (null !== $cached->lock_id && is_file($cached->lock_id)) {
-            $t = filemtime($cached->lock_id);
-            return $t && (time() - $t < $smarty->locking_timeout);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Lock cache for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return bool|void
-     */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = true;
-        touch($cached->lock_id);
-    }
-
-    /**
-     * Unlock cache for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return bool|void
-     */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = false;
-        @unlink($cached->lock_id);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php b/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php
deleted file mode 100644
index 1f0ab9b7d..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Assign
- * Compiles the {assign} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Assign Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('nocache', 'noscope');
-
-    /**
-     * Valid scope names
-     *
-     * @var array
-     */
-    public $valid_scopes = array(
-        'local'    => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
-        'root'     => Smarty::SCOPE_ROOT, 'global' => Smarty::SCOPE_GLOBAL,
-        'tpl_root' => Smarty::SCOPE_TPL_ROOT, 'smarty' => Smarty::SCOPE_SMARTY
-    );
-
-    /**
-     * Compiles code for the {assign} tag
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
-        $this->required_attributes = array('var', 'value');
-        $this->shorttag_order = array('var', 'value');
-        $this->optional_attributes = array('scope');
-        $this->mapCache = array();
-        $_nocache = false;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // nocache ?
-        if ($_var = $compiler->getId($_attr[ 'var' ])) {
-            $_var = "'{$_var}'";
-        } else {
-            $_var = $_attr[ 'var' ];
-        }
-        if ($compiler->tag_nocache || $compiler->nocache) {
-            $_nocache = true;
-            // create nocache var to make it know for further compiling
-            $compiler->setNocacheInVariable($_attr[ 'var' ]);
-        }
-        // scope setup
-        if ($_attr[ 'noscope' ]) {
-            $_scope = -1;
-        } else {
-            $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
-        }
-        // optional parameter
-        $_params = '';
-        if ($_nocache || $_scope) {
-            $_params .= ' ,' . var_export($_nocache, true);
-        }
-        if ($_scope) {
-            $_params .= ' ,' . $_scope;
-        }
-        if (isset($parameter[ 'smarty_internal_index' ])) {
-            $output =
-                "<?php \$_tmp_array = isset(\$_smarty_tpl->tpl_vars[{$_var}]) ? \$_smarty_tpl->tpl_vars[{$_var}]->value : array();\n";
-            $output .= "if (!(is_array(\$_tmp_array) || \$_tmp_array instanceof ArrayAccess)) {\n";
-            $output .= "settype(\$_tmp_array, 'array');\n";
-            $output .= "}\n";
-            $output .= "\$_tmp_array{$parameter['smarty_internal_index']} = {$_attr['value']};\n";
-            $output .= "\$_smarty_tpl->_assignInScope({$_var}, \$_tmp_array{$_params});?>";
-        } else {
-            $output = "<?php \$_smarty_tpl->_assignInScope({$_var}, {$_attr['value']}{$_params});?>";
-        }
-        return $output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_block.php b/include/smarty/libs/sysplugins/smarty_internal_compile_block.php
deleted file mode 100644
index cbaccd2b3..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_block.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
- * This file is part of Smarty.
- *
- * (c) 2015 Uwe Tews
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Smarty Internal Plugin Compile Block Class
- *
- * @author Uwe Tews <uwe.tews@googlemail.com>
- */
-class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inheritance
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('hide', 'nocache');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('assign');
-
-    /**
-     * Compiles code for the {block} tag
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->_cache[ 'blockNesting' ] = 0;
-        }
-        if ($compiler->_cache[ 'blockNesting' ] === 0) {
-            // make sure that inheritance gets initialized in template code
-            $this->registerInit($compiler);
-            $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
-        } else {
-            $this->option_flags = array('hide', 'nocache');
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        ++$compiler->_cache[ 'blockNesting' ];
-        $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(mt_rand(), true));
-        $compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
-        $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ] = $_className;
-        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
-        $compiler->_cache[ 'blockParams' ][ 1 ][ 'subBlocks' ][ trim($_attr[ 'name' ], '"\'') ][] = $_className;
-        $this->openTag(
-            $compiler,
-            'block',
-            array(
-                $_attr, $compiler->nocache, $compiler->parser->current_buffer,
-                $compiler->template->compiled->has_nocache_code,
-                $compiler->template->caching
-            )
-        );
-        $compiler->saveRequiredPlugins(true);
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        $compiler->template->compiled->has_nocache_code = false;
-        $compiler->suppressNocacheProcessing = true;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile BlockClose Class
- */
-class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_Inheritance
-{
-    /**
-     * Compiles code for the {/block} tag
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return bool true
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
-        // init block parameter
-        $_block = $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ];
-        unset($compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ]);
-        $_name = $_attr[ 'name' ];
-        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
-        unset($_attr[ 'assign' ], $_attr[ 'name' ]);
-        foreach ($_attr as $name => $stat) {
-            if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat !== 'false')) {
-                $_block[ $name ] = 'true';
-            }
-        }
-        $_className = $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ];
-        // get compiled block code
-        $_functionCode = $compiler->parser->current_buffer;
-        // setup buffer for template function code
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        $output = "<?php\n";
-        $output .= $compiler->cStyleComment(" {block {$_name}} ") . "\n";
-        $output .= "class {$_className} extends Smarty_Internal_Block\n";
-        $output .= "{\n";
-        foreach ($_block as $property => $value) {
-            $output .= "public \${$property} = " . var_export($value, true) . ";\n";
-        }
-        $output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\n";
-        $output .= $compiler->compileRequiredPlugins();
-        $compiler->restoreRequiredPlugins();
-        if ($compiler->template->compiled->has_nocache_code) {
-            $output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
-        }
-        if (isset($_assign)) {
-            $output .= "ob_start();\n";
-        }
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree(
-            $compiler->parser,
-            new Smarty_Internal_ParseTree_Tag(
-                $compiler->parser,
-                $output
-            )
-        );
-        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
-        $output = "<?php\n";
-        if (isset($_assign)) {
-            $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
-        }
-        $output .= "}\n";
-        $output .= "}\n";
-        $output .= $compiler->cStyleComment(" {/block {$_name}} ") . "\n\n";
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree(
-            $compiler->parser,
-            new Smarty_Internal_ParseTree_Tag(
-                $compiler->parser,
-                $output
-            )
-        );
-        $compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        // restore old status
-        $compiler->template->compiled->has_nocache_code = $_has_nocache_code;
-        $compiler->tag_nocache = $compiler->nocache;
-        $compiler->nocache = $_nocache;
-        $compiler->parser->current_buffer = $_buffer;
-        $output = "<?php \n";
-        if ($compiler->_cache[ 'blockNesting' ] === 1) {
-            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
-        } else {
-            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
-        }
-        $output .= "?>\n";
-        --$compiler->_cache[ 'blockNesting' ];
-        if ($compiler->_cache[ 'blockNesting' ] === 0) {
-            unset($compiler->_cache[ 'blockNesting' ]);
-        }
-        $compiler->has_code = true;
-        $compiler->suppressNocacheProcessing = true;
-        return $output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_block_child.php b/include/smarty/libs/sysplugins/smarty_internal_compile_block_child.php
deleted file mode 100644
index 588d18628..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_block_child.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * This file is part of Smarty.
- *
- * (c) 2015 Uwe Tews
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Smarty Internal Plugin Compile Block Child Class
- *
- * @author Uwe Tews <uwe.tews@googlemail.com>
- */
-class Smarty_Internal_Compile_Block_Child extends Smarty_Internal_Compile_Child
-{
-    /**
-     * Tag name
-     *
-     * @var string
-     */
-    public $tag = 'block_child';
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php b/include/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php
deleted file mode 100644
index 97f11ca43..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * This file is part of Smarty.
- *
- * (c) 2015 Uwe Tews
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Smarty Internal Plugin Compile Block Parent Class
- *
- * @author Uwe Tews <uwe.tews@googlemail.com>
- */
-class Smarty_Internal_Compile_Block_Parent extends Smarty_Internal_Compile_Child
-{
-    /**
-     * Tag name
-     *
-     * @var string
-     */
-    public $tag = 'block_parent';
-
-    /**
-     * Block type
-     *
-     * @var string
-     */
-    public $blockType = 'Parent';
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_break.php b/include/smarty/libs/sysplugins/smarty_internal_compile_break.php
deleted file mode 100644
index 1ee8d75d7..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_break.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Break
- * Compiles the {break} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Break Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('levels');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('levels');
-
-    /**
-     * Tag name may be overloaded by Smarty_Internal_Compile_Continue
-     *
-     * @var string
-     */
-    public $tag = 'break';
-
-    /**
-     * Compiles code for the {break} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        list($levels, $foreachLevels) = $this->checkLevels($args, $compiler);
-        $output = "<?php ";
-        if ($foreachLevels > 0 && $this->tag === 'continue') {
-            $foreachLevels--;
-        }
-        if ($foreachLevels > 0) {
-            /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
-            $foreachCompiler = $compiler->getTagCompiler('foreach');
-            $output .= $foreachCompiler->compileRestore($foreachLevels);
-        }
-        $output .= "{$this->tag} {$levels};?>";
-        return $output;
-    }
-
-    /**
-     * check attributes and return array of break and foreach levels
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return array
-     * @throws \SmartyCompilerException
-     */
-    public function checkLevels($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', null, true);
-        }
-        if (isset($_attr[ 'levels' ])) {
-            if (!is_numeric($_attr[ 'levels' ])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
-            }
-            $levels = $_attr[ 'levels' ];
-        } else {
-            $levels = 1;
-        }
-        $level_count = $levels;
-        $stack_count = count($compiler->_tag_stack) - 1;
-        $foreachLevels = 0;
-        $lastTag = '';
-        while ($level_count > 0 && $stack_count >= 0) {
-            if (isset($_is_loopy[ $compiler->_tag_stack[ $stack_count ][ 0 ] ])) {
-                $lastTag = $compiler->_tag_stack[ $stack_count ][ 0 ];
-                if ($level_count === 0) {
-                    break;
-                }
-                $level_count--;
-                if ($compiler->_tag_stack[ $stack_count ][ 0 ] === 'foreach') {
-                    $foreachLevels++;
-                }
-            }
-            $stack_count--;
-        }
-        if ($level_count !== 0) {
-            $compiler->trigger_template_error("cannot {$this->tag} {$levels} level(s)", null, true);
-        }
-        if ($lastTag === 'foreach' && $this->tag === 'break' && $foreachLevels > 0) {
-            $foreachLevels--;
-        }
-        return array($levels, $foreachLevels);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_call.php b/include/smarty/libs/sysplugins/smarty_internal_compile_call.php
deleted file mode 100644
index 445cabc60..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_call.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function_Call
- * Compiles the calls of user defined tags defined by {function}
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function_Call Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles the calls of user defined tags defined by {function}
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // save possible attributes
-        if (isset($_attr[ 'assign' ])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr[ 'assign' ];
-        }
-        //$_name = trim($_attr['name'], "''");
-        $_name = $_attr[ 'name' ];
-        unset($_attr[ 'name' ], $_attr[ 'assign' ], $_attr[ 'nocache' ]);
-        // set flag (compiled code of {function} must be included in cache file
-        if (!$compiler->template->caching || $compiler->nocache || $compiler->tag_nocache) {
-            $_nocache = 'true';
-        } else {
-            $_nocache = 'false';
-        }
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $_params = 'array(' . implode(',', $_paramsArray) . ')';
-        //$compiler->suppressNocacheProcessing = true;
-        // was there an assign attribute
-        if (isset($_assign)) {
-            $_output =
-                "<?php ob_start();\n\$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-        } else {
-            $_output =
-                "<?php \$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
-        }
-        return $_output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php b/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php
deleted file mode 100644
index a4ffbc9ea..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Capture
- * Compiles the {capture} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Capture Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('name', 'assign', 'append');
-
-    /**
-     * Compiles code for the {$smarty.capture.xxx}
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public static function compileSpecialVariable(
-        $args,
-        Smarty_Internal_TemplateCompilerBase $compiler,
-        $parameter = null
-    ) {
-        return '$_smarty_tpl->smarty->ext->_capture->getBuffer($_smarty_tpl' .
-               (isset($parameter[ 1 ]) ? ", {$parameter[ 1 ]})" : ')');
-    }
-
-    /**
-     * Compiles code for the {capture} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     * @param null                                  $parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter = null)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args, $parameter, 'capture');
-        $buffer = isset($_attr[ 'name' ]) ? $_attr[ 'name' ] : "'default'";
-        $assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : 'null';
-        $append = isset($_attr[ 'append' ]) ? $_attr[ 'append' ] : 'null';
-        $compiler->_cache[ 'capture_stack' ][] = array($compiler->nocache);
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $_output = "<?php \$_smarty_tpl->smarty->ext->_capture->open(\$_smarty_tpl, $buffer, $assign, $append);?>";
-        return $_output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Captureclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/capture} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     * @param null                                  $parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args, $parameter, '/capture');
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        list($compiler->nocache) = array_pop($compiler->_cache[ 'capture_stack' ]);
-        return "<?php \$_smarty_tpl->smarty->ext->_capture->close(\$_smarty_tpl);?>";
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_child.php b/include/smarty/libs/sysplugins/smarty_internal_compile_child.php
deleted file mode 100644
index f728c18bf..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_child.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * This file is part of Smarty.
- *
- * (c) 2015 Uwe Tews
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Smarty Internal Plugin Compile Child Class
- *
- * @author Uwe Tews <uwe.tews@googlemail.com>
- */
-class Smarty_Internal_Compile_Child extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('assign');
-
-    /**
-     * Tag name
-     *
-     * @var string
-     */
-    public $tag = 'child';
-
-    /**
-     * Block type
-     *
-     * @var string
-     */
-    public $blockType = 'Child';
-
-    /**
-     * Compiles code for the {child} tag
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $tag = isset($parameter[ 0 ]) ? "'{$parameter[0]}'" : "'{{$this->tag}}'";
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->trigger_template_error(
-                "{$tag} used outside {block} tags ",
-                $compiler->parser->lex->taglineno
-            );
-        }
-        $compiler->has_code = true;
-        $compiler->suppressNocacheProcessing = true;
-        if ($this->blockType === 'Child') {
-            $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
-        }
-        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
-        $output = "<?php \n";
-        if (isset($_assign)) {
-            $output .= "ob_start();\n";
-        }
-        $output .= '$_smarty_tpl->inheritance->call' . $this->blockType . '($_smarty_tpl, $this' .
-                   ($this->blockType === 'Child' ? '' : ", {$tag}") . ");\n";
-        if (isset($_assign)) {
-            $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
-        }
-        $output .= "?>\n";
-        return $output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php b/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
deleted file mode 100644
index 8fe64ee10..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Config Load
- * Compiles the {config load} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Config Load Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Config_Load 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', 'section');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('section', 'scope');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('nocache', 'noscope');
-
-    /**
-     * Valid scope names
-     *
-     * @var array
-     */
-    public $valid_scopes = array(
-        'local'  => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
-        'root'   => Smarty::SCOPE_ROOT, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
-        'smarty' => Smarty::SCOPE_SMARTY, 'global' => Smarty::SCOPE_SMARTY
-    );
-
-    /**
-     * Compiles code for the {config_load} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', null, true);
-        }
-        // save possible attributes
-        $conf_file = $_attr[ 'file' ];
-        if (isset($_attr[ 'section' ])) {
-            $section = $_attr[ 'section' ];
-        } else {
-            $section = 'null';
-        }
-        // scope setup
-        if ($_attr[ 'noscope' ]) {
-            $_scope = -1;
-        } else {
-            $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
-        }
-        // create config object
-        $_output =
-            "<?php\n\$_smarty_tpl->smarty->ext->configLoad->_loadConfigFile(\$_smarty_tpl, {$conf_file}, {$section}, {$_scope});\n?>\n";
-        return $_output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php b/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php
deleted file mode 100644
index e545728ee..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Continue
- * Compiles the {continue} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Continue Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Continue extends Smarty_Internal_Compile_Break
-{
-    /**
-     * Tag name
-     *
-     * @var string
-     */
-    public $tag = 'continue';
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php b/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php
deleted file mode 100644
index 799416689..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Debug
- * Compiles the {debug} tag.
- * It opens a window the the Smarty Debugging Console.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Debug Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {debug} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // compile always as nocache
-        $compiler->tag_nocache = true;
-        // display debug template
-        $_output =
-            "<?php \$_smarty_debug = new Smarty_Internal_Debug;\n \$_smarty_debug->display_debug(\$_smarty_tpl);\n";
-        $_output .= "unset(\$_smarty_debug);\n?>";
-        return $_output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php b/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php
deleted file mode 100644
index 8e0174e3e..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Eval
- * Compiles the {eval} tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Eval Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('var');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('assign');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('var', 'assign');
-
-    /**
-     * Compiles code for the {eval} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if (isset($_attr[ 'assign' ])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr[ 'assign' ];
-        }
-        // create template object
-        $_output =
-            "\$_template = new {$compiler->smarty->template_class}('eval:'.{$_attr[ 'var' ]}, \$_smarty_tpl->smarty, \$_smarty_tpl);";
-        //was there an assign attribute?
-        if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
-        } else {
-            $_output .= 'echo $_template->fetch();';
-        }
-        return "<?php $_output ?>";
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php b/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php
deleted file mode 100644
index d72d2b76f..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile extend
- * Compiles the {extends} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile extend Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inheritance
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
-
-    /**
-     * Array of names of optional attribute required by tag
-     * use array('_any') if there is no restriction of attributes names
-     *
-     * @var array
-     */
-    public $optional_attributes = array('extends_resource');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
-
-    /**
-     * Compiles code for the {extends} tag extends: resource
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->line - 1);
-        }
-        if (strpos($_attr[ 'file' ], '$_tmp') !== false) {
-            $compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
-        }
-        // add code to initialize inheritance
-        $this->registerInit($compiler, true);
-        $file = trim($_attr[ 'file' ], '\'"');
-        if (strlen($file) > 8 && substr($file, 0, 8) === 'extends:') {
-            // generate code for each template
-            $files = array_reverse(explode('|', substr($file, 8)));
-            $i = 0;
-            foreach ($files as $file) {
-                if ($file[ 0 ] === '"') {
-                    $file = trim($file, '".');
-                } else {
-                    $file = "'{$file}'";
-                }
-                $i++;
-                if ($i === count($files) && isset($_attr[ 'extends_resource' ])) {
-                    $this->compileEndChild($compiler);
-                }
-                $this->compileInclude($compiler, $file);
-            }
-            if (!isset($_attr[ 'extends_resource' ])) {
-                $this->compileEndChild($compiler);
-            }
-        } else {
-            $this->compileEndChild($compiler, $_attr[ 'file' ]);
-        }
-        $compiler->has_code = false;
-        return '';
-    }
-
-    /**
-     * Add code for inheritance endChild() method to end of template
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param null|string                           $template optional inheritance parent template
-     *
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler, $template = null)
-    {
-        $inlineUids = '';
-        if (isset($template) && $compiler->smarty->merge_compiled_includes) {
-            $code = $compiler->compileTag('include', array($template, array('scope' => 'parent')));
-            if (preg_match('/([,][\s]*[\'][a-z0-9]+[\'][,][\s]*[\']content.*[\'])[)]/', $code, $match)) {
-                $inlineUids = $match[ 1 ];
-            }
-        }
-        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag(
-            $compiler->parser,
-            '<?php $_smarty_tpl->inheritance->endChild($_smarty_tpl' .
-            (isset($template) ?
-                ", {$template}{$inlineUids}" :
-                '') . ");\n?>"
-        );
-    }
-
-    /**
-     * Add code for including subtemplate to end of template
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param string                                $template subtemplate name
-     *
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $template)
-    {
-        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag(
-            $compiler->parser,
-            $compiler->compileTag(
-                'include',
-                array(
-                    $template,
-                    array('scope' => 'parent')
-                )
-            )
-        );
-    }
-
-    /**
-     * Create source code for {extends} from source components array
-     *
-     * @param \Smarty_Internal_Template $template
-     *
-     * @return string
-     */
-    public static function extendsSourceArrayCode(Smarty_Internal_Template $template)
-    {
-        $resources = array();
-        foreach ($template->source->components as $source) {
-            $resources[] = $source->resource;
-        }
-        return $template->smarty->left_delimiter . 'extends file=\'extends:' . join('|', $resources) .
-               '\' extends_resource=true' . $template->smarty->right_delimiter;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_for.php b/include/smarty/libs/sysplugins/smarty_internal_compile_for.php
deleted file mode 100644
index 969e22c1a..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_for.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile For
- * Compiles the {for} {forelse} {/for} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile For Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {for} tag
-     * Smarty supports two different syntax's:
-     * - {for $var in $array}
-     * For looping over arrays or iterators
-     * - {for $x=0; $x<$y; $x++}
-     * For general loops
-     * The parser is generating different sets of attribute by which this compiler can
-     * determine which syntax is used.
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $compiler->loopNesting++;
-        if ($parameter === 0) {
-            $this->required_attributes = array('start', 'to');
-            $this->optional_attributes = array('max', 'step');
-        } else {
-            $this->required_attributes = array('start', 'ifexp', 'var', 'step');
-            $this->optional_attributes = array();
-        }
-        $this->mapCache = array();
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $output = "<?php\n";
-        if ($parameter === 1) {
-            foreach ($_attr[ 'start' ] as $_statement) {
-                if (is_array($_statement[ 'var' ])) {
-                    $var = $_statement[ 'var' ][ 'var' ];
-                    $index = $_statement[ 'var' ][ 'smarty_internal_index' ];
-                } else {
-                    $var = $_statement[ 'var' ];
-                    $index = '';
-                }
-                $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);\n";
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->value{$index} = {$_statement['value']};\n";
-            }
-            if (is_array($_attr[ 'var' ])) {
-                $var = $_attr[ 'var' ][ 'var' ];
-                $index = $_attr[ 'var' ][ 'smarty_internal_index' ];
-            } else {
-                $var = $_attr[ 'var' ];
-                $index = '';
-            }
-            $output .= "if ($_attr[ifexp]) {\nfor (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
-        } else {
-            $_statement = $_attr[ 'start' ];
-            if (is_array($_statement[ 'var' ])) {
-                $var = $_statement[ 'var' ][ 'var' ];
-                $index = $_statement[ 'var' ][ 'smarty_internal_index' ];
-            } else {
-                $var = $_statement[ 'var' ];
-                $index = '';
-            }
-            $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);";
-            if (isset($_attr[ 'step' ])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
-            }
-            if (isset($_attr[ 'max' ])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
-            }
-            $output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
-            $output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
-            $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration === 1;";
-            $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration === \$_smarty_tpl->tpl_vars[$var]->total;";
-        }
-        $output .= '?>';
-        $this->openTag($compiler, 'for', array('for', $compiler->nocache));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        // return compiled code
-        return $output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Forelse Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {forelse} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
-        $this->openTag($compiler, 'forelse', array('forelse', $nocache));
-        return "<?php }} else { ?>";
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Forclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/for} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $compiler->loopNesting--;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
-        $output = "<?php }\n";
-        if ($openTag !== 'forelse') {
-            $output .= "}\n";
-        }
-        $output .= "?>";
-        return $output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
deleted file mode 100644
index edfe358be..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Foreach
- * Compiles the {foreach} {foreachelse} {/foreach} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Foreach Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_ForeachSection
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('from', 'item');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('name', 'key', 'properties');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('from', 'item', 'key', 'name');
-
-    /**
-     * counter
-     *
-     * @var int
-     */
-    public $counter = 0;
-
-    /**
-     * Name of this tag
-     *
-     * @var string
-     */
-    public $tagName = 'foreach';
-
-    /**
-     * Valid properties of $smarty.foreach.name.xxx variable
-     *
-     * @var array
-     */
-    public $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total');
-
-    /**
-     * Valid properties of $item@xxx variable
-     *
-     * @var array
-     */
-    public $itemProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'key');
-
-    /**
-     * Flag if tag had name attribute
-     *
-     * @var bool
-     */
-    public $isNamed = false;
-
-    /**
-     * Compiles code for the {foreach} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $compiler->loopNesting++;
-        // init
-        $this->isNamed = false;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $from = $_attr[ 'from' ];
-        $item = $compiler->getId($_attr[ 'item' ]);
-        if ($item === false) {
-            $item = $compiler->getVariableName($_attr[ 'item' ]);
-        }
-        $key = $name = null;
-        $attributes = array('item' => $item);
-        if (isset($_attr[ 'key' ])) {
-            $key = $compiler->getId($_attr[ 'key' ]);
-            if ($key === false) {
-                $key = $compiler->getVariableName($_attr[ 'key' ]);
-            }
-            $attributes[ 'key' ] = $key;
-        }
-        if (isset($_attr[ 'name' ])) {
-            $this->isNamed = true;
-            $name = $attributes[ 'name' ] = $compiler->getId($_attr[ 'name' ]);
-        }
-        foreach ($attributes as $a => $v) {
-            if ($v === false) {
-                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
-            }
-        }
-        $fromName = $compiler->getVariableName($_attr[ 'from' ]);
-        if ($fromName) {
-            foreach (array('item', 'key') as $a) {
-                if (isset($attributes[ $a ]) && $attributes[ $a ] === $fromName) {
-                    $compiler->trigger_template_error(
-                        "'{$a}' and 'from' may not have same variable name '{$fromName}'",
-                        null,
-                        true
-                    );
-                }
-            }
-        }
-        $itemVar = "\$_smarty_tpl->tpl_vars['{$item}']";
-        $local = '$__foreach_' . $attributes[ 'item' ] . '_' . $this->counter++ . '_';
-        // search for used tag attributes
-        $itemAttr = array();
-        $namedAttr = array();
-        $this->scanForProperties($attributes, $compiler);
-        if (!empty($this->matchResults[ 'item' ])) {
-            $itemAttr = $this->matchResults[ 'item' ];
-        }
-        if (!empty($this->matchResults[ 'named' ])) {
-            $namedAttr = $this->matchResults[ 'named' ];
-        }
-        if (isset($_attr[ 'properties' ]) && preg_match_all('/[\'](.*?)[\']/', $_attr[ 'properties' ], $match)) {
-            foreach ($match[ 1 ] as $prop) {
-                if (in_array($prop, $this->itemProperties)) {
-                    $itemAttr[ $prop ] = true;
-                } else {
-                    $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
-                }
-            }
-            if ($this->isNamed) {
-                foreach ($match[ 1 ] as $prop) {
-                    if (in_array($prop, $this->nameProperties)) {
-                        $nameAttr[ $prop ] = true;
-                    } else {
-                        $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
-                    }
-                }
-            }
-        }
-        if (isset($itemAttr[ 'first' ])) {
-            $itemAttr[ 'index' ] = true;
-        }
-        if (isset($namedAttr[ 'first' ])) {
-            $namedAttr[ 'index' ] = true;
-        }
-        if (isset($namedAttr[ 'last' ])) {
-            $namedAttr[ 'iteration' ] = true;
-            $namedAttr[ 'total' ] = true;
-        }
-        if (isset($itemAttr[ 'last' ])) {
-            $itemAttr[ 'iteration' ] = true;
-            $itemAttr[ 'total' ] = true;
-        }
-        if (isset($namedAttr[ 'show' ])) {
-            $namedAttr[ 'total' ] = true;
-        }
-        if (isset($itemAttr[ 'show' ])) {
-            $itemAttr[ 'total' ] = true;
-        }
-        $keyTerm = '';
-        if (isset($attributes[ 'key' ])) {
-            $keyTerm = "\$_smarty_tpl->tpl_vars['{$key}']->value => ";
-        }
-        if (isset($itemAttr[ 'key' ])) {
-            $keyTerm = "{$itemVar}->key => ";
-        }
-        if ($this->isNamed) {
-            $foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
-        }
-        $needTotal = isset($itemAttr[ 'total' ]);
-        // Register tag
-        $this->openTag(
-            $compiler,
-            'foreach',
-            array('foreach', $compiler->nocache, $local, $itemVar, empty($itemAttr) ? 1 : 2)
-        );
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        // generate output code
-        $output = "<?php\n";
-        $output .= "\$_from = \$_smarty_tpl->smarty->ext->_foreach->init(\$_smarty_tpl, $from, " .
-                   var_export($item, true);
-        if ($name || $needTotal || $key) {
-            $output .= ', ' . var_export($needTotal, true);
-        }
-        if ($name || $key) {
-            $output .= ', ' . var_export($key, true);
-        }
-        if ($name) {
-            $output .= ', ' . var_export($name, true) . ', ' . var_export($namedAttr, true);
-        }
-        $output .= ");\n";
-        if (isset($itemAttr[ 'show' ])) {
-            $output .= "{$itemVar}->show = ({$itemVar}->total > 0);\n";
-        }
-        if (isset($itemAttr[ 'iteration' ])) {
-            $output .= "{$itemVar}->iteration = 0;\n";
-        }
-        if (isset($itemAttr[ 'index' ])) {
-            $output .= "{$itemVar}->index = -1;\n";
-        }
-        $output .= "{$itemVar}->do_else = true;\n";
-        $output .= "if (\$_from !== null) foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
-        $output .= "{$itemVar}->do_else = false;\n";
-        if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
-            $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
-        }
-        if (isset($itemAttr[ 'iteration' ])) {
-            $output .= "{$itemVar}->iteration++;\n";
-        }
-        if (isset($itemAttr[ 'index' ])) {
-            $output .= "{$itemVar}->index++;\n";
-        }
-        if (isset($itemAttr[ 'first' ])) {
-            $output .= "{$itemVar}->first = !{$itemVar}->index;\n";
-        }
-        if (isset($itemAttr[ 'last' ])) {
-            $output .= "{$itemVar}->last = {$itemVar}->iteration === {$itemVar}->total;\n";
-        }
-        if (isset($foreachVar)) {
-            if (isset($namedAttr[ 'iteration' ])) {
-                $output .= "{$foreachVar}->value['iteration']++;\n";
-            }
-            if (isset($namedAttr[ 'index' ])) {
-                $output .= "{$foreachVar}->value['index']++;\n";
-            }
-            if (isset($namedAttr[ 'first' ])) {
-                $output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n";
-            }
-            if (isset($namedAttr[ 'last' ])) {
-                $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] === {$foreachVar}->value['total'];\n";
-            }
-        }
-        if (!empty($itemAttr)) {
-            $output .= "{$local}saved = {$itemVar};\n";
-        }
-        $output .= '?>';
-        return $output;
-    }
-
-    /**
-     * Compiles code for to restore saved template variables
-     *
-     * @param int $levels number of levels to restore
-     *
-     * @return string compiled code
-     */
-    public function compileRestore($levels)
-    {
-        return "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl, {$levels});";
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Foreachelse Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {foreachelse} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        list($openTag, $nocache, $local, $itemVar, $restore) = $this->closeTag($compiler, array('foreach'));
-        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $itemVar, 0));
-        $output = "<?php\n";
-        if ($restore === 2) {
-            $output .= "{$itemVar} = {$local}saved;\n";
-        }
-        $output .= "}\nif ({$itemVar}->do_else) {\n?>";
-        return $output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Foreachclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/foreach} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $compiler->loopNesting--;
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        list(
-            $openTag, $compiler->nocache, $local, $itemVar, $restore
-            ) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
-        $output = "<?php\n";
-        if ($restore === 2) {
-            $output .= "{$itemVar} = {$local}saved;\n";
-        }
-        $output .= "}\n";
-        /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
-        $foreachCompiler = $compiler->getTagCompiler('foreach');
-        $output .= $foreachCompiler->compileRestore(1);
-        $output .= "?>";
-        return $output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_function.php
deleted file mode 100644
index b05a82b74..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_function.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function
- * Compiles the {function} {/function} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the {function} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return bool true
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', null, true);
-        }
-        unset($_attr[ 'nocache' ]);
-        $_name = trim($_attr[ 'name' ], '\'"');
-
-        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,
-            $compiler->template->caching
-        );
-        $this->openTag($compiler, 'function', $save);
-        // Init temporary context
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        $compiler->template->compiled->has_nocache_code = false;
-        $compiler->saveRequiredPlugins(true);
-        return true;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Functionclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiler object
-     *
-     * @var object
-     */
-    private $compiler = null;
-
-    /**
-     * Compiles code for the {/function} tag
-     *
-     * @param array                                        $args     array with attributes from parser
-     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return bool true
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $this->compiler = $compiler;
-        $saved_data = $this->closeTag($compiler, array('function'));
-        $_attr = $saved_data[ 0 ];
-        $_name = trim($_attr[ 'name' ], '\'"');
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
-            $compiler->parent_compiler->template->compiled->filepath;
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
-        $_parameter = $_attr;
-        unset($_parameter[ 'name' ]);
-        // default parameter
-        $_paramsArray = array();
-        foreach ($_parameter as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        if (!empty($_paramsArray)) {
-            $_params = 'array(' . implode(',', $_paramsArray) . ')';
-            $_paramsCode = "\$params = array_merge($_params, \$params);\n";
-        } else {
-            $_paramsCode = '';
-        }
-        $_functionCode = $compiler->parser->current_buffer;
-        // setup buffer for template function code
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        $_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
-        $_funcNameCaching = $_funcName . '_nocache';
-        if ($compiler->template->compiled->has_nocache_code) {
-            $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
-            $output = "<?php\n";
-            $output .= $compiler->cStyleComment(" {$_funcNameCaching} ") . "\n";
-            $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
-            $output .= "function {$_funcNameCaching} (Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
-            $output .= "ob_start();\n";
-            $output .= $compiler->compileRequiredPlugins();
-            $output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
-            $output .= $_paramsCode;
-            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n";
-            $output .= "\$params = var_export(\$params, true);\n";
-            $output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
-            $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
-            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";?>";
-            $compiler->parser->current_buffer->append_subtree(
-                $compiler->parser,
-                new Smarty_Internal_ParseTree_Tag(
-                    $compiler->parser,
-                    $output
-                )
-            );
-            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
-            $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
-            $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
-            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
-            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash ?? '', ob_get_clean());\n";
-            $output .= "}\n}\n";
-            $output .= $compiler->cStyleComment("/ {$_funcName}_nocache ") . "\n\n";
-            $output .= "?>\n";
-            $compiler->parser->current_buffer->append_subtree(
-                $compiler->parser,
-                new Smarty_Internal_ParseTree_Tag(
-                    $compiler->parser,
-                    $output
-                )
-            );
-            $_functionCode = new Smarty_Internal_ParseTree_Tag(
-                $compiler->parser,
-                preg_replace_callback(
-                    "/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
-                    array($this, 'removeNocache'),
-                    $_functionCode->to_smarty_php($compiler->parser)
-                )
-            );
-        }
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
-        $output = "<?php\n";
-        $output .= $compiler->cStyleComment(" {$_funcName} ") . "\n";
-        $output .= "if (!function_exists('{$_funcName}')) {\n";
-        $output .= "function {$_funcName}(Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
-        $output .= $_paramsCode;
-        $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n";
-        $output .= $compiler->compileCheckPlugins(array_merge($compiler->required_plugins[ 'compiled' ],
-            $compiler->required_plugins[ 'nocache' ]));
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree(
-            $compiler->parser,
-            new Smarty_Internal_ParseTree_Tag(
-                $compiler->parser,
-                $output
-            )
-        );
-        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
-        $output = "<?php\n}}\n";
-        $output .= $compiler->cStyleComment("/ {$_funcName} ") . "\n\n";
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree(
-            $compiler->parser,
-            new Smarty_Internal_ParseTree_Tag(
-                $compiler->parser,
-                $output
-            )
-        );
-        $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
-        // restore old buffer
-        $compiler->parser->current_buffer = $saved_data[ 1 ];
-        // restore old status
-        $compiler->restoreRequiredPlugins();
-        $compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
-        $compiler->template->caching = $saved_data[ 3 ];
-        return true;
-    }
-
-    /**
-     * Remove nocache code
-     *
-     * @param $match
-     *
-     * @return string
-     */
-    public function removeNocache($match)
-    {
-        $code =
-            preg_replace(
-                "/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
-                '',
-                $match[ 0 ]
-            );
-        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
-        return $code;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_if.php b/include/smarty/libs/sysplugins/smarty_internal_compile_if.php
deleted file mode 100644
index df3dc3fad..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_if.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile If
- * Compiles the {if} {else} {elseif} {/if} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile If Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {if} tag
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $this->openTag($compiler, 'if', array(1, $compiler->nocache));
-        // must whole block be nocache ?
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        if (!isset($parameter[ 'if condition' ])) {
-            $compiler->trigger_template_error('missing if condition', null, true);
-        }
-        if (is_array($parameter[ 'if condition' ])) {
-            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
-                $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-            } else {
-                $var = $parameter[ 'if condition' ][ 'var' ];
-            }
-            if ($compiler->nocache) {
-                // create nocache var to make it know for further compiling
-                $compiler->setNocacheInVariable($var);
-            }
-            $prefixVar = $compiler->getNewPrefixVariable();
-            $_output = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
-            $assignAttr = array();
-            $assignAttr[][ 'value' ] = $prefixVar;
-            $assignCompiler = new Smarty_Internal_Compile_Assign();
-            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
-                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-                $_output .= $assignCompiler->compile(
-                    $assignAttr,
-                    $compiler,
-                    array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
-                );
-            } else {
-                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
-                $_output .= $assignCompiler->compile($assignAttr, $compiler, array());
-            }
-            $_output .= "<?php if ({$prefixVar}) {?>";
-            return $_output;
-        } else {
-            return "<?php if ({$parameter['if condition']}) {?>";
-        }
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Else Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {else} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
-        $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
-        return '<?php } else { ?>';
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile ElseIf Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {elseif} tag
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
-        if (!isset($parameter[ 'if condition' ])) {
-            $compiler->trigger_template_error('missing elseif condition', null, true);
-        }
-        $assignCode = '';
-        $var = '';
-        if (is_array($parameter[ 'if condition' ])) {
-            $condition_by_assign = true;
-            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
-                $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-            } else {
-                $var = $parameter[ 'if condition' ][ 'var' ];
-            }
-            if ($compiler->nocache) {
-                // create nocache var to make it know for further compiling
-                $compiler->setNocacheInVariable($var);
-            }
-            $prefixVar = $compiler->getNewPrefixVariable();
-            $assignCode = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
-            $assignCompiler = new Smarty_Internal_Compile_Assign();
-            $assignAttr = array();
-            $assignAttr[][ 'value' ] = $prefixVar;
-            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
-                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-                $assignCode .= $assignCompiler->compile(
-                    $assignAttr,
-                    $compiler,
-                    array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
-                );
-            } else {
-                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
-                $assignCode .= $assignCompiler->compile($assignAttr, $compiler, array());
-            }
-        } else {
-            $condition_by_assign = false;
-        }
-        $prefixCode = $compiler->getPrefixCode();
-        if (empty($prefixCode)) {
-            if ($condition_by_assign) {
-                $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
-                $_output = $compiler->appendCode("<?php } else {\n?>", $assignCode);
-                return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
-            } else {
-                $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
-                return "<?php } elseif ({$parameter['if condition']}) {?>";
-            }
-        } else {
-            $_output = $compiler->appendCode("<?php } else {\n?>", $prefixCode);
-            $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
-            if ($condition_by_assign) {
-                $_output = $compiler->appendCode($_output, $assignCode);
-                return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
-            } else {
-                return $compiler->appendCode($_output, "<?php if ({$parameter['if condition']}) {?>");
-            }
-        }
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Ifclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/if} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif'));
-        $tmp = '';
-        for ($i = 0; $i < $nesting; $i++) {
-            $tmp .= '}';
-        }
-        return "<?php {$tmp}?>";
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_include.php b/include/smarty/libs/sysplugins/smarty_internal_compile_include.php
deleted file mode 100644
index bf62461bc..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_include.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Include
- * Compiles the {include} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Include Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
-{
-    /**
-     * caching mode to create nocache code but no cache file
-     */
-    const CACHING_NOCACHE_CODE = 9999;
-
-    /**
-     * 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 $option_flags = array('nocache', 'inline', 'caching');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Valid scope names
-     *
-     * @var array
-     */
-    public $valid_scopes = array(
-        'parent' => Smarty::SCOPE_PARENT, 'root' => Smarty::SCOPE_ROOT,
-        'global' => Smarty::SCOPE_GLOBAL, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
-        'smarty' => Smarty::SCOPE_SMARTY
-    );
-
-    /**
-     * Compiles code for the {include} tag
-     *
-     * @param array                                  $args     array with attributes from parser
-     * @param Smarty_Internal_SmartyTemplateCompiler $compiler compiler object
-     *
-     * @return string
-     * @throws \Exception
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler)
-    {
-        $uid = $t_hash = null;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $fullResourceName = $source_resource = $_attr[ 'file' ];
-        $variable_template = false;
-        $cache_tpl = false;
-        // parse resource_name
-        if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
-            $type = !empty($match[ 3 ]) ? $match[ 3 ] : $compiler->template->smarty->default_resource_type;
-            $name = !empty($match[ 5 ]) ? $match[ 5 ] : $match[ 6 ];
-            $handler = Smarty_Resource::load($compiler->smarty, $type);
-            if ($handler->recompiled || $handler->uncompiled) {
-                $variable_template = true;
-            }
-            if (!$variable_template) {
-                if ($type !== 'string') {
-                    $fullResourceName = "{$type}:{$name}";
-                    $compiled = $compiler->parent_compiler->template->compiled;
-                    if (isset($compiled->includes[ $fullResourceName ])) {
-                        $compiled->includes[ $fullResourceName ]++;
-                        $cache_tpl = true;
-                    } else {
-                        if ("{$compiler->template->source->type}:{$compiler->template->source->name}" ==
-                            $fullResourceName
-                        ) {
-                            // recursive call of current template
-                            $compiled->includes[ $fullResourceName ] = 2;
-                            $cache_tpl = true;
-                        } else {
-                            $compiled->includes[ $fullResourceName ] = 1;
-                        }
-                    }
-                    $fullResourceName = $match[ 1 ] . $fullResourceName . $match[ 1 ];
-                }
-            }
-            if (empty($match[ 5 ])) {
-                $variable_template = true;
-            }
-        } else {
-            $variable_template = true;
-        }
-        // scope setup
-        $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
-        // set flag to cache subtemplate object when called within loop or template name is variable.
-        if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) {
-            $_cache_tpl = 'true';
-        } else {
-            $_cache_tpl = 'false';
-        }
-        // assume caching is off
-        $_caching = Smarty::CACHING_OFF;
-        $call_nocache = $compiler->tag_nocache || $compiler->nocache;
-        // caching was on and {include} is not in nocache mode
-        if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
-            $_caching = self::CACHING_NOCACHE_CODE;
-        }
-        // flag if included template code should be merged into caller
-        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr[ 'inline' ] === true) &&
-                                   !$compiler->template->source->handler->recompiled;
-        if ($merge_compiled_includes) {
-            // variable template name ?
-            if ($variable_template) {
-                $merge_compiled_includes = false;
-            }
-            // variable compile_id?
-            if (isset($_attr[ 'compile_id' ]) && $compiler->isVariable($_attr[ 'compile_id' ])) {
-                $merge_compiled_includes = false;
-            }
-        }
-        /*
-        * if the {include} tag provides individual parameter for caching or compile_id
-        * the subtemplate must not be included into the common cache file and is treated like
-        * a call in nocache mode.
-        *
-        */
-        if ($_attr[ 'nocache' ] !== true && $_attr[ 'caching' ]) {
-            $_caching = $_new_caching = (int)$_attr[ 'caching' ];
-            $call_nocache = true;
-        } else {
-            $_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        }
-        if (isset($_attr[ 'cache_lifetime' ])) {
-            $_cache_lifetime = $_attr[ 'cache_lifetime' ];
-            $call_nocache = true;
-            $_caching = $_new_caching;
-        } else {
-            $_cache_lifetime = '$_smarty_tpl->cache_lifetime';
-        }
-        if (isset($_attr[ 'cache_id' ])) {
-            $_cache_id = $_attr[ 'cache_id' ];
-            $call_nocache = true;
-            $_caching = $_new_caching;
-        } else {
-            $_cache_id = '$_smarty_tpl->cache_id';
-        }
-        if (isset($_attr[ 'compile_id' ])) {
-            $_compile_id = $_attr[ 'compile_id' ];
-        } else {
-            $_compile_id = '$_smarty_tpl->compile_id';
-        }
-        // if subtemplate will be called in nocache mode do not merge
-        if ($compiler->template->caching && $call_nocache) {
-            $merge_compiled_includes = false;
-        }
-        // assign attribute
-        if (isset($_attr[ 'assign' ])) {
-            // output will be stored in a smarty variable instead of being displayed
-            if ($_assign = $compiler->getId($_attr[ 'assign' ])) {
-                $_assign = "'{$_assign}'";
-                if ($compiler->tag_nocache || $compiler->nocache || $call_nocache) {
-                    // create nocache var to make it know for further compiling
-                    $compiler->setNocacheInVariable($_attr[ 'assign' ]);
-                }
-            } else {
-                $_assign = $_attr[ 'assign' ];
-            }
-        }
-        $has_compiled_template = false;
-        if ($merge_compiled_includes) {
-            $c_id = isset($_attr[ 'compile_id' ]) ? $_attr[ 'compile_id' ] : $compiler->template->compile_id;
-            // we must observe different compile_id and caching
-            $t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
-            $compiler->smarty->allow_ambiguous_resources = true;
-            /* @var Smarty_Internal_Template $tpl */
-            $tpl = new $compiler->smarty->template_class(
-                trim($fullResourceName, '"\''),
-                $compiler->smarty,
-                $compiler->template,
-                $compiler->template->cache_id,
-                $c_id,
-                $_caching
-            );
-            $uid = $tpl->source->type . $tpl->source->uid;
-            if (!isset($compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ])) {
-                $has_compiled_template = $this->compileInlineTemplate($compiler, $tpl, $t_hash);
-            } else {
-                $has_compiled_template = true;
-            }
-            unset($tpl);
-        }
-        // delete {include} standard attributes
-        unset($_attr[ 'file' ], $_attr[ 'assign' ], $_attr[ 'cache_id' ], $_attr[ 'compile_id' ], $_attr[ 'cache_lifetime' ], $_attr[ 'nocache' ], $_attr[ 'caching' ], $_attr[ 'scope' ], $_attr[ 'inline' ]);
-        // remaining attributes must be assigned as smarty variable
-        $_vars = 'array()';
-        if (!empty($_attr)) {
-            $_pairs = array();
-            // create variables
-            foreach ($_attr as $key => $value) {
-                $_pairs[] = "'$key'=>$value";
-            }
-            $_vars = 'array(' . join(',', $_pairs) . ')';
-        }
-        $update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache &&
-                             $_compile_id !== '$_smarty_tpl->compile_id';
-        if ($has_compiled_template && !$call_nocache) {
-            $_output = "<?php\n";
-            if ($update_compile_id) {
-                $_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
-            }
-            if (!empty($_attr) && $_caching === 9999 && $compiler->template->caching) {
-                $_vars_nc = "foreach ($_vars as \$ik => \$iv) {\n";
-                $_vars_nc .= "\$_smarty_tpl->tpl_vars[\$ik] =  new Smarty_Variable(\$iv);\n";
-                $_vars_nc .= "}\n";
-                $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, -3);
-            }
-            if (isset($_assign)) {
-                $_output .= "ob_start();\n";
-            }
-            $_output .= "\$_smarty_tpl->_subTemplateRender({$fullResourceName}, {$_cache_id}, {$_compile_id}, {$_caching}, {$_cache_lifetime}, {$_vars}, {$_scope}, {$_cache_tpl}, '{$compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['uid']}', '{$compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['func']}');\n";
-            if (isset($_assign)) {
-                $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
-            }
-            if ($update_compile_id) {
-                $_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
-            }
-            $_output .= "?>";
-            return $_output;
-        }
-        if ($call_nocache) {
-            $compiler->tag_nocache = true;
-        }
-        $_output = "<?php ";
-        if ($update_compile_id) {
-            $_output .= "\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n";
-        }
-        // was there an assign attribute
-        if (isset($_assign)) {
-            $_output .= "ob_start();\n";
-        }
-        $_output .= "\$_smarty_tpl->_subTemplateRender({$fullResourceName}, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_scope, {$_cache_tpl});\n";
-        if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
-        }
-        if ($update_compile_id) {
-            $_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
-        }
-        $_output .= "?>";
-        return $_output;
-    }
-
-    /**
-     * Compile inline sub template
-     *
-     * @param \Smarty_Internal_SmartyTemplateCompiler $compiler
-     * @param \Smarty_Internal_Template               $tpl
-     * @param string                                  $t_hash
-     *
-     * @return bool
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function compileInlineTemplate(
-        Smarty_Internal_SmartyTemplateCompiler $compiler,
-        Smarty_Internal_Template $tpl,
-        $t_hash
-    ) {
-        $uid = $tpl->source->type . $tpl->source->uid;
-        if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
-            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] = $tpl->source->uid;
-            if (isset($compiler->template->inheritance)) {
-                $tpl->inheritance = clone $compiler->template->inheritance;
-            }
-            $tpl->compiled = new Smarty_Template_Compiled();
-            $tpl->compiled->nocache_hash = $compiler->parent_compiler->template->compiled->nocache_hash;
-            $tpl->loadCompiler();
-            // save unique function name
-            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'func' ] =
-            $tpl->compiled->unifunc = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-            // make sure whole chain gets compiled
-            $tpl->mustCompile = true;
-            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'nocache_hash' ] =
-                $tpl->compiled->nocache_hash;
-            if ($tpl->source->type === 'file') {
-                $sourceInfo = $tpl->source->filepath;
-            } else {
-                $basename = $tpl->source->handler->getBasename($tpl->source);
-                $sourceInfo = $tpl->source->type . ':' .
-                              ($basename ? $basename : $tpl->source->name);
-            }
-            // get compiled code
-            $compiled_code = "<?php\n\n";
-            $compiled_code .= $compiler->cStyleComment(" Start inline template \"{$sourceInfo}\" =============================") . "\n";
-            $compiled_code .= "function {$tpl->compiled->unifunc} (Smarty_Internal_Template \$_smarty_tpl) {\n";
-            $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
-            $compiled_code .= "<?php\n";
-            $compiled_code .= "}\n?>\n";
-            $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
-            $compiled_code .= "<?php\n\n";
-            $compiled_code .= $compiler->cStyleComment(" End inline template \"{$sourceInfo}\" =============================") . "\n";
-            $compiled_code .= '?>';
-            unset($tpl->compiler);
-            if ($tpl->compiled->has_nocache_code) {
-                // replace nocache_hash
-                $compiled_code =
-                    str_replace(
-                        "{$tpl->compiled->nocache_hash}",
-                        $compiler->template->compiled->nocache_hash,
-                        $compiled_code
-                    );
-                $compiler->template->compiled->has_nocache_code = true;
-            }
-            $compiler->parent_compiler->mergedSubTemplatesCode[ $tpl->compiled->unifunc ] = $compiled_code;
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php b/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php
deleted file mode 100644
index 29031d910..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Insert
- * Compiles the {insert} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the {insert} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache);
-        if (!$nocacheParam) {
-            // do not compile as nocache code
-            $compiler->suppressNocacheProcessing = true;
-        }
-        $compiler->tag_nocache = true;
-        $_smarty_tpl = $compiler->template;
-        $_name = null;
-        $_script = null;
-        $_output = '<?php ';
-        // save possible attributes
-        eval('$_name = @' . $_attr[ 'name' ] . ';');
-        if (isset($_attr[ 'assign' ])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr[ 'assign' ];
-            // create variable to make sure that the compiler knows about its nocache status
-            $var = trim($_attr[ 'assign' ], '\'');
-            if (isset($compiler->template->tpl_vars[ $var ])) {
-                $compiler->template->tpl_vars[ $var ]->nocache = true;
-            } else {
-                $compiler->template->tpl_vars[ $var ] = new Smarty_Variable(null, true);
-            }
-        }
-        if (isset($_attr[ 'script' ])) {
-            // script which must be included
-            $_function = "smarty_insert_{$_name}";
-            $_smarty_tpl = $compiler->template;
-            $_filepath = false;
-            eval('$_script = @' . $_attr[ 'script' ] . ';');
-            if (!isset($compiler->smarty->security_policy) && file_exists($_script)) {
-                $_filepath = $_script;
-            } else {
-                if (isset($compiler->smarty->security_policy)) {
-                    $_dir = $compiler->smarty->security_policy->trusted_dir;
-                } else {
-                    $_dir = null;
-                }
-                if (!empty($_dir)) {
-                    foreach ((array)$_dir as $_script_dir) {
-                        $_script_dir = rtrim($_script_dir ?? '', '/\\') . DIRECTORY_SEPARATOR;
-                        if (file_exists($_script_dir . $_script)) {
-                            $_filepath = $_script_dir . $_script;
-                            break;
-                        }
-                    }
-                }
-            }
-            if ($_filepath === false) {
-                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", null, true);
-            }
-            // code for script file loading
-            $_output .= "require_once '{$_filepath}' ;";
-            include_once $_filepath;
-            if (!is_callable($_function)) {
-                $compiler->trigger_template_error(
-                    " {insert} function '{$_function}' is not callable in script file '{$_script}'",
-                    null,
-                    true
-                );
-            }
-        } else {
-            $_filepath = 'null';
-            $_function = "insert_{$_name}";
-            // function in PHP script ?
-            if (!is_callable($_function)) {
-                // try plugin
-                if (!$_function = $compiler->getPlugin($_name, 'insert')) {
-                    $compiler->trigger_template_error(
-                        "{insert} no function or plugin found for '{$_name}'",
-                        null,
-                        true
-                    );
-                }
-            }
-        }
-        // delete {insert} standard attributes
-        unset($_attr[ 'name' ], $_attr[ 'assign' ], $_attr[ 'script' ], $_attr[ 'nocache' ]);
-        // convert attributes into parameter array string
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            $_paramsArray[] = "'$_key' => $_value";
-        }
-        $_params = 'array(' . implode(", ", $_paramsArray) . ')';
-        // call insert
-        if (isset($_assign)) {
-            if ($_smarty_tpl->caching && !$nocacheParam) {
-                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
-            } else {
-                $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
-            }
-        } else {
-            if ($_smarty_tpl->caching && !$nocacheParam) {
-                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
-            } else {
-                $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
-            }
-        }
-        $compiler->template->compiled->has_nocache_code = true;
-        return $_output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php b/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
deleted file mode 100644
index 5493d4ecc..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Ldelim
- * Compiles the {ldelim} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Ldelim Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {ldelim} tag
-     * This tag does output the left delimiter
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', null, true);
-        }
-        return $compiler->smarty->left_delimiter;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php b/include/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php
deleted file mode 100644
index 8a34ccd0a..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Make_Nocache
- * Compiles the {make_nocache} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Make_Nocache Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Make_Nocache extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array();
-
-    /**
-     * Array of names of required attribute required by tag
-     *
-     * @var array
-     */
-    public $required_attributes = array('var');
-
-    /**
-     * Shorttag attribute order defined by its names
-     *
-     * @var array
-     */
-    public $shorttag_order = array('var');
-
-    /**
-     * Compiles code for the {make_nocache} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($compiler->template->caching) {
-            $output = "<?php \$_smarty_tpl->smarty->ext->_make_nocache->save(\$_smarty_tpl, {$_attr[ 'var' ]});\n?>\n";
-            $compiler->template->compiled->has_nocache_code = true;
-            $compiler->suppressNocacheProcessing = true;
-            return $output;
-        } else {
-            return true;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php b/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
deleted file mode 100644
index 12f64ed2e..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Nocache
- * Compiles the {nocache} {/nocache} tags.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Nocache Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
-{
-    /**
-     * Array of names of valid option flags
-     *
-     * @var array
-     */
-    public $option_flags = array();
-
-    /**
-     * Compiles code for the {nocache} tag
-     * This tag does not generate compiled output. It only sets a compiler flag.
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return bool
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        $this->openTag($compiler, 'nocache', array($compiler->nocache));
-        // enter nocache mode
-        $compiler->nocache = true;
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-        return true;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Nocacheclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/nocache} tag
-     * This tag does not generate compiled output. It only sets a compiler flag.
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return bool
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        // leave nocache mode
-        list($compiler->nocache) = $this->closeTag($compiler, array('nocache'));
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-        return true;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_parent.php b/include/smarty/libs/sysplugins/smarty_internal_compile_parent.php
deleted file mode 100644
index ff23edf73..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_parent.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * This file is part of Smarty.
- *
- * (c) 2015 Uwe Tews
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Smarty Internal Plugin Compile Parent Class
- *
- * @author Uwe Tews <uwe.tews@googlemail.com>
- */
-class Smarty_Internal_Compile_Parent extends Smarty_Internal_Compile_Child
-{
-    /**
-     * Tag name
-     *
-     * @var string
-     */
-    public $tag = 'parent';
-
-    /**
-     * Block type
-     *
-     * @var string
-     */
-    public $blockType = 'Parent';
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
deleted file mode 100644
index 199a296c8..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Block Plugin
- * Compiles code for the execution of block plugin
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Block Plugin Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * nesting level
-     *
-     * @var int
-     */
-    public $nesting = 0;
-
-    /**
-     * Compiles code for the execution of block plugin
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     * @param string                                $tag       name of block plugin
-     * @param string                                $function  PHP function name
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function = null)
-    {
-        if (!isset($tag[ 5 ]) || substr($tag, -5) !== 'close') {
-            // opening tag of block plugin
-            // check and get attributes
-            $_attr = $this->getAttributes($compiler, $args);
-            $this->nesting++;
-            unset($_attr[ 'nocache' ]);
-            list($callback, $_paramsArray, $callable) = $this->setup($compiler, $_attr, $tag, $function);
-            $_params = 'array(' . implode(',', $_paramsArray) . ')';
-            // compile code
-            $output = "<?php ";
-            if (is_array($callback)) {
-                $output .= "\$_block_plugin{$this->nesting} = isset({$callback[0]}) ? {$callback[0]} : null;\n";
-                $callback = "\$_block_plugin{$this->nesting}{$callback[1]}";
-            }
-            if (isset($callable)) {
-                $output .= "if (!is_callable({$callable})) {\nthrow new SmartyException('block tag \'{$tag}\' not callable or registered');\n}\n";
-            }
-            $output .= "\$_smarty_tpl->smarty->_cache['_tag_stack'][] = array('{$tag}', {$_params});\n";
-            $output .= "\$_block_repeat=true;\necho {$callback}({$_params}, null, \$_smarty_tpl, \$_block_repeat);\nwhile (\$_block_repeat) {\nob_start();?>";
-            $this->openTag($compiler, $tag, array($_params, $compiler->nocache, $callback));
-            // maybe nocache because of nocache variables or nocache plugin
-            $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        } else {
-            // must endblock be nocache?
-            if ($compiler->nocache) {
-                $compiler->tag_nocache = true;
-            }
-            // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache, $callback) = $this->closeTag($compiler, substr($tag, 0, -5));
-            // compile code
-            if (!isset($parameter[ 'modifier_list' ])) {
-                $mod_pre = $mod_post = $mod_content = '';
-                $mod_content2 = 'ob_get_clean()';
-            } else {
-                $mod_content2 = "\$_block_content{$this->nesting}";
-                $mod_content = "\$_block_content{$this->nesting} = ob_get_clean();\n";
-                $mod_pre = "ob_start();\n";
-                $mod_post = 'echo ' . $compiler->compileTag(
-                        'private_modifier',
-                        array(),
-                        array(
-                            'modifierlist' => $parameter[ 'modifier_list' ],
-                            'value'        => 'ob_get_clean()'
-                        )
-                    ) . ";\n";
-            }
-            $output =
-                "<?php {$mod_content}\$_block_repeat=false;\n{$mod_pre}echo {$callback}({$_params}, {$mod_content2}, \$_smarty_tpl, \$_block_repeat);\n{$mod_post}}\n";
-            $output .= 'array_pop($_smarty_tpl->smarty->_cache[\'_tag_stack\']);?>';
-        }
-        return $output;
-    }
-
-    /**
-     * Setup callback and parameter array
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param array                                 $_attr attributes
-     * @param string                                $tag
-     * @param string                                $function
-     *
-     * @return array
-     */
-    public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $function)
-    {
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        return array($function, $_paramsArray, null);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php
deleted file mode 100644
index 246350dc8..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile ForeachSection
- * Shared methods for {foreach} {section} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile ForeachSection Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_CompileBase
-{
-    /**
-     * Name of this tag
-     *
-     * @var string
-     */
-    public $tagName = '';
-
-    /**
-     * Valid properties of $smarty.xxx variable
-     *
-     * @var array
-     */
-    public $nameProperties = array();
-
-    /**
-     * {section} tag has no item properties
-     *
-     * @var array
-     */
-    public $itemProperties = null;
-
-    /**
-     * {section} tag has always name attribute
-     *
-     * @var bool
-     */
-    public $isNamed = true;
-
-    /**
-     * @var array
-     */
-    public $matchResults = array();
-
-    /**
-     * Preg search pattern
-     *
-     * @var string
-     */
-    private $propertyPreg = '';
-
-    /**
-     * Offsets in preg match result
-     *
-     * @var array
-     */
-    private $resultOffsets = array();
-
-    /**
-     * Start offset
-     *
-     * @var int
-     */
-    private $startOffset = 0;
-
-    /**
-     * Scan sources for used tag attributes
-     *
-     * @param array                                 $attributes
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     *
-     * @throws \SmartyException
-     */
-    public function scanForProperties($attributes, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $this->propertyPreg = '~(';
-        $this->startOffset = 1;
-        $this->resultOffsets = array();
-        $this->matchResults = array('named' => array(), 'item' => array());
-        if (isset($attributes[ 'name' ])) {
-            $this->buildPropertyPreg(true, $attributes);
-        }
-        if (isset($this->itemProperties)) {
-            if ($this->isNamed) {
-                $this->propertyPreg .= '|';
-            }
-            $this->buildPropertyPreg(false, $attributes);
-        }
-        $this->propertyPreg .= ')\W~i';
-        // Template source
-        $this->matchTemplateSource($compiler);
-        // Parent template source
-        $this->matchParentTemplateSource($compiler);
-        // {block} source
-        $this->matchBlockSource($compiler);
-    }
-
-    /**
-     * Build property preg string
-     *
-     * @param bool  $named
-     * @param array $attributes
-     */
-    public function buildPropertyPreg($named, $attributes)
-    {
-        if ($named) {
-            $this->resultOffsets[ 'named' ] = $this->startOffset = $this->startOffset + 3;
-            $this->propertyPreg .= "(([\$]smarty[.]{$this->tagName}[.]" .
-                                   ($this->tagName === 'section' ? "|[\[]\s*" : '') .
-                                   "){$attributes['name']}[.](";
-            $properties = $this->nameProperties;
-        } else {
-            $this->resultOffsets[ 'item' ] = $this->startOffset = $this->startOffset + 2;
-            $this->propertyPreg .= "([\$]{$attributes['item']}[@](";
-            $properties = $this->itemProperties;
-        }
-        $propName = reset($properties);
-        while ($propName) {
-            $this->propertyPreg .= "{$propName}";
-            $propName = next($properties);
-            if ($propName) {
-                $this->propertyPreg .= '|';
-            }
-        }
-        $this->propertyPreg .= '))';
-    }
-
-    /**
-     * Find matches in source string
-     *
-     * @param string $source
-     */
-    public function matchProperty($source)
-    {
-        preg_match_all($this->propertyPreg, $source, $match);
-        foreach ($this->resultOffsets as $key => $offset) {
-            foreach ($match[ $offset ] as $m) {
-                if (!empty($m)) {
-                    $this->matchResults[ $key ][ smarty_strtolower_ascii($m) ] = true;
-                }
-            }
-        }
-    }
-
-    /**
-     * Find matches in template source
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    public function matchTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $this->matchProperty($compiler->parser->lex->data);
-    }
-
-    /**
-     * Find matches in all parent template source
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     *
-     * @throws \SmartyException
-     */
-    public function matchParentTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // search parent compiler template source
-        $nextCompiler = $compiler;
-        while ($nextCompiler !== $nextCompiler->parent_compiler) {
-            $nextCompiler = $nextCompiler->parent_compiler;
-            if ($compiler !== $nextCompiler) {
-                // get template source
-                $_content = $nextCompiler->template->source->getContent();
-                if ($_content !== '') {
-                    // run pre filter if required
-                    if ((isset($nextCompiler->smarty->autoload_filters[ 'pre' ]) ||
-                         isset($nextCompiler->smarty->registered_filters[ 'pre' ]))
-                    ) {
-                        $_content = $nextCompiler->smarty->ext->_filterHandler->runFilter(
-                            'pre',
-                            $_content,
-                            $nextCompiler->template
-                        );
-                    }
-                    $this->matchProperty($_content);
-                }
-            }
-        }
-    }
-
-    /**
-     * Find matches in {block} tag source
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    public function matchBlockSource(Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-    }
-
-    /**
-     * Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $tag = smarty_strtolower_ascii(trim($parameter[ 0 ], '"\''));
-        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
-        if (!$name) {
-            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
-        }
-        $property = isset($parameter[ 2 ]) ? smarty_strtolower_ascii($compiler->getId($parameter[ 2 ])) : false;
-        if (!$property || !in_array($property, $this->nameProperties)) {
-            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
-        }
-        $tagVar = "'__smarty_{$tag}_{$name}'";
-        return "(isset(\$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}']) ? \$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}'] : null)";
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
deleted file mode 100644
index 055823423..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function Plugin
- * Compiles code for the execution of function plugin
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function Plugin Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array();
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of function plugin
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     * @param string                                $tag       name of function plugin
-     * @param string                                $function  PHP function name
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        unset($_attr[ 'nocache' ]);
-        // convert attributes into parameter array string
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $_params = 'array(' . implode(',', $_paramsArray) . ')';
-        // compile code
-        $output = "{$function}({$_params},\$_smarty_tpl)";
-        if (!empty($parameter[ 'modifierlist' ])) {
-            $output = $compiler->compileTag(
-                'private_modifier',
-                array(),
-                array(
-                    'modifierlist' => $parameter[ 'modifierlist' ],
-                    'value'        => $output
-                )
-            );
-        }
-        $output = "<?php echo {$output};?>\n";
-        return $output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
deleted file mode 100644
index aea082f01..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Modifier
- * Compiles code for modifier execution
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Modifier Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for modifier execution
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $output = $parameter[ 'value' ];
-        // loop over list of modifiers
-        foreach ($parameter[ 'modifierlist' ] as $single_modifier) {
-            /* @var string $modifier */
-            $modifier = $single_modifier[ 0 ];
-            $single_modifier[ 0 ] = $output;
-            $params = implode(',', $single_modifier);
-            // check if we know already the type of modifier
-            if (isset($compiler->known_modifier_type[ $modifier ])) {
-                $modifier_types = array($compiler->known_modifier_type[ $modifier ]);
-            } else {
-                $modifier_types = array(1, 2, 3, 4, 5, 6);
-            }
-            foreach ($modifier_types as $type) {
-                switch ($type) {
-                    case 1:
-                        // registered modifier
-                        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ])) {
-                            if (is_callable($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ])) {
-                                $output =
-                                    sprintf(
-                                        'call_user_func_array($_smarty_tpl->registered_plugins[ \'%s\' ][ %s ][ 0 ], array( %s ))',
-                                        Smarty::PLUGIN_MODIFIER,
-                                        var_export($modifier, true),
-                                        $params
-                                    );
-                                $compiler->known_modifier_type[ $modifier ] = $type;
-                                break 2;
-                            }
-                        }
-                        break;
-                    case 2:
-                        // registered modifier compiler
-                        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIERCOMPILER ][ $modifier ][ 0 ])) {
-                            $output =
-                                call_user_func(
-                                    $compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIERCOMPILER ][ $modifier ][ 0 ],
-                                    $single_modifier,
-                                    $compiler->smarty
-                                );
-                            $compiler->known_modifier_type[ $modifier ] = $type;
-                            break 2;
-                        }
-                        break;
-                    case 3:
-                        // modifiercompiler plugin
-                        if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
-                            // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy)
-                                || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
-                            ) {
-                                $plugin = 'smarty_modifiercompiler_' . $modifier;
-                                $output = $plugin($single_modifier, $compiler);
-                            }
-                            $compiler->known_modifier_type[ $modifier ] = $type;
-                            break 2;
-                        }
-                        break;
-                    case 4:
-                        // modifier plugin
-                        if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
-                            // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy)
-                                || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
-                            ) {
-                                $output = "{$function}({$params})";
-                            }
-                            $compiler->known_modifier_type[ $modifier ] = $type;
-                            break 2;
-                        }
-                        break;
-                    case 5:
-                        // PHP function
-                        if (is_callable($modifier)) {
-                            // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy)
-                                || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
-                            ) {
-                                trigger_error('Using php-function "' . $modifier . '" as a modifier is deprecated and will be ' .
-                                    'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .
-                                    'a custom modifier.', E_USER_DEPRECATED);
-                                $output = "{$modifier}({$params})";
-                            }
-                            $compiler->known_modifier_type[ $modifier ] = $type;
-                            break 2;
-                        }
-                        break;
-                    case 6:
-                        // default plugin handler
-                        if (isset($compiler->default_handler_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ])
-                            || (is_callable($compiler->smarty->default_plugin_handler_func)
-                                && $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))
-                        ) {
-                            $function = $compiler->default_handler_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ];
-                            // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy)
-                                || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
-                            ) {
-                                if (!is_array($function)) {
-                                    $output = "{$function}({$params})";
-                                } else {
-                                    if (is_object($function[ 0 ])) {
-                                        $output = $function[ 0 ] . '->' . $function[ 1 ] . '(' . $params . ')';
-                                    } else {
-                                        $output = $function[ 0 ] . '::' . $function[ 1 ] . '(' . $params . ')';
-                                    }
-                                }
-                            }
-                            if (isset($compiler->required_plugins[ 'nocache' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ])
-                                ||
-                                isset($compiler->required_plugins[ 'compiled' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ])
-                            ) {
-                                // was a plugin
-                                $compiler->known_modifier_type[ $modifier ] = 4;
-                            } else {
-                                $compiler->known_modifier_type[ $modifier ] = $type;
-                            }
-                            break 2;
-                        }
-                }
-            }
-            if (!isset($compiler->known_modifier_type[ $modifier ])) {
-                $compiler->trigger_template_error("unknown modifier '{$modifier}'", null, true);
-            }
-        }
-        return $output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
deleted file mode 100644
index baac51b28..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Object Block Function
- * Compiles code for registered objects as block function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Object Block Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_Compile_Private_Block_Plugin
-{
-    /**
-     * Setup callback and parameter array
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param array                                 $_attr attributes
-     * @param string                                $tag
-     * @param string                                $method
-     *
-     * @return array
-     */
-    public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $method)
-    {
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $callback = array("\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]", "->{$method}");
-        return array($callback, $_paramsArray, "array(\$_block_plugin{$this->nesting}, '{$method}')");
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
deleted file mode 100644
index 2a763c6e3..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Object Function
- * Compiles code for registered objects as function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Object Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of function plugin
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     * @param string                                $tag       name of function
-     * @param string                                $method    name of method to call
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        unset($_attr[ 'nocache' ]);
-        $_assign = null;
-        if (isset($_attr[ 'assign' ])) {
-            $_assign = $_attr[ 'assign' ];
-            unset($_attr[ 'assign' ]);
-        }
-        // method or property ?
-        if (is_callable(array($compiler->smarty->registered_objects[ $tag ][ 0 ], $method))) {
-            // convert attributes into parameter array string
-            if ($compiler->smarty->registered_objects[ $tag ][ 2 ]) {
-                $_paramsArray = array();
-                foreach ($_attr as $_key => $_value) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-                $_params = 'array(' . implode(',', $_paramsArray) . ')';
-                $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
-            } else {
-                $_params = implode(',', $_attr);
-                $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
-            }
-        } else {
-            // object property
-            $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}";
-        }
-        if (!empty($parameter[ 'modifierlist' ])) {
-            $output = $compiler->compileTag(
-                'private_modifier',
-                array(),
-                array('modifierlist' => $parameter[ 'modifierlist' ], 'value' => $output)
-            );
-        }
-        if (empty($_assign)) {
-            return "<?php echo {$output};?>\n";
-        } else {
-            return "<?php \$_smarty_tpl->assign({$_assign},{$output});?>\n";
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
deleted file mode 100644
index 96bd37244..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Print Expression
- * Compiles any tag which will output an expression or variable
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Print Expression Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('assign');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('nocache', 'nofilter');
-
-    /**
-     * 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);
-        $output = $parameter[ 'value' ];
-        // tag modifier
-        if (!empty($parameter[ 'modifierlist' ])) {
-            $output = $compiler->compileTag(
-                'private_modifier',
-                array(),
-                array(
-                    'modifierlist' => $parameter[ 'modifierlist' ],
-                    'value'        => $output
-                )
-            );
-        }
-        if (isset($_attr[ 'assign' ])) {
-            // assign output to variable
-            return "<?php \$_smarty_tpl->assign({$_attr['assign']},{$output});?>";
-        } else {
-            // display value
-            if (!$_attr[ 'nofilter' ]) {
-                // default modifier
-                if (!empty($compiler->smarty->default_modifiers)) {
-                    if (empty($compiler->default_modifier_list)) {
-                        $modifierlist = array();
-                        foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) {
-                            preg_match_all(
-                                '/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/',
-                                $single_default_modifier,
-                                $mod_array
-                            );
-                            for ($i = 0, $count = count($mod_array[ 0 ]); $i < $count; $i++) {
-                                if ($mod_array[ 0 ][ $i ] !== ':') {
-                                    $modifierlist[ $key ][] = $mod_array[ 0 ][ $i ];
-                                }
-                            }
-                        }
-                        $compiler->default_modifier_list = $modifierlist;
-                    }
-                    $output = $compiler->compileTag(
-                        'private_modifier',
-                        array(),
-                        array(
-                            'modifierlist' => $compiler->default_modifier_list,
-                            'value'        => $output
-                        )
-                    );
-                }
-                // autoescape html
-                if ($compiler->template->smarty->escape_html) {
-                    $output = "htmlspecialchars((string) {$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
-                }
-                // loop over registered filters
-                if (!empty($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ])) {
-                    foreach ($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ] as $key =>
-                        $function) {
-                        if (!is_array($function)) {
-                            $output = "{$function}({$output},\$_smarty_tpl)";
-                        } elseif (is_object($function[ 0 ])) {
-                            $output =
-                                "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE]['{$key}'][0]->{$function[1]}({$output},\$_smarty_tpl)";
-                        } else {
-                            $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)";
-                        }
-                    }
-                }
-                // auto loaded filters
-                if (isset($compiler->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ])) {
-                    foreach ((array)$compiler->template->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ] as $name) {
-                        $result = $this->compile_variable_filter($compiler, $name, $output);
-                        if ($result !== false) {
-                            $output = $result;
-                        } else {
-                            // not found, throw exception
-                            throw new SmartyException("Unable to load variable filter '{$name}'");
-                        }
-                    }
-                }
-                foreach ($compiler->variable_filters as $filter) {
-                    if (count($filter) === 1
-                        && ($result = $this->compile_variable_filter($compiler, $filter[ 0 ], $output)) !== false
-                    ) {
-                        $output = $result;
-                    } else {
-                        $output = $compiler->compileTag(
-                            'private_modifier',
-                            array(),
-                            array('modifierlist' => array($filter), 'value' => $output)
-                        );
-                    }
-                }
-            }
-            $output = "<?php echo {$output};?>\n";
-        }
-        return $output;
-    }
-
-    /**
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     * @param string                                $name     name of variable filter
-     * @param string                                $output   embedded output
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    private function compile_variable_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output)
-    {
-        $function = $compiler->getPlugin($name, 'variablefilter');
-        if ($function) {
-            return "{$function}({$output},\$_smarty_tpl)";
-        } else {
-            // not found
-            return false;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
deleted file mode 100644
index 0f818d1b3..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Registered Block
- * Compiles code for the execution of a registered block function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Registered Block Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_Compile_Private_Block_Plugin
-{
-    /**
-     * Setup callback, parameter array and nocache mode
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param array                                 $_attr attributes
-     * @param string                                $tag
-     * @param null                                  $function
-     *
-     * @return array
-     */
-    public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $function)
-    {
-        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $tag ])) {
-            $tag_info = $compiler->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $tag ];
-            $callback = $tag_info[ 0 ];
-            if (is_array($callback)) {
-                if (is_object($callback[ 0 ])) {
-                    $callable = "array(\$_block_plugin{$this->nesting}, '{$callback[1]}')";
-                    $callback =
-                        array("\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]", "->{$callback[1]}");
-                } else {
-                    $callable = "array(\$_block_plugin{$this->nesting}, '{$callback[1]}')";
-                    $callback =
-                        array("\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]", "::{$callback[1]}");
-                }
-            } else {
-                $callable = "\$_block_plugin{$this->nesting}";
-                $callback = array("\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0]", '');
-            }
-        } else {
-            $tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $tag ];
-            $callback = $tag_info[ 0 ];
-            if (is_array($callback)) {
-                $callable = "array('{$callback[0]}', '{$callback[1]}')";
-                $callback = "{$callback[1]}::{$callback[1]}";
-            } else {
-                $callable = null;
-            }
-        }
-        $compiler->tag_nocache = !$tag_info[ 1 ] | $compiler->tag_nocache;
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } elseif ($compiler->template->caching && in_array($_key, $tag_info[ 2 ])) {
-                $_value = str_replace('\'', "^#^", $_value);
-                $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        return array($callback, $_paramsArray, $callable);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
deleted file mode 100644
index 2591107d2..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Registered Function
- * Compiles code for the execution of a registered function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Registered Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of a registered function
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     * @param string                                $tag       name of function
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        unset($_attr[ 'nocache' ]);
-        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
-            $tag_info = $compiler->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ];
-            $is_registered = true;
-        } else {
-            $tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ];
-            $is_registered = false;
-        }
-        // not cacheable?
-        $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[ 1 ];
-        // convert attributes into parameter array string
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } elseif ($compiler->template->caching && in_array($_key, $tag_info[ 2 ])) {
-                $_value = str_replace('\'', "^#^", $_value);
-                $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $_params = 'array(' . implode(',', $_paramsArray) . ')';
-        // compile code
-        if ($is_registered) {
-            $output =
-                "call_user_func_array( \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0], array( {$_params},\$_smarty_tpl ) )";
-        } else {
-            $function = $tag_info[ 0 ];
-            if (!is_array($function)) {
-                $output = "{$function}({$_params},\$_smarty_tpl)";
-            } else {
-                $output = "{$function[0]}::{$function[1]}({$_params},\$_smarty_tpl)";
-            }
-        }
-        if (!empty($parameter[ 'modifierlist' ])) {
-            $output = $compiler->compileTag(
-                'private_modifier',
-                array(),
-                array(
-                    'modifierlist' => $parameter[ 'modifierlist' ],
-                    'value'        => $output
-                )
-            );
-        }
-        $output = "<?php echo {$output};?>\n";
-        return $output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
deleted file mode 100644
index 590cba5af..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Special Smarty Variable
- * Compiles the special $smarty variables
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile special Smarty Variable Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the special $smarty variables
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     * @param                                       $parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
-        $variable = smarty_strtolower_ascii($compiler->getId($_index[ 0 ]));
-        if ($variable === false) {
-            $compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
-        }
-        if (!isset($compiler->smarty->security_policy)
-            || $compiler->smarty->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)
-        ) {
-            switch ($variable) {
-                case 'foreach':
-                case 'section':
-                    if (!isset(Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ])) {
-                        $class = 'Smarty_Internal_Compile_' . smarty_ucfirst_ascii($variable);
-                        Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ] = new $class;
-                    }
-                    return Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ]->compileSpecialVariable(
-                        array(),
-                        $compiler,
-                        $_index
-                    );
-                case 'capture':
-                    if (class_exists('Smarty_Internal_Compile_Capture')) {
-                        return Smarty_Internal_Compile_Capture::compileSpecialVariable(array(), $compiler, $_index);
-                    }
-                    return '';
-                case 'now':
-                    return 'time()';
-                case 'cookies':
-                    if (isset($compiler->smarty->security_policy)
-                        && !$compiler->smarty->security_policy->allow_super_globals
-                    ) {
-                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                        break;
-                    }
-                    $compiled_ref = '$_COOKIE';
-                    break;
-                case 'get':
-                case 'post':
-                case 'env':
-                case 'server':
-                case 'session':
-                case 'request':
-                    if (isset($compiler->smarty->security_policy)
-                        && !$compiler->smarty->security_policy->allow_super_globals
-                    ) {
-                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                        break;
-                    }
-                    $compiled_ref = '$_' . smarty_strtoupper_ascii($variable);
-                    break;
-                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)';
-                case 'version':
-                    return "Smarty::SMARTY_VERSION";
-                case 'const':
-                    if (isset($compiler->smarty->security_policy)
-                        && !$compiler->smarty->security_policy->allow_constants
-                    ) {
-                        $compiler->trigger_template_error("(secure mode) constants not permitted");
-                        break;
-                    }
-                    if (strpos($_index[ 1 ], '$') === false && strpos($_index[ 1 ], '\'') === false) {
-                        return "(defined('{$_index[1]}') ? constant('{$_index[1]}') : null)";
-                    } else {
-                        return "(defined({$_index[1]}) ? constant({$_index[1]}) : null)";
-                    }
-                // no break
-                case 'config':
-                    if (isset($_index[ 2 ])) {
-                        return "(is_array(\$tmp = \$_smarty_tpl->smarty->ext->configload->_getConfigVariable(\$_smarty_tpl, $_index[1])) ? \$tmp[$_index[2]] : null)";
-                    } else {
-                        return "\$_smarty_tpl->smarty->ext->configload->_getConfigVariable(\$_smarty_tpl, $_index[1])";
-                    }
-                // no break
-                case 'ldelim':
-                    return "\$_smarty_tpl->smarty->left_delimiter";
-                case 'rdelim':
-                    return "\$_smarty_tpl->smarty->right_delimiter";
-                default:
-                    $compiler->trigger_template_error('$smarty.' . trim($_index[ 0 ], "'") . ' is not defined');
-                    break;
-            }
-            if (isset($_index[ 1 ])) {
-                array_shift($_index);
-                foreach ($_index as $_ind) {
-                    $compiled_ref = $compiled_ref . "[$_ind]";
-                }
-            }
-            return $compiled_ref;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php b/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
deleted file mode 100644
index 1cc340c18..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Rdelim
- * Compiles the {rdelim} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Rdelim Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_Compile_Ldelim
-{
-    /**
-     * Compiles code for the {rdelim} tag
-     * This tag does output the right delimiter.
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        parent::compile($args, $compiler);
-        return $compiler->smarty->right_delimiter;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_section.php b/include/smarty/libs/sysplugins/smarty_internal_compile_section.php
deleted file mode 100644
index 0dee20820..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_section.php
+++ /dev/null
@@ -1,462 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Section
- * Compiles the {section} {sectionelse} {/section} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Section Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_ForeachSection
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name', 'loop');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name', 'loop');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('start', 'step', 'max', 'show', 'properties');
-
-    /**
-     * counter
-     *
-     * @var int
-     */
-    public $counter = 0;
-
-    /**
-     * Name of this tag
-     *
-     * @var string
-     */
-    public $tagName = 'section';
-
-    /**
-     * Valid properties of $smarty.section.name.xxx variable
-     *
-     * @var array
-     */
-    public $nameProperties = array(
-        'first', 'last', 'index', 'iteration', 'show', 'total', 'rownum', 'index_prev',
-        'index_next', 'loop'
-    );
-
-    /**
-     * {section} tag has no item properties
-     *
-     * @var array
-     */
-    public $itemProperties = null;
-
-    /**
-     * {section} tag has always name attribute
-     *
-     * @var bool
-     */
-    public $isNamed = true;
-
-    /**
-     * Compiles code for the {section} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $compiler->loopNesting++;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $attributes = array('name' => $compiler->getId($_attr[ 'name' ]));
-        unset($_attr[ 'name' ]);
-        foreach ($attributes as $a => $v) {
-            if ($v === false) {
-                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
-            }
-        }
-        $local = "\$__section_{$attributes['name']}_" . $this->counter++ . '_';
-        $sectionVar = "\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']";
-        $this->openTag($compiler, 'section', array('section', $compiler->nocache, $local, $sectionVar));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $initLocal = array();
-        $initNamedProperty = array();
-        $initFor = array();
-        $incFor = array();
-        $cmpFor = array();
-        $propValue = array(
-            'index'     => "{$sectionVar}->value['index']", 'show' => 'true', 'step' => 1,
-            'iteration' => "{$local}iteration",
-        );
-        $propType = array('index' => 2, 'iteration' => 2, 'show' => 0, 'step' => 0,);
-        // search for used tag attributes
-        $this->scanForProperties($attributes, $compiler);
-        if (!empty($this->matchResults[ 'named' ])) {
-            $namedAttr = $this->matchResults[ 'named' ];
-        }
-        if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) {
-            foreach ($match[ 1 ] as $prop) {
-                if (in_array($prop, $this->nameProperties)) {
-                    $namedAttr[ $prop ] = true;
-                } else {
-                    $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
-                }
-            }
-        }
-        $namedAttr[ 'index' ] = true;
-        $output = "<?php\n";
-        foreach ($_attr as $attr_name => $attr_value) {
-            switch ($attr_name) {
-                case 'loop':
-                    if (is_numeric($attr_value)) {
-                        $v = (int)$attr_value;
-                        $t = 0;
-                    } else {
-                        $v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
-                        $t = 1;
-                    }
-                    if ($t === 1) {
-                        $initLocal[ 'loop' ] = $v;
-                        $v = "{$local}loop";
-                    }
-                    break;
-                case 'show':
-                    if (is_bool($attr_value)) {
-                        $v = $attr_value ? 'true' : 'false';
-                        $t = 0;
-                    } else {
-                        $v = "(bool) $attr_value";
-                        $t = 3;
-                    }
-                    break;
-                case 'step':
-                    if (is_numeric($attr_value)) {
-                        $v = (int)$attr_value;
-                        $v = ($v === 0) ? 1 : $v;
-                        $t = 0;
-                        break;
-                    }
-                    $initLocal[ 'step' ] = "((int)@$attr_value) === 0 ? 1 : (int)@$attr_value";
-                    $v = "{$local}step";
-                    $t = 2;
-                    break;
-                case 'max':
-                case 'start':
-                    if (is_numeric($attr_value)) {
-                        $v = (int)$attr_value;
-                        $t = 0;
-                        break;
-                    }
-                    $v = "(int)@$attr_value";
-                    $t = 3;
-                    break;
-            }
-            if ($t === 3 && $compiler->getId($attr_value)) {
-                $t = 1;
-            }
-            $propValue[ $attr_name ] = $v;
-            $propType[ $attr_name ] = $t;
-        }
-        if (isset($namedAttr[ 'step' ])) {
-            $initNamedProperty[ 'step' ] = $propValue[ 'step' ];
-        }
-        if (isset($namedAttr[ 'iteration' ])) {
-            $propValue[ 'iteration' ] = "{$sectionVar}->value['iteration']";
-        }
-        $incFor[ 'iteration' ] = "{$propValue['iteration']}++";
-        $initFor[ 'iteration' ] = "{$propValue['iteration']} = 1";
-        if ($propType[ 'step' ] === 0) {
-            if ($propValue[ 'step' ] === 1) {
-                $incFor[ 'index' ] = "{$sectionVar}->value['index']++";
-            } elseif ($propValue[ 'step' ] > 1) {
-                $incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}";
-            } else {
-                $incFor[ 'index' ] = "{$sectionVar}->value['index'] -= " . -$propValue[ 'step' ];
-            }
-        } else {
-            $incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}";
-        }
-        if (!isset($propValue[ 'max' ])) {
-            $propValue[ 'max' ] = $propValue[ 'loop' ];
-            $propType[ 'max' ] = $propType[ 'loop' ];
-        } elseif ($propType[ 'max' ] !== 0) {
-            $propValue[ 'max' ] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
-            $propType[ 'max' ] = 1;
-        } else {
-            if ($propValue[ 'max' ] < 0) {
-                $propValue[ 'max' ] = $propValue[ 'loop' ];
-                $propType[ 'max' ] = $propType[ 'loop' ];
-            }
-        }
-        if (!isset($propValue[ 'start' ])) {
-            $start_code =
-                array(1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue[ 'loop' ], 5 => ' - 1');
-            if ($propType[ 'loop' ] === 0) {
-                $start_code[ 5 ] = '';
-                $start_code[ 4 ] = $propValue[ 'loop' ] - 1;
-            }
-            if ($propType[ 'step' ] === 0) {
-                if ($propValue[ 'step' ] > 0) {
-                    $start_code = array(1 => '0');
-                    $propType[ 'start' ] = 0;
-                } else {
-                    $start_code[ 1 ] = $start_code[ 2 ] = $start_code[ 3 ] = '';
-                    $propType[ 'start' ] = $propType[ 'loop' ];
-                }
-            } else {
-                $propType[ 'start' ] = 1;
-            }
-            $propValue[ 'start' ] = join('', $start_code);
-        } else {
-            $start_code =
-                array(
-                    1  => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ", 4 => '0',
-                    5  => ' : ', 6 => '-1', 7 => ', ', 8 => "{$propValue['start']} + {$propValue['loop']}", 10 => ')',
-                    11 => ' : ', 12 => 'min(', 13 => $propValue[ 'start' ], 14 => ', ',
-                    15 => "{$propValue['step']} > 0 ? ", 16 => $propValue[ 'loop' ], 17 => ' : ',
-                    18 => $propType[ 'loop' ] === 0 ? $propValue[ 'loop' ] - 1 : "{$propValue['loop']} - 1",
-                    19 => ')'
-                );
-            if ($propType[ 'step' ] === 0) {
-                $start_code[ 3 ] = $start_code[ 5 ] = $start_code[ 15 ] = $start_code[ 17 ] = '';
-                if ($propValue[ 'step' ] > 0) {
-                    $start_code[ 6 ] = $start_code[ 18 ] = '';
-                } else {
-                    $start_code[ 4 ] = $start_code[ 16 ] = '';
-                }
-            }
-            if ($propType[ 'start' ] === 0) {
-                if ($propType[ 'loop' ] === 0) {
-                    $start_code[ 8 ] = $propValue[ 'start' ] + $propValue[ 'loop' ];
-                }
-                $propType[ 'start' ] = $propType[ 'step' ] + $propType[ 'loop' ];
-                $start_code[ 1 ] = '';
-                if ($propValue[ 'start' ] < 0) {
-                    for ($i = 11; $i <= 19; $i++) {
-                        $start_code[ $i ] = '';
-                    }
-                    if ($propType[ 'start' ] === 0) {
-                        $start_code = array(
-                            max(
-                                $propValue[ 'step' ] > 0 ? 0 : -1,
-                                $propValue[ 'start' ] + $propValue[ 'loop' ]
-                            )
-                        );
-                    }
-                } else {
-                    for ($i = 1; $i <= 11; $i++) {
-                        $start_code[ $i ] = '';
-                    }
-                    if ($propType[ 'start' ] === 0) {
-                        $start_code =
-                            array(
-                                min(
-                                    $propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] : $propValue[ 'loop' ] - 1,
-                                    $propValue[ 'start' ]
-                                )
-                            );
-                    }
-                }
-            }
-            $propValue[ 'start' ] = join('', $start_code);
-        }
-        if ($propType[ 'start' ] !== 0) {
-            $initLocal[ 'start' ] = $propValue[ 'start' ];
-            $propValue[ 'start' ] = "{$local}start";
-        }
-        $initFor[ 'index' ] = "{$sectionVar}->value['index'] = {$propValue['start']}";
-        if (!isset($_attr[ 'start' ]) && !isset($_attr[ 'step' ]) && !isset($_attr[ 'max' ])) {
-            $propValue[ 'total' ] = $propValue[ 'loop' ];
-            $propType[ 'total' ] = $propType[ 'loop' ];
-        } else {
-            $propType[ 'total' ] =
-                $propType[ 'start' ] + $propType[ 'loop' ] + $propType[ 'step' ] + $propType[ 'max' ];
-            if ($propType[ 'total' ] === 0) {
-                $propValue[ 'total' ] =
-                    min(
-                        ceil(
-                            ($propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] - $propValue[ 'start' ] :
-                                (int)$propValue[ 'start' ] + 1) / abs($propValue[ 'step' ])
-                        ),
-                        $propValue[ 'max' ]
-                    );
-            } else {
-                $total_code = array(
-                    1  => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
-                    5  => $propValue[ 'loop' ], 6 => ' - ', 7 => $propValue[ 'start' ], 8 => ' : ',
-                    9  => $propValue[ 'start' ], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
-                    14 => $propValue[ 'step' ], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",
-                );
-                if (!isset($propValue[ 'max' ])) {
-                    $total_code[ 1 ] = $total_code[ 17 ] = '';
-                }
-                if ($propType[ 'loop' ] + $propType[ 'start' ] === 0) {
-                    $total_code[ 5 ] = $propValue[ 'loop' ] - $propValue[ 'start' ];
-                    $total_code[ 6 ] = $total_code[ 7 ] = '';
-                }
-                if ($propType[ 'start' ] === 0) {
-                    $total_code[ 9 ] = (int)$propValue[ 'start' ] + 1;
-                    $total_code[ 10 ] = '';
-                }
-                if ($propType[ 'step' ] === 0) {
-                    $total_code[ 13 ] = $total_code[ 15 ] = '';
-                    if ($propValue[ 'step' ] === 1 || $propValue[ 'step' ] === -1) {
-                        $total_code[ 2 ] = $total_code[ 12 ] = $total_code[ 14 ] = $total_code[ 16 ] = '';
-                    } elseif ($propValue[ 'step' ] < 0) {
-                        $total_code[ 14 ] = -$propValue[ 'step' ];
-                    }
-                    $total_code[ 4 ] = '';
-                    if ($propValue[ 'step' ] > 0) {
-                        $total_code[ 8 ] = $total_code[ 9 ] = $total_code[ 10 ] = '';
-                    } else {
-                        $total_code[ 5 ] = $total_code[ 6 ] = $total_code[ 7 ] = $total_code[ 8 ] = '';
-                    }
-                }
-                $propValue[ 'total' ] = join('', $total_code);
-            }
-        }
-        if (isset($namedAttr[ 'loop' ])) {
-            $initNamedProperty[ 'loop' ] = "'loop' => {$propValue['loop']}";
-        }
-        if (isset($namedAttr[ 'total' ])) {
-            $initNamedProperty[ 'total' ] = "'total' => {$propValue['total']}";
-            if ($propType[ 'total' ] > 0) {
-                $propValue[ 'total' ] = "{$sectionVar}->value['total']";
-            }
-        } elseif ($propType[ 'total' ] > 0) {
-            $initLocal[ 'total' ] = $propValue[ 'total' ];
-            $propValue[ 'total' ] = "{$local}total";
-        }
-        $cmpFor[ 'iteration' ] = "{$propValue['iteration']} <= {$propValue['total']}";
-        foreach ($initLocal as $key => $code) {
-            $output .= "{$local}{$key} = {$code};\n";
-        }
-        $_vars = 'array(' . join(', ', $initNamedProperty) . ')';
-        $output .= "{$sectionVar} = new Smarty_Variable({$_vars});\n";
-        $cond_code = "{$propValue['total']} !== 0";
-        if ($propType[ 'total' ] === 0) {
-            if ($propValue[ 'total' ] === 0) {
-                $cond_code = 'false';
-            } else {
-                $cond_code = 'true';
-            }
-        }
-        if ($propType[ 'show' ] > 0) {
-            $output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n";
-            $output .= "if ({$local}show) {\n";
-        } elseif ($propValue[ 'show' ] === 'true') {
-            $output .= "if ({$cond_code}) {\n";
-        } else {
-            $output .= "if (false) {\n";
-        }
-        $jinit = join(', ', $initFor);
-        $jcmp = join(', ', $cmpFor);
-        $jinc = join(', ', $incFor);
-        $output .= "for ({$jinit}; {$jcmp}; {$jinc}){\n";
-        if (isset($namedAttr[ 'rownum' ])) {
-            $output .= "{$sectionVar}->value['rownum'] = {$propValue['iteration']};\n";
-        }
-        if (isset($namedAttr[ 'index_prev' ])) {
-            $output .= "{$sectionVar}->value['index_prev'] = {$propValue['index']} - {$propValue['step']};\n";
-        }
-        if (isset($namedAttr[ 'index_next' ])) {
-            $output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n";
-        }
-        if (isset($namedAttr[ 'first' ])) {
-            $output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} === 1);\n";
-        }
-        if (isset($namedAttr[ 'last' ])) {
-            $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} === {$propValue['total']});\n";
-        }
-        $output .= '?>';
-        return $output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Sectionelse Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {sectionelse} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        list($openTag, $nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section'));
-        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache, $local, $sectionVar));
-        return "<?php }} else {\n ?>";
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Sectionclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/section} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $compiler->loopNesting--;
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        list($openTag, $compiler->nocache, $local, $sectionVar) =
-            $this->closeTag($compiler, array('section', 'sectionelse'));
-        $output = "<?php\n";
-        if ($openTag === 'sectionelse') {
-            $output .= "}\n";
-        } else {
-            $output .= "}\n}\n";
-        }
-        $output .= '?>';
-        return $output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php b/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
deleted file mode 100644
index 70e2e2f9f..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Setfilter
- * Compiles code for setfilter tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Setfilter Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for setfilter tag
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $compiler->variable_filter_stack[] = $compiler->variable_filters;
-        $compiler->variable_filters = $parameter[ 'modifier_list' ];
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-        return true;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Setfilterclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/setfilter} tag
-     * This tag does not generate compiled output. It resets variable filter.
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        // reset variable filter to previous state
-        if (count($compiler->variable_filter_stack)) {
-            $compiler->variable_filters = array_pop($compiler->variable_filter_stack);
-        } else {
-            $compiler->variable_filters = array();
-        }
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-        return true;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_while.php b/include/smarty/libs/sysplugins/smarty_internal_compile_while.php
deleted file mode 100644
index 5aa3a7330..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_while.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile While
- * Compiles the {while} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile While Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {while} tag
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $compiler->loopNesting++;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $this->openTag($compiler, 'while', $compiler->nocache);
-        if (!array_key_exists('if condition', $parameter)) {
-            $compiler->trigger_template_error('missing while condition', null, true);
-        }
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        if (is_array($parameter[ 'if condition' ])) {
-            if ($compiler->nocache) {
-                // create nocache var to make it know for further compiling
-                if (is_array($parameter[ 'if condition' ][ 'var' ])) {
-                    $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-                } else {
-                    $var = $parameter[ 'if condition' ][ 'var' ];
-                }
-                $compiler->setNocacheInVariable($var);
-            }
-            $prefixVar = $compiler->getNewPrefixVariable();
-            $assignCompiler = new Smarty_Internal_Compile_Assign();
-            $assignAttr = array();
-            $assignAttr[][ 'value' ] = $prefixVar;
-            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
-                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-                $_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
-                $_output .= $assignCompiler->compile(
-                    $assignAttr,
-                    $compiler,
-                    array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
-                );
-            } else {
-                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
-                $_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
-                $_output .= $assignCompiler->compile($assignAttr, $compiler, array());
-            }
-            return $_output;
-        } else {
-            return "<?php\n while ({$parameter['if condition']}) {?>";
-        }
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Whileclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/while} tag
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $compiler->loopNesting--;
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        $compiler->nocache = $this->closeTag($compiler, array('while'));
-        return "<?php }?>\n";
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compilebase.php b/include/smarty/libs/sysplugins/smarty_internal_compilebase.php
deleted file mode 100644
index 2a32e4373..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_compilebase.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin CompileBase
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * This class does extend all internal compile plugins
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-abstract class Smarty_Internal_CompileBase
-{
-    /**
-     * Array of names of required attribute required by tag
-     *
-     * @var array
-     */
-    public $required_attributes = array();
-
-    /**
-     * Array of names of optional attribute required by tag
-     * use array('_any') if there is no restriction of attributes names
-     *
-     * @var array
-     */
-    public $optional_attributes = array();
-
-    /**
-     * Shorttag attribute order defined by its names
-     *
-     * @var array
-     */
-    public $shorttag_order = array();
-
-    /**
-     * Array of names of valid option flags
-     *
-     * @var array
-     */
-    public $option_flags = array('nocache');
-
-    /**
-     * Mapping array for boolean option value
-     *
-     * @var array
-     */
-    public $optionMap = array(1 => true, 0 => false, 'true' => true, 'false' => false);
-
-    /**
-     * Mapping array with attributes as key
-     *
-     * @var array
-     */
-    public $mapCache = array();
-
-    /**
-     * This function checks if the attributes passed are valid
-     * The attributes passed for the tag to compile are checked against the list of required and
-     * optional attributes. Required attributes must be present. Optional attributes are check against
-     * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
-     * as valid
-     *
-     * @param object $compiler   compiler object
-     * @param array  $attributes attributes applied to the tag
-     *
-     * @return array  of mapped attributes for further processing
-     */
-    public function getAttributes($compiler, $attributes)
-    {
-        $_indexed_attr = array();
-        if (!isset($this->mapCache[ 'option' ])) {
-            $this->mapCache[ 'option' ] = array_fill_keys($this->option_flags, true);
-        }
-        foreach ($attributes as $key => $mixed) {
-            // shorthand ?
-            if (!is_array($mixed)) {
-                // option flag ?
-                if (isset($this->mapCache[ 'option' ][ trim($mixed, '\'"') ])) {
-                    $_indexed_attr[ trim($mixed, '\'"') ] = true;
-                    // shorthand attribute ?
-                } elseif (isset($this->shorttag_order[ $key ])) {
-                    $_indexed_attr[ $this->shorttag_order[ $key ] ] = $mixed;
-                } else {
-                    // too many shorthands
-                    $compiler->trigger_template_error('too many shorthand attributes', null, true);
-                }
-                // named attribute
-            } else {
-                foreach ($mixed as $k => $v) {
-                    // option flag?
-                    if (isset($this->mapCache[ 'option' ][ $k ])) {
-                        if (is_bool($v)) {
-                            $_indexed_attr[ $k ] = $v;
-                        } else {
-                            if (is_string($v)) {
-                                $v = trim($v, '\'" ');
-                            }
-                            if (isset($this->optionMap[ $v ])) {
-                                $_indexed_attr[ $k ] = $this->optionMap[ $v ];
-                            } else {
-                                $compiler->trigger_template_error(
-                                    "illegal value '" . var_export($v, true) .
-                                    "' for option flag '{$k}'",
-                                    null,
-                                    true
-                                );
-                            }
-                        }
-                        // must be named attribute
-                    } else {
-                        $_indexed_attr[ $k ] = $v;
-                    }
-                }
-            }
-        }
-        // check if all required attributes present
-        foreach ($this->required_attributes as $attr) {
-            if (!isset($_indexed_attr[ $attr ])) {
-                $compiler->trigger_template_error("missing '{$attr}' attribute", null, true);
-            }
-        }
-        // check for not allowed attributes
-        if ($this->optional_attributes !== array('_any')) {
-            if (!isset($this->mapCache[ 'all' ])) {
-                $this->mapCache[ 'all' ] =
-                    array_fill_keys(
-                        array_merge(
-                            $this->required_attributes,
-                            $this->optional_attributes,
-                            $this->option_flags
-                        ),
-                        true
-                    );
-            }
-            foreach ($_indexed_attr as $key => $dummy) {
-                if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) {
-                    $compiler->trigger_template_error("unexpected '{$key}' attribute", null, true);
-                }
-            }
-        }
-        // default 'false' for all option flags not set
-        foreach ($this->option_flags as $flag) {
-            if (!isset($_indexed_attr[ $flag ])) {
-                $_indexed_attr[ $flag ] = false;
-            }
-        }
-        if (isset($_indexed_attr[ 'nocache' ]) && $_indexed_attr[ 'nocache' ]) {
-            $compiler->tag_nocache = true;
-        }
-        return $_indexed_attr;
-    }
-
-    /**
-     * Push opening tag name on stack
-     * Optionally additional data can be saved on stack
-     *
-     * @param object $compiler compiler object
-     * @param string $openTag  the opening tag's name
-     * @param mixed  $data     optional data saved
-     */
-    public function openTag($compiler, $openTag, $data = null)
-    {
-        array_push($compiler->_tag_stack, array($openTag, $data));
-    }
-
-    /**
-     * Pop closing tag
-     * Raise an error if this stack-top doesn't match with expected opening tags
-     *
-     * @param object       $compiler    compiler object
-     * @param array|string $expectedTag the expected opening tag names
-     *
-     * @return mixed        any type the opening tag's name or saved data
-     */
-    public function closeTag($compiler, $expectedTag)
-    {
-        if (count($compiler->_tag_stack) > 0) {
-            // get stacked info
-            list($_openTag, $_data) = array_pop($compiler->_tag_stack);
-            // open tag must match with the expected ones
-            if (in_array($_openTag, (array)$expectedTag)) {
-                if (is_null($_data)) {
-                    // return opening tag
-                    return $_openTag;
-                } else {
-                    // return restored data
-                    return $_data;
-                }
-            }
-            // wrong nesting of tags
-            $compiler->trigger_template_error("unclosed '{$compiler->smarty->left_delimiter}{$_openTag}{$compiler->smarty->right_delimiter}' tag");
-            return;
-        }
-        // wrong nesting of tags
-        $compiler->trigger_template_error('unexpected closing tag', null, true);
-        return;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
deleted file mode 100644
index 469b9667a..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Config File Compiler
- * This is the config file compiler class. It calls the lexer and parser to
- * perform the compiling.
- *
- * @package    Smarty
- * @subpackage Config
- * @author     Uwe Tews
- */
-
-/**
- * Main config file compiler class
- *
- * @package    Smarty
- * @subpackage Config
- */
-class Smarty_Internal_Config_File_Compiler
-{
-    /**
-     * Lexer class name
-     *
-     * @var string
-     */
-    public $lexer_class;
-
-    /**
-     * Parser class name
-     *
-     * @var string
-     */
-    public $parser_class;
-
-    /**
-     * Lexer object
-     *
-     * @var object
-     */
-    public $lex;
-
-    /**
-     * Parser object
-     *
-     * @var object
-     */
-    public $parser;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty object
-     */
-    public $smarty;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty_Internal_Template object
-     */
-    public $template;
-
-    /**
-     * Compiled config data sections and variables
-     *
-     * @var array
-     */
-    public $config_data = array();
-
-    /**
-     * compiled config data must always be written
-     *
-     * @var bool
-     */
-    public $write_compiled_code = true;
-
-    /**
-     * Initialize compiler
-     *
-     * @param string $lexer_class  class name
-     * @param string $parser_class class name
-     * @param Smarty $smarty       global instance
-     */
-    public function __construct($lexer_class, $parser_class, Smarty $smarty)
-    {
-        $this->smarty = $smarty;
-        // get required plugins
-        $this->lexer_class = $lexer_class;
-        $this->parser_class = $parser_class;
-        $this->smarty = $smarty;
-        $this->config_data[ 'sections' ] = array();
-        $this->config_data[ 'vars' ] = array();
-    }
-
-    /**
-     * Method to compile Smarty config source.
-     *
-     * @param Smarty_Internal_Template $template
-     *
-     * @return bool true if compiling succeeded, false if it failed
-     * @throws \SmartyException
-     */
-    public function compileTemplate(Smarty_Internal_Template $template)
-    {
-        $this->template = $template;
-        $this->template->compiled->file_dependency[ $this->template->source->uid ] =
-            array(
-                $this->template->source->filepath,
-                $this->template->source->getTimeStamp(),
-                $this->template->source->type
-            );
-        if ($this->smarty->debugging) {
-            if (!isset($this->smarty->_debug)) {
-                $this->smarty->_debug = new Smarty_Internal_Debug();
-            }
-            $this->smarty->_debug->start_compile($this->template);
-        }
-        // init the lexer/parser to compile the config file
-        /* @var Smarty_Internal_ConfigFileLexer $this->lex */
-        $this->lex = new $this->lexer_class(
-            str_replace(
-                array(
-                    "\r\n",
-                    "\r"
-                ),
-                "\n",
-                $template->source->getContent()
-            ) . "\n",
-            $this
-        );
-        /* @var Smarty_Internal_ConfigFileParser $this->parser */
-        $this->parser = new $this->parser_class($this->lex, $this);
-        if (function_exists('mb_internal_encoding')
-            && function_exists('ini_get')
-            && ((int)ini_get('mbstring.func_overload')) & 2
-        ) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        } else {
-            $mbEncoding = null;
-        }
-        if ($this->smarty->_parserdebug) {
-            $this->parser->PrintTrace();
-        }
-        // get tokens from lexer and parse them
-        while ($this->lex->yylex()) {
-            if ($this->smarty->_parserdebug) {
-                echo "<br>Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token {$this->lex->value} Line {$this->lex->line} \n";
-            }
-            $this->parser->doParse($this->lex->token, $this->lex->value);
-        }
-        // finish parsing process
-        $this->parser->doParse(0, 0);
-        if ($mbEncoding) {
-            mb_internal_encoding($mbEncoding);
-        }
-        if ($this->smarty->debugging) {
-            $this->smarty->_debug->end_compile($this->template);
-        }
-        // template header code
-        $template_header = sprintf(
-            "<?php /* Smarty version %s, created on %s\n         compiled from '%s' */ ?>\n",
-            Smarty::SMARTY_VERSION,
-            date("Y-m-d H:i:s"),
-            str_replace('*/', '* /' , $this->template->source->filepath)
-        );
-        $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
-                var_export($this->config_data, true) . '); ?>';
-        return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
-    }
-
-    /**
-     * display compiler error messages without dying
-     * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about expected tokens.
-     * If parameter $args contains a string this is used as error message
-     *
-     * @param string $args individual error message or null
-     *
-     * @throws SmartyCompilerException
-     */
-    public function trigger_config_file_error($args = null)
-    {
-        // get config source line which has error
-        $line = $this->lex->line;
-        if (isset($args)) {
-            // $line--;
-        }
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text =
-            "Syntax error in config file '{$this->template->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
-        if (isset($args)) {
-            // individual error message
-            $error_text .= $args;
-        } else {
-            // expected token from parser
-            foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                $exp_token = $this->parser->yyTokenName[ $token ];
-                if (isset($this->lex->smarty_token_names[ $exp_token ])) {
-                    // token type from lexer
-                    $expect[] = '"' . $this->lex->smarty_token_names[ $exp_token ] . '"';
-                } else {
-                    // otherwise internal token name
-                    $expect[] = $this->parser->yyTokenName[ $token ];
-                }
-            }
-            // output parser error message
-            $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
-        }
-        throw new SmartyCompilerException($error_text);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php b/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php
deleted file mode 100644
index 36fdb76ee..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php
+++ /dev/null
@@ -1,1046 +0,0 @@
-<?php
-
-class TPC_yyStackEntry
-{
-    public $stateno;       /* The state-number */
-    public $major;         /* The major token value.  This is the code
-                     ** number for the token at this stack level */
-    public $minor; /* The user-supplied minor token value.  This
-                     ** is the value of the token  */
-}
-
-// line 12 "../smarty/lexer/smarty_internal_configfileparser.y"
-
-/**
- * Smarty Internal Plugin Configfileparse
- *
- * This is the config file parser.
- * It is generated from the smarty_internal_configfileparser.y file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-class Smarty_Internal_Configfileparser
-{
-    // line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
-    const TPC_OPENB                = 1;
-    const TPC_SECTION              = 2;
-    const TPC_CLOSEB               = 3;
-    const TPC_DOT                  = 4;
-    const TPC_ID                   = 5;
-    const TPC_EQUAL                = 6;
-    const TPC_FLOAT                = 7;
-    const TPC_INT                  = 8;
-    const TPC_BOOL                 = 9;
-    const TPC_SINGLE_QUOTED_STRING = 10;
-    const TPC_DOUBLE_QUOTED_STRING = 11;
-    const TPC_TRIPPLE_QUOTES       = 12;
-    const TPC_TRIPPLE_TEXT         = 13;
-    const TPC_TRIPPLE_QUOTES_END   = 14;
-    const TPC_NAKED_STRING         = 15;
-    const TPC_OTHER                = 16;
-    const TPC_NEWLINE              = 17;
-    const TPC_COMMENTSTART         = 18;
-    const YY_NO_ACTION             = 60;
-    const YY_ACCEPT_ACTION         = 59;
-    const YY_ERROR_ACTION          = 58;
-    const YY_SZ_ACTTAB             = 38;
-    const YY_SHIFT_USE_DFLT        = -8;
-    const YY_SHIFT_MAX             = 19;
-    const YY_REDUCE_USE_DFLT       = -17;
-    const YY_REDUCE_MAX            = 10;
-    const YYNOCODE                 = 29;
-    const YYSTACKDEPTH             = 100;
-    const YYNSTATE                 = 36;
-    const YYNRULE                  = 22;
-    const YYERRORSYMBOL            = 19;
-    const YYERRSYMDT               = 'yy0';
-    const YYFALLBACK               = 0;
-
-    public static $yy_action        = array(
-        32, 31, 30, 29, 35, 13, 19, 3, 24, 26,
-        59, 9, 14, 1, 16, 25, 11, 28, 25, 11,
-        17, 27, 34, 20, 18, 15, 23, 5, 6, 22,
-        10, 8, 4, 12, 2, 33, 7, 21,
-    );
-
-    public static $yy_lookahead     = array(
-        7, 8, 9, 10, 11, 12, 5, 23, 15, 16,
-        20, 21, 2, 23, 4, 17, 18, 14, 17, 18,
-        13, 14, 25, 26, 15, 2, 17, 3, 3, 17,
-        25, 25, 6, 1, 23, 27, 22, 24,
-    );
-
-    public static $yy_shift_ofst    = array(
-        -8, 1, 1, 1, -7, -2, -2, 32, -8, -8,
-        -8, 9, 10, 7, 25, 24, 23, 3, 12, 26,
-    );
-
-    public static $yy_reduce_ofst   = array(
-        -10, -3, -3, -3, 8, 6, 5, 13, 11, 14,
-        -16,
-    );
-
-    public static $yyExpectedTokens = array(
-        array(),
-        array(5, 17, 18,),
-        array(5, 17, 18,),
-        array(5, 17, 18,),
-        array(7, 8, 9, 10, 11, 12, 15, 16,),
-        array(17, 18,),
-        array(17, 18,),
-        array(1,),
-        array(),
-        array(),
-        array(),
-        array(15, 17,),
-        array(2, 4,),
-        array(13, 14,),
-        array(3,),
-        array(3,),
-        array(2,),
-        array(14,),
-        array(17,),
-        array(6,),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-        array(),
-    );
-
-    public static $yy_default       = array(
-        44, 37, 41, 40, 58, 58, 58, 36, 44, 39,
-        44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-        43, 38, 57, 56, 53, 55, 54, 52, 51, 49,
-        48, 47, 46, 45, 42, 50,
-    );
-
-    public static $yyFallback       = array();
-
-    public static $yyRuleName       = array(
-        'start ::= global_vars sections',
-        'global_vars ::= var_list',
-        'sections ::= sections section',
-        'sections ::=',
-        'section ::= OPENB SECTION CLOSEB newline var_list',
-        'section ::= OPENB DOT SECTION CLOSEB newline var_list',
-        'var_list ::= var_list newline',
-        'var_list ::= var_list var',
-        'var_list ::=',
-        'var ::= ID EQUAL value',
-        'value ::= FLOAT',
-        'value ::= INT',
-        'value ::= BOOL',
-        'value ::= SINGLE_QUOTED_STRING',
-        'value ::= DOUBLE_QUOTED_STRING',
-        'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
-        'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
-        'value ::= NAKED_STRING',
-        'value ::= OTHER',
-        'newline ::= NEWLINE',
-        'newline ::= COMMENTSTART NEWLINE',
-        'newline ::= COMMENTSTART NAKED_STRING NEWLINE',
-    );
-
-    public static $yyRuleInfo       = array(
-        array(0 => 20, 1 => 2),
-        array(0 => 21, 1 => 1),
-        array(0 => 22, 1 => 2),
-        array(0 => 22, 1 => 0),
-        array(0 => 24, 1 => 5),
-        array(0 => 24, 1 => 6),
-        array(0 => 23, 1 => 2),
-        array(0 => 23, 1 => 2),
-        array(0 => 23, 1 => 0),
-        array(0 => 26, 1 => 3),
-        array(0 => 27, 1 => 1),
-        array(0 => 27, 1 => 1),
-        array(0 => 27, 1 => 1),
-        array(0 => 27, 1 => 1),
-        array(0 => 27, 1 => 1),
-        array(0 => 27, 1 => 3),
-        array(0 => 27, 1 => 2),
-        array(0 => 27, 1 => 1),
-        array(0 => 27, 1 => 1),
-        array(0 => 25, 1 => 1),
-        array(0 => 25, 1 => 2),
-        array(0 => 25, 1 => 3),
-    );
-
-    public static $yyReduceMap      = array(
-        0  => 0,
-        2  => 0,
-        3  => 0,
-        19 => 0,
-        20 => 0,
-        21 => 0,
-        1  => 1,
-        4  => 4,
-        5  => 5,
-        6  => 6,
-        7  => 7,
-        8  => 8,
-        9  => 9,
-        10 => 10,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-        16 => 16,
-        17 => 17,
-        18 => 17,
-    );
-
-    /**
-     * helper map
-     *
-     * @var array
-     */
-    private static $escapes_single = array(
-        '\\' => '\\',
-        '\'' => '\''
-    );
-
-    /**
-     * result status
-     *
-     * @var bool
-     */
-    public $successful = true;
-
-    /**
-     * return value
-     *
-     * @var mixed
-     */
-    public $retvalue = 0;
-
-    /**
-     * @var
-     */
-    public $yymajor;
-
-    /**
-     * compiler object
-     *
-     * @var Smarty_Internal_Config_File_Compiler
-     */
-    public $compiler = null;
-
-    /**
-     * smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty      = null;
-
-    public $yyTraceFILE;
-
-    public $yyTracePrompt;
-
-    public $yyidx;
-
-    public $yyerrcnt;
-
-    public $yystack     = array();
-
-    public $yyTokenName = array(
-        '$', 'OPENB', 'SECTION', 'CLOSEB',
-        'DOT', 'ID', 'EQUAL', 'FLOAT',
-        'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING',
-        'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING',
-        'OTHER', 'NEWLINE', 'COMMENTSTART', 'error',
-        'start', 'global_vars', 'sections', 'var_list',
-        'section', 'newline', 'var', 'value',
-    );
-
-    /**
-     * lexer object
-     *
-     * @var Smarty_Internal_Configfilelexer
-     */
-    private $lex;
-
-    /**
-     * internal error flag
-     *
-     * @var bool
-     */
-    private $internalError = false;
-
-    /**
-     * copy of config_overwrite property
-     *
-     * @var bool
-     */
-    private $configOverwrite = false;
-
-    /**
-     * copy of config_read_hidden property
-     *
-     * @var bool
-     */
-    private $configReadHidden = false;
-
-    private $_retvalue;
-
-    /**
-     * constructor
-     *
-     * @param Smarty_Internal_Configfilelexer      $lex
-     * @param Smarty_Internal_Config_File_Compiler $compiler
-     */
-    public function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
-    {
-        $this->lex = $lex;
-        $this->smarty = $compiler->smarty;
-        $this->compiler = $compiler;
-        $this->configOverwrite = $this->smarty->config_overwrite;
-        $this->configReadHidden = $this->smarty->config_read_hidden;
-    }
-
-    public static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:
-                break;   /* If no destructor action specified: do nothing */
-        }
-    }
-
-    /**
-     * parse single quoted string
-     *  remove outer quotes
-     *  unescape inner quotes
-     *
-     * @param string $qstr
-     *
-     * @return string
-     */
-    private static function parse_single_quoted_string($qstr)
-    {
-        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
-        $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
-        $str = '';
-        foreach ($ss as $s) {
-            if (strlen($s) === 2 && $s[ 0 ] === '\\') {
-                if (isset(self::$escapes_single[ $s[ 1 ] ])) {
-                    $s = self::$escapes_single[ $s[ 1 ] ];
-                }
-            }
-            $str .= $s;
-        }
-        return $str;
-    }                    /* Index of top element in stack */
-    /**
-     * parse double quoted string
-     *
-     * @param string $qstr
-     *
-     * @return string
-     */
-    private static function parse_double_quoted_string($qstr)
-    {
-        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
-        return stripcslashes($inner_str);
-    }                 /* Shifts left before out of the error */
-    /**
-     * parse triple quoted string
-     *
-     * @param string $qstr
-     *
-     * @return string
-     */
-    private static function parse_tripple_double_quoted_string($qstr)
-    {
-        return stripcslashes($qstr);
-    }  /* The parser's stack */
-    public function Trace($TraceFILE, $zTracePrompt)
-    {
-        if (!$TraceFILE) {
-            $zTracePrompt = 0;
-        } elseif (!$zTracePrompt) {
-            $TraceFILE = 0;
-        }
-        $this->yyTraceFILE = $TraceFILE;
-        $this->yyTracePrompt = $zTracePrompt;
-    }
-
-    public function PrintTrace()
-    {
-        $this->yyTraceFILE = fopen('php://output', 'w');
-        $this->yyTracePrompt = '<br>';
-    }
-
-    public function tokenName($tokenType)
-    {
-        if ($tokenType === 0) {
-            return 'End of Input';
-        }
-        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[ $tokenType ];
-        } else {
-            return 'Unknown';
-        }
-    }
-
-    public function yy_pop_parser_stack()
-    {
-        if (empty($this->yystack)) {
-            return;
-        }
-        $yytos = array_pop($this->yystack);
-        if ($this->yyTraceFILE && $this->yyidx >= 0) {
-            fwrite(
-                $this->yyTraceFILE,
-                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] .
-                "\n"
-            );
-        }
-        $yymajor = $yytos->major;
-        self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx--;
-        return $yymajor;
-    }
-
-    public function __destruct()
-    {
-        while ($this->yystack !== array()) {
-            $this->yy_pop_parser_stack();
-        }
-        if (is_resource($this->yyTraceFILE)) {
-            fclose($this->yyTraceFILE);
-        }
-    }
-
-    public function yy_get_expected_tokens($token)
-    {
-        static $res3 = array();
-        static $res4 = array();
-        $state = $this->yystack[ $this->yyidx ]->stateno;
-        $expected = self::$yyExpectedTokens[ $state ];
-        if (isset($res3[ $state ][ $token ])) {
-            if ($res3[ $state ][ $token ]) {
-                return $expected;
-            }
-        } else {
-            if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
-                return $expected;
-            }
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done++ === 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return array_unique($expected);
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[ $this->yyidx ]->stateno,
-                        self::$yyRuleInfo[ $yyruleno ][ 0 ]
-                    );
-                    if (isset(self::$yyExpectedTokens[ $nextstate ])) {
-                        $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
-                        if (isset($res4[ $nextstate ][ $token ])) {
-                            if ($res4[ $nextstate ][ $token ]) {
-                                $this->yyidx = $yyidx;
-                                $this->yystack = $stack;
-                                return array_unique($expected);
-                            }
-                        } else {
-                            if ($res4[ $nextstate ][ $token ] =
-                                in_array($token, self::$yyExpectedTokens[ $nextstate ], true)) {
-                                $this->yyidx = $yyidx;
-                                $this->yystack = $stack;
-                                return array_unique($expected);
-                            }
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx++;
-                        $x = new TPC_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-                        $this->yystack[ $this->yyidx ] = $x;
-                        continue 2;
-                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return array_unique($expected);
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return $expected;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-        return array_unique($expected);
-    }
-
-    public function yy_is_expected_token($token)
-    {
-        static $res = array();
-        static $res2 = array();
-        if ($token === 0) {
-            return true; // 0 is not part of this
-        }
-        $state = $this->yystack[ $this->yyidx ]->stateno;
-        if (isset($res[ $state ][ $token ])) {
-            if ($res[ $state ][ $token ]) {
-                return true;
-            }
-        } else {
-            if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
-                return true;
-            }
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done++ === 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return true;
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[ $this->yyidx ]->stateno,
-                        self::$yyRuleInfo[ $yyruleno ][ 0 ]
-                    );
-                    if (isset($res2[ $nextstate ][ $token ])) {
-                        if ($res2[ $nextstate ][ $token ]) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return true;
-                        }
-                    } else {
-                        if ($res2[ $nextstate ][ $token ] =
-                            (isset(self::$yyExpectedTokens[ $nextstate ]) &&
-                             in_array($token, self::$yyExpectedTokens[ $nextstate ], true))) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return true;
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx++;
-                        $x = new TPC_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-                        $this->yystack[ $this->yyidx ] = $x;
-                        continue 2;
-                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        if (!$token) {
-                            // end of input: this is valid
-                            return true;
-                        }
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return false;
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return true;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-        return true;
-    }
-
-    public function yy_find_shift_action($iLookAhead)
-    {
-        $stateno = $this->yystack[ $this->yyidx ]->stateno;
-        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[ $stateno ])) {
-            // no shift actions
-            return self::$yy_default[ $stateno ];
-        }
-        $i = self::$yy_shift_ofst[ $stateno ];
-        if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[ $stateno ];
-        }
-        if ($iLookAhead === self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[ $i ] != $iLookAhead) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                && ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0) {
-                if ($this->yyTraceFILE) {
-                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
-                                               $this->yyTokenName[ $iLookAhead ] . ' => ' .
-                                               $this->yyTokenName[ $iFallback ] . "\n");
-                }
-                return $this->yy_find_shift_action($iFallback);
-            }
-            return self::$yy_default[ $stateno ];
-        } else {
-            return self::$yy_action[ $i ];
-        }
-    }
-
-    public function yy_find_reduce_action($stateno, $iLookAhead)
-    {
-        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-        if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
-            return self::$yy_default[ $stateno ];
-        }
-        $i = self::$yy_reduce_ofst[ $stateno ];
-        if ($i === self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[ $stateno ];
-        }
-        if ($iLookAhead === self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[ $i ] != $iLookAhead) {
-            return self::$yy_default[ $stateno ];
-        } else {
-            return self::$yy_action[ $i ];
-        }
-    }
-
-    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
-    {
-        $this->yyidx++;
-        if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx--;
-            if ($this->yyTraceFILE) {
-                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
-            }
-            while ($this->yyidx >= 0) {
-                $this->yy_pop_parser_stack();
-            }
-            // line 239 "../smarty/lexer/smarty_internal_configfileparser.y"
-            $this->internalError = true;
-            $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
-            return;
-        }
-        $yytos = new TPC_yyStackEntry;
-        $yytos->stateno = $yyNewState;
-        $yytos->major = $yyMajor;
-        $yytos->minor = $yypMinor;
-        $this->yystack[] = $yytos;
-        if ($this->yyTraceFILE && $this->yyidx > 0) {
-            fprintf(
-                $this->yyTraceFILE,
-                "%sShift %d\n",
-                $this->yyTracePrompt,
-                $yyNewState
-            );
-            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
-            for ($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf(
-                    $this->yyTraceFILE,
-                    " %s",
-                    $this->yyTokenName[ $this->yystack[ $i ]->major ]
-                );
-            }
-            fwrite($this->yyTraceFILE, "\n");
-        }
-    }
-
-    public function yy_r0()
-    {
-        $this->_retvalue = null;
-    }
-
-    public function yy_r1()
-    {
-        $this->add_global_vars($this->yystack[ $this->yyidx + 0 ]->minor);
-        $this->_retvalue = null;
-    }
-
-    public function yy_r4()
-    {
-        $this->add_section_vars($this->yystack[ $this->yyidx + -3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
-        $this->_retvalue = null;
-    }
-
-    // line 245 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r5()
-    {
-        if ($this->configReadHidden) {
-            $this->add_section_vars(
-                $this->yystack[ $this->yyidx + -3 ]->minor,
-                $this->yystack[ $this->yyidx + 0 ]->minor
-            );
-        }
-        $this->_retvalue = null;
-    }
-
-    // line 250 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r6()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
-    }
-
-    // line 264 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r7()
-    {
-        $this->_retvalue =
-            array_merge($this->yystack[ $this->yyidx + -1 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor));
-    }
-
-    // line 269 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r8()
-    {
-        $this->_retvalue = array();
-    }
-
-    // line 277 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r9()
-    {
-        $this->_retvalue =
-            array(
-                'key'   => $this->yystack[ $this->yyidx + -2 ]->minor,
-                'value' => $this->yystack[ $this->yyidx + 0 ]->minor
-            );
-    }
-
-    // line 281 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r10()
-    {
-        $this->_retvalue = (float)$this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r11()
-    {
-        $this->_retvalue = (int)$this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 291 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r12()
-    {
-        $this->_retvalue = $this->parse_bool($this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 296 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r13()
-    {
-        $this->_retvalue = self::parse_single_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 300 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r14()
-    {
-        $this->_retvalue = self::parse_double_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    // line 304 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r15()
-    {
-        $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[ $this->yyidx + -1 ]->minor);
-    }
-
-    // line 308 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r16()
-    {
-        $this->_retvalue = '';
-    }
-
-    // line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r17()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    // line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_reduce($yyruleno)
-    {
-        if ($this->yyTraceFILE && $yyruleno >= 0
-            && $yyruleno < count(self::$yyRuleName)) {
-            fprintf(
-                $this->yyTraceFILE,
-                "%sReduce (%d) [%s].\n",
-                $this->yyTracePrompt,
-                $yyruleno,
-                self::$yyRuleName[ $yyruleno ]
-            );
-        }
-        $this->_retvalue = $yy_lefthand_side = null;
-        if (isset(self::$yyReduceMap[ $yyruleno ])) {
-            // call the action
-            $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
-            $yy_lefthand_side = $this->_retvalue;
-        }
-        $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-        $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
-        $this->yyidx -= $yysize;
-        for ($i = $yysize; $i; $i--) {
-            // pop all of the right-hand side parameters
-            array_pop($this->yystack);
-        }
-        $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
-        if ($yyact < self::YYNSTATE) {
-            if (!$this->yyTraceFILE && $yysize) {
-                $this->yyidx++;
-                $x = new TPC_yyStackEntry;
-                $x->stateno = $yyact;
-                $x->major = $yygoto;
-                $x->minor = $yy_lefthand_side;
-                $this->yystack[ $this->yyidx ] = $x;
-            } else {
-                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
-            }
-        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
-            $this->yy_accept();
-        }
-    }
-
-    // line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_parse_failed()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-    }
-
-    // line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_syntax_error($yymajor, $TOKEN)
-    {
-        // line 232 "../smarty/lexer/smarty_internal_configfileparser.y"
-        $this->internalError = true;
-        $this->yymajor = $yymajor;
-        $this->compiler->trigger_config_file_error();
-    }
-
-    public function yy_accept()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-        // line 225 "../smarty/lexer/smarty_internal_configfileparser.y"
-        $this->successful = !$this->internalError;
-        $this->internalError = false;
-        $this->retvalue = $this->_retvalue;
-    }
-
-    public function doParse($yymajor, $yytokenvalue)
-    {
-        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
-        if ($this->yyidx === null || $this->yyidx < 0) {
-            $this->yyidx = 0;
-            $this->yyerrcnt = -1;
-            $x = new TPC_yyStackEntry;
-            $x->stateno = 0;
-            $x->major = 0;
-            $this->yystack = array();
-            $this->yystack[] = $x;
-        }
-        $yyendofinput = ($yymajor == 0);
-        if ($this->yyTraceFILE) {
-            fprintf(
-                $this->yyTraceFILE,
-                "%sInput %s\n",
-                $this->yyTracePrompt,
-                $this->yyTokenName[ $yymajor ]
-            );
-        }
-        do {
-            $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL &&
-                !$this->yy_is_expected_token($yymajor)) {
-                // force a syntax error
-                $yyact = self::YY_ERROR_ACTION;
-            }
-            if ($yyact < self::YYNSTATE) {
-                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt--;
-                if ($yyendofinput && $this->yyidx >= 0) {
-                    $yymajor = 0;
-                } else {
-                    $yymajor = self::YYNOCODE;
-                }
-            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
-                $this->yy_reduce($yyact - self::YYNSTATE);
-            } elseif ($yyact === self::YY_ERROR_ACTION) {
-                if ($this->yyTraceFILE) {
-                    fprintf(
-                        $this->yyTraceFILE,
-                        "%sSyntax Error!\n",
-                        $this->yyTracePrompt
-                    );
-                }
-                if (self::YYERRORSYMBOL) {
-                    if ($this->yyerrcnt < 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $yymx = $this->yystack[ $this->yyidx ]->major;
-                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
-                        if ($this->yyTraceFILE) {
-                            fprintf(
-                                $this->yyTraceFILE,
-                                "%sDiscard input token %s\n",
-                                $this->yyTracePrompt,
-                                $this->yyTokenName[ $yymajor ]
-                            );
-                        }
-                        $this->yy_destructor($yymajor, $yytokenvalue);
-                        $yymajor = self::YYNOCODE;
-                    } else {
-                        while ($this->yyidx >= 0 &&
-                               $yymx !== self::YYERRORSYMBOL &&
-                               ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                        ) {
-                            $this->yy_pop_parser_stack();
-                        }
-                        if ($this->yyidx < 0 || $yymajor == 0) {
-                            $this->yy_destructor($yymajor, $yytokenvalue);
-                            $this->yy_parse_failed();
-                            $yymajor = self::YYNOCODE;
-                        } elseif ($yymx !== self::YYERRORSYMBOL) {
-                            $u2 = 0;
-                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
-                        }
-                    }
-                    $this->yyerrcnt = 3;
-                    $yyerrorhit = 1;
-                } else {
-                    if ($this->yyerrcnt <= 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $this->yyerrcnt = 3;
-                    $this->yy_destructor($yymajor, $yytokenvalue);
-                    if ($yyendofinput) {
-                        $this->yy_parse_failed();
-                    }
-                    $yymajor = self::YYNOCODE;
-                }
-            } else {
-                $this->yy_accept();
-                $yymajor = self::YYNOCODE;
-            }
-        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
-    }
-
-    /**
-     * parse optional boolean keywords
-     *
-     * @param string $str
-     *
-     * @return bool
-     */
-    private function parse_bool($str)
-    {
-        $str = strtolower($str);
-        if (in_array($str, array('on', 'yes', 'true'))) {
-            $res = true;
-        } else {
-            $res = false;
-        }
-        return $res;
-    }
-
-    /**
-     * set a config variable in target array
-     *
-     * @param array $var
-     * @param array $target_array
-     */
-    private function set_var(array $var, array &$target_array)
-    {
-        $key = $var[ 'key' ];
-        $value = $var[ 'value' ];
-        if ($this->configOverwrite || !isset($target_array[ 'vars' ][ $key ])) {
-            $target_array[ 'vars' ][ $key ] = $value;
-        } else {
-            settype($target_array[ 'vars' ][ $key ], 'array');
-            $target_array[ 'vars' ][ $key ][] = $value;
-        }
-    }
-
-    /**
-     * add config variable to global vars
-     *
-     * @param array $vars
-     */
-    private function add_global_vars(array $vars)
-    {
-        if (!isset($this->compiler->config_data[ 'vars' ])) {
-            $this->compiler->config_data[ 'vars' ] = array();
-        }
-        foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data);
-        }
-    }
-
-    /**
-     * add config variable to section
-     *
-     * @param string $section_name
-     * @param array  $vars
-     */
-    private function add_section_vars($section_name, array $vars)
-    {
-        if (!isset($this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ])) {
-            $this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ] = array();
-        }
-        foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data[ 'sections' ][ $section_name ]);
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_data.php b/include/smarty/libs/sysplugins/smarty_internal_data.php
deleted file mode 100644
index 1b64185b8..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_data.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Data
- * This file contains the basic classes and methods for template and variable creation
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Base class with template and variable methods
- *
- * @package    Smarty
- * @subpackage Template
- *
- * @property int    $scope
- * @property Smarty $smarty
- * The following methods will be dynamically loaded by the extension handler when they are called.
- * They are located in a corresponding Smarty_Internal_Method_xxxx class
- *
- * @method mixed _getConfigVariable(string $varName, bool $errorEnable = true)
- * @method mixed getConfigVariable(string $varName, bool $errorEnable = true)
- * @method mixed getConfigVars(string $varName = null, bool $searchParents = true)
- * @method mixed getGlobal(string $varName = null)
- * @method mixed getStreamVariable(string $variable)
- * @method Smarty_Internal_Data clearAssign(mixed $tpl_var)
- * @method Smarty_Internal_Data clearAllAssign()
- * @method Smarty_Internal_Data clearConfig(string $varName = null)
- * @method Smarty_Internal_Data configLoad(string $config_file, mixed $sections = null, string $scope = 'local')
- */
-abstract class Smarty_Internal_Data
-{
-    /**
-     * This object type (Smarty = 1, template = 2, data = 4)
-     *
-     * @var int
-     */
-    public $_objType = 4;
-
-    /**
-     * name of class used for templates
-     *
-     * @var string
-     */
-    public $template_class = 'Smarty_Internal_Template';
-
-    /**
-     * template variables
-     *
-     * @var Smarty_Variable[]
-     */
-    public $tpl_vars = array();
-
-    /**
-     * parent template (if any)
-     *
-     * @var Smarty|Smarty_Internal_Template|Smarty_Data
-     */
-    public $parent = null;
-
-    /**
-     * configuration settings
-     *
-     * @var string[]
-     */
-    public $config_vars = array();
-
-    /**
-     * extension handler
-     *
-     * @var Smarty_Internal_Extension_Handler
-     */
-    public $ext = null;
-
-    /**
-     * Smarty_Internal_Data constructor.
-     *
-     * Install extension handler
-     */
-    public function __construct()
-    {
-        $this->ext = new Smarty_Internal_Extension_Handler();
-        $this->ext->objType = $this->_objType;
-    }
-
-    /**
-     * assigns a Smarty variable
-     *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed        $value   the value to assign
-     * @param boolean      $nocache if true any output of this variable will be not cached
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
-     *                              chaining
-     */
-    public function assign($tpl_var, $value = null, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $_key => $_val) {
-                $this->assign($_key, $_val, $nocache);
-            }
-        } else {
-            if ($tpl_var !== '') {
-                if ($this->_objType === 2) {
-                    /**
-                     *
-                     *
-                     * @var Smarty_Internal_Template $this
-                     */
-                    $this->_assignInScope($tpl_var, $value, $nocache);
-                } else {
-                    $this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * appends values to template variables
-     *
-     * @api  Smarty::append()
-     * @link https://www.smarty.net/docs/en/api.append.tpl
-     *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed        $value   the value to append
-     * @param bool         $merge   flag if array elements shall be merged
-     * @param bool         $nocache if true any output of this variable will
-     *                              be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
-    {
-        return $this->ext->append->append($this, $tpl_var, $value, $merge, $nocache);
-    }
-
-    /**
-     * assigns a global Smarty variable
-     *
-     * @param string  $varName the global variable name
-     * @param mixed   $value   the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function assignGlobal($varName, $value = null, $nocache = false)
-    {
-        return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
-    }
-
-    /**
-     * appends values to template variables by reference
-     *
-     * @param string  $tpl_var the template variable name
-     * @param mixed   &$value  the referenced value to append
-     * @param boolean $merge   flag if array elements shall be merged
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function appendByRef($tpl_var, &$value, $merge = false)
-    {
-        return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
-    }
-
-    /**
-     * assigns values to template variables by reference
-     *
-     * @param string  $tpl_var the template variable name
-     * @param         $value
-     * @param boolean $nocache if true any output of this variable will be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function assignByRef($tpl_var, &$value, $nocache = false)
-    {
-        return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
-    }
-
-    /**
-     * Returns a single or all template variables
-     *
-     * @api  Smarty::getTemplateVars()
-     * @link https://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
-     * @param bool                                                    $searchParents include parent templates?
-     *
-     * @return mixed variable value or or array of variables
-     */
-    public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
-    {
-        return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
-    }
-
-    /**
-     * Follow the parent chain an merge template and config variables
-     *
-     * @param \Smarty_Internal_Data|null $data
-     */
-    public function _mergeVars(Smarty_Internal_Data $data = null)
-    {
-        if (isset($data)) {
-            if (!empty($this->tpl_vars)) {
-                $data->tpl_vars = array_merge($this->tpl_vars, $data->tpl_vars);
-            }
-            if (!empty($this->config_vars)) {
-                $data->config_vars = array_merge($this->config_vars, $data->config_vars);
-            }
-        } else {
-            $data = $this;
-        }
-        if (isset($this->parent)) {
-            $this->parent->_mergeVars($data);
-        }
-    }
-
-    /**
-     * Return true if this instance is a Data obj
-     *
-     * @return bool
-     */
-    public function _isDataObj()
-    {
-        return $this->_objType === 4;
-    }
-
-    /**
-     * Return true if this instance is a template obj
-     *
-     * @return bool
-     */
-    public function _isTplObj()
-    {
-        return $this->_objType === 2;
-    }
-
-    /**
-     * Return true if this instance is a Smarty obj
-     *
-     * @return bool
-     */
-    public function _isSmartyObj()
-    {
-        return $this->_objType === 1;
-    }
-
-    /**
-     * Get Smarty object
-     *
-     * @return Smarty
-     */
-    public function _getSmartyObj()
-    {
-        return $this->smarty;
-    }
-
-    /**
-     * Handle unknown class methods
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
-     *
-     * @return mixed
-     */
-    public function __call($name, $args)
-    {
-        return $this->ext->_callExternalMethod($this, $name, $args);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_extension_handler.php b/include/smarty/libs/sysplugins/smarty_internal_extension_handler.php
deleted file mode 100644
index 3ef040ab1..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_extension_handler.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-
-/**
- * Smarty Extension handler
- *
- * Load extensions dynamically
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- *
- * Runtime extensions
- * @property   Smarty_Internal_Runtime_CacheModify       $_cacheModify
- * @property   Smarty_Internal_Runtime_CacheResourceFile $_cacheResourceFile
- * @property   Smarty_Internal_Runtime_Capture           $_capture
- * @property   Smarty_Internal_Runtime_CodeFrame         $_codeFrame
- * @property   Smarty_Internal_Runtime_FilterHandler     $_filterHandler
- * @property   Smarty_Internal_Runtime_Foreach           $_foreach
- * @property   Smarty_Internal_Runtime_GetIncludePath    $_getIncludePath
- * @property   Smarty_Internal_Runtime_Make_Nocache      $_make_nocache
- * @property   Smarty_Internal_Runtime_UpdateCache       $_updateCache
- * @property   Smarty_Internal_Runtime_UpdateScope       $_updateScope
- * @property   Smarty_Internal_Runtime_TplFunction       $_tplFunction
- * @property   Smarty_Internal_Runtime_WriteFile         $_writeFile
- *
- * Method extensions
- * @property   Smarty_Internal_Method_GetTemplateVars    $getTemplateVars
- * @property   Smarty_Internal_Method_Append             $append
- * @property   Smarty_Internal_Method_AppendByRef        $appendByRef
- * @property   Smarty_Internal_Method_AssignGlobal       $assignGlobal
- * @property   Smarty_Internal_Method_AssignByRef        $assignByRef
- * @property   Smarty_Internal_Method_LoadFilter         $loadFilter
- * @property   Smarty_Internal_Method_LoadPlugin         $loadPlugin
- * @property   Smarty_Internal_Method_RegisterFilter     $registerFilter
- * @property   Smarty_Internal_Method_RegisterObject     $registerObject
- * @property   Smarty_Internal_Method_RegisterPlugin     $registerPlugin
- * @property   mixed|\Smarty_Template_Cached             configLoad
- */
-#[\AllowDynamicProperties]
-class Smarty_Internal_Extension_Handler
-{
-    public $objType = null;
-
-    /**
-     * Cache for property information from generic getter/setter
-     * Preloaded with names which should not use with generic getter/setter
-     *
-     * @var array
-     */
-    private $_property_info     = array(
-        'AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
-        'DebugTemplate'   => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
-        'TemplateVars'    => 0, 'Literals' => 'Literals',
-    );//
-
-    private $resolvedProperties = array();
-
-    /**
-     * Call external Method
-     *
-     * @param \Smarty_Internal_Data $data
-     * @param string                $name external method names
-     * @param array                 $args argument array
-     *
-     * @return mixed
-     */
-    public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
-    {
-        /* @var Smarty $data ->smarty */
-        $smarty = isset($data->smarty) ? $data->smarty : $data;
-        if (!isset($smarty->ext->$name)) {
-            if (preg_match('/^((set|get)|(.*?))([A-Z].*)$/', $name, $match)) {
-                $basename = $this->upperCase($match[ 4 ]);
-                if (!isset($smarty->ext->$basename) && isset($this->_property_info[ $basename ])
-                    && is_string($this->_property_info[ $basename ])
-                ) {
-                    $class = 'Smarty_Internal_Method_' . $this->_property_info[ $basename ];
-                    if (class_exists($class)) {
-                        $classObj = new $class();
-                        $methodes = get_class_methods($classObj);
-                        foreach ($methodes as $method) {
-                            $smarty->ext->$method = $classObj;
-                        }
-                    }
-                }
-                if (!empty($match[ 2 ]) && !isset($smarty->ext->$name)) {
-                    $class = 'Smarty_Internal_Method_' . $this->upperCase($name);
-                    if (!class_exists($class)) {
-                        $objType = $data->_objType;
-                        $propertyType = false;
-                        if (!isset($this->resolvedProperties[ $match[ 0 ] ][ $objType ])) {
-                            $property = $this->resolvedProperties['property'][$basename] ??
-                                $this->resolvedProperties['property'][$basename] = smarty_strtolower_ascii(
-                                join(
-                                    '_',
-                                    preg_split(
-                                        '/([A-Z][^A-Z]*)/',
-                                        $basename,
-                                        -1,
-                                        PREG_SPLIT_NO_EMPTY |
-                                        PREG_SPLIT_DELIM_CAPTURE
-                                    )
-                                )
-                            );
-                            if ($property !== false) {
-                                if (property_exists($data, $property)) {
-                                    $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 1;
-                                } elseif (property_exists($smarty, $property)) {
-                                    $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 2;
-                                } else {
-                                    $this->resolvedProperties[ 'property' ][ $basename ] = $property = false;
-                                }
-                            }
-                        } else {
-                            $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ];
-                            $property = $this->resolvedProperties[ 'property' ][ $basename ];
-                        }
-                        if ($propertyType) {
-                            $obj = $propertyType === 1 ? $data : $smarty;
-                            if ($match[ 2 ] === 'get') {
-                                return $obj->$property;
-                            } elseif ($match[ 2 ] === 'set') {
-                                return $obj->$property = $args[ 0 ];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        $callback = array($smarty->ext->$name, $name);
-        array_unshift($args, $data);
-        if (isset($callback) && $callback[ 0 ]->objMap | $data->_objType) {
-            return call_user_func_array($callback, $args);
-        }
-        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
-    }
-
-    /**
-     * Make first character of name parts upper case
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    public function upperCase($name)
-    {
-        $_name = explode('_', $name);
-        $_name = array_map('smarty_ucfirst_ascii', $_name);
-        return implode('_', $_name);
-    }
-
-    /**
-     * get extension object
-     *
-     * @param string $property_name property name
-     *
-     * @return mixed|Smarty_Template_Cached
-     */
-    public function __get($property_name)
-    {
-        // object properties of runtime template extensions will start with '_'
-        if ($property_name[ 0 ] === '_') {
-            $class = 'Smarty_Internal_Runtime' . $this->upperCase($property_name);
-        } else {
-            $class = 'Smarty_Internal_Method_' . $this->upperCase($property_name);
-        }
-        if (!class_exists($class)) {
-            return $this->$property_name = new Smarty_Internal_Undefined($class);
-        }
-        return $this->$property_name = new $class();
-    }
-
-    /**
-     * set extension property
-     *
-     * @param string $property_name property name
-     * @param mixed  $value         value
-     *
-     */
-    public function __set($property_name, $value)
-    {
-        $this->$property_name = $value;
-    }
-
-    /**
-     * Call error handler for undefined method
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
-     *
-     * @return mixed
-     */
-    public function __call($name, $args)
-    {
-        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), array($this));
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php b/include/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php
deleted file mode 100644
index a05f55a82..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Smarty Method AddAutoloadFilters
- *
- * Smarty::addAutoloadFilters() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_AddAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
-{
-    /**
-     * Add autoload filters
-     *
-     * @api Smarty::setAutoloadFilters()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param array                                                           $filters filters to load automatically
-     * @param string                                                          $type    "pre", "output", … specify
-     *                                                                                 the filter type to set.
-     *                                                                                 Defaults to none treating
-     *                                                                                 $filters' keys as the
-     *                                                                                 appropriate types
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function addAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if ($type !== null) {
-            $this->_checkFilterType($type);
-            if (!empty($smarty->autoload_filters[ $type ])) {
-                $smarty->autoload_filters[ $type ] = array_merge($smarty->autoload_filters[ $type ], (array)$filters);
-            } else {
-                $smarty->autoload_filters[ $type ] = (array)$filters;
-            }
-        } else {
-            foreach ((array)$filters as $type => $value) {
-                $this->_checkFilterType($type);
-                if (!empty($smarty->autoload_filters[ $type ])) {
-                    $smarty->autoload_filters[ $type ] =
-                        array_merge($smarty->autoload_filters[ $type ], (array)$value);
-                } else {
-                    $smarty->autoload_filters[ $type ] = (array)$value;
-                }
-            }
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php b/include/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php
deleted file mode 100644
index c3feb3d8b..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Smarty Method AddDefaultModifiers
- *
- * Smarty::addDefaultModifiers() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_AddDefaultModifiers
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Add default modifiers
-     *
-     * @api Smarty::addDefaultModifiers()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param array|string                                                    $modifiers modifier or list of modifiers
-     *                                                                                   to add
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function addDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if (is_array($modifiers)) {
-            $smarty->default_modifiers = array_merge($smarty->default_modifiers, $modifiers);
-        } else {
-            $smarty->default_modifiers[] = $modifiers;
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_append.php b/include/smarty/libs/sysplugins/smarty_internal_method_append.php
deleted file mode 100644
index e207734e8..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_append.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * Smarty Method Append
- *
- * Smarty::append() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_Append
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * appends values to template variables
-     *
-     * @api  Smarty::append()
-     * @link https://www.smarty.net/docs/en/api.append.tpl
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param array|string                                            $tpl_var the template variable name(s)
-     * @param mixed                                                   $value   the value to append
-     * @param bool                                                    $merge   flag if array elements shall be merged
-     * @param bool                                                    $nocache if true any output of this variable will
-     *                                                                         be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function append(Smarty_Internal_Data $data, $tpl_var, $value = null, $merge = false, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            // $tpl_var is an array, ignore $value
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key !== '') {
-                    $this->append($data, $_key, $_val, $merge, $nocache);
-                }
-            }
-        } else {
-            if ($tpl_var !== '' && isset($value)) {
-                if (!isset($data->tpl_vars[ $tpl_var ])) {
-                    $tpl_var_inst = $data->ext->getTemplateVars->_getVariable($data, $tpl_var, null, true, false);
-                    if ($tpl_var_inst instanceof Smarty_Undefined_Variable) {
-                        $data->tpl_vars[ $tpl_var ] = new Smarty_Variable(null, $nocache);
-                    } else {
-                        $data->tpl_vars[ $tpl_var ] = clone $tpl_var_inst;
-                    }
-                }
-                if (!(is_array($data->tpl_vars[ $tpl_var ]->value)
-                      || $data->tpl_vars[ $tpl_var ]->value instanceof ArrayAccess)
-                ) {
-                    settype($data->tpl_vars[ $tpl_var ]->value, 'array');
-                }
-                if ($merge && is_array($value)) {
-                    foreach ($value as $_mkey => $_mval) {
-                        $data->tpl_vars[ $tpl_var ]->value[ $_mkey ] = $_mval;
-                    }
-                } else {
-                    $data->tpl_vars[ $tpl_var ]->value[] = $value;
-                }
-            }
-            if ($data->_isTplObj() && $data->scope) {
-                $data->ext->_updateScope->_updateScope($data, $tpl_var);
-            }
-        }
-        return $data;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php b/include/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php
deleted file mode 100644
index b5be69b54..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Smarty Method AppendByRef
- *
- * Smarty::appendByRef() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-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
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param string                                                  $tpl_var the template variable name
-     * @param mixed                                                   &$value  the referenced value to append
-     * @param bool                                                    $merge   flag if array elements shall be merged
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public static function appendByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $merge = false)
-    {
-        if ($tpl_var !== '' && isset($value)) {
-            if (!isset($data->tpl_vars[ $tpl_var ])) {
-                $data->tpl_vars[ $tpl_var ] = new Smarty_Variable();
-            }
-            if (!is_array($data->tpl_vars[ $tpl_var ]->value)) {
-                settype($data->tpl_vars[ $tpl_var ]->value, 'array');
-            }
-            if ($merge && is_array($value)) {
-                foreach ($value as $_key => $_val) {
-                    $data->tpl_vars[ $tpl_var ]->value[ $_key ] = &$value[ $_key ];
-                }
-            } else {
-                $data->tpl_vars[ $tpl_var ]->value[] = &$value;
-            }
-            if ($data->_isTplObj() && $data->scope) {
-                $data->ext->_updateScope->_updateScope($data, $tpl_var);
-            }
-        }
-        return $data;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php b/include/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php
deleted file mode 100644
index fa705bb80..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Smarty Method AssignByRef
- *
- * Smarty::assignByRef() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_AssignByRef
-{
-    /**
-     * assigns values to template variables by reference
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param string                                                  $tpl_var the template variable name
-     * @param                                                         $value
-     * @param boolean                                                 $nocache if true any output of this variable will
-     *                                                                         be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function assignByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $nocache)
-    {
-        if ($tpl_var !== '') {
-            $data->tpl_vars[ $tpl_var ] = new Smarty_Variable(null, $nocache);
-            $data->tpl_vars[ $tpl_var ]->value = &$value;
-            if ($data->_isTplObj() && $data->scope) {
-                $data->ext->_updateScope->_updateScope($data, $tpl_var);
-            }
-        }
-        return $data;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php b/include/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php
deleted file mode 100644
index 08cfa4693..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Smarty Method AssignGlobal
- *
- * Smarty::assignGlobal() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_AssignGlobal
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * assigns a global Smarty variable
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param string                                                  $varName the global variable name
-     * @param mixed                                                   $value   the value to assign
-     * @param boolean                                                 $nocache if true any output of this variable will
-     *                                                                         be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function assignGlobal(Smarty_Internal_Data $data, $varName, $value = null, $nocache = false)
-    {
-        if ($varName !== '') {
-            Smarty::$global_tpl_vars[ $varName ] = new Smarty_Variable($value, $nocache);
-            $ptr = $data;
-            while ($ptr->_isTplObj()) {
-                $ptr->tpl_vars[ $varName ] = clone Smarty::$global_tpl_vars[ $varName ];
-                $ptr = $ptr->parent;
-            }
-        }
-        return $data;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php
deleted file mode 100644
index 6fb0c8f3d..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Smarty Method ClearAllAssign
- *
- * Smarty::clearAllAssign() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_ClearAllAssign
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * clear all the assigned template variables.
-     *
-     * @api  Smarty::clearAllAssign()
-     * @link https://www.smarty.net/docs/en/api.clear.all.assign.tpl
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function clearAllAssign(Smarty_Internal_Data $data)
-    {
-        $data->tpl_vars = array();
-        return $data;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php
deleted file mode 100644
index b74d30580..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Smarty Method ClearAllCache
- *
- * Smarty::clearAllCache() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_ClearAllCache
-{
-    /**
-     * Valid for Smarty object
-     *
-     * @var int
-     */
-    public $objMap = 1;
-
-    /**
-     * Empty cache folder
-     *
-     * @api  Smarty::clearAllCache()
-     * @link https://www.smarty.net/docs/en/api.clear.all.cache.tpl
-     *
-     * @param \Smarty $smarty
-     * @param integer $exp_time expiration time
-     * @param string  $type     resource type
-     *
-     * @return int number of cache files deleted
-     * @throws \SmartyException
-     */
-    public function clearAllCache(Smarty $smarty, $exp_time = null, $type = null)
-    {
-        $smarty->_clearTemplateCache();
-        // load cache resource and call clearAll
-        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
-        return $_cache_resource->clearAll($smarty, $exp_time);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearassign.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearassign.php
deleted file mode 100644
index 12b755c06..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_clearassign.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Smarty Method ClearAssign
- *
- * Smarty::clearAssign() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_ClearAssign
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * clear the given assigned template variable(s).
-     *
-     * @api  Smarty::clearAssign()
-     * @link https://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
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function clearAssign(Smarty_Internal_Data $data, $tpl_var)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $curr_var) {
-                unset($data->tpl_vars[ $curr_var ]);
-            }
-        } else {
-            unset($data->tpl_vars[ $tpl_var ]);
-        }
-        return $data;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearcache.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearcache.php
deleted file mode 100644
index df766eee8..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_clearcache.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Smarty Method ClearCache
- *
- * Smarty::clearCache() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_ClearCache
-{
-    /**
-     * Valid for Smarty object
-     *
-     * @var int
-     */
-    public $objMap = 1;
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @api  Smarty::clearCache()
-     * @link https://www.smarty.net/docs/en/api.clear.cache.tpl
-     *
-     * @param \Smarty $smarty
-     * @param string  $template_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time
-     * @param string  $type          resource type
-     *
-     * @return int number of cache files deleted
-     * @throws \SmartyException
-     */
-    public function clearCache(
-        Smarty $smarty,
-        $template_name,
-        $cache_id = null,
-        $compile_id = null,
-        $exp_time = null,
-        $type = null
-    ) {
-        $smarty->_clearTemplateCache();
-        // load cache resource and call clear
-        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
-        return $_cache_resource->clear($smarty, $template_name, $cache_id, $compile_id, $exp_time);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
deleted file mode 100644
index db0a49b00..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-/**
- * Smarty Method ClearCompiledTemplate
- *
- * Smarty::clearCompiledTemplate() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_ClearCompiledTemplate
-{
-    /**
-     * Valid for Smarty object
-     *
-     * @var int
-     */
-    public $objMap = 1;
-
-    /**
-     * Delete compiled template file
-     *
-     * @api  Smarty::clearCompiledTemplate()
-     * @link https://www.smarty.net/docs/en/api.clear.compiled.template.tpl
-     *
-     * @param \Smarty $smarty
-     * @param string  $resource_name template name
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time
-     *
-     * @return int number of template files deleted
-     * @throws \SmartyException
-     */
-    public function clearCompiledTemplate(Smarty $smarty, $resource_name = null, $compile_id = null, $exp_time = null)
-    {
-        // clear template objects cache
-        $smarty->_clearTemplateCache();
-        $_compile_dir = $smarty->getCompileDir();
-        if ($_compile_dir === '/') { //We should never want to delete this!
-            return 0;
-        }
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = Smarty::CACHING_OFF;
-            /* @var Smarty_Internal_Template $tpl */
-            $tpl = $smarty->createTemplate($resource_name);
-            $smarty->caching = $_save_stat;
-            if (!$tpl->source->handler->uncompiled && !$tpl->source->handler->recompiled && $tpl->source->exists) {
-                $_resource_part_1 = basename(str_replace('^', DIRECTORY_SEPARATOR, $tpl->compiled->filepath));
-                $_resource_part_1_length = strlen($_resource_part_1);
-            } else {
-                return 0;
-            }
-            $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
-            $_resource_part_2_length = strlen($_resource_part_2);
-        }
-        $_dir = $_compile_dir;
-        if ($smarty->use_sub_dirs && isset($_compile_id)) {
-            $_dir .= $_compile_id . $_dir_sep;
-        }
-        if (isset($_compile_id)) {
-            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
-            $_compile_id_part_length = strlen($_compile_id_part);
-        }
-        $_count = 0;
-        try {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            // NOTE: UnexpectedValueException thrown for PHP >= 5.3
-        } catch (Exception $e) {
-            return 0;
-        }
-        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($_compile as $_file) {
-            if (substr(basename($_file->getPathname()), 0, 1) === '.') {
-                continue;
-            }
-            $_filepath = (string)$_file;
-            if ($_file->isDir()) {
-                if (!$_compile->isDot()) {
-                    // delete folder if empty
-                    @rmdir($_file->getPathname());
-                }
-            } else {
-                // delete only php files
-                if (substr($_filepath, -4) !== '.php') {
-                    continue;
-                }
-                $unlink = false;
-                if ((!isset($_compile_id) ||
-                     (isset($_filepath[ $_compile_id_part_length ]) &&
-                      $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
-                    && (!isset($resource_name) || (isset($_filepath[ $_resource_part_1_length ])
-                                                   && substr_compare(
-                                                          $_filepath,
-                                                          $_resource_part_1,
-                                                          -$_resource_part_1_length,
-                                                          $_resource_part_1_length
-                                                      ) === 0) || (isset($_filepath[ $_resource_part_2_length ])
-                                                                   && substr_compare(
-                                                                          $_filepath,
-                                                                          $_resource_part_2,
-                                                                          -$_resource_part_2_length,
-                                                                          $_resource_part_2_length
-                                                                      ) === 0))
-                ) {
-                    if (isset($exp_time)) {
-                        if (is_file($_filepath) && time() - filemtime($_filepath) >= $exp_time) {
-                            $unlink = true;
-                        }
-                    } else {
-                        $unlink = true;
-                    }
-                }
-                if ($unlink && is_file($_filepath) && @unlink($_filepath)) {
-                    $_count++;
-                    if (function_exists('opcache_invalidate')
-                        && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api')) < 1)
-                    ) {
-                        opcache_invalidate($_filepath, true);
-                    } elseif (function_exists('apc_delete_file')) {
-                        apc_delete_file($_filepath);
-                    }
-                }
-            }
-        }
-        return $_count;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php b/include/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php
deleted file mode 100644
index d1b730322..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Smarty Method ClearConfig
- *
- * Smarty::clearConfig() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_ClearConfig
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * clear a single or all config variables
-     *
-     * @api  Smarty::clearConfig()
-     * @link https://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
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function clearConfig(Smarty_Internal_Data $data, $name = null)
-    {
-        if (isset($name)) {
-            unset($data->config_vars[ $name ]);
-        } else {
-            $data->config_vars = array();
-        }
-        return $data;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php b/include/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php
deleted file mode 100644
index 3934ca042..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Smarty Method CompileAllConfig
- *
- * Smarty::compileAllConfig() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_CompileAllConfig extends Smarty_Internal_Method_CompileAllTemplates
-{
-    /**
-     * Compile all config files
-     *
-     * @api Smarty::compileAllConfig()
-     *
-     * @param \Smarty $smarty        passed smarty object
-     * @param string  $extension     file extension
-     * @param bool    $force_compile force all to recompile
-     * @param int     $time_limit
-     * @param int     $max_errors
-     *
-     * @return int number of template files recompiled
-     */
-    public function compileAllConfig(
-        Smarty $smarty,
-        $extension = '.conf',
-        $force_compile = false,
-        $time_limit = 0,
-        $max_errors = null
-    ) {
-        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors, true);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php b/include/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php
deleted file mode 100644
index 5c046da40..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/**
- * Smarty Method CompileAllTemplates
- *
- * Smarty::compileAllTemplates() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_CompileAllTemplates
-{
-    /**
-     * Valid for Smarty object
-     *
-     * @var int
-     */
-    public $objMap = 1;
-
-    /**
-     * Compile all template files
-     *
-     * @api Smarty::compileAllTemplates()
-     *
-     * @param \Smarty $smarty        passed smarty object
-     * @param string  $extension     file extension
-     * @param bool    $force_compile force all to recompile
-     * @param int     $time_limit
-     * @param int     $max_errors
-     *
-     * @return integer number of template files recompiled
-     */
-    public function compileAllTemplates(
-        Smarty $smarty,
-        $extension = '.tpl',
-        $force_compile = false,
-        $time_limit = 0,
-        $max_errors = null
-    ) {
-        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors);
-    }
-
-    /**
-     * Compile all template or config files
-     *
-     * @param \Smarty $smarty
-     * @param string  $extension     template file name extension
-     * @param bool    $force_compile force all to recompile
-     * @param int     $time_limit    set maximum execution time
-     * @param int     $max_errors    set maximum allowed errors
-     * @param bool    $isConfig      flag true if called for config files
-     *
-     * @return int number of template files compiled
-     */
-    protected function compileAll(
-        Smarty $smarty,
-        $extension,
-        $force_compile,
-        $time_limit,
-        $max_errors,
-        $isConfig = false
-    ) {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $_count = 0;
-        $_error_count = 0;
-        $sourceDir = $isConfig ? $smarty->getConfigDir() : $smarty->getTemplateDir();
-        // loop over array of source directories
-        foreach ($sourceDir as $_dir) {
-            $_dir_1 = new RecursiveDirectoryIterator(
-                $_dir,
-                defined('FilesystemIterator::FOLLOW_SYMLINKS') ?
-                    FilesystemIterator::FOLLOW_SYMLINKS : 0
-            );
-            $_dir_2 = new RecursiveIteratorIterator($_dir_1);
-            foreach ($_dir_2 as $_fileinfo) {
-                $_file = $_fileinfo->getFilename();
-                if (substr(basename($_fileinfo->getPathname()), 0, 1) === '.' || strpos($_file, '.svn') !== false) {
-                    continue;
-                }
-                if (substr_compare($_file, $extension, -strlen($extension)) !== 0) {
-                    continue;
-                }
-                if ($_fileinfo->getPath() !== substr($_dir, 0, -1)) {
-                    $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DIRECTORY_SEPARATOR . $_file;
-                }
-                echo "\n<br>", $_dir, '---', $_file;
-                flush();
-                $_start_time = microtime(true);
-                $_smarty = clone $smarty;
-                //
-                $_smarty->_cache = array();
-                $_smarty->ext = new Smarty_Internal_Extension_Handler();
-                $_smarty->ext->objType = $_smarty->_objType;
-                $_smarty->force_compile = $force_compile;
-                try {
-                    /* @var Smarty_Internal_Template $_tpl */
-                    $_tpl = new $smarty->template_class($_file, $_smarty);
-                    $_tpl->caching = Smarty::CACHING_OFF;
-                    $_tpl->source =
-                        $isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
-                    if ($_tpl->mustCompile()) {
-                        $_tpl->compileTemplateSource();
-                        $_count++;
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                } catch (Exception $e) {
-                    echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
-                    $_error_count++;
-                }
-                // free memory
-                unset($_tpl);
-                $_smarty->_clearTemplateCache();
-                if ($max_errors !== null && $_error_count === $max_errors) {
-                    echo "\n<br><br>too many errors\n";
-                    exit(1);
-                }
-            }
-        }
-        echo "\n<br>";
-        return $_count;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_configload.php b/include/smarty/libs/sysplugins/smarty_internal_method_configload.php
deleted file mode 100644
index c3174d2d0..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_configload.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-/**
- * Smarty Method ConfigLoad
- *
- * Smarty::configLoad() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_ConfigLoad
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * load a config file, optionally load just selected sections
-     *
-     * @api  Smarty::configLoad()
-     * @link https://www.smarty.net/docs/en/api.config.load.tpl
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param string                                                  $config_file filename
-     * @param mixed                                                   $sections    array of section names, single
-     *                                                                             section or null
-     *
-     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
-     * @throws \Exception
-     */
-    public function configLoad(Smarty_Internal_Data $data, $config_file, $sections = null)
-    {
-        $this->_loadConfigFile($data, $config_file, $sections, null);
-        return $data;
-    }
-
-    /**
-     * load a config file, optionally load just selected sections
-     *
-     * @api  Smarty::configLoad()
-     * @link https://www.smarty.net/docs/en/api.config.load.tpl
-     *
-     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
-     * @param string                                                  $config_file filename
-     * @param mixed                                                   $sections    array of section names, single
-     *                                                                             section or null
-     * @param int                                                     $scope       scope into which config variables
-     *                                                                             shall be loaded
-     *
-     * @throws \Exception
-     */
-    public function _loadConfigFile(Smarty_Internal_Data $data, $config_file, $sections = null, $scope = 0)
-    {
-        /* @var \Smarty $smarty */
-        $smarty = $data->_getSmartyObj();
-        /* @var \Smarty_Internal_Template $confObj */
-        $confObj = new Smarty_Internal_Template($config_file, $smarty, $data, null, null, null, null, true);
-        $confObj->caching = Smarty::CACHING_OFF;
-        $confObj->source->config_sections = $sections;
-        $confObj->source->scope = $scope;
-        $confObj->compiled = Smarty_Template_Compiled::load($confObj);
-        $confObj->compiled->render($confObj);
-        if ($data->_isTplObj()) {
-            $data->compiled->file_dependency[ $confObj->source->uid ] =
-                array($confObj->source->filepath, $confObj->source->getTimeStamp(), $confObj->source->type);
-        }
-    }
-
-    /**
-     * load config variables into template object
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param array                     $new_config_vars
-     */
-    public function _loadConfigVars(Smarty_Internal_Template $tpl, $new_config_vars)
-    {
-        $this->_assignConfigVars($tpl->parent->config_vars, $tpl, $new_config_vars);
-        $tagScope = $tpl->source->scope;
-        if ($tagScope >= 0) {
-            if ($tagScope === Smarty::SCOPE_LOCAL) {
-                $this->_updateVarStack($tpl, $new_config_vars);
-                $tagScope = 0;
-                if (!$tpl->scope) {
-                    return;
-                }
-            }
-            if ($tpl->parent->_isTplObj() && ($tagScope || $tpl->parent->scope)) {
-                $mergedScope = $tagScope | $tpl->scope;
-                if ($mergedScope) {
-                    // update scopes
-                    /* @var \Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $ptr */
-                    foreach ($tpl->smarty->ext->_updateScope->_getAffectedScopes($tpl->parent, $mergedScope) as $ptr) {
-                        $this->_assignConfigVars($ptr->config_vars, $tpl, $new_config_vars);
-                        if ($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) {
-                            $this->_updateVarStack($tpl, $new_config_vars);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Assign all config variables in given scope
-     *
-     * @param array                     $config_vars     config variables in scope
-     * @param \Smarty_Internal_Template $tpl
-     * @param array                     $new_config_vars loaded config variables
-     */
-    public function _assignConfigVars(&$config_vars, Smarty_Internal_Template $tpl, $new_config_vars)
-    {
-        // copy global config vars
-        foreach ($new_config_vars[ 'vars' ] as $variable => $value) {
-            if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
-                $config_vars[ $variable ] = $value;
-            } else {
-                $config_vars[ $variable ] = array_merge((array)$config_vars[ $variable ], (array)$value);
-            }
-        }
-        // scan sections
-        $sections = $tpl->source->config_sections;
-        if (!empty($sections)) {
-            foreach ((array)$sections as $tpl_section) {
-                if (isset($new_config_vars[ 'sections' ][ $tpl_section ])) {
-                    foreach ($new_config_vars[ 'sections' ][ $tpl_section ][ 'vars' ] as $variable => $value) {
-                        if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
-                            $config_vars[ $variable ] = $value;
-                        } else {
-                            $config_vars[ $variable ] = array_merge((array)$config_vars[ $variable ], (array)$value);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Update config variables in template local variable stack
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param array                     $config_vars
-     */
-    public function _updateVarStack(Smarty_Internal_Template $tpl, $config_vars)
-    {
-        $i = 0;
-        while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
-            $this->_assignConfigVars($tpl->_cache[ 'varStack' ][ $i ][ 'config' ], $tpl, $config_vars);
-            $i++;
-        }
-    }
-
-    /**
-     * gets  a config variable value
-     *
-     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
-     * @param string                                                  $varName the name of the config variable
-     * @param bool                                                    $errorEnable
-     *
-     * @return null|string  the value of the config variable
-     */
-    public function _getConfigVariable(Smarty_Internal_Data $data, $varName, $errorEnable = true)
-    {
-        $_ptr = $data;
-        while ($_ptr !== null) {
-            if (isset($_ptr->config_vars[ $varName ])) {
-                // found it, return it
-                return $_ptr->config_vars[ $varName ];
-            }
-            // not found, try at parent
-            $_ptr = $_ptr->parent;
-        }
-        if ($data->smarty->error_unassigned && $errorEnable) {
-            // force a notice
-            $x = $$varName;
-        }
-        return null;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_createdata.php b/include/smarty/libs/sysplugins/smarty_internal_method_createdata.php
deleted file mode 100644
index c684c0870..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_createdata.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Smarty Method CreateData
- *
- * Smarty::createData() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_CreateData
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * creates a data object
-     *
-     * @api  Smarty::createData()
-     * @link https://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
-     *                                                                                     variables
-     * @param string                                                               $name   optional data block name
-     *
-     * @return \Smarty_Data data object
-     */
-    public function createData(Smarty_Internal_TemplateBase $obj, Smarty_Internal_Data $parent = null, $name = null)
-    {
-        /* @var Smarty $smarty */
-        $smarty = $obj->_getSmartyObj();
-        $dataObj = new Smarty_Data($parent, $smarty, $name);
-        if ($smarty->debugging) {
-            Smarty_Internal_Debug::register_data($dataObj);
-        }
-        return $dataObj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php b/include/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php
deleted file mode 100644
index 4145db10b..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetAutoloadFilters
- *
- * Smarty::getAutoloadFilters() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_GetAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
-{
-    /**
-     * Get autoload filters
-     *
-     * @api Smarty::getAutoloadFilters()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $type type of filter to get auto loads
-     *                                                                              for. Defaults to all autoload
-     *                                                                              filters
-     *
-     * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
-     *                was specified
-     * @throws \SmartyException
-     */
-    public function getAutoloadFilters(Smarty_Internal_TemplateBase $obj, $type = null)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if ($type !== null) {
-            $this->_checkFilterType($type);
-            return isset($smarty->autoload_filters[ $type ]) ? $smarty->autoload_filters[ $type ] : array();
-        }
-        return $smarty->autoload_filters;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvariable.php b/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvariable.php
deleted file mode 100644
index b54815123..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvariable.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetConfigVariable
- *
- * Smarty::getConfigVariable() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_GetConfigVariable
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * gets  a config variable value
-     *
-     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
-     * @param string                                                  $varName the name of the config variable
-     * @param bool                                                    $errorEnable
-     *
-     * @return null|string  the value of the config variable
-     */
-    public function getConfigVariable(Smarty_Internal_Data $data, $varName = null, $errorEnable = true)
-    {
-        return $data->ext->configLoad->_getConfigVariable($data, $varName, $errorEnable);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php b/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php
deleted file mode 100644
index 763bdf989..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetConfigVars
- *
- * Smarty::getConfigVars() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_GetConfigVars
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * Returns a single or all config variables
-     *
-     * @api  Smarty::getConfigVars()
-     * @link https://www.smarty.net/docs/en/api.get.config.vars.tpl
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param string                                                  $varname        variable name or null
-     * @param bool                                                    $search_parents include parent templates?
-     *
-     * @return mixed variable value or or array of variables
-     */
-    public function getConfigVars(Smarty_Internal_Data $data, $varname = null, $search_parents = true)
-    {
-        $_ptr = $data;
-        $var_array = array();
-        while ($_ptr !== null) {
-            if (isset($varname)) {
-                if (isset($_ptr->config_vars[ $varname ])) {
-                    return $_ptr->config_vars[ $varname ];
-                }
-            } else {
-                $var_array = array_merge($_ptr->config_vars, $var_array);
-            }
-            // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset($varname)) {
-            return '';
-        } else {
-            return $var_array;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php b/include/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php
deleted file mode 100644
index 77d908c15..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetDebugTemplate
- *
- * Smarty::getDebugTemplate() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_GetDebugTemplate
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * return name of debugging template
-     *
-     * @api Smarty::getDebugTemplate()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     *
-     * @return string
-     */
-    public function getDebugTemplate(Smarty_Internal_TemplateBase $obj)
-    {
-        $smarty = $obj->_getSmartyObj();
-        return $smarty->debug_tpl;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php b/include/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php
deleted file mode 100644
index 57da85c49..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetDefaultModifiers
- *
- * Smarty::getDefaultModifiers() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_GetDefaultModifiers
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Get default modifiers
-     *
-     * @api Smarty::getDefaultModifiers()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     *
-     * @return array list of default modifiers
-     */
-    public function getDefaultModifiers(Smarty_Internal_TemplateBase $obj)
-    {
-        $smarty = $obj->_getSmartyObj();
-        return $smarty->default_modifiers;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getglobal.php b/include/smarty/libs/sysplugins/smarty_internal_method_getglobal.php
deleted file mode 100644
index 2be11d7e8..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_getglobal.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetGlobal
- *
- * Smarty::getGlobal() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_GetGlobal
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * Returns a single or all global  variables
-     *
-     * @api Smarty::getGlobal()
-     *
-     * @param \Smarty_Internal_Data $data
-     * @param string                $varName variable name or null
-     *
-     * @return string|array variable value or or array of variables
-     */
-    public function getGlobal(Smarty_Internal_Data $data, $varName = null)
-    {
-        if (isset($varName)) {
-            if (isset(Smarty::$global_tpl_vars[ $varName ])) {
-                return Smarty::$global_tpl_vars[ $varName ]->value;
-            } else {
-                return '';
-            }
-        } else {
-            $_result = array();
-            foreach (Smarty::$global_tpl_vars as $key => $var) {
-                $_result[ $key ] = $var->value;
-            }
-            return $_result;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php b/include/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php
deleted file mode 100644
index 0b3a071d3..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetRegisteredObject
- *
- * Smarty::getRegisteredObject() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_GetRegisteredObject
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * return a reference to a registered object
-     *
-     * @api  Smarty::getRegisteredObject()
-     * @link https://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
-     *
-     * @return object
-     * @throws \SmartyException if no such object is found
-     */
-    public function getRegisteredObject(Smarty_Internal_TemplateBase $obj, $object_name)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if (!isset($smarty->registered_objects[ $object_name ])) {
-            throw new SmartyException("'$object_name' is not a registered object");
-        }
-        if (!is_object($smarty->registered_objects[ $object_name ][ 0 ])) {
-            throw new SmartyException("registered '$object_name' is not an object");
-        }
-        return $smarty->registered_objects[ $object_name ][ 0 ];
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php b/include/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php
deleted file mode 100644
index 8db39c525..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetStreamVariable
- *
- * Smarty::getStreamVariable() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_GetStreamVariable
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * gets  a stream variable
-     *
-     * @api Smarty::getStreamVariable()
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param string                                                  $variable the stream of the variable
-     *
-     * @return mixed
-     * @throws \SmartyException
-     */
-    public function getStreamVariable(Smarty_Internal_Data $data, $variable)
-    {
-        $_result = '';
-        $fp = fopen($variable, 'r+');
-        if ($fp) {
-            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
-                $_result .= $current_line;
-            }
-            fclose($fp);
-            return $_result;
-        }
-        $smarty = isset($data->smarty) ? $data->smarty : $data;
-        if ($smarty->error_unassigned) {
-            throw new SmartyException('Undefined stream variable "' . $variable . '"');
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_gettags.php b/include/smarty/libs/sysplugins/smarty_internal_method_gettags.php
deleted file mode 100644
index 0d1335a8d..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_gettags.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetTags
- *
- * Smarty::getTags() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_GetTags
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * 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
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param null|string|Smarty_Internal_Template                            $template
-     *
-     * @return array of tag/attributes
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function getTags(Smarty_Internal_TemplateBase $obj, $template = null)
-    {
-        /* @var Smarty $smarty */
-        $smarty = $obj->_getSmartyObj();
-        if ($obj->_isTplObj() && !isset($template)) {
-            $tpl = clone $obj;
-        } elseif (isset($template) && $template->_isTplObj()) {
-            $tpl = clone $template;
-        } elseif (isset($template) && is_string($template)) {
-            /* @var Smarty_Internal_Template $tpl */
-            $tpl = new $smarty->template_class($template, $smarty);
-            // checks if template exists
-            if (!$tpl->source->exists) {
-                throw new SmartyException("Unable to load template {$tpl->source->type} '{$tpl->source->name}'");
-            }
-        }
-        if (isset($tpl)) {
-            $tpl->smarty = clone $tpl->smarty;
-            $tpl->smarty->_cache[ 'get_used_tags' ] = true;
-            $tpl->_cache[ 'used_tags' ] = array();
-            $tpl->smarty->merge_compiled_includes = false;
-            $tpl->smarty->disableSecurity();
-            $tpl->caching = Smarty::CACHING_OFF;
-            $tpl->loadCompiler();
-            $tpl->compiler->compileTemplate($tpl);
-            return $tpl->_cache[ 'used_tags' ];
-        }
-        throw new SmartyException('Missing template specification');
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php b/include/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php
deleted file mode 100644
index 0470785b1..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetTemplateVars
- *
- * Smarty::getTemplateVars() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_GetTemplateVars
-{
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
-
-    /**
-     * Returns a single or all template variables
-     *
-     * @api  Smarty::getTemplateVars()
-     * @link https://www.smarty.net/docs/en/api.get.template.vars.tpl
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param string                                                  $varName       variable name or null
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
-     * @param bool                                                    $searchParents include parent templates?
-     *
-     * @return mixed variable value or or array of variables
-     */
-    public function getTemplateVars(
-        Smarty_Internal_Data $data,
-        $varName = null,
-        Smarty_Internal_Data $_ptr = null,
-        $searchParents = true
-    ) {
-        if (isset($varName)) {
-            $_var = $this->_getVariable($data, $varName, $_ptr, $searchParents, false);
-            if (is_object($_var)) {
-                return $_var->value;
-            } else {
-                return null;
-            }
-        } else {
-            $_result = array();
-            if ($_ptr === null) {
-                $_ptr = $data;
-            }
-            while ($_ptr !== null) {
-                foreach ($_ptr->tpl_vars as $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[ $key ] = $var->value;
-                    }
-                }
-                // not found, try at parent
-                if ($searchParents && isset($_ptr->parent)) {
-                    $_ptr = $_ptr->parent;
-                } else {
-                    $_ptr = null;
-                }
-            }
-            if ($searchParents && isset(Smarty::$global_tpl_vars)) {
-                foreach (Smarty::$global_tpl_vars as $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[ $key ] = $var->value;
-                    }
-                }
-            }
-            return $_result;
-        }
-    }
-
-    /**
-     * gets the object of a Smarty variable
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param string                                                  $varName       the name of the Smarty variable
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
-     * @param bool                                                    $searchParents search also in parent data
-     * @param bool                                                    $errorEnable
-     *
-     * @return \Smarty_Variable
-     */
-    public function _getVariable(
-        Smarty_Internal_Data $data,
-        $varName,
-        Smarty_Internal_Data $_ptr = null,
-        $searchParents = true,
-        $errorEnable = true
-    ) {
-        if ($_ptr === null) {
-            $_ptr = $data;
-        }
-        while ($_ptr !== null) {
-            if (isset($_ptr->tpl_vars[ $varName ])) {
-                // found it, return it
-                return $_ptr->tpl_vars[ $varName ];
-            }
-            // not found, try at parent
-            if ($searchParents && isset($_ptr->parent)) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset(Smarty::$global_tpl_vars[ $varName ])) {
-            // found it, return it
-            return Smarty::$global_tpl_vars[ $varName ];
-        }
-        if ($errorEnable && $data->_getSmartyObj()->error_unassigned) {
-            // force a notice
-            $x = $$varName;
-        }
-        return new Smarty_Undefined_Variable;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_literals.php b/include/smarty/libs/sysplugins/smarty_internal_method_literals.php
deleted file mode 100644
index bfa3f58ec..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_literals.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Smarty Method GetLiterals
- *
- * Smarty::getLiterals() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_Literals
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Get literals
-     *
-     * @api Smarty::getLiterals()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     *
-     * @return array list of literals
-     */
-    public function getLiterals(Smarty_Internal_TemplateBase $obj)
-    {
-        $smarty = $obj->_getSmartyObj();
-        return (array)$smarty->literals;
-    }
-
-    /**
-     * Add literals
-     *
-     * @api Smarty::addLiterals()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param array|string                                                    $literals literal or list of literals
-     *                                                                                  to addto add
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function addLiterals(Smarty_Internal_TemplateBase $obj, $literals = null)
-    {
-        if (isset($literals)) {
-            $this->set($obj->_getSmartyObj(), (array)$literals);
-        }
-        return $obj;
-    }
-
-    /**
-     * Set literals
-     *
-     * @api Smarty::setLiterals()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param array|string                                                    $literals literal or list of literals
-     *                                                                                  to setto set
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function setLiterals(Smarty_Internal_TemplateBase $obj, $literals = null)
-    {
-        $smarty = $obj->_getSmartyObj();
-        $smarty->literals = array();
-        if (!empty($literals)) {
-            $this->set($smarty, (array)$literals);
-        }
-        return $obj;
-    }
-
-    /**
-     * common setter for literals for easier handling of duplicates the
-     * Smarty::$literals array gets filled with identical key values
-     *
-     * @param \Smarty $smarty
-     * @param array   $literals
-     *
-     * @throws \SmartyException
-     */
-    private function set(Smarty $smarty, $literals)
-    {
-        $literals = array_combine($literals, $literals);
-        $error = isset($literals[ $smarty->left_delimiter ]) ? array($smarty->left_delimiter) : array();
-        $error = isset($literals[ $smarty->right_delimiter ]) ? $error[] = $smarty->right_delimiter : $error;
-        if (!empty($error)) {
-            throw new SmartyException(
-                'User defined literal(s) "' . $error .
-                '" may not be identical with left or right delimiter'
-            );
-        }
-        $smarty->literals = array_merge((array)$smarty->literals, (array)$literals);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php b/include/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php
deleted file mode 100644
index af788a24e..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Smarty Method LoadFilter
- *
- * Smarty::loadFilter() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_LoadFilter
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Valid filter types
-     *
-     * @var array
-     */
-    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @api  Smarty::loadFilter()
-     *
-     * @link https://www.smarty.net/docs/en/api.load.filter.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $type filter type
-     * @param string                                                          $name filter name
-     *
-     * @return bool
-     * @throws SmartyException if filter could not be loaded
-     */
-    public function loadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
-    {
-        $smarty = $obj->_getSmartyObj();
-        $this->_checkFilterType($type);
-        $_plugin = "smarty_{$type}filter_{$name}";
-        $_filter_name = $_plugin;
-        if (is_callable($_plugin)) {
-            $smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
-            return true;
-        }
-        if ($smarty->loadPlugin($_plugin)) {
-            if (class_exists($_plugin, false)) {
-                $_plugin = array($_plugin, 'execute');
-            }
-            if (is_callable($_plugin)) {
-                $smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
-                return true;
-            }
-        }
-        throw new SmartyException("{$type}filter '{$name}' not found or callable");
-    }
-
-    /**
-     * Check if filter type is valid
-     *
-     * @param string $type
-     *
-     * @throws \SmartyException
-     */
-    public function _checkFilterType($type)
-    {
-        if (!isset($this->filterTypes[ $type ])) {
-            throw new SmartyException("Illegal filter type '{$type}'");
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php b/include/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php
deleted file mode 100644
index 6ddcaec94..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Smarty Extension Loadplugin
- *
- * $smarty->loadPlugin() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_LoadPlugin
-{
-    /**
-     * Cache of searched plugin files
-     *
-     * @var array
-     */
-    public $plugin_files = array();
-
-    /**
-     * Takes unknown classes and loads plugin files for them
-     * class name format: Smarty_PluginType_PluginName
-     * plugin filename format: plugintype.pluginname.php
-     *
-     * @param \Smarty $smarty
-     * @param string  $plugin_name class plugin name to load
-     * @param bool    $check       check if already loaded
-     *
-     * @return bool|string
-     * @throws \SmartyException
-     */
-    public function loadPlugin(Smarty $smarty, $plugin_name, $check)
-    {
-        // if function or class exists, exit silently (already loaded)
-        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
-            return true;
-        }
-        if (!preg_match('#^smarty_((internal)|([^_]+))_(.+)$#i', $plugin_name, $match)) {
-            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
-        }
-        if (!empty($match[ 2 ])) {
-            $file = SMARTY_SYSPLUGINS_DIR . smarty_strtolower_ascii($plugin_name) . '.php';
-            if (isset($this->plugin_files[ $file ])) {
-                if ($this->plugin_files[ $file ] !== false) {
-                    return $this->plugin_files[ $file ];
-                } else {
-                    return false;
-                }
-            } else {
-                if (is_file($file)) {
-                    $this->plugin_files[ $file ] = $file;
-                    include_once $file;
-                    return $file;
-                } else {
-                    $this->plugin_files[ $file ] = false;
-                    return false;
-                }
-            }
-        }
-        // plugin filename is expected to be: [type].[name].php
-        $_plugin_filename = "{$match[1]}.{$match[4]}.php";
-        $_lower_filename = smarty_strtolower_ascii($_plugin_filename);
-        if (isset($this->plugin_files)) {
-            if (isset($this->plugin_files[ 'plugins_dir' ][ $_lower_filename ])) {
-                if (!$smarty->use_include_path || $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] !== false) {
-                    return $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ];
-                }
-            }
-            if (!$smarty->use_include_path || $smarty->ext->_getIncludePath->isNewIncludePath($smarty)) {
-                unset($this->plugin_files[ 'include_path' ]);
-            } else {
-                if (isset($this->plugin_files[ 'include_path' ][ $_lower_filename ])) {
-                    return $this->plugin_files[ 'include_path' ][ $_lower_filename ];
-                }
-            }
-        }
-        $_file_names = array($_plugin_filename);
-        if ($_lower_filename !== $_plugin_filename) {
-            $_file_names[] = $_lower_filename;
-        }
-        $_p_dirs = $smarty->getPluginsDir();
-        if (!isset($this->plugin_files[ 'plugins_dir' ][ $_lower_filename ])) {
-            // loop through plugin dirs and find the plugin
-            foreach ($_p_dirs as $_plugin_dir) {
-                foreach ($_file_names as $name) {
-                    $file = $_plugin_dir . $name;
-                    if (is_file($file)) {
-                        $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] = $file;
-                        include_once $file;
-                        return $file;
-                    }
-                    $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] = false;
-                }
-            }
-        }
-        if ($smarty->use_include_path) {
-            foreach ($_file_names as $_file_name) {
-                // try PHP include_path
-                $file = $smarty->ext->_getIncludePath->getIncludePath($_p_dirs, $_file_name, $smarty);
-                $this->plugin_files[ 'include_path' ][ $_lower_filename ] = $file;
-                if ($file !== false) {
-                    include_once $file;
-                    return $file;
-                }
-            }
-        }
-        // no plugin loaded
-        return false;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php b/include/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php
deleted file mode 100644
index 381346c8f..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Smarty Method MustCompile
- *
- * Smarty_Internal_Template::mustCompile() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_MustCompile
-{
-    /**
-     * Valid for template object
-     *
-     * @var int
-     */
-    public $objMap = 2;
-
-    /**
-     * Returns if the current template must be compiled by the Smarty compiler
-     * It does compare the timestamps of template source and the compiled templates and checks the force compile
-     * configuration
-     *
-     * @param \Smarty_Internal_Template $_template
-     *
-     * @return bool
-     * @throws \SmartyException
-     */
-    public function mustCompile(Smarty_Internal_Template $_template)
-    {
-        if (!$_template->source->exists) {
-            if ($_template->_isSubTpl()) {
-                $parent_resource = " in '{$_template->parent->template_resource}'";
-            } else {
-                $parent_resource = '';
-            }
-            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
-        }
-        if ($_template->mustCompile === null) {
-            $_template->mustCompile = (!$_template->source->handler->uncompiled &&
-                                       ($_template->smarty->force_compile || $_template->source->handler->recompiled ||
-                                        !$_template->compiled->exists || ($_template->compile_check &&
-                                                                          $_template->compiled->getTimeStamp() <
-                                                                          $_template->source->getTimeStamp())));
-        }
-        return $_template->mustCompile;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php b/include/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php
deleted file mode 100644
index 5608b3fd0..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Smarty Method RegisterCacheResource
- *
- * Smarty::registerCacheResource() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_RegisterCacheResource
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @api  Smarty::registerCacheResource()
-     * @link https://www.smarty.net/docs/en/api.register.cacheresource.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $name name of resource type
-     * @param \Smarty_CacheResource                                           $resource_handler
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function registerCacheResource(
-        Smarty_Internal_TemplateBase $obj,
-        $name,
-        Smarty_CacheResource $resource_handler
-    ) {
-        $smarty = $obj->_getSmartyObj();
-        $smarty->registered_cache_resources[ $name ] = $resource_handler;
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerclass.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerclass.php
deleted file mode 100644
index 76a69c6e5..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_registerclass.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Smarty Method RegisterClass
- *
- * Smarty::registerClass() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_RegisterClass
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Registers static classes to be used in templates
-     *
-     * @api  Smarty::registerClass()
-     * @link https://www.smarty.net/docs/en/api.register.class.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $class_name
-     * @param string                                                          $class_impl the referenced PHP class to
-     *                                                                                    register
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function registerClass(Smarty_Internal_TemplateBase $obj, $class_name, $class_impl)
-    {
-        $smarty = $obj->_getSmartyObj();
-        // test if exists
-        if (!class_exists($class_impl)) {
-            throw new SmartyException("Undefined class '$class_impl' in register template class");
-        }
-        // register the class
-        $smarty->registered_classes[ $class_name ] = $class_impl;
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
deleted file mode 100644
index b340f178d..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Smarty Method RegisterDefaultConfigHandler
- *
- * Smarty::registerDefaultConfigHandler() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_RegisterDefaultConfigHandler
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Register config default handler
-     *
-     * @api Smarty::registerDefaultConfigHandler()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param callable                                                        $callback class/method name
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws SmartyException              if $callback is not callable
-     */
-    public function registerDefaultConfigHandler(Smarty_Internal_TemplateBase $obj, $callback)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if (is_callable($callback)) {
-            $smarty->default_config_handler_func = $callback;
-        } else {
-            throw new SmartyException('Default config handler not callable');
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
deleted file mode 100644
index 4cda5b056..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Smarty Method RegisterDefaultPluginHandler
- *
- * Smarty::registerDefaultPluginHandler() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_RegisterDefaultPluginHandler
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Registers a default plugin handler
-     *
-     * @api  Smarty::registerDefaultPluginHandler()
-     * @link https://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
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws SmartyException              if $callback is not callable
-     */
-    public function registerDefaultPluginHandler(Smarty_Internal_TemplateBase $obj, $callback)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if (is_callable($callback)) {
-            $smarty->default_plugin_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default plugin handler '$callback' not callable");
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
deleted file mode 100644
index cbc133ccd..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * Smarty Method RegisterDefaultTemplateHandler
- *
- * Smarty::registerDefaultTemplateHandler() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_RegisterDefaultTemplateHandler
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Register template default handler
-     *
-     * @api Smarty::registerDefaultTemplateHandler()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param callable                                                        $callback class/method name
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws SmartyException              if $callback is not callable
-     */
-    public function registerDefaultTemplateHandler(Smarty_Internal_TemplateBase $obj, $callback)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if (is_callable($callback)) {
-            $smarty->default_template_handler_func = $callback;
-        } else {
-            throw new SmartyException('Default template handler not callable');
-        }
-        return $obj;
-    }
-
-    /**
-     * get default content from template or config resource handler
-     *
-     * @param Smarty_Template_Source $source
-     *
-     * @throws \SmartyException
-     */
-    public static function _getDefaultTemplate(Smarty_Template_Source $source)
-    {
-        if ($source->isConfig) {
-            $default_handler = $source->smarty->default_config_handler_func;
-        } else {
-            $default_handler = $source->smarty->default_template_handler_func;
-        }
-        $_content = $_timestamp = null;
-        $_return = call_user_func_array(
-            $default_handler,
-            array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty)
-        );
-        if (is_string($_return)) {
-            $source->exists = is_file($_return);
-            if ($source->exists) {
-                $source->timestamp = filemtime($_return);
-            } else {
-                throw new SmartyException(
-                    'Default handler: Unable to load ' .
-                    ($source->isConfig ? 'config' : 'template') .
-                    " default file '{$_return}' for '{$source->type}:{$source->name}'"
-                );
-            }
-            $source->name = $source->filepath = $_return;
-            $source->uid = sha1($source->filepath);
-        } elseif ($_return === true) {
-            $source->content = $_content;
-            $source->exists = true;
-            $source->uid = $source->name = sha1($_content);
-            $source->handler = Smarty_Resource::load($source->smarty, 'eval');
-        } else {
-            $source->exists = false;
-            throw new SmartyException(
-                'Default handler: No ' . ($source->isConfig ? 'config' : 'template') .
-                " default content for '{$source->type}:{$source->name}'"
-            );
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php
deleted file mode 100644
index 9719eb2b6..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Smarty Method RegisterFilter
- *
- * Smarty::registerFilter() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_RegisterFilter
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Valid filter types
-     *
-     * @var array
-     */
-    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
-
-    /**
-     * Registers a filter function
-     *
-     * @api  Smarty::registerFilter()
-     *
-     * @link https://www.smarty.net/docs/en/api.register.filter.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $type filter type
-     * @param callback                                                        $callback
-     * @param string|null                                                     $name optional filter name
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function registerFilter(Smarty_Internal_TemplateBase $obj, $type, $callback, $name = null)
-    {
-        $smarty = $obj->_getSmartyObj();
-        $this->_checkFilterType($type);
-        $name = isset($name) ? $name : $this->_getFilterName($callback);
-        if (!is_callable($callback)) {
-            throw new SmartyException("{$type}filter '{$name}' not callable");
-        }
-        $smarty->registered_filters[ $type ][ $name ] = $callback;
-        return $obj;
-    }
-
-    /**
-     * Return internal filter name
-     *
-     * @param callback $function_name
-     *
-     * @return string   internal filter name
-     */
-    public function _getFilterName($function_name)
-    {
-        if (is_array($function_name)) {
-            $_class_name = (is_object($function_name[ 0 ]) ? get_class($function_name[ 0 ]) : $function_name[ 0 ]);
-            return $_class_name . '_' . $function_name[ 1 ];
-        } elseif (is_string($function_name)) {
-            return $function_name;
-        } else {
-            return 'closure';
-        }
-    }
-
-    /**
-     * Check if filter type is valid
-     *
-     * @param string $type
-     *
-     * @throws \SmartyException
-     */
-    public function _checkFilterType($type)
-    {
-        if (!isset($this->filterTypes[ $type ])) {
-            throw new SmartyException("Illegal filter type '{$type}'");
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerobject.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerobject.php
deleted file mode 100644
index 8e6fe0521..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_registerobject.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Smarty Method RegisterObject
- *
- * Smarty::registerObject() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_RegisterObject
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @api  Smarty::registerObject()
-     * @link https://www.smarty.net/docs/en/api.register.object.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $object_name
-     * @param object                                                          $object                     the
-     *                                                                                                    referenced
-     *                                                                                                    PHP
-     *                                                                                                    object
-     *                                                                                                    to
-     *                                                                                                    register
-     *
-     * @param array                                                           $allowed_methods_properties list of
-     *                                                                                                    allowed
-     *                                                                                                    methods
-     *                                                                                                    (empty
-     *                                                                                                    = all)
-     *
-     * @param bool                                                            $format                     smarty
-     *                                                                                                    argument
-     *                                                                                                    format,
-     *                                                                                                    else
-     *                                                                                                    traditional
-     *
-     * @param array                                                           $block_methods              list of
-     *                                                                                                    block-methods
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function registerObject(
-        Smarty_Internal_TemplateBase $obj,
-        $object_name,
-        $object,
-        $allowed_methods_properties = array(),
-        $format = true,
-        $block_methods = array()
-    ) {
-        $smarty = $obj->_getSmartyObj();
-        // test if allowed methods callable
-        if (!empty($allowed_methods_properties)) {
-            foreach ((array)$allowed_methods_properties as $method) {
-                if (!is_callable(array($object, $method)) && !property_exists($object, $method)) {
-                    throw new SmartyException("Undefined method or property '$method' in registered object");
-                }
-            }
-        }
-        // test if block methods callable
-        if (!empty($block_methods)) {
-            foreach ((array)$block_methods as $method) {
-                if (!is_callable(array($object, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
-                }
-            }
-        }
-        // register the object
-        $smarty->registered_objects[ $object_name ] =
-            array($object, (array)$allowed_methods_properties, (boolean)$format, (array)$block_methods);
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php
deleted file mode 100644
index 74c0ae908..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Smarty Method RegisterPlugin
- *
- * Smarty::registerPlugin() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_RegisterPlugin
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Registers plugin to be used in templates
-     *
-     * @api  Smarty::registerPlugin()
-     * @link https://www.smarty.net/docs/en/api.register.plugin.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $type       plugin type
-     * @param string                                                          $name       name of template tag
-     * @param callback                                                        $callback   PHP callback to register
-     * @param bool                                                            $cacheable  if true (default) this
-     *                                                                                    function is cache able
-     * @param mixed                                                           $cache_attr caching attributes if any
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws SmartyException              when the plugin tag is invalid
-     */
-    public function registerPlugin(
-        Smarty_Internal_TemplateBase $obj,
-        $type,
-        $name,
-        $callback,
-        $cacheable = true,
-        $cache_attr = null
-    ) {
-        $smarty = $obj->_getSmartyObj();
-        if (isset($smarty->registered_plugins[ $type ][ $name ])) {
-            throw new SmartyException("Plugin tag '{$name}' already registered");
-        } 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);
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_registerresource.php b/include/smarty/libs/sysplugins/smarty_internal_method_registerresource.php
deleted file mode 100644
index 302657ae0..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_registerresource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Smarty Method RegisterResource
- *
- * Smarty::registerResource() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_RegisterResource
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @api  Smarty::registerResource()
-     * @link https://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
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, Smarty_Resource $resource_handler)
-    {
-        $smarty = $obj->_getSmartyObj();
-        $smarty->registered_resources[ $name ] = $resource_handler;
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php b/include/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php
deleted file mode 100644
index 2972f3ce1..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Smarty Method SetAutoloadFilters
- *
- * Smarty::setAutoloadFilters() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_SetAutoloadFilters
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Valid filter types
-     *
-     * @var array
-     */
-    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
-
-    /**
-     * Set autoload filters
-     *
-     * @api Smarty::setAutoloadFilters()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param array                                                           $filters filters to load automatically
-     * @param string                                                          $type    "pre", "output", … specify
-     *                                                                                 the filter type to set.
-     *                                                                                 Defaults to none treating
-     *                                                                                 $filters' keys as the
-     *                                                                                 appropriate types
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function setAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if ($type !== null) {
-            $this->_checkFilterType($type);
-            $smarty->autoload_filters[ $type ] = (array)$filters;
-        } else {
-            foreach ((array)$filters as $type => $value) {
-                $this->_checkFilterType($type);
-            }
-            $smarty->autoload_filters = (array)$filters;
-        }
-        return $obj;
-    }
-
-    /**
-     * Check if filter type is valid
-     *
-     * @param string $type
-     *
-     * @throws \SmartyException
-     */
-    public function _checkFilterType($type)
-    {
-        if (!isset($this->filterTypes[ $type ])) {
-            throw new SmartyException("Illegal filter type '{$type}'");
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php b/include/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php
deleted file mode 100644
index cc9d23e2a..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Smarty Method SetDebugTemplate
- *
- * Smarty::setDebugTemplate() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_SetDebugTemplate
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * set the debug template
-     *
-     * @api Smarty::setDebugTemplate()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $tpl_name
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws SmartyException if file is not readable
-     */
-    public function setDebugTemplate(Smarty_Internal_TemplateBase $obj, $tpl_name)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if (!is_readable($tpl_name)) {
-            throw new SmartyException("Unknown file '{$tpl_name}'");
-        }
-        $smarty->debug_tpl = $tpl_name;
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php b/include/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php
deleted file mode 100644
index eadc2de1b..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Smarty Method SetDefaultModifiers
- *
- * Smarty::setDefaultModifiers() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_SetDefaultModifiers
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Set default modifiers
-     *
-     * @api Smarty::setDefaultModifiers()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param array|string                                                    $modifiers modifier or list of modifiers
-     *                                                                                   to set
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function setDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
-    {
-        $smarty = $obj->_getSmartyObj();
-        $smarty->default_modifiers = (array)$modifiers;
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php b/include/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php
deleted file mode 100644
index e41e8dffc..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Smarty Method UnloadFilter
- *
- * Smarty::unloadFilter() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFilter
-{
-    /**
-     * load a filter of specified type and name
-     *
-     * @api  Smarty::unloadFilter()
-     *
-     * @link https://www.smarty.net/docs/en/api.unload.filter.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $type filter type
-     * @param string                                                          $name filter name
-     *
-     * @return Smarty_Internal_TemplateBase
-     * @throws \SmartyException
-     */
-    public function unloadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
-    {
-        $smarty = $obj->_getSmartyObj();
-        $this->_checkFilterType($type);
-        if (isset($smarty->registered_filters[ $type ])) {
-            $_filter_name = "smarty_{$type}filter_{$name}";
-            if (isset($smarty->registered_filters[ $type ][ $_filter_name ])) {
-                unset($smarty->registered_filters[ $type ][ $_filter_name ]);
-                if (empty($smarty->registered_filters[ $type ])) {
-                    unset($smarty->registered_filters[ $type ]);
-                }
-            }
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php b/include/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
deleted file mode 100644
index 377397e97..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Smarty Method UnregisterCacheResource
- *
- * Smarty::unregisterCacheResource() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_UnregisterCacheResource
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @api  Smarty::unregisterCacheResource()
-     * @link https://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param                                                                 $name
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function unregisterCacheResource(Smarty_Internal_TemplateBase $obj, $name)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if (isset($smarty->registered_cache_resources[ $name ])) {
-            unset($smarty->registered_cache_resources[ $name ]);
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php
deleted file mode 100644
index ebc9337d0..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Smarty Method UnregisterFilter
- *
- * Smarty::unregisterFilter() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_RegisterFilter
-{
-    /**
-     * Unregisters a filter function
-     *
-     * @api  Smarty::unregisterFilter()
-     *
-     * @link https://www.smarty.net/docs/en/api.unregister.filter.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $type filter type
-     * @param callback|string                                                 $callback
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function unregisterFilter(Smarty_Internal_TemplateBase $obj, $type, $callback)
-    {
-        $smarty = $obj->_getSmartyObj();
-        $this->_checkFilterType($type);
-        if (isset($smarty->registered_filters[ $type ])) {
-            $name = is_string($callback) ? $callback : $this->_getFilterName($callback);
-            if (isset($smarty->registered_filters[ $type ][ $name ])) {
-                unset($smarty->registered_filters[ $type ][ $name ]);
-                if (empty($smarty->registered_filters[ $type ])) {
-                    unset($smarty->registered_filters[ $type ]);
-                }
-            }
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php
deleted file mode 100644
index 77d619637..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Smarty Method UnregisterObject
- *
- * Smarty::unregisterObject() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_UnregisterObject
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Registers plugin to be used in templates
-     *
-     * @api  Smarty::unregisterObject()
-     * @link https://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
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if (isset($smarty->registered_objects[ $object_name ])) {
-            unset($smarty->registered_objects[ $object_name ]);
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php
deleted file mode 100644
index 2431d5c23..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Smarty Method UnregisterPlugin
- *
- * Smarty::unregisterPlugin() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_UnregisterPlugin
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Registers plugin to be used in templates
-     *
-     * @api  Smarty::unregisterPlugin()
-     * @link https://www.smarty.net/docs/en/api.unregister.plugin.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param string                                                          $type plugin type
-     * @param string                                                          $name name of template tag
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function unregisterPlugin(Smarty_Internal_TemplateBase $obj, $type, $name)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if (isset($smarty->registered_plugins[ $type ][ $name ])) {
-            unset($smarty->registered_plugins[ $type ][ $name ]);
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php b/include/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php
deleted file mode 100644
index bbb6a861d..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Smarty Method UnregisterResource
- *
- * Smarty::unregisterResource() method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Method_UnregisterResource
-{
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @api  Smarty::unregisterResource()
-     * @link https://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
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function unregisterResource(Smarty_Internal_TemplateBase $obj, $type)
-    {
-        $smarty = $obj->_getSmartyObj();
-        if (isset($smarty->registered_resources[ $type ])) {
-            unset($smarty->registered_resources[ $type ]);
-        }
-        return $obj;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php b/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
deleted file mode 100644
index 88694dcfd..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Nocache Insert
- * Compiles the {insert} tag into the cache file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Nocache_Insert
-{
-    /**
-     * Compiles code for the {insert} tag into cache file
-     *
-     * @param string                   $_function insert function name
-     * @param array                    $_attr     array with parameter
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $_script   script name to load or 'null'
-     * @param string                   $_assign   optional variable name
-     *
-     * @return string                   compiled code
-     */
-    public static function compile($_function, $_attr, $_template, $_script, $_assign = null)
-    {
-        $_output = '<?php ';
-        if ($_script !== 'null') {
-            // script which must be included
-            // code for script file loading
-            $_output .= "require_once '{$_script}';";
-        }
-        // call insert
-        if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign('{$_assign}' , {$_function} (" . var_export($_attr, true) .
-                        ',\$_smarty_tpl), true);?>';
-        } else {
-            $_output .= "echo {$_function}(" . var_export($_attr, true) . ',$_smarty_tpl);?>';
-        }
-        $_tpl = $_template;
-        while ($_tpl->_isSubTpl()) {
-            $_tpl = $_tpl->parent;
-        }
-        return "/*%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/{$_output}/*/%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/";
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree.php b/include/smarty/libs/sysplugins/smarty_internal_parsetree.php
deleted file mode 100644
index 9f7678526..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_parsetree.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Templateparser Parsetree
- * These are classes to build parsetree in the template parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Thue Kristensen
- * @author     Uwe Tews
- */
-
-/**
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-abstract class Smarty_Internal_ParseTree
-{
-    /**
-     * Buffer content
-     *
-     * @var mixed
-     */
-    public $data;
-
-    /**
-     * Subtree array
-     *
-     * @var array
-     */
-    public $subtrees = array();
-
-    /**
-     * Return buffer
-     *
-     * @param \Smarty_Internal_Templateparser $parser
-     *
-     * @return string buffer content
-     */
-    abstract public function to_smarty_php(Smarty_Internal_Templateparser $parser);
-
-    /**
-     * Template data object destructor
-     */
-    public function __destruct()
-    {
-        $this->data = null;
-        $this->subtrees = null;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_file.php b/include/smarty/libs/sysplugins/smarty_internal_resource_file.php
deleted file mode 100644
index ae2060673..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_file.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource File
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource File
- * Implements the file system as resource for Smarty templates
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_File extends Smarty_Resource
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @throws \SmartyException
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $this->buildFilepath($source, $_template);
-        if ($source->filepath !== false) {
-            if (isset($source->smarty->security_policy) && is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath, $source->isConfig);
-            }
-            $source->exists = true;
-            $source->uid = sha1(
-                $source->filepath . ($source->isConfig ? $source->smarty->_joined_config_dir :
-                    $source->smarty->_joined_template_dir)
-            );
-            $source->timestamp = filemtime($source->filepath);
-        } else {
-            $source->timestamp = $source->exists = false;
-        }
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        if (!$source->exists) {
-            $source->timestamp = $source->exists = is_file($source->filepath);
-        }
-        if ($source->exists) {
-            $source->timestamp = filemtime($source->filepath);
-        }
-    }
-
-    /**
-     * Load template's source from file into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if ($source->exists) {
-            return file_get_contents($source->filepath);
-        }
-        throw new SmartyException(
-            'Unable to read ' . ($source->isConfig ? 'config' : 'template') .
-            " {$source->type} '{$source->name}'"
-        );
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return basename($source->filepath);
-    }
-
-    /**
-     * build template filepath by traversing the template_dir array
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return string fully qualified filepath
-     * @throws SmartyException
-     */
-    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $file = $source->name;
-        // absolute file ?
-        if ($file[ 0 ] === '/' || $file[ 1 ] === ':') {
-            $file = $source->smarty->_realpath($file, true);
-            return is_file($file) ? $file : false;
-        }
-        // go relative to a given template?
-        if ($file[ 0 ] === '.' && $_template && $_template->_isSubTpl()
-            && preg_match('#^[.]{1,2}[\\\/]#', $file)
-        ) {
-            if ($_template->parent->source->type !== 'file' && $_template->parent->source->type !== 'extends'
-                && !isset($_template->parent->_cache[ 'allow_relative_path' ])
-            ) {
-                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
-            }
-            // normalize path
-            $path =
-                $source->smarty->_realpath(dirname($_template->parent->source->filepath) . DIRECTORY_SEPARATOR . $file);
-            // files relative to a template only get one shot
-            return is_file($path) ? $path : false;
-        }
-        // normalize DIRECTORY_SEPARATOR
-        if (strpos($file, DIRECTORY_SEPARATOR === '/' ? '\\' : '/') !== false) {
-            $file = str_replace(DIRECTORY_SEPARATOR === '/' ? '\\' : '/', DIRECTORY_SEPARATOR, $file);
-        }
-        $_directories = $source->smarty->getTemplateDir(null, $source->isConfig);
-        // template_dir index?
-        if ($file[ 0 ] === '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) {
-            $file = $fileMatch[ 2 ];
-            $_indices = explode(',', $fileMatch[ 1 ]);
-            $_index_dirs = array();
-            foreach ($_indices as $index) {
-                $index = trim($index);
-                // try string indexes
-                if (isset($_directories[ $index ])) {
-                    $_index_dirs[] = $_directories[ $index ];
-                } elseif (is_numeric($index)) {
-                    // try numeric index
-                    $index = (int)$index;
-                    if (isset($_directories[ $index ])) {
-                        $_index_dirs[] = $_directories[ $index ];
-                    } else {
-                        // try at location index
-                        $keys = array_keys($_directories);
-                        if (isset($_directories[ $keys[ $index ] ])) {
-                            $_index_dirs[] = $_directories[ $keys[ $index ] ];
-                        }
-                    }
-                }
-            }
-            if (empty($_index_dirs)) {
-                // index not found
-                return false;
-            } else {
-                $_directories = $_index_dirs;
-            }
-        }
-        // relative file name?
-        foreach ($_directories as $_directory) {
-            $path = $_directory . $file;
-            if (is_file($path)) {
-                return (strpos($path, '.' . DIRECTORY_SEPARATOR) !== false) ? $source->smarty->_realpath($path) : $path;
-            }
-        }
-        if (!isset($_index_dirs)) {
-            // Could be relative to cwd
-            $path = $source->smarty->_realpath($file, true);
-            if (is_file($path)) {
-                return $path;
-            }
-        }
-        // Use include path ?
-        if ($source->smarty->use_include_path) {
-            return $source->smarty->ext->_getIncludePath->getIncludePath($_directories, $file, $source->smarty);
-        }
-        return false;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_php.php b/include/smarty/libs/sysplugins/smarty_internal_resource_php.php
deleted file mode 100644
index 9d98ae181..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_php.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Resource PHP
- * Implements the file system as resource for PHP templates
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File
-{
-    /**
-     * Flag that it's an uncompiled resource
-     *
-     * @var bool
-     */
-    public $uncompiled = true;
-
-    /**
-     * Resource does implement populateCompiledFilepath() method
-     *
-     * @var bool
-     */
-    public $hasCompiledHandler = true;
-
-    /**
-     * container for short_open_tag directive's value before executing PHP templates
-     *
-     * @var string
-     */
-    protected $short_open_tag;
-
-    /**
-     * Create a new PHP Resource
-     */
-    public function __construct()
-    {
-        $this->short_open_tag = function_exists('ini_get') ? ini_get('short_open_tag') : 1;
-    }
-
-    /**
-     * Load template's source from file into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if ($source->exists) {
-            return '';
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
-
-    /**
-     * populate compiled object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object (is ignored)
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $compiled->filepath = $_template->source->filepath;
-        $compiled->timestamp = $_template->source->timestamp;
-        $compiled->exists = $_template->source->exists;
-        $compiled->file_dependency[ $_template->source->uid ] =
-            array(
-                $compiled->filepath,
-                $compiled->timestamp,
-                $_template->source->type,
-            );
-    }
-
-    /**
-     * Render and output the template (without using the compiler)
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     * @throws SmartyException          if template cannot be loaded or allow_php_templates is disabled
-     */
-    public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
-    {
-        if (!$source->smarty->allow_php_templates) {
-            throw new SmartyException('PHP templates are disabled');
-        }
-        if (!$source->exists) {
-            throw new SmartyException(
-                "Unable to load template '{$source->type}:{$source->name}'" .
-                ($_template->_isSubTpl() ? " in '{$_template->parent->template_resource}'" : '')
-            );
-        }
-        // prepare variables
-        extract($_template->getTemplateVars());
-        // include PHP template with short open tags enabled
-        if (function_exists('ini_set')) {
-            ini_set('short_open_tag', '1');
-        }
-        /**
-         *
-         *
-         * @var Smarty_Internal_Template $_smarty_template
-         * used in included file
-         */
-        $_smarty_template = $_template;
-        include $source->filepath;
-        if (function_exists('ini_set')) {
-            ini_set('short_open_tag', $this->short_open_tag);
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php b/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php
deleted file mode 100644
index 5f0203498..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Stream
- * Implements the streams as resource for Smarty template
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Stream
- * Implements the streams as resource for Smarty template
- *
- * @link       https://php.net/streams
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        if (strpos($source->resource, '://') !== false) {
-            $source->filepath = $source->resource;
-        } else {
-            $source->filepath = str_replace(':', '://', $source->resource);
-        }
-        $source->uid = false;
-        $source->content = $this->getContent($source);
-        $source->timestamp = $source->exists = !!$source->content;
-    }
-
-    /**
-     * Load template's source from stream into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string template source
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        $t = '';
-        // the availability of the stream has already been checked in Smarty_Resource::fetch()
-        $fp = fopen($source->filepath, 'r+');
-        if ($fp) {
-            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
-                $t .= $current_line;
-            }
-            fclose($fp);
-            return $t;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty  $smarty        Smarty instance
-     * @param string  $resource_name resource_name to make unique
-     * @param boolean $isConfig      flag for config resource
-     *
-     * @return string unique resource name
-     */
-    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
-    {
-        return get_class($this) . '#' . $resource_name;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_string.php b/include/smarty/libs/sysplugins/smarty_internal_resource_string.php
deleted file mode 100644
index 3fecbb7ef..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_string.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource String
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource String
- * Implements the strings as resource for Smarty template
- * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_String extends Smarty_Resource
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->uid = $source->filepath = sha1($source->name . $source->smarty->_joined_template_dir);
-        $source->timestamp = $source->exists = true;
-    }
-
-    /**
-     * Load template's source from $resource_name into current template object
-     *
-     * @uses decode() to decode base64 and urlencoded template_resources
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        return $this->decode($source->name);
-    }
-
-    /**
-     * decode base64 and urlencode
-     *
-     * @param string $string template_resource to decode
-     *
-     * @return string decoded template_resource
-     */
-    protected function decode($string)
-    {
-        // decode if specified
-        if (($pos = strpos($string, ':')) !== false) {
-            if (!strncmp($string, 'base64', 6)) {
-                return base64_decode(substr($string, 7));
-            } elseif (!strncmp($string, 'urlencode', 9)) {
-                return urldecode(substr($string, 10));
-            }
-        }
-        return $string;
-    }
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty  $smarty        Smarty instance
-     * @param string  $resource_name resource_name to make unique
-     * @param boolean $isConfig      flag for config resource
-     *
-     * @return string unique resource name
-     */
-    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
-    {
-        return get_class($this) . '#' . $this->decode($resource_name);
-    }
-
-    /**
-     * Determine basename for compiled filename
-     * Always returns an empty string.
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return '';
-    }
-
-    /*
-        * Disable timestamp checks for string resource.
-        *
-        * @return bool
-        */
-    /**
-     * @return bool
-     */
-    public function checkTimestamps()
-    {
-        return false;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php
deleted file mode 100644
index 6e12d2ae1..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- **/
-class Smarty_Internal_Runtime_CacheModify
-{
-    /**
-     * check client side cache
-     *
-     * @param \Smarty_Template_Cached   $cached
-     * @param \Smarty_Internal_Template $_template
-     * @param string                    $content
-     *
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
-    {
-        $_isCached = $_template->isCached() && !$_template->compiled->has_nocache_code;
-        $_last_modified_date =
-            @substr($_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ], 0, strpos($_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ], 'GMT') + 3);
-        if ($_isCached && $cached->timestamp <= strtotime($_last_modified_date)) {
-            switch (PHP_SAPI) {
-                case 'cgi': // php-cgi < 5.3
-                case 'cgi-fcgi': // php-cgi >= 5.3
-                case 'fpm-fcgi': // php-fpm >= 5.3.3
-                    header('Status: 304 Not Modified');
-                    break;
-                case 'cli':
-                    if (/* ^phpunit */
-                    !empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
-                    ) {
-                        $_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] = '304 Not Modified';
-                    }
-                    break;
-                default:
-                    if (/* ^phpunit */
-                    !empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
-                    ) {
-                        $_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] = '304 Not Modified';
-                    } else {
-                        header($_SERVER[ 'SERVER_PROTOCOL' ] . ' 304 Not Modified');
-                    }
-                    break;
-            }
-        } else {
-            switch (PHP_SAPI) {
-                case 'cli':
-                    if (/* ^phpunit */
-                    !empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
-                    ) {
-                        $_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] =
-                            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT';
-                    }
-                    break;
-                default:
-                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT');
-                    break;
-            }
-            echo $content;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php
deleted file mode 100644
index 287096438..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * Smarty cache resource file clear method
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Runtime Cache Resource File Class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Runtime_CacheResourceFile
-{
-    /**
-     * Empty cache for a specific template
-     *
-     * @param Smarty  $smarty
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-    {
-        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
-        $_dir = $smarty->getCacheDir();
-        if ($_dir === '/') { //We should never want to delete this!
-            return 0;
-        }
-        $_dir_length = strlen($_dir);
-        if (isset($_cache_id)) {
-            $_cache_id_parts = explode('|', $_cache_id);
-            $_cache_id_parts_count = count($_cache_id_parts);
-            if ($smarty->use_sub_dirs) {
-                foreach ($_cache_id_parts as $id_part) {
-                    $_dir .= $id_part . '/';
-                }
-            }
-        }
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = Smarty::CACHING_LIFETIME_CURRENT;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($tpl->source->exists) {
-                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
-            } else {
-                return 0;
-            }
-        }
-        $_count = 0;
-        $_time = time();
-        if (file_exists($_dir)) {
-            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
-            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
-            foreach ($_cache as $_file) {
-                if (substr(basename($_file->getPathname()), 0, 1) === '.') {
-                    continue;
-                }
-                $_filepath = (string)$_file;
-                // directory ?
-                if ($_file->isDir()) {
-                    if (!$_cache->isDot()) {
-                        // delete folder if empty
-                        @rmdir($_file->getPathname());
-                    }
-                } else {
-                    // delete only php files
-                    if (substr($_filepath, -4) !== '.php') {
-                        continue;
-                    }
-                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr($_filepath, $_dir_length)));
-                    $_parts_count = count($_parts);
-                    // check name
-                    if (isset($resource_name)) {
-                        if ($_parts[ $_parts_count - 1 ] !== $_resourcename_parts) {
-                            continue;
-                        }
-                    }
-                    // check compile id
-                    if (isset($_compile_id) && (!isset($_parts[ $_parts_count - 2 - $_compile_id_offset ])
-                                                || $_parts[ $_parts_count - 2 - $_compile_id_offset ] !== $_compile_id)
-                    ) {
-                        continue;
-                    }
-                    // check cache id
-                    if (isset($_cache_id)) {
-                        // count of cache id parts
-                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset :
-                            $_parts_count - 1 - $_compile_id_offset;
-                        if ($_parts_count < $_cache_id_parts_count) {
-                            continue;
-                        }
-                        for ($i = 0; $i < $_cache_id_parts_count; $i++) {
-                            if ($_parts[ $i ] !== $_cache_id_parts[ $i ]) {
-                                continue 2;
-                            }
-                        }
-                    }
-                    if (is_file($_filepath)) {
-                        // expired ?
-                        if (isset($exp_time)) {
-                            if ($exp_time < 0) {
-                                preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_filepath), $match);
-                                if ($_time < (filemtime($_filepath) + $match[ 1 ])) {
-                                    continue;
-                                }
-                            } else {
-                                if ($_time - filemtime($_filepath) < $exp_time) {
-                                    continue;
-                                }
-                            }
-                        }
-                        $_count += @unlink($_filepath) ? 1 : 0;
-                        if (function_exists('opcache_invalidate')
-                            && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
-                        ) {
-                            opcache_invalidate($_filepath, true);
-                        } elseif (function_exists('apc_delete_file')) {
-                            apc_delete_file($_filepath);
-                        }
-                    }
-                }
-            }
-        }
-        return $_count;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_capture.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_capture.php
deleted file mode 100644
index c9dca83d9..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_capture.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-/**
- * Runtime Extension Capture
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Runtime_Capture
-{
-    /**
-     * Flag that this instance  will not be cached
-     *
-     * @var bool
-     */
-    public $isPrivateExtension = true;
-
-    /**
-     * Stack of capture parameter
-     *
-     * @var array
-     */
-    private $captureStack = array();
-
-    /**
-     * Current open capture sections
-     *
-     * @var int
-     */
-    private $captureCount = 0;
-
-    /**
-     * Count stack
-     *
-     * @var int[]
-     */
-    private $countStack = array();
-
-    /**
-     * Named buffer
-     *
-     * @var string[]
-     */
-    private $namedBuffer = array();
-
-    /**
-     * Flag if callbacks are registered
-     *
-     * @var bool
-     */
-    private $isRegistered = false;
-
-    /**
-     * Open capture section
-     *
-     * @param \Smarty_Internal_Template $_template
-     * @param string                    $buffer capture name
-     * @param string                    $assign variable name
-     * @param string                    $append variable name
-     */
-    public function open(Smarty_Internal_Template $_template, $buffer, $assign, $append)
-    {
-        if (!$this->isRegistered) {
-            $this->register($_template);
-        }
-        $this->captureStack[] = array(
-            $buffer,
-            $assign,
-            $append
-        );
-        $this->captureCount++;
-        ob_start();
-    }
-
-    /**
-     * Register callbacks in template class
-     *
-     * @param \Smarty_Internal_Template $_template
-     */
-    private function register(Smarty_Internal_Template $_template)
-    {
-        $_template->startRenderCallbacks[] = array(
-            $this,
-            'startRender'
-        );
-        $_template->endRenderCallbacks[] = array(
-            $this,
-            'endRender'
-        );
-        $this->startRender($_template);
-        $this->isRegistered = true;
-    }
-
-    /**
-     * Start render callback
-     *
-     * @param \Smarty_Internal_Template $_template
-     */
-    public function startRender(Smarty_Internal_Template $_template)
-    {
-        $this->countStack[] = $this->captureCount;
-        $this->captureCount = 0;
-    }
-
-    /**
-     * Close capture section
-     *
-     * @param \Smarty_Internal_Template $_template
-     *
-     * @throws \SmartyException
-     */
-    public function close(Smarty_Internal_Template $_template)
-    {
-        if ($this->captureCount) {
-            list($buffer, $assign, $append) = array_pop($this->captureStack);
-            $this->captureCount--;
-            if (isset($assign)) {
-                $_template->assign($assign, ob_get_contents());
-            }
-            if (isset($append)) {
-                $_template->append($append, ob_get_contents());
-            }
-            $this->namedBuffer[ $buffer ] = ob_get_clean();
-        } else {
-            $this->error($_template);
-        }
-    }
-
-    /**
-     * Error exception on not matching {capture}{/capture}
-     *
-     * @param \Smarty_Internal_Template $_template
-     *
-     * @throws \SmartyException
-     */
-    public function error(Smarty_Internal_Template $_template)
-    {
-        throw new SmartyException("Not matching {capture}{/capture} in '{$_template->template_resource}'");
-    }
-
-    /**
-     * Return content of named capture buffer by key or as array
-     *
-     * @param \Smarty_Internal_Template $_template
-     * @param string|null               $name
-     *
-     * @return string|string[]|null
-     */
-    public function getBuffer(Smarty_Internal_Template $_template, $name = null)
-    {
-        if (isset($name)) {
-            return isset($this->namedBuffer[ $name ]) ? $this->namedBuffer[ $name ] : null;
-        } else {
-            return $this->namedBuffer;
-        }
-    }
-
-    /**
-     * End render callback
-     *
-     * @param \Smarty_Internal_Template $_template
-     *
-     * @throws \SmartyException
-     */
-    public function endRender(Smarty_Internal_Template $_template)
-    {
-        if ($this->captureCount) {
-            $this->error($_template);
-        } else {
-            $this->captureCount = array_pop($this->countStack);
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
deleted file mode 100644
index d0ca751e2..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Smarty Internal Extension
- * This file contains the Smarty template extension to create a code frame
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Class Smarty_Internal_Extension_CodeFrame
- * Create code frame for compiled and cached templates
- */
-class Smarty_Internal_Runtime_CodeFrame
-{
-    /**
-     * Create code frame for compiled and cached templates
-     *
-     * @param Smarty_Internal_Template              $_template
-     * @param string                                $content   optional template content
-     * @param string                                $functions compiled template function and block code
-     * @param bool                                  $cache     flag for cache file
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     *
-     * @return string
-     */
-    public function create(
-        Smarty_Internal_Template $_template,
-        $content = '',
-        $functions = '',
-        $cache = false,
-        Smarty_Internal_TemplateCompilerBase $compiler = null
-    ) {
-        // build property code
-        $properties[ 'version' ] = Smarty::SMARTY_VERSION;
-        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-        if (!$cache) {
-            $properties[ 'has_nocache_code' ] = $_template->compiled->has_nocache_code;
-            $properties[ 'file_dependency' ] = $_template->compiled->file_dependency;
-            $properties[ 'includes' ] = $_template->compiled->includes;
-        } else {
-            $properties[ 'has_nocache_code' ] = $_template->cached->has_nocache_code;
-            $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
-            $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
-        }
-        $output = sprintf(
-			"<?php\n/* Smarty version %s, created on %s\n  from '%s' */\n\n",
-            $properties[ 'version' ],
-	        date("Y-m-d H:i:s"),
-	        str_replace('*/', '* /', $_template->source->filepath)
-        );
-        $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
-        $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
-               ($cache ? 'true' : 'false') . ')';
-        $output .= "if ({$dec}) {\n";
-        $output .= "function {$properties['unifunc']} (Smarty_Internal_Template \$_smarty_tpl) {\n";
-        if (!$cache && !empty($compiler->tpl_function)) {
-            $output .= '$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions($_smarty_tpl, ';
-            $output .= var_export($compiler->tpl_function, true);
-            $output .= ");\n";
-        }
-        if ($cache && isset($_template->smarty->ext->_tplFunction)) {
-            $output .= "\$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " .
-                       var_export($_template->smarty->ext->_tplFunction->getTplFunction($_template), true) . ");\n";
-        }
-        $output .= "?>";
-        $output .= $content;
-        $output .= "<?php }\n?>";
-        $output .= $functions;
-        $output .= "<?php }\n";
-        // remove unneeded PHP tags
-        if (preg_match('/\s*\?>[\n]?<\?php\s*/', $output)) {
-            $curr_split = preg_split(
-                '/\s*\?>[\n]?<\?php\s*/',
-                $output
-            );
-            preg_match_all(
-                '/\s*\?>[\n]?<\?php\s*/',
-                $output,
-                $curr_parts
-            );
-            $output = '';
-            foreach ($curr_split as $idx => $curr_output) {
-                $output .= $curr_output;
-                if (isset($curr_parts[ 0 ][ $idx ])) {
-                    $output .= "\n";
-                }
-            }
-        }
-        if (preg_match('/\?>\s*$/', $output)) {
-            $curr_split = preg_split(
-                '/\?>\s*$/',
-                $output
-            );
-            $output = '';
-            foreach ($curr_split as $idx => $curr_output) {
-                $output .= $curr_output;
-            }
-        }
-        return $output;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php
deleted file mode 100644
index 9f868e1a4..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Filter Handler
- * Smarty filter handler class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-
-/**
- * Class for filter processing
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Runtime_FilterHandler
-{
-    /**
-     * Run filters over content
-     * The filters will be lazy loaded if required
-     * class name format: Smarty_FilterType_FilterName
-     * plugin filename format: filtertype.filtername.php
-     * Smarty2 filter plugins could be used
-     *
-     * @param string                   $type     the type of filter ('pre','post','output') which shall run
-     * @param string                   $content  the content which shall be processed by the filters
-     * @param Smarty_Internal_Template $template template object
-     *
-     * @throws SmartyException
-     * @return string                   the filtered content
-     */
-    public function runFilter($type, $content, Smarty_Internal_Template $template)
-    {
-        // loop over autoload filters of specified type
-        if (!empty($template->smarty->autoload_filters[ $type ])) {
-            foreach ((array)$template->smarty->autoload_filters[ $type ] as $name) {
-                $plugin_name = "Smarty_{$type}filter_{$name}";
-                if (function_exists($plugin_name)) {
-                    $callback = $plugin_name;
-                } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
-                    $callback = array($plugin_name, 'execute');
-                } elseif ($template->smarty->loadPlugin($plugin_name, false)) {
-                    if (function_exists($plugin_name)) {
-                        // use loaded Smarty2 style plugin
-                        $callback = $plugin_name;
-                    } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
-                        // loaded class of filter plugin
-                        $callback = array($plugin_name, 'execute');
-                    } else {
-                        throw new SmartyException("Auto load {$type}-filter plugin method '{$plugin_name}::execute' not callable");
-                    }
-                } else {
-                    // nothing found, throw exception
-                    throw new SmartyException("Unable to auto load {$type}-filter plugin '{$plugin_name}'");
-                }
-                $content = call_user_func($callback, $content, $template);
-            }
-        }
-        // loop over registered filters of specified type
-        if (!empty($template->smarty->registered_filters[ $type ])) {
-            foreach ($template->smarty->registered_filters[ $type ] as $key => $name) {
-                $content = call_user_func($template->smarty->registered_filters[ $type ][ $key ], $content, $template);
-            }
-        }
-        // return filtered output
-        return $content;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php
deleted file mode 100644
index badead165..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * Foreach Runtime Methods count(), init(), restore()
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Runtime_Foreach
-{
-    /**
-     * Stack of saved variables
-     *
-     * @var array
-     */
-    private $stack = array();
-
-    /**
-     * Init foreach loop
-     *  - save item and key variables, named foreach property data if defined
-     *  - init item and key variables, named foreach property data if required
-     *  - count total if required
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param mixed                     $from       values to loop over
-     * @param string                    $item       variable name
-     * @param bool                      $needTotal  flag if we need to count values
-     * @param null|string               $key        variable name
-     * @param null|string               $name       of named foreach
-     * @param array                     $properties of named foreach
-     *
-     * @return mixed $from
-     */
-    public function init(
-        Smarty_Internal_Template $tpl,
-        $from,
-        $item,
-        $needTotal = false,
-        $key = null,
-        $name = null,
-        $properties = array()
-    ) {
-        $needTotal = $needTotal || isset($properties[ 'total' ]);
-        $saveVars = array();
-        $total = null;
-        if (!is_array($from)) {
-            if (is_object($from)) {
-                if ($needTotal) {
-                    $total = $this->count($from);
-                }
-            } else {
-                settype($from, 'array');
-            }
-        }
-        if (!isset($total)) {
-            $total = empty($from) ? 0 : ($needTotal ? count($from) : 1);
-        }
-        if (isset($tpl->tpl_vars[ $item ])) {
-            $saveVars[ 'item' ] = array(
-                $item,
-                $tpl->tpl_vars[ $item ]
-            );
-        }
-        $tpl->tpl_vars[ $item ] = new Smarty_Variable(null, $tpl->isRenderingCache);
-        if ($total === 0) {
-            $from = null;
-        } else {
-            if ($key) {
-                if (isset($tpl->tpl_vars[ $key ])) {
-                    $saveVars[ 'key' ] = array(
-                        $key,
-                        $tpl->tpl_vars[ $key ]
-                    );
-                }
-                $tpl->tpl_vars[ $key ] = new Smarty_Variable(null, $tpl->isRenderingCache);
-            }
-        }
-        if ($needTotal) {
-            $tpl->tpl_vars[ $item ]->total = $total;
-        }
-        if ($name) {
-            $namedVar = "__smarty_foreach_{$name}";
-            if (isset($tpl->tpl_vars[ $namedVar ])) {
-                $saveVars[ 'named' ] = array(
-                    $namedVar,
-                    $tpl->tpl_vars[ $namedVar ]
-                );
-            }
-            $namedProp = array();
-            if (isset($properties[ 'total' ])) {
-                $namedProp[ 'total' ] = $total;
-            }
-            if (isset($properties[ 'iteration' ])) {
-                $namedProp[ 'iteration' ] = 0;
-            }
-            if (isset($properties[ 'index' ])) {
-                $namedProp[ 'index' ] = -1;
-            }
-            if (isset($properties[ 'show' ])) {
-                $namedProp[ 'show' ] = ($total > 0);
-            }
-            $tpl->tpl_vars[ $namedVar ] = new Smarty_Variable($namedProp);
-        }
-        $this->stack[] = $saveVars;
-        return $from;
-    }
-
-    /**
-     * [util function] counts an array, arrayAccess/traversable or PDOStatement object
-     *
-     * @param mixed $value
-     *
-     * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
-     *               for empty elements
-     */
-    public function count($value)
-    {
-        if ($value instanceof IteratorAggregate) {
-            // Note: getIterator() returns a Traversable, not an Iterator
-            // thus rewind() and valid() methods may not be present
-            return iterator_count($value->getIterator());
-        } elseif ($value instanceof Iterator) {
-            return $value instanceof Generator ? 1 : iterator_count($value);
-        } elseif ($value instanceof Countable) {
-            return count($value);
-        } elseif ($value instanceof PDOStatement) {
-            return $value->rowCount();
-        } elseif ($value instanceof Traversable) {
-            return iterator_count($value);
-        }
-        return count((array)$value);
-    }
-
-    /**
-     * Restore saved variables
-     *
-     * will be called by {break n} or {continue n} for the required number of levels
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param int                       $levels number of levels
-     */
-    public function restore(Smarty_Internal_Template $tpl, $levels = 1)
-    {
-        while ($levels) {
-            $saveVars = array_pop($this->stack);
-            if (!empty($saveVars)) {
-                if (isset($saveVars[ 'item' ])) {
-                    $item = &$saveVars[ 'item' ];
-                    $tpl->tpl_vars[ $item[ 0 ] ]->value = $item[ 1 ]->value;
-                }
-                if (isset($saveVars[ 'key' ])) {
-                    $tpl->tpl_vars[ $saveVars[ 'key' ][ 0 ] ] = $saveVars[ 'key' ][ 1 ];
-                }
-                if (isset($saveVars[ 'named' ])) {
-                    $tpl->tpl_vars[ $saveVars[ 'named' ][ 0 ] ] = $saveVars[ 'named' ][ 1 ];
-                }
-            }
-            $levels--;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php
deleted file mode 100644
index 5ae98304e..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * Smarty read include path plugin
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Monte Ohrt
- */
-
-/**
- * Smarty Internal Read Include Path Class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Runtime_GetIncludePath
-{
-    /**
-     * include path cache
-     *
-     * @var string
-     */
-    public $_include_path = '';
-
-    /**
-     * include path directory cache
-     *
-     * @var array
-     */
-    public $_include_dirs = array();
-
-    /**
-     * include path directory cache
-     *
-     * @var array
-     */
-    public $_user_dirs = array();
-
-    /**
-     * stream cache
-     *
-     * @var string[][]
-     */
-    public $isFile = array();
-
-    /**
-     * stream cache
-     *
-     * @var string[]
-     */
-    public $isPath = array();
-
-    /**
-     * stream cache
-     *
-     * @var int[]
-     */
-    public $number = array();
-
-    /**
-     * status cache
-     *
-     * @var bool
-     */
-    public $_has_stream_include = null;
-
-    /**
-     * Number for array index
-     *
-     * @var int
-     */
-    public $counter = 0;
-
-    /**
-     * Check if include path was updated
-     *
-     * @param \Smarty $smarty
-     *
-     * @return bool
-     */
-    public function isNewIncludePath(Smarty $smarty)
-    {
-        $_i_path = get_include_path();
-        if ($this->_include_path !== $_i_path) {
-            $this->_include_dirs = array();
-            $this->_include_path = $_i_path;
-            $_dirs = (array)explode(PATH_SEPARATOR, $_i_path);
-            foreach ($_dirs as $_path) {
-                if (is_dir($_path)) {
-                    $this->_include_dirs[] = $smarty->_realpath($_path . DIRECTORY_SEPARATOR, true);
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * return array with include path directories
-     *
-     * @param \Smarty $smarty
-     *
-     * @return array
-     */
-    public function getIncludePathDirs(Smarty $smarty)
-    {
-        $this->isNewIncludePath($smarty);
-        return $this->_include_dirs;
-    }
-
-    /**
-     * Return full file path from PHP include_path
-     *
-     * @param string[] $dirs
-     * @param string   $file
-     * @param \Smarty  $smarty
-     *
-     * @return bool|string full filepath or false
-     */
-    public function getIncludePath($dirs, $file, Smarty $smarty)
-    {
-        //if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = false)) {
-        if (!(isset($this->_has_stream_include) ? $this->_has_stream_include :
-            $this->_has_stream_include = function_exists('stream_resolve_include_path'))
-        ) {
-            $this->isNewIncludePath($smarty);
-        }
-        // try PHP include_path
-        foreach ($dirs as $dir) {
-            $dir_n = isset($this->number[ $dir ]) ? $this->number[ $dir ] : $this->number[ $dir ] = $this->counter++;
-            if (isset($this->isFile[ $dir_n ][ $file ])) {
-                if ($this->isFile[ $dir_n ][ $file ]) {
-                    return $this->isFile[ $dir_n ][ $file ];
-                } else {
-                    continue;
-                }
-            }
-            if (isset($this->_user_dirs[ $dir_n ])) {
-                if (false === $this->_user_dirs[ $dir_n ]) {
-                    continue;
-                } else {
-                    $dir = $this->_user_dirs[ $dir_n ];
-                }
-            } else {
-                if ($dir[ 0 ] === '/' || $dir[ 1 ] === ':') {
-                    $dir = str_ireplace(getcwd(), '.', $dir);
-                    if ($dir[ 0 ] === '/' || $dir[ 1 ] === ':') {
-                        $this->_user_dirs[ $dir_n ] = false;
-                        continue;
-                    }
-                }
-                $dir = substr($dir, 2);
-                $this->_user_dirs[ $dir_n ] = $dir;
-            }
-            if ($this->_has_stream_include) {
-                $path = stream_resolve_include_path($dir . (isset($file) ? $file : ''));
-                if ($path) {
-                    return $this->isFile[ $dir_n ][ $file ] = $path;
-                }
-            } else {
-                foreach ($this->_include_dirs as $key => $_i_path) {
-                    $path = isset($this->isPath[ $key ][ $dir_n ]) ? $this->isPath[ $key ][ $dir_n ] :
-                        $this->isPath[ $key ][ $dir_n ] = is_dir($_dir_path = $_i_path . $dir) ? $_dir_path : false;
-                    if ($path === false) {
-                        continue;
-                    }
-                    if (isset($file)) {
-                        $_file = $this->isFile[ $dir_n ][ $file ] = (is_file($path . $file)) ? $path . $file : false;
-                        if ($_file) {
-                            return $_file;
-                        }
-                    } else {
-                        // no file was given return directory path
-                        return $path;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php
deleted file mode 100644
index 8f7f02d59..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-
-/**
- * Inheritance Runtime Methods processBlock, endChild, init
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- **/
-class Smarty_Internal_Runtime_Inheritance
-{
-    /**
-     * State machine
-     * - 0 idle next extends will create a new inheritance tree
-     * - 1 processing child template
-     * - 2 wait for next inheritance template
-     * - 3 assume parent template, if child will loaded goto state 1
-     *     a call to a sub template resets the state to 0
-     *
-     * @var int
-     */
-    public $state = 0;
-
-    /**
-     * Array of root child {block} objects
-     *
-     * @var Smarty_Internal_Block[]
-     */
-    public $childRoot = array();
-
-    /**
-     * inheritance template nesting level
-     *
-     * @var int
-     */
-    public $inheritanceLevel = 0;
-
-    /**
-     * inheritance template index
-     *
-     * @var int
-     */
-    public $tplIndex = -1;
-
-    /**
-     * Array of template source objects
-     *
-     * @var Smarty_Template_Source[]
-     */
-    public $sources = array();
-
-    /**
-     * Stack of source objects while executing block code
-     *
-     * @var Smarty_Template_Source[]
-     */
-    public $sourceStack = array();
-
-    /**
-     * Initialize inheritance
-     *
-     * @param \Smarty_Internal_Template $tpl        template object of caller
-     * @param bool                      $initChild  if true init for child template
-     * @param array                     $blockNames outer level block name
-     */
-    public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array())
-    {
-        // if called while executing parent template it must be a sub-template with new inheritance root
-        if ($initChild && $this->state === 3 && (strpos($tpl->template_resource, 'extendsall') === false)) {
-            $tpl->inheritance = new Smarty_Internal_Runtime_Inheritance();
-            $tpl->inheritance->init($tpl, $initChild, $blockNames);
-            return;
-        }
-        ++$this->tplIndex;
-        $this->sources[ $this->tplIndex ] = $tpl->source;
-        // start of child sub template(s)
-        if ($initChild) {
-            $this->state = 1;
-            if (!$this->inheritanceLevel) {
-                //grab any output of child templates
-                ob_start();
-            }
-            ++$this->inheritanceLevel;
-            //           $tpl->startRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateStart');
-            //           $tpl->endRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateEnd');
-        }
-        // if state was waiting for parent change state to parent
-        if ($this->state === 2) {
-            $this->state = 3;
-        }
-    }
-
-    /**
-     * End of child template(s)
-     * - if outer level is reached flush output buffer and switch to wait for parent template state
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param null|string               $template optional name of inheritance parent template
-     * @param null|string               $uid      uid of inline template
-     * @param null|string               $func     function call name of inline template
-     *
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function endChild(Smarty_Internal_Template $tpl, $template = null, $uid = null, $func = null)
-    {
-        --$this->inheritanceLevel;
-        if (!$this->inheritanceLevel) {
-            ob_end_clean();
-            $this->state = 2;
-        }
-        if (isset($template) && (($tpl->parent->_isTplObj() && $tpl->parent->source->type !== 'extends')
-                                 || $tpl->smarty->extends_recursion)
-        ) {
-            $tpl->_subTemplateRender(
-                $template,
-                $tpl->cache_id,
-                $tpl->compile_id,
-                $tpl->caching ? 9999 : 0,
-                $tpl->cache_lifetime,
-                array(),
-                2,
-                false,
-                $uid,
-                $func
-            );
-        }
-    }
-
-    /**
-     * Smarty_Internal_Block constructor.
-     * - if outer level {block} of child template ($state === 1) save it as child root block
-     * - otherwise process inheritance and render
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param                           $className
-     * @param string                    $name
-     * @param int|null                  $tplIndex index of outer level {block} if nested
-     *
-     * @throws \SmartyException
-     */
-    public function instanceBlock(Smarty_Internal_Template $tpl, $className, $name, $tplIndex = null)
-    {
-        $block = new $className($name, isset($tplIndex) ? $tplIndex : $this->tplIndex);
-        if (isset($this->childRoot[ $name ])) {
-            $block->child = $this->childRoot[ $name ];
-        }
-        if ($this->state === 1) {
-            $this->childRoot[ $name ] = $block;
-            return;
-        }
-        // make sure we got child block of child template of current block
-        while ($block->child && $block->child->child && $block->tplIndex <= $block->child->tplIndex) {
-            $block->child = $block->child->child;
-        }
-        $this->process($tpl, $block);
-    }
-
-    /**
-     * Goto child block or render this
-     *
-     * @param \Smarty_Internal_Template   $tpl
-     * @param \Smarty_Internal_Block      $block
-     * @param \Smarty_Internal_Block|null $parent
-     *
-     * @throws \SmartyException
-     */
-    public function process(
-        Smarty_Internal_Template $tpl,
-        Smarty_Internal_Block $block,
-        Smarty_Internal_Block $parent = null
-    ) {
-        if ($block->hide && !isset($block->child)) {
-            return;
-        }
-        if (isset($block->child) && $block->child->hide && !isset($block->child->child)) {
-            $block->child = null;
-        }
-        $block->parent = $parent;
-        if ($block->append && !$block->prepend && isset($parent)) {
-            $this->callParent($tpl, $block, '\'{block append}\'');
-        }
-        if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) {
-            $this->callBlock($block, $tpl);
-        } else {
-            $this->process($tpl, $block->child, $block);
-        }
-        if ($block->prepend && isset($parent)) {
-            $this->callParent($tpl, $block, '{block prepend}');
-            if ($block->append) {
-                if ($block->callsChild || !isset($block->child)
-                    || ($block->child->hide && !isset($block->child->child))
-                ) {
-                    $this->callBlock($block, $tpl);
-                } else {
-                    $this->process($tpl, $block->child, $block);
-                }
-            }
-        }
-        $block->parent = null;
-    }
-
-    /**
-     * Render child on \$smarty.block.child
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param \Smarty_Internal_Block    $block
-     *
-     * @return null|string block content
-     * @throws \SmartyException
-     */
-    public function callChild(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block)
-    {
-        if (isset($block->child)) {
-            $this->process($tpl, $block->child, $block);
-        }
-    }
-
-    /**
-     * Render parent block on \$smarty.block.parent or {block append/prepend}
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param \Smarty_Internal_Block    $block
-     * @param string                    $tag
-     *
-     * @return null|string  block content
-     * @throws \SmartyException
-     */
-    public function callParent(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block, $tag)
-    {
-        if (isset($block->parent)) {
-            $this->callBlock($block->parent, $tpl);
-        } else {
-            throw new SmartyException("inheritance: illegal '{$tag}' used in child template '{$tpl->inheritance->sources[$block->tplIndex]->filepath}' block '{$block->name}'");
-        }
-    }
-
-    /**
-     * render block
-     *
-     * @param \Smarty_Internal_Block    $block
-     * @param \Smarty_Internal_Template $tpl
-     */
-    public function callBlock(Smarty_Internal_Block $block, Smarty_Internal_Template $tpl)
-    {
-        $this->sourceStack[] = $tpl->source;
-        $tpl->source = $this->sources[ $block->tplIndex ];
-        $block->callBlock($tpl);
-        $tpl->source = array_pop($this->sourceStack);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_make_nocache.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_make_nocache.php
deleted file mode 100644
index 7994aa048..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_make_nocache.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * {make_nocache} Runtime Methods save(), store()
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Runtime_Make_Nocache
-{
-    /**
-     * Save current variable value while rendering compiled template and inject nocache code to
-     * assign variable value in cahed template
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param string                    $var variable name
-     *
-     * @throws \SmartyException
-     */
-    public function save(Smarty_Internal_Template $tpl, $var)
-    {
-        if (isset($tpl->tpl_vars[ $var ])) {
-            $export =
-                preg_replace('/^\\\\?Smarty_Variable::__set_state[(]|[)]$/', '', var_export($tpl->tpl_vars[ $var ], true));
-            if (preg_match('/(\w+)::__set_state/', $export, $match)) {
-                throw new SmartyException("{make_nocache \${$var}} in template '{$tpl->source->name}': variable does contain object '{$match[1]}' not implementing method '__set_state'");
-            }
-            echo "/*%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/<?php " .
-                 addcslashes("\$_smarty_tpl->smarty->ext->_make_nocache->store(\$_smarty_tpl, '{$var}', ", '\\') .
-                 $export . ");?>\n/*/%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/";
-        }
-    }
-
-    /**
-     * Store variable value saved while rendering compiled template in cached template context
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param string                    $var variable name
-     * @param array                     $properties
-     */
-    public function store(Smarty_Internal_Template $tpl, $var, $properties)
-    {
-        // do not overwrite existing nocache variables
-        if (!isset($tpl->tpl_vars[ $var ]) || !$tpl->tpl_vars[ $var ]->nocache) {
-            $newVar = new Smarty_Variable();
-            unset($properties[ 'nocache' ]);
-            foreach ($properties as $k => $v) {
-                $newVar->$k = $v;
-            }
-            $tpl->tpl_vars[ $var ] = $newVar;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php
deleted file mode 100644
index e5f8e48f7..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-/**
- * TplFunction Runtime Methods callTemplateFunction
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- **/
-class Smarty_Internal_Runtime_TplFunction
-{
-    /**
-     * Call template function
-     *
-     * @param \Smarty_Internal_Template $tpl     template object
-     * @param string                    $name    template function name
-     * @param array                     $params  parameter array
-     * @param bool                      $nocache true if called nocache
-     *
-     * @throws \SmartyException
-     */
-    public function callTemplateFunction(Smarty_Internal_Template $tpl, $name, $params, $nocache)
-    {
-        $funcParam = isset($tpl->tplFunctions[ $name ]) ? $tpl->tplFunctions[ $name ] :
-            (isset($tpl->smarty->tplFunctions[ $name ]) ? $tpl->smarty->tplFunctions[ $name ] : null);
-        if (isset($funcParam)) {
-            if (!$tpl->caching || ($tpl->caching && $nocache)) {
-                $function = $funcParam[ 'call_name' ];
-            } else {
-                if (isset($funcParam[ 'call_name_caching' ])) {
-                    $function = $funcParam[ 'call_name_caching' ];
-                } else {
-                    $function = $funcParam[ 'call_name' ];
-                }
-            }
-            if (function_exists($function)) {
-                $this->saveTemplateVariables($tpl, $name);
-                $function($tpl, $params);
-                $this->restoreTemplateVariables($tpl, $name);
-                return;
-            }
-            // try to load template function dynamically
-            if ($this->addTplFuncToCache($tpl, $name, $function)) {
-                $this->saveTemplateVariables($tpl, $name);
-                $function($tpl, $params);
-                $this->restoreTemplateVariables($tpl, $name);
-                return;
-            }
-        }
-        throw new SmartyException("Unable to find template function '{$name}'");
-    }
-
-    /**
-     * Register template functions defined by template
-     *
-     * @param \Smarty|\Smarty_Internal_Template|\Smarty_Internal_TemplateBase $obj
-     * @param array                                                           $tplFunctions source information array of
-     *                                                                                      template functions defined
-     *                                                                                      in template
-     * @param bool                                                            $override     if true replace existing
-     *                                                                                      functions with same name
-     */
-    public function registerTplFunctions(Smarty_Internal_TemplateBase $obj, $tplFunctions, $override = true)
-    {
-        $obj->tplFunctions =
-            $override ? array_merge($obj->tplFunctions, $tplFunctions) : array_merge($tplFunctions, $obj->tplFunctions);
-        // make sure that the template functions are known in parent templates
-        if ($obj->_isSubTpl()) {
-            $obj->smarty->ext->_tplFunction->registerTplFunctions($obj->parent, $tplFunctions, false);
-        } else {
-            $obj->smarty->tplFunctions = $override ? array_merge($obj->smarty->tplFunctions, $tplFunctions) :
-                array_merge($tplFunctions, $obj->smarty->tplFunctions);
-        }
-    }
-
-    /**
-     * Return source parameter array for single or all template functions
-     *
-     * @param \Smarty_Internal_Template $tpl  template object
-     * @param null|string               $name template function name
-     *
-     * @return array|bool|mixed
-     */
-    public function getTplFunction(Smarty_Internal_Template $tpl, $name = null)
-    {
-        if (isset($name)) {
-            return isset($tpl->tplFunctions[ $name ]) ? $tpl->tplFunctions[ $name ] :
-                (isset($tpl->smarty->tplFunctions[ $name ]) ? $tpl->smarty->tplFunctions[ $name ] : false);
-        } else {
-            return empty($tpl->tplFunctions) ? $tpl->smarty->tplFunctions : $tpl->tplFunctions;
-        }
-    }
-
-    /**
-     * Add template function to cache file for nocache calls
-     *
-     * @param Smarty_Internal_Template $tpl
-     * @param string                   $_name     template function name
-     * @param string                   $_function PHP function name
-     *
-     * @return bool
-     */
-    public function addTplFuncToCache(Smarty_Internal_Template $tpl, $_name, $_function)
-    {
-        $funcParam = $tpl->tplFunctions[ $_name ];
-        if (is_file($funcParam[ 'compiled_filepath' ])) {
-            // read compiled file
-            $code = file_get_contents($funcParam[ 'compiled_filepath' ]);
-            // grab template function
-            if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) {
-                // grab source info from file dependency
-                preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1);
-                unset($code);
-                // make PHP function known
-                eval($match[ 0 ]);
-                if (function_exists($_function)) {
-                    // search cache file template
-                    $tplPtr = $tpl;
-                    while (!isset($tplPtr->cached) && isset($tplPtr->parent)) {
-                        $tplPtr = $tplPtr->parent;
-                    }
-                    // add template function code to cache file
-                    if (isset($tplPtr->cached)) {
-                        $content = $tplPtr->cached->read($tplPtr);
-                        if ($content) {
-                            // check if we must update file dependency
-                            if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) {
-                                $content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content);
-                            }
-                            $tplPtr->smarty->ext->_updateCache->write(
-                                $tplPtr,
-                                preg_replace('/\s*\?>\s*$/', "\n", $content) .
-                                "\n" . preg_replace(
-                                    array(
-                                        '/^\s*<\?php\s+/',
-                                        '/\s*\?>\s*$/',
-                                    ),
-                                    "\n",
-                                    $match[ 0 ]
-                                )
-                            );
-                        }
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Save current template variables on stack
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param string                    $name stack name
-     */
-    public function saveTemplateVariables(Smarty_Internal_Template $tpl, $name)
-    {
-        $tpl->_cache[ 'varStack' ][] =
-            array('tpl' => $tpl->tpl_vars, 'config' => $tpl->config_vars, 'name' => "_tplFunction_{$name}");
-    }
-
-    /**
-     * Restore saved variables into template objects
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param string                    $name stack name
-     */
-    public function restoreTemplateVariables(Smarty_Internal_Template $tpl, $name)
-    {
-        if (isset($tpl->_cache[ 'varStack' ])) {
-            $vars = array_pop($tpl->_cache[ 'varStack' ]);
-            $tpl->tpl_vars = $vars[ 'tpl' ];
-            $tpl->config_vars = $vars[ 'config' ];
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php
deleted file mode 100644
index c1abbb321..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-/**
- * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- **/
-class Smarty_Internal_Runtime_UpdateCache
-{
-    /**
-     * check client side cache
-     *
-     * @param \Smarty_Template_Cached  $cached
-     * @param Smarty_Internal_Template $_template
-     * @param string                   $content
-     */
-    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
-    {
-    }
-
-    /**
-     * Cache was invalid , so render from compiled and write to cache
-     *
-     * @param \Smarty_Template_Cached   $cached
-     * @param \Smarty_Internal_Template $_template
-     * @param                           $no_output_filter
-     *
-     * @throws \Exception
-     */
-    public function updateCache(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $no_output_filter)
-    {
-        ob_start();
-        if (!isset($_template->compiled)) {
-            $_template->loadCompiled();
-        }
-        $_template->compiled->render($_template);
-        if ($_template->smarty->debugging) {
-            $_template->smarty->_debug->start_cache($_template);
-        }
-        $this->removeNoCacheHash($cached, $_template, $no_output_filter);
-        $compile_check = (int)$_template->compile_check;
-        $_template->compile_check = Smarty::COMPILECHECK_OFF;
-        if ($_template->_isSubTpl()) {
-            $_template->compiled->unifunc = $_template->parent->compiled->unifunc;
-        }
-        if (!$_template->cached->processed) {
-            $_template->cached->process($_template, true);
-        }
-        $_template->compile_check = $compile_check;
-        $cached->getRenderedTemplateCode($_template);
-        if ($_template->smarty->debugging) {
-            $_template->smarty->_debug->end_cache($_template);
-        }
-    }
-
-    /**
-     * Sanitize content and write it to cache resource
-     *
-     * @param \Smarty_Template_Cached  $cached
-     * @param Smarty_Internal_Template $_template
-     * @param bool                     $no_output_filter
-     *
-     * @throws \SmartyException
-     */
-    public function removeNoCacheHash(
-        Smarty_Template_Cached $cached,
-        Smarty_Internal_Template $_template,
-        $no_output_filter
-    ) {
-        $php_pattern = '/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/';
-        $content = ob_get_clean();
-        $hash_array = $cached->hashes;
-        $hash_array[ $_template->compiled->nocache_hash ] = true;
-        $hash_array = array_keys($hash_array);
-        $nocache_hash = '(' . implode('|', $hash_array) . ')';
-        $_template->cached->has_nocache_code = false;
-        // get text between non-cached items
-        $cache_split =
-            preg_split(
-                "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
-                $content
-            );
-        // get non-cached items
-        preg_match_all(
-            "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
-            $content,
-            $cache_parts
-        );
-        $content = '';
-        // loop over items, stitch back together
-        foreach ($cache_split as $curr_idx => $curr_split) {
-            if (preg_match($php_pattern, $curr_split)) {
-                // escape PHP tags in template content
-                $php_split = preg_split(
-                    $php_pattern,
-                    $curr_split
-                );
-                preg_match_all(
-                    $php_pattern,
-                    $curr_split,
-                    $php_parts
-                );
-                foreach ($php_split as $idx_php => $curr_php) {
-                    $content .= $curr_php;
-                    if (isset($php_parts[ 0 ][ $idx_php ])) {
-                        $content .= "<?php echo '{$php_parts[ 1 ][ $idx_php ]}'; ?>\n";
-                    }
-                }
-            } else {
-                $content .= $curr_split;
-            }
-            if (isset($cache_parts[ 0 ][ $curr_idx ])) {
-                $_template->cached->has_nocache_code = true;
-                $content .= $cache_parts[ 2 ][ $curr_idx ];
-            }
-        }
-        if (!$no_output_filter && !$_template->cached->has_nocache_code
-            && (isset($_template->smarty->autoload_filters[ 'output' ])
-                || isset($_template->smarty->registered_filters[ 'output' ]))
-        ) {
-            $content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template);
-        }
-        // write cache file content
-        $this->writeCachedContent($_template, $content);
-    }
-
-    /**
-     * Writes the content to cache resource
-     *
-     * @param Smarty_Internal_Template $_template
-     * @param string                   $content
-     *
-     * @return bool
-     */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-    {
-        if ($_template->source->handler->recompiled || !$_template->caching
-        ) {
-            // don't write cache file
-            return false;
-        }
-        if (!isset($_template->cached)) {
-            $_template->loadCached();
-        }
-        $content = $_template->smarty->ext->_codeFrame->create($_template, $content, '', true);
-        return $this->write($_template, $content);
-    }
-
-    /**
-     * Write this cache object to handler
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     *
-     * @return bool success
-     */
-    public function write(Smarty_Internal_Template $_template, $content)
-    {
-        if (!$_template->source->handler->recompiled) {
-            $cached = $_template->cached;
-            if ($cached->handler->writeCachedContent($_template, $content)) {
-                $cached->content = null;
-                $cached->timestamp = time();
-                $cached->exists = true;
-                $cached->valid = true;
-                $cached->cache_lifetime = $_template->cache_lifetime;
-                $cached->processed = false;
-                if ($_template->smarty->cache_locking) {
-                    $cached->handler->releaseLock($_template->smarty, $cached);
-                }
-                return true;
-            }
-            $cached->content = null;
-            $cached->timestamp = false;
-            $cached->exists = false;
-            $cached->valid = false;
-            $cached->processed = false;
-        }
-        return false;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
deleted file mode 100644
index 2240f97ca..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Runtime Extension updateScope
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- **/
-class Smarty_Internal_Runtime_UpdateScope
-{
-    /**
-     * Update new assigned template or config variable in other effected scopes
-     *
-     * @param Smarty_Internal_Template $tpl      data object
-     * @param string|null              $varName  variable name
-     * @param int                      $tagScope tag scope to which bubble up variable value
-     */
-    public function _updateScope(Smarty_Internal_Template $tpl, $varName, $tagScope = 0)
-    {
-        if ($tagScope) {
-            $this->_updateVarStack($tpl, $varName);
-            $tagScope = $tagScope & ~Smarty::SCOPE_LOCAL;
-            if (!$tpl->scope && !$tagScope) {
-                return;
-            }
-        }
-        $mergedScope = $tagScope | $tpl->scope;
-        if ($mergedScope) {
-            if ($mergedScope & Smarty::SCOPE_GLOBAL && $varName) {
-                Smarty::$global_tpl_vars[ $varName ] = $tpl->tpl_vars[ $varName ];
-            }
-            // update scopes
-            foreach ($this->_getAffectedScopes($tpl, $mergedScope) as $ptr) {
-                $this->_updateVariableInOtherScope($ptr->tpl_vars, $tpl, $varName);
-                if ($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) {
-                    $this->_updateVarStack($ptr, $varName);
-                }
-            }
-        }
-    }
-
-    /**
-     * Get array of objects which needs to be updated  by given scope value
-     *
-     * @param Smarty_Internal_Template $tpl
-     * @param int                      $mergedScope merged tag and template scope to which bubble up variable value
-     *
-     * @return array
-     */
-    public function _getAffectedScopes(Smarty_Internal_Template $tpl, $mergedScope)
-    {
-        $_stack = array();
-        $ptr = $tpl->parent;
-        if ($mergedScope && isset($ptr) && $ptr->_isTplObj()) {
-            $_stack[] = $ptr;
-            $mergedScope = $mergedScope & ~Smarty::SCOPE_PARENT;
-            if (!$mergedScope) {
-                // only parent was set, we are done
-                return $_stack;
-            }
-            $ptr = $ptr->parent;
-        }
-        while (isset($ptr) && $ptr->_isTplObj()) {
-            $_stack[] = $ptr;
-            $ptr = $ptr->parent;
-        }
-        if ($mergedScope & Smarty::SCOPE_SMARTY) {
-            if (isset($tpl->smarty)) {
-                $_stack[] = $tpl->smarty;
-            }
-        } elseif ($mergedScope & Smarty::SCOPE_ROOT) {
-            while (isset($ptr)) {
-                if (!$ptr->_isTplObj()) {
-                    $_stack[] = $ptr;
-                    break;
-                }
-                $ptr = $ptr->parent;
-            }
-        }
-        return $_stack;
-    }
-
-    /**
-     * Update variable in other scope
-     *
-     * @param array                     $tpl_vars template variable array
-     * @param \Smarty_Internal_Template $from
-     * @param string                    $varName  variable name
-     */
-    public function _updateVariableInOtherScope(&$tpl_vars, Smarty_Internal_Template $from, $varName)
-    {
-        if (!isset($tpl_vars[ $varName ])) {
-            $tpl_vars[ $varName ] = clone $from->tpl_vars[ $varName ];
-        } else {
-            $tpl_vars[ $varName ] = clone $tpl_vars[ $varName ];
-            $tpl_vars[ $varName ]->value = $from->tpl_vars[ $varName ]->value;
-        }
-    }
-
-    /**
-     * Update variable in template local variable stack
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param string|null               $varName variable name or null for config variables
-     */
-    public function _updateVarStack(Smarty_Internal_Template $tpl, $varName)
-    {
-        $i = 0;
-        while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
-            $this->_updateVariableInOtherScope($tpl->_cache[ 'varStack' ][ $i ][ 'tpl' ], $tpl, $varName);
-            $i++;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php b/include/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
deleted file mode 100644
index 492d5eb25..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Smarty write file plugin
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Monte Ohrt
- */
-
-/**
- * Smarty Internal Write File Class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Runtime_WriteFile
-{
-    /**
-     * Writes file in a safe way to disk
-     *
-     * @param string $_filepath complete filepath
-     * @param string $_contents file content
-     * @param Smarty $smarty    smarty instance
-     *
-     * @throws SmartyException
-     * @return boolean true
-     */
-    public function writeFile($_filepath, $_contents, Smarty $smarty)
-    {
-        $_error_reporting = error_reporting();
-        error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        $_dirpath = dirname($_filepath);
-        // if subdirs, create dir structure
-        if ($_dirpath !== '.') {
-            $i = 0;
-            // loop if concurrency problem occurs
-            // see https://bugs.php.net/bug.php?id=35326
-            while (!is_dir($_dirpath)) {
-                if (@mkdir($_dirpath, 0777, true)) {
-                    break;
-                }
-                clearstatcache();
-                if (++$i === 3) {
-                    error_reporting($_error_reporting);
-                    throw new SmartyException("unable to create directory {$_dirpath}");
-                }
-                sleep(1);
-            }
-        }
-        // write to tmp file, then move to overt file lock race condition
-        $_tmp_file = $_dirpath . DIRECTORY_SEPARATOR . str_replace(array('.', ','), '_', uniqid('wrt', true));
-        if (!file_put_contents($_tmp_file, $_contents)) {
-            error_reporting($_error_reporting);
-            throw new SmartyException("unable to write file {$_tmp_file}");
-        }
-        /*
-         * Windows' rename() fails if the destination exists,
-         * Linux' rename() properly handles the overwrite.
-         * Simply unlink()ing a file might cause other processes
-         * currently reading that file to fail, but linux' rename()
-         * seems to be smart enough to handle that for us.
-         */
-        if (Smarty::$_IS_WINDOWS) {
-            // remove original file
-            if (is_file($_filepath)) {
-                @unlink($_filepath);
-            }
-            // rename tmp file
-            $success = @rename($_tmp_file, $_filepath);
-        } else {
-            // rename tmp file
-            $success = @rename($_tmp_file, $_filepath);
-            if (!$success) {
-                // remove original file
-                if (is_file($_filepath)) {
-                    @unlink($_filepath);
-                }
-                // rename tmp file
-                $success = @rename($_tmp_file, $_filepath);
-            }
-        }
-        if (!$success) {
-            error_reporting($_error_reporting);
-            throw new SmartyException("unable to write file {$_filepath}");
-        }
-        // set file permissions
-        @chmod($_filepath, 0666 & ~umask());
-        error_reporting($_error_reporting);
-        return true;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
deleted file mode 100644
index 21f4e3fdd..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Smarty Template Compiler Base
- * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Class SmartyTemplateCompiler
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase
-{
-    /**
-     * Lexer class name
-     *
-     * @var string
-     */
-    public $lexer_class;
-
-    /**
-     * Parser class name
-     *
-     * @var string
-     */
-    public $parser_class;
-
-    /**
-     * array of vars which can be compiled in local scope
-     *
-     * @var array
-     */
-    public $local_var = array();
-
-    /**
-     * array of callbacks called when the normal compile process of template is finished
-     *
-     * @var array
-     */
-    public $postCompileCallbacks = array();
-
-    /**
-     * prefix code
-     *
-     * @var string
-     */
-    public $prefixCompiledCode = '';
-
-    /**
-     * postfix code
-     *
-     * @var string
-     */
-    public $postfixCompiledCode = '';
-
-    /**
-     * Initialize compiler
-     *
-     * @param string $lexer_class  class name
-     * @param string $parser_class class name
-     * @param Smarty $smarty       global instance
-     */
-    public function __construct($lexer_class, $parser_class, Smarty $smarty)
-    {
-        parent::__construct($smarty);
-        // get required plugins
-        $this->lexer_class = $lexer_class;
-        $this->parser_class = $parser_class;
-    }
-
-    /**
-     * method to compile a Smarty template
-     *
-     * @param mixed $_content template source
-     * @param bool  $isTemplateSource
-     *
-     * @return bool true if compiling succeeded, false if it failed
-     * @throws \SmartyCompilerException
-     */
-    protected function doCompile($_content, $isTemplateSource = false)
-    {
-        /* here is where the compiling takes place. Smarty
-          tags in the templates are replaces with PHP code,
-          then written to compiled files. */
-        // init the lexer/parser to compile the template
-        $this->parser =
-            new $this->parser_class(
-                new $this->lexer_class(
-                    str_replace(
-                        array(
-                            "\r\n",
-                            "\r"
-                        ),
-                        "\n",
-                        $_content
-                    ),
-                    $this
-                ),
-                $this
-            );
-        if ($isTemplateSource && $this->template->caching) {
-            $this->parser->insertPhpCode("<?php\n\$_smarty_tpl->compiled->nocache_hash = '{$this->nocache_hash}';\n?>\n");
-        }
-        if (function_exists('mb_internal_encoding')
-            && function_exists('ini_get')
-            && ((int)ini_get('mbstring.func_overload')) & 2
-        ) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        } else {
-            $mbEncoding = null;
-        }
-        if ($this->smarty->_parserdebug) {
-            $this->parser->PrintTrace();
-            $this->parser->lex->PrintTrace();
-        }
-        // get tokens from lexer and parse them
-        while ($this->parser->lex->yylex()) {
-            if ($this->smarty->_parserdebug) {
-                echo "<pre>Line {$this->parser->lex->line} Parsing  {$this->parser->yyTokenName[$this->parser->lex->token]} Token " .
-                     htmlentities($this->parser->lex->value) . "</pre>";
-            }
-            $this->parser->doParse($this->parser->lex->token, $this->parser->lex->value);
-        }
-        // finish parsing process
-        $this->parser->doParse(0, 0);
-        if ($mbEncoding) {
-            mb_internal_encoding($mbEncoding);
-        }
-        // check for unclosed tags
-        if (count($this->_tag_stack) > 0) {
-            // get stacked info
-            list($openTag, $_data) = array_pop($this->_tag_stack);
-            $this->trigger_template_error(
-                "unclosed {$this->smarty->left_delimiter}" . $openTag .
-                "{$this->smarty->right_delimiter} tag"
-            );
-        }
-        // call post compile callbacks
-        foreach ($this->postCompileCallbacks as $cb) {
-            $parameter = $cb;
-            $parameter[ 0 ] = $this;
-            call_user_func_array($cb[ 0 ], $parameter);
-        }
-        // return compiled code
-        return $this->prefixCompiledCode . $this->parser->retvalue . $this->postfixCompiledCode;
-    }
-
-    /**
-     * Register a post compile callback
-     * - when the callback is called after template compiling the compiler object will be inserted as first parameter
-     *
-     * @param callback $callback
-     * @param array    $parameter optional parameter array
-     * @param string   $key       optional key for callback
-     * @param bool     $replace   if true replace existing keyed callback
-     */
-    public function registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
-    {
-        array_unshift($parameter, $callback);
-        if (isset($key)) {
-            if ($replace || !isset($this->postCompileCallbacks[ $key ])) {
-                $this->postCompileCallbacks[ $key ] = $parameter;
-            }
-        } else {
-            $this->postCompileCallbacks[] = $parameter;
-        }
-    }
-
-    /**
-     * Remove a post compile callback
-     *
-     * @param string $key callback key
-     */
-    public function unregisterPostCompileCallback($key)
-    {
-        unset($this->postCompileCallbacks[ $key ]);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_template.php b/include/smarty/libs/sysplugins/smarty_internal_template.php
deleted file mode 100644
index 72d1d52e0..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_template.php
+++ /dev/null
@@ -1,741 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Template
- * This file contains the Smarty template engine
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Main class with template data structures and methods
- *
- * @package    Smarty
- * @subpackage Template
- *
- * @property Smarty_Template_Compiled             $compiled
- * @property Smarty_Template_Cached               $cached
- * @property Smarty_Internal_TemplateCompilerBase $compiler
- * @property mixed|\Smarty_Template_Cached        registered_plugins
- *
- * The following methods will be dynamically loaded by the extension handler when they are called.
- * They are located in a corresponding Smarty_Internal_Method_xxxx class
- *
- * @method bool mustCompile()
- */
-#[\AllowDynamicProperties]
-class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
-{
-    /**
-     * Template object cache
-     *
-     * @var Smarty_Internal_Template[]
-     */
-    public static $tplObjCache = array();
-
-    /**
-     * Template object cache for Smarty::isCached() === true
-     *
-     * @var Smarty_Internal_Template[]
-     */
-    public static $isCacheTplObj = array();
-
-    /**
-     * Sub template Info Cache
-     * - index name
-     * - value use count
-     *
-     * @var int[]
-     */
-    public static $subTplInfo = array();
-
-    /**
-     * This object type (Smarty = 1, template = 2, data = 4)
-     *
-     * @var int
-     */
-    public $_objType = 2;
-
-    /**
-     * Global smarty instance
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * Source instance
-     *
-     * @var Smarty_Template_Source|Smarty_Template_Config
-     */
-    public $source = null;
-
-    /**
-     * Inheritance runtime extension
-     *
-     * @var Smarty_Internal_Runtime_Inheritance
-     */
-    public $inheritance = null;
-
-    /**
-     * Template resource
-     *
-     * @var string
-     */
-    public $template_resource = null;
-
-    /**
-     * flag if compiled template is invalid and must be (re)compiled
-     *
-     * @var bool
-     */
-    public $mustCompile = null;
-
-    /**
-     * Template Id
-     *
-     * @var null|string
-     */
-    public $templateId = null;
-
-    /**
-     * Scope in which variables shall be assigned
-     *
-     * @var int
-     */
-    public $scope = 0;
-
-    /**
-     * Flag which is set while rending a cache file
-     *
-     * @var bool
-     */
-    public $isRenderingCache = false;
-
-    /**
-     * Callbacks called before rendering template
-     *
-     * @var callback[]
-     */
-    public $startRenderCallbacks = array();
-
-    /**
-     * Callbacks called after rendering template
-     *
-     * @var callback[]
-     */
-    public $endRenderCallbacks = array();
-
-    /**
-     * Create template data object
-     * Some of the global Smarty settings copied to template scope
-     * It load the required template resources and caching plugins
-     *
-     * @param string                                                       $template_resource template resource string
-     * @param Smarty                                                       $smarty            Smarty instance
-     * @param null|\Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $_parent           back pointer to parent
-     *                                                                                        object with variables or
-     *                                                                                        null
-     * @param mixed                                                        $_cache_id         cache   id or null
-     * @param mixed                                                        $_compile_id       compile id or null
-     * @param bool|int|null                                                $_caching          use caching?
-     * @param int|null                                                     $_cache_lifetime   cache life-time in
-     *                                                                                        seconds
-     * @param bool                                                         $_isConfig
-     *
-     * @throws \SmartyException
-     */
-    public function __construct(
-        $template_resource,
-        Smarty $smarty,
-        Smarty_Internal_Data $_parent = null,
-        $_cache_id = null,
-        $_compile_id = null,
-        $_caching = null,
-        $_cache_lifetime = null,
-        $_isConfig = false
-    ) {
-        $this->smarty = $smarty;
-        // Smarty parameter
-        $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
-        $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
-        $this->caching = (int)($_caching === null ? $this->smarty->caching : $_caching);
-        $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime;
-        $this->compile_check = (int)$smarty->compile_check;
-        $this->parent = $_parent;
-        // Template resource
-        $this->template_resource = $template_resource;
-        $this->source = $_isConfig ? Smarty_Template_Config::load($this) : Smarty_Template_Source::load($this);
-        parent::__construct();
-        if ($smarty->security_policy && method_exists($smarty->security_policy, 'registerCallBacks')) {
-            $smarty->security_policy->registerCallBacks($this);
-        }
-    }
-
-    /**
-     * render template
-     *
-     * @param bool      $no_output_filter if true do not run output filter
-     * @param null|bool $display          true: display, false: fetch null: sub-template
-     *
-     * @return string
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function render($no_output_filter = true, $display = null)
-    {
-        if ($this->smarty->debugging) {
-            if (!isset($this->smarty->_debug)) {
-                $this->smarty->_debug = new Smarty_Internal_Debug();
-            }
-            $this->smarty->_debug->start_template($this, $display);
-        }
-        // checks if template exists
-        if (!$this->source->exists) {
-            throw new SmartyException(
-                "Unable to load template '{$this->source->type}:{$this->source->name}'" .
-                ($this->_isSubTpl() ? " in '{$this->parent->template_resource}'" : '')
-            );
-        }
-        // disable caching for evaluated code
-        if ($this->source->handler->recompiled) {
-            $this->caching = Smarty::CACHING_OFF;
-        }
-        // read from cache or render
-        if ($this->caching === Smarty::CACHING_LIFETIME_CURRENT || $this->caching === Smarty::CACHING_LIFETIME_SAVED) {
-            if (!isset($this->cached) || $this->cached->cache_id !== $this->cache_id
-                || $this->cached->compile_id !== $this->compile_id
-            ) {
-                $this->loadCached(true);
-            }
-            $this->cached->render($this, $no_output_filter);
-        } else {
-            if (!isset($this->compiled) || $this->compiled->compile_id !== $this->compile_id) {
-                $this->loadCompiled(true);
-            }
-            $this->compiled->render($this);
-        }
-        // display or fetch
-        if ($display) {
-            if ($this->caching && $this->smarty->cache_modified_check) {
-                $this->smarty->ext->_cacheModify->cacheModifiedCheck(
-                    $this->cached,
-                    $this,
-                    isset($content) ? $content : ob_get_clean()
-                );
-            } else {
-                if ((!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled)
-                    && !$no_output_filter && (isset($this->smarty->autoload_filters[ 'output' ])
-                                              || isset($this->smarty->registered_filters[ 'output' ]))
-                ) {
-                    echo $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
-                } else {
-                    echo ob_get_clean();
-                }
-            }
-            if ($this->smarty->debugging) {
-                $this->smarty->_debug->end_template($this);
-                // debug output
-                $this->smarty->_debug->display_debug($this, true);
-            }
-            return '';
-        } else {
-            if ($this->smarty->debugging) {
-                $this->smarty->_debug->end_template($this);
-                if ($this->smarty->debugging === 2 && $display === false) {
-                    $this->smarty->_debug->display_debug($this, true);
-                }
-            }
-            if (!$no_output_filter
-                && (!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled)
-                && (isset($this->smarty->autoload_filters[ 'output' ])
-                    || isset($this->smarty->registered_filters[ 'output' ]))
-            ) {
-                return $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
-            }
-            // return cache content
-            return null;
-        }
-    }
-
-    /**
-     * Runtime function to render sub-template
-     *
-     * @param string  $template       template name
-     * @param mixed   $cache_id       cache id
-     * @param mixed   $compile_id     compile id
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param array   $data           passed parameter template variables
-     * @param int     $scope          scope in which {include} should execute
-     * @param bool    $forceTplCache  cache template object
-     * @param string  $uid            file dependency uid
-     * @param string  $content_func   function name
-     *
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function _subTemplateRender(
-        $template,
-        $cache_id,
-        $compile_id,
-        $caching,
-        $cache_lifetime,
-        $data,
-        $scope,
-        $forceTplCache,
-        $uid = null,
-        $content_func = null
-    ) {
-        $tpl = clone $this;
-        $tpl->parent = $this;
-        $smarty = &$this->smarty;
-        $_templateId = $smarty->_getTemplateId($template, $cache_id, $compile_id, $caching, $tpl);
-        // recursive call ?
-        if ((isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId()) !== $_templateId) {
-            // already in template cache?
-            if (isset(self::$tplObjCache[ $_templateId ])) {
-                // copy data from cached object
-                $cachedTpl = &self::$tplObjCache[ $_templateId ];
-                $tpl->templateId = $cachedTpl->templateId;
-                $tpl->template_resource = $cachedTpl->template_resource;
-                $tpl->cache_id = $cachedTpl->cache_id;
-                $tpl->compile_id = $cachedTpl->compile_id;
-                $tpl->source = $cachedTpl->source;
-                if (isset($cachedTpl->compiled)) {
-                    $tpl->compiled = $cachedTpl->compiled;
-                } else {
-                    unset($tpl->compiled);
-                }
-                if ($caching !== 9999 && isset($cachedTpl->cached)) {
-                    $tpl->cached = $cachedTpl->cached;
-                } else {
-                    unset($tpl->cached);
-                }
-            } else {
-                $tpl->templateId = $_templateId;
-                $tpl->template_resource = $template;
-                $tpl->cache_id = $cache_id;
-                $tpl->compile_id = $compile_id;
-                if (isset($uid)) {
-                    // for inline templates we can get all resource information from file dependency
-                    list($filepath, $timestamp, $type) = $tpl->compiled->file_dependency[ $uid ];
-                    $tpl->source = new Smarty_Template_Source($smarty, $filepath, $type, $filepath);
-                    $tpl->source->filepath = $filepath;
-                    $tpl->source->timestamp = $timestamp;
-                    $tpl->source->exists = true;
-                    $tpl->source->uid = $uid;
-                } else {
-                    $tpl->source = Smarty_Template_Source::load($tpl);
-                    unset($tpl->compiled);
-                }
-                if ($caching !== 9999) {
-                    unset($tpl->cached);
-                }
-            }
-        } else {
-            // on recursive calls force caching
-            $forceTplCache = true;
-        }
-        $tpl->caching = $caching;
-        $tpl->cache_lifetime = $cache_lifetime;
-        // set template scope
-        $tpl->scope = $scope;
-        if (!isset(self::$tplObjCache[ $tpl->templateId ]) && !$tpl->source->handler->recompiled) {
-            // check if template object should be cached
-            if ($forceTplCache || (isset(self::$subTplInfo[ $tpl->template_resource ])
-                                   && self::$subTplInfo[ $tpl->template_resource ] > 1)
-                || ($tpl->_isSubTpl() && isset(self::$tplObjCache[ $tpl->parent->templateId ]))
-            ) {
-                self::$tplObjCache[ $tpl->templateId ] = $tpl;
-            }
-        }
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val, $this->isRenderingCache);
-            }
-        }
-        if ($tpl->caching === 9999) {
-            if (!isset($tpl->compiled)) {
-                $tpl->loadCompiled(true);
-            }
-            if ($tpl->compiled->has_nocache_code) {
-                $this->cached->hashes[ $tpl->compiled->nocache_hash ] = true;
-            }
-        }
-        $tpl->_cache = array();
-        if (isset($uid)) {
-            if ($smarty->debugging) {
-                if (!isset($smarty->_debug)) {
-                    $smarty->_debug = new Smarty_Internal_Debug();
-                }
-                $smarty->_debug->start_template($tpl);
-                $smarty->_debug->start_render($tpl);
-            }
-            $tpl->compiled->getRenderedTemplateCode($tpl, $content_func);
-            if ($smarty->debugging) {
-                $smarty->_debug->end_template($tpl);
-                $smarty->_debug->end_render($tpl);
-            }
-        } else {
-            if (isset($tpl->compiled)) {
-                $tpl->compiled->render($tpl);
-            } else {
-                $tpl->render();
-            }
-        }
-    }
-
-    /**
-     * Get called sub-templates and save call count
-     */
-    public function _subTemplateRegister()
-    {
-        foreach ($this->compiled->includes as $name => $count) {
-            if (isset(self::$subTplInfo[ $name ])) {
-                self::$subTplInfo[ $name ] += $count;
-            } else {
-                self::$subTplInfo[ $name ] = $count;
-            }
-        }
-    }
-
-    /**
-     * Check if this is a sub template
-     *
-     * @return bool true is sub template
-     */
-    public function _isSubTpl()
-    {
-        return isset($this->parent) && $this->parent->_isTplObj();
-    }
-
-    /**
-     * Assign variable in scope
-     *
-     * @param string $varName variable name
-     * @param mixed  $value   value
-     * @param bool   $nocache nocache flag
-     * @param int    $scope   scope into which variable shall be assigned
-     */
-    public function _assignInScope($varName, $value, $nocache = false, $scope = 0)
-    {
-        if (isset($this->tpl_vars[ $varName ])) {
-            $this->tpl_vars[ $varName ] = clone $this->tpl_vars[ $varName ];
-            $this->tpl_vars[ $varName ]->value = $value;
-            if ($nocache || $this->isRenderingCache) {
-                $this->tpl_vars[ $varName ]->nocache = true;
-            }
-        } else {
-            $this->tpl_vars[ $varName ] = new Smarty_Variable($value, $nocache || $this->isRenderingCache);
-        }
-        if ($scope >= 0) {
-            if ($scope > 0 || $this->scope > 0) {
-                $this->smarty->ext->_updateScope->_updateScope($this, $varName, $scope);
-            }
-        }
-    }
-
-    /**
-     * Check if plugins are callable require file otherwise
-     *
-     * @param array $plugins required plugins
-     *
-     * @throws \SmartyException
-     */
-    public function _checkPlugins($plugins)
-    {
-        static $checked = array();
-        foreach ($plugins as $plugin) {
-            $name = join('::', (array)$plugin[ 'function' ]);
-            if (!isset($checked[ $name ])) {
-                if (!is_callable($plugin[ 'function' ])) {
-                    if (is_file($plugin[ 'file' ])) {
-                        include_once $plugin[ 'file' ];
-                        if (is_callable($plugin[ 'function' ])) {
-                            $checked[ $name ] = true;
-                        }
-                    }
-                } else {
-                    $checked[ $name ] = true;
-                }
-            }
-            if (!isset($checked[ $name ])) {
-                if (false !== $this->smarty->loadPlugin($name)) {
-                    $checked[ $name ] = true;
-                } else {
-                    throw new SmartyException("Plugin '{$name}' not callable");
-                }
-            }
-        }
-    }
-
-    /**
-     * This function is executed automatically when a compiled or cached template file is included
-     * - Decode saved properties from compiled template and cache files
-     * - Check if compiled or cache file is valid
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param array                     $properties special template properties
-     * @param bool                      $cache      flag if called from cache file
-     *
-     * @return bool flag if compiled or cache file is valid
-     * @throws \SmartyException
-     */
-    public function _decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
-    {
-        // on cache resources other than file check version stored in cache code
-        if (!isset($properties[ 'version' ]) || Smarty::SMARTY_VERSION !== $properties[ 'version' ]) {
-            if ($cache) {
-                $tpl->smarty->clearAllCache();
-            } else {
-                $tpl->smarty->clearCompiledTemplate();
-            }
-            return false;
-        }
-        $is_valid = true;
-        if (!empty($properties[ 'file_dependency' ])
-            && ((!$cache && $tpl->compile_check) || $tpl->compile_check === Smarty::COMPILECHECK_ON)
-        ) {
-            // check file dependencies at compiled code
-            foreach ($properties[ 'file_dependency' ] as $_file_to_check) {
-                if ($_file_to_check[ 2 ] === 'file' || $_file_to_check[ 2 ] === 'php') {
-                    if ($tpl->source->filepath === $_file_to_check[ 0 ]) {
-                        // do not recheck current template
-                        continue;
-                        //$mtime = $tpl->source->getTimeStamp();
-                    } else {
-                        // file and php types can be checked without loading the respective resource handlers
-                        $mtime = is_file($_file_to_check[ 0 ]) ? filemtime($_file_to_check[ 0 ]) : false;
-                    }
-                } else {
-                    $handler = Smarty_Resource::load($tpl->smarty, $_file_to_check[ 2 ]);
-                    if ($handler->checkTimestamps()) {
-                        $source = Smarty_Template_Source::load($tpl, $tpl->smarty, $_file_to_check[ 0 ]);
-                        $mtime = $source->getTimeStamp();
-                    } else {
-                        continue;
-                    }
-                }
-                if ($mtime === false || $mtime > $_file_to_check[ 1 ]) {
-                    $is_valid = false;
-                    break;
-                }
-            }
-        }
-        if ($cache) {
-            // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
-            if ($tpl->caching === Smarty::CACHING_LIFETIME_SAVED && $properties[ 'cache_lifetime' ] >= 0
-                && (time() > ($tpl->cached->timestamp + $properties[ 'cache_lifetime' ]))
-            ) {
-                $is_valid = false;
-            }
-            $tpl->cached->cache_lifetime = $properties[ 'cache_lifetime' ];
-            $tpl->cached->valid = $is_valid;
-            $resource = $tpl->cached;
-        } else {
-            $tpl->mustCompile = !$is_valid;
-            $resource = $tpl->compiled;
-            $resource->includes = isset($properties[ 'includes' ]) ? $properties[ 'includes' ] : array();
-        }
-        if ($is_valid) {
-            $resource->unifunc = $properties[ 'unifunc' ];
-            $resource->has_nocache_code = $properties[ 'has_nocache_code' ];
-            //            $tpl->compiled->nocache_hash = $properties['nocache_hash'];
-            $resource->file_dependency = $properties[ 'file_dependency' ];
-        }
-        return $is_valid && !function_exists($properties[ 'unifunc' ]);
-    }
-
-    /**
-     * Compiles the template
-     * If the template is not evaluated the compiled template is saved on disk
-     *
-     * @throws \Exception
-     */
-    public function compileTemplateSource()
-    {
-        return $this->compiled->compileTemplateSource($this);
-    }
-
-    /**
-     * Writes the content to cache resource
-     *
-     * @param string $content
-     *
-     * @return bool
-     */
-    public function writeCachedContent($content)
-    {
-        return $this->smarty->ext->_updateCache->writeCachedContent($this, $content);
-    }
-
-    /**
-     * Get unique template id
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function _getTemplateId()
-    {
-        return isset($this->templateId) ? $this->templateId : $this->templateId =
-            $this->smarty->_getTemplateId($this->template_resource, $this->cache_id, $this->compile_id);
-    }
-
-    /**
-     * runtime error not matching capture tags
-     *
-     * @throws \SmartyException
-     */
-    public function capture_error()
-    {
-        throw new SmartyException("Not matching {capture} open/close in '{$this->template_resource}'");
-    }
-
-    /**
-     * Load compiled object
-     *
-     * @param bool $force force new compiled object
-     */
-    public function loadCompiled($force = false)
-    {
-        if ($force || !isset($this->compiled)) {
-            $this->compiled = Smarty_Template_Compiled::load($this);
-        }
-    }
-
-    /**
-     * Load cached object
-     *
-     * @param bool $force force new cached object
-     */
-    public function loadCached($force = false)
-    {
-        if ($force || !isset($this->cached)) {
-            $this->cached = Smarty_Template_Cached::load($this);
-        }
-    }
-
-    /**
-     * Load inheritance object
-     */
-    public function _loadInheritance()
-    {
-        if (!isset($this->inheritance)) {
-            $this->inheritance = new Smarty_Internal_Runtime_Inheritance();
-        }
-    }
-
-    /**
-     * Unload inheritance object
-     */
-    public function _cleanUp()
-    {
-        $this->startRenderCallbacks = array();
-        $this->endRenderCallbacks = array();
-        $this->inheritance = null;
-    }
-
-    /**
-     * Load compiler object
-     *
-     * @throws \SmartyException
-     */
-    public function loadCompiler()
-    {
-        if (!class_exists($this->source->compiler_class)) {
-            $this->smarty->loadPlugin($this->source->compiler_class);
-        }
-        $this->compiler =
-            new $this->source->compiler_class(
-                $this->source->template_lexer_class,
-                $this->source->template_parser_class,
-                $this->smarty
-            );
-    }
-
-    /**
-     * Handle unknown class methods
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
-     *
-     * @return mixed
-     */
-    public function __call($name, $args)
-    {
-        // method of Smarty object?
-        if (method_exists($this->smarty, $name)) {
-            return call_user_func_array(array($this->smarty, $name), $args);
-        }
-        // parent
-        return parent::__call($name, $args);
-    }
-
-    /**
-     * get Smarty property in template context
-     *
-     * @param string $property_name property name
-     *
-     * @return mixed|Smarty_Template_Cached
-     * @throws SmartyException
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'compiled':
-                $this->loadCompiled();
-                return $this->compiled;
-            case 'cached':
-                $this->loadCached();
-                return $this->cached;
-            case 'compiler':
-                $this->loadCompiler();
-                return $this->compiler;
-            default:
-                // Smarty property ?
-                if (property_exists($this->smarty, $property_name)) {
-                    return $this->smarty->$property_name;
-                }
-        }
-        throw new SmartyException("template property '$property_name' does not exist.");
-    }
-
-    /**
-     * set Smarty property in template context
-     *
-     * @param string $property_name property name
-     * @param mixed  $value         value
-     *
-     * @throws SmartyException
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'compiled':
-            case 'cached':
-            case 'compiler':
-                $this->$property_name = $value;
-                return;
-            default:
-                // Smarty property ?
-                if (property_exists($this->smarty, $property_name)) {
-                    $this->smarty->$property_name = $value;
-                    return;
-                }
-        }
-        throw new SmartyException("invalid template property '$property_name'.");
-    }
-
-    /**
-     * Template data object destructor
-     */
-    public function __destruct()
-    {
-        if ($this->smarty->cache_locking && isset($this->cached) && $this->cached->is_locked) {
-            $this->cached->handler->releaseLock($this->smarty, $this->cached);
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_templatebase.php b/include/smarty/libs/sysplugins/smarty_internal_templatebase.php
deleted file mode 100644
index 918362e91..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_templatebase.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Smarty Template  Base
- * This file contains the basic shared methods for template handling
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Class with shared smarty/template methods
- *
- * @package    Smarty
- * @subpackage Template
- *
- * @property int $_objType
- *
- * The following methods will be dynamically loaded by the extension handler when they are called.
- * They are located in a corresponding Smarty_Internal_Method_xxxx class
- *
- * @method Smarty_Internal_TemplateBase addAutoloadFilters(mixed $filters, string $type = null)
- * @method Smarty_Internal_TemplateBase addDefaultModifiers(mixed $modifiers)
- * @method Smarty_Internal_TemplateBase addLiterals(mixed $literals)
- * @method Smarty_Internal_TemplateBase createData(Smarty_Internal_Data $parent = null, string $name = null)
- * @method array getAutoloadFilters(string $type = null)
- * @method string getDebugTemplate()
- * @method array getDefaultModifier()
- * @method array getLiterals()
- * @method array getTags(mixed $template = null)
- * @method object getRegisteredObject(string $object_name)
- * @method Smarty_Internal_TemplateBase registerCacheResource(string $name, Smarty_CacheResource $resource_handler)
- * @method Smarty_Internal_TemplateBase registerClass(string $class_name, string $class_impl)
- * @method Smarty_Internal_TemplateBase registerDefaultConfigHandler(callback $callback)
- * @method Smarty_Internal_TemplateBase registerDefaultPluginHandler(callback $callback)
- * @method Smarty_Internal_TemplateBase registerDefaultTemplateHandler(callback $callback)
- * @method Smarty_Internal_TemplateBase registerResource(string $name, mixed $resource_handler)
- * @method Smarty_Internal_TemplateBase setAutoloadFilters(mixed $filters, string $type = null)
- * @method Smarty_Internal_TemplateBase setDebugTemplate(string $tpl_name)
- * @method Smarty_Internal_TemplateBase setDefaultModifiers(mixed $modifiers)
- * @method Smarty_Internal_TemplateBase setLiterals(mixed $literals)
- * @method Smarty_Internal_TemplateBase unloadFilter(string $type, string $name)
- * @method Smarty_Internal_TemplateBase unregisterCacheResource(string $name)
- * @method Smarty_Internal_TemplateBase unregisterObject(string $object_name)
- * @method Smarty_Internal_TemplateBase unregisterPlugin(string $type, string $name)
- * @method Smarty_Internal_TemplateBase unregisterFilter(string $type, mixed $callback)
- * @method Smarty_Internal_TemplateBase unregisterResource(string $name)
- */
-abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
-{
-    /**
-     * Set this if you want different sets of cache files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $cache_id = null;
-
-    /**
-     * Set this if you want different sets of compiled files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $compile_id = null;
-
-    /**
-     * caching enabled
-     *
-     * @var int
-     */
-    public $caching = Smarty::CACHING_OFF;
-
-    /**
-     * check template for modifications?
-     *
-     * @var int
-     */
-    public $compile_check = Smarty::COMPILECHECK_ON;
-
-    /**
-     * cache lifetime in seconds
-     *
-     * @var integer
-     */
-    public $cache_lifetime = 3600;
-
-    /**
-     * Array of source information for known template functions
-     *
-     * @var array
-     */
-    public $tplFunctions = array();
-
-    /**
-     * universal cache
-     *
-     * @var array()
-     */
-    public $_cache = array();
-
-    /**
-     * fetches a rendered Smarty template
-     *
-     * @param string $template   the resource handle of the template file or template object
-     * @param mixed  $cache_id   cache id to be used with this template
-     * @param mixed  $compile_id compile id to be used with this template
-     * @param object $parent     next higher level of Smarty variables
-     *
-     * @throws Exception
-     * @throws SmartyException
-     * @return string rendered template output
-     */
-    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null)
-    {
-        $result = $this->_execute($template, $cache_id, $compile_id, $parent, 0);
-        return $result === null ? ob_get_clean() : $result;
-    }
-
-    /**
-     * displays a Smarty template
-     *
-     * @param string $template   the resource handle of the template file or template object
-     * @param mixed  $cache_id   cache id to be used with this template
-     * @param mixed  $compile_id compile id to be used with this template
-     * @param object $parent     next higher level of Smarty variables
-     *
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
-    {
-        // display template
-        $this->_execute($template, $cache_id, $compile_id, $parent, 1);
-    }
-
-    /**
-     * test if cache is valid
-     *
-     * @api  Smarty::isCached()
-     * @link https://www.smarty.net/docs/en/api.is.cached.tpl
-     *
-     * @param null|string|\Smarty_Internal_Template $template   the resource handle of the template file or template
-     *                                                          object
-     * @param mixed                                 $cache_id   cache id to be used with this template
-     * @param mixed                                 $compile_id compile id to be used with this template
-     * @param object                                $parent     next higher level of Smarty variables
-     *
-     * @return bool cache status
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
-    {
-        return $this->_execute($template, $cache_id, $compile_id, $parent, 2);
-    }
-
-    /**
-     * fetches a rendered Smarty template
-     *
-     * @param string $template   the resource handle of the template file or template object
-     * @param mixed  $cache_id   cache id to be used with this template
-     * @param mixed  $compile_id compile id to be used with this template
-     * @param object $parent     next higher level of Smarty variables
-     * @param string $function   function type 0 = fetch,  1 = display, 2 = isCache
-     *
-     * @return mixed
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    private function _execute($template, $cache_id, $compile_id, $parent, $function)
-    {
-        $smarty = $this->_getSmartyObj();
-        $saveVars = true;
-        if ($template === null) {
-            if (!$this->_isTplObj()) {
-                throw new SmartyException($function . '():Missing \'$template\' parameter');
-            } else {
-                $template = $this;
-            }
-        } elseif (is_object($template)) {
-            /* @var Smarty_Internal_Template $template */
-            if (!isset($template->_objType) || !$template->_isTplObj()) {
-                throw new SmartyException($function . '():Template object expected');
-            }
-        } else {
-            // get template object
-            $saveVars = false;
-            $template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent ? $parent : $this, false);
-            if ($this->_objType === 1) {
-                // set caching in template object
-                $template->caching = $this->caching;
-            }
-        }
-        // make sure we have integer values
-        $template->caching = (int)$template->caching;
-        // fetch template content
-        $level = ob_get_level();
-        try {
-            $_smarty_old_error_level =
-                isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
-
-            if ($smarty->isMutingUndefinedOrNullWarnings()) {
-                $errorHandler = new Smarty_Internal_ErrorHandler();
-                $errorHandler->activate();
-            }
-
-            if ($this->_objType === 2) {
-                /* @var Smarty_Internal_Template $this */
-                $template->tplFunctions = $this->tplFunctions;
-                $template->inheritance = $this->inheritance;
-            }
-            /* @var Smarty_Internal_Template $parent */
-            if (isset($parent->_objType) && ($parent->_objType === 2) && !empty($parent->tplFunctions)) {
-                $template->tplFunctions = array_merge($parent->tplFunctions, $template->tplFunctions);
-            }
-            if ($function === 2) {
-                if ($template->caching) {
-                    // return cache status of template
-                    if (!isset($template->cached)) {
-                        $template->loadCached();
-                    }
-                    $result = $template->cached->isCached($template);
-                    Smarty_Internal_Template::$isCacheTplObj[ $template->_getTemplateId() ] = $template;
-                } else {
-                    return false;
-                }
-            } else {
-                if ($saveVars) {
-                    $savedTplVars = $template->tpl_vars;
-                    $savedConfigVars = $template->config_vars;
-                }
-                ob_start();
-                $template->_mergeVars();
-                if (!empty(Smarty::$global_tpl_vars)) {
-                    $template->tpl_vars = array_merge(Smarty::$global_tpl_vars, $template->tpl_vars);
-                }
-                $result = $template->render(false, $function);
-                $template->_cleanUp();
-                if ($saveVars) {
-                    $template->tpl_vars = $savedTplVars;
-                    $template->config_vars = $savedConfigVars;
-                } else {
-                    if (!$function && !isset(Smarty_Internal_Template::$tplObjCache[ $template->templateId ])) {
-                        $template->parent = null;
-                        $template->tpl_vars = $template->config_vars = array();
-                        Smarty_Internal_Template::$tplObjCache[ $template->templateId ] = $template;
-                    }
-                }
-            }
-
-            if (isset($errorHandler)) {
-                $errorHandler->deactivate();
-            }
-
-            if (isset($_smarty_old_error_level)) {
-                error_reporting($_smarty_old_error_level);
-            }
-            return $result;
-        } catch (Throwable $e) {
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-            if (isset($errorHandler)) {
-                $errorHandler->deactivate();
-            }
-
-            if (isset($_smarty_old_error_level)) {
-                error_reporting($_smarty_old_error_level);
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Registers plugin to be used in templates
-     *
-     * @api  Smarty::registerPlugin()
-     * @link https://www.smarty.net/docs/en/api.register.plugin.tpl
-     *
-     * @param string   $type       plugin type
-     * @param string   $name       name of template tag
-     * @param callable $callback   PHP callback to register
-     * @param bool     $cacheable  if true (default) this function is cache able
-     * @param mixed    $cache_attr caching attributes if any
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function registerPlugin($type, $name, $callback, $cacheable = true, $cache_attr = null)
-    {
-        return $this->ext->registerPlugin->registerPlugin($this, $type, $name, $callback, $cacheable, $cache_attr);
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @api  Smarty::loadFilter()
-     * @link https://www.smarty.net/docs/en/api.load.filter.tpl
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     *
-     * @return bool
-     * @throws \SmartyException
-     */
-    public function loadFilter($type, $name)
-    {
-        return $this->ext->loadFilter->loadFilter($this, $type, $name);
-    }
-
-    /**
-     * Registers a filter function
-     *
-     * @api  Smarty::registerFilter()
-     * @link https://www.smarty.net/docs/en/api.register.filter.tpl
-     *
-     * @param string      $type filter type
-     * @param callable    $callback
-     * @param string|null $name optional filter name
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function registerFilter($type, $callback, $name = null)
-    {
-        return $this->ext->registerFilter->registerFilter($this, $type, $callback, $name);
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @api  Smarty::registerObject()
-     * @link https://www.smarty.net/docs/en/api.register.object.tpl
-     *
-     * @param string $object_name
-     * @param object $object                     the referenced PHP object to register
-     * @param array  $allowed_methods_properties list of allowed methods (empty = all)
-     * @param bool   $format                     smarty argument format, else traditional
-     * @param array  $block_methods              list of block-methods
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function registerObject(
-        $object_name,
-        $object,
-        $allowed_methods_properties = array(),
-        $format = true,
-        $block_methods = array()
-    ) {
-        return $this->ext->registerObject->registerObject(
-            $this,
-            $object_name,
-            $object,
-            $allowed_methods_properties,
-            $format,
-            $block_methods
-        );
-    }
-
-    /**
-     * @param int $compile_check
-     */
-    public function setCompileCheck($compile_check)
-    {
-        $this->compile_check = (int)$compile_check;
-    }
-
-    /**
-     * @param int $caching
-     */
-    public function setCaching($caching)
-    {
-        $this->caching = (int)$caching;
-    }
-
-    /**
-     * @param int $cache_lifetime
-     */
-    public function setCacheLifetime($cache_lifetime)
-    {
-        $this->cache_lifetime = $cache_lifetime;
-    }
-
-    /**
-     * @param string $compile_id
-     */
-    public function setCompileId($compile_id)
-    {
-        $this->compile_id = $compile_id;
-    }
-
-    /**
-     * @param string $cache_id
-     */
-    public function setCacheId($cache_id)
-    {
-        $this->cache_id = $cache_id;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
deleted file mode 100644
index d5c18d31a..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
+++ /dev/null
@@ -1,1749 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Smarty Template Compiler Base
- * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Main abstract compiler class
- *
- * @package    Smarty
- * @subpackage Compiler
- *
- * @property Smarty_Internal_SmartyTemplateCompiler $prefixCompiledCode  = ''
- * @property Smarty_Internal_SmartyTemplateCompiler $postfixCompiledCode = ''
- * @method   registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
- * @method   unregisterPostCompileCallback($key)
- */
-abstract class Smarty_Internal_TemplateCompilerBase
-{
-    /**
-     * compile tag objects cache
-     *
-     * @var array
-     */
-    public static $_tag_objects = array();
-
-    /**
-     * counter for prefix variable number
-     *
-     * @var int
-     */
-    public static $prefixVariableNumber = 0;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * Parser object
-     *
-     * @var Smarty_Internal_Templateparser
-     */
-    public $parser = null;
-
-    /**
-     * hash for nocache sections
-     *
-     * @var mixed
-     */
-    public $nocache_hash = null;
-
-    /**
-     * suppress generation of nocache code
-     *
-     * @var bool
-     */
-    public $suppressNocacheProcessing = false;
-
-    /**
-     * caching enabled (copied from template object)
-     *
-     * @var int
-     */
-    public $caching = 0;
-
-    /**
-     * tag stack
-     *
-     * @var array
-     */
-    public $_tag_stack = array();
-
-    /**
-     * tag stack count
-     *
-     * @var array
-     */
-    public $_tag_stack_count = array();
-
-    /**
-     * Plugins used by template
-     *
-     * @var array
-     */
-    public $required_plugins = array('compiled' => array(), 'nocache' => array());
-
-    /**
-     * Required plugins stack
-     *
-     * @var array
-     */
-    public $required_plugins_stack = array();
-
-    /**
-     * current template
-     *
-     * @var Smarty_Internal_Template
-     */
-    public $template = null;
-
-    /**
-     * merged included sub template data
-     *
-     * @var array
-     */
-    public $mergedSubTemplatesData = array();
-
-    /**
-     * merged sub template code
-     *
-     * @var array
-     */
-    public $mergedSubTemplatesCode = array();
-
-    /**
-     * collected template properties during compilation
-     *
-     * @var array
-     */
-    public $templateProperties = array();
-
-    /**
-     * source line offset for error messages
-     *
-     * @var int
-     */
-    public $trace_line_offset = 0;
-
-    /**
-     * trace uid
-     *
-     * @var string
-     */
-    public $trace_uid = '';
-
-    /**
-     * trace file path
-     *
-     * @var string
-     */
-    public $trace_filepath = '';
-
-    /**
-     * stack for tracing file and line of nested {block} tags
-     *
-     * @var array
-     */
-    public $trace_stack = array();
-
-    /**
-     * plugins loaded by default plugin handler
-     *
-     * @var array
-     */
-    public $default_handler_plugins = array();
-
-    /**
-     * saved preprocessed modifier list
-     *
-     * @var mixed
-     */
-    public $default_modifier_list = null;
-
-    /**
-     * force compilation of complete template as nocache
-     *
-     * @var boolean
-     */
-    public $forceNocache = false;
-
-    /**
-     * flag if compiled template file shall we written
-     *
-     * @var bool
-     */
-    public $write_compiled_code = true;
-
-    /**
-     * Template functions
-     *
-     * @var array
-     */
-    public $tpl_function = array();
-
-    /**
-     * called sub functions from template function
-     *
-     * @var array
-     */
-    public $called_functions = array();
-
-    /**
-     * compiled template or block function code
-     *
-     * @var string
-     */
-    public $blockOrFunctionCode = '';
-
-    /**
-     * flags for used modifier plugins
-     *
-     * @var array
-     */
-    public $modifier_plugins = array();
-
-    /**
-     * type of already compiled modifier
-     *
-     * @var array
-     */
-    public $known_modifier_type = array();
-
-    /**
-     * parent compiler object for merged subtemplates and template functions
-     *
-     * @var Smarty_Internal_TemplateCompilerBase
-     */
-    public $parent_compiler = null;
-
-    /**
-     * Flag true when compiling nocache section
-     *
-     * @var bool
-     */
-    public $nocache = false;
-
-    /**
-     * Flag true when tag is compiled as nocache
-     *
-     * @var bool
-     */
-    public $tag_nocache = false;
-
-    /**
-     * Compiled tag prefix code
-     *
-     * @var array
-     */
-    public $prefix_code = array();
-
-    /**
-     * used prefix variables by current compiled tag
-     *
-     * @var array
-     */
-    public $usedPrefixVariables = array();
-
-    /**
-     * Prefix code  stack
-     *
-     * @var array
-     */
-    public $prefixCodeStack = array();
-
-    /**
-     * Tag has compiled code
-     *
-     * @var bool
-     */
-    public $has_code = false;
-
-    /**
-     * A variable string was compiled
-     *
-     * @var bool
-     */
-    public $has_variable_string = false;
-
-    /**
-     * Stack for {setfilter} {/setfilter}
-     *
-     * @var array
-     */
-    public $variable_filter_stack = array();
-
-    /**
-     * variable filters for {setfilter} {/setfilter}
-     *
-     * @var array
-     */
-    public $variable_filters = array();
-
-    /**
-     * Nesting count of looping tags like {foreach}, {for}, {section}, {while}
-     *
-     * @var int
-     */
-    public $loopNesting = 0;
-
-    /**
-     * Strip preg pattern
-     *
-     * @var string
-     */
-    public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
-
-    /**
-     * plugin search order
-     *
-     * @var array
-     */
-    public $plugin_search_order = array(
-        'function',
-        'block',
-        'compiler',
-        'class'
-    );
-
-    /**
-     * General storage area for tag compiler plugins
-     *
-     * @var array
-     */
-    public $_cache = array();
-
-    /**
-     * Lexer preg pattern for left delimiter
-     *
-     * @var string
-     */
-    private $ldelPreg = '[{]';
-
-    /**
-     * Lexer preg pattern for right delimiter
-     *
-     * @var string
-     */
-    private $rdelPreg = '[}]';
-
-    /**
-     * Length of right delimiter
-     *
-     * @var int
-     */
-    private $rdelLength = 0;
-
-    /**
-     * Length of left delimiter
-     *
-     * @var int
-     */
-    private $ldelLength = 0;
-
-    /**
-     * Lexer preg pattern for user literals
-     *
-     * @var string
-     */
-    private $literalPreg = '';
-
-    /**
-     * Initialize compiler
-     *
-     * @param Smarty $smarty global instance
-     */
-    public function __construct(Smarty $smarty)
-    {
-        $this->smarty = $smarty;
-        $this->nocache_hash = str_replace(
-            array(
-                '.',
-                ','
-            ),
-            '_',
-            uniqid(mt_rand(), true)
-        );
-    }
-
-    /**
-     * Method to compile a Smarty template
-     *
-     * @param Smarty_Internal_Template                  $template template object to compile
-     * @param bool                                      $nocache  true is shall be compiled in nocache mode
-     * @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
-     *
-     * @return bool true if compiling succeeded, false if it failed
-     * @throws \Exception
-     */
-    public function compileTemplate(
-        Smarty_Internal_Template $template,
-        $nocache = null,
-        Smarty_Internal_TemplateCompilerBase $parent_compiler = null
-    ) {
-        // get code frame of compiled template
-        $_compiled_code = $template->smarty->ext->_codeFrame->create(
-            $template,
-            $this->compileTemplateSource(
-                $template,
-                $nocache,
-                $parent_compiler
-            ),
-            $this->postFilter($this->blockOrFunctionCode) .
-            join('', $this->mergedSubTemplatesCode),
-            false,
-            $this
-        );
-        return $_compiled_code;
-    }
-
-    /**
-     * Compile template source and run optional post filter
-     *
-     * @param \Smarty_Internal_Template             $template
-     * @param null|bool                             $nocache flag if template must be compiled in nocache mode
-     * @param \Smarty_Internal_TemplateCompilerBase $parent_compiler
-     *
-     * @return string
-     * @throws \Exception
-     */
-    public function compileTemplateSource(
-        Smarty_Internal_Template $template,
-        $nocache = null,
-        Smarty_Internal_TemplateCompilerBase $parent_compiler = null
-    ) {
-        try {
-            // save template object in compiler class
-            $this->template = $template;
-            if ($this->smarty->debugging) {
-                if (!isset($this->smarty->_debug)) {
-                    $this->smarty->_debug = new Smarty_Internal_Debug();
-                }
-                $this->smarty->_debug->start_compile($this->template);
-            }
-            $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
-            $nocache = isset($nocache) ? $nocache : false;
-            if (empty($template->compiled->nocache_hash)) {
-                $template->compiled->nocache_hash = $this->nocache_hash;
-            } else {
-                $this->nocache_hash = $template->compiled->nocache_hash;
-            }
-            $this->caching = $template->caching;
-            // flag for nocache sections
-            $this->nocache = $nocache;
-            $this->tag_nocache = false;
-            // reset has nocache code flag
-            $this->template->compiled->has_nocache_code = false;
-            $this->has_variable_string = false;
-            $this->prefix_code = array();
-            // add file dependency
-            if ($this->smarty->merge_compiled_includes || $this->template->source->handler->checkTimestamps()) {
-                $this->parent_compiler->template->compiled->file_dependency[ $this->template->source->uid ] =
-                    array(
-                        $this->template->source->filepath,
-                        $this->template->source->getTimeStamp(),
-                        $this->template->source->type,
-                    );
-            }
-            $this->smarty->_current_file = $this->template->source->filepath;
-            // get template source
-            if (!empty($this->template->source->components)) {
-                // we have array of inheritance templates by extends: resource
-                // generate corresponding source code sequence
-                $_content =
-                    Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template);
-            } else {
-                // get template source
-                $_content = $this->template->source->getContent();
-            }
-            $_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true));
-            if (!empty($this->required_plugins[ 'compiled' ]) || !empty($this->required_plugins[ 'nocache' ])) {
-                $_compiled_code = '<?php ' . $this->compileRequiredPlugins() . "?>\n" . $_compiled_code;
-            }
-        } catch (Exception $e) {
-            if ($this->smarty->debugging) {
-                $this->smarty->_debug->end_compile($this->template);
-            }
-            $this->_tag_stack = array();
-            // free memory
-            $this->parent_compiler = null;
-            $this->template = null;
-            $this->parser = null;
-            throw $e;
-        }
-        if ($this->smarty->debugging) {
-            $this->smarty->_debug->end_compile($this->template);
-        }
-        $this->parent_compiler = null;
-        $this->parser = null;
-        return $_compiled_code;
-    }
-
-    /**
-     * Optionally process compiled code by post filter
-     *
-     * @param string $code compiled code
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function postFilter($code)
-    {
-        // run post filter if on code
-        if (!empty($code)
-            && (isset($this->smarty->autoload_filters[ 'post' ]) || isset($this->smarty->registered_filters[ 'post' ]))
-        ) {
-            return $this->smarty->ext->_filterHandler->runFilter('post', $code, $this->template);
-        } else {
-            return $code;
-        }
-    }
-
-    /**
-     * Run optional prefilter
-     *
-     * @param string $_content template source
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function preFilter($_content)
-    {
-        // run pre filter if required
-        if ($_content !== ''
-            && ((isset($this->smarty->autoload_filters[ 'pre' ]) || isset($this->smarty->registered_filters[ 'pre' ])))
-        ) {
-            return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template);
-        } else {
-            return $_content;
-        }
-    }
-
-    /**
-     * Compile Tag
-     * This is a call back from the lexer/parser
-     *
-     * Save current prefix code
-     * Compile tag
-     * Merge tag prefix code with saved one
-     * (required nested tags in attributes)
-     *
-     * @param string $tag       tag name
-     * @param array  $args      array with tag attributes
-     * @param array  $parameter array with compilation parameter
-     *
-     * @throws SmartyCompilerException
-     * @throws SmartyException
-     * @return string compiled code
-     */
-    public function compileTag($tag, $args, $parameter = array())
-    {
-        $this->prefixCodeStack[] = $this->prefix_code;
-        $this->prefix_code = array();
-        $result = $this->compileTag2($tag, $args, $parameter);
-        $this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
-        return $result;
-    }
-
-    /**
-     * compile variable
-     *
-     * @param string $variable
-     *
-     * @return string
-     */
-    public function compileVariable($variable)
-    {
-        if (!strpos($variable, '(')) {
-            // not a variable variable
-            $var = trim($variable, '\'');
-            $this->tag_nocache = $this->tag_nocache |
-                                 $this->template->ext->getTemplateVars->_getVariable(
-                                     $this->template,
-                                     $var,
-                                     null,
-                                     true,
-                                     false
-                                 )->nocache;
-            // todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache;
-        }
-        return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
-    }
-
-    /**
-     * compile config variable
-     *
-     * @param string $variable
-     *
-     * @return string
-     */
-    public function compileConfigVariable($variable)
-    {
-        // return '$_smarty_tpl->config_vars[' . $variable . ']';
-        return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')';
-    }
-
-    /**
-     * compile PHP function call
-     *
-     * @param string $name
-     * @param array  $parameter
-     *
-     * @return string
-     * @throws \SmartyCompilerException
-     */
-    public function compilePHPFunctionCall($name, $parameter)
-    {
-        if (!$this->smarty->security_policy || $this->smarty->security_policy->isTrustedPhpFunction($name, $this)) {
-            if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0
-                || strcasecmp($name, 'array') === 0 || is_callable($name)
-            ) {
-                $func_name = smarty_strtolower_ascii($name);
-
-                if ($func_name === 'isset') {
-                    if (count($parameter) === 0) {
-                        $this->trigger_template_error('Illegal number of parameter in "isset()"');
-                    }
-
-                    $pa = array();
-                    foreach ($parameter as $p) {
-                        $pa[] = $this->syntaxMatchesVariable($p) ? 'isset(' . $p . ')' : '(' . $p . ' !== null )';
-                    }
-                    return '(' . implode(' && ', $pa) . ')';
-
-                } elseif (in_array(
-                    $func_name,
-                    array(
-                        'empty',
-                        'reset',
-                        'current',
-                        'end',
-                        'prev',
-                        'next'
-                    )
-                )
-                ) {
-                    if (count($parameter) !== 1) {
-                        $this->trigger_template_error("Illegal number of parameter in '{$func_name()}'");
-                    }
-                    if ($func_name === 'empty') {
-                        return $func_name . '(' .
-                               str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
-                    } else {
-                        return $func_name . '(' . $parameter[ 0 ] . ')';
-                    }
-                } else {
-                    return $name . '(' . implode(',', $parameter) . ')';
-                }
-            } else {
-                $this->trigger_template_error("unknown function '{$name}'");
-            }
-        }
-    }
-
-    /**
-     * Determines whether the passed string represents a valid (PHP) variable.
-     * This is important, because `isset()` only works on variables and `empty()` can only be passed
-     * a variable prior to php5.5
-     * @param $string
-     * @return bool
-     */
-    private function syntaxMatchesVariable($string) {
-        static $regex_pattern = '/^\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*((->)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|\[.*]*\])*$/';
-        return 1 === preg_match($regex_pattern, trim($string));
-    }
-
-    /**
-     * This method is called from parser to process a text content section if strip is enabled
-     * - remove text from inheritance child templates as they may generate output
-     *
-     * @param string $text
-     *
-     * @return string
-     */
-    public function processText($text)
-    {
-
-        if (strpos($text, '<') === false) {
-            return preg_replace($this->stripRegEx, '', $text);
-        }
-
-        $store = array();
-        $_store = 0;
-
-        // capture html elements not to be messed with
-        $_offset = 0;
-        if (preg_match_all(
-            '#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
-            $text,
-            $matches,
-            PREG_OFFSET_CAPTURE | PREG_SET_ORDER
-        )
-        ) {
-            foreach ($matches as $match) {
-                $store[] = $match[ 0 ][ 0 ];
-                $_length = strlen($match[ 0 ][ 0 ]);
-                $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-                $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
-                $_offset += $_length - strlen($replace);
-                $_store++;
-            }
-        }
-        $expressions = array(// replace multiple spaces between tags by a single space
-                             '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s'                            => '\1 \2',
-                             // remove newline between tags
-                             '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s'                     => '\1\2',
-                             // remove multiple spaces between attributes (but not in attribute values!)
-                             '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
-                             '#>[\040\011]+$#Ss'                                                       => '> ',
-                             '#>[\040\011]*[\n]\s*$#Ss'                                                => '>',
-                             $this->stripRegEx                                                         => '',
-        );
-        $text = preg_replace(array_keys($expressions), array_values($expressions), $text);
-        $_offset = 0;
-        if (preg_match_all(
-            '#@!@SMARTY:([0-9]+):SMARTY@!@#is',
-            $text,
-            $matches,
-            PREG_OFFSET_CAPTURE | PREG_SET_ORDER
-        )
-        ) {
-            foreach ($matches as $match) {
-                $_length = strlen($match[ 0 ][ 0 ]);
-                $replace = $store[ $match[ 1 ][ 0 ] ];
-                $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
-                $_offset += strlen($replace) - $_length;
-                $_store++;
-            }
-        }
-        return $text;
-    }
-
-    /**
-     * lazy loads internal compile plugin for tag and calls the compile method
-     * compile objects cached for reuse.
-     * class name format:  Smarty_Internal_Compile_TagName
-     * plugin filename format: Smarty_Internal_TagName.php
-     *
-     * @param string $tag    tag name
-     * @param array  $args   list of tag attributes
-     * @param mixed  $param1 optional parameter
-     * @param mixed  $param2 optional parameter
-     * @param mixed  $param3 optional parameter
-     *
-     * @return bool|string compiled code or false
-     * @throws \SmartyCompilerException
-     */
-    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
-    {
-        /* @var Smarty_Internal_CompileBase $tagCompiler */
-        $tagCompiler = $this->getTagCompiler($tag);
-        // compile this tag
-        return $tagCompiler === false ? false : $tagCompiler->compile($args, $this, $param1, $param2, $param3);
-    }
-
-    /**
-     * lazy loads internal compile plugin for tag compile objects cached for reuse.
-     *
-     * class name format:  Smarty_Internal_Compile_TagName
-     * plugin filename format: Smarty_Internal_TagName.php
-     *
-     * @param string $tag tag name
-     *
-     * @return bool|\Smarty_Internal_CompileBase tag compiler object or false if not found
-     */
-    public function getTagCompiler($tag)
-    {
-        // re-use object if already exists
-        if (!isset(self::$_tag_objects[ $tag ])) {
-            // lazy load internal compiler plugin
-            $_tag = explode('_', $tag);
-            $_tag = array_map('smarty_ucfirst_ascii', $_tag);
-            $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
-            if (class_exists($class_name)
-                && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
-            ) {
-                self::$_tag_objects[ $tag ] = new $class_name;
-            } else {
-                self::$_tag_objects[ $tag ] = false;
-            }
-        }
-        return self::$_tag_objects[ $tag ];
-    }
-
-    /**
-     * Check for plugins and return function name
-     *
-     * @param        $plugin_name
-     * @param string $plugin_type type of plugin
-     *
-     * @return string call name of function
-     * @throws \SmartyException
-     */
-    public function getPlugin($plugin_name, $plugin_type)
-    {
-        $function = null;
-        if ($this->caching && ($this->nocache || $this->tag_nocache)) {
-            if (isset($this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
-                $function =
-                    $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
-            } elseif (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
-                $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] =
-                    $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ];
-                $function =
-                    $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
-            }
-        } else {
-            if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
-                $function =
-                    $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
-            } elseif (isset($this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
-                $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] =
-                    $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ];
-                $function =
-                    $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
-            }
-        }
-        if (isset($function)) {
-            if ($plugin_type === 'modifier') {
-                $this->modifier_plugins[ $plugin_name ] = true;
-            }
-            return $function;
-        }
-        // loop through plugin dirs and find the plugin
-        $function = 'smarty_' . $plugin_type . '_' . $plugin_name;
-        $file = $this->smarty->loadPlugin($function, false);
-        if (is_string($file)) {
-            if ($this->caching && ($this->nocache || $this->tag_nocache)) {
-                $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
-                    $file;
-                $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
-                    $function;
-            } else {
-                $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
-                    $file;
-                $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
-                    $function;
-            }
-            if ($plugin_type === 'modifier') {
-                $this->modifier_plugins[ $plugin_name ] = true;
-            }
-            return $function;
-        }
-        if (is_callable($function)) {
-            // plugin function is defined in the script
-            return $function;
-        }
-        return false;
-    }
-
-    /**
-     * Check for plugins by default plugin handler
-     *
-     * @param string $tag         name of tag
-     * @param string $plugin_type type of plugin
-     *
-     * @return bool true if found
-     * @throws \SmartyCompilerException
-     */
-    public function getPluginFromDefaultHandler($tag, $plugin_type)
-    {
-        $callback = null;
-        $script = null;
-        $cacheable = true;
-        $result = call_user_func_array(
-            $this->smarty->default_plugin_handler_func,
-            array(
-                $tag,
-                $plugin_type,
-                $this->template,
-                &$callback,
-                &$script,
-                &$cacheable,
-            )
-        );
-        if ($result) {
-            $this->tag_nocache = $this->tag_nocache || !$cacheable;
-            if ($script !== null) {
-                if (is_file($script)) {
-                    if ($this->caching && ($this->nocache || $this->tag_nocache)) {
-                        $this->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] =
-                            $script;
-                        $this->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] =
-                            $callback;
-                    } else {
-                        $this->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] =
-                            $script;
-                        $this->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] =
-                            $callback;
-                    }
-                    include_once $script;
-                } else {
-                    $this->trigger_template_error("Default plugin handler: Returned script file '{$script}' for '{$tag}' not found");
-                }
-            }
-            if (is_callable($callback)) {
-                $this->default_handler_plugins[ $plugin_type ][ $tag ] = array(
-                    $callback,
-                    true,
-                    array()
-                );
-                return true;
-            } else {
-                $this->trigger_template_error("Default plugin handler: Returned callback for '{$tag}' not callable");
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Append code segments and remove unneeded ?> <?php transitions
-     *
-     * @param string $left
-     * @param string $right
-     *
-     * @return string
-     */
-    public function appendCode($left, $right)
-    {
-        if (preg_match('/\s*\?>\s?$/D', $left) && preg_match('/^<\?php\s+/', $right)) {
-            $left = preg_replace('/\s*\?>\s?$/D', "\n", $left);
-            $left .= preg_replace('/^<\?php\s+/', '', $right);
-        } else {
-            $left .= $right;
-        }
-        return $left;
-    }
-
-    /**
-     * Inject inline code for nocache template sections
-     * This method gets the content of each template element from the parser.
-     * If the content is compiled code and it should be not cached the code is injected
-     * into the rendered output.
-     *
-     * @param string  $content content of template element
-     * @param boolean $is_code true if content is compiled code
-     *
-     * @return string  content
-     */
-    public function processNocacheCode($content, $is_code)
-    {
-        // If the template is not evaluated and we have a nocache section and or a nocache tag
-        if ($is_code && !empty($content)) {
-            // generate replacement code
-            if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->caching
-                && !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
-            ) {
-                $this->template->compiled->has_nocache_code = true;
-                $_output = addcslashes($content, '\'\\');
-                $_output = str_replace('^#^', '\'', $_output);
-                $_output =
-                    "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/{$_output}/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
-                // make sure we include modifier plugins for nocache code
-                foreach ($this->modifier_plugins as $plugin_name => $dummy) {
-                    if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) {
-                        $this->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] =
-                            $this->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ];
-                    }
-                }
-            } else {
-                $_output = $content;
-            }
-        } else {
-            $_output = $content;
-        }
-        $this->modifier_plugins = array();
-        $this->suppressNocacheProcessing = false;
-        $this->tag_nocache = false;
-        return $_output;
-    }
-
-    /**
-     * Get Id
-     *
-     * @param string $input
-     *
-     * @return bool|string
-     */
-    public function getId($input)
-    {
-        if (preg_match('~^([\'"]*)([0-9]*[a-zA-Z_]\w*)\1$~', $input, $match)) {
-            return $match[ 2 ];
-        }
-        return false;
-    }
-
-    /**
-     * Get variable name from string
-     *
-     * @param string $input
-     *
-     * @return bool|string
-     */
-    public function getVariableName($input)
-    {
-        if (preg_match('~^[$]_smarty_tpl->tpl_vars\[[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]->value$~', $input, $match)) {
-            return $match[ 1 ];
-        }
-        return false;
-    }
-
-    /**
-     * Set nocache flag in variable or create new variable
-     *
-     * @param string $varName
-     */
-    public function setNocacheInVariable($varName)
-    {
-        // create nocache var to make it know for further compiling
-        if ($_var = $this->getId($varName)) {
-            if (isset($this->template->tpl_vars[ $_var ])) {
-                $this->template->tpl_vars[ $_var ] = clone $this->template->tpl_vars[ $_var ];
-                $this->template->tpl_vars[ $_var ]->nocache = true;
-            } else {
-                $this->template->tpl_vars[ $_var ] = new Smarty_Variable(null, true);
-            }
-        }
-    }
-
-    /**
-     * @param array $_attr tag attributes
-     * @param array $validScopes
-     *
-     * @return int|string
-     * @throws \SmartyCompilerException
-     */
-    public function convertScope($_attr, $validScopes)
-    {
-        $_scope = 0;
-        if (isset($_attr[ 'scope' ])) {
-            $_scopeName = trim($_attr[ 'scope' ], '\'"');
-            if (is_numeric($_scopeName) && in_array($_scopeName, $validScopes)) {
-                $_scope = $_scopeName;
-            } elseif (is_string($_scopeName)) {
-                $_scopeName = trim($_scopeName, '\'"');
-                $_scope = isset($validScopes[ $_scopeName ]) ? $validScopes[ $_scopeName ] : false;
-            } else {
-                $_scope = false;
-            }
-            if ($_scope === false) {
-                $err = var_export($_scopeName, true);
-                $this->trigger_template_error("illegal value '{$err}' for \"scope\" attribute", null, true);
-            }
-        }
-        return $_scope;
-    }
-
-    /**
-     * Generate nocache code string
-     *
-     * @param string $code PHP code
-     *
-     * @return string
-     */
-    public function makeNocacheCode($code)
-    {
-        return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/<?php " .
-               str_replace('^#^', '\'', addcslashes($code, '\'\\')) .
-               "?>/*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n";
-    }
-
-    /**
-     * display compiler error messages without dying
-     * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about expected tokens.
-     * If parameter $args contains a string this is used as error message
-     *
-     * @param string    $args    individual error message or null
-     * @param string    $line    line-number
-     * @param null|bool $tagline if true the line number of last tag
-     *
-     * @throws \SmartyCompilerException when an unexpected token is found
-     */
-    public function trigger_template_error($args = null, $line = null, $tagline = null)
-    {
-        $lex = $this->parser->lex;
-        if ($tagline === true) {
-            // get line number of Tag
-            $line = $lex->taglineno;
-        } elseif (!isset($line)) {
-            // get template source line which has error
-            $line = $lex->line;
-        } else {
-            $line = (int)$line;
-        }
-        if (in_array(
-            $this->template->source->type,
-            array(
-                'eval',
-                'string'
-            )
-        )
-        ) {
-            $templateName = $this->template->source->type . ':' . trim(
-                    preg_replace(
-                        '![\t\r\n]+!',
-                        ' ',
-                        strlen($lex->data) > 40 ?
-                            substr($lex->data, 0, 40) .
-                            '...' : $lex->data
-                    )
-                );
-        } else {
-            $templateName = $this->template->source->type . ':' . $this->template->source->filepath;
-        }
-        //        $line += $this->trace_line_offset;
-        $match = preg_split("/\n/", $lex->data);
-        $error_text =
-            'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
-            '"  on line ' . ($line + $this->trace_line_offset) . ' "' .
-            trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ])) . '" ';
-        if (isset($args)) {
-            // individual error message
-            $error_text .= $args;
-        } else {
-            $expect = array();
-            // expected token from parser
-            $error_text .= ' - Unexpected "' . $lex->value . '"';
-            if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
-                foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                    $exp_token = $this->parser->yyTokenName[ $token ];
-                    if (isset($lex->smarty_token_names[ $exp_token ])) {
-                        // token type from lexer
-                        $expect[] = '"' . $lex->smarty_token_names[ $exp_token ] . '"';
-                    } else {
-                        // otherwise internal token name
-                        $expect[] = $this->parser->yyTokenName[ $token ];
-                    }
-                }
-                $error_text .= ', expected one of: ' . implode(' , ', $expect);
-            }
-        }
-        if ($this->smarty->_parserdebug) {
-            $this->parser->errorRunDown();
-            echo ob_get_clean();
-            flush();
-        }
-        $e = new SmartyCompilerException(
-            $error_text,
-            0,
-            $this->template->source->filepath,
-            $line
-        );
-        $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
-        $e->desc = $args;
-        $e->template = $this->template->source->filepath;
-        throw $e;
-    }
-
-    /**
-     * Return var_export() value with all white spaces removed
-     *
-     * @param mixed $value
-     *
-     * @return string
-     */
-    public function getVarExport($value)
-    {
-        return preg_replace('/\s/', '', var_export($value, true));
-    }
-
-    /**
-     *  enter double quoted string
-     *  - save tag stack count
-     */
-    public function enterDoubleQuote()
-    {
-        array_push($this->_tag_stack_count, $this->getTagStackCount());
-    }
-
-    /**
-     * Return tag stack count
-     *
-     * @return int
-     */
-    public function getTagStackCount()
-    {
-        return count($this->_tag_stack);
-    }
-
-    /**
-     * @param $lexerPreg
-     *
-     * @return mixed
-     */
-    public function replaceDelimiter($lexerPreg)
-    {
-        return str_replace(
-            array('SMARTYldel', 'SMARTYliteral', 'SMARTYrdel', 'SMARTYautoliteral', 'SMARTYal'),
-            array(
-                $this->ldelPreg, $this->literalPreg, $this->rdelPreg,
-                $this->smarty->getAutoLiteral() ? '{1,}' : '{9}',
-                $this->smarty->getAutoLiteral() ? '' : '\\s*'
-            ),
-            $lexerPreg
-        );
-    }
-
-    /**
-     * Build lexer regular expressions for left and right delimiter and user defined literals
-     */
-    public function initDelimiterPreg()
-    {
-        $ldel = $this->smarty->getLeftDelimiter();
-        $this->ldelLength = strlen($ldel);
-        $this->ldelPreg = '';
-        foreach (str_split($ldel, 1) as $chr) {
-            $this->ldelPreg .= '[' . preg_quote($chr,'/') . ']';
-        }
-        $rdel = $this->smarty->getRightDelimiter();
-        $this->rdelLength = strlen($rdel);
-        $this->rdelPreg = '';
-        foreach (str_split($rdel, 1) as $chr) {
-            $this->rdelPreg .= '[' . preg_quote($chr,'/') . ']';
-        }
-        $literals = $this->smarty->getLiterals();
-        if (!empty($literals)) {
-            foreach ($literals as $key => $literal) {
-                $literalPreg = '';
-                foreach (str_split($literal, 1) as $chr) {
-                    $literalPreg .= '[' . preg_quote($chr,'/') . ']';
-                }
-                $literals[ $key ] = $literalPreg;
-            }
-            $this->literalPreg = '|' . implode('|', $literals);
-        } else {
-            $this->literalPreg = '';
-        }
-    }
-
-    /**
-     *  leave double quoted string
-     *  - throw exception if block in string was not closed
-     *
-     * @throws \SmartyCompilerException
-     */
-    public function leaveDoubleQuote()
-    {
-        if (array_pop($this->_tag_stack_count) !== $this->getTagStackCount()) {
-            $tag = $this->getOpenBlockTag();
-            $this->trigger_template_error(
-                "unclosed '{{$tag}}' in doubled quoted string",
-                null,
-                true
-            );
-        }
-    }
-
-    /**
-     * Get left delimiter preg
-     *
-     * @return string
-     */
-    public function getLdelPreg()
-    {
-        return $this->ldelPreg;
-    }
-
-    /**
-     * Get right delimiter preg
-     *
-     * @return string
-     */
-    public function getRdelPreg()
-    {
-        return $this->rdelPreg;
-    }
-
-    /**
-     * Get length of left delimiter
-     *
-     * @return int
-     */
-    public function getLdelLength()
-    {
-        return $this->ldelLength;
-    }
-
-    /**
-     * Get length of right delimiter
-     *
-     * @return int
-     */
-    public function getRdelLength()
-    {
-        return $this->rdelLength;
-    }
-
-    /**
-     * Get name of current open block tag
-     *
-     * @return string|boolean
-     */
-    public function getOpenBlockTag()
-    {
-        $tagCount = $this->getTagStackCount();
-        if ($tagCount) {
-            return $this->_tag_stack[ $tagCount - 1 ][ 0 ];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Check if $value contains variable elements
-     *
-     * @param mixed $value
-     *
-     * @return bool|int
-     */
-    public function isVariable($value)
-    {
-        if (is_string($value)) {
-            return preg_match('/[$(]/', $value);
-        }
-        if (is_bool($value) || is_numeric($value)) {
-            return false;
-        }
-        if (is_array($value)) {
-            foreach ($value as $k => $v) {
-                if ($this->isVariable($k) || $this->isVariable($v)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        return false;
-    }
-
-    /**
-     * Get new prefix variable name
-     *
-     * @return string
-     */
-    public function getNewPrefixVariable()
-    {
-        ++self::$prefixVariableNumber;
-        return $this->getPrefixVariable();
-    }
-
-    /**
-     * Get current prefix variable name
-     *
-     * @return string
-     */
-    public function getPrefixVariable()
-    {
-        return '$_prefixVariable' . self::$prefixVariableNumber;
-    }
-
-    /**
-     * append  code to prefix buffer
-     *
-     * @param string $code
-     */
-    public function appendPrefixCode($code)
-    {
-        $this->prefix_code[] = $code;
-    }
-
-    /**
-     * get prefix code string
-     *
-     * @return string
-     */
-    public function getPrefixCode()
-    {
-        $code = '';
-        $prefixArray = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
-        $this->prefixCodeStack[] = array();
-        foreach ($prefixArray as $c) {
-            $code = $this->appendCode($code, $c);
-        }
-        $this->prefix_code = array();
-        return $code;
-    }
-
-    /**
-     * Save current required plugins
-     *
-     * @param bool $init if true init required plugins
-     */
-    public function saveRequiredPlugins($init = false)
-    {
-        $this->required_plugins_stack[] = $this->required_plugins;
-        if ($init) {
-            $this->required_plugins = array('compiled' => array(), 'nocache' => array());
-        }
-    }
-
-    /**
-     * Restore required plugins
-     */
-    public function restoreRequiredPlugins()
-    {
-        $this->required_plugins = array_pop($this->required_plugins_stack);
-    }
-
-    /**
-     * Compile code to call Smarty_Internal_Template::_checkPlugins()
-     * for required plugins
-     *
-     * @return string
-     */
-    public function compileRequiredPlugins()
-    {
-        $code = $this->compileCheckPlugins($this->required_plugins[ 'compiled' ]);
-        if ($this->caching && !empty($this->required_plugins[ 'nocache' ])) {
-            $code .= $this->makeNocacheCode($this->compileCheckPlugins($this->required_plugins[ 'nocache' ]));
-        }
-        return $code;
-    }
-
-    /**
-     * Compile code to call Smarty_Internal_Template::_checkPlugins
-     *   - checks if plugin is callable require otherwise
-     *
-     * @param $requiredPlugins
-     *
-     * @return string
-     */
-    public function compileCheckPlugins($requiredPlugins)
-    {
-        if (!empty($requiredPlugins)) {
-            $plugins = array();
-            foreach ($requiredPlugins as $plugin) {
-                foreach ($plugin as $data) {
-                    $plugins[] = $data;
-                }
-            }
-            return '$_smarty_tpl->_checkPlugins(' . $this->getVarExport($plugins) . ');' . "\n";
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * method to compile a Smarty template
-     *
-     * @param mixed $_content template source
-     * @param bool  $isTemplateSource
-     *
-     * @return bool true if compiling succeeded, false if it failed
-     */
-    abstract protected function doCompile($_content, $isTemplateSource = false);
-
-    public function cStyleComment($string) {
-        return '/*' . str_replace('*/', '* /' , $string) . '*/';
-    }
-
-    /**
-     * Compile Tag
-     *
-     * @param string $tag       tag name
-     * @param array  $args      array with tag attributes
-     * @param array  $parameter array with compilation parameter
-     *
-     * @throws SmartyCompilerException
-     * @throws SmartyException
-     * @return string compiled code
-     */
-    private function compileTag2($tag, $args, $parameter)
-    {
-        $plugin_type = '';
-        // $args contains the attributes parsed and compiled by the lexer/parser
-        // assume that tag does compile into code, but creates no HTML output
-        $this->has_code = true;
-        // log tag/attributes
-        if (isset($this->smarty->_cache[ 'get_used_tags' ])) {
-            $this->template->_cache[ 'used_tags' ][] = array(
-                $tag,
-                $args
-            );
-        }
-        // check nocache option flag
-        foreach ($args as $arg) {
-            if (!is_array($arg)) {
-                if ($arg === "'nocache'" || $arg === 'nocache') {
-                    $this->tag_nocache = true;
-                }
-            } else {
-                foreach ($arg as $k => $v) {
-                    if (($k === "'nocache'" || $k === 'nocache') && (trim($v, "'\" ") === 'true')) {
-                        $this->tag_nocache = true;
-                    }
-                }
-            }
-        }
-        // compile the smarty tag (required compile classes to compile the tag are auto loaded)
-        if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
-            if (isset($this->parent_compiler->tpl_function[ $tag ])
-                || (isset($this->template->smarty->ext->_tplFunction)
-                    && $this->template->smarty->ext->_tplFunction->getTplFunction($this->template, $tag) !== false)
-            ) {
-                // template defined by {template} tag
-                $args[ '_attr' ][ 'name' ] = "'{$tag}'";
-                $_output = $this->callTagCompiler('call', $args, $parameter);
-            }
-        }
-        if ($_output !== false) {
-            if ($_output !== true) {
-                // did we get compiled code
-                if ($this->has_code) {
-                    // return compiled code
-                    return $_output;
-                }
-            }
-            // tag did not produce compiled code
-            return null;
-        } else {
-            // map_named attributes
-            if (isset($args[ '_attr' ])) {
-                foreach ($args[ '_attr' ] as $key => $attribute) {
-                    if (is_array($attribute)) {
-                        $args = array_merge($args, $attribute);
-                    }
-                }
-            }
-            // not an internal compiler tag
-            if (strlen($tag) < 6 || substr($tag, -5) !== 'close') {
-                // check if tag is a registered object
-                if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) {
-                    $method = $parameter[ 'object_method' ];
-                    if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])
-                        && (empty($this->smarty->registered_objects[ $tag ][ 1 ])
-                            || in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ]))
-                    ) {
-                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
-                    } elseif (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) {
-                        return $this->callTagCompiler(
-                            'private_object_block_function',
-                            $args,
-                            $parameter,
-                            $tag,
-                            $method
-                        );
-                    } else {
-                        // throw exception
-                        $this->trigger_template_error(
-                            'not allowed method "' . $method . '" in registered object "' .
-                            $tag . '"',
-                            null,
-                            true
-                        );
-                    }
-                }
-                // check if tag is registered
-                foreach (array(
-                    Smarty::PLUGIN_COMPILER,
-                    Smarty::PLUGIN_FUNCTION,
-                    Smarty::PLUGIN_BLOCK,
-                ) as $plugin_type) {
-                    if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) {
-                        // if compiler function plugin call it now
-                        if ($plugin_type === Smarty::PLUGIN_COMPILER) {
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                                if (is_array($mixed)) {
-                                    $new_args = array_merge($new_args, $mixed);
-                                } else {
-                                    $new_args[ $key ] = $mixed;
-                                }
-                            }
-                            if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) {
-                                $this->tag_nocache = true;
-                            }
-                            return call_user_func_array(
-                                $this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ],
-                                array(
-                                    $new_args,
-                                    $this
-                                )
-                            );
-                        }
-                        // compile registered function or block function
-                        if ($plugin_type === Smarty::PLUGIN_FUNCTION || $plugin_type === Smarty::PLUGIN_BLOCK) {
-                            return $this->callTagCompiler(
-                                'private_registered_' . $plugin_type,
-                                $args,
-                                $parameter,
-                                $tag
-                            );
-                        }
-                    }
-                }
-                // check plugins from plugins folder
-                foreach ($this->plugin_search_order as $plugin_type) {
-                    if ($plugin_type === Smarty::PLUGIN_COMPILER
-                        && $this->smarty->loadPlugin('smarty_compiler_' . $tag)
-                        && (!isset($this->smarty->security_policy)
-                            || $this->smarty->security_policy->isTrustedTag($tag, $this))
-                    ) {
-                        $plugin = 'smarty_compiler_' . $tag;
-                        if (is_callable($plugin)) {
-                            // convert arguments format for old compiler plugins
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                                if (is_array($mixed)) {
-                                    $new_args = array_merge($new_args, $mixed);
-                                } else {
-                                    $new_args[ $key ] = $mixed;
-                                }
-                            }
-                            return $plugin($new_args, $this->smarty);
-                        }
-                        if (class_exists($plugin, false)) {
-                            $plugin_object = new $plugin;
-                            if (method_exists($plugin_object, 'compile')) {
-                                return $plugin_object->compile($args, $this);
-                            }
-                        }
-                        throw new SmartyException("Plugin '{$tag}' not callable");
-                    } else {
-                        if ($function = $this->getPlugin($tag, $plugin_type)) {
-                            if (!isset($this->smarty->security_policy)
-                                || $this->smarty->security_policy->isTrustedTag($tag, $this)
-                            ) {
-                                return $this->callTagCompiler(
-                                    'private_' . $plugin_type . '_plugin',
-                                    $args,
-                                    $parameter,
-                                    $tag,
-                                    $function
-                                );
-                            }
-                        }
-                    }
-                }
-                if (is_callable($this->smarty->default_plugin_handler_func)) {
-                    $found = false;
-                    // look for already resolved tags
-                    foreach ($this->plugin_search_order as $plugin_type) {
-                        if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) {
-                            $found = true;
-                            break;
-                        }
-                    }
-                    if (!$found) {
-                        // call default handler
-                        foreach ($this->plugin_search_order as $plugin_type) {
-                            if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
-                                $found = true;
-                                break;
-                            }
-                        }
-                    }
-                    if ($found) {
-                        // if compiler function plugin call it now
-                        if ($plugin_type === Smarty::PLUGIN_COMPILER) {
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                                if (is_array($mixed)) {
-                                    $new_args = array_merge($new_args, $mixed);
-                                } else {
-                                    $new_args[ $key ] = $mixed;
-                                }
-                            }
-                            return call_user_func_array(
-                                $this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ],
-                                array(
-                                    $new_args,
-                                    $this
-                                )
-                            );
-                        } else {
-                            return $this->callTagCompiler(
-                                'private_registered_' . $plugin_type,
-                                $args,
-                                $parameter,
-                                $tag
-                            );
-                        }
-                    }
-                }
-            } else {
-                // compile closing tag of block function
-                $base_tag = substr($tag, 0, -5);
-                // check if closing tag is a registered object
-                if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) {
-                    $method = $parameter[ 'object_method' ];
-                    if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) {
-                        return $this->callTagCompiler(
-                            'private_object_block_function',
-                            $args,
-                            $parameter,
-                            $tag,
-                            $method
-                        );
-                    } else {
-                        // throw exception
-                        $this->trigger_template_error(
-                            'not allowed closing tag method "' . $method .
-                            '" in registered object "' . $base_tag . '"',
-                            null,
-                            true
-                        );
-                    }
-                }
-                // registered block tag ?
-                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
-                    || isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
-                ) {
-                    return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
-                }
-                // registered function tag ?
-                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
-                    return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
-                }
-                // block plugin?
-                if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
-                    return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
-                }
-                // function plugin?
-                if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) {
-                    if (!isset($this->smarty->security_policy)
-                        || $this->smarty->security_policy->isTrustedTag($tag, $this)
-                    ) {
-                        return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function);
-                    }
-                }
-                // registered compiler plugin ?
-                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) {
-                    // if compiler function plugin call it now
-                    $args = array();
-                    if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) {
-                        $this->tag_nocache = true;
-                    }
-                    return call_user_func_array(
-                        $this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ],
-                        array(
-                            $args,
-                            $this
-                        )
-                    );
-                }
-                if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
-                    $plugin = 'smarty_compiler_' . $tag;
-                    if (is_callable($plugin)) {
-                        return $plugin($args, $this->smarty);
-                    }
-                    if (class_exists($plugin, false)) {
-                        $plugin_object = new $plugin;
-                        if (method_exists($plugin_object, 'compile')) {
-                            return $plugin_object->compile($args, $this);
-                        }
-                    }
-                    throw new SmartyException("Plugin '{$tag}' not callable");
-                }
-            }
-            $this->trigger_template_error("unknown tag '{$tag}'", null, true);
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_templateparser.php b/include/smarty/libs/sysplugins/smarty_internal_templateparser.php
deleted file mode 100644
index a2dd0d6fb..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_templateparser.php
+++ /dev/null
@@ -1,2926 +0,0 @@
-<?php
-
-class TP_yyStackEntry
-{
-    public $stateno;       /* The state-number */
-    public $major;         /* The major token value.  This is the code
-                     ** number for the token at this stack level */
-    public $minor; /* The user-supplied minor token value.  This
-                     ** is the value of the token  */
-};
-
-
-// line 11 "../smarty/lexer/smarty_internal_templateparser.y"
-
-/**
-* Smarty Template Parser Class
-*
-* This is the template parser.
-* It is generated from the smarty_internal_templateparser.y file
-* 
-* @author Uwe Tews <uwe.tews@googlemail.com>
-*/
-class Smarty_Internal_Templateparser
-{
-// line 23 "../smarty/lexer/smarty_internal_templateparser.y"
-
-    const ERR1 = 'Security error: Call to private object member not allowed';
-    const ERR2 = 'Security error: Call to dynamic object member not allowed';
-
-    /**
-     * result status
-     *
-     * @var bool
-     */
-    public $successful = true;
-
-    /**
-     * return value
-     *
-     * @var mixed
-     */
-    public $retvalue = 0;
-
-    /**
-     * @var
-     */
-    public $yymajor;
-
-    /**
-     * last index of array variable
-     *
-     * @var mixed
-     */
-    public $last_index;
-
-    /**
-     * last variable name
-     *
-     * @var string
-     */
-    public $last_variable;
-
-    /**
-     * root parse tree buffer
-     *
-     * @var Smarty_Internal_ParseTree_Template
-     */
-    public $root_buffer;
-
-    /**
-     * current parse tree object
-     *
-     * @var Smarty_Internal_ParseTree
-     */
-    public $current_buffer;
-
-    /**
-     * lexer object
-     *
-     * @var Smarty_Internal_Templatelexer
-     */
-    public $lex;
-
-    /**
-     * internal error flag
-     *
-     * @var bool
-     */
-    private $internalError = false;
-
-    /**
-     * {strip} status
-     *
-     * @var bool
-     */
-    public $strip = false;
-    /**
-     * compiler object
-     *
-     * @var Smarty_Internal_TemplateCompilerBase
-     */
-    public $compiler = null;
-
-    /**
-     * smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * template object
-     *
-     * @var Smarty_Internal_Template
-     */
-    public $template = null;
-
-    /**
-     * block nesting level
-     *
-     * @var int
-     */
-    public $block_nesting_level = 0;
-
-    /**
-     * security object
-     *
-     * @var Smarty_Security
-     */
-    public $security = null;
-
-    /**
-     * template prefix array
-     *
-     * @var \Smarty_Internal_ParseTree[]
-     */
-    public $template_prefix = array();
-
-    /**
-     * template prefix array
-     *
-     * @var \Smarty_Internal_ParseTree[]
-     */
-    public $template_postfix = array();
-
-    /**
-     * constructor
-     *
-     * @param Smarty_Internal_Templatelexer        $lex
-     * @param Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    public function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $this->lex = $lex;
-        $this->compiler = $compiler;
-        $this->template = $this->compiler->template;
-        $this->smarty = $this->template->smarty;
-        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
-        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
-    }
-
-     /**
-     * insert PHP code in current buffer
-     *
-     * @param string $code
-     */
-    public function insertPhpCode($code)
-    {
-        $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
-    }
-
-    /**
-     * error rundown
-     *
-     */
-    public function errorRunDown()
-    {
-        while ($this->yystack !== array()) {
-            $this->yy_pop_parser_stack();
-        }
-        if (is_resource($this->yyTraceFILE)) {
-            fclose($this->yyTraceFILE);
-        }
-    }
-
-    /**
-     *  merge PHP code with prefix code and return parse tree tag object
-     *
-     * @param string $code
-     *
-     * @return Smarty_Internal_ParseTree_Tag
-     */
-    public function mergePrefixCode($code)
-    {
-        $tmp = '';
-        foreach ($this->compiler->prefix_code as $preCode) {
-            $tmp .= $preCode;
-        }
-        $this->compiler->prefix_code = array();
-        $tmp .= $code;
-        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
-    }
-
-
-    const TP_VERT                           =  1;
-    const TP_COLON                          =  2;
-    const TP_TEXT                           =  3;
-    const TP_STRIPON                        =  4;
-    const TP_STRIPOFF                       =  5;
-    const TP_LITERALSTART                   =  6;
-    const TP_LITERALEND                     =  7;
-    const TP_LITERAL                        =  8;
-    const TP_SIMPELOUTPUT                   =  9;
-    const TP_SIMPLETAG                      = 10;
-    const TP_SMARTYBLOCKCHILDPARENT         = 11;
-    const TP_LDEL                           = 12;
-    const TP_RDEL                           = 13;
-    const TP_DOLLARID                       = 14;
-    const TP_EQUAL                          = 15;
-    const TP_ID                             = 16;
-    const TP_PTR                            = 17;
-    const TP_LDELMAKENOCACHE                = 18;
-    const TP_LDELIF                         = 19;
-    const TP_LDELFOR                        = 20;
-    const TP_SEMICOLON                      = 21;
-    const TP_INCDEC                         = 22;
-    const TP_TO                             = 23;
-    const TP_STEP                           = 24;
-    const TP_LDELFOREACH                    = 25;
-    const TP_SPACE                          = 26;
-    const TP_AS                             = 27;
-    const TP_APTR                           = 28;
-    const TP_LDELSETFILTER                  = 29;
-    const TP_CLOSETAG                       = 30;
-    const TP_LDELSLASH                      = 31;
-    const TP_ATTR                           = 32;
-    const TP_INTEGER                        = 33;
-    const TP_COMMA                          = 34;
-    const TP_OPENP                          = 35;
-    const TP_CLOSEP                         = 36;
-    const TP_MATH                           = 37;
-    const TP_UNIMATH                        = 38;
-    const TP_ISIN                           = 39;
-    const TP_QMARK                          = 40;
-    const TP_NOT                            = 41;
-    const TP_TYPECAST                       = 42;
-    const TP_HEX                            = 43;
-    const TP_DOT                            = 44;
-    const TP_INSTANCEOF                     = 45;
-    const TP_SINGLEQUOTESTRING              = 46;
-    const TP_DOUBLECOLON                    = 47;
-    const TP_NAMESPACE                      = 48;
-    const TP_AT                             = 49;
-    const TP_HATCH                          = 50;
-    const TP_OPENB                          = 51;
-    const TP_CLOSEB                         = 52;
-    const TP_DOLLAR                         = 53;
-    const TP_LOGOP                          = 54;
-    const TP_SLOGOP                         = 55;
-    const TP_TLOGOP                         = 56;
-    const TP_SINGLECOND                     = 57;
-    const TP_ARRAYOPEN                      = 58;
-    const TP_QUOTE                          = 59;
-    const TP_BACKTICK                       = 60;
-    const YY_NO_ACTION = 514;
-    const YY_ACCEPT_ACTION = 513;
-    const YY_ERROR_ACTION = 512;
-
-    const YY_SZ_ACTTAB = 1997;
-public static $yy_action = array(
-    249,  250,  239,    1,   27,  127,  220,  184,  160,  213,
-     11,   54,  278,   10,  173,   34,  108,  387,  282,  279,
-    223,  321,  221,    8,  194,  387,   18,  387,   85,   41,
-    387,  285,   42,   44,  264,  222,  387,  209,  387,  198,
-    387,   52,    5,  307,  288,  288,  164,  283,  224,    4,
-     50,  249,  250,  239,    1,  232,  131,  381,  189,  205,
-    213,   11,   54,   39,   35,  243,   31,  108,   94,   17,
-    381,  223,  321,  221,  439,  226,  381,   33,   49,  426,
-     41,  439,   89,   42,   44,  264,  222,    9,  235,  163,
-    198,  426,   52,    5,  131,  288,  212,  284,  102,  106,
-      4,   50,  249,  250,  239,    1,  232,  129,  426,  189,
-    347,  213,   11,   54,  175,  324,  347,  208,  108,   22,
-    426,  301,  223,  321,  221,  302,  226,  135,   18,   49,
-     52,   41,   26,  288,   42,   44,  264,  222,   16,  235,
-    294,  198,  204,   52,    5,  170,  288,   32,   90,  267,
-    268,    4,   50,  249,  250,  239,    1,   20,  129,  185,
-    179,  255,  213,   11,   54,  455,  288,  192,  455,  108,
-    175,  167,  455,  223,  321,  221,  439,  226,  256,   18,
-     55,  292,   41,  439,  132,   42,   44,  264,  222,  427,
-    235,   12,  198,  165,   52,    5,  232,  288,  288,  347,
-    153,  427,    4,   50,  249,  250,  239,    1,  232,  129,
-    286,  181,  347,  213,   11,   54,   24,   13,  347,   49,
-    108,  232,  320,  426,  223,  321,  221,  195,  201,  173,
-     18,   49,  139,   41,  296,  426,   42,   44,  264,  222,
-      7,  235,  286,  198,   49,   52,    5,  147,  288,  117,
-    150,  317,  263,    4,   50,  249,  250,  239,    1,   95,
-    130,  173,  189,  155,  213,   11,   54,   22,  244,  271,
-    192,  108,  323,  286,  101,  223,  321,  221,  294,  226,
-    204,   18,  348,  257,   41,  166,  283,   42,   44,  264,
-    222,   28,  235,  300,  198,  348,   52,    5,  247,  288,
-    117,  348,   94,  206,    4,   50,  249,  250,  239,    1,
-     95,  129,   22,  189,  277,  213,   11,   54,   91,  274,
-    224,  426,  108,  323,  216,  156,  223,  321,  221,  132,
-    180,  262,   18,  426,  100,   41,   12,  288,   42,   44,
-    264,  222,   15,  235,  216,  198,  254,   52,    5,  233,
-    288,  210,  190,  192,  100,    4,   50,  249,  250,  239,
-      1,    3,  131,   94,  189,  192,  213,   11,   54,  269,
-     10,  204,  290,  108,  325,  216,  224,  223,  321,  221,
-     23,  226,  211,   33,  315,  100,   45,  513,   92,   42,
-     44,  264,  222,  102,  235,  178,  198,  268,   52,    5,
-    275,  288,  161,  192,   37,   25,    4,   50,  249,  250,
-    239,    1,  286,  129,  172,  187,  305,  213,   11,   54,
-    164,  283,  310,  141,  108,  281,  281,  236,  223,  321,
-    221,  169,  226,  230,   18,  122,  171,   41,  225,  175,
-     42,   44,  264,  222,  144,  235,  303,  198,  134,   52,
-      5,  265,  288,  151,  286,  192,  175,    4,   50,  249,
-    250,  239,    1,  286,  128,   94,  189,  143,  213,   11,
-     54,  219,  152,  207,  193,  108,  149,  281,   31,  223,
-    321,  221,  100,  226,   21,    6,  286,  288,   41,  158,
-     16,   42,   44,  264,  222,  102,  235,  238,  198,  286,
-     52,    5,  157,  288,  281,  122,  168,  283,    4,   50,
-    249,  250,  239,    1,   30,   93,  308,   51,  215,  213,
-     11,   54,   53,  251,  140,  248,  108,  245,  304,  116,
-    223,  321,  221,  111,  226,  176,   18,  270,  266,   41,
-    224,  322,   42,   44,  264,  222,    7,  235,  259,  198,
-    147,   52,    5,  257,  288,   43,   40,   38,   83,    4,
-     50,  241,  214,  204,  319,  280,   88,  107,  138,  182,
-     97,   64,  311,  312,  313,  316,   95,  281,  298,  258,
-    142,  234,   94,  105,  272,  197,  231,  482,  237,  323,
-     37,  133,  324,  241,  214,  204,  319,  314,   88,  107,
-    296,  183,   97,   82,   84,   43,   40,   38,   95,  296,
-    296,  258,  296,  296,  296,  159,  272,  197,  231,  296,
-    237,  323,  311,  312,  313,  316,  241,  296,  204,  296,
-    296,  103,  296,  296,  199,  104,   77,  296,  296,  110,
-    296,   95,  296,  296,  258,  278,  296,  296,   34,  272,
-    197,  231,  279,  237,  323,   43,   40,   38,  296,  296,
-    296,  241,   26,  204,  196,  276,  103,  296,   16,  199,
-    104,   77,  311,  312,  313,  316,   95,  192,  296,  258,
-    146,  296,  296,  296,  272,  197,  231,  296,  237,  323,
-    286,  393,   39,   35,  243,  296,  296,  296,  296,  191,
-    276,  296,   26,  318,  252,  253,  126,  296,   16,  249,
-    250,  239,    1,  296,  296,  131,  296,  261,  213,   11,
-     54,  296,  296,  296,  426,  108,  393,  393,  393,  223,
-    321,  221,  241,  296,  204,  299,  426,  103,  107,  296,
-    183,   97,   82,  393,  393,  393,  393,   95,  296,  260,
-    258,   52,  296,  296,  288,  272,  197,  231,  296,  237,
-    323,  293,  296,  296,  296,  296,  296,  249,  250,  239,
-      2,  296,  295,  296,  296,  296,  213,   11,   54,  296,
-    296,  177,  296,  108,  136,  296,  296,  223,  321,  221,
-    296,  296,  296,  293,   43,   40,   38,  296,  296,  249,
-    250,  239,    2,  296,  295,   43,   40,   38,  213,   11,
-     54,  311,  312,  313,  316,  108,  296,  291,   14,  223,
-    321,  221,  311,  312,  313,  316,  296,  296,  241,  296,
-    204,  296,  192,  103,  296,  296,  199,  104,   77,  296,
-    296,  296,  296,   95,  383,  296,  258,  296,  296,  297,
-     14,  272,  197,  231,  296,  237,  323,  383,  296,  296,
-    241,  296,  204,  383,  296,   99,  296,  287,  199,  120,
-     48,  241,  112,  204,  296,   95,  103,  296,  258,  199,
-    120,   74,  296,  272,  197,  231,   95,  237,  323,  258,
-    455,  296,  296,  455,  272,  197,  231,  455,  237,  323,
-    241,  296,  204,  296,  296,  103,  200,  296,  199,  120,
-     74,  296,  296,  296,  296,   95,  296,  296,  258,  278,
-    296,  296,   34,  272,  197,  231,  279,  237,  323,  241,
-    455,  204,  296,  296,   99,  202,  296,  199,  120,   56,
-    241,  211,  204,  296,   95,  103,  296,  258,  199,  120,
-     74,  296,  272,  197,  231,   95,  237,  323,  258,  227,
-    296,  296,  296,  272,  197,  231,  296,  237,  323,  241,
-    296,  204,  148,  296,  103,  203,   86,  199,  120,   73,
-    296,  296,  286,  296,   95,  296,  296,  258,  278,  296,
-    296,   34,  272,  197,  231,  279,  237,  323,  241,  296,
-    204,  175,  296,  103,  296,  296,  199,  120,   75,  241,
-    296,  204,  296,   95,  103,  296,  258,  199,  120,   63,
-    296,  272,  197,  231,   95,  237,  323,  258,  229,  192,
-    296,  296,  272,  197,  231,  296,  237,  323,  241,  296,
-    204,  380,  296,  103,  296,  296,  199,  120,   58,  296,
-    296,  296,  296,   95,  380,  296,  258,  296,  296,  296,
-    380,  272,  197,  231,  296,  237,  323,  241,  296,  204,
-    296,  296,  103,  296,  296,  199,  120,   71,  241,  296,
-    204,  296,   95,  103,  296,  258,  199,  120,   79,  296,
-    272,  197,  231,   95,  237,  323,  258,  296,  296,  296,
-    154,  272,  197,  231,   87,  237,  323,  241,  296,  204,
-    286,  296,  103,  296,  296,  199,  120,   70,  296,  296,
-    296,  296,   95,  296,  296,  258,  296,  296,  296,  175,
-    272,  197,  231,  296,  237,  323,  241,  296,  204,  296,
-    296,  103,  296,  296,  199,  120,   56,  241,  296,  204,
-    296,   95,  103,  296,  258,  199,  120,   46,  296,  272,
-    197,  231,   95,  237,  323,  258,  296,  296,  296,  296,
-    272,  197,  231,  296,  237,  323,  241,  296,  204,  296,
-    296,  103,  296,  296,  199,  120,   78,  296,  296,  296,
-    296,   95,  296,  296,  258,  296,  296,  296,  296,  272,
-    197,  231,  296,  237,  323,  241,  296,  204,  296,  296,
-    103,  296,  296,  199,  120,   66,  241,  296,  204,  296,
-     95,  103,  296,  258,  199,  120,   59,  296,  272,  197,
-    231,   95,  237,  323,  258,  296,  296,  296,  296,  272,
-    197,  231,  296,  237,  323,  241,  296,  204,  296,  296,
-    103,  296,  296,  186,  109,   57,  296,  296,  296,  296,
-     95,  296,  296,  258,  296,  296,  296,  296,  272,  197,
-    231,  296,  237,  323,  241,  296,  204,  296,  296,  103,
-    296,  296,  188,  120,   67,  241,  296,  204,  296,   95,
-    103,  296,  258,  199,   96,   62,  296,  272,  197,  231,
-     95,  237,  323,  258,  296,  296,  296,  296,  272,  197,
-    231,  296,  237,  323,  241,  296,  204,  296,  296,  103,
-    296,  296,  199,  120,   80,  296,  296,  296,  296,   95,
-    296,  296,  258,  296,  296,  296,  296,  272,  197,  231,
-    296,  237,  323,  241,  296,  204,  296,  296,  103,  296,
-    296,  199,  120,   76,  241,  296,  204,  296,   95,  103,
-    296,  258,  199,  120,   81,  296,  272,  197,  231,   95,
-    237,  323,  258,  296,  296,  296,  296,  272,  197,  231,
-    296,  237,  323,  241,  296,  204,  296,  296,  103,  296,
-    296,  199,  120,   65,  296,  296,  296,  296,   95,  296,
-    296,  258,  296,  296,  296,  296,  272,  197,  231,  296,
-    237,  323,  241,  296,  204,  296,  296,  103,  296,  296,
-    199,   96,   68,  241,  296,  204,  296,   95,  103,  296,
-    258,  199,  120,   61,  296,  272,  197,  231,   95,  237,
-    323,  258,  296,  296,  296,  296,  272,  197,  231,  296,
-    237,  323,  241,  296,  204,  296,  296,  103,  296,  296,
-    199,   98,   69,  296,  296,  296,  296,   95,  296,  296,
-    258,  296,  296,  296,  296,  272,  197,  231,  296,  237,
-    323,  241,  296,  204,  296,  296,  103,  296,  296,  199,
-    120,   72,  241,  296,  204,  296,   95,  103,  296,  258,
-    199,  120,   47,  296,  272,  197,  231,   95,  237,  323,
-    258,  296,  296,  296,  296,  272,  197,  231,  296,  237,
-    323,  241,  192,  204,  296,  296,  103,  296,  296,  199,
-    120,   60,  296,  296,  351,  296,   95,  296,  217,  258,
-    296,  296,  296,  296,  272,  197,  231,   26,  237,  323,
-    241,  296,  204,   16,  296,  103,  426,  296,  199,  125,
-    296,  241,  296,  204,  296,   95,  103,  296,  426,  199,
-    118,  296,  242,  272,  197,  231,   95,  237,  323,  296,
-    296,  296,  296,  246,  272,  197,  231,  296,  237,  323,
-    241,  296,  204,  278,  296,  103,   34,  296,  199,  121,
-    279,  296,  296,  296,  296,   95,  296,  296,  296,  296,
-     26,  296,  162,  272,  197,  231,   16,  237,  323,  241,
-    296,  204,  296,  296,  103,  296,  296,  199,  123,  296,
-    241,  296,  204,  296,   95,  103,  296,  296,  199,  114,
-    296,  296,  272,  197,  231,   95,  237,  323,  296,  296,
-    296,  296,  296,  272,  197,  231,  296,  237,  323,  241,
-    296,  204,  296,  145,  103,  296,  296,  199,  124,  296,
-    296,  296,  296,  286,   95,   39,   35,  243,  296,  296,
-    296,  296,  272,  197,  231,  296,  237,  323,  241,  296,
-    204,  296,  296,  103,  296,  296,  199,  115,  296,  241,
-    296,  204,  296,   95,  103,  296,  296,  199,  113,  296,
-    296,  272,  197,  231,   95,  237,  323,  296,  296,  296,
-    296,  296,  272,  197,  231,  228,  237,  323,  241,  296,
-    204,  296,  455,  103,  296,  455,  199,  119,    3,  455,
-    439,  296,  296,   95,  296,  296,  296,  296,  296,  296,
-    296,  272,  197,  231,  228,  237,  323,  296,  296,  296,
-    296,  455,  296,  296,  455,  296,  296,  439,  455,  439,
-    439,  228,  455,  296,  439,  296,  296,  137,  455,  296,
-    296,  455,  296,  296,   32,  455,  439,  286,  296,   39,
-     35,  243,   29,  296,   26,  296,  439,  296,  296,  439,
-     16,  455,  296,  439,  306,   43,   40,   38,  296,  296,
-    296,  296,  296,  439,  296,  296,  439,  296,  455,  296,
-    439,   26,  311,  312,  313,  316,  296,   16,  228,  296,
-    296,  296,   43,   40,   38,  455,  296,  296,  455,  296,
-    296,  296,  455,  439,  296,  296,   19,  296,  296,  311,
-    312,  313,  316,  455,  296,  296,  455,  296,  296,  296,
-    455,  439,  296,  296,  296,   43,   40,   38,  296,  296,
-    439,  296,  296,  439,  174,  455,  296,  439,  296,  240,
-    309,  296,  311,  312,  313,  316,  296,  289,  439,  296,
-     36,  439,  296,  455,  296,  439,  296,  296,   43,   40,
-     38,  296,  296,   43,   40,   38,  296,  296,  296,  296,
-    296,   43,   40,   38,  296,  311,  312,  313,  316,  296,
-    311,  312,  313,  316,  296,   43,   40,   38,  311,  312,
-    313,  316,  273,   43,   40,   38,  296,  296,  296,  296,
-    296,  296,  311,  312,  313,  316,  296,  296,  296,  296,
-    311,  312,  313,  316,  455,  296,  296,  455,   43,   40,
-     38,  455,  439,  218,   43,   40,   38,  296,  296,  296,
-    296,  296,  296,  296,  296,  311,  312,  313,  316,  296,
-    296,  311,  312,  313,  316,  296,  296,  296,  296,  439,
-    296,  296,  439,  296,  455,  296,  439,
-    );
-    public static $yy_lookahead = array(
-      9,   10,   11,   12,   12,   14,   14,   16,   16,   18,
-     19,   20,    9,   34,  102,   12,   25,   13,   70,   16,
-     29,   30,   31,   35,   33,   21,   35,   23,   95,   38,
-     26,   52,   41,   42,   43,   44,   32,   46,   34,   48,
-     36,   50,   51,   52,   53,   53,   98,   99,   44,   58,
-     59,    9,   10,   11,   12,   22,   14,   13,   16,   15,
-     18,   19,   20,   85,   86,   87,   15,   25,   17,   21,
-     26,   29,   30,   31,   44,   33,   32,   35,   45,   35,
-     38,   51,   34,   41,   42,   43,   44,   35,   46,   77,
-     48,   47,   50,   51,   14,   53,   16,   13,   47,   47,
-     58,   59,    9,   10,   11,   12,   22,   14,   35,   16,
-     26,   18,   19,   20,  102,  103,   32,   44,   25,   34,
-     47,   36,   29,   30,   31,   52,   33,   14,   35,   45,
-     50,   38,   26,   53,   41,   42,   43,   44,   32,   46,
-     66,   48,   68,   50,   51,   77,   53,   15,   35,    7,
-      8,   58,   59,    9,   10,   11,   12,   12,   14,   14,
-     16,   16,   18,   19,   20,    9,   53,    1,   12,   25,
-    102,   82,   16,   29,   30,   31,   44,   33,   33,   35,
-    106,  107,   38,   51,   44,   41,   42,   43,   44,   35,
-     46,   51,   48,   82,   50,   51,   22,   53,   53,   13,
-     73,   47,   58,   59,    9,   10,   11,   12,   22,   14,
-     83,   16,   26,   18,   19,   20,   28,   12,   32,   45,
-     25,   22,   70,   35,   29,   30,   31,   65,   33,  102,
-     35,   45,   73,   38,   60,   47,   41,   42,   43,   44,
-     35,   46,   83,   48,   45,   50,   51,   95,   53,   71,
-     95,   52,   74,   58,   59,    9,   10,   11,   12,   81,
-     14,  102,   16,   73,   18,   19,   20,   34,   90,   36,
-      1,   25,   94,   83,   81,   29,   30,   31,   66,   33,
-     68,   35,   13,   96,   38,   98,   99,   41,   42,   43,
-     44,   15,   46,  100,   48,   26,   50,   51,   14,   53,
-     71,   32,   17,   74,   58,   59,    9,   10,   11,   12,
-     81,   14,   34,   16,   36,   18,   19,   20,   82,  107,
-     44,   35,   25,   94,   71,   95,   29,   30,   31,   44,
-     33,   78,   35,   47,   81,   38,   51,   53,   41,   42,
-     43,   44,   15,   46,   71,   48,   16,   50,   51,   22,
-     53,   78,   79,    1,   81,   58,   59,    9,   10,   11,
-     12,   15,   14,   17,   16,    1,   18,   19,   20,   66,
-     34,   68,   36,   25,   16,   71,   44,   29,   30,   31,
-     28,   33,   78,   35,   52,   81,   38,   62,   63,   41,
-     42,   43,   44,   47,   46,    6,   48,    8,   50,   51,
-     16,   53,   73,    1,    2,   40,   58,   59,    9,   10,
-     11,   12,   83,   14,   77,   16,   52,   18,   19,   20,
-     98,   99,   52,   95,   25,   97,   97,   92,   29,   30,
-     31,   77,   33,   49,   35,  100,   14,   38,   16,  102,
-     41,   42,   43,   44,   73,   46,   14,   48,   14,   50,
-     51,   36,   53,   73,   83,    1,  102,   58,   59,    9,
-     10,   11,   12,   83,   14,   17,   16,   50,   18,   19,
-     20,   17,   71,   64,   65,   25,   73,   97,   15,   29,
-     30,   31,   81,   33,   26,   35,   83,   53,   38,   73,
-     32,   41,   42,   43,   44,   47,   46,   92,   48,   83,
-     50,   51,   95,   53,   97,  100,   98,   99,   58,   59,
-      9,   10,   11,   12,   23,   14,   52,   16,   16,   18,
-     19,   20,   16,    7,   50,   16,   25,   13,   13,   16,
-     29,   30,   31,   16,   33,   16,   35,   33,   33,   38,
-     44,   16,   41,   42,   43,   44,   35,   46,   16,   48,
-     95,   50,   51,   96,   53,   37,   38,   39,   81,   58,
-     59,   66,   67,   68,   69,   83,   71,   72,   95,   74,
-     75,   76,   54,   55,   56,   57,   81,   97,   60,   84,
-     95,   13,   17,   80,   89,   90,   91,    1,   93,   94,
-      2,   81,  103,   66,   67,   68,   69,   99,   71,   72,
-    108,   74,   75,   76,   81,   37,   38,   39,   81,  108,
-    108,   84,  108,  108,  108,   95,   89,   90,   91,  108,
-     93,   94,   54,   55,   56,   57,   66,  108,   68,  108,
-    108,   71,  108,  108,   74,   75,   76,  108,  108,   21,
-    108,   81,  108,  108,   84,    9,  108,  108,   12,   89,
-     90,   91,   16,   93,   94,   37,   38,   39,  108,  108,
-    108,   66,   26,   68,  104,  105,   71,  108,   32,   74,
-     75,   76,   54,   55,   56,   57,   81,    1,  108,   84,
-     73,  108,  108,  108,   89,   90,   91,  108,   93,   94,
-     83,    2,   85,   86,   87,  108,  108,  108,  108,  104,
-    105,  108,   26,    3,    4,    5,    6,  108,   32,    9,
-     10,   11,   12,  108,  108,   14,  108,   16,   18,   19,
-     20,  108,  108,  108,   35,   25,   37,   38,   39,   29,
-     30,   31,   66,  108,   68,   69,   47,   71,   72,  108,
-     74,   75,   76,   54,   55,   56,   57,   81,  108,   48,
-     84,   50,  108,  108,   53,   89,   90,   91,  108,   93,
-     94,    3,  108,  108,  108,  108,  108,    9,   10,   11,
-     12,  108,   14,  108,  108,  108,   18,   19,   20,  108,
-    108,   13,  108,   25,   27,  108,  108,   29,   30,   31,
-    108,  108,  108,    3,   37,   38,   39,  108,  108,    9,
-     10,   11,   12,  108,   14,   37,   38,   39,   18,   19,
-     20,   54,   55,   56,   57,   25,  108,   59,   60,   29,
-     30,   31,   54,   55,   56,   57,  108,  108,   66,  108,
-     68,  108,    1,   71,  108,  108,   74,   75,   76,  108,
-    108,  108,  108,   81,   13,  108,   84,  108,  108,   59,
-     60,   89,   90,   91,  108,   93,   94,   26,  108,  108,
-     66,  108,   68,   32,  108,   71,  108,  105,   74,   75,
-     76,   66,   78,   68,  108,   81,   71,  108,   84,   74,
-     75,   76,  108,   89,   90,   91,   81,   93,   94,   84,
-      9,  108,  108,   12,   89,   90,   91,   16,   93,   94,
-     66,  108,   68,  108,  108,   71,  101,  108,   74,   75,
-     76,  108,  108,  108,  108,   81,  108,  108,   84,    9,
-    108,  108,   12,   89,   90,   91,   16,   93,   94,   66,
-     49,   68,  108,  108,   71,  101,  108,   74,   75,   76,
-     66,   78,   68,  108,   81,   71,  108,   84,   74,   75,
-     76,  108,   89,   90,   91,   81,   93,   94,   84,   49,
-    108,  108,  108,   89,   90,   91,  108,   93,   94,   66,
-    108,   68,   73,  108,   71,  101,   77,   74,   75,   76,
-    108,  108,   83,  108,   81,  108,  108,   84,    9,  108,
-    108,   12,   89,   90,   91,   16,   93,   94,   66,  108,
-     68,  102,  108,   71,  108,  108,   74,   75,   76,   66,
-    108,   68,  108,   81,   71,  108,   84,   74,   75,   76,
-    108,   89,   90,   91,   81,   93,   94,   84,   49,    1,
-    108,  108,   89,   90,   91,  108,   93,   94,   66,  108,
-     68,   13,  108,   71,  108,  108,   74,   75,   76,  108,
-    108,  108,  108,   81,   26,  108,   84,  108,  108,  108,
-     32,   89,   90,   91,  108,   93,   94,   66,  108,   68,
-    108,  108,   71,  108,  108,   74,   75,   76,   66,  108,
-     68,  108,   81,   71,  108,   84,   74,   75,   76,  108,
-     89,   90,   91,   81,   93,   94,   84,  108,  108,  108,
-     73,   89,   90,   91,   77,   93,   94,   66,  108,   68,
-     83,  108,   71,  108,  108,   74,   75,   76,  108,  108,
-    108,  108,   81,  108,  108,   84,  108,  108,  108,  102,
-     89,   90,   91,  108,   93,   94,   66,  108,   68,  108,
-    108,   71,  108,  108,   74,   75,   76,   66,  108,   68,
-    108,   81,   71,  108,   84,   74,   75,   76,  108,   89,
-     90,   91,   81,   93,   94,   84,  108,  108,  108,  108,
-     89,   90,   91,  108,   93,   94,   66,  108,   68,  108,
-    108,   71,  108,  108,   74,   75,   76,  108,  108,  108,
-    108,   81,  108,  108,   84,  108,  108,  108,  108,   89,
-     90,   91,  108,   93,   94,   66,  108,   68,  108,  108,
-     71,  108,  108,   74,   75,   76,   66,  108,   68,  108,
-     81,   71,  108,   84,   74,   75,   76,  108,   89,   90,
-     91,   81,   93,   94,   84,  108,  108,  108,  108,   89,
-     90,   91,  108,   93,   94,   66,  108,   68,  108,  108,
-     71,  108,  108,   74,   75,   76,  108,  108,  108,  108,
-     81,  108,  108,   84,  108,  108,  108,  108,   89,   90,
-     91,  108,   93,   94,   66,  108,   68,  108,  108,   71,
-    108,  108,   74,   75,   76,   66,  108,   68,  108,   81,
-     71,  108,   84,   74,   75,   76,  108,   89,   90,   91,
-     81,   93,   94,   84,  108,  108,  108,  108,   89,   90,
-     91,  108,   93,   94,   66,  108,   68,  108,  108,   71,
-    108,  108,   74,   75,   76,  108,  108,  108,  108,   81,
-    108,  108,   84,  108,  108,  108,  108,   89,   90,   91,
-    108,   93,   94,   66,  108,   68,  108,  108,   71,  108,
-    108,   74,   75,   76,   66,  108,   68,  108,   81,   71,
-    108,   84,   74,   75,   76,  108,   89,   90,   91,   81,
-     93,   94,   84,  108,  108,  108,  108,   89,   90,   91,
-    108,   93,   94,   66,  108,   68,  108,  108,   71,  108,
-    108,   74,   75,   76,  108,  108,  108,  108,   81,  108,
-    108,   84,  108,  108,  108,  108,   89,   90,   91,  108,
-     93,   94,   66,  108,   68,  108,  108,   71,  108,  108,
-     74,   75,   76,   66,  108,   68,  108,   81,   71,  108,
-     84,   74,   75,   76,  108,   89,   90,   91,   81,   93,
-     94,   84,  108,  108,  108,  108,   89,   90,   91,  108,
-     93,   94,   66,  108,   68,  108,  108,   71,  108,  108,
-     74,   75,   76,  108,  108,  108,  108,   81,  108,  108,
-     84,  108,  108,  108,  108,   89,   90,   91,  108,   93,
-     94,   66,  108,   68,  108,  108,   71,  108,  108,   74,
-     75,   76,   66,  108,   68,  108,   81,   71,  108,   84,
-     74,   75,   76,  108,   89,   90,   91,   81,   93,   94,
-     84,  108,  108,  108,  108,   89,   90,   91,  108,   93,
-     94,   66,    1,   68,  108,  108,   71,  108,  108,   74,
-     75,   76,  108,  108,   13,  108,   81,  108,   17,   84,
-    108,  108,  108,  108,   89,   90,   91,   26,   93,   94,
-     66,  108,   68,   32,  108,   71,   35,  108,   74,   75,
-    108,   66,  108,   68,  108,   81,   71,  108,   47,   74,
-     75,  108,   88,   89,   90,   91,   81,   93,   94,  108,
-    108,  108,  108,   88,   89,   90,   91,  108,   93,   94,
-     66,  108,   68,    9,  108,   71,   12,  108,   74,   75,
-     16,  108,  108,  108,  108,   81,  108,  108,  108,  108,
-     26,  108,   28,   89,   90,   91,   32,   93,   94,   66,
-    108,   68,  108,  108,   71,  108,  108,   74,   75,  108,
-     66,  108,   68,  108,   81,   71,  108,  108,   74,   75,
-    108,  108,   89,   90,   91,   81,   93,   94,  108,  108,
-    108,  108,  108,   89,   90,   91,  108,   93,   94,   66,
-    108,   68,  108,   73,   71,  108,  108,   74,   75,  108,
-    108,  108,  108,   83,   81,   85,   86,   87,  108,  108,
-    108,  108,   89,   90,   91,  108,   93,   94,   66,  108,
-     68,  108,  108,   71,  108,  108,   74,   75,  108,   66,
-    108,   68,  108,   81,   71,  108,  108,   74,   75,  108,
-    108,   89,   90,   91,   81,   93,   94,  108,  108,  108,
-    108,  108,   89,   90,   91,    2,   93,   94,   66,  108,
-     68,  108,    9,   71,  108,   12,   74,   75,   15,   16,
-     17,  108,  108,   81,  108,  108,  108,  108,  108,  108,
-    108,   89,   90,   91,    2,   93,   94,  108,  108,  108,
-    108,    9,  108,  108,   12,  108,  108,   44,   16,   17,
-     47,    2,   49,  108,   51,  108,  108,   73,    9,  108,
-    108,   12,  108,  108,   15,   16,   17,   83,  108,   85,
-     86,   87,   24,  108,   26,  108,   44,  108,  108,   47,
-     32,   49,  108,   51,   52,   37,   38,   39,  108,  108,
-    108,  108,  108,   44,  108,  108,   47,  108,   49,  108,
-     51,   26,   54,   55,   56,   57,  108,   32,    2,  108,
-    108,  108,   37,   38,   39,    9,  108,  108,   12,  108,
-    108,  108,   16,   17,  108,  108,    2,  108,  108,   54,
-     55,   56,   57,    9,  108,  108,   12,  108,  108,  108,
-     16,   17,  108,  108,  108,   37,   38,   39,  108,  108,
-     44,  108,  108,   47,   13,   49,  108,   51,  108,   13,
-     52,  108,   54,   55,   56,   57,  108,   13,   44,  108,
-      2,   47,  108,   49,  108,   51,  108,  108,   37,   38,
-     39,  108,  108,   37,   38,   39,  108,  108,  108,  108,
-    108,   37,   38,   39,  108,   54,   55,   56,   57,  108,
-     54,   55,   56,   57,  108,   37,   38,   39,   54,   55,
-     56,   57,   36,   37,   38,   39,  108,  108,  108,  108,
-    108,  108,   54,   55,   56,   57,  108,  108,  108,  108,
-     54,   55,   56,   57,    9,  108,  108,   12,   37,   38,
-     39,   16,   17,   36,   37,   38,   39,  108,  108,  108,
-    108,  108,  108,  108,  108,   54,   55,   56,   57,  108,
-    108,   54,   55,   56,   57,  108,  108,  108,  108,   44,
-    108,  108,   47,  108,   49,  108,   51,
-);
-    const YY_SHIFT_USE_DFLT = -22;
-    const YY_SHIFT_MAX = 230;
-    public static $yy_shift_ofst = array(
-    -22,  501,  501,   93,  399,  399,  450,   93,   93,   93,
-    399,  450,   -9,   93,   93,   93,   93,   93,   93,  144,
-     93,  195,   93,   93,   93,  246,  195,   93,   93,   93,
-     93,   93,  297,   93,   93,   93,   93,  348,   42,   42,
-     42,   42,   42,   42,   42,   42, 1768, 1795, 1795,  701,
-    758, 1521,   80,  676,  113,  790, 1927, 1828, 1896,  568,
-    768, 1861,  757, 1866, 1874, 1888,  618,  518, 1921, 1921,
-   1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921,
-   1921, 1921, 1921, 1584,  636,  285,  676,  676,  346,  113,
-    113,  402,  700, 1723,   -8,  910,  831,  269, 1028,   51,
-      3,    3,  422,  448,  352,  106,  422,  106,  458,  364,
-    434,  454,  106,  166,  166,  166,  166,  565,  166,  166,
-    166,  586,  565,  166,  166,  -22,  -22, 1752, 1769, 1826,
-   1844, 1945,  145,  979,  156,  132,  284,  106,  140,  106,
-     30,  140,  140,   30,  106,  106,  106,  140,  106,  106,
-    140,  106,  327,  106,  106,  106,  140,  140,  106,  140,
-    205,  106,  284,  166,  565,  588,  565,  588,  565,  166,
-    166,  -12,  166,  -22,  -22,  -22,  -22,  -22,  -22,  689,
-      4,   44,   84,  186,   73,  881,  199,  188,  174,  286,
-     48,  336,  384,  389,  332,  142,  -21,   52,  154,   33,
-     85,  276,  278,  233,  515,  509,  474,  516,  502,  464,
-    491,  415,  417,  432,  514,  370,  463,  506,  365,  513,
-    -12,  517,  504,  519,  505,  511,  496,  525,  532,  330,
-    358,
-);
-    const YY_REDUCE_USE_DFLT = -89;
-    const YY_REDUCE_MAX = 178;
-    public static $yy_reduce_ofst = array(
-    325,  527,  495,  666,  595,  560,  863,  874,  834,  805,
-    762,  794, 1179, 1455, 1208, 1012, 1386, 1139, 1070, 1110,
-   1150, 1219, 1248, 1277, 1288, 1317, 1346, 1357, 1415, 1426,
-   1081, 1041, 1001,  972,  943,  932,  903, 1484, 1495, 1622,
-   1633, 1662, 1593, 1564, 1553, 1524, 1704,  607, 1590,  178,
-     74, 1027,  229,  899,  273,  212,  -22,  -22,  -22,  -22,
-    -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
-    -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
-    -22,  -22,  -22,  380,  329,  187,  159,  127,  -52,  253,
-    304,   12,  303,  152,  193,  328,   68,   68,   68,  322,
-    328,  407,  405,  322,   68,  190,  335,  416,  403,   68,
-    401,  354,  371,   68,   68,   68,  337,  322,   68,   68,
-     68,   68,  408,   68,   68,   68,  409,  455,  455,  455,
-    455,  455,  510,  480,  455,  455,  477,  482,  457,  482,
-    473,  457,  457,  485,  482,  482,  482,  457,  482,  482,
-    457,  482,  503,  482,  482,  482,  457,  457,  482,  457,
-    520,  482,  523,  -88,  498,  489,  498,  489,  498,  -88,
-    -88,  -67,  -88,  111,  155,   89,  236,  230,  162,
-);
-    public static $yyExpectedTokens = array(
-         array(),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 52, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
-         array(24, 26, 32, 37, 38, 39, 54, 55, 56, 57, ),
-         array(26, 32, 37, 38, 39, 54, 55, 56, 57, ),
-         array(26, 32, 37, 38, 39, 54, 55, 56, 57, ),
-         array(14, 16, 48, 50, 53, ),
-         array(3, 9, 10, 11, 12, 14, 18, 19, 20, 25, 29, 30, 31, 59, 60, ),
-         array(1, 13, 17, 26, 32, 35, 47, ),
-         array(14, 16, 50, 53, ),
-         array(1, 26, 32, ),
-         array(14, 35, 53, ),
-         array(3, 9, 10, 11, 12, 14, 18, 19, 20, 25, 29, 30, 31, 59, 60, ),
-         array(36, 37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 52, 54, 55, 56, 57, ),
-         array(36, 37, 38, 39, 54, 55, 56, 57, ),
-         array(13, 37, 38, 39, 54, 55, 56, 57, ),
-         array(13, 37, 38, 39, 54, 55, 56, 57, ),
-         array(13, 37, 38, 39, 54, 55, 56, 57, ),
-         array(27, 37, 38, 39, 54, 55, 56, 57, ),
-         array(13, 37, 38, 39, 54, 55, 56, 57, ),
-         array(13, 37, 38, 39, 54, 55, 56, 57, ),
-         array(2, 37, 38, 39, 54, 55, 56, 57, ),
-         array(21, 37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, 60, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(37, 38, 39, 54, 55, 56, 57, ),
-         array(9, 12, 16, 26, 28, 32, ),
-         array(9, 12, 16, 26, 32, ),
-         array(17, 44, 51, ),
-         array(1, 26, 32, ),
-         array(1, 26, 32, ),
-         array(15, 17, 47, ),
-         array(14, 35, 53, ),
-         array(14, 35, 53, ),
-         array(1, 2, ),
-         array(3, 4, 5, 6, 9, 10, 11, 12, 18, 19, 20, 25, 29, 30, 31, ),
-         array(2, 9, 12, 15, 16, 17, 44, 47, 49, 51, ),
-         array(12, 14, 16, 53, ),
-         array(9, 12, 16, 49, ),
-         array(1, 13, 26, 32, ),
-         array(1, 13, 26, 32, ),
-         array(1, 13, 26, 32, ),
-         array(15, 17, 47, ),
-         array(9, 12, 16, ),
-         array(9, 12, 16, ),
-         array(14, 16, ),
-         array(17, 47, ),
-         array(1, 28, ),
-         array(26, 32, ),
-         array(14, 16, ),
-         array(26, 32, ),
-         array(26, 32, ),
-         array(1, 52, ),
-         array(14, 53, ),
-         array(1, 17, ),
-         array(26, 32, ),
-         array(1, ),
-         array(1, ),
-         array(1, ),
-         array(1, ),
-         array(17, ),
-         array(1, ),
-         array(1, ),
-         array(1, ),
-         array(1, ),
-         array(17, ),
-         array(1, ),
-         array(1, ),
-         array(),
-         array(),
-         array(2, 9, 12, 16, 17, 44, 47, 49, 51, 52, ),
-         array(2, 9, 12, 15, 16, 17, 44, 47, 49, 51, ),
-         array(2, 9, 12, 16, 17, 44, 47, 49, 51, ),
-         array(2, 9, 12, 16, 17, 44, 47, 49, 51, ),
-         array(9, 12, 16, 17, 44, 47, 49, 51, ),
-         array(12, 14, 16, 33, 53, ),
-         array(9, 12, 16, 49, ),
-         array(9, 12, 16, ),
-         array(15, 44, 51, ),
-         array(14, 53, ),
-         array(26, 32, ),
-         array(44, 51, ),
-         array(26, 32, ),
-         array(44, 51, ),
-         array(44, 51, ),
-         array(44, 51, ),
-         array(44, 51, ),
-         array(26, 32, ),
-         array(26, 32, ),
-         array(26, 32, ),
-         array(44, 51, ),
-         array(26, 32, ),
-         array(26, 32, ),
-         array(44, 51, ),
-         array(26, 32, ),
-         array(15, 22, ),
-         array(26, 32, ),
-         array(26, 32, ),
-         array(26, 32, ),
-         array(44, 51, ),
-         array(44, 51, ),
-         array(26, 32, ),
-         array(44, 51, ),
-         array(12, 35, ),
-         array(26, 32, ),
-         array(14, 53, ),
-         array(1, ),
-         array(17, ),
-         array(2, ),
-         array(17, ),
-         array(2, ),
-         array(17, ),
-         array(1, ),
-         array(1, ),
-         array(35, ),
-         array(1, ),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(2, 35, 37, 38, 39, 47, 54, 55, 56, 57, ),
-         array(13, 21, 23, 26, 32, 34, 36, 44, ),
-         array(13, 15, 26, 32, 35, 47, ),
-         array(13, 22, 26, 32, 45, ),
-         array(13, 22, 26, 32, 45, ),
-         array(35, 44, 47, 52, ),
-         array(9, 12, 16, 49, ),
-         array(22, 45, 52, ),
-         array(28, 35, 47, ),
-         array(22, 45, 60, ),
-         array(35, 47, ),
-         array(21, 34, ),
-         array(34, 36, ),
-         array(16, 49, ),
-         array(6, 8, ),
-         array(44, 52, ),
-         array(7, 8, ),
-         array(34, 52, ),
-         array(35, 47, ),
-         array(35, 47, ),
-         array(22, 45, ),
-         array(34, 36, ),
-         array(15, 44, ),
-         array(34, 36, ),
-         array(34, 36, ),
-         array(13, ),
-         array(16, ),
-         array(50, ),
-         array(7, ),
-         array(16, ),
-         array(52, ),
-         array(23, ),
-         array(36, ),
-         array(50, ),
-         array(14, ),
-         array(13, ),
-         array(52, ),
-         array(15, ),
-         array(16, ),
-         array(40, ),
-         array(16, ),
-         array(35, ),
-         array(16, ),
-         array(33, ),
-         array(16, ),
-         array(33, ),
-         array(35, ),
-         array(44, ),
-         array(16, ),
-         array(16, ),
-         array(16, ),
-         array(16, ),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-         array(),
-);
-    public static $yy_default = array(
-    336,  512,  512,  512,  497,  497,  512,  474,  474,  474,
-    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-    512,  512,  512,  512,  512,  512,  377,  377,  356,  512,
-    512,  413,  512,  377,  512,  512,  512,  512,  512,  512,
-    512,  512,  382,  512,  349,  512,  512,  512,  382,  379,
-    389,  388,  384,  402,  473,  397,  498,  500,  401,  361,
-    472,  499,  349,  377,  377,  487,  377,  377,  429,  512,
-    512,  368,  326,  428,  512,  439,  391,  391,  391,  429,
-    439,  439,  512,  429,  391,  377,  512,  377,  377,  391,
-    512,  371,  358,  395,  394,  396,  373,  429,  400,  404,
-    391,  404,  484,  406,  405,  481,  334,  428,  428,  428,
-    428,  428,  512,  441,  439,  455,  512,  363,  435,  354,
-    434,  437,  433,  432,  359,  357,  364,  436,  353,  367,
-    466,  365,  512,  352,  350,  360,  467,  465,  346,  464,
-    439,  366,  512,  369,  461,  475,  488,  476,  485,  372,
-    422,  439,  374,  480,  439,  480,  480,  439,  334,  413,
-    409,  413,  403,  403,  413,  440,  403,  413,  403,  413,
-    512,  512,  512,  332,  409,  512,  512,  512,  423,  403,
-    512,  409,  512,  512,  512,  512,  512,  512,  512,  418,
-    385,  512,  512,  512,  512,  512,  512,  512,  415,  512,
-    455,  512,  512,  512,  411,  486,  409,  512,  512,  512,
-    512,  419,  407,  362,  445,  418,  425,  424,  420,  339,
-    460,  421,  483,  398,  416,  340,  399,  455,  378,  337,
-    338,  330,  328,  329,  442,  443,  444,  438,  392,  393,
-    427,  426,  386,  417,  408,  390,  410,  331,  333,  335,
-    412,  470,  414,  415,  503,  478,  495,  471,  459,  458,
-    375,  457,  344,  462,  508,  493,  376,  496,  456,  509,
-    494,  501,  504,  511,  510,  507,  505,  502,  506,  345,
-    468,  469,  446,  355,  341,  452,  450,  454,  448,  453,
-    447,  489,  490,  491,  463,  449,  492,  451,  327,  342,
-    343,  370,  430,  431,  479,  477,
-);
-    const YYNOCODE = 109;
-    const YYSTACKDEPTH = 500;
-    const YYNSTATE = 326;
-    const YYNRULE = 186;
-    const YYERRORSYMBOL = 61;
-    const YYERRSYMDT = 'yy0';
-    const YYFALLBACK = 0;
-    public static $yyFallback = array(
-    );
-    public function Trace($TraceFILE, $zTracePrompt)
-    {
-        if (!$TraceFILE) {
-            $zTracePrompt = 0;
-        } elseif (!$zTracePrompt) {
-            $TraceFILE = 0;
-        }
-        $this->yyTraceFILE = $TraceFILE;
-        $this->yyTracePrompt = $zTracePrompt;
-    }
-
-    public function PrintTrace()
-    {
-        $this->yyTraceFILE = fopen('php://output', 'w');
-        $this->yyTracePrompt = '<br>';
-    }
-
-    public $yyTraceFILE;
-    public $yyTracePrompt;
-    public $yyidx;                    /* Index of top element in stack */
-    public $yyerrcnt;                 /* Shifts left before out of the error */
-    public $yystack = array();  /* The parser's stack */
-
-    public $yyTokenName = array(
-  '$',             'VERT',          'COLON',         'TEXT',        
-  'STRIPON',       'STRIPOFF',      'LITERALSTART',  'LITERALEND',  
-  'LITERAL',       'SIMPELOUTPUT',  'SIMPLETAG',     'SMARTYBLOCKCHILDPARENT',
-  'LDEL',          'RDEL',          'DOLLARID',      'EQUAL',       
-  'ID',            'PTR',           'LDELMAKENOCACHE',  'LDELIF',      
-  'LDELFOR',       'SEMICOLON',     'INCDEC',        'TO',          
-  'STEP',          'LDELFOREACH',   'SPACE',         'AS',          
-  'APTR',          'LDELSETFILTER',  'CLOSETAG',      'LDELSLASH',   
-  'ATTR',          'INTEGER',       'COMMA',         'OPENP',       
-  'CLOSEP',        'MATH',          'UNIMATH',       'ISIN',        
-  'QMARK',         'NOT',           'TYPECAST',      'HEX',         
-  'DOT',           'INSTANCEOF',    'SINGLEQUOTESTRING',  'DOUBLECOLON', 
-  'NAMESPACE',     'AT',            'HATCH',         'OPENB',       
-  'CLOSEB',        'DOLLAR',        'LOGOP',         'SLOGOP',      
-  'TLOGOP',        'SINGLECOND',    'ARRAYOPEN',     'QUOTE',       
-  'BACKTICK',      'error',         'start',         'template',    
-  'literal_e2',    'literal_e1',    'smartytag',     'tagbody',     
-  'tag',           'outattr',       'eqoutattr',     'varindexed',  
-  'output',        'attributes',    'variable',      'value',       
-  'expr',          'modifierlist',  'statement',     'statements',  
-  'foraction',     'varvar',        'modparameters',  'attribute',   
-  'ternary',       'tlop',          'lop',           'scond',       
-  'array',         'function',      'ns1',           'doublequoted_with_quotes',
-  'static_class_access',  'arraydef',      'object',        'arrayindex',  
-  'indexdef',      'varvarele',     'objectchain',   'objectelement',
-  'method',        'params',        'modifier',      'modparameter',
-  'arrayelements',  'arrayelement',  'doublequoted',  'doublequotedcontent',
-    );
-
-    public static $yyRuleName = array(
-  'start ::= template',
-  'template ::= template TEXT',
-  'template ::= template STRIPON',
-  'template ::= template STRIPOFF',
-  'template ::= template LITERALSTART literal_e2 LITERALEND',
-  'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND',
-  'literal_e2 ::= literal_e1',
-  'literal_e1 ::= literal_e1 LITERAL',
-  'literal_e1 ::=',
-  'template ::= template smartytag',
-  'template ::=',
-  'smartytag ::= SIMPELOUTPUT',
-  'smartytag ::= SIMPLETAG',
-  'smartytag ::= SMARTYBLOCKCHILDPARENT',
-  'smartytag ::= LDEL tagbody RDEL',
-  'smartytag ::= tag RDEL',
-  'tagbody ::= outattr',
-  'tagbody ::= DOLLARID eqoutattr',
-  'tagbody ::= varindexed eqoutattr',
-  'eqoutattr ::= EQUAL outattr',
-  'outattr ::= output attributes',
-  'output ::= variable',
-  'output ::= value',
-  'output ::= expr',
-  'tag ::= LDEL ID attributes',
-  'tag ::= LDEL ID',
-  'tag ::= LDEL ID modifierlist attributes',
-  'tag ::= LDEL ID PTR ID attributes',
-  'tag ::= LDEL ID PTR ID modifierlist attributes',
-  'tag ::= LDELMAKENOCACHE DOLLARID',
-  'tag ::= LDELIF expr',
-  'tag ::= LDELIF expr attributes',
-  'tag ::= LDELIF statement',
-  'tag ::= LDELIF statement attributes',
-  'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
-  'foraction ::= EQUAL expr',
-  'foraction ::= INCDEC',
-  'tag ::= LDELFOR statement TO expr attributes',
-  'tag ::= LDELFOR statement TO expr STEP expr attributes',
-  'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
-  'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
-  'tag ::= LDELFOREACH attributes',
-  'tag ::= LDELSETFILTER ID modparameters',
-  'tag ::= LDELSETFILTER ID modparameters modifierlist',
-  'smartytag ::= CLOSETAG',
-  'tag ::= LDELSLASH ID',
-  'tag ::= LDELSLASH ID modifierlist',
-  'tag ::= LDELSLASH ID PTR ID',
-  'tag ::= LDELSLASH ID PTR ID modifierlist',
-  'attributes ::= attributes attribute',
-  'attributes ::= attribute',
-  'attributes ::=',
-  'attribute ::= SPACE ID EQUAL ID',
-  'attribute ::= ATTR expr',
-  'attribute ::= ATTR value',
-  'attribute ::= SPACE ID',
-  'attribute ::= SPACE expr',
-  'attribute ::= SPACE value',
-  'attribute ::= SPACE INTEGER EQUAL expr',
-  'statements ::= statement',
-  'statements ::= statements COMMA statement',
-  'statement ::= DOLLARID EQUAL INTEGER',
-  'statement ::= DOLLARID EQUAL expr',
-  'statement ::= varindexed EQUAL expr',
-  'statement ::= OPENP statement CLOSEP',
-  'expr ::= value',
-  'expr ::= ternary',
-  'expr ::= DOLLARID COLON ID',
-  'expr ::= expr MATH value',
-  'expr ::= expr UNIMATH value',
-  'expr ::= expr tlop value',
-  'expr ::= expr lop expr',
-  'expr ::= expr scond',
-  'expr ::= expr ISIN array',
-  'expr ::= expr ISIN value',
-  'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
-  'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr',
-  'value ::= variable',
-  'value ::= UNIMATH value',
-  'value ::= NOT value',
-  'value ::= TYPECAST value',
-  'value ::= variable INCDEC',
-  'value ::= HEX',
-  'value ::= INTEGER',
-  'value ::= INTEGER DOT INTEGER',
-  'value ::= INTEGER DOT',
-  'value ::= DOT INTEGER',
-  'value ::= ID',
-  'value ::= function',
-  'value ::= OPENP expr CLOSEP',
-  'value ::= variable INSTANCEOF ns1',
-  'value ::= variable INSTANCEOF variable',
-  'value ::= SINGLEQUOTESTRING',
-  'value ::= doublequoted_with_quotes',
-  'value ::= varindexed DOUBLECOLON static_class_access',
-  'value ::= smartytag',
-  'value ::= value modifierlist',
-  'value ::= NAMESPACE',
-  'value ::= arraydef',
-  'value ::= ns1 DOUBLECOLON static_class_access',
-  'ns1 ::= ID',
-  'ns1 ::= NAMESPACE',
-  'variable ::= DOLLARID',
-  'variable ::= varindexed',
-  'variable ::= varvar AT ID',
-  'variable ::= object',
-  'variable ::= HATCH ID HATCH',
-  'variable ::= HATCH ID HATCH arrayindex',
-  'variable ::= HATCH variable HATCH',
-  'variable ::= HATCH variable HATCH arrayindex',
-  'varindexed ::= DOLLARID arrayindex',
-  'varindexed ::= varvar arrayindex',
-  'arrayindex ::= arrayindex indexdef',
-  'arrayindex ::=',
-  'indexdef ::= DOT DOLLARID',
-  'indexdef ::= DOT varvar',
-  'indexdef ::= DOT varvar AT ID',
-  'indexdef ::= DOT ID',
-  'indexdef ::= DOT INTEGER',
-  'indexdef ::= DOT LDEL expr RDEL',
-  'indexdef ::= OPENB ID CLOSEB',
-  'indexdef ::= OPENB ID DOT ID CLOSEB',
-  'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
-  'indexdef ::= OPENB INTEGER CLOSEB',
-  'indexdef ::= OPENB DOLLARID CLOSEB',
-  'indexdef ::= OPENB variable CLOSEB',
-  'indexdef ::= OPENB value CLOSEB',
-  'indexdef ::= OPENB expr CLOSEB',
-  'indexdef ::= OPENB CLOSEB',
-  'varvar ::= DOLLARID',
-  'varvar ::= DOLLAR',
-  'varvar ::= varvar varvarele',
-  'varvarele ::= ID',
-  'varvarele ::= SIMPELOUTPUT',
-  'varvarele ::= LDEL expr RDEL',
-  'object ::= varindexed objectchain',
-  'objectchain ::= objectelement',
-  'objectchain ::= objectchain objectelement',
-  'objectelement ::= PTR ID arrayindex',
-  'objectelement ::= PTR varvar arrayindex',
-  'objectelement ::= PTR LDEL expr RDEL arrayindex',
-  'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
-  'objectelement ::= PTR method',
-  'function ::= ns1 OPENP params CLOSEP',
-  'method ::= ID OPENP params CLOSEP',
-  'method ::= DOLLARID OPENP params CLOSEP',
-  'params ::= params COMMA expr',
-  'params ::= expr',
-  'params ::=',
-  'modifierlist ::= modifierlist modifier modparameters',
-  'modifierlist ::= modifier modparameters',
-  'modifier ::= VERT AT ID',
-  'modifier ::= VERT ID',
-  'modparameters ::= modparameters modparameter',
-  'modparameters ::=',
-  'modparameter ::= COLON value',
-  'modparameter ::= COLON UNIMATH value',
-  'modparameter ::= COLON array',
-  'static_class_access ::= method',
-  'static_class_access ::= method objectchain',
-  'static_class_access ::= ID',
-  'static_class_access ::= DOLLARID arrayindex',
-  'static_class_access ::= DOLLARID arrayindex objectchain',
-  'lop ::= LOGOP',
-  'lop ::= SLOGOP',
-  'tlop ::= TLOGOP',
-  'scond ::= SINGLECOND',
-  'arraydef ::= OPENB arrayelements CLOSEB',
-  'arraydef ::= ARRAYOPEN arrayelements CLOSEP',
-  'arrayelements ::= arrayelement',
-  'arrayelements ::= arrayelements COMMA arrayelement',
-  'arrayelements ::=',
-  'arrayelement ::= value APTR expr',
-  'arrayelement ::= ID APTR expr',
-  'arrayelement ::= expr',
-  'doublequoted_with_quotes ::= QUOTE QUOTE',
-  'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
-  'doublequoted ::= doublequoted doublequotedcontent',
-  'doublequoted ::= doublequotedcontent',
-  'doublequotedcontent ::= BACKTICK variable BACKTICK',
-  'doublequotedcontent ::= BACKTICK expr BACKTICK',
-  'doublequotedcontent ::= DOLLARID',
-  'doublequotedcontent ::= LDEL variable RDEL',
-  'doublequotedcontent ::= LDEL expr RDEL',
-  'doublequotedcontent ::= smartytag',
-  'doublequotedcontent ::= TEXT',
-    );
-
-    public function tokenName($tokenType)
-    {
-        if ($tokenType === 0) {
-            return 'End of Input';
-        }
-        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[$tokenType];
-        } else {
-            return 'Unknown';
-        }
-    }
-
-    public static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:  break;   /* If no destructor action specified: do nothing */
-        }
-    }
-
-    public function yy_pop_parser_stack()
-    {
-        if (empty($this->yystack)) {
-            return;
-        }
-        $yytos = array_pop($this->yystack);
-        if ($this->yyTraceFILE && $this->yyidx >= 0) {
-            fwrite($this->yyTraceFILE,
-                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                    "\n");
-        }
-        $yymajor = $yytos->major;
-        self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx--;
-
-        return $yymajor;
-    }
-
-    public function __destruct()
-    {
-        while ($this->yystack !== Array()) {
-            $this->yy_pop_parser_stack();
-        }
-        if (is_resource($this->yyTraceFILE)) {
-            fclose($this->yyTraceFILE);
-        }
-    }
-
-    public function yy_get_expected_tokens($token)
-    {
-        static $res3 = array();
-        static $res4 = array();
-        $state = $this->yystack[$this->yyidx]->stateno;
-        $expected = self::$yyExpectedTokens[$state];
-        if (isset($res3[$state][$token])) {
-            if ($res3[$state][$token]) {
-                return $expected;
-            }
-        } else {
-            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
-                return $expected;
-            }
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done++ === 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return array_unique($expected);
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno][0]);
-                    if (isset(self::$yyExpectedTokens[$nextstate])) {
-                $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                        if (isset($res4[$nextstate][$token])) {
-                            if ($res4[$nextstate][$token]) {
-                                $this->yyidx = $yyidx;
-                                $this->yystack = $stack;
-                                return array_unique($expected);
-                            }
-                        } else {
-                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                                $this->yyidx = $yyidx;
-                                $this->yystack = $stack;
-                                return array_unique($expected);
-                            }
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx++;
-                        $x = new TP_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno][0];
-                        $this->yystack[$this->yyidx] = $x;
-                        continue 2;
-                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return array_unique($expected);
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return $expected;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-    $this->yyidx = $yyidx;
-    $this->yystack = $stack;
-
-        return array_unique($expected);
-    }
-
-    public function yy_is_expected_token($token)
-    {
-        static $res = array();
-        static $res2 = array();
-        if ($token === 0) {
-            return true; // 0 is not part of this
-        }
-        $state = $this->yystack[$this->yyidx]->stateno;
-        if (isset($res[$state][$token])) {
-            if ($res[$state][$token]) {
-                return true;
-            }
-        } else {
-            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
-                return true;
-            }
-       }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done++ === 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return true;
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno][0]);
-                    if (isset($res2[$nextstate][$token])) {
-                        if ($res2[$nextstate][$token]) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return true;
-                        }
-                    } else {
-                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return true;
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx++;
-                        $x = new TP_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno][0];
-                        $this->yystack[$this->yyidx] = $x;
-                        continue 2;
-                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        if (!$token) {
-                            // end of input: this is valid
-                            return true;
-                        }
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return false;
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return true;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-
-        return true;
-    }
-
-   public function yy_find_shift_action($iLookAhead)
-    {
-        $stateno = $this->yystack[$this->yyidx]->stateno;
-
-        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[$stateno])) {
-            // no shift actions
-            return self::$yy_default[$stateno];
-        }
-        $i = self::$yy_shift_ofst[$stateno];
-        if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[$stateno];
-        }
-        if ($iLookAhead === self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
-                if ($this->yyTraceFILE) {
-                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
-                        $this->yyTokenName[$iLookAhead] . ' => ' .
-                        $this->yyTokenName[$iFallback] . "\n");
-                }
-
-                return $this->yy_find_shift_action($iFallback);
-            }
-
-            return self::$yy_default[$stateno];
-        } else {
-            return self::$yy_action[$i];
-        }
-    }
-
-    public function yy_find_reduce_action($stateno, $iLookAhead)
-    {
-        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
-        if (!isset(self::$yy_reduce_ofst[$stateno])) {
-            return self::$yy_default[$stateno];
-        }
-        $i = self::$yy_reduce_ofst[$stateno];
-        if ($i === self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[$stateno];
-        }
-        if ($iLookAhead === self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            return self::$yy_default[$stateno];
-        } else {
-            return self::$yy_action[$i];
-        }
-    }
-
-    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
-    {
-        $this->yyidx++;
-        if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx--;
-            if ($this->yyTraceFILE) {
-                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
-            }
-            while ($this->yyidx >= 0) {
-                $this->yy_pop_parser_stack();
-            }
-// line 220 "../smarty/lexer/smarty_internal_templateparser.y"
-
-    $this->internalError = true;
-    $this->compiler->trigger_template_error('Stack overflow in template parser');
-
-            return;
-        }
-        $yytos = new TP_yyStackEntry;
-        $yytos->stateno = $yyNewState;
-        $yytos->major = $yyMajor;
-        $yytos->minor = $yypMinor;
-        $this->yystack[] = $yytos;
-        if ($this->yyTraceFILE && $this->yyidx > 0) {
-            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
-                $yyNewState);
-            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
-            for ($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf($this->yyTraceFILE, " %s",
-                    $this->yyTokenName[$this->yystack[$i]->major]);
-            }
-            fwrite($this->yyTraceFILE,"\n");
-        }
-    }
-
-    public static $yyRuleInfo = array(
-  array( 0 => 62, 1 => 1 ),
-  array( 0 => 63, 1 => 2 ),
-  array( 0 => 63, 1 => 2 ),
-  array( 0 => 63, 1 => 2 ),
-  array( 0 => 63, 1 => 4 ),
-  array( 0 => 64, 1 => 4 ),
-  array( 0 => 64, 1 => 1 ),
-  array( 0 => 65, 1 => 2 ),
-  array( 0 => 65, 1 => 0 ),
-  array( 0 => 63, 1 => 2 ),
-  array( 0 => 63, 1 => 0 ),
-  array( 0 => 66, 1 => 1 ),
-  array( 0 => 66, 1 => 1 ),
-  array( 0 => 66, 1 => 1 ),
-  array( 0 => 66, 1 => 3 ),
-  array( 0 => 66, 1 => 2 ),
-  array( 0 => 67, 1 => 1 ),
-  array( 0 => 67, 1 => 2 ),
-  array( 0 => 67, 1 => 2 ),
-  array( 0 => 70, 1 => 2 ),
-  array( 0 => 69, 1 => 2 ),
-  array( 0 => 72, 1 => 1 ),
-  array( 0 => 72, 1 => 1 ),
-  array( 0 => 72, 1 => 1 ),
-  array( 0 => 68, 1 => 3 ),
-  array( 0 => 68, 1 => 2 ),
-  array( 0 => 68, 1 => 4 ),
-  array( 0 => 68, 1 => 5 ),
-  array( 0 => 68, 1 => 6 ),
-  array( 0 => 68, 1 => 2 ),
-  array( 0 => 68, 1 => 2 ),
-  array( 0 => 68, 1 => 3 ),
-  array( 0 => 68, 1 => 2 ),
-  array( 0 => 68, 1 => 3 ),
-  array( 0 => 68, 1 => 8 ),
-  array( 0 => 80, 1 => 2 ),
-  array( 0 => 80, 1 => 1 ),
-  array( 0 => 68, 1 => 5 ),
-  array( 0 => 68, 1 => 7 ),
-  array( 0 => 68, 1 => 6 ),
-  array( 0 => 68, 1 => 8 ),
-  array( 0 => 68, 1 => 2 ),
-  array( 0 => 68, 1 => 3 ),
-  array( 0 => 68, 1 => 4 ),
-  array( 0 => 66, 1 => 1 ),
-  array( 0 => 68, 1 => 2 ),
-  array( 0 => 68, 1 => 3 ),
-  array( 0 => 68, 1 => 4 ),
-  array( 0 => 68, 1 => 5 ),
-  array( 0 => 73, 1 => 2 ),
-  array( 0 => 73, 1 => 1 ),
-  array( 0 => 73, 1 => 0 ),
-  array( 0 => 83, 1 => 4 ),
-  array( 0 => 83, 1 => 2 ),
-  array( 0 => 83, 1 => 2 ),
-  array( 0 => 83, 1 => 2 ),
-  array( 0 => 83, 1 => 2 ),
-  array( 0 => 83, 1 => 2 ),
-  array( 0 => 83, 1 => 4 ),
-  array( 0 => 79, 1 => 1 ),
-  array( 0 => 79, 1 => 3 ),
-  array( 0 => 78, 1 => 3 ),
-  array( 0 => 78, 1 => 3 ),
-  array( 0 => 78, 1 => 3 ),
-  array( 0 => 78, 1 => 3 ),
-  array( 0 => 76, 1 => 1 ),
-  array( 0 => 76, 1 => 1 ),
-  array( 0 => 76, 1 => 3 ),
-  array( 0 => 76, 1 => 3 ),
-  array( 0 => 76, 1 => 3 ),
-  array( 0 => 76, 1 => 3 ),
-  array( 0 => 76, 1 => 3 ),
-  array( 0 => 76, 1 => 2 ),
-  array( 0 => 76, 1 => 3 ),
-  array( 0 => 76, 1 => 3 ),
-  array( 0 => 84, 1 => 7 ),
-  array( 0 => 84, 1 => 7 ),
-  array( 0 => 75, 1 => 1 ),
-  array( 0 => 75, 1 => 2 ),
-  array( 0 => 75, 1 => 2 ),
-  array( 0 => 75, 1 => 2 ),
-  array( 0 => 75, 1 => 2 ),
-  array( 0 => 75, 1 => 1 ),
-  array( 0 => 75, 1 => 1 ),
-  array( 0 => 75, 1 => 3 ),
-  array( 0 => 75, 1 => 2 ),
-  array( 0 => 75, 1 => 2 ),
-  array( 0 => 75, 1 => 1 ),
-  array( 0 => 75, 1 => 1 ),
-  array( 0 => 75, 1 => 3 ),
-  array( 0 => 75, 1 => 3 ),
-  array( 0 => 75, 1 => 3 ),
-  array( 0 => 75, 1 => 1 ),
-  array( 0 => 75, 1 => 1 ),
-  array( 0 => 75, 1 => 3 ),
-  array( 0 => 75, 1 => 1 ),
-  array( 0 => 75, 1 => 2 ),
-  array( 0 => 75, 1 => 1 ),
-  array( 0 => 75, 1 => 1 ),
-  array( 0 => 75, 1 => 3 ),
-  array( 0 => 90, 1 => 1 ),
-  array( 0 => 90, 1 => 1 ),
-  array( 0 => 74, 1 => 1 ),
-  array( 0 => 74, 1 => 1 ),
-  array( 0 => 74, 1 => 3 ),
-  array( 0 => 74, 1 => 1 ),
-  array( 0 => 74, 1 => 3 ),
-  array( 0 => 74, 1 => 4 ),
-  array( 0 => 74, 1 => 3 ),
-  array( 0 => 74, 1 => 4 ),
-  array( 0 => 71, 1 => 2 ),
-  array( 0 => 71, 1 => 2 ),
-  array( 0 => 95, 1 => 2 ),
-  array( 0 => 95, 1 => 0 ),
-  array( 0 => 96, 1 => 2 ),
-  array( 0 => 96, 1 => 2 ),
-  array( 0 => 96, 1 => 4 ),
-  array( 0 => 96, 1 => 2 ),
-  array( 0 => 96, 1 => 2 ),
-  array( 0 => 96, 1 => 4 ),
-  array( 0 => 96, 1 => 3 ),
-  array( 0 => 96, 1 => 5 ),
-  array( 0 => 96, 1 => 3 ),
-  array( 0 => 96, 1 => 3 ),
-  array( 0 => 96, 1 => 3 ),
-  array( 0 => 96, 1 => 3 ),
-  array( 0 => 96, 1 => 3 ),
-  array( 0 => 96, 1 => 3 ),
-  array( 0 => 96, 1 => 2 ),
-  array( 0 => 81, 1 => 1 ),
-  array( 0 => 81, 1 => 1 ),
-  array( 0 => 81, 1 => 2 ),
-  array( 0 => 97, 1 => 1 ),
-  array( 0 => 97, 1 => 1 ),
-  array( 0 => 97, 1 => 3 ),
-  array( 0 => 94, 1 => 2 ),
-  array( 0 => 98, 1 => 1 ),
-  array( 0 => 98, 1 => 2 ),
-  array( 0 => 99, 1 => 3 ),
-  array( 0 => 99, 1 => 3 ),
-  array( 0 => 99, 1 => 5 ),
-  array( 0 => 99, 1 => 6 ),
-  array( 0 => 99, 1 => 2 ),
-  array( 0 => 89, 1 => 4 ),
-  array( 0 => 100, 1 => 4 ),
-  array( 0 => 100, 1 => 4 ),
-  array( 0 => 101, 1 => 3 ),
-  array( 0 => 101, 1 => 1 ),
-  array( 0 => 101, 1 => 0 ),
-  array( 0 => 77, 1 => 3 ),
-  array( 0 => 77, 1 => 2 ),
-  array( 0 => 102, 1 => 3 ),
-  array( 0 => 102, 1 => 2 ),
-  array( 0 => 82, 1 => 2 ),
-  array( 0 => 82, 1 => 0 ),
-  array( 0 => 103, 1 => 2 ),
-  array( 0 => 103, 1 => 3 ),
-  array( 0 => 103, 1 => 2 ),
-  array( 0 => 92, 1 => 1 ),
-  array( 0 => 92, 1 => 2 ),
-  array( 0 => 92, 1 => 1 ),
-  array( 0 => 92, 1 => 2 ),
-  array( 0 => 92, 1 => 3 ),
-  array( 0 => 86, 1 => 1 ),
-  array( 0 => 86, 1 => 1 ),
-  array( 0 => 85, 1 => 1 ),
-  array( 0 => 87, 1 => 1 ),
-  array( 0 => 93, 1 => 3 ),
-  array( 0 => 93, 1 => 3 ),
-  array( 0 => 104, 1 => 1 ),
-  array( 0 => 104, 1 => 3 ),
-  array( 0 => 104, 1 => 0 ),
-  array( 0 => 105, 1 => 3 ),
-  array( 0 => 105, 1 => 3 ),
-  array( 0 => 105, 1 => 1 ),
-  array( 0 => 91, 1 => 2 ),
-  array( 0 => 91, 1 => 3 ),
-  array( 0 => 106, 1 => 2 ),
-  array( 0 => 106, 1 => 1 ),
-  array( 0 => 107, 1 => 3 ),
-  array( 0 => 107, 1 => 3 ),
-  array( 0 => 107, 1 => 1 ),
-  array( 0 => 107, 1 => 3 ),
-  array( 0 => 107, 1 => 3 ),
-  array( 0 => 107, 1 => 1 ),
-  array( 0 => 107, 1 => 1 ),
-    );
-
-    public static $yyReduceMap = array(
-        0 => 0,
-        1 => 1,
-        2 => 2,
-        3 => 3,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        21 => 6,
-        22 => 6,
-        23 => 6,
-        36 => 6,
-        56 => 6,
-        57 => 6,
-        65 => 6,
-        66 => 6,
-        77 => 6,
-        82 => 6,
-        83 => 6,
-        88 => 6,
-        92 => 6,
-        93 => 6,
-        97 => 6,
-        98 => 6,
-        100 => 6,
-        105 => 6,
-        169 => 6,
-        174 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-        16 => 16,
-        17 => 17,
-        18 => 18,
-        19 => 19,
-        20 => 20,
-        24 => 24,
-        25 => 25,
-        26 => 26,
-        27 => 27,
-        28 => 28,
-        29 => 29,
-        30 => 30,
-        31 => 31,
-        33 => 31,
-        32 => 32,
-        34 => 34,
-        35 => 35,
-        37 => 37,
-        38 => 38,
-        39 => 39,
-        40 => 40,
-        41 => 41,
-        42 => 42,
-        43 => 43,
-        44 => 44,
-        45 => 45,
-        46 => 46,
-        47 => 47,
-        48 => 48,
-        49 => 49,
-        50 => 50,
-        59 => 50,
-        147 => 50,
-        151 => 50,
-        155 => 50,
-        157 => 50,
-        51 => 51,
-        148 => 51,
-        154 => 51,
-        52 => 52,
-        53 => 53,
-        54 => 53,
-        55 => 55,
-        132 => 55,
-        58 => 58,
-        60 => 60,
-        61 => 61,
-        62 => 61,
-        63 => 63,
-        64 => 64,
-        67 => 67,
-        68 => 68,
-        69 => 68,
-        70 => 70,
-        71 => 71,
-        72 => 72,
-        73 => 73,
-        74 => 74,
-        75 => 75,
-        76 => 76,
-        78 => 78,
-        80 => 78,
-        81 => 78,
-        112 => 78,
-        79 => 79,
-        84 => 84,
-        85 => 85,
-        86 => 86,
-        87 => 87,
-        89 => 89,
-        90 => 90,
-        91 => 90,
-        94 => 94,
-        95 => 95,
-        96 => 96,
-        99 => 99,
-        101 => 101,
-        102 => 102,
-        103 => 103,
-        104 => 104,
-        106 => 106,
-        107 => 107,
-        108 => 108,
-        109 => 109,
-        110 => 110,
-        111 => 111,
-        113 => 113,
-        171 => 113,
-        114 => 114,
-        115 => 115,
-        116 => 116,
-        117 => 117,
-        118 => 118,
-        119 => 119,
-        127 => 119,
-        120 => 120,
-        121 => 121,
-        122 => 122,
-        123 => 122,
-        125 => 122,
-        126 => 122,
-        124 => 124,
-        128 => 128,
-        129 => 129,
-        130 => 130,
-        175 => 130,
-        131 => 131,
-        133 => 133,
-        134 => 134,
-        135 => 135,
-        136 => 136,
-        137 => 137,
-        138 => 138,
-        139 => 139,
-        140 => 140,
-        141 => 141,
-        142 => 142,
-        143 => 143,
-        144 => 144,
-        145 => 145,
-        146 => 146,
-        149 => 149,
-        150 => 150,
-        152 => 152,
-        153 => 153,
-        156 => 156,
-        158 => 158,
-        159 => 159,
-        160 => 160,
-        161 => 161,
-        162 => 162,
-        163 => 163,
-        164 => 164,
-        165 => 165,
-        166 => 166,
-        167 => 167,
-        168 => 167,
-        170 => 170,
-        172 => 172,
-        173 => 173,
-        176 => 176,
-        177 => 177,
-        178 => 178,
-        179 => 179,
-        182 => 179,
-        180 => 180,
-        183 => 180,
-        181 => 181,
-        184 => 184,
-        185 => 185,
-    );
-// line 233 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r0(){
-    $this->root_buffer->prepend_array($this, $this->template_prefix);
-    $this->root_buffer->append_array($this, $this->template_postfix);
-    $this->_retvalue = $this->root_buffer->to_smarty_php($this);
-    }
-// line 240 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r1(){
-         $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));
-    }
-// line 250 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r2(){
-    $this->strip = true;
-    }
-// line 254 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r3(){
-    $this->strip = false;
-    }
-// line 259 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r4(){
-       $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($this->yystack[$this->yyidx + -1]->minor));
-    }
-// line 264 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r5(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.$this->yystack[$this->yyidx + -1]->minor;
-    }
-// line 267 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r6(){
-    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 271 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r7(){
-        $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-
-    }
-// line 276 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r8(){
-    $this->_retvalue = '';
-    }
-// line 280 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r9(){
-      if ($this->compiler->has_code) {
-          $this->current_buffer->append_subtree($this, $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor));
-      }
-     $this->compiler->has_variable_string = false;
-     $this->block_nesting_level = count($this->compiler->_tag_stack);
-    }
-// line 292 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r11(){
-    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
-    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
-    } else {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
-    }
-    }
-// line 302 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r12(){
-    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
-    if ($tag == 'strip') {
-        $this->strip = true;
-        $this->_retvalue = null;
-    } else {
-        if (defined($tag)) {
-            if ($this->security) {
-               $this->security->isTrustedConstant($tag, $this->compiler);
-            }
-            $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
-        } else {
-            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
-                $this->_retvalue = $this->compiler->compileTag($match[1],array('\'nocache\''));
-            } else {
-                $this->_retvalue = $this->compiler->compileTag($tag,array());
-            }
-        }
-    }
-    }
-// line 323 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r13(){
-    $j = strrpos($this->yystack[$this->yyidx + 0]->minor,'.');
-    if ($this->yystack[$this->yyidx + 0]->minor[$j+1] == 'c') {
-        // {$smarty.block.child}
-        $this->_retvalue = $this->compiler->compileTag('child',array(),array($this->yystack[$this->yyidx + 0]->minor));
-    } else {
-        // {$smarty.block.parent}
-       $this->_retvalue = $this->compiler->compileTag('parent',array(),array($this->yystack[$this->yyidx + 0]->minor));
-     }
-    }
-// line 334 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r14(){
-    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
-    }
-// line 338 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r15(){
-     $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
-     }
-// line 342 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r16(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor[1],array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]));
-    }
-// line 351 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r17(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'')),$this->yystack[$this->yyidx + 0]->minor[1]));
-    }
-// line 355 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r18(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>$this->yystack[$this->yyidx + -1]->minor['var'])),$this->yystack[$this->yyidx + 0]->minor[1]),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']));
-    }
-// line 359 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r19(){
-       $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 363 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r20(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 378 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r24(){
-        if (defined($this->yystack[$this->yyidx + -1]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -1]->minor, $this->compiler);
-            }
-            $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -1]->minor));
-        } else {
-            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
-        }
-    }
-// line 388 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r25(){
-        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
-            }
-            $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + 0]->minor));
-        } else {
-            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor,array());
-        }
-    }
-// line 401 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r26(){
-        if (defined($this->yystack[$this->yyidx + -2]->minor)) {
-            if ($this->security) {
-                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -2]->minor, $this->compiler);
-            }
-            $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
-        } else {
-            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + 0]->minor, array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
-        }
-    }
-// line 413 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r27(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + 0]->minor,array('object_method'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-// line 418 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r28(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + 0]->minor,array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor, 'object_method'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-// line 423 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r29(){
-    $this->_retvalue = $this->compiler->compileTag('make_nocache',array(array('var'=>'\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'')));
-    }
-// line 428 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r30(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength())); 
-    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
-    }
-// line 433 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r31(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->compiler->getLdelLength()));
-    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + 0]->minor,array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-// line 438 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r32(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength()));
-    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
-    }
-// line 449 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r34(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -4]->minor),array('var'=>$this->yystack[$this->yyidx + -2]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),1);
-    }
-// line 453 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r35(){
-    $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 461 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r37(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -3]->minor),array('to'=>$this->yystack[$this->yyidx + -1]->minor))),0);
-    }
-// line 465 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r38(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -5]->minor),array('to'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),0);
-    }
-// line 470 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r39(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -3]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor))));
-    }
-// line 474 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r40(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor),array('key'=>$this->yystack[$this->yyidx + -3]->minor))));
-    }
-// line 477 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r41(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 482 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r42(){
-    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + 0]->minor))));
-    }
-// line 486 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r43(){
-    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor)),$this->yystack[$this->yyidx + 0]->minor)));
-    }
-// line 492 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r44(){
-    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' /');
-    if ($tag === 'strip') {
-        $this->strip = false;
-        $this->_retvalue = null;
-    } else {
-       $this->_retvalue = $this->compiler->compileTag($tag.'close',array());
-    }
-     }
-// line 501 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r45(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor.'close',array());
-    }
-// line 505 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r46(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
-    }
-// line 510 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r47(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + 0]->minor));
-    }
-// line 514 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r48(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + -1]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
-    }
-// line 522 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r49(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 528 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r50(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 533 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r51(){
-    $this->_retvalue = array();
-    }
-// line 538 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r52(){
-    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-        if ($this->security) {
-            $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
-        }
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
-    } else {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'\''.$this->yystack[$this->yyidx + 0]->minor.'\'');
-    }
-    }
-// line 549 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r53(){
-    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r\t")=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 557 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r55(){
-    $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
-    }
-// line 569 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r58(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 582 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r60(){
-    $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
-    }
-// line 587 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r61(){
-    $this->_retvalue = array('var' => '\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'', 'value'=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 594 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r63(){
-    $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 598 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r64(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    }
-// line 618 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r67(){
-    $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
-    }
-// line 623 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r68(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 633 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r70(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor['pre']. $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor['op'].$this->yystack[$this->yyidx + 0]->minor .')';
-    }
-// line 637 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r71(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 641 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r72(){
-    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + -1]->minor . ')';
-    }
-// line 645 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r73(){
-    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-// line 649 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r74(){
-    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-// line 657 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r75(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '. $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'') . ' : '.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 661 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r76(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 671 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r78(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 676 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r79(){
-    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 697 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r84(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 701 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r85(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
-    }
-// line 705 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r86(){
-    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 710 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r87(){
-    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
-        if ($this->security) {
-             $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
-        }
-        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    } else {
-        $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
-    }
-    }
-// line 727 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r89(){
-    $this->_retvalue = '('. $this->yystack[$this->yyidx + -1]->minor .')';
-    }
-// line 731 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r90(){
-      $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 749 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r94(){
-	    if ($this->security && $this->security->static_classes !== array()) {
-		    $this->compiler->trigger_template_error('dynamic static class not allowed by security setting');
-	    }
-    $prefixVar = $this->compiler->getNewPrefixVariable();
-    if ($this->yystack[$this->yyidx + -2]->minor['var'] === '\'smarty\'') {
-        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).';?>');
-     } else {
-        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = ". $this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].';?>');
-    }
-    $this->_retvalue = $prefixVar .'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
-    }
-// line 760 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r95(){
-    $prefixVar = $this->compiler->getNewPrefixVariable();
-    $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[$this->yyidx + 0]->minor);
-    $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
-    $this->_retvalue = $prefixVar;
-    }
-// line 767 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r96(){
-    $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));
-    }
-// line 780 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r99(){
-    if (!in_array(strtolower($this->yystack[$this->yyidx + -2]->minor), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))) {
-        if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
-            $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
-        } else {
-            $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
-        } 
-    } else {
-        $this->compiler->trigger_template_error ('static class \''.$this->yystack[$this->yyidx + -2]->minor.'\' is undefined or not allowed by security setting');
-    }
-    }
-// line 799 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r101(){
-    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-        }
-// line 810 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r102(){
-   $this->_retvalue = $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'');
-    }
-// line 813 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r103(){
-    if ($this->yystack[$this->yyidx + 0]->minor['var'] === '\'smarty\'') {
-        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
-        $this->_retvalue = $smarty_var;
-    } else {
-        // used for array reset,next,prev,end,current 
-        $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
-        $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-        $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-    }
-    }
-// line 826 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r104(){
-    $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 836 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r106(){
-    $this->_retvalue = $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -1]->minor . '\'');
-    }
-// line 840 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r107(){
-    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -2]->minor . '\'') . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' :null)';
-    }
-// line 844 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r108(){
-    $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -1]->minor);
-    }
-// line 848 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r109(){
-    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -2]->minor) . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' : null)';
-    }
-// line 852 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r110(){
-    $this->_retvalue = array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'', 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 855 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r111(){
-    $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 868 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r113(){
-    return;
-    }
-// line 874 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r114(){
-    $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'').']';
-    }
-// line 877 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r115(){
-    $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor).']';
-    }
-// line 881 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r116(){
-    $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']';
-    }
-// line 885 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r117(){
-    $this->_retvalue = '[\''. $this->yystack[$this->yyidx + 0]->minor .'\']';
-    }
-// line 889 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r118(){
-    $this->_retvalue = '['. $this->yystack[$this->yyidx + 0]->minor .']';
-    }
-// line 894 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r119(){
-    $this->_retvalue = '['. $this->yystack[$this->yyidx + -1]->minor .']';
-    }
-// line 899 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r120(){
-    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
-    }
-// line 903 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r121(){
-    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
-    }
-// line 906 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r122(){
-    $this->_retvalue = '['.$this->yystack[$this->yyidx + -1]->minor.']';
-    }
-// line 912 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r124(){
-    $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'').']';
-    }
-// line 928 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r128(){
-    $this->_retvalue = '[]';
-    }
-// line 938 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r129(){
-    $this->_retvalue = '\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'';
-    }
-// line 942 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r130(){
-    $this->_retvalue = '\'\'';
-    }
-// line 947 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r131(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 955 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r133(){
-    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
-    $this->_retvalue = $this->compiler->compileVariable('\''.$var.'\'');
-    }
-// line 961 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r134(){
-    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-// line 968 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r135(){
-    if ($this->yystack[$this->yyidx + -1]->minor['var'] === '\'smarty\'') {
-        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
-    } else {
-        $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
-    }
-    }
-// line 977 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r136(){
-    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 982 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r137(){
-    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 987 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r138(){
-    if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) === '_') {
-        $this->compiler->trigger_template_error (self::ERR1);
-    }
-    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 994 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r139(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::ERR2);
-    }
-    $this->_retvalue = '->{'.$this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}';
-    }
-// line 1001 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r140(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::ERR2);
-    }
-    $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
-    }
-// line 1008 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r141(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::ERR2);
-    }
-    $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
-    }
-// line 1016 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r142(){
-    $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 1024 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r143(){
-    $this->_retvalue = $this->compiler->compilePHPFunctionCall($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor);
-    }
-// line 1032 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r144(){
-    if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) === '_') {
-        $this->compiler->trigger_template_error (self::ERR1);
-    }
-    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . '('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
-    }
-// line 1039 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r145(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::ERR2);
-    }
-    $prefixVar = $this->compiler->getNewPrefixVariable();
-    $this->compiler->appendPrefixCode("<?php {$prefixVar} = ".$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -3]->minor,1).'\'').';?>');
-    $this->_retvalue = $prefixVar .'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
-    }
-// line 1050 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r146(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
-    }
-// line 1067 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r149(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));
-    }
-// line 1071 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r150(){
-    $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
-    }
-// line 1079 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r152(){
-    $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 1087 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r153(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 1100 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r156(){
-    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 1109 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r158(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
-    }
-// line 1114 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r159(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
-    }
-// line 1119 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r160(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
-    }
-// line 1124 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r161(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
-    }
-// line 1129 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r162(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor, 'property');
-    }
-// line 1135 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r163(){
-    $this->_retvalue = ' '. trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
-    }
-// line 1139 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r164(){
-    static $lops = array(
-        'eq' => ' == ',
-        'ne' => ' != ',
-        'neq' => ' != ',
-        'gt' => ' > ',
-        'ge' => ' >= ',
-        'gte' => ' >= ',
-        'lt' =>  ' < ',
-        'le' =>  ' <= ',
-        'lte' => ' <= ',
-        'mod' =>  ' % ',
-        'and' => ' && ',
-        'or' => ' || ',
-        'xor' => ' xor ',
-         );
-    $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
-    $this->_retvalue = $lops[$op];
-    }
-// line 1158 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r165(){
-     static $tlops = array(
-         'isdivby' => array('op' => ' % ', 'pre' => '!('),
-         'isnotdivby' => array('op' => ' % ', 'pre' => '('),
-         'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
-         'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
-         'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
-         'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
-         );
-     $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
-     $this->_retvalue = $tlops[$op];
-     }
-// line 1171 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r166(){
-        static $scond = array (
-            'iseven' => '!(1 & ',
-            'isnoteven' => '(1 & ',
-            'isodd' => '(1 & ',
-            'isnotodd' => '!(1 & ',
-        );
-   $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
-   $this->_retvalue = $scond[$op];
-    }
-// line 1185 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r167(){
-    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-// line 1196 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r170(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 1204 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r172(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 1208 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r173(){ 
-    $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-// line 1224 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r176(){
-    $this->compiler->leaveDoubleQuote();
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php($this);
-    }
-// line 1230 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r177(){
-    $this->yystack[$this->yyidx + -1]->minor->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    }
-// line 1235 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r178(){
-    $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 1239 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r179(){
-    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)'.$this->yystack[$this->yyidx + -1]->minor);
-    }
-// line 1243 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r180(){
-    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)('.$this->yystack[$this->yyidx + -1]->minor.')');
-    }
-// line 1247 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r181(){
-    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
-    }
-// line 1259 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r184(){
-    $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-// line 1263 "../smarty/lexer/smarty_internal_templateparser.y"
-    public function yy_r185(){
-    $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    private $_retvalue;
-
-    public function yy_reduce($yyruleno)
-    {
-        if ($this->yyTraceFILE && $yyruleno >= 0
-              && $yyruleno < count(self::$yyRuleName)) {
-            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
-                $this->yyTracePrompt, $yyruleno,
-                self::$yyRuleName[$yyruleno]);
-        }
-
-        $this->_retvalue = $yy_lefthand_side = null;
-        if (isset(self::$yyReduceMap[$yyruleno])) {
-            // call the action
-            $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
-            $yy_lefthand_side = $this->_retvalue;
-        }
-        $yygoto = self::$yyRuleInfo[$yyruleno][0];
-        $yysize = self::$yyRuleInfo[$yyruleno][1];
-        $this->yyidx -= $yysize;
-        for ($i = $yysize; $i; $i--) {
-            // pop all of the right-hand side parameters
-            array_pop($this->yystack);
-        }
-        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
-        if ($yyact < self::YYNSTATE) {
-            if (!$this->yyTraceFILE && $yysize) {
-                $this->yyidx++;
-                $x = new TP_yyStackEntry;
-                $x->stateno = $yyact;
-                $x->major = $yygoto;
-                $x->minor = $yy_lefthand_side;
-                $this->yystack[$this->yyidx] = $x;
-            } else {
-                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
-            }
-        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
-            $this->yy_accept();
-        }
-    }
-
-    public function yy_parse_failed()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-        } while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-    }
-
-    public function yy_syntax_error($yymajor, $TOKEN)
-    {
-// line 213 "../smarty/lexer/smarty_internal_templateparser.y"
-
-    $this->internalError = true;
-    $this->yymajor = $yymajor;
-    $this->compiler->trigger_template_error();
-    }
-
-    public function yy_accept()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-        } while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-// line 206 "../smarty/lexer/smarty_internal_templateparser.y"
-
-    $this->successful = !$this->internalError;
-    $this->internalError = false;
-    $this->retvalue = $this->_retvalue;
-    }
-
-    public function doParse($yymajor, $yytokenvalue)
-    {
-        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
-
-        if ($this->yyidx === null || $this->yyidx < 0) {
-            $this->yyidx = 0;
-            $this->yyerrcnt = -1;
-            $x = new TP_yyStackEntry;
-            $x->stateno = 0;
-            $x->major = 0;
-            $this->yystack = array();
-            $this->yystack[] = $x;
-        }
-        $yyendofinput = ($yymajor==0);
-
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sInput %s\n",
-                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
-        }
-
-        do {
-            $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL &&
-                  !$this->yy_is_expected_token($yymajor)) {
-                // force a syntax error
-                $yyact = self::YY_ERROR_ACTION;
-            }
-            if ($yyact < self::YYNSTATE) {
-                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt--;
-                if ($yyendofinput && $this->yyidx >= 0) {
-                    $yymajor = 0;
-                } else {
-                    $yymajor = self::YYNOCODE;
-                }
-            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
-                $this->yy_reduce($yyact - self::YYNSTATE);
-            } elseif ($yyact === self::YY_ERROR_ACTION) {
-                if ($this->yyTraceFILE) {
-                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
-                        $this->yyTracePrompt);
-                }
-                if (self::YYERRORSYMBOL) {
-                    if ($this->yyerrcnt < 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
-                        if ($this->yyTraceFILE) {
-                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
-                                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
-                        }
-                        $this->yy_destructor($yymajor, $yytokenvalue);
-                        $yymajor = self::YYNOCODE;
-                    } else {
-                        while ($this->yyidx >= 0 &&
-                                 $yymx !== self::YYERRORSYMBOL &&
-        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                              ){
-                            $this->yy_pop_parser_stack();
-                        }
-                        if ($this->yyidx < 0 || $yymajor==0) {
-                            $this->yy_destructor($yymajor, $yytokenvalue);
-                            $this->yy_parse_failed();
-                            $yymajor = self::YYNOCODE;
-                        } elseif ($yymx !== self::YYERRORSYMBOL) {
-                            $u2 = 0;
-                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
-                        }
-                    }
-                    $this->yyerrcnt = 3;
-                    $yyerrorhit = 1;
-                } else {
-                    if ($this->yyerrcnt <= 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $this->yyerrcnt = 3;
-                    $this->yy_destructor($yymajor, $yytokenvalue);
-                    if ($yyendofinput) {
-                        $this->yy_parse_failed();
-                    }
-                    $yymajor = self::YYNOCODE;
-                }
-            } else {
-                $this->yy_accept();
-                $yymajor = self::YYNOCODE;
-            }
-        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
-    }
-}
-
diff --git a/include/smarty/libs/sysplugins/smarty_internal_testinstall.php b/include/smarty/libs/sysplugins/smarty_internal_testinstall.php
deleted file mode 100644
index c8ffd4cc6..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_testinstall.php
+++ /dev/null
@@ -1,605 +0,0 @@
-<?php
-/**
- * Smarty Internal TestInstall
- * Test Smarty installation
- *
- * @package    Smarty
- * @subpackage Utilities
- * @author     Uwe Tews
- */
-
-/**
- * TestInstall class
- *
- * @package    Smarty
- * @subpackage Utilities
- */
-class Smarty_Internal_TestInstall
-{
-    /**
-     * diagnose Smarty setup
-     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
-     *
-     * @param \Smarty $smarty
-     * @param array   $errors array to push results into rather than outputting them
-     *
-     * @return bool status, true if everything is fine, false else
-     */
-    public static function testInstall(Smarty $smarty, &$errors = null)
-    {
-        $status = true;
-        if ($errors === null) {
-            echo "<PRE>\n";
-            echo "Smarty Installation test...\n";
-            echo "Testing template directory...\n";
-        }
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-        // test if all registered template_dir are accessible
-        foreach ($smarty->getTemplateDir() as $template_dir) {
-            $_template_dir = $template_dir;
-            $template_dir = realpath($template_dir);
-            // resolve include_path or fail existence
-            if (!$template_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $template_dir = stream_resolve_include_path($_template_dir);
-                    } else {
-                        $template_dir = $smarty->ext->_getIncludePath->getIncludePath($_template_dir, null, $smarty);
-                    }
-                    if ($template_dir !== false) {
-                        if ($errors === null) {
-                            echo "$template_dir is OK.\n";
-                        }
-                        continue;
-                    } else {
-                        $status = false;
-                        $message =
-                            "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors[ 'template_dir' ] = $message;
-                        }
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_template_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors[ 'template_dir' ] = $message;
-                    }
-                    continue;
-                }
-            }
-            if (!is_dir($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors[ 'template_dir' ] = $message;
-                }
-            } elseif (!is_readable($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors[ 'template_dir' ] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$template_dir is OK.\n";
-                }
-            }
-        }
-        if ($errors === null) {
-            echo "Testing compile directory...\n";
-        }
-        // test if registered compile_dir is accessible
-        $__compile_dir = $smarty->getCompileDir();
-        $_compile_dir = realpath($__compile_dir);
-        if (!$_compile_dir) {
-            $status = false;
-            $message = "FAILED: {$__compile_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors[ 'compile_dir' ] = $message;
-            }
-        } elseif (!is_dir($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors[ 'compile_dir' ] = $message;
-            }
-        } elseif (!is_readable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors[ 'compile_dir' ] = $message;
-            }
-        } elseif (!is_writable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors[ 'compile_dir' ] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_compile_dir} is OK.\n";
-            }
-        }
-        if ($errors === null) {
-            echo "Testing plugins directory...\n";
-        }
-        // test if all registered plugins_dir are accessible
-        // and if core plugins directory is still registered
-        $_core_plugins_dir = realpath(__DIR__ . '/../plugins');
-        $_core_plugins_available = false;
-        foreach ($smarty->getPluginsDir() as $plugin_dir) {
-            $_plugin_dir = $plugin_dir;
-            $plugin_dir = realpath($plugin_dir);
-            // resolve include_path or fail existence
-            if (!$plugin_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
-                    } else {
-                        $plugin_dir = $smarty->ext->_getIncludePath->getIncludePath($_plugin_dir, null, $smarty);
-                    }
-                    if ($plugin_dir !== false) {
-                        if ($errors === null) {
-                            echo "$plugin_dir is OK.\n";
-                        }
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors[ 'plugins_dir' ] = $message;
-                        }
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_plugin_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors[ 'plugins_dir' ] = $message;
-                    }
-                    continue;
-                }
-            }
-            if (!is_dir($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors[ 'plugins_dir' ] = $message;
-                }
-            } elseif (!is_readable($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors[ 'plugins_dir' ] = $message;
-                }
-            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
-                $_core_plugins_available = true;
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            }
-        }
-        if (!$_core_plugins_available) {
-            $status = false;
-            $message = "WARNING: Smarty's own libs/plugins is not available";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } elseif (!isset($errors[ 'plugins_dir' ])) {
-                $errors[ 'plugins_dir' ] = $message;
-            }
-        }
-        if ($errors === null) {
-            echo "Testing cache directory...\n";
-        }
-        // test if all registered cache_dir is accessible
-        $__cache_dir = $smarty->getCacheDir();
-        $_cache_dir = realpath($__cache_dir);
-        if (!$_cache_dir) {
-            $status = false;
-            $message = "FAILED: {$__cache_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors[ 'cache_dir' ] = $message;
-            }
-        } elseif (!is_dir($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors[ 'cache_dir' ] = $message;
-            }
-        } elseif (!is_readable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors[ 'cache_dir' ] = $message;
-            }
-        } elseif (!is_writable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors[ 'cache_dir' ] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_cache_dir} is OK.\n";
-            }
-        }
-        if ($errors === null) {
-            echo "Testing configs directory...\n";
-        }
-        // test if all registered config_dir are accessible
-        foreach ($smarty->getConfigDir() as $config_dir) {
-            $_config_dir = $config_dir;
-            // resolve include_path or fail existence
-            if (!$config_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $config_dir = stream_resolve_include_path($_config_dir);
-                    } else {
-                        $config_dir = $smarty->ext->_getIncludePath->getIncludePath($_config_dir, null, $smarty);
-                    }
-                    if ($config_dir !== false) {
-                        if ($errors === null) {
-                            echo "$config_dir is OK.\n";
-                        }
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors[ 'config_dir' ] = $message;
-                        }
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_config_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors[ 'config_dir' ] = $message;
-                    }
-                    continue;
-                }
-            }
-            if (!is_dir($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors[ 'config_dir' ] = $message;
-                }
-            } elseif (!is_readable($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors[ 'config_dir' ] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$config_dir is OK.\n";
-                }
-            }
-        }
-        if ($errors === null) {
-            echo "Testing sysplugin files...\n";
-        }
-        // test if sysplugins are available
-        $source = SMARTY_SYSPLUGINS_DIR;
-        if (is_dir($source)) {
-            $expectedSysplugins = array(
-                'smartycompilerexception.php'                               => true,
-                'smartyexception.php'                                       => true,
-                'smarty_cacheresource.php'                                  => true,
-                'smarty_cacheresource_custom.php'                           => true,
-                'smarty_cacheresource_keyvaluestore.php'                    => true,
-                'smarty_data.php'                                           => true,
-                'smarty_internal_block.php'                                 => true,
-                'smarty_internal_cacheresource_file.php'                    => true,
-                'smarty_internal_compilebase.php'                           => true,
-                'smarty_internal_compile_append.php'                        => true,
-                'smarty_internal_compile_assign.php'                        => true,
-                'smarty_internal_compile_block.php'                         => true,
-                'smarty_internal_compile_block_child.php'                   => true,
-                'smarty_internal_compile_block_parent.php'                  => true,
-                'smarty_internal_compile_child.php'                         => true,
-                'smarty_internal_compile_parent.php'                        => true,
-                'smarty_internal_compile_break.php'                         => true,
-                'smarty_internal_compile_call.php'                          => true,
-                'smarty_internal_compile_capture.php'                       => true,
-                'smarty_internal_compile_config_load.php'                   => true,
-                'smarty_internal_compile_continue.php'                      => true,
-                'smarty_internal_compile_debug.php'                         => true,
-                'smarty_internal_compile_eval.php'                          => true,
-                'smarty_internal_compile_extends.php'                       => true,
-                'smarty_internal_compile_for.php'                           => true,
-                'smarty_internal_compile_foreach.php'                       => true,
-                'smarty_internal_compile_function.php'                      => true,
-                'smarty_internal_compile_if.php'                            => true,
-                'smarty_internal_compile_include.php'                       => true,
-                'smarty_internal_compile_insert.php'                        => true,
-                'smarty_internal_compile_ldelim.php'                        => true,
-                'smarty_internal_compile_make_nocache.php'                  => true,
-                'smarty_internal_compile_nocache.php'                       => true,
-                'smarty_internal_compile_private_block_plugin.php'          => true,
-                'smarty_internal_compile_private_foreachsection.php'        => true,
-                'smarty_internal_compile_private_function_plugin.php'       => true,
-                'smarty_internal_compile_private_modifier.php'              => true,
-                'smarty_internal_compile_private_object_block_function.php' => true,
-                'smarty_internal_compile_private_object_function.php'       => true,
-                'smarty_internal_compile_private_print_expression.php'      => true,
-                'smarty_internal_compile_private_registered_block.php'      => true,
-                'smarty_internal_compile_private_registered_function.php'   => true,
-                'smarty_internal_compile_private_special_variable.php'      => true,
-                'smarty_internal_compile_rdelim.php'                        => true,
-                'smarty_internal_compile_section.php'                       => true,
-                'smarty_internal_compile_setfilter.php'                     => true,
-                'smarty_internal_compile_shared_inheritance.php'            => true,
-                'smarty_internal_compile_while.php'                         => true,
-                'smarty_internal_configfilelexer.php'                       => true,
-                'smarty_internal_configfileparser.php'                      => true,
-                'smarty_internal_config_file_compiler.php'                  => true,
-                'smarty_internal_data.php'                                  => true,
-                'smarty_internal_debug.php'                                 => true,
-                'smarty_internal_extension_handler.php'                     => true,
-                'smarty_internal_method_addautoloadfilters.php'             => true,
-                'smarty_internal_method_adddefaultmodifiers.php'            => true,
-                'smarty_internal_method_append.php'                         => true,
-                'smarty_internal_method_appendbyref.php'                    => true,
-                'smarty_internal_method_assignbyref.php'                    => true,
-                'smarty_internal_method_assignglobal.php'                   => true,
-                'smarty_internal_method_clearallassign.php'                 => true,
-                'smarty_internal_method_clearallcache.php'                  => true,
-                'smarty_internal_method_clearassign.php'                    => true,
-                'smarty_internal_method_clearcache.php'                     => true,
-                'smarty_internal_method_clearcompiledtemplate.php'          => true,
-                'smarty_internal_method_clearconfig.php'                    => true,
-                'smarty_internal_method_compileallconfig.php'               => true,
-                'smarty_internal_method_compilealltemplates.php'            => true,
-                'smarty_internal_method_configload.php'                     => true,
-                'smarty_internal_method_createdata.php'                     => true,
-                'smarty_internal_method_getautoloadfilters.php'             => true,
-                'smarty_internal_method_getconfigvariable.php'              => true,
-                'smarty_internal_method_getconfigvars.php'                  => true,
-                'smarty_internal_method_getdebugtemplate.php'               => true,
-                'smarty_internal_method_getdefaultmodifiers.php'            => true,
-                'smarty_internal_method_getglobal.php'                      => true,
-                'smarty_internal_method_getregisteredobject.php'            => true,
-                'smarty_internal_method_getstreamvariable.php'              => true,
-                'smarty_internal_method_gettags.php'                        => true,
-                'smarty_internal_method_gettemplatevars.php'                => true,
-                'smarty_internal_method_literals.php'                       => true,
-                'smarty_internal_method_loadfilter.php'                     => true,
-                'smarty_internal_method_loadplugin.php'                     => true,
-                'smarty_internal_method_mustcompile.php'                    => true,
-                'smarty_internal_method_registercacheresource.php'          => true,
-                'smarty_internal_method_registerclass.php'                  => true,
-                'smarty_internal_method_registerdefaultconfighandler.php'   => true,
-                'smarty_internal_method_registerdefaultpluginhandler.php'   => true,
-                'smarty_internal_method_registerdefaulttemplatehandler.php' => true,
-                'smarty_internal_method_registerfilter.php'                 => true,
-                'smarty_internal_method_registerobject.php'                 => true,
-                'smarty_internal_method_registerplugin.php'                 => true,
-                'smarty_internal_method_registerresource.php'               => true,
-                'smarty_internal_method_setautoloadfilters.php'             => true,
-                'smarty_internal_method_setdebugtemplate.php'               => true,
-                'smarty_internal_method_setdefaultmodifiers.php'            => true,
-                'smarty_internal_method_unloadfilter.php'                   => true,
-                'smarty_internal_method_unregistercacheresource.php'        => true,
-                'smarty_internal_method_unregisterfilter.php'               => true,
-                'smarty_internal_method_unregisterobject.php'               => true,
-                'smarty_internal_method_unregisterplugin.php'               => true,
-                'smarty_internal_method_unregisterresource.php'             => true,
-                'smarty_internal_nocache_insert.php'                        => true,
-                'smarty_internal_parsetree.php'                             => true,
-                'smarty_internal_parsetree_code.php'                        => true,
-                'smarty_internal_parsetree_dq.php'                          => true,
-                'smarty_internal_parsetree_dqcontent.php'                   => true,
-                'smarty_internal_parsetree_tag.php'                         => true,
-                'smarty_internal_parsetree_template.php'                    => true,
-                'smarty_internal_parsetree_text.php'                        => true,
-                'smarty_internal_resource_eval.php'                         => true,
-                'smarty_internal_resource_extends.php'                      => true,
-                'smarty_internal_resource_file.php'                         => true,
-                'smarty_internal_resource_php.php'                          => true,
-                'smarty_internal_resource_stream.php'                       => true,
-                'smarty_internal_resource_string.php'                       => true,
-                'smarty_internal_runtime_cachemodify.php'                   => true,
-                'smarty_internal_runtime_cacheresourcefile.php'             => true,
-                'smarty_internal_runtime_capture.php'                       => true,
-                'smarty_internal_runtime_codeframe.php'                     => true,
-                'smarty_internal_runtime_filterhandler.php'                 => true,
-                'smarty_internal_runtime_foreach.php'                       => true,
-                'smarty_internal_runtime_getincludepath.php'                => true,
-                'smarty_internal_runtime_inheritance.php'                   => true,
-                'smarty_internal_runtime_make_nocache.php'                  => true,
-                'smarty_internal_runtime_tplfunction.php'                   => true,
-                'smarty_internal_runtime_updatecache.php'                   => true,
-                'smarty_internal_runtime_updatescope.php'                   => true,
-                'smarty_internal_runtime_writefile.php'                     => true,
-                'smarty_internal_smartytemplatecompiler.php'                => true,
-                'smarty_internal_template.php'                              => true,
-                'smarty_internal_templatebase.php'                          => true,
-                'smarty_internal_templatecompilerbase.php'                  => true,
-                'smarty_internal_templatelexer.php'                         => true,
-                'smarty_internal_templateparser.php'                        => true,
-                'smarty_internal_testinstall.php'                           => true,
-                'smarty_internal_undefined.php'                             => true,
-                'smarty_resource.php'                                       => true,
-                'smarty_resource_custom.php'                                => true,
-                'smarty_resource_recompiled.php'                            => true,
-                'smarty_resource_uncompiled.php'                            => true,
-                'smarty_security.php'                                       => true,
-                'smarty_template_cached.php'                                => true,
-                'smarty_template_compiled.php'                              => true,
-                'smarty_template_config.php'                                => true,
-                'smarty_template_resource_base.php'                         => true,
-                'smarty_template_source.php'                                => true,
-                'smarty_undefined_variable.php'                             => true,
-                'smarty_variable.php'                                       => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expectedSysplugins[ $filename ])) {
-                        unset($expectedSysplugins[ $filename ]);
-                    }
-                }
-            }
-            if ($expectedSysplugins) {
-                $status = false;
-                $message = "FAILED: files missing from libs/sysplugins: " . join(', ', array_keys($expectedSysplugins));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors[ 'sysplugins' ] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: " . SMARTY_SYSPLUGINS_DIR . ' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors[ 'sysplugins_dir_constant' ] = $message;
-            }
-        }
-        if ($errors === null) {
-            echo "Testing plugin files...\n";
-        }
-        // test if core plugins are available
-        $source = SMARTY_PLUGINS_DIR;
-        if (is_dir($source)) {
-            $expectedPlugins = array(
-                'block.textformat.php'                  => true,
-                'function.counter.php'                  => true,
-                'function.cycle.php'                    => true,
-                'function.fetch.php'                    => true,
-                'function.html_checkboxes.php'          => true,
-                'function.html_image.php'               => true,
-                'function.html_options.php'             => true,
-                'function.html_radios.php'              => true,
-                'function.html_select_date.php'         => true,
-                'function.html_select_time.php'         => true,
-                'function.html_table.php'               => true,
-                'function.mailto.php'                   => true,
-                'function.math.php'                     => true,
-                'modifier.capitalize.php'               => true,
-                'modifier.date_format.php'              => true,
-                'modifier.debug_print_var.php'          => true,
-                'modifier.escape.php'                   => true,
-                'modifier.mb_wordwrap.php'              => true,
-                'modifier.regex_replace.php'            => true,
-                'modifier.replace.php'                  => true,
-                'modifier.spacify.php'                  => true,
-                'modifier.truncate.php'                 => true,
-                'modifiercompiler.cat.php'              => true,
-                'modifiercompiler.count_characters.php' => true,
-                'modifiercompiler.count_paragraphs.php' => true,
-                'modifiercompiler.count_sentences.php'  => true,
-                'modifiercompiler.count_words.php'      => true,
-                'modifiercompiler.default.php'          => true,
-                'modifiercompiler.escape.php'           => true,
-                'modifiercompiler.from_charset.php'     => true,
-                'modifiercompiler.indent.php'           => true,
-                'modifiercompiler.lower.php'            => true,
-                'modifiercompiler.noprint.php'          => true,
-                'modifiercompiler.string_format.php'    => true,
-                'modifiercompiler.strip.php'            => true,
-                'modifiercompiler.strip_tags.php'       => true,
-                'modifiercompiler.to_charset.php'       => true,
-                'modifiercompiler.unescape.php'         => true,
-                'modifiercompiler.upper.php'            => true,
-                'modifiercompiler.wordwrap.php'         => true,
-                'outputfilter.trimwhitespace.php'       => true,
-                'shared.escape_special_chars.php'       => true,
-                'shared.literal_compiler_param.php'     => true,
-                'shared.make_timestamp.php'             => true,
-                'shared.mb_str_replace.php'             => true,
-                'shared.mb_unicode.php'                 => true,
-                'variablefilter.htmlspecialchars.php'   => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expectedPlugins[ $filename ])) {
-                        unset($expectedPlugins[ $filename ]);
-                    }
-                }
-            }
-            if ($expectedPlugins) {
-                $status = false;
-                $message = "FAILED: files missing from libs/plugins: " . join(', ', array_keys($expectedPlugins));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors[ 'plugins' ] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: " . SMARTY_PLUGINS_DIR . ' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors[ 'plugins_dir_constant' ] = $message;
-            }
-        }
-        if ($errors === null) {
-            echo "Tests complete.\n";
-            echo "</PRE>\n";
-        }
-        return $status;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_undefined.php b/include/smarty/libs/sysplugins/smarty_internal_undefined.php
deleted file mode 100644
index 7df0acc2d..000000000
--- a/include/smarty/libs/sysplugins/smarty_internal_undefined.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Undefined
- *
- * Class to handle undefined method calls or calls to obsolete runtime extensions
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-class Smarty_Internal_Undefined
-{
-    /**
-     * Name of undefined extension class
-     *
-     * @var string|null
-     */
-    public $class = null;
-
-    /**
-     * Smarty_Internal_Undefined constructor.
-     *
-     * @param null|string $class name of undefined extension class
-     */
-    public function __construct($class = null)
-    {
-        $this->class = $class;
-    }
-
-    /**
-     * Wrapper for obsolete class Smarty_Internal_Runtime_ValidateCompiled
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param array                     $properties special template properties
-     * @param bool                      $cache      flag if called from cache file
-     *
-     * @return bool false
-     */
-    public function decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
-    {
-        if ($cache) {
-            $tpl->cached->valid = false;
-        } else {
-            $tpl->mustCompile = true;
-        }
-        return false;
-    }
-
-    /**
-     * Call error handler for undefined method
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
-     *
-     * @return mixed
-     * @throws SmartyException
-     */
-    public function __call($name, $args)
-    {
-        if (isset($this->class)) {
-            throw new SmartyException("undefined extension class '{$this->class}'");
-        } else {
-            throw new SmartyException(get_class($args[ 0 ]) . "->{$name}() undefined method");
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_resource.php b/include/smarty/libs/sysplugins/smarty_resource.php
deleted file mode 100644
index 3c43a9f46..000000000
--- a/include/smarty/libs/sysplugins/smarty_resource.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Base implementation for resource plugins
- *
- * @package    Smarty
- * @subpackage TemplateResources
- *
- * @method renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
- * @method populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
- * @method process(Smarty_Internal_Template $_smarty_tpl)
- */
-abstract class Smarty_Resource
-{
-    /**
-     * resource types provided by the core
-     *
-     * @var array
-     */
-    public static $sysplugins = array(
-        'file'    => 'smarty_internal_resource_file.php',
-        'string'  => 'smarty_internal_resource_string.php',
-        'extends' => 'smarty_internal_resource_extends.php',
-        'stream'  => 'smarty_internal_resource_stream.php',
-        'eval'    => 'smarty_internal_resource_eval.php',
-        'php'     => 'smarty_internal_resource_php.php'
-    );
-
-    /**
-     * Source is bypassing compiler
-     *
-     * @var boolean
-     */
-    public $uncompiled = false;
-
-    /**
-     * Source must be recompiled on every occasion
-     *
-     * @var boolean
-     */
-    public $recompiled = false;
-
-    /**
-     * Flag if resource does implement populateCompiledFilepath() method
-     *
-     * @var bool
-     */
-    public $hasCompiledHandler = false;
-
-    /**
-     * Load Resource Handler
-     *
-     * @param Smarty $smarty smarty object
-     * @param string $type   name of the resource
-     *
-     * @throws SmartyException
-     * @return Smarty_Resource Resource Handler
-     */
-    public static function load(Smarty $smarty, $type)
-    {
-        // try smarty's cache
-        if (isset($smarty->_cache[ 'resource_handlers' ][ $type ])) {
-            return $smarty->_cache[ 'resource_handlers' ][ $type ];
-        }
-        // try registered resource
-        if (isset($smarty->registered_resources[ $type ])) {
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] = $smarty->registered_resources[ $type ];
-        }
-        // try sysplugins dir
-        if (isset(self::$sysplugins[ $type ])) {
-            $_resource_class = 'Smarty_Internal_Resource_' . smarty_ucfirst_ascii($type);
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
-        }
-        // try plugins dir
-        $_resource_class = 'Smarty_Resource_' . smarty_ucfirst_ascii($type);
-        if ($smarty->loadPlugin($_resource_class)) {
-            if (class_exists($_resource_class, false)) {
-                return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
-            } else {
-                $smarty->registerResource(
-                    $type,
-                    array(
-                        "smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
-                        "smarty_resource_{$type}_secure", "smarty_resource_{$type}_trusted"
-                    )
-                );
-                // give it another try, now that the resource is registered properly
-                return self::load($smarty, $type);
-            }
-        }
-        // try streams
-        $_known_stream = stream_get_wrappers();
-        if (in_array($type, $_known_stream)) {
-            // is known stream
-            if (is_object($smarty->security_policy)) {
-                $smarty->security_policy->isTrustedStream($type);
-            }
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] = new Smarty_Internal_Resource_Stream();
-        }
-        // TODO: try default_(template|config)_handler
-        // give up
-        throw new SmartyException("Unknown resource type '{$type}'");
-    }
-
-    /**
-     * extract resource_type and resource_name from template_resource and config_resource
-     *
-     * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
-     *
-     * @param string $resource_name    template_resource or config_resource to parse
-     * @param string $default_resource the default resource_type defined in $smarty
-     *
-     * @return array with parsed resource name and type
-     */
-    public static function parseResourceName($resource_name, $default_resource)
-    {
-        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]/', $resource_name, $match)) {
-            $type = $match[ 1 ];
-            $name = substr($resource_name, strlen($match[ 0 ]));
-        } else {
-            // no resource given, use default
-            // or single character before the colon is not a resource type, but part of the filepath
-            $type = $default_resource;
-            $name = $resource_name;
-        }
-        return array($name, $type);
-    }
-
-    /**
-     * modify template_resource according to resource handlers specifications
-     *
-     * @param \Smarty_Internal_Template|\Smarty $obj               Smarty instance
-     * @param string                            $template_resource template_resource to extract resource handler and
-     *                                                             name of
-     *
-     * @return string unique resource name
-     * @throws \SmartyException
-     */
-    public static function getUniqueTemplateName($obj, $template_resource)
-    {
-        $smarty = $obj->_getSmartyObj();
-        list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
-        // TODO: optimize for Smarty's internal resource types
-        $resource = Smarty_Resource::load($smarty, $type);
-        // go relative to a given template?
-        $_file_is_dotted = $name[ 0 ] === '.' && ($name[ 1 ] === '.' || $name[ 1 ] === '/');
-        if ($obj->_isTplObj() && $_file_is_dotted
-            && ($obj->source->type === 'file' || $obj->parent->source->type === 'extends')
-        ) {
-            $name = $smarty->_realpath(dirname($obj->parent->source->filepath) . DIRECTORY_SEPARATOR . $name);
-        }
-        return $resource->buildUniqueResourceName($smarty, $name);
-    }
-
-    /**
-     * initialize Source Object for given resource
-     * wrapper for backward compatibility to versions < 3.1.22
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param Smarty_Internal_Template $_template         template object
-     * @param Smarty                   $smarty            smarty object
-     * @param string                   $template_resource resource identifier
-     *
-     * @return \Smarty_Template_Source Source Object
-     * @throws \SmartyException
-     */
-    public static function source(
-        Smarty_Internal_Template $_template = null,
-        Smarty $smarty = null,
-        $template_resource = null
-    ) {
-        return Smarty_Template_Source::load($_template, $smarty, $template_resource);
-    }
-
-    /**
-     * Load template's source into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    abstract public function getContent(Smarty_Template_Source $source);
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty  $smarty        Smarty instance
-     * @param string  $resource_name resource_name to make unique
-     * @param boolean $isConfig      flag for config resource
-     *
-     * @return string unique resource name
-     */
-    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
-    {
-        if ($isConfig) {
-            if (!isset($smarty->_joined_config_dir)) {
-                $smarty->getTemplateDir(null, true);
-            }
-            return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name;
-        } else {
-            if (!isset($smarty->_joined_template_dir)) {
-                $smarty->getTemplateDir();
-            }
-            return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name;
-        }
-    }
-
-    /*
-     * Check if resource must check time stamps when when loading complied or cached templates.
-     * Resources like 'extends' which use source components my disable timestamp checks on own resource.
-     *
-     * @return bool
-     */
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return basename(preg_replace('![^\w]+!', '_', $source->name));
-    }
-
-    /**
-     * @return bool
-     */
-    public function checkTimestamps()
-    {
-        return true;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_resource_custom.php b/include/smarty/libs/sysplugins/smarty_resource_custom.php
deleted file mode 100644
index 191fa7c90..000000000
--- a/include/smarty/libs/sysplugins/smarty_resource_custom.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Wrapper Implementation for custom resource plugins
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Custom extends Smarty_Resource
-{
-    /**
-     * fetch template and its modification time from data source
-     *
-     * @param string  $name    template name
-     * @param string  &$source template source
-     * @param integer &$mtime  template modification timestamp (epoch)
-     */
-    abstract protected function fetch($name, &$source, &$mtime);
-
-    /**
-     * Fetch template's modification timestamp from data source
-     * {@internal implementing this method is optional.
-     *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
-     *
-     * @param string $name template name
-     *
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-     */
-    protected function fetchTimestamp($name)
-    {
-        return null;
-    }
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $source->type . ':' . $this->generateSafeName($source->name);
-        $source->uid = sha1($source->type . ':' . $source->name);
-        $mtime = $this->fetchTimestamp($source->name);
-        if ($mtime !== null) {
-            $source->timestamp = $mtime;
-        } else {
-            $this->fetch($source->name, $content, $timestamp);
-            $source->timestamp = isset($timestamp) ? $timestamp : false;
-            if (isset($content)) {
-                $source->content = $content;
-            }
-        }
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Load template's source into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        $this->fetch($source->name, $content, $timestamp);
-        if (isset($content)) {
-            return $content;
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return basename($this->generateSafeName($source->name));
-    }
-
-    /**
-     * Removes special characters from $name and limits its length to 127 characters.
-     *
-     * @param $name
-     *
-     * @return string
-     */
-    private function generateSafeName($name): string {
-        return substr(preg_replace('/[^A-Za-z0-9._]/', '', (string) $name), 0, 127);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_resource_recompiled.php b/include/smarty/libs/sysplugins/smarty_resource_recompiled.php
deleted file mode 100644
index 760c4dd33..000000000
--- a/include/smarty/libs/sysplugins/smarty_resource_recompiled.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Base implementation for resource plugins that don't compile cache
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Recompiled extends Smarty_Resource
-{
-    /**
-     * Flag that it's an recompiled resource
-     *
-     * @var bool
-     */
-    public $recompiled = true;
-
-    /**
-     * Resource does implement populateCompiledFilepath() method
-     *
-     * @var bool
-     */
-    public $hasCompiledHandler = true;
-
-    /**
-     * compile template from source
-     *
-     * @param Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
-     *
-     * @throws Exception
-     */
-    public function process(Smarty_Internal_Template $_smarty_tpl)
-    {
-        $compiled = &$_smarty_tpl->compiled;
-        $compiled->file_dependency = array();
-        $compiled->includes = array();
-        $compiled->nocache_hash = null;
-        $compiled->unifunc = null;
-        $level = ob_get_level();
-        ob_start();
-        $_smarty_tpl->loadCompiler();
-        // call compiler
-        try {
-            eval('?>' . $_smarty_tpl->compiler->compileTemplate($_smarty_tpl));
-        } catch (Exception $e) {
-            unset($_smarty_tpl->compiler);
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-            throw $e;
-        }
-        // release compiler object to free memory
-        unset($_smarty_tpl->compiler);
-        ob_get_clean();
-        $compiled->timestamp = time();
-        $compiled->exists = true;
-    }
-
-    /**
-     * populate Compiled Object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $compiled->filepath = false;
-        $compiled->timestamp = false;
-        $compiled->exists = false;
-    }
-
-    /*
-       * Disable timestamp checks for recompiled resource.
-       *
-       * @return bool
-       */
-    /**
-     * @return bool
-     */
-    public function checkTimestamps()
-    {
-        return false;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php b/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php
deleted file mode 100644
index a11e2c14c..000000000
--- a/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Base implementation for resource plugins that don't use the compiler
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
-{
-    /**
-     * Flag that it's an uncompiled resource
-     *
-     * @var bool
-     */
-    public $uncompiled = true;
-
-    /**
-     * Resource does implement populateCompiledFilepath() method
-     *
-     * @var bool
-     */
-    public $hasCompiledHandler = true;
-
-    /**
-     * populate compiled object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $compiled->filepath = $_template->source->filepath;
-        $compiled->timestamp = $_template->source->timestamp;
-        $compiled->exists = $_template->source->exists;
-        if ($_template->smarty->merge_compiled_includes || $_template->source->handler->checkTimestamps()) {
-            $compiled->file_dependency[ $_template->source->uid ] =
-                array($compiled->filepath, $compiled->timestamp, $_template->source->type,);
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_security.php b/include/smarty/libs/sysplugins/smarty_security.php
deleted file mode 100644
index 97cd0521d..000000000
--- a/include/smarty/libs/sysplugins/smarty_security.php
+++ /dev/null
@@ -1,680 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage Security
- * @author     Uwe Tews
- */
-/**
- * FIXME: Smarty_Security API
- *      - getter and setter instead of public properties would allow cultivating an internal cache properly
- *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir
- *      are immutable the cache is killed every time either of the variables change. That means that two distinct
- *      Smarty objects with differing
- *        $template_dir or $config_dir should NOT share the same Smarty_Security instance,
- *        as this would lead to (severe) performance penalty! how should this be handled?
- */
-
-/**
- * This class does contain the security settings
- */
-#[\AllowDynamicProperties]
-class Smarty_Security
-{
-
-    /**
-     * This is the list of template directories that are considered secure.
-     * $template_dir is in this list implicitly.
-     *
-     * @var array
-     */
-    public $secure_dir = array();
-
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     * {@link $security} is disabled during their inclusion/execution.
-     *
-     * @var array
-     */
-    public $trusted_dir = array();
-
-    /**
-     * List of regular expressions (PCRE) that include trusted URIs
-     *
-     * @var array
-     */
-    public $trusted_uri = array();
-
-    /**
-     * List of trusted constants names
-     *
-     * @var array
-     */
-    public $trusted_constants = array();
-
-    /**
-     * This is an array of trusted static classes.
-     * If empty access to all static classes is allowed.
-     * If set to 'none' none is allowed.
-     *
-     * @var array
-     */
-    public $static_classes = array();
-
-    /**
-     * This is an nested array of trusted classes and static methods.
-     * If empty access to all static classes and methods is allowed.
-     * Format:
-     * array (
-     *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
-     *         'class_2' => array(),                       // all methods of class allowed
-     *       )
-     * If set to null none is allowed.
-     *
-     * @var array
-     */
-    public $trusted_static_methods = array();
-
-    /**
-     * This is an array of trusted static properties.
-     * If empty access to all static classes and properties is allowed.
-     * Format:
-     * array (
-     *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
-     *         'class_2' => array(),                   // all properties of class allowed
-     *       )
-     * If set to null none is allowed.
-     *
-     * @var array
-     */
-    public $trusted_static_properties = array();
-
-    /**
-     * This is an array of trusted PHP functions.
-     * If empty all functions are allowed.
-     * To disable all PHP functions set $php_functions = null.
-     *
-     * @var array
-     */
-    public $php_functions = array('isset', 'empty', 'count', 'sizeof', 'in_array', 'is_array', 'time',);
-
-    /**
-     * This is an array of trusted PHP modifiers.
-     * If empty all modifiers are allowed.
-     * To disable all modifier set $php_modifiers = null.
-     *
-     * @var array
-     */
-    public $php_modifiers = array('escape', 'count', 'sizeof', 'nl2br',);
-
-    /**
-     * This is an array of allowed tags.
-     * If empty no restriction by allowed_tags.
-     *
-     * @var array
-     */
-    public $allowed_tags = array();
-
-    /**
-     * This is an array of disabled tags.
-     * If empty no restriction by disabled_tags.
-     *
-     * @var array
-     */
-    public $disabled_tags = array();
-
-    /**
-     * This is an array of allowed modifier plugins.
-     * If empty no restriction by allowed_modifiers.
-     *
-     * @var array
-     */
-    public $allowed_modifiers = array();
-
-    /**
-     * This is an array of disabled modifier plugins.
-     * If empty no restriction by disabled_modifiers.
-     *
-     * @var array
-     */
-    public $disabled_modifiers = array();
-
-    /**
-     * This is an array of disabled special $smarty variables.
-     *
-     * @var array
-     */
-    public $disabled_special_smarty_vars = array();
-
-    /**
-     * This is an array of trusted streams.
-     * If empty all streams are allowed.
-     * To disable all streams set $streams = null.
-     *
-     * @var array
-     */
-    public $streams = array('file');
-
-    /**
-     * + flag if constants can be accessed from template
-     *
-     * @var boolean
-     */
-    public $allow_constants = true;
-
-    /**
-     * + flag if super globals can be accessed from template
-     *
-     * @var boolean
-     */
-    public $allow_super_globals = true;
-
-    /**
-     * max template nesting level
-     *
-     * @var int
-     */
-    public $max_template_nesting = 0;
-
-    /**
-     * current template nesting level
-     *
-     * @var int
-     */
-    private $_current_template_nesting = 0;
-
-    /**
-     * Cache for $resource_dir lookup
-     *
-     * @var array
-     */
-    protected $_resource_dir = array();
-
-    /**
-     * Cache for $template_dir lookup
-     *
-     * @var array
-     */
-    protected $_template_dir = array();
-
-    /**
-     * Cache for $config_dir lookup
-     *
-     * @var array
-     */
-    protected $_config_dir = array();
-
-    /**
-     * Cache for $secure_dir lookup
-     *
-     * @var array
-     */
-    protected $_secure_dir = array();
-
-    /**
-     * Cache for $php_resource_dir lookup
-     *
-     * @var array
-     */
-    protected $_php_resource_dir = null;
-
-    /**
-     * Cache for $trusted_dir lookup
-     *
-     * @var array
-     */
-    protected $_trusted_dir = null;
-
-    /**
-     * Cache for include path status
-     *
-     * @var bool
-     */
-    protected $_include_path_status = false;
-
-    /**
-     * Cache for $_include_array lookup
-     *
-     * @var array
-     */
-    protected $_include_dir = array();
-
-    /**
-     * @param Smarty $smarty
-     */
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    }
-
-    /**
-     * Check if PHP function is trusted.
-     *
-     * @param string $function_name
-     * @param object $compiler compiler object
-     *
-     * @return boolean                 true if function is trusted
-     */
-    public function isTrustedPhpFunction($function_name, $compiler)
-    {
-        if (isset($this->php_functions)
-            && (empty($this->php_functions) || in_array($function_name, $this->php_functions))
-        ) {
-            return true;
-        }
-        $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if static class is trusted.
-     *
-     * @param string $class_name
-     * @param object $compiler compiler object
-     *
-     * @return boolean                 true if class is trusted
-     */
-    public function isTrustedStaticClass($class_name, $compiler)
-    {
-        if (isset($this->static_classes)
-            && (empty($this->static_classes) || in_array($class_name, $this->static_classes))
-        ) {
-            return true;
-        }
-        $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if static class method/property is trusted.
-     *
-     * @param string $class_name
-     * @param string $params
-     * @param object $compiler compiler object
-     *
-     * @return boolean                 true if class method is trusted
-     */
-    public function isTrustedStaticClassAccess($class_name, $params, $compiler)
-    {
-        if (!isset($params[ 2 ])) {
-            // fall back
-            return $this->isTrustedStaticClass($class_name, $compiler);
-        }
-        if ($params[ 2 ] === 'method') {
-            $allowed = $this->trusted_static_methods;
-            $name = substr($params[ 0 ], 0, strpos($params[ 0 ], '('));
-        } else {
-            $allowed = $this->trusted_static_properties;
-            // strip '$'
-            $name = substr($params[ 0 ], 1);
-        }
-        if (isset($allowed)) {
-            if (empty($allowed)) {
-                // fall back
-                return $this->isTrustedStaticClass($class_name, $compiler);
-            }
-            if (isset($allowed[ $class_name ])
-                && (empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
-            ) {
-                return true;
-            }
-        }
-        $compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if PHP modifier is trusted.
-     *
-     * @param string $modifier_name
-     * @param object $compiler compiler object
-     * @deprecated
-     * @return boolean                 true if modifier is trusted
-     */
-    public function isTrustedPhpModifier($modifier_name, $compiler)
-    {
-        if (isset($this->php_modifiers)
-            && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
-        ) {
-            return true;
-        }
-        $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if tag is trusted.
-     *
-     * @param string $tag_name
-     * @param object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     */
-    public function isTrustedTag($tag_name, $compiler)
-    {
-        // check for internal always required tags
-        if (in_array(
-            $tag_name,
-            array(
-                'assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin',
-                'private_object_block_function', 'private_object_function', 'private_registered_function',
-                'private_registered_block', 'private_special_variable', 'private_print_expression',
-                'private_modifier'
-            )
-        )
-        ) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_tags)) {
-            if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
-            }
-        } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
-        }
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if special $smarty variable is trusted.
-     *
-     * @param string $var_name
-     * @param object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     */
-    public function isTrustedSpecialSmartyVar($var_name, $compiler)
-    {
-        if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error(
-                "special variable '\$smarty.{$var_name}' not allowed by security setting",
-                null,
-                true
-            );
-        }
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if modifier plugin is trusted.
-     *
-     * @param string $modifier_name
-     * @param object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     */
-    public function isTrustedModifier($modifier_name, $compiler)
-    {
-        // check for internal always allowed modifier
-        if (in_array($modifier_name, array('default'))) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_modifiers)) {
-            if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error(
-                    "modifier '{$modifier_name}' disabled by security setting",
-                    null,
-                    true
-                );
-            }
-        } elseif (in_array($modifier_name, $this->allowed_modifiers)
-                  && !in_array($modifier_name, $this->disabled_modifiers)
-        ) {
-            return true;
-        } else {
-            $compiler->trigger_template_error(
-                "modifier '{$modifier_name}' not allowed by security setting",
-                null,
-                true
-            );
-        }
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if constants are enabled or trusted
-     *
-     * @param string $const    constant name
-     * @param object $compiler compiler object
-     *
-     * @return bool
-     */
-    public function isTrustedConstant($const, $compiler)
-    {
-        if (in_array($const, array('true', 'false', 'null'))) {
-            return true;
-        }
-        if (!empty($this->trusted_constants)) {
-            if (!in_array(strtolower($const), $this->trusted_constants)) {
-                $compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
-                return false;
-            }
-            return true;
-        }
-        if ($this->allow_constants) {
-            return true;
-        }
-        $compiler->trigger_template_error("Security: access to constants not permitted");
-        return false;
-    }
-
-    /**
-     * Check if stream is trusted.
-     *
-     * @param string $stream_name
-     *
-     * @return boolean         true if stream is trusted
-     * @throws SmartyException if stream is not trusted
-     */
-    public function isTrustedStream($stream_name)
-    {
-        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
-            return true;
-        }
-        throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
-    }
-
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param string    $filepath
-     * @param null|bool $isConfig
-     *
-     * @return bool true if directory is trusted
-     * @throws \SmartyException if directory is not trusted
-     */
-    public function isTrustedResourceDir($filepath, $isConfig = null)
-    {
-        if ($this->_include_path_status !== $this->smarty->use_include_path) {
-            $_dir =
-                $this->smarty->use_include_path ? $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty) : array();
-            if ($this->_include_dir !== $_dir) {
-                $this->_updateResourceDir($this->_include_dir, $_dir);
-                $this->_include_dir = $_dir;
-            }
-            $this->_include_path_status = $this->smarty->use_include_path;
-        }
-        $_dir = $this->smarty->getTemplateDir();
-        if ($this->_template_dir !== $_dir) {
-            $this->_updateResourceDir($this->_template_dir, $_dir);
-            $this->_template_dir = $_dir;
-        }
-        $_dir = $this->smarty->getConfigDir();
-        if ($this->_config_dir !== $_dir) {
-            $this->_updateResourceDir($this->_config_dir, $_dir);
-            $this->_config_dir = $_dir;
-        }
-        if ($this->_secure_dir !== $this->secure_dir) {
-            $this->secure_dir = (array)$this->secure_dir;
-            foreach ($this->secure_dir as $k => $d) {
-                $this->secure_dir[ $k ] = $this->smarty->_realpath($d . DIRECTORY_SEPARATOR, true);
-            }
-            $this->_updateResourceDir($this->_secure_dir, $this->secure_dir);
-            $this->_secure_dir = $this->secure_dir;
-        }
-        $addPath = $this->_checkDir($filepath, $this->_resource_dir);
-        if ($addPath !== false) {
-            $this->_resource_dir = array_merge($this->_resource_dir, $addPath);
-        }
-        return true;
-    }
-
-    /**
-     * Check if URI (e.g. {fetch} or {html_image}) is trusted
-     * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
-     * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
-     * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
-     *
-     * @param string $uri
-     *
-     * @return boolean         true if URI is trusted
-     * @throws SmartyException if URI is not trusted
-     * @uses   $trusted_uri for list of patterns to match against $uri
-     */
-    public function isTrustedUri($uri)
-    {
-        $_uri = parse_url($uri);
-        if (!empty($_uri[ 'scheme' ]) && !empty($_uri[ 'host' ])) {
-            $_uri = $_uri[ 'scheme' ] . '://' . $_uri[ 'host' ];
-            foreach ($this->trusted_uri as $pattern) {
-                if (preg_match($pattern, $_uri)) {
-                    return true;
-                }
-            }
-        }
-        throw new SmartyException("URI '{$uri}' not allowed by security setting");
-    }
-
-    /**
-     * Remove old directories and its sub folders, add new directories
-     *
-     * @param array $oldDir
-     * @param array $newDir
-     */
-    private function _updateResourceDir($oldDir, $newDir)
-    {
-        foreach ($oldDir as $directory) {
-            //           $directory = $this->smarty->_realpath($directory, true);
-            $length = strlen($directory);
-            foreach ($this->_resource_dir as $dir) {
-                if (substr($dir, 0, $length) === $directory) {
-                    unset($this->_resource_dir[ $dir ]);
-                }
-            }
-        }
-        foreach ($newDir as $directory) {
-            //           $directory = $this->smarty->_realpath($directory, true);
-            $this->_resource_dir[ $directory ] = true;
-        }
-    }
-
-    /**
-     * Check if file is inside a valid directory
-     *
-     * @param string $filepath
-     * @param array  $dirs valid directories
-     *
-     * @return array|bool
-     * @throws \SmartyException
-     */
-    private function _checkDir($filepath, $dirs)
-    {
-        $directory = dirname($this->smarty->_realpath($filepath, true)) . DIRECTORY_SEPARATOR;
-        $_directory = array();
-        if (!preg_match('#[\\\\/][.][.][\\\\/]#', $directory)) {
-            while (true) {
-                // test if the directory is trusted
-                if (isset($dirs[ $directory ])) {
-                    return $_directory;
-                }
-                // abort if we've reached root
-                if (!preg_match('#[\\\\/][^\\\\/]+[\\\\/]$#', $directory)) {
-                    // give up
-                    break;
-                }
-                // remember the directory to add it to _resource_dir in case we're successful
-                $_directory[ $directory ] = true;
-                // bubble up one level
-                $directory = preg_replace('#[\\\\/][^\\\\/]+[\\\\/]$#', DIRECTORY_SEPARATOR, $directory);
-            }
-        }
-        // give up
-        throw new SmartyException(sprintf('Smarty Security: not trusted file path \'%s\' ', $filepath));
-    }
-
-    /**
-     * Loads security class and enables security
-     *
-     * @param \Smarty                $smarty
-     * @param string|Smarty_Security $security_class if a string is used, it must be class-name
-     *
-     * @return \Smarty current Smarty instance for chaining
-     * @throws \SmartyException when an invalid class name is provided
-     */
-    public static function enableSecurity(Smarty $smarty, $security_class)
-    {
-        if ($security_class instanceof Smarty_Security) {
-            $smarty->security_policy = $security_class;
-            return $smarty;
-        } elseif (is_object($security_class)) {
-            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
-        }
-        if ($security_class === null) {
-            $security_class = $smarty->security_class;
-        }
-        if (!class_exists($security_class)) {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
-            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
-        } else {
-            $smarty->security_policy = new $security_class($smarty);
-        }
-        return $smarty;
-    }
-
-    /**
-     * Start template processing
-     *
-     * @param $template
-     *
-     * @throws SmartyException
-     */
-    public function startTemplate($template)
-    {
-        if ($this->max_template_nesting > 0 && $this->_current_template_nesting++ >= $this->max_template_nesting) {
-            throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
-        }
-    }
-
-    /**
-     * Exit template processing
-     */
-    public function endTemplate()
-    {
-        if ($this->max_template_nesting > 0) {
-            $this->_current_template_nesting--;
-        }
-    }
-
-    /**
-     * Register callback functions call at start/end of template rendering
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function registerCallBacks(Smarty_Internal_Template $template)
-    {
-        $template->startRenderCallbacks[] = array($this, 'startTemplate');
-        $template->endRenderCallbacks[] = array($this, 'endTemplate');
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_template_cached.php b/include/smarty/libs/sysplugins/smarty_template_cached.php
deleted file mode 100644
index 508d27f36..000000000
--- a/include/smarty/libs/sysplugins/smarty_template_cached.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Uwe Tews
- * Date: 04.12.2014
- * Time: 06:08
- */
-
-/**
- * Smarty Resource Data Object
- * Cache Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-class Smarty_Template_Cached extends Smarty_Template_Resource_Base
-{
-    /**
-     * Cache Is Valid
-     *
-     * @var boolean
-     */
-    public $valid = null;
-
-    /**
-     * CacheResource Handler
-     *
-     * @var Smarty_CacheResource
-     */
-    public $handler = null;
-
-    /**
-     * Template Cache Id (Smarty_Internal_Template::$cache_id)
-     *
-     * @var string
-     */
-    public $cache_id = null;
-
-    /**
-     * saved cache lifetime in seconds
-     *
-     * @var integer
-     */
-    public $cache_lifetime = 0;
-
-    /**
-     * Id for cache locking
-     *
-     * @var string
-     */
-    public $lock_id = null;
-
-    /**
-     * flag that cache is locked by this instance
-     *
-     * @var bool
-     */
-    public $is_locked = false;
-
-    /**
-     * Source Object
-     *
-     * @var Smarty_Template_Source
-     */
-    public $source = null;
-
-    /**
-     * Nocache hash codes of processed compiled templates
-     *
-     * @var array
-     */
-    public $hashes = array();
-
-    /**
-     * Flag if this is a cache resource
-     *
-     * @var bool
-     */
-    public $isCache = true;
-
-    /**
-     * create Cached Object container
-     *
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @throws \SmartyException
-     */
-    public function __construct(Smarty_Internal_Template $_template)
-    {
-        $this->compile_id = $_template->compile_id;
-        $this->cache_id = $_template->cache_id;
-        $this->source = $_template->source;
-        if (!class_exists('Smarty_CacheResource', false)) {
-            include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
-        }
-        $this->handler = Smarty_CacheResource::load($_template->smarty);
-    }
-
-    /**
-     * @param Smarty_Internal_Template $_template
-     *
-     * @return Smarty_Template_Cached
-     */
-    public static function load(Smarty_Internal_Template $_template)
-    {
-        $_template->cached = new Smarty_Template_Cached($_template);
-        $_template->cached->handler->populate($_template->cached, $_template);
-        // caching enabled ?
-        if (!$_template->caching || $_template->source->handler->recompiled
-        ) {
-            $_template->cached->valid = false;
-        }
-        return $_template->cached;
-    }
-
-    /**
-     * Render cache template
-     *
-     * @param \Smarty_Internal_Template $_template
-     * @param bool                      $no_output_filter
-     *
-     * @throws \Exception
-     */
-    public function render(Smarty_Internal_Template $_template, $no_output_filter = true)
-    {
-        if ($this->isCached($_template)) {
-            if ($_template->smarty->debugging) {
-                if (!isset($_template->smarty->_debug)) {
-                    $_template->smarty->_debug = new Smarty_Internal_Debug();
-                }
-                $_template->smarty->_debug->start_cache($_template);
-            }
-            if (!$this->processed) {
-                $this->process($_template);
-            }
-            $this->getRenderedTemplateCode($_template);
-            if ($_template->smarty->debugging) {
-                $_template->smarty->_debug->end_cache($_template);
-            }
-            return;
-        } else {
-            $_template->smarty->ext->_updateCache->updateCache($this, $_template, $no_output_filter);
-        }
-    }
-
-    /**
-     * Check if cache is valid, lock cache if required
-     *
-     * @param \Smarty_Internal_Template $_template
-     *
-     * @return bool flag true if cache is valid
-     */
-    public function isCached(Smarty_Internal_Template $_template)
-    {
-        if ($this->valid !== null) {
-            return $this->valid;
-        }
-        while (true) {
-            while (true) {
-                if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
-                    $this->valid = false;
-                } else {
-                    $this->valid = true;
-                }
-                if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_CURRENT
-                    && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
-                ) {
-                    // lifetime expired
-                    $this->valid = false;
-                }
-                if ($this->valid && $_template->compile_check === Smarty::COMPILECHECK_ON
-                    && $_template->source->getTimeStamp() > $this->timestamp
-                ) {
-                    $this->valid = false;
-                }
-                if ($this->valid || !$_template->smarty->cache_locking) {
-                    break;
-                }
-                if (!$this->handler->locked($_template->smarty, $this)) {
-                    $this->handler->acquireLock($_template->smarty, $this);
-                    break 2;
-                }
-                $this->handler->populate($this, $_template);
-            }
-            if ($this->valid) {
-                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
-                    // load cache file for the following checks
-                    if ($_template->smarty->debugging) {
-                        $_template->smarty->_debug->start_cache($_template);
-                    }
-                    if ($this->handler->process($_template, $this) === false) {
-                        $this->valid = false;
-                    } else {
-                        $this->processed = true;
-                    }
-                    if ($_template->smarty->debugging) {
-                        $_template->smarty->_debug->end_cache($_template);
-                    }
-                } else {
-                    $this->is_locked = true;
-                    continue;
-                }
-            } else {
-                return $this->valid;
-            }
-            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED
-                && $_template->cached->cache_lifetime >= 0
-                && (time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))
-            ) {
-                $this->valid = false;
-            }
-            if ($_template->smarty->cache_locking) {
-                if (!$this->valid) {
-                    $this->handler->acquireLock($_template->smarty, $this);
-                } elseif ($this->is_locked) {
-                    $this->handler->releaseLock($_template->smarty, $this);
-                }
-            }
-            return $this->valid;
-        }
-        return $this->valid;
-    }
-
-    /**
-     * Process cached template
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param bool                     $update    flag if called because cache update
-     */
-    public function process(Smarty_Internal_Template $_template, $update = false)
-    {
-        if ($this->handler->process($_template, $this, $update) === false) {
-            $this->valid = false;
-        }
-        if ($this->valid) {
-            $this->processed = true;
-        } else {
-            $this->processed = false;
-        }
-    }
-
-    /**
-     * Read cache content from handler
-     *
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return string|false content
-     */
-    public function read(Smarty_Internal_Template $_template)
-    {
-        if (!$_template->source->handler->recompiled) {
-            return $this->handler->readCachedContent($_template);
-        }
-        return false;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_template_compiled.php b/include/smarty/libs/sysplugins/smarty_template_compiled.php
deleted file mode 100644
index 37d8f0a9e..000000000
--- a/include/smarty/libs/sysplugins/smarty_template_compiled.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-/**
- * Smarty Resource Data Object
- * Meta Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- * @property   string $content compiled content
- */
-class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
-{
-    /**
-     * nocache hash
-     *
-     * @var string|null
-     */
-    public $nocache_hash = null;
-
-    /**
-     * get a Compiled Object of this source
-     *
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return Smarty_Template_Compiled compiled object
-     */
-    public static function load($_template)
-    {
-        $compiled = new Smarty_Template_Compiled();
-        if ($_template->source->handler->hasCompiledHandler) {
-            $_template->source->handler->populateCompiledFilepath($compiled, $_template);
-        } else {
-            $compiled->populateCompiledFilepath($_template);
-        }
-        return $compiled;
-    }
-
-    /**
-     * populate Compiled Object with compiled filepath
-     *
-     * @param Smarty_Internal_Template $_template template object
-     **/
-    public function populateCompiledFilepath(Smarty_Internal_Template $_template)
-    {
-        $source = &$_template->source;
-        $smarty = &$_template->smarty;
-        $this->filepath = $smarty->getCompileDir();
-        if (isset($_template->compile_id)) {
-            $this->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) .
-                               ($smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^');
-        }
-        // if use_sub_dirs, break file into directories
-        if ($smarty->use_sub_dirs) {
-            $this->filepath .= $source->uid[ 0 ] . $source->uid[ 1 ] . DIRECTORY_SEPARATOR . $source->uid[ 2 ] .
-                               $source->uid[ 3 ] . DIRECTORY_SEPARATOR . $source->uid[ 4 ] . $source->uid[ 5 ] .
-                               DIRECTORY_SEPARATOR;
-        }
-        $this->filepath .= $source->uid . '_';
-        if ($source->isConfig) {
-            $this->filepath .= (int)$smarty->config_read_hidden + (int)$smarty->config_booleanize * 2 +
-                               (int)$smarty->config_overwrite * 4;
-        } else {
-            $this->filepath .= (int)$smarty->merge_compiled_includes + (int)$smarty->escape_html * 2 +
-                               (($smarty->merge_compiled_includes && $source->type === 'extends') ?
-                                   (int)$smarty->extends_recursion * 4 : 0);
-        }
-        $this->filepath .= '.' . $source->type;
-        $basename = $source->handler->getBasename($source);
-        if (!empty($basename)) {
-            $this->filepath .= '.' . $basename;
-        }
-        if ($_template->caching) {
-            $this->filepath .= '.cache';
-        }
-        $this->filepath .= '.php';
-        $this->timestamp = $this->exists = is_file($this->filepath);
-        if ($this->exists) {
-            $this->timestamp = filemtime($this->filepath);
-        }
-    }
-
-    /**
-     * render compiled template code
-     *
-     * @param Smarty_Internal_Template $_template
-     *
-     * @return string
-     * @throws Exception
-     */
-    public function render(Smarty_Internal_Template $_template)
-    {
-        // checks if template exists
-        if (!$_template->source->exists) {
-            $type = $_template->source->isConfig ? 'config' : 'template';
-            throw new SmartyException("Unable to load {$type} '{$_template->source->type}:{$_template->source->name}'");
-        }
-        if ($_template->smarty->debugging) {
-            if (!isset($_template->smarty->_debug)) {
-                $_template->smarty->_debug = new Smarty_Internal_Debug();
-            }
-            $_template->smarty->_debug->start_render($_template);
-        }
-        if (!$this->processed) {
-            $this->process($_template);
-        }
-        if (isset($_template->cached)) {
-            $_template->cached->file_dependency =
-                array_merge($_template->cached->file_dependency, $this->file_dependency);
-        }
-        if ($_template->source->handler->uncompiled) {
-            $_template->source->handler->renderUncompiled($_template->source, $_template);
-        } else {
-            $this->getRenderedTemplateCode($_template);
-        }
-        if ($_template->caching && $this->has_nocache_code) {
-            $_template->cached->hashes[ $this->nocache_hash ] = true;
-        }
-        if ($_template->smarty->debugging) {
-            $_template->smarty->_debug->end_render($_template);
-        }
-    }
-
-    /**
-     * load compiled template or compile from source
-     *
-     * @param Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
-     *
-     * @throws Exception
-     */
-    public function process(Smarty_Internal_Template $_smarty_tpl)
-    {
-        $source = &$_smarty_tpl->source;
-        $smarty = &$_smarty_tpl->smarty;
-        if ($source->handler->recompiled) {
-            $source->handler->process($_smarty_tpl);
-        } elseif (!$source->handler->uncompiled) {
-            if (!$this->exists || $smarty->force_compile
-                || ($_smarty_tpl->compile_check && $source->getTimeStamp() > $this->getTimeStamp())
-            ) {
-                $this->compileTemplateSource($_smarty_tpl);
-                $compileCheck = $_smarty_tpl->compile_check;
-                $_smarty_tpl->compile_check = Smarty::COMPILECHECK_OFF;
-                $this->loadCompiledTemplate($_smarty_tpl);
-                $_smarty_tpl->compile_check = $compileCheck;
-            } else {
-                $_smarty_tpl->mustCompile = true;
-                @include $this->filepath;
-                if ($_smarty_tpl->mustCompile) {
-                    $this->compileTemplateSource($_smarty_tpl);
-                    $compileCheck = $_smarty_tpl->compile_check;
-                    $_smarty_tpl->compile_check = Smarty::COMPILECHECK_OFF;
-                    $this->loadCompiledTemplate($_smarty_tpl);
-                    $_smarty_tpl->compile_check = $compileCheck;
-                }
-            }
-            $_smarty_tpl->_subTemplateRegister();
-            $this->processed = true;
-        }
-    }
-
-    /**
-     * compile template from source
-     *
-     * @param Smarty_Internal_Template $_template
-     *
-     * @throws Exception
-     */
-    public function compileTemplateSource(Smarty_Internal_Template $_template)
-    {
-        $this->file_dependency = array();
-        $this->includes = array();
-        $this->nocache_hash = null;
-        $this->unifunc = null;
-        // compile locking
-        if ($saved_timestamp = (!$_template->source->handler->recompiled && is_file($this->filepath))) {
-            $saved_timestamp = $this->getTimeStamp();
-            touch($this->filepath);
-        }
-        // compile locking
-        try {
-            // call compiler
-            $_template->loadCompiler();
-            $this->write($_template, $_template->compiler->compileTemplate($_template));
-        } catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($saved_timestamp && is_file($this->filepath)) {
-                touch($this->filepath, $saved_timestamp);
-            }
-            unset($_template->compiler);
-            throw $e;
-        }
-        // release compiler object to free memory
-        unset($_template->compiler);
-    }
-
-    /**
-     * Write compiled code by handler
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $code      compiled code
-     *
-     * @return bool success
-     * @throws \SmartyException
-     */
-    public function write(Smarty_Internal_Template $_template, $code)
-    {
-        if (!$_template->source->handler->recompiled) {
-            if ($_template->smarty->ext->_writeFile->writeFile($this->filepath, $code, $_template->smarty) === true) {
-                $this->timestamp = $this->exists = is_file($this->filepath);
-                if ($this->exists) {
-                    $this->timestamp = filemtime($this->filepath);
-                    return true;
-                }
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Read compiled content from handler
-     *
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return string content
-     */
-    public function read(Smarty_Internal_Template $_template)
-    {
-        if (!$_template->source->handler->recompiled) {
-            return file_get_contents($this->filepath);
-        }
-        return isset($this->content) ? $this->content : false;
-    }
-
-    /**
-     * Load fresh compiled template by including the PHP file
-     * HHVM requires a work around because of a PHP incompatibility
-     *
-     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
-     */
-    private function loadCompiledTemplate(Smarty_Internal_Template $_smarty_tpl)
-    {
-        if (function_exists('opcache_invalidate')
-            && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
-        ) {
-            opcache_invalidate($this->filepath, true);
-        } elseif (function_exists('apc_compile_file')) {
-            apc_compile_file($this->filepath);
-        }
-        if (defined('HHVM_VERSION')) {
-            eval('?>' . file_get_contents($this->filepath));
-        } else {
-            include $this->filepath;
-        }
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_template_config.php b/include/smarty/libs/sysplugins/smarty_template_config.php
deleted file mode 100644
index 850ae32e7..000000000
--- a/include/smarty/libs/sysplugins/smarty_template_config.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Smarty Config Source Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Config Resource Data Object
- * Meta Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- */
-class Smarty_Template_Config extends Smarty_Template_Source
-{
-    /**
-     * array of section names, single section or null
-     *
-     * @var null|string|array
-     */
-    public $config_sections = null;
-
-    /**
-     * scope into which the config variables shall be loaded
-     *
-     * @var int
-     */
-    public $scope = 0;
-
-    /**
-     * Flag that source is a config file
-     *
-     * @var bool
-     */
-    public $isConfig = true;
-
-    /**
-     * Name of the Class to compile this resource's contents with
-     *
-     * @var string
-     */
-    public $compiler_class = 'Smarty_Internal_Config_File_Compiler';
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     *
-     * @var string
-     */
-    public $template_lexer_class = 'Smarty_Internal_Configfilelexer';
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     *
-     * @var string
-     */
-    public $template_parser_class = 'Smarty_Internal_Configfileparser';
-
-    /**
-     * initialize Source Object for given resource
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param Smarty_Internal_Template $_template         template object
-     * @param Smarty                   $smarty            smarty object
-     * @param string                   $template_resource resource identifier
-     *
-     * @return Smarty_Template_Config Source Object
-     * @throws SmartyException
-     */
-    public static function load(
-        Smarty_Internal_Template $_template = null,
-        Smarty $smarty = null,
-        $template_resource = null
-    ) {
-        static $_incompatible_resources = array('extends' => true, 'php' => true);
-        if ($_template) {
-            $smarty = $_template->smarty;
-            $template_resource = $_template->template_resource;
-        }
-        if (empty($template_resource)) {
-            throw new SmartyException('Source: Missing  name');
-        }
-        // parse resource_name, load resource handler
-        list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $smarty->default_config_type);
-        // make sure configs are not loaded via anything smarty can't handle
-        if (isset($_incompatible_resources[ $type ])) {
-            throw new SmartyException("Unable to use resource '{$type}' for config");
-        }
-        $source = new Smarty_Template_Config($smarty, $template_resource, $type, $name);
-        $source->handler->populate($source, $_template);
-        if (!$source->exists && isset($smarty->default_config_handler_func)) {
-            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
-            $source->handler->populate($source, $_template);
-        }
-        return $source;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_template_resource_base.php b/include/smarty/libs/sysplugins/smarty_template_resource_base.php
deleted file mode 100644
index 52bfba252..000000000
--- a/include/smarty/libs/sysplugins/smarty_template_resource_base.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * Smarty Template Resource Base Object
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-abstract class Smarty_Template_Resource_Base
-{
-    /**
-     * Compiled Filepath
-     *
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Compiled Timestamp
-     *
-     * @var integer|bool
-     */
-    public $timestamp = false;
-
-    /**
-     * Compiled Existence
-     *
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Template Compile Id (Smarty_Internal_Template::$compile_id)
-     *
-     * @var string
-     */
-    public $compile_id = null;
-
-    /**
-     * Compiled Content Loaded
-     *
-     * @var boolean
-     */
-    public $processed = false;
-
-    /**
-     * unique function name for compiled template code
-     *
-     * @var string
-     */
-    public $unifunc = '';
-
-    /**
-     * flag if template does contain nocache code sections
-     *
-     * @var bool
-     */
-    public $has_nocache_code = false;
-
-    /**
-     * resource file dependency
-     *
-     * @var array
-     */
-    public $file_dependency = array();
-
-    /**
-     * Content buffer
-     *
-     * @var string
-     */
-    public $content = null;
-
-    /**
-     * Included sub templates
-     * - index name
-     * - value use count
-     *
-     * @var int[]
-     */
-    public $includes = array();
-
-    /**
-     * Flag if this is a cache resource
-     *
-     * @var bool
-     */
-    public $isCache = false;
-
-    /**
-     * Process resource
-     *
-     * @param Smarty_Internal_Template $_template template object
-     */
-    abstract public function process(Smarty_Internal_Template $_template);
-
-    /**
-     * get rendered template content by calling compiled or cached template code
-     *
-     * @param \Smarty_Internal_Template $_template
-     * @param string                    $unifunc function with template code
-     *
-     * @throws \Exception
-     */
-    public function getRenderedTemplateCode(Smarty_Internal_Template $_template, $unifunc = null)
-    {
-        $smarty = &$_template->smarty;
-        $_template->isRenderingCache = $this->isCache;
-        $level = ob_get_level();
-        try {
-            if (!isset($unifunc)) {
-                $unifunc = $this->unifunc;
-            }
-            if (empty($unifunc) || !function_exists($unifunc)) {
-                throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
-            }
-            if ($_template->startRenderCallbacks) {
-                foreach ($_template->startRenderCallbacks as $callback) {
-                    call_user_func($callback, $_template);
-                }
-            }
-            $unifunc($_template);
-            foreach ($_template->endRenderCallbacks as $callback) {
-                call_user_func($callback, $_template);
-            }
-            $_template->isRenderingCache = false;
-        } catch (Exception $e) {
-            $_template->isRenderingCache = false;
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-            if (isset($smarty->security_policy)) {
-                $smarty->security_policy->endTemplate();
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Get compiled time stamp
-     *
-     * @return int
-     */
-    public function getTimeStamp()
-    {
-        if ($this->exists && !$this->timestamp) {
-            $this->timestamp = filemtime($this->filepath);
-        }
-        return $this->timestamp;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_template_source.php b/include/smarty/libs/sysplugins/smarty_template_source.php
deleted file mode 100644
index 16b47f23c..000000000
--- a/include/smarty/libs/sysplugins/smarty_template_source.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-/**
- * Smarty Resource Data Object
- * Meta Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-class Smarty_Template_Source
-{
-    /**
-     * Unique Template ID
-     *
-     * @var string
-     */
-    public $uid = null;
-
-    /**
-     * Template Resource (Smarty_Internal_Template::$template_resource)
-     *
-     * @var string
-     */
-    public $resource = null;
-
-    /**
-     * Resource Type
-     *
-     * @var string
-     */
-    public $type = null;
-
-    /**
-     * Resource Name
-     *
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * Source Filepath
-     *
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Source Timestamp
-     *
-     * @var integer
-     */
-    public $timestamp = null;
-
-    /**
-     * Source Existence
-     *
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Source File Base name
-     *
-     * @var string
-     */
-    public $basename = null;
-
-    /**
-     * The Components an extended template is made of
-     *
-     * @var \Smarty_Template_Source[]
-     */
-    public $components = null;
-
-    /**
-     * Resource Handler
-     *
-     * @var \Smarty_Resource
-     */
-    public $handler = null;
-
-    /**
-     * Smarty instance
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * Resource is source
-     *
-     * @var bool
-     */
-    public $isConfig = false;
-
-    /**
-     * Template source content eventually set by default handler
-     *
-     * @var string
-     */
-    public $content = null;
-
-    /**
-     * Name of the Class to compile this resource's contents with
-     *
-     * @var string
-     */
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     *
-     * @var string
-     */
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     *
-     * @var string
-     */
-    public $template_parser_class = 'Smarty_Internal_Templateparser';
-
-    /**
-     * create Source Object container
-     *
-     * @param Smarty $smarty   Smarty instance this source object belongs to
-     * @param string $resource full template_resource
-     * @param string $type     type of resource
-     * @param string $name     resource name
-     *
-     * @throws   \SmartyException
-     * @internal param \Smarty_Resource $handler Resource Handler this source object communicates with
-     */
-    public function __construct(Smarty $smarty, $resource, $type, $name)
-    {
-        $this->handler =
-            isset($smarty->_cache[ 'resource_handlers' ][ $type ]) ? $smarty->_cache[ 'resource_handlers' ][ $type ] :
-                Smarty_Resource::load($smarty, $type);
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-    }
-
-    /**
-     * initialize Source Object for given resource
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param Smarty_Internal_Template $_template         template object
-     * @param Smarty                   $smarty            smarty object
-     * @param string                   $template_resource resource identifier
-     *
-     * @return Smarty_Template_Source Source Object
-     * @throws SmartyException
-     */
-    public static function load(
-        Smarty_Internal_Template $_template = null,
-        Smarty $smarty = null,
-        $template_resource = null
-    ) {
-        if ($_template) {
-            $smarty = $_template->smarty;
-            $template_resource = $_template->template_resource;
-        }
-        if (empty($template_resource)) {
-            throw new SmartyException('Source: Missing  name');
-        }
-        // parse resource_name, load resource handler, identify unique resource name
-        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
-            $type = $match[ 1 ];
-            $name = $match[ 2 ];
-        } else {
-            // no resource given, use default
-            // or single character before the colon is not a resource type, but part of the filepath
-            $type = $smarty->default_resource_type;
-            $name = $template_resource;
-        }
-        // create new source  object
-        $source = new Smarty_Template_Source($smarty, $template_resource, $type, $name);
-        $source->handler->populate($source, $_template);
-        if (!$source->exists && isset($_template->smarty->default_template_handler_func)) {
-            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
-            $source->handler->populate($source, $_template);
-        }
-        return $source;
-    }
-
-    /**
-     * Get source time stamp
-     *
-     * @return int
-     */
-    public function getTimeStamp()
-    {
-        if (!isset($this->timestamp)) {
-            $this->handler->populateTimestamp($this);
-        }
-        return $this->timestamp;
-    }
-
-    /**
-     * Get source content
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function getContent()
-    {
-        return isset($this->content) ? $this->content : $this->handler->getContent($this);
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_undefined_variable.php b/include/smarty/libs/sysplugins/smarty_undefined_variable.php
deleted file mode 100644
index 6d31a8a05..000000000
--- a/include/smarty/libs/sysplugins/smarty_undefined_variable.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * class for undefined variable object
- * This class defines an object for undefined variable handling
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Undefined_Variable extends Smarty_Variable
-{
-    /**
-     * Returns null for not existing properties
-     *
-     * @param string $name
-     *
-     * @return null
-     */
-    public function __get($name)
-    {
-        return null;
-    }
-
-    /**
-     * Always returns an empty string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return '';
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smarty_variable.php b/include/smarty/libs/sysplugins/smarty_variable.php
deleted file mode 100644
index 6a534228b..000000000
--- a/include/smarty/libs/sysplugins/smarty_variable.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * class for the Smarty variable object
- * This class defines the Smarty variable object
- *
- * @package    Smarty
- * @subpackage Template
- */
-#[\AllowDynamicProperties]
-class Smarty_Variable
-{
-    /**
-     * template variable
-     *
-     * @var mixed
-     */
-    public $value = null;
-
-    /**
-     * if true any output of this variable will be not cached
-     *
-     * @var boolean
-     */
-    public $nocache = false;
-
-    /**
-     * create Smarty variable object
-     *
-     * @param mixed   $value   the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     */
-    public function __construct($value = null, $nocache = false)
-    {
-        $this->value = $value;
-        $this->nocache = $nocache;
-    }
-
-    /**
-     * <<magic>> String conversion
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string)$this->value;
-    }
-}
diff --git a/include/smarty/libs/sysplugins/smartycompilerexception.php b/include/smarty/libs/sysplugins/smartycompilerexception.php
deleted file mode 100644
index c7125ac8e..000000000
--- a/include/smarty/libs/sysplugins/smartycompilerexception.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Smarty compiler exception class
- *
- * @package Smarty
- */
-class SmartyCompilerException extends SmartyException
-{
-    /**
-     * The constructor of the exception
-     *
-     * @param string         $message  The Exception message to throw.
-     * @param int            $code     The Exception code.
-     * @param string|null    $filename The filename where the exception is thrown.
-     * @param int|null       $line     The line number where the exception is thrown.
-     * @param Throwable|null $previous The previous exception used for the exception chaining.
-     */
-    public function __construct(
-        string $message = "",
-        int $code = 0,
-        $filename = null,
-        $line = null,
-        Throwable $previous = null
-    ) {
-        parent::__construct($message, $code, $previous);
-
-        // These are optional parameters, should be be overridden only when present!
-        if ($filename) {
-            $this->file = $filename;
-        }
-        if ($line) {
-            $this->line = $line;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
-    }
-
-    /**
-     * @param int $line
-     */
-    public function setLine($line)
-    {
-        $this->line = $line;
-    }
-
-    /**
-     * The template source snippet relating to the error
-     *
-     * @type string|null
-     */
-    public $source = null;
-
-    /**
-     * The raw text of the error message
-     *
-     * @type string|null
-     */
-    public $desc = null;
-
-    /**
-     * The resource identifier or template name
-     *
-     * @type string|null
-     */
-    public $template = null;
-}
diff --git a/include/smarty/libs/sysplugins/smartyexception.php b/include/smarty/libs/sysplugins/smartyexception.php
deleted file mode 100644
index 7f7b9aa43..000000000
--- a/include/smarty/libs/sysplugins/smartyexception.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Smarty exception class
- *
- * @package Smarty
- */
-class SmartyException extends Exception
-{
-    public static $escape = false;
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
-    }
-}
diff --git a/include/smarty/src/BlockHandler/Base.php b/include/smarty/src/BlockHandler/Base.php
new file mode 100644
index 000000000..e194f67b6
--- /dev/null
+++ b/include/smarty/src/BlockHandler/Base.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Smarty\BlockHandler;
+
+use Smarty\Template;
+
+abstract class Base implements BlockHandlerInterface {
+
+	/**
+	 * @var bool
+	 */
+	protected $cacheable = true;
+
+	abstract public function handle($params, $content, Template $template, &$repeat);
+
+	public function isCacheable(): bool {
+		return $this->cacheable;
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/BlockHandler/BlockHandlerInterface.php b/include/smarty/src/BlockHandler/BlockHandlerInterface.php
new file mode 100644
index 000000000..9aa744ec7
--- /dev/null
+++ b/include/smarty/src/BlockHandler/BlockHandlerInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Smarty\BlockHandler;
+
+use Smarty\Template;
+
+interface BlockHandlerInterface {
+	public function handle($params, $content, Template $template, &$repeat);
+	public function isCacheable(): bool;
+}
\ No newline at end of file
diff --git a/include/smarty/src/BlockHandler/BlockPluginWrapper.php b/include/smarty/src/BlockHandler/BlockPluginWrapper.php
new file mode 100644
index 000000000..b6236a67e
--- /dev/null
+++ b/include/smarty/src/BlockHandler/BlockPluginWrapper.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Smarty\BlockHandler;
+
+use Smarty\Template;
+
+class BlockPluginWrapper extends Base {
+
+	private $callback;
+
+	public function __construct($callback, bool $cacheable = true) {
+		$this->callback = $callback;
+		$this->cacheable = $cacheable;
+	}
+
+	public function handle($params, $content, Template $template, &$repeat) {
+		return \call_user_func_array($this->callback, [$params, $content, &$template, &$repeat]);
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/BlockHandler/TextFormat.php b/include/smarty/src/BlockHandler/TextFormat.php
new file mode 100644
index 000000000..b4fa5acd4
--- /dev/null
+++ b/include/smarty/src/BlockHandler/TextFormat.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Smarty\BlockHandler;
+
+use Smarty\Smarty;
+use Smarty\Template;
+
+/**
+ * Smarty {textformat}{/textformat} block plugin
+ * Type:     block function
+ * Name:     textformat
+ * Purpose:  format text a certain way with preset styles
+ *           or custom wrap/indent settings
+ * Params:
+ *
+ * - style         - string (email)
+ * - indent        - integer (0)
+ * - wrap          - integer (80)
+ * - wrap_char     - string ("\n")
+ * - indent_char   - string (" ")
+ * - wrap_boundary - boolean (true)
+ *
+ * @param array                    $params   parameters
+ * @param string                   $content  contents of the block
+ * @param Template $template template object
+ * @param boolean                  &$repeat  repeat flag
+ *
+ * @return string content re-formatted
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @throws \Smarty\Exception
+ */
+class TextFormat implements BlockHandlerInterface {
+
+	public function handle($params, $content, Template $template, &$repeat) {
+		if (is_null($content)) {
+			return;
+		}
+		$style = null;
+		$indent = 0;
+		$indent_first = 0;
+		$indent_char = ' ';
+		$wrap = 80;
+		$wrap_char = "\n";
+		$wrap_cut = false;
+		$assign = null;
+		foreach ($params as $_key => $_val) {
+			switch ($_key) {
+				case 'style':
+				case 'indent_char':
+				case 'wrap_char':
+				case 'assign':
+					$$_key = (string)$_val;
+					break;
+				case 'indent':
+				case 'indent_first':
+				case 'wrap':
+					$$_key = (int)$_val;
+					break;
+				case 'wrap_cut':
+					$$_key = (bool)$_val;
+					break;
+				default:
+					trigger_error("textformat: unknown attribute '{$_key}'");
+			}
+		}
+		if ($style === 'email') {
+			$wrap = 72;
+		}
+		// split into paragraphs
+		$_paragraphs = preg_split('![\r\n]{2}!', $content);
+		foreach ($_paragraphs as &$_paragraph) {
+			if (!$_paragraph) {
+				continue;
+			}
+			// convert mult. spaces & special chars to single space
+			$_paragraph =
+				preg_replace(
+					array(
+						'!\s+!' . Smarty::$_UTF8_MODIFIER,
+						'!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER
+					),
+					array(
+						' ',
+						''
+					),
+					$_paragraph
+				);
+			// indent first line
+			if ($indent_first > 0) {
+				$_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
+			}
+			// wordwrap sentences
+			$_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+			// indent lines
+			if ($indent > 0) {
+				$_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
+			}
+		}
+		$_output = implode($wrap_char . $wrap_char, $_paragraphs);
+		if ($assign) {
+			$template->assign($assign, $_output);
+		} else {
+			return $_output;
+		}
+	}
+
+	public function isCacheable(): bool {
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Cacheresource/Base.php b/include/smarty/src/Cacheresource/Base.php
new file mode 100644
index 000000000..41c4f6bc6
--- /dev/null
+++ b/include/smarty/src/Cacheresource/Base.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Smarty\Cacheresource;
+
+use Smarty\Exception;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Cached;
+
+/**
+ * Cache Handler API
+ * @author     Rodney Rehm
+ */
+abstract class Base
+{
+
+    /**
+     * populate Cached Object with metadata from Resource
+     *
+     * @param Cached  $cached    cached object
+     * @param Template $_template template object
+     *
+     * @return void
+     */
+    abstract public function populate(Cached $cached, Template $_template);
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Cached $cached
+     *
+     * @return void
+     */
+    abstract public function populateTimestamp(Cached $cached);
+
+	/**
+	 * Read the cached template and process header
+	 *
+	 * @param Template $_template template object
+	 * @param Cached|null $cached cached object
+	 * @param boolean $update flag if called because cache update
+	 *
+	 * @return boolean true or false if the cached content does not exist
+	 */
+    abstract public function process(
+	    Template $_template,
+	    ?Cached  $cached = null,
+	             $update = false
+    );
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean success
+     */
+    abstract public function storeCachedContent(Template $_template, $content);
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Template $_template template object
+     *
+     * @return string  content
+     */
+    abstract public function retrieveCachedContent(Template $_template);
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clearAll(Smarty $smarty, $exp_time = null);
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+
+    /**
+     * @param Smarty                 $smarty
+     * @param Cached $cached
+     *
+     * @return bool|null
+     */
+    public function locked(Smarty $smarty, Cached $cached)
+    {
+        // theoretically locking_timeout should be checked against time_limit (max_execution_time)
+        $start = microtime(true);
+        $hadLock = null;
+        while ($this->hasLock($smarty, $cached)) {
+            $hadLock = true;
+            if (microtime(true) - $start > $smarty->locking_timeout) {
+                // abort waiting for lock release
+                return false;
+            }
+            sleep(1);
+        }
+        return $hadLock;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Cached $cached
+     *
+     * @return bool
+     */
+    public function hasLock(Smarty $smarty, Cached $cached)
+    {
+        // check if lock exists
+        return false;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Cached $cached
+     *
+     * @return bool
+     */
+    public function acquireLock(Smarty $smarty, Cached $cached)
+    {
+        // create lock
+        return true;
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Cached $cached
+     *
+     * @return bool
+     */
+    public function releaseLock(Smarty $smarty, Cached $cached)
+    {
+        // release lock
+        return true;
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php b/include/smarty/src/Cacheresource/Custom.php
similarity index 64%
rename from include/smarty/libs/sysplugins/smarty_cacheresource_custom.php
rename to include/smarty/src/Cacheresource/Custom.php
index 68ad11289..f9eb858e4 100644
--- a/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php
+++ b/include/smarty/src/Cacheresource/Custom.php
@@ -1,19 +1,26 @@
 <?php
+
+namespace Smarty\Cacheresource;
+
 /**
  * Smarty Internal Plugin
  *
- * @package    Smarty
- * @subpackage Cacher
+
+
  */
 
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Cached;
+
 /**
  * Cache Handler API
  *
- * @package    Smarty
- * @subpackage Cacher
+
+
  * @author     Rodney Rehm
  */
-abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
+abstract class Custom extends Base
 {
     /**
      * fetch cached content and its modification time from data source
@@ -73,20 +80,20 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     abstract protected function delete($name, $cache_id, $compile_id, $exp_time);
 
     /**
-     * populate Cached Object with meta data from Resource
+     * populate Cached Object with metadata from Resource
      *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
+     * @param \Smarty\Template\Cached   $cached    cached object
+     * @param Template $_template template object
      *
      * @return void
      */
-    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
+    public function populate(\Smarty\Template\Cached $cached, Template $_template)
     {
         $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
         $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w]+!', '_', $cached->compile_id) : null;
-        $path = $cached->source->uid . $_cache_id . $_compile_id;
+        $path = $cached->getSource()->uid . $_cache_id . $_compile_id;
         $cached->filepath = sha1($path);
-        if ($_template->smarty->cache_locking) {
+        if ($_template->getSmarty()->cache_locking) {
             $cached->lock_id = sha1('lock.' . $path);
         }
         $this->populateTimestamp($cached);
@@ -95,14 +102,14 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     /**
      * populate Cached Object with timestamp and exists from Resource
      *
-     * @param Smarty_Template_Cached $cached
+     * @param \Smarty\Template\Cached $cached
      *
      * @return void
      */
-    public function populateTimestamp(Smarty_Template_Cached $cached)
+    public function populateTimestamp(\Smarty\Template\Cached $cached)
     {
         $mtime =
-            $this->fetchTimestamp($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id);
+            $this->fetchTimestamp($cached->filepath, $cached->getSource()->name, $cached->cache_id, $cached->compile_id);
         if ($mtime !== null) {
             $cached->timestamp = $mtime;
             $cached->exists = !!$cached->timestamp;
@@ -111,7 +118,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
         $timestamp = null;
         $this->fetch(
             $cached->filepath,
-            $cached->source->name,
+            $cached->getSource()->name,
             $cached->cache_id,
             $cached->compile_id,
             $cached->content,
@@ -121,29 +128,29 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
         $cached->exists = !!$cached->timestamp;
     }
 
-    /**
-     * Read the cached template and process the header
-     *
-     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
-     * @param Smarty_Template_Cached    $cached      cached object
-     * @param boolean                   $update      flag if called because cache update
-     *
-     * @return boolean                 true or false if the cached content does not exist
-     */
+	/**
+	 * Read the cached template and process the header
+	 *
+	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
+	 * @param Cached|null $cached cached object
+	 * @param boolean $update flag if called because cache update
+	 *
+	 * @return boolean                 true or false if the cached content does not exist
+	 */
     public function process(
-        Smarty_Internal_Template $_smarty_tpl,
-        Smarty_Template_Cached $cached = null,
-        $update = false
+	    Template               $_smarty_tpl,
+	    ?\Smarty\Template\Cached $cached = null,
+	                           $update = false
     ) {
         if (!$cached) {
-            $cached = $_smarty_tpl->cached;
+            $cached = $_smarty_tpl->getCached();
         }
         $content = $cached->content ? $cached->content : null;
         $timestamp = $cached->timestamp ? $cached->timestamp : null;
         if ($content === null || !$timestamp) {
             $this->fetch(
-                $_smarty_tpl->cached->filepath,
-                $_smarty_tpl->source->name,
+                $_smarty_tpl->getCached()->filepath,
+                $_smarty_tpl->getSource()->name,
                 $_smarty_tpl->cache_id,
                 $_smarty_tpl->compile_id,
                 $content,
@@ -161,16 +168,16 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     /**
      * Write the rendered template output to cache
      *
-     * @param Smarty_Internal_Template $_template template object
+     * @param Template $_template template object
      * @param string                   $content   content to cache
      *
      * @return boolean                  success
      */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    public function storeCachedContent(Template $_template, $content)
     {
         return $this->save(
-            $_template->cached->filepath,
-            $_template->source->name,
+            $_template->getCached()->filepath,
+            $_template->getSource()->name,
             $_template->cache_id,
             $_template->compile_id,
             $_template->cache_lifetime,
@@ -181,19 +188,18 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     /**
      * Read cached template from cache
      *
-     * @param Smarty_Internal_Template $_template template object
+     * @param Template $_template template object
      *
      * @return string|boolean  content
      */
-    public function readCachedContent(Smarty_Internal_Template $_template)
+    public function retrieveCachedContent(Template $_template)
     {
-        $content = $_template->cached->content ? $_template->cached->content : null;
-        $timestamp = null;
-        if ($content === null) {
+        $content = $_template->getCached()->content ?: null;
+	    if ($content === null) {
             $timestamp = null;
             $this->fetch(
-                $_template->cached->filepath,
-                $_template->source->name,
+                $_template->getCached()->filepath,
+                $_template->getSource()->name,
                 $_template->cache_id,
                 $_template->compile_id,
                 $content,
@@ -206,15 +212,15 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
         return false;
     }
 
-    /**
-     * Empty cache
-     *
-     * @param Smarty  $smarty   Smarty object
-     * @param integer $exp_time expiration time (number of seconds, not timestamp)
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearAll(Smarty $smarty, $exp_time = null)
+	/**
+	 * Empty cache
+	 *
+	 * @param \Smarty\Smarty $smarty Smarty object
+	 * @param null $exp_time expiration time (number of seconds, not timestamp)
+	 *
+	 * @return integer number of cache files deleted
+	 */
+    public function clearAll(\Smarty\Smarty $smarty, $exp_time = null)
     {
         return $this->delete(null, null, null, $exp_time);
     }
@@ -222,20 +228,20 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     /**
      * Empty cache for a specific template
      *
-     * @param Smarty  $smarty        Smarty object
+     * @param \Smarty\Smarty  $smarty        Smarty object
      * @param string  $resource_name template name
      * @param string  $cache_id      cache id
      * @param string  $compile_id    compile id
      * @param integer $exp_time      expiration time (number of seconds, not timestamp)
      *
      * @return int number of cache files deleted
-     * @throws \SmartyException
+     * @throws \Smarty\Exception
      */
-    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    public function clear(\Smarty\Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
         $cache_name = null;
         if (isset($resource_name)) {
-            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            $source = \Smarty\Template\Source::load(null, $smarty, $resource_name);
             if ($source->exists) {
                 $cache_name = $source->name;
             } else {
@@ -245,18 +251,18 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
         return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
     }
 
-    /**
-     * Check is cache is locked for this template
-     *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     *
-     * @return boolean               true or false if cache is locked
-     */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+	/**
+	 * Check is cache is locked for this template
+	 *
+	 * @param Smarty $smarty Smarty object
+	 * @param Cached $cached cached object
+	 *
+	 * @return boolean               true or false if cache is locked
+	 */
+    public function hasLock(\Smarty\Smarty $smarty, \Smarty\Template\Cached $cached)
     {
         $id = $cached->lock_id;
-        $name = $cached->source->name . '.lock';
+        $name = $cached->getSource()->name . '.lock';
         $mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
         if ($mtime === null) {
             $this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
@@ -267,31 +273,31 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     /**
      * Lock cache for this template
      *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
+     * @param \Smarty\Smarty                 $smarty Smarty object
+     * @param \Smarty\Template\Cached $cached cached object
      *
      * @return bool|void
      */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    public function acquireLock(\Smarty\Smarty $smarty, \Smarty\Template\Cached $cached)
     {
         $cached->is_locked = true;
         $id = $cached->lock_id;
-        $name = $cached->source->name . '.lock';
+        $name = $cached->getSource()->name . '.lock';
         $this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, '');
     }
 
     /**
      * Unlock cache for this template
      *
-     * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
+     * @param \Smarty\Smarty                 $smarty Smarty object
+     * @param \Smarty\Template\Cached $cached cached object
      *
      * @return bool|void
      */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    public function releaseLock(\Smarty\Smarty $smarty, \Smarty\Template\Cached $cached)
     {
         $cached->is_locked = false;
-        $name = $cached->source->name . '.lock';
+        $name = $cached->getSource()->name . '.lock';
         $this->delete($name, $cached->cache_id, $cached->compile_id, null);
     }
 }
diff --git a/include/smarty/src/Cacheresource/File.php b/include/smarty/src/Cacheresource/File.php
new file mode 100644
index 000000000..4b4198ec2
--- /dev/null
+++ b/include/smarty/src/Cacheresource/File.php
@@ -0,0 +1,338 @@
+<?php
+
+namespace Smarty\Cacheresource;
+
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Cached;
+
+/**
+ * Smarty Internal Plugin CacheResource File
+ *
+
+
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+/**
+ * This class does contain all necessary methods for the HTML cache on file system
+ * Implements the file system as resource for the HTML cache Version using nocache inserts.
+ */
+class File extends Base
+{
+    /**
+     * populate Cached Object with metadata from Resource
+     *
+     * @param Cached   $cached    cached object
+     * @param Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Cached $cached, Template $_template)
+    {
+        $source = $_template->getSource();
+        $smarty = $_template->getSmarty();
+        $_compile_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+        $_filepath = $source->uid;
+        $cached->filepath = $smarty->getCacheDir();
+        if (isset($_template->cache_id)) {
+            $cached->filepath .= preg_replace(
+                                     array(
+                                         '![^\w|]+!',
+                                         '![|]+!'
+                                     ),
+                                     array(
+                                         '_',
+                                         $_compile_dir_sep
+                                     ),
+                                     $_template->cache_id
+                                 ) . $_compile_dir_sep;
+        }
+        if (isset($_template->compile_id)) {
+            $cached->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . $_compile_dir_sep;
+        }
+        // if use_sub_dirs, break file into directories
+        if ($smarty->use_sub_dirs) {
+            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] .
+                                 $_filepath[ 3 ] .
+                                 DIRECTORY_SEPARATOR .
+                                 $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
+        }
+        $cached->filepath .= $_filepath . '_' . $source->getBasename();
+
+        if ($smarty->cache_locking) {
+            $cached->lock_id = $cached->filepath . '.lock';
+        }
+        $cached->filepath .= '.php';
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Cached $cached cached object
+     *
+     * @return void
+     */
+    public function populateTimestamp(Cached $cached)
+    {
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
+    }
+
+	/**
+	 * Read the cached template and process its header
+	 *
+	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
+	 * @param Cached|null $cached cached object
+	 * @param bool $update flag if called because cache update
+	 *
+	 * @return boolean true or false if the cached content does not exist
+	 */
+    public function process(
+	    Template $_smarty_tpl,
+	    ?Cached  $cached = null,
+	             $update = false
+    ) {
+        $_smarty_tpl->getCached()->setValid(false);
+        if ($update && defined('HHVM_VERSION')) {
+            eval('?>' . file_get_contents($_smarty_tpl->getCached()->filepath));
+            return true;
+        } else {
+            return @include $_smarty_tpl->getCached()->filepath;
+        }
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return bool success
+     * @throws \Smarty\Exception
+     */
+    public function storeCachedContent(Template $_template, $content)
+    {
+        if ($_template->getSmarty()->writeFile($_template->getCached()->filepath, $content) === true) {
+            if (function_exists('opcache_invalidate')
+                && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api'))) < 1
+            ) {
+                opcache_invalidate($_template->getCached()->filepath, true);
+            } elseif (function_exists('apc_compile_file')) {
+                apc_compile_file($_template->getCached()->filepath);
+            }
+            $cached = $_template->getCached();
+            $cached->timestamp = $cached->exists = is_file($cached->filepath);
+            if ($cached->exists) {
+                $cached->timestamp = filemtime($cached->filepath);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Template $_template template object
+     *
+     * @return string  content
+     */
+    public function retrieveCachedContent(Template $_template)
+    {
+        if (is_file($_template->getCached()->filepath)) {
+            return file_get_contents($_template->getCached()->filepath);
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearAll(Smarty $smarty, $exp_time = null)
+    {
+        return $this->clear($smarty, null, null, null, $exp_time);
+    }
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+	    $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+	    $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+	    $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
+	    $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
+	    $_dir = $smarty->getCacheDir();
+	    if ($_dir === '/') { //We should never want to delete this!
+		    return 0;
+	    }
+	    $_dir_length = strlen($_dir);
+	    if (isset($_cache_id)) {
+		    $_cache_id_parts = explode('|', $_cache_id);
+		    $_cache_id_parts_count = count($_cache_id_parts);
+		    if ($smarty->use_sub_dirs) {
+			    foreach ($_cache_id_parts as $id_part) {
+				    $_dir .= $id_part . '/';
+			    }
+		    }
+	    }
+	    if (isset($resource_name)) {
+		    $_save_stat = $smarty->caching;
+		    $smarty->caching = \Smarty\Smarty::CACHING_LIFETIME_CURRENT;
+		    $tpl = $smarty->doCreateTemplate($resource_name);
+		    $smarty->caching = $_save_stat;
+		    // remove from template cache
+		    if ($tpl->getSource()->exists) {
+			    $_resourcename_parts = basename(str_replace('^', '/', $tpl->getCached()->filepath));
+		    } else {
+			    return 0;
+		    }
+	    }
+	    $_count = 0;
+	    $_time = time();
+	    if (file_exists($_dir)) {
+		    $_cacheDirs = new RecursiveDirectoryIterator($_dir);
+		    $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
+		    foreach ($_cache as $_file) {
+			    if (substr(basename($_file->getPathname()), 0, 1) === '.') {
+				    continue;
+			    }
+			    $_filepath = (string)$_file;
+			    // directory ?
+			    if ($_file->isDir()) {
+				    if (!$_cache->isDot()) {
+					    // delete folder if empty
+					    @rmdir($_file->getPathname());
+				    }
+			    } else {
+				    // delete only php files
+				    if (substr($_filepath, -4) !== '.php') {
+					    continue;
+				    }
+				    $_parts = explode($_dir_sep, str_replace('\\', '/', substr($_filepath, $_dir_length)));
+				    $_parts_count = count($_parts);
+				    // check name
+				    if (isset($resource_name)) {
+					    if ($_parts[ $_parts_count - 1 ] !== $_resourcename_parts) {
+						    continue;
+					    }
+				    }
+				    // check compile id
+				    if (isset($_compile_id) && (!isset($_parts[ $_parts_count - 2 - $_compile_id_offset ])
+						    || $_parts[ $_parts_count - 2 - $_compile_id_offset ] !== $_compile_id)
+				    ) {
+					    continue;
+				    }
+				    // check cache id
+				    if (isset($_cache_id)) {
+					    // count of cache id parts
+					    $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset :
+						    $_parts_count - 1 - $_compile_id_offset;
+					    if ($_parts_count < $_cache_id_parts_count) {
+						    continue;
+					    }
+					    for ($i = 0; $i < $_cache_id_parts_count; $i++) {
+						    if ($_parts[ $i ] !== $_cache_id_parts[ $i ]) {
+							    continue 2;
+						    }
+					    }
+				    }
+				    if (is_file($_filepath)) {
+					    // expired ?
+					    if (isset($exp_time)) {
+						    if ($exp_time < 0) {
+							    preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_filepath), $match);
+							    if ($_time < (filemtime($_filepath) + $match[ 1 ])) {
+								    continue;
+							    }
+						    } else {
+							    if ($_time - filemtime($_filepath) < $exp_time) {
+								    continue;
+							    }
+						    }
+					    }
+					    $_count += @unlink($_filepath) ? 1 : 0;
+					    if (function_exists('opcache_invalidate')
+						    && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+					    ) {
+						    opcache_invalidate($_filepath, true);
+					    } elseif (function_exists('apc_delete_file')) {
+						    apc_delete_file($_filepath);
+					    }
+				    }
+			    }
+		    }
+	    }
+	    return $_count;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Cached $cached cached object
+     *
+     * @return boolean true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Cached $cached)
+    {
+        clearstatcache(true, $cached->lock_id ?? '');
+        if (null !== $cached->lock_id && is_file($cached->lock_id)) {
+            $t = filemtime($cached->lock_id);
+            return $t && (time() - $t < $smarty->locking_timeout);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Cached $cached cached object
+     *
+     * @return void
+     */
+    public function acquireLock(Smarty $smarty, Cached $cached)
+    {
+        $cached->is_locked = true;
+        touch($cached->lock_id);
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Cached $cached cached object
+     *
+     * @return void
+     */
+    public function releaseLock(Smarty $smarty, Cached $cached)
+    {
+        $cached->is_locked = false;
+        @unlink($cached->lock_id);
+    }
+}
diff --git a/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/include/smarty/src/Cacheresource/KeyValueStore.php
similarity index 83%
rename from include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
rename to include/smarty/src/Cacheresource/KeyValueStore.php
index 4b1c0f6d8..1953bb20f 100644
--- a/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
+++ b/include/smarty/src/Cacheresource/KeyValueStore.php
@@ -1,9 +1,16 @@
 <?php
+
+namespace Smarty\Cacheresource;
+
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Cached;
+
 /**
  * Smarty Internal Plugin
  *
- * @package    Smarty
- * @subpackage Cacher
+
+
  */
 
 /**
@@ -24,11 +31,11 @@
  * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
  * consider using »a|b|c|$page-$items-$whatever« instead.
  *
- * @package    Smarty
- * @subpackage Cacher
+
+
  * @author     Rodney Rehm
  */
-abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
+abstract class KeyValueStore extends Base
 {
     /**
      * cache for contents
@@ -47,14 +54,14 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
     /**
      * populate Cached Object with meta data from Resource
      *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
+     * @param Cached   $cached    cached object
+     * @param Template $_template template object
      *
      * @return void
      */
-    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
+    public function populate(Cached $cached, Template $_template)
     {
-        $cached->filepath = $_template->source->uid . '#' . $this->sanitize($cached->source->resource) . '#' .
+        $cached->filepath = $_template->getSource()->uid . '#' . $this->sanitize($cached->getSource()->resource) . '#' .
                             $this->sanitize($cached->cache_id) . '#' . $this->sanitize($cached->compile_id);
         $this->populateTimestamp($cached);
     }
@@ -62,20 +69,20 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
     /**
      * populate Cached Object with timestamp and exists from Resource
      *
-     * @param Smarty_Template_Cached $cached cached object
+     * @param Cached $cached cached object
      *
      * @return void
      */
-    public function populateTimestamp(Smarty_Template_Cached $cached)
+    public function populateTimestamp(Cached $cached)
     {
         if (!$this->fetch(
             $cached->filepath,
-            $cached->source->name,
+            $cached->getSource()->name,
             $cached->cache_id,
             $cached->compile_id,
             $content,
             $timestamp,
-            $cached->source->uid
+            $cached->getSource()->uid
         )
         ) {
             return;
@@ -85,34 +92,34 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
         $cached->exists = !!$cached->timestamp;
     }
 
-    /**
-     * Read the cached template and process the header
-     *
-     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
-     * @param Smarty_Template_Cached    $cached      cached object
-     * @param boolean                   $update      flag if called because cache update
-     *
-     * @return boolean                 true or false if the cached content does not exist
-     */
+	/**
+	 * Read the cached template and process the header
+	 *
+	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
+	 * @param Cached|null $cached cached object
+	 * @param boolean $update flag if called because cache update
+	 *
+	 * @return boolean                 true or false if the cached content does not exist
+	 */
     public function process(
-        Smarty_Internal_Template $_smarty_tpl,
-        Smarty_Template_Cached $cached = null,
-        $update = false
+	    Template $_smarty_tpl,
+	    ?Cached  $cached = null,
+	             $update = false
     ) {
         if (!$cached) {
-            $cached = $_smarty_tpl->cached;
+            $cached = $_smarty_tpl->getCached();
         }
-        $content = $cached->content ? $cached->content : null;
-        $timestamp = $cached->timestamp ? $cached->timestamp : null;
+        $content = $cached->content ?: null;
+        $timestamp = $cached->timestamp ?: null;
         if ($content === null || !$timestamp) {
             if (!$this->fetch(
-                $_smarty_tpl->cached->filepath,
-                $_smarty_tpl->source->name,
+                $_smarty_tpl->getCached()->filepath,
+                $_smarty_tpl->getSource()->name,
                 $_smarty_tpl->cache_id,
                 $_smarty_tpl->compile_id,
                 $content,
                 $timestamp,
-                $_smarty_tpl->source->uid
+                $_smarty_tpl->getSource()->uid
             )
             ) {
                 return false;
@@ -128,37 +135,37 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
     /**
      * Write the rendered template output to cache
      *
-     * @param Smarty_Internal_Template $_template template object
+     * @param Template $_template template object
      * @param string                   $content   content to cache
      *
      * @return boolean                  success
      */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    public function storeCachedContent(Template $_template, $content)
     {
         $this->addMetaTimestamp($content);
-        return $this->write(array($_template->cached->filepath => $content), $_template->cache_lifetime);
+        return $this->write(array($_template->getCached()->filepath => $content), $_template->cache_lifetime);
     }
 
     /**
      * Read cached template from cache
      *
-     * @param Smarty_Internal_Template $_template template object
+     * @param Template $_template template object
      *
      * @return string|false  content
      */
-    public function readCachedContent(Smarty_Internal_Template $_template)
+    public function retrieveCachedContent(Template $_template)
     {
-        $content = $_template->cached->content ? $_template->cached->content : null;
+        $content = $_template->getCached()->content ?: null;
         $timestamp = null;
         if ($content === null) {
             if (!$this->fetch(
-                $_template->cached->filepath,
-                $_template->source->name,
+                $_template->getCached()->filepath,
+                $_template->getSource()->name,
                 $_template->cache_id,
                 $_template->compile_id,
                 $content,
                 $timestamp,
-                $_template->source->uid
+                $_template->getSource()->uid
             )
             ) {
                 return false;
@@ -200,7 +207,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      * @param integer $exp_time      expiration time [being ignored]
      *
      * @return int number of cache files deleted [always -1]
-     * @throws \SmartyException
+     * @throws \Smarty\Exception
      * @uses   buildCachedFilepath() to generate the CacheID
      * @uses   invalidate() to mark CacheIDs parent chain as outdated
      * @uses   delete() to remove CacheID from cache
@@ -222,12 +229,12 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      * @param string $resource_name template name
      *
      * @return string filepath of cache file
-     * @throws \SmartyException
+     * @throws \Smarty\Exception
      */
     protected function getTemplateUid(Smarty $smarty, $resource_name)
     {
         if (isset($resource_name)) {
-            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            $source = \Smarty\Template\Source::load(null, $smarty, $resource_name);
             if ($source->exists) {
                 return $source->uid;
             }
@@ -380,11 +387,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
         $compile_id = null,
         $resource_uid = null
     ) {
-        // abort if there is no CacheID
-        if (false && !$cid) {
-            return 0;
-        }
-        // abort if there are no InvalidationKeys to check
+	    // abort if there are no InvalidationKeys to check
         if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
             return 0;
         }
@@ -457,11 +460,11 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      * Check is cache is locked for this template
      *
      * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
+     * @param Cached $cached cached object
      *
      * @return boolean               true or false if cache is locked
      */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    public function hasLock(Smarty $smarty, Cached $cached)
     {
         $key = 'LOCK#' . $cached->filepath;
         $data = $this->read(array($key));
@@ -472,11 +475,11 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      * Lock cache for this template
      *
      * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
+     * @param Cached $cached cached object
      *
      * @return bool|void
      */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    public function acquireLock(Smarty $smarty, Cached $cached)
     {
         $cached->is_locked = true;
         $key = 'LOCK#' . $cached->filepath;
@@ -487,11 +490,11 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      * Unlock cache for this template
      *
      * @param Smarty                 $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
+     * @param Cached $cached cached object
      *
-     * @return bool|void
+     * @return void
      */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    public function releaseLock(Smarty $smarty, Cached $cached)
     {
         $cached->is_locked = false;
         $key = 'LOCK#' . $cached->filepath;
diff --git a/include/smarty/src/Compile/Base.php b/include/smarty/src/Compile/Base.php
new file mode 100644
index 000000000..2d5c0c0ef
--- /dev/null
+++ b/include/smarty/src/Compile/Base.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * Smarty Internal Compile Plugin Base
+ * @author     Uwe Tews
+ */
+namespace Smarty\Compile;
+
+use Smarty\Compiler\Template;
+use Smarty\Data;
+use Smarty\Exception;
+
+/**
+ * This class does extend all internal compile plugins
+ *
+
+
+ */
+abstract class Base implements CompilerInterface {
+
+	/**
+	 * Array of names of required attribute required by tag
+	 *
+	 * @var array
+	 */
+	protected $required_attributes = [];
+
+	/**
+	 * Array of names of optional attribute required by tag
+	 * use array('_any') if there is no restriction of attributes names
+	 *
+	 * @var array
+	 */
+	protected $optional_attributes = [];
+
+	/**
+	 * Shorttag attribute order defined by its names
+	 *
+	 * @var array
+	 */
+	protected $shorttag_order = [];
+
+	/**
+	 * Array of names of valid option flags
+	 *
+	 * @var array
+	 */
+	protected $option_flags = ['nocache'];
+	/**
+	 * @var bool
+	 */
+	protected $cacheable = true;
+
+	public function isCacheable(): bool {
+		return $this->cacheable;
+	}
+
+	/**
+	 * Converts attributes into parameter array strings
+	 *
+	 * @param array $_attr
+	 *
+	 * @return array
+	 */
+	protected function formatParamsArray(array $_attr): array {
+		$_paramsArray = [];
+		foreach ($_attr as $_key => $_value) {
+			$_paramsArray[] = var_export($_key, true) . "=>" . $_value;
+		}
+		return $_paramsArray;
+	}
+
+	/**
+	 * This function checks if the attributes passed are valid
+	 * The attributes passed for the tag to compile are checked against the list of required and
+	 * optional attributes. Required attributes must be present. Optional attributes are check against
+	 * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
+	 * as valid
+	 *
+	 * @param object $compiler compiler object
+	 * @param array $attributes attributes applied to the tag
+	 *
+	 * @return array  of mapped attributes for further processing
+	 */
+	protected function getAttributes($compiler, $attributes) {
+		$_indexed_attr = [];
+		$options = array_fill_keys($this->option_flags, true);
+		foreach ($attributes as $key => $mixed) {
+			// shorthand ?
+			if (!is_array($mixed)) {
+				// options flag ?
+				if (isset($options[trim($mixed, '\'"')])) {
+					$_indexed_attr[trim($mixed, '\'"')] = true;
+					// shorthand attribute ?
+				} elseif (isset($this->shorttag_order[$key])) {
+					$_indexed_attr[$this->shorttag_order[$key]] = $mixed;
+				} else {
+					// too many shorthands
+					$compiler->trigger_template_error('too many shorthand attributes', null, true);
+				}
+				// named attribute
+			} else {
+				foreach ($mixed as $k => $v) {
+					// options flag?
+					if (isset($options[$k])) {
+						if (is_bool($v)) {
+							$_indexed_attr[$k] = $v;
+						} else {
+							if (is_string($v)) {
+								$v = trim($v, '\'" ');
+							}
+
+							// Mapping array for boolean option value
+							static $optionMap = [1 => true, 0 => false, 'true' => true, 'false' => false];
+
+							if (isset($optionMap[$v])) {
+								$_indexed_attr[$k] = $optionMap[$v];
+							} else {
+								$compiler->trigger_template_error(
+									"illegal value '" . var_export($v, true) .
+									"' for options flag '{$k}'",
+									null,
+									true
+								);
+							}
+						}
+						// must be named attribute
+					} else {
+						$_indexed_attr[$k] = $v;
+					}
+				}
+			}
+		}
+		// check if all required attributes present
+		foreach ($this->required_attributes as $attr) {
+			if (!isset($_indexed_attr[$attr])) {
+				$compiler->trigger_template_error("missing '{$attr}' attribute", null, true);
+			}
+		}
+		// check for not allowed attributes
+		if ($this->optional_attributes !== ['_any']) {
+			$allowedAttributes = array_fill_keys(
+				array_merge(
+					$this->required_attributes,
+					$this->optional_attributes,
+					$this->option_flags
+				),
+				true
+			);
+			foreach ($_indexed_attr as $key => $dummy) {
+				if (!isset($allowedAttributes[$key]) && $key !== 0) {
+					$compiler->trigger_template_error("unexpected '{$key}' attribute", null, true);
+				}
+			}
+		}
+		// default 'false' for all options flags not set
+		foreach ($this->option_flags as $flag) {
+			if (!isset($_indexed_attr[$flag])) {
+				$_indexed_attr[$flag] = false;
+			}
+		}
+
+		return $_indexed_attr;
+	}
+
+	/**
+	 * Push opening tag name on stack
+	 * Optionally additional data can be saved on stack
+	 *
+	 * @param Template $compiler compiler object
+	 * @param string $openTag the opening tag's name
+	 * @param mixed $data optional data saved
+	 */
+	protected function openTag(Template $compiler, $openTag, $data = null) {
+		$compiler->openTag($openTag, $data);
+	}
+
+	/**
+	 * Pop closing tag
+	 * Raise an error if this stack-top doesn't match with expected opening tags
+	 *
+	 * @param Template $compiler compiler object
+	 * @param array|string $expectedTag the expected opening tag names
+	 *
+	 * @return mixed        any type the opening tag's name or saved data
+	 */
+	protected function closeTag(Template $compiler, $expectedTag) {
+		return $compiler->closeTag($expectedTag);
+	}
+
+	/**
+	 * @param mixed $scope
+	 * @param array $invalidScopes
+	 *
+	 * @return int
+	 * @throws Exception
+	 */
+	protected function convertScope($scope): int {
+
+		static $scopes = [
+			'local'    => Data::SCOPE_LOCAL,    // current scope
+			'parent' => Data::SCOPE_PARENT,     // parent scope (definition unclear)
+			'tpl_root' => Data::SCOPE_TPL_ROOT, // highest template (keep going up until parent is not a template)
+			'root'     => Data::SCOPE_ROOT,     // highest scope (definition unclear)
+			'global' => Data::SCOPE_GLOBAL,     // smarty object
+
+			'smarty' => Data::SCOPE_SMARTY,     // @deprecated alias of 'global'
+		];
+
+		$_scopeName = trim($scope, '\'"');
+		if (is_numeric($_scopeName) && in_array($_scopeName, $scopes)) {
+			return (int) $_scopeName;
+		}
+
+		if (isset($scopes[$_scopeName])) {
+			return $scopes[$_scopeName];
+		}
+
+		$err = var_export($_scopeName, true);
+		throw new Exception("illegal value '{$err}' for \"scope\" attribute");
+	}
+
+	/**
+	 * Compiles code for the tag
+	 *
+	 * @param array                                 $args      array with attributes from parser
+	 * @param Template $compiler  compiler object
+	 * @param array                                 $parameter array with compilation parameter
+	 *
+	 * @return string compiled code as a string
+	 * @throws \Smarty\CompilerException
+	 */
+	abstract public function compile($args, Template $compiler, $parameter = array(), $tag = null, $function = null): string;
+}
diff --git a/include/smarty/src/Compile/BlockCompiler.php b/include/smarty/src/Compile/BlockCompiler.php
new file mode 100644
index 000000000..e7a8f310e
--- /dev/null
+++ b/include/smarty/src/Compile/BlockCompiler.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Block Plugin
+ * Compiles code for the execution of block plugin
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+use Smarty\Compiler\Template;
+use Smarty\CompilerException;
+use Smarty\Exception;
+use Smarty\Smarty;
+
+/**
+ * Smarty Internal Plugin Compile Block Plugin Class
+ *
+ */
+class BlockCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['_any'];
+
+	/**
+	 * nesting level
+	 *
+	 * @var int
+	 */
+	private $nesting = 0;
+
+
+	/**
+	 * Compiles code for the execution of block plugin
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 * @param string $tag name of block plugin
+	 * @param string $function PHP function name
+	 *
+	 * @return string compiled code
+	 * @throws CompilerException
+	 * @throws Exception
+	 */
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		if (!isset($tag[5]) || substr($tag, -5) !== 'close') {
+			$output = $this->compileOpeningTag($compiler, $args, $tag, $function);
+		} else {
+			$output = $this->compileClosingTag($compiler, $tag, $parameter, $function);
+		}
+		return $output;
+	}
+
+	/**
+	 * Compiles code for the {$smarty.block.child} property
+	 *
+	 * @param Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws CompilerException
+	 */
+	public function compileChild(\Smarty\Compiler\Template $compiler) {
+
+		if (!isset($compiler->_cache['blockNesting'])) {
+			$compiler->trigger_template_error(
+				"'{\$smarty.block.child}' used outside {block} tags ",
+				$compiler->getParser()->lex->taglineno
+			);
+		}
+		$compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]['callsChild'] = true;
+		$compiler->suppressNocacheProcessing = true;
+
+		$output = "<?php \n";
+		$output .= '$_smarty_tpl->getInheritance()->callChild($_smarty_tpl, $this' . ");\n";
+		$output .= "?>\n";
+		return $output;
+	}
+
+	/**
+	 * Compiles code for the {$smarty.block.parent} property
+	 *
+	 * @param Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws CompilerException
+	 */
+	public function compileParent(\Smarty\Compiler\Template $compiler) {
+
+		if (!isset($compiler->_cache['blockNesting'])) {
+			$compiler->trigger_template_error(
+				"'{\$smarty.block.parent}' used outside {block} tags ",
+				$compiler->getParser()->lex->taglineno
+			);
+		}
+		$compiler->suppressNocacheProcessing = true;
+
+		$output = "<?php \n";
+		$output .= '$_smarty_tpl->getInheritance()->callParent($_smarty_tpl, $this' . ");\n";
+		$output .= "?>\n";
+		return $output;
+	}
+
+	/**
+	 * Returns true if this block is cacheable.
+	 *
+	 * @param Smarty $smarty
+	 * @param $function
+	 *
+	 * @return bool
+	 */
+	protected function blockIsCacheable(\Smarty\Smarty $smarty, $function): bool {
+		return $smarty->getBlockHandler($function)->isCacheable();
+	}
+
+	/**
+	 * Returns the code used for the isset check
+	 *
+	 * @param string $tag tag name
+	 * @param string $function base tag or method name
+	 *
+	 * @return string
+	 */
+	protected function getIsCallableCode($tag, $function): string {
+		return "\$_smarty_tpl->getSmarty()->getBlockHandler(" . var_export($function, true) . ")";
+	}
+
+	/**
+	 * Returns the full code used to call the callback
+	 *
+	 * @param string $tag tag name
+	 * @param string $function base tag or method name
+	 *
+	 * @return string
+	 */
+	protected function getFullCallbackCode($tag, $function): string {
+		return "\$_smarty_tpl->getSmarty()->getBlockHandler(" . var_export($function, true) . ")->handle";
+	}
+
+	/**
+	 * @param Template $compiler
+	 * @param array $args
+	 * @param string|null $tag
+	 * @param string|null $function
+	 *
+	 * @return string
+	 */
+	private function compileOpeningTag(Template $compiler, array $args, ?string $tag, ?string $function): string {
+
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$this->nesting++;
+		unset($_attr['nocache']);
+		$_params = 'array(' . implode(',', $this->formatParamsArray($_attr)) . ')';
+
+		if (!$this->blockIsCacheable($compiler->getSmarty(), $function)) {
+			$compiler->tag_nocache = true;
+		}
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this block
+			$this->openTag($compiler, 'nocache');
+		}
+
+		$this->openTag($compiler, $tag, [$_params, $compiler->tag_nocache]);
+
+		// compile code
+		$output = "<?php \$_block_repeat=true;
+if (!" . $this->getIsCallableCode($tag, $function) .") {\nthrow new \\Smarty\\Exception('block tag \'{$tag}\' not callable or registered');\n}\n
+echo " . $this->getFullCallbackCode($tag, $function) . "({$_params}, null, \$_smarty_tpl, \$_block_repeat);
+while (\$_block_repeat) {
+  ob_start();
+?>";
+
+		return $output;
+	}
+
+	/**
+	 * @param Template $compiler
+	 * @param string $tag
+	 * @param array $parameter
+	 * @param string|null $function
+	 *
+	 * @return string
+	 * @throws CompilerException
+	 * @throws Exception
+	 */
+	private function compileClosingTag(Template $compiler, string $tag, array $parameter, ?string $function): string {
+
+		// closing tag of block plugin, restore nocache
+		$base_tag = substr($tag, 0, -5);
+		[$_params, $nocache_pushed] = $this->closeTag($compiler, $base_tag);
+
+		// compile code
+		if (!isset($parameter['modifier_list'])) {
+			$mod_pre = $mod_post = $mod_content = '';
+			$mod_content2 = 'ob_get_clean()';
+		} else {
+			$mod_content2 = "\$_block_content{$this->nesting}";
+			$mod_content = "\$_block_content{$this->nesting} = ob_get_clean();\n";
+			$mod_pre = "ob_start();\n";
+			$mod_post = 'echo ' . $compiler->compileModifier($parameter['modifier_list'], 'ob_get_clean()')
+				. ";\n";
+		}
+		$output = "<?php {$mod_content}\$_block_repeat=false;\n{$mod_pre}";
+		$callback = $this->getFullCallbackCode($base_tag, $function);
+		$output .= "echo {$callback}({$_params}, {$mod_content2}, \$_smarty_tpl, \$_block_repeat);\n";
+		$output .= "{$mod_post}}\n?>";
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		return $output;
+	}
+
+}
diff --git a/include/smarty/src/Compile/CompilerInterface.php b/include/smarty/src/Compile/CompilerInterface.php
new file mode 100644
index 000000000..5f2cc7ccc
--- /dev/null
+++ b/include/smarty/src/Compile/CompilerInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Smarty\Compile;
+
+/**
+ * This class does extend all internal compile plugins
+ *
+
+
+ */
+interface CompilerInterface {
+
+	/**
+	 * Compiles code for the tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code as a string
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string;
+
+	public function isCacheable(): bool;
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/DefaultHandlerBlockCompiler.php b/include/smarty/src/Compile/DefaultHandlerBlockCompiler.php
new file mode 100644
index 000000000..394a6e76d
--- /dev/null
+++ b/include/smarty/src/Compile/DefaultHandlerBlockCompiler.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Smarty\Compile;
+
+class DefaultHandlerBlockCompiler extends BlockCompiler {
+	/**
+	 * @inheritDoc
+	 */
+	protected function getIsCallableCode($tag, $function): string {
+		return "\$_smarty_tpl->getSmarty()->getRuntime('DefaultPluginHandler')->hasPlugin(" .
+			var_export($function, true) . ", 'block')";
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getFullCallbackCode($tag, $function): string {
+		return "\$_smarty_tpl->getSmarty()->getRuntime('DefaultPluginHandler')->getCallback(" .
+			var_export($function, true) . ", 'block')";
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function blockIsCacheable(\Smarty\Smarty $smarty, $function): bool {
+		return true;
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/DefaultHandlerFunctionCallCompiler.php b/include/smarty/src/Compile/DefaultHandlerFunctionCallCompiler.php
new file mode 100644
index 000000000..e6d11384e
--- /dev/null
+++ b/include/smarty/src/Compile/DefaultHandlerFunctionCallCompiler.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Smarty\Compile;
+
+use Smarty\Compiler\Template;
+
+class DefaultHandlerFunctionCallCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles code for the execution of a registered function
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 * @param string $tag name of tag
+	 * @param string $function name of function
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		unset($_attr['nocache']);
+
+		$_paramsArray = $this->formatParamsArray($_attr);
+		$_params = 'array(' . implode(',', $_paramsArray) . ')';
+
+		$output = "\$_smarty_tpl->getSmarty()->getRuntime('DefaultPluginHandler')->getCallback(" . var_export($function, true) .
+			",'function')($_params, \$_smarty_tpl)";
+
+		if (!empty($parameter['modifierlist'])) {
+			$output = $compiler->compileModifier($parameter['modifierlist'], $output);
+		}
+		return "<?php echo {$output};?>\n";
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/FunctionCallCompiler.php b/include/smarty/src/Compile/FunctionCallCompiler.php
new file mode 100644
index 000000000..107dd98bb
--- /dev/null
+++ b/include/smarty/src/Compile/FunctionCallCompiler.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Registered Function
+ * Compiles code for the execution of a registered function
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+use Smarty\Compiler\Template;
+use Smarty\CompilerException;
+
+/**
+ * Smarty Internal Plugin Compile Registered Function Class
+ *
+
+
+ */
+class FunctionCallCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $optional_attributes = ['_any'];
+
+	/**
+	 * Shorttag attribute order defined by its names
+	 *
+	 * @var array
+	 */
+	protected $shorttag_order = [];
+
+	/**
+	 * Compiles code for the execution of a registered function
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 * @param string $tag name of tag
+	 * @param string $function name of function
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		unset($_attr['nocache']);
+
+		$_paramsArray = $this->formatParamsArray($_attr);
+		$_params = 'array(' . implode(',', $_paramsArray) . ')';
+
+
+		if ($functionHandler = $compiler->getSmarty()->getFunctionHandler($function)) {
+
+			// not cacheable?
+			$compiler->tag_nocache = $compiler->tag_nocache || !$functionHandler->isCacheable();
+			$output = "\$_smarty_tpl->getSmarty()->getFunctionHandler(" . var_export($function, true) . ")";
+			$output .= "->handle($_params, \$_smarty_tpl)";
+		} else {
+			$compiler->trigger_template_error("unknown function '{$function}'", null, true);
+		}
+
+		if (!empty($parameter['modifierlist'])) {
+			$output = $compiler->compileModifier($parameter['modifierlist'], $output);
+		}
+
+		return $output;
+	}
+}
diff --git a/include/smarty/src/Compile/Modifier/BCPluginWrapper.php b/include/smarty/src/Compile/Modifier/BCPluginWrapper.php
new file mode 100644
index 000000000..0147651fd
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/BCPluginWrapper.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+class BCPluginWrapper extends Base {
+
+	private $callback;
+
+	public function __construct($callback) {
+		$this->callback = $callback;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return call_user_func($this->callback, $params, $compiler);
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/Base.php b/include/smarty/src/Compile/Modifier/Base.php
new file mode 100644
index 000000000..2ae572287
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/Base.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+use Smarty\Exception;
+
+abstract class Base implements ModifierCompilerInterface {
+
+	/**
+	 * Compiles code for the modifier
+	 *
+	 * @param array                                 $params      array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler  compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	abstract public function compile($params, \Smarty\Compiler\Template $compiler);
+
+	/**
+	 * evaluate compiler parameter
+	 *
+	 * @param array   $params  parameter array as given to the compiler function
+	 * @param integer $index   array index of the parameter to convert
+	 * @param mixed   $default value to be returned if the parameter is not present
+	 *
+	 * @return mixed evaluated value of parameter or $default
+	 * @throws Exception if parameter is not a literal (but an expression, variable, …)
+	 * @author Rodney Rehm
+	 */
+	protected function literal_compiler_param($params, $index, $default = null)
+	{
+		// not set, go default
+		if (!isset($params[ $index ])) {
+			return $default;
+		}
+		// test if param is a literal
+		if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[ $index ])) {
+			throw new Exception(
+				'$param[' . $index .
+				'] is not a literal and is thus not evaluatable at compile time'
+			);
+		}
+		$t = null;
+		eval("\$t = " . $params[ $index ] . ";");
+		return $t;
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/CatModifierCompiler.php b/include/smarty/src/Compile/Modifier/CatModifierCompiler.php
new file mode 100644
index 000000000..21005d5be
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/CatModifierCompiler.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+/**
+ * Smarty cat modifier plugin
+ * Type:     modifier
+ * Name:     cat
+ * Date:     Feb 24, 2003
+ * Purpose:  catenate a value to a variable
+ * Input:    string to catenate
+ * Example:  {$var|cat:"foo"}
+ *
+ * @author Uwe Tews
+ */
+
+class CatModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return '(' . implode(').(', $params) . ')';
+	}
+
+}
+
+
diff --git a/include/smarty/src/Compile/Modifier/CountCharactersModifierCompiler.php b/include/smarty/src/Compile/Modifier/CountCharactersModifierCompiler.php
new file mode 100644
index 000000000..fb5f5ca33
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/CountCharactersModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_characters modifier plugin
+ * Type:     modifier
+ * Name:     count_characters
+ * Purpose:  count the number of characters in a text
+ *
+ * @author Uwe Tews
+ */
+
+class CountCharactersModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
+			return 'preg_match_all(\'/[^\s]/' . \Smarty\Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
+		}
+		return 'mb_strlen((string) ' . $params[ 0 ] . ', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/CountParagraphsModifierCompiler.php b/include/smarty/src/Compile/Modifier/CountParagraphsModifierCompiler.php
new file mode 100644
index 000000000..76552e073
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/CountParagraphsModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_paragraphs modifier plugin
+ * Type:     modifier
+ * Name:     count_paragraphs
+ * Purpose:  count the number of paragraphs in a text
+ *
+ * @author Uwe Tews
+ */
+
+class CountParagraphsModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		// count \r or \n characters
+		return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/CountSentencesModifierCompiler.php b/include/smarty/src/Compile/Modifier/CountSentencesModifierCompiler.php
new file mode 100644
index 000000000..bc7c43e1c
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/CountSentencesModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_sentences modifier plugin
+ * Type:     modifier
+ * Name:     count_sentences
+ * Purpose:  count the number of sentences in a text
+ *
+ * @author Uwe Tews
+ */
+
+class CountSentencesModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		// find periods, question marks, exclamation marks with a word before but not after.
+		return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . \Smarty\Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/CountWordsModifierCompiler.php b/include/smarty/src/Compile/Modifier/CountWordsModifierCompiler.php
new file mode 100644
index 000000000..c11d546d4
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/CountWordsModifierCompiler.php
@@ -0,0 +1,20 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_words modifier plugin
+ * Type:     modifier
+ * Name:     count_words
+ * Purpose:  count the number of words in a text
+ *
+ * @author Uwe Tews
+ */
+
+class CountWordsModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		// expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
+		return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . \Smarty\Smarty::$_UTF8_MODIFIER . '\', ' .
+			$params[ 0 ] . ', $tmp)';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/DefaultModifierCompiler.php b/include/smarty/src/Compile/Modifier/DefaultModifierCompiler.php
new file mode 100644
index 000000000..3d82aa70c
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/DefaultModifierCompiler.php
@@ -0,0 +1,26 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty default modifier plugin
+ * Type:     modifier
+ * Name:     default
+ * Purpose:  designate default value for empty variables
+ *
+ * @author Uwe Tews
+ */
+
+class DefaultModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		$output = $params[ 0 ];
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = "''";
+		}
+		array_shift($params);
+		foreach ($params as $param) {
+			$output = '(($tmp = ' . $output . ' ?? null)===null||$tmp===\'\' ? ' . $param . ' ?? null : $tmp)';
+		}
+		return $output;
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/EmptyModifierCompiler.php b/include/smarty/src/Compile/Modifier/EmptyModifierCompiler.php
new file mode 100644
index 000000000..6bb6c11c4
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/EmptyModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+use Smarty\CompilerException;
+
+/**
+ * Smarty empty modifier plugin
+ */
+class EmptyModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+
+		if (count($params) !== 1) {
+			throw new CompilerException("Invalid number of arguments for empty. empty expects exactly 1 parameter.");
+		}
+
+		return 'empty(' . $params[0] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/EscapeModifierCompiler.php b/include/smarty/src/Compile/Modifier/EscapeModifierCompiler.php
new file mode 100644
index 000000000..4352359f0
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/EscapeModifierCompiler.php
@@ -0,0 +1,66 @@
+<?php
+namespace Smarty\Compile\Modifier;
+
+use Smarty\Exception;
+
+/**
+ * Smarty escape modifier plugin
+ * Type:     modifier
+ * Name:     escape
+ * Purpose:  escape string for output
+ *
+ * @author Rodney Rehm
+ */
+
+class EscapeModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		try {
+			$esc_type = $this->literal_compiler_param($params, 1, 'html');
+			$char_set = $this->literal_compiler_param($params, 2, \Smarty\Smarty::$_CHARSET);
+			$double_encode = $this->literal_compiler_param($params, 3, true);
+			if (!$char_set) {
+				$char_set = \Smarty\Smarty::$_CHARSET;
+			}
+			switch ($esc_type) {
+				case 'html':
+				case 'force':
+					// in case of auto-escaping, and without the 'force' option, no double-escaping
+					if ($compiler->getSmarty()->escape_html && $esc_type != 'force')
+						return $params[0];
+					// otherwise, escape the variable
+					return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+						var_export($double_encode, true) . ')';
+				// no break
+				case 'htmlall':
+					$compiler->setRawOutput(true);
+					return 'htmlentities(mb_convert_encoding((string)' . $params[ 0 ] . ', \'UTF-8\', ' .
+						var_export($char_set, true) . '), ENT_QUOTES, \'UTF-8\', ' .
+						var_export($double_encode, true) . ')';
+				// no break
+				case 'url':
+					$compiler->setRawOutput(true);
+					return 'rawurlencode((string)' . $params[ 0 ] . ')';
+				case 'urlpathinfo':
+					$compiler->setRawOutput(true);
+					return 'str_replace("%2F", "/", rawurlencode((string)' . $params[ 0 ] . '))';
+				case 'quotes':
+					$compiler->setRawOutput(true);
+					// escape unescaped single quotes
+					return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'", (string)' . $params[ 0 ] . ')';
+				case 'javascript':
+					$compiler->setRawOutput(true);
+					// escape quotes and backslashes, newlines, etc.
+					// see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+					return 'strtr((string)' .
+						$params[ 0 ] .
+						', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", 
+						"\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S",
+						"`" => "\\\\`", "\${" => "\\\\\\$\\{"))';
+			}
+		} catch (Exception $e) {
+			// pass through to regular plugin fallback
+		}
+		return '$_smarty_tpl->getSmarty()->getModifierCallback(\'escape\')(' . join(', ', $params) . ')';
+	}
+}
diff --git a/include/smarty/src/Compile/Modifier/FromCharsetModifierCompiler.php b/include/smarty/src/Compile/Modifier/FromCharsetModifierCompiler.php
new file mode 100644
index 000000000..606fedf94
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/FromCharsetModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty from_charset modifier plugin
+ * Type:     modifier
+ * Name:     from_charset
+ * Purpose:  convert character encoding from $charset to internal encoding
+ *
+ * @author Rodney Rehm
+ */
+
+class FromCharsetModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = '"ISO-8859-1"';
+		}
+		return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(\Smarty\Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/IndentModifierCompiler.php b/include/smarty/src/Compile/Modifier/IndentModifierCompiler.php
new file mode 100644
index 000000000..353e757f0
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/IndentModifierCompiler.php
@@ -0,0 +1,24 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty indent modifier plugin
+ * Type:     modifier
+ * Name:     indent
+ * Purpose:  indent lines of text
+ *
+ * @author Uwe Tews
+ */
+
+class IndentModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = 4;
+		}
+		if (!isset($params[ 2 ])) {
+			$params[ 2 ] = "' '";
+		}
+		return 'preg_replace(\'!^!m\',str_repeat(' . $params[ 2 ] . ',' . $params[ 1 ] . '),' . $params[ 0 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/IsArrayModifierCompiler.php b/include/smarty/src/Compile/Modifier/IsArrayModifierCompiler.php
new file mode 100644
index 000000000..0e66bb521
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/IsArrayModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+use Smarty\CompilerException;
+
+/**
+ * Smarty is_array modifier plugin
+ */
+class IsArrayModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+
+		if (count($params) !== 1) {
+			throw new CompilerException("Invalid number of arguments for is_array. is_array expects exactly 1 parameter.");
+		}
+
+		return 'is_array(' . $params[0] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/IssetModifierCompiler.php b/include/smarty/src/Compile/Modifier/IssetModifierCompiler.php
new file mode 100644
index 000000000..0962fbfa3
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/IssetModifierCompiler.php
@@ -0,0 +1,25 @@
+<?php
+namespace Smarty\Compile\Modifier;
+use Smarty\CompilerException;
+
+/**
+ * Smarty isset modifier plugin
+ */
+class IssetModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+
+		$params = array_filter($params, function($v) { return !empty($v); });
+
+		if (count($params) < 1) {
+			throw new CompilerException("Invalid number of arguments for isset. isset expects at least one parameter.");
+		}
+
+		$tests = [];
+		foreach ($params as $param) {
+			$tests[] = 'null !== (' . $param . ' ?? null)';
+		}
+		return '(' . implode(' && ', $tests) . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/JsonEncodeModifierCompiler.php b/include/smarty/src/Compile/Modifier/JsonEncodeModifierCompiler.php
new file mode 100644
index 000000000..4f191a31f
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/JsonEncodeModifierCompiler.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+/**
+ * Smarty json_encode modifier plugin
+ */
+class JsonEncodeModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'json_encode(' . $params[0] . (isset($params[1]) ? ', (int) ' . $params[1] : '') . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/LowerModifierCompiler.php b/include/smarty/src/Compile/Modifier/LowerModifierCompiler.php
new file mode 100644
index 000000000..62fc87e90
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/LowerModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty lower modifier plugin
+ * Type:     modifier
+ * Name:     lower
+ * Purpose:  convert string to lowercase
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ */
+
+class LowerModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'mb_strtolower((string) ' . $params[ 0 ] . ', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/ModifierCompilerInterface.php b/include/smarty/src/Compile/Modifier/ModifierCompilerInterface.php
new file mode 100644
index 000000000..0a39b819a
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/ModifierCompilerInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+interface ModifierCompilerInterface {
+
+	/**
+	 * Compiles code for the modifier
+	 *
+	 * @param array $params array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($params, \Smarty\Compiler\Template $compiler);
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/Nl2brModifierCompiler.php b/include/smarty/src/Compile/Modifier/Nl2brModifierCompiler.php
new file mode 100644
index 000000000..c3b1aa533
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/Nl2brModifierCompiler.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty nl2br modifier plugin
+ * Type:     modifier
+ * Name:     nl2br
+ * Purpose:  insert HTML line breaks before all newlines in a string
+ *
+ */
+
+class Nl2brModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'nl2br((string) ' . $params[0] . ', (bool) ' . ($params[1] ?? true) . ')';
+	}
+}
diff --git a/include/smarty/src/Compile/Modifier/NoPrintModifierCompiler.php b/include/smarty/src/Compile/Modifier/NoPrintModifierCompiler.php
new file mode 100644
index 000000000..c9401cfe0
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/NoPrintModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty noprint modifier plugin
+ * Type:     modifier
+ * Name:     noprint
+ * Purpose:  return an empty string
+ *
+ * @author Uwe Tews
+ */
+
+class NoPrintModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return "''";
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/RawModifierCompiler.php b/include/smarty/src/Compile/Modifier/RawModifierCompiler.php
new file mode 100644
index 000000000..c001bb1d4
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/RawModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+
+use Smarty\Exception;
+
+/**
+ * Smarty raw modifier plugin
+ * Type:     modifier
+ * Name:     raw
+ * Purpose:  when escaping is enabled by default, generates a raw output of a variable
+ *
+ * @author Amaury Bouchard
+ */
+
+class RawModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		$compiler->setRawOutput(true);
+		return ($params[0]);
+	}
+}
diff --git a/include/smarty/src/Compile/Modifier/RoundModifierCompiler.php b/include/smarty/src/Compile/Modifier/RoundModifierCompiler.php
new file mode 100644
index 000000000..82476833e
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/RoundModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty round modifier plugin
+ * Type:     modifier
+ * Name:     round
+ * Purpose:  Returns the rounded value of num to specified precision (number of digits after the decimal point)
+ *
+ */
+
+class RoundModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'round((float) ' . $params[0] . ', (int) ' . ($params[1] ?? 0) . ', (int) ' . ($params[2] ?? PHP_ROUND_HALF_UP) . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/StrRepeatModifierCompiler.php b/include/smarty/src/Compile/Modifier/StrRepeatModifierCompiler.php
new file mode 100644
index 000000000..c33af3299
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/StrRepeatModifierCompiler.php
@@ -0,0 +1,17 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty str_repeat modifier plugin
+ * Type:     modifier
+ * Name:     str_repeat
+ * Purpose:  returns string repeated times times
+ *
+ */
+
+class StrRepeatModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'str_repeat((string) ' . $params[0] . ', (int) ' . $params[1] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/StringFormatModifierCompiler.php b/include/smarty/src/Compile/Modifier/StringFormatModifierCompiler.php
new file mode 100644
index 000000000..e662f0164
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/StringFormatModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty string_format modifier plugin
+ * Type:     modifier
+ * Name:     string_format
+ * Purpose:  format strings via sprintf
+ *
+ * @author Uwe Tews
+ */
+
+class StringFormatModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'sprintf(' . $params[ 1 ] . ',' . $params[ 0 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/StripModifierCompiler.php b/include/smarty/src/Compile/Modifier/StripModifierCompiler.php
new file mode 100644
index 000000000..d85f83df3
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/StripModifierCompiler.php
@@ -0,0 +1,24 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty strip modifier plugin
+ * Type:     modifier
+ * Name:     strip
+ * Purpose:  Replace all repeated spaces, newlines, tabs
+ *              with a single space or supplied replacement string.
+ * Example:  {$var|strip} {$var|strip:"&nbsp;"}
+ * Date:     September 25th, 2002
+ *
+ * @author Uwe Tews
+ */
+
+class StripModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = "' '";
+		}
+		return "preg_replace('!\s+!" . \Smarty\Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/StripTagsModifierCompiler.php b/include/smarty/src/Compile/Modifier/StripTagsModifierCompiler.php
new file mode 100644
index 000000000..dfd09437a
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/StripTagsModifierCompiler.php
@@ -0,0 +1,22 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty strip_tags modifier plugin
+ * Type:     modifier
+ * Name:     strip_tags
+ * Purpose:  strip html tags from text
+ *
+ * @author Uwe Tews
+ */
+
+class StripTagsModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
+			return "preg_replace('!<[^>]*?>!', ' ', (string) {$params[0]})";
+		} else {
+			return 'strip_tags((string) ' . $params[ 0 ] . ')';
+		}
+	}
+
+}
diff --git a/include/smarty/src/Compile/Modifier/StrlenModifierCompiler.php b/include/smarty/src/Compile/Modifier/StrlenModifierCompiler.php
new file mode 100644
index 000000000..5cc666fd5
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/StrlenModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty strlen modifier plugin
+ * Type:     modifier
+ * Name:     strlen
+ * Purpose:  return the length of the given string
+ *
+ */
+
+class StrlenModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'strlen((string) ' . $params[0] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/SubstrModifierCompiler.php b/include/smarty/src/Compile/Modifier/SubstrModifierCompiler.php
new file mode 100644
index 000000000..8fb33ed77
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/SubstrModifierCompiler.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+/**
+ * Smarty substr modifier plugin
+ */
+class SubstrModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'substr((string) ' . $params[0] . ', (int) ' . $params[1] .
+			(isset($params[2]) ? ', (int) ' . $params[2] : '') . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/ToCharsetModifierCompiler.php b/include/smarty/src/Compile/Modifier/ToCharsetModifierCompiler.php
new file mode 100644
index 000000000..67a5709d9
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/ToCharsetModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty to_charset modifier plugin
+ * Type:     modifier
+ * Name:     to_charset
+ * Purpose:  convert character encoding from internal encoding to $charset
+ *
+ * @author Rodney Rehm
+ */
+
+class ToCharsetModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = '"ISO-8859-1"';
+		}
+		return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 1 ] . ', "' . addslashes(\Smarty\Smarty::$_CHARSET) . '")';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/UnescapeModifierCompiler.php b/include/smarty/src/Compile/Modifier/UnescapeModifierCompiler.php
new file mode 100644
index 000000000..1844ceb95
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/UnescapeModifierCompiler.php
@@ -0,0 +1,34 @@
+<?php
+namespace Smarty\Compile\Modifier;
+
+/**
+ * Smarty unescape modifier plugin
+ * Type:     modifier
+ * Name:     unescape
+ * Purpose:  unescape html entities
+ *
+ * @author Rodney Rehm
+ */
+
+class UnescapeModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		$esc_type = $this->literal_compiler_param($params, 1, 'html');
+
+		if (!isset($params[ 2 ])) {
+			$params[ 2 ] = '\'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\'';
+		}
+
+		switch ($esc_type) {
+			case 'entity':
+			case 'htmlall':
+				return 'html_entity_decode(mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'UTF-8\'), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
+			case 'html':
+				return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
+			case 'url':
+				return 'rawurldecode(' . $params[ 0 ] . ')';
+			default:
+				return $params[ 0 ];
+		}
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Modifier/UpperModifierCompiler.php b/include/smarty/src/Compile/Modifier/UpperModifierCompiler.php
new file mode 100644
index 000000000..74e9a7024
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/UpperModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty upper modifier plugin
+ * Type:     modifier
+ * Name:     lower
+ * Purpose:  convert string to uppercase
+ *
+ * @author Uwe Tews
+ */
+
+class UpperModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'mb_strtoupper((string) ' . $params[ 0 ] . ' ?? \'\', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
+	}
+
+}
diff --git a/include/smarty/src/Compile/Modifier/WordWrapModifierCompiler.php b/include/smarty/src/Compile/Modifier/WordWrapModifierCompiler.php
new file mode 100644
index 000000000..092b95a80
--- /dev/null
+++ b/include/smarty/src/Compile/Modifier/WordWrapModifierCompiler.php
@@ -0,0 +1,27 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty wordwrap modifier plugin
+ * Type:     modifier
+ * Name:     wordwrap
+ * Purpose:  wrap a string of text at a given length
+ *
+ * @author Uwe Tews
+ */
+
+class WordWrapModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = 80;
+		}
+		if (!isset($params[ 2 ])) {
+			$params[ 2 ] = '"\n"';
+		}
+		if (!isset($params[ 3 ])) {
+			$params[ 3 ] = 'false';
+		}
+		return 'smarty_mb_wordwrap(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/ModifierCompiler.php b/include/smarty/src/Compile/ModifierCompiler.php
new file mode 100644
index 000000000..dfec3d777
--- /dev/null
+++ b/include/smarty/src/Compile/ModifierCompiler.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Modifier
+ * Compiles code for modifier execution
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+use Smarty\Compile\Base;
+use Smarty\Compiler\Template;
+use Smarty\CompilerException;
+
+/**
+ * Smarty Internal Plugin Compile Modifier Class
+ *
+
+
+ */
+class ModifierCompiler extends Base {
+
+	/**
+	 * Compiles code for modifier execution
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		$output = $parameter['value'];
+
+		// loop over list of modifiers
+		foreach ($parameter['modifierlist'] as $single_modifier) {
+			/* @var string $modifier */
+			$modifier = $single_modifier[0];
+
+
+			$modifier_params = array_values($single_modifier);
+
+			$modifier_params[0] = $output;
+			$params = implode(',', $modifier_params);
+
+			if (!is_object($compiler->getSmarty()->security_policy)
+				|| $compiler->getSmarty()->security_policy->isTrustedModifier($modifier, $compiler)
+			) {
+
+				if ($handler = $compiler->getModifierCompiler($modifier)) {
+					$output = $handler->compile($modifier_params, $compiler);
+				} elseif ($compiler->getSmarty()->getModifierCallback($modifier)) {
+					$output = sprintf(
+							'$_smarty_tpl->getSmarty()->getModifierCallback(%s)(%s)',
+							var_export($modifier, true),
+							$params
+						);
+				} elseif ($callback = $compiler->getPluginFromDefaultHandler($modifier, \Smarty\Smarty::PLUGIN_MODIFIERCOMPILER)) {
+					$output = (new \Smarty\Compile\Modifier\BCPluginWrapper($callback))->compile($modifier_params, $compiler);
+				} elseif ($function = $compiler->getPluginFromDefaultHandler($modifier, \Smarty\Smarty::PLUGIN_MODIFIER)) {
+					if (!is_array($function)) {
+						$output = "{$function}({$params})";
+					} else {
+						$operator = is_object($function[0]) ? '->' : '::';
+						$output =  $function[0] . $operator . $function[1] . '(' . $params . ')';
+					}
+				}  else {
+					$compiler->trigger_template_error("unknown modifier '{$modifier}'", null, true);
+				}
+			}
+		}
+		return (string)$output;
+	}
+
+	/**
+	 * Wether this class will be able to compile the given modifier.
+	 * @param string $modifier
+	 * @param Template $compiler
+	 *
+	 * @return bool
+	 * @throws CompilerException
+	 */
+	public function canCompileForModifier(string $modifier, \Smarty\Compiler\Template $compiler): bool {
+		return $compiler->getModifierCompiler($modifier)
+			|| $compiler->getSmarty()->getModifierCallback($modifier)
+			|| $compiler->getPluginFromDefaultHandler($modifier, \Smarty\Smarty::PLUGIN_MODIFIERCOMPILER)
+			|| $compiler->getPluginFromDefaultHandler($modifier, \Smarty\Smarty::PLUGIN_MODIFIER);
+	}
+}
diff --git a/include/smarty/src/Compile/ObjectMethodBlockCompiler.php b/include/smarty/src/Compile/ObjectMethodBlockCompiler.php
new file mode 100644
index 000000000..6c05c4220
--- /dev/null
+++ b/include/smarty/src/Compile/ObjectMethodBlockCompiler.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Object Block Function
+ * Compiles code for registered objects as block function
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+/**
+ * Smarty Internal Plugin Compile Object Block Function Class
+ *
+
+
+ */
+class ObjectMethodBlockCompiler extends BlockCompiler {
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getIsCallableCode($tag, $function): string {
+		$callbackObject = "\$_smarty_tpl->getSmarty()->registered_objects['{$tag}'][0]";
+		return "(isset({$callbackObject}) && is_callable(array({$callbackObject}, '{$function}')))";
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getFullCallbackCode($tag, $function): string {
+		$callbackObject = "\$_smarty_tpl->getSmarty()->registered_objects['{$tag}'][0]";
+		return "{$callbackObject}->{$function}";
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function blockIsCacheable(\Smarty\Smarty $smarty, $function): bool {
+		return true;
+	}
+
+}
diff --git a/include/smarty/src/Compile/ObjectMethodCallCompiler.php b/include/smarty/src/Compile/ObjectMethodCallCompiler.php
new file mode 100644
index 000000000..70855cfc8
--- /dev/null
+++ b/include/smarty/src/Compile/ObjectMethodCallCompiler.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Object Function
+ * Compiles code for registered objects as function
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+/**
+ * Smarty Internal Plugin Compile Object Function Class
+ *
+
+
+ */
+class ObjectMethodCallCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles code for the execution of function plugin
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 * @param string $tag name of function
+	 * @param string $function name of method to call
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		unset($_attr['nocache']);
+		$_assign = null;
+		if (isset($_attr['assign'])) {
+			$_assign = $_attr['assign'];
+			unset($_attr['assign']);
+		}
+		// method or property ?
+		if (is_callable([$compiler->getSmarty()->registered_objects[$tag][0], $function])) {
+			// convert attributes into parameter array string
+			if ($compiler->getSmarty()->registered_objects[$tag][2]) {
+				$_paramsArray = $this->formatParamsArray($_attr);
+				$_params = 'array(' . implode(',', $_paramsArray) . ')';
+				$output = "\$_smarty_tpl->getSmarty()->registered_objects['{$tag}'][0]->{$function}({$_params},\$_smarty_tpl)";
+			} else {
+				$_params = implode(',', $_attr);
+				$output = "\$_smarty_tpl->getSmarty()->registered_objects['{$tag}'][0]->{$function}({$_params})";
+			}
+		} else {
+			// object property
+			$output = "\$_smarty_tpl->getSmarty()->registered_objects['{$tag}'][0]->{$function}";
+		}
+		if (!empty($parameter['modifierlist'])) {
+			$output = $compiler->compileModifier($parameter['modifierlist'], $output);
+		}
+		if (empty($_assign)) {
+			return "<?php echo {$output};?>\n";
+		} else {
+			return "<?php \$_smarty_tpl->assign({$_assign},{$output});?>\n";
+		}
+	}
+}
diff --git a/include/smarty/src/Compile/PrintExpressionCompiler.php b/include/smarty/src/Compile/PrintExpressionCompiler.php
new file mode 100644
index 000000000..3642551ee
--- /dev/null
+++ b/include/smarty/src/Compile/PrintExpressionCompiler.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Print Expression
+ * Compiles any tag which will output an expression or variable
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+use Smarty\Compile\Base;
+use Smarty\Compiler\BaseCompiler;
+
+/**
+ * Smarty Internal Plugin Compile Print Expression Class
+ *
+
+
+ */
+class PrintExpressionCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $optional_attributes = ['assign'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	protected $option_flags = ['nocache', 'nofilter'];
+
+	/**
+	 * Compiles code for generating output from any expression
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$output = $parameter['value'];
+		// tag modifier
+		if (!empty($parameter['modifierlist'])) {
+			$output = $compiler->compileModifier($parameter['modifierlist'], $output);
+		}
+		if (isset($_attr['assign'])) {
+			// assign output to variable
+			return "<?php \$_smarty_tpl->assign({$_attr['assign']},{$output});?>";
+		} else {
+			// display value
+			if (!$_attr['nofilter']) {
+				// default modifier
+				if ($compiler->getSmarty()->getDefaultModifiers()) {
+					$modifierlist = [];
+					foreach ($compiler->getSmarty()->getDefaultModifiers() as $key => $single_default_modifier) {
+						preg_match_all(
+							'/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/',
+							$single_default_modifier,
+							$mod_array
+						);
+						for ($i = 0, $count = count($mod_array[0]); $i < $count; $i++) {
+							if ($mod_array[0][$i] !== ':') {
+								$modifierlist[$key][] = $mod_array[0][$i];
+							}
+						}
+					}
+
+					$output = $compiler->compileModifier($modifierlist, $output);
+				}
+
+				if ($compiler->getTemplate()->getSmarty()->escape_html && !$compiler->isRawOutput()) {
+					$output = "htmlspecialchars((string) ({$output}), ENT_QUOTES, '" . addslashes(\Smarty\Smarty::$_CHARSET) . "')";
+				}
+
+			}
+			$output = "<?php echo {$output};?>\n";
+			$compiler->setRawOutput(false);
+		}
+		return $output;
+	}
+
+}
diff --git a/include/smarty/src/Compile/SpecialVariableCompiler.php b/include/smarty/src/Compile/SpecialVariableCompiler.php
new file mode 100644
index 000000000..2b6cf4330
--- /dev/null
+++ b/include/smarty/src/Compile/SpecialVariableCompiler.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Special Smarty Variable
+ * Compiles the special $smarty variables
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+use Smarty\Compile\Base;
+use Smarty\Compile\Tag\Capture;
+use Smarty\Compile\Tag\ForeachTag;
+use Smarty\Compile\Tag\Section;
+use Smarty\Compiler\Template;
+use Smarty\CompilerException;
+
+/**
+ * Smarty Internal Plugin Compile special Smarty Variable Class
+ *
+
+
+ */
+class SpecialVariableCompiler extends Base {
+
+	/**
+	 * Compiles code for the special $smarty variables
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 * @param array $parameter
+	 * @param null $tag
+	 * @param null $function
+	 *
+	 * @return string compiled code
+	 * @throws CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		$_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
+		$variable = smarty_strtolower_ascii($compiler->getId($_index[0]));
+		if ($variable === false) {
+			$compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
+		}
+		if (!isset($compiler->getSmarty()->security_policy)
+			|| $compiler->getSmarty()->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)
+		) {
+			switch ($variable) {
+				case 'foreach':
+					return (new ForeachTag())->compileSpecialVariable($compiler, $_index);
+				case 'section':
+					return (new Section())->compileSpecialVariable($compiler, $_index);
+				case 'capture':
+					return (new Capture())->compileSpecialVariable($compiler, $_index);
+				case 'now':
+					return 'time()';
+				case 'cookies':
+					if (isset($compiler->getSmarty()->security_policy)
+						&& !$compiler->getSmarty()->security_policy->allow_super_globals
+					) {
+						$compiler->trigger_template_error("(secure mode) super globals not permitted");
+						break;
+					}
+					$compiled_ref = '$_COOKIE';
+					break;
+				case 'get':
+				case 'post':
+				case 'env':
+				case 'server':
+				case 'session':
+				case 'request':
+					if (isset($compiler->getSmarty()->security_policy)
+						&& !$compiler->getSmarty()->security_policy->allow_super_globals
+					) {
+						$compiler->trigger_template_error("(secure mode) super globals not permitted");
+						break;
+					}
+					$compiled_ref = '$_' . smarty_strtoupper_ascii($variable);
+					break;
+				case 'template':
+					return '$_smarty_tpl->template_resource';
+				case 'template_object':
+					if (isset($compiler->getSmarty()->security_policy)) {
+						$compiler->trigger_template_error("(secure mode) template_object not permitted");
+						break;
+					}
+					return '$_smarty_tpl';
+				case 'current_dir':
+					return '$_smarty_current_dir';
+				case 'version':
+					return "\\Smarty\\Smarty::SMARTY_VERSION";
+				case 'const':
+					if (isset($compiler->getSmarty()->security_policy)
+						&& !$compiler->getSmarty()->security_policy->allow_constants
+					) {
+						$compiler->trigger_template_error("(secure mode) constants not permitted");
+						break;
+					}
+					if (strpos($_index[1], '$') === false && strpos($_index[1], '\'') === false) {
+						return "(defined('{$_index[1]}') ? constant('{$_index[1]}') : null)";
+					} else {
+						return "(defined({$_index[1]}) ? constant({$_index[1]}) : null)";
+					}
+				// no break
+				case 'config':
+					if (isset($_index[2])) {
+						return "(is_array(\$tmp = \$_smarty_tpl->getConfigVariable($_index[1])) ? \$tmp[$_index[2]] : null)";
+					} else {
+						return "\$_smarty_tpl->getConfigVariable($_index[1])";
+					}
+				// no break
+				case 'ldelim':
+					return "\$_smarty_tpl->getLeftDelimiter()";
+				case 'rdelim':
+					return "\$_smarty_tpl->getRightDelimiter()";
+				default:
+					$compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is not defined');
+					break;
+			}
+			if (isset($_index[1])) {
+				array_shift($_index);
+				foreach ($_index as $_ind) {
+					$compiled_ref = $compiled_ref . "[$_ind]";
+				}
+			}
+			return $compiled_ref;
+		}
+
+		return '';
+	}
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_append.php b/include/smarty/src/Compile/Tag/Append.php
similarity index 60%
rename from include/smarty/libs/sysplugins/smarty_internal_compile_append.php
rename to include/smarty/src/Compile/Tag/Append.php
index 1a9befbf6..171f69600 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_append.php
+++ b/include/smarty/src/Compile/Tag/Append.php
@@ -1,40 +1,46 @@
 <?php
+
+namespace Smarty\Compile\Tag;
+
 /**
  * Smarty Internal Plugin Compile Append
  * Compiles the {append} tag
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Append Class
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  */
-class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
+class Append extends Assign
 {
+
+	/**
+	 * @inheritdoc
+	 */
+	protected $optional_attributes = ['scope', 'index'];
+
     /**
      * Compiles code for the {append} tag
      *
      * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param \Smarty\Compiler\Template $compiler  compiler object
      * @param array                                 $parameter array with compilation parameter
      *
      * @return string compiled code
-     * @throws \SmartyCompilerException
+     * @throws \Smarty\CompilerException
      */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // the following must be assigned at runtime because it will be overwritten in parent class
-        $this->required_attributes = array('var', 'value');
-        $this->shorttag_order = array('var', 'value');
-        $this->optional_attributes = array('scope', 'index');
-        $this->mapCache = array();
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
+
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
+
         // map to compile assign attributes
         if (isset($_attr[ 'index' ])) {
             $_params[ 'smarty_internal_index' ] = '[' . $_attr[ 'index' ] . ']';
diff --git a/include/smarty/src/Compile/Tag/Assign.php b/include/smarty/src/Compile/Tag/Assign.php
new file mode 100644
index 000000000..8433a97e1
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/Assign.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+use Smarty\Smarty;
+
+/**
+ * Smarty Internal Plugin Compile Assign
+ * Compiles the {assign} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Assign Class
+ *
+
+
+ */
+class Assign extends Base
+{
+	/**
+	 * @inheritdoc
+	 */
+	protected $required_attributes = ['var', 'value'];
+
+	/**
+	 * @inheritdoc
+	 */
+	protected $optional_attributes = ['scope'];
+
+	/**
+	 * @inheritdoc
+	 */
+	protected $shorttag_order = ['var', 'value'];
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see BasePlugin
+     */
+    protected $option_flags = array('nocache', 'noscope');
+
+    /**
+     * Compiles code for the {assign} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty\Compiler\Template $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \Smarty\CompilerException
+     */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
+
+        $_nocache = false;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        if ($_var = $compiler->getId($_attr[ 'var' ])) {
+            $_var = "'{$_var}'";
+        } else {
+            $_var = $_attr[ 'var' ];
+        }
+        if ($compiler->tag_nocache || $compiler->isNocacheActive()) {
+            $_nocache = true;
+            // create nocache var to make it know for further compiling
+            $compiler->setNocacheInVariable($_attr[ 'var' ]);
+        }
+        // scope setup
+        if ($_attr[ 'noscope' ]) {
+            $_scope = -1;
+        } else {
+            $_scope = isset($_attr['scope']) ? $this->convertScope($_attr['scope']) : null;
+        }
+
+        if (isset($parameter[ 'smarty_internal_index' ])) {
+            $output =
+                "<?php \$_tmp_array = \$_smarty_tpl->getValue({$_var}) ?? [];\n";
+            $output .= "if (!(is_array(\$_tmp_array) || \$_tmp_array instanceof ArrayAccess)) {\n";
+            $output .= "settype(\$_tmp_array, 'array');\n";
+            $output .= "}\n";
+            $output .= "\$_tmp_array{$parameter['smarty_internal_index']} = {$_attr['value']};\n";
+            $output .= "\$_smarty_tpl->assign({$_var}, \$_tmp_array, " . var_export($_nocache, true) . ", " . var_export($_scope, true) . ");?>";
+        } else {
+            $output = "<?php \$_smarty_tpl->assign({$_var}, {$_attr['value']}, " . var_export($_nocache, true) . ", " . var_export($_scope, true) . ");?>";
+        }
+        return $output;
+    }
+}
diff --git a/include/smarty/src/Compile/Tag/BCPluginWrapper.php b/include/smarty/src/Compile/Tag/BCPluginWrapper.php
new file mode 100644
index 000000000..abd89f78f
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/BCPluginWrapper.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+class BCPluginWrapper extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $optional_attributes = array('_any');
+
+	private $callback;
+
+	public function __construct($callback, bool $cacheable = true) {
+		$this->callback = $callback;
+		$this->cacheable = $cacheable;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		return call_user_func($this->callback, $this->getAttributes($compiler, $args), $compiler->getSmarty());
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/Block.php b/include/smarty/src/Compile/Tag/Block.php
new file mode 100644
index 000000000..d8b301006
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/Block.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\ParseTree\Template;
+
+/**
+ * Smarty Internal Plugin Compile Block Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Block extends Inheritance {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $required_attributes = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $shorttag_order = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $option_flags = ['hide', 'nocache'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $optional_attributes = ['assign'];
+
+	/**
+	 * Compiles code for the {block} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
+		if (!isset($compiler->_cache['blockNesting'])) {
+			$compiler->_cache['blockNesting'] = 0;
+		}
+		if ($compiler->_cache['blockNesting'] === 0) {
+			// make sure that inheritance gets initialized in template code
+			$this->registerInit($compiler);
+			$this->option_flags = ['hide', 'nocache', 'append', 'prepend'];
+		} else {
+			$this->option_flags = ['hide', 'nocache'];
+		}
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		++$compiler->_cache['blockNesting'];
+		$_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(mt_rand(), true));
+
+		$this->openTag(
+			$compiler,
+			'block',
+			[
+				$_attr, $compiler->tag_nocache, $compiler->getParser()->current_buffer,
+				$compiler->getTemplate()->getCompiled()->getNocacheCode(), $_className
+			]
+		);
+
+		$compiler->getParser()->current_buffer = new Template();
+		$compiler->getTemplate()->getCompiled()->setNocacheCode(false);
+		$compiler->suppressNocacheProcessing = true;
+		return '';
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/BlockClose.php b/include/smarty/src/Compile/Tag/BlockClose.php
new file mode 100644
index 000000000..586c7c050
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/BlockClose.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\ParseTree\Template;
+
+/**
+ * Smarty Internal Plugin Compile BlockClose Class
+ */
+class BlockClose extends Inheritance {
+
+	/**
+	 * Compiles code for the {/block} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return bool true
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
+		[$_attr, $_nocache, $_buffer, $_has_nocache_code, $_className] = $this->closeTag($compiler, ['block']);
+
+		$_block = [];
+		if (isset($compiler->_cache['blockParams'])) {
+			$_block = $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']] ?? [];
+			unset($compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]);
+		}
+
+		$_name = $_attr['name'];
+		$_assign = $_attr['assign'] ?? null;
+		unset($_attr[ 'assign' ], $_attr[ 'name' ]);
+
+		foreach ($_attr as $name => $stat) {
+			if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat !== 'false')) {
+				$_block[ $name ] = 'true';
+			}
+		}
+
+		// get compiled block code
+		$_functionCode = $compiler->getParser()->current_buffer;
+		// setup buffer for template function code
+		$compiler->getParser()->current_buffer = new Template();
+		$output = "<?php\n";
+		$output .= $compiler->cStyleComment(" {block {$_name}} ") . "\n";
+		$output .= "class {$_className} extends \\Smarty\\Runtime\\Block\n";
+		$output .= "{\n";
+		foreach ($_block as $property => $value) {
+			$output .= "public \${$property} = " . var_export($value, true) . ";\n";
+		}
+		$output .= "public function callBlock(\\Smarty\\Template \$_smarty_tpl) {\n";
+
+		$output .= (new \Smarty\Compiler\CodeFrame($compiler->getTemplate()))->insertLocalVariables();
+
+		if ($compiler->getTemplate()->getCompiled()->getNocacheCode()) {
+			$output .= "\$_smarty_tpl->getCached()->hashes['{$compiler->getTemplate()->getCompiled()->nocache_hash}'] = true;\n";
+		}
+		if (isset($_assign)) {
+			$output .= "ob_start();\n";
+		}
+		$output .= "?>\n";
+		$compiler->getParser()->current_buffer->append_subtree(
+			$compiler->getParser(),
+			new \Smarty\ParseTree\Tag(
+				$compiler->getParser(),
+				$output
+			)
+		);
+		$compiler->getParser()->current_buffer->append_subtree($compiler->getParser(), $_functionCode);
+		$output = "<?php\n";
+		if (isset($_assign)) {
+			$output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+		}
+		$output .= "}\n";
+		$output .= "}\n";
+		$output .= $compiler->cStyleComment(" {/block {$_name}} ") . "\n\n";
+		$output .= "?>\n";
+		$compiler->getParser()->current_buffer->append_subtree(
+			$compiler->getParser(),
+			new \Smarty\ParseTree\Tag(
+				$compiler->getParser(),
+				$output
+			)
+		);
+		$compiler->blockOrFunctionCode .= $compiler->getParser()->current_buffer->to_smarty_php($compiler->getParser());
+
+		$compiler->getParser()->current_buffer = new Template();
+
+		// restore old status
+		$compiler->getTemplate()->getCompiled()->setNocacheCode($_has_nocache_code);
+		$compiler->tag_nocache = $_nocache;
+
+		$compiler->getParser()->current_buffer = $_buffer;
+		$output = "<?php \n";
+		if ($compiler->_cache['blockNesting'] === 1) {
+			$output .= "\$_smarty_tpl->getInheritance()->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
+		} else {
+			$output .= "\$_smarty_tpl->getInheritance()->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
+		}
+		$output .= "?>\n";
+		--$compiler->_cache['blockNesting'];
+		if ($compiler->_cache['blockNesting'] === 0) {
+			unset($compiler->_cache['blockNesting']);
+		}
+		$compiler->suppressNocacheProcessing = true;
+		return $output;
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/BreakTag.php b/include/smarty/src/Compile/Tag/BreakTag.php
new file mode 100644
index 000000000..b8b554f3b
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/BreakTag.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Break
+ * Compiles the {break} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Break Class
+ *
+
+
+ */
+class BreakTag extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['levels'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['levels'];
+
+	/**
+	 * Tag name may be overloaded by ContinueTag
+	 *
+	 * @var string
+	 */
+	protected $tag = 'break';
+
+	/**
+	 * Compiles code for the {break} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
+		[$levels, $foreachLevels] = $this->checkLevels($args, $compiler);
+		$output = "<?php ";
+		if ($foreachLevels > 0 && $this->tag === 'continue') {
+			$foreachLevels--;
+		}
+		if ($foreachLevels > 0) {
+			/* @var ForeachTag $foreachCompiler */
+			$foreachCompiler = $compiler->getTagCompiler('foreach');
+			$output .= $foreachCompiler->compileRestore($foreachLevels);
+		}
+		$output .= "{$this->tag} {$levels};?>";
+		return $output;
+	}
+
+	/**
+	 * check attributes and return array of break and foreach levels
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return array
+	 * @throws \Smarty\CompilerException
+	 */
+	public function checkLevels($args, \Smarty\Compiler\Template $compiler) {
+		static $_is_loopy = ['for' => true, 'foreach' => true, 'while' => true, 'section' => true];
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		if ($_attr['nocache'] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', null, true);
+		}
+		if (isset($_attr['levels'])) {
+			if (!is_numeric($_attr['levels'])) {
+				$compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
+			}
+			$levels = $_attr['levels'];
+		} else {
+			$levels = 1;
+		}
+		$level_count = $levels;
+
+		$tagStack = $compiler->getTagStack();
+		$stack_count = count($tagStack) - 1;
+
+		$foreachLevels = 0;
+		$lastTag = '';
+		while ($level_count > 0 && $stack_count >= 0) {
+			if (isset($_is_loopy[$tagStack[$stack_count][0]])) {
+				$lastTag = $tagStack[$stack_count][0];
+				if ($level_count === 0) {
+					break;
+				}
+				$level_count--;
+				if ($tagStack[$stack_count][0] === 'foreach') {
+					$foreachLevels++;
+				}
+			}
+			$stack_count--;
+		}
+		if ($level_count !== 0) {
+			$compiler->trigger_template_error("cannot {$this->tag} {$levels} level(s)", null, true);
+		}
+		if ($lastTag === 'foreach' && $this->tag === 'break' && $foreachLevels > 0) {
+			$foreachLevels--;
+		}
+		return [$levels, $foreachLevels];
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/Call.php b/include/smarty/src/Compile/Tag/Call.php
new file mode 100644
index 000000000..04f07a14a
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/Call.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function_Call
+ * Compiles the calls of user defined tags defined by {function}
+ *
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Function_Call Class
+ */
+class Call extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $required_attributes = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $shorttag_order = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles the calls of user defined tags defined by {function}
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		// save possible attributes
+		if (isset($_attr['assign'])) {
+			// output will be stored in a smarty variable instead of being displayed
+			$_assign = $_attr['assign'];
+		}
+		//$_name = trim($_attr['name'], "''");
+		$_name = $_attr['name'];
+		unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
+		// set flag (compiled code of {function} must be included in cache file
+		if (!$compiler->getTemplate()->caching || $compiler->isNocacheActive() || $compiler->tag_nocache) {
+			$_nocache = 'true';
+		} else {
+			$_nocache = 'false';
+		}
+		$_paramsArray = $this->formatParamsArray($_attr);
+		$_params = 'array(' . implode(',', $_paramsArray) . ')';
+		//$compiler->suppressNocacheProcessing = true;
+		// was there an assign attribute
+		if (isset($_assign)) {
+			$_output =
+				"<?php ob_start();\n\$_smarty_tpl->getSmarty()->getRuntime('TplFunction')->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
+		} else {
+			$_output =
+				"<?php \$_smarty_tpl->getSmarty()->getRuntime('TplFunction')->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
+		}
+		return $_output;
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/Capture.php b/include/smarty/src/Compile/Tag/Capture.php
new file mode 100644
index 000000000..7b7362f9e
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/Capture.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Capture Class
+ *
+
+
+ */
+class Capture extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $shorttag_order = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $optional_attributes = ['name', 'assign', 'append'];
+
+	/**
+	 * Compiles code for the {$smarty.capture.xxx}
+	 *
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public static function compileSpecialVariable(
+		\Smarty\Compiler\Template $compiler,
+		                                     $parameter = null
+	) {
+		return '$_smarty_tpl->getSmarty()->getRuntime(\'Capture\')->getBuffer($_smarty_tpl' .
+			(isset($parameter[1]) ? ", {$parameter[ 1 ]})" : ')');
+	}
+
+	/**
+	 * Compiles code for the {capture} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param null $parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$buffer = $_attr['name'] ?? "'default'";
+		$assign = $_attr['assign'] ?? 'null';
+		$append = $_attr['append'] ?? 'null';
+
+		$compiler->_cache['capture_stack'][] = $compiler->tag_nocache;
+		if ($compiler->tag_nocache) {
+			// push a virtual {nocache} tag onto the stack.
+			$compiler->openTag('nocache');
+		}
+
+		return "<?php \$_smarty_tpl->getSmarty()->getRuntime('Capture')->open(\$_smarty_tpl, $buffer, $assign, $append);?>";
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/CaptureClose.php b/include/smarty/src/Compile/Tag/CaptureClose.php
new file mode 100644
index 000000000..c0d779692
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/CaptureClose.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Capture
+ * Compiles the {capture} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Captureclose Class
+ *
+
+
+ */
+class CaptureClose extends Base {
+
+	/**
+	 * Compiles code for the {/capture} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param null $parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		if (array_pop($compiler->_cache['capture_stack'])) {
+			// pop the virtual {nocache} tag from the stack.
+			$compiler->closeTag('nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		return "<?php \$_smarty_tpl->getSmarty()->getRuntime('Capture')->close(\$_smarty_tpl);?>";
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/ConfigLoad.php b/include/smarty/src/Compile/Tag/ConfigLoad.php
new file mode 100644
index 000000000..8b4cf46d2
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ConfigLoad.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Config Load
+ * Compiles the {config load} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+use Smarty\Smarty;
+
+/**
+ * Smarty Internal Plugin Compile Config Load Class
+ *
+
+
+ */
+class ConfigLoad extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $required_attributes = ['file'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['file', 'section'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['section'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $option_flags = [];
+
+	/**
+	 * Compiles code for the {config_load} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+
+		// save possible attributes
+		$conf_file = $_attr['file'];
+		$section = $_attr['section'] ?? 'null';
+
+		// create config object
+		return "<?php\n\$_smarty_tpl->configLoad({$conf_file}, {$section});\n?>\n";
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/ContinueTag.php b/include/smarty/src/Compile/Tag/ContinueTag.php
new file mode 100644
index 000000000..82abe6cea
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ContinueTag.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Continue
+ * Compiles the {continue} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile Continue Class
+ *
+
+
+ */
+class ContinueTag extends BreakTag {
+
+	/**
+	 * Tag name
+	 *
+	 * @var string
+	 */
+	protected $tag = 'continue';
+}
diff --git a/include/smarty/src/Compile/Tag/Debug.php b/include/smarty/src/Compile/Tag/Debug.php
new file mode 100644
index 000000000..4542bd3cd
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/Debug.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Debug
+ * Compiles the {debug} tag.
+ * It opens a window the the Smarty Debugging Console.
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Debug Class
+ *
+
+
+ */
+class Debug extends Base {
+
+	/**
+	 * Compiles code for the {debug} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes, may trigger errors
+		$this->getAttributes($compiler, $args);
+
+		// compile always as nocache
+		$compiler->tag_nocache = true;
+		// display debug template
+		$_output =
+			"<?php \$_smarty_debug = new \\Smarty\\Debug;\n \$_smarty_debug->display_debug(\$_smarty_tpl);\n";
+		$_output .= "unset(\$_smarty_debug);\n?>";
+		return $_output;
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/ElseIfTag.php b/include/smarty/src/Compile/Tag/ElseIfTag.php
new file mode 100644
index 000000000..8e59c3413
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ElseIfTag.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile ElseIf Class
+ *
+
+
+ */
+class ElseIfTag extends Base {
+
+	/**
+	 * Compiles code for the {elseif} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		[$nesting, $nocache_pushed] = $this->closeTag($compiler, ['if', 'elseif']);
+
+		if (!isset($parameter['if condition'])) {
+			$compiler->trigger_template_error('missing elseif condition', null, true);
+		}
+		$assignCode = '';
+		$var = '';
+		if (is_array($parameter['if condition'])) {
+			$condition_by_assign = true;
+			if (is_array($parameter['if condition']['var'])) {
+				$var = $parameter['if condition']['var']['var'];
+			} else {
+				$var = $parameter['if condition']['var'];
+			}
+			if ($compiler->isNocacheActive()) {
+				// create nocache var to make it know for further compiling
+				$compiler->setNocacheInVariable($var);
+			}
+			$prefixVar = $compiler->getNewPrefixVariable();
+			$assignCode = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
+			$assignCompiler = new Assign();
+			$assignAttr = [];
+			$assignAttr[]['value'] = $prefixVar;
+			if (is_array($parameter['if condition']['var'])) {
+				$assignAttr[]['var'] = $parameter['if condition']['var']['var'];
+				$assignCode .= $assignCompiler->compile(
+					$assignAttr,
+					$compiler,
+					['smarty_internal_index' => $parameter['if condition']['var']['smarty_internal_index']]
+				);
+			} else {
+				$assignAttr[]['var'] = $parameter['if condition']['var'];
+				$assignCode .= $assignCompiler->compile($assignAttr, $compiler, []);
+			}
+		} else {
+			$condition_by_assign = false;
+		}
+		$prefixCode = $compiler->getPrefixCode();
+		if (empty($prefixCode)) {
+			if ($condition_by_assign) {
+				$this->openTag($compiler, 'elseif', [$nesting + 1, $compiler->tag_nocache]);
+				$_output = $compiler->appendCode("<?php } else {\n?>", $assignCode);
+				return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
+			} else {
+				$this->openTag($compiler, 'elseif', [$nesting, $nocache_pushed]);
+				return "<?php } elseif ({$parameter['if condition']}) {?>";
+			}
+		} else {
+			$_output = $compiler->appendCode("<?php } else {\n?>", $prefixCode);
+			$this->openTag($compiler, 'elseif', [$nesting + 1, $nocache_pushed]);
+			if ($condition_by_assign) {
+				$_output = $compiler->appendCode($_output, $assignCode);
+				return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
+			} else {
+				return $compiler->appendCode($_output, "<?php if ({$parameter['if condition']}) {?>");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/ElseTag.php b/include/smarty/src/Compile/Tag/ElseTag.php
new file mode 100644
index 000000000..a7025da72
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ElseTag.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Else Class
+ *
+
+
+ */
+class ElseTag extends Base {
+
+	/**
+	 * Compiles code for the {else} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		[$nesting, $compiler->tag_nocache] = $this->closeTag($compiler, ['if', 'elseif']);
+		$this->openTag($compiler, 'else', [$nesting, $compiler->tag_nocache]);
+		return '<?php } else { ?>';
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/EvalTag.php b/include/smarty/src/Compile/Tag/EvalTag.php
new file mode 100644
index 000000000..8396fd097
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/EvalTag.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Eval
+ * Compiles the {eval} tag.
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Eval Class
+ *
+
+
+ */
+class EvalTag extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $required_attributes = ['var'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $optional_attributes = ['assign'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $shorttag_order = ['var', 'assign'];
+
+	/**
+	 * Compiles code for the {eval} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		if (isset($_attr['assign'])) {
+			// output will be stored in a smarty variable instead of being displayed
+			$_assign = $_attr['assign'];
+		}
+		// create template object
+		$_output =
+			"\$_template = new \\Smarty\\Template('eval:'.{$_attr[ 'var' ]}, \$_smarty_tpl->getSmarty(), \$_smarty_tpl);";
+		//was there an assign attribute?
+		if (isset($_assign)) {
+			$_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
+		} else {
+			$_output .= 'echo $_template->fetch();';
+		}
+		return "<?php $_output ?>";
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/ExtendsTag.php b/include/smarty/src/Compile/Tag/ExtendsTag.php
new file mode 100644
index 000000000..0ec2cf2ba
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ExtendsTag.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile extend
+ * Compiles the {extends} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile extend Class
+ *
+
+
+ */
+class ExtendsTag extends Inheritance {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $required_attributes = ['file'];
+
+	/**
+	 * Array of names of optional attribute required by tag
+	 * use array('_any') if there is no restriction of attributes names
+	 *
+	 * @var array
+	 */
+	protected $optional_attributes = [];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['file'];
+
+	/**
+	 * Compiles code for the {extends} tag extends: resource
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		if ($_attr['nocache'] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', $compiler->getParser()->lex->line - 1);
+		}
+		if (strpos($_attr['file'], '$_tmp') !== false) {
+			$compiler->trigger_template_error('illegal value for file attribute', $compiler->getParser()->lex->line - 1);
+		}
+		// add code to initialize inheritance
+		$this->registerInit($compiler, true);
+		$this->compileEndChild($compiler, $_attr['file']);
+		return '';
+	}
+
+	/**
+	 * Add code for inheritance endChild() method to end of template
+	 *
+	 * @param \Smarty\Compiler\Template $compiler
+	 * @param null|string $template optional inheritance parent template
+	 *
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	private function compileEndChild(\Smarty\Compiler\Template $compiler, $template = null) {
+		$compiler->getParser()->template_postfix[] = new \Smarty\ParseTree\Tag(
+			$compiler->getParser(),
+			'<?php $_smarty_tpl->getInheritance()->endChild($_smarty_tpl' .
+			(isset($template) ?	", {$template}, \$_smarty_current_dir" : '') . ");\n?>"
+		);
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/ForClose.php b/include/smarty/src/Compile/Tag/ForClose.php
new file mode 100644
index 000000000..189bcfd93
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ForClose.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile For
+ * Compiles the {for} {forelse} {/for} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Forclose Class
+ *
+
+
+ */
+class ForClose extends Base {
+
+	/**
+	 * Compiles code for the {/for} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting--;
+
+		[$openTag, $nocache_pushed] = $this->closeTag($compiler, ['for', 'forelse']);
+		$output = "<?php }\n";
+		if ($openTag !== 'forelse') {
+			$output .= "}\n";
+		}
+		$output .= "?>";
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		return $output;
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/ForElse.php b/include/smarty/src/Compile/Tag/ForElse.php
new file mode 100644
index 000000000..d939a72ab
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ForElse.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Forelse Class
+ *
+
+
+ */
+class ForElse extends Base {
+
+	/**
+	 * Compiles code for the {forelse} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		[$tagName, $nocache_pushed] = $this->closeTag($compiler, ['for']);
+		$this->openTag($compiler, 'forelse', ['forelse', $nocache_pushed]);
+		return "<?php }} else { ?>";
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/ForTag.php b/include/smarty/src/Compile/Tag/ForTag.php
new file mode 100644
index 000000000..fdf71b681
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ForTag.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile For Class
+ *
+
+
+ */
+class ForTag extends Base {
+
+	/**
+	 * Compiles code for the {for} tag
+	 * Smarty supports two different syntax's:
+	 * - {for $var in $array}
+	 * For looping over arrays or iterators
+	 * - {for $x=0; $x<$y; $x++}
+	 * For general loops
+	 * The parser is generating different sets of attribute by which this compiler can
+	 * determine which syntax is used.
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting++;
+		if ($parameter === 0) {
+			$this->required_attributes = ['start', 'to'];
+			$this->optional_attributes = ['max', 'step'];
+		} else {
+			$this->required_attributes = ['start', 'ifexp', 'var', 'step'];
+			$this->optional_attributes = [];
+		}
+
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$output = "<?php\n";
+		if ($parameter === 1) {
+			foreach ($_attr['start'] as $_statement) {
+				if (is_array($_statement['var'])) {
+					$var = $_statement['var']['var'];
+					$index = $_statement['var']['smarty_internal_index'];
+				} else {
+					$var = $_statement['var'];
+					$index = '';
+				}
+				$output .= "\$_smarty_tpl->assign($var, null);\n";
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->value{$index} = {$_statement['value']};\n";
+			}
+			if (is_array($_attr['var'])) {
+				$var = $_attr['var']['var'];
+				$index = $_attr['var']['smarty_internal_index'];
+			} else {
+				$var = $_attr['var'];
+				$index = '';
+			}
+			$output .= "if ($_attr[ifexp]) {\nfor (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
+		} else {
+			$_statement = $_attr['start'];
+			if (is_array($_statement['var'])) {
+				$var = $_statement['var']['var'];
+				$index = $_statement['var']['smarty_internal_index'];
+			} else {
+				$var = $_statement['var'];
+				$index = '';
+			}
+			$output .= "\$_smarty_tpl->assign($var, null);";
+			if (isset($_attr['step'])) {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
+			} else {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
+			}
+			if (isset($_attr['max'])) {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
+			} else {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
+			}
+			$output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
+			$output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
+			$output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration === 1;";
+			$output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration === \$_smarty_tpl->tpl_vars[$var]->total;";
+		}
+		$output .= '?>';
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this for loop
+			$this->openTag($compiler, 'nocache');
+		}
+
+		$this->openTag($compiler, 'for', ['for', $compiler->tag_nocache]);
+
+		return $output;
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/ForeachClose.php b/include/smarty/src/Compile/Tag/ForeachClose.php
new file mode 100644
index 000000000..e657c1d84
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ForeachClose.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Foreach
+ * Compiles the {foreach} {foreachelse} {/foreach} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Foreachclose Class
+ *
+
+
+ */
+class ForeachClose extends Base {
+
+	/**
+	 * Compiles code for the {/foreach} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting--;
+
+		[$openTag, $nocache_pushed, $localVariablePrefix, $item, $restore] = $this->closeTag($compiler, ['foreach', 'foreachelse']);
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		$output = "<?php\n";
+		if ($restore) {
+			$output .= "\$_smarty_tpl->setVariable('{$item}', {$localVariablePrefix}Backup);\n";
+		}
+		$output .= "}\n";
+		/* @var \Smarty\Compile\Tag\ForeachTag $foreachCompiler */
+		$foreachCompiler = $compiler->getTagCompiler('foreach');
+		$output .= $foreachCompiler->compileRestore(1);
+		$output .= "?>";
+		return $output;
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/ForeachElse.php b/include/smarty/src/Compile/Tag/ForeachElse.php
new file mode 100644
index 000000000..d48898473
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ForeachElse.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Foreachelse Class
+ *
+
+
+ */
+class ForeachElse extends Base {
+
+	/**
+	 * Compiles code for the {foreachelse} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		[$openTag, $nocache_pushed, $localVariablePrefix, $item, $restore] = $this->closeTag($compiler, ['foreach']);
+		$this->openTag($compiler, 'foreachelse', ['foreachelse', $nocache_pushed, $localVariablePrefix, $item, false]);
+		$output = "<?php\n";
+		if ($restore) {
+			$output .= "\$_smarty_tpl->setVariable('{$item}', {$localVariablePrefix}Backup);\n";
+		}
+		$output .= "}\nif ({$localVariablePrefix}DoElse) {\n?>";
+		return $output;
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/ForeachSection.php b/include/smarty/src/Compile/Tag/ForeachSection.php
new file mode 100644
index 000000000..dd2574011
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ForeachSection.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile ForeachSection
+ * Shared methods for {foreach} {section} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile ForeachSection Class
+ *
+
+
+ */
+abstract class ForeachSection extends Base {
+
+	/**
+	 * Name of this tag
+	 *
+	 * @var string
+	 */
+	protected $tagName = '';
+
+	/**
+	 * Valid properties of $smarty.xxx variable
+	 *
+	 * @var array
+	 */
+	protected $nameProperties = [];
+
+	/**
+	 * {section} tag has no item properties
+	 *
+	 * @var array
+	 */
+	protected $itemProperties = null;
+
+	/**
+	 * {section} tag has always name attribute
+	 *
+	 * @var bool
+	 */
+	protected $isNamed = true;
+
+	/**
+	 * @var array
+	 */
+	protected $matchResults = [];
+
+	/**
+	 * Preg search pattern
+	 *
+	 * @var string
+	 */
+	private $propertyPreg = '';
+
+	/**
+	 * Offsets in preg match result
+	 *
+	 * @var array
+	 */
+	private $resultOffsets = [];
+
+	/**
+	 * Start offset
+	 *
+	 * @var int
+	 */
+	private $startOffset = 0;
+
+	/**
+	 * Scan sources for used tag attributes
+	 *
+	 * @param array $attributes
+	 * @param \Smarty\Compiler\Template $compiler
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	protected function scanForProperties($attributes, \Smarty\Compiler\Template $compiler) {
+		$this->propertyPreg = '~(';
+		$this->startOffset = 1;
+		$this->resultOffsets = [];
+		$this->matchResults = ['named' => [], 'item' => []];
+		if (isset($attributes['name'])) {
+			$this->buildPropertyPreg(true, $attributes);
+		}
+		if (isset($this->itemProperties)) {
+			if ($this->isNamed) {
+				$this->propertyPreg .= '|';
+			}
+			$this->buildPropertyPreg(false, $attributes);
+		}
+		$this->propertyPreg .= ')\W~i';
+		// Template source
+		$this->matchTemplateSource($compiler);
+		// Parent template source
+		$this->matchParentTemplateSource($compiler);
+	}
+
+	/**
+	 * Build property preg string
+	 *
+	 * @param bool $named
+	 * @param array $attributes
+	 */
+	private function buildPropertyPreg($named, $attributes) {
+		if ($named) {
+			$this->resultOffsets['named'] = $this->startOffset = $this->startOffset + 3;
+			$this->propertyPreg .= "(([\$]smarty[.]{$this->tagName}[.]" .
+				($this->tagName === 'section' ? "|[\[]\s*" : '') .
+				"){$attributes['name']}[.](";
+			$properties = $this->nameProperties;
+		} else {
+			$this->resultOffsets['item'] = $this->startOffset = $this->startOffset + 2;
+			$this->propertyPreg .= "([\$]{$attributes['item']}[@](";
+			$properties = $this->itemProperties;
+		}
+		$propName = reset($properties);
+		while ($propName) {
+			$this->propertyPreg .= "{$propName}";
+			$propName = next($properties);
+			if ($propName) {
+				$this->propertyPreg .= '|';
+			}
+		}
+		$this->propertyPreg .= '))';
+	}
+
+	/**
+	 * Find matches in source string
+	 *
+	 * @param string $source
+	 */
+	private function matchProperty($source) {
+		preg_match_all($this->propertyPreg, $source, $match);
+		foreach ($this->resultOffsets as $key => $offset) {
+			foreach ($match[$offset] as $m) {
+				if (!empty($m)) {
+					$this->matchResults[$key][smarty_strtolower_ascii($m)] = true;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Find matches in template source
+	 *
+	 * @param \Smarty\Compiler\Template $compiler
+	 */
+	private function matchTemplateSource(\Smarty\Compiler\Template $compiler) {
+		$this->matchProperty($compiler->getParser()->lex->data);
+	}
+
+	/**
+	 * Find matches in all parent template source
+	 *
+	 * @param \Smarty\Compiler\Template $compiler
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	private function matchParentTemplateSource(\Smarty\Compiler\Template $compiler) {
+		// search parent compiler template source
+		$nextCompiler = $compiler;
+		while ($nextCompiler !== $nextCompiler->getParentCompiler()) {
+			$nextCompiler = $nextCompiler->getParentCompiler();
+			if ($compiler !== $nextCompiler) {
+				// get template source
+				$_content = $nextCompiler->getTemplate()->getSource()->getContent();
+				if ($_content !== '') {
+					// run pre filter if required
+					$_content = $nextCompiler->getSmarty()->runPreFilters($_content,	$nextCompiler->getTemplate());
+					$this->matchProperty($_content);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
+	 *
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compileSpecialVariable(\Smarty\Compiler\Template $compiler, $parameter) {
+		$tag = smarty_strtolower_ascii(trim($parameter[0], '"\''));
+		$name = isset($parameter[1]) ? $compiler->getId($parameter[1]) : false;
+		if (!$name) {
+			$compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+		}
+		$property = isset($parameter[2]) ? smarty_strtolower_ascii($compiler->getId($parameter[2])) : false;
+		if (!$property || !in_array($property, $this->nameProperties)) {
+			$compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
+		}
+		$tagVar = "'__smarty_{$tag}_{$name}'";
+		return "(\$_smarty_tpl->getValue({$tagVar})['{$property}'] ?? null)";
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/ForeachTag.php b/include/smarty/src/Compile/Tag/ForeachTag.php
new file mode 100644
index 000000000..9f765af58
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/ForeachTag.php
@@ -0,0 +1,286 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile Foreach Class
+ *
+
+
+ */
+class ForeachTag extends ForeachSection {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $required_attributes = ['from', 'item'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['name', 'key', 'properties'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['from', 'item', 'key', 'name'];
+
+	/**
+	 * counter
+	 *
+	 * @var int
+	 */
+	private static $counter = 0;
+
+	/**
+	 * Name of this tag
+	 *
+	 * @var string
+	 */
+	protected $tagName = 'foreach';
+
+	/**
+	 * Valid properties of $smarty.foreach.name.xxx variable
+	 *
+	 * @var array
+	 */
+	protected $nameProperties = ['first', 'last', 'index', 'iteration', 'show', 'total'];
+
+	/**
+	 * Valid properties of $item@xxx variable
+	 *
+	 * @var array
+	 */
+	protected $itemProperties = ['first', 'last', 'index', 'iteration', 'show', 'total', 'key'];
+
+	/**
+	 * Flag if tag had name attribute
+	 *
+	 * @var bool
+	 */
+	protected $isNamed = false;
+
+	/**
+	 * Compiles code for the {foreach} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting++;
+		// init
+		$this->isNamed = false;
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$from = $_attr['from'];
+		$item = $compiler->getId($_attr['item']);
+		if ($item === false) {
+			$item = $this->getVariableName($_attr['item']);
+		}
+		$key = $name = null;
+		$attributes = ['item' => $item];
+		if (isset($_attr['key'])) {
+			$key = $compiler->getId($_attr['key']);
+			if ($key === false) {
+				$key = $this->getVariableName($_attr['key']);
+			}
+			$attributes['key'] = $key;
+		}
+		if (isset($_attr['name'])) {
+			$this->isNamed = true;
+			$name = $attributes['name'] = $compiler->getId($_attr['name']);
+		}
+		foreach ($attributes as $a => $v) {
+			if ($v === false) {
+				$compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+			}
+		}
+		$fromName = $this->getVariableName($_attr['from']);
+		if ($fromName) {
+			foreach (['item', 'key'] as $a) {
+				if (isset($attributes[$a]) && $attributes[$a] === $fromName) {
+					$compiler->trigger_template_error(
+						"'{$a}' and 'from' may not have same variable name '{$fromName}'",
+						null,
+						true
+					);
+				}
+			}
+		}
+
+		$itemVar = "\$_smarty_tpl->getVariable('{$item}')";
+		$localVariablePrefix = '$foreach' . self::$counter++;
+
+		// search for used tag attributes
+		$itemAttr = [];
+		$namedAttr = [];
+		$this->scanForProperties($attributes, $compiler);
+		if (!empty($this->matchResults['item'])) {
+			$itemAttr = $this->matchResults['item'];
+		}
+		if (!empty($this->matchResults['named'])) {
+			$namedAttr = $this->matchResults['named'];
+		}
+		if (isset($_attr['properties']) && preg_match_all('/[\'](.*?)[\']/', $_attr['properties'], $match)) {
+			foreach ($match[1] as $prop) {
+				if (in_array($prop, $this->itemProperties)) {
+					$itemAttr[$prop] = true;
+				} else {
+					$compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+				}
+			}
+			if ($this->isNamed) {
+				foreach ($match[1] as $prop) {
+					if (in_array($prop, $this->nameProperties)) {
+						$nameAttr[$prop] = true;
+					} else {
+						$compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+					}
+				}
+			}
+		}
+		if (isset($itemAttr['first'])) {
+			$itemAttr['index'] = true;
+		}
+		if (isset($namedAttr['first'])) {
+			$namedAttr['index'] = true;
+		}
+		if (isset($namedAttr['last'])) {
+			$namedAttr['iteration'] = true;
+			$namedAttr['total'] = true;
+		}
+		if (isset($itemAttr['last'])) {
+			$itemAttr['iteration'] = true;
+			$itemAttr['total'] = true;
+		}
+		if (isset($namedAttr['show'])) {
+			$namedAttr['total'] = true;
+		}
+		if (isset($itemAttr['show'])) {
+			$itemAttr['total'] = true;
+		}
+		$keyTerm = '';
+		if (isset($attributes['key'])) {
+			$keyTerm = "\$_smarty_tpl->getVariable('{$key}')->value => ";
+		}
+		if (isset($itemAttr['key'])) {
+			$keyTerm = "{$itemVar}->key => ";
+		}
+		if ($this->isNamed) {
+			$foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
+		}
+		$needTotal = isset($itemAttr['total']);
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this block
+			$this->openTag($compiler, 'nocache');
+		}
+
+		// Register tag
+		$this->openTag(
+			$compiler,
+			'foreach',
+			['foreach', $compiler->tag_nocache, $localVariablePrefix, $item, !empty($itemAttr)]
+		);
+
+		// generate output code
+		$output = "<?php\n";
+		$output .= "\$_from = \$_smarty_tpl->getSmarty()->getRuntime('Foreach')->init(\$_smarty_tpl, $from, " .
+			var_export($item, true);
+		if ($name || $needTotal || $key) {
+			$output .= ', ' . var_export($needTotal, true);
+		}
+		if ($name || $key) {
+			$output .= ', ' . var_export($key, true);
+		}
+		if ($name) {
+			$output .= ', ' . var_export($name, true) . ', ' . var_export($namedAttr, true);
+		}
+		$output .= ");\n";
+		if (isset($itemAttr['show'])) {
+			$output .= "{$itemVar}->show = ({$itemVar}->total > 0);\n";
+		}
+		if (isset($itemAttr['iteration'])) {
+			$output .= "{$itemVar}->iteration = 0;\n";
+		}
+		if (isset($itemAttr['index'])) {
+			$output .= "{$itemVar}->index = -1;\n";
+		}
+		$output .= "{$localVariablePrefix}DoElse = true;\n";
+		$output .= "foreach (\$_from ?? [] as {$keyTerm}{$itemVar}->value) {\n";
+		$output .= "{$localVariablePrefix}DoElse = false;\n";
+		if (isset($attributes['key']) && isset($itemAttr['key'])) {
+			$output .= "\$_smarty_tpl->assign('{$key}', {$itemVar}->key);\n";
+		}
+		if (isset($itemAttr['iteration'])) {
+			$output .= "{$itemVar}->iteration++;\n";
+		}
+		if (isset($itemAttr['index'])) {
+			$output .= "{$itemVar}->index++;\n";
+		}
+		if (isset($itemAttr['first'])) {
+			$output .= "{$itemVar}->first = !{$itemVar}->index;\n";
+		}
+		if (isset($itemAttr['last'])) {
+			$output .= "{$itemVar}->last = {$itemVar}->iteration === {$itemVar}->total;\n";
+		}
+		if (isset($foreachVar)) {
+			if (isset($namedAttr['iteration'])) {
+				$output .= "{$foreachVar}->value['iteration']++;\n";
+			}
+			if (isset($namedAttr['index'])) {
+				$output .= "{$foreachVar}->value['index']++;\n";
+			}
+			if (isset($namedAttr['first'])) {
+				$output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n";
+			}
+			if (isset($namedAttr['last'])) {
+				$output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] === {$foreachVar}->value['total'];\n";
+			}
+		}
+		if (!empty($itemAttr)) {
+			$output .= "{$localVariablePrefix}Backup = clone \$_smarty_tpl->getVariable('{$item}');\n";
+		}
+		$output .= '?>';
+		return $output;
+	}
+
+	/**
+	 * Get variable name from string
+	 *
+	 * @param string $input
+	 *
+	 * @return bool|string
+	 */
+	private function getVariableName($input) {
+		if (preg_match('~^[$]_smarty_tpl->getValue\([\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]\)$~', $input, $match)) {
+			return $match[1];
+		}
+		return false;
+	}
+
+	/**
+	 * Compiles code for to restore saved template variables
+	 *
+	 * @param int $levels number of levels to restore
+	 *
+	 * @return string compiled code
+	 */
+	public function compileRestore($levels) {
+		return "\$_smarty_tpl->getSmarty()->getRuntime('Foreach')->restore(\$_smarty_tpl, {$levels});";
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/FunctionClose.php b/include/smarty/src/Compile/Tag/FunctionClose.php
new file mode 100644
index 000000000..aff6dc658
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/FunctionClose.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function
+ * Compiles the {function} {/function} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Functionclose Class
+ *
+
+
+ */
+class FunctionClose extends Base {
+
+	/**
+	 * Compiler object
+	 *
+	 * @var object
+	 */
+	private $compiler = null;
+
+	/**
+	 * Compiles code for the {/function} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object|\Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$this->compiler = $compiler;
+		$saved_data = $this->closeTag($compiler, ['function']);
+		$_attr = $saved_data[0];
+		$_name = trim($_attr['name'], '\'"');
+		$parentCompiler = $compiler->getParentCompiler();
+		$parentCompiler->tpl_function[$_name]['compiled_filepath'] =
+			$parentCompiler->getTemplate()->getCompiled()->filepath;
+		$parentCompiler->tpl_function[$_name]['uid'] = $compiler->getTemplate()->getSource()->uid;
+		$_parameter = $_attr;
+		unset($_parameter['name']);
+		// default parameter
+		$_paramsArray = $this->formatParamsArray($_attr);
+
+		$_paramsCode = (new \Smarty\Compiler\CodeFrame($compiler->getTemplate()))->insertLocalVariables();
+
+		if (!empty($_paramsArray)) {
+			$_params = 'array(' . implode(',', $_paramsArray) . ')';
+			$_paramsCode .= "\$params = array_merge($_params, \$params);\n";
+		}
+		$_functionCode = $compiler->getParser()->current_buffer;
+		// setup buffer for template function code
+		$compiler->getParser()->current_buffer = new \Smarty\ParseTree\Template();
+
+		$_funcName = "smarty_template_function_{$_name}_{$compiler->getTemplate()->getCompiled()->nocache_hash}";
+		$_funcNameCaching = $_funcName . '_nocache';
+
+		if ($compiler->getTemplate()->getCompiled()->getNocacheCode()) {
+			$parentCompiler->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
+			$output = "<?php\n";
+			$output .= $compiler->cStyleComment(" {$_funcNameCaching} ") . "\n";
+			$output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
+			$output .= "function {$_funcNameCaching} (\\Smarty\\Template \$_smarty_tpl,\$params) {\n";
+
+			$output .= "ob_start();\n";
+			$output .= "\$_smarty_tpl->getCompiled()->setNocacheCode(true);\n";
+			$output .= $_paramsCode;
+			$output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->assign(\$key, \$value);\n}\n";
+			$output .= "\$params = var_export(\$params, true);\n";
+			$output .= "echo \"/*%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/<?php ";
+			$output .= "\\\$_smarty_tpl->pushStack();\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->assign(\\\$key, \\\$value);\n}\n?>";
+			$output .= "/*/%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/\";?>";
+			$compiler->getParser()->current_buffer->append_subtree(
+				$compiler->getParser(),
+				new \Smarty\ParseTree\Tag(
+					$compiler->getParser(),
+					$output
+				)
+			);
+			$compiler->getParser()->current_buffer->append_subtree($compiler->getParser(), $_functionCode);
+			$output = "<?php echo \"/*%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/<?php ";
+			$output .= "\\\$_smarty_tpl->popStack();?>\n";
+			$output .= "/*/%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/\";\n?>";
+			$output .= "<?php echo str_replace('{$compiler->getTemplate()->getCompiled()->nocache_hash}', \$_smarty_tpl->getCompiled()->nocache_hash ?? '', ob_get_clean());\n";
+			$output .= "}\n}\n";
+			$output .= $compiler->cStyleComment("/ {$_funcName}_nocache ") . "\n\n";
+			$output .= "?>\n";
+			$compiler->getParser()->current_buffer->append_subtree(
+				$compiler->getParser(),
+				new \Smarty\ParseTree\Tag(
+					$compiler->getParser(),
+					$output
+				)
+			);
+			$_functionCode = new \Smarty\ParseTree\Tag(
+				$compiler->getParser(),
+				preg_replace_callback(
+					"/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%\*\/';(\?>\n)?)/",
+					[$this, 'removeNocache'],
+					$_functionCode->to_smarty_php($compiler->getParser())
+				)
+			);
+		}
+		$parentCompiler->tpl_function[$_name]['call_name'] = $_funcName;
+		$output = "<?php\n";
+		$output .= $compiler->cStyleComment(" {$_funcName} ") . "\n";
+		$output .= "if (!function_exists('{$_funcName}')) {\n";
+		$output .= "function {$_funcName}(\\Smarty\\Template \$_smarty_tpl,\$params) {\n";
+		$output .= $_paramsCode;
+		$output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->assign(\$key, \$value);\n}\n";
+		$output .= "?>\n";
+		$compiler->getParser()->current_buffer->append_subtree(
+			$compiler->getParser(),
+			new \Smarty\ParseTree\Tag(
+				$compiler->getParser(),
+				$output
+			)
+		);
+		$compiler->getParser()->current_buffer->append_subtree($compiler->getParser(), $_functionCode);
+		$output = "<?php\n}}\n";
+		$output .= $compiler->cStyleComment("/ {$_funcName} ") . "\n\n";
+		$output .= "?>\n";
+		$compiler->getParser()->current_buffer->append_subtree(
+			$compiler->getParser(),
+			new \Smarty\ParseTree\Tag(
+				$compiler->getParser(),
+				$output
+			)
+		);
+		$parentCompiler->blockOrFunctionCode .= $compiler->getParser()->current_buffer->to_smarty_php($compiler->getParser());
+		// restore old buffer
+		$compiler->getParser()->current_buffer = $saved_data[1];
+		// restore old status
+		$compiler->getTemplate()->getCompiled()->setNocacheCode($saved_data[2]);
+		$compiler->getTemplate()->caching = $saved_data[3];
+		return '';
+	}
+
+	/**
+	 * Remove nocache code
+	 *
+	 * @param $match
+	 *
+	 * @return string
+	 */
+	public function removeNocache($match) {
+		$hash = $this->compiler->getTemplate()->getCompiled()->nocache_hash;
+		$code =
+			preg_replace(
+				"/((<\?php )?echo '\/\*%%SmartyNocache:{$hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$hash}%%\*\/';(\?>\n)?)/",
+				'',
+				$match[0]
+			);
+		return str_replace(['\\\'', '\\\\\''], ['\'', '\\\''], $code);
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/FunctionTag.php b/include/smarty/src/Compile/Tag/FunctionTag.php
new file mode 100644
index 000000000..c291c3dee
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/FunctionTag.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Function Class
+ *
+
+
+ */
+class FunctionTag extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $required_attributes = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles code for the {function} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		if ($_attr['nocache'] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', null, true);
+		}
+		unset($_attr['nocache']);
+		$_name = trim($_attr['name'], '\'"');
+
+		if (!preg_match('/^[a-zA-Z0-9_\x80-\xff]+$/', $_name)) {
+			$compiler->trigger_template_error("Function name contains invalid characters: {$_name}", null, true);
+		}
+
+		$compiler->getParentCompiler()->tpl_function[$_name] = [];
+		$save = [
+			$_attr, $compiler->getParser()->current_buffer, $compiler->getTemplate()->getCompiled()->getNocacheCode(),
+			$compiler->getTemplate()->caching,
+		];
+		$this->openTag($compiler, 'function', $save);
+		// Init temporary context
+		$compiler->getParser()->current_buffer = new \Smarty\ParseTree\Template();
+		$compiler->getTemplate()->getCompiled()->setNocacheCode(false);
+		return '';
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/IfClose.php b/include/smarty/src/Compile/Tag/IfClose.php
new file mode 100644
index 000000000..df15094f1
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/IfClose.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile If
+ * Compiles the {if} {else} {elseif} {/if} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Ifclose Class
+ *
+
+
+ */
+class IfClose extends Base {
+
+	/**
+	 * Compiles code for the {/if} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		[$nesting, $nocache_pushed] = $this->closeTag($compiler, ['if', 'else', 'elseif']);
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		$tmp = '';
+		for ($i = 0; $i < $nesting; $i++) {
+			$tmp .= '}';
+		}
+		return "<?php {$tmp}?>";
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/IfTag.php b/include/smarty/src/Compile/Tag/IfTag.php
new file mode 100644
index 000000000..7790859b1
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/IfTag.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile If Class
+ *
+
+
+ */
+class IfTag extends Base {
+
+	/**
+	 * Compiles code for the {if} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this block
+			$this->openTag($compiler, 'nocache');
+		}
+
+		$this->openTag($compiler, 'if', [1, $compiler->tag_nocache]);
+
+		if (!isset($parameter['if condition'])) {
+			$compiler->trigger_template_error('missing if condition', null, true);
+		}
+		if (is_array($parameter['if condition'])) {
+			if (is_array($parameter['if condition']['var'])) {
+				$var = $parameter['if condition']['var']['var'];
+			} else {
+				$var = $parameter['if condition']['var'];
+			}
+			if ($compiler->isNocacheActive()) {
+				// create nocache var to make it know for further compiling
+				$compiler->setNocacheInVariable($var);
+			}
+			$prefixVar = $compiler->getNewPrefixVariable();
+			$_output = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
+			$assignAttr = [];
+			$assignAttr[]['value'] = $prefixVar;
+			$assignCompiler = new Assign();
+			if (is_array($parameter['if condition']['var'])) {
+				$assignAttr[]['var'] = $parameter['if condition']['var']['var'];
+				$_output .= $assignCompiler->compile(
+					$assignAttr,
+					$compiler,
+					['smarty_internal_index' => $parameter['if condition']['var']['smarty_internal_index']]
+				);
+			} else {
+				$assignAttr[]['var'] = $parameter['if condition']['var'];
+				$_output .= $assignCompiler->compile($assignAttr, $compiler, []);
+			}
+			$_output .= "<?php if ({$prefixVar}) {?>";
+			return $_output;
+		} else {
+			return "<?php if ({$parameter['if condition']}) {?>";
+		}
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/IncludeTag.php b/include/smarty/src/Compile/Tag/IncludeTag.php
new file mode 100644
index 000000000..8e775811e
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/IncludeTag.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Include
+ * Compiles the {include} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+use Smarty\Compiler\Template;
+use Smarty\Data;
+use Smarty\Smarty;
+use Smarty\Template\Compiled;
+
+/**
+ * Smarty Internal Plugin Compile Include Class
+ *
+
+
+ */
+class IncludeTag extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	protected $required_attributes = ['file'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	protected $shorttag_order = ['file'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	protected $option_flags = ['nocache', 'inline', 'caching'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	protected $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles code for the {include} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 *
+	 * @return string
+	 * @throws \Exception
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$uid = $t_hash = null;
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$fullResourceName = $source_resource = $_attr['file'];
+		$variable_template = false;
+		// parse resource_name
+		if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
+			$type = !empty($match[3]) ? $match[3] : $compiler->getTemplate()->getSmarty()->default_resource_type;
+			$name = !empty($match[5]) ? $match[5] : $match[6];
+			$handler = \Smarty\Resource\BasePlugin::load($compiler->getSmarty(), $type);
+			if ($handler->recompiled) {
+				$variable_template = true;
+			}
+			if (!$variable_template) {
+				if ($type !== 'string') {
+					$fullResourceName = "{$type}:{$name}";
+					$compiled = $compiler->getParentCompiler()->getTemplate()->getCompiled();
+					if (isset($compiled->includes[$fullResourceName])) {
+						$compiled->includes[$fullResourceName]++;
+					} else {
+						if ("{$compiler->getTemplate()->getSource()->type}:{$compiler->getTemplate()->getSource()->name}" ==
+							$fullResourceName
+						) {
+							// recursive call of current template
+							$compiled->includes[$fullResourceName] = 2;
+						} else {
+							$compiled->includes[$fullResourceName] = 1;
+						}
+					}
+					$fullResourceName = $match[1] . $fullResourceName . $match[1];
+				}
+			}
+		}
+		// scope setup
+		$_scope = isset($_attr['scope']) ? $this->convertScope($_attr['scope']) : 0;
+
+		// assume caching is off
+		$_caching = Smarty::CACHING_OFF;
+
+		// caching was on and {include} is not in nocache mode
+		if ($compiler->getTemplate()->caching && !$compiler->isNocacheActive()) {
+			$_caching = \Smarty\Template::CACHING_NOCACHE_CODE;
+		}
+
+		/*
+		* if the {include} tag provides individual parameter for caching or compile_id
+		* the subtemplate must not be included into the common cache file and is treated like
+		* a call in nocache mode.
+		*
+		*/
+
+		$call_nocache = $compiler->isNocacheActive();
+		if ($_attr['nocache'] !== true && $_attr['caching']) {
+			$_caching = $_new_caching = (int)$_attr['caching'];
+			$call_nocache = true;
+		} else {
+			$_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
+		}
+		if (isset($_attr['cache_lifetime'])) {
+			$_cache_lifetime = $_attr['cache_lifetime'];
+			$call_nocache = true;
+			$_caching = $_new_caching;
+		} else {
+			$_cache_lifetime = '$_smarty_tpl->cache_lifetime';
+		}
+		if (isset($_attr['cache_id'])) {
+			$_cache_id = $_attr['cache_id'];
+			$call_nocache = true;
+			$_caching = $_new_caching;
+		} else {
+			$_cache_id = '$_smarty_tpl->cache_id';
+		}
+
+		// assign attribute
+		if (isset($_attr['assign'])) {
+			// output will be stored in a smarty variable instead of being displayed
+			if ($_assign = $compiler->getId($_attr['assign'])) {
+				$_assign = "'{$_assign}'";
+				if ($call_nocache) {
+					// create nocache var to make it know for further compiling
+					$compiler->setNocacheInVariable($_attr['assign']);
+				}
+			} else {
+				$_assign = $_attr['assign'];
+			}
+		}
+		$has_compiled_template = false;
+
+		// delete {include} standard attributes
+		unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
+		// remaining attributes must be assigned as smarty variable
+		$_vars = 'array()';
+		if (!empty($_attr)) {
+			$_pairs = [];
+			// create variables
+			foreach ($_attr as $key => $value) {
+				$_pairs[] = "'$key'=>$value";
+			}
+			$_vars = 'array(' . join(',', $_pairs) . ')';
+		}
+		if ($call_nocache) {
+			$compiler->tag_nocache = true;
+		}
+		$_output = "<?php ";
+		// was there an assign attribute
+		if (isset($_assign)) {
+			$_output .= "ob_start();\n";
+		}
+		$_output .= "\$_smarty_tpl->renderSubTemplate({$fullResourceName}, $_cache_id, \$_smarty_tpl->compile_id, " .
+			"$_caching, $_cache_lifetime, $_vars, (int) {$_scope}, \$_smarty_current_dir);\n";
+		if (isset($_assign)) {
+			$_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean(), false, {$_scope});\n";
+		}
+		$_output .= "?>";
+		return $_output;
+	}
+
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php b/include/smarty/src/Compile/Tag/Inheritance.php
similarity index 58%
rename from include/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php
rename to include/smarty/src/Compile/Tag/Inheritance.php
index d90262e60..6764651a1 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php
+++ b/include/smarty/src/Compile/Tag/Inheritance.php
@@ -1,44 +1,49 @@
 <?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Shared Inheritance
  * Shared methods for {extends} and {block} tags
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Shared Inheritance Class
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  */
-class Smarty_Internal_Compile_Shared_Inheritance extends Smarty_Internal_CompileBase
+abstract class Inheritance extends Base
 {
     /**
      * Compile inheritance initialization code as prefix
      *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param \Smarty\Compiler\Template $compiler
      * @param bool|false                            $initChildSequence if true force child template
      */
-    public static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    public static function postCompile(\Smarty\Compiler\Template $compiler, $initChildSequence = false)
     {
-        $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " .
+        $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->getInheritance()->init(\$_smarty_tpl, " .
                                          var_export($initChildSequence, true) . ");\n?>\n";
     }
 
     /**
      * Register post compile callback to compile inheritance initialization code
      *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param \Smarty\Compiler\Template $compiler
      * @param bool|false                            $initChildSequence if true force child template
      */
-    public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    public function registerInit(\Smarty\Compiler\Template $compiler, $initChildSequence = false)
     {
         if ($initChildSequence || !isset($compiler->_cache[ 'inheritanceInit' ])) {
             $compiler->registerPostCompileCallback(
-                array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
+                array(self::class, 'postCompile'),
                 array($initChildSequence),
                 'inheritanceInit',
                 $initChildSequence
diff --git a/include/smarty/src/Compile/Tag/Ldelim.php b/include/smarty/src/Compile/Tag/Ldelim.php
new file mode 100644
index 000000000..a265fa70c
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/Ldelim.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Ldelim
+ * Compiles the {ldelim} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Ldelim Class
+ *
+
+
+ */
+class Ldelim extends Base {
+
+	/**
+	 * Compiles code for the {ldelim} tag
+	 * This tag does output the left delimiter
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$_attr = $this->getAttributes($compiler, $args);
+		if ($_attr['nocache'] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', null, true);
+		}
+		return $compiler->getTemplate()->getLeftDelimiter();
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/Nocache.php b/include/smarty/src/Compile/Tag/Nocache.php
new file mode 100644
index 000000000..dd30f8937
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/Nocache.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Nocache Class
+ *
+
+
+ */
+class Nocache extends Base {
+
+	/**
+	 * Array of names of valid option flags
+	 *
+	 * @var array
+	 */
+	protected $option_flags = [];
+
+	/**
+	 * Compiles code for the {nocache} tag
+	 * This tag does not generate compiled output. It only sets a compiler flag.
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$this->openTag($compiler, 'nocache');
+		return '';
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/NocacheClose.php b/include/smarty/src/Compile/Tag/NocacheClose.php
new file mode 100644
index 000000000..75edd9982
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/NocacheClose.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Nocache
+ * Compiles the {nocache} {/nocache} tags.
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Nocacheclose Class
+ *
+
+
+ */
+class NocacheClose extends Base {
+
+	/**
+	 * Compiles code for the {/nocache} tag
+	 * This tag does not generate compiled output. It only sets a compiler flag.
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$this->closeTag($compiler, ['nocache']);
+		return '';
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/Rdelim.php b/include/smarty/src/Compile/Tag/Rdelim.php
new file mode 100644
index 000000000..60e7a23d1
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/Rdelim.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Rdelim
+ * Compiles the {rdelim} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile Rdelim Class
+ *
+
+
+ */
+class Rdelim extends Ldelim {
+
+	/**
+	 * Compiles code for the {rdelim} tag
+	 * This tag does output the right delimiter.
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		parent::compile($args, $compiler);
+		return $compiler->getTemplate()->getRightDelimiter();
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/Section.php b/include/smarty/src/Compile/Tag/Section.php
new file mode 100644
index 000000000..136591174
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/Section.php
@@ -0,0 +1,399 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile Section Class
+ *
+
+
+ */
+class Section extends ForeachSection {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $required_attributes = ['name', 'loop'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['name', 'loop'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['start', 'step', 'max', 'show', 'properties'];
+
+	/**
+	 * counter
+	 *
+	 * @var int
+	 */
+	protected $counter = 0;
+
+	/**
+	 * Name of this tag
+	 *
+	 * @var string
+	 */
+	protected $tagName = 'section';
+
+	/**
+	 * Valid properties of $smarty.section.name.xxx variable
+	 *
+	 * @var array
+	 */
+	protected $nameProperties = [
+		'first', 'last', 'index', 'iteration', 'show', 'total', 'rownum', 'index_prev',
+		'index_next', 'loop',
+	];
+
+	/**
+	 * {section} tag has no item properties
+	 *
+	 * @var array
+	 */
+	protected $itemProperties = null;
+
+	/**
+	 * {section} tag has always name attribute
+	 *
+	 * @var bool
+	 */
+	protected $isNamed = true;
+
+	/**
+	 * Compiles code for the {section} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting++;
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$attributes = ['name' => $compiler->getId($_attr['name'])];
+		unset($_attr['name']);
+		foreach ($attributes as $a => $v) {
+			if ($v === false) {
+				$compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+			}
+		}
+		$local = "\$__section_{$attributes['name']}_" . $this->counter++ . '_';
+		$sectionVar = "\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']";
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this block
+			$this->openTag($compiler, 'nocache');
+		}
+
+		$this->openTag($compiler, 'section', ['section', $compiler->tag_nocache]);
+
+		$initLocal = [];
+		$initNamedProperty = [];
+		$initFor = [];
+		$incFor = [];
+		$cmpFor = [];
+		$propValue = [
+			'index' => "{$sectionVar}->value['index']", 'show' => 'true', 'step' => 1,
+			'iteration' => "{$local}iteration",
+		];
+		$propType = ['index' => 2, 'iteration' => 2, 'show' => 0, 'step' => 0,];
+		// search for used tag attributes
+		$this->scanForProperties($attributes, $compiler);
+		if (!empty($this->matchResults['named'])) {
+			$namedAttr = $this->matchResults['named'];
+		}
+		if (isset($_attr['properties']) && preg_match_all("/['](.*?)[']/", $_attr['properties'], $match)) {
+			foreach ($match[1] as $prop) {
+				if (in_array($prop, $this->nameProperties)) {
+					$namedAttr[$prop] = true;
+				} else {
+					$compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+				}
+			}
+		}
+		$namedAttr['index'] = true;
+		$output = "<?php\n";
+		foreach ($_attr as $attr_name => $attr_value) {
+			switch ($attr_name) {
+				case 'loop':
+					if (is_numeric($attr_value)) {
+						$v = (int)$attr_value;
+						$t = 0;
+					} else {
+						$v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
+						$t = 1;
+					}
+					if ($t === 1) {
+						$initLocal['loop'] = $v;
+						$v = "{$local}loop";
+					}
+					break;
+				case 'show':
+					if (is_bool($attr_value)) {
+						$v = $attr_value ? 'true' : 'false';
+						$t = 0;
+					} else {
+						$v = "(bool) $attr_value";
+						$t = 3;
+					}
+					break;
+				case 'step':
+					if (is_numeric($attr_value)) {
+						$v = (int)$attr_value;
+						$v = ($v === 0) ? 1 : $v;
+						$t = 0;
+						break;
+					}
+					$initLocal['step'] = "((int)@$attr_value) === 0 ? 1 : (int)@$attr_value";
+					$v = "{$local}step";
+					$t = 2;
+					break;
+				case 'max':
+				case 'start':
+					if (is_numeric($attr_value)) {
+						$v = (int)$attr_value;
+						$t = 0;
+						break;
+					}
+					$v = "(int)@$attr_value";
+					$t = 3;
+					break;
+			}
+			if ($t === 3 && $compiler->getId($attr_value)) {
+				$t = 1;
+			}
+			$propValue[$attr_name] = $v;
+			$propType[$attr_name] = $t;
+		}
+		if (isset($namedAttr['step'])) {
+			$initNamedProperty['step'] = $propValue['step'];
+		}
+		if (isset($namedAttr['iteration'])) {
+			$propValue['iteration'] = "{$sectionVar}->value['iteration']";
+		}
+		$incFor['iteration'] = "{$propValue['iteration']}++";
+		$initFor['iteration'] = "{$propValue['iteration']} = 1";
+		if ($propType['step'] === 0) {
+			if ($propValue['step'] === 1) {
+				$incFor['index'] = "{$sectionVar}->value['index']++";
+			} elseif ($propValue['step'] > 1) {
+				$incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+			} else {
+				$incFor['index'] = "{$sectionVar}->value['index'] -= " . -$propValue['step'];
+			}
+		} else {
+			$incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+		}
+		if (!isset($propValue['max'])) {
+			$propValue['max'] = $propValue['loop'];
+			$propType['max'] = $propType['loop'];
+		} elseif ($propType['max'] !== 0) {
+			$propValue['max'] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
+			$propType['max'] = 1;
+		} else {
+			if ($propValue['max'] < 0) {
+				$propValue['max'] = $propValue['loop'];
+				$propType['max'] = $propType['loop'];
+			}
+		}
+		if (!isset($propValue['start'])) {
+			$start_code =
+				[1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue['loop'], 5 => ' - 1'];
+			if ($propType['loop'] === 0) {
+				$start_code[5] = '';
+				$start_code[4] = $propValue['loop'] - 1;
+			}
+			if ($propType['step'] === 0) {
+				if ($propValue['step'] > 0) {
+					$start_code = [1 => '0'];
+					$propType['start'] = 0;
+				} else {
+					$start_code[1] = $start_code[2] = $start_code[3] = '';
+					$propType['start'] = $propType['loop'];
+				}
+			} else {
+				$propType['start'] = 1;
+			}
+			$propValue['start'] = join('', $start_code);
+		} else {
+			$start_code =
+				[
+					1 => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ", 4 => '0',
+					5 => ' : ', 6 => '-1', 7 => ', ', 8 => "{$propValue['start']} + {$propValue['loop']}", 10 => ')',
+					11 => ' : ', 12 => 'min(', 13 => $propValue['start'], 14 => ', ',
+					15 => "{$propValue['step']} > 0 ? ", 16 => $propValue['loop'], 17 => ' : ',
+					18 => $propType['loop'] === 0 ? $propValue['loop'] - 1 : "{$propValue['loop']} - 1",
+					19 => ')',
+				];
+			if ($propType['step'] === 0) {
+				$start_code[3] = $start_code[5] = $start_code[15] = $start_code[17] = '';
+				if ($propValue['step'] > 0) {
+					$start_code[6] = $start_code[18] = '';
+				} else {
+					$start_code[4] = $start_code[16] = '';
+				}
+			}
+			if ($propType['start'] === 0) {
+				if ($propType['loop'] === 0) {
+					$start_code[8] = $propValue['start'] + $propValue['loop'];
+				}
+				$propType['start'] = $propType['step'] + $propType['loop'];
+				$start_code[1] = '';
+				if ($propValue['start'] < 0) {
+					for ($i = 11; $i <= 19; $i++) {
+						$start_code[$i] = '';
+					}
+					if ($propType['start'] === 0) {
+						$start_code = [
+							max(
+								$propValue['step'] > 0 ? 0 : -1,
+								$propValue['start'] + $propValue['loop']
+							),
+						];
+					}
+				} else {
+					for ($i = 1; $i <= 11; $i++) {
+						$start_code[$i] = '';
+					}
+					if ($propType['start'] === 0) {
+						$start_code =
+							[
+								min(
+									$propValue['step'] > 0 ? $propValue['loop'] : $propValue['loop'] - 1,
+									$propValue['start']
+								),
+							];
+					}
+				}
+			}
+			$propValue['start'] = join('', $start_code);
+		}
+		if ($propType['start'] !== 0) {
+			$initLocal['start'] = $propValue['start'];
+			$propValue['start'] = "{$local}start";
+		}
+		$initFor['index'] = "{$sectionVar}->value['index'] = {$propValue['start']}";
+		if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
+			$propValue['total'] = $propValue['loop'];
+			$propType['total'] = $propType['loop'];
+		} else {
+			$propType['total'] =
+				$propType['start'] + $propType['loop'] + $propType['step'] + $propType['max'];
+			if ($propType['total'] === 0) {
+				$propValue['total'] =
+					min(
+						ceil(
+							($propValue['step'] > 0 ? $propValue['loop'] - $propValue['start'] :
+								(int)$propValue['start'] + 1) / abs($propValue['step'])
+						),
+						$propValue['max']
+					);
+			} else {
+				$total_code = [
+					1 => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
+					5 => $propValue['loop'], 6 => ' - ', 7 => $propValue['start'], 8 => ' : ',
+					9 => $propValue['start'], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
+					14 => $propValue['step'], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",
+				];
+				if (!isset($propValue['max'])) {
+					$total_code[1] = $total_code[17] = '';
+				}
+				if ($propType['loop'] + $propType['start'] === 0) {
+					$total_code[5] = $propValue['loop'] - $propValue['start'];
+					$total_code[6] = $total_code[7] = '';
+				}
+				if ($propType['start'] === 0) {
+					$total_code[9] = (int)$propValue['start'] + 1;
+					$total_code[10] = '';
+				}
+				if ($propType['step'] === 0) {
+					$total_code[13] = $total_code[15] = '';
+					if ($propValue['step'] === 1 || $propValue['step'] === -1) {
+						$total_code[2] = $total_code[12] = $total_code[14] = $total_code[16] = '';
+					} elseif ($propValue['step'] < 0) {
+						$total_code[14] = -$propValue['step'];
+					}
+					$total_code[4] = '';
+					if ($propValue['step'] > 0) {
+						$total_code[8] = $total_code[9] = $total_code[10] = '';
+					} else {
+						$total_code[5] = $total_code[6] = $total_code[7] = $total_code[8] = '';
+					}
+				}
+				$propValue['total'] = join('', $total_code);
+			}
+		}
+		if (isset($namedAttr['loop'])) {
+			$initNamedProperty['loop'] = "'loop' => {$propValue['loop']}";
+		}
+		if (isset($namedAttr['total'])) {
+			$initNamedProperty['total'] = "'total' => {$propValue['total']}";
+			if ($propType['total'] > 0) {
+				$propValue['total'] = "{$sectionVar}->value['total']";
+			}
+		} elseif ($propType['total'] > 0) {
+			$initLocal['total'] = $propValue['total'];
+			$propValue['total'] = "{$local}total";
+		}
+		$cmpFor['iteration'] = "{$propValue['iteration']} <= {$propValue['total']}";
+		foreach ($initLocal as $key => $code) {
+			$output .= "{$local}{$key} = {$code};\n";
+		}
+		$_vars = 'array(' . join(', ', $initNamedProperty) . ')';
+		$output .= "{$sectionVar} = new \\Smarty\\Variable({$_vars});\n";
+		$cond_code = "{$propValue['total']} !== 0";
+		if ($propType['total'] === 0) {
+			if ($propValue['total'] === 0) {
+				$cond_code = 'false';
+			} else {
+				$cond_code = 'true';
+			}
+		}
+		if ($propType['show'] > 0) {
+			$output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n";
+			$output .= "if ({$local}show) {\n";
+		} elseif ($propValue['show'] === 'true') {
+			$output .= "if ({$cond_code}) {\n";
+		} else {
+			$output .= "if (false) {\n";
+		}
+		$jinit = join(', ', $initFor);
+		$jcmp = join(', ', $cmpFor);
+		$jinc = join(', ', $incFor);
+		$output .= "for ({$jinit}; {$jcmp}; {$jinc}){\n";
+		if (isset($namedAttr['rownum'])) {
+			$output .= "{$sectionVar}->value['rownum'] = {$propValue['iteration']};\n";
+		}
+		if (isset($namedAttr['index_prev'])) {
+			$output .= "{$sectionVar}->value['index_prev'] = {$propValue['index']} - {$propValue['step']};\n";
+		}
+		if (isset($namedAttr['index_next'])) {
+			$output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n";
+		}
+		if (isset($namedAttr['first'])) {
+			$output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} === 1);\n";
+		}
+		if (isset($namedAttr['last'])) {
+			$output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} === {$propValue['total']});\n";
+		}
+		$output .= '?>';
+		return $output;
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/SectionClose.php b/include/smarty/src/Compile/Tag/SectionClose.php
new file mode 100644
index 000000000..24c79c32a
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/SectionClose.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Section
+ * Compiles the {section} {sectionelse} {/section} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Sectionclose Class
+ */
+class SectionClose extends Base {
+
+	/**
+	 * Compiles code for the {/section} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting--;
+
+		[$openTag, $nocache_pushed] = $this->closeTag($compiler, ['section', 'sectionelse']);
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+		}
+
+		$output = "<?php\n";
+		if ($openTag === 'sectionelse') {
+			$output .= "}\n";
+		} else {
+			$output .= "}\n}\n";
+		}
+		$output .= '?>';
+		return $output;
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/SectionElse.php b/include/smarty/src/Compile/Tag/SectionElse.php
new file mode 100644
index 000000000..b9ea56366
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/SectionElse.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Sectionelse Class
+ *
+
+
+ */
+class SectionElse extends Base {
+
+	/**
+	 * Compiles code for the {sectionelse} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		[$openTag, $nocache_pushed] = $this->closeTag($compiler, ['section']);
+		$this->openTag($compiler, 'sectionelse', ['sectionelse', $nocache_pushed]);
+		return "<?php }} else {\n ?>";
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/Setfilter.php b/include/smarty/src/Compile/Tag/Setfilter.php
new file mode 100644
index 000000000..9da2f969c
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/Setfilter.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Setfilter Class
+ *
+
+
+ */
+class Setfilter extends Base {
+
+	/**
+	 * Compiles code for setfilter tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->variable_filter_stack[] = $compiler->getSmarty()->getDefaultModifiers();
+
+		// The modifier_list is passed as an array of array's. The inner arrays have the modifier at index 0,
+		// and, possibly, parameters at subsequent indexes, e.g. [ ['escape','"mail"'] ]
+		// We will collapse them so the syntax is OK for ::setDefaultModifiers() as follows: [ 'escape:"mail"' ]
+		$newList = [];
+		foreach($parameter['modifier_list'] as $modifier) {
+			$newList[] = implode(':', $modifier);
+		}
+
+		$compiler->getSmarty()->setDefaultModifiers($newList);
+
+		return '';
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compile/Tag/SetfilterClose.php b/include/smarty/src/Compile/Tag/SetfilterClose.php
new file mode 100644
index 000000000..2814f641d
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/SetfilterClose.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Setfilter
+ * Compiles code for setfilter tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Setfilterclose Class
+ *
+
+
+ */
+class SetfilterClose extends Base {
+
+	/**
+	 * Compiles code for the {/setfilter} tag
+	 * This tag does not generate compiled output. It resets variable filter.
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$this->getAttributes($compiler, $args);
+
+		// reset variable filter to previous state
+		$compiler->getSmarty()->setDefaultModifiers(
+			count($compiler->variable_filter_stack) ? array_pop($compiler->variable_filter_stack) : []
+		);
+
+		return '';
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/WhileClose.php b/include/smarty/src/Compile/Tag/WhileClose.php
new file mode 100644
index 000000000..5adb3a49b
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/WhileClose.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile While
+ * Compiles the {while} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Whileclose Class
+ *
+
+
+ */
+class WhileClose extends Base {
+
+	/**
+	 * Compiles code for the {/while} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting--;
+
+		$nocache_pushed = $this->closeTag($compiler, ['while']);
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		return "<?php }?>\n";
+	}
+}
diff --git a/include/smarty/src/Compile/Tag/WhileTag.php b/include/smarty/src/Compile/Tag/WhileTag.php
new file mode 100644
index 000000000..3300b5075
--- /dev/null
+++ b/include/smarty/src/Compile/Tag/WhileTag.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile While Class
+ *
+
+
+ */
+class WhileTag extends Base {
+
+	/**
+	 * Compiles code for the {while} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting++;
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this block
+			$this->openTag($compiler, 'nocache');
+		}
+
+		$this->openTag($compiler, 'while', $compiler->tag_nocache);
+
+		if (!array_key_exists('if condition', $parameter)) {
+			$compiler->trigger_template_error('missing while condition', null, true);
+		}
+
+		if (is_array($parameter['if condition'])) {
+			if ($compiler->isNocacheActive()) {
+				// create nocache var to make it know for further compiling
+				if (is_array($parameter['if condition']['var'])) {
+					$var = $parameter['if condition']['var']['var'];
+				} else {
+					$var = $parameter['if condition']['var'];
+				}
+				$compiler->setNocacheInVariable($var);
+			}
+			$prefixVar = $compiler->getNewPrefixVariable();
+			$assignCompiler = new Assign();
+			$assignAttr = [];
+			$assignAttr[]['value'] = $prefixVar;
+			if (is_array($parameter['if condition']['var'])) {
+				$assignAttr[]['var'] = $parameter['if condition']['var']['var'];
+				$_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
+				$_output .= $assignCompiler->compile(
+					$assignAttr,
+					$compiler,
+					['smarty_internal_index' => $parameter['if condition']['var']['smarty_internal_index']]
+				);
+			} else {
+				$assignAttr[]['var'] = $parameter['if condition']['var'];
+				$_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
+				$_output .= $assignCompiler->compile($assignAttr, $compiler, []);
+			}
+			return $_output;
+		} else {
+			return "<?php\n while ({$parameter['if condition']}) {?>";
+		}
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compiler/BaseCompiler.php b/include/smarty/src/Compiler/BaseCompiler.php
new file mode 100644
index 000000000..78c35a697
--- /dev/null
+++ b/include/smarty/src/Compiler/BaseCompiler.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Smarty\Compiler;
+
+use Smarty\Smarty;
+
+abstract class BaseCompiler {
+
+	/**
+	 * Smarty object
+	 *
+	 * @var Smarty
+	 */
+	protected $smarty = null;
+
+	/**
+	 * @return Smarty|null
+	 */
+	public function getSmarty(): Smarty {
+		return $this->smarty;
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Compiler/CodeFrame.php b/include/smarty/src/Compiler/CodeFrame.php
new file mode 100644
index 000000000..d0e1cc120
--- /dev/null
+++ b/include/smarty/src/Compiler/CodeFrame.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Smarty\Compiler;
+
+use Smarty\Exception;
+
+/**
+ * Smarty Internal Extension
+ * This file contains the Smarty template extension to create a code frame
+ *
+ * @author     Uwe Tews
+ */
+
+/**
+ * Create code frame for compiled and cached templates
+ */
+class CodeFrame
+{
+
+	/**
+	 * @var \Smarty\Template
+	 */
+	private $_template;
+
+	public function __construct(\Smarty\Template $_template) {
+		$this->_template = $_template;
+	}
+
+	/**
+	 * Create code frame for compiled and cached templates
+	 *
+	 * @param string $content optional template content
+	 * @param string $functions compiled template function and block code
+	 * @param bool $cache flag for cache file
+	 * @param Template|null $compiler
+	 *
+	 * @return string
+	 * @throws Exception
+*/
+    public function create(
+        $content = '',
+        $functions = '',
+        $cache = false,
+        ?\Smarty\Compiler\Template $compiler = null
+    ) {
+        // build property code
+        $properties[ 'version' ] = \Smarty\Smarty::SMARTY_VERSION;
+        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+        if (!$cache) {
+            $properties[ 'has_nocache_code' ] = $this->_template->getCompiled()->getNocacheCode();
+            $properties[ 'file_dependency' ] = $this->_template->getCompiled()->file_dependency;
+            $properties[ 'includes' ] = $this->_template->getCompiled()->includes;
+        } else {
+            $properties[ 'has_nocache_code' ] = $this->_template->getCached()->getNocacheCode();
+            $properties[ 'file_dependency' ] = $this->_template->getCached()->file_dependency;
+            $properties[ 'cache_lifetime' ] = $this->_template->cache_lifetime;
+        }
+        $output = sprintf(
+			"<?php\n/* Smarty version %s, created on %s\n  from '%s' */\n\n",
+            $properties[ 'version' ],
+	        date("Y-m-d H:i:s"),
+	        str_replace('*/', '* /', $this->_template->getSource()->getFullResourceName())
+        );
+        $output .= "/* @var \\Smarty\\Template \$_smarty_tpl */\n";
+        $dec = "\$_smarty_tpl->" . ($cache ? "getCached()" : "getCompiled()");
+		$dec .= "->isFresh(\$_smarty_tpl, " . var_export($properties, true) . ')';
+        $output .= "if ({$dec}) {\n";
+        $output .= "function {$properties['unifunc']} (\\Smarty\\Template \$_smarty_tpl) {\n";
+
+		$output .= $this->insertLocalVariables();
+
+        if (!$cache && !empty($compiler->tpl_function)) {
+            $output .= '$_smarty_tpl->getSmarty()->getRuntime(\'TplFunction\')->registerTplFunctions($_smarty_tpl, ';
+            $output .= var_export($compiler->tpl_function, true);
+            $output .= ");\n";
+        }
+        if ($cache && $this->_template->getSmarty()->hasRuntime('TplFunction')) {
+			if ($tplfunctions = $this->_template->getSmarty()->getRuntime('TplFunction')->getTplFunction($this->_template)) {
+				$output .= "\$_smarty_tpl->getSmarty()->getRuntime('TplFunction')->registerTplFunctions(\$_smarty_tpl, " .
+					var_export($tplfunctions, true) . ");\n";
+			}
+        }
+        $output .= "?>";
+        $output .= $content;
+        $output .= "<?php }\n?>";
+        $output .= $functions;
+        $output .= "<?php }\n";
+        // remove unneeded PHP tags
+        if (preg_match('/\s*\?>[\n]?<\?php\s*/', $output)) {
+            $curr_split = preg_split(
+                '/\s*\?>[\n]?<\?php\s*/',
+                $output
+            );
+            preg_match_all(
+                '/\s*\?>[\n]?<\?php\s*/',
+                $output,
+                $curr_parts
+            );
+            $output = '';
+            foreach ($curr_split as $idx => $curr_output) {
+                $output .= $curr_output;
+                if (isset($curr_parts[ 0 ][ $idx ])) {
+                    $output .= "\n";
+                }
+            }
+        }
+        if (preg_match('/\?>\s*$/', $output)) {
+            $curr_split = preg_split(
+                '/\?>\s*$/',
+                $output
+            );
+            $output = '';
+            foreach ($curr_split as $idx => $curr_output) {
+                $output .= $curr_output;
+            }
+        }
+        return $output;
+    }
+
+	/**
+	 * @return string
+	 */
+	public function insertLocalVariables(): string {
+		return '$_smarty_current_dir = ' . var_export(dirname($this->_template->getSource()->getFilepath() ?? '.'), true) . ";\n";
+	}
+}
diff --git a/include/smarty/src/Compiler/Configfile.php b/include/smarty/src/Compiler/Configfile.php
new file mode 100644
index 000000000..84c14f9e7
--- /dev/null
+++ b/include/smarty/src/Compiler/Configfile.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Smarty Internal Plugin Config File Compiler
+ * This is the config file compiler class. It calls the lexer and parser to
+ * perform the compiling.
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compiler;
+use Smarty\Lexer\ConfigfileLexer;
+use Smarty\Parser\ConfigfileParser;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\CompilerException;
+
+/**
+ * Main config file compiler class
+ *
+
+
+ */
+class Configfile extends BaseCompiler {
+
+	/**
+	 * Lexer object
+	 *
+	 * @var ConfigfileLexer
+	 */
+	public $lex;
+
+	/**
+	 * Parser object
+	 *
+	 * @var ConfigfileParser
+	 */
+	public $parser;
+
+	/**
+	 * Smarty object
+	 *
+	 * @var Smarty object
+	 */
+	public $smarty;
+
+	/**
+	 * Smarty object
+	 *
+	 * @var Template object
+	 */
+	public $template;
+
+	/**
+	 * Compiled config data sections and variables
+	 *
+	 * @var array
+	 */
+	public $config_data = [];
+
+	/**
+	 * Initialize compiler
+	 *
+	 * @param Smarty $smarty global instance
+	 */
+	public function __construct(Smarty $smarty) {
+		$this->smarty = $smarty;
+		$this->config_data['sections'] = [];
+		$this->config_data['vars'] = [];
+	}
+
+	/**
+	 * Method to compile Smarty config source.
+	 *
+	 * @param Template $template
+	 *
+	 * @return bool true if compiling succeeded, false if it failed
+	 * @throws \Smarty\Exception
+	 */
+	public function compileTemplate(Template $template) {
+		$this->template = $template;
+		$this->template->getCompiled()->file_dependency[$this->template->getSource()->uid] =
+			[
+				$this->template->getSource()->getResourceName(),
+				$this->template->getSource()->getTimeStamp(),
+				$this->template->getSource()->type,
+			];
+		if ($this->smarty->debugging) {
+			$this->smarty->getDebug()->start_compile($this->template);
+		}
+		// init the lexer/parser to compile the config file
+		/* @var ConfigfileLexer $this->lex */
+		$this->lex = new ConfigfileLexer(
+			str_replace(
+				[
+					"\r\n",
+					"\r",
+				],
+				"\n",
+				$template->getSource()->getContent()
+			) . "\n",
+			$this
+		);
+
+		$this->parser = new ConfigfileParser($this->lex, $this);
+		if ($this->smarty->_parserdebug) {
+			$this->parser->PrintTrace();
+		}
+		// get tokens from lexer and parse them
+		while ($this->lex->yylex()) {
+			if ($this->smarty->_parserdebug) {
+				echo "Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token {$this->lex->value} Line {$this->lex->line} \n";
+			}
+			$this->parser->doParse($this->lex->token, $this->lex->value);
+		}
+		// finish parsing process
+		$this->parser->doParse(0, 0);
+		if ($this->smarty->debugging) {
+			$this->smarty->getDebug()->end_compile($this->template);
+		}
+		// template header code
+		$template_header = sprintf(
+			"<?php /* Smarty version %s, created on %s\n         compiled from '%s' */ ?>\n",
+			\Smarty\Smarty::SMARTY_VERSION,
+			date("Y-m-d H:i:s"),
+			str_replace('*/', '* /', $this->template->getSource()->getFullResourceName())
+		);
+		$code = '<?php $_smarty_tpl->parent->assignConfigVars(' .
+			var_export($this->config_data, true) . ', $_smarty_tpl->getValue("sections")); ?>';
+		return $template_header . $this->template->createCodeFrame($code);
+	}
+
+	/**
+	 * display compiler error messages without dying
+	 * If parameter $args is empty it is a parser detected syntax error.
+	 * In this case the parser is called to obtain information about expected tokens.
+	 * If parameter $args contains a string this is used as error message
+	 *
+	 * @param string $args individual error message or null
+	 *
+	 * @throws CompilerException
+	 */
+	public function trigger_config_file_error($args = null) {
+		// get config source line which has error
+		$line = $this->lex->line;
+		if (isset($args)) {
+			// $line--;
+		}
+		$match = preg_split("/\n/", $this->lex->data);
+		$error_text =
+			"Syntax error in config file '{$this->template->getSource()->getFullResourceName()}' on line {$line} '{$match[$line - 1]}' ";
+		if (isset($args)) {
+			// individual error message
+			$error_text .= $args;
+		} else {
+			// expected token from parser
+			foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+				$exp_token = $this->parser->yyTokenName[$token];
+				if (isset($this->lex->smarty_token_names[$exp_token])) {
+					// token type from lexer
+					$expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
+				} else {
+					// otherwise internal token name
+					$expect[] = $this->parser->yyTokenName[$token];
+				}
+			}
+			// output parser error message
+			$error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
+		}
+		throw new CompilerException($error_text);
+	}
+}
diff --git a/include/smarty/src/Compiler/Template.php b/include/smarty/src/Compiler/Template.php
new file mode 100644
index 000000000..efc52162b
--- /dev/null
+++ b/include/smarty/src/Compiler/Template.php
@@ -0,0 +1,1512 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template Compiler Base
+ * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compiler;
+
+use Smarty\Compile\BlockCompiler;
+use Smarty\Compile\DefaultHandlerBlockCompiler;
+use Smarty\Compile\DefaultHandlerFunctionCallCompiler;
+use Smarty\Compile\ModifierCompiler;
+use Smarty\Compile\ObjectMethodBlockCompiler;
+use Smarty\Compile\ObjectMethodCallCompiler;
+use Smarty\Compile\FunctionCallCompiler;
+use Smarty\Compile\PrintExpressionCompiler;
+use Smarty\Lexer\TemplateLexer;
+use Smarty\Parser\TemplateParser;
+use Smarty\Smarty;
+use Smarty\Compile\Tag\ExtendsTag;
+use Smarty\CompilerException;
+use Smarty\Exception;
+use function array_merge;
+use function is_array;
+use function strlen;
+use function substr;
+
+/**
+ * Class SmartyTemplateCompiler
+ *
+
+
+ */
+class Template extends BaseCompiler {
+
+	/**
+	 * counter for prefix variable number
+	 *
+	 * @var int
+	 */
+	public static $prefixVariableNumber = 0;
+
+	/**
+	 * Parser object
+	 *
+	 * @var \Smarty\Parser\TemplateParser
+	 */
+	private $parser = null;
+
+	/**
+	 * hash for nocache sections
+	 *
+	 * @var mixed
+	 */
+	public $nocache_hash = null;
+
+	/**
+	 * suppress generation of nocache code
+	 *
+	 * @var bool
+	 */
+	public $suppressNocacheProcessing = false;
+
+	/**
+	 * caching enabled (copied from template object)
+	 *
+	 * @var int
+	 */
+	public $caching = 0;
+
+	/**
+	 * tag stack
+	 *
+	 * @var array
+	 */
+	private $_tag_stack = [];
+
+	/**
+	 * tag stack count
+	 *
+	 * @var array
+	 */
+	private $_tag_stack_count = [];
+
+	/**
+	 * current template
+	 *
+	 * @var \Smarty\Template
+	 */
+	private $template = null;
+
+	/**
+	 * merged included sub template data
+	 *
+	 * @var array
+	 */
+	public $mergedSubTemplatesData = [];
+
+	/**
+	 * merged sub template code
+	 *
+	 * @var array
+	 */
+	public $mergedSubTemplatesCode = [];
+
+	/**
+	 * source line offset for error messages
+	 *
+	 * @var int
+	 */
+	public $trace_line_offset = 0;
+
+	/**
+	 * trace uid
+	 *
+	 * @var string
+	 */
+	public $trace_uid = '';
+
+	/**
+	 * trace file path
+	 *
+	 * @var string
+	 */
+	public $trace_filepath = '';
+
+	/**
+	 * Template functions
+	 *
+	 * @var array
+	 */
+	public $tpl_function = [];
+
+	/**
+	 * compiled template or block function code
+	 *
+	 * @var string
+	 */
+	public $blockOrFunctionCode = '';
+
+	/**
+	 * flags for used modifier plugins
+	 *
+	 * @var array
+	 */
+	public $modifier_plugins = [];
+
+	/**
+	 * parent compiler object for merged subtemplates and template functions
+	 *
+	 * @var \Smarty\Compiler\Template
+	 */
+	private $parent_compiler = null;
+
+	/**
+	 * Flag true when compiling nocache section
+	 *
+	 * @var bool
+	 */
+	public $nocache = false;
+
+	/**
+	 * Flag true when tag is compiled as nocache
+	 *
+	 * @var bool
+	 */
+	public $tag_nocache = false;
+
+	/**
+	 * Compiled tag prefix code
+	 *
+	 * @var array
+	 */
+	public $prefix_code = [];
+
+	/**
+	 * Prefix code  stack
+	 *
+	 * @var array
+	 */
+	public $prefixCodeStack = [];
+
+	/**
+	 * A variable string was compiled
+	 *
+	 * @var bool
+	 */
+	public $has_variable_string = false;
+
+	/**
+	 * Stack for {setfilter} {/setfilter}
+	 *
+	 * @var array
+	 */
+	public $variable_filter_stack = [];
+
+	/**
+	 * Nesting count of looping tags like {foreach}, {for}, {section}, {while}
+	 *
+	 * @var int
+	 */
+	public $loopNesting = 0;
+
+	/**
+	 * Strip preg pattern
+	 *
+	 * @var string
+	 */
+	public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
+
+	/**
+	 * General storage area for tag compiler plugins
+	 *
+	 * @var array
+	 */
+	public $_cache = array();
+
+	/**
+	 * Lexer preg pattern for left delimiter
+	 *
+	 * @var string
+	 */
+	private $ldelPreg = '[{]';
+
+	/**
+	 * Lexer preg pattern for right delimiter
+	 *
+	 * @var string
+	 */
+	private $rdelPreg = '[}]';
+
+	/**
+	 * Length of right delimiter
+	 *
+	 * @var int
+	 */
+	private $rdelLength = 0;
+
+	/**
+	 * Length of left delimiter
+	 *
+	 * @var int
+	 */
+	private $ldelLength = 0;
+
+	/**
+	 * Lexer preg pattern for user literals
+	 *
+	 * @var string
+	 */
+	private $literalPreg = '';
+
+	/**
+	 * array of callbacks called when the normal compile process of template is finished
+	 *
+	 * @var array
+	 */
+	public $postCompileCallbacks = [];
+
+	/**
+	 * prefix code
+	 *
+	 * @var string
+	 */
+	public $prefixCompiledCode = '';
+
+	/**
+	 * postfix code
+	 *
+	 * @var string
+	 */
+	public $postfixCompiledCode = '';
+	/**
+	 * @var ObjectMethodBlockCompiler
+	 */
+	private $objectMethodBlockCompiler;
+	/**
+	 * @var DefaultHandlerBlockCompiler
+	 */
+	private $defaultHandlerBlockCompiler;
+	/**
+	 * @var BlockCompiler
+	 */
+	private $blockCompiler;
+	/**
+	 * @var DefaultHandlerFunctionCallCompiler
+	 */
+	private $defaultHandlerFunctionCallCompiler;
+	/**
+	 * @var FunctionCallCompiler
+	 */
+	private $functionCallCompiler;
+	/**
+	 * @var ObjectMethodCallCompiler
+	 */
+	private $objectMethodCallCompiler;
+	/**
+	 * @var ModifierCompiler
+	 */
+	private $modifierCompiler;
+	/**
+	 * @var PrintExpressionCompiler
+	 */
+	private $printExpressionCompiler;
+
+	/**
+	 * Depth of nested {nocache}{/nocache} blocks. If outside, this is 0. If inside, this is 1 or higher (if nested).
+	 * @var int
+	 */
+	private $noCacheStackDepth = 0;
+
+	/**
+	 * disabled auto-escape (when set to true, the next variable output is not auto-escaped)
+	 *
+	 * @var boolean
+	 */
+	private $raw_output = false;
+
+	/**
+	 * Initialize compiler
+	 *
+	 * @param Smarty $smarty global instance
+	 */
+	public function __construct(Smarty $smarty) {
+		$this->smarty = $smarty;
+		$this->nocache_hash = str_replace(
+			[
+				'.',
+				',',
+			],
+			'_',
+			uniqid(mt_rand(), true)
+		);
+
+		$this->modifierCompiler = new ModifierCompiler();
+		$this->functionCallCompiler = new FunctionCallCompiler();
+		$this->defaultHandlerFunctionCallCompiler = new DefaultHandlerFunctionCallCompiler();
+		$this->blockCompiler = new BlockCompiler();
+		$this->defaultHandlerBlockCompiler = new DefaultHandlerBlockCompiler();
+		$this->objectMethodBlockCompiler = new ObjectMethodBlockCompiler();
+		$this->objectMethodCallCompiler = new ObjectMethodCallCompiler();
+		$this->printExpressionCompiler = new PrintExpressionCompiler();
+	}
+
+	/**
+	 * Method to compile a Smarty template
+	 *
+	 * @param \Smarty\Template $template template object to compile
+	 *
+	 * @return string code
+	 * @throws Exception
+	 */
+	public function compileTemplate(\Smarty\Template $template) {
+		return $template->createCodeFrame(
+			$this->compileTemplateSource($template),
+			$this->smarty->runPostFilters($this->blockOrFunctionCode, $this->template) .
+			join('', $this->mergedSubTemplatesCode),
+			false,
+			$this
+		);
+	}
+
+	/**
+	 * Compile template source and run optional post filter
+	 *
+	 * @param \Smarty\Template $template
+	 * @param Template|null $parent_compiler
+	 *
+	 * @return string
+	 * @throws CompilerException
+	 * @throws Exception
+	 */
+	public function compileTemplateSource(\Smarty\Template $template, ?\Smarty\Compiler\Template $parent_compiler = null) {
+		try {
+			// save template object in compiler class
+			$this->template = $template;
+			if ($this->smarty->debugging) {
+				$this->smarty->getDebug()->start_compile($this->template);
+			}
+			$this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
+
+			if (empty($template->getCompiled()->nocache_hash)) {
+				$template->getCompiled()->nocache_hash = $this->nocache_hash;
+			} else {
+				$this->nocache_hash = $template->getCompiled()->nocache_hash;
+			}
+			$this->caching = $template->caching;
+
+			// flag for nocache sections
+			$this->nocache = false;
+			$this->tag_nocache = false;
+			// reset has nocache code flag
+			$this->template->getCompiled()->setNocacheCode(false);
+
+			$this->has_variable_string = false;
+			$this->prefix_code = [];
+			// add file dependency
+			if ($this->template->getSource()->handler->checkTimestamps()) {
+				$this->parent_compiler->getTemplate()->getCompiled()->file_dependency[$this->template->getSource()->uid] =
+					[
+						$this->template->getSource()->getResourceName(),
+						$this->template->getSource()->getTimeStamp(),
+						$this->template->getSource()->type,
+					];
+			}
+			// get template source
+			if (!empty($this->template->getSource()->components)) {
+
+				$_compiled_code = '<?php $_smarty_tpl->getInheritance()->init($_smarty_tpl, true); ?>';
+
+				$i = 0;
+				$reversed_components = array_reverse($this->template->getSource()->components);
+				foreach ($reversed_components as $source) {
+					$i++;
+					if ($i === count($reversed_components)) {
+						$_compiled_code .= '<?php $_smarty_tpl->getInheritance()->endChild($_smarty_tpl); ?>';
+					}
+					$_compiled_code .= $this->compileTag(
+						'include',
+						[
+							var_export($source->resource, true),
+							['scope' => 'parent'],
+						]
+					);
+				}
+				$_compiled_code = $this->smarty->runPostFilters($_compiled_code, $this->template);
+			} else {
+				// get template source
+				$_content = $this->template->getSource()->getContent();
+				$_compiled_code = $this->smarty->runPostFilters(
+					$this->doCompile(
+						$this->smarty->runPreFilters($_content, $this->template),
+						true
+					),
+					$this->template
+				);
+			}
+
+		} catch (\Exception $e) {
+			if ($this->smarty->debugging) {
+				$this->smarty->getDebug()->end_compile($this->template);
+			}
+			$this->_tag_stack = [];
+			// free memory
+			$this->parent_compiler = null;
+			$this->template = null;
+			$this->parser = null;
+			throw $e;
+		}
+		if ($this->smarty->debugging) {
+			$this->smarty->getDebug()->end_compile($this->template);
+		}
+		$this->parent_compiler = null;
+		$this->parser = null;
+		return $_compiled_code;
+	}
+
+	/**
+	 * Compile Tag
+	 * This is a call back from the lexer/parser
+	 *
+	 * Save current prefix code
+	 * Compile tag
+	 * Merge tag prefix code with saved one
+	 * (required nested tags in attributes)
+	 *
+	 * @param string $tag tag name
+	 * @param array $args array with tag attributes
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws Exception
+	 * @throws CompilerException
+	 */
+	public function compileTag($tag, $args, $parameter = []) {
+		$this->prefixCodeStack[] = $this->prefix_code;
+		$this->prefix_code = [];
+		$result = $this->compileTag2($tag, $args, $parameter);
+		$this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+		return $result;
+	}
+
+	/**
+	 * Compiles code for modifier execution
+	 *
+	 * @param $modifierlist
+	 * @param $value
+	 *
+	 * @return string compiled code
+	 * @throws CompilerException
+	 * @throws Exception
+	 */
+	public function compileModifier($modifierlist, $value) {
+		return $this->modifierCompiler->compile([], $this, ['modifierlist' => $modifierlist, 'value' => $value]);
+	}
+
+	/**
+	 * compile variable
+	 *
+	 * @param string $variable
+	 *
+	 * @return string
+	 */
+	public function triggerTagNoCache($variable): void {
+		if (!strpos($variable, '(')) {
+			// not a variable variable
+			$var = trim($variable, '\'');
+			$this->tag_nocache = $this->tag_nocache |
+				$this->template->getVariable(
+					$var,
+					true,
+					false
+				)->isNocache();
+		}
+	}
+
+	/**
+	 * compile config variable
+	 *
+	 * @param string $variable
+	 *
+	 * @return string
+	 */
+	public function compileConfigVariable($variable) {
+		// return '$_smarty_tpl->config_vars[' . $variable . ']';
+		return '$_smarty_tpl->getConfigVariable(' . $variable . ')';
+	}
+
+	/**
+	 * This method is called from parser to process a text content section if strip is enabled
+	 * - remove text from inheritance child templates as they may generate output
+	 *
+	 * @param string $text
+	 *
+	 * @return string
+	 */
+	public function processText($text) {
+
+		if (strpos($text, '<') === false) {
+			return preg_replace($this->stripRegEx, '', $text);
+		}
+
+		$store = [];
+		$_store = 0;
+
+		// capture html elements not to be messed with
+		$_offset = 0;
+		if (preg_match_all(
+			'#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+			$text,
+			$matches,
+			PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+		)
+		) {
+			foreach ($matches as $match) {
+				$store[] = $match[0][0];
+				$_length = strlen($match[0][0]);
+				$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+				$text = substr_replace($text, $replace, $match[0][1] - $_offset, $_length);
+				$_offset += $_length - strlen($replace);
+				$_store++;
+			}
+		}
+		$expressions = [// replace multiple spaces between tags by a single space
+			'#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s' => '\1 \2',
+			// remove newline between tags
+			'#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s' => '\1\2',
+			// remove multiple spaces between attributes (but not in attribute values!)
+			'#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+			'#>[\040\011]+$#Ss' => '> ',
+			'#>[\040\011]*[\n]\s*$#Ss' => '>',
+			$this->stripRegEx => '',
+		];
+		$text = preg_replace(array_keys($expressions), array_values($expressions), $text);
+		$_offset = 0;
+		if (preg_match_all(
+			'#@!@SMARTY:([0-9]+):SMARTY@!@#is',
+			$text,
+			$matches,
+			PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+		)
+		) {
+			foreach ($matches as $match) {
+				$_length = strlen($match[0][0]);
+				$replace = $store[$match[1][0]];
+				$text = substr_replace($text, $replace, $match[0][1] + $_offset, $_length);
+				$_offset += strlen($replace) - $_length;
+				$_store++;
+			}
+		}
+		return $text;
+	}
+
+	/**
+	 * lazy loads internal compile plugin for tag compile objects cached for reuse.
+	 *
+	 * class name format:  \Smarty\Compile\TagName
+	 *
+	 * @param string $tag tag name
+	 *
+	 * @return ?\Smarty\Compile\CompilerInterface tag compiler object or null if not found or untrusted by security policy
+	 */
+	public function getTagCompiler($tag): ?\Smarty\Compile\CompilerInterface {
+        $tag = strtolower($tag);
+
+		if (isset($this->smarty->security_policy) && !$this->smarty->security_policy->isTrustedTag($tag, $this)) {
+			return null;
+		}
+
+		foreach ($this->smarty->getExtensions() as $extension) {
+			if ($compiler = $extension->getTagCompiler($tag)) {
+				return $compiler;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * lazy loads internal compile plugin for modifier compile objects cached for reuse.
+	 *
+	 * @param string $modifier tag name
+	 *
+	 * @return bool|\Smarty\Compile\Modifier\ModifierCompilerInterface tag compiler object or false if not found or untrusted by security policy
+	 */
+	public function getModifierCompiler($modifier) {
+
+		if (isset($this->smarty->security_policy) && !$this->smarty->security_policy->isTrustedModifier($modifier, $this)) {
+			return false;
+		}
+
+		foreach ($this->smarty->getExtensions() as $extension) {
+			if ($modifierCompiler = $extension->getModifierCompiler($modifier)) {
+				return $modifierCompiler;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check for plugins by default plugin handler
+	 *
+	 * @param string $tag name of tag
+	 * @param string $plugin_type type of plugin
+	 *
+	 * @return callback|null
+	 * @throws \Smarty\CompilerException
+	 */
+	public function getPluginFromDefaultHandler($tag, $plugin_type) {
+
+		$defaultPluginHandlerFunc = $this->smarty->getDefaultPluginHandlerFunc();
+
+		if (!is_callable($defaultPluginHandlerFunc)) {
+			return null;
+		}
+
+
+		$callback = null;
+		$script = null;
+		$cacheable = true;
+
+		$result = \call_user_func_array(
+			$defaultPluginHandlerFunc,
+			[
+				$tag,
+				$plugin_type,
+				null, // This used to pass $this->template, but this parameter has been removed in 5.0
+				&$callback,
+				&$script,
+				&$cacheable,
+			]
+		);
+		if ($result) {
+			$this->tag_nocache = $this->tag_nocache || !$cacheable;
+			if ($script !== null) {
+				if (is_file($script)) {
+					include_once $script;
+				} else {
+					$this->trigger_template_error("Default plugin handler: Returned script file '{$script}' for '{$tag}' not found");
+				}
+			}
+			if (is_callable($callback)) {
+				return $callback;
+			} else {
+				$this->trigger_template_error("Default plugin handler: Returned callback for '{$tag}' not callable");
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Append code segments and remove unneeded ?> <?php transitions
+	 *
+	 * @param string $left
+	 * @param string $right
+	 *
+	 * @return string
+	 */
+	public function appendCode(string $left, string $right): string
+	{
+		if (preg_match('/\s*\?>\s?$/D', $left) && preg_match('/^<\?php\s+/', $right)) {
+			$left = preg_replace('/\s*\?>\s?$/D', "\n", $left);
+			$left .= preg_replace('/^<\?php\s+/', '', $right);
+		} else {
+			$left .= $right;
+		}
+		return $left;
+	}
+
+	/**
+	 * Inject inline code for nocache template sections
+	 * This method gets the content of each template element from the parser.
+	 * If the content is compiled code, and it should be not be cached the code is injected
+	 * into the rendered output.
+	 *
+	 * @param string $content content of template element
+	 *
+	 * @return string  content
+	 */
+	public function processNocacheCode($content) {
+
+		// If the template is not evaluated, and we have a nocache section and/or a nocache tag
+		// generate replacement code
+		if (!empty($content)
+			&& !($this->template->getSource()->handler->recompiled)
+			&& $this->caching
+			&& $this->isNocacheActive()
+		) {
+			$this->template->getCompiled()->setNocacheCode(true);
+			$_output = addcslashes($content, '\'\\');
+			$_output =
+				"<?php echo '" . $this->getNocacheBlockStartMarker() . $_output . $this->getNocacheBlockEndMarker() . "';?>\n";
+		} else {
+			$_output = $content;
+		}
+
+		$this->modifier_plugins = [];
+		$this->suppressNocacheProcessing = false;
+		$this->tag_nocache = false;
+		return $_output;
+	}
+
+
+	private function getNocacheBlockStartMarker(): string {
+		return "/*%%SmartyNocache:{$this->nocache_hash}%%*/";
+	}
+
+	private function getNocacheBlockEndMarker(): string {
+		return "/*/%%SmartyNocache:{$this->nocache_hash}%%*/";
+	}
+
+
+	/**
+	 * Get Id
+	 *
+	 * @param string $input
+	 *
+	 * @return bool|string
+	 */
+	public function getId($input) {
+		if (preg_match('~^([\'"]*)([0-9]*[a-zA-Z_]\w*)\1$~', $input, $match)) {
+			return $match[2];
+		}
+		return false;
+	}
+
+	/**
+	 * Set nocache flag in variable or create new variable
+	 *
+	 * @param string $varName
+	 */
+	public function setNocacheInVariable($varName) {
+		// create nocache var to make it know for further compiling
+		if ($_var = $this->getId($varName)) {
+			if ($this->template->hasVariable($_var)) {
+				$this->template->getVariable($_var)->setNocache(true);
+			} else {
+				$this->template->assign($_var, null, true);
+			}
+		}
+	}
+
+	/**
+	 * display compiler error messages without dying
+	 * If parameter $args is empty it is a parser detected syntax error.
+	 * In this case the parser is called to obtain information about expected tokens.
+	 * If parameter $args contains a string this is used as error message
+	 *
+	 * @param string $args individual error message or null
+	 * @param string $line line-number
+	 * @param null|bool $tagline if true the line number of last tag
+	 *
+	 * @throws \Smarty\CompilerException when an unexpected token is found
+	 */
+	public function trigger_template_error($args = null, $line = null, $tagline = null) {
+		$lex = $this->parser->lex;
+		if ($tagline === true) {
+			// get line number of Tag
+			$line = $lex->taglineno;
+		} elseif (!isset($line)) {
+			// get template source line which has error
+			$line = $lex->line;
+		} else {
+			$line = (int)$line;
+		}
+		if (in_array(
+			$this->template->getSource()->type,
+			[
+				'eval',
+				'string',
+			]
+		)
+		) {
+			$templateName = $this->template->getSource()->type . ':' . trim(
+					preg_replace(
+						'![\t\r\n]+!',
+						' ',
+						strlen($lex->data) > 40 ?
+							substr($lex->data, 0, 40) .
+							'...' : $lex->data
+					)
+				);
+		} else {
+			$templateName = $this->template->getSource()->getFullResourceName();
+		}
+		//        $line += $this->trace_line_offset;
+		$match = preg_split("/\n/", $lex->data);
+		$error_text =
+			'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
+			'"  on line ' . ($line + $this->trace_line_offset) . ' "' .
+			trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1])) . '" ';
+		if (isset($args)) {
+			// individual error message
+			$error_text .= $args;
+		} else {
+			$expect = [];
+			// expected token from parser
+			$error_text .= ' - Unexpected "' . $lex->value . '"';
+			if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
+				foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+					$exp_token = $this->parser->yyTokenName[$token];
+					if (isset($lex->smarty_token_names[$exp_token])) {
+						// token type from lexer
+						$expect[] = '"' . $lex->smarty_token_names[$exp_token] . '"';
+					} else {
+						// otherwise internal token name
+						$expect[] = $this->parser->yyTokenName[$token];
+					}
+				}
+				$error_text .= ', expected one of: ' . implode(' , ', $expect);
+			}
+		}
+		if ($this->smarty->_parserdebug) {
+			$this->parser->errorRunDown();
+			echo ob_get_clean();
+			flush();
+		}
+		$e = new CompilerException(
+			$error_text,
+			0,
+			$this->template->getSource()->getFilepath() ?? $this->template->getSource()->getFullResourceName(),
+			$line
+		);
+		$e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1]));
+		$e->desc = $args;
+		$e->template = $this->template->getSource()->getFullResourceName();
+		throw $e;
+	}
+
+	/**
+	 * Return var_export() value with all white spaces removed
+	 *
+	 * @param mixed $value
+	 *
+	 * @return string
+	 */
+	public function getVarExport($value) {
+		return preg_replace('/\s/', '', var_export($value, true));
+	}
+
+	/**
+	 *  enter double quoted string
+	 *  - save tag stack count
+	 */
+	public function enterDoubleQuote() {
+		array_push($this->_tag_stack_count, $this->getTagStackCount());
+	}
+
+	/**
+	 * Return tag stack count
+	 *
+	 * @return int
+	 */
+	public function getTagStackCount() {
+		return count($this->_tag_stack);
+	}
+
+	/**
+	 * @param $lexerPreg
+	 *
+	 * @return mixed
+	 */
+	public function replaceDelimiter($lexerPreg) {
+		return str_replace(
+			['SMARTYldel', 'SMARTYliteral', 'SMARTYrdel', 'SMARTYautoliteral', 'SMARTYal'],
+			[
+				$this->ldelPreg, $this->literalPreg, $this->rdelPreg,
+				$this->smarty->getAutoLiteral() ? '{1,}' : '{9}',
+				$this->smarty->getAutoLiteral() ? '' : '\\s*',
+			],
+			$lexerPreg
+		);
+	}
+
+	/**
+	 * Build lexer regular expressions for left and right delimiter and user defined literals
+	 */
+	public function initDelimiterPreg() {
+		$ldel = $this->smarty->getLeftDelimiter();
+		$this->ldelLength = strlen($ldel);
+		$this->ldelPreg = '';
+		foreach (str_split($ldel, 1) as $chr) {
+			$this->ldelPreg .= '[' . preg_quote($chr, '/') . ']';
+		}
+		$rdel = $this->smarty->getRightDelimiter();
+		$this->rdelLength = strlen($rdel);
+		$this->rdelPreg = '';
+		foreach (str_split($rdel, 1) as $chr) {
+			$this->rdelPreg .= '[' . preg_quote($chr, '/') . ']';
+		}
+		$literals = $this->smarty->getLiterals();
+		if (!empty($literals)) {
+			foreach ($literals as $key => $literal) {
+				$literalPreg = '';
+				foreach (str_split($literal, 1) as $chr) {
+					$literalPreg .= '[' . preg_quote($chr, '/') . ']';
+				}
+				$literals[$key] = $literalPreg;
+			}
+			$this->literalPreg = '|' . implode('|', $literals);
+		} else {
+			$this->literalPreg = '';
+		}
+	}
+
+	/**
+	 *  leave double quoted string
+	 *  - throw exception if block in string was not closed
+	 *
+	 * @throws \Smarty\CompilerException
+	 */
+	public function leaveDoubleQuote() {
+		if (array_pop($this->_tag_stack_count) !== $this->getTagStackCount()) {
+			$tag = $this->getOpenBlockTag();
+			$this->trigger_template_error(
+				"unclosed '{{$tag}}' in doubled quoted string",
+				null,
+				true
+			);
+		}
+	}
+
+	/**
+	 * Get left delimiter preg
+	 *
+	 * @return string
+	 */
+	public function getLdelPreg() {
+		return $this->ldelPreg;
+	}
+
+	/**
+	 * Get right delimiter preg
+	 *
+	 * @return string
+	 */
+	public function getRdelPreg() {
+		return $this->rdelPreg;
+	}
+
+	/**
+	 * Get length of left delimiter
+	 *
+	 * @return int
+	 */
+	public function getLdelLength() {
+		return $this->ldelLength;
+	}
+
+	/**
+	 * Get length of right delimiter
+	 *
+	 * @return int
+	 */
+	public function getRdelLength() {
+		return $this->rdelLength;
+	}
+
+	/**
+	 * Get name of current open block tag
+	 *
+	 * @return string|boolean
+	 */
+	public function getOpenBlockTag() {
+		$tagCount = $this->getTagStackCount();
+		if ($tagCount) {
+			return $this->_tag_stack[$tagCount - 1][0];
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Check if $value contains variable elements
+	 *
+	 * @param mixed $value
+	 *
+	 * @return bool|int
+	 */
+	public function isVariable($value) {
+		if (is_string($value)) {
+			return preg_match('/[$(]/', $value);
+		}
+		if (is_bool($value) || is_numeric($value)) {
+			return false;
+		}
+		if (is_array($value)) {
+			foreach ($value as $k => $v) {
+				if ($this->isVariable($k) || $this->isVariable($v)) {
+					return true;
+				}
+			}
+			return false;
+		}
+		return false;
+	}
+
+	/**
+	 * Get new prefix variable name
+	 *
+	 * @return string
+	 */
+	public function getNewPrefixVariable() {
+		++self::$prefixVariableNumber;
+		return $this->getPrefixVariable();
+	}
+
+	/**
+	 * Get current prefix variable name
+	 *
+	 * @return string
+	 */
+	public function getPrefixVariable() {
+		return '$_prefixVariable' . self::$prefixVariableNumber;
+	}
+
+	/**
+	 * append  code to prefix buffer
+	 *
+	 * @param string $code
+	 */
+	public function appendPrefixCode($code) {
+		$this->prefix_code[] = $code;
+	}
+
+	/**
+	 * get prefix code string
+	 *
+	 * @return string
+	 */
+	public function getPrefixCode() {
+		$code = '';
+		$prefixArray = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+		$this->prefixCodeStack[] = [];
+		foreach ($prefixArray as $c) {
+			$code = $this->appendCode($code, (string) $c);
+		}
+		$this->prefix_code = [];
+		return $code;
+	}
+
+	public function cStyleComment($string) {
+		return '/*' . str_replace('*/', '* /', $string) . '*/';
+	}
+
+	public function compileChildBlock() {
+		return $this->blockCompiler->compileChild($this);
+	}
+
+	public function compileParentBlock() {
+		return $this->blockCompiler->compileParent($this);
+	}
+
+	/**
+	 * Compile Tag
+	 *
+	 * @param string $tag tag name
+	 * @param array $args array with tag attributes
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws Exception
+	 * @throws CompilerException
+	 */
+	private function compileTag2($tag, $args, $parameter) {
+		// $args contains the attributes parsed and compiled by the lexer/parser
+
+		$this->handleNocacheFlag($args);
+
+		// compile built-in tags
+		if ($tagCompiler = $this->getTagCompiler($tag)) {
+			if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
+				$this->tag_nocache = $this->tag_nocache | !$tagCompiler->isCacheable();
+				$_output = $tagCompiler->compile($args, $this, $parameter);
+				if (!empty($parameter['modifierlist'])) {
+					throw new CompilerException('No modifiers allowed on ' . $tag);
+				}
+				return $_output;
+			}
+		}
+
+		// call to function previously defined by {function} tag
+		if ($this->canCompileTemplateFunctionCall($tag)) {
+
+			if (!empty($parameter['modifierlist'])) {
+				throw new CompilerException('No modifiers allowed on ' . $tag);
+			}
+
+			$args['_attr']['name'] = "'{$tag}'";
+			$tagCompiler = $this->getTagCompiler('call');
+			return $tagCompiler === null ? false : $tagCompiler->compile($args, $this, $parameter);
+		}
+
+		// remaining tastes: (object-)function, (object-function-)block, custom-compiler
+		// opening and closing tags for these are handled with the same handler
+		$base_tag = $this->getBaseTag($tag);
+
+		// check if tag is a registered object
+		if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_method'])) {
+			return $this->compileRegisteredObjectMethodCall($base_tag, $args, $parameter, $tag);
+		}
+
+		// check if tag is a function
+		if ($this->smarty->getFunctionHandler($tag)) {
+			if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
+				return (new \Smarty\Compile\PrintExpressionCompiler())->compile(
+					['nofilter'], // functions are never auto-escaped
+					$this,
+					['value' =>	$this->compileFunctionCall($tag, $args, $parameter)]
+				);
+			}
+		}
+
+		// check if tag is a block
+		if ($this->smarty->getBlockHandler($base_tag)) {
+			if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($base_tag, $this)) {
+				return $this->blockCompiler->compile($args, $this, $parameter, $tag, $base_tag);
+			}
+		}
+
+		// the default plugin handler is a handler of last resort, it may also handle not specifically registered tags.
+		if ($callback = $this->getPluginFromDefaultHandler($tag, Smarty::PLUGIN_COMPILER)) {
+			if (!empty($parameter['modifierlist'])) {
+				throw new CompilerException('No modifiers allowed on ' . $tag);
+			}
+			$tagCompiler = new \Smarty\Compile\Tag\BCPluginWrapper($callback);
+			return $tagCompiler->compile($args, $this, $parameter);
+		}
+
+		if ($this->getPluginFromDefaultHandler($base_tag, Smarty::PLUGIN_FUNCTION)) {
+			return $this->defaultHandlerFunctionCallCompiler->compile($args, $this, $parameter, $tag, $tag);
+		}
+
+		if ($this->getPluginFromDefaultHandler($base_tag, Smarty::PLUGIN_BLOCK)) {
+			return $this->defaultHandlerBlockCompiler->compile($args, $this, $parameter, $tag, $base_tag);
+		}
+
+		$this->trigger_template_error("unknown tag '{$tag}'", null, true);
+	}
+
+	/**
+	 * Sets $this->tag_nocache if attributes contain the 'nocache' flag.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return void
+	 */
+	private function handleNocacheFlag(array $attributes) {
+		foreach ($attributes as $value) {
+			if (is_string($value) && trim($value, '\'" ') == 'nocache') {
+				$this->tag_nocache = true;
+			}
+		}
+	}
+
+	private function getBaseTag($tag) {
+		if (strlen($tag) < 6 || substr($tag, -5) !== 'close') {
+			return $tag;
+		} else {
+			return substr($tag, 0, -5);
+		}
+	}
+
+	/**
+	 * Compiles the output of a variable or expression.
+	 *
+	 * @param $value
+	 * @param $attributes
+	 * @param $modifiers
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function compilePrintExpression($value, $attributes = [], $modifiers = null) {
+		$this->handleNocacheFlag($attributes);
+		return $this->printExpressionCompiler->compile($attributes, $this, [
+			'value'=> $value,
+			'modifierlist' => $modifiers,
+		]);
+	}
+
+	/**
+	 * method to compile a Smarty template
+	 *
+	 * @param mixed $_content template source
+	 * @param bool $isTemplateSource
+	 *
+	 * @return bool true if compiling succeeded, false if it failed
+	 * @throws \Smarty\CompilerException
+	 */
+	protected function doCompile($_content, $isTemplateSource = false) {
+		/* here is where the compiling takes place. Smarty
+		  tags in the templates are replaces with PHP code,
+		  then written to compiled files. */
+		// init the lexer/parser to compile the template
+		$this->parser = new TemplateParser(
+				new TemplateLexer(
+					str_replace(
+						[
+							"\r\n",
+							"\r",
+						],
+						"\n",
+						$_content
+					),
+					$this
+				),
+				$this
+			);
+		if ($isTemplateSource && $this->template->caching) {
+			$this->parser->insertPhpCode("<?php\n\$_smarty_tpl->getCompiled()->nocache_hash = '{$this->nocache_hash}';\n?>\n");
+		}
+		if ($this->smarty->_parserdebug) {
+			$this->parser->PrintTrace();
+			$this->parser->lex->PrintTrace();
+		}
+		// get tokens from lexer and parse them
+		while ($this->parser->lex->yylex()) {
+			if ($this->smarty->_parserdebug) {
+				echo "Line {$this->parser->lex->line} Parsing  {$this->parser->yyTokenName[$this->parser->lex->token]} Token " .
+					$this->parser->lex->value;
+			}
+			$this->parser->doParse($this->parser->lex->token, $this->parser->lex->value);
+		}
+		// finish parsing process
+		$this->parser->doParse(0, 0);
+		// check for unclosed tags
+		if ($this->getTagStackCount() > 0) {
+			// get stacked info
+			[$openTag, $_data] = array_pop($this->_tag_stack);
+			$this->trigger_template_error(
+				"unclosed " . $this->smarty->getLeftDelimiter() . $openTag .
+				$this->smarty->getRightDelimiter() . " tag"
+			);
+		}
+		// call post compile callbacks
+		foreach ($this->postCompileCallbacks as $cb) {
+			$callbackFunction = $cb[0];
+			$parameters = $cb;
+			$parameters[0] = $this;
+			$callbackFunction(...$parameters);
+		}
+		// return compiled code
+		return $this->prefixCompiledCode . $this->parser->retvalue . $this->postfixCompiledCode;
+	}
+
+	/**
+	 * Register a post compile callback
+	 * - when the callback is called after template compiling the compiler object will be inserted as first parameter
+	 *
+	 * @param callback $callback
+	 * @param array $parameter optional parameter array
+	 * @param string $key optional key for callback
+	 * @param bool $replace if true replace existing keyed callback
+	 */
+	public function registerPostCompileCallback($callback, $parameter = [], $key = null, $replace = false) {
+		array_unshift($parameter, $callback);
+		if (isset($key)) {
+			if ($replace || !isset($this->postCompileCallbacks[$key])) {
+				$this->postCompileCallbacks[$key] = $parameter;
+			}
+		} else {
+			$this->postCompileCallbacks[] = $parameter;
+		}
+	}
+
+	/**
+	 * Remove a post compile callback
+	 *
+	 * @param string $key callback key
+	 */
+	public function unregisterPostCompileCallback($key) {
+		unset($this->postCompileCallbacks[$key]);
+	}
+
+	/**
+	 * @param string $tag
+	 *
+	 * @return bool
+	 * @throws Exception
+	 */
+	private function canCompileTemplateFunctionCall(string $tag): bool {
+		return
+			isset($this->parent_compiler->tpl_function[$tag])
+			|| (
+				$this->template->getSmarty()->hasRuntime('TplFunction')
+				&& ($this->template->getSmarty()->getRuntime('TplFunction')->getTplFunction($this->template, $tag) !== false)
+			);
+	}
+
+	/**
+	 * @throws CompilerException
+	 */
+	private function compileRegisteredObjectMethodCall(string $base_tag, array $args, array $parameter, string $tag) {
+
+		$method = $parameter['object_method'];
+		$allowedAsBlockFunction = in_array($method, $this->smarty->registered_objects[$base_tag][3]);
+
+		if ($base_tag === $tag) {
+			// opening tag
+
+			$allowedAsNormalFunction = empty($this->smarty->registered_objects[$base_tag][1])
+				|| in_array($method, $this->smarty->registered_objects[$base_tag][1]);
+
+			if ($allowedAsBlockFunction) {
+				return $this->objectMethodBlockCompiler->compile($args, $this, $parameter, $tag, $method);
+			} elseif ($allowedAsNormalFunction) {
+				return $this->objectMethodCallCompiler->compile($args, $this, $parameter, $tag, $method);
+			}
+
+			$this->trigger_template_error(
+				'not allowed method "' . $method . '" in registered object "' .
+				$tag . '"',
+				null,
+				true
+			);
+		}
+
+		// closing tag
+		if ($allowedAsBlockFunction) {
+			return $this->objectMethodBlockCompiler->compile($args, $this, $parameter, $tag, $method);
+		}
+
+		$this->trigger_template_error(
+			'not allowed closing tag method "' . $method .
+			'" in registered object "' . $base_tag . '"',
+			null,
+			true
+		);
+	}
+
+	public function compileFunctionCall(string $base_tag, array $args, array $parameter = []) {
+		return $this->functionCallCompiler->compile($args, $this, $parameter, $base_tag, $base_tag);
+	}
+
+	public function compileModifierInExpression(string $function, array $_attr) {
+		$value = array_shift($_attr);
+		return $this->compileModifier([array_merge([$function], $_attr)], $value);
+	}
+
+	/**
+	 * @return TemplateParser|null
+	 */
+	public function getParser(): ?TemplateParser {
+		return $this->parser;
+	}
+
+	/**
+	 * @param TemplateParser|null $parser
+	 */
+	public function setParser(?TemplateParser $parser): void {
+		$this->parser = $parser;
+	}
+
+	/**
+	 * @return \Smarty\Template|null
+	 */
+	public function getTemplate(): ?\Smarty\Template {
+		return $this->template;
+	}
+
+	/**
+	 * @param \Smarty\Template|null $template
+	 */
+	public function setTemplate(?\Smarty\Template $template): void {
+		$this->template = $template;
+	}
+
+	/**
+	 * @return Template|null
+	 */
+	public function getParentCompiler(): ?Template {
+		return $this->parent_compiler;
+	}
+
+	/**
+	 * @param Template|null $parent_compiler
+	 */
+	public function setParentCompiler(?Template $parent_compiler): void {
+		$this->parent_compiler = $parent_compiler;
+	}
+
+
+	/**
+	 * Push opening tag name on stack
+	 * Optionally additional data can be saved on stack
+	 *
+	 * @param string $openTag the opening tag's name
+	 * @param mixed $data optional data saved
+	 */
+	public function openTag($openTag, $data = null) {
+		$this->_tag_stack[] = [$openTag, $data];
+		if ($openTag == 'nocache') {
+			$this->noCacheStackDepth++;
+		}
+	}
+
+	/**
+	 * Pop closing tag
+	 * Raise an error if this stack-top doesn't match with expected opening tags
+	 *
+	 * @param array|string $expectedTag the expected opening tag names
+	 *
+	 * @return mixed        any type the opening tag's name or saved data
+	 * @throws CompilerException
+	 */
+	public function closeTag($expectedTag) {
+		if ($this->getTagStackCount() > 0) {
+			// get stacked info
+			[$_openTag, $_data] = array_pop($this->_tag_stack);
+			// open tag must match with the expected ones
+			if (in_array($_openTag, (array)$expectedTag)) {
+
+				if ($_openTag == 'nocache') {
+					$this->noCacheStackDepth--;
+				}
+
+				if (is_null($_data)) {
+					// return opening tag
+					return $_openTag;
+				} else {
+					// return restored data
+					return $_data;
+				}
+			}
+			// wrong nesting of tags
+			$this->trigger_template_error("unclosed '" . $this->getTemplate()->getLeftDelimiter() . "{$_openTag}" .
+				$this->getTemplate()->getRightDelimiter() . "' tag");
+			return;
+		}
+		// wrong nesting of tags
+		$this->trigger_template_error('unexpected closing tag', null, true);
+	}
+
+	/**
+	 * Returns true if we are in a {nocache}...{/nocache} block, but false if inside {block} tag inside a {nocache} block...
+	 * @return bool
+	 */
+	public function isNocacheActive(): bool {
+		return !$this->suppressNocacheProcessing && ($this->noCacheStackDepth > 0 || $this->tag_nocache);
+	}
+
+	/**
+	 * Returns the full tag stack, used in the compiler for {break}
+	 * @return array
+	 */
+	public function getTagStack(): array {
+		return $this->_tag_stack;
+	}
+
+	/**
+	 * Should the next variable output be raw (true) or auto-escaped (false)
+	 * @return bool
+	 */
+	public function isRawOutput(): bool {
+		return $this->raw_output;
+	}
+
+	/**
+	 * Should the next variable output be raw (true) or auto-escaped (false)
+	 * @param bool $raw_output
+	 * @return void
+	 */
+	public function setRawOutput(bool $raw_output): void {
+		$this->raw_output = $raw_output;
+	}
+}
diff --git a/include/smarty/src/CompilerException.php b/include/smarty/src/CompilerException.php
new file mode 100644
index 000000000..60af9db7c
--- /dev/null
+++ b/include/smarty/src/CompilerException.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * Smarty compiler exception class
+ *
+
+ */
+class CompilerException extends Exception {
+
+	/**
+	 * The constructor of the exception
+	 *
+	 * @param string $message The Exception message to throw.
+	 * @param int $code The Exception code.
+	 * @param string|null $filename The filename where the exception is thrown.
+	 * @param int|null $line The line number where the exception is thrown.
+	 * @param \Throwable|null $previous The previous exception used for the exception chaining.
+	 */
+	public function __construct(
+		string    $message = "",
+		int       $code = 0,
+		?string   $filename = null,
+		?int      $line = null,
+		?\Throwable $previous = null
+	) {
+		parent::__construct($message, $code, $previous);
+
+		// These are optional parameters, should be be overridden only when present!
+		if ($filename) {
+			$this->file = $filename;
+		}
+		if ($line) {
+			$this->line = $line;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString() {
+		return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
+	}
+
+	/**
+	 * @param int $line
+	 */
+	public function setLine($line) {
+		$this->line = $line;
+	}
+
+	/**
+	 * The template source snippet relating to the error
+	 *
+	 * @type string|null
+	 */
+	public $source = null;
+
+	/**
+	 * The raw text of the error message
+	 *
+	 * @type string|null
+	 */
+	public $desc = null;
+
+	/**
+	 * The resource identifier or template name
+	 *
+	 * @type string|null
+	 */
+	public $template = null;
+}
diff --git a/include/smarty/src/Data.php b/include/smarty/src/Data.php
new file mode 100644
index 000000000..6ae823d8c
--- /dev/null
+++ b/include/smarty/src/Data.php
@@ -0,0 +1,521 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * Smarty Internal Plugin Data
+ * This file contains the basic properties and methods for holding config and template variables
+ */
+class Data
+{
+
+	/**
+	 * define variable scopes
+	 */
+	const SCOPE_LOCAL    = 1;
+	const SCOPE_PARENT   = 2;
+	const SCOPE_TPL_ROOT = 4;
+	const SCOPE_ROOT     = 8;
+	const SCOPE_SMARTY   = 16;
+	const SCOPE_GLOBAL   = 32;
+
+	/**
+	 * Global smarty instance
+	 *
+	 * @var Smarty
+	 */
+	protected $smarty = null;
+
+    /**
+     * template variables
+     *
+     * @var Variable[]
+     */
+    public $tpl_vars = array();
+
+    /**
+     * parent data container (if any)
+     *
+     * @var Data
+     */
+    public $parent = null;
+
+    /**
+     * configuration settings
+     *
+     * @var string[]
+     */
+    public $config_vars = array();
+
+	/**
+	 * This variable will hold a stack of template variables.
+	 *
+	 * @var null|array
+	 */
+	private $_var_stack = [];
+
+	/**
+	 * This variable will hold a stack of config variables.
+	 *
+	 * @var null|array
+	 */
+	private $_config_stack = [];
+
+	/**
+	 * Default scope for new variables
+	 * @var int
+	 */
+	protected $defaultScope = self::SCOPE_LOCAL;
+
+	/**
+	 * create Smarty data object
+	 *
+	 * @param Smarty|array $_parent parent template
+	 * @param Smarty|Template $smarty global smarty instance
+	 * @param string $name optional data block name
+	 *
+	 * @throws Exception
+	 */
+	public function __construct($_parent = null, $smarty = null, $name = null) {
+
+		$this->smarty = $smarty;
+		if (is_object($_parent)) {
+			// when object set up back pointer
+			$this->parent = $_parent;
+		} elseif (is_array($_parent)) {
+			// set up variable values
+			foreach ($_parent as $_key => $_val) {
+				$this->assign($_key, $_val);
+			}
+		} elseif ($_parent !== null) {
+			throw new Exception('Wrong type for template variables');
+		}
+	}
+
+	/**
+	 * assigns a Smarty variable
+	 *
+	 * @param array|string $tpl_var the template variable name(s)
+	 * @param mixed $value the value to assign
+	 * @param boolean $nocache if true any output of this variable will be not cached
+	 * @param int $scope one of self::SCOPE_* constants
+	 *
+	 * @return Data current Data (or Smarty or \Smarty\Template) instance for
+	 *                              chaining
+	 */
+    public function assign($tpl_var, $value = null, $nocache = false, $scope = null)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $_key => $_val) {
+                $this->assign($_key, $_val, $nocache, $scope);
+            }
+			return $this;
+        }
+		switch ($scope ?? $this->getDefaultScope()) {
+			case self::SCOPE_GLOBAL:
+			case self::SCOPE_SMARTY:
+				$this->getSmarty()->assign($tpl_var, $value);
+				break;
+			case self::SCOPE_TPL_ROOT:
+				$ptr = $this;
+				while (isset($ptr->parent) && ($ptr->parent instanceof Template)) {
+					$ptr = $ptr->parent;
+				}
+				$ptr->assign($tpl_var, $value);
+				break;
+			case self::SCOPE_ROOT:
+				$ptr = $this;
+				while (isset($ptr->parent) && !($ptr->parent instanceof Smarty)) {
+					$ptr = $ptr->parent;
+				}
+				$ptr->assign($tpl_var, $value);
+				break;
+			case self::SCOPE_PARENT:
+				if ($this->parent) {
+					$this->parent->assign($tpl_var, $value);
+				} else {
+					// assign local as fallback
+					$this->assign($tpl_var, $value);
+				}
+				break;
+			case self::SCOPE_LOCAL:
+			default:
+				if (isset($this->tpl_vars[$tpl_var])) {
+					$this->tpl_vars[$tpl_var]->setValue($value);
+					if ($nocache) {
+						$this->tpl_vars[$tpl_var]->setNocache(true);
+					}
+				} else {
+					$this->tpl_vars[$tpl_var] = new Variable($value, $nocache);
+				}
+		}
+
+        return $this;
+    }
+
+    /**
+     * appends values to template variables
+     *
+     * @param array|string $tpl_var the template variable name(s)
+     * @param mixed        $value   the value to append
+     * @param bool         $merge   flag if array elements shall be merged
+     * @param bool         $nocache if true any output of this variable will
+     *                              be not cached
+     *
+     * @return Data
+     * @api  Smarty::append()
+     */
+	public function append($tpl_var, $value = null, $merge = false, $nocache = false)
+	{
+		if (is_array($tpl_var)) {
+			foreach ($tpl_var as $_key => $_val) {
+				$this->append($_key, $_val, $merge, $nocache);
+			}
+		} else {
+
+			$newValue = $this->getValue($tpl_var) ?? [];
+			if (!is_array($newValue)) {
+				$newValue = (array) $newValue;
+			}
+
+			if ($merge && is_array($value)) {
+				foreach ($value as $_mkey => $_mval) {
+					$newValue[$_mkey] = $_mval;
+				}
+			} else {
+				$newValue[] = $value;
+			}
+
+			$this->assign($tpl_var, $newValue, $nocache);
+		}
+		return $this;
+	}
+
+    /**
+     * assigns a global Smarty variable
+     *
+     * @param string  $varName the global variable name
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return Data
+     * @deprecated since 5.0
+     */
+    public function assignGlobal($varName, $value = null, $nocache = false)
+    {
+		trigger_error(__METHOD__ . " is deprecated. Use \\Smarty\\Smarty::assign() to assign a variable " .
+		" at the Smarty level.", E_USER_DEPRECATED);
+	    return $this->getSmarty()->assign($varName, $value, $nocache);
+    }
+
+    /**
+     * Returns a single or all template variables
+     *
+     * @param string                                                  $varName       variable name or null
+     * @param bool $searchParents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     * @api  Smarty::getTemplateVars()
+     *
+     */
+    public function getTemplateVars($varName = null, $searchParents = true)
+    {
+	    if (isset($varName)) {
+			return $this->getValue($varName, $searchParents);
+	    }
+
+		return array_merge(
+			$this->parent && $searchParents ? $this->parent->getTemplateVars() : [],
+			array_map(function(Variable $var) { return $var->getValue(); }, $this->tpl_vars)
+		);
+    }
+
+	/**
+	 * Wrapper for ::getVariable()
+	 *
+	 * @deprecated since 5.0
+	 *
+	 * @param $varName
+	 * @param $searchParents
+	 * @param $errorEnable
+	 *
+	 * @return void
+	 */
+	public function _getVariable($varName, $searchParents = true, $errorEnable = true) {
+		trigger_error('Using ::_getVariable() to is deprecated and will be ' .
+			'removed in a future release. Use getVariable() instead.', E_USER_DEPRECATED);
+		return $this->getVariable($varName, $searchParents, $errorEnable);
+	}
+
+	/**
+	 * Gets the object of a Smarty variable
+	 *
+	 * @param string $varName the name of the Smarty variable
+	 * @param bool $searchParents search also in parent data
+	 * @param bool $errorEnable
+	 *
+	 * @return Variable
+	 */
+	public function getVariable($varName, $searchParents = true, $errorEnable = true) {
+		if (isset($this->tpl_vars[$varName])) {
+			return $this->tpl_vars[$varName];
+		}
+
+		if ($searchParents && $this->parent) {
+			return $this->parent->getVariable($varName, $searchParents, $errorEnable);
+		}
+
+		if ($errorEnable && $this->getSmarty()->error_unassigned) {
+			// force a notice
+			$x = $$varName;
+		}
+		return new UndefinedVariable();
+	}
+
+	/**
+	 * Directly sets a complete Variable object in the variable with the given name.
+	 * @param $varName
+	 * @param Variable $variableObject
+	 *
+	 * @return void
+	 */
+	public function setVariable($varName, Variable $variableObject) {
+		$this->tpl_vars[$varName] = $variableObject;
+	}
+
+	/**
+	 * Indicates if given variable has been set.
+	 * @param $varName
+	 *
+	 * @return bool
+	 */
+	public function hasVariable($varName): bool {
+		return !($this->getVariable($varName, true, false) instanceof UndefinedVariable);
+	}
+
+	/**
+	 * Returns the value of the Smarty\Variable given by $varName, or null if the variable does not exist.
+	 *
+	 * @param $varName
+	 * @param bool $searchParents
+	 *
+	 * @return mixed|null
+	 */
+	public function getValue($varName, $searchParents = true) {
+		$variable = $this->getVariable($varName, $searchParents);
+		return isset($variable) ? $variable->getValue() : null;
+	}
+
+	/**
+	 * load config variables into template object
+	 *
+	 * @param array $new_config_vars
+	 */
+	public function assignConfigVars($new_config_vars, array $sections = []) {
+
+		// copy global config vars
+		foreach ($new_config_vars['vars'] as $variable => $value) {
+			if ($this->getSmarty()->config_overwrite || !isset($this->config_vars[$variable])) {
+				$this->config_vars[$variable] = $value;
+			} else {
+				$this->config_vars[$variable] = array_merge((array)$this->config_vars[$variable], (array)$value);
+			}
+		}
+
+		foreach ($sections as $tpl_section) {
+			if (isset($new_config_vars['sections'][$tpl_section])) {
+				foreach ($new_config_vars['sections'][$tpl_section]['vars'] as $variable => $value) {
+					if ($this->getSmarty()->config_overwrite || !isset($this->config_vars[$variable])) {
+						$this->config_vars[$variable] = $value;
+					} else {
+						$this->config_vars[$variable] = array_merge((array)$this->config_vars[$variable], (array)$value);
+					}
+				}
+			}
+		}
+	}
+
+    /**
+     * Get Smarty object
+     *
+     * @return Smarty
+     */
+    public function getSmarty()
+    {
+        return $this->smarty;
+    }
+
+	/**
+	 * clear the given assigned template variable(s).
+	 *
+	 * @param string|array $tpl_var the template variable(s) to clear
+	 *
+	 * @return Data
+	 *
+	 * @api  Smarty::clearAssign()
+	 */
+	public function clearAssign($tpl_var)
+	{
+		if (is_array($tpl_var)) {
+			foreach ($tpl_var as $curr_var) {
+				unset($this->tpl_vars[ $curr_var ]);
+			}
+		} else {
+			unset($this->tpl_vars[ $tpl_var ]);
+		}
+		return $this;
+	}
+
+	/**
+	 * clear all the assigned template variables.
+	 *
+	 * @return Data
+	 *
+	 * @api  Smarty::clearAllAssign()
+	 */
+	public function clearAllAssign()
+	{
+		$this->tpl_vars = array();
+		return $this;
+	}
+
+	/**
+	 * clear a single or all config variables
+	 *
+	 * @param string|null $name variable name or null
+	 *
+	 * @return Data
+	 *
+	 * @api  Smarty::clearConfig()
+	 */
+	public function clearConfig($name = null)
+	{
+		if (isset($name)) {
+			unset($this->config_vars[ $name ]);
+		} else {
+			$this->config_vars = array();
+		}
+		return $this;
+	}
+
+	/**
+	 * Gets a config variable value
+	 *
+	 * @param string $varName the name of the config variable
+	 *
+	 * @return mixed  the value of the config variable
+	 * @throws Exception
+	 */
+	public function getConfigVariable($varName)
+	{
+
+		if (isset($this->config_vars[$varName])) {
+			return $this->config_vars[$varName];
+		}
+
+		$returnValue = $this->parent ? $this->parent->getConfigVariable($varName) : null;
+
+		if ($returnValue === null && $this->getSmarty()->error_unassigned) {
+			throw new Exception("Undefined variable $varName");
+		}
+
+		return $returnValue;
+	}
+
+	public function hasConfigVariable($varName): bool {
+		try {
+			return $this->getConfigVariable($varName) !== null;
+		} catch (Exception $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns a single or all config variables
+	 *
+	 * @param string $varname variable name or null
+	 *
+	 * @return mixed variable value or or array of variables
+	 * @throws Exception
+	 *
+	 * @api  Smarty::getConfigVars()
+	 */
+	public function getConfigVars($varname = null)
+	{
+		if (isset($varname)) {
+			return $this->getConfigVariable($varname);
+		}
+
+		return array_merge($this->parent ? $this->parent->getConfigVars() : [], $this->config_vars);
+	}
+
+	/**
+	 * load a config file, optionally load just selected sections
+	 *
+	 * @param string $config_file filename
+	 * @param mixed                                                   $sections    array of section names, single
+	 *                                                                             section or null
+
+	 * @returns $this
+	 * @throws \Exception
+	 *
+	 * @api  Smarty::configLoad()
+	 */
+	public function configLoad($config_file, $sections = null)
+	{
+		$template = $this->getSmarty()->doCreateTemplate($config_file, null, null, $this, null, null, true);
+		$template->caching = Smarty::CACHING_OFF;
+		$template->assign('sections', (array) $sections ?? []);
+		// trigger a call to $this->assignConfigVars
+		$template->fetch();
+		return $this;
+	}
+
+	/**
+	 * Sets the default scope for new variables assigned in this template.
+	 * @param int $scope
+	 *
+	 * @return void
+	 */
+	protected function setDefaultScope(int $scope) {
+		$this->defaultScope = $scope;
+	}
+
+	/**
+	 * Returns the default scope for new variables assigned in this template.
+	 * @return int
+	 */
+	public function getDefaultScope(): int {
+		return $this->defaultScope;
+	}
+
+	/**
+	 * @return Data|Smarty|null
+	 */
+	public function getParent() {
+		return $this->parent;
+	}
+
+	/**
+	 * @param Data|Smarty|null $parent
+	 */
+	public function setParent($parent): void {
+		$this->parent = $parent;
+	}
+
+	public function pushStack(): void {
+		$stackList = [];
+		foreach ($this->tpl_vars as $name => $variable) {
+			$stackList[$name] = clone $variable; // variables are stored in Variable objects
+		}
+		$this->_var_stack[] = $this->tpl_vars;
+		$this->tpl_vars = $stackList;
+
+		$this->_config_stack[] = $this->config_vars;
+	}
+
+	public function popStack(): void {
+		$this->tpl_vars = array_pop($this->_var_stack);
+		$this->config_vars = array_pop($this->_config_stack);
+	}
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_debug.php b/include/smarty/src/Debug.php
similarity index 53%
rename from include/smarty/libs/sysplugins/smarty_internal_debug.php
rename to include/smarty/src/Debug.php
index 570819d26..ab1a88779 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_debug.php
+++ b/include/smarty/src/Debug.php
@@ -1,34 +1,28 @@
 <?php
+
+namespace Smarty;
+
 /**
  * Smarty Internal Plugin Debug
  * Class to collect data for the Smarty Debugging Console
  *
- * @package    Smarty
- * @subpackage Debug
  * @author     Uwe Tews
  */
-
-/**
- * Smarty Internal Plugin Debug Class
- *
- * @package    Smarty
- * @subpackage Debug
- */
-class Smarty_Internal_Debug extends Smarty_Internal_Data
+class Debug extends Data
 {
     /**
      * template data
      *
      * @var array
      */
-    public $template_data = array();
+    public $template_data = [];
 
     /**
      * List of uid's which shall be ignored
      *
      * @var array
      */
-    public $ignore_uid = array();
+    public $ignore_uid = [];
 
     /**
      * Index of display() and fetch() calls
@@ -47,10 +41,10 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * Start logging template
      *
-     * @param \Smarty_Internal_Template $template template
+     * @param Template $template template
      * @param null                      $mode     true: display   false: fetch  null: subtemplate
      */
-    public function start_template(Smarty_Internal_Template $template, $mode = null)
+    public function start_template(Template $template, $mode = null)
     {
         if (isset($mode) && !$template->_isSubTpl()) {
             $this->index++;
@@ -64,39 +58,30 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * End logging of cache time
      *
-     * @param \Smarty_Internal_Template $template cached template
+     * @param Template $template cached template
      */
-    public function end_template(Smarty_Internal_Template $template)
+    public function end_template(Template $template)
     {
         $key = $this->get_key($template);
         $this->template_data[ $this->index ][ $key ][ 'total_time' ] +=
             microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_template_time' ];
-        //$this->template_data[$this->index][$key]['properties'] = $template->properties;
     }
 
     /**
      * Start logging of compile time
      *
-     * @param \Smarty_Internal_Template $template
+     * @param Template $template
      */
-    public function start_compile(Smarty_Internal_Template $template)
+    public function start_compile(Template $template)
     {
         static $_is_stringy = array('string' => true, 'eval' => true);
-        if (!empty($template->compiler->trace_uid)) {
-            $key = $template->compiler->trace_uid;
+        if (!empty($template->getCompiler()->trace_uid)) {
+            $key = $template->getCompiler()->trace_uid;
             if (!isset($this->template_data[ $this->index ][ $key ])) {
-                if (isset($_is_stringy[ $template->source->type ])) {
-                    $this->template_data[ $this->index ][ $key ][ 'name' ] =
-                        '\'' . substr($template->source->name, 0, 25) . '...\'';
-                } else {
-                    $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
-                }
-                $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
-                $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
-                $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+                $this->saveTemplateData($_is_stringy, $template, $key);
             }
         } else {
-            if (isset($this->ignore_uid[ $template->source->uid ])) {
+            if (isset($this->ignore_uid[ $template->getSource()->uid ])) {
                 return;
             }
             $key = $this->get_key($template);
@@ -107,14 +92,14 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * End logging of compile time
      *
-     * @param \Smarty_Internal_Template $template
+     * @param Template $template
      */
-    public function end_compile(Smarty_Internal_Template $template)
+    public function end_compile(Template $template)
     {
-        if (!empty($template->compiler->trace_uid)) {
-            $key = $template->compiler->trace_uid;
+        if (!empty($template->getCompiler()->trace_uid)) {
+            $key = $template->getCompiler()->trace_uid;
         } else {
-            if (isset($this->ignore_uid[ $template->source->uid ])) {
+            if (isset($this->ignore_uid[ $template->getSource()->uid ])) {
                 return;
             }
             $key = $this->get_key($template);
@@ -126,9 +111,9 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * Start logging of render time
      *
-     * @param \Smarty_Internal_Template $template
+     * @param Template $template
      */
-    public function start_render(Smarty_Internal_Template $template)
+    public function start_render(Template $template)
     {
         $key = $this->get_key($template);
         $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
@@ -137,9 +122,9 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * End logging of compile time
      *
-     * @param \Smarty_Internal_Template $template
+     * @param Template $template
      */
-    public function end_render(Smarty_Internal_Template $template)
+    public function end_render(Template $template)
     {
         $key = $this->get_key($template);
         $this->template_data[ $this->index ][ $key ][ 'render_time' ] +=
@@ -149,9 +134,9 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * Start logging of cache time
      *
-     * @param \Smarty_Internal_Template $template cached template
+     * @param Template $template cached template
      */
-    public function start_cache(Smarty_Internal_Template $template)
+    public function start_cache(Template $template)
     {
         $key = $this->get_key($template);
         $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
@@ -160,9 +145,9 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * End logging of cache time
      *
-     * @param \Smarty_Internal_Template $template cached template
+     * @param Template $template cached template
      */
-    public function end_cache(Smarty_Internal_Template $template)
+    public function end_cache(Template $template)
     {
         $key = $this->get_key($template);
         $this->template_data[ $this->index ][ $key ][ 'cache_time' ] +=
@@ -172,65 +157,52 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * Register template object
      *
-     * @param \Smarty_Internal_Template $template cached template
+     * @param Template $template cached template
      */
-    public function register_template(Smarty_Internal_Template $template)
+    public function register_template(Template $template)
     {
     }
 
     /**
      * Register data object
      *
-     * @param \Smarty_Data $data data object
+     * @param Data $data data object
      */
-    public static function register_data(Smarty_Data $data)
+    public static function register_data(Data $data)
     {
     }
 
     /**
      * Opens a window for the Smarty Debugging Console and display the data
      *
-     * @param Smarty_Internal_Template|Smarty $obj object to debug
+     * @param Template|Smarty $obj object to debug
      * @param bool                            $full
      *
      * @throws \Exception
-     * @throws \SmartyException
+     * @throws Exception
      */
-    public function display_debug($obj, $full = false)
+    public function display_debug($obj, bool $full = false)
     {
         if (!$full) {
             $this->offset++;
             $savedIndex = $this->index;
             $this->index = 9999;
         }
-        $smarty = $obj->_getSmartyObj();
+        $smarty = $obj->getSmarty();
         // create fresh instance of smarty for displaying the debug console
         // to avoid problems if the application did overload the Smarty class
         $debObj = new Smarty();
         // copy the working dirs from application
         $debObj->setCompileDir($smarty->getCompileDir());
-        // init properties by hand as user may have edited the original Smarty class
-        $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ .
-                                                                           '/../plugins' : $smarty->getPluginsDir());
-        $debObj->force_compile = false;
         $debObj->compile_check = Smarty::COMPILECHECK_ON;
-        $debObj->left_delimiter = '{';
-        $debObj->right_delimiter = '}';
         $debObj->security_policy = null;
         $debObj->debugging = false;
         $debObj->debugging_ctrl = 'NONE';
         $debObj->error_reporting = E_ALL & ~E_NOTICE;
-        $debObj->debug_tpl =
-            isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
-        $debObj->registered_plugins = array();
+        $debObj->debug_tpl = $smarty->debug_tpl ?? 'file:' . __DIR__ . '/debug.tpl';
         $debObj->registered_resources = array();
-        $debObj->registered_filters = array();
-        $debObj->autoload_filters = array();
-        $debObj->default_modifiers = array();
         $debObj->escape_html = true;
         $debObj->caching = Smarty::CACHING_OFF;
-        $debObj->compile_id = null;
-        $debObj->cache_id = null;
         // prepare information of assigned variables
         $ptr = $this->get_debug_vars($obj);
         $_assigned_vars = $ptr->tpl_vars;
@@ -238,20 +210,22 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
         $_config_vars = $ptr->config_vars;
         ksort($_config_vars);
         $debugging = $smarty->debugging;
-        $_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
-        if ($obj->_isTplObj()) {
-            $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
-        }
-        if ($obj->_objType === 1 || $full) {
-            $_template->assign('template_data', $this->template_data[ $this->index ]);
+        $templateName = $obj->getSource()->type . ':' . $obj->getSource()->name;
+        $displayMode = $debugging === 2 || !$full;
+        $offset = $this->offset * 50;
+        $_template = $debObj->doCreateTemplate($debObj->debug_tpl);
+        if ($obj instanceof Template) {
+            $_template->assign('template_name', $templateName);
+        } elseif ($obj instanceof Smarty || $full) {
+            $_template->assign('template_data', $this->template_data[$this->index]);
         } else {
             $_template->assign('template_data', null);
         }
         $_template->assign('assigned_vars', $_assigned_vars);
         $_template->assign('config_vars', $_config_vars);
         $_template->assign('execution_time', microtime(true) - $smarty->start_time);
-        $_template->assign('display_mode', $debugging === 2 || !$full);
-        $_template->assign('offset', $this->offset * 50);
+        $_template->assign('targetWindow', $displayMode ? md5("$offset$templateName") : '__Smarty__');
+        $_template->assign('offset', $offset);
         echo $_template->fetch();
         if (isset($full)) {
             $this->index--;
@@ -264,22 +238,16 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * Recursively gets variables from all template/data scopes
      *
-     * @param Smarty_Internal_Template|Smarty_Data $obj object to debug
+     * @param \Smarty\Data $obj object to debug
      *
-     * @return StdClass
+     * @return \StdClass
      */
-    public function get_debug_vars($obj)
+    private function get_debug_vars($obj)
     {
         $config_vars = array();
         foreach ($obj->config_vars as $key => $var) {
-            $config_vars[ $key ][ 'value' ] = $var;
-            if ($obj->_isTplObj()) {
-                $config_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj->_isDataObj()) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
-            } else {
-                $config_vars[ $key ][ 'scope' ] = 'Smarty object';
-            }
+            $config_vars[$key]['value'] = $var;
+	        $config_vars[$key]['scope'] = get_class($obj) . ':' . spl_object_id($obj);
         }
         $tpl_vars = array();
         foreach ($obj->tpl_vars as $key => $var) {
@@ -298,13 +266,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
                     }
                 }
             }
-            if ($obj->_isTplObj()) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj->_isDataObj()) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
-            } else {
-                $tpl_vars[ $key ][ 'scope' ] = 'Smarty object';
-            }
+	        $tpl_vars[$key]['scope'] = get_class($obj) . ':' . spl_object_id($obj);
         }
         if (isset($obj->parent)) {
             $parent = $this->get_debug_vars($obj->parent);
@@ -320,27 +282,6 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
                 }
             }
             $config_vars = array_merge($parent->config_vars, $config_vars);
-        } else {
-            foreach (Smarty::$global_tpl_vars as $key => $var) {
-                if (!array_key_exists($key, $tpl_vars)) {
-                    foreach ($var as $varkey => $varvalue) {
-                        if ($varkey === 'value') {
-                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
-                        } else {
-                            if ($varkey === 'nocache') {
-                                if ($varvalue === true) {
-                                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
-                                }
-                            } else {
-                                if ($varkey !== 'scope' || $varvalue !== 0) {
-                                    $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
-                                }
-                            }
-                        }
-                    }
-                    $tpl_vars[ $key ][ 'scope' ] = 'Global';
-                }
-            }
         }
         return (object)array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
     }
@@ -348,31 +289,20 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * Return key into $template_data for template
      *
-     * @param \Smarty_Internal_Template $template template object
+     * @param Template $template template object
      *
      * @return string key into $template_data
      */
-    private function get_key(Smarty_Internal_Template $template)
+    private function get_key(Template $template)
     {
         static $_is_stringy = array('string' => true, 'eval' => true);
-        // calculate Uid if not already done
-        if ($template->source->uid === '') {
-            $template->source->filepath;
-        }
-        $key = $template->source->uid;
+
+        $key = $template->getSource()->uid;
         if (isset($this->template_data[ $this->index ][ $key ])) {
             return $key;
         } else {
-            if (isset($_is_stringy[ $template->source->type ])) {
-                $this->template_data[ $this->index ][ $key ][ 'name' ] =
-                    '\'' . substr($template->source->name, 0, 25) . '...\'';
-            } else {
-                $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
-            }
-            $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
+	        $this->saveTemplateData($_is_stringy, $template, $key);
+	        $this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
             return $key;
         }
     }
@@ -380,15 +310,11 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * Ignore template
      *
-     * @param \Smarty_Internal_Template $template
+     * @param Template $template
      */
-    public function ignore(Smarty_Internal_Template $template)
+    public function ignore(Template $template)
     {
-        // calculate Uid if not already done
-        if ($template->source->uid === '') {
-            $template->source->filepath;
-        }
-        $this->ignore_uid[ $template->source->uid ] = true;
+        $this->ignore_uid[$template->getSource()->uid] = true;
     }
 
     /**
@@ -422,4 +348,23 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
             }
         }
     }
+
+	/**
+	 * @param array $_is_stringy
+	 * @param Template $template
+	 * @param string $key
+	 *
+	 * @return void
+	 */
+	private function saveTemplateData(array $_is_stringy, Template $template, string $key): void {
+		if (isset($_is_stringy[$template->getSource()->type])) {
+			$this->template_data[$this->index][$key]['name'] =
+				'\'' . substr($template->getSource()->name, 0, 25) . '...\'';
+		} else {
+			$this->template_data[$this->index][$key]['name'] = $template->getSource()->getResourceName();
+		}
+		$this->template_data[$this->index][$key]['compile_time'] = 0;
+		$this->template_data[$this->index][$key]['render_time'] = 0;
+		$this->template_data[$this->index][$key]['cache_time'] = 0;
+	}
 }
diff --git a/include/smarty/libs/sysplugins/smarty_internal_errorhandler.php b/include/smarty/src/ErrorHandler.php
similarity index 88%
rename from include/smarty/libs/sysplugins/smarty_internal_errorhandler.php
rename to include/smarty/src/ErrorHandler.php
index f57cc21ff..05b1cb3e6 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_errorhandler.php
+++ b/include/smarty/src/ErrorHandler.php
@@ -1,21 +1,18 @@
 <?php
 
+namespace Smarty;
+
 /**
  * Smarty error handler to fix new error levels in PHP8 for backwards compatibility
- *
- * @package    Smarty
- * @subpackage PluginsInternal
  * @author     Simon Wisselink
- *
  */
-class Smarty_Internal_ErrorHandler
+class ErrorHandler
 {
-
     /**
-     * Allows {$foo} where foo is unset.
+     * Allows {$foo->propName} where propName is undefined.
      * @var bool
      */
-    public $allowUndefinedVars = true;
+    public $allowUndefinedProperties = true;
 
     /**
      * Allows {$foo.bar} where bar is unset and {$foo.bar1.bar2} where either bar1 or bar2 is unset.
@@ -72,16 +69,15 @@ class Smarty_Internal_ErrorHandler
      */
     public function handleError($errno, $errstr, $errfile, $errline, $errcontext = [])
     {
-
-        if ($this->allowUndefinedVars && preg_match(
-                '/^(Attempt to read property "value" on null|Trying to get property (\'value\' )?of non-object)/',
+        if ($this->allowUndefinedProperties && preg_match(
+                '/^(Undefined property)/',
                 $errstr
             )) {
             return; // suppresses this error
         }
 
         if ($this->allowUndefinedArrayKeys && preg_match(
-            '/^(Undefined index|Undefined array key|Trying to access array offset on value of type)/',
+            '/^(Undefined index|Undefined array key|Trying to access array offset on)/',
             $errstr
         )) {
             return; // suppresses this error
diff --git a/include/smarty/src/Exception.php b/include/smarty/src/Exception.php
new file mode 100644
index 000000000..0f75f5685
--- /dev/null
+++ b/include/smarty/src/Exception.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * Smarty exception class
+ */
+class Exception extends \Exception {
+
+	/**
+	 * @return string
+	 */
+	public function __toString() {
+		return ' --> Smarty: ' . $this->message . ' <-- ';
+	}
+}
diff --git a/include/smarty/src/Extension/BCPluginsAdapter.php b/include/smarty/src/Extension/BCPluginsAdapter.php
new file mode 100644
index 000000000..77b47f8cd
--- /dev/null
+++ b/include/smarty/src/Extension/BCPluginsAdapter.php
@@ -0,0 +1,229 @@
+<?php
+
+namespace Smarty\Extension;
+
+use Smarty\BlockHandler\BlockPluginWrapper;
+use Smarty\Compile\CompilerInterface;
+use Smarty\Compile\Modifier\BCPluginWrapper as ModifierCompilerPluginWrapper;
+use Smarty\Compile\Tag\BCPluginWrapper as TagPluginWrapper;
+use Smarty\Filter\FilterPluginWrapper;
+use Smarty\FunctionHandler\BCPluginWrapper as FunctionPluginWrapper;
+
+class BCPluginsAdapter extends Base {
+
+	/**
+	 * @var \Smarty\Smarty
+	 */
+	private $smarty;
+
+	public function __construct(\Smarty\Smarty $smarty) {
+		$this->smarty = $smarty;
+	}
+
+	private function findPlugin($type, $name): ?array {
+		if (null !== $plugin = $this->smarty->getRegisteredPlugin($type, $name)) {
+			return $plugin;
+		}
+
+		return null;
+	}
+
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\CompilerInterface {
+
+		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_COMPILER, $tag);
+		if ($plugin === null) {
+			return null;
+		}
+
+		if (is_callable($plugin[0])) {
+			$callback = $plugin[0];
+			$cacheable = (bool) $plugin[1] ?? true;
+			return new TagPluginWrapper($callback, $cacheable);
+		} elseif (class_exists($plugin[0])) {
+			$compiler = new $plugin[0];
+			if ($compiler instanceof CompilerInterface) {
+				return $compiler;
+			}
+		}
+
+		return null;
+	}
+
+	public function getFunctionHandler(string $functionName): ?\Smarty\FunctionHandler\FunctionHandlerInterface {
+		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_FUNCTION, $functionName);
+		if ($plugin === null) {
+			return null;
+		}
+		$callback = $plugin[0];
+		$cacheable = (bool) $plugin[1] ?? true;
+
+		return new FunctionPluginWrapper($callback, $cacheable);
+
+	}
+
+	public function getBlockHandler(string $blockTagName): ?\Smarty\BlockHandler\BlockHandlerInterface {
+		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_BLOCK, $blockTagName);
+		if ($plugin === null) {
+			return null;
+		}
+		$callback = $plugin[0];
+		$cacheable = (bool) $plugin[1] ?? true;
+
+		return new BlockPluginWrapper($callback, $cacheable);
+	}
+
+	public function getModifierCallback(string $modifierName) {
+
+		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_MODIFIER, $modifierName);
+		if ($plugin === null) {
+			return null;
+		}
+		return $plugin[0];
+	}
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface {
+		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_MODIFIERCOMPILER, $modifier);
+		if ($plugin === null) {
+			return null;
+		}
+		$callback = $plugin[0];
+
+		return new ModifierCompilerPluginWrapper($callback);
+	}
+
+	/**
+	 * @var array
+	 */
+	private $preFilters = [];
+
+	public function getPreFilters(): array {
+		return $this->preFilters;
+	}
+
+	public function addPreFilter(\Smarty\Filter\FilterInterface $filter) {
+		$this->preFilters[] = $filter;
+	}
+
+	public function addCallableAsPreFilter(callable $callable, ?string $name = null) {
+		if ($name === null) {
+			$this->preFilters[] = new FilterPluginWrapper($callable);
+		} else {
+			$this->preFilters[$name] = new FilterPluginWrapper($callable);
+		}
+	}
+
+	public function removePrefilter(string $name) {
+		unset($this->preFilters[$name]);
+	}
+
+	/**
+	 * @var array
+	 */
+	private $postFilters = [];
+
+	public function getPostFilters(): array {
+		return $this->postFilters;
+	}
+
+	public function addPostFilter(\Smarty\Filter\FilterInterface $filter) {
+		$this->postFilters[] = $filter;
+	}
+
+	public function addCallableAsPostFilter(callable $callable, ?string $name = null) {
+		if ($name === null) {
+			$this->postFilters[] = new FilterPluginWrapper($callable);
+		} else {
+			$this->postFilters[$name] = new FilterPluginWrapper($callable);
+		}
+	}
+
+	public function removePostFilter(string $name) {
+		unset($this->postFilters[$name]);
+	}
+
+
+	/**
+	 * @var array
+	 */
+	private $outputFilters = [];
+
+	public function getOutputFilters(): array {
+		return $this->outputFilters;
+	}
+
+	public function addOutputFilter(\Smarty\Filter\FilterInterface $filter) {
+		$this->outputFilters[] = $filter;
+	}
+
+	public function addCallableAsOutputFilter(callable $callable, ?string $name = null) {
+		if ($name === null) {
+			$this->outputFilters[] = new FilterPluginWrapper($callable);
+		} else {
+			$this->outputFilters[$name] = new FilterPluginWrapper($callable);
+		}
+	}
+
+	public function removeOutputFilter(string $name) {
+		unset($this->outputFilters[$name]);
+	}
+
+	public function loadPluginsFromDir(string $path) {
+		foreach([
+			'function',
+			'modifier',
+		    'block',
+		    'compiler',
+		    'prefilter',
+		    'postfilter',
+		    'outputfilter',
+		    'modifiercompiler',
+		] as $type) {
+			foreach (glob($path  . $type . '.?*.php') as $filename) {
+				$pluginName = $this->getPluginNameFromFilename($filename);
+				if ($pluginName !== null) {
+					require_once $filename;
+					$functionOrClassName = 'smarty_' . $type . '_' . $pluginName;
+					if (function_exists($functionOrClassName) || class_exists($functionOrClassName)) {
+						$this->smarty->registerPlugin($type, $pluginName, $functionOrClassName, true, []);
+					}
+				}
+			}
+		}
+
+		$type = 'resource';
+		foreach (glob($path  . $type . '.?*.php') as $filename) {
+			$pluginName = $this->getPluginNameFromFilename($filename);
+			if ($pluginName !== null) {
+				require_once $filename;
+				if (class_exists($className = 'smarty_' . $type . '_' . $pluginName)) {
+					$this->smarty->registerResource($pluginName, new $className());
+				}
+			}
+		}
+
+		$type = 'cacheresource';
+		foreach (glob($path  . $type . '.?*.php') as $filename) {
+			$pluginName = $this->getPluginNameFromFilename($filename);
+			if ($pluginName !== null) {
+				require_once $filename;
+				if (class_exists($className = 'smarty_' . $type . '_' . $pluginName)) {
+					$this->smarty->registerCacheResource($pluginName, new $className());
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * @param $filename
+	 *
+	 * @return string|null
+	 */
+	private function getPluginNameFromFilename($filename) {
+		if (!preg_match('/.*\.([a-z_A-Z0-9]+)\.php$/',$filename,$matches)) {
+			return null;
+		}
+		return $matches[1];
+	}
+
+}
diff --git a/include/smarty/src/Extension/Base.php b/include/smarty/src/Extension/Base.php
new file mode 100644
index 000000000..b37b6acd0
--- /dev/null
+++ b/include/smarty/src/Extension/Base.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Smarty\Extension;
+
+use Smarty\FunctionHandler\FunctionHandlerInterface;
+
+class Base implements ExtensionInterface {
+
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\CompilerInterface {
+		return null;
+	}
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface {
+		return null;
+	}
+
+	public function getFunctionHandler(string $functionName): ?\Smarty\FunctionHandler\FunctionHandlerInterface {
+		return null;
+	}
+
+	public function getBlockHandler(string $blockTagName): ?\Smarty\BlockHandler\BlockHandlerInterface {
+		return null;
+	}
+
+	public function getModifierCallback(string $modifierName) {
+		return null;
+	}
+
+	public function getPreFilters(): array {
+		return [];
+	}
+
+	public function getPostFilters(): array {
+		return [];
+	}
+
+	public function getOutputFilters(): array {
+		return [];
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Extension/CallbackWrapper.php b/include/smarty/src/Extension/CallbackWrapper.php
new file mode 100644
index 000000000..193fc1363
--- /dev/null
+++ b/include/smarty/src/Extension/CallbackWrapper.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Smarty\Extension;
+
+use Smarty\Exception;
+
+class CallbackWrapper {
+
+	/**
+	 * @var callback
+	 */
+	private $callback;
+	/**
+	 * @var string
+	 */
+	private $modifierName;
+
+	/**
+	 * @param string $modifierName
+	 * @param callback $callback
+	 */
+	public function __construct(string $modifierName, $callback) {
+		$this->callback = $callback;
+		$this->modifierName = $modifierName;
+	}
+
+	public function handle(...$params) {
+		try {
+			return ($this->callback)(...$params);
+		} catch (\ArgumentCountError $e) {
+			throw new Exception("Invalid number of arguments to modifier " . $this->modifierName);
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Extension/CoreExtension.php b/include/smarty/src/Extension/CoreExtension.php
new file mode 100644
index 000000000..a7c658d34
--- /dev/null
+++ b/include/smarty/src/Extension/CoreExtension.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Smarty\Extension;
+
+class CoreExtension extends Base {
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\CompilerInterface {
+		switch ($tag) {
+			case 'append': return new \Smarty\Compile\Tag\Append();
+			case 'assign': return new \Smarty\Compile\Tag\Assign();
+			case 'block': return new \Smarty\Compile\Tag\Block();
+			case 'blockclose': return new \Smarty\Compile\Tag\BlockClose();
+			case 'break': return new \Smarty\Compile\Tag\BreakTag();
+			case 'call': return new \Smarty\Compile\Tag\Call();
+			case 'capture': return new \Smarty\Compile\Tag\Capture();
+			case 'captureclose': return new \Smarty\Compile\Tag\CaptureClose();
+			case 'config_load': return new \Smarty\Compile\Tag\ConfigLoad();
+			case 'continue': return new \Smarty\Compile\Tag\ContinueTag();
+			case 'debug': return new \Smarty\Compile\Tag\Debug();
+			case 'eval': return new \Smarty\Compile\Tag\EvalTag();
+			case 'extends': return new \Smarty\Compile\Tag\ExtendsTag();
+			case 'for': return new \Smarty\Compile\Tag\ForTag();
+			case 'foreach': return new \Smarty\Compile\Tag\ForeachTag();
+			case 'foreachelse': return new \Smarty\Compile\Tag\ForeachElse();
+			case 'foreachclose': return new \Smarty\Compile\Tag\ForeachClose();
+			case 'forelse': return new \Smarty\Compile\Tag\ForElse();
+			case 'forclose': return new \Smarty\Compile\Tag\ForClose();
+			case 'function': return new \Smarty\Compile\Tag\FunctionTag();
+			case 'functionclose': return new \Smarty\Compile\Tag\FunctionClose();
+			case 'if': return new \Smarty\Compile\Tag\IfTag();
+			case 'else': return new \Smarty\Compile\Tag\ElseTag();
+			case 'elseif': return new \Smarty\Compile\Tag\ElseIfTag();
+			case 'ifclose': return new \Smarty\Compile\Tag\IfClose();
+			case 'include': return new \Smarty\Compile\Tag\IncludeTag();
+			case 'ldelim': return new \Smarty\Compile\Tag\Ldelim();
+			case 'rdelim': return new \Smarty\Compile\Tag\Rdelim();
+			case 'nocache': return new \Smarty\Compile\Tag\Nocache();
+			case 'nocacheclose': return new \Smarty\Compile\Tag\NocacheClose();
+			case 'section': return new \Smarty\Compile\Tag\Section();
+			case 'sectionelse': return new \Smarty\Compile\Tag\SectionElse();
+			case 'sectionclose': return new \Smarty\Compile\Tag\SectionClose();
+			case 'setfilter': return new \Smarty\Compile\Tag\Setfilter();
+			case 'setfilterclose': return new \Smarty\Compile\Tag\SetfilterClose();
+			case 'while': return new \Smarty\Compile\Tag\WhileTag();
+			case 'whileclose': return new \Smarty\Compile\Tag\WhileClose();
+		}
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Extension/DefaultExtension.php b/include/smarty/src/Extension/DefaultExtension.php
new file mode 100644
index 000000000..b5f38f6c4
--- /dev/null
+++ b/include/smarty/src/Extension/DefaultExtension.php
@@ -0,0 +1,757 @@
+<?php
+
+namespace Smarty\Extension;
+
+use Smarty\Exception;
+
+class DefaultExtension extends Base {
+
+	private $modifiers = [];
+
+	private $functionHandlers = [];
+
+	private $blockHandlers = [];
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface {
+
+		if (isset($this->modifiers[$modifier])) {
+			return $this->modifiers[$modifier];
+		}
+
+		switch ($modifier) {
+			case 'cat': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\CatModifierCompiler(); break;
+			case 'count_characters': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\CountCharactersModifierCompiler(); break;
+			case 'count_paragraphs': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\CountParagraphsModifierCompiler(); break;
+			case 'count_sentences': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\CountSentencesModifierCompiler(); break;
+			case 'count_words': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\CountWordsModifierCompiler(); break;
+			case 'default': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\DefaultModifierCompiler(); break;
+			case 'empty': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\EmptyModifierCompiler(); break;
+			case 'escape': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\EscapeModifierCompiler(); break;
+			case 'from_charset': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\FromCharsetModifierCompiler(); break;
+			case 'indent': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\IndentModifierCompiler(); break;
+			case 'is_array': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\IsArrayModifierCompiler(); break;
+			case 'isset': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\IssetModifierCompiler(); break;
+			case 'json_encode': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\JsonEncodeModifierCompiler(); break;
+			case 'lower': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\LowerModifierCompiler(); break;
+			case 'nl2br': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\Nl2brModifierCompiler(); break;
+			case 'noprint': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\NoPrintModifierCompiler(); break;
+			case 'raw': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\RawModifierCompiler(); break;
+			case 'round': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\RoundModifierCompiler(); break;
+			case 'str_repeat': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\StrRepeatModifierCompiler(); break;
+			case 'string_format': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\StringFormatModifierCompiler(); break;
+			case 'strip': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\StripModifierCompiler(); break;
+			case 'strip_tags': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\StripTagsModifierCompiler(); break;
+			case 'strlen': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\StrlenModifierCompiler(); break;
+			case 'substr': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\SubstrModifierCompiler(); break;
+			case 'to_charset': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\ToCharsetModifierCompiler(); break;
+			case 'unescape': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\UnescapeModifierCompiler(); break;
+			case 'upper': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\UpperModifierCompiler(); break;
+			case 'wordwrap': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\WordWrapModifierCompiler(); break;
+		}
+
+		return $this->modifiers[$modifier] ?? null;
+	}
+
+	public function getModifierCallback(string $modifierName) {
+		switch ($modifierName) {
+			case 'capitalize': return [$this, 'smarty_modifier_capitalize'];
+			case 'count': return [$this, 'smarty_modifier_count'];
+			case 'date_format': return [$this, 'smarty_modifier_date_format'];
+			case 'debug_print_var': return [$this, 'smarty_modifier_debug_print_var'];
+			case 'escape': return [$this, 'smarty_modifier_escape'];
+			case 'explode': return [$this, 'smarty_modifier_explode'];
+			case 'implode': return [$this, 'smarty_modifier_implode'];
+			case 'in_array': return [$this, 'smarty_modifier_in_array'];
+			case 'join': return [$this, 'smarty_modifier_join'];
+			case 'mb_wordwrap': return [$this, 'smarty_modifier_mb_wordwrap'];
+			case 'number_format': return [$this, 'smarty_modifier_number_format'];
+			case 'regex_replace': return [$this, 'smarty_modifier_regex_replace'];
+			case 'replace': return [$this, 'smarty_modifier_replace'];
+			case 'spacify': return [$this, 'smarty_modifier_spacify'];
+			case 'split': return [$this, 'smarty_modifier_split'];
+			case 'truncate': return [$this, 'smarty_modifier_truncate'];
+		}
+		return null;
+	}
+
+	public function getFunctionHandler(string $functionName): ?\Smarty\FunctionHandler\FunctionHandlerInterface {
+
+		if (isset($this->functionHandlers[$functionName])) {
+			return $this->functionHandlers[$functionName];
+		}
+
+		switch ($functionName) {
+			case 'count': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Count(); break;
+			case 'counter': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Counter(); break;
+			case 'cycle': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Cycle(); break;
+			case 'fetch': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Fetch(); break;
+			case 'html_checkboxes': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlCheckboxes(); break;
+			case 'html_image': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlImage(); break;
+			case 'html_options': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlOptions(); break;
+			case 'html_radios': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlRadios(); break;
+			case 'html_select_date': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlSelectDate(); break;
+			case 'html_select_time': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlSelectTime(); break;
+			case 'html_table': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlTable(); break;
+			case 'mailto': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Mailto(); break;
+			case 'math': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Math(); break;
+		}
+
+		return $this->functionHandlers[$functionName] ?? null;
+	}
+
+	public function getBlockHandler(string $blockTagName): ?\Smarty\BlockHandler\BlockHandlerInterface {
+
+		switch ($blockTagName) {
+			case 'textformat': $this->blockHandlers[$blockTagName] = new \Smarty\BlockHandler\TextFormat(); break;
+		}
+
+		return $this->blockHandlers[$blockTagName] ?? null;
+	}
+
+	/**
+	 * Smarty spacify modifier plugin
+	 * Type:     modifier
+	 * Name:     spacify
+	 * Purpose:  add spaces between characters in a string
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param string $string       input string
+	 * @param string $spacify_char string to insert between characters.
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_spacify($string, $spacify_char = ' ')
+	{
+		// well… what about charsets besides latin and UTF-8?
+		return implode($spacify_char, preg_split('//' . \Smarty\Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
+	}
+
+	/**
+	 * Smarty capitalize modifier plugin
+	 * Type:     modifier
+	 * Name:     capitalize
+	 * Purpose:  capitalize words in the string
+	 * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
+	 *
+	 * @param string  $string    string to capitalize
+	 * @param boolean $uc_digits also capitalize "x123" to "X123"
+	 * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
+	 *
+	 * @return string capitalized string
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 * @author Rodney Rehm
+	 */
+	public function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
+	{
+		$string = (string) $string;
+
+		if ($lc_rest) {
+			// uppercase (including hyphenated words)
+			$upper_string = mb_convert_case($string, MB_CASE_TITLE, \Smarty\Smarty::$_CHARSET);
+		} else {
+			// uppercase word breaks
+			$upper_string = preg_replace_callback(
+				"!(^|[^\p{L}'])([\p{Ll}])!S" . \Smarty\Smarty::$_UTF8_MODIFIER,
+				function ($matches)	{
+					return stripslashes($matches[1]) .
+						mb_convert_case(stripslashes($matches[2]), MB_CASE_UPPER, \Smarty\Smarty::$_CHARSET);
+				},
+				$string
+			);
+		}
+		// check uc_digits case
+		if (!$uc_digits) {
+			if (preg_match_all(
+				"!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . \Smarty\Smarty::$_UTF8_MODIFIER,
+				$string,
+				$matches,
+				PREG_OFFSET_CAPTURE
+			)
+			) {
+				foreach ($matches[ 1 ] as $match) {
+					$upper_string =
+						substr_replace(
+							$upper_string,
+							mb_strtolower($match[ 0 ], \Smarty\Smarty::$_CHARSET),
+							$match[ 1 ],
+							strlen($match[ 0 ])
+						);
+				}
+			}
+		}
+		$upper_string =
+			preg_replace_callback(
+				"!((^|\s)['\"])(\w)!" . \Smarty\Smarty::$_UTF8_MODIFIER,
+				function ($matches) {
+					return stripslashes(
+						$matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]),
+						MB_CASE_UPPER,
+						\Smarty\Smarty::$_CHARSET
+					);
+				},
+				$upper_string
+			);
+		return $upper_string;
+	}
+
+	/**
+	 * Smarty count modifier plugin
+	 * Type:     modifier
+	 * Name:     count
+	 * Purpose:  counts all elements in an array or in a Countable object
+	 * Input:
+	 *          - Countable|array: array or object to count
+	 *          - mode: int defaults to 0 for normal count mode, if set to 1 counts recursive
+	 *
+	 * @param mixed $arrayOrObject  input array/object
+	 * @param int $mode       count mode
+	 *
+	 * @return int
+	 */
+	public function smarty_modifier_count($arrayOrObject, $mode = 0) {
+		/*
+		 * @see https://www.php.net/count
+		 * > Prior to PHP 8.0.0, if the parameter was neither an array nor an object that implements the Countable interface,
+		 * > 1 would be returned, unless value was null, in which case 0 would be returned.
+		 */
+
+		if ($arrayOrObject instanceof \Countable || is_array($arrayOrObject)) {
+			return count($arrayOrObject, (int) $mode);
+		} elseif ($arrayOrObject === null) {
+			return 0;
+		}
+		return 1;
+	}
+
+	/**
+	 * Smarty date_format modifier plugin
+	 * Type:     modifier
+	 * Name:     date_format
+	 * Purpose:  format datestamps via strftime
+	 * Input:
+	 *          - string: input date string
+	 *          - format: strftime format for output
+	 *          - default_date: default date if $string is empty
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param string $string       input date string
+	 * @param string $format       strftime format for output
+	 * @param string $default_date default date if $string is empty
+	 * @param string $formatter    either 'strftime' or 'auto'
+	 *
+	 * @return string |void
+	 * @uses   smarty_make_timestamp()
+	 */
+	public function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
+	{
+		if ($format === null) {
+			$format = \Smarty\Smarty::$_DATE_FORMAT;
+		}
+
+		if (!empty($string) && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
+			$timestamp = smarty_make_timestamp($string);
+		} elseif (!empty($default_date)) {
+			$timestamp = smarty_make_timestamp($default_date);
+		} else {
+			return;
+		}
+		if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) {
+			if (\Smarty\Smarty::$_IS_WINDOWS) {
+				$_win_from = array(
+					'%D',
+					'%h',
+					'%n',
+					'%r',
+					'%R',
+					'%t',
+					'%T'
+				);
+				$_win_to = array(
+					'%m/%d/%y',
+					'%b',
+					"\n",
+					'%I:%M:%S %p',
+					'%H:%M',
+					"\t",
+					'%H:%M:%S'
+				);
+				if (strpos($format, '%e') !== false) {
+					$_win_from[] = '%e';
+					$_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
+				}
+				if (strpos($format, '%l') !== false) {
+					$_win_from[] = '%l';
+					$_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
+				}
+				$format = str_replace($_win_from, $_win_to, $format);
+			}
+			// @ to suppress deprecation errors when running in PHP8.1 or higher.
+			return @strftime($format, $timestamp);
+		} else {
+			return date($format, $timestamp);
+		}
+	}
+
+	/**
+	 * Smarty debug_print_var modifier plugin
+	 * Type:     modifier
+	 * Name:     debug_print_var
+	 * Purpose:  formats variable contents for display in the console
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param array|object $var     variable to be formatted
+	 * @param int          $max     maximum recursion depth if $var is an array or object
+	 * @param int          $length  maximum string length if $var is a string
+	 * @param int          $depth   actual recursion depth
+	 * @param array        $objects processed objects in actual depth to prevent recursive object processing
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
+	{
+		$_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
+		switch (gettype($var)) {
+			case 'array':
+				$results = '<b>Array (' . count($var) . ')</b>';
+				if ($depth === $max) {
+					break;
+				}
+				foreach ($var as $curr_key => $curr_val) {
+					$results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b>' . htmlspecialchars(strtr($curr_key, $_replace)) .
+						'</b> =&gt; ' .
+						$this->smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
+					$depth--;
+				}
+				break;
+			case 'object':
+				$object_vars = get_object_vars($var);
+				$results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+				if (in_array($var, $objects)) {
+					$results .= ' called recursive';
+					break;
+				}
+				if ($depth === $max) {
+					break;
+				}
+				$objects[] = $var;
+				foreach ($object_vars as $curr_key => $curr_val) {
+					$results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b> -&gt;' . htmlspecialchars(strtr($curr_key, $_replace)) .
+						'</b> = ' . $this->smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
+					$depth--;
+				}
+				break;
+			case 'boolean':
+			case 'NULL':
+			case 'resource':
+				if (true === $var) {
+					$results = 'true';
+				} elseif (false === $var) {
+					$results = 'false';
+				} elseif (null === $var) {
+					$results = 'null';
+				} else {
+					$results = htmlspecialchars((string)$var);
+				}
+				$results = '<i>' . $results . '</i>';
+				break;
+			case 'integer':
+			case 'float':
+				$results = htmlspecialchars((string)$var);
+				break;
+			case 'string':
+				$results = strtr($var, $_replace);
+				if (mb_strlen($var, \Smarty\Smarty::$_CHARSET) > $length) {
+					$results = mb_substr($var, 0, $length - 3, \Smarty\Smarty::$_CHARSET) . '...';
+				}
+				$results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, \Smarty\Smarty::$_CHARSET);
+				break;
+			case 'unknown type':
+			default:
+				$results = strtr((string)$var, $_replace);
+				if (mb_strlen($results, \Smarty\Smarty::$_CHARSET) > $length) {
+					$results = mb_substr($results, 0, $length - 3, \Smarty\Smarty::$_CHARSET) . '...';
+				}
+				$results = htmlspecialchars($results, ENT_QUOTES, \Smarty\Smarty::$_CHARSET);
+		}
+		return $results;
+	}
+
+	/**
+	 * Smarty escape modifier plugin
+	 * Type:     modifier
+	 * Name:     escape
+	 * Purpose:  escape string for output
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param string  $string        input string
+	 * @param string  $esc_type      escape type
+	 * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
+	 * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
+	 *
+	 * @return string escaped input string
+	 */
+	public function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
+	{
+		if (!$char_set) {
+			$char_set = \Smarty\Smarty::$_CHARSET;
+		}
+
+		$string = (string)$string;
+
+		switch ($esc_type) {
+			case 'html':
+				return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+			// no break
+			case 'htmlall':
+				$string = mb_convert_encoding($string, 'UTF-8', $char_set);
+				return htmlentities($string, ENT_QUOTES, 'UTF-8', $double_encode);
+			// no break
+			case 'url':
+				return rawurlencode($string);
+			case 'urlpathinfo':
+				return str_replace('%2F', '/', rawurlencode($string));
+			case 'quotes':
+				// escape unescaped single quotes
+				return preg_replace("%(?<!\\\\)'%", "\\'", $string);
+			case 'hex':
+				// escape every byte into hex
+				// Note that the UTF-8 encoded character ä will be represented as %c3%a4
+				$return = '';
+				$_length = strlen($string);
+				for ($x = 0; $x < $_length; $x++) {
+					$return .= '%' . bin2hex($string[ $x ]);
+				}
+				return $return;
+			case 'hexentity':
+				$return = '';
+				foreach ($this->mb_to_unicode($string, \Smarty\Smarty::$_CHARSET) as $unicode) {
+					$return .= '&#x' . strtoupper(dechex($unicode)) . ';';
+				}
+				return $return;
+			case 'decentity':
+				$return = '';
+				foreach ($this->mb_to_unicode($string, \Smarty\Smarty::$_CHARSET) as $unicode) {
+					$return .= '&#' . $unicode . ';';
+				}
+				return $return;
+			case 'javascript':
+				// escape quotes and backslashes, newlines, etc.
+				return strtr(
+					$string,
+					array(
+						'\\' => '\\\\',
+						"'"  => "\\'",
+						'"'  => '\\"',
+						"\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':
+				return smarty_mb_str_replace(
+					array(
+						'@',
+						'.'
+					),
+					array(
+						' [AT] ',
+						' [DOT] '
+					),
+					$string
+				);
+			case 'nonstd':
+				// escape non-standard chars, such as ms document quotes
+				$return = '';
+				foreach ($this->mb_to_unicode($string, \Smarty\Smarty::$_CHARSET) as $unicode) {
+					if ($unicode >= 126) {
+						$return .= '&#' . $unicode . ';';
+					} else {
+						$return .= chr($unicode);
+					}
+				}
+				return $return;
+			default:
+				trigger_error("escape: unsupported type: $esc_type - returning unmodified string", E_USER_NOTICE);
+				return $string;
+		}
+	}
+
+
+	/**
+	 * convert characters to their decimal unicode equivalents
+	 *
+	 * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+	 *
+	 * @param string $string   characters to calculate unicode of
+	 * @param string $encoding encoding of $string
+	 *
+	 * @return array sequence of unicodes
+	 * @author Rodney Rehm
+	 */
+	private function mb_to_unicode($string, $encoding = null) {
+		if ($encoding) {
+			$expanded = mb_convert_encoding($string, 'UTF-32BE', $encoding);
+		} else {
+			$expanded = mb_convert_encoding($string, 'UTF-32BE');
+		}
+		return unpack('N*', $expanded);
+	}
+
+	/**
+	 * Smarty explode modifier plugin
+	 * Type:     modifier
+	 * Name:     explode
+	 * Purpose:  split a string by a string
+	 *
+	 * @param string   $separator
+	 * @param string   $string
+	 * @param int|null $limit
+	 *
+	 * @return array
+	 */
+	public function smarty_modifier_explode($separator, $string, ?int $limit = null)
+	{
+		trigger_error("Using explode is deprecated. " .
+			"Use split, using the array first, separator second.", E_USER_DEPRECATED);
+		// provide $string default to prevent deprecation errors in PHP >=8.1
+		return explode($separator, $string ?? '', $limit ?? PHP_INT_MAX);
+	}
+
+	/**
+	 * Smarty split modifier plugin
+	 * Type:     modifier
+	 * Name:     split
+	 * Purpose:  split a string by a string
+	 *
+	 * @param string $string
+	 * @param string   $separator
+	 * @param int|null $limit
+	 *
+	 * @return array
+	 */
+	public function smarty_modifier_split($string, $separator, ?int $limit = null)
+	{
+		// provide $string default to prevent deprecation errors in PHP >=8.1
+		return explode($separator, $string ?? '', $limit ?? PHP_INT_MAX);
+	}
+
+	/**
+	 * Smarty implode modifier plugin
+	 * Type:     modifier
+	 * Name:     implode
+	 * Purpose:  join an array of values into a single string
+	 *
+	 * @param array   $values
+	 * @param string   $separator
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_implode($values, $separator = '')
+	{
+
+		trigger_error("Using implode is deprecated. " .
+			"Use join using the array first, separator second.", E_USER_DEPRECATED);
+
+		if (is_array($separator)) {
+			return implode((string) ($values ?? ''), (array) $separator);
+		}
+		return implode((string) ($separator ?? ''), (array) $values);
+	}
+
+	/**
+	 * Smarty in_array modifier plugin
+	 * Type:     modifier
+	 * Name:     in_array
+	 * Purpose:  test if value is contained in an array
+	 *
+	 * @param mixed   $needle
+	 * @param array   $array
+	 * @param bool   $strict
+	 *
+	 * @return bool
+	 */
+	public function smarty_modifier_in_array($needle, $array, $strict = false)
+	{
+		return in_array($needle, (array) $array, (bool) $strict);
+	}
+
+	/**
+	 * Smarty join modifier plugin
+	 * Type:     modifier
+	 * Name:     join
+	 * Purpose:  join an array of values into a single string
+	 *
+	 * @param array   $values
+	 * @param string   $separator
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_join($values, $separator = '')
+	{
+		if (is_array($separator)) {
+			trigger_error("Using join with the separator first is deprecated. " .
+				"Call join using the array first, separator second.", E_USER_DEPRECATED);
+			return implode((string) ($values ?? ''), (array) $separator);
+		}
+		return implode((string) ($separator ?? ''), (array) $values);
+	}
+
+	/**
+	 * Smarty wordwrap modifier plugin
+	 * Type:     modifier
+	 * Name:     mb_wordwrap
+	 * Purpose:  Wrap a string to a given number of characters
+	 *
+	 * @link   https://php.net/manual/en/function.wordwrap.php for similarity
+	 *
+	 * @param string  $str   the string to wrap
+	 * @param int     $width the width of the output
+	 * @param string  $break the character used to break the line
+	 * @param boolean $cut   ignored parameter, just for the sake of
+	 *
+	 * @return string  wrapped string
+	 * @author Rodney Rehm
+	 */
+	public function smarty_modifier_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
+	{
+		return smarty_mb_wordwrap($str, $width, $break, $cut);
+	}
+
+	/**
+	 * Smarty number_format modifier plugin
+	 * Type:     modifier
+	 * Name:     number_format
+	 * Purpose:  Format a number with grouped thousands
+	 *
+	 * @param float|null  $num
+	 * @param int         $decimals
+	 * @param string|null $decimal_separator
+	 * @param string|null $thousands_separator
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_number_format(?float $num, int $decimals = 0, ?string $decimal_separator = ".", ?string $thousands_separator = ",")
+	{
+		// provide $num default to prevent deprecation errors in PHP >=8.1
+		return number_format($num ?? 0.0, $decimals, $decimal_separator, $thousands_separator);
+	}
+
+	/**
+	 * Smarty regex_replace modifier plugin
+	 * Type:     modifier
+	 * Name:     regex_replace
+	 * Purpose:  regular expression search/replace
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param string       $string  input string
+	 * @param string|array $search  regular expression(s) to search for
+	 * @param string|array $replace string(s) that should be replaced
+	 * @param int          $limit   the maximum number of replacements
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
+	{
+		if (is_array($search)) {
+			foreach ($search as $idx => $s) {
+				$search[ $idx ] = $this->regex_replace_check($s);
+			}
+		} else {
+			$search = $this->regex_replace_check($search);
+		}
+		return preg_replace($search, $replace, $string, $limit);
+	}
+
+	/**
+	 * @param  string $search string(s) that should be replaced
+	 *
+	 * @return string
+	 * @ignore
+	 */
+	private function regex_replace_check($search)
+	{
+		// null-byte injection detection
+		// anything behind the first null-byte is ignored
+		if (($pos = strpos($search, "\0")) !== false) {
+			$search = substr($search, 0, $pos);
+		}
+		// remove eval-modifier from $search
+		if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[ 1 ], 'e') !== false)) {
+			$search = substr($search, 0, -strlen($match[ 1 ])) . preg_replace('![e\s]+!', '', $match[ 1 ]);
+		}
+		return $search;
+	}
+
+	/**
+	 * Smarty replace modifier plugin
+	 * Type:     modifier
+	 * Name:     replace
+	 * Purpose:  simple search/replace
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 * @author Uwe Tews
+	 *
+	 * @param string $string  input string
+	 * @param string $search  text to search for
+	 * @param string $replace replacement text
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_replace($string, $search, $replace)
+	{
+		return smarty_mb_str_replace($search, $replace, $string);
+	}
+
+	/**
+	 * Smarty truncate modifier plugin
+	 * Type:     modifier
+	 * Name:     truncate
+	 * Purpose:  Truncate a string to a certain length if necessary,
+	 *               optionally splitting in the middle of a word, and
+	 *               appending the $etc string or inserting $etc into the middle.
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param string  $string      input string
+	 * @param integer $length      length of truncated text
+	 * @param string  $etc         end string
+	 * @param boolean $break_words truncate at word boundary
+	 * @param boolean $middle      truncate in the middle of text
+	 *
+	 * @return string truncated string
+	 */
+	public function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
+	{
+		if ($length === 0 || $string === null) {
+			return '';
+		}
+		if (mb_strlen($string, \Smarty\Smarty::$_CHARSET) > $length) {
+			$length -= min($length, mb_strlen($etc, \Smarty\Smarty::$_CHARSET));
+			if (!$break_words && !$middle) {
+				$string = preg_replace(
+					'/\s+?(\S+)?$/' . \Smarty\Smarty::$_UTF8_MODIFIER,
+					'',
+					mb_substr($string, 0, $length + 1, \Smarty\Smarty::$_CHARSET)
+				);
+			}
+			if (!$middle) {
+				return mb_substr($string, 0, $length, \Smarty\Smarty::$_CHARSET) . $etc;
+			}
+			return mb_substr($string, 0, intval($length / 2), \Smarty\Smarty::$_CHARSET) . $etc .
+				mb_substr($string, -intval($length / 2), $length, \Smarty\Smarty::$_CHARSET);
+		}
+		return $string;
+	}
+
+}
diff --git a/include/smarty/src/Extension/ExtensionInterface.php b/include/smarty/src/Extension/ExtensionInterface.php
new file mode 100644
index 000000000..72e358ee5
--- /dev/null
+++ b/include/smarty/src/Extension/ExtensionInterface.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Smarty\Extension;
+
+use Smarty\BlockHandler\BlockHandlerInterface;
+use Smarty\Compile\CompilerInterface;
+use Smarty\Compile\Modifier\ModifierCompilerInterface;
+use Smarty\FunctionHandler\FunctionHandlerInterface;
+
+interface ExtensionInterface {
+
+	/**
+	 * Either return \Smarty\Compile\CompilerInterface that will compile the given $tag or
+	 * return null to indicate that you do not know how to handle this $tag. (Another Extension might.)
+	 *
+	 * @param string $tag
+	 * @return CompilerInterface|null
+	 */
+	public function getTagCompiler(string $tag): ?CompilerInterface;
+
+	/**
+	 * Either return \Smarty\Compile\Modifier\ModifierCompilerInterface that will compile the given $modifier or
+	 * return null to indicate that you do not know how to handle this $modifier. (Another Extension might.)
+	 *
+	 * @param string $modifier
+	 * @return ModifierCompilerInterface|null
+	 */
+	public function getModifierCompiler(string $modifier): ?ModifierCompilerInterface;
+
+	/**
+	 * Either return \Smarty\FunctionHandler\FunctionHandlerInterface that will handle the given $functionName or
+	 * return null to indicate that you do not know how to handle this $functionName. (Another Extension might.)
+	 *
+	 * @param string $functionName
+	 * @return FunctionHandlerInterface|null
+	 */
+	public function getFunctionHandler(string $functionName): ?FunctionHandlerInterface;
+
+	/**
+	 * Either return \Smarty\BlockHandler\BlockHandlerInterface that will handle the given $blockTagName or return null
+	 * to indicate that you do not know how to handle this $blockTagName. (Another Extension might.)
+	 *
+	 * @param string $blockTagName
+	 * @return BlockHandlerInterface|null
+	 */
+	public function getBlockHandler(string $blockTagName): ?BlockHandlerInterface;
+
+	/**
+	 * Either return a callable that takes at least 1 parameter (a string) and returns a modified string or return null
+	 * to indicate that you do not know how to handle this $modifierName. (Another Extension might.)
+	 *
+	 * The callable can accept additional optional parameters.
+	 *
+	 * @param string $modifierName
+	 * @return callable|null
+	 */
+	public function getModifierCallback(string $modifierName);
+
+	/**
+	 * Return a list of prefilters that will all be applied, in sequence.
+	 * Template prefilters can be used to preprocess templates before they are compiled.
+	 *
+	 * @return \Smarty\Filter\FilterInterface[]
+	 */
+	public function getPreFilters(): array;
+
+	/**
+	 * Return a list of postfilters that will all be applied, in sequence.
+	 * Template postfilters can be used to process compiled template code (so, after the compilation).
+	 *
+	 * @return \Smarty\Filter\FilterInterface[]
+	 */
+	public function getPostFilters(): array;
+
+	/**
+	 * Return a list of outputfilters that will all be applied, in sequence.
+	 * Template outputfilters can be used to change template output just before it is rendered.
+	 *
+	 * @return \Smarty\Filter\FilterInterface[]
+	 */
+	public function getOutputFilters(): array;
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Filter/FilterInterface.php b/include/smarty/src/Filter/FilterInterface.php
new file mode 100644
index 000000000..42280e25b
--- /dev/null
+++ b/include/smarty/src/Filter/FilterInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Smarty\Filter;
+
+interface FilterInterface {
+
+	public function filter($code, \Smarty\Template $template);
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Filter/FilterPluginWrapper.php b/include/smarty/src/Filter/FilterPluginWrapper.php
new file mode 100644
index 000000000..665ee385c
--- /dev/null
+++ b/include/smarty/src/Filter/FilterPluginWrapper.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Smarty\Filter;
+
+class FilterPluginWrapper implements FilterInterface {
+
+	private $callback;
+
+	public function __construct($callback) {
+		$this->callback = $callback;
+	}
+	public function filter($code, \Smarty\Template $template) {
+		return call_user_func($this->callback, $code, $template);
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/Filter/Output/TrimWhitespace.php b/include/smarty/src/Filter/Output/TrimWhitespace.php
new file mode 100644
index 000000000..5803725ee
--- /dev/null
+++ b/include/smarty/src/Filter/Output/TrimWhitespace.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Smarty\Filter\Output;
+
+/**
+ * Smarty trimwhitespace outputfilter plugin
+ * Trim unnecessary whitespace from HTML markup.
+ *
+ * @author Rodney Rehm
+ *
+ * @param string $source input string
+ *
+ * @return string filtered output
+ */
+class TrimWhitespace implements \Smarty\Filter\FilterInterface {
+
+	public function filter($code, \Smarty\Template $template) {
+
+		$source = $code;
+
+		$store = array();
+		$_store = 0;
+		$_offset = 0;
+		// Unify Line-Breaks to \n
+		$source = preg_replace('/\015\012|\015|\012/', "\n", $source);
+		// capture Internet Explorer and KnockoutJS Conditional Comments
+		if (preg_match_all(
+			'#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is',
+			$source,
+			$matches,
+			PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+		)
+		) {
+			foreach ($matches as $match) {
+				$store[] = $match[ 0 ][ 0 ];
+				$_length = strlen($match[ 0 ][ 0 ]);
+				$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+				$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+				$_offset += $_length - strlen($replace);
+				$_store++;
+			}
+		}
+		// Strip all HTML-Comments
+		// yes, even the ones in <script> - see https://stackoverflow.com/a/808850/515124
+		$source = preg_replace('#<!--.*?-->#ms', '', $source);
+		// capture html elements not to be messed with
+		$_offset = 0;
+		if (preg_match_all(
+			'#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+			$source,
+			$matches,
+			PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+		)
+		) {
+			foreach ($matches as $match) {
+				$store[] = $match[ 0 ][ 0 ];
+				$_length = strlen($match[ 0 ][ 0 ]);
+				$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+				$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+				$_offset += $_length - strlen($replace);
+				$_store++;
+			}
+		}
+		$expressions = array(// replace multiple spaces between tags by a single space
+			// can't remove them entirely, because that might break poorly implemented CSS display:inline-block elements
+			'#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                                    => '\1 \2',
+			// remove spaces between attributes (but not in attribute values!)
+			'#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+			// note: for some very weird reason trim() seems to remove spaces inside attributes.
+			// maybe a \0 byte or something is interfering?
+			'#^\s+<#Ss'                                                               => '<',
+			'#>\s+$#Ss'                                                               => '>',
+		);
+		$source = preg_replace(array_keys($expressions), array_values($expressions), $source);
+		// note: for some very weird reason trim() seems to remove spaces inside attributes.
+		// maybe a \0 byte or something is interfering?
+		// $source = trim( $source );
+		$_offset = 0;
+		if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+			foreach ($matches as $match) {
+				$_length = strlen($match[ 0 ][ 0 ]);
+				$replace = $store[ $match[ 1 ][ 0 ] ];
+				$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+				$_offset += strlen($replace) - $_length;
+				$_store++;
+			}
+		}
+		return $source;
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/BCPluginWrapper.php b/include/smarty/src/FunctionHandler/BCPluginWrapper.php
new file mode 100644
index 000000000..04af07ed8
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/BCPluginWrapper.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+class BCPluginWrapper extends Base {
+
+	private $callback;
+
+	public function __construct($callback, bool $cacheable = true) {
+		$this->callback = $callback;
+		$this->cacheable = $cacheable;
+	}
+
+	public function handle($params, Template $template) {
+		$func = $this->callback;
+		return $func($params, $template);
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/Base.php b/include/smarty/src/FunctionHandler/Base.php
new file mode 100644
index 000000000..7cf196372
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/Base.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+class Base implements FunctionHandlerInterface {
+
+	/**
+	 * @var bool
+	 */
+	protected $cacheable = true;
+
+	public function isCacheable(): bool {
+		return $this->cacheable;
+	}
+
+	public function handle($params, Template $template) {
+		// TODO: Implement handle() method.
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/Count.php b/include/smarty/src/FunctionHandler/Count.php
new file mode 100644
index 000000000..768d809b5
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/Count.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ * count(Countable|array $value, int $mode = COUNT_NORMAL): int
+ * If the optional mode parameter is set to COUNT_RECURSIVE (or 1), count() will recursively count the array.
+ * This is particularly useful for counting all the elements of a multidimensional array.
+ *
+ * Returns the number of elements in value. Prior to PHP 8.0.0, if the parameter was neither an array nor an object that
+ * implements the Countable interface, 1 would be returned, unless value was null, in which case 0 would be returned.
+ */
+class Count extends Base {
+
+	public function handle($params, Template $template) {
+
+		$params = array_values($params ?? []);
+
+		if (count($params) < 1 || count($params) > 2) {
+			throw new Exception("Invalid number of arguments for count. count expects 1 or 2 parameters.");
+		}
+
+		$value = $params[0];
+
+		if ($value instanceof \Countable) {
+			return $value->count();
+		}
+
+		$mode = count($params) == 2 ? (int) $params[1] : COUNT_NORMAL;
+		return count((array) $value, $mode);
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/Counter.php b/include/smarty/src/FunctionHandler/Counter.php
new file mode 100644
index 000000000..b447caf1f
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/Counter.php
@@ -0,0 +1,61 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {counter} function plugin
+ * Type:     function
+ * Name:     counter
+ * Purpose:  print out a counter value
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @return string|null
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ */
+class Counter extends Base {
+
+	private $counters = [];
+
+	public function handle($params, Template $template) {
+		$name = (isset($params['name'])) ? $params['name'] : 'default';
+		if (!isset($this->counters[$name])) {
+			$this->counters[$name] = ['start' => 1, 'skip' => 1, 'direction' => 'up', 'count' => 1];
+		}
+		$counter =& $this->counters[$name];
+		if (isset($params['start'])) {
+			$counter['start'] = $counter['count'] = (int)$params['start'];
+		}
+		if (!empty($params['assign'])) {
+			$counter['assign'] = $params['assign'];
+		}
+		if (isset($counter['assign'])) {
+			$template->assign($counter['assign'], $counter['count']);
+		}
+		if (isset($params['print'])) {
+			$print = (bool)$params['print'];
+		} else {
+			$print = empty($counter['assign']);
+		}
+		if ($print) {
+			$retval = $counter['count'];
+		} else {
+			$retval = null;
+		}
+		if (isset($params['skip'])) {
+			$counter['skip'] = $params['skip'];
+		}
+		if (isset($params['direction'])) {
+			$counter['direction'] = $params['direction'];
+		}
+		if ($counter['direction'] === 'down') {
+			$counter['count'] -= $counter['skip'];
+		} else {
+			$counter['count'] += $counter['skip'];
+		}
+		return $retval;
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/Cycle.php b/include/smarty/src/FunctionHandler/Cycle.php
new file mode 100644
index 000000000..909a688b6
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/Cycle.php
@@ -0,0 +1,90 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {cycle} function plugin
+ * Type:     function
+ * Name:     cycle
+ * Date:     May 3, 2002
+ * Purpose:  cycle through given values
+ * Params:
+ *
+ * - name      - name of cycle (optional)
+ * - values    - comma separated list of values to cycle, or an array of values to cycle
+ *               (this can be left out for subsequent calls)
+ * - reset     - boolean - resets given var to true
+ * - print     - boolean - print var or not. default is true
+ * - advance   - boolean - whether to advance the cycle
+ * - delimiter - the value delimiter, default is ","
+ * - assign    - boolean, assigns to template var instead of printed.
+ *
+ * Examples:
+ *
+ * {cycle values="#eeeeee,#d0d0d0d"}
+ * {cycle name=row values="one,two,three" reset=true}
+ * {cycle name=row}
+ *
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credit to Mark Priatel <mpriatel@rogers.com>
+ * @author  credit to Gerard <gerard@interfold.com>
+ * @author  credit to Jason Sweat <jsweat_php@yahoo.com>
+ * @version 1.3
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @return string|null
+ */
+class Cycle extends Base {
+
+	public function handle($params, Template $template) {
+		static $cycle_vars;
+		$name = (empty($params['name'])) ? 'default' : $params['name'];
+		$print = !(isset($params['print'])) || (bool)$params['print'];
+		$advance = !(isset($params['advance'])) || (bool)$params['advance'];
+		$reset = isset($params['reset']) && (bool)$params['reset'];
+		if (!isset($params['values'])) {
+			if (!isset($cycle_vars[$name]['values'])) {
+				trigger_error('cycle: missing \'values\' parameter');
+				return;
+			}
+		} else {
+			if (isset($cycle_vars[$name]['values']) && $cycle_vars[$name]['values'] !== $params['values']) {
+				$cycle_vars[$name]['index'] = 0;
+			}
+			$cycle_vars[$name]['values'] = $params['values'];
+		}
+		if (isset($params['delimiter'])) {
+			$cycle_vars[$name]['delimiter'] = $params['delimiter'];
+		} elseif (!isset($cycle_vars[$name]['delimiter'])) {
+			$cycle_vars[$name]['delimiter'] = ',';
+		}
+		if (is_array($cycle_vars[$name]['values'])) {
+			$cycle_array = $cycle_vars[$name]['values'];
+		} else {
+			$cycle_array = explode($cycle_vars[$name]['delimiter'], $cycle_vars[$name]['values']);
+		}
+		if (!isset($cycle_vars[$name]['index']) || $reset) {
+			$cycle_vars[$name]['index'] = 0;
+		}
+		if (isset($params['assign'])) {
+			$print = false;
+			$template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
+		}
+		if ($print) {
+			$retval = $cycle_array[$cycle_vars[$name]['index']];
+		} else {
+			$retval = null;
+		}
+		if ($advance) {
+			if ($cycle_vars[$name]['index'] >= count($cycle_array) - 1) {
+				$cycle_vars[$name]['index'] = 0;
+			} else {
+				$cycle_vars[$name]['index']++;
+			}
+		}
+		return $retval;
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/Fetch.php b/include/smarty/src/FunctionHandler/Fetch.php
new file mode 100644
index 000000000..d10ef668f
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/Fetch.php
@@ -0,0 +1,203 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ * Smarty {fetch} plugin
+ * Type:     function
+ * Name:     fetch
+ * Purpose:  fetch file, web or ftp data and display results
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @throws Exception
+ * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
+ */
+class Fetch extends Base {
+
+	public function handle($params, Template $template) {
+		if (empty($params['file'])) {
+			trigger_error('[plugin] fetch parameter \'file\' cannot be empty', E_USER_NOTICE);
+			return;
+		}
+		// strip file protocol
+		if (stripos($params['file'], 'file://') === 0) {
+			$params['file'] = substr($params['file'], 7);
+		}
+		$protocol = strpos($params['file'], '://');
+		if ($protocol !== false) {
+			$protocol = strtolower(substr($params['file'], 0, $protocol));
+		}
+		if (isset($template->getSmarty()->security_policy)) {
+			if ($protocol) {
+				// remote resource (or php stream, …)
+				if (!$template->getSmarty()->security_policy->isTrustedUri($params['file'])) {
+					return;
+				}
+			} else {
+				// local file
+				if (!$template->getSmarty()->security_policy->isTrustedResourceDir($params['file'])) {
+					return;
+				}
+			}
+		}
+		$content = '';
+		if ($protocol === 'http') {
+			// http fetch
+			if ($uri_parts = parse_url($params['file'])) {
+				// set defaults
+				$host = $server_name = $uri_parts['host'];
+				$timeout = 30;
+				$accept = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
+				$agent = 'Smarty Template Engine ' . \Smarty\Smarty::SMARTY_VERSION;
+				$referer = '';
+				$uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
+				$uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
+				$_is_proxy = false;
+				if (empty($uri_parts['port'])) {
+					$port = 80;
+				} else {
+					$port = $uri_parts['port'];
+				}
+				if (!empty($uri_parts['user'])) {
+					$user = $uri_parts['user'];
+				}
+				if (!empty($uri_parts['pass'])) {
+					$pass = $uri_parts['pass'];
+				}
+				// loop through parameters, setup headers
+				foreach ($params as $param_key => $param_value) {
+					switch ($param_key) {
+						case 'file':
+						case 'assign':
+						case 'assign_headers':
+							break;
+						case 'user':
+							if (!empty($param_value)) {
+								$user = $param_value;
+							}
+							break;
+						case 'pass':
+							if (!empty($param_value)) {
+								$pass = $param_value;
+							}
+							break;
+						case 'accept':
+							if (!empty($param_value)) {
+								$accept = $param_value;
+							}
+							break;
+						case 'header':
+							if (!empty($param_value)) {
+								if (!preg_match('![\w\d-]+: .+!', $param_value)) {
+									trigger_error("[plugin] invalid header format '{$param_value}'", E_USER_NOTICE);
+									return;
+								} else {
+									$extra_headers[] = $param_value;
+								}
+							}
+							break;
+						case 'proxy_host':
+							if (!empty($param_value)) {
+								$proxy_host = $param_value;
+							}
+							break;
+						case 'proxy_port':
+							if (!preg_match('!\D!', $param_value)) {
+								$proxy_port = (int)$param_value;
+							} else {
+								trigger_error("[plugin] invalid value for attribute '{$param_key }'", E_USER_NOTICE);
+								return;
+							}
+							break;
+						case 'agent':
+							if (!empty($param_value)) {
+								$agent = $param_value;
+							}
+							break;
+						case 'referer':
+							if (!empty($param_value)) {
+								$referer = $param_value;
+							}
+							break;
+						case 'timeout':
+							if (!preg_match('!\D!', $param_value)) {
+								$timeout = (int)$param_value;
+							} else {
+								trigger_error("[plugin] invalid value for attribute '{$param_key}'", E_USER_NOTICE);
+								return;
+							}
+							break;
+						default:
+							trigger_error("[plugin] unrecognized attribute '{$param_key}'", E_USER_NOTICE);
+							return;
+					}
+				}
+				if (!empty($proxy_host) && !empty($proxy_port)) {
+					$_is_proxy = true;
+					$fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
+				} else {
+					$fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
+				}
+				if (!$fp) {
+					trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
+					return;
+				} else {
+					if ($_is_proxy) {
+						fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
+					} else {
+						fputs($fp, "GET $uri HTTP/1.0\r\n");
+					}
+					if (!empty($host)) {
+						fputs($fp, "Host: $host\r\n");
+					}
+					if (!empty($accept)) {
+						fputs($fp, "Accept: $accept\r\n");
+					}
+					if (!empty($agent)) {
+						fputs($fp, "User-Agent: $agent\r\n");
+					}
+					if (!empty($referer)) {
+						fputs($fp, "Referer: $referer\r\n");
+					}
+					if (isset($extra_headers) && is_array($extra_headers)) {
+						foreach ($extra_headers as $curr_header) {
+							fputs($fp, $curr_header . "\r\n");
+						}
+					}
+					if (!empty($user) && !empty($pass)) {
+						fputs($fp, 'Authorization: BASIC ' . base64_encode("$user:$pass") . "\r\n");
+					}
+					fputs($fp, "\r\n");
+					while (!feof($fp)) {
+						$content .= fgets($fp, 4096);
+					}
+					fclose($fp);
+					$csplit = preg_split("!\r\n\r\n!", $content, 2);
+					$content = $csplit[1];
+					if (!empty($params['assign_headers'])) {
+						$template->assign($params['assign_headers'], preg_split("!\r\n!", $csplit[0]));
+					}
+				}
+			} else {
+				trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
+				return;
+			}
+		} else {
+			$content = @file_get_contents($params['file']);
+			if ($content === false) {
+				throw new Exception("{fetch} cannot read resource '" . $params['file'] . "'");
+			}
+		}
+		if (!empty($params['assign'])) {
+			$template->assign($params['assign'], $content);
+		} else {
+			return $content;
+		}
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/FunctionHandlerInterface.php b/include/smarty/src/FunctionHandler/FunctionHandlerInterface.php
new file mode 100644
index 000000000..ce77e13d2
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/FunctionHandlerInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+interface FunctionHandlerInterface {
+	public function handle($params, Template $template);
+	public function isCacheable(): bool;
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/HtmlBase.php b/include/smarty/src/FunctionHandler/HtmlBase.php
new file mode 100644
index 000000000..99f8e6c77
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/HtmlBase.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+class HtmlBase extends Base {
+
+	/**
+	 * @param $inputType
+	 * @param      $name
+	 * @param      $value
+	 * @param      $output
+	 * @param $ismultiselect
+	 * @param      $selected
+	 * @param      $extra
+	 * @param      $separator
+	 * @param      $labels
+	 * @param      $label_ids
+	 * @param bool $escape
+	 *
+	 * @return string
+	 */
+	protected function getHtmlForInput(
+		$inputType,
+		$name,
+		$value,
+		$output,
+		$ismultiselect,
+		$selected,
+		$extra,
+		$separator,
+		$labels,
+		$label_ids,
+		$escape = true
+	) {
+
+		$_output = '';
+		if (is_object($value)) {
+			if (method_exists($value, '__toString')) {
+				$value = (string)$value->__toString();
+			} else {
+				trigger_error(
+					'value is an object of class \'' . get_class($value) .
+					'\' without __toString() method',
+					E_USER_NOTICE
+				);
+				return '';
+			}
+		} else {
+			$value = (string)$value;
+		}
+		if (is_object($output)) {
+			if (method_exists($output, '__toString')) {
+				$output = (string)$output->__toString();
+			} else {
+				trigger_error(
+					'output is an object of class \'' . get_class($output) .
+					'\' without __toString() method',
+					E_USER_NOTICE
+				);
+				return '';
+			}
+		} else {
+			$output = (string)$output;
+		}
+		if ($labels) {
+			if ($label_ids) {
+				$_id = smarty_function_escape_special_chars(
+					preg_replace(
+						'![^\w\-\.]!' . \Smarty\Smarty::$_UTF8_MODIFIER,
+						'_',
+						$name . '_' . $value
+					)
+				);
+				$_output .= '<label for="' . $_id . '">';
+			} else {
+				$_output .= '<label>';
+			}
+		}
+		$name = smarty_function_escape_special_chars($name);
+		$value = smarty_function_escape_special_chars($value);
+		if ($escape) {
+			$output = smarty_function_escape_special_chars($output);
+		}
+		$_output .= '<input type="' . $inputType . '" name="' . $name;
+		if ($ismultiselect) {
+			$_output .= '[]';
+		}
+		$_output .= '" value="' . $value . '"';
+		if ($labels && $label_ids) {
+			$_output .= ' id="' . $_id . '"';
+		}
+		if ($ismultiselect && is_array($selected)) {
+			if (isset($selected[ $value ])) {
+				$_output .= ' checked="checked"';
+			}
+		} elseif ($value === $selected) {
+			$_output .= ' checked="checked"';
+		}
+		$_output .= $extra . ' />' . $output;
+		if ($labels) {
+			$_output .= '</label>';
+		}
+		$_output .= $separator;
+		return $_output;
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/HtmlCheckboxes.php b/include/smarty/src/FunctionHandler/HtmlCheckboxes.php
new file mode 100644
index 000000000..45ecc40a1
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/HtmlCheckboxes.php
@@ -0,0 +1,189 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_checkboxes} function plugin
+ * File:       HtmlCheckboxes.php
+ * Type:       function
+ * Name:       html_checkboxes
+ * Date:       24.Feb.2003
+ * Purpose:    Prints out a list of checkbox input types
+ * Examples:
+ *
+ * {html_checkboxes values=$ids output=$names}
+ * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
+ * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
+ *
+ * Params:
+ *
+ * - name       (optional) - string default "checkbox"
+ * - values     (required) - array
+ * - options    (optional) - associative array
+ * - checked    (optional) - array default not set
+ * - separator  (optional) - ie <br> or &nbsp;
+ * - output     (optional) - the output next to each checkbox
+ * - assign     (optional) - assign the output as an array to this variable
+ * - escape     (optional) - escape the content (not value), defaults to true
+ *
+ * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author  credits to Monte Ohrt <monte at ohrt dot com>
+ * @version 1.0
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
+ * @throws \Smarty\Exception
+ */
+class HtmlCheckboxes extends HtmlBase {
+
+	public function handle($params, Template $template) {
+		$name = 'checkbox';
+		$values = null;
+		$options = null;
+		$selected = [];
+		$separator = '';
+		$escape = true;
+		$labels = true;
+		$label_ids = false;
+		$output = null;
+		$extra = '';
+		foreach ($params as $_key => $_val) {
+			switch ($_key) {
+				case 'name':
+				case 'separator':
+					$$_key = (string)$_val;
+					break;
+				case 'escape':
+				case 'labels':
+				case 'label_ids':
+					$$_key = (bool)$_val;
+					break;
+				case 'options':
+					$$_key = (array)$_val;
+					break;
+				case 'values':
+				case 'output':
+					$$_key = array_values((array)$_val);
+					break;
+				case 'checked':
+				case 'selected':
+					if (is_array($_val)) {
+						$selected = [];
+						foreach ($_val as $_sel) {
+							if (is_object($_sel)) {
+								if (method_exists($_sel, '__toString')) {
+									$_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
+								} else {
+									trigger_error(
+										'html_checkboxes: selected attribute contains an object of class \'' .
+										get_class($_sel) . '\' without __toString() method',
+										E_USER_NOTICE
+									);
+									continue;
+								}
+							} else {
+								$_sel = smarty_function_escape_special_chars((string)$_sel);
+							}
+							$selected[$_sel] = true;
+						}
+					} elseif (is_object($_val)) {
+						if (method_exists($_val, '__toString')) {
+							$selected = smarty_function_escape_special_chars((string)$_val->__toString());
+						} else {
+							trigger_error(
+								'html_checkboxes: selected attribute is an object of class \'' . get_class($_val) .
+								'\' without __toString() method',
+								E_USER_NOTICE
+							);
+						}
+					} else {
+						$selected = smarty_function_escape_special_chars((string)$_val);
+					}
+					break;
+				case 'checkboxes':
+					trigger_error(
+						'html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
+						E_USER_WARNING
+					);
+					$options = (array)$_val;
+					break;
+				case 'strict':
+				case 'assign':
+					break;
+				case 'disabled':
+				case 'readonly':
+					if (!empty($params['strict'])) {
+						if (!is_scalar($_val)) {
+							trigger_error(
+								"html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+								E_USER_NOTICE
+							);
+						}
+						if ($_val === true || $_val === $_key) {
+							$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+						}
+						break;
+					}
+				// omit break; to fall through!
+				// no break
+				default:
+					if (!is_array($_val)) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+					} else {
+						trigger_error("html_checkboxes: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+					}
+					break;
+			}
+		}
+		if (!isset($options) && !isset($values)) {
+			return '';
+		} /* raise error here? */
+		$_html_result = [];
+		if (isset($options)) {
+			foreach ($options as $_key => $_val) {
+				$_html_result[] =
+					$this->getHtmlForInput(
+						'checkbox',
+						$name,
+						$_key,
+						$_val,
+						true,
+						$selected,
+						$extra,
+						$separator,
+						$labels,
+						$label_ids,
+						$escape
+					);
+			}
+		} else {
+			foreach ($values as $_i => $_key) {
+				$_val = isset($output[$_i]) ? $output[$_i] : '';
+				$_html_result[] =
+					$this->getHtmlForInput(
+						'checkbox',
+						$name,
+						$_key,
+						$_val,
+						true,
+						$selected,
+						$extra,
+						$separator,
+						$labels,
+						$label_ids,
+						$escape
+					);
+			}
+		}
+		if (!empty($params['assign'])) {
+			$template->assign($params['assign'], $_html_result);
+		} else {
+			return implode("\n", $_html_result);
+		}
+	}
+
+}
diff --git a/include/smarty/src/FunctionHandler/HtmlImage.php b/include/smarty/src/FunctionHandler/HtmlImage.php
new file mode 100644
index 000000000..9cb087456
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/HtmlImage.php
@@ -0,0 +1,149 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ * Smarty {html_image} function plugin
+ * Type:     function
+ * Name:     html_image
+ * Date:     Feb 24, 2003
+ * Purpose:  format HTML tags for the image
+ * Examples: {html_image file="/images/masthead.gif"}
+ * Output:   <img src="/images/masthead.gif" width=400 height=23>
+ * Params:
+ *
+ * - file        - (required) - file (and path) of image
+ * - height      - (optional) - image height (default actual height)
+ * - width       - (optional) - image width (default actual width)
+ * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
+ * - path_prefix - prefix for path output (optional, default empty)
+ *
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Duda <duda@big.hu>
+ * @version 1.0
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @throws Exception
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
+ */
+class HtmlImage extends Base {
+
+	public function handle($params, Template $template) {
+		$alt = '';
+		$file = '';
+		$height = '';
+		$width = '';
+		$extra = '';
+		$prefix = '';
+		$suffix = '';
+		$path_prefix = '';
+		$basedir = $_SERVER['DOCUMENT_ROOT'] ?? '';
+		foreach ($params as $_key => $_val) {
+			switch ($_key) {
+				case 'file':
+				case 'height':
+				case 'width':
+				case 'dpi':
+				case 'path_prefix':
+				case 'basedir':
+					$$_key = $_val;
+					break;
+				case 'alt':
+					if (!is_array($_val)) {
+						$$_key = smarty_function_escape_special_chars($_val);
+					} else {
+						throw new Exception(
+							"html_image: extra attribute '{$_key}' cannot be an array",
+							E_USER_NOTICE
+						);
+					}
+					break;
+				case 'link':
+				case 'href':
+					$prefix = '<a href="' . $_val . '">';
+					$suffix = '</a>';
+					break;
+				default:
+					if (!is_array($_val)) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+					} else {
+						throw new Exception(
+							"html_image: extra attribute '{$_key}' cannot be an array",
+							E_USER_NOTICE
+						);
+					}
+					break;
+			}
+		}
+		if (empty($file)) {
+			trigger_error('html_image: missing \'file\' parameter', E_USER_NOTICE);
+			return;
+		}
+		if ($file[0] === '/') {
+			$_image_path = $basedir . $file;
+		} else {
+			$_image_path = $file;
+		}
+		// strip file protocol
+		if (stripos($params['file'], 'file://') === 0) {
+			$params['file'] = substr($params['file'], 7);
+		}
+		$protocol = strpos($params['file'], '://');
+		if ($protocol !== false) {
+			$protocol = strtolower(substr($params['file'], 0, $protocol));
+		}
+		if (isset($template->getSmarty()->security_policy)) {
+			if ($protocol) {
+				// remote resource (or php stream, …)
+				if (!$template->getSmarty()->security_policy->isTrustedUri($params['file'])) {
+					return;
+				}
+			} else {
+				// local file
+				if (!$template->getSmarty()->security_policy->isTrustedResourceDir($_image_path)) {
+					return;
+				}
+			}
+		}
+		if (!isset($params['width']) || !isset($params['height'])) {
+			// FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
+			if (!$_image_data = @getimagesize($_image_path)) {
+				if (!file_exists($_image_path)) {
+					trigger_error("html_image: unable to find '{$_image_path}'", E_USER_NOTICE);
+					return;
+				} elseif (!is_readable($_image_path)) {
+					trigger_error("html_image: unable to read '{$_image_path}'", E_USER_NOTICE);
+					return;
+				} else {
+					trigger_error("html_image: '{$_image_path}' is not a valid image file", E_USER_NOTICE);
+					return;
+				}
+			}
+			if (!isset($params['width'])) {
+				$width = $_image_data[0];
+			}
+			if (!isset($params['height'])) {
+				$height = $_image_data[1];
+			}
+		}
+		if (isset($params['dpi'])) {
+			if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
+				// FIXME: (rodneyrehm) wrong dpi assumption
+				// don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
+				$dpi_default = 72;
+			} else {
+				$dpi_default = 96;
+			}
+			$_resize = $dpi_default / $params['dpi'];
+			$width = round($width * $_resize);
+			$height = round($height * $_resize);
+		}
+		return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' .
+			$height . '"' . $extra . ' />' . $suffix;
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/HtmlOptions.php b/include/smarty/src/FunctionHandler/HtmlOptions.php
new file mode 100644
index 000000000..5346738b6
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/HtmlOptions.php
@@ -0,0 +1,223 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_options} function plugin
+ * Type:     function
+ * Name:     html_options
+ * Purpose:  Prints the list of <option> tags generated from
+ *           the passed parameters
+ * Params:
+ *
+ * - name       (optional) - string default "select"
+ * - values     (required) - if no options supplied) - array
+ * - options    (required) - if no values supplied) - associative array
+ * - selected   (optional) - string default not set
+ * - output     (required) - if not options supplied) - array
+ * - id         (optional) - string default not set
+ * - class      (optional) - string default not set
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty\Template $template
+ *
+ * @return string
+ * @uses   smarty_function_escape_special_chars()
+ * @throws \Smarty\Exception
+ */
+class HtmlOptions extends Base {
+
+	public function handle($params, Template $template) {
+		$name = null;
+		$values = null;
+		$options = null;
+		$selected = null;
+		$output = null;
+		$id = null;
+		$class = null;
+		$extra = '';
+		foreach ($params as $_key => $_val) {
+			switch ($_key) {
+				case 'name':
+				case 'class':
+				case 'id':
+					$$_key = (string)$_val;
+					break;
+				case 'options':
+					$options = (array)$_val;
+					break;
+				case 'values':
+				case 'output':
+					$$_key = array_values((array)$_val);
+					break;
+				case 'selected':
+					if (is_array($_val)) {
+						$selected = [];
+						foreach ($_val as $_sel) {
+							if (is_object($_sel)) {
+								if (method_exists($_sel, '__toString')) {
+									$_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
+								} else {
+									trigger_error(
+										'html_options: selected attribute contains an object of class \'' .
+										get_class($_sel) . '\' without __toString() method',
+										E_USER_NOTICE
+									);
+									continue;
+								}
+							} else {
+								$_sel = smarty_function_escape_special_chars((string)$_sel);
+							}
+							$selected[$_sel] = true;
+						}
+					} elseif (is_object($_val)) {
+						if (method_exists($_val, '__toString')) {
+							$selected = smarty_function_escape_special_chars((string)$_val->__toString());
+						} else {
+							trigger_error(
+								'html_options: selected attribute is an object of class \'' . get_class($_val) .
+								'\' without __toString() method',
+								E_USER_NOTICE
+							);
+						}
+					} else {
+						$selected = smarty_function_escape_special_chars((string)$_val);
+					}
+					break;
+				case 'strict':
+					break;
+				case 'disabled':
+				case 'readonly':
+					if (!empty($params['strict'])) {
+						if (!is_scalar($_val)) {
+							trigger_error(
+								"html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+								E_USER_NOTICE
+							);
+						}
+						if ($_val === true || $_val === $_key) {
+							$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+						}
+						break;
+					}
+				// omit break; to fall through!
+				// no break
+				default:
+					if (!is_array($_val)) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+					} else {
+						trigger_error("html_options: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+					}
+					break;
+			}
+		}
+		if (!isset($options) && !isset($values)) {
+			/* raise error here? */
+			return '';
+		}
+		$_html_result = '';
+		$_idx = 0;
+		if (isset($options)) {
+			foreach ($options as $_key => $_val) {
+				$_html_result .= $this->output($_key, $_val, $selected, $id, $class, $_idx);
+			}
+		} else {
+			foreach ($values as $_i => $_key) {
+				$_val = $output[$_i] ?? '';
+				$_html_result .= $this->output($_key, $_val, $selected, $id, $class, $_idx);
+			}
+		}
+		if (!empty($name)) {
+			$_html_class = !empty($class) ? ' class="' . $class . '"' : '';
+			$_html_id = !empty($id) ? ' id="' . $id . '"' : '';
+			$_html_result =
+				'<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
+				'</select>' . "\n";
+		}
+		return $_html_result;
+	}
+
+
+	/**
+	 * @param $key
+	 * @param $value
+	 * @param $selected
+	 * @param $id
+	 * @param $class
+	 * @param $idx
+	 *
+	 * @return string
+	 */
+	private function output($key, $value, $selected, $id, $class, &$idx)
+	{
+		if (!is_array($value)) {
+			$_key = smarty_function_escape_special_chars($key);
+			$_html_result = '<option value="' . $_key . '"';
+			if (is_array($selected)) {
+				if (isset($selected[ $_key ])) {
+					$_html_result .= ' selected="selected"';
+				}
+			} elseif ($_key === $selected) {
+				$_html_result .= ' selected="selected"';
+			}
+			$_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
+			$_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
+			if (is_object($value)) {
+				if (method_exists($value, '__toString')) {
+					$value = smarty_function_escape_special_chars((string)$value->__toString());
+				} else {
+					trigger_error(
+						'html_options: value is an object of class \'' . get_class($value) .
+						'\' without __toString() method',
+						E_USER_NOTICE
+					);
+					return '';
+				}
+			} else {
+				$value = smarty_function_escape_special_chars((string)$value);
+			}
+			$_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
+			$idx++;
+		} else {
+			$_idx = 0;
+			$_html_result =
+				$this->getHtmlForOptGroup(
+					$key,
+					$value,
+					$selected,
+					!empty($id) ? ($id . '-' . $idx) : null,
+					$class,
+					$_idx
+				);
+			$idx++;
+		}
+		return $_html_result;
+	}
+
+	/**
+	 * @param $key
+	 * @param $values
+	 * @param $selected
+	 * @param $id
+	 * @param $class
+	 * @param $idx
+	 *
+	 * @return string
+	 */
+	private function getHtmlForOptGroup($key, $values, $selected, $id, $class, &$idx)
+	{
+		$optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
+		foreach ($values as $key => $value) {
+			$optgroup_html .= $this->output($key, $value, $selected, $id, $class, $idx);
+		}
+		$optgroup_html .= "</optgroup>\n";
+		return $optgroup_html;
+	}
+
+}
+
diff --git a/include/smarty/src/FunctionHandler/HtmlRadios.php b/include/smarty/src/FunctionHandler/HtmlRadios.php
new file mode 100644
index 000000000..544c5c7d4
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/HtmlRadios.php
@@ -0,0 +1,174 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_radios} function plugin
+ * File:       HtmlRadios.php
+ * Type:       function
+ * Name:       html_radios
+ * Date:       24.Feb.2003
+ * Purpose:    Prints out a list of radio input types
+ * Params:
+ *
+ * - name       (optional) - string default "radio"
+ * - values     (required) - array
+ * - options    (required) - associative array
+ * - checked    (optional) - array default not set
+ * - separator  (optional) - ie <br> or &nbsp;
+ * - output     (optional) - the output next to each radio button
+ * - assign     (optional) - assign the output as an array to this variable
+ * - escape     (optional) - escape the content (not value), defaults to true
+ *
+ * Examples:
+ *
+ * {html_radios values=$ids output=$names}
+ * {html_radios values=$ids name='box' separator='<br>' output=$names}
+ * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
+ *
+ * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author  credits to Monte Ohrt <monte at ohrt dot com>
+ * @version 1.0
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
+ * @throws \Smarty\Exception
+ */
+class HtmlRadios extends HtmlBase {
+
+	public function handle($params, Template $template) {
+		$name = 'radio';
+		$values = null;
+		$options = null;
+		$selected = null;
+		$separator = '';
+		$escape = true;
+		$labels = true;
+		$label_ids = false;
+		$output = null;
+		$extra = '';
+		foreach ($params as $_key => $_val) {
+			switch ($_key) {
+				case 'name':
+				case 'separator':
+					$$_key = (string)$_val;
+					break;
+				case 'checked':
+				case 'selected':
+					if (is_array($_val)) {
+						trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+					} elseif (is_object($_val)) {
+						if (method_exists($_val, '__toString')) {
+							$selected = smarty_function_escape_special_chars((string)$_val->__toString());
+						} else {
+							trigger_error(
+								'html_radios: selected attribute is an object of class \'' . get_class($_val) .
+								'\' without __toString() method',
+								E_USER_NOTICE
+							);
+						}
+					} else {
+						$selected = (string)$_val;
+					}
+					break;
+				case 'escape':
+				case 'labels':
+				case 'label_ids':
+					$$_key = (bool)$_val;
+					break;
+				case 'options':
+					$$_key = (array)$_val;
+					break;
+				case 'values':
+				case 'output':
+					$$_key = array_values((array)$_val);
+					break;
+				case 'radios':
+					trigger_error(
+						'html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
+						E_USER_WARNING
+					);
+					$options = (array)$_val;
+					break;
+				case 'strict':
+				case 'assign':
+					break;
+				case 'disabled':
+				case 'readonly':
+					if (!empty($params['strict'])) {
+						if (!is_scalar($_val)) {
+							trigger_error(
+								"html_options: {$_key} attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+								E_USER_NOTICE
+							);
+						}
+						if ($_val === true || $_val === $_key) {
+							$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+						}
+						break;
+					}
+				// omit break; to fall through!
+				// no break
+				default:
+					if (!is_array($_val)) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+					} else {
+						trigger_error("html_radios: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+					}
+					break;
+			}
+		}
+		if (!isset($options) && !isset($values)) {
+			/* raise error here? */
+			return '';
+		}
+		$_html_result = [];
+		if (isset($options)) {
+			foreach ($options as $_key => $_val) {
+				$_html_result[] =
+					$this->getHtmlForInput(
+						'radio',
+						$name,
+						$_key,
+						$_val,
+						false,
+						$selected,
+						$extra,
+						$separator,
+						$labels,
+						$label_ids,
+						$escape
+					);
+			}
+		} else {
+			foreach ($values as $_i => $_key) {
+				$_val = $output[$_i] ?? '';
+				$_html_result[] =
+					$this->getHtmlForInput(
+						'radio',
+						$name,
+						$_key,
+						$_val,
+						false,
+						$selected,
+						$extra,
+						$separator,
+						$labels,
+						$label_ids,
+						$escape
+					);
+			}
+		}
+		if (!empty($params['assign'])) {
+			$template->assign($params['assign'], $_html_result);
+		} else {
+			return implode("\n", $_html_result);
+		}
+	}
+
+
+}
diff --git a/include/smarty/src/FunctionHandler/HtmlSelectDate.php b/include/smarty/src/FunctionHandler/HtmlSelectDate.php
new file mode 100644
index 000000000..a6acfb7bd
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/HtmlSelectDate.php
@@ -0,0 +1,381 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_select_date} plugin
+ * Type:     function
+ * Name:     html_select_date
+ * Purpose:  Prints the dropdowns for date selection.
+ * ChangeLog:
+ *
+ *            - 1.0 initial release
+ *            - 1.1 added support for +/- N syntax for begin
+ *              and end year values. (Monte)
+ *            - 1.2 added support for yyyy-mm-dd syntax for
+ *              time value. (Jan Rosier)
+ *            - 1.3 added support for choosing format for
+ *              month values (Gary Loescher)
+ *            - 1.3.1 added support for choosing format for
+ *              day values (Marcus Bointon)
+ *            - 1.3.2 support negative timestamps, force year
+ *              dropdown to include given date unless explicitly set (Monte)
+ *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
+ *              of 0000-00-00 dates (cybot, boots)
+ *            - 2.0 complete rewrite for performance,
+ *              added attributes month_names, *_id
+ *
+ * @version 2.0
+ * @author  Andrei Zmievski
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  Rodney Rehm
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty\Template $template
+ *
+ * @return string
+ * @throws \Smarty\Exception
+ */
+class HtmlSelectDate extends Base {
+
+	public function handle($params, Template $template) {
+		// generate timestamps used for month names only
+		static $_month_timestamps = null;
+		static $_current_year = null;
+		if ($_month_timestamps === null) {
+			$_current_year = date('Y');
+			$_month_timestamps = [];
+			for ($i = 1; $i <= 12; $i++) {
+				$_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
+			}
+		}
+		/* Default values. */
+		$prefix = 'Date_';
+		$start_year = null;
+		$end_year = null;
+		$display_days = true;
+		$display_months = true;
+		$display_years = true;
+		$month_format = '%B';
+		/* Write months as numbers by default  GL */
+		$month_value_format = '%m';
+		$day_format = '%02d';
+		/* Write day values using this format MB */
+		$day_value_format = '%d';
+		$year_as_text = false;
+		/* Display years in reverse order? Ie. 2000,1999,.... */
+		$reverse_years = false;
+		/* Should the select boxes be part of an array when returned from PHP?
+		   e.g. setting it to "birthday", would create "birthday[Day]",
+		   "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
+		$field_array = null;
+		/* <select size>'s of the different <select> tags.
+		   If not set, uses default dropdown. */
+		$day_size = null;
+		$month_size = null;
+		$year_size = null;
+		/* Unparsed attributes common to *ALL* the <select>/<input> tags.
+		   An example might be in the template: all_extra ='class ="foo"'. */
+		$all_extra = null;
+		/* Separate attributes for the tags. */
+		$day_extra = null;
+		$month_extra = null;
+		$year_extra = null;
+		/* Order in which to display the fields.
+		   "D" -> day, "M" -> month, "Y" -> year. */
+		$field_order = 'MDY';
+		/* String printed between the different fields. */
+		$field_separator = "\n";
+		$option_separator = "\n";
+		$time = null;
+
+		// $all_empty = null;
+		// $day_empty = null;
+		// $month_empty = null;
+		// $year_empty = null;
+		$extra_attrs = '';
+		$all_id = null;
+		$day_id = null;
+		$month_id = null;
+		$year_id = null;
+		foreach ($params as $_key => $_value) {
+			switch ($_key) {
+				case 'time':
+					$$_key = $_value; // we'll handle conversion below
+					break;
+				case 'month_names':
+					if (is_array($_value) && count($_value) === 12) {
+						$$_key = $_value;
+					} else {
+						trigger_error('html_select_date: month_names must be an array of 12 strings', E_USER_NOTICE);
+					}
+					break;
+				case 'prefix':
+				case 'field_array':
+				case 'start_year':
+				case 'end_year':
+				case 'day_format':
+				case 'day_value_format':
+				case 'month_format':
+				case 'month_value_format':
+				case 'day_size':
+				case 'month_size':
+				case 'year_size':
+				case 'all_extra':
+				case 'day_extra':
+				case 'month_extra':
+				case 'year_extra':
+				case 'field_order':
+				case 'field_separator':
+				case 'option_separator':
+				case 'all_empty':
+				case 'month_empty':
+				case 'day_empty':
+				case 'year_empty':
+				case 'all_id':
+				case 'month_id':
+				case 'day_id':
+				case 'year_id':
+					$$_key = (string)$_value;
+					break;
+				case 'display_days':
+				case 'display_months':
+				case 'display_years':
+				case 'year_as_text':
+				case 'reverse_years':
+					$$_key = (bool)$_value;
+					break;
+				default:
+					if (!is_array($_value)) {
+						$extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+					} else {
+						trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+					}
+					break;
+			}
+		}
+		// Note: date() is faster than strftime()
+		// Note: explode(date()) is faster than date() date() date()
+
+		if (isset($time) && is_array($time)) {
+			if (isset($time[$prefix . 'Year'])) {
+				// $_REQUEST[$field_array] given
+				foreach ([
+					         'Y' => 'Year',
+					         'm' => 'Month',
+					         'd' => 'Day'
+				         ] as $_elementKey => $_elementName) {
+					$_variableName = '_' . strtolower($_elementName);
+					$$_variableName =
+						$time[$prefix . $_elementName] ?? date($_elementKey);
+				}
+			} elseif (isset($time[$field_array][$prefix . 'Year'])) {
+				// $_REQUEST given
+				foreach ([
+					         'Y' => 'Year',
+					         'm' => 'Month',
+					         'd' => 'Day'
+				         ] as $_elementKey => $_elementName) {
+					$_variableName = '_' . strtolower($_elementName);
+					$$_variableName = $time[$field_array][$prefix . $_elementName] ?? date($_elementKey);
+				}
+			} else {
+				// no date found, use NOW
+				[$_year, $_month, $_day] = explode('-', date('Y-m-d'));
+			}
+		} elseif (isset($time) && preg_match("/(\d*)-(\d*)-(\d*)/", $time, $matches)) {
+			$_year = $_month = $_day = null;
+			if ($matches[1] > '') {
+				$_year = (int)$matches[1];
+			}
+			if ($matches[2] > '') {
+				$_month = (int)$matches[2];
+			}
+			if ($matches[3] > '') {
+				$_day = (int)$matches[3];
+			}
+		} elseif ($time === null) {
+			if (array_key_exists('time', $params)) {
+				$_year = $_month = $_day = null;
+			} else {
+				[$_year, $_month, $_day] = explode('-', date('Y-m-d'));
+			}
+		} else {
+			$time = smarty_make_timestamp($time);
+			[$_year, $_month, $_day] = explode('-', date('Y-m-d', $time));
+		}
+
+		// make syntax "+N" or "-N" work with $start_year and $end_year
+		// Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
+		foreach ([
+			         'start',
+			         'end'
+		         ] as $key) {
+			$key .= '_year';
+			$t = $$key;
+			if ($t === null) {
+				$$key = (int)$_current_year;
+			} elseif ($t[0] === '+') {
+				$$key = (int)($_current_year + (int)trim(substr($t, 1)));
+			} elseif ($t[0] === '-') {
+				$$key = (int)($_current_year - (int)trim(substr($t, 1)));
+			} else {
+				$$key = (int)$$key;
+			}
+		}
+		// flip for ascending or descending
+		if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
+			$t = $end_year;
+			$end_year = $start_year;
+			$start_year = $t;
+		}
+		// generate year <select> or <input>
+		if ($display_years) {
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($year_extra) {
+				$_extra .= ' ' . $year_extra;
+			}
+			if ($year_as_text) {
+				$_html_years =
+					'<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
+					$extra_attrs . ' />';
+			} else {
+				$_html_years = '<select name="' . $_name . '"';
+				if ($year_id !== null || $all_id !== null) {
+					$_html_years .= ' id="' . smarty_function_escape_special_chars(
+							$year_id !== null ?
+								($year_id ? $year_id : $_name) :
+								($all_id ? ($all_id . $_name) :
+									$_name)
+						) . '"';
+				}
+				if ($year_size) {
+					$_html_years .= ' size="' . $year_size . '"';
+				}
+				$_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
+				if (isset($year_empty) || isset($all_empty)) {
+					$_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' .
+						$option_separator;
+				}
+				$op = $start_year > $end_year ? -1 : 1;
+				for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
+					$_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i .
+						'</option>' . $option_separator;
+				}
+				$_html_years .= '</select>';
+			}
+		}
+		// generate month <select> or <input>
+		if ($display_months) {
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($month_extra) {
+				$_extra .= ' ' . $month_extra;
+			}
+			$_html_months = '<select name="' . $_name . '"';
+			if ($month_id !== null || $all_id !== null) {
+				$_html_months .= ' id="' . smarty_function_escape_special_chars(
+						$month_id !== null ?
+							($month_id ? $month_id : $_name) :
+							($all_id ? ($all_id . $_name) :
+								$_name)
+					) . '"';
+			}
+			if ($month_size) {
+				$_html_months .= ' size="' . $month_size . '"';
+			}
+			$_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($month_empty) || isset($all_empty)) {
+				$_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' .
+					$option_separator;
+			}
+			for ($i = 1; $i <= 12; $i++) {
+				$_val = sprintf('%02d', $i);
+				$_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) :
+					($month_format === '%m' ? $_val : @strftime($month_format, $_month_timestamps[$i]));
+				$_value = $month_value_format === '%m' ? $_val : @strftime($month_value_format, $_month_timestamps[$i]);
+				$_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
+					'>' . $_text . '</option>' . $option_separator;
+			}
+			$_html_months .= '</select>';
+		}
+		// generate day <select> or <input>
+		if ($display_days) {
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($day_extra) {
+				$_extra .= ' ' . $day_extra;
+			}
+			$_html_days = '<select name="' . $_name . '"';
+			if ($day_id !== null || $all_id !== null) {
+				$_html_days .= ' id="' .
+					smarty_function_escape_special_chars(
+						$day_id !== null ? ($day_id ? $day_id : $_name) :
+							($all_id ? ($all_id . $_name) : $_name)
+					) . '"';
+			}
+			if ($day_size) {
+				$_html_days .= ' size="' . $day_size . '"';
+			}
+			$_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($day_empty) || isset($all_empty)) {
+				$_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' .
+					$option_separator;
+			}
+			for ($i = 1; $i <= 31; $i++) {
+				$_val = sprintf('%02d', $i);
+				$_text = $day_format === '%02d' ? $_val : sprintf($day_format, $i);
+				$_value = $day_value_format === '%02d' ? $_val : sprintf($day_value_format, $i);
+				$_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' .
+					$_text . '</option>' . $option_separator;
+			}
+			$_html_days .= '</select>';
+		}
+		// order the fields for output
+		$_html = '';
+		for ($i = 0; $i <= 2; $i++) {
+			switch ($field_order[$i]) {
+				case 'Y':
+				case 'y':
+					if (isset($_html_years)) {
+						if ($_html) {
+							$_html .= $field_separator;
+						}
+						$_html .= $_html_years;
+					}
+					break;
+				case 'm':
+				case 'M':
+					if (isset($_html_months)) {
+						if ($_html) {
+							$_html .= $field_separator;
+						}
+						$_html .= $_html_months;
+					}
+					break;
+				case 'd':
+				case 'D':
+					if (isset($_html_days)) {
+						if ($_html) {
+							$_html .= $field_separator;
+						}
+						$_html .= $_html_days;
+					}
+					break;
+			}
+		}
+		return $_html;
+	}
+}
\ No newline at end of file
diff --git a/include/smarty/src/FunctionHandler/HtmlSelectTime.php b/include/smarty/src/FunctionHandler/HtmlSelectTime.php
new file mode 100644
index 000000000..40679c10c
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/HtmlSelectTime.php
@@ -0,0 +1,334 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_select_time} function plugin
+ * Type:     function
+ * Name:     html_select_time
+ * Purpose:  Prints the dropdowns for time selection
+ *
+ * @author Roberto Berto <roberto@berto.net>
+ * @author Monte Ohrt <monte AT ohrt DOT com>
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty\Template $template
+ *
+ * @return string
+ * @uses   smarty_make_timestamp()
+ * @throws \Smarty\Exception
+ */
+class HtmlSelectTime extends Base {
+
+	public function handle($params, Template $template) {
+		$prefix = 'Time_';
+		$field_array = null;
+		$field_separator = "\n";
+		$option_separator = "\n";
+		$time = null;
+		$display_hours = true;
+		$display_minutes = true;
+		$display_seconds = true;
+		$display_meridian = true;
+		$hour_format = '%02d';
+		$hour_value_format = '%02d';
+		$minute_format = '%02d';
+		$minute_value_format = '%02d';
+		$second_format = '%02d';
+		$second_value_format = '%02d';
+		$hour_size = null;
+		$minute_size = null;
+		$second_size = null;
+		$meridian_size = null;
+		$all_empty = null;
+		$hour_empty = null;
+		$minute_empty = null;
+		$second_empty = null;
+		$meridian_empty = null;
+		$all_id = null;
+		$hour_id = null;
+		$minute_id = null;
+		$second_id = null;
+		$meridian_id = null;
+		$use_24_hours = true;
+		$minute_interval = 1;
+		$second_interval = 1;
+		$extra_attrs = '';
+		$all_extra = null;
+		$hour_extra = null;
+		$minute_extra = null;
+		$second_extra = null;
+		$meridian_extra = null;
+		foreach ($params as $_key => $_value) {
+			switch ($_key) {
+				case 'time':
+					if (!is_array($_value) && $_value !== null) {
+						$time = smarty_make_timestamp($_value);
+					}
+					break;
+				case 'prefix':
+				case 'field_array':
+				case 'field_separator':
+				case 'option_separator':
+				case 'all_extra':
+				case 'hour_extra':
+				case 'minute_extra':
+				case 'second_extra':
+				case 'meridian_extra':
+				case 'all_empty':
+				case 'hour_empty':
+				case 'minute_empty':
+				case 'second_empty':
+				case 'meridian_empty':
+				case 'all_id':
+				case 'hour_id':
+				case 'minute_id':
+				case 'second_id':
+				case 'meridian_id':
+				case 'hour_format':
+				case 'hour_value_format':
+				case 'minute_format':
+				case 'minute_value_format':
+				case 'second_format':
+				case 'second_value_format':
+					$$_key = (string)$_value;
+					break;
+				case 'display_hours':
+				case 'display_minutes':
+				case 'display_seconds':
+				case 'display_meridian':
+				case 'use_24_hours':
+					$$_key = (bool)$_value;
+					break;
+				case 'minute_interval':
+				case 'second_interval':
+				case 'hour_size':
+				case 'minute_size':
+				case 'second_size':
+				case 'meridian_size':
+					$$_key = (int)$_value;
+					break;
+				default:
+					if (!is_array($_value)) {
+						$extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+					} else {
+						trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+					}
+					break;
+			}
+		}
+		if (isset($params['time']) && is_array($params['time'])) {
+			if (isset($params['time'][$prefix . 'Hour'])) {
+				// $_REQUEST[$field_array] given
+				foreach ([
+					         'H' => 'Hour',
+					         'i' => 'Minute',
+					         's' => 'Second'
+				         ] as $_elementKey => $_elementName) {
+					$_variableName = '_' . strtolower($_elementName);
+					$$_variableName =
+						$params['time'][$prefix . $_elementName] ?? date($_elementKey);
+				}
+				$_meridian =
+					isset($params['time'][$prefix . 'Meridian']) ? (' ' . $params['time'][$prefix . 'Meridian']) :
+						'';
+				$time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+				[$_hour, $_minute, $_second] = $time = explode('-', date('H-i-s', $time));
+			} elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
+				// $_REQUEST given
+				foreach ([
+					         'H' => 'Hour',
+					         'i' => 'Minute',
+					         's' => 'Second'
+				         ] as $_elementKey => $_elementName) {
+					$_variableName = '_' . strtolower($_elementName);
+					$$_variableName = $params['time'][$field_array][$prefix . $_elementName] ?? date($_elementKey);
+				}
+				$_meridian = isset($params['time'][$field_array][$prefix . 'Meridian']) ?
+					(' ' . $params['time'][$field_array][$prefix . 'Meridian']) : '';
+				$time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+				[$_hour, $_minute, $_second] = $time = explode('-', date('H-i-s', $time));
+			} else {
+				// no date found, use NOW
+				[$_year, $_month, $_day] = $time = explode('-', date('Y-m-d'));
+			}
+		} elseif ($time === null) {
+			if (array_key_exists('time', $params)) {
+				$_hour = $_minute = $_second = $time = null;
+			} else {
+				[$_hour, $_minute, $_second] = $time = explode('-', date('H-i-s'));
+			}
+		} else {
+			[$_hour, $_minute, $_second] = $time = explode('-', date('H-i-s', $time));
+		}
+		// generate hour <select>
+		if ($display_hours) {
+			$_html_hours = '';
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($hour_extra) {
+				$_extra .= ' ' . $hour_extra;
+			}
+			$_html_hours = '<select name="' . $_name . '"';
+			if ($hour_id !== null || $all_id !== null) {
+				$_html_hours .= ' id="' .
+					smarty_function_escape_special_chars(
+						$hour_id !== null ? ($hour_id ? $hour_id : $_name) :
+							($all_id ? ($all_id . $_name) : $_name)
+					) . '"';
+			}
+			if ($hour_size) {
+				$_html_hours .= ' size="' . $hour_size . '"';
+			}
+			$_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($hour_empty) || isset($all_empty)) {
+				$_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' .
+					$option_separator;
+			}
+			$start = $use_24_hours ? 0 : 1;
+			$end = $use_24_hours ? 23 : 12;
+			for ($i = $start; $i <= $end; $i++) {
+				$_val = sprintf('%02d', $i);
+				$_text = $hour_format === '%02d' ? $_val : sprintf($hour_format, $i);
+				$_value = $hour_value_format === '%02d' ? $_val : sprintf($hour_value_format, $i);
+				if (!$use_24_hours) {
+					$_hour12 = $_hour == 0 ? 12 : ($_hour <= 12 ? $_hour : $_hour - 12);
+				}
+				$selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
+				$_html_hours .= '<option value="' . $_value . '"' . ($selected ? ' selected="selected"' : '') . '>' .
+					$_text . '</option>' . $option_separator;
+			}
+			$_html_hours .= '</select>';
+		}
+		// generate minute <select>
+		if ($display_minutes) {
+			$_html_minutes = '';
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($minute_extra) {
+				$_extra .= ' ' . $minute_extra;
+			}
+			$_html_minutes = '<select name="' . $_name . '"';
+			if ($minute_id !== null || $all_id !== null) {
+				$_html_minutes .= ' id="' . smarty_function_escape_special_chars(
+						$minute_id !== null ?
+							($minute_id ? $minute_id : $_name) :
+							($all_id ? ($all_id . $_name) :
+								$_name)
+					) . '"';
+			}
+			if ($minute_size) {
+				$_html_minutes .= ' size="' . $minute_size . '"';
+			}
+			$_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($minute_empty) || isset($all_empty)) {
+				$_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' .
+					$option_separator;
+			}
+			$selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
+			for ($i = 0; $i <= 59; $i += $minute_interval) {
+				$_val = sprintf('%02d', $i);
+				$_text = $minute_format === '%02d' ? $_val : sprintf($minute_format, $i);
+				$_value = $minute_value_format === '%02d' ? $_val : sprintf($minute_value_format, $i);
+				$_html_minutes .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
+					'>' . $_text . '</option>' . $option_separator;
+			}
+			$_html_minutes .= '</select>';
+		}
+		// generate second <select>
+		if ($display_seconds) {
+			$_html_seconds = '';
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($second_extra) {
+				$_extra .= ' ' . $second_extra;
+			}
+			$_html_seconds = '<select name="' . $_name . '"';
+			if ($second_id !== null || $all_id !== null) {
+				$_html_seconds .= ' id="' . smarty_function_escape_special_chars(
+						$second_id !== null ?
+							($second_id ? $second_id : $_name) :
+							($all_id ? ($all_id . $_name) :
+								$_name)
+					) . '"';
+			}
+			if ($second_size) {
+				$_html_seconds .= ' size="' . $second_size . '"';
+			}
+			$_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($second_empty) || isset($all_empty)) {
+				$_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' .
+					$option_separator;
+			}
+			$selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
+			for ($i = 0; $i <= 59; $i += $second_interval) {
+				$_val = sprintf('%02d', $i);
+				$_text = $second_format === '%02d' ? $_val : sprintf($second_format, $i);
+				$_value = $second_value_format === '%02d' ? $_val : sprintf($second_value_format, $i);
+				$_html_seconds .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
+					'>' . $_text . '</option>' . $option_separator;
+			}
+			$_html_seconds .= '</select>';
+		}
+		// generate meridian <select>
+		if ($display_meridian && !$use_24_hours) {
+			$_html_meridian = '';
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($meridian_extra) {
+				$_extra .= ' ' . $meridian_extra;
+			}
+			$_html_meridian = '<select name="' . $_name . '"';
+			if ($meridian_id !== null || $all_id !== null) {
+				$_html_meridian .= ' id="' . smarty_function_escape_special_chars(
+						$meridian_id !== null ?
+							($meridian_id ? $meridian_id :
+								$_name) :
+							($all_id ? ($all_id . $_name) :
+								$_name)
+					) . '"';
+			}
+			if ($meridian_size) {
+				$_html_meridian .= ' size="' . $meridian_size . '"';
+			}
+			$_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($meridian_empty) || isset($all_empty)) {
+				$_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) .
+					'</option>' . $option_separator;
+			}
+			$_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .
+				'>AM</option>' . $option_separator . '<option value="pm"' .
+				($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator .
+				'</select>';
+		}
+		$_html = '';
+		foreach ([
+			         '_html_hours',
+			         '_html_minutes',
+			         '_html_seconds',
+			         '_html_meridian'
+		         ] as $k) {
+			if (isset($$k)) {
+				if ($_html) {
+					$_html .= $field_separator;
+				}
+				$_html .= $$k;
+			}
+		}
+		return $_html;
+	}
+}
diff --git a/include/smarty/src/FunctionHandler/HtmlTable.php b/include/smarty/src/FunctionHandler/HtmlTable.php
new file mode 100644
index 000000000..d5d147053
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/HtmlTable.php
@@ -0,0 +1,161 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_table} function plugin
+ * Type:     function
+ * Name:     html_table
+ * Date:     Feb 17, 2003
+ * Purpose:  make an html table from an array of data
+ * Params:
+ *
+ * - loop       - array to loop through
+ * - cols       - number of columns, comma separated list of column names
+ *                or array of column names
+ * - rows       - number of rows
+ * - table_attr - table attributes
+ * - th_attr    - table heading attributes (arrays are cycled)
+ * - tr_attr    - table row attributes (arrays are cycled)
+ * - td_attr    - table cell attributes (arrays are cycled)
+ * - trailpad   - value to pad trailing cells with
+ * - caption    - text for caption element
+ * - vdir       - vertical direction (default: "down", means top-to-bottom)
+ * - hdir       - horizontal direction (default: "right", means left-to-right)
+ * - inner      - inner loop (default "cols": print $loop line by line,
+ *                $loop will be printed column by column otherwise)
+ *
+ * Examples:
+ *
+ * {table loop=$data}
+ * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
+ * {table loop=$data cols="first,second,third" tr_attr=$colors}
+ *
+ * @param array $params parameters
+ *
+ * @return string
+ *@author  credit to boots <boots dot smarty at yahoo dot com>
+ * @version 1.1
+ *
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credit to Messju Mohr <messju at lammfellpuschen dot de>
+ */
+class HtmlTable extends Base {
+
+	public function handle($params, Template $template) {
+		$table_attr = 'border="1"';
+		$tr_attr = '';
+		$th_attr = '';
+		$td_attr = '';
+		$cols = $cols_count = 3;
+		$rows = 3;
+		$trailpad = '&nbsp;';
+		$vdir = 'down';
+		$hdir = 'right';
+		$inner = 'cols';
+		$caption = '';
+		$loop = null;
+		if (!isset($params['loop'])) {
+			trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
+			return;
+		}
+		foreach ($params as $_key => $_value) {
+			switch ($_key) {
+				case 'loop':
+					$$_key = (array)$_value;
+					break;
+				case 'cols':
+					if (is_array($_value) && !empty($_value)) {
+						$cols = $_value;
+						$cols_count = count($_value);
+					} elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
+						$cols = explode(',', $_value);
+						$cols_count = count($cols);
+					} elseif (!empty($_value)) {
+						$cols_count = (int)$_value;
+					} else {
+						$cols_count = $cols;
+					}
+					break;
+				case 'rows':
+					$$_key = (int)$_value;
+					break;
+				case 'table_attr':
+				case 'trailpad':
+				case 'hdir':
+				case 'vdir':
+				case 'inner':
+				case 'caption':
+					$$_key = (string)$_value;
+					break;
+				case 'tr_attr':
+				case 'td_attr':
+				case 'th_attr':
+					$$_key = $_value;
+					break;
+			}
+		}
+		$loop_count = count($loop);
+		if (empty($params['rows'])) {
+			/* no rows specified */
+			$rows = ceil($loop_count / $cols_count);
+		} elseif (empty($params['cols'])) {
+			if (!empty($params['rows'])) {
+				/* no cols specified, but rows */
+				$cols_count = ceil($loop_count / $rows);
+			}
+		}
+		$output = "<table $table_attr>\n";
+		if (!empty($caption)) {
+			$output .= '<caption>' . $caption . "</caption>\n";
+		}
+		if (is_array($cols)) {
+			$cols = ($hdir === 'right') ? $cols : array_reverse($cols);
+			$output .= "<thead><tr>\n";
+			for ($r = 0; $r < $cols_count; $r++) {
+				$output .= '<th' . $this->cycle('th', $th_attr, $r) . '>';
+				$output .= $cols[$r];
+				$output .= "</th>\n";
+			}
+			$output .= "</tr></thead>\n";
+		}
+		$output .= "<tbody>\n";
+		for ($r = 0; $r < $rows; $r++) {
+			$output .= "<tr" . $this->cycle('tr', $tr_attr, $r) . ">\n";
+			$rx = ($vdir === 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
+			for ($c = 0; $c < $cols_count; $c++) {
+				$x = ($hdir === 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
+				if ($inner !== 'cols') {
+					/* shuffle x to loop over rows*/
+					$x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
+				}
+				if ($x < $loop_count) {
+					$output .= "<td" . $this->cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
+				} else {
+					$output .= "<td" . $this->cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
+				}
+			}
+			$output .= "</tr>\n";
+		}
+		$output .= "</tbody>\n";
+		$output .= "</table>\n";
+		return $output;
+	}
+
+	/**
+	 * @param $name
+	 * @param $var
+	 * @param $no
+	 *
+	 * @return string
+	 */
+	private function cycle($name, $var, $no) {
+		if (!is_array($var)) {
+			$ret = $var;
+		} else {
+			$ret = $var[$no % count($var)];
+		}
+		return ($ret) ? ' ' . $ret : '';
+	}
+}
diff --git a/include/smarty/src/FunctionHandler/Mailto.php b/include/smarty/src/FunctionHandler/Mailto.php
new file mode 100644
index 000000000..eb35c48eb
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/Mailto.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {mailto} function plugin
+ * Type:     function
+ * Name:     mailto
+ * Date:     May 21, 2002
+ * Purpose:  automate mailto address link creation, and optionally encode them.
+ * Params:
+ *
+ * - address    - (required) - e-mail address
+ * - text       - (optional) - text to display, default is address
+ * - encode     - (optional) - can be one of:
+ *                             * none : no encoding (default)
+ *                             * javascript : encode with javascript
+ *                             * javascript_charcode : encode with javascript charcode
+ *                             * hex : encode with hexadecimal (no javascript)
+ * - cc         - (optional) - address(es) to carbon copy
+ * - bcc        - (optional) - address(es) to blind carbon copy
+ * - subject    - (optional) - e-mail subject
+ * - newsgroups - (optional) - newsgroup(s) to post to
+ * - followupto - (optional) - address(es) to follow up to
+ * - extra      - (optional) - extra tags for the href link
+ *
+ * Examples:
+ *
+ * {mailto address="me@domain.com"}
+ * {mailto address="me@domain.com" encode="javascript"}
+ * {mailto address="me@domain.com" encode="hex"}
+ * {mailto address="me@domain.com" subject="Hello to you!"}
+ * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
+ * {mailto address="me@domain.com" extra='class="mailto"'}
+ *
+ * @version 1.2
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Jason Sweat (added cc, bcc and subject functionality)
+ *
+ * @param array $params parameters
+ *
+ * @return string
+ */
+class Mailto extends Base {
+
+	public function handle($params, Template $template) {
+		static $_allowed_encoding = [
+			'javascript' => true,
+			'javascript_charcode' => true,
+			'hex' => true,
+			'none' => true
+		];
+
+		$extra = '';
+		if (empty($params['address'])) {
+			trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
+			return;
+		} else {
+			$address = $params['address'];
+		}
+
+		$text = $address;
+
+		// netscape and mozilla do not decode %40 (@) in BCC field (bug?)
+		// so, don't encode it.
+		$mail_parms = [];
+		foreach ($params as $var => $value) {
+			switch ($var) {
+				case 'cc':
+				case 'bcc':
+				case 'followupto':
+					if (!empty($value)) {
+						$mail_parms[] = $var . '=' . str_replace(['%40', '%2C'], ['@', ','], rawurlencode($value));
+					}
+					break;
+				case 'subject':
+				case 'newsgroups':
+					$mail_parms[] = $var . '=' . rawurlencode($value);
+					break;
+				case 'extra':
+				case 'text':
+					$$var = $value;
+				// no break
+				default:
+			}
+		}
+
+		if ($mail_parms) {
+			$address .= '?' . join('&', $mail_parms);
+		}
+		$encode = (empty($params['encode'])) ? 'none' : $params['encode'];
+		if (!isset($_allowed_encoding[$encode])) {
+			trigger_error(
+				"mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
+				E_USER_WARNING
+			);
+			return;
+		}
+
+		$string = '<a href="mailto:' . htmlspecialchars($address, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, \Smarty\Smarty::$_CHARSET) .
+			'" ' . $extra . '>' . htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, \Smarty\Smarty::$_CHARSET) . '</a>';
+
+		if ($encode === 'javascript') {
+			$js_encode = '';
+			for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+				$js_encode .= '%' . bin2hex($string[$x]);
+			}
+			return '<script>document.write(unescape(\'' . $js_encode . '\'))</script>';
+		} elseif ($encode === 'javascript_charcode') {
+			for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+				$ord[] = ord($string[$x]);
+			}
+			return '<script>document.write(String.fromCharCode(' . implode(',', $ord) . '))</script>';
+		} elseif ($encode === 'hex') {
+			preg_match('!^(.*)(\?.*)$!', $address, $match);
+			if (!empty($match[2])) {
+				trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
+				return;
+			}
+			$address_encode = '';
+			for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
+				if (preg_match('!\w!' . \Smarty\Smarty::$_UTF8_MODIFIER, $address[$x])) {
+					$address_encode .= '%' . bin2hex($address[$x]);
+				} else {
+					$address_encode .= $address[$x];
+				}
+			}
+			$text_encode = '';
+			for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
+				$text_encode .= '&#x' . bin2hex($text[$x]) . ';';
+			}
+			$mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
+			return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
+		} else {
+			// no encoding
+			return $string;
+		}
+	}
+}
diff --git a/include/smarty/src/FunctionHandler/Math.php b/include/smarty/src/FunctionHandler/Math.php
new file mode 100644
index 000000000..23ef9253d
--- /dev/null
+++ b/include/smarty/src/FunctionHandler/Math.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {math} function plugin
+ * Type:     function
+ * Name:     math
+ * Purpose:  handle math computations in template
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @return string|null
+ */
+class Math extends Base {
+
+	public function handle($params, Template $template) {
+		static $_allowed_funcs =
+			[
+				'int' => true,
+				'abs' => true,
+				'ceil' => true,
+				'acos' => true,
+				'acosh' => true,
+				'cos' => true,
+				'cosh' => true,
+				'deg2rad' => true,
+				'rad2deg' => true,
+				'exp' => true,
+				'floor' => true,
+				'log' => true,
+				'log10' => true,
+				'max' => true,
+				'min' => true,
+				'pi' => true,
+				'pow' => true,
+				'rand' => true,
+				'round' => true,
+				'asin' => true,
+				'asinh' => true,
+				'sin' => true,
+				'sinh' => true,
+				'sqrt' => true,
+				'srand' => true,
+				'atan' => true,
+				'atanh' => true,
+				'tan' => true,
+				'tanh' => true
+			];
+
+		// be sure equation parameter is present
+		if (empty($params['equation'])) {
+			trigger_error("math: missing equation parameter", E_USER_WARNING);
+			return;
+		}
+		$equation = $params['equation'];
+
+		// Remove whitespaces
+		$equation = preg_replace('/\s+/', '', $equation);
+
+		// Adapted from https://www.php.net/manual/en/function.eval.php#107377
+		$number = '-?(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number
+		$functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))';
+		$operators = '[,+\/*\^%-]'; // Allowed math operators
+		$regexp = '/^((' . $number . '|' . $functionsOrVars . '|(' . $functionsOrVars . '\s*\((?1)*\)|\((?1)*\)))(?:' . $operators . '(?1))?)+$/';
+
+		if (!preg_match($regexp, $equation)) {
+			trigger_error("math: illegal characters", E_USER_WARNING);
+			return;
+		}
+
+		// make sure parenthesis are balanced
+		if (substr_count($equation, '(') !== substr_count($equation, ')')) {
+			trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
+			return;
+		}
+
+		// disallow backticks
+		if (strpos($equation, '`') !== false) {
+			trigger_error("math: backtick character not allowed in equation", E_USER_WARNING);
+			return;
+		}
+
+		// also disallow dollar signs
+		if (strpos($equation, '$') !== false) {
+			trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING);
+			return;
+		}
+		foreach ($params as $key => $val) {
+			if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+				// make sure value is not empty
+				if (strlen($val) === 0) {
+					trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING);
+					return;
+				}
+				if (!is_numeric($val)) {
+					trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING);
+					return;
+				}
+			}
+		}
+		// match all vars in equation, make sure all are passed
+		preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match);
+		foreach ($match[1] as $curr_var) {
+			if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) {
+				trigger_error(
+					"math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'",
+					E_USER_WARNING
+				);
+				return;
+			}
+		}
+		foreach ($params as $key => $val) {
+			if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+				$equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
+			}
+		}
+		$smarty_math_result = null;
+		eval("\$smarty_math_result = " . $equation . ";");
+
+		if (empty($params['format'])) {
+			if (empty($params['assign'])) {
+				return $smarty_math_result;
+			} else {
+				$template->assign($params['assign'], $smarty_math_result);
+			}
+		} else {
+			if (empty($params['assign'])) {
+				printf($params['format'], $smarty_math_result);
+			} else {
+				$template->assign($params['assign'], sprintf($params['format'], $smarty_math_result));
+			}
+		}
+	}
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/include/smarty/src/Lexer/ConfigfileLexer.php
similarity index 57%
rename from include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
rename to include/smarty/src/Lexer/ConfigfileLexer.php
index afb3efcb0..d592c8238 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
+++ b/include/smarty/src/Lexer/ConfigfileLexer.php
@@ -1,111 +1,117 @@
 <?php
-/**
- * Smarty Internal Plugin Configfilelexer
- *
- * This is the lexer to break the config file source into tokens
- *
- * @package    Smarty
- * @subpackage Config
- * @author     Uwe Tews
- */
+
+namespace Smarty\Lexer;
 
 /**
- * Smarty_Internal_Configfilelexer
- *
- * This is the config file lexer.
- * It is generated from the smarty_internal_configfilelexer.plex file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-class Smarty_Internal_Configfilelexer
+* Smarty Internal Plugin ConfigfileLexer
+*
+* This is the lexer to break the config file source into tokens 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews 
+*/
+/**
+* ConfigfileLexer
+*
+* This is the config file lexer.
+* It is generated from the ConfigfileLexer.plex file
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class ConfigfileLexer
 {
-    const START              = 1;
-    const VALUE              = 2;
-    const NAKED_STRING_VALUE = 3;
-    const COMMENT            = 4;
-    const SECTION            = 5;
-    const TRIPPLE            = 6;
-
     /**
      * Source
      *
      * @var string
      */
     public $data;
-
-    /**
-     * Source length
-     *
-     * @var int
-     */
-    public $dataLength = null;
-
-    /**
+      /**
+      * Source length
+      *
+      * @var int
+      */
+     public $dataLength = null;
+   /**
      * byte counter
      *
      * @var int
      */
     public $counter;
-
     /**
      * token number
      *
      * @var int
      */
     public $token;
-
     /**
      * token value
      *
      * @var string
      */
     public $value;
-
     /**
      * current line
      *
      * @var int
      */
     public $line;
-
     /**
      * state number
      *
      * @var int
      */
     public $state = 1;
-
     /**
      * Smarty object
      *
      * @var Smarty
      */
     public $smarty = null;
-
+    /**
+     * compiler object
+     *
+     * @var \Smarty\Compiler\Configfile
+     */
+    private $compiler = null;
+    /**
+     * copy of config_booleanize
+     *
+     * @var bool
+     */
+    private $configBooleanize = false;
     /**
      * trace file
      *
      * @var resource
      */
     public $yyTraceFILE;
-
     /**
      * trace prompt
      *
      * @var string
      */
     public $yyTracePrompt;
-
     /**
      * state names
      *
      * @var array
      */
-    public $state_name = array(
-        1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE'
-    );
+    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+    private $yy_global_pattern2 = null;
+    private $yy_global_pattern3 = null;
+    private $yy_global_pattern4 = null;
+    private $yy_global_pattern5 = null;
+    private $yy_global_pattern6 = null;
 
     /**
      * token names
@@ -115,54 +121,19 @@ class Smarty_Internal_Configfilelexer
     public $smarty_token_names = array(        // Text for parser error messages
     );
 
-    /**
-     * compiler object
-     *
-     * @var Smarty_Internal_Config_File_Compiler
-     */
-    private $compiler = null;
-
-    /**
-     * copy of config_booleanize
-     *
-     * @var bool
-     */
-    private $configBooleanize = false;
-
-    /**
-     * storage for assembled token patterns
-     *
-     * @var string
-     */
-    private $yy_global_pattern1 = null;
-
-    private $yy_global_pattern2 = null;
-
-    private $yy_global_pattern3 = null;
-
-    private $yy_global_pattern4 = null;
-
-    private $yy_global_pattern5 = null;
-
-    private $yy_global_pattern6 = null;
-
-    private $_yy_state          = 1;
-
-    private $_yy_stack          = array();
-
     /**
      * constructor
      *
      * @param   string                             $data template source
-     * @param Smarty_Internal_Config_File_Compiler $compiler
+     * @param \Smarty\Compiler\Configfile $compiler
      */
-    public function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
+    public function __construct($data, \Smarty\Compiler\Configfile $compiler)
     {
         $this->data = $data . "\n"; //now all lines are \n-terminated
         $this->dataLength = strlen($data);
         $this->counter = 0;
         if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
-            $this->counter += strlen($match[ 0 ]);
+            $this->counter += strlen($match[0]);
         }
         $this->line = 1;
         $this->compiler = $compiler;
@@ -170,10 +141,9 @@ class Smarty_Internal_Configfilelexer
         $this->configBooleanize = $this->smarty->config_booleanize;
     }
 
-    public function replace($input)
-    {
+   public function replace ($input) {
         return $input;
-    } // end function
+   }
 
     public function PrintTrace()
     {
@@ -181,6 +151,11 @@ class Smarty_Internal_Configfilelexer
         $this->yyTracePrompt = '<br>';
     }
 
+
+
+    private $_yy_state = 1;
+    private $_yy_stack = array();
+
     public function yylex()
     {
         return $this->{'yylex' . $this->_yy_state}();
@@ -189,85 +164,61 @@ class Smarty_Internal_Configfilelexer
     public function yypushstate($state)
     {
         if ($this->yyTraceFILE) {
-            fprintf(
-                $this->yyTraceFILE,
-                "%sState push %s\n",
-                $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
-            );
+             fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
-            fprintf(
-                $this->yyTraceFILE,
-                "%snew State %s\n",
-                $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
-            );
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
     public function yypopstate()
     {
-        if ($this->yyTraceFILE) {
-            fprintf(
-                $this->yyTraceFILE,
-                "%sState pop %s\n",
-                $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
-            );
+       if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,  isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
-        $this->_yy_state = array_pop($this->_yy_stack);
+       $this->_yy_state = array_pop($this->_yy_stack);
         if ($this->yyTraceFILE) {
-            fprintf(
-                $this->yyTraceFILE,
-                "%snew State %s\n",
-                $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
-            );
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
+
     }
 
     public function yybegin($state)
     {
-        $this->_yy_state = $state;
+       $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
-            fprintf(
-                $this->yyTraceFILE,
-                "%sState set %s\n",
-                $this->yyTracePrompt,
-                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
-            );
+             fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
+
+
+
     public function yylex1()
     {
         if (!isset($this->yy_global_pattern1)) {
-            $this->yy_global_pattern1 =
-                $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS");
+            $this->yy_global_pattern1 = $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state START');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state START');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -285,89 +236,91 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
+                }            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
-    public function yy_r1_1()
-    {
-        $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
-        $this->yypushstate(self::COMMENT);
-    }
-
-    public function yy_r1_2()
-    {
-        $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
-        $this->yypushstate(self::SECTION);
-    }
-
-    public function yy_r1_3()
-    {
-        $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
-    }
-
-    public function yy_r1_4()
-    {
-        $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
-        $this->yypushstate(self::VALUE);
     } // end function
 
+
+    const START = 1;
+    public function yy_r1_1()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_COMMENTSTART;
+    $this->yypushstate(self::COMMENT);
+    }
+    public function yy_r1_2()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_OPENB;
+    $this->yypushstate(self::SECTION);
+    }
+    public function yy_r1_3()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_CLOSEB;
+    }
+    public function yy_r1_4()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_EQUAL;
+    $this->yypushstate(self::VALUE);
+    }
     public function yy_r1_5()
     {
-        return false;
-    }
 
+    return false;
+    }
     public function yy_r1_6()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    }
 
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
+    }
     public function yy_r1_7()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_ID;
-    }
 
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_ID;
+    }
     public function yy_r1_8()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_OTHER;
     }
 
+
+
     public function yylex2()
     {
         if (!isset($this->yy_global_pattern2)) {
-            $this->yy_global_pattern2 =
-                $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
+            $this->yy_global_pattern2 = $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state VALUE');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state VALUE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -385,80 +338,84 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
+                }            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const VALUE = 2;
     public function yy_r2_1()
     {
-        return false;
-    }
 
+    return false;
+    }
     public function yy_r2_2()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
-        $this->yypopstate();
-    }
 
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_FLOAT;
+    $this->yypopstate();
+    }
     public function yy_r2_3()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_INT;
-        $this->yypopstate();
-    }
 
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_INT;
+    $this->yypopstate();
+    }
     public function yy_r2_4()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
-        $this->yypushstate(self::TRIPPLE);
-    }
 
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES;
+    $this->yypushstate(self::TRIPPLE);
+    }
     public function yy_r2_5()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
-        $this->yypopstate();
-    }
 
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_SINGLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
     public function yy_r2_6()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
-        $this->yypopstate();
-    } // end function
 
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
     public function yy_r2_7()
     {
-        if (!$this->configBooleanize ||
-            !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no'))) {
-            $this->yypopstate();
-            $this->yypushstate(self::NAKED_STRING_VALUE);
-            return true; //reprocess in new state
-        } else {
-            $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
-            $this->yypopstate();
-        }
-    }
 
+    if (!$this->configBooleanize || !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no')) ) {
+        $this->yypopstate();
+        $this->yypushstate(self::NAKED_STRING_VALUE);
+        return true; //reprocess in new state
+    } else {
+        $this->token = \Smarty\Parser\ConfigfileParser::TPC_BOOL;
+        $this->yypopstate();
+    }
+    }
     public function yy_r2_8()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-        $this->yypopstate();
-    }
 
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->yypopstate();
+    }
     public function yy_r2_9()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-        $this->value = '';
-        $this->yypopstate();
-    } // end function
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->value = '';
+    $this->yypopstate();
+    }
+
+
 
     public function yylex3()
     {
@@ -468,23 +425,21 @@ class Smarty_Internal_Configfilelexer
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state NAKED_STRING_VALUE');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state NAKED_STRING_VALUE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -502,26 +457,31 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
+                }            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const NAKED_STRING_VALUE = 3;
     public function yy_r3_1()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-        $this->yypopstate();
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->yypopstate();
     }
 
+
+
     public function yylex4()
     {
         if (!isset($this->yy_global_pattern4)) {
@@ -530,23 +490,21 @@ class Smarty_Internal_Configfilelexer
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state COMMENT');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state COMMENT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -564,36 +522,41 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
+                }            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
-    public function yy_r4_1()
-    {
-        return false;
-    }
-
-    public function yy_r4_2()
-    {
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
     } // end function
 
+
+    const COMMENT = 4;
+    public function yy_r4_1()
+    {
+
+    return false;
+    }
+    public function yy_r4_2()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    }
     public function yy_r4_3()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-        $this->yypopstate();
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
+    $this->yypopstate();
     }
 
+
+
     public function yylex5()
     {
         if (!isset($this->yy_global_pattern5)) {
@@ -602,23 +565,21 @@ class Smarty_Internal_Configfilelexer
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state SECTION');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state SECTION');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -636,30 +597,34 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
+                }            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const SECTION = 5;
     public function yy_r5_1()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
-    }
 
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOT;
+    }
     public function yy_r5_2()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
-        $this->yypopstate();
-    } // end function
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_SECTION;
+    $this->yypopstate();
+    }
+
 
     public function yylex6()
     {
@@ -669,23 +634,21 @@ class Smarty_Internal_Configfilelexer
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
         }
-        if ($this->counter >= $this->dataLength) {
+        if ($this->counter >=  $this->dataLength) {
             return false; // end of input
         }
+        
         do {
-            if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, 0, $this->counter)) {
-                if (!isset($yymatches[ 0 ][ 1 ])) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+            if (preg_match($this->yy_global_pattern6,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
                 } else {
                     $yymatches = array_filter($yymatches);
                 }
                 if (empty($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr(
-                                            $this->data,
-                                            $this->counter,
-                                            5
-                                        ) . '... state TRIPPLE');
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TRIPPLE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -703,37 +666,42 @@ class Smarty_Internal_Configfilelexer
                 } elseif ($r === false) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= $this->dataLength) {
+                    if ($this->counter >=  $this->dataLength) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }
-            } else {
+                }            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[ $this->counter ]);
+                    ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-    }
 
+    } // end function
+
+
+    const TRIPPLE = 6;
     public function yy_r6_1()
     {
-        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
-        $this->yypopstate();
-        $this->yypushstate(self::START);
-    }
 
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES_END;
+    $this->yypopstate();
+    $this->yypushstate(self::START);
+    }
     public function yy_r6_2()
     {
-        $to = strlen($this->data);
-        preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[ 0 ][ 1 ])) {
-            $to = $match[ 0 ][ 1 ];
-        } else {
-            $this->compiler->trigger_config_file_error('missing or misspelled literal closing tag');
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+
+  $to = strlen($this->data);
+  preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+  if (isset($match[0][1])) {
+    $to = $match[0][1];
+  } else {
+    $this->compiler->trigger_config_file_error ('missing or misspelled literal closing tag');
+  }  
+  $this->value = substr($this->data,$this->counter,$to-$this->counter);
+  $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_TEXT;
     }
+
+
 }
diff --git a/include/smarty/lexer/smarty_internal_configfilelexer.plex b/include/smarty/src/Lexer/ConfigfileLexer.plex
similarity index 73%
rename from include/smarty/lexer/smarty_internal_configfilelexer.plex
rename to include/smarty/src/Lexer/ConfigfileLexer.plex
index 7a86fadc4..a895050c4 100644
--- a/include/smarty/lexer/smarty_internal_configfilelexer.plex
+++ b/include/smarty/src/Lexer/ConfigfileLexer.plex
@@ -1,6 +1,9 @@
 <?php
+
+namespace Smarty\Lexer;
+
 /**
-* Smarty Internal Plugin Configfilelexer
+* Smarty Internal Plugin ConfigfileLexer
 *
 * This is the lexer to break the config file source into tokens 
 * @package Smarty
@@ -8,16 +11,16 @@
 * @author Uwe Tews 
 */
 /**
-* Smarty_Internal_Configfilelexer
+* ConfigfileLexer
 *
 * This is the config file lexer.
-* It is generated from the smarty_internal_configfilelexer.plex file
+* It is generated from the ConfigfileLexer.plex file
 *
 * @package Smarty
 * @subpackage Compiler
 * @author Uwe Tews
 */
-class Smarty_Internal_Configfilelexer
+class ConfigfileLexer
 {
     /**
      * Source
@@ -70,7 +73,7 @@ class Smarty_Internal_Configfilelexer
     /**
      * compiler object
      *
-     * @var Smarty_Internal_Config_File_Compiler
+     * @var \Smarty\Compiler\Configfile
      */
     private $compiler = null;
     /**
@@ -122,9 +125,9 @@ class Smarty_Internal_Configfilelexer
      * constructor
      *
      * @param   string                             $data template source
-     * @param Smarty_Internal_Config_File_Compiler $compiler
+     * @param \Smarty\Compiler\Configfile $compiler
      */
-    public function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
+    public function __construct($data, \Smarty\Compiler\Configfile $compiler)
     {
         $this->data = $data . "\n"; //now all lines are \n-terminated
         $this->dataLength = strlen($data);
@@ -179,31 +182,31 @@ naked_string = /[^\n]+?(?=[ \t\r]*\n)/
 %statename START
 
 commentstart {
-    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_COMMENTSTART;
     $this->yypushstate(self::COMMENT);
 }
 openB {
-    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_OPENB;
     $this->yypushstate(self::SECTION);
 }
 closeB {
-    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_CLOSEB;
 }
 equal {
-    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_EQUAL;
     $this->yypushstate(self::VALUE);
 }
 whitespace {
     return false;
 }
 newline {
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
 }
 id {
-    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_ID;
 }
 text {
-    $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_OTHER;
 }
 
 */
@@ -215,23 +218,23 @@ whitespace {
     return false;
 }
 float {
-    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_FLOAT;
     $this->yypopstate();
 }
 int {
-    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_INT;
     $this->yypopstate();
 }
 tripple_quotes {
-    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES;
     $this->yypushstate(self::TRIPPLE);
 }
 single_quoted_string {
-    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_SINGLE_QUOTED_STRING;
     $this->yypopstate();
 }
 double_quoted_string {
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOUBLE_QUOTED_STRING;
     $this->yypopstate();
 }
 maybe_bool {
@@ -240,16 +243,16 @@ maybe_bool {
         $this->yypushstate(self::NAKED_STRING_VALUE);
         return true; //reprocess in new state
     } else {
-        $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+        $this->token = \Smarty\Parser\ConfigfileParser::TPC_BOOL;
         $this->yypopstate();
     }
 }
 naked_string {
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
     $this->yypopstate();
 }
 newline {
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
     $this->value = '';
     $this->yypopstate();
 }
@@ -260,7 +263,7 @@ newline {
 %statename NAKED_STRING_VALUE
 
 naked_string {
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
     $this->yypopstate();
 }
 
@@ -273,10 +276,10 @@ whitespace {
     return false;
 }
 naked_string {
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
 }
 newline {
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
     $this->yypopstate();
 }
 
@@ -286,10 +289,10 @@ newline {
 %statename SECTION
 
 dot {
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOT;
 }
 section {
-    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_SECTION;
     $this->yypopstate();
 }
 
@@ -298,7 +301,7 @@ section {
 %statename TRIPPLE
 
 tripple_quotes_end {
-    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES_END;
     $this->yypopstate();
     $this->yypushstate(self::START);
 }
@@ -311,7 +314,7 @@ text {
     $this->compiler->trigger_config_file_error ('missing or misspelled literal closing tag');
   }  
   $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+  $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_TEXT;
 }
 */
 
diff --git a/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php b/include/smarty/src/Lexer/TemplateLexer.php
similarity index 79%
rename from include/smarty/libs/sysplugins/smarty_internal_templatelexer.php
rename to include/smarty/src/Lexer/TemplateLexer.php
index 5ca482058..2e7f33055 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php
+++ b/include/smarty/src/Lexer/TemplateLexer.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Smarty\Lexer;
+
 /*
  * This file is part of Smarty.
  *
@@ -9,14 +12,14 @@
  */
 
 /**
- * Smarty_Internal_Templatelexer
+ * TemplateLexer
  * This is the template file lexer.
- * It is generated from the smarty_internal_templatelexer.plex file
+ * It is generated from the TemplateLexer.plex file
  *
  *
  * @author Uwe Tews <uwe.tews@googlemail.com>
  */
-class Smarty_Internal_Templatelexer
+class TemplateLexer
 {
     /**
      * Source
@@ -67,13 +70,6 @@ class Smarty_Internal_Templatelexer
      */
     public $taglineno;
 
-    /**
-     * php code type
-     *
-     * @var string
-     */
-    public $phpType = '';
-
    /**
      * state number
      *
@@ -91,7 +87,7 @@ class Smarty_Internal_Templatelexer
     /**
      * compiler object
      *
-     * @var Smarty_Internal_TemplateCompilerBase
+     * @var \Smarty\Compiler\Template
      */
     public $compiler = null;
 
@@ -161,7 +157,6 @@ class Smarty_Internal_Templatelexer
                                                'COMMENT'     => 'comment',
                                                'AS'          => 'as',
                                                'TO'          => 'to',
-                                               'PHP'         => '"<?php", "<%", "{php}" tag',
                                                'LOGOP'       => '"<", "==" ... logical operator',
                                                'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
                                                'SCOND'       => '"is even" ... if condition',
@@ -227,9 +222,9 @@ class Smarty_Internal_Templatelexer
      * constructor
      *
      * @param   string                             $source template source
-     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     * @param \Smarty\Compiler\Template $compiler
      */
-    public function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler)
+    public function __construct($source, \Smarty\Compiler\Template $compiler)
     {
         $this->data = $source;
         $this->dataLength = strlen($this->data);
@@ -238,7 +233,7 @@ class Smarty_Internal_Templatelexer
             $this->counter += strlen($match[0]);
         }
         $this->line = 1;
-        $this->smarty = $compiler->template->smarty;
+        $this->smarty = $compiler->getTemplate()->getSmarty();
         $this->compiler = $compiler;
         $this->compiler->initDelimiterPreg();
         $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter();
@@ -380,7 +375,7 @@ class Smarty_Internal_Templatelexer
     public function yy_r1_1()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
          }
     public function yy_r1_2()
     {
@@ -398,18 +393,18 @@ class Smarty_Internal_Templatelexer
     public function yy_r1_4()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
          }
     public function yy_r1_6()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERALSTART;
         $this->yypushstate(self::LITERAL);
          }
     public function yy_r1_8()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND;
         $this->yypushstate(self::LITERAL);
          }
     public function yy_r1_10()
@@ -430,14 +425,14 @@ class Smarty_Internal_Templatelexer
          $to = $match[0][1];
        }
        $this->value = substr($this->data,$this->counter,$to-$this->counter);
-       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+       $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
          }
 
      
     public function yylex2()
     {
         if (!isset($this->yy_global_pattern2)) {
-            $this->yy_global_pattern2 = $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYalmake_nocache\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS");
+            $this->yy_global_pattern2 = $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
@@ -493,84 +488,77 @@ class Smarty_Internal_Templatelexer
     public function yy_r2_1()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELIF;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
          }
     public function yy_r2_4()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOR;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
          }
     public function yy_r2_6()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOREACH;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
          }
     public function yy_r2_8()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELSETFILTER;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
          }
     public function yy_r2_10()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-         }
-    public function yy_r2_12()
     {
 
         $this->yypopstate();
-        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SIMPLETAG;
         $this->taglineno = $this->line;
          }
-    public function yy_r2_15()
+    public function yy_r2_13()
     {
 
          $this->yypopstate();
-         $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+         $this->token = \Smarty\Parser\TemplateParser::TP_SMARTYBLOCKCHILDPARENT;
          $this->taglineno = $this->line;
          }
+    public function yy_r2_16()
+    {
+
+        $this->yypopstate();
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+         }
     public function yy_r2_18()
-    {
-
-        $this->yypopstate();
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
-        $this->taglineno = $this->line;
-         }
-    public function yy_r2_20()
     {
 
         if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) {
             $this->yypopstate();
-            $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+            $this->token = \Smarty\Parser\TemplateParser::TP_SIMPELOUTPUT;
             $this->taglineno = $this->line;
         } else {
             $this->value = $this->smarty->getLeftDelimiter();
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
             $this->yybegin(self::TAGBODY);
             $this->taglineno = $this->line;
         }
          }
-    public function yy_r2_23()
+    public function yy_r2_21()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELSLASH;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
          }
-    public function yy_r2_25()
+    public function yy_r2_23()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
          }
@@ -579,7 +567,7 @@ class Smarty_Internal_Templatelexer
     public function yylex3()
     {
         if (!isset($this->yy_global_pattern3)) {
-            $this->yy_global_pattern3 = $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
+            $this->yy_global_pattern3 = $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+(not\\s+)?in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
@@ -635,7 +623,7 @@ class Smarty_Internal_Templatelexer
     public function yy_r3_1()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->token = \Smarty\Parser\TemplateParser::TP_RDEL;
         $this->yypopstate();
          }
     public function yy_r3_2()
@@ -647,227 +635,227 @@ class Smarty_Internal_Templatelexer
     public function yy_r3_4()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE;
         $this->yypushstate(self::DOUBLEQUOTEDSTRING);
         $this->compiler->enterDoubleQuote();
          }
     public function yy_r3_5()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SINGLEQUOTESTRING;
          }
     public function yy_r3_6()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID;
          }
     public function yy_r3_7()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLAR;
          }
     public function yy_r3_8()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
-         }
-    public function yy_r3_9()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_AS;
+        $this->token = \Smarty\Parser\TemplateParser::TP_ISIN;
          }
     public function yy_r3_10()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TO;
+        $this->token = \Smarty\Parser\TemplateParser::TP_AS;
          }
     public function yy_r3_11()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_STEP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TO;
          }
     public function yy_r3_12()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+        $this->token = \Smarty\Parser\TemplateParser::TP_STEP;
          }
     public function yy_r3_13()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_INSTANCEOF;
          }
-    public function yy_r3_15()
+    public function yy_r3_14()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LOGOP;
          }
-    public function yy_r3_17()
+    public function yy_r3_16()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SLOGOP;
          }
-    public function yy_r3_20()
+    public function yy_r3_18()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TLOGOP;
          }
-    public function yy_r3_23()
+    public function yy_r3_21()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SINGLECOND;
          }
     public function yy_r3_24()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+        $this->token = \Smarty\Parser\TemplateParser::TP_NOT;
          }
-    public function yy_r3_28()
+    public function yy_r3_25()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TYPECAST;
          }
     public function yy_r3_29()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_OPENP;
          }
     public function yy_r3_30()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEP;
          }
     public function yy_r3_31()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+        $this->token = \Smarty\Parser\TemplateParser::TP_OPENB;
          }
     public function yy_r3_32()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_PTR;
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEB;
          }
     public function yy_r3_33()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_APTR;
+        $this->token = \Smarty\Parser\TemplateParser::TP_PTR;
          }
     public function yy_r3_34()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+        $this->token = \Smarty\Parser\TemplateParser::TP_APTR;
          }
     public function yy_r3_35()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+        $this->token = \Smarty\Parser\TemplateParser::TP_EQUAL;
          }
-    public function yy_r3_37()
+    public function yy_r3_36()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+        $this->token = \Smarty\Parser\TemplateParser::TP_INCDEC;
          }
-    public function yy_r3_39()
+    public function yy_r3_38()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_MATH;
+        $this->token = \Smarty\Parser\TemplateParser::TP_UNIMATH;
          }
-    public function yy_r3_41()
+    public function yy_r3_40()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_AT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_MATH;
          }
     public function yy_r3_42()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
+        $this->token = \Smarty\Parser\TemplateParser::TP_AT;
          }
     public function yy_r3_43()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+        $this->token = \Smarty\Parser\TemplateParser::TP_ARRAYOPEN;
          }
     public function yy_r3_44()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_HATCH;
+         }
+    public function yy_r3_45()
     {
 
         // resolve conflicts with shorttag and right_delimiter starting with '='
         if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) {
             preg_match('/\s+/',$this->value,$match);
             $this->value = $match[0];
-            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+            $this->token = \Smarty\Parser\TemplateParser::TP_SPACE;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+            $this->token = \Smarty\Parser\TemplateParser::TP_ATTR;
         }
          }
-    public function yy_r3_45()
+    public function yy_r3_46()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
-         }
-    public function yy_r3_48()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ID;
+        $this->token = \Smarty\Parser\TemplateParser::TP_NAMESPACE;
          }
     public function yy_r3_49()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+        $this->token = \Smarty\Parser\TemplateParser::TP_ID;
          }
     public function yy_r3_50()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-        $this->yypopstate();
+        $this->token = \Smarty\Parser\TemplateParser::TP_INTEGER;
          }
     public function yy_r3_51()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK;
+        $this->yypopstate();
          }
     public function yy_r3_52()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_DOT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_VERT;
          }
     public function yy_r3_53()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOT;
          }
     public function yy_r3_54()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+        $this->token = \Smarty\Parser\TemplateParser::TP_COMMA;
          }
     public function yy_r3_55()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SEMICOLON;
          }
     public function yy_r3_56()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_COLON;
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOUBLECOLON;
          }
     public function yy_r3_57()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+        $this->token = \Smarty\Parser\TemplateParser::TP_COLON;
          }
     public function yy_r3_58()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_HEX;
+        $this->token = \Smarty\Parser\TemplateParser::TP_QMARK;
          }
     public function yy_r3_59()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+        $this->token = \Smarty\Parser\TemplateParser::TP_HEX;
          }
     public function yy_r3_60()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SPACE;
+         }
+    public function yy_r3_61()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
          }
 
 
@@ -932,16 +920,16 @@ class Smarty_Internal_Templatelexer
     {
 
         $this->literal_cnt++;
-        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
          }
     public function yy_r4_3()
     {
 
         if ($this->literal_cnt) {
              $this->literal_cnt--;
-            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+            $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+            $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND;
             $this->yypopstate();
         }
          }
@@ -959,7 +947,7 @@ class Smarty_Internal_Templatelexer
           $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
        }
        $this->value = substr($this->data,$this->counter,$to-$this->counter);
-       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+       $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
          }
 
      
@@ -1022,17 +1010,17 @@ class Smarty_Internal_Templatelexer
     public function yy_r5_1()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
          }
     public function yy_r5_3()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
          }
     public function yy_r5_5()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
          }
     public function yy_r5_7()
     {
@@ -1049,20 +1037,20 @@ class Smarty_Internal_Templatelexer
     public function yy_r5_11()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
         $this->taglineno = $this->line;
         $this->yypushstate(self::TAGBODY);
          }
     public function yy_r5_13()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE;
         $this->yypopstate();
          }
     public function yy_r5_14()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK;
         $this->value = substr($this->value,0,-1);
         $this->yypushstate(self::TAGBODY);
         $this->taglineno = $this->line;
@@ -1070,24 +1058,24 @@ class Smarty_Internal_Templatelexer
     public function yy_r5_15()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID;
          }
     public function yy_r5_16()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
          }
     public function yy_r5_17()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
          }
     public function yy_r5_22()
     {
 
         $to = $this->dataLength;
         $this->value = substr($this->data,$this->counter,$to-$this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
          }
 
   }
diff --git a/include/smarty/lexer/smarty_internal_templatelexer.plex b/include/smarty/src/Lexer/TemplateLexer.plex
similarity index 72%
rename from include/smarty/lexer/smarty_internal_templatelexer.plex
rename to include/smarty/src/Lexer/TemplateLexer.plex
index 2cd46df97..282a99cf9 100644
--- a/include/smarty/lexer/smarty_internal_templatelexer.plex
+++ b/include/smarty/src/Lexer/TemplateLexer.plex
@@ -1,4 +1,7 @@
 <?php
+
+namespace Smarty\Lexer;
+
 /*
  * This file is part of Smarty.
  *
@@ -9,14 +12,14 @@
  */
 
 /**
- * Smarty_Internal_Templatelexer
+ * TemplateLexer
  * This is the template file lexer.
- * It is generated from the smarty_internal_templatelexer.plex file
+ * It is generated from the TemplateLexer.plex file
  *
  *
  * @author Uwe Tews <uwe.tews@googlemail.com>
  */
-class Smarty_Internal_Templatelexer
+class TemplateLexer
 {
     /**
      * Source
@@ -67,13 +70,6 @@ class Smarty_Internal_Templatelexer
      */
     public $taglineno;
 
-    /**
-     * php code type
-     *
-     * @var string
-     */
-    public $phpType = '';
-
    /**
      * state number
      *
@@ -91,7 +87,7 @@ class Smarty_Internal_Templatelexer
     /**
      * compiler object
      *
-     * @var Smarty_Internal_TemplateCompilerBase
+     * @var \Smarty\Compiler\Template
      */
     public $compiler = null;
 
@@ -226,9 +222,9 @@ class Smarty_Internal_Templatelexer
      * constructor
      *
      * @param   string                             $source template source
-     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     * @param \Smarty\Compiler\Template $compiler
      */
-    public function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler)
+    public function __construct($source, \Smarty\Compiler\Template $compiler)
     {
         $this->data = $source;
         $this->dataLength = strlen($this->data);
@@ -237,7 +233,7 @@ class Smarty_Internal_Templatelexer
             $this->counter += strlen($match[0]);
         }
         $this->line = 1;
-        $this->smarty = $compiler->template->smarty;
+        $this->smarty = $compiler->getTemplate()->getSmarty();
         $this->compiler = $compiler;
         $this->compiler->initDelimiterPreg();
         $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter();
@@ -328,13 +324,12 @@ class Smarty_Internal_Templatelexer
      slop = ~\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\s+~
      tlop = ~\s+is\s+(not\s+)?(odd|even|div)\s+by\s+~
      scond = ~\s+is\s+(not\s+)?(odd|even)~
-     isin = ~\s+is\s+in\s+~
+     isin = ~\s+is\s+(not\s+)?in\s+~
      as = ~\s+as\s+~
      to = ~\s+to\s+~
      step = ~\s+step\s+~
      if = ~(if|elseif|else if|while)\s+~
      for = ~for\s+~
-     makenocache = ~make_nocache\s+~
      array = ~array~
      foreach = ~foreach(?![^\s])~
      setfilter = ~setfilter\s+~
@@ -346,7 +341,7 @@ class Smarty_Internal_Templatelexer
      /*!lex2php
      %statename TEXT
      emptyjava {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
      }
      comment {
        $to = $this->dataLength;
@@ -360,14 +355,14 @@ class Smarty_Internal_Templatelexer
         return false;
      }
      userliteral {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
      }
      ldel literal rdel {
-        $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERALSTART;
         $this->yypushstate(self::LITERAL);
      }
      ldel slash literal rdel {
-        $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND;
         $this->yypushstate(self::LITERAL);
      }
      ldel {
@@ -384,70 +379,65 @@ class Smarty_Internal_Templatelexer
          $to = $match[0][1];
        }
        $this->value = substr($this->data,$this->counter,$to-$this->counter);
-       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+       $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
      }
      */
      /*!lex2php
      %statename TAG
      ldel if {
-        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELIF;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
      }
      ldel for {
-        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOR;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
      }
      ldel foreach {
-        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOREACH;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
      }
      ldel setfilter {
-        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-     }
-     ldel makenocache {
-        $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELSETFILTER;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
      }
      ldel id nocacherdel {
         $this->yypopstate();
-        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SIMPLETAG;
         $this->taglineno = $this->line;
      }
      ldel smartyblockchildparent rdel {
          $this->yypopstate();
-         $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+         $this->token = \Smarty\Parser\TemplateParser::TP_SMARTYBLOCKCHILDPARENT;
          $this->taglineno = $this->line;
      }
      ldel slash id rdel {
         $this->yypopstate();
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSETAG;
         $this->taglineno = $this->line;
      }
      ldel dollar id nocacherdel {
         if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) {
             $this->yypopstate();
-            $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+            $this->token = \Smarty\Parser\TemplateParser::TP_SIMPELOUTPUT;
             $this->taglineno = $this->line;
         } else {
             $this->value = $this->smarty->getLeftDelimiter();
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
             $this->yybegin(self::TAGBODY);
             $this->taglineno = $this->line;
         }
      }
      ldel slash {
-        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELSLASH;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
      }
      ldel {
-        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
         $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
      }
@@ -455,7 +445,7 @@ class Smarty_Internal_Templatelexer
      /*!lex2php
      %statename TAGBODY
      rdel {
-        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->token = \Smarty\Parser\TemplateParser::TP_RDEL;
         $this->yypopstate();
      }
      ldel {
@@ -463,143 +453,143 @@ class Smarty_Internal_Templatelexer
         return true;
      }
      double_quote {
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE;
         $this->yypushstate(self::DOUBLEQUOTEDSTRING);
         $this->compiler->enterDoubleQuote();
      }
      singlequotestring {
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SINGLEQUOTESTRING;
      }
      dollar id {
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID;
      }
      dollar {
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLAR;
      }
      isin {
-        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+        $this->token = \Smarty\Parser\TemplateParser::TP_ISIN;
      }
      as {
-        $this->token = Smarty_Internal_Templateparser::TP_AS;
+        $this->token = \Smarty\Parser\TemplateParser::TP_AS;
      }
      to {
-        $this->token = Smarty_Internal_Templateparser::TP_TO;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TO;
      }
      step {
-        $this->token = Smarty_Internal_Templateparser::TP_STEP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_STEP;
      }
      instanceof {
-        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+        $this->token = \Smarty\Parser\TemplateParser::TP_INSTANCEOF;
      }
      lop {
-        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LOGOP;
      }
      slop {
-        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SLOGOP;
      }
      tlop {
-        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TLOGOP;
      }
      scond {
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SINGLECOND;
      }
      not{
-        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_NOT;
      }
      typecast {
-        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TYPECAST;
      }
      openP {
-        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_OPENP;
      }
      closeP {
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEP;
      }
      openB {
-        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+        $this->token = \Smarty\Parser\TemplateParser::TP_OPENB;
      }
      closeB {
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEB;
      }
      ptr {
-        $this->token = Smarty_Internal_Templateparser::TP_PTR;
+        $this->token = \Smarty\Parser\TemplateParser::TP_PTR;
      }
      aptr {
-        $this->token = Smarty_Internal_Templateparser::TP_APTR;
+        $this->token = \Smarty\Parser\TemplateParser::TP_APTR;
      }
      equal {
-        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+        $this->token = \Smarty\Parser\TemplateParser::TP_EQUAL;
      }
      incdec {
-        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+        $this->token = \Smarty\Parser\TemplateParser::TP_INCDEC;
      }
      unimath {
-        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+        $this->token = \Smarty\Parser\TemplateParser::TP_UNIMATH;
      }
      math {
-        $this->token = Smarty_Internal_Templateparser::TP_MATH;
+        $this->token = \Smarty\Parser\TemplateParser::TP_MATH;
      }
      at {
-        $this->token = Smarty_Internal_Templateparser::TP_AT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_AT;
      }
      array openP {
-        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
+        $this->token = \Smarty\Parser\TemplateParser::TP_ARRAYOPEN;
      }
      hatch {
-        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+        $this->token = \Smarty\Parser\TemplateParser::TP_HATCH;
      }
      attr {
         // resolve conflicts with shorttag and right_delimiter starting with '='
         if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) {
             preg_match('/\s+/',$this->value,$match);
             $this->value = $match[0];
-            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+            $this->token = \Smarty\Parser\TemplateParser::TP_SPACE;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+            $this->token = \Smarty\Parser\TemplateParser::TP_ATTR;
         }
      }
      namespace {
-        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+        $this->token = \Smarty\Parser\TemplateParser::TP_NAMESPACE;
      }
      id {
-        $this->token = Smarty_Internal_Templateparser::TP_ID;
+        $this->token = \Smarty\Parser\TemplateParser::TP_ID;
      }
      integer {
-        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+        $this->token = \Smarty\Parser\TemplateParser::TP_INTEGER;
      }
      backtick {
-        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK;
         $this->yypopstate();
      }
      vert {
-        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_VERT;
      }
      dot {
-        $this->token = Smarty_Internal_Templateparser::TP_DOT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOT;
      }
      comma {
-        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+        $this->token = \Smarty\Parser\TemplateParser::TP_COMMA;
      }
      semicolon {
-        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SEMICOLON;
      }
      doublecolon {
-        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOUBLECOLON;
      }
      colon {
-        $this->token = Smarty_Internal_Templateparser::TP_COLON;
+        $this->token = \Smarty\Parser\TemplateParser::TP_COLON;
      }
      qmark {
-        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+        $this->token = \Smarty\Parser\TemplateParser::TP_QMARK;
      }
      hex {
-        $this->token = Smarty_Internal_Templateparser::TP_HEX;
+        $this->token = \Smarty\Parser\TemplateParser::TP_HEX;
      }
      space {
-        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+        $this->token = \Smarty\Parser\TemplateParser::TP_SPACE;
      }
      char {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
      }
      */
 
@@ -607,14 +597,14 @@ class Smarty_Internal_Templatelexer
      %statename LITERAL
      ldel literal rdel {
         $this->literal_cnt++;
-        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
      }
      ldel slash literal rdel {
         if ($this->literal_cnt) {
              $this->literal_cnt--;
-            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+            $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+            $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND;
             $this->yypopstate();
         }
      }
@@ -630,19 +620,19 @@ class Smarty_Internal_Templatelexer
           $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
        }
        $this->value = substr($this->data,$this->counter,$to-$this->counter);
-       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+       $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
      }
      */
      /*!lex2php
      %statename DOUBLEQUOTEDSTRING
      userliteral {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
      }
      ldel literal rdel {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
      }
      ldel slash literal rdel {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
      }
      ldel slash {
         $this->yypushstate(self::TAG);
@@ -653,33 +643,33 @@ class Smarty_Internal_Templatelexer
         return true;
      }
      ldel {
-        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
         $this->taglineno = $this->line;
         $this->yypushstate(self::TAGBODY);
      }
      double_quote {
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE;
         $this->yypopstate();
      }
      backtick dollar {
-        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK;
         $this->value = substr($this->value,0,-1);
         $this->yypushstate(self::TAGBODY);
         $this->taglineno = $this->line;
      }
      dollar id {
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID;
      }
      dollar {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
      }
      textdoublequoted {
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
      }
      char {
         $to = $this->dataLength;
         $this->value = substr($this->data,$this->counter,$to-$this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
      }
     */
   }
diff --git a/include/smarty/src/ParseTree/Base.php b/include/smarty/src/ParseTree/Base.php
new file mode 100644
index 000000000..e1140c15e
--- /dev/null
+++ b/include/smarty/src/ParseTree/Base.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Smarty\ParseTree;
+
+/**
+ * Smarty Internal Plugin Templateparser ParseTree
+ * These are classes to build parsetree in the template parser
+ *
+
+
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+
+
+ * @ignore
+ */
+abstract class Base
+{
+    /**
+     * Buffer content
+     *
+     * @var mixed
+     */
+    public $data;
+
+    /**
+     * Subtree array
+     *
+     * @var array
+     */
+    public $subtrees = array();
+
+    /**
+     * Return buffer
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     *
+     * @return string buffer content
+     */
+    abstract public function to_smarty_php(\Smarty\Parser\TemplateParser $parser);
+
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_code.php b/include/smarty/src/ParseTree/Code.php
similarity index 67%
rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_code.php
rename to include/smarty/src/ParseTree/Code.php
index 7bd0bc45c..b39f22c8b 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_code.php
+++ b/include/smarty/src/ParseTree/Code.php
@@ -1,10 +1,13 @@
 <?php
+
+namespace Smarty\ParseTree;
+
 /**
  * Smarty Internal Plugin Templateparser Parse Tree
  * These are classes to build parse trees in the template parser
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @author     Thue Kristensen
  * @author     Uwe Tews
  */
@@ -12,11 +15,11 @@
 /**
  * Code fragment inside a tag .
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @ignore
  */
-class Smarty_Internal_ParseTree_Code extends Smarty_Internal_ParseTree
+class Code extends Base
 {
     /**
      * Create parse tree buffer for code fragment
@@ -31,11 +34,11 @@ class Smarty_Internal_ParseTree_Code extends Smarty_Internal_ParseTree
     /**
      * Return buffer content in parentheses
      *
-     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty\Parser\TemplateParser $parser
      *
      * @return string content
      */
-    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
     {
         return sprintf('(%s)', $this->data);
     }
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php b/include/smarty/src/ParseTree/Dq.php
similarity index 50%
rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php
rename to include/smarty/src/ParseTree/Dq.php
index 8655f5869..b5fca3b40 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php
+++ b/include/smarty/src/ParseTree/Dq.php
@@ -1,92 +1,94 @@
 <?php
+
+namespace Smarty\ParseTree;
 /**
- * Double quoted string inside a tag.
+ * Double-quoted string inside a tag.
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @ignore
  */
 
 /**
  * Double quoted string inside a tag.
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @ignore
  */
-class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
+class Dq extends Base
 {
     /**
-     * Create parse tree buffer for double quoted string subtrees
+     * Create parse tree buffer for double-quoted string subtrees
      *
      * @param object                    $parser  parser object
-     * @param Smarty_Internal_ParseTree $subtree parse tree buffer
+     * @param Base $subtree parse tree buffer
      */
-    public function __construct($parser, Smarty_Internal_ParseTree $subtree)
+    public function __construct($parser, Base $subtree)
     {
         $this->subtrees[] = $subtree;
-        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
-            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        if ($subtree instanceof Tag) {
+            $parser->block_nesting_level = $parser->compiler->getTagStackCount();
         }
     }
 
     /**
      * Append buffer to subtree
      *
-     * @param \Smarty_Internal_Templateparser $parser
-     * @param Smarty_Internal_ParseTree       $subtree parse tree buffer
+     * @param \Smarty\Parser\TemplateParser $parser
+     * @param Base $subtree parse tree buffer
      */
-    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    public function append_subtree(\Smarty\Parser\TemplateParser $parser, Base $subtree)
     {
         $last_subtree = count($this->subtrees) - 1;
-        if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Smarty_Internal_ParseTree_Tag
+        if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Tag
             && $this->subtrees[ $last_subtree ]->saved_block_nesting < $parser->block_nesting_level
         ) {
-            if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
+            if ($subtree instanceof Code) {
                 $this->subtrees[ $last_subtree ]->data =
                     $parser->compiler->appendCode(
-                        $this->subtrees[ $last_subtree ]->data,
+                        (string) $this->subtrees[ $last_subtree ]->data,
                         '<?php echo ' . $subtree->data . ';?>'
                     );
-            } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+            } elseif ($subtree instanceof DqContent) {
                 $this->subtrees[ $last_subtree ]->data =
                     $parser->compiler->appendCode(
-                        $this->subtrees[ $last_subtree ]->data,
+                        (string) $this->subtrees[ $last_subtree ]->data,
                         '<?php echo "' . $subtree->data . '";?>'
                     );
             } else {
                 $this->subtrees[ $last_subtree ]->data =
-                    $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data, $subtree->data);
+                    $parser->compiler->appendCode((string) $this->subtrees[ $last_subtree ]->data, (string) $subtree->data);
             }
         } else {
             $this->subtrees[] = $subtree;
         }
-        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
-            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        if ($subtree instanceof Tag) {
+            $parser->block_nesting_level = $parser->compiler->getTagStackCount();
         }
     }
 
     /**
      * Merge subtree buffer content together
      *
-     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty\Parser\TemplateParser $parser
      *
      * @return string compiled template code
      */
-    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
     {
         $code = '';
         foreach ($this->subtrees as $subtree) {
             if ($code !== '') {
                 $code .= '.';
             }
-            if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            if ($subtree instanceof Tag) {
                 $more_php = $subtree->assign_to_var($parser);
             } else {
                 $more_php = $subtree->to_smarty_php($parser);
             }
             $code .= $more_php;
-            if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+            if (!$subtree instanceof DqContent) {
                 $parser->compiler->has_variable_string = true;
             }
         }
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php b/include/smarty/src/ParseTree/DqContent.php
similarity index 58%
rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php
rename to include/smarty/src/ParseTree/DqContent.php
index a8ca389d9..f0a4b0697 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php
+++ b/include/smarty/src/ParseTree/DqContent.php
@@ -1,22 +1,24 @@
 <?php
+
+namespace Smarty\ParseTree;
 /**
  * Smarty Internal Plugin Templateparser Parse Tree
  * These are classes to build parse tree  in the template parser
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @author     Thue Kristensen
  * @author     Uwe Tews
  */
 
 /**
- * Raw chars as part of a double quoted string.
+ * Raw chars as part of a double-quoted string.
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @ignore
  */
-class Smarty_Internal_ParseTree_DqContent extends Smarty_Internal_ParseTree
+class DqContent extends Base
 {
     /**
      * Create parse tree buffer with string content
@@ -29,13 +31,13 @@ class Smarty_Internal_ParseTree_DqContent extends Smarty_Internal_ParseTree
     }
 
     /**
-     * Return content as double quoted string
+     * Return content as double-quoted string
      *
-     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty\Parser\TemplateParser $parser
      *
      * @return string doubled quoted string
      */
-    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
     {
         return '"' . $this->data . '"';
     }
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php b/include/smarty/src/ParseTree/Tag.php
similarity index 63%
rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php
rename to include/smarty/src/ParseTree/Tag.php
index e6c755604..05237f2de 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php
+++ b/include/smarty/src/ParseTree/Tag.php
@@ -1,10 +1,13 @@
 <?php
+
+namespace Smarty\ParseTree;
+
 /**
  * Smarty Internal Plugin Templateparser Parse Tree
  * These are classes to build parse tree in the template parser
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @author     Thue Kristensen
  * @author     Uwe Tews
  */
@@ -12,11 +15,11 @@
 /**
  * A complete smarty tag.
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @ignore
  */
-class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
+class Tag extends Base
 {
     /**
      * Saved block nesting level
@@ -28,10 +31,10 @@ class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
     /**
      * Create parse tree buffer for Smarty tag
      *
-     * @param \Smarty_Internal_Templateparser $parser parser object
+     * @param \Smarty\Parser\TemplateParser $parser parser object
      * @param string                          $data   content
      */
-    public function __construct(Smarty_Internal_Templateparser $parser, $data)
+    public function __construct(\Smarty\Parser\TemplateParser $parser, $data)
     {
         $this->data = $data;
         $this->saved_block_nesting = $parser->block_nesting_level;
@@ -40,11 +43,11 @@ class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
     /**
      * Return buffer content
      *
-     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty\Parser\TemplateParser $parser
      *
      * @return string content
      */
-    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
     {
         return $this->data;
     }
@@ -52,16 +55,16 @@ class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
     /**
      * Return complied code that loads the evaluated output of buffer content into a temporary variable
      *
-     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty\Parser\TemplateParser $parser
      *
      * @return string template code
      */
-    public function assign_to_var(Smarty_Internal_Templateparser $parser)
+    public function assign_to_var(\Smarty\Parser\TemplateParser $parser)
     {
         $var = $parser->compiler->getNewPrefixVariable();
-        $tmp = $parser->compiler->appendCode('<?php ob_start();?>', $this->data);
+        $tmp = $parser->compiler->appendCode('<?php ob_start();?>', (string) $this->data);
         $tmp = $parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
-        $parser->compiler->prefix_code[] = sprintf('%s', $tmp);
+        $parser->compiler->appendPrefixCode($tmp);
         return $var;
     }
 }
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php b/include/smarty/src/ParseTree/Template.php
similarity index 77%
rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php
rename to include/smarty/src/ParseTree/Template.php
index 829c420fe..ce802a0f4 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php
+++ b/include/smarty/src/ParseTree/Template.php
@@ -1,10 +1,13 @@
 <?php
+
+namespace Smarty\ParseTree;
+
 /**
  * Smarty Internal Plugin Templateparser Parse Tree
  * These are classes to build parse tree in the template parser
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @author     Thue Kristensen
  * @author     Uwe Tews
  */
@@ -12,11 +15,11 @@
 /**
  * Template element
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @ignore
  */
-class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
+class Template extends Base
 {
     /**
      * Array of template elements
@@ -35,10 +38,10 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
     /**
      * Append buffer to subtree
      *
-     * @param \Smarty_Internal_Templateparser $parser
-     * @param Smarty_Internal_ParseTree       $subtree
+     * @param \Smarty\Parser\TemplateParser $parser
+     * @param Base $subtree
      */
-    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    public function append_subtree(\Smarty\Parser\TemplateParser $parser, Base $subtree)
     {
         if (!empty($subtree->subtrees)) {
             $this->subtrees = array_merge($this->subtrees, $subtree->subtrees);
@@ -52,10 +55,10 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
     /**
      * Append array to subtree
      *
-     * @param \Smarty_Internal_Templateparser $parser
-     * @param \Smarty_Internal_ParseTree[]    $array
+     * @param \Smarty\Parser\TemplateParser $parser
+     * @param Base[] $array
      */
-    public function append_array(Smarty_Internal_Templateparser $parser, $array = array())
+    public function append_array(\Smarty\Parser\TemplateParser $parser, $array = array())
     {
         if (!empty($array)) {
             $this->subtrees = array_merge($this->subtrees, (array)$array);
@@ -65,10 +68,10 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
     /**
      * Prepend array to subtree
      *
-     * @param \Smarty_Internal_Templateparser $parser
-     * @param \Smarty_Internal_ParseTree[]    $array
+     * @param \Smarty\Parser\TemplateParser $parser
+     * @param Base[] $array
      */
-    public function prepend_array(Smarty_Internal_Templateparser $parser, $array = array())
+    public function prepend_array(\Smarty\Parser\TemplateParser $parser, $array = array())
     {
         if (!empty($array)) {
             $this->subtrees = array_merge((array)$array, $this->subtrees);
@@ -78,11 +81,11 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
     /**
      * Sanitize and merge subtree buffers together
      *
-     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty\Parser\TemplateParser $parser
      *
      * @return string template code content
      */
-    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
     {
         $code = '';
 
@@ -111,7 +114,7 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
                     break;
                 case 'tag':
                     foreach ($chunk['subtrees'] as $subtree) {
-                        $text = $parser->compiler->appendCode($text, $subtree->to_smarty_php($parser));
+                        $text = $parser->compiler->appendCode($text, (string) $subtree->to_smarty_php($parser));
                     }
                     $code .= $text;
                     break;
@@ -136,12 +139,12 @@ class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
                 continue;
             }
 
-            if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text
+            if ($this->subtrees[ $key ] instanceof Text
                 && $this->subtrees[ $key ]->isToBeStripped()) {
                 $newMode = 'textstripped';
-            } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
+            } elseif ($this->subtrees[ $key ] instanceof Text) {
                 $newMode = 'text';
-            } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
+            } elseif ($this->subtrees[ $key ] instanceof Tag) {
                 $newMode = 'tag';
             } else {
                 $newMode = 'other';
diff --git a/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php b/include/smarty/src/ParseTree/Text.php
similarity index 78%
rename from include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php
rename to include/smarty/src/ParseTree/Text.php
index 58116c811..e6131407c 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php
+++ b/include/smarty/src/ParseTree/Text.php
@@ -1,20 +1,22 @@
 <?php
 
+namespace Smarty\ParseTree;
+
 /**
  * Smarty Internal Plugin Templateparser Parse Tree
  * These are classes to build parse tree in the template parser
  *
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @author     Thue Kristensen
  * @author     Uwe Tews
  *             *
  *             template text
- * @package    Smarty
- * @subpackage Compiler
+
+
  * @ignore
  */
-class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
+class Text extends Base
 {
 
     /**
@@ -46,11 +48,11 @@ class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
     /**
      * Return buffer content
      *
-     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty\Parser\TemplateParser $parser
      *
      * @return string text
      */
-    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
     {
         return $this->data;
     }
diff --git a/include/smarty/src/Parser/ConfigfileParser.php b/include/smarty/src/Parser/ConfigfileParser.php
new file mode 100644
index 000000000..7997a0981
--- /dev/null
+++ b/include/smarty/src/Parser/ConfigfileParser.php
@@ -0,0 +1,972 @@
+<?php
+
+// line 12 "src/Parser/ConfigfileParser.y"
+
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\ConfigfileLexer as Lexer;
+use \Smarty\Compiler\Configfile as Configfile;
+
+/**
+* Smarty Internal Plugin Configfileparse
+*
+* This is the config file parser.
+* It is generated from the ConfigfileParser.y file
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class ConfigfileParser
+{
+// line 31 "src/Parser/ConfigfileParser.y"
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+    /**
+     * @var
+     */
+    public $yymajor;
+    /**
+     * lexer object
+     *
+     * @var Lexer
+     */
+    private $lex;
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+    /**
+     * compiler object
+     *
+     * @var Configfile
+     */
+    public $compiler = null;
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * copy of config_overwrite property
+     *
+     * @var bool
+     */
+    private $configOverwrite = false;
+    /**
+     * copy of config_read_hidden property
+     *
+     * @var bool
+     */
+    private $configReadHidden = false;
+    /**
+     * helper map
+     *
+     * @var array
+     */
+    private static $escapes_single = array('\\' => '\\',
+                                           '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Lexer      $lex
+     * @param Configfile $compiler
+     */
+    public function __construct(Lexer $lex, Configfile $compiler)
+    {
+        $this->lex = $lex;
+        $this->smarty = $compiler->getSmarty();
+        $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
+    }
+
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
+
+        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $str = '';
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
+                }
+            }
+            $str .= $s;
+        }
+        return $str;
+    }
+
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
+        return stripcslashes($inner_str);
+    }
+
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
+        return stripcslashes($qstr);
+    }
+
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(array $var, array &$target_array)
+    {
+        $key = $var['key'];
+        $value = $var['value'];
+
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
+            $target_array['vars'][$key] = $value;
+        } else {
+            settype($target_array['vars'][$key], 'array');
+            $target_array['vars'][$key][] = $value;
+        }
+    }
+
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(array $vars)
+    {
+        if (!isset($this->compiler->config_data['vars'])) {
+            $this->compiler->config_data['vars'] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, array $vars)
+    {
+        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
+            $this->compiler->config_data['sections'][$section_name]['vars'] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
+        }
+    }
+
+    const TPC_OPENB                          =  1;
+    const TPC_SECTION                        =  2;
+    const TPC_CLOSEB                         =  3;
+    const TPC_DOT                            =  4;
+    const TPC_ID                             =  5;
+    const TPC_EQUAL                          =  6;
+    const TPC_FLOAT                          =  7;
+    const TPC_INT                            =  8;
+    const TPC_BOOL                           =  9;
+    const TPC_SINGLE_QUOTED_STRING           = 10;
+    const TPC_DOUBLE_QUOTED_STRING           = 11;
+    const TPC_TRIPPLE_QUOTES                 = 12;
+    const TPC_TRIPPLE_TEXT                   = 13;
+    const TPC_TRIPPLE_QUOTES_END             = 14;
+    const TPC_NAKED_STRING                   = 15;
+    const TPC_OTHER                          = 16;
+    const TPC_NEWLINE                        = 17;
+    const TPC_COMMENTSTART                   = 18;
+    const YY_NO_ACTION = 60;
+    const YY_ACCEPT_ACTION = 59;
+    const YY_ERROR_ACTION = 58;
+
+    const YY_SZ_ACTTAB = 39;
+public static $yy_action = array(
+     24,   25,   26,   27,   28,   12,   15,   23,   31,   32,
+     59,    8,    9,    3,   21,   22,   33,   13,   33,   13,
+     14,   10,   18,   16,   30,   11,   17,   20,   34,    7,
+      5,    1,    2,   29,    4,   19,   52,   35,    6,
+    );
+    public static $yy_lookahead = array(
+      7,    8,    9,   10,   11,   12,    5,   27,   15,   16,
+     20,   21,   25,   23,   25,   26,   17,   18,   17,   18,
+      2,   25,    4,   13,   14,    1,   15,   24,   17,   22,
+      3,   23,   23,   14,    6,    2,   28,   17,    3,
+);
+    const YY_SHIFT_USE_DFLT = -8;
+    const YY_SHIFT_MAX = 19;
+    public static $yy_shift_ofst = array(
+     -8,    1,    1,    1,   -7,   -1,   -1,   24,   -8,   -8,
+     -8,   18,   10,   11,   27,   28,   19,   20,   33,   35,
+);
+    const YY_REDUCE_USE_DFLT = -21;
+    const YY_REDUCE_MAX = 10;
+    public static $yy_reduce_ofst = array(
+    -10,  -11,  -11,  -11,  -20,  -13,   -4,    3,    7,    8,
+      9,
+);
+    public static $yyExpectedTokens = array(
+         array(),
+         array(5, 17, 18, ),
+         array(5, 17, 18, ),
+         array(5, 17, 18, ),
+         array(7, 8, 9, 10, 11, 12, 15, 16, ),
+         array(17, 18, ),
+         array(17, 18, ),
+         array(1, ),
+         array(),
+         array(),
+         array(),
+         array(2, 4, ),
+         array(13, 14, ),
+         array(15, 17, ),
+         array(3, ),
+         array(6, ),
+         array(14, ),
+         array(17, ),
+         array(2, ),
+         array(3, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+);
+    public static $yy_default = array(
+     44,   40,   41,   37,   58,   58,   58,   36,   39,   44,
+     44,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+     38,   42,   43,   45,   46,   47,   48,   49,   50,   51,
+     52,   53,   54,   55,   56,   57,
+);
+    const YYNOCODE = 29;
+    const YYSTACKDEPTH = 100;
+    const YYNSTATE = 36;
+    const YYNRULE = 22;
+    const YYERRORSYMBOL = 19;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    public static $yyFallback = array(
+    );
+    public function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
+    }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+    public $yyTraceFILE;
+    public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array(
+  '$',             'OPENB',         'SECTION',       'CLOSEB',      
+  'DOT',           'ID',            'EQUAL',         'FLOAT',       
+  'INT',           'BOOL',          'SINGLE_QUOTED_STRING',  'DOUBLE_QUOTED_STRING',
+  'TRIPPLE_QUOTES',  'TRIPPLE_TEXT',  'TRIPPLE_QUOTES_END',  'NAKED_STRING',
+  'OTHER',         'NEWLINE',       'COMMENTSTART',  'error',       
+  'start',         'global_vars',   'sections',      'var_list',    
+  'section',       'newline',       'var',           'value',       
+    );
+
+    public static $yyRuleName = array(
+  'start ::= global_vars sections',
+  'global_vars ::= var_list',
+  'sections ::= sections section',
+  'sections ::=',
+  'section ::= OPENB SECTION CLOSEB newline var_list',
+  'section ::= OPENB DOT SECTION CLOSEB newline var_list',
+  'var_list ::= var_list newline',
+  'var_list ::= var_list var',
+  'var_list ::=',
+  'var ::= ID EQUAL value',
+  'value ::= FLOAT',
+  'value ::= INT',
+  'value ::= BOOL',
+  'value ::= SINGLE_QUOTED_STRING',
+  'value ::= DOUBLE_QUOTED_STRING',
+  'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
+  'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
+  'value ::= NAKED_STRING',
+  'value ::= OTHER',
+  'newline ::= NEWLINE',
+  'newline ::= COMMENTSTART NEWLINE',
+  'newline ::= COMMENTSTART NAKED_STRING NEWLINE',
+    );
+
+    public function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[$tokenType];
+        } else {
+            return 'Unknown';
+        }
+    }
+
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    public function yy_pop_parser_stack()
+    {
+        if (empty($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite($this->yyTraceFILE,
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+
+        return $yymajor;
+    }
+
+    public function __destruct()
+    {
+        while ($this->yystack !== Array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    public function yy_get_expected_tokens($token)
+    {
+        static $res3 = array();
+        static $res4 = array();
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+                        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return array_unique($expected);
+    }
+
+    public function yy_is_expected_token($token)
+    {
+        static $res = array();
+        static $res2 = array();
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
+       }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return true;
+    }
+
+   public function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
+            // no shift actions
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_shift_ofst[$stateno];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+                        $this->yyTokenName[$iLookAhead] . ' => ' .
+                        $this->yyTokenName[$iFallback] . "\n");
+                }
+
+                return $this->yy_find_shift_action($iFallback);
+            }
+
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_reduce_ofst[$stateno];
+        if ($i === self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+// line 245 "src/Parser/ConfigfileParser.y"
+
+            $this->internalError = true;
+            $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
+
+            return;
+        }
+        $yytos = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
+                $yyNewState);
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf($this->yyTraceFILE, " %s",
+                    $this->yyTokenName[$this->yystack[$i]->major]);
+            }
+            fwrite($this->yyTraceFILE,"\n");
+        }
+    }
+
+    public static $yyRuleInfo = array(
+  array( 0 => 20, 1 => 2 ),
+  array( 0 => 21, 1 => 1 ),
+  array( 0 => 22, 1 => 2 ),
+  array( 0 => 22, 1 => 0 ),
+  array( 0 => 24, 1 => 5 ),
+  array( 0 => 24, 1 => 6 ),
+  array( 0 => 23, 1 => 2 ),
+  array( 0 => 23, 1 => 2 ),
+  array( 0 => 23, 1 => 0 ),
+  array( 0 => 26, 1 => 3 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 3 ),
+  array( 0 => 27, 1 => 2 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 25, 1 => 1 ),
+  array( 0 => 25, 1 => 2 ),
+  array( 0 => 25, 1 => 3 ),
+    );
+
+    public static $yyReduceMap = array(
+        0 => 0,
+        2 => 0,
+        3 => 0,
+        19 => 0,
+        20 => 0,
+        21 => 0,
+        1 => 1,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 17,
+    );
+// line 251 "src/Parser/ConfigfileParser.y"
+    public function yy_r0(){
+    $this->_retvalue = null;
+    }
+// line 256 "src/Parser/ConfigfileParser.y"
+    public function yy_r1(){
+    $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = null;
+    }
+// line 270 "src/Parser/ConfigfileParser.y"
+    public function yy_r4(){
+    $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = null;
+    }
+// line 275 "src/Parser/ConfigfileParser.y"
+    public function yy_r5(){
+    if ($this->configReadHidden) {
+        $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+    }
+    $this->_retvalue = null;
+    }
+// line 283 "src/Parser/ConfigfileParser.y"
+    public function yy_r6(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 287 "src/Parser/ConfigfileParser.y"
+    public function yy_r7(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, array($this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 291 "src/Parser/ConfigfileParser.y"
+    public function yy_r8(){
+    $this->_retvalue = array();
+    }
+// line 297 "src/Parser/ConfigfileParser.y"
+    public function yy_r9(){
+    $this->_retvalue = array('key' => $this->yystack[$this->yyidx + -2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 302 "src/Parser/ConfigfileParser.y"
+    public function yy_r10(){
+    $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 306 "src/Parser/ConfigfileParser.y"
+    public function yy_r11(){
+    $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 310 "src/Parser/ConfigfileParser.y"
+    public function yy_r12(){
+    $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 314 "src/Parser/ConfigfileParser.y"
+    public function yy_r13(){
+    $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 318 "src/Parser/ConfigfileParser.y"
+    public function yy_r14(){
+    $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 322 "src/Parser/ConfigfileParser.y"
+    public function yy_r15(){
+    $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 326 "src/Parser/ConfigfileParser.y"
+    public function yy_r16(){
+    $this->_retvalue = '';
+    }
+// line 330 "src/Parser/ConfigfileParser.y"
+    public function yy_r17(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    private $_retvalue;
+
+    public function yy_reduce($yyruleno)
+    {
+        if ($this->yyTraceFILE && $yyruleno >= 0
+              && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
+                $this->yyTracePrompt, $yyruleno,
+                self::$yyRuleName[$yyruleno]);
+        }
+
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (isset(self::$yyReduceMap[$yyruleno])) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
+        $this->yyidx -= $yysize;
+        for ($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[$this->yyidx] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    public function yy_parse_failed()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    public function yy_syntax_error($yymajor, $TOKEN)
+    {
+// line 238 "src/Parser/ConfigfileParser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_config_file_error();
+    }
+
+    public function yy_accept()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+// line 231 "src/Parser/ConfigfileParser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+    }
+
+    public function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            $this->yystack[] = $x;
+        }
+        $yyendofinput = ($yymajor==0);
+
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sInput %s\n",
+                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+        }
+
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                  !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact === self::YY_ERROR_ACTION) {
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
+                        $this->yyTracePrompt);
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[$this->yyidx]->major;
+                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
+                                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                                 $yymx !== self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor==0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx !== self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }
+        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
+    }
+}
+
diff --git a/include/smarty/lexer/smarty_internal_configfileparser.y b/include/smarty/src/Parser/ConfigfileParser.y
similarity index 91%
rename from include/smarty/lexer/smarty_internal_configfileparser.y
rename to include/smarty/src/Parser/ConfigfileParser.y
index c981b58e9..23afc2d8f 100644
--- a/include/smarty/lexer/smarty_internal_configfileparser.y
+++ b/include/smarty/src/Parser/ConfigfileParser.y
@@ -1,5 +1,5 @@
 /**
-* Smarty Internal Plugin Configfileparser
+* ConfigfileParser
 *
 * This is the config file parser
 * 
@@ -10,16 +10,22 @@
 */
 %name TPC_
 %declare_class {
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\ConfigfileLexer as Lexer;
+use \Smarty\Compiler\Configfile as Configfile;
+
 /**
 * Smarty Internal Plugin Configfileparse
 *
 * This is the config file parser.
-* It is generated from the smarty_internal_configfileparser.y file
+* It is generated from the ConfigfileParser.y file
 * @package Smarty
 * @subpackage Compiler
 * @author Uwe Tews
 */
-class Smarty_Internal_Configfileparser
+class ConfigfileParser
 }
 %include_class
 {
@@ -42,7 +48,7 @@ class Smarty_Internal_Configfileparser
     /**
      * lexer object
      *
-     * @var Smarty_Internal_Configfilelexer
+     * @var Lexer
      */
     private $lex;
     /**
@@ -54,7 +60,7 @@ class Smarty_Internal_Configfileparser
     /**
      * compiler object
      *
-     * @var Smarty_Internal_Config_File_Compiler
+     * @var Configfile
      */
     public $compiler = null;
     /**
@@ -86,13 +92,13 @@ class Smarty_Internal_Configfileparser
     /**
      * constructor
      *
-     * @param Smarty_Internal_Configfilelexer      $lex
-     * @param Smarty_Internal_Config_File_Compiler $compiler
+     * @param Lexer      $lex
+     * @param Configfile $compiler
      */
-    public function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+    public function __construct(Lexer $lex, Configfile $compiler)
     {
         $this->lex = $lex;
-        $this->smarty = $compiler->smarty;
+        $this->smarty = $compiler->getSmarty();
         $this->compiler = $compiler;
         $this->configOverwrite = $this->smarty->config_overwrite;
         $this->configReadHidden = $this->smarty->config_read_hidden;
@@ -237,8 +243,8 @@ class Smarty_Internal_Configfileparser
 
 %stack_overflow
 {
-    $this->internalError = true;
-    $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
+            $this->internalError = true;
+            $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
 }
 
 // Complete config file
diff --git a/include/smarty/src/Parser/TemplateParser.php b/include/smarty/src/Parser/TemplateParser.php
new file mode 100644
index 000000000..772df98d0
--- /dev/null
+++ b/include/smarty/src/Parser/TemplateParser.php
@@ -0,0 +1,3178 @@
+<?php
+
+// line 11 "src/Parser/TemplateParser.y"
+
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\TemplateLexer as Lexer;
+use \Smarty\ParseTree\Template as TemplateParseTree;
+use \Smarty\Compiler\Template as TemplateCompiler;
+use \Smarty\ParseTree\Code;
+use \Smarty\ParseTree\Dq;
+use \Smarty\ParseTree\DqContent;
+use \Smarty\ParseTree\Tag;
+use \Smarty\CompilerException;
+
+/**
+* Smarty Template Parser Class
+*
+* This is the template parser.
+* It is generated from the TemplateParser.y file
+* 
+* @author Uwe Tews <uwe.tews@googlemail.com>
+*/
+class TemplateParser
+{
+// line 35 "src/Parser/TemplateParser.y"
+
+    const ERR1 = 'Security error: Call to private object member not allowed';
+    const ERR2 = 'Security error: Call to dynamic object member not allowed';
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * last index of array variable
+     *
+     * @var mixed
+     */
+    public $last_index;
+
+    /**
+     * last variable name
+     *
+     * @var string
+     */
+    public $last_variable;
+
+    /**
+     * root parse tree buffer
+     *
+     * @var TemplateParseTree
+     */
+    public $root_buffer;
+
+    /**
+     * current parse tree object
+     *
+     * @var \Smarty\ParseTree\Base
+     */
+    public $current_buffer;
+
+    /**
+     * lexer object
+     *
+     * @var Lexer
+     */
+    public $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
+    /**
+     * {strip} status
+     *
+     * @var bool
+     */
+    public $strip = false;
+    /**
+     * compiler object
+     *
+     * @var TemplateCompiler
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var \Smarty\Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * template object
+     *
+     * @var \Smarty\Template
+     */
+    public $template = null;
+
+    /**
+     * block nesting level
+     *
+     * @var int
+     */
+    public $block_nesting_level = 0;
+
+    /**
+     * security object
+     *
+     * @var \Smarty\Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty\ParseTree\Base[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty\ParseTree\Base[]
+     */
+    public $template_postfix = array();
+
+    /**
+     * constructor
+     *
+     * @param Lexer        $lex
+     * @param TemplateCompiler $compiler
+     */
+    public function __construct(Lexer $lex, TemplateCompiler $compiler)
+    {
+        $this->lex = $lex;
+        $this->compiler = $compiler;
+        $this->template = $this->compiler->getTemplate();
+        $this->smarty = $this->template->getSmarty();
+        $this->security = $this->smarty->security_policy ?? false;
+        $this->current_buffer = $this->root_buffer = new TemplateParseTree();
+    }
+
+     /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
+    {
+        $this->current_buffer->append_subtree($this, new Tag($this, $code));
+    }
+
+    /**
+     * error rundown
+     *
+     */
+    public function errorRunDown()
+    {
+        while ($this->yystack !== array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    /**
+     *  merge PHP code with prefix code and return parse tree tag object
+     *
+     * @param string $code
+     *
+     * @return Tag
+     */
+    private function mergePrefixCode($code)
+    {
+        $tmp = '';
+        foreach ($this->compiler->prefix_code as $preCode) {
+            $tmp .= $preCode;
+        }
+        $this->compiler->prefix_code = array();
+        $tmp .= $code;
+        return new Tag($this, $this->compiler->processNocacheCode($tmp));
+    }
+
+
+    const TP_VERT                           =  1;
+    const TP_COLON                          =  2;
+    const TP_TEXT                           =  3;
+    const TP_STRIPON                        =  4;
+    const TP_STRIPOFF                       =  5;
+    const TP_LITERALSTART                   =  6;
+    const TP_LITERALEND                     =  7;
+    const TP_LITERAL                        =  8;
+    const TP_SIMPELOUTPUT                   =  9;
+    const TP_SIMPLETAG                      = 10;
+    const TP_SMARTYBLOCKCHILDPARENT         = 11;
+    const TP_LDEL                           = 12;
+    const TP_RDEL                           = 13;
+    const TP_DOLLARID                       = 14;
+    const TP_EQUAL                          = 15;
+    const TP_ID                             = 16;
+    const TP_PTR                            = 17;
+    const TP_LDELIF                         = 18;
+    const TP_LDELFOR                        = 19;
+    const TP_SEMICOLON                      = 20;
+    const TP_INCDEC                         = 21;
+    const TP_TO                             = 22;
+    const TP_STEP                           = 23;
+    const TP_LDELFOREACH                    = 24;
+    const TP_SPACE                          = 25;
+    const TP_AS                             = 26;
+    const TP_APTR                           = 27;
+    const TP_LDELSETFILTER                  = 28;
+    const TP_CLOSETAG                       = 29;
+    const TP_LDELSLASH                      = 30;
+    const TP_ATTR                           = 31;
+    const TP_INTEGER                        = 32;
+    const TP_COMMA                          = 33;
+    const TP_OPENP                          = 34;
+    const TP_CLOSEP                         = 35;
+    const TP_MATH                           = 36;
+    const TP_UNIMATH                        = 37;
+    const TP_ISIN                           = 38;
+    const TP_QMARK                          = 39;
+    const TP_NOT                            = 40;
+    const TP_TYPECAST                       = 41;
+    const TP_HEX                            = 42;
+    const TP_DOT                            = 43;
+    const TP_INSTANCEOF                     = 44;
+    const TP_SINGLEQUOTESTRING              = 45;
+    const TP_DOUBLECOLON                    = 46;
+    const TP_NAMESPACE                      = 47;
+    const TP_AT                             = 48;
+    const TP_HATCH                          = 49;
+    const TP_OPENB                          = 50;
+    const TP_CLOSEB                         = 51;
+    const TP_DOLLAR                         = 52;
+    const TP_LOGOP                          = 53;
+    const TP_SLOGOP                         = 54;
+    const TP_TLOGOP                         = 55;
+    const TP_SINGLECOND                     = 56;
+    const TP_ARRAYOPEN                      = 57;
+    const TP_QUOTE                          = 58;
+    const TP_BACKTICK                       = 59;
+    const YY_NO_ACTION = 542;
+    const YY_ACCEPT_ACTION = 541;
+    const YY_ERROR_ACTION = 540;
+
+    const YY_SZ_ACTTAB = 2565;
+public static $yy_action = array(
+     33,  106,  269,  306,  179,  305,  200,  247,  248,  249,
+      1,  264,  138,  237,  202,  361,    6,   87,  284,  222,
+    338,  361,  112,  107,  400,  321,  217,  261,  218,  130,
+    224,  400,   21,  400,   49,   44,  400,   32,   45,   46,
+    278,  226,  400,  282,  400,  203,  400,   53,    4,  139,
+    302,  231,   28,  102,  225,    5,   54,  247,  248,  249,
+      1,   20,  135,  192,  193,  271,    6,   87,  246,  222,
+    216,   29,  112,  229,    7,  159,  217,  261,  218,  140,
+    208,  272,   21,  509,   53,   44,   13,  302,   45,   46,
+    278,  226,  149,  235,  153,  203,  257,   53,    4,  328,
+    302,  302,  256,  304,  143,    5,   54,  247,  248,  249,
+      1,  302,  100,  394,   86,  236,    6,   87,    3,  222,
+    102,  257,  112,  144,   97,  394,  217,  261,  218,  102,
+    224,  394,   21,  256,  446,   44,  178,  305,   45,   46,
+    278,  226,  302,  282,  200,  203,  446,   53,    4,  115,
+    302,   47,   22,  285,   41,    5,   54,  247,  248,  249,
+      1,  139,  137,  267,  202,  141,    6,   87,   14,  222,
+    541,   99,  112,  151,   15,  446,  217,  261,  218,  314,
+    224,  216,   21,  256,  233,   44,    9,  446,   45,   46,
+    278,  226,  325,  282,  268,  203,   53,   53,    4,  302,
+    302,  152,  257,  361,  320,    5,   54,  247,  248,  249,
+      1,  264,  137,  102,  194,  361,    6,   87,   37,  222,
+    102,  361,  112,  257,   89,  316,  217,  261,  218,  314,
+    224,  216,   21,   36,   49,   44,  200,   40,   45,   46,
+    278,  226,  115,  282,  237,  203,   14,   53,    4,  115,
+    302,  238,   15,  155,  107,    5,   54,  247,  248,  249,
+      1,  466,  136,  256,  202,  200,    6,   87,  466,  222,
+    255,  171,  112,  264,  446,  310,  217,  261,  218,  158,
+    224,  257,   11,  142,  157,   44,  446,  183,   45,   46,
+    278,  226,   26,  282,  256,  203,   49,   53,    4,  446,
+    302,  184,  260,  323,  176,    5,   54,  247,  248,  249,
+      1,  446,  137,  264,  189,  291,    6,   87,  183,  222,
+    200,  302,  112,  253,  178,  305,  217,  261,  218,  263,
+    213,   18,   21,  200,  184,   44,   49,   15,   45,   46,
+    278,  226,  146,  282,  269,  203,   25,   53,    4,  220,
+    302,  312,  107,  152,  290,    5,   54,  247,  248,  249,
+      1,  219,  137,  147,  187,  130,    6,   87,  259,  222,
+     16,   19,  112,  256,  167,  258,  217,  261,  218,  111,
+    224,  173,   21,   96,  256,   44,  200,   23,   45,   46,
+    278,  226,  177,  282,  227,  203,  335,   53,    4,  174,
+    302,  180,  305,  170,   90,    5,   54,  247,  248,  249,
+      1,  184,  137,  256,  202,   91,    6,   87,  482,  222,
+    160,  482,  112,  214,  197,  482,  217,  261,  218,  184,
+    188,  181,   21,  245,  302,   44,  164,  140,   45,   46,
+    278,  226,  466,  282,   13,  203,  166,   53,    4,  466,
+    302,   42,   43,  286,   12,    5,   54,  247,  248,  249,
+      1,  264,  139,  447,  202,   40,    6,   87,  293,  294,
+    295,  296,  112,   17,  311,  447,  217,  261,  218,  337,
+    224,  183,   21,  260,   49,   48,  244,  245,   45,   46,
+    278,  226,   24,  282,  303,  203,    8,   53,    4,   92,
+    302,   42,   43,  286,   12,    5,   54,  247,  248,  249,
+      1,   10,  139,    9,  202,  317,    6,   87,  293,  294,
+    295,  296,  112,  116,  299,   35,  217,  261,  218,  225,
+    224,  198,   21,   98,   34,   44,  329,  324,   45,   46,
+    278,  226,  448,  282,  448,  203,  161,   53,    4,  172,
+    302,  129,  175,  225,  232,    5,   54,  288,  215,  216,
+    252,  101,   93,  109,  243,  191,  103,   85,  450,  162,
+    450,   24,  101,  330,  182,  273,  274,  300,  298,  301,
+    250,  251,  281,  204,  283,  113,  289,  262,  300,  298,
+    301,  121,  288,  215,  216,  252,  270,   93,  109,  275,
+    190,  103,   60,  277,  279,  225,  237,  101,  280,  297,
+    273,  274,  129,  239,  199,  266,  107,  281,  204,  283,
+      7,  289,  101,  300,  298,  301,  288,   88,  216,  254,
+    163,  114,  109,  265,  191,  103,   85,  200,  300,  298,
+    301,  101,  200,  259,  273,  274,   19,  165,  326,  362,
+    258,  281,  204,  283,  396,  289,  234,  300,  298,  301,
+    288,  362,  216,  327,  200,  114,  396,  362,  201,  119,
+     72,  336,  396,   37,  259,  101,  393,   19,  273,  274,
+    154,  258,  228,  339,   94,  281,  204,  283,  393,  289,
+    256,  300,  298,  301,  393,   38,  314,  288,  314,  216,
+    314,  314,  114,  207,  319,  201,  119,   72,  314,  314,
+    314,  314,  101,  221,  184,  273,  274,  156,  314,  314,
+    314,   95,  281,  204,  283,  314,  289,  256,  300,  298,
+    301,  314,  314,  314,  288,  314,  216,  314,  314,  108,
+    206,  319,  201,  122,   51,  314,  120,  314,  314,  101,
+    314,  184,  273,  274,  314,  314,  314,  314,  314,  281,
+    204,  283,  314,  289,  314,  300,  298,  301,  288,  314,
+    216,  314,  314,  114,  314,  314,  201,  122,   67,  314,
+    314,  314,  314,  101,  314,  314,  273,  274,  314,  314,
+    314,  314,  314,  281,  204,  283,  314,  289,  314,  300,
+    298,  301,  288,  314,  216,  314,  314,  114,  212,  314,
+    201,  122,   67,  314,  314,  314,  314,  101,  314,  314,
+    273,  274,  314,  314,  314,  314,  314,  281,  204,  283,
+    314,  289,  314,  300,  298,  301,  288,  314,  216,  314,
+    314,  114,  205,  314,  201,  119,   72,  314,  314,  314,
+    314,  101,  314,  314,  273,  274,  314,  314,  314,  314,
+    314,  281,  204,  283,  314,  289,  314,  300,  298,  301,
+    314,  314,  314,  288,  314,  216,  314,  314,  114,  314,
+    318,  201,  122,   78,  314,  314,  314,  314,  101,  314,
+    482,  273,  274,  482,  314,  314,  314,  482,  281,  204,
+    283,  314,  289,  209,  211,  298,  301,  288,  314,  216,
+    314,  314,  108,  314,  314,  201,  122,   58,  314,  238,
+    314,  314,  101,  314,  314,  273,  274,  314,  314,  482,
+    314,  314,  281,  204,  283,  314,  289,  314,  300,  298,
+    301,  288,  314,  216,  314,  314,  114,  314,  314,  201,
+    118,   64,  314,  314,  314,  314,  101,  314,  314,  273,
+    274,  314,  314,  314,  314,  314,  281,  204,  283,  314,
+    289,  314,  300,  298,  301,  288,  314,  216,  314,  314,
+    114,  314,  314,  196,  117,   59,  314,  314,  314,  314,
+    101,  314,  314,  273,  274,  314,  314,  314,  314,  314,
+    281,  204,  283,  314,  289,  314,  300,  298,  301,  288,
+    314,  216,  314,  314,  114,  314,  314,  201,  104,   84,
+    314,  314,  314,  314,  101,  314,  314,  273,  274,  314,
+    314,  314,  314,  314,  281,  204,  283,  314,  289,  314,
+    300,  298,  301,  288,  314,  216,  314,  314,  114,  314,
+    314,  201,  105,   83,  314,  314,  314,  314,  101,  314,
+    314,  273,  274,  314,  314,  314,  314,  314,  281,  204,
+    283,  314,  289,  314,  300,  298,  301,  288,  314,  216,
+    314,  314,  114,  314,  314,  201,  122,   55,  314,  314,
+    314,  314,  101,  314,  314,  273,  274,  314,  314,  314,
+    314,  314,  281,  204,  283,  314,  289,  314,  300,  298,
+    301,  288,  314,  216,  314,  314,  114,  314,  314,  201,
+    122,   66,  314,  314,  314,  314,  101,  314,  314,  273,
+    274,  314,  314,  314,  314,  314,  281,  204,  283,  314,
+    289,  314,  300,  298,  301,  288,  314,  216,  314,  314,
+    114,  314,  314,  201,  104,   56,  314,  314,  314,  314,
+    101,  314,  314,  273,  274,  314,  314,  314,  314,  314,
+    281,  204,  283,  314,  289,  314,  300,  298,  301,  288,
+    314,  216,  314,  314,  114,  314,  314,  201,  122,   65,
+    314,  314,  314,  314,  101,  314,  314,  273,  274,  314,
+    314,  314,  314,  314,  281,  204,  283,  314,  289,  314,
+    300,  298,  301,  288,  314,  216,  314,  314,  114,  314,
+    314,  201,  122,   57,  314,  314,  314,  314,  101,  314,
+    314,  273,  274,  314,  314,  314,  314,  314,  281,  204,
+    283,  314,  289,  314,  300,  298,  301,  288,  314,  216,
+    314,  314,  114,  314,  314,  201,  122,   58,  314,  314,
+    314,  314,  101,  314,  314,  273,  274,  314,  314,  314,
+    314,  314,  281,  204,  283,  314,  289,  314,  300,  298,
+    301,  288,  314,  216,  314,  314,  114,  314,  314,  201,
+    122,   68,  314,  314,  314,  314,  101,  314,  314,  273,
+    274,  314,  314,  314,  314,  314,  281,  204,  283,  314,
+    289,  314,  300,  298,  301,  288,  314,  216,  314,  314,
+    114,  314,  314,  201,  122,   69,  314,  314,  314,  314,
+    101,  314,  314,  273,  274,  314,  314,  314,  314,  314,
+    281,  204,  283,  314,  289,  314,  300,  298,  301,  288,
+    314,  216,  314,  314,  114,  314,  314,  201,  122,   70,
+    314,  314,  314,  314,  101,  314,  314,  273,  274,  314,
+    314,  314,  314,  314,  281,  204,  283,  314,  289,  314,
+    300,  298,  301,  288,  314,  216,  314,  314,  114,  314,
+    314,  201,  122,   71,  314,  314,  314,  314,  101,  314,
+    314,  273,  274,  314,  314,  314,  314,  314,  281,  204,
+    283,  314,  289,  314,  300,  298,  301,  288,  314,  216,
+    314,  314,  114,  314,  314,  201,  122,   73,  314,  314,
+    314,  314,  101,  314,  314,  273,  274,  314,  314,  314,
+    314,  314,  281,  204,  283,  314,  289,  314,  300,  298,
+    301,  288,  314,  216,  314,  314,  114,  314,  314,  195,
+    122,   61,  314,  314,  314,  314,  101,  314,  314,  273,
+    274,  314,  314,  314,  314,  314,  281,  204,  283,  314,
+    289,  314,  300,  298,  301,  288,  314,  216,  314,  314,
+    114,  314,  314,  201,  122,   62,  314,  314,  314,  314,
+    101,  314,  314,  273,  274,  314,  314,  314,  314,  314,
+    281,  204,  283,  314,  289,  314,  300,  298,  301,  288,
+    314,  216,  314,  314,  114,  314,  314,  201,  122,   63,
+    314,  314,  314,  314,  101,  314,  314,  273,  274,  314,
+    314,  314,  314,  314,  281,  204,  283,  314,  289,  314,
+    300,  298,  301,  288,  314,  216,  314,  314,  114,  314,
+    314,  201,  122,   74,  314,  314,  314,  314,  101,  314,
+    314,  273,  274,  314,  314,  314,  314,  314,  281,  204,
+    283,  314,  289,  314,  300,  298,  301,  288,  314,  216,
+    314,  314,  114,  314,  314,  201,  122,   75,  314,  314,
+    314,  314,  101,  314,  314,  273,  274,  314,  314,  314,
+    314,  314,  281,  204,  283,  314,  289,  314,  300,  298,
+    301,  288,  314,  216,  314,  314,  114,  314,  314,  201,
+    122,   76,  314,  314,  314,  314,  101,  314,  314,  273,
+    274,  314,  314,  314,  314,  314,  281,  204,  283,  314,
+    289,  314,  300,  298,  301,  288,  314,  216,  314,  314,
+    114,  314,  314,  201,  122,   77,  314,  314,  314,  314,
+    101,  314,  314,  273,  274,  314,  314,  314,  314,  314,
+    281,  204,  283,  314,  289,  314,  300,  298,  301,  288,
+    314,  216,  314,  314,  114,  314,  314,  201,  122,   79,
+    314,  314,  314,  314,  101,  314,  314,  273,  274,  314,
+    314,  314,  314,  314,  281,  204,  283,  314,  289,  314,
+    210,  298,  301,  288,  314,  216,  314,  314,  114,  314,
+    314,  201,  122,   80,  314,  314,  314,  314,  101,  314,
+    314,  273,  274,  314,  314,  314,  314,  314,  281,  204,
+    283,  314,  289,  314,  300,  298,  301,  288,  314,  216,
+    314,  314,  114,  314,  314,  201,  122,   81,  314,  314,
+    314,  314,  101,  314,  314,  273,  274,  314,  314,  314,
+    314,  314,  281,  204,  283,  314,  289,  314,  300,  298,
+    301,  288,  314,  216,  314,  314,  114,  314,  314,  201,
+    122,   82,  314,  314,  314,  314,  101,  314,  314,  273,
+    274,  314,  314,  314,  314,  314,  281,  204,  283,  314,
+    289,  314,  300,  298,  301,  288,  314,  216,  314,  314,
+    114,  314,  314,  201,  122,   50,  314,  314,  314,  314,
+    101,  314,  314,  273,  274,  314,  314,  314,  314,  314,
+    281,  204,  283,  314,  289,  314,  300,  298,  301,  288,
+    314,  216,  314,  314,  114,  314,  314,  201,  122,   52,
+    314,  314,  314,  314,  101,  314,  314,  273,  274,  314,
+    314,  314,  314,  314,  281,  204,  283,  314,  289,  314,
+    300,  298,  301,  288,  314,  216,  168,  314,  114,  314,
+    314,  201,  134,  314,  314,  314,  256,  314,  101,   47,
+     22,  285,   41,  314,  314,  314,  314,  333,  281,  204,
+    283,  314,  289,  314,  300,  298,  301,  288,  314,  216,
+    145,  314,  114,  314,  314,  201,  128,  314,  314,  314,
+    256,  314,  101,   47,   22,  285,   41,  314,  314,  314,
+    314,  287,  281,  204,  283,  315,  289,  314,  300,  298,
+    301,  247,  248,  249,    2,  314,  313,  314,  314,  314,
+      6,   87,  259,  314,  314,   19,  112,  314,   14,  258,
+    217,  261,  218,  314,   15,   39,  314,   14,   14,   42,
+     43,  286,   12,   15,   15,  314,  314,  314,   42,   43,
+    286,   12,  314,  314,  314,  314,  293,  294,  295,  296,
+    308,   27,  314,  314,  315,  293,  294,  295,  296,  314,
+    247,  248,  249,    2,  314,  313,  314,  110,  314,    6,
+     87,  314,  314,  314,  314,  112,  314,  314,  148,  217,
+    261,  218,  314,   42,   43,  286,   12,  314,   42,   43,
+    286,   12,  314,  314,  314,  314,  314,  314,  314,  314,
+    293,  294,  295,  296,  314,  293,  294,  295,  296,  309,
+     27,  314,  314,  240,  241,  242,  133,  223,  314,  247,
+    248,  249,    1,  314,  482,  314,  314,  482,    6,   87,
+      3,  482,  466,  314,  112,  314,  276,  314,  217,  261,
+    218,  288,  314,  216,  314,  314,  114,  314,  314,  201,
+    132,  314,  314,  314,  314,  314,  101,  314,  466,  314,
+    314,  466,  314,  482,  314,  466,  281,  204,  283,  314,
+    289,  314,  300,  298,  301,  314,  288,  314,  216,  314,
+    200,  114,  314,  314,  201,  123,  314,  314,  314,  314,
+    314,  101,  365,  314,  314,  314,  230,  314,  314,  314,
+    314,  281,  204,  283,   14,  289,  314,  300,  298,  301,
+     15,  314,  288,  446,  216,  314,  169,  114,  314,  314,
+    201,  124,  314,  314,  314,  446,  256,  101,  314,   47,
+     22,  285,   41,  314,  314,  314,  314,  281,  204,  283,
+    314,  289,  314,  300,  298,  301,  314,  288,  314,  216,
+    314,  314,  114,  314,  314,  201,  125,  314,  314,  314,
+    314,  314,  101,  314,  314,  314,  314,  314,  314,  314,
+    314,  314,  281,  204,  283,  314,  289,  314,  300,  298,
+    301,  314,  314,  288,  314,  216,  314,  314,  114,  314,
+    314,  201,  126,  314,  314,  314,  314,  314,  101,  314,
+    314,  314,  314,  314,  314,  314,  314,  314,  281,  204,
+    283,  314,  289,  314,  300,  298,  301,  314,  288,  314,
+    216,  314,  314,  114,  314,  314,  201,  127,  314,  314,
+    314,  314,  314,  101,  314,  314,  314,  314,  314,  314,
+    314,  314,  314,  281,  204,  283,  314,  289,  314,  300,
+    298,  301,  314,  314,  288,  314,  216,  223,  314,  114,
+    314,  314,  201,  131,  482,  314,  314,  482,  314,  101,
+    314,  482,  466,  314,  314,  314,  276,  314,  314,  281,
+    204,  283,  314,  289,  314,  300,  298,  301,  314,  314,
+    409,  314,  314,  314,  314,  314,  314,  314,  466,  314,
+    314,  466,  314,  482,  223,  466,  292,  314,  314,  314,
+    314,  482,  314,  314,  482,  314,  314,   36,  482,  466,
+    314,  223,  446,  276,  409,  409,  409,  409,  482,  314,
+    314,  482,  314,  314,  446,  482,  466,  314,  314,   30,
+    276,  409,  409,  409,  409,  466,  482,  314,  466,  482,
+    482,  314,  466,  482,  466,  314,  314,  314,  276,  314,
+    314,  314,  466,  314,  314,  466,  332,  482,  314,  466,
+    314,  314,  314,  314,  314,  331,   42,   43,  286,   12,
+    466,  314,  314,  466,  314,  482,  314,  466,  314,   42,
+     43,  286,   12,  293,  294,  295,  296,  307,  314,   42,
+     43,  286,   12,  185,  314,  314,  293,  294,  295,  296,
+    186,  314,  314,  314,  322,  314,  293,  294,  295,  296,
+     42,   43,  286,   12,   31,  314,   42,   43,  286,   12,
+    314,  334,  314,   42,   43,  286,   12,  293,  294,  295,
+    296,  314,  314,  293,  294,  295,  296,  314,  314,  314,
+    293,  294,  295,  296,   42,   43,  286,   12,   42,   43,
+    286,   12,  482,  314,  314,  482,  314,  314,  314,  482,
+    466,  293,  294,  295,  296,  293,  294,  295,  296,  314,
+    314,  314,  259,  314,  314,   19,  314,  314,  314,  258,
+    314,  314,  314,  314,  314,  314,  466,  314,   14,  466,
+    150,  482,  314,  466,   15,
+    );
+    public static $yy_lookahead = array(
+      2,   80,  100,   13,  102,  103,    1,    9,   10,   11,
+     12,   21,   14,   70,   16,   25,   18,   19,   93,   21,
+     77,   31,   24,   80,   13,  104,   28,   29,   30,  104,
+     32,   20,   34,   22,   44,   37,   25,   39,   40,   41,
+     42,   43,   31,   45,   33,   47,   35,   49,   50,   14,
+     52,   16,   12,   17,   43,   57,   58,    9,   10,   11,
+     12,   12,   14,   14,   16,   16,   18,   19,   65,   21,
+     67,   12,   24,   14,   34,   16,   28,   29,   30,   43,
+     32,   32,   34,    1,   49,   37,   50,   52,   40,   41,
+     42,   43,   72,   45,   99,   47,  101,   49,   50,   51,
+     52,   52,   82,   69,   14,   57,   58,    9,   10,   11,
+     12,   52,   14,   13,   16,   15,   18,   19,   15,   21,
+     17,  101,   24,   72,   34,   25,   28,   29,   30,   17,
+     32,   31,   34,   82,   34,   37,  102,  103,   40,   41,
+     42,   43,   52,   45,    1,   47,   46,   49,   50,   46,
+     52,   85,   86,   87,   88,   57,   58,    9,   10,   11,
+     12,   14,   14,   16,   16,   80,   18,   19,   25,   21,
+     61,   62,   24,   72,   31,   34,   28,   29,   30,   65,
+     32,   67,   34,   82,   43,   37,   33,   46,   40,   41,
+     42,   43,   51,   45,   47,   47,   49,   49,   50,   52,
+     52,   99,  101,   13,   51,   57,   58,    9,   10,   11,
+     12,   21,   14,   17,   16,   25,   18,   19,   15,   21,
+     17,   31,   24,  101,  110,  111,   28,   29,   30,   65,
+     32,   67,   34,   15,   44,   37,    1,    2,   40,   41,
+     42,   43,   46,   45,   70,   47,   25,   49,   50,   46,
+     52,   77,   31,   72,   80,   57,   58,    9,   10,   11,
+     12,   43,   14,   82,   16,    1,   18,   19,   50,   21,
+     82,   76,   24,   21,   34,  111,   28,   29,   30,   99,
+     32,  101,   34,   14,   72,   37,   46,  106,   40,   41,
+     42,   43,   27,   45,   82,   47,   44,   49,   50,   34,
+     52,  106,  107,   51,   76,   57,   58,    9,   10,   11,
+     12,   46,   14,   21,   16,   51,   18,   19,  106,   21,
+      1,   52,   24,   69,  102,  103,   28,   29,   30,   16,
+     32,   25,   34,    1,  106,   37,   44,   31,   40,   41,
+     42,   43,   70,   45,  100,   47,   27,   49,   50,   17,
+     52,   59,   80,   99,   93,   57,   58,    9,   10,   11,
+     12,   48,   14,   72,   16,  104,   18,   19,    9,   21,
+     20,   12,   24,   82,   72,   16,   28,   29,   30,   79,
+     32,   76,   34,   33,   82,   37,    1,    2,   40,   41,
+     42,   43,   14,   45,   16,   47,   14,   49,   50,   76,
+     52,  102,  103,   72,   80,   57,   58,    9,   10,   11,
+     12,  106,   14,   82,   16,   80,   18,   19,    9,   21,
+     99,   12,   24,   63,   64,   16,   28,   29,   30,  106,
+     32,    6,   34,    8,   52,   37,   99,   43,   40,   41,
+     42,   43,   43,   45,   50,   47,   99,   49,   50,   50,
+     52,   36,   37,   38,   39,   57,   58,    9,   10,   11,
+     12,   21,   14,   34,   16,    2,   18,   19,   53,   54,
+     55,   56,   24,   15,   59,   46,   28,   29,   30,   21,
+     32,  106,   34,  107,   44,   37,    7,    8,   40,   41,
+     42,   43,   33,   45,   35,   47,   34,   49,   50,   99,
+     52,   36,   37,   38,   39,   57,   58,    9,   10,   11,
+     12,   34,   14,   33,   16,   35,   18,   19,   53,   54,
+     55,   56,   24,   46,  103,   15,   28,   29,   30,   43,
+     32,   64,   34,   81,   33,   37,   35,   51,   40,   41,
+     42,   43,   33,   45,   35,   47,   99,   49,   50,   81,
+     52,   70,   81,   43,   73,   57,   58,   65,   66,   67,
+     68,   80,   70,   71,    7,   73,   74,   75,   33,   99,
+     35,   33,   80,   35,   16,   83,   84,   96,   97,   98,
+     13,   13,   90,   91,   92,   16,   94,   16,   96,   97,
+     98,   16,   65,   66,   67,   68,   16,   70,   71,   14,
+     73,   74,   75,   16,   32,   43,   70,   80,   32,   16,
+     83,   84,   70,   77,   78,   73,   80,   90,   91,   92,
+     34,   94,   80,   96,   97,   98,   65,   16,   67,   68,
+     49,   70,   71,   91,   73,   74,   75,    1,   96,   97,
+     98,   80,    1,    9,   83,   84,   12,   49,   51,   13,
+     16,   90,   91,   92,   13,   94,   16,   96,   97,   98,
+     65,   25,   67,   51,    1,   70,   25,   31,   73,   74,
+     75,   16,   31,   15,    9,   80,   13,   12,   83,   84,
+     72,   16,   48,   35,   76,   90,   91,   92,   25,   94,
+     82,   96,   97,   98,   31,   22,  112,   65,  112,   67,
+    112,  112,   70,  108,  109,   73,   74,   75,  112,  112,
+    112,  112,   80,   48,  106,   83,   84,   72,  112,  112,
+    112,   76,   90,   91,   92,  112,   94,   82,   96,   97,
+     98,  112,  112,  112,   65,  112,   67,  112,  112,   70,
+    108,  109,   73,   74,   75,  112,   77,  112,  112,   80,
+    112,  106,   83,   84,  112,  112,  112,  112,  112,   90,
+     91,   92,  112,   94,  112,   96,   97,   98,   65,  112,
+     67,  112,  112,   70,  112,  112,   73,   74,   75,  112,
+    112,  112,  112,   80,  112,  112,   83,   84,  112,  112,
+    112,  112,  112,   90,   91,   92,  112,   94,  112,   96,
+     97,   98,   65,  112,   67,  112,  112,   70,  105,  112,
+     73,   74,   75,  112,  112,  112,  112,   80,  112,  112,
+     83,   84,  112,  112,  112,  112,  112,   90,   91,   92,
+    112,   94,  112,   96,   97,   98,   65,  112,   67,  112,
+    112,   70,  105,  112,   73,   74,   75,  112,  112,  112,
+    112,   80,  112,  112,   83,   84,  112,  112,  112,  112,
+    112,   90,   91,   92,  112,   94,  112,   96,   97,   98,
+    112,  112,  112,   65,  112,   67,  112,  112,   70,  112,
+    109,   73,   74,   75,  112,  112,  112,  112,   80,  112,
+      9,   83,   84,   12,  112,  112,  112,   16,   90,   91,
+     92,  112,   94,   95,   96,   97,   98,   65,  112,   67,
+    112,  112,   70,  112,  112,   73,   74,   75,  112,   77,
+    112,  112,   80,  112,  112,   83,   84,  112,  112,   48,
+    112,  112,   90,   91,   92,  112,   94,  112,   96,   97,
+     98,   65,  112,   67,  112,  112,   70,  112,  112,   73,
+     74,   75,  112,  112,  112,  112,   80,  112,  112,   83,
+     84,  112,  112,  112,  112,  112,   90,   91,   92,  112,
+     94,  112,   96,   97,   98,   65,  112,   67,  112,  112,
+     70,  112,  112,   73,   74,   75,  112,  112,  112,  112,
+     80,  112,  112,   83,   84,  112,  112,  112,  112,  112,
+     90,   91,   92,  112,   94,  112,   96,   97,   98,   65,
+    112,   67,  112,  112,   70,  112,  112,   73,   74,   75,
+    112,  112,  112,  112,   80,  112,  112,   83,   84,  112,
+    112,  112,  112,  112,   90,   91,   92,  112,   94,  112,
+     96,   97,   98,   65,  112,   67,  112,  112,   70,  112,
+    112,   73,   74,   75,  112,  112,  112,  112,   80,  112,
+    112,   83,   84,  112,  112,  112,  112,  112,   90,   91,
+     92,  112,   94,  112,   96,   97,   98,   65,  112,   67,
+    112,  112,   70,  112,  112,   73,   74,   75,  112,  112,
+    112,  112,   80,  112,  112,   83,   84,  112,  112,  112,
+    112,  112,   90,   91,   92,  112,   94,  112,   96,   97,
+     98,   65,  112,   67,  112,  112,   70,  112,  112,   73,
+     74,   75,  112,  112,  112,  112,   80,  112,  112,   83,
+     84,  112,  112,  112,  112,  112,   90,   91,   92,  112,
+     94,  112,   96,   97,   98,   65,  112,   67,  112,  112,
+     70,  112,  112,   73,   74,   75,  112,  112,  112,  112,
+     80,  112,  112,   83,   84,  112,  112,  112,  112,  112,
+     90,   91,   92,  112,   94,  112,   96,   97,   98,   65,
+    112,   67,  112,  112,   70,  112,  112,   73,   74,   75,
+    112,  112,  112,  112,   80,  112,  112,   83,   84,  112,
+    112,  112,  112,  112,   90,   91,   92,  112,   94,  112,
+     96,   97,   98,   65,  112,   67,  112,  112,   70,  112,
+    112,   73,   74,   75,  112,  112,  112,  112,   80,  112,
+    112,   83,   84,  112,  112,  112,  112,  112,   90,   91,
+     92,  112,   94,  112,   96,   97,   98,   65,  112,   67,
+    112,  112,   70,  112,  112,   73,   74,   75,  112,  112,
+    112,  112,   80,  112,  112,   83,   84,  112,  112,  112,
+    112,  112,   90,   91,   92,  112,   94,  112,   96,   97,
+     98,   65,  112,   67,  112,  112,   70,  112,  112,   73,
+     74,   75,  112,  112,  112,  112,   80,  112,  112,   83,
+     84,  112,  112,  112,  112,  112,   90,   91,   92,  112,
+     94,  112,   96,   97,   98,   65,  112,   67,  112,  112,
+     70,  112,  112,   73,   74,   75,  112,  112,  112,  112,
+     80,  112,  112,   83,   84,  112,  112,  112,  112,  112,
+     90,   91,   92,  112,   94,  112,   96,   97,   98,   65,
+    112,   67,  112,  112,   70,  112,  112,   73,   74,   75,
+    112,  112,  112,  112,   80,  112,  112,   83,   84,  112,
+    112,  112,  112,  112,   90,   91,   92,  112,   94,  112,
+     96,   97,   98,   65,  112,   67,  112,  112,   70,  112,
+    112,   73,   74,   75,  112,  112,  112,  112,   80,  112,
+    112,   83,   84,  112,  112,  112,  112,  112,   90,   91,
+     92,  112,   94,  112,   96,   97,   98,   65,  112,   67,
+    112,  112,   70,  112,  112,   73,   74,   75,  112,  112,
+    112,  112,   80,  112,  112,   83,   84,  112,  112,  112,
+    112,  112,   90,   91,   92,  112,   94,  112,   96,   97,
+     98,   65,  112,   67,  112,  112,   70,  112,  112,   73,
+     74,   75,  112,  112,  112,  112,   80,  112,  112,   83,
+     84,  112,  112,  112,  112,  112,   90,   91,   92,  112,
+     94,  112,   96,   97,   98,   65,  112,   67,  112,  112,
+     70,  112,  112,   73,   74,   75,  112,  112,  112,  112,
+     80,  112,  112,   83,   84,  112,  112,  112,  112,  112,
+     90,   91,   92,  112,   94,  112,   96,   97,   98,   65,
+    112,   67,  112,  112,   70,  112,  112,   73,   74,   75,
+    112,  112,  112,  112,   80,  112,  112,   83,   84,  112,
+    112,  112,  112,  112,   90,   91,   92,  112,   94,  112,
+     96,   97,   98,   65,  112,   67,  112,  112,   70,  112,
+    112,   73,   74,   75,  112,  112,  112,  112,   80,  112,
+    112,   83,   84,  112,  112,  112,  112,  112,   90,   91,
+     92,  112,   94,  112,   96,   97,   98,   65,  112,   67,
+    112,  112,   70,  112,  112,   73,   74,   75,  112,  112,
+    112,  112,   80,  112,  112,   83,   84,  112,  112,  112,
+    112,  112,   90,   91,   92,  112,   94,  112,   96,   97,
+     98,   65,  112,   67,  112,  112,   70,  112,  112,   73,
+     74,   75,  112,  112,  112,  112,   80,  112,  112,   83,
+     84,  112,  112,  112,  112,  112,   90,   91,   92,  112,
+     94,  112,   96,   97,   98,   65,  112,   67,  112,  112,
+     70,  112,  112,   73,   74,   75,  112,  112,  112,  112,
+     80,  112,  112,   83,   84,  112,  112,  112,  112,  112,
+     90,   91,   92,  112,   94,  112,   96,   97,   98,   65,
+    112,   67,  112,  112,   70,  112,  112,   73,   74,   75,
+    112,  112,  112,  112,   80,  112,  112,   83,   84,  112,
+    112,  112,  112,  112,   90,   91,   92,  112,   94,  112,
+     96,   97,   98,   65,  112,   67,  112,  112,   70,  112,
+    112,   73,   74,   75,  112,  112,  112,  112,   80,  112,
+    112,   83,   84,  112,  112,  112,  112,  112,   90,   91,
+     92,  112,   94,  112,   96,   97,   98,   65,  112,   67,
+    112,  112,   70,  112,  112,   73,   74,   75,  112,  112,
+    112,  112,   80,  112,  112,   83,   84,  112,  112,  112,
+    112,  112,   90,   91,   92,  112,   94,  112,   96,   97,
+     98,   65,  112,   67,  112,  112,   70,  112,  112,   73,
+     74,   75,  112,  112,  112,  112,   80,  112,  112,   83,
+     84,  112,  112,  112,  112,  112,   90,   91,   92,  112,
+     94,  112,   96,   97,   98,   65,  112,   67,  112,  112,
+     70,  112,  112,   73,   74,   75,  112,  112,  112,  112,
+     80,  112,  112,   83,   84,  112,  112,  112,  112,  112,
+     90,   91,   92,  112,   94,  112,   96,   97,   98,   65,
+    112,   67,  112,  112,   70,  112,  112,   73,   74,   75,
+    112,  112,  112,  112,   80,  112,  112,   83,   84,  112,
+    112,  112,  112,  112,   90,   91,   92,  112,   94,  112,
+     96,   97,   98,   65,  112,   67,   72,  112,   70,  112,
+    112,   73,   74,  112,  112,  112,   82,  112,   80,   85,
+     86,   87,   88,  112,  112,  112,  112,   89,   90,   91,
+     92,  112,   94,  112,   96,   97,   98,   65,  112,   67,
+     72,  112,   70,  112,  112,   73,   74,  112,  112,  112,
+     82,  112,   80,   85,   86,   87,   88,  112,  112,  112,
+    112,   89,   90,   91,   92,    3,   94,  112,   96,   97,
+     98,    9,   10,   11,   12,  112,   14,  112,  112,  112,
+     18,   19,    9,  112,  112,   12,   24,  112,   25,   16,
+     28,   29,   30,  112,   31,   23,  112,   25,   25,   36,
+     37,   38,   39,   31,   31,  112,  112,  112,   36,   37,
+     38,   39,  112,  112,  112,  112,   53,   54,   55,   56,
+     58,   59,  112,  112,    3,   53,   54,   55,   56,  112,
+      9,   10,   11,   12,  112,   14,  112,   20,  112,   18,
+     19,  112,  112,  112,  112,   24,  112,  112,   26,   28,
+     29,   30,  112,   36,   37,   38,   39,  112,   36,   37,
+     38,   39,  112,  112,  112,  112,  112,  112,  112,  112,
+     53,   54,   55,   56,  112,   53,   54,   55,   56,   58,
+     59,  112,  112,    3,    4,    5,    6,    2,  112,    9,
+     10,   11,   12,  112,    9,  112,  112,   12,   18,   19,
+     15,   16,   17,  112,   24,  112,   21,  112,   28,   29,
+     30,   65,  112,   67,  112,  112,   70,  112,  112,   73,
+     74,  112,  112,  112,  112,  112,   80,  112,   43,  112,
+    112,   46,  112,   48,  112,   50,   90,   91,   92,  112,
+     94,  112,   96,   97,   98,  112,   65,  112,   67,  112,
+      1,   70,  112,  112,   73,   74,  112,  112,  112,  112,
+    112,   80,   13,  112,  112,  112,   17,  112,  112,  112,
+    112,   90,   91,   92,   25,   94,  112,   96,   97,   98,
+     31,  112,   65,   34,   67,  112,   72,   70,  112,  112,
+     73,   74,  112,  112,  112,   46,   82,   80,  112,   85,
+     86,   87,   88,  112,  112,  112,  112,   90,   91,   92,
+    112,   94,  112,   96,   97,   98,  112,   65,  112,   67,
+    112,  112,   70,  112,  112,   73,   74,  112,  112,  112,
+    112,  112,   80,  112,  112,  112,  112,  112,  112,  112,
+    112,  112,   90,   91,   92,  112,   94,  112,   96,   97,
+     98,  112,  112,   65,  112,   67,  112,  112,   70,  112,
+    112,   73,   74,  112,  112,  112,  112,  112,   80,  112,
+    112,  112,  112,  112,  112,  112,  112,  112,   90,   91,
+     92,  112,   94,  112,   96,   97,   98,  112,   65,  112,
+     67,  112,  112,   70,  112,  112,   73,   74,  112,  112,
+    112,  112,  112,   80,  112,  112,  112,  112,  112,  112,
+    112,  112,  112,   90,   91,   92,  112,   94,  112,   96,
+     97,   98,  112,  112,   65,  112,   67,    2,  112,   70,
+    112,  112,   73,   74,    9,  112,  112,   12,  112,   80,
+    112,   16,   17,  112,  112,  112,   21,  112,  112,   90,
+     91,   92,  112,   94,  112,   96,   97,   98,  112,  112,
+      2,  112,  112,  112,  112,  112,  112,  112,   43,  112,
+    112,   46,  112,   48,    2,   50,   51,  112,  112,  112,
+    112,    9,  112,  112,   12,  112,  112,   15,   16,   17,
+    112,    2,   34,   21,   36,   37,   38,   39,    9,  112,
+    112,   12,  112,  112,   46,   16,   17,  112,  112,    2,
+     21,   53,   54,   55,   56,   43,    9,  112,   46,   12,
+     48,  112,   50,   16,   17,  112,  112,  112,   21,  112,
+    112,  112,   43,  112,  112,   46,   13,   48,  112,   50,
+    112,  112,  112,  112,  112,   35,   36,   37,   38,   39,
+     43,  112,  112,   46,  112,   48,  112,   50,  112,   36,
+     37,   38,   39,   53,   54,   55,   56,   13,  112,   36,
+     37,   38,   39,   13,  112,  112,   53,   54,   55,   56,
+     13,  112,  112,  112,   51,  112,   53,   54,   55,   56,
+     36,   37,   38,   39,    2,  112,   36,   37,   38,   39,
+    112,   13,  112,   36,   37,   38,   39,   53,   54,   55,
+     56,  112,  112,   53,   54,   55,   56,  112,  112,  112,
+     53,   54,   55,   56,   36,   37,   38,   39,   36,   37,
+     38,   39,    9,  112,  112,   12,  112,  112,  112,   16,
+     17,   53,   54,   55,   56,   53,   54,   55,   56,  112,
+    112,  112,    9,  112,  112,   12,  112,  112,  112,   16,
+    112,  112,  112,  112,  112,  112,   43,  112,   25,   46,
+     27,   48,  112,   50,   31,
+);
+    const YY_SHIFT_USE_DFLT = -11;
+    const YY_SHIFT_MAX = 239;
+    public static $yy_shift_ofst = array(
+    -11,   98,   98,  148,  198,  198,  248,  148,  148,  198,
+    148,  248,   -2,   48,  298,  148,  148,  148,  298,  148,
+    148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
+    348,  148,  148,  148,  148,  148,  398,  148,  148,  148,
+    448,  498,  498,  498,  498,  498,  498,  498,  498,  147,
+   1962, 1953, 1953,   35, 1952, 2007, 2012, 2413, 2400, 2423,
+   2444,  415, 2450, 2457, 2482, 2478,  465,  465,  465,  465,
+    465,  465,  465,  465,  465,  465,  465,  465,  465,  465,
+    465,  465,  465,  465,  465,  465, 2139,   90,  143, 2011,
+   2533, 1963,   36,  103,  143,  143,   90,   90,  235, 2070,
+   2075,  634,   59,  636,  641,  663,  359,  359,  203,  221,
+    269,  221,  306,  332,  196,  378,  378,  264,  385,  319,
+    221,    5,    5,    5,    5,    5,    5,    5,    5,  112,
+    112,   82,    5,  -11,  -11, 2315, 2362, 2379, 2397, 2513,
+     49,  665,  409,  218,  221,  221,  458,  221,  382,  221,
+    382,  221,  394,  394,  221,  221,  221,  221,  394,   40,
+    394,  394,  394,  399,  394,  399,  394,  221,  221,  221,
+    221,    5,  463,    5,    5,  463,    5,  462,  112,  112,
+    112,  -11,  -11,  -11,  -11,  -11,  -11, 2348,   11,  100,
+    -10,  190,  881,  141,  265,  292,  252,  425,  479,  350,
+    313,  440,  240,  429,  477,  459,  480,  153,  486,  501,
+    509,  535,  538,  510,  557,  567,  568,  558,  569,  571,
+    575,  580,  585,  587,  562,  572,  576,  586,  593,  462,
+    611,  581,  598,  640,  597,  612,  655,  658,  648,  673,
+);
+    const YY_REDUCE_USE_DFLT = -99;
+    const YY_REDUCE_MAX = 186;
+    public static $yy_reduce_ofst = array(
+    109,  492,  527,  561,  595,  632,  669,  703,  737,  771,
+    808,  842,  876,  910,  944,  978, 1012, 1046, 1080, 1114,
+   1148, 1182, 1216, 1250, 1284, 1318, 1352, 1386, 1420, 1454,
+   1488, 1522, 1556, 1590, 1624, 1658, 1692, 1726, 1760, 1794,
+   1828, 1862, 2036, 2071, 2107, 2142, 2178, 2213, 2249,  542,
+   1824, 1858, 2104,  481,  114,   66,   66,   66,   66,   66,
+     66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
+     66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
+     66,   66,   66,   66,   66,   66,  608,  536,  645,  164,
+     20,  101,  -98,   34,  181,  212,  -57,  174,  195,    3,
+    254,   -5,  -79,  228,  228,  228,  180,   -5,  222,   51,
+    272,  291,  302,  305,  222,  -75,  261,  228,  228,  228,
+    331,  323,  228,  228,  228,  228,  228,  228,  228,  222,
+    299,  228,  228,  360,  228,  102,  102,  102,  102,  102,
+     85,  122,  102,  102,  188,  188,  300,  188,  324,  188,
+    335,  188,  244,  244,  188,  188,  188,  188,  244,  321,
+    244,  244,  244,  337,  244,  347,  244,  188,  188,  188,
+    188,  375,  376,  375,  375,  376,  375,  400,  421,  421,
+    421,  467,  452,  468,  471,  447,  470,
+);
+    public static $yyExpectedTokens = array(
+         array(),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(2, 9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 39, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 51, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(14, 16, 47, 49, 52, ),
+         array(23, 25, 31, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(25, 31, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(25, 31, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(14, 16, 49, 52, ),
+         array(3, 9, 10, 11, 12, 14, 18, 19, 24, 28, 29, 30, 58, 59, ),
+         array(20, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(26, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(13, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(35, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 51, 53, 54, 55, 56, ),
+         array(13, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, 59, ),
+         array(13, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(13, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(2, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(13, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(1, 13, 17, 25, 31, 34, 46, ),
+         array(14, 34, 52, ),
+         array(1, 25, 31, ),
+         array(3, 9, 10, 11, 12, 14, 18, 19, 24, 28, 29, 30, 58, 59, ),
+         array(9, 12, 16, 25, 27, 31, ),
+         array(9, 12, 16, 25, 31, ),
+         array(17, 43, 50, ),
+         array(15, 17, 46, ),
+         array(1, 25, 31, ),
+         array(1, 25, 31, ),
+         array(14, 34, 52, ),
+         array(14, 34, 52, ),
+         array(1, 2, ),
+         array(3, 4, 5, 6, 9, 10, 11, 12, 18, 19, 24, 28, 29, 30, ),
+         array(2, 9, 12, 15, 16, 17, 21, 43, 46, 48, 50, ),
+         array(9, 12, 16, 48, ),
+         array(12, 14, 16, 52, ),
+         array(1, 13, 25, 31, ),
+         array(1, 13, 25, 31, ),
+         array(1, 13, 25, 31, ),
+         array(9, 12, 16, ),
+         array(9, 12, 16, ),
+         array(15, 17, 46, ),
+         array(25, 31, ),
+         array(14, 52, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(1, 17, ),
+         array(17, 46, ),
+         array(14, 16, ),
+         array(14, 16, ),
+         array(1, 51, ),
+         array(1, 2, ),
+         array(1, 27, ),
+         array(25, 31, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(17, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(),
+         array(),
+         array(2, 9, 12, 16, 17, 21, 43, 46, 48, 50, 51, ),
+         array(2, 9, 12, 15, 16, 17, 21, 43, 46, 48, 50, ),
+         array(2, 9, 12, 16, 17, 21, 43, 46, 48, 50, ),
+         array(2, 9, 12, 16, 17, 21, 43, 46, 48, 50, ),
+         array(9, 12, 16, 17, 43, 46, 48, 50, ),
+         array(12, 14, 16, 32, 52, ),
+         array(9, 12, 16, 48, ),
+         array(9, 12, 16, ),
+         array(15, 43, 50, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(15, 21, ),
+         array(25, 31, ),
+         array(14, 52, ),
+         array(25, 31, ),
+         array(14, 52, ),
+         array(25, 31, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(43, 50, ),
+         array(12, 34, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(1, ),
+         array(2, ),
+         array(1, ),
+         array(1, ),
+         array(2, ),
+         array(1, ),
+         array(34, ),
+         array(17, ),
+         array(17, ),
+         array(17, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(2, 34, 36, 37, 38, 39, 46, 53, 54, 55, 56, ),
+         array(13, 20, 22, 25, 31, 33, 35, 43, ),
+         array(13, 15, 25, 31, 34, 46, ),
+         array(13, 21, 25, 31, 44, ),
+         array(13, 21, 25, 31, 44, ),
+         array(9, 12, 16, 48, ),
+         array(34, 43, 46, 51, ),
+         array(27, 34, 46, ),
+         array(21, 44, 59, ),
+         array(21, 44, 51, ),
+         array(6, 8, ),
+         array(7, 8, ),
+         array(20, 33, ),
+         array(16, 48, ),
+         array(21, 44, ),
+         array(34, 46, ),
+         array(34, 46, ),
+         array(34, 46, ),
+         array(33, 35, ),
+         array(33, 35, ),
+         array(33, 51, ),
+         array(43, 51, ),
+         array(33, 35, ),
+         array(33, 35, ),
+         array(33, 35, ),
+         array(33, 35, ),
+         array(15, 43, ),
+         array(7, ),
+         array(13, ),
+         array(13, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(14, ),
+         array(16, ),
+         array(43, ),
+         array(32, ),
+         array(32, ),
+         array(34, ),
+         array(16, ),
+         array(34, ),
+         array(16, ),
+         array(49, ),
+         array(49, ),
+         array(16, ),
+         array(51, ),
+         array(51, ),
+         array(16, ),
+         array(15, ),
+         array(35, ),
+         array(22, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+);
+    public static $yy_default = array(
+    350,  540,  540,  540,  525,  525,  540,  501,  501,  524,
+    452,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+    540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+    540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+    540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+    390,  369,  390,  540,  540,  540,  395,  540,  540,  540,
+    363,  540,  540,  540,  540,  540,  374,  500,  413,  420,
+    499,  526,  528,  527,  419,  421,  418,  422,  451,  449,
+    397,  401,  402,  392,  395,  363,  433,  540,  390,  540,
+    390,  390,  514,  454,  390,  390,  540,  540,  381,  340,
+    453,  466,  540,  404,  404,  404,  466,  466,  454,  390,
+    540,  390,  390,  384,  454,  540,  540,  404,  404,  404,
+    371,  386,  404,  411,  424,  425,  426,  412,  417,  454,
+    511,  424,  410,  348,  508,  453,  453,  453,  453,  453,
+    540,  468,  466,  482,  360,  370,  540,  373,  540,  378,
+    540,  379,  463,  464,  364,  366,  367,  368,  492,  466,
+    491,  494,  493,  457,  458,  459,  460,  380,  376,  377,
+    372,  382,  502,  385,  387,  503,  442,  466,  488,  515,
+    512,  348,  507,  507,  507,  466,  466,  433,  429,  433,
+    423,  423,  467,  433,  433,  423,  423,  346,  540,  540,
+    540,  423,  433,  443,  540,  540,  540,  540,  429,  540,
+    461,  461,  540,  429,  540,  540,  540,  540,  540,  540,
+    540,  540,  540,  540,  429,  431,  540,  513,  540,  482,
+    540,  540,  540,  540,  540,  438,  540,  540,  540,  398,
+    341,  342,  343,  344,  345,  347,  349,  351,  352,  353,
+    354,  355,  356,  357,  359,  388,  389,  484,  485,  486,
+    506,  383,  504,  505,  427,  436,  437,  446,  447,  465,
+    469,  470,  471,  405,  406,  407,  408,  409,  428,  430,
+    432,  434,  438,  439,  440,  414,  415,  416,  441,  444,
+    445,  479,  477,  516,  517,  518,  519,  455,  456,  490,
+    461,  462,  483,  498,  358,  489,  536,  537,  529,  530,
+    531,  534,  533,  535,  538,  539,  532,  521,  523,  522,
+    520,  495,  480,  478,  476,  473,  474,  475,  481,  496,
+    497,  435,  472,  510,  487,  482,  391,  375,  399,  403,
+);
+    const YYNOCODE = 113;
+    const YYSTACKDEPTH = 500;
+    const YYNSTATE = 340;
+    const YYNRULE = 200;
+    const YYERRORSYMBOL = 60;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    public static $yyFallback = array(
+    );
+    public function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
+    }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+    public $yyTraceFILE;
+    public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array(
+  '$',             'VERT',          'COLON',         'TEXT',        
+  'STRIPON',       'STRIPOFF',      'LITERALSTART',  'LITERALEND',  
+  'LITERAL',       'SIMPELOUTPUT',  'SIMPLETAG',     'SMARTYBLOCKCHILDPARENT',
+  'LDEL',          'RDEL',          'DOLLARID',      'EQUAL',       
+  'ID',            'PTR',           'LDELIF',        'LDELFOR',     
+  'SEMICOLON',     'INCDEC',        'TO',            'STEP',        
+  'LDELFOREACH',   'SPACE',         'AS',            'APTR',        
+  'LDELSETFILTER',  'CLOSETAG',      'LDELSLASH',     'ATTR',        
+  'INTEGER',       'COMMA',         'OPENP',         'CLOSEP',      
+  'MATH',          'UNIMATH',       'ISIN',          'QMARK',       
+  'NOT',           'TYPECAST',      'HEX',           'DOT',         
+  'INSTANCEOF',    'SINGLEQUOTESTRING',  'DOUBLECOLON',   'NAMESPACE',   
+  'AT',            'HATCH',         'OPENB',         'CLOSEB',      
+  'DOLLAR',        'LOGOP',         'SLOGOP',        'TLOGOP',      
+  'SINGLECOND',    'ARRAYOPEN',     'QUOTE',         'BACKTICK',    
+  'error',         'start',         'template',      'literal_e2',  
+  'literal_e1',    'smartytag',     'tagbody',       'tag',         
+  'outattr',       'eqoutattr',     'varindexed',    'output',      
+  'attributes',    'variablevalue',  'value',         'expr',        
+  'modifierlist',  'statement',     'statements',    'foraction',   
+  'varvar',        'modparameters',  'attribute',     'nullcoalescing',
+  'ternary',       'tlop',          'lop',           'scond',       
+  'isin',          'array',         'function',      'ns1',         
+  'doublequoted_with_quotes',  'static_class_access',  'arraydef',      'variablelist',
+  'variable',      'object',        'configvariable',  'arrayindex',  
+  'indexdef',      'varvarele',     'objectchain',   'objectelement',
+  'method',        'params',        'modifier',      'modparameter',
+  'arrayelements',  'arrayelement',  'doublequoted',  'doublequotedcontent',
+    );
+
+    public static $yyRuleName = array(
+  'start ::= template',
+  'template ::= template TEXT',
+  'template ::= template STRIPON',
+  'template ::= template STRIPOFF',
+  'template ::= template LITERALSTART literal_e2 LITERALEND',
+  'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND',
+  'literal_e2 ::= literal_e1',
+  'literal_e1 ::= literal_e1 LITERAL',
+  'literal_e1 ::=',
+  'template ::= template smartytag',
+  'template ::=',
+  'smartytag ::= SIMPELOUTPUT',
+  'smartytag ::= SIMPLETAG',
+  'smartytag ::= SMARTYBLOCKCHILDPARENT',
+  'smartytag ::= LDEL tagbody RDEL',
+  'smartytag ::= tag RDEL',
+  'tagbody ::= outattr',
+  'tagbody ::= DOLLARID eqoutattr',
+  'tagbody ::= varindexed eqoutattr',
+  'eqoutattr ::= EQUAL outattr',
+  'outattr ::= output attributes',
+  'output ::= variablevalue',
+  'output ::= value',
+  'output ::= expr',
+  'tag ::= LDEL ID attributes',
+  'tag ::= LDEL ID',
+  'tag ::= LDEL ID modifierlist attributes',
+  'tag ::= LDEL ID PTR ID attributes',
+  'tag ::= LDEL ID PTR ID modifierlist attributes',
+  'tag ::= LDELIF expr',
+  'tag ::= LDELIF expr attributes',
+  'tag ::= LDELIF statement',
+  'tag ::= LDELIF statement attributes',
+  'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
+  'foraction ::= EQUAL expr',
+  'foraction ::= INCDEC',
+  'tag ::= LDELFOR statement TO expr attributes',
+  'tag ::= LDELFOR statement TO expr STEP expr attributes',
+  'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
+  'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
+  'tag ::= LDELFOREACH attributes',
+  'tag ::= LDELSETFILTER ID modparameters',
+  'tag ::= LDELSETFILTER ID modparameters modifierlist',
+  'smartytag ::= CLOSETAG',
+  'tag ::= LDELSLASH ID',
+  'tag ::= LDELSLASH ID modifierlist',
+  'tag ::= LDELSLASH ID PTR ID',
+  'tag ::= LDELSLASH ID PTR ID modifierlist',
+  'attributes ::= attributes attribute',
+  'attributes ::= attribute',
+  'attributes ::=',
+  'attribute ::= SPACE ID EQUAL ID',
+  'attribute ::= ATTR expr',
+  'attribute ::= ATTR value',
+  'attribute ::= SPACE ID',
+  'attribute ::= SPACE expr',
+  'attribute ::= SPACE value',
+  'attribute ::= SPACE INTEGER EQUAL expr',
+  'statements ::= statement',
+  'statements ::= statements COMMA statement',
+  'statement ::= DOLLARID EQUAL INTEGER',
+  'statement ::= DOLLARID EQUAL expr',
+  'statement ::= varindexed EQUAL expr',
+  'statement ::= OPENP statement CLOSEP',
+  'expr ::= value',
+  'expr ::= nullcoalescing',
+  'expr ::= ternary',
+  'expr ::= INCDEC DOLLARID',
+  'expr ::= DOLLARID INCDEC',
+  'expr ::= DOLLARID COLON ID',
+  'expr ::= expr MATH value',
+  'expr ::= expr UNIMATH value',
+  'expr ::= expr tlop value',
+  'expr ::= expr lop expr',
+  'expr ::= expr scond',
+  'isin ::= ISIN',
+  'expr ::= expr isin array',
+  'expr ::= expr isin value',
+  'nullcoalescing ::= expr QMARK QMARK expr',
+  'ternary ::= expr QMARK DOLLARID COLON expr',
+  'ternary ::= expr QMARK value COLON expr',
+  'ternary ::= expr QMARK expr COLON expr',
+  'ternary ::= expr QMARK COLON expr',
+  'value ::= variablevalue',
+  'value ::= UNIMATH value',
+  'value ::= NOT value',
+  'value ::= TYPECAST value',
+  'value ::= variablevalue INCDEC',
+  'value ::= HEX',
+  'value ::= INTEGER',
+  'value ::= INTEGER DOT INTEGER',
+  'value ::= INTEGER DOT',
+  'value ::= DOT INTEGER',
+  'value ::= ID',
+  'value ::= function',
+  'value ::= OPENP expr CLOSEP',
+  'value ::= variablevalue INSTANCEOF ns1',
+  'value ::= variablevalue INSTANCEOF variablevalue',
+  'value ::= SINGLEQUOTESTRING',
+  'value ::= doublequoted_with_quotes',
+  'value ::= varindexed DOUBLECOLON static_class_access',
+  'value ::= smartytag',
+  'value ::= value modifierlist',
+  'value ::= NAMESPACE',
+  'value ::= arraydef',
+  'value ::= ns1 DOUBLECOLON static_class_access',
+  'ns1 ::= ID',
+  'ns1 ::= NAMESPACE',
+  'variablelist ::= variablelist COMMA variable',
+  'variablelist ::= variablelist COMMA expr',
+  'variablelist ::= variable',
+  'variablelist ::= expr',
+  'variablelist ::=',
+  'variable ::= DOLLARID',
+  'variable ::= varindexed',
+  'variable ::= varvar AT ID',
+  'variable ::= object',
+  'configvariable ::= HATCH ID HATCH',
+  'configvariable ::= HATCH ID HATCH arrayindex',
+  'configvariable ::= HATCH variablevalue HATCH',
+  'configvariable ::= HATCH variablevalue HATCH arrayindex',
+  'variablevalue ::= variable',
+  'variablevalue ::= configvariable',
+  'varindexed ::= DOLLARID arrayindex',
+  'varindexed ::= varvar arrayindex',
+  'arrayindex ::= arrayindex indexdef',
+  'arrayindex ::=',
+  'indexdef ::= DOT DOLLARID',
+  'indexdef ::= DOT varvar',
+  'indexdef ::= DOT varvar AT ID',
+  'indexdef ::= DOT ID',
+  'indexdef ::= DOT INTEGER',
+  'indexdef ::= DOT LDEL expr RDEL',
+  'indexdef ::= OPENB ID CLOSEB',
+  'indexdef ::= OPENB ID DOT ID CLOSEB',
+  'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
+  'indexdef ::= OPENB INTEGER CLOSEB',
+  'indexdef ::= OPENB DOLLARID CLOSEB',
+  'indexdef ::= OPENB variablevalue CLOSEB',
+  'indexdef ::= OPENB value CLOSEB',
+  'indexdef ::= OPENB expr CLOSEB',
+  'indexdef ::= OPENB CLOSEB',
+  'varvar ::= DOLLARID',
+  'varvar ::= DOLLAR',
+  'varvar ::= varvar varvarele',
+  'varvarele ::= ID',
+  'varvarele ::= SIMPELOUTPUT',
+  'varvarele ::= LDEL expr RDEL',
+  'object ::= varindexed objectchain',
+  'objectchain ::= objectelement',
+  'objectchain ::= objectchain objectelement',
+  'objectelement ::= PTR ID arrayindex',
+  'objectelement ::= PTR varvar arrayindex',
+  'objectelement ::= PTR LDEL expr RDEL arrayindex',
+  'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
+  'objectelement ::= PTR method',
+  'function ::= ns1 OPENP variablelist CLOSEP',
+  'method ::= ID OPENP params CLOSEP',
+  'method ::= DOLLARID OPENP params CLOSEP',
+  'params ::= params COMMA expr',
+  'params ::= expr',
+  'params ::=',
+  'modifierlist ::= modifierlist modifier modparameters',
+  'modifierlist ::= modifier modparameters',
+  'modifier ::= VERT AT ID',
+  'modifier ::= VERT ID',
+  'modparameters ::= modparameters modparameter',
+  'modparameters ::=',
+  'modparameter ::= COLON value',
+  'modparameter ::= COLON UNIMATH value',
+  'modparameter ::= COLON array',
+  'static_class_access ::= method',
+  'static_class_access ::= method objectchain',
+  'static_class_access ::= ID',
+  'static_class_access ::= DOLLARID arrayindex',
+  'static_class_access ::= DOLLARID arrayindex objectchain',
+  'lop ::= LOGOP',
+  'lop ::= SLOGOP',
+  'tlop ::= TLOGOP',
+  'scond ::= SINGLECOND',
+  'arraydef ::= OPENB arrayelements CLOSEB',
+  'arraydef ::= ARRAYOPEN arrayelements CLOSEP',
+  'arrayelements ::= arrayelement',
+  'arrayelements ::= arrayelements COMMA arrayelement',
+  'arrayelements ::= arrayelements COMMA',
+  'arrayelements ::=',
+  'arrayelement ::= value APTR expr',
+  'arrayelement ::= ID APTR expr',
+  'arrayelement ::= expr',
+  'doublequoted_with_quotes ::= QUOTE QUOTE',
+  'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
+  'doublequoted ::= doublequoted doublequotedcontent',
+  'doublequoted ::= doublequotedcontent',
+  'doublequotedcontent ::= BACKTICK variablevalue BACKTICK',
+  'doublequotedcontent ::= BACKTICK expr BACKTICK',
+  'doublequotedcontent ::= DOLLARID',
+  'doublequotedcontent ::= LDEL variablevalue RDEL',
+  'doublequotedcontent ::= LDEL expr RDEL',
+  'doublequotedcontent ::= smartytag',
+  'doublequotedcontent ::= TEXT',
+    );
+
+    public function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[$tokenType];
+        } else {
+            return 'Unknown';
+        }
+    }
+
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    public function yy_pop_parser_stack()
+    {
+        if (empty($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite($this->yyTraceFILE,
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+
+        return $yymajor;
+    }
+
+    public function __destruct()
+    {
+        while ($this->yystack !== Array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    public function yy_get_expected_tokens($token)
+    {
+        static $res3 = array();
+        static $res4 = array();
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+                        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return array_unique($expected);
+    }
+
+    public function yy_is_expected_token($token)
+    {
+        static $res = array();
+        static $res2 = array();
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
+       }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return true;
+    }
+
+   public function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
+            // no shift actions
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_shift_ofst[$stateno];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+                        $this->yyTokenName[$iLookAhead] . ' => ' .
+                        $this->yyTokenName[$iFallback] . "\n");
+                }
+
+                return $this->yy_find_shift_action($iFallback);
+            }
+
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_reduce_ofst[$stateno];
+        if ($i === self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+// line 232 "src/Parser/TemplateParser.y"
+
+    $this->internalError = true;
+    $this->compiler->trigger_template_error('Stack overflow in template parser');
+
+            return;
+        }
+        $yytos = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
+                $yyNewState);
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf($this->yyTraceFILE, " %s",
+                    $this->yyTokenName[$this->yystack[$i]->major]);
+            }
+            fwrite($this->yyTraceFILE,"\n");
+        }
+    }
+
+    public static $yyRuleInfo = array(
+  array( 0 => 61, 1 => 1 ),
+  array( 0 => 62, 1 => 2 ),
+  array( 0 => 62, 1 => 2 ),
+  array( 0 => 62, 1 => 2 ),
+  array( 0 => 62, 1 => 4 ),
+  array( 0 => 63, 1 => 4 ),
+  array( 0 => 63, 1 => 1 ),
+  array( 0 => 64, 1 => 2 ),
+  array( 0 => 64, 1 => 0 ),
+  array( 0 => 62, 1 => 2 ),
+  array( 0 => 62, 1 => 0 ),
+  array( 0 => 65, 1 => 1 ),
+  array( 0 => 65, 1 => 1 ),
+  array( 0 => 65, 1 => 1 ),
+  array( 0 => 65, 1 => 3 ),
+  array( 0 => 65, 1 => 2 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 2 ),
+  array( 0 => 66, 1 => 2 ),
+  array( 0 => 69, 1 => 2 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 71, 1 => 1 ),
+  array( 0 => 71, 1 => 1 ),
+  array( 0 => 71, 1 => 1 ),
+  array( 0 => 67, 1 => 3 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 4 ),
+  array( 0 => 67, 1 => 5 ),
+  array( 0 => 67, 1 => 6 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 3 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 3 ),
+  array( 0 => 67, 1 => 8 ),
+  array( 0 => 79, 1 => 2 ),
+  array( 0 => 79, 1 => 1 ),
+  array( 0 => 67, 1 => 5 ),
+  array( 0 => 67, 1 => 7 ),
+  array( 0 => 67, 1 => 6 ),
+  array( 0 => 67, 1 => 8 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 3 ),
+  array( 0 => 67, 1 => 4 ),
+  array( 0 => 65, 1 => 1 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 3 ),
+  array( 0 => 67, 1 => 4 ),
+  array( 0 => 67, 1 => 5 ),
+  array( 0 => 72, 1 => 2 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 72, 1 => 0 ),
+  array( 0 => 82, 1 => 4 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 4 ),
+  array( 0 => 78, 1 => 1 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 88, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 83, 1 => 4 ),
+  array( 0 => 84, 1 => 5 ),
+  array( 0 => 84, 1 => 5 ),
+  array( 0 => 84, 1 => 5 ),
+  array( 0 => 84, 1 => 4 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 91, 1 => 1 ),
+  array( 0 => 91, 1 => 1 ),
+  array( 0 => 95, 1 => 3 ),
+  array( 0 => 95, 1 => 3 ),
+  array( 0 => 95, 1 => 1 ),
+  array( 0 => 95, 1 => 1 ),
+  array( 0 => 95, 1 => 0 ),
+  array( 0 => 96, 1 => 1 ),
+  array( 0 => 96, 1 => 1 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 1 ),
+  array( 0 => 98, 1 => 3 ),
+  array( 0 => 98, 1 => 4 ),
+  array( 0 => 98, 1 => 3 ),
+  array( 0 => 98, 1 => 4 ),
+  array( 0 => 73, 1 => 1 ),
+  array( 0 => 73, 1 => 1 ),
+  array( 0 => 70, 1 => 2 ),
+  array( 0 => 70, 1 => 2 ),
+  array( 0 => 99, 1 => 2 ),
+  array( 0 => 99, 1 => 0 ),
+  array( 0 => 100, 1 => 2 ),
+  array( 0 => 100, 1 => 2 ),
+  array( 0 => 100, 1 => 4 ),
+  array( 0 => 100, 1 => 2 ),
+  array( 0 => 100, 1 => 2 ),
+  array( 0 => 100, 1 => 4 ),
+  array( 0 => 100, 1 => 3 ),
+  array( 0 => 100, 1 => 5 ),
+  array( 0 => 100, 1 => 3 ),
+  array( 0 => 100, 1 => 3 ),
+  array( 0 => 100, 1 => 3 ),
+  array( 0 => 100, 1 => 3 ),
+  array( 0 => 100, 1 => 3 ),
+  array( 0 => 100, 1 => 3 ),
+  array( 0 => 100, 1 => 2 ),
+  array( 0 => 80, 1 => 1 ),
+  array( 0 => 80, 1 => 1 ),
+  array( 0 => 80, 1 => 2 ),
+  array( 0 => 101, 1 => 1 ),
+  array( 0 => 101, 1 => 1 ),
+  array( 0 => 101, 1 => 3 ),
+  array( 0 => 97, 1 => 2 ),
+  array( 0 => 102, 1 => 1 ),
+  array( 0 => 102, 1 => 2 ),
+  array( 0 => 103, 1 => 3 ),
+  array( 0 => 103, 1 => 3 ),
+  array( 0 => 103, 1 => 5 ),
+  array( 0 => 103, 1 => 6 ),
+  array( 0 => 103, 1 => 2 ),
+  array( 0 => 90, 1 => 4 ),
+  array( 0 => 104, 1 => 4 ),
+  array( 0 => 104, 1 => 4 ),
+  array( 0 => 105, 1 => 3 ),
+  array( 0 => 105, 1 => 1 ),
+  array( 0 => 105, 1 => 0 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 2 ),
+  array( 0 => 106, 1 => 3 ),
+  array( 0 => 106, 1 => 2 ),
+  array( 0 => 81, 1 => 2 ),
+  array( 0 => 81, 1 => 0 ),
+  array( 0 => 107, 1 => 2 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 2 ),
+  array( 0 => 93, 1 => 1 ),
+  array( 0 => 93, 1 => 2 ),
+  array( 0 => 93, 1 => 1 ),
+  array( 0 => 93, 1 => 2 ),
+  array( 0 => 93, 1 => 3 ),
+  array( 0 => 86, 1 => 1 ),
+  array( 0 => 86, 1 => 1 ),
+  array( 0 => 85, 1 => 1 ),
+  array( 0 => 87, 1 => 1 ),
+  array( 0 => 94, 1 => 3 ),
+  array( 0 => 94, 1 => 3 ),
+  array( 0 => 108, 1 => 1 ),
+  array( 0 => 108, 1 => 3 ),
+  array( 0 => 108, 1 => 2 ),
+  array( 0 => 108, 1 => 0 ),
+  array( 0 => 109, 1 => 3 ),
+  array( 0 => 109, 1 => 3 ),
+  array( 0 => 109, 1 => 1 ),
+  array( 0 => 92, 1 => 2 ),
+  array( 0 => 92, 1 => 3 ),
+  array( 0 => 110, 1 => 2 ),
+  array( 0 => 110, 1 => 1 ),
+  array( 0 => 111, 1 => 3 ),
+  array( 0 => 111, 1 => 3 ),
+  array( 0 => 111, 1 => 1 ),
+  array( 0 => 111, 1 => 3 ),
+  array( 0 => 111, 1 => 3 ),
+  array( 0 => 111, 1 => 1 ),
+  array( 0 => 111, 1 => 1 ),
+    );
+
+    public static $yyReduceMap = array(
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        21 => 6,
+        22 => 6,
+        23 => 6,
+        35 => 6,
+        55 => 6,
+        56 => 6,
+        64 => 6,
+        65 => 6,
+        66 => 6,
+        83 => 6,
+        88 => 6,
+        89 => 6,
+        94 => 6,
+        98 => 6,
+        99 => 6,
+        103 => 6,
+        104 => 6,
+        106 => 6,
+        122 => 6,
+        182 => 6,
+        188 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 18,
+        19 => 19,
+        20 => 20,
+        24 => 24,
+        25 => 25,
+        26 => 26,
+        27 => 27,
+        28 => 28,
+        29 => 29,
+        30 => 30,
+        32 => 30,
+        31 => 31,
+        33 => 33,
+        34 => 34,
+        36 => 36,
+        37 => 37,
+        38 => 38,
+        39 => 39,
+        40 => 40,
+        41 => 41,
+        42 => 42,
+        43 => 43,
+        44 => 44,
+        45 => 45,
+        46 => 46,
+        47 => 47,
+        48 => 48,
+        49 => 49,
+        58 => 49,
+        110 => 49,
+        111 => 49,
+        160 => 49,
+        164 => 49,
+        168 => 49,
+        170 => 49,
+        50 => 50,
+        112 => 50,
+        161 => 50,
+        167 => 50,
+        51 => 51,
+        52 => 52,
+        53 => 52,
+        54 => 54,
+        145 => 54,
+        57 => 57,
+        59 => 59,
+        60 => 60,
+        61 => 60,
+        62 => 62,
+        63 => 63,
+        67 => 67,
+        68 => 68,
+        69 => 69,
+        70 => 70,
+        71 => 70,
+        72 => 72,
+        73 => 73,
+        74 => 74,
+        75 => 75,
+        76 => 76,
+        77 => 77,
+        78 => 78,
+        79 => 79,
+        80 => 80,
+        81 => 80,
+        82 => 82,
+        84 => 84,
+        86 => 84,
+        87 => 84,
+        125 => 84,
+        85 => 85,
+        90 => 90,
+        91 => 91,
+        92 => 92,
+        93 => 93,
+        95 => 95,
+        96 => 96,
+        97 => 96,
+        100 => 100,
+        101 => 101,
+        102 => 102,
+        105 => 105,
+        107 => 107,
+        108 => 108,
+        109 => 108,
+        159 => 108,
+        113 => 113,
+        114 => 114,
+        115 => 115,
+        116 => 116,
+        117 => 117,
+        118 => 118,
+        119 => 119,
+        120 => 120,
+        121 => 121,
+        123 => 123,
+        124 => 124,
+        126 => 126,
+        185 => 126,
+        127 => 127,
+        128 => 128,
+        129 => 129,
+        130 => 130,
+        131 => 131,
+        132 => 132,
+        140 => 132,
+        133 => 133,
+        134 => 134,
+        135 => 135,
+        136 => 135,
+        138 => 135,
+        139 => 135,
+        137 => 137,
+        141 => 141,
+        142 => 142,
+        143 => 143,
+        189 => 143,
+        144 => 144,
+        146 => 146,
+        147 => 147,
+        148 => 148,
+        149 => 149,
+        150 => 150,
+        151 => 151,
+        152 => 152,
+        153 => 153,
+        154 => 154,
+        155 => 155,
+        156 => 156,
+        157 => 157,
+        158 => 158,
+        162 => 162,
+        163 => 163,
+        165 => 165,
+        166 => 166,
+        169 => 169,
+        171 => 171,
+        172 => 172,
+        173 => 173,
+        174 => 174,
+        175 => 175,
+        176 => 176,
+        177 => 177,
+        178 => 178,
+        179 => 179,
+        180 => 180,
+        181 => 180,
+        183 => 183,
+        184 => 184,
+        186 => 186,
+        187 => 187,
+        190 => 190,
+        191 => 191,
+        192 => 192,
+        193 => 193,
+        196 => 193,
+        194 => 194,
+        197 => 194,
+        195 => 195,
+        198 => 198,
+        199 => 199,
+    );
+// line 245 "src/Parser/TemplateParser.y"
+    public function yy_r0(){
+    $this->root_buffer->prepend_array($this, $this->template_prefix);
+    $this->root_buffer->append_array($this, $this->template_postfix);
+    $this->_retvalue = $this->root_buffer->to_smarty_php($this);
+    }
+// line 252 "src/Parser/TemplateParser.y"
+    public function yy_r1(){
+         $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\ParseTree\Text($text, $this->strip));
+    }
+// line 262 "src/Parser/TemplateParser.y"
+    public function yy_r2(){
+    $this->strip = true;
+    }
+// line 266 "src/Parser/TemplateParser.y"
+    public function yy_r3(){
+    $this->strip = false;
+    }
+// line 271 "src/Parser/TemplateParser.y"
+    public function yy_r4(){
+       $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Text($this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 276 "src/Parser/TemplateParser.y"
+    public function yy_r5(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.$this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 279 "src/Parser/TemplateParser.y"
+    public function yy_r6(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 283 "src/Parser/TemplateParser.y"
+    public function yy_r7(){
+        $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+
+    }
+// line 288 "src/Parser/TemplateParser.y"
+    public function yy_r8(){
+    $this->_retvalue = '';
+    }
+// line 292 "src/Parser/TemplateParser.y"
+    public function yy_r9(){
+     $this->current_buffer->append_subtree($this, $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor));
+     $this->compiler->has_variable_string = false;
+     $this->block_nesting_level = $this->compiler->getTagStackCount();
+    }
+// line 302 "src/Parser/TemplateParser.y"
+    public function yy_r11(){
+    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    $attributes = [];
+    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+        $attributes[] = 'nocache';
+        $var = $match[1];
+    }
+    $this->compiler->triggerTagNoCache($var);
+    $this->_retvalue = $this->compiler->compilePrintExpression('$_smarty_tpl->getValue(\''.$var.'\')', $attributes);
+    }
+// line 314 "src/Parser/TemplateParser.y"
+    public function yy_r12(){
+    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
+    if ($tag == 'strip') {
+        $this->strip = true;
+        $this->_retvalue = null;
+    } else {
+        if (defined($tag)) {
+            if ($this->security) {
+               $this->security->isTrustedConstant($tag, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compilePrintExpression($tag);
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                $this->_retvalue = $this->compiler->compileTag($match[1],array('\'nocache\''));
+            } else {
+                $this->_retvalue = $this->compiler->compileTag($tag,array());
+            }
+        }
+    }
+    }
+// line 335 "src/Parser/TemplateParser.y"
+    public function yy_r13(){
+    $j = strrpos($this->yystack[$this->yyidx + 0]->minor,'.');
+    if ($this->yystack[$this->yyidx + 0]->minor[$j+1] == 'c') {
+        // {$smarty.block.child}
+        $this->_retvalue = $this->compiler->compileChildBlock();
+    } else {
+        // {$smarty.block.parent}
+       $this->_retvalue = $this->compiler->compileParentBlock();
+     }
+    }
+// line 346 "src/Parser/TemplateParser.y"
+    public function yy_r14(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 350 "src/Parser/TemplateParser.y"
+    public function yy_r15(){
+     $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
+     }
+// line 354 "src/Parser/TemplateParser.y"
+    public function yy_r16(){
+    $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + 0]->minor[0], $this->yystack[$this->yyidx + 0]->minor[1]);
+    }
+// line 363 "src/Parser/TemplateParser.y"
+    public function yy_r17(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'')),$this->yystack[$this->yyidx + 0]->minor[1]));
+    }
+// line 367 "src/Parser/TemplateParser.y"
+    public function yy_r18(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>$this->yystack[$this->yyidx + -1]->minor['var'])),$this->yystack[$this->yyidx + 0]->minor[1]),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']));
+    }
+// line 371 "src/Parser/TemplateParser.y"
+    public function yy_r19(){
+       $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 375 "src/Parser/TemplateParser.y"
+    public function yy_r20(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 390 "src/Parser/TemplateParser.y"
+    public function yy_r24(){
+        if (defined($this->yystack[$this->yyidx + -1]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -1]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor);
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+        }
+    }
+// line 400 "src/Parser/TemplateParser.y"
+    public function yy_r25(){
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + 0]->minor);
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor,array());
+        }
+    }
+// line 413 "src/Parser/TemplateParser.y"
+    public function yy_r26(){
+        if (defined($this->yystack[$this->yyidx + -2]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -2]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor);
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + 0]->minor, array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
+        }
+    }
+// line 425 "src/Parser/TemplateParser.y"
+    public function yy_r27(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + 0]->minor,array('object_method'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 430 "src/Parser/TemplateParser.y"
+    public function yy_r28(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + 0]->minor,array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor, 'object_method'=>$this->yystack[$this->yyidx + -2]->minor));
+    }
+// line 435 "src/Parser/TemplateParser.y"
+    public function yy_r29(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength())); 
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 440 "src/Parser/TemplateParser.y"
+    public function yy_r30(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->compiler->getLdelLength()));
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + 0]->minor,array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 445 "src/Parser/TemplateParser.y"
+    public function yy_r31(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength()));
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 456 "src/Parser/TemplateParser.y"
+    public function yy_r33(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -4]->minor),array('var'=>$this->yystack[$this->yyidx + -2]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),1);
+    }
+// line 460 "src/Parser/TemplateParser.y"
+    public function yy_r34(){
+    $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 468 "src/Parser/TemplateParser.y"
+    public function yy_r36(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -3]->minor),array('to'=>$this->yystack[$this->yyidx + -1]->minor))),0);
+    }
+// line 472 "src/Parser/TemplateParser.y"
+    public function yy_r37(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -5]->minor),array('to'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),0);
+    }
+// line 477 "src/Parser/TemplateParser.y"
+    public function yy_r38(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -3]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor))));
+    }
+// line 481 "src/Parser/TemplateParser.y"
+    public function yy_r39(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor),array('key'=>$this->yystack[$this->yyidx + -3]->minor))));
+    }
+// line 484 "src/Parser/TemplateParser.y"
+    public function yy_r40(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 489 "src/Parser/TemplateParser.y"
+    public function yy_r41(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + 0]->minor))));
+    }
+// line 493 "src/Parser/TemplateParser.y"
+    public function yy_r42(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor)),$this->yystack[$this->yyidx + 0]->minor)));
+    }
+// line 499 "src/Parser/TemplateParser.y"
+    public function yy_r43(){
+    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' /');
+    if ($tag === 'strip') {
+        $this->strip = false;
+        $this->_retvalue = null;
+    } else {
+       $this->_retvalue = $this->compiler->compileTag($tag.'close',array());
+    }
+     }
+// line 508 "src/Parser/TemplateParser.y"
+    public function yy_r44(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor.'close',array());
+    }
+// line 512 "src/Parser/TemplateParser.y"
+    public function yy_r45(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 517 "src/Parser/TemplateParser.y"
+    public function yy_r46(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 521 "src/Parser/TemplateParser.y"
+    public function yy_r47(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + -1]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 529 "src/Parser/TemplateParser.y"
+    public function yy_r48(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 535 "src/Parser/TemplateParser.y"
+    public function yy_r49(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 540 "src/Parser/TemplateParser.y"
+    public function yy_r50(){
+    $this->_retvalue = array();
+    }
+// line 545 "src/Parser/TemplateParser.y"
+    public function yy_r51(){
+    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+        if ($this->security) {
+            $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+        }
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+    } else {
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'\''.$this->yystack[$this->yyidx + 0]->minor.'\'');
+    }
+    }
+// line 556 "src/Parser/TemplateParser.y"
+    public function yy_r52(){
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r\t")=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 564 "src/Parser/TemplateParser.y"
+    public function yy_r54(){
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
+    }
+// line 576 "src/Parser/TemplateParser.y"
+    public function yy_r57(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 589 "src/Parser/TemplateParser.y"
+    public function yy_r59(){
+    $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
+    }
+// line 594 "src/Parser/TemplateParser.y"
+    public function yy_r60(){
+    $this->_retvalue = array('var' => '\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'', 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 601 "src/Parser/TemplateParser.y"
+    public function yy_r62(){
+    $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 605 "src/Parser/TemplateParser.y"
+    public function yy_r63(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 630 "src/Parser/TemplateParser.y"
+    public function yy_r67(){
+	$this->_retvalue = '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')->preIncDec(\'' . $this->yystack[$this->yyidx + -1]->minor . '\')';
+    }
+// line 635 "src/Parser/TemplateParser.y"
+    public function yy_r68(){
+	$this->_retvalue = '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + -1]->minor,1) .'\')->postIncDec(\'' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+    }
+// line 640 "src/Parser/TemplateParser.y"
+    public function yy_r69(){
+    $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+    }
+// line 645 "src/Parser/TemplateParser.y"
+    public function yy_r70(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 655 "src/Parser/TemplateParser.y"
+    public function yy_r72(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor['pre']. $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor['op'].$this->yystack[$this->yyidx + 0]->minor .')';
+    }
+// line 659 "src/Parser/TemplateParser.y"
+    public function yy_r73(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 663 "src/Parser/TemplateParser.y"
+    public function yy_r74(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + -1]->minor . ')';
+    }
+// line 667 "src/Parser/TemplateParser.y"
+    public function yy_r75(){
+    static $isin = [
+        'isin' => 'in_array(',
+        'isnotin' => '!in_array(',
+    ];
+   $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+   $this->_retvalue = $isin[$op];
+    }
+// line 676 "src/Parser/TemplateParser.y"
+    public function yy_r76(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+// line 680 "src/Parser/TemplateParser.y"
+    public function yy_r77(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+// line 685 "src/Parser/TemplateParser.y"
+    public function yy_r78(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.' ?? '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 692 "src/Parser/TemplateParser.y"
+    public function yy_r79(){
+    $this->compiler->triggerTagNoCache(substr($this->yystack[$this->yyidx + -2]->minor,1));
+    $this->_retvalue = $this->yystack[$this->yyidx + -4]->minor.' ? $_smarty_tpl->getValue(\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\') : '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 697 "src/Parser/TemplateParser.y"
+    public function yy_r80(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -4]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 706 "src/Parser/TemplateParser.y"
+    public function yy_r82(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.' ?: '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 716 "src/Parser/TemplateParser.y"
+    public function yy_r84(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 721 "src/Parser/TemplateParser.y"
+    public function yy_r85(){
+    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 742 "src/Parser/TemplateParser.y"
+    public function yy_r90(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 746 "src/Parser/TemplateParser.y"
+    public function yy_r91(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
+    }
+// line 750 "src/Parser/TemplateParser.y"
+    public function yy_r92(){
+    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 755 "src/Parser/TemplateParser.y"
+    public function yy_r93(){
+    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+        if ($this->security) {
+             $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+        }
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
+    }
+    }
+// line 772 "src/Parser/TemplateParser.y"
+    public function yy_r95(){
+    $this->_retvalue = '('. $this->yystack[$this->yyidx + -1]->minor .')';
+    }
+// line 776 "src/Parser/TemplateParser.y"
+    public function yy_r96(){
+      $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 794 "src/Parser/TemplateParser.y"
+    public function yy_r100(){
+    if ($this->security && $this->security->static_classes !== array()) {
+        $this->compiler->trigger_template_error('dynamic static class not allowed by security setting');
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    if ($this->yystack[$this->yyidx + -2]->minor['var'] === '\'smarty\'') {
+        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).';?>');
+     } else {
+        $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + -2]->minor['var']);
+        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = \$_smarty_tpl->getValue(" . $this->yystack[$this->yyidx + -2]->minor['var'] . ')'.$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].';?>');
+    }
+    $this->_retvalue = $prefixVar .'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+    }
+// line 809 "src/Parser/TemplateParser.y"
+    public function yy_r101(){
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $tmp = $this->compiler->appendCode('<?php ob_start();?>', (string) $this->yystack[$this->yyidx + 0]->minor);
+    $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
+    $this->_retvalue = $prefixVar;
+    }
+// line 816 "src/Parser/TemplateParser.y"
+    public function yy_r102(){
+    $this->_retvalue = $this->compiler->compileModifier($this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 829 "src/Parser/TemplateParser.y"
+    public function yy_r105(){
+    if (!in_array(strtolower($this->yystack[$this->yyidx + -2]->minor), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))) {
+        if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
+            $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+        } else {
+            $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+        } 
+    } else {
+        $this->compiler->trigger_template_error ('static class \''.$this->yystack[$this->yyidx + -2]->minor.'\' is undefined or not allowed by security setting');
+    }
+    }
+// line 848 "src/Parser/TemplateParser.y"
+    public function yy_r107(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+        }
+// line 856 "src/Parser/TemplateParser.y"
+    public function yy_r108(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 883 "src/Parser/TemplateParser.y"
+    public function yy_r113(){
+   $this->compiler->triggerTagNoCache(substr($this->yystack[$this->yyidx + 0]->minor,1));
+   $this->_retvalue = array('$_smarty_tpl->hasVariable(\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\')','$_smarty_tpl->getValue(\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\')');
+    }
+// line 887 "src/Parser/TemplateParser.y"
+    public function yy_r114(){
+    if ($this->yystack[$this->yyidx + 0]->minor['var'] === '\'smarty\'') {
+        $smarty_var = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
+        $this->_retvalue = array('true', $smarty_var);
+    } else {
+        // used for array reset,next,prev,end,current 
+        $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
+        $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+        $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + 0]->minor['var']);
+        $this->_retvalue = array('true', '$_smarty_tpl->getValue(' . $this->yystack[$this->yyidx + 0]->minor['var'] . ')'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
+    }
+    }
+// line 901 "src/Parser/TemplateParser.y"
+    public function yy_r115(){
+    $this->_retvalue = array('true', '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 906 "src/Parser/TemplateParser.y"
+    public function yy_r116(){
+    $this->_retvalue = array('true', $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 911 "src/Parser/TemplateParser.y"
+    public function yy_r117(){
+    $this->_retvalue = $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -1]->minor . '\'');
+    }
+// line 915 "src/Parser/TemplateParser.y"
+    public function yy_r118(){
+    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -2]->minor . '\'') . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' :null)';
+    }
+// line 919 "src/Parser/TemplateParser.y"
+    public function yy_r119(){
+    $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 923 "src/Parser/TemplateParser.y"
+    public function yy_r120(){
+    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -2]->minor) . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' : null)';
+    }
+// line 927 "src/Parser/TemplateParser.y"
+    public function yy_r121(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor[1];
+    }
+// line 935 "src/Parser/TemplateParser.y"
+    public function yy_r123(){
+    $this->_retvalue = array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'', 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 938 "src/Parser/TemplateParser.y"
+    public function yy_r124(){
+    $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 951 "src/Parser/TemplateParser.y"
+    public function yy_r126(){
+    return;
+    }
+// line 957 "src/Parser/TemplateParser.y"
+    public function yy_r127(){
+    $this->compiler->triggerTagNoCache(substr($this->yystack[$this->yyidx + 0]->minor,1));
+    $this->_retvalue = '[$_smarty_tpl->getValue(\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\')]';
+    }
+// line 961 "src/Parser/TemplateParser.y"
+    public function yy_r128(){
+    $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = '[$_smarty_tpl->getValue(' . $this->yystack[$this->yyidx + 0]->minor . ')]';
+    }
+// line 966 "src/Parser/TemplateParser.y"
+    public function yy_r129(){
+    $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + -2]->minor);
+    $this->_retvalue = '[$_smarty_tpl->getValue(' . $this->yystack[$this->yyidx + -2]->minor . ')->'.$this->yystack[$this->yyidx + 0]->minor.']';
+    }
+// line 971 "src/Parser/TemplateParser.y"
+    public function yy_r130(){
+    $this->_retvalue = '[\''. $this->yystack[$this->yyidx + 0]->minor .'\']';
+    }
+// line 975 "src/Parser/TemplateParser.y"
+    public function yy_r131(){
+    $this->_retvalue = '['. $this->yystack[$this->yyidx + 0]->minor .']';
+    }
+// line 980 "src/Parser/TemplateParser.y"
+    public function yy_r132(){
+    $this->_retvalue = '['. $this->yystack[$this->yyidx + -1]->minor .']';
+    }
+// line 985 "src/Parser/TemplateParser.y"
+    public function yy_r133(){
+    $this->_retvalue = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
+    }
+// line 989 "src/Parser/TemplateParser.y"
+    public function yy_r134(){
+    $this->_retvalue = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
+    }
+// line 992 "src/Parser/TemplateParser.y"
+    public function yy_r135(){
+    $this->_retvalue = '['.$this->yystack[$this->yyidx + -1]->minor.']';
+    }
+// line 998 "src/Parser/TemplateParser.y"
+    public function yy_r137(){
+    $this->compiler->triggerTagNoCache(substr($this->yystack[$this->yyidx + -1]->minor,1));
+    $this->_retvalue = '[$_smarty_tpl->getValue(\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\')]';
+    }
+// line 1015 "src/Parser/TemplateParser.y"
+    public function yy_r141(){
+    $this->_retvalue = '[]';
+    }
+// line 1025 "src/Parser/TemplateParser.y"
+    public function yy_r142(){
+    $this->_retvalue = '\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'';
+    }
+// line 1029 "src/Parser/TemplateParser.y"
+    public function yy_r143(){
+    $this->_retvalue = '\'\'';
+    }
+// line 1034 "src/Parser/TemplateParser.y"
+    public function yy_r144(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1042 "src/Parser/TemplateParser.y"
+    public function yy_r146(){
+    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    $this->compiler->triggerTagNoCache($var);
+    $this->_retvalue = '$_smarty_tpl->getValue(\''.$var.'\')';
+    }
+// line 1049 "src/Parser/TemplateParser.y"
+    public function yy_r147(){
+    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+// line 1056 "src/Parser/TemplateParser.y"
+    public function yy_r148(){
+    if ($this->yystack[$this->yyidx + -1]->minor['var'] === '\'smarty\'') {
+        $this->_retvalue = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + -1]->minor['var']);
+        $this->_retvalue = '$_smarty_tpl->getValue(' . $this->yystack[$this->yyidx + -1]->minor['var'] . ')'.$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
+    }
+    }
+// line 1066 "src/Parser/TemplateParser.y"
+    public function yy_r149(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1071 "src/Parser/TemplateParser.y"
+    public function yy_r150(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1076 "src/Parser/TemplateParser.y"
+    public function yy_r151(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1083 "src/Parser/TemplateParser.y"
+    public function yy_r152(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->compiler->triggerTagNoCache($this->yystack[$this->yyidx + -1]->minor);
+    $this->_retvalue = '->{$_smarty_tpl->getValue(' . $this->yystack[$this->yyidx + -1]->minor . ')'.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1091 "src/Parser/TemplateParser.y"
+    public function yy_r153(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1098 "src/Parser/TemplateParser.y"
+    public function yy_r154(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1106 "src/Parser/TemplateParser.y"
+    public function yy_r155(){
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1114 "src/Parser/TemplateParser.y"
+    public function yy_r156(){
+
+    if ($this->yystack[$this->yyidx + -3]->minor == 'isset') {
+        $this->_retvalue = '(true';
+        if (count($this->yystack[$this->yyidx + -1]->minor) == 0) {
+            throw new CompilerException("Invalid number of arguments for isset. isset expects at least one parameter.");
+        }
+        foreach ($this->yystack[$this->yyidx + -1]->minor as $value) {
+            if (is_array($value)) {
+                $this->_retvalue .= ' && (' . $value[0] . ' && null !== (' . $value[1] . ' ?? null))';
+            } else {
+                $this->_retvalue .= ' && (' . $value . ' !== null)';
+            }
+        }
+        $this->_retvalue .= ')';
+    } elseif ($this->yystack[$this->yyidx + -3]->minor == 'empty') {
+        if (count($this->yystack[$this->yyidx + -1]->minor) != 1) {
+            throw new CompilerException("Invalid number of arguments for empty. empty expects at exactly one parameter.");
+        }
+        if (is_array($this->yystack[$this->yyidx + -1]->minor[0])) {
+            $this->_retvalue .= '( !' . $this->yystack[$this->yyidx + -1]->minor[0][0] . ' || empty(' . $this->yystack[$this->yyidx + -1]->minor[0][1] . '))';
+        } else {
+            $this->_retvalue = 'false == ' . $this->yystack[$this->yyidx + -1]->minor[0];
+        }
+    } else {
+        $p = array();
+        foreach ($this->yystack[$this->yyidx + -1]->minor as $value) {
+            if (is_array($value)) {
+                $p[] = $value[1];
+            } else {
+                $p[] = $value;
+            }
+        }
+        $this->_retvalue = $this->compiler->compileModifierInExpression($this->yystack[$this->yyidx + -3]->minor, $p);
+    }
+    }
+// line 1155 "src/Parser/TemplateParser.y"
+    public function yy_r157(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . '('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+// line 1162 "src/Parser/TemplateParser.y"
+    public function yy_r158(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $this->compiler->triggerTagNoCache(substr($this->yystack[$this->yyidx + -3]->minor,1));
+    $this->compiler->appendPrefixCode("<?php {$prefixVar} = \$_smarty_tpl->getValue('".substr($this->yystack[$this->yyidx + -3]->minor,1).'\')'.';?>');
+    $this->_retvalue = $prefixVar .'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+// line 1191 "src/Parser/TemplateParser.y"
+    public function yy_r162(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));
+    }
+// line 1195 "src/Parser/TemplateParser.y"
+    public function yy_r163(){
+    $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 1203 "src/Parser/TemplateParser.y"
+    public function yy_r165(){
+    $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1211 "src/Parser/TemplateParser.y"
+    public function yy_r166(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1224 "src/Parser/TemplateParser.y"
+    public function yy_r169(){
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1233 "src/Parser/TemplateParser.y"
+    public function yy_r171(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
+    }
+// line 1238 "src/Parser/TemplateParser.y"
+    public function yy_r172(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
+    }
+// line 1243 "src/Parser/TemplateParser.y"
+    public function yy_r173(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
+    }
+// line 1248 "src/Parser/TemplateParser.y"
+    public function yy_r174(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+// line 1253 "src/Parser/TemplateParser.y"
+    public function yy_r175(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+// line 1259 "src/Parser/TemplateParser.y"
+    public function yy_r176(){
+    $this->_retvalue = ' '. trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
+    }
+// line 1263 "src/Parser/TemplateParser.y"
+    public function yy_r177(){
+    static $lops = array(
+        'eq' => ' == ',
+        'ne' => ' != ',
+        'neq' => ' != ',
+        'gt' => ' > ',
+        'ge' => ' >= ',
+        'gte' => ' >= ',
+        'lt' =>  ' < ',
+        'le' =>  ' <= ',
+        'lte' => ' <= ',
+        'mod' =>  ' % ',
+        'and' => ' && ',
+        'or' => ' || ',
+        'xor' => ' xor ',
+         );
+    $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+    $this->_retvalue = $lops[$op];
+    }
+// line 1282 "src/Parser/TemplateParser.y"
+    public function yy_r178(){
+     static $tlops = array(
+         'isdivby' => array('op' => ' % ', 'pre' => '!('),
+         'isnotdivby' => array('op' => ' % ', 'pre' => '('),
+         'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         );
+     $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+     $this->_retvalue = $tlops[$op];
+     }
+// line 1295 "src/Parser/TemplateParser.y"
+    public function yy_r179(){
+        static $scond = array (
+            'iseven' => '!(1 & ',
+            'isnoteven' => '(1 & ',
+            'isodd' => '(1 & ',
+            'isnotodd' => '!(1 & ',
+        );
+   $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+   $this->_retvalue = $scond[$op];
+    }
+// line 1309 "src/Parser/TemplateParser.y"
+    public function yy_r180(){
+    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+// line 1320 "src/Parser/TemplateParser.y"
+    public function yy_r183(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1324 "src/Parser/TemplateParser.y"
+    public function yy_r184(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.',';
+    }
+// line 1332 "src/Parser/TemplateParser.y"
+    public function yy_r186(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1336 "src/Parser/TemplateParser.y"
+    public function yy_r187(){ 
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1352 "src/Parser/TemplateParser.y"
+    public function yy_r190(){
+    $this->compiler->leaveDoubleQuote();
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php($this);
+    }
+// line 1358 "src/Parser/TemplateParser.y"
+    public function yy_r191(){
+    $this->yystack[$this->yyidx + -1]->minor->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 1363 "src/Parser/TemplateParser.y"
+    public function yy_r192(){
+    $this->_retvalue = new Dq($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1367 "src/Parser/TemplateParser.y"
+    public function yy_r193(){
+    $this->_retvalue = new Code('(string)'.$this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 1371 "src/Parser/TemplateParser.y"
+    public function yy_r194(){
+    $this->_retvalue = new Code('(string)('.$this->yystack[$this->yyidx + -1]->minor.')');
+    }
+// line 1375 "src/Parser/TemplateParser.y"
+    public function yy_r195(){
+    $this->_retvalue = new Code('(string)$_smarty_tpl->getValue(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')');
+    }
+// line 1387 "src/Parser/TemplateParser.y"
+    public function yy_r198(){
+    $this->_retvalue = new Tag($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1391 "src/Parser/TemplateParser.y"
+    public function yy_r199(){
+    $this->_retvalue = new DqContent($this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    private $_retvalue;
+
+    public function yy_reduce($yyruleno)
+    {
+        if ($this->yyTraceFILE && $yyruleno >= 0
+              && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
+                $this->yyTracePrompt, $yyruleno,
+                self::$yyRuleName[$yyruleno]);
+        }
+
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (isset(self::$yyReduceMap[$yyruleno])) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
+        $this->yyidx -= $yysize;
+        for ($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[$this->yyidx] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    public function yy_parse_failed()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    public function yy_syntax_error($yymajor, $TOKEN)
+    {
+// line 225 "src/Parser/TemplateParser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
+    }
+
+    public function yy_accept()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+// line 218 "src/Parser/TemplateParser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+    }
+
+    public function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            $this->yystack[] = $x;
+        }
+        $yyendofinput = ($yymajor==0);
+
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sInput %s\n",
+                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+        }
+
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                  !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact === self::YY_ERROR_ACTION) {
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
+                        $this->yyTracePrompt);
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[$this->yyidx]->major;
+                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
+                                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                                 $yymx !== self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor==0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx !== self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }
+        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
+    }
+}
+
diff --git a/include/smarty/lexer/smarty_internal_templateparser.y b/include/smarty/src/Parser/TemplateParser.y
similarity index 75%
rename from include/smarty/lexer/smarty_internal_templateparser.y
rename to include/smarty/src/Parser/TemplateParser.y
index 620498765..544148f13 100644
--- a/include/smarty/lexer/smarty_internal_templateparser.y
+++ b/include/smarty/src/Parser/TemplateParser.y
@@ -9,15 +9,27 @@
 %stack_size 500
 %name TP_
 %declare_class {
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\TemplateLexer as Lexer;
+use \Smarty\ParseTree\Template as TemplateParseTree;
+use \Smarty\Compiler\Template as TemplateCompiler;
+use \Smarty\ParseTree\Code;
+use \Smarty\ParseTree\Dq;
+use \Smarty\ParseTree\DqContent;
+use \Smarty\ParseTree\Tag;
+use \Smarty\CompilerException;
+
 /**
 * Smarty Template Parser Class
 *
 * This is the template parser.
-* It is generated from the smarty_internal_templateparser.y file
+* It is generated from the TemplateParser.y file
 * 
 * @author Uwe Tews <uwe.tews@googlemail.com>
 */
-class Smarty_Internal_Templateparser
+class TemplateParser
 }
 %include_class
 {
@@ -60,21 +72,21 @@ class Smarty_Internal_Templateparser
     /**
      * root parse tree buffer
      *
-     * @var Smarty_Internal_ParseTree_Template
+     * @var TemplateParseTree
      */
     public $root_buffer;
 
     /**
      * current parse tree object
      *
-     * @var Smarty_Internal_ParseTree
+     * @var \Smarty\ParseTree\Base
      */
     public $current_buffer;
 
     /**
      * lexer object
      *
-     * @var Smarty_Internal_Templatelexer
+     * @var Lexer
      */
     public $lex;
 
@@ -94,21 +106,21 @@ class Smarty_Internal_Templateparser
     /**
      * compiler object
      *
-     * @var Smarty_Internal_TemplateCompilerBase
+     * @var TemplateCompiler
      */
     public $compiler = null;
 
     /**
      * smarty object
      *
-     * @var Smarty
+     * @var \Smarty\Smarty
      */
     public $smarty = null;
 
     /**
      * template object
      *
-     * @var Smarty_Internal_Template
+     * @var \Smarty\Template
      */
     public $template = null;
 
@@ -122,38 +134,38 @@ class Smarty_Internal_Templateparser
     /**
      * security object
      *
-     * @var Smarty_Security
+     * @var \Smarty\Security
      */
     public $security = null;
 
     /**
      * template prefix array
      *
-     * @var \Smarty_Internal_ParseTree[]
+     * @var \Smarty\ParseTree\Base[]
      */
     public $template_prefix = array();
 
     /**
      * template prefix array
      *
-     * @var \Smarty_Internal_ParseTree[]
+     * @var \Smarty\ParseTree\Base[]
      */
     public $template_postfix = array();
 
     /**
      * constructor
      *
-     * @param Smarty_Internal_Templatelexer        $lex
-     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     * @param Lexer        $lex
+     * @param TemplateCompiler $compiler
      */
-    public function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
+    public function __construct(Lexer $lex, TemplateCompiler $compiler)
     {
         $this->lex = $lex;
         $this->compiler = $compiler;
-        $this->template = $this->compiler->template;
-        $this->smarty = $this->template->smarty;
-        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
-        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
+        $this->template = $this->compiler->getTemplate();
+        $this->smarty = $this->template->getSmarty();
+        $this->security = $this->smarty->security_policy ?? false;
+        $this->current_buffer = $this->root_buffer = new TemplateParseTree();
     }
 
      /**
@@ -163,7 +175,7 @@ class Smarty_Internal_Templateparser
      */
     public function insertPhpCode($code)
     {
-        $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
+        $this->current_buffer->append_subtree($this, new Tag($this, $code));
     }
 
     /**
@@ -185,9 +197,9 @@ class Smarty_Internal_Templateparser
      *
      * @param string $code
      *
-     * @return Smarty_Internal_ParseTree_Tag
+     * @return Tag
      */
-    public function mergePrefixCode($code)
+    private function mergePrefixCode($code)
     {
         $tmp = '';
         foreach ($this->compiler->prefix_code as $preCode) {
@@ -195,7 +207,7 @@ class Smarty_Internal_Templateparser
         }
         $this->compiler->prefix_code = array();
         $tmp .= $code;
-        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
+        return new Tag($this, $this->compiler->processNocacheCode($tmp));
     }
 
 }
@@ -244,7 +256,7 @@ template       ::= template  TEXT(B). {
             $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, new \Smarty\ParseTree\Text($text, $this->strip));
 }
                       // strip on
 template       ::= template  STRIPON. {
@@ -257,7 +269,7 @@ template       ::= template STRIPOFF. {
 
                      // Literal
 template       ::= template LITERALSTART literal_e2(B) LITERALEND. {
-       $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text(B));
+       $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Text(B));
 }
 
 
@@ -278,11 +290,9 @@ literal_e1(A) ::= . {
 }
                       // Smarty tag
 template       ::= template smartytag(B). {
-      if ($this->compiler->has_code) {
-          $this->current_buffer->append_subtree($this, $this->mergePrefixCode(B));
-      }
+     $this->current_buffer->append_subtree($this, $this->mergePrefixCode(B));
      $this->compiler->has_variable_string = false;
-     $this->block_nesting_level = count($this->compiler->_tag_stack);
+     $this->block_nesting_level = $this->compiler->getTagStackCount();
 }
 
 
@@ -291,11 +301,13 @@ template       ::= .
 
 smartytag(A)   ::= SIMPELOUTPUT(B). {
     $var = trim(substr(B, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    $attributes = [];
     if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
-        A = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
-    } else {
-        A = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
+        $attributes[] = 'nocache';
+        $var = $match[1];
     }
+    $this->compiler->triggerTagNoCache($var);
+    A = $this->compiler->compilePrintExpression('$_smarty_tpl->getValue(\''.$var.'\')', $attributes);
 }
 
 // simple tag like {name}
@@ -309,7 +321,7 @@ smartytag(A)::= SIMPLETAG(B). {
             if ($this->security) {
                $this->security->isTrustedConstant($tag, $this->compiler);
             }
-            A = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
+            A = $this->compiler->compilePrintExpression($tag);
         } else {
             if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
                 A = $this->compiler->compileTag($match[1],array('\'nocache\''));
@@ -324,10 +336,10 @@ smartytag(A)   ::= SMARTYBLOCKCHILDPARENT(i). {
     $j = strrpos(i,'.');
     if (i[$j+1] == 'c') {
         // {$smarty.block.child}
-        A = $this->compiler->compileTag('child',array(),array(i));
+        A = $this->compiler->compileChildBlock();
     } else {
         // {$smarty.block.parent}
-       A = $this->compiler->compileTag('parent',array(),array(i));
+       A = $this->compiler->compileParentBlock();
      }
 }
 
@@ -340,7 +352,7 @@ smartytag(A)   ::= LDEL tagbody(B) RDEL. {
  }
                   // output with optional attributes
 tagbody(A) ::= outattr(B). {
-    A = $this->compiler->compileTag('private_print_expression',B[1],array('value'=>B[0]));
+    A = $this->compiler->compilePrintExpression(B[0], B[1]);
 }
 
 //
@@ -364,7 +376,7 @@ outattr(A) ::= output(B) attributes(C). {
     A = array(B,C);
 }
 
-output(A) ::= variable(B). {
+output(A) ::= variablevalue(B). {
     A = B;
 }
 output(A) ::= value(B). {
@@ -380,7 +392,7 @@ tag(res)   ::= LDEL ID(i) attributes(a). {
             if ($this->security) {
                 $this->security->isTrustedConstant(i, $this->compiler);
             }
-            res = $this->compiler->compileTag('private_print_expression',a,array('value'=>i));
+            res = $this->compiler->compilePrintExpression(i, a);
         } else {
             res = $this->compiler->compileTag(i,a);
         }
@@ -390,7 +402,7 @@ tag(res)   ::= LDEL ID(i). {
             if ($this->security) {
                 $this->security->isTrustedConstant(i, $this->compiler);
             }
-            res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>i));
+            res = $this->compiler->compilePrintExpression(i);
         } else {
             res = $this->compiler->compileTag(i,array());
         }
@@ -403,7 +415,7 @@ tag(res)   ::= LDEL ID(i) modifierlist(l)attributes(a). {
             if ($this->security) {
                 $this->security->isTrustedConstant(i, $this->compiler);
             }
-            res = $this->compiler->compileTag('private_print_expression',a,array('value'=>i, 'modifierlist'=>l));
+            res = $this->compiler->compilePrintExpression(i, a, l);
         } else {
             res = $this->compiler->compileTag(i,a, array('modifierlist'=>l));
         }
@@ -419,11 +431,6 @@ tag(res)   ::= LDEL ID(i) PTR ID(me) modifierlist(l) attributes(a). {
     res = $this->compiler->compileTag(i,a,array('modifierlist'=>l, 'object_method'=>me));
 }
 
-                  // nocache tag
-tag(res)   ::= LDELMAKENOCACHE DOLLARID(i). {
-    res = $this->compiler->compileTag('make_nocache',array(array('var'=>'\''.substr(i,1).'\'')));
-}
-
                   // {if}, {elseif} and {while} tag
 tag(res)   ::= LDELIF(i) expr(ie). {
     $tag = trim(substr(i,$this->compiler->getLdelLength())); 
@@ -609,11 +616,26 @@ expr(res)        ::= value(v). {
     res = v;
 }
 
+                 // nullcoalescing
+expr(res)        ::= nullcoalescing(v). {
+    res = v;
+}
+
                  // ternary
 expr(res)        ::= ternary(v). {
     res = v;
 }
 
+		// ++$a / --$a
+expr(res)	::= INCDEC(i2) DOLLARID(i). {
+	res = '$_smarty_tpl->getVariable(\''. substr(i,1) .'\')->preIncDec(\'' . i2 . '\')';
+}
+
+		// $a++ / $a--
+expr(res)	::= DOLLARID(i) INCDEC(i2). {
+	res = '$_smarty_tpl->getVariable(\''. substr(i,1) .'\')->postIncDec(\'' . i2 . '\')';
+}
+
                  // resources/streams
 expr(res)        ::= DOLLARID(i) COLON ID(i2). {
     res = '$_smarty_tpl->getStreamVariable(\''.substr(i,1).'://' . i2 . '\')';
@@ -642,28 +664,51 @@ expr(res)        ::= expr(e1) scond(c). {
     res = c . e1 . ')';
 }
 
-expr(res)        ::= expr(e1) ISIN array(a).  {
-    res = 'in_array('.e1.','.a.')';
+isin(res)  ::= ISIN(o). {
+    static $isin = [
+        'isin' => 'in_array(',
+        'isnotin' => '!in_array(',
+    ];
+   $op = strtolower(str_replace(' ', '', o));
+   res = $isin[$op];
 }
 
-expr(res)        ::= expr(e1) ISIN value(v).  {
-    res = 'in_array('.e1.',(array)'.v.')';
+expr(res)        ::= expr(e1) isin(c) array(a).  {
+    res = c . e1.','.a.')';
 }
 
+expr(res)        ::= expr(e1) isin(c) value(v).  {
+    res = c . e1.',(array)'.v.')';
+}
+
+// null coalescing
+nullcoalescing(res)        ::= expr(v) QMARK QMARK expr(e2). {
+    res = v.' ?? '.e2;
+}
 
 //
 // ternary
 //
-ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK DOLLARID(e1) COLON  expr(e2). {
-    res = v.' ? '. $this->compiler->compileVariable('\''.substr(e1,1).'\'') . ' : '.e2;
+ternary(res)        ::= expr(v) QMARK DOLLARID(e1) COLON  expr(e2). {
+    $this->compiler->triggerTagNoCache(substr(e1,1));
+    res = v.' ? $_smarty_tpl->getValue(\''.substr(e1,1).'\') : '.e2;
 }
 
-ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK  expr(e1) COLON  expr(e2). {
+ternary(res)        ::= expr(v) QMARK value(e1) COLON expr(e2). {
     res = v.' ? '.e1.' : '.e2;
 }
 
+ternary(res)        ::= expr(v) QMARK expr(e1) COLON expr(e2). {
+    res = v.' ? '.e1.' : '.e2;
+}
+
+// shorthand ternary
+ternary(res)        ::= expr(v) QMARK COLON expr(e2). {
+    res = v.' ?: '.e2;
+}
+
                  // value
-value(res)       ::= variable(v). {
+value(res)       ::= variablevalue(v). {
     res = v;
 }
 
@@ -681,7 +726,7 @@ value(res)       ::= TYPECAST(t) value(v). {
     res = t.v;
 }
 
-value(res)       ::= variable(v) INCDEC(o). {
+value(res)       ::= variablevalue(v) INCDEC(o). {
     res = v.o;
 }
 
@@ -728,10 +773,10 @@ value(res)       ::= OPENP expr(e) CLOSEP. {
     res = '('. e .')';
 }
 
-value(res)        ::= variable(v1) INSTANCEOF(i) ns1(v2). {
+value(res)        ::= variablevalue(v1) INSTANCEOF(i) ns1(v2). {
       res = v1.i.v2;
 }
-value(res)        ::= variable(v1) INSTANCEOF(i) variable(v2). {
+value(res)        ::= variablevalue(v1) INSTANCEOF(i) variablevalue(v2). {
       res = v1.i.v2;
 }
 
@@ -752,9 +797,10 @@ value(res)    ::= varindexed(vi) DOUBLECOLON static_class_access(r). {
     }
     $prefixVar = $this->compiler->getNewPrefixVariable();
     if (vi['var'] === '\'smarty\'') {
-        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).';?>');
+        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,vi['smarty_internal_index']).';?>');
      } else {
-        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = ". $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].';?>');
+        $this->compiler->triggerTagNoCache(vi['var']);
+        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = \$_smarty_tpl->getValue(" . vi['var'] . ')'.vi['smarty_internal_index'].';?>');
     }
     res = $prefixVar .'::'.r[0].r[1];
 }
@@ -762,13 +808,13 @@ value(res)    ::= varindexed(vi) DOUBLECOLON static_class_access(r). {
                   // Smarty tag
 value(res)       ::= smartytag(st). {
     $prefixVar = $this->compiler->getNewPrefixVariable();
-    $tmp = $this->compiler->appendCode('<?php ob_start();?>', st);
+    $tmp = $this->compiler->appendCode('<?php ob_start();?>', (string) st);
     $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
     res = $prefixVar;
 }
 
 value(res)       ::= value(v) modifierlist(l). {
-    res = $this->compiler->compileTag('private_modifier',array(),array('value'=>v,'modifierlist'=>l));
+    res = $this->compiler->compileModifier(l, v);
 }
                   // name space constant
 value(res)       ::= NAMESPACE(c). {
@@ -804,54 +850,88 @@ ns1(res)           ::= NAMESPACE(i). {
     }
 
 
+// variable lists
 
+// multiple variables
+variablelist(res)       ::= variablelist(l) COMMA variable(v). {
+    res = array_merge(l,array(v));
+}
+
+variablelist(res)       ::= variablelist(l) COMMA expr(e). {
+    res = array_merge(l,array(e));
+}
+
+// single variable
+variablelist(res)       ::= variable(v). {
+    res = array(v);
+}
+
+// single expression
+variablelist(res)       ::= expr(e). {
+    res = array(e);
+}
+
+// no variable
+variablelist(res)       ::= . {
+    res = array();
+}
 
 //
 // variables 
 //
                   // Smarty variable (optional array)
 variable(res)    ::= DOLLARID(i). {
-   res = $this->compiler->compileVariable('\''.substr(i,1).'\'');
+   $this->compiler->triggerTagNoCache(substr(i,1));
+   res = array('$_smarty_tpl->hasVariable(\''.substr(i,1).'\')','$_smarty_tpl->getValue(\''.substr(i,1).'\')');
 }
 variable(res)    ::= varindexed(vi). {
     if (vi['var'] === '\'smarty\'') {
-        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']);
-        res = $smarty_var;
+        $smarty_var = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,vi['smarty_internal_index']);
+        res = array('true', $smarty_var);
     } else {
         // used for array reset,next,prev,end,current 
         $this->last_variable = vi['var'];
         $this->last_index = vi['smarty_internal_index'];
-        res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'];
+        $this->compiler->triggerTagNoCache(vi['var']);
+        res = array('true', '$_smarty_tpl->getValue(' . vi['var'] . ')'.vi['smarty_internal_index']);
     }
 }
 
                   // variable with property
 variable(res)    ::= varvar(v) AT ID(p). {
-    res = '$_smarty_tpl->tpl_vars['. v .']->'.p;
+    res = array('true', '$_smarty_tpl->getVariable('. v .')->'.p);
 }
 
                   // object
 variable(res)    ::= object(o). {
-    res = o;
+    res = array('true', o);
 }
 
                   // config variable
-variable(res)    ::= HATCH ID(i) HATCH. {
+configvariable(res)    ::= HATCH ID(i) HATCH. {
     res = $this->compiler->compileConfigVariable('\'' . i . '\'');
 }
 
-variable(res)    ::= HATCH ID(i) HATCH arrayindex(a). {
+configvariable(res)    ::= HATCH ID(i) HATCH arrayindex(a). {
     res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . i . '\'') . ') ? $tmp'.a.' :null)';
 }
 
-variable(res)    ::= HATCH variable(v) HATCH. {
+configvariable(res)    ::= HATCH variablevalue(v) HATCH. {
     res = $this->compiler->compileConfigVariable(v);
 }
 
-variable(res)    ::= HATCH variable(v) HATCH arrayindex(a). {
+configvariable(res)    ::= HATCH variablevalue(v) HATCH arrayindex(a). {
     res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable(v) . ') ? $tmp'.a.' : null)';
 }
 
+variablevalue(res)    ::= variable(v). {
+    res = v[1];
+}
+
+variablevalue(res)    ::= configvariable(v). {
+    res = v;
+}
+
 varindexed(res)  ::= DOLLARID(i) arrayindex(a). {
     res = array('var'=>'\''.substr(i,1).'\'', 'smarty_internal_index'=>a);
 }
@@ -875,14 +955,17 @@ arrayindex        ::= . {
 // single index definition
                     // Smarty2 style index 
 indexdef(res)    ::= DOT DOLLARID(i).  {
-    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';
+    $this->compiler->triggerTagNoCache(substr(i,1));
+    res = '[$_smarty_tpl->getValue(\''.substr(i,1).'\')]';
 }
 indexdef(res)    ::= DOT varvar(v).  {
-    res = '['.$this->compiler->compileVariable(v).']';
+    $this->compiler->triggerTagNoCache(v);
+    res = '[$_smarty_tpl->getValue(' . v . ')]';
 }
 
 indexdef(res)    ::= DOT varvar(v) AT ID(p). {
-    res = '['.$this->compiler->compileVariable(v).'->'.p.']';
+    $this->compiler->triggerTagNoCache(v);
+    res = '[$_smarty_tpl->getValue(' . v . ')->'.p.']';
 }
 
 indexdef(res)   ::= DOT ID(i). {
@@ -900,11 +983,11 @@ indexdef(res)   ::= DOT LDEL expr(e) RDEL. {
 
                     // section tag index
 indexdef(res)   ::= OPENB ID(i)CLOSEB. {
-    res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\'index\']').']';
+    res = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.i.'\'][\'index\']').']';
 }
 
 indexdef(res)   ::= OPENB ID(i) DOT ID(i2) CLOSEB. {
-    res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\''.i2.'\']').']';
+    res = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.i.'\'][\''.i2.'\']').']';
 }
 indexdef(res)   ::= OPENB SINGLEQUOTESTRING(s) CLOSEB. {
     res = '['.s.']';
@@ -913,9 +996,10 @@ indexdef(res)   ::= OPENB INTEGER(n) CLOSEB. {
     res = '['.n.']';
 }
 indexdef(res)   ::= OPENB DOLLARID(i) CLOSEB. {
-    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';
+    $this->compiler->triggerTagNoCache(substr(i,1));
+    res = '[$_smarty_tpl->getValue(\''.substr(i,1).'\')]';
 }
-indexdef(res)   ::= OPENB variable(v) CLOSEB. {
+indexdef(res)   ::= OPENB variablevalue(v) CLOSEB. {
     res = '['.v.']';
 }
 indexdef(res)   ::= OPENB value(v) CLOSEB. {
@@ -957,7 +1041,8 @@ varvarele(res)   ::= ID(s). {
 }
 varvarele(res)   ::= SIMPELOUTPUT(i). {
     $var = trim(substr(i, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
-    res = $this->compiler->compileVariable('\''.$var.'\'');
+    $this->compiler->triggerTagNoCache($var);
+    res = '$_smarty_tpl->getValue(\''.$var.'\')';
 }
 
                     // variable sections of element
@@ -970,9 +1055,10 @@ varvarele(res)   ::= LDEL expr(e) RDEL. {
 //
 object(res)    ::= varindexed(vi) objectchain(oc). {
     if (vi['var'] === '\'smarty\'') {
-        res =  $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).oc;
+        res = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,vi['smarty_internal_index']).oc;
     } else {
-        res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].oc;
+        $this->compiler->triggerTagNoCache(vi['var']);
+        res = '$_smarty_tpl->getValue(' . vi['var'] . ')'.vi['smarty_internal_index'].oc;
     }
 }
 
@@ -998,7 +1084,8 @@ objectelement(res)::= PTR varvar(v) arrayindex(a). {
     if ($this->security) {
         $this->compiler->trigger_template_error (self::ERR2);
     }
-    res = '->{'.$this->compiler->compileVariable(v).a.'}';
+    $this->compiler->triggerTagNoCache(v);
+    res = '->{$_smarty_tpl->getValue(' . v . ')'.a.'}';
 }
 
 objectelement(res)::= PTR LDEL expr(e) RDEL arrayindex(a). {
@@ -1024,8 +1111,41 @@ objectelement(res)::= PTR method(f).  {
 //
 // function
 //
-function(res)     ::= ns1(f) OPENP params(p) CLOSEP. {
-    res = $this->compiler->compilePHPFunctionCall(f, p);
+function(res)     ::= ns1(f) OPENP variablelist(v) CLOSEP. {
+
+    if (f == 'isset') {
+        res = '(true';
+        if (count(v) == 0) {
+            throw new CompilerException("Invalid number of arguments for isset. isset expects at least one parameter.");
+        }
+        foreach (v as $value) {
+            if (is_array($value)) {
+                res .= ' && (' . $value[0] . ' && null !== (' . $value[1] . ' ?? null))';
+            } else {
+                res .= ' && (' . $value . ' !== null)';
+            }
+        }
+        res .= ')';
+    } elseif (f == 'empty') {
+        if (count(v) != 1) {
+            throw new CompilerException("Invalid number of arguments for empty. empty expects at exactly one parameter.");
+        }
+        if (is_array(v[0])) {
+            res .= '( !' . v[0][0] . ' || empty(' . v[0][1] . '))';
+        } else {
+            res = 'false == ' . v[0];
+        }
+    } else {
+        $p = array();
+        foreach (v as $value) {
+            if (is_array($value)) {
+                $p[] = $value[1];
+            } else {
+                $p[] = $value;
+            }
+        }
+        res = $this->compiler->compileModifierInExpression(f, $p);
+    }
 }
 
 
@@ -1044,7 +1164,8 @@ method(res)     ::= DOLLARID(f) OPENP params(p) CLOSEP.  {
         $this->compiler->trigger_template_error (self::ERR2);
     }
     $prefixVar = $this->compiler->getNewPrefixVariable();
-    $this->compiler->appendPrefixCode("<?php {$prefixVar} = ".$this->compiler->compileVariable('\''.substr(f,1).'\'').';?>');
+    $this->compiler->triggerTagNoCache(substr(f,1));
+    $this->compiler->appendPrefixCode("<?php {$prefixVar} = \$_smarty_tpl->getValue('".substr(f,1).'\')'.';?>');
     res = $prefixVar .'('. implode(',',p) .')';
 }
 
@@ -1059,7 +1180,7 @@ params(res)       ::= expr(e). {
     res = array(e);
 }
 
-                    // kein parameter
+                    // no parameter
 params(res)       ::= . {
     res = array();
 }
@@ -1200,6 +1321,10 @@ arrayelements(res)   ::=  arrayelements(a1) COMMA arrayelement(a).  {
     res = a1.','.a;
 }
 
+arrayelements(res)   ::=  arrayelements(a) COMMA.  {
+    res = a.',';
+}
+
 arrayelements        ::=  .  {
     return;
 }
@@ -1236,34 +1361,34 @@ doublequoted(res)          ::= doublequoted(o1) doublequotedcontent(o2). {
 }
 
 doublequoted(res)          ::= doublequotedcontent(o). {
-    res = new Smarty_Internal_ParseTree_Dq($this, o);
+    res = new Dq($this, o);
 }
 
-doublequotedcontent(res)           ::=  BACKTICK variable(v) BACKTICK. {
-    res = new Smarty_Internal_ParseTree_Code('(string)'.v);
+doublequotedcontent(res)           ::=  BACKTICK variablevalue(v) BACKTICK. {
+    res = new Code('(string)'.v);
 }
 
 doublequotedcontent(res)           ::=  BACKTICK expr(e) BACKTICK. {
-    res = new Smarty_Internal_ParseTree_Code('(string)('.e.')');
+    res = new Code('(string)('.e.')');
 }
 
 doublequotedcontent(res)           ::=  DOLLARID(i). {
-    res = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\''. substr(i,1) .'\']->value');
+    res = new Code('(string)$_smarty_tpl->getValue(\''. substr(i,1) .'\')');
 }
 
-doublequotedcontent(res)           ::=  LDEL variable(v) RDEL. {
-    res = new Smarty_Internal_ParseTree_Code('(string)'.v);
+doublequotedcontent(res)           ::=  LDEL variablevalue(v) RDEL. {
+    res = new Code('(string)'.v);
 }
 
 doublequotedcontent(res)           ::=  LDEL expr(e) RDEL. {
-    res = new Smarty_Internal_ParseTree_Code('(string)('.e.')');
+    res = new Code('(string)('.e.')');
 }
 
 doublequotedcontent(res)     ::=  smartytag(st). {
-    res = new Smarty_Internal_ParseTree_Tag($this, st);
+    res = new Tag($this, st);
 }
 
 doublequotedcontent(res)           ::=  TEXT(o). {
-    res = new Smarty_Internal_ParseTree_DqContent(o);
+    res = new DqContent(o);
 }
 
diff --git a/include/smarty/src/Resource/BasePlugin.php b/include/smarty/src/Resource/BasePlugin.php
new file mode 100644
index 000000000..6d2222237
--- /dev/null
+++ b/include/smarty/src/Resource/BasePlugin.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace Smarty\Resource;
+
+use Smarty\Exception;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
+
+/**
+ * Smarty Resource Plugin
+ * Base implementation for resource plugins
+ * @author     Rodney Rehm
+ */
+abstract class BasePlugin
+{
+    /**
+     * resource types provided by the core
+     *
+     * @var array
+     */
+    public static $sysplugins = [
+        'file'    => FilePlugin::class,
+        'string'  => StringPlugin::class,
+        'extends' => ExtendsPlugin::class,
+        'stream'  => StreamPlugin::class,
+        'eval'    => StringEval::class,
+    ];
+
+    /**
+     * Source must be recompiled on every occasion
+     *
+     * @var boolean
+     */
+    public $recompiled = false;
+
+    /**
+     * Flag if resource does allow compilation
+     *
+     * @return bool
+     */
+    public function supportsCompiledTemplates(): bool {
+		return true;
+    }
+
+	/**
+	 * Check if resource must check time stamps when loading compiled or cached templates.
+	 * Resources like 'extends' which use source components my disable timestamp checks on own resource.
+	 * @return bool
+	 */
+	public function checkTimestamps()
+	{
+		return true;
+	}
+
+	/**
+	 * Load Resource Handler
+	 *
+	 * @param Smarty $smarty smarty object
+	 * @param string $type name of the resource
+	 *
+	 * @return BasePlugin Resource Handler
+	 * @throws Exception
+	 */
+    public static function load(Smarty $smarty, $type)
+    {
+        // try smarty's cache
+        if (isset($smarty->_resource_handlers[ $type ])) {
+            return $smarty->_resource_handlers[ $type ];
+        }
+        // try registered resource
+        if (isset($smarty->registered_resources[ $type ])) {
+            return $smarty->_resource_handlers[ $type ] = $smarty->registered_resources[ $type ];
+        }
+        // try sysplugins dir
+        if (isset(self::$sysplugins[ $type ])) {
+            $_resource_class = self::$sysplugins[ $type ];
+            return $smarty->_resource_handlers[ $type ] = new $_resource_class();
+        }
+        // try plugins dir
+        $_resource_class = 'Smarty_Resource_' . \smarty_ucfirst_ascii($type);
+        if (class_exists($_resource_class, false)) {
+            return $smarty->_resource_handlers[ $type ] = new $_resource_class();
+        }
+        // try streams
+        $_known_stream = stream_get_wrappers();
+        if (in_array($type, $_known_stream)) {
+            // is known stream
+            if (is_object($smarty->security_policy)) {
+                $smarty->security_policy->isTrustedStream($type);
+            }
+            return $smarty->_resource_handlers[ $type ] = new StreamPlugin();
+        }
+        // TODO: try default_(template|config)_handler
+        // give up
+        throw new \Smarty\Exception("Unknown resource type '{$type}'");
+    }
+
+    /**
+     * Load template's source into current template object
+     *
+     * @param Source $source source object
+     *
+     * @return string                 template source
+     * @throws \Smarty\Exception        if source cannot be loaded
+     */
+    abstract public function getContent(Source $source);
+
+	/**
+	 * populate Source Object with metadata from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template|null $_template template object
+	 */
+    abstract public function populate(Source $source, ?\Smarty\Template $_template = null);
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Source $source source object
+     */
+    public function populateTimestamp(Source $source)
+    {
+        // intentionally left blank
+    }
+
+	/*
+ * Check if resource must check time stamps when when loading complied or cached templates.
+ * Resources like 'extends' which use source components my disable timestamp checks on own resource.
+ *
+ * @return bool
+ */
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @param \Smarty\Template\Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(\Smarty\Template\Source $source)
+	{
+		return basename(preg_replace('![^\w]+!', '_', $source->name));
+	}
+
+}
diff --git a/include/smarty/src/Resource/CustomPlugin.php b/include/smarty/src/Resource/CustomPlugin.php
new file mode 100644
index 000000000..895e97108
--- /dev/null
+++ b/include/smarty/src/Resource/CustomPlugin.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+
+
+ * @author     Rodney Rehm
+ */
+
+namespace Smarty\Resource;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
+use Smarty\Exception;
+
+/**
+ * Smarty Resource Plugin
+ * Wrapper Implementation for custom resource plugins
+ *
+
+
+ */
+abstract class CustomPlugin extends BasePlugin {
+
+	/**
+	 * fetch template and its modification time from data source
+	 *
+	 * @param string $name template name
+	 * @param string  &$source template source
+	 * @param integer &$mtime template modification timestamp (epoch)
+	 */
+	abstract protected function fetch($name, &$source, &$mtime);
+
+	/**
+	 * Fetch template's modification timestamp from data source
+	 * {@internal implementing this method is optional.
+	 *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
+	 *
+	 * @param string $name template name
+	 *
+	 * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+	 */
+	protected function fetchTimestamp($name) {
+		return null;
+	}
+
+	/**
+	 * populate Source Object with metadata from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template|null $_template template object
+	 */
+	public function populate(Source $source, ?Template $_template = null) {
+		$source->uid = sha1($source->type . ':' . $source->name);
+		$mtime = $this->fetchTimestamp($source->name);
+		if ($mtime !== null) {
+			$source->timestamp = $mtime;
+		} else {
+			$this->fetch($source->name, $content, $timestamp);
+			$source->timestamp = $timestamp ?? false;
+			if (isset($content)) {
+				$source->content = $content;
+			}
+		}
+		$source->exists = !!$source->timestamp;
+	}
+
+	/**
+	 * Load template's source into current template object
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 template source
+	 * @throws Exception        if source cannot be loaded
+	 */
+	public function getContent(Source $source) {
+		$this->fetch($source->name, $content, $timestamp);
+		if (isset($content)) {
+			return $content;
+		}
+		throw new Exception("Unable to read template {$source->type} '{$source->name}'");
+	}
+
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(Source $source) {
+		return basename($this->generateSafeName($source->name));
+	}
+
+	/**
+	 * Removes special characters from $name and limits its length to 127 characters.
+	 *
+	 * @param $name
+	 *
+	 * @return string
+	 */
+	private function generateSafeName($name): string {
+		return substr(preg_replace('/[^A-Za-z0-9._]/', '', (string)$name), 0, 127);
+	}
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/include/smarty/src/Resource/ExtendsPlugin.php
similarity index 50%
rename from include/smarty/libs/sysplugins/smarty_internal_resource_extends.php
rename to include/smarty/src/Resource/ExtendsPlugin.php
index 80946932e..960e37971 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php
+++ b/include/smarty/src/Resource/ExtendsPlugin.php
@@ -1,59 +1,45 @@
 <?php
-/**
- * Smarty Internal Plugin Resource Extends
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
+
+namespace Smarty\Resource;
+
+use Smarty\Exception;
+use Smarty\Template;
+use Smarty\Template\Source;
 
 /**
  * Smarty Internal Plugin Resource Extends
  * Implements the file system as resource for Smarty which {extend}s a chain of template files templates
- *
- * @package    Smarty
- * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
-class Smarty_Internal_Resource_Extends extends Smarty_Resource
+class ExtendsPlugin extends BasePlugin
 {
-    /**
-     * mbstring.overload flag
-     *
-     * @var int
-     */
-    public $mbstring_overload = 0;
 
     /**
-     * populate Source Object with meta data from Resource
+     * populate Source Object with metadata from Resource
      *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
+     * @param Source $source source object
+     * @param Template|null $_template template object
      *
-     * @throws SmartyException
+     * @throws Exception
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    public function populate(Source $source, ?Template $_template = null)
     {
         $uid = '';
         $sources = array();
         $components = explode('|', $source->name);
-        $smarty = &$source->smarty;
+        $smarty = $source->getSmarty();
         $exists = true;
         foreach ($components as $component) {
-            /* @var \Smarty_Template_Source $_s */
-            $_s = Smarty_Template_Source::load(null, $smarty, $component);
-            if ($_s->type === 'php') {
-                throw new SmartyException("Resource type {$_s->type} cannot be used with the extends resource type");
-            }
+            $_s = Source::load(null, $smarty, $component);
             $sources[ $_s->uid ] = $_s;
-            $uid .= $_s->filepath;
+            $uid .= $_s->uid;
             if ($_template) {
                 $exists = $exists && $_s->exists;
             }
         }
         $source->components = $sources;
-        $source->filepath = $_s->filepath;
-        $source->uid = sha1($uid . $source->smarty->_joined_template_dir);
+        $source->uid = sha1($uid . $source->getSmarty()->_joined_template_dir);
         $source->exists = $exists;
         if ($_template) {
             $source->timestamp = $_s->timestamp;
@@ -63,12 +49,12 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
     /**
      * populate Source Object with timestamp and exists from Resource
      *
-     * @param Smarty_Template_Source $source source object
+     * @param Source $source source object
      */
-    public function populateTimestamp(Smarty_Template_Source $source)
+    public function populateTimestamp(Source $source)
     {
         $source->exists = true;
-        /* @var \Smarty_Template_Source $_s */
+        /* @var Source $_s */
         foreach ($source->components as $_s) {
             $source->exists = $source->exists && $_s->exists;
         }
@@ -78,19 +64,19 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
     /**
      * Load template's source from files into current template object
      *
-     * @param Smarty_Template_Source $source source object
+     * @param Source $source source object
      *
      * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @throws \Smarty\Exception if source cannot be loaded
      */
-    public function getContent(Smarty_Template_Source $source)
+    public function getContent(Source $source)
     {
         if (!$source->exists) {
-            throw new SmartyException("Unable to load template '{$source->type}:{$source->name}'");
+            throw new \Smarty\Exception("Unable to load  '{$source->type}:{$source->name}'");
         }
         $_components = array_reverse($source->components);
         $_content = '';
-        /* @var \Smarty_Template_Source $_s */
+        /* @var Source $_s */
         foreach ($_components as $_s) {
             // read content
             $_content .= $_s->getContent();
@@ -101,13 +87,17 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
+     * @param Source $source source object
      *
      * @return string resource's basename
      */
-    public function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Source $source)
     {
-        return str_replace(':', '.', basename($source->filepath));
+        $search = array(':');
+        if (\Smarty\Smarty::$_IS_WINDOWS) {
+            $search = array(':', '|');
+        }
+        return str_replace($search, '.', basename($source->getResourceName()));
     }
 
     /*
diff --git a/include/smarty/src/Resource/FilePlugin.php b/include/smarty/src/Resource/FilePlugin.php
new file mode 100644
index 000000000..0033c8348
--- /dev/null
+++ b/include/smarty/src/Resource/FilePlugin.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource File
+ *
+
+
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+namespace Smarty\Resource;
+
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
+use Smarty\Exception;
+
+/**
+ * Smarty Internal Plugin Resource File
+ * Implements the file system as resource for Smarty templates
+ *
+
+
+ */
+class FilePlugin extends BasePlugin {
+
+	/**
+	 * populate Source Object with metadata from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template|null $_template template object
+	 *
+	 * @throws Exception
+	 */
+	public function populate(Source $source, ?Template $_template = null) {
+
+		$source->uid = sha1(
+			$source->name . ($source->isConfig ? $source->getSmarty()->_joined_config_dir :
+				$source->getSmarty()->_joined_template_dir)
+		);
+
+		if ($path = $this->getFilePath($source->name, $source->getSmarty(), $source->isConfig)) {
+			if (isset($source->getSmarty()->security_policy) && is_object($source->getSmarty()->security_policy)) {
+				$source->getSmarty()->security_policy->isTrustedResourceDir($path, $source->isConfig);
+			}
+			$source->exists = true;
+			$source->timestamp = filemtime($path);
+		} else {
+			$source->timestamp = $source->exists = false;
+		}
+	}
+
+	/**
+	 * populate Source Object with timestamp and exists from Resource
+	 *
+	 * @param Source $source source object
+	 */
+	public function populateTimestamp(Source $source) {
+		$path = $this->getFilePath($source->name, $source->getSmarty(), $source->isConfig);
+		if (!$source->exists) {
+			$source->exists = ($path !== false && is_file($path));
+		}
+		if ($source->exists && $path !== false) {
+			$source->timestamp = filemtime($path);
+		} else {
+			$source->timestamp = 0;
+		}
+	}
+
+	/**
+	 * Load template's source from file into current template object
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 template source
+	 * @throws Exception        if source cannot be loaded
+	 */
+	public function getContent(Source $source) {
+		if ($source->exists) {
+			return file_get_contents($this->getFilePath($source->getResourceName(), $source->getSmarty(), $source->isConfig()));
+		}
+		throw new Exception(
+			'Unable to read ' . ($source->isConfig ? 'config' : 'template') .
+			" {$source->type} '{$source->name}'"
+		);
+	}
+
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(Source $source) {
+		return basename($source->getResourceName());
+	}
+
+	/**
+	 * build template filepath by traversing the template_dir array
+	 *
+	 * @param $file
+	 * @param Smarty $smarty
+	 * @param bool $isConfig
+	 *
+	 * @return string fully qualified filepath
+	 */
+	public function getFilePath($file, \Smarty\Smarty $smarty, bool $isConfig = false) {
+		// absolute file ?
+		if ($file[0] === '/' || $file[1] === ':') {
+			$file = $smarty->_realpath($file, true);
+			return is_file($file) ? $file : false;
+		}
+
+		// normalize DIRECTORY_SEPARATOR
+		if (strpos($file, DIRECTORY_SEPARATOR === '/' ? '\\' : '/') !== false) {
+			$file = str_replace(DIRECTORY_SEPARATOR === '/' ? '\\' : '/', DIRECTORY_SEPARATOR, $file);
+		}
+		$_directories = $smarty->getTemplateDir(null, $isConfig);
+		// template_dir index?
+		if ($file[0] === '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) {
+			$file = $fileMatch[2];
+			$_indices = explode(',', $fileMatch[1]);
+			$_index_dirs = [];
+			foreach ($_indices as $index) {
+				$index = trim($index);
+				// try string indexes
+				if (isset($_directories[$index])) {
+					$_index_dirs[] = $_directories[$index];
+				} elseif (is_numeric($index)) {
+					// try numeric index
+					$index = (int)$index;
+					if (isset($_directories[$index])) {
+						$_index_dirs[] = $_directories[$index];
+					} else {
+						// try at location index
+						$keys = array_keys($_directories);
+						if (isset($_directories[$keys[$index]])) {
+							$_index_dirs[] = $_directories[$keys[$index]];
+						}
+					}
+				}
+			}
+			if (empty($_index_dirs)) {
+				// index not found
+				return false;
+			} else {
+				$_directories = $_index_dirs;
+			}
+		}
+		// relative file name?
+		foreach ($_directories as $_directory) {
+			$path = $_directory . $file;
+			if (is_file($path)) {
+				return (strpos($path, '.' . DIRECTORY_SEPARATOR) !== false) ? $smarty->_realpath($path) : $path;
+			}
+		}
+		if (!isset($_index_dirs)) {
+			// Could be relative to cwd
+			$path = $smarty->_realpath($file, true);
+			if (is_file($path)) {
+				return $path;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the timestamp of the resource indicated by $resourceName, or false if it doesn't exist.
+	 *
+	 * @param string $resourceName
+	 * @param Smarty $smarty
+	 * @param bool $isConfig
+	 *
+	 * @return false|int
+	 */
+	public function getResourceNameTimestamp(string $resourceName, \Smarty\Smarty $smarty, bool $isConfig = false) {
+		if ($path = $this->getFilePath($resourceName, $smarty, $isConfig)) {
+			return filemtime($path);
+		}
+		return false;
+	}
+}
diff --git a/include/smarty/src/Resource/RecompiledPlugin.php b/include/smarty/src/Resource/RecompiledPlugin.php
new file mode 100644
index 000000000..f1c64bc78
--- /dev/null
+++ b/include/smarty/src/Resource/RecompiledPlugin.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+
+
+ * @author     Rodney Rehm
+ */
+
+namespace Smarty\Resource;
+
+use Smarty\Template;
+
+/**
+ * Smarty Resource Plugin
+ * Base implementation for resource plugins that don't compile cache
+ *
+
+
+ */
+abstract class RecompiledPlugin extends BasePlugin {
+
+	/**
+	 * Flag that it's an recompiled resource
+	 *
+	 * @var bool
+	 */
+	public $recompiled = true;
+
+	/**
+	 * Flag if resource does allow compilation
+	 *
+	 * @return bool
+	 */
+	public function supportsCompiledTemplates(): bool {
+		return false;
+	}
+
+	/*
+	   * Disable timestamp checks for recompiled resource.
+	   *
+	   * @return bool
+	   */
+	/**
+	 * @return bool
+	 */
+	public function checkTimestamps() {
+		return false;
+	}
+}
diff --git a/include/smarty/src/Resource/StreamPlugin.php b/include/smarty/src/Resource/StreamPlugin.php
new file mode 100644
index 000000000..9b5b3f579
--- /dev/null
+++ b/include/smarty/src/Resource/StreamPlugin.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+
+
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+namespace Smarty\Resource;
+
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
+
+/**
+ * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+ * @link       https://php.net/streams
+
+
+ */
+class StreamPlugin extends RecompiledPlugin {
+
+	/**
+	 * populate Source Object with meta data from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template $_template template object
+	 *
+	 * @return void
+	 */
+	public function populate(Source $source, ?Template $_template = null) {
+		$source->uid = false;
+		$source->content = $this->getContent($source);
+		$source->timestamp = $source->exists = !!$source->content;
+	}
+
+	/**
+	 * Load template's source from stream into current template object
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string template source
+	 */
+	public function getContent(Source $source) {
+
+		if (strpos($source->getResourceName(), '://') !== false) {
+			$filepath = $source->getResourceName();
+		} else {
+			$filepath = str_replace(':', '://', $source->getFullResourceName());
+		}
+
+		$t = '';
+		// the availability of the stream has already been checked in Smarty\Resource\Base::fetch()
+		$fp = fopen($filepath, 'r+');
+		if ($fp) {
+			while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+				$t .= $current_line;
+			}
+			fclose($fp);
+			return $t;
+		} else {
+			return false;
+		}
+	}
+
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php b/include/smarty/src/Resource/StringEval.php
similarity index 53%
rename from include/smarty/libs/sysplugins/smarty_internal_resource_eval.php
rename to include/smarty/src/Resource/StringEval.php
index 3b552a589..2aa60ffb7 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php
+++ b/include/smarty/src/Resource/StringEval.php
@@ -1,9 +1,14 @@
 <?php
+
+namespace Smarty\Resource;
+
+use Smarty\Smarty;
+
 /**
  * Smarty Internal Plugin Resource Eval
  *
- * @package    Smarty
- * @subpackage TemplateResources
+
+
  * @author     Uwe Tews
  * @author     Rodney Rehm
  */
@@ -13,35 +18,35 @@
  * Implements the strings as resource for Smarty template
  * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}}
  *
- * @package    Smarty
- * @subpackage TemplateResources
+
+
  */
-class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
+class StringEval extends RecompiledPlugin
 {
     /**
      * populate Source Object with meta data from Resource
      *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
+     * @param \Smarty\Template\Source   $source    source object
+     * @param \Smarty\Template $_template template object
      *
      * @return void
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    public function populate(\Smarty\Template\Source $source, ?\Smarty\Template $_template = null)
     {
-        $source->uid = $source->filepath = sha1($source->name);
+        $source->uid = sha1($source->name);
         $source->timestamp = $source->exists = true;
     }
 
     /**
      * Load template's source from $resource_name into current template object
      *
-     * @uses decode() to decode base64 and urlencoded template_resources
-     *
-     * @param Smarty_Template_Source $source source object
+     * @param \Smarty\Template\Source $source source object
      *
      * @return string                 template source
+     *@uses decode() to decode base64 and urlencoded template_resources
+     *
      */
-    public function getContent(Smarty_Template_Source $source)
+    public function getContent(\Smarty\Template\Source $source)
     {
         return $this->decode($source->name);
     }
@@ -66,28 +71,14 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
         return $string;
     }
 
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty  $smarty        Smarty instance
-     * @param string  $resource_name resource_name to make unique
-     * @param boolean $isConfig      flag for config resource
-     *
-     * @return string unique resource name
-     */
-    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
-    {
-        return get_class($this) . '#' . $this->decode($resource_name);
-    }
-
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
+     * @param \Smarty\Template\Source $source source object
      *
      * @return string                 resource's basename
      */
-    public function getBasename(Smarty_Template_Source $source)
+    public function getBasename(\Smarty\Template\Source $source)
     {
         return '';
     }
diff --git a/include/smarty/src/Resource/StringPlugin.php b/include/smarty/src/Resource/StringPlugin.php
new file mode 100644
index 000000000..fb3692c73
--- /dev/null
+++ b/include/smarty/src/Resource/StringPlugin.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource String
+ *
+
+
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+namespace Smarty\Resource;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
+
+/**
+ * Smarty Internal Plugin Resource String
+ * Implements the strings as resource for Smarty template
+ * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
+ *
+
+
+ */
+class StringPlugin extends BasePlugin {
+
+	/**
+	 * populate Source Object with metadata from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template $_template template object
+	 *
+	 * @return void
+	 */
+	public function populate(Source $source, ?Template $_template = null) {
+		$source->uid = sha1($source->name);
+		$source->timestamp = $source->exists = true;
+	}
+
+	/**
+	 * Load template's source from $resource_name into current template object
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 template source
+	 * @uses decode() to decode base64 and urlencoded template_resources
+	 *
+	 */
+	public function getContent(Source $source) {
+		return $this->decode($source->name);
+	}
+
+	/**
+	 * decode base64 and urlencode
+	 *
+	 * @param string $string template_resource to decode
+	 *
+	 * @return string decoded template_resource
+	 */
+	protected function decode($string) {
+		// decode if specified
+		if (($pos = strpos($string, ':')) !== false) {
+			if (!strncmp($string, 'base64', 6)) {
+				return base64_decode(substr($string, 7));
+			} elseif (!strncmp($string, 'urlencode', 9)) {
+				return urldecode(substr($string, 10));
+			}
+		}
+		return $string;
+	}
+
+	/**
+	 * Determine basename for compiled filename
+	 * Always returns an empty string.
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(Source $source) {
+		return '';
+	}
+
+	/*
+		* Disable timestamp checks for string resource.
+		*
+		* @return bool
+		*/
+	/**
+	 * @return bool
+	 */
+	public function checkTimestamps() {
+		return false;
+	}
+}
diff --git a/include/smarty/libs/sysplugins/smarty_internal_block.php b/include/smarty/src/Runtime/Block.php
similarity index 81%
rename from include/smarty/libs/sysplugins/smarty_internal_block.php
rename to include/smarty/src/Runtime/Block.php
index 9956d642b..90eab9cbb 100644
--- a/include/smarty/libs/sysplugins/smarty_internal_block.php
+++ b/include/smarty/src/Runtime/Block.php
@@ -1,13 +1,15 @@
 <?php
 
+namespace Smarty\Runtime;
+
 /**
  * Smarty {block} tag class
  *
- * @package    Smarty
- * @subpackage PluginsInternal
+
+
  * @author     Uwe Tews
  */
-class Smarty_Internal_Block
+class Block
 {
     /**
      * Block name
@@ -47,14 +49,14 @@ class Smarty_Internal_Block
     /**
      * Inheritance child block
      *
-     * @var Smarty_Internal_Block|null
+     * @var Block|null
      */
     public $child = null;
 
     /**
      * Inheritance calling parent block
      *
-     * @var Smarty_Internal_Block|null
+     * @var Block|null
      */
     public $parent = null;
 
@@ -66,7 +68,7 @@ class Smarty_Internal_Block
     public $tplIndex = 0;
 
     /**
-     * Smarty_Internal_Block constructor.
+     * Block constructor.
      * - if outer level {block} of child template ($state === 1) save it as child root block
      * - otherwise process inheritance and render
      *
@@ -82,9 +84,9 @@ class Smarty_Internal_Block
     /**
      * Compiled block code overloaded by {block} class
      *
-     * @param \Smarty_Internal_Template $tpl
+     * @param \Smarty\Template $tpl
      */
-    public function callBlock(Smarty_Internal_Template $tpl)
+    public function callBlock(\Smarty\Template $tpl)
     {
     }
 }
diff --git a/include/smarty/src/Runtime/CaptureRuntime.php b/include/smarty/src/Runtime/CaptureRuntime.php
new file mode 100644
index 000000000..3f37c59fc
--- /dev/null
+++ b/include/smarty/src/Runtime/CaptureRuntime.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace Smarty\Runtime;
+use Smarty\Template;
+
+/**
+ * Runtime Extension Capture
+ *
+
+
+ * @author     Uwe Tews
+ */
+class CaptureRuntime {
+
+	/**
+	 * Stack of capture parameter
+	 *
+	 * @var array
+	 */
+	private $captureStack = [];
+
+	/**
+	 * Current open capture sections
+	 *
+	 * @var int
+	 */
+	private $captureCount = 0;
+
+	/**
+	 * Count stack
+	 *
+	 * @var int[]
+	 */
+	private $countStack = [];
+
+	/**
+	 * Named buffer
+	 *
+	 * @var string[]
+	 */
+	private $namedBuffer = [];
+
+	/**
+	 * Open capture section
+	 *
+	 * @param \Smarty\Template $_template
+	 * @param string $buffer capture name
+	 * @param string $assign variable name
+	 * @param string $append variable name
+	 */
+	public function open(Template $_template, $buffer, $assign, $append) {
+
+		$this->registerCallbacks($_template);
+
+		$this->captureStack[] = [
+			$buffer,
+			$assign,
+			$append,
+		];
+		$this->captureCount++;
+		ob_start();
+	}
+
+	/**
+	 * Register callbacks in template class
+	 *
+	 * @param \Smarty\Template $_template
+	 */
+	private function registerCallbacks(Template $_template) {
+
+		foreach ($_template->startRenderCallbacks as $callback) {
+			if (is_array($callback) && get_class($callback[0]) == self::class) {
+				// already registered
+				return;
+			}
+		}
+
+		$_template->startRenderCallbacks[] = [
+			$this,
+			'startRender',
+		];
+		$_template->endRenderCallbacks[] = [
+			$this,
+			'endRender',
+		];
+		$this->startRender($_template);
+	}
+
+	/**
+	 * Start render callback
+	 *
+	 * @param \Smarty\Template $_template
+	 */
+	public function startRender(Template $_template) {
+		$this->countStack[] = $this->captureCount;
+		$this->captureCount = 0;
+	}
+
+	/**
+	 * Close capture section
+	 *
+	 * @param \Smarty\Template $_template
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function close(Template $_template) {
+		if ($this->captureCount) {
+			[$buffer, $assign, $append] = array_pop($this->captureStack);
+			$this->captureCount--;
+			if (isset($assign)) {
+				$_template->assign($assign, ob_get_contents());
+			}
+			if (isset($append)) {
+				$_template->append($append, ob_get_contents());
+			}
+			$this->namedBuffer[$buffer] = ob_get_clean();
+		} else {
+			$this->error($_template);
+		}
+	}
+
+	/**
+	 * Error exception on not matching {capture}{/capture}
+	 *
+	 * @param \Smarty\Template $_template
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function error(Template $_template) {
+		throw new \Smarty\Exception("Not matching {capture}{/capture} in '{$_template->template_resource}'");
+	}
+
+	/**
+	 * Return content of named capture buffer by key or as array
+	 *
+	 * @param \Smarty\Template $_template
+	 * @param string|null $name
+	 *
+	 * @return string|string[]|null
+	 */
+	public function getBuffer(Template $_template, $name = null) {
+		if (isset($name)) {
+			return $this->namedBuffer[$name] ?? null;
+		} else {
+			return $this->namedBuffer;
+		}
+	}
+
+	/**
+	 * End render callback
+	 *
+	 * @param \Smarty\Template $_template
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function endRender(Template $_template) {
+		if ($this->captureCount) {
+			$this->error($_template);
+		} else {
+			$this->captureCount = array_pop($this->countStack);
+		}
+	}
+}
diff --git a/include/smarty/src/Runtime/DefaultPluginHandlerRuntime.php b/include/smarty/src/Runtime/DefaultPluginHandlerRuntime.php
new file mode 100644
index 000000000..f3be85ca6
--- /dev/null
+++ b/include/smarty/src/Runtime/DefaultPluginHandlerRuntime.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Smarty\Runtime;
+
+use Smarty\Exception;
+
+class DefaultPluginHandlerRuntime {
+
+	/**
+	 * @var callable
+	 */
+	private $defaultPluginHandler;
+
+	public function __construct(?callable $defaultPluginHandler = null) {
+		$this->defaultPluginHandler = $defaultPluginHandler;
+	}
+
+	public function hasPlugin($tag, $plugin_type): bool {
+		if ($this->defaultPluginHandler === null) {
+			return false;
+		}
+
+		$callback = null;
+
+		// these are not used here
+		$script = null;
+		$cacheable = null;
+
+		return (\call_user_func_array(
+				$this->defaultPluginHandler,
+				[
+					$tag,
+					$plugin_type,
+					null, // This used to pass $this->template, but this parameter has been removed in 5.0
+					&$callback,
+					&$script,
+					&$cacheable,
+				]
+			) && $callback);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function getCallback($tag, $plugin_type) {
+
+		if ($this->defaultPluginHandler === null) {
+			return false;
+		}
+
+		$callback = null;
+
+		// these are not used here
+		$script = null;
+		$cacheable = null;
+
+		if (\call_user_func_array(
+				$this->defaultPluginHandler,
+				[
+					$tag,
+					$plugin_type,
+					null, // This used to pass $this->template, but this parameter has been removed in 5.0
+					&$callback,
+					&$script,
+					&$cacheable,
+				]
+			) && $callback) {
+			return $callback;
+		}
+		throw new Exception("Default plugin handler: Returned callback for '{$tag}' not callable at runtime");
+	}
+
+}
\ No newline at end of file
diff --git a/include/smarty/src/Runtime/ForeachRuntime.php b/include/smarty/src/Runtime/ForeachRuntime.php
new file mode 100644
index 000000000..06da7d546
--- /dev/null
+++ b/include/smarty/src/Runtime/ForeachRuntime.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Smarty\Runtime;
+use Smarty\Template;
+
+/**
+ * Foreach Runtime Methods count(), init(), restore()
+ *
+
+
+ * @author     Uwe Tews
+ */
+class ForeachRuntime {
+
+	/**
+	 * Stack of saved variables
+	 *
+	 * @var array
+	 */
+	private $stack = [];
+
+	/**
+	 * Init foreach loop
+	 *  - save item and key variables, named foreach property data if defined
+	 *  - init item and key variables, named foreach property data if required
+	 *  - count total if required
+	 *
+	 * @param \Smarty\Template $tpl
+	 * @param mixed $from values to loop over
+	 * @param string $item variable name
+	 * @param bool $needTotal flag if we need to count values
+	 * @param null|string $key variable name
+	 * @param null|string $name of named foreach
+	 * @param array $properties of named foreach
+	 *
+	 * @return mixed $from
+	 */
+	public function init(
+		Template $tpl,
+		         $from,
+		         $item,
+		         $needTotal = false,
+		         $key = null,
+		         $name = null,
+		         $properties = []
+	) {
+		$needTotal = $needTotal || isset($properties['total']);
+		$saveVars = [];
+		$total = null;
+		if (!is_array($from)) {
+			if (is_object($from)) {
+				if ($needTotal) {
+					$total = $this->count($from);
+				}
+			} else {
+				settype($from, 'array');
+			}
+		}
+		if (!isset($total)) {
+			$total = empty($from) ? 0 : ($needTotal ? count($from) : 1);
+		}
+		if ($tpl->hasVariable($item)) {
+			$saveVars['item'] = [
+				$item,
+				$tpl->getVariable($item)->getValue(),
+			];
+		}
+		$tpl->assign($item,null);
+		if ($total === 0) {
+			$from = null;
+		} else {
+			if ($key) {
+				if ($tpl->hasVariable($key)) {
+					$saveVars['key'] = [
+						$key,
+						clone $tpl->getVariable($key),
+					];
+				}
+				$tpl->assign($key, null);
+			}
+		}
+		if ($needTotal) {
+			$tpl->getVariable($item)->total = $total;
+		}
+		if ($name) {
+			$namedVar = "__smarty_foreach_{$name}";
+			if ($tpl->hasVariable($namedVar)) {
+				$saveVars['named'] = [
+					$namedVar,
+					clone $tpl->getVariable($namedVar),
+				];
+			}
+			$namedProp = [];
+			if (isset($properties['total'])) {
+				$namedProp['total'] = $total;
+			}
+			if (isset($properties['iteration'])) {
+				$namedProp['iteration'] = 0;
+			}
+			if (isset($properties['index'])) {
+				$namedProp['index'] = -1;
+			}
+			if (isset($properties['show'])) {
+				$namedProp['show'] = ($total > 0);
+			}
+			$tpl->assign($namedVar, $namedProp);
+		}
+		$this->stack[] = $saveVars;
+		return $from;
+	}
+
+	/**
+	 * [util function] counts an array, arrayAccess/traversable or PDOStatement object
+	 *
+	 * @param mixed $value
+	 *
+	 * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
+	 *               for empty elements
+	 * @throws \Exception
+	 */
+	public function count($value): int
+	{
+		if ($value instanceof \IteratorAggregate) {
+			// Note: getIterator() returns a Traversable, not an Iterator
+			// thus rewind() and valid() methods may not be present
+			return iterator_count($value->getIterator());
+		} elseif ($value instanceof \Iterator) {
+			return $value instanceof \Generator ? 1 : iterator_count($value);
+		} elseif ($value instanceof \Countable) {
+			return count($value);
+		}
+		return count((array) $value);
+	}
+
+	/**
+	 * Restore saved variables
+	 *
+	 * will be called by {break n} or {continue n} for the required number of levels
+	 *
+	 * @param \Smarty\Template $tpl
+	 * @param int $levels number of levels
+	 */
+	public function restore(Template $tpl, $levels = 1) {
+		while ($levels) {
+			$saveVars = array_pop($this->stack);
+			if (!empty($saveVars)) {
+				if (isset($saveVars['item'])) {
+					$tpl->getVariable($saveVars['item'][0])->setValue($saveVars['item'][1]);
+				}
+				if (isset($saveVars['key'])) {
+					$tpl->setVariable($saveVars['key'][0], $saveVars['key'][1]);
+				}
+				if (isset($saveVars['named'])) {
+					$tpl->setVariable($saveVars['named'][0], $saveVars['named'][1]);
+				}
+			}
+			$levels--;
+		}
+	}
+}
diff --git a/include/smarty/src/Runtime/InheritanceRuntime.php b/include/smarty/src/Runtime/InheritanceRuntime.php
new file mode 100644
index 000000000..74ea85440
--- /dev/null
+++ b/include/smarty/src/Runtime/InheritanceRuntime.php
@@ -0,0 +1,243 @@
+<?php
+
+namespace Smarty\Runtime;
+use Smarty\Template;
+use Smarty\Template\Source;
+use Smarty\Exception;
+
+/**
+ * Inheritance Runtime Methods processBlock, endChild, init
+ *
+
+
+ * @author     Uwe Tews
+ **/
+class InheritanceRuntime {
+
+	/**
+	 * State machine
+	 * - 0 idle next extends will create a new inheritance tree
+	 * - 1 processing child template
+	 * - 2 wait for next inheritance template
+	 * - 3 assume parent template, if child will loaded goto state 1
+	 *     a call to a sub template resets the state to 0
+	 *
+	 * @var int
+	 */
+	private $state = 0;
+
+	/**
+	 * Array of root child {block} objects
+	 *
+	 * @var \Smarty\Runtime\Block[]
+	 */
+	private $childRoot = [];
+
+	/**
+	 * inheritance template nesting level
+	 *
+	 * @var int
+	 */
+	private $inheritanceLevel = 0;
+
+	/**
+	 * inheritance template index
+	 *
+	 * @var int
+	 */
+	private $tplIndex = -1;
+
+	/**
+	 * Array of template source objects
+	 *
+	 * @var Source[]
+	 */
+	private $sources = [];
+
+	/**
+	 * Stack of source objects while executing block code
+	 *
+	 * @var Source[]
+	 */
+	private $sourceStack = [];
+
+	/**
+	 * Initialize inheritance
+	 *
+	 * @param \Smarty\Template $tpl template object of caller
+	 * @param bool $initChild if true init for child template
+	 * @param array $blockNames outer level block name
+	 */
+	public function init(Template $tpl, $initChild, $blockNames = []) {
+		// if called while executing parent template it must be a sub-template with new inheritance root
+		if ($initChild && $this->state === 3 && (strpos($tpl->template_resource, 'extendsall') === false)) {
+			$tpl->setInheritance(clone $tpl->getSmarty()->getRuntime('Inheritance'));
+			$tpl->getInheritance()->init($tpl, $initChild, $blockNames);
+			return;
+		}
+		++$this->tplIndex;
+		$this->sources[$this->tplIndex] = $tpl->getSource();
+		// start of child sub template(s)
+		if ($initChild) {
+			$this->state = 1;
+			if (!$this->inheritanceLevel) {
+				//grab any output of child templates
+				ob_start();
+			}
+			++$this->inheritanceLevel;
+		}
+		// if state was waiting for parent change state to parent
+		if ($this->state === 2) {
+			$this->state = 3;
+		}
+	}
+
+	/**
+	 * End of child template(s)
+	 * - if outer level is reached flush output buffer and switch to wait for parent template state
+	 *
+	 * @param \Smarty\Template $tpl
+	 * @param null|string $template optional name of inheritance parent template
+	 *
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 */
+	public function endChild(Template $tpl, $template = null, ?string $currentDir = null) {
+		--$this->inheritanceLevel;
+		if (!$this->inheritanceLevel) {
+			ob_end_clean();
+			$this->state = 2;
+		}
+		if (isset($template)) {
+			$tpl->renderSubTemplate(
+				$template,
+				$tpl->cache_id,
+				$tpl->compile_id,
+				$tpl->caching ? \Smarty\Template::CACHING_NOCACHE_CODE : 0,
+				$tpl->cache_lifetime,
+				[],
+				null,
+				$currentDir
+			);
+		}
+	}
+
+	/**
+	 * \Smarty\Runtime\Block constructor.
+	 * - if outer level {block} of child template ($state === 1) save it as child root block
+	 * - otherwise process inheritance and render
+	 *
+	 * @param \Smarty\Template $tpl
+	 * @param                           $className
+	 * @param string $name
+	 * @param int|null $tplIndex index of outer level {block} if nested
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function instanceBlock(Template $tpl, $className, $name, $tplIndex = null) {
+		$block = new $className($name, isset($tplIndex) ? $tplIndex : $this->tplIndex);
+		if (isset($this->childRoot[$name])) {
+			$block->child = $this->childRoot[$name];
+		}
+		if ($this->state === 1) {
+			$this->childRoot[$name] = $block;
+			return;
+		}
+		// make sure we got child block of child template of current block
+		while ($block->child && $block->child->child && $block->tplIndex <= $block->child->tplIndex) {
+			$block->child = $block->child->child;
+		}
+		$this->processBlock($tpl, $block);
+	}
+
+	/**
+	 * Goto child block or render this
+	 *
+	 * @param Template $tpl
+	 * @param \Smarty\Runtime\Block $block
+	 * @param \Smarty\Runtime\Block|null $parent
+	 *
+	 * @throws Exception
+	 */
+	private function processBlock(
+		Template              $tpl,
+		\Smarty\Runtime\Block $block,
+		?\Smarty\Runtime\Block $parent = null
+	) {
+		if ($block->hide && !isset($block->child)) {
+			return;
+		}
+		if (isset($block->child) && $block->child->hide && !isset($block->child->child)) {
+			$block->child = null;
+		}
+		$block->parent = $parent;
+		if ($block->append && !$block->prepend && isset($parent)) {
+			$this->callParent($tpl, $block, '\'{block append}\'');
+		}
+		if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) {
+			$this->callBlock($block, $tpl);
+		} else {
+			$this->processBlock($tpl, $block->child, $block);
+		}
+		if ($block->prepend && isset($parent)) {
+			$this->callParent($tpl, $block, '{block prepend}');
+			if ($block->append) {
+				if ($block->callsChild || !isset($block->child)
+					|| ($block->child->hide && !isset($block->child->child))
+				) {
+					$this->callBlock($block, $tpl);
+				} else {
+					$this->processBlock($tpl, $block->child, $block);
+				}
+			}
+		}
+		$block->parent = null;
+	}
+
+	/**
+	 * Render child on \$smarty.block.child
+	 *
+	 * @param Template $tpl
+	 * @param \Smarty\Runtime\Block $block
+	 *
+	 * @return null|string block content
+	 * @throws Exception
+	 */
+	public function callChild(Template $tpl, \Smarty\Runtime\Block $block) {
+		if (isset($block->child)) {
+			$this->processBlock($tpl, $block->child, $block);
+		}
+	}
+
+	/**
+	 * Render parent block on \$smarty.block.parent or {block append/prepend}
+	 *
+	 * @param Template $tpl
+	 * @param \Smarty\Runtime\Block $block
+	 * @param string $tag
+	 *
+	 * @return null|string  block content
+	 * @throws Exception
+	 */
+	public function callParent(Template $tpl, \Smarty\Runtime\Block $block) {
+		if (isset($block->parent)) {
+			$this->callBlock($block->parent, $tpl);
+		} else {
+			throw new Exception("inheritance: illegal '{\$smarty.block.parent}' used in child template '" .
+				"{$tpl->getInheritance()->sources[$block->tplIndex]->getResourceName()}' block '{$block->name}'");
+		}
+	}
+
+	/**
+	 * render block
+	 *
+	 * @param \Smarty\Runtime\Block $block
+	 * @param Template $tpl
+	 */
+	public function callBlock(\Smarty\Runtime\Block $block, Template $tpl) {
+		$this->sourceStack[] = $tpl->getSource();
+		$tpl->setSource($this->sources[$block->tplIndex]);
+		$block->callBlock($tpl);
+		$tpl->setSource(array_pop($this->sourceStack));
+	}
+}
diff --git a/include/smarty/src/Runtime/TplFunctionRuntime.php b/include/smarty/src/Runtime/TplFunctionRuntime.php
new file mode 100644
index 000000000..6c4b93d73
--- /dev/null
+++ b/include/smarty/src/Runtime/TplFunctionRuntime.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace Smarty\Runtime;
+use Smarty\Exception;
+use Smarty\Template;
+use Smarty\TemplateBase;
+
+/**
+ * TplFunction Runtime Methods callTemplateFunction
+ *
+
+
+ * @author     Uwe Tews
+ **/
+class TplFunctionRuntime {
+
+	/**
+	 * Call template function
+	 *
+	 * @param \Smarty\Template $tpl template object
+	 * @param string $name template function name
+	 * @param array $params parameter array
+	 * @param bool $nocache true if called nocache
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function callTemplateFunction(Template $tpl, $name, $params, $nocache) {
+		$funcParam = $tpl->tplFunctions[$name] ?? ($tpl->getSmarty()->tplFunctions[$name] ?? null);
+		if (!isset($funcParam)) {
+			throw new \Smarty\Exception("Unable to find template function '{$name}'");
+		}
+
+		if (!$tpl->caching || ($tpl->caching && $nocache)) {
+			$function = $funcParam['call_name'];
+		} else {
+			if (isset($funcParam['call_name_caching'])) {
+				$function = $funcParam['call_name_caching'];
+			} else {
+				$function = $funcParam['call_name'];
+			}
+		}
+		if (!function_exists($function) && !$this->addTplFuncToCache($tpl, $name, $function)) {
+			throw new \Smarty\Exception("Unable to find template function '{$name}'");
+		}
+
+		$tpl->pushStack();
+		$function($tpl, $params);
+		$tpl->popStack();
+	}
+
+	/**
+	 * Register template functions defined by template
+	 *
+	 * @param \Smarty|\Smarty\Template|\Smarty\TemplateBase $obj
+	 * @param array $tplFunctions source information array of
+	 *                                                                                      template functions defined
+	 *                                                                                      in template
+	 * @param bool $override if true replace existing
+	 *                                                                                      functions with same name
+	 */
+	public function registerTplFunctions(TemplateBase $obj, $tplFunctions, $override = true) {
+		$obj->tplFunctions =
+			$override ? array_merge($obj->tplFunctions, $tplFunctions) : array_merge($tplFunctions, $obj->tplFunctions);
+		// make sure that the template functions are known in parent templates
+		if ($obj->_isSubTpl()) {
+			$this->registerTplFunctions($obj->parent, $tplFunctions, false);
+		} else {
+			$obj->getSmarty()->tplFunctions = $override ? array_merge($obj->getSmarty()->tplFunctions, $tplFunctions) :
+				array_merge($tplFunctions, $obj->getSmarty()->tplFunctions);
+		}
+	}
+
+	/**
+	 * Return source parameter array for single or all template functions
+	 *
+	 * @param \Smarty\Template $tpl template object
+	 * @param null|string $name template function name
+	 *
+	 * @return array|bool|mixed
+	 */
+	public function getTplFunction(Template $tpl, $name = null) {
+		if (isset($name)) {
+			return $tpl->tplFunctions[$name] ?? ($tpl->getSmarty()->tplFunctions[$name] ?? false);
+		} else {
+			return empty($tpl->tplFunctions) ? $tpl->getSmarty()->tplFunctions : $tpl->tplFunctions;
+		}
+	}
+
+	/**
+	 * Add template function to cache file for nocache calls
+	 *
+	 * @param Template $tpl
+	 * @param string $_name template function name
+	 * @param string $_function PHP function name
+	 *
+	 * @return bool
+	 * @throws Exception
+	 */
+	private function addTplFuncToCache(Template $tpl, $_name, $_function) {
+		$funcParam = $tpl->tplFunctions[$_name];
+		if (is_file($funcParam['compiled_filepath'])) {
+			// read compiled file
+			$code = file_get_contents($funcParam['compiled_filepath']);
+			// grab template function
+			if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) {
+				// grab source info from file dependency
+				preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1);
+				unset($code);
+				// make PHP function known
+				eval($match[0]);
+				if (function_exists($_function)) {
+
+					// Some magic code existed here, testing if the cached property had been set
+					// and then bubbling up until it found a parent template that had the cached property.
+					// This is no longer possible, so somehow this might break.
+
+					// add template function code to cache file
+					$content = $tpl->getCached()->readCache($tpl);
+					if ($content) {
+						// check if we must update file dependency
+						if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) {
+							$content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content);
+						}
+						$tpl->getCached()->writeCache(
+							$tpl,
+							preg_replace('/\s*\?>\s*$/', "\n", $content) .
+							"\n" . preg_replace(
+								[
+									'/^\s*<\?php\s+/',
+									'/\s*\?>\s*$/',
+								],
+								"\n",
+								$match[0]
+							)
+						);
+					}
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+}
diff --git a/include/smarty/src/Security.php b/include/smarty/src/Security.php
new file mode 100644
index 000000000..250b3bca7
--- /dev/null
+++ b/include/smarty/src/Security.php
@@ -0,0 +1,560 @@
+<?php
+/**
+ * Smarty plugin
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+/**
+ * FIXME: \Smarty\Security API
+ *      - getter and setter instead of public properties would allow cultivating an internal cache properly
+ *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir
+ *      are immutable the cache is killed every time either of the variables change. That means that two distinct
+ *      Smarty objects with differing
+ *        $template_dir or $config_dir should NOT share the same \Smarty\Security instance,
+ *        as this would lead to (severe) performance penalty! how should this be handled?
+ */
+
+namespace Smarty;
+
+use Smarty\Exception;
+
+/**
+ * This class does contain the security settings
+ */
+#[\AllowDynamicProperties]
+class Security {
+
+	/**
+	 * This is the list of template directories that are considered secure.
+	 * $template_dir is in this list implicitly.
+	 *
+	 * @var array
+	 */
+	public $secure_dir = [];
+
+	/**
+	 * List of regular expressions (PCRE) that include trusted URIs
+	 *
+	 * @var array
+	 */
+	public $trusted_uri = [];
+
+	/**
+	 * List of trusted constants names
+	 *
+	 * @var array
+	 */
+	public $trusted_constants = [];
+
+	/**
+	 * This is an array of trusted static classes.
+	 * If empty access to all static classes is allowed.
+	 * If set to 'none' none is allowed.
+	 *
+	 * @var array
+	 */
+	public $static_classes = [];
+
+	/**
+	 * This is an nested array of trusted classes and static methods.
+	 * If empty access to all static classes and methods is allowed.
+	 * Format:
+	 * array (
+	 *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
+	 *         'class_2' => array(),                       // all methods of class allowed
+	 *       )
+	 * If set to null none is allowed.
+	 *
+	 * @var array
+	 */
+	public $trusted_static_methods = [];
+
+	/**
+	 * This is an array of trusted static properties.
+	 * If empty access to all static classes and properties is allowed.
+	 * Format:
+	 * array (
+	 *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+	 *         'class_2' => array(),                   // all properties of class allowed
+	 *       )
+	 * If set to null none is allowed.
+	 *
+	 * @var array
+	 */
+	public $trusted_static_properties = [];
+
+	/**
+	 * This is an array of allowed tags.
+	 * If empty no restriction by allowed_tags.
+	 *
+	 * @var array
+	 */
+	public $allowed_tags = [];
+
+	/**
+	 * This is an array of disabled tags.
+	 * If empty no restriction by disabled_tags.
+	 *
+	 * @var array
+	 */
+	public $disabled_tags = [];
+
+	/**
+	 * This is an array of allowed modifier plugins.
+	 * If empty no restriction by allowed_modifiers.
+	 *
+	 * @var array
+	 */
+	public $allowed_modifiers = [];
+
+	/**
+	 * This is an array of disabled modifier plugins.
+	 * If empty no restriction by disabled_modifiers.
+	 *
+	 * @var array
+	 */
+	public $disabled_modifiers = [];
+
+	/**
+	 * This is an array of disabled special $smarty variables.
+	 *
+	 * @var array
+	 */
+	public $disabled_special_smarty_vars = [];
+
+	/**
+	 * This is an array of trusted streams.
+	 * If empty all streams are allowed.
+	 * To disable all streams set $streams = null.
+	 *
+	 * @var array
+	 */
+	public $streams = ['file'];
+
+	/**
+	 * + flag if constants can be accessed from template
+	 *
+	 * @var boolean
+	 */
+	public $allow_constants = true;
+
+	/**
+	 * + flag if super globals can be accessed from template
+	 *
+	 * @var boolean
+	 */
+	public $allow_super_globals = true;
+
+	/**
+	 * max template nesting level
+	 *
+	 * @var int
+	 */
+	public $max_template_nesting = 0;
+
+	/**
+	 * current template nesting level
+	 *
+	 * @var int
+	 */
+	private $_current_template_nesting = 0;
+
+	/**
+	 * Cache for $resource_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_resource_dir = [];
+
+	/**
+	 * Cache for $template_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_template_dir = [];
+
+	/**
+	 * Cache for $config_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_config_dir = [];
+
+	/**
+	 * Cache for $secure_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_secure_dir = [];
+
+	/**
+	 * @param Smarty $smarty
+	 */
+	public function __construct(Smarty $smarty) {
+		$this->smarty = $smarty;
+	}
+
+	/**
+	 * Check if static class is trusted.
+	 *
+	 * @param string $class_name
+	 * @param object $compiler compiler object
+	 *
+	 * @return boolean                 true if class is trusted
+	 */
+	public function isTrustedStaticClass($class_name, $compiler) {
+		if (isset($this->static_classes)
+			&& (empty($this->static_classes) || in_array($class_name, $this->static_classes))
+		) {
+			return true;
+		}
+		$compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if static class method/property is trusted.
+	 *
+	 * @param string $class_name
+	 * @param string $params
+	 * @param object $compiler compiler object
+	 *
+	 * @return boolean                 true if class method is trusted
+	 */
+	public function isTrustedStaticClassAccess($class_name, $params, $compiler) {
+		if (!isset($params[2])) {
+			// fall back
+			return $this->isTrustedStaticClass($class_name, $compiler);
+		}
+		if ($params[2] === 'method') {
+			$allowed = $this->trusted_static_methods;
+			$name = substr($params[0], 0, strpos($params[0], '('));
+		} else {
+			$allowed = $this->trusted_static_properties;
+			// strip '$'
+			$name = substr($params[0], 1);
+		}
+		if (isset($allowed)) {
+			if (empty($allowed)) {
+				// fall back
+				return $this->isTrustedStaticClass($class_name, $compiler);
+			}
+			if (isset($allowed[$class_name])
+				&& (empty($allowed[$class_name]) || in_array($name, $allowed[$class_name]))
+			) {
+				return true;
+			}
+		}
+		$compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if tag is trusted.
+	 *
+	 * @param string $tag_name
+	 * @param object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 */
+	public function isTrustedTag($tag_name, $compiler) {
+		$tag_name = strtolower($tag_name);
+
+		// check for internal always required tags
+		if (in_array($tag_name,	['assign', 'call'])) {
+			return true;
+		}
+		// check security settings
+		if (empty($this->allowed_tags)) {
+			if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
+				return true;
+			} else {
+				$compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
+			}
+		} elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
+			return true;
+		} else {
+			$compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
+		}
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if special $smarty variable is trusted.
+	 *
+	 * @param string $var_name
+	 * @param object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 */
+	public function isTrustedSpecialSmartyVar($var_name, $compiler) {
+		if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
+			return true;
+		} else {
+			$compiler->trigger_template_error(
+				"special variable '\$smarty.{$var_name}' not allowed by security setting",
+				null,
+				true
+			);
+		}
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if modifier plugin is trusted.
+	 *
+	 * @param string $modifier_name
+	 * @param object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 */
+	public function isTrustedModifier($modifier_name, $compiler) {
+		// check for internal always allowed modifier
+		if (in_array($modifier_name, ['default'])) {
+			return true;
+		}
+		// check security settings
+		if (empty($this->allowed_modifiers)) {
+			if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
+				return true;
+			} else {
+				$compiler->trigger_template_error(
+					"modifier '{$modifier_name}' disabled by security setting",
+					null,
+					true
+				);
+			}
+		} elseif (in_array($modifier_name, $this->allowed_modifiers)
+			&& !in_array($modifier_name, $this->disabled_modifiers)
+		) {
+			return true;
+		} else {
+			$compiler->trigger_template_error(
+				"modifier '{$modifier_name}' not allowed by security setting",
+				null,
+				true
+			);
+		}
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if constants are enabled or trusted
+	 *
+	 * @param string $const constant name
+	 * @param object $compiler compiler object
+	 *
+	 * @return bool
+	 */
+	public function isTrustedConstant($const, $compiler) {
+		if (in_array($const, ['true', 'false', 'null'])) {
+			return true;
+		}
+		if (!empty($this->trusted_constants)) {
+			if (!in_array(strtolower($const), $this->trusted_constants)) {
+				$compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
+				return false;
+			}
+			return true;
+		}
+		if ($this->allow_constants) {
+			return true;
+		}
+		$compiler->trigger_template_error("Security: access to constants not permitted");
+		return false;
+	}
+
+	/**
+	 * Check if stream is trusted.
+	 *
+	 * @param string $stream_name
+	 *
+	 * @return boolean         true if stream is trusted
+	 * @throws Exception if stream is not trusted
+	 */
+	public function isTrustedStream($stream_name) {
+		if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
+			return true;
+		}
+		throw new Exception("stream '{$stream_name}' not allowed by security setting");
+	}
+
+	/**
+	 * Check if directory of file resource is trusted.
+	 *
+	 * @param string $filepath
+	 * @param null|bool $isConfig
+	 *
+	 * @return bool true if directory is trusted
+	 * @throws \Smarty\Exception if directory is not trusted
+	 */
+	public function isTrustedResourceDir($filepath, $isConfig = null) {
+		$_dir = $this->smarty->getTemplateDir();
+		if ($this->_template_dir !== $_dir) {
+			$this->_updateResourceDir($this->_template_dir, $_dir);
+			$this->_template_dir = $_dir;
+		}
+		$_dir = $this->smarty->getConfigDir();
+		if ($this->_config_dir !== $_dir) {
+			$this->_updateResourceDir($this->_config_dir, $_dir);
+			$this->_config_dir = $_dir;
+		}
+		if ($this->_secure_dir !== $this->secure_dir) {
+			$this->secure_dir = (array)$this->secure_dir;
+			foreach ($this->secure_dir as $k => $d) {
+				$this->secure_dir[$k] = $this->smarty->_realpath($d . DIRECTORY_SEPARATOR, true);
+			}
+			$this->_updateResourceDir($this->_secure_dir, $this->secure_dir);
+			$this->_secure_dir = $this->secure_dir;
+		}
+		$addPath = $this->_checkDir($filepath, $this->_resource_dir);
+		if ($addPath !== false) {
+			$this->_resource_dir = array_merge($this->_resource_dir, $addPath);
+		}
+		return true;
+	}
+
+	/**
+	 * Check if URI (e.g. {fetch} or {html_image}) is trusted
+	 * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
+	 * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
+	 * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
+	 *
+	 * @param string $uri
+	 *
+	 * @return boolean         true if URI is trusted
+	 * @throws Exception if URI is not trusted
+	 * @uses   $trusted_uri for list of patterns to match against $uri
+	 */
+	public function isTrustedUri($uri) {
+		$_uri = parse_url($uri);
+		if (!empty($_uri['scheme']) && !empty($_uri['host'])) {
+			$_uri = $_uri['scheme'] . '://' . $_uri['host'];
+			foreach ($this->trusted_uri as $pattern) {
+				if (preg_match($pattern, $_uri)) {
+					return true;
+				}
+			}
+		}
+		throw new Exception("URI '{$uri}' not allowed by security setting");
+	}
+
+	/**
+	 * Remove old directories and its sub folders, add new directories
+	 *
+	 * @param array $oldDir
+	 * @param array $newDir
+	 */
+	private function _updateResourceDir($oldDir, $newDir) {
+		foreach ($oldDir as $directory) {
+			//           $directory = $this->smarty->_realpath($directory, true);
+			$length = strlen($directory);
+			foreach ($this->_resource_dir as $dir) {
+				if (substr($dir, 0, $length) === $directory) {
+					unset($this->_resource_dir[$dir]);
+				}
+			}
+		}
+		foreach ($newDir as $directory) {
+			//           $directory = $this->smarty->_realpath($directory, true);
+			$this->_resource_dir[$directory] = true;
+		}
+	}
+
+	/**
+	 * Check if file is inside a valid directory
+	 *
+	 * @param string $filepath
+	 * @param array $dirs valid directories
+	 *
+	 * @return array|bool
+	 * @throws \Smarty\Exception
+	 */
+	private function _checkDir($filepath, $dirs) {
+		$directory = dirname($this->smarty->_realpath($filepath, true)) . DIRECTORY_SEPARATOR;
+		$_directory = [];
+		if (!preg_match('#[\\\\/][.][.][\\\\/]#', $directory)) {
+			while (true) {
+				// test if the directory is trusted
+				if (isset($dirs[$directory])) {
+					return $_directory;
+				}
+				// abort if we've reached root
+				if (!preg_match('#[\\\\/][^\\\\/]+[\\\\/]$#', $directory)) {
+					// give up
+					break;
+				}
+				// remember the directory to add it to _resource_dir in case we're successful
+				$_directory[$directory] = true;
+				// bubble up one level
+				$directory = preg_replace('#[\\\\/][^\\\\/]+[\\\\/]$#', DIRECTORY_SEPARATOR, $directory);
+			}
+		}
+		// give up
+		throw new Exception(sprintf('Smarty Security: not trusted file path \'%s\' ', $filepath));
+	}
+
+	/**
+	 * Loads security class and enables security
+	 *
+	 * @param \Smarty $smarty
+	 * @param string|Security $security_class if a string is used, it must be class-name
+	 *
+	 * @return \Smarty current Smarty instance for chaining
+	 * @throws \Smarty\Exception when an invalid class name is provided
+	 */
+	public static function enableSecurity(Smarty $smarty, $security_class) {
+		if ($security_class instanceof Security) {
+			$smarty->security_policy = $security_class;
+			return $smarty;
+		} elseif (is_object($security_class)) {
+			throw new Exception("Class '" . get_class($security_class) . "' must extend \\Smarty\\Security.");
+		}
+		if ($security_class === null) {
+			$security_class = $smarty->security_class;
+		}
+		if (!class_exists($security_class)) {
+			throw new Exception("Security class '$security_class' is not defined");
+		} elseif ($security_class !== Security::class && !is_subclass_of($security_class, Security::class)) {
+			throw new Exception("Class '$security_class' must extend " . Security::class . ".");
+		} else {
+			$smarty->security_policy = new $security_class($smarty);
+		}
+		return $smarty;
+	}
+
+	/**
+	 * Start template processing
+	 *
+	 * @param $template
+	 *
+	 * @throws Exception
+	 */
+	public function startTemplate($template) {
+		if ($this->max_template_nesting > 0 && $this->_current_template_nesting++ >= $this->max_template_nesting) {
+			throw new Exception("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
+		}
+	}
+
+	/**
+	 * Exit template processing
+	 */
+	public function endTemplate() {
+		if ($this->max_template_nesting > 0) {
+			$this->_current_template_nesting--;
+		}
+	}
+
+	/**
+	 * Register callback functions call at start/end of template rendering
+	 *
+	 * @param \Smarty\Template $template
+	 */
+	public function registerCallBacks(Template $template) {
+		$template->startRenderCallbacks[] = [$this, 'startTemplate'];
+		$template->endRenderCallbacks[] = [$this, 'endTemplate'];
+	}
+}
diff --git a/include/smarty/src/Smarty.php b/include/smarty/src/Smarty.php
new file mode 100644
index 000000000..efad0c1d5
--- /dev/null
+++ b/include/smarty/src/Smarty.php
@@ -0,0 +1,2239 @@
+<?php
+
+namespace Smarty;
+
+use FilesystemIterator;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use Smarty\Cacheresource\File;
+use Smarty\Extension\Base;
+use Smarty\Extension\BCPluginsAdapter;
+use Smarty\Extension\CallbackWrapper;
+use Smarty\Extension\CoreExtension;
+use Smarty\Extension\DefaultExtension;
+use Smarty\Extension\ExtensionInterface;
+use Smarty\Filter\Output\TrimWhitespace;
+use Smarty\Runtime\CaptureRuntime;
+use Smarty\Runtime\DefaultPluginHandlerRuntime;
+use Smarty\Runtime\ForeachRuntime;
+use Smarty\Runtime\InheritanceRuntime;
+use Smarty\Runtime\TplFunctionRuntime;
+
+
+/**
+ * Project:     Smarty: the PHP compiling template engine
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License 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
+ *
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews   <uwe dot tews at gmail dot com>
+ * @author    Rodney Rehm
+ * @author    Simon Wisselink
+ */
+
+/**
+ * This is the main Smarty class
+ */
+class Smarty extends \Smarty\TemplateBase {
+
+	/**
+	 * smarty version
+	 */
+	const SMARTY_VERSION = '5.5.2';
+
+	/**
+	 * define caching modes
+	 */
+	const CACHING_OFF = 0;
+	const CACHING_LIFETIME_CURRENT = 1;
+	const CACHING_LIFETIME_SAVED = 2;
+	/**
+	 * define constant for clearing cache files be saved expiration dates
+	 */
+	const CLEAR_EXPIRED = -1;
+	/**
+	 * define compile check modes
+	 */
+	const COMPILECHECK_OFF = 0;
+	const COMPILECHECK_ON = 1;
+	/**
+	 * filter types
+	 */
+	const FILTER_POST = 'post';
+	const FILTER_PRE = 'pre';
+	const FILTER_OUTPUT = 'output';
+	const FILTER_VARIABLE = 'variable';
+	/**
+	 * plugin types
+	 */
+	const PLUGIN_FUNCTION = 'function';
+	const PLUGIN_BLOCK = 'block';
+	const PLUGIN_COMPILER = 'compiler';
+	const PLUGIN_MODIFIER = 'modifier';
+	const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
+
+	/**
+	 * The character set to adhere to (defaults to "UTF-8")
+	 */
+	public static $_CHARSET = 'UTF-8';
+
+	/**
+	 * The date format to be used internally
+	 * (accepts date() and strftime())
+	 */
+	public static $_DATE_FORMAT = '%b %e, %Y';
+
+	/**
+	 * Flag denoting if PCRE should run in UTF-8 mode
+	 */
+	public static $_UTF8_MODIFIER = 'u';
+
+	/**
+	 * Flag denoting if operating system is windows
+	 */
+	public static $_IS_WINDOWS = false;
+
+	/**
+	 * auto literal on delimiters with whitespace
+	 *
+	 * @var boolean
+	 */
+	public $auto_literal = true;
+
+	/**
+	 * display error on not assigned variables
+	 *
+	 * @var boolean
+	 */
+	public $error_unassigned = false;
+
+	/**
+	 * flag if template_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_templateDirNormalized = false;
+
+	/**
+	 * joined template directory string used in cache keys
+	 *
+	 * @var string
+	 */
+	public $_joined_template_dir = null;
+
+	/**
+	 * flag if config_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_configDirNormalized = false;
+
+	/**
+	 * joined config directory string used in cache keys
+	 *
+	 * @var string
+	 */
+	public $_joined_config_dir = null;
+
+	/**
+	 * default template handler
+	 *
+	 * @var callable
+	 */
+	public $default_template_handler_func = null;
+
+	/**
+	 * default config handler
+	 *
+	 * @var callable
+	 */
+	public $default_config_handler_func = null;
+
+	/**
+	 * default plugin handler
+	 *
+	 * @var callable
+	 */
+	private $default_plugin_handler_func = null;
+
+	/**
+	 * flag if template_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_compileDirNormalized = false;
+
+	/**
+	 * flag if template_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_cacheDirNormalized = false;
+
+	/**
+	 * force template compiling?
+	 *
+	 * @var boolean
+	 */
+	public $force_compile = false;
+
+	/**
+	 * use sub dirs for compiled/cached files?
+	 *
+	 * @var boolean
+	 */
+	public $use_sub_dirs = false;
+
+	/**
+	 * merge compiled includes
+	 *
+	 * @var boolean
+	 */
+	public $merge_compiled_includes = false;
+
+	/**
+	 * force cache file creation
+	 *
+	 * @var boolean
+	 */
+	public $force_cache = false;
+
+	/**
+	 * template left-delimiter
+	 *
+	 * @var string
+	 */
+	private $left_delimiter = "{";
+
+	/**
+	 * template right-delimiter
+	 *
+	 * @var string
+	 */
+	private $right_delimiter = "}";
+
+	/**
+	 * array of strings which shall be treated as literal by compiler
+	 *
+	 * @var array string
+	 */
+	public $literals = [];
+
+	/**
+	 * class name
+	 * This should be instance of \Smarty\Security.
+	 *
+	 * @var string
+	 * @see \Smarty\Security
+	 */
+	public $security_class = \Smarty\Security::class;
+
+	/**
+	 * implementation of security class
+	 *
+	 * @var \Smarty\Security
+	 */
+	public $security_policy = null;
+
+	/**
+	 * debug mode
+	 * Setting this to true enables the debug-console. Setting it to 2 enables individual Debug Console window by
+	 * template name.
+	 *
+	 * @var boolean|int
+	 */
+	public $debugging = false;
+
+	/**
+	 * This determines if debugging is enable-able from the browser.
+	 * <ul>
+	 *  <li>NONE => no debugging control allowed</li>
+	 *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
+	 * </ul>
+	 *
+	 * @var string
+	 */
+	public $debugging_ctrl = 'NONE';
+
+	/**
+	 * Name of debugging URL-param.
+	 * Only used when $debugging_ctrl is set to 'URL'.
+	 * The name of the URL-parameter that activates debugging.
+	 *
+	 * @var string
+	 */
+	public $smarty_debug_id = 'SMARTY_DEBUG';
+
+	/**
+	 * Path of debug template.
+	 *
+	 * @var string
+	 */
+	public $debug_tpl = null;
+
+	/**
+	 * When set, smarty uses this value as error_reporting-level.
+	 *
+	 * @var int
+	 */
+	public $error_reporting = null;
+
+	/**
+	 * Controls whether variables with the same name overwrite each other.
+	 *
+	 * @var boolean
+	 */
+	public $config_overwrite = true;
+
+	/**
+	 * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
+	 *
+	 * @var boolean
+	 */
+	public $config_booleanize = true;
+
+	/**
+	 * Controls whether hidden config sections/vars are read from the file.
+	 *
+	 * @var boolean
+	 */
+	public $config_read_hidden = false;
+
+	/**
+	 * locking concurrent compiles
+	 *
+	 * @var boolean
+	 */
+	public $compile_locking = true;
+
+	/**
+	 * Controls whether cache resources should use locking mechanism
+	 *
+	 * @var boolean
+	 */
+	public $cache_locking = false;
+
+	/**
+	 * seconds to wait for acquiring a lock before ignoring the write lock
+	 *
+	 * @var float
+	 */
+	public $locking_timeout = 10;
+
+	/**
+	 * resource type used if none given
+	 * Must be a valid key of $registered_resources.
+	 *
+	 * @var string
+	 */
+	public $default_resource_type = 'file';
+
+	/**
+	 * cache resource
+	 * Must be a subclass of \Smarty\Cacheresource\Base
+	 *
+	 * @var \Smarty\Cacheresource\Base
+	 */
+	private $cacheResource;
+
+	/**
+	 * config type
+	 *
+	 * @var string
+	 */
+	public $default_config_type = 'file';
+
+	/**
+	 * check If-Modified-Since headers
+	 *
+	 * @var boolean
+	 */
+	public $cache_modified_check = false;
+
+	/**
+	 * registered plugins
+	 *
+	 * @var array
+	 */
+	public $registered_plugins = [];
+
+	/**
+	 * registered objects
+	 *
+	 * @var array
+	 */
+	public $registered_objects = [];
+
+	/**
+	 * registered classes
+	 *
+	 * @var array
+	 */
+	public $registered_classes = [];
+
+	/**
+	 * registered resources
+	 *
+	 * @var array
+	 */
+	public $registered_resources = [];
+
+	/**
+	 * registered cache resources
+	 *
+	 * @var array
+	 * @deprecated since 5.0
+	 */
+	private $registered_cache_resources = [];
+
+	/**
+	 * default modifier
+	 *
+	 * @var array
+	 */
+	public $default_modifiers = [];
+
+	/**
+	 * autoescape variable output
+	 *
+	 * @var boolean
+	 */
+	public $escape_html = false;
+
+	/**
+	 * start time for execution time calculation
+	 *
+	 * @var int
+	 */
+	public $start_time = 0;
+
+	/**
+	 * internal flag to enable parser debugging
+	 *
+	 * @var bool
+	 */
+	public $_parserdebug = false;
+
+	/**
+	 * Debug object
+	 *
+	 * @var \Smarty\Debug
+	 */
+	public $_debug = null;
+
+	/**
+	 * template directory
+	 *
+	 * @var array
+	 */
+	protected $template_dir = ['./templates/'];
+
+	/**
+	 * flags for normalized template directory entries
+	 *
+	 * @var array
+	 */
+	protected $_processedTemplateDir = [];
+
+	/**
+	 * config directory
+	 *
+	 * @var array
+	 */
+	protected $config_dir = ['./configs/'];
+
+	/**
+	 * flags for normalized template directory entries
+	 *
+	 * @var array
+	 */
+	protected $_processedConfigDir = [];
+
+	/**
+	 * compile directory
+	 *
+	 * @var string
+	 */
+	protected $compile_dir = './templates_c/';
+
+	/**
+	 * cache directory
+	 *
+	 * @var string
+	 */
+	protected $cache_dir = './cache/';
+
+	/**
+	 * PHP7 Compatibility mode
+	 *
+	 * @var bool
+	 */
+	private $isMutingUndefinedOrNullWarnings = false;
+
+	/**
+	 * Cache of loaded resource handlers.
+	 *
+	 * @var array
+	 */
+	public $_resource_handlers = [];
+
+	/**
+	 * Cache of loaded cacheresource handlers.
+	 *
+	 * @var array
+	 */
+	public $_cacheresource_handlers = [];
+
+	/**
+	 * List of extensions
+	 *
+	 * @var ExtensionInterface[]
+	 */
+	private $extensions = [];
+	/**
+	 * @var BCPluginsAdapter
+	 */
+	private $BCPluginsAdapter;
+
+	/**
+	 * Initialize new Smarty object
+	 */
+	public function __construct() {
+
+		$this->start_time = microtime(true);
+		// Check if we're running on Windows
+		\Smarty\Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
+		// let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
+		if (\Smarty\Smarty::$_CHARSET !== 'UTF-8') {
+			\Smarty\Smarty::$_UTF8_MODIFIER = '';
+		}
+
+		$this->BCPluginsAdapter = new BCPluginsAdapter($this);
+
+		$this->extensions[] = new CoreExtension();
+		$this->extensions[] = new DefaultExtension();
+		$this->extensions[] = $this->BCPluginsAdapter;
+
+		$this->cacheResource = new File();
+	}
+
+	/**
+	 * Load an additional extension.
+	 *
+	 * @return void
+	 */
+	public function addExtension(ExtensionInterface $extension) {
+		$this->extensions[] = $extension;
+	}
+
+	/**
+	 * Returns all loaded extensions
+	 *
+	 * @return array|ExtensionInterface[]
+	 */
+	public function getExtensions(): array {
+		return $this->extensions;
+	}
+
+	/**
+	 * Replace the entire list extensions, allowing you to determine the exact order of the extensions.
+	 *
+	 * @param ExtensionInterface[] $extensions
+	 *
+	 * @return void
+	 */
+	public function setExtensions(array $extensions): void {
+		$this->extensions = $extensions;
+	}
+
+	/**
+	 * Check if a template resource exists
+	 *
+	 * @param string $resource_name template name
+	 *
+	 * @return bool status
+	 * @throws \Smarty\Exception
+	 */
+	public function templateExists($resource_name) {
+		// create source object
+		$source = Template\Source::load(null, $this, $resource_name);
+		return $source->exists;
+	}
+
+	/**
+	 * Loads security class and enables security
+	 *
+	 * @param string|\Smarty\Security $security_class if a string is used, it must be class-name
+	 *
+	 * @return static                 current Smarty instance for chaining
+	 * @throws \Smarty\Exception
+	 */
+	public function enableSecurity($security_class = null) {
+		\Smarty\Security::enableSecurity($this, $security_class);
+		return $this;
+	}
+
+	/**
+	 * Disable security
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function disableSecurity() {
+		$this->security_policy = null;
+		return $this;
+	}
+
+	/**
+	 * Add template directory(s)
+	 *
+	 * @param string|array $template_dir directory(s) of template sources
+	 * @param string $key of the array element to assign the template dir to
+	 * @param bool $isConfig true for config_dir
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function addTemplateDir($template_dir, $key = null, $isConfig = false) {
+		if ($isConfig) {
+			$processed = &$this->_processedConfigDir;
+			$dir = &$this->config_dir;
+			$this->_configDirNormalized = false;
+		} else {
+			$processed = &$this->_processedTemplateDir;
+			$dir = &$this->template_dir;
+			$this->_templateDirNormalized = false;
+		}
+		if (is_array($template_dir)) {
+			foreach ($template_dir as $k => $v) {
+				if (is_int($k)) {
+					// indexes are not merged but appended
+					$dir[] = $v;
+				} else {
+					// string indexes are overridden
+					$dir[$k] = $v;
+					unset($processed[$key]);
+				}
+			}
+		} else {
+			if ($key !== null) {
+				// override directory at specified index
+				$dir[$key] = $template_dir;
+				unset($processed[$key]);
+			} else {
+				// append new directory
+				$dir[] = $template_dir;
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * Get template directories
+	 *
+	 * @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
+	 */
+	public function getTemplateDir($index = null, $isConfig = false) {
+		if ($isConfig) {
+			$dir = &$this->config_dir;
+		} else {
+			$dir = &$this->template_dir;
+		}
+		if ($isConfig ? !$this->_configDirNormalized : !$this->_templateDirNormalized) {
+			$this->_normalizeTemplateConfig($isConfig);
+		}
+		if ($index !== null) {
+			return isset($dir[$index]) ? $dir[$index] : null;
+		}
+		return $dir;
+	}
+
+	/**
+	 * Set template directory
+	 *
+	 * @param string|array $template_dir directory(s) of template sources
+	 * @param bool $isConfig true for config_dir
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function setTemplateDir($template_dir, $isConfig = false) {
+		if ($isConfig) {
+			$this->config_dir = [];
+			$this->_processedConfigDir = [];
+		} else {
+			$this->template_dir = [];
+			$this->_processedTemplateDir = [];
+		}
+		$this->addTemplateDir($template_dir, null, $isConfig);
+		return $this;
+	}
+
+	/**
+	 * Adds a template directory before any existing directoires
+	 *
+	 * @param string $new_template_dir directory of template sources
+	 * @param bool $is_config true for config_dir
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function prependTemplateDir($new_template_dir, $is_config = false) {
+		$current_template_dirs = $is_config ? $this->config_dir : $this->template_dir;
+		array_unshift($current_template_dirs, $new_template_dir);
+		$this->setTemplateDir($current_template_dirs, $is_config);
+		return $this;
+	}
+
+	/**
+	 * Add config directory(s)
+	 *
+	 * @param string|array $config_dir directory(s) of config sources
+	 * @param mixed $key key of the array element to assign the config dir to
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function addConfigDir($config_dir, $key = null) {
+		return $this->addTemplateDir($config_dir, $key, true);
+	}
+
+	/**
+	 * Get config directory
+	 *
+	 * @param mixed $index index of directory to get, null to get all
+	 *
+	 * @return array configuration directory
+	 */
+	public function getConfigDir($index = null) {
+		return $this->getTemplateDir($index, true);
+	}
+
+	/**
+	 * Set config directory
+	 *
+	 * @param $config_dir
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function setConfigDir($config_dir) {
+		return $this->setTemplateDir($config_dir, true);
+	}
+
+	/**
+	 * Registers plugin to be used in templates
+	 *
+	 * @param string $type plugin type
+	 * @param string $name name of template tag
+	 * @param callable $callback PHP callback to register
+	 * @param bool $cacheable if true (default) this function is cache able
+	 *
+	 * @return $this
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::registerPlugin()
+	 */
+	public function registerPlugin($type, $name, $callback, $cacheable = true) {
+		if (isset($this->registered_plugins[$type][$name])) {
+			throw new Exception("Plugin tag '{$name}' already registered");
+		} elseif (!is_callable($callback) && !class_exists($callback)) {
+			throw new Exception("Plugin '{$name}' not callable");
+		} else {
+			$this->registered_plugins[$type][$name] = [$callback, (bool)$cacheable];
+		}
+		return $this;
+	}
+
+	/**
+	 * Returns plugin previously registered using ::registerPlugin as a numerical array as follows or null if not found:
+	 * [
+	 *  0 => the callback
+	 *  1 => (bool) $cacheable
+	 *  2 => (array) $cache_attr
+	 * ]
+	 *
+	 * @param string $type plugin type
+	 * @param string $name name of template tag
+	 *
+	 * @return array|null
+	 *
+	 * @api  Smarty::unregisterPlugin()
+	 */
+	public function getRegisteredPlugin($type, $name): ?array {
+		if (isset($this->registered_plugins[$type][$name])) {
+			return $this->registered_plugins[$type][$name];
+		}
+		return null;
+	}
+
+	/**
+	 * Unregisters plugin previously registered using ::registerPlugin
+	 *
+	 * @param string $type plugin type
+	 * @param string $name name of template tag
+	 *
+	 * @return $this
+	 *
+	 * @api  Smarty::unregisterPlugin()
+	 */
+	public function unregisterPlugin($type, $name) {
+		if (isset($this->registered_plugins[$type][$name])) {
+			unset($this->registered_plugins[$type][$name]);
+		}
+		return $this;
+	}
+
+	/**
+	 * Adds directory of plugin files
+	 *
+	 * @param null|array|string $plugins_dir
+	 *
+	 * @return static current Smarty instance for chaining
+	 * @deprecated since 5.0
+	 */
+	public function addPluginsDir($plugins_dir) {
+		trigger_error('Using Smarty::addPluginsDir() to load plugins is deprecated and will be ' .
+			'removed in a future release. Use Smarty::addExtension() to add an extension or Smarty::registerPlugin to ' .
+			'quickly register a plugin using a callback function.', E_USER_DEPRECATED);
+
+		foreach ((array)$plugins_dir as $v) {
+			$path = $this->_realpath(rtrim($v ?? '', '/\\') . DIRECTORY_SEPARATOR, true);
+			$this->BCPluginsAdapter->loadPluginsFromDir($path);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get plugin directories
+	 *
+	 * @return array list of plugin directories
+	 * @deprecated since 5.0
+	 */
+	public function getPluginsDir() {
+		trigger_error('Using Smarty::getPluginsDir() is deprecated and will be ' .
+			'removed in a future release. It will always return an empty array.', E_USER_DEPRECATED);
+		return [];
+	}
+
+	/**
+	 * Set plugins directory
+	 *
+	 * @param string|array $plugins_dir directory(s) of plugins
+	 *
+	 * @return static current Smarty instance for chaining
+	 * @deprecated since 5.0
+	 */
+	public function setPluginsDir($plugins_dir) {
+		trigger_error('Using Smarty::getPluginsDir() is deprecated and will be ' .
+			'removed in a future release. For now, it will remove the DefaultExtension from the extensions list and ' .
+			'proceed to call Smartyy::addPluginsDir..', E_USER_DEPRECATED);
+
+		$this->extensions = array_filter(
+			$this->extensions,
+			function ($extension) {
+				return !($extension instanceof DefaultExtension);
+			}
+		);
+
+		return $this->addPluginsDir($plugins_dir);
+	}
+
+	/**
+	 * Registers a default plugin handler
+	 *
+	 * @param callable $callback class/method name
+	 *
+	 * @return $this
+	 * @throws Exception              if $callback is not callable
+	 *
+	 * @api  Smarty::registerDefaultPluginHandler()
+	 *
+	 * @deprecated since 5.0
+	 */
+	public function registerDefaultPluginHandler($callback) {
+
+		trigger_error('Using Smarty::registerDefaultPluginHandler() is deprecated and will be ' .
+			'removed in a future release. Please rewrite your plugin handler as an extension.',
+			E_USER_DEPRECATED);
+
+		if (is_callable($callback)) {
+			$this->default_plugin_handler_func = $callback;
+		} else {
+			throw new Exception("Default plugin handler '$callback' not callable");
+		}
+		return $this;
+	}
+
+	/**
+	 * Get compiled directory
+	 *
+	 * @return string path to compiled templates
+	 */
+	public function getCompileDir() {
+		if (!$this->_compileDirNormalized) {
+			$this->_normalizeDir('compile_dir', $this->compile_dir);
+			$this->_compileDirNormalized = true;
+		}
+		return $this->compile_dir;
+	}
+
+	/**
+	 *
+	 * @param string $compile_dir directory to store compiled templates in
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function setCompileDir($compile_dir) {
+		$this->_normalizeDir('compile_dir', $compile_dir);
+		$this->_compileDirNormalized = true;
+		return $this;
+	}
+
+	/**
+	 * Get cache directory
+	 *
+	 * @return string path of cache directory
+	 */
+	public function getCacheDir() {
+		if (!$this->_cacheDirNormalized) {
+			$this->_normalizeDir('cache_dir', $this->cache_dir);
+			$this->_cacheDirNormalized = true;
+		}
+		return $this->cache_dir;
+	}
+
+	/**
+	 * Set cache directory
+	 *
+	 * @param string $cache_dir directory to store cached templates in
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function setCacheDir($cache_dir) {
+		$this->_normalizeDir('cache_dir', $cache_dir);
+		$this->_cacheDirNormalized = true;
+		return $this;
+	}
+
+	private $templates = [];
+
+	/**
+	 * Creates a template object
+	 *
+	 * @param string $template_name
+	 * @param mixed $cache_id cache id to be used with this template
+	 * @param mixed $compile_id compile id to be used with this template
+	 * @param null $parent next higher level of Smarty variables
+	 *
+	 * @return Template template object
+	 * @throws Exception
+	 */
+	public function createTemplate($template_name, $cache_id = null, $compile_id = null, $parent = null): Template {
+
+		$data = [];
+
+		// Shuffle params for backward compatibility: if 2nd param is an object, it's the parent
+		if (is_object($cache_id)) {
+			$parent = $cache_id;
+			$cache_id = null;
+		}
+
+		// Shuffle params for backward compatibility: if 2nd param is an array, it's data
+		if (is_array($cache_id)) {
+			$data = $cache_id;
+			$cache_id = null;
+		}
+
+		return $this->doCreateTemplate($template_name, $cache_id, $compile_id, $parent, null, null, false, $data);
+	}
+
+	/**
+	 * Get unique template id
+	 *
+	 * @param string $resource_name
+	 * @param null|mixed $cache_id
+	 * @param null|mixed $compile_id
+	 * @param null $caching
+	 *
+	 * @return string
+	 */
+	private function generateUniqueTemplateId(
+		$resource_name,
+		$cache_id = null,
+		$compile_id = null,
+		$caching = null
+	): string {
+		// defaults for optional params
+		$cache_id = $cache_id ?? $this->cache_id;
+		$compile_id = $compile_id ?? $this->compile_id;
+		$caching = (int)$caching ?? $this->caching;
+
+		// Add default resource type to resource name if it is missing
+		if (strpos($resource_name, ':') === false) {
+			$resource_name = "{$this->default_resource_type}:{$resource_name}";
+		}
+
+		$_templateId = $resource_name . '#' . $cache_id . '#' . $compile_id . '#' . $caching;
+
+		// hash very long IDs to prevent problems with filename length
+		// do not hash shorter IDs, so they remain recognizable
+		if (strlen($_templateId) > 150) {
+			$_templateId = sha1($_templateId);
+		}
+
+		return $_templateId;
+	}
+
+	/**
+	 * Normalize path
+	 *  - remove /./ and /../
+	 *  - make it absolute if required
+	 *
+	 * @param string $path file path
+	 * @param bool $realpath if true - convert to absolute
+	 *                         false - convert to relative
+	 *                         null - keep as it is but
+	 *                         remove /./ /../
+	 *
+	 * @return string
+	 */
+	public function _realpath($path, $realpath = null) {
+		$nds = ['/' => '\\', '\\' => '/'];
+		preg_match(
+			'%^(?<root>(?:[[:alpha:]]:[\\\\/]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(.*))$%u',
+			$path,
+			$parts
+		);
+		$path = $parts['path'];
+		if ($parts['root'] === '\\') {
+			$parts['root'] = substr(getcwd(), 0, 2) . $parts['root'];
+		} else {
+			if ($realpath !== null && !$parts['root']) {
+				$path = getcwd() . DIRECTORY_SEPARATOR . $path;
+			}
+		}
+		// normalize DIRECTORY_SEPARATOR
+		$path = str_replace($nds[DIRECTORY_SEPARATOR], DIRECTORY_SEPARATOR, $path);
+		$parts['root'] = str_replace($nds[DIRECTORY_SEPARATOR], DIRECTORY_SEPARATOR, $parts['root']);
+		do {
+			$path = preg_replace(
+				['#[\\\\/]{2}#', '#[\\\\/][.][\\\\/]#', '#[\\\\/]([^\\\\/.]+)[\\\\/][.][.][\\\\/]#'],
+				DIRECTORY_SEPARATOR,
+				$path,
+				-1,
+				$count
+			);
+		} while ($count > 0);
+		return $realpath !== false ? $parts['root'] . $path : str_ireplace(getcwd(), '.', $parts['root'] . $path);
+	}
+
+	/**
+	 * @param boolean $use_sub_dirs
+	 */
+	public function setUseSubDirs($use_sub_dirs) {
+		$this->use_sub_dirs = $use_sub_dirs;
+	}
+
+	/**
+	 * @param int $error_reporting
+	 */
+	public function setErrorReporting($error_reporting) {
+		$this->error_reporting = $error_reporting;
+	}
+
+	/**
+	 * @param boolean $escape_html
+	 */
+	public function setEscapeHtml($escape_html) {
+		$this->escape_html = $escape_html;
+	}
+
+	/**
+	 * Return auto_literal flag
+	 *
+	 * @return boolean
+	 */
+	public function getAutoLiteral() {
+		return $this->auto_literal;
+	}
+
+	/**
+	 * Set auto_literal flag
+	 *
+	 * @param boolean $auto_literal
+	 */
+	public function setAutoLiteral($auto_literal = true) {
+		$this->auto_literal = $auto_literal;
+	}
+
+	/**
+	 * @param boolean $force_compile
+	 */
+	public function setForceCompile($force_compile) {
+		$this->force_compile = $force_compile;
+	}
+
+	/**
+	 * @param boolean $merge_compiled_includes
+	 */
+	public function setMergeCompiledIncludes($merge_compiled_includes) {
+		$this->merge_compiled_includes = $merge_compiled_includes;
+	}
+
+	/**
+	 * Get left delimiter
+	 *
+	 * @return string
+	 */
+	public function getLeftDelimiter() {
+		return $this->left_delimiter;
+	}
+
+	/**
+	 * Set left delimiter
+	 *
+	 * @param string $left_delimiter
+	 */
+	public function setLeftDelimiter($left_delimiter) {
+		$this->left_delimiter = $left_delimiter;
+	}
+
+	/**
+	 * Get right delimiter
+	 *
+	 * @return string $right_delimiter
+	 */
+	public function getRightDelimiter() {
+		return $this->right_delimiter;
+	}
+
+	/**
+	 * Set right delimiter
+	 *
+	 * @param string
+	 */
+	public function setRightDelimiter($right_delimiter) {
+		$this->right_delimiter = $right_delimiter;
+	}
+
+	/**
+	 * @param boolean $debugging
+	 */
+	public function setDebugging($debugging) {
+		$this->debugging = $debugging;
+	}
+
+	/**
+	 * @param boolean $config_overwrite
+	 */
+	public function setConfigOverwrite($config_overwrite) {
+		$this->config_overwrite = $config_overwrite;
+	}
+
+	/**
+	 * @param boolean $config_booleanize
+	 */
+	public function setConfigBooleanize($config_booleanize) {
+		$this->config_booleanize = $config_booleanize;
+	}
+
+	/**
+	 * @param boolean $config_read_hidden
+	 */
+	public function setConfigReadHidden($config_read_hidden) {
+		$this->config_read_hidden = $config_read_hidden;
+	}
+
+	/**
+	 * @param boolean $compile_locking
+	 */
+	public function setCompileLocking($compile_locking) {
+		$this->compile_locking = $compile_locking;
+	}
+
+	/**
+	 * @param string $default_resource_type
+	 */
+	public function setDefaultResourceType($default_resource_type) {
+		$this->default_resource_type = $default_resource_type;
+	}
+
+	/**
+	 * Test install
+	 *
+	 * @param null $errors
+	 */
+	public function testInstall(&$errors = null) {
+		\Smarty\TestInstall::testInstall($this, $errors);
+	}
+
+	/**
+	 * Get Smarty object
+	 *
+	 * @return static
+	 */
+	public function getSmarty() {
+		return $this;
+	}
+
+	/**
+	 * Normalize and set directory string
+	 *
+	 * @param string $dirName cache_dir or compile_dir
+	 * @param string $dir filepath of folder
+	 */
+	private function _normalizeDir($dirName, $dir) {
+		$this->{$dirName} = $this->_realpath(rtrim($dir ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
+	}
+
+	/**
+	 * Normalize template_dir or config_dir
+	 *
+	 * @param bool $isConfig true for config_dir
+	 */
+	private function _normalizeTemplateConfig($isConfig) {
+		if ($isConfig) {
+			$processed = &$this->_processedConfigDir;
+			$dir = &$this->config_dir;
+		} else {
+			$processed = &$this->_processedTemplateDir;
+			$dir = &$this->template_dir;
+		}
+		if (!is_array($dir)) {
+			$dir = (array)$dir;
+		}
+		foreach ($dir as $k => $v) {
+			if (!isset($processed[$k])) {
+				$dir[$k] = $this->_realpath(rtrim($v ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
+				$processed[$k] = true;
+			}
+		}
+
+		if ($isConfig) {
+			$this->_configDirNormalized = true;
+			$this->_joined_config_dir = join('#', $this->config_dir);
+		} else {
+			$this->_templateDirNormalized = true;
+			$this->_joined_template_dir = join('#', $this->template_dir);
+		}
+
+	}
+
+	/**
+	 * Mutes errors for "undefined index", "undefined array key" and "trying to read property of null".
+	 *
+	 * @void
+	 */
+	public function muteUndefinedOrNullWarnings(): void {
+		$this->isMutingUndefinedOrNullWarnings = true;
+	}
+
+	/**
+	 * Indicates if Smarty will mute errors for "undefined index", "undefined array key" and "trying to read property of null".
+	 *
+	 * @return bool
+	 */
+	public function isMutingUndefinedOrNullWarnings(): bool {
+		return $this->isMutingUndefinedOrNullWarnings;
+	}
+
+	/**
+	 * Empty cache for a specific template
+	 *
+	 * @param string $template_name template name
+	 * @param string $cache_id cache id
+	 * @param string $compile_id compile id
+	 * @param integer $exp_time expiration time
+	 * @param string $type resource type
+	 *
+	 * @return int number of cache files deleted
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::clearCache()
+	 */
+	public function clearCache(
+		$template_name,
+		$cache_id = null,
+		$compile_id = null,
+		$exp_time = null
+	) {
+		return $this->getCacheResource()->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
+	}
+
+	/**
+	 * Empty cache folder
+	 *
+	 * @param integer $exp_time expiration time
+	 * @param string $type resource type
+	 *
+	 * @return int number of cache files deleted
+	 *
+	 * @api  Smarty::clearAllCache()
+	 */
+	public function clearAllCache($exp_time = null) {
+		return $this->getCacheResource()->clearAll($this, $exp_time);
+	}
+
+	/**
+	 * Delete compiled template file
+	 *
+	 * @param string $resource_name template name
+	 * @param string $compile_id compile id
+	 * @param integer $exp_time expiration time
+	 *
+	 * @return int number of template files deleted
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::clearCompiledTemplate()
+	 */
+	public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) {
+		$_compile_dir = $this->getCompileDir();
+		if ($_compile_dir === '/') { //We should never want to delete this!
+			return 0;
+		}
+		$_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+		$_dir_sep = $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+		if (isset($resource_name)) {
+			$_save_stat = $this->caching;
+			$this->caching = \Smarty\Smarty::CACHING_OFF;
+			/* @var Template $tpl */
+			$tpl = $this->doCreateTemplate($resource_name);
+			$this->caching = $_save_stat;
+			if (!$tpl->getSource()->handler->recompiled && $tpl->getSource()->exists) {
+				$_resource_part_1 = basename(str_replace('^', DIRECTORY_SEPARATOR, $tpl->getCompiled()->filepath));
+				$_resource_part_1_length = strlen($_resource_part_1);
+			} else {
+				return 0;
+			}
+			$_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
+			$_resource_part_2_length = strlen($_resource_part_2);
+		}
+		$_dir = $_compile_dir;
+		if ($this->use_sub_dirs && isset($_compile_id)) {
+			$_dir .= $_compile_id . $_dir_sep;
+		}
+		if (isset($_compile_id)) {
+			$_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
+			$_compile_id_part_length = strlen($_compile_id_part);
+		}
+		$_count = 0;
+		try {
+			$_compileDirs = new RecursiveDirectoryIterator($_dir);
+		} catch (\UnexpectedValueException $e) {
+			// path not found / not a dir
+			return 0;
+		}
+		$_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
+		foreach ($_compile as $_file) {
+			if (substr(basename($_file->getPathname()), 0, 1) === '.') {
+				continue;
+			}
+			$_filepath = (string)$_file;
+			if ($_file->isDir()) {
+				if (!$_compile->isDot()) {
+					// delete folder if empty
+					@rmdir($_file->getPathname());
+				}
+			} else {
+				// delete only php files
+				if (substr($_filepath, -4) !== '.php') {
+					continue;
+				}
+				$unlink = false;
+				if ((!isset($_compile_id) ||
+						(isset($_filepath[$_compile_id_part_length]) &&
+							$a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
+					&& (!isset($resource_name) || (isset($_filepath[$_resource_part_1_length])
+							&& substr_compare(
+								$_filepath,
+								$_resource_part_1,
+								-$_resource_part_1_length,
+								$_resource_part_1_length
+							) === 0) || (isset($_filepath[$_resource_part_2_length])
+							&& substr_compare(
+								$_filepath,
+								$_resource_part_2,
+								-$_resource_part_2_length,
+								$_resource_part_2_length
+							) === 0))
+				) {
+					if (isset($exp_time)) {
+						if (is_file($_filepath) && time() - filemtime($_filepath) >= $exp_time) {
+							$unlink = true;
+						}
+					} else {
+						$unlink = true;
+					}
+				}
+				if ($unlink && is_file($_filepath) && @unlink($_filepath)) {
+					$_count++;
+					if (function_exists('opcache_invalidate')
+						&& (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api')) < 1)
+					) {
+						opcache_invalidate($_filepath, true);
+					} elseif (function_exists('apc_delete_file')) {
+						apc_delete_file($_filepath);
+					}
+				}
+			}
+		}
+		return $_count;
+	}
+
+	/**
+	 * Compile all template files
+	 *
+	 * @param string $extension file extension
+	 * @param bool $force_compile force all to recompile
+	 * @param int $time_limit
+	 * @param int $max_errors
+	 *
+	 * @return integer number of template files recompiled
+	 * @api Smarty::compileAllTemplates()
+	 *
+	 */
+	public function compileAllTemplates(
+		$extension = '.tpl',
+		$force_compile = false,
+		$time_limit = 0,
+		$max_errors = null
+	) {
+		return $this->compileAll($extension, $force_compile, $time_limit, $max_errors);
+	}
+
+	/**
+	 * Compile all config files
+	 *
+	 * @param string $extension file extension
+	 * @param bool $force_compile force all to recompile
+	 * @param int $time_limit
+	 * @param int $max_errors
+	 *
+	 * @return int number of template files recompiled
+	 * @api Smarty::compileAllConfig()
+	 *
+	 */
+	public function compileAllConfig(
+		$extension = '.conf',
+		$force_compile = false,
+		$time_limit = 0,
+		$max_errors = null
+	) {
+		return $this->compileAll($extension, $force_compile, $time_limit, $max_errors, true);
+	}
+
+	/**
+	 * Compile all template or config files
+	 *
+	 * @param string $extension template file name extension
+	 * @param bool $force_compile force all to recompile
+	 * @param int $time_limit set maximum execution time
+	 * @param int $max_errors set maximum allowed errors
+	 * @param bool $isConfig flag true if called for config files
+	 *
+	 * @return int number of template files compiled
+	 */
+	protected function compileAll(
+		$extension,
+		$force_compile,
+		$time_limit,
+		$max_errors,
+		$isConfig = false
+	) {
+		// switch off time limit
+		if (function_exists('set_time_limit')) {
+			@set_time_limit($time_limit);
+		}
+		$_count = 0;
+		$_error_count = 0;
+		$sourceDir = $isConfig ? $this->getConfigDir() : $this->getTemplateDir();
+		// loop over array of source directories
+		foreach ($sourceDir as $_dir) {
+			$_dir_1 = new RecursiveDirectoryIterator(
+				$_dir,
+				defined('FilesystemIterator::FOLLOW_SYMLINKS') ?
+					FilesystemIterator::FOLLOW_SYMLINKS : 0
+			);
+			$_dir_2 = new RecursiveIteratorIterator($_dir_1);
+			foreach ($_dir_2 as $_fileinfo) {
+				$_file = $_fileinfo->getFilename();
+				if (substr(basename($_fileinfo->getPathname()), 0, 1) === '.' || strpos($_file, '.svn') !== false) {
+					continue;
+				}
+				if (substr_compare($_file, $extension, -strlen($extension)) !== 0) {
+					continue;
+				}
+				if ($_fileinfo->getPath() !== substr($_dir, 0, -1)) {
+					$_file = substr($_fileinfo->getPath(), strlen($_dir)) . DIRECTORY_SEPARATOR . $_file;
+				}
+				echo "\n", $_dir, '---', $_file;
+				flush();
+				$_start_time = microtime(true);
+				$_smarty = clone $this;
+				//
+				$_smarty->force_compile = $force_compile;
+				try {
+					$_tpl = $this->doCreateTemplate($_file);
+					$_tpl->caching = self::CACHING_OFF;
+					$_tpl->setSource(
+						$isConfig ? \Smarty\Template\Config::load($_tpl) : \Smarty\Template\Source::load($_tpl)
+					);
+					if ($_tpl->mustCompile()) {
+						$_tpl->compileTemplateSource();
+						$_count++;
+						echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+						flush();
+					} else {
+						echo ' is up to date';
+						flush();
+					}
+				} catch (\Exception $e) {
+					echo "\n        ------>Error: ", $e->getMessage(), "\n";
+					$_error_count++;
+				}
+				// free memory
+				unset($_tpl);
+				if ($max_errors !== null && $_error_count === $max_errors) {
+					echo "\ntoo many errors\n";
+					exit(1);
+				}
+			}
+		}
+		echo "\n";
+		return $_count;
+	}
+
+	/**
+	 * check client side cache
+	 *
+	 * @param \Smarty\Template\Cached $cached
+	 * @param Template $_template
+	 * @param string $content
+	 *
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 */
+	public function cacheModifiedCheck(Template\Cached $cached, Template $_template, $content) {
+		$_isCached = $_template->isCached() && !$_template->getCompiled()->getNocacheCode();
+		$_last_modified_date =
+			@substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
+		if ($_isCached && $cached->timestamp <= strtotime($_last_modified_date)) {
+			switch (PHP_SAPI) {
+				case 'cgi': // php-cgi < 5.3
+				case 'cgi-fcgi': // php-cgi >= 5.3
+				case 'fpm-fcgi': // php-fpm >= 5.3.3
+					header('Status: 304 Not Modified');
+					break;
+				case 'cli':
+					if (/* ^phpunit */
+					!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+					) {
+						$_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+					}
+					break;
+				default:
+					if (/* ^phpunit */
+					!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+					) {
+						$_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+					} else {
+						header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
+					}
+					break;
+			}
+		} else {
+			switch (PHP_SAPI) {
+				case 'cli':
+					if (/* ^phpunit */
+					!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+					) {
+						$_SERVER['SMARTY_PHPUNIT_HEADERS'][] =
+							'Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT';
+					}
+					break;
+				default:
+					header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT');
+					break;
+			}
+			echo $content;
+		}
+	}
+
+	public function getModifierCallback(string $modifierName) {
+		foreach ($this->getExtensions() as $extension) {
+			if ($callback = $extension->getModifierCallback($modifierName)) {
+				return [new CallbackWrapper($modifierName, $callback), 'handle'];
+			}
+		}
+		return null;
+	}
+
+	public function getFunctionHandler(string $functionName): ?\Smarty\FunctionHandler\FunctionHandlerInterface {
+		foreach ($this->getExtensions() as $extension) {
+			if ($handler = $extension->getFunctionHandler($functionName)) {
+				return $handler;
+			}
+		}
+		return null;
+	}
+
+	public function getBlockHandler(string $blockTagName): ?\Smarty\BlockHandler\BlockHandlerInterface {
+		foreach ($this->getExtensions() as $extension) {
+			if ($handler = $extension->getBlockHandler($blockTagName)) {
+				return $handler;
+			}
+		}
+		return null;
+	}
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface {
+		foreach ($this->getExtensions() as $extension) {
+			if ($handler = $extension->getModifierCompiler($modifier)) {
+				return $handler;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Run pre-filters over template source
+	 *
+	 * @param string $source the content which shall be processed by the filters
+	 * @param Template $template template object
+	 *
+	 * @return string                   the filtered source
+	 */
+	public function runPreFilters($source, Template $template) {
+
+		foreach ($this->getExtensions() as $extension) {
+			/** @var \Smarty\Filter\FilterInterface $filter */
+			foreach ($extension->getPreFilters() as $filter) {
+				$source = $filter->filter($source, $template);
+			}
+		}
+
+		// return filtered output
+		return $source;
+	}
+
+	/**
+	 * Run post-filters over template's compiled code
+	 *
+	 * @param string $code the content which shall be processed by the filters
+	 * @param Template $template template object
+	 *
+	 * @return string                   the filtered code
+	 */
+	public function runPostFilters($code, Template $template) {
+
+		foreach ($this->getExtensions() as $extension) {
+			/** @var \Smarty\Filter\FilterInterface $filter */
+			foreach ($extension->getPostFilters() as $filter) {
+				$code = $filter->filter($code, $template);
+			}
+		}
+
+		// return filtered output
+		return $code;
+	}
+
+	/**
+	 * Run filters over template output
+	 *
+	 * @param string $content the content which shall be processed by the filters
+	 * @param Template $template template object
+	 *
+	 * @return string                   the filtered (modified) output
+	 */
+	public function runOutputFilters($content, Template $template) {
+
+		foreach ($this->getExtensions() as $extension) {
+			/** @var \Smarty\Filter\FilterInterface $filter */
+			foreach ($extension->getOutputFilters() as $filter) {
+				$content = $filter->filter($content, $template);
+			}
+		}
+
+		// return filtered output
+		return $content;
+	}
+
+	/**
+	 * Writes file in a safe way to disk
+	 *
+	 * @param string $_filepath complete filepath
+	 * @param string $_contents file content
+	 *
+	 * @return boolean true
+	 * @throws Exception
+	 */
+	public function writeFile($_filepath, $_contents) {
+		$_error_reporting = error_reporting();
+		error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
+		$_dirpath = dirname($_filepath);
+		// if subdirs, create dir structure
+		if ($_dirpath !== '.') {
+			$i = 0;
+			// loop if concurrency problem occurs
+			// see https://bugs.php.net/bug.php?id=35326
+			while (!is_dir($_dirpath)) {
+				if (@mkdir($_dirpath, 0777, true)) {
+					break;
+				}
+				clearstatcache();
+				if (++$i === 3) {
+					error_reporting($_error_reporting);
+					throw new Exception("unable to create directory {$_dirpath}");
+				}
+				sleep(1);
+			}
+		}
+		// write to tmp file, then move to overt file lock race condition
+		$_tmp_file = $_dirpath . DIRECTORY_SEPARATOR . str_replace(['.', ','], '_', uniqid('wrt', true));
+		if (!file_put_contents($_tmp_file, $_contents)) {
+			error_reporting($_error_reporting);
+			throw new Exception("unable to write file {$_tmp_file}");
+		}
+		/*
+		 * Windows' rename() fails if the destination exists,
+		 * Linux' rename() properly handles the overwrite.
+		 * Simply unlink()ing a file might cause other processes
+		 * currently reading that file to fail, but linux' rename()
+		 * seems to be smart enough to handle that for us.
+		 */
+		if (\Smarty\Smarty::$_IS_WINDOWS) {
+			// remove original file
+			if (is_file($_filepath)) {
+				@unlink($_filepath);
+			}
+			// rename tmp file
+			$success = @rename($_tmp_file, $_filepath);
+		} else {
+			// rename tmp file
+			$success = @rename($_tmp_file, $_filepath);
+			if (!$success) {
+				// remove original file
+				if (is_file($_filepath)) {
+					@unlink($_filepath);
+				}
+				// rename tmp file
+				$success = @rename($_tmp_file, $_filepath);
+			}
+		}
+		if (!$success) {
+			error_reporting($_error_reporting);
+			throw new Exception("unable to write file {$_filepath}");
+		}
+		// set file permissions
+		@chmod($_filepath, 0666 & ~umask());
+		error_reporting($_error_reporting);
+		return true;
+	}
+
+	private $runtimes = [];
+
+	/**
+	 * Loads and returns a runtime extension or null if not found
+	 *
+	 * @param string $type
+	 *
+	 * @return object|null
+	 */
+	public function getRuntime(string $type) {
+
+		if (isset($this->runtimes[$type])) {
+			return $this->runtimes[$type];
+		}
+
+		// Lazy load runtimes when/if needed
+		switch ($type) {
+			case 'Capture':
+				return $this->runtimes[$type] = new CaptureRuntime();
+			case 'Foreach':
+				return $this->runtimes[$type] = new ForeachRuntime();
+			case 'Inheritance':
+				return $this->runtimes[$type] = new InheritanceRuntime();
+			case 'TplFunction':
+				return $this->runtimes[$type] = new TplFunctionRuntime();
+			case 'DefaultPluginHandler':
+				return $this->runtimes[$type] = new DefaultPluginHandlerRuntime(
+					$this->getDefaultPluginHandlerFunc()
+				);
+		}
+
+		throw new \Smarty\Exception('Trying to load invalid runtime ' . $type);
+	}
+
+	/**
+	 * Indicates if a runtime is available.
+	 *
+	 * @param string $type
+	 *
+	 * @return bool
+	 */
+	public function hasRuntime(string $type): bool {
+		try {
+			$this->getRuntime($type);
+			return true;
+		} catch (\Smarty\Exception $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * @return callable|null
+	 */
+	public function getDefaultPluginHandlerFunc(): ?callable {
+		return $this->default_plugin_handler_func;
+	}
+
+	/**
+	 * load a filter of specified type and name
+	 *
+	 * @param string $type filter type
+	 * @param string $name filter name
+	 *
+	 * @return bool
+	 * @throws \Smarty\Exception
+	 * @api  Smarty::loadFilter()
+	 *
+	 * @deprecated since 5.0
+	 */
+	public function loadFilter($type, $name) {
+
+		if ($type == \Smarty\Smarty::FILTER_VARIABLE) {
+			foreach ($this->getExtensions() as $extension) {
+				if ($extension->getModifierCallback($name)) {
+
+					trigger_error('Using Smarty::loadFilter() to load variable filters is deprecated and will ' .
+						'be removed in a future release. Use Smarty::addDefaultModifiers() to add a modifier.',
+						E_USER_DEPRECATED);
+
+					$this->addDefaultModifiers([$name]);
+					return true;
+				}
+			}
+		}
+
+		trigger_error('Using Smarty::loadFilter() to load filters is deprecated and will be ' .
+			'removed in a future release. Use Smarty::addExtension() to add an extension or Smarty::registerFilter to ' .
+			'quickly register a filter using a callback function.', E_USER_DEPRECATED);
+
+		if ($type == \Smarty\Smarty::FILTER_OUTPUT && $name == 'trimwhitespace') {
+			$this->BCPluginsAdapter->addOutputFilter(new TrimWhitespace());
+			return true;
+		}
+
+		$_plugin = "smarty_{$type}filter_{$name}";
+		if (!is_callable($_plugin) && class_exists($_plugin, false)) {
+			$_plugin = [$_plugin, 'execute'];
+		}
+
+		if (is_callable($_plugin)) {
+			$this->registerFilter($type, $_plugin, $name);
+			return true;
+		}
+
+		throw new Exception("{$type}filter '{$name}' not found or callable");
+	}
+
+	/**
+	 * load a filter of specified type and name
+	 *
+	 * @param string $type filter type
+	 * @param string $name filter name
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 * @api  Smarty::unloadFilter()
+	 *
+	 *
+	 * @deprecated since 5.0
+	 */
+	public function unloadFilter($type, $name) {
+		trigger_error('Using Smarty::unloadFilter() to unload filters is deprecated and will be ' .
+			'removed in a future release. Use Smarty::addExtension() to add an extension or Smarty::(un)registerFilter to ' .
+			'quickly (un)register a filter using a callback function.', E_USER_DEPRECATED);
+
+		return $this->unregisterFilter($type, $name);
+	}
+
+	private $_caching_type = 'file';
+
+	/**
+	 * @param $type
+	 *
+	 * @return void
+	 * @deprecated since 5.0
+	 */
+	public function setCachingType($type) {
+		trigger_error('Using Smarty::setCachingType() is deprecated and will be ' .
+			'removed in a future release. Use Smarty::setCacheResource() instead.', E_USER_DEPRECATED);
+		$this->_caching_type = $type;
+		$this->activateBCCacheResource();
+	}
+
+	/**
+	 * @return string
+	 * @deprecated since 5.0
+	 */
+	public function getCachingType(): string {
+		trigger_error('Using Smarty::getCachingType() is deprecated and will be ' .
+			'removed in a future release.', E_USER_DEPRECATED);
+		return $this->_caching_type;
+	}
+
+	/**
+	 * Registers a resource to fetch a template
+	 *
+	 * @param string $name name of resource type
+	 * @param Base $resource_handler
+	 *
+	 * @return static
+	 *
+	 * @api  Smarty::registerCacheResource()
+	 *
+	 * @deprecated since 5.0
+	 */
+	public function registerCacheResource($name, \Smarty\Cacheresource\Base $resource_handler) {
+
+		trigger_error('Using Smarty::registerCacheResource() is deprecated and will be ' .
+			'removed in a future release. Use Smarty::setCacheResource() instead.', E_USER_DEPRECATED);
+
+		$this->registered_cache_resources[$name] = $resource_handler;
+		$this->activateBCCacheResource();
+		return $this;
+	}
+
+	/**
+	 * Unregisters a resource to fetch a template
+	 *
+	 * @param                                                                 $name
+	 *
+	 * @return static
+	 * @api  Smarty::unregisterCacheResource()
+	 *
+	 * @deprecated since 5.0
+	 *
+	 */
+	public function unregisterCacheResource($name) {
+
+		trigger_error('Using Smarty::unregisterCacheResource() is deprecated and will be ' .
+			'removed in a future release.', E_USER_DEPRECATED);
+
+		if (isset($this->registered_cache_resources[$name])) {
+			unset($this->registered_cache_resources[$name]);
+		}
+		return $this;
+	}
+
+	private function activateBCCacheResource() {
+		if ($this->_caching_type == 'file') {
+			$this->setCacheResource(new File());
+		}
+		if (isset($this->registered_cache_resources[$this->_caching_type])) {
+			$this->setCacheResource($this->registered_cache_resources[$this->_caching_type]);
+		}
+	}
+
+	/**
+	 * Registers a filter function
+	 *
+	 * @param string $type filter type
+	 * @param callable $callback
+	 * @param string|null $name optional filter name
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::registerFilter()
+	 */
+	public function registerFilter($type, $callback, $name = null) {
+		$name = $name ?? $this->_getFilterName($callback);
+		if (!is_callable($callback)) {
+			throw new Exception("{$type}filter '{$name}' not callable");
+		}
+		switch ($type) {
+			case 'variable':
+				$this->registerPlugin(self::PLUGIN_MODIFIER, $name, $callback);
+				trigger_error('Using Smarty::registerFilter() to register variable filters is deprecated and ' .
+					'will be removed in a future release. Use Smarty::addDefaultModifiers() to add a modifier.',
+					E_USER_DEPRECATED);
+
+				$this->addDefaultModifiers([$name]);
+				break;
+			case 'output':
+				$this->BCPluginsAdapter->addCallableAsOutputFilter($callback, $name);
+				break;
+			case 'pre':
+				$this->BCPluginsAdapter->addCallableAsPreFilter($callback, $name);
+				break;
+			case 'post':
+				$this->BCPluginsAdapter->addCallableAsPostFilter($callback, $name);
+				break;
+			default:
+				throw new Exception("Illegal filter type '{$type}'");
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Return internal filter name
+	 *
+	 * @param callback $callable
+	 *
+	 * @return string|null   internal filter name or null if callable cannot be serialized
+	 */
+	private function _getFilterName($callable) {
+		if (is_array($callable)) {
+			$_class_name = is_object($callable[0]) ? get_class($callable[0]) : $callable[0];
+			return $_class_name . '_' . $callable[1];
+		} elseif (is_string($callable)) {
+			return $callable;
+		}
+		return null;
+	}
+
+	/**
+	 * Unregisters a filter function. Smarty cannot unregister closures/anonymous functions if
+	 * no name was given in ::registerFilter.
+	 *
+	 * @param string $type filter type
+	 * @param callback|string $name the name previously used in ::registerFilter
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 * @api  Smarty::unregisterFilter()
+	 *
+	 *
+	 */
+	public function unregisterFilter($type, $name) {
+
+		if (!is_string($name)) {
+			$name = $this->_getFilterName($name);
+		}
+
+		if ($name) {
+			switch ($type) {
+				case 'output':
+					$this->BCPluginsAdapter->removeOutputFilter($name);
+					break;
+				case 'pre':
+					$this->BCPluginsAdapter->removePreFilter($name);
+					break;
+				case 'post':
+					$this->BCPluginsAdapter->removePostFilter($name);
+					break;
+				default:
+					throw new Exception("Illegal filter type '{$type}'");
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add default modifiers
+	 *
+	 * @param array|string $modifiers modifier or list of modifiers
+	 *                                                                                   to add
+	 *
+	 * @return static
+	 * @api Smarty::addDefaultModifiers()
+	 *
+	 */
+	public function addDefaultModifiers($modifiers) {
+		if (is_array($modifiers)) {
+			$this->default_modifiers = array_merge($this->default_modifiers, $modifiers);
+		} else {
+			$this->default_modifiers[] = $modifiers;
+		}
+		return $this;
+	}
+
+	/**
+	 * Get default modifiers
+	 *
+	 * @return array list of default modifiers
+	 * @api Smarty::getDefaultModifiers()
+	 *
+	 */
+	public function getDefaultModifiers() {
+		return $this->default_modifiers;
+	}
+
+	/**
+	 * Set default modifiers
+	 *
+	 * @param array|string $modifiers modifier or list of modifiers
+	 *                                                                                   to set
+	 *
+	 * @return static
+	 * @api Smarty::setDefaultModifiers()
+	 *
+	 */
+	public function setDefaultModifiers($modifiers) {
+		$this->default_modifiers = (array)$modifiers;
+		return $this;
+	}
+
+	/**
+	 * @return Cacheresource\Base
+	 */
+	public function getCacheResource(): Cacheresource\Base {
+		return $this->cacheResource;
+	}
+
+	/**
+	 * @param Cacheresource\Base $cacheResource
+	 */
+	public function setCacheResource(Cacheresource\Base $cacheResource): void {
+		$this->cacheResource = $cacheResource;
+	}
+
+	/**
+	 * fetches a rendered Smarty template
+	 *
+	 * @param string $template the resource handle of the template file or template object
+	 * @param mixed $cache_id cache id to be used with this template
+	 * @param mixed $compile_id compile id to be used with this template
+	 *
+	 * @return string rendered template output
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function fetch($template = null, $cache_id = null, $compile_id = null) {
+		return $this->returnOrCreateTemplate($template, $cache_id, $compile_id)->fetch();
+	}
+
+	/**
+	 * displays a Smarty template
+	 *
+	 * @param string $template the resource handle of the template file or template object
+	 * @param mixed $cache_id cache id to be used with this template
+	 * @param mixed $compile_id compile id to be used with this template
+	 *
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 */
+	public function display($template = null, $cache_id = null, $compile_id = null) {
+		$this->returnOrCreateTemplate($template, $cache_id, $compile_id)->display();
+	}
+
+	/**
+	 * @param $resource_name
+	 * @param $cache_id
+	 * @param $compile_id
+	 * @param $parent
+	 * @param $caching
+	 * @param $cache_lifetime
+	 * @param bool $isConfig
+	 * @param array $data
+	 *
+	 * @return Template
+	 * @throws Exception
+	 */
+	public function doCreateTemplate(
+		$resource_name,
+		$cache_id = null,
+		$compile_id = null,
+		$parent = null,
+		$caching = null,
+		$cache_lifetime = null,
+		bool $isConfig = false,
+		array $data = []): Template {
+
+		if (!$this->_templateDirNormalized) {
+			$this->_normalizeTemplateConfig(false);
+		}
+
+		$_templateId = $this->generateUniqueTemplateId($resource_name, $cache_id, $compile_id, $caching);
+
+		if (!isset($this->templates[$_templateId])) {
+			$newTemplate = new Template($resource_name, $this, $parent ?: $this, $cache_id, $compile_id, $caching, $isConfig);
+			$newTemplate->templateId = $_templateId; // @TODO this could go in constructor ^?
+			$this->templates[$_templateId] = $newTemplate;
+		}
+
+		$tpl = clone $this->templates[$_templateId];
+
+		$tpl->setParent($parent ?: $this);
+
+		if ($cache_lifetime) {
+			$tpl->setCacheLifetime($cache_lifetime);
+		}
+
+		// fill data if present
+		foreach ($data as $_key => $_val) {
+			$tpl->assign($_key, $_val);
+		}
+
+		$tpl->tplFunctions = array_merge($parent->tplFunctions ?? [], $tpl->tplFunctions ?? []);
+
+		if (!$this->debugging && $this->debugging_ctrl === 'URL') {
+			$tpl->getSmarty()->getDebug()->debugUrl($tpl->getSmarty());
+		}
+		return $tpl;
+	}
+
+	/**
+	 * test if cache is valid
+	 *
+	 * @param null|string|Template $template the resource handle of the template file or template
+	 *                                                          object
+	 * @param mixed $cache_id cache id to be used with this template
+	 * @param mixed $compile_id compile id to be used with this template
+	 *
+	 * @return bool cache status
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::isCached()
+	 */
+	public function isCached($template = null, $cache_id = null, $compile_id = null) {
+		return $this->returnOrCreateTemplate($template, $cache_id, $compile_id)->isCached();
+	}
+
+	/**
+	 * @param $template
+	 * @param $cache_id
+	 * @param $compile_id
+	 * @param $parent
+	 *
+	 * @return Template
+	 * @throws Exception
+	 */
+	private function returnOrCreateTemplate($template, $cache_id = null, $compile_id = null) {
+		if (!($template instanceof Template)) {
+			$template = $this->createTemplate($template, $cache_id, $compile_id, $this);
+			$template->caching = $this->caching;
+		}
+		return $template;
+	}
+
+	/**
+	 * Sets if Smarty should check If-Modified-Since headers to determine cache validity.
+	 * @param bool $cache_modified_check
+	 * @return void
+	 */
+	public function setCacheModifiedCheck($cache_modified_check): void {
+		$this->cache_modified_check = (bool) $cache_modified_check;
+	}
+
+}
+
diff --git a/include/smarty/src/Template.php b/include/smarty/src/Template.php
new file mode 100644
index 000000000..242fb2388
--- /dev/null
+++ b/include/smarty/src/Template.php
@@ -0,0 +1,732 @@
+<?php
+/**
+ * Smarty Internal Plugin Template
+ * This file contains the Smarty template engine
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty;
+
+use Smarty\Resource\BasePlugin;
+use Smarty\Runtime\InheritanceRuntime;
+use Smarty\Template\Source;
+use Smarty\Template\Cached;
+use Smarty\Template\Compiled;
+use Smarty\Template\Config;
+
+/**
+ * Main class with template data structures and methods
+ */
+#[\AllowDynamicProperties]
+class Template extends TemplateBase {
+
+	/**
+	 * caching mode to create nocache code but no cache file
+	 */
+	public const CACHING_NOCACHE_CODE = 9999;
+
+	/**
+	 * @var Compiled
+	 */
+	private $compiled = null;
+
+	/**
+	 * @var Cached
+	 */
+	private $cached = null;
+
+	/**
+	 * @var \Smarty\Compiler\Template
+	 */
+	private $compiler = null;
+
+	/**
+	 * Source instance
+	 *
+	 * @var Source|Config
+	 */
+	private $source = null;
+
+	/**
+	 * Template resource
+	 *
+	 * @var string
+	 */
+	public $template_resource = null;
+
+	/**
+	 * Template ID
+	 *
+	 * @var null|string
+	 */
+	public $templateId = null;
+
+	/**
+	 * Callbacks called before rendering template
+	 *
+	 * @var callback[]
+	 */
+	public $startRenderCallbacks = [];
+
+	/**
+	 * Callbacks called after rendering template
+	 *
+	 * @var callback[]
+	 */
+	public $endRenderCallbacks = [];
+
+	/**
+	 * Template left-delimiter. If null, defaults to $this->getSmarty()-getLeftDelimiter().
+	 *
+	 * @var string
+	 */
+	private $left_delimiter = null;
+
+	/**
+	 * Template right-delimiter. If null, defaults to $this->getSmarty()-getRightDelimiter().
+	 *
+	 * @var string
+	 */
+	private $right_delimiter = null;
+
+	/**
+	 * @var InheritanceRuntime|null
+	 */
+	private $inheritance;
+
+	/**
+	 * Create template data object
+	 * Some of the global Smarty settings copied to template scope
+	 * It load the required template resources and caching plugins
+	 *
+	 * @param string $template_resource template resource string
+	 * @param Smarty $smarty Smarty instance
+	 * @param \Smarty\Data|null $_parent back pointer to parent object with variables or null
+	 * @param mixed $_cache_id cache   id or null
+	 * @param mixed $_compile_id compile id or null
+	 * @param bool|int|null $_caching use caching?
+	 * @param bool $_isConfig
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function __construct(
+		$template_resource,
+		Smarty $smarty,
+		?\Smarty\Data $_parent = null,
+		$_cache_id = null,
+		$_compile_id = null,
+		$_caching = null,
+		$_isConfig = false
+	) {
+		$this->smarty = $smarty;
+		// Smarty parameter
+		$this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
+		$this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
+		$this->caching = (int)($_caching === null ? $this->smarty->caching : $_caching);
+		$this->cache_lifetime = $this->smarty->cache_lifetime;
+		$this->compile_check = (int)$smarty->compile_check;
+		$this->parent = $_parent;
+		// Template resource
+		$this->template_resource = $template_resource;
+
+		$this->source = $_isConfig ? Config::load($this) : Source::load($this);
+		$this->compiled = Compiled::load($this);
+
+		if ($smarty->security_policy) {
+			$smarty->security_policy->registerCallBacks($this);
+		}
+	}
+
+	/**
+	 * render template
+	 *
+	 * @param bool $no_output_filter if true do not run output filter
+	 * @param null|bool $display true: display, false: fetch null: sub-template
+	 *
+	 * @return string
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 */
+	private function render($no_output_filter = true, $display = null) {
+		if ($this->smarty->debugging) {
+			$this->smarty->getDebug()->start_template($this, $display);
+		}
+		// checks if template exists
+		if ($this->compile_check && !$this->getSource()->exists) {
+			throw new Exception(
+				"Unable to load '{$this->getSource()->type}:{$this->getSource()->name}'" .
+				($this->_isSubTpl() ? " in '{$this->parent->template_resource}'" : '')
+			);
+		}
+
+		// disable caching for evaluated code
+		if ($this->getSource()->handler->recompiled) {
+			$this->caching = \Smarty\Smarty::CACHING_OFF;
+		}
+
+		foreach ($this->startRenderCallbacks as $callback) {
+			call_user_func($callback, $this);
+		}
+
+		try {
+
+			// read from cache or render
+			if ($this->caching === \Smarty\Smarty::CACHING_LIFETIME_CURRENT || $this->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED) {
+				$this->getCached()->render($this, $no_output_filter);
+			} else {
+				$this->getCompiled()->render($this);
+			}
+
+		} finally {
+			foreach ($this->endRenderCallbacks as $callback) {
+				call_user_func($callback, $this);
+			}
+		}
+
+		// display or fetch
+		if ($display) {
+			if ($this->caching && $this->smarty->cache_modified_check) {
+				$this->smarty->cacheModifiedCheck(
+					$this->getCached(),
+					$this,
+					isset($content) ? $content : ob_get_clean()
+				);
+			} else {
+				if ((!$this->caching || $this->getCached()->getNocacheCode() || $this->getSource()->handler->recompiled)
+					&& !$no_output_filter
+				) {
+					echo $this->smarty->runOutputFilters(ob_get_clean(), $this);
+				} else {
+					echo ob_get_clean();
+				}
+			}
+			if ($this->smarty->debugging) {
+				$this->smarty->getDebug()->end_template($this);
+				// debug output
+				$this->smarty->getDebug()->display_debug($this, true);
+			}
+			return '';
+		} else {
+			if ($this->smarty->debugging) {
+				$this->smarty->getDebug()->end_template($this);
+				if ($this->smarty->debugging === 2 && $display === false) {
+					$this->smarty->getDebug()->display_debug($this, true);
+				}
+			}
+			if (
+				!$no_output_filter
+				&& (!$this->caching || $this->getCached()->getNocacheCode() || $this->getSource()->handler->recompiled)
+			) {
+
+				return $this->smarty->runOutputFilters(ob_get_clean(), $this);
+			}
+			// return cache content
+			return null;
+		}
+	}
+
+	/**
+	 * Runtime function to render sub-template
+	 *
+	 * @param string $template_name template name
+	 * @param mixed $cache_id cache id
+	 * @param mixed $compile_id compile id
+	 * @param integer $caching cache mode
+	 * @param integer $cache_lifetime lifetime of cache data
+	 * @param array $extra_vars passed parameter template variables
+	 * @param int|null $scope
+	 *
+	 * @throws Exception
+	 */
+	public function renderSubTemplate(
+		$template_name,
+		$cache_id,
+		$compile_id,
+		$caching,
+		$cache_lifetime,
+		array $extra_vars = [],
+		?int $scope = null,
+		?string $currentDir = null
+	) {
+
+		$name = $this->parseResourceName($template_name);
+		if ($currentDir && preg_match('/^\.{1,2}\//', $name)) {
+			// relative template resource name, append it to current template name
+			$template_name = $currentDir . DIRECTORY_SEPARATOR . $name;
+		}
+
+		$tpl = $this->smarty->doCreateTemplate($template_name, $cache_id, $compile_id, $this, $caching, $cache_lifetime);
+
+		$tpl->inheritance = $this->getInheritance(); // re-use the same Inheritance object inside the inheritance tree
+
+		if ($scope) {
+			$tpl->defaultScope = $scope;
+		}
+
+		if ($caching) {
+			if ($tpl->templateId !== $this->templateId && $caching !== \Smarty\Template::CACHING_NOCACHE_CODE) {
+				$tpl->getCached(true);
+			} else {
+				// re-use the same Cache object across subtemplates to gather hashes and file dependencies.
+				$tpl->setCached($this->getCached());
+			}
+		}
+
+		foreach ($extra_vars as $_key => $_val) {
+			$tpl->assign($_key, $_val);
+		}
+		if ($tpl->caching === \Smarty\Template::CACHING_NOCACHE_CODE) {
+			if ($tpl->getCompiled()->getNocacheCode()) {
+				$this->getCached()->hashes[$tpl->getCompiled()->nocache_hash] = true;
+			}
+		}
+
+		$tpl->render();
+	}
+
+	/**
+	 * Remove type indicator from resource name if present.
+	 * E.g. $this->parseResourceName('file:template.tpl') returns 'template.tpl'
+	 *
+	 * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
+	 *
+	 * @param string $resource_name    template_resource or config_resource to parse
+	 *
+	 * @return string
+	 */
+	private function parseResourceName($resource_name): string {
+		if (preg_match('/^([A-Za-z0-9_\-]{2,}):/', $resource_name, $match)) {
+			return substr($resource_name, strlen($match[0]));
+		}
+		return $resource_name;
+	}
+
+	/**
+	 * Check if this is a sub template
+	 *
+	 * @return bool true is sub template
+	 */
+	public function _isSubTpl() {
+		return isset($this->parent) && $this->parent instanceof Template;
+	}
+
+	public function assign($tpl_var, $value = null, $nocache = false, $scope = null) {
+		return parent::assign($tpl_var, $value, $nocache, $scope);
+	}
+
+	/**
+	 * Compiles the template
+	 * If the template is not evaluated the compiled template is saved on disk
+	 *
+	 * @TODO only used in compileAll and 1 unit test: can we move this and make compileAndWrite private?
+	 *
+	 * @throws \Exception
+	 */
+	public function compileTemplateSource() {
+		return $this->getCompiled()->compileAndWrite($this);
+	}
+
+	/**
+	 * Return cached content
+	 *
+	 * @return null|string
+	 * @throws Exception
+	 */
+	public function getCachedContent() {
+		return $this->getCached()->getContent($this);
+	}
+
+	/**
+	 * Writes the content to cache resource
+	 *
+	 * @param string $content
+	 *
+	 * @return bool
+	 *
+	 * @TODO this method is only used in unit tests that (mostly) try to test CacheResources.
+	 */
+	public function writeCachedContent($content) {
+		if ($this->getSource()->handler->recompiled || !$this->caching
+		) {
+			// don't write cache file
+			return false;
+		}
+		$codeframe = $this->createCodeFrame($content, '', true);
+		return $this->getCached()->writeCache($this, $codeframe);
+	}
+
+	/**
+	 * Get unique template id
+	 *
+	 * @return string
+	 */
+	public function getTemplateId() {
+		return $this->templateId;
+	}
+
+	/**
+	 * runtime error not matching capture tags
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function capture_error() {
+		throw new Exception("Not matching {capture} open/close in '{$this->template_resource}'");
+	}
+
+	/**
+	 * Return Compiled object
+	 *
+	 * @param bool $forceNew force new compiled object
+	 */
+	public function getCompiled($forceNew = false) {
+		if ($forceNew || !isset($this->compiled)) {
+			$this->compiled = Compiled::load($this);
+		}
+		return $this->compiled;
+	}
+
+	/**
+	 * Return Cached object
+	 *
+	 * @param bool $forceNew force new cached object
+	 *
+	 * @throws Exception
+	 */
+	public function getCached($forceNew = false): Cached {
+		if ($forceNew || !isset($this->cached)) {
+			$cacheResource = $this->smarty->getCacheResource();
+			$this->cached = new Cached(
+				$this->source,
+				$cacheResource,
+				$this->compile_id,
+				$this->cache_id
+			);
+			if ($this->isCachingEnabled()) {
+				$cacheResource->populate($this->cached, $this);
+			} else {
+				$this->cached->setValid(false);
+			}
+		}
+		return $this->cached;
+	}
+
+	private function isCachingEnabled(): bool {
+		return $this->caching && !$this->getSource()->handler->recompiled;
+	}
+
+	/**
+	 * Helper function for InheritanceRuntime object
+	 *
+	 * @return InheritanceRuntime
+	 * @throws Exception
+	 */
+	public function getInheritance(): InheritanceRuntime {
+		if (is_null($this->inheritance)) {
+			$this->inheritance = clone $this->getSmarty()->getRuntime('Inheritance');
+		}
+		return $this->inheritance;
+	}
+
+	/**
+	 * Sets a new InheritanceRuntime object.
+	 *
+	 * @param InheritanceRuntime $inheritanceRuntime
+	 *
+	 * @return void
+	 */
+	public function setInheritance(InheritanceRuntime $inheritanceRuntime) {
+		$this->inheritance = $inheritanceRuntime;
+	}
+
+	/**
+	 * Return Compiler object
+	 */
+	public function getCompiler() {
+		if (!isset($this->compiler)) {
+			$this->compiler = $this->getSource()->createCompiler();
+		}
+		return $this->compiler;
+	}
+
+	/**
+	 * Create code frame for compiled and cached templates
+	 *
+	 * @param string $content optional template content
+	 * @param string $functions compiled template function and block code
+	 * @param bool $cache flag for cache file
+	 * @param Compiler\Template|null $compiler
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function createCodeFrame($content = '', $functions = '', $cache = false, ?\Smarty\Compiler\Template $compiler = null) {
+		return $this->getCodeFrameCompiler()->create($content, $functions, $cache, $compiler);
+	}
+
+	/**
+	 * Template data object destructor
+	 */
+	public function __destruct() {
+		if ($this->smarty->cache_locking && $this->getCached()->is_locked) {
+			$this->getCached()->handler->releaseLock($this->smarty, $this->getCached());
+		}
+	}
+
+	/**
+	 * Returns if the current template must be compiled by the Smarty compiler
+	 * It does compare the timestamps of template source and the compiled templates and checks the force compile
+	 * configuration
+	 *
+	 * @return bool
+	 * @throws \Smarty\Exception
+	 */
+	public function mustCompile(): bool {
+		if (!$this->getSource()->exists) {
+			if ($this->_isSubTpl()) {
+				$parent_resource = " in '{$this->parent->template_resource}'";
+			} else {
+				$parent_resource = '';
+			}
+			throw new Exception("Unable to load {$this->getSource()->type} '{$this->getSource()->name}'{$parent_resource}");
+		}
+
+		// @TODO move this logic to Compiled
+		return $this->smarty->force_compile
+			|| $this->getSource()->handler->recompiled
+			|| !$this->getCompiled()->exists
+			|| ($this->compile_check &&	$this->getCompiled()->getTimeStamp() < $this->getSource()->getTimeStamp());
+	}
+
+	private function getCodeFrameCompiler(): Compiler\CodeFrame {
+		return new \Smarty\Compiler\CodeFrame($this);
+	}
+
+	/**
+	 * Get left delimiter
+	 *
+	 * @return string
+	 */
+	public function getLeftDelimiter()
+	{
+		return $this->left_delimiter ?? $this->getSmarty()->getLeftDelimiter();
+	}
+
+	/**
+	 * Set left delimiter
+	 *
+	 * @param string $left_delimiter
+	 */
+	public function setLeftDelimiter($left_delimiter)
+	{
+		$this->left_delimiter = $left_delimiter;
+	}
+
+	/**
+	 * Get right delimiter
+	 *
+	 * @return string $right_delimiter
+	 */
+	public function getRightDelimiter()
+	{
+		return $this->right_delimiter ?? $this->getSmarty()->getRightDelimiter();;
+	}
+
+	/**
+	 * Set right delimiter
+	 *
+	 * @param string
+	 */
+	public function setRightDelimiter($right_delimiter)
+	{
+		$this->right_delimiter = $right_delimiter;
+	}
+
+	/**
+	 * gets  a stream variable
+	 *
+	 * @param string                                                  $variable the stream of the variable
+	 *
+	 * @return mixed
+	 * @throws \Smarty\Exception
+	 *
+	 */
+	public function getStreamVariable($variable)
+	{
+
+		trigger_error("Using stream variables (\`\{\$foo:bar\}\`)is deprecated.", E_USER_DEPRECATED);
+
+		$_result = '';
+		$fp = fopen($variable, 'r+');
+		if ($fp) {
+			while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+				$_result .= $current_line;
+			}
+			fclose($fp);
+			return $_result;
+		}
+		if ($this->getSmarty()->error_unassigned) {
+			throw new Exception('Undefined stream variable "' . $variable . '"');
+		}
+		return null;
+	}
+	/**
+	 * @inheritdoc
+	 */
+	public function configLoad($config_file, $sections = null)
+	{
+		$confObj = parent::configLoad($config_file, $sections);
+
+		$this->getCompiled()->file_dependency[ $confObj->getSource()->uid ] =
+			array($confObj->getSource()->getResourceName(), $confObj->getSource()->getTimeStamp(), $confObj->getSource()->type);
+
+		return $confObj;
+	}
+
+	public function fetch() {
+		$result = $this->_execute(0);
+		return $result === null ? ob_get_clean() : $result;
+	}
+
+	public function display() {
+		$this->_execute(1);
+	}
+
+	/**
+	 * test if cache is valid
+	 *
+	 * @param mixed $cache_id cache id to be used with this template
+	 * @param mixed $compile_id compile id to be used with this template
+	 * @param object $parent next higher level of Smarty variables
+	 *
+	 * @return bool cache status
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::isCached()
+	 */
+	public function isCached(): bool {
+		return (bool) $this->_execute(2);
+	}
+
+	/**
+	 * fetches a rendered Smarty template
+	 *
+	 * @param string $function function type 0 = fetch,  1 = display, 2 = isCache
+	 *
+	 * @return mixed
+	 * @throws Exception
+	 * @throws \Throwable
+	 */
+	private function _execute($function) {
+
+		$smarty = $this->getSmarty();
+
+		// make sure we have integer values
+		$this->caching = (int)$this->caching;
+		// fetch template content
+		$level = ob_get_level();
+		try {
+			$_smarty_old_error_level =
+				isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
+
+			if ($smarty->isMutingUndefinedOrNullWarnings()) {
+				$errorHandler = new \Smarty\ErrorHandler();
+				$errorHandler->activate();
+			}
+
+			if ($function === 2) {
+				if ($this->caching) {
+					// return cache status of template
+					$result = $this->getCached()->isCached($this);
+				} else {
+					return false;
+				}
+			} else {
+
+				// After rendering a template, the tpl/config variables are reset, so the template can be re-used.
+				$this->pushStack();
+
+				// Start output-buffering.
+				ob_start();
+
+				$result = $this->render(false, $function);
+
+				// Restore the template to its previous state
+				$this->popStack();
+			}
+
+			if (isset($errorHandler)) {
+				$errorHandler->deactivate();
+			}
+
+			if (isset($_smarty_old_error_level)) {
+				error_reporting($_smarty_old_error_level);
+			}
+			return $result;
+		} catch (\Throwable $e) {
+			while (ob_get_level() > $level) {
+				ob_end_clean();
+			}
+			if (isset($errorHandler)) {
+				$errorHandler->deactivate();
+			}
+
+			if (isset($_smarty_old_error_level)) {
+				error_reporting($_smarty_old_error_level);
+			}
+			throw $e;
+		}
+	}
+
+	/**
+	 * @return Config|Source|null
+	 */
+	public function getSource() {
+		return $this->source;
+	}
+
+	/**
+	 * @param Config|Source|null $source
+	 */
+	public function setSource($source): void {
+		$this->source = $source;
+	}
+
+	/**
+	 * Sets the Cached object, so subtemplates can share one Cached object to gather meta-data.
+	 *
+	 * @param Cached $cached
+	 *
+	 * @return void
+	 */
+	private function setCached(Cached $cached) {
+		$this->cached = $cached;
+	}
+
+	/**
+	 * @param string $compile_id
+	 *
+	 * @throws Exception
+	 */
+	public function setCompileId($compile_id) {
+		parent::setCompileId($compile_id);
+		$this->getCompiled(true);
+		if ($this->caching) {
+			$this->getCached(true);
+		}
+	}
+
+	/**
+	 * @param string $cache_id
+	 *
+	 * @throws Exception
+	 */
+	public function setCacheId($cache_id) {
+		parent::setCacheId($cache_id);
+		$this->getCached(true);
+	}
+
+}
diff --git a/include/smarty/src/Template/Cached.php b/include/smarty/src/Template/Cached.php
new file mode 100644
index 000000000..78635db06
--- /dev/null
+++ b/include/smarty/src/Template/Cached.php
@@ -0,0 +1,428 @@
+<?php
+
+namespace Smarty\Template;
+
+use Smarty\Exception;
+use Smarty\Template;
+use Smarty\Template\Cacheresource\Base;
+use Smarty\Template\Compiler\CodeFrame;
+
+/**
+ * Represents a cached version of a template or config file.
+ * @author     Rodney Rehm
+ */
+class Cached extends GeneratedPhpFile {
+
+	/**
+	 * Cache Is Valid
+	 *
+	 * @var boolean
+	 */
+	private $valid = null;
+
+	/**
+	 * @param bool|null $valid
+	 */
+	public function setValid(?bool $valid): void {
+		$this->valid = $valid;
+	}
+
+	/**
+	 * CacheResource Handler
+	 *
+	 * @var \Smarty\Cacheresource\Base
+	 */
+	public $handler = null;
+
+	/**
+	 * Template Cache Id (\Smarty\Template::$cache_id)
+	 *
+	 * @var string
+	 */
+	public $cache_id = null;
+
+	/**
+	 * saved cache lifetime in seconds
+	 *
+	 * @var int
+	 */
+	public $cache_lifetime = 0;
+
+	/**
+	 * Id for cache locking
+	 *
+	 * @var string
+	 */
+	public $lock_id = null;
+
+	/**
+	 * flag that cache is locked by this instance
+	 *
+	 * @var bool
+	 */
+	public $is_locked = false;
+
+	/**
+	 * Source Object
+	 *
+	 * @var Source
+	 */
+	public $source = null;
+
+	/**
+	 * Nocache hash codes of processed compiled templates
+	 *
+	 * @var array
+	 */
+	public $hashes = [];
+
+	/**
+	 * Content buffer
+	 *
+	 * @var string
+	 */
+	public $content = null;
+
+	/**
+	 * create Cached Object container
+	 *
+	 * @param Source $source
+	 * @param \Smarty\Cacheresource\Base $handler
+	 * @param $compile_id
+	 * @param $cache_id
+	 */
+	public function __construct(Source $source, \Smarty\Cacheresource\Base $handler, $compile_id, $cache_id) {
+		$this->compile_id = $compile_id;
+		$this->cache_id = $cache_id;
+		$this->source = $source;
+		$this->handler = $handler;
+	}
+
+	/**
+	 * Render cache template
+	 *
+	 * @param \Smarty\Template $_template
+	 * @param bool $no_output_filter
+	 *
+	 * @throws \Exception
+	 */
+	public function render(Template $_template, $no_output_filter = true) {
+
+		if (!$this->isCached($_template)) {
+			$this->updateCache($_template, $no_output_filter);
+		} else {
+			if (!$this->processed) {
+				$this->process($_template);
+			}
+		}
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->start_cache($_template);
+		}
+
+		$this->getRenderedTemplateCode($_template, $this->unifunc);
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->end_cache($_template);
+		}
+
+	}
+
+	/**
+	 * Check if cache is valid, lock cache if required
+	 *
+	 * @param Template $_template
+	 *
+	 * @return bool flag true if cache is valid
+	 * @throws Exception
+	 */
+	public function isCached(Template $_template) {
+		if ($this->valid !== null) {
+			return $this->valid;
+		}
+		while (true) {
+			while (true) {
+				if ($this->exists === false || $_template->getSmarty()->force_compile || $_template->getSmarty()->force_cache) {
+					$this->valid = false;
+				} else {
+					$this->valid = true;
+				}
+				if ($this->valid && $_template->caching === \Smarty\Smarty::CACHING_LIFETIME_CURRENT
+					&& $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
+				) {
+					// lifetime expired
+					$this->valid = false;
+				}
+				if ($this->valid && $_template->compile_check === \Smarty\Smarty::COMPILECHECK_ON
+					&& $_template->getSource()->getTimeStamp() > $this->timestamp
+				) {
+					$this->valid = false;
+				}
+				if ($this->valid || !$_template->getSmarty()->cache_locking) {
+					break;
+				}
+				if (!$this->handler->locked($_template->getSmarty(), $this)) {
+					$this->handler->acquireLock($_template->getSmarty(), $this);
+					break 2;
+				}
+				$this->handler->populate($this, $_template);
+			}
+			if ($this->valid) {
+				if (!$_template->getSmarty()->cache_locking || $this->handler->locked($_template->getSmarty(), $this) === null) {
+					// load cache file for the following checks
+					if ($_template->getSmarty()->debugging) {
+						$_template->getSmarty()->getDebug()->start_cache($_template);
+					}
+					if ($this->handler->process($_template, $this) === false) {
+						$this->valid = false;
+					} else {
+						$this->processed = true;
+					}
+					if ($_template->getSmarty()->debugging) {
+						$_template->getSmarty()->getDebug()->end_cache($_template);
+					}
+				} else {
+					$this->is_locked = true;
+					continue;
+				}
+			} else {
+				return $this->valid;
+			}
+			if ($this->valid && $_template->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED
+				&& $_template->getCached()->cache_lifetime >= 0
+				&& (time() > ($_template->getCached()->timestamp + $_template->getCached()->cache_lifetime))
+			) {
+				$this->valid = false;
+			}
+			if ($_template->getSmarty()->cache_locking) {
+				if (!$this->valid) {
+					$this->handler->acquireLock($_template->getSmarty(), $this);
+				} elseif ($this->is_locked) {
+					$this->handler->releaseLock($_template->getSmarty(), $this);
+				}
+			}
+			return $this->valid;
+		}
+		return $this->valid;
+	}
+
+	/**
+	 * Process cached template
+	 *
+	 * @param Template $_template template object
+	 */
+	private function process(Template $_template) {
+		if ($this->handler->process($_template, $this) === false) {
+			$this->valid = false;
+		}
+		$this->processed = $this->valid;
+	}
+
+	/**
+	 * Read cache content from handler
+	 *
+	 * @param Template $_template template object
+	 *
+	 * @return string|false content
+	 */
+	public function readCache(Template $_template) {
+		if (!$_template->getSource()->handler->recompiled) {
+			return $this->handler->retrieveCachedContent($_template);
+		}
+		return false;
+	}
+
+	/**
+	 * Write this cache object to handler
+	 *
+	 * @param string $content content to cache
+	 *
+	 * @return bool success
+	 */
+	public function writeCache(Template $_template, $content) {
+		if (!$_template->getSource()->handler->recompiled) {
+			if ($this->handler->storeCachedContent($_template, $content)) {
+				$this->content = null;
+				$this->timestamp = time();
+				$this->exists = true;
+				$this->valid = true;
+				$this->cache_lifetime = $_template->cache_lifetime;
+				$this->processed = false;
+				if ($_template->getSmarty()->cache_locking) {
+					$this->handler->releaseLock($_template->getSmarty(), $this);
+				}
+				return true;
+			}
+			$this->content = null;
+			$this->timestamp = false;
+			$this->exists = false;
+			$this->valid = false;
+			$this->processed = false;
+		}
+		return false;
+	}
+
+	/**
+	 * Cache was invalid , so render from compiled and write to cache
+	 *
+	 * @param Template $_template
+	 * @param bool $no_output_filter
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	private function updateCache(Template $_template, $no_output_filter) {
+
+		ob_start();
+
+		$_template->getCompiled()->render($_template);
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->start_cache($_template);
+		}
+
+		$this->removeNoCacheHash($_template, $no_output_filter);
+		$this->process($_template);
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->end_cache($_template);
+		}
+	}
+
+	/**
+	 * Sanitize content and write it to cache resource
+	 *
+	 * @param Template $_template
+	 * @param bool $no_output_filter
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	private function removeNoCacheHash(Template $_template, $no_output_filter) {
+		$php_pattern = '/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/';
+		$content = ob_get_clean();
+		$hash_array = $this->hashes;
+		$hash_array[$_template->getCompiled()->nocache_hash] = true;
+		$hash_array = array_keys($hash_array);
+		$nocache_hash = '(' . implode('|', $hash_array) . ')';
+		$_template->getCached()->setNocacheCode(false);
+		// get text between non-cached items
+		$cache_split =
+			preg_split(
+				"!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
+				$content
+			);
+		// get non-cached items
+		preg_match_all(
+			"!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
+			$content,
+			$cache_parts
+		);
+		$content = '';
+		// loop over items, stitch back together
+		foreach ($cache_split as $curr_idx => $curr_split) {
+			if (preg_match($php_pattern, $curr_split)) {
+				// escape PHP tags in template content
+				$php_split = preg_split(
+					$php_pattern,
+					$curr_split
+				);
+				preg_match_all(
+					$php_pattern,
+					$curr_split,
+					$php_parts
+				);
+				foreach ($php_split as $idx_php => $curr_php) {
+					$content .= $curr_php;
+					if (isset($php_parts[0][$idx_php])) {
+						$content .= "<?php echo '{$php_parts[ 1 ][ $idx_php ]}'; ?>\n";
+					}
+				}
+			} else {
+				$content .= $curr_split;
+			}
+			if (isset($cache_parts[0][$curr_idx])) {
+				$_template->getCached()->setNocacheCode(true);
+				$content .= $cache_parts[2][$curr_idx];
+			}
+		}
+		if (
+			!$no_output_filter
+			&& !$_template->getCached()->getNocacheCode()
+		) {
+			$content = $_template->getSmarty()->runOutputFilters($content, $_template);
+		}
+
+		$codeframe = (new \Smarty\Compiler\CodeFrame($_template))->create($content, '', true);
+		$this->writeCache($_template, $codeframe);
+	}
+
+	/**
+	 * @return Source|null
+	 */
+	public function getSource(): ?Source {
+		return $this->source;
+	}
+
+	/**
+	 * @param Source|null $source
+	 */
+	public function setSource(?Source $source): void {
+		$this->source = $source;
+	}
+
+	/**
+	 * Returns the generated content
+	 *
+	 * @param Template $template
+	 *
+	 * @return string|null
+	 * @throws \Exception
+	 */
+	public function getContent(Template $template) {
+		ob_start();
+		$this->render($template);
+		return ob_get_clean();
+	}
+
+	/**
+	 * This function is executed automatically when a generated file is included
+	 * - Decode saved properties
+	 * - Check if file is valid
+	 *
+	 * @param Template $_template
+	 * @param array $properties special template properties
+	 *
+	 * @return bool flag if compiled or cache file is valid
+	 * @throws Exception
+	 */
+	public function isFresh(Template $_template, array $properties): bool {
+
+		// on cache resources other than file check version stored in cache code
+		if (\Smarty\Smarty::SMARTY_VERSION !== $properties['version']) {
+			return false;
+		}
+
+		$is_valid = true;
+
+		if (!empty($properties['file_dependency']) && ($_template->compile_check === \Smarty\Smarty::COMPILECHECK_ON)) {
+			$is_valid = $this->checkFileDependencies($properties['file_dependency'], $_template);
+		}
+
+		// CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
+		if ($_template->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0
+			&& (time() > ($this->timestamp + $properties['cache_lifetime']))
+		) {
+			$is_valid = false;
+		}
+
+		$this->cache_lifetime = $properties['cache_lifetime'];
+		$this->setValid($is_valid);
+
+		if ($is_valid) {
+			$this->unifunc = $properties['unifunc'];
+			$this->setNocacheCode($properties['has_nocache_code']);
+			$this->file_dependency = $properties['file_dependency'];
+		}
+		return $is_valid && !function_exists($properties['unifunc']);
+	}
+
+}
diff --git a/include/smarty/src/Template/Compiled.php b/include/smarty/src/Template/Compiled.php
new file mode 100644
index 000000000..5a07db0e6
--- /dev/null
+++ b/include/smarty/src/Template/Compiled.php
@@ -0,0 +1,305 @@
+<?php
+
+namespace Smarty\Template;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ * Represents a compiled version of a template or config file.
+ * @author     Rodney Rehm
+ */
+class Compiled extends GeneratedPhpFile {
+
+	/**
+	 * nocache hash
+	 *
+	 * @var string|null
+	 */
+	public $nocache_hash = null;
+
+	/**
+	 * Included sub templates
+	 * - index name
+	 * - value use count
+	 *
+	 * @var int[]
+	 */
+	public $includes = [];
+	/**
+	 * @var bool
+	 */
+	private $isValid = false;
+
+	/**
+	 * get a Compiled Object of this source
+	 *
+	 * @param Template $_template template object
+	 *
+	 * @return Compiled compiled object
+	 */
+	public static function load($_template) {
+		$compiled = new Compiled();
+		if ($_template->getSource()->handler->supportsCompiledTemplates()) {
+			$compiled->populateCompiledFilepath($_template);
+		}
+		return $compiled;
+	}
+
+	/**
+	 * populate Compiled Object with compiled filepath
+	 *
+	 * @param Template $_template template object
+	 **/
+	private function populateCompiledFilepath(Template $_template) {
+		$source = $_template->getSource();
+		$smarty = $_template->getSmarty();
+		$this->filepath = $smarty->getCompileDir();
+		if (isset($_template->compile_id)) {
+			$this->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) .
+				($smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^');
+		}
+		// if use_sub_dirs, break file into directories
+		if ($smarty->use_sub_dirs) {
+			$this->filepath .= $source->uid[0] . $source->uid[1] . DIRECTORY_SEPARATOR . $source->uid[2] .
+				$source->uid[3] . DIRECTORY_SEPARATOR . $source->uid[4] . $source->uid[5] .
+				DIRECTORY_SEPARATOR;
+		}
+		$this->filepath .= $source->uid . '_';
+		if ($source->isConfig) {
+			$this->filepath .= (int)$smarty->config_read_hidden + (int)$smarty->config_booleanize * 2 +
+				(int)$smarty->config_overwrite * 4;
+		} else {
+			$this->filepath .= (int)$smarty->escape_html * 2;
+		}
+		$this->filepath .= '.' . $source->type . '_' . $source->getBasename();
+
+		if ($_template->caching) {
+			$this->filepath .= '.cache';
+		}
+		$this->filepath .= '.php';
+		$this->timestamp = $this->exists = is_file($this->filepath);
+		if ($this->exists) {
+			$this->timestamp = filemtime($this->filepath);
+		}
+	}
+
+	/**
+	 * render compiled template code
+	 *
+	 * @param Template $_template
+	 *
+	 * @return string
+	 * @throws \Smarty\Exception
+	 */
+	public function render(Template $_template) {
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->start_render($_template);
+		}
+		if (!$this->processed) {
+			$this->compileAndLoad($_template);
+		}
+
+		// @TODO Can't Cached handle this? Maybe introduce an event to decouple.
+		if ($_template->caching) {
+			$_template->getCached()->file_dependency =
+				array_merge($_template->getCached()->file_dependency, $this->file_dependency);
+		}
+
+		$this->getRenderedTemplateCode($_template, $this->unifunc);
+
+		// @TODO Can't Cached handle this? Maybe introduce an event to decouple and remove the $_template->caching property.
+		if ($_template->caching && $this->getNocacheCode()) {
+			$_template->getCached()->hashes[$this->nocache_hash] = true;
+		}
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->end_render($_template);
+		}
+	}
+
+	/**
+	 * load compiled template or compile from source
+	 *
+	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
+	 *
+	 * @throws Exception
+	 */
+	private function compileAndLoad(Template $_smarty_tpl) {
+
+		if ($_smarty_tpl->getSource()->handler->recompiled) {
+			$this->recompile($_smarty_tpl);
+			return;
+		}
+
+		if ($this->exists && !$_smarty_tpl->getSmarty()->force_compile
+			&& !($_smarty_tpl->compile_check && $_smarty_tpl->getSource()->getTimeStamp() > $this->getTimeStamp())
+		) {
+			$this->loadCompiledTemplate($_smarty_tpl, false);
+		}
+
+		if (!$this->isValid) {
+			$this->compileAndWrite($_smarty_tpl);
+			$this->loadCompiledTemplate($_smarty_tpl);
+		}
+
+		$this->processed = true;
+	}
+
+	/**
+	 * compile template from source
+	 *
+	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
+	 *
+	 * @throws Exception
+	 */
+	private function recompile(Template $_smarty_tpl) {
+		$level = ob_get_level();
+		ob_start();
+		// call compiler
+		try {
+			eval('?>' . $this->doCompile($_smarty_tpl));
+		} catch (\Exception $e) {
+			while (ob_get_level() > $level) {
+				ob_end_clean();
+			}
+			throw $e;
+		}
+		ob_get_clean();
+		$this->timestamp = time();
+		$this->exists = true;
+	}
+
+	/**
+	 * compile template from source
+	 *
+	 * @param Template $_template
+	 *
+	 * @throws Exception
+	 */
+	public function compileAndWrite(Template $_template) {
+		// compile locking
+		if ($saved_timestamp = (!$_template->getSource()->handler->recompiled && is_file($this->filepath))) {
+			$saved_timestamp = $this->getTimeStamp();
+			touch($this->filepath);
+		}
+		// compile locking
+		try {
+			// call compiler
+			$this->write($_template, $this->doCompile($_template));
+		} catch (\Exception $e) {
+			// restore old timestamp in case of error
+			if ($saved_timestamp && is_file($this->filepath)) {
+				touch($this->filepath, $saved_timestamp);
+			}
+			throw $e;
+		}
+	}
+
+	/**
+	 * Do the actual compiling.
+	 *
+	 * @param Template $_smarty_tpl
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	private function doCompile(Template $_smarty_tpl): string {
+		$this->file_dependency = [];
+		$this->includes = [];
+		$this->nocache_hash = null;
+		$this->unifunc = null;
+		return $_smarty_tpl->getCompiler()->compileTemplate($_smarty_tpl);
+	}
+
+	/**
+	 * Write compiled code by handler
+	 *
+	 * @param Template $_template template object
+	 * @param string $code compiled code
+	 *
+	 * @return bool success
+	 * @throws \Smarty\Exception
+	 */
+	private function write(Template $_template, $code) {
+		if (!$_template->getSource()->handler->recompiled) {
+			if ($_template->getSmarty()->writeFile($this->filepath, $code) === true) {
+				$this->timestamp = $this->exists = is_file($this->filepath);
+				if ($this->exists) {
+					$this->timestamp = filemtime($this->filepath);
+					return true;
+				}
+			}
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Load fresh compiled template by including the PHP file
+	 * HHVM requires a workaround because of a PHP incompatibility
+	 *
+	 * @param Template $_smarty_tpl do not change/remove variable name, is used by compiled template
+	 * @param bool $invalidateCachedFiles forces a revalidation of the file in opcache or apc cache (if available)
+	 *
+	 */
+	private function loadCompiledTemplate(Template $_smarty_tpl, bool $invalidateCachedFiles = true) {
+        
+		if ($invalidateCachedFiles) {
+			if (function_exists('opcache_invalidate')
+				 && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+			) {
+				opcache_invalidate($this->filepath, true);
+			} elseif (function_exists('apc_compile_file')) {
+				apc_compile_file($this->filepath);
+			}
+		}
+		if (defined('HHVM_VERSION')) {
+			eval('?>' . file_get_contents($this->filepath));
+		} else {
+			include $this->filepath;
+		}
+
+	}
+
+	/**
+	 * This function is executed automatically when a compiled or cached template file is included
+	 * - Decode saved properties from compiled template and cache files
+	 * - Check if compiled or cache file is valid
+	 *
+	 * @param Template $_template
+	 * @param array $properties special template properties
+	 *
+	 * @return bool flag if compiled or cache file is valid
+	 * @throws Exception
+	 */
+	public function isFresh(Template $_template, array $properties): bool {
+
+		// on cache resources other than file check version stored in cache code
+		if (\Smarty\Smarty::SMARTY_VERSION !== $properties['version']) {
+			return false;
+		}
+
+		$is_valid = true;
+		if (!empty($properties['file_dependency']) && $_template->compile_check) {
+			$is_valid = $this->checkFileDependencies($properties['file_dependency'], $_template);
+		}
+
+		$this->isValid = $is_valid;
+		$this->includes = $properties['includes'] ?? [];
+
+		if ($is_valid) {
+			$this->unifunc = $properties['unifunc'];
+			$this->setNocacheCode($properties['has_nocache_code']);
+			$this->file_dependency = $properties['file_dependency'];
+		}
+		return $is_valid && !function_exists($properties['unifunc']);
+	}
+
+	/**
+	 * This method is here only to fix an issue when upgrading from Smarty v4 to v5.
+	 */
+	public function _decodeProperties($a, $b, $c = false): bool { return false; }
+
+}
diff --git a/include/smarty/src/Template/Config.php b/include/smarty/src/Template/Config.php
new file mode 100644
index 000000000..b2fcbf813
--- /dev/null
+++ b/include/smarty/src/Template/Config.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Smarty\Template;
+
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Exception;
+
+/**
+ * Smarty Config Resource Data Object
+ * Metadata Container for Config Files
+ *
+ * @author     Uwe Tews
+ */
+class Config extends Source {
+
+	/**
+	 * Flag that source is a config file
+	 *
+	 * @var bool
+	 */
+	public $isConfig = true;
+
+	/**
+	 * @var array
+	 */
+	static protected $_incompatible_resources = ['extends' => true];
+
+	public function createCompiler(): \Smarty\Compiler\BaseCompiler {
+		return new \Smarty\Compiler\Configfile($this->smarty);
+	}
+
+	protected static function getDefaultHandlerFunc(Smarty $smarty) {
+		return $smarty->default_config_handler_func;
+	}
+}
diff --git a/include/smarty/src/Template/GeneratedPhpFile.php b/include/smarty/src/Template/GeneratedPhpFile.php
new file mode 100644
index 000000000..f436e9769
--- /dev/null
+++ b/include/smarty/src/Template/GeneratedPhpFile.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace Smarty\Template;
+
+use Smarty\Exception;
+use Smarty\Resource\FilePlugin;
+use Smarty\Template;
+
+/**
+ * Base class for generated PHP files, such as compiled and cached versions of templates and config files.
+ *
+ * @author     Rodney Rehm
+ */
+abstract class GeneratedPhpFile {
+
+	/**
+	 * Compiled Filepath
+	 *
+	 * @var string
+	 */
+	public $filepath = null;
+
+	/**
+	 * Compiled Timestamp
+	 *
+	 * @var int|bool
+	 */
+	public $timestamp = false;
+
+	/**
+	 * Compiled Existence
+	 *
+	 * @var boolean
+	 */
+	public $exists = false;
+
+	/**
+	 * Template Compile Id (\Smarty\Template::$compile_id)
+	 *
+	 * @var string
+	 */
+	public $compile_id = null;
+
+	/**
+	 * Compiled Content Loaded
+	 *
+	 * @var boolean
+	 */
+	protected $processed = false;
+
+	/**
+	 * unique function name for compiled template code
+	 *
+	 * @var string
+	 */
+	public $unifunc = '';
+
+	/**
+	 * flag if template does contain nocache code sections
+	 *
+	 * @var bool
+	 */
+	private $has_nocache_code = false;
+
+	/**
+	 * resource file dependency
+	 *
+	 * @var array
+	 */
+	public $file_dependency = [];
+
+	/**
+	 * Get compiled time stamp
+	 *
+	 * @return int
+	 */
+	public function getTimeStamp() {
+		if ($this->exists && !$this->timestamp) {
+			$this->timestamp = filemtime($this->filepath);
+		}
+		return $this->timestamp;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getNocacheCode(): bool {
+		return $this->has_nocache_code;
+	}
+
+	/**
+	 * @param bool $has_nocache_code
+	 */
+	public function setNocacheCode(bool $has_nocache_code): void {
+		$this->has_nocache_code = $has_nocache_code;
+	}
+
+	/**
+	 * get rendered template content by calling compiled or cached template code
+	 *
+	 * @param string $unifunc function with template code
+	 *
+	 * @throws \Exception
+	 */
+	protected function getRenderedTemplateCode(\Smarty\Template $_template, $unifunc) {
+		$level = ob_get_level();
+		try {
+			if (empty($unifunc) || !function_exists($unifunc)) {
+				throw new \Smarty\Exception("Invalid compiled template for '{$this->filepath}'");
+			}
+			$unifunc($_template);
+		} catch (\Exception $e) {
+			while (ob_get_level() > $level) {
+				ob_end_clean();
+			}
+
+			throw $e;
+		}
+	}
+
+	/**
+	 * @param $file_dependency
+	 * @param Template $_template
+	 *
+	 * @return bool
+	 * @throws Exception
+	 */
+	protected function checkFileDependencies($file_dependency, Template $_template): bool {
+			// check file dependencies at compiled code
+		foreach ($file_dependency as $_file_to_check) {
+
+			$handler = \Smarty\Resource\BasePlugin::load($_template->getSmarty(), $_file_to_check[2]);
+
+			if ($handler instanceof FilePlugin) {
+				if ($_template->getSource()->getResourceName() === $_file_to_check[0]) {
+					// do not recheck current template
+					continue;
+				}
+				$mtime = $handler->getResourceNameTimestamp($_file_to_check[0], $_template->getSmarty(), $_template->getSource()->isConfig);
+			} else {
+
+				if ($handler->checkTimestamps()) {
+					// @TODO this doesn't actually check any dependencies, but only the main source file
+					// and that might to be irrelevant, as the comment "do not recheck current template" above suggests
+					$source = Source::load($_template, $_template->getSmarty());
+					$mtime = $source->getTimeStamp();
+				} else {
+					continue;
+				}
+			}
+
+			if ($mtime === false || $mtime > $_file_to_check[1]) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+}
diff --git a/include/smarty/src/Template/Source.php b/include/smarty/src/Template/Source.php
new file mode 100644
index 000000000..2c2022ee5
--- /dev/null
+++ b/include/smarty/src/Template/Source.php
@@ -0,0 +1,285 @@
+<?php
+
+namespace Smarty\Template;
+
+use Smarty\Resource\FilePlugin;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Exception;
+
+/**
+ * Meta-data Container for Template source files
+ * @author     Rodney Rehm
+ */
+class Source {
+
+	/**
+	 * Unique Template ID
+	 *
+	 * @var string|null
+	 */
+	public $uid = null;
+
+	/**
+	 * Template Resource (\Smarty\Template::$template_resource)
+	 *
+	 * @var string
+	 */
+	public $resource = null;
+
+	/**
+	 * Resource Type
+	 *
+	 * @var string
+	 */
+	public $type = null;
+
+	/**
+	 * Resource Name
+	 *
+	 * @var string
+	 */
+	public $name = null;
+
+	/**
+	 * Source Timestamp
+	 *
+	 * @var int
+	 */
+	public $timestamp = null;
+
+	/**
+	 * Source Existence
+	 *
+	 * @var boolean
+	 */
+	public $exists = false;
+
+	/**
+	 * Source File Base name
+	 *
+	 * @var string
+	 */
+	public $basename = null;
+
+	/**
+	 * The Components an extended template is made of
+	 *
+	 * @var \Smarty\Template\Source[]
+	 */
+	public $components = null;
+
+	/**
+	 * Resource Handler
+	 *
+	 * @var \Smarty\Resource\BasePlugin
+	 */
+	public $handler = null;
+
+	/**
+	 * Smarty instance
+	 *
+	 * @var Smarty
+	 */
+	protected $smarty = null;
+
+	/**
+	 * Resource is source
+	 *
+	 * @var bool
+	 */
+	public $isConfig = false;
+
+	/**
+	 * Template source content eventually set by default handler
+	 *
+	 * @var string
+	 */
+	public $content = null;
+
+	/**
+	 * @var array
+	 */
+	static protected $_incompatible_resources = [];
+
+	/**
+	 * create Source Object container
+	 *
+	 * @param Smarty $smarty Smarty instance this source object belongs to
+	 * @param string $resource full template_resource
+	 * @param string $type type of resource
+	 * @param string $name resource name
+	 *
+	 * @throws   \Smarty\Exception
+	 * @internal param \Smarty\Resource\Base $handler Resource Handler this source object communicates with
+	 */
+	public function __construct(Smarty $smarty, $type, $name) {
+		$this->handler = \Smarty\Resource\BasePlugin::load($smarty, $type);
+
+		$this->smarty = $smarty;
+		$this->resource = $type . ':' . $name;
+		$this->type = $type;
+		$this->name = $name;
+	}
+
+	/**
+	 * initialize Source Object for given resource
+	 * Either [$_template] or [$smarty, $template_resource] must be specified
+	 *
+	 * @param Template|null $_template template object
+	 * @param Smarty|null $smarty smarty object
+	 * @param null $template_resource resource identifier
+	 *
+	 * @return Source Source Object
+	 * @throws Exception
+	 */
+	public static function load(
+		?Template $_template = null,
+		?Smarty   $smarty = null,
+		          $template_resource = null
+	) {
+		if ($_template) {
+			$smarty = $_template->getSmarty();
+			$template_resource = $_template->template_resource;
+		}
+		if (empty($template_resource)) {
+			throw new Exception('Source: Missing  name');
+		}
+		// parse resource_name, load resource handler, identify unique resource name
+		if (preg_match('/^([A-Za-z0-9_\-]{2,}):([\s\S]*)$/', $template_resource, $match)) {
+			$type = $match[1];
+			$name = $match[2];
+		} else {
+			// no resource given, use default
+			// or single character before the colon is not a resource type, but part of the filepath
+			$type = $smarty->default_resource_type;
+			$name = $template_resource;
+		}
+
+		if (isset(self::$_incompatible_resources[$type])) {
+			throw new Exception("Unable to use resource '{$type}' for " . __METHOD__);
+		}
+
+		// create new source object
+		$source = new static($smarty, $type, $name);
+		$source->handler->populate($source, $_template);
+		if (!$source->exists && static::getDefaultHandlerFunc($smarty)) {
+			$source->_getDefaultTemplate(static::getDefaultHandlerFunc($smarty));
+			$source->handler->populate($source, $_template);
+		}
+		return $source;
+	}
+
+	protected static function getDefaultHandlerFunc(Smarty $smarty) {
+		return $smarty->default_template_handler_func;
+	}
+
+	/**
+	 * Get source time stamp
+	 *
+	 * @return int
+	 */
+	public function getTimeStamp() {
+		if (!isset($this->timestamp)) {
+			$this->handler->populateTimestamp($this);
+		}
+		return $this->timestamp;
+	}
+
+	/**
+	 * Get source content
+	 *
+	 * @return string
+	 * @throws \Smarty\Exception
+	 */
+	public function getContent() {
+		return $this->content ?? $this->handler->getContent($this);
+	}
+
+	/**
+	 * get default content from template or config resource handler
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function _getDefaultTemplate($default_handler) {
+		$_content = $_timestamp = null;
+		$_return = \call_user_func_array(
+			$default_handler,
+			[$this->type, $this->name, &$_content, &$_timestamp, $this->smarty]
+		);
+		if (is_string($_return)) {
+			$this->exists = is_file($_return);
+			if ($this->exists) {
+				$this->timestamp = filemtime($_return);
+			} else {
+				throw new Exception(
+					'Default handler: Unable to load ' .
+					"default file '{$_return}' for '{$this->type}:{$this->name}'"
+				);
+			}
+			$this->name = $_return;
+			$this->uid = sha1($_return);
+		} elseif ($_return === true) {
+			$this->content = $_content;
+			$this->exists = true;
+			$this->uid = $this->name = sha1($_content);
+			$this->handler = \Smarty\Resource\BasePlugin::load($this->smarty, 'eval');
+		} else {
+			$this->exists = false;
+			throw new Exception(
+				'Default handler: No ' . ($this->isConfig ? 'config' : 'template') .
+				" default content for '{$this->type}:{$this->name}'"
+			);
+		}
+	}
+
+	public function createCompiler(): \Smarty\Compiler\BaseCompiler {
+		return new \Smarty\Compiler\Template($this->smarty);
+	}
+
+	public function getSmarty() {
+		return $this->smarty;
+	}
+
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename()
+	{
+		return $this->handler->getBasename($this);
+	}
+
+	/**
+	 * Return source name
+	 * e.g.: 'sub/index.tpl'
+	 *
+	 * @return string
+	 */
+	public function getResourceName(): string {
+		return (string) $this->name;
+	}
+
+	/**
+	 * Return source name, including the type prefix.
+	 * e.g.: 'file:sub/index.tpl'
+	 *
+	 * @return string
+	 */
+	public function getFullResourceName(): string {
+		return $this->type . ':' . $this->name;
+	}
+
+	public function getFilepath(): ?string {
+		if ($this->handler instanceof FilePlugin) {
+			return $this->handler->getFilePath($this->name, $this->smarty, $this->isConfig);
+		}
+		return null;
+	}
+
+	public function isConfig(): bool {
+		return $this->isConfig;
+	}
+
+}
diff --git a/include/smarty/src/TemplateBase.php b/include/smarty/src/TemplateBase.php
new file mode 100644
index 000000000..f01d11076
--- /dev/null
+++ b/include/smarty/src/TemplateBase.php
@@ -0,0 +1,425 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template  Base
+ * This file contains the basic shared methods for template handling
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty;
+
+/**
+ * Class with shared smarty/template methods
+ */
+abstract class TemplateBase extends Data {
+
+	/**
+	 * Set this if you want different sets of cache files for the same
+	 * templates.
+	 *
+	 * @var string
+	 */
+	public $cache_id = null;
+
+	/**
+	 * Set this if you want different sets of compiled files for the same
+	 * templates.
+	 *
+	 * @var string
+	 */
+	public $compile_id = null;
+
+	/**
+	 * caching enabled
+	 *
+	 * @var int
+	 */
+	public $caching = \Smarty\Smarty::CACHING_OFF;
+
+	/**
+	 * check template for modifications?
+	 *
+	 * @var int
+	 */
+	public $compile_check = \Smarty\Smarty::COMPILECHECK_ON;
+
+	/**
+	 * cache lifetime in seconds
+	 *
+	 * @var int
+	 */
+	public $cache_lifetime = 3600;
+
+	/**
+	 * Array of source information for known template functions
+	 *
+	 * @var array
+	 */
+	public $tplFunctions = [];
+
+	/**
+	 * @var Debug
+	 */
+	private $debug;
+
+	/**
+	 * Registers object to be used in templates
+	 *
+	 * @param string $object_name
+	 * @param object $object the referenced PHP object to register
+	 * @param array $allowed_methods_properties list of allowed methods (empty = all)
+	 * @param bool $format smarty argument format, else traditional
+	 * @param array $block_methods list of block-methods
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::registerObject()
+	 */
+	public function registerObject(
+		$object_name,
+		$object,
+		$allowed_methods_properties = [],
+		$format = true,
+		$block_methods = []
+	) {
+		$smarty = $this->getSmarty();
+		// test if allowed methods callable
+		if (!empty($allowed_methods_properties)) {
+			foreach ((array)$allowed_methods_properties as $method) {
+				if (!is_callable([$object, $method]) && !property_exists($object, $method)) {
+					throw new Exception("Undefined method or property '$method' in registered object");
+				}
+			}
+		}
+		// test if block methods callable
+		if (!empty($block_methods)) {
+			foreach ((array)$block_methods as $method) {
+				if (!is_callable([$object, $method])) {
+					throw new Exception("Undefined method '$method' in registered object");
+				}
+			}
+		}
+		// register the object
+		$smarty->registered_objects[$object_name] =
+			[$object, (array)$allowed_methods_properties, (boolean)$format, (array)$block_methods];
+		return $this;
+	}
+
+	/**
+	 * Registers plugin to be used in templates
+	 *
+	 * @param string $object_name name of object
+	 *
+	 * @return static
+	 * @api  Smarty::unregisterObject()
+	 *
+	 */
+	public function unregisterObject($object_name) {
+		$smarty = $this->getSmarty();
+		if (isset($smarty->registered_objects[$object_name])) {
+			unset($smarty->registered_objects[$object_name]);
+		}
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getCompileCheck(): int {
+		return $this->compile_check;
+	}
+
+	/**
+	 * @param int $compile_check
+	 */
+	public function setCompileCheck($compile_check) {
+		$this->compile_check = (int)$compile_check;
+	}
+
+	/**
+	 * @param int $caching
+	 */
+	public function setCaching($caching) {
+		$this->caching = (int)$caching;
+	}
+
+	/**
+	 * @param int $cache_lifetime
+	 */
+	public function setCacheLifetime($cache_lifetime) {
+		$this->cache_lifetime = $cache_lifetime;
+	}
+
+	/**
+	 * @param string $compile_id
+	 */
+	public function setCompileId($compile_id) {
+		$this->compile_id = $compile_id;
+	}
+
+	/**
+	 * @param string $cache_id
+	 */
+	public function setCacheId($cache_id) {
+		$this->cache_id = $cache_id;
+	}
+
+	/**
+	 * creates a data object
+	 *
+	 * @param Data|null $parent next higher level of Smarty
+	 *                                                                                     variables
+	 * @param null $name optional data block name
+	 *
+	 * @return Data data object
+	 * @throws Exception
+	 * @api  Smarty::createData()
+	 *
+	 */
+	public function createData(?Data $parent = null, $name = null) {
+		/* @var Smarty $smarty */
+		$smarty = $this->getSmarty();
+		$dataObj = new Data($parent, $smarty, $name);
+		if ($smarty->debugging) {
+			$smarty->getDebug()->register_data($dataObj);
+		}
+		return $dataObj;
+	}
+
+	/**
+	 * return name of debugging template
+	 *
+	 * @return string
+	 * @api Smarty::getDebugTemplate()
+	 *
+	 */
+	public function getDebugTemplate() {
+		$smarty = $this->getSmarty();
+		return $smarty->debug_tpl;
+	}
+
+	/**
+	 * @return Debug
+	 */
+	public function getDebug(): Debug {
+		if (!isset($this->debug)) {
+			$this->debug = new \Smarty\Debug();
+		}
+		return $this->debug;
+	}
+
+
+	/**
+	 * return a reference to a registered object
+	 *
+	 * @param string $object_name object name
+	 *
+	 * @return object
+	 * @throws \Smarty\Exception if no such object is found
+	 *
+	 * @api  Smarty::getRegisteredObject()
+	 */
+	public function getRegisteredObject($object_name) {
+		$smarty = $this->getSmarty();
+		if (!isset($smarty->registered_objects[$object_name])) {
+			throw new Exception("'$object_name' is not a registered object");
+		}
+		if (!is_object($smarty->registered_objects[$object_name][0])) {
+			throw new Exception("registered '$object_name' is not an object");
+		}
+		return $smarty->registered_objects[$object_name][0];
+	}
+
+	/**
+	 * Get literals
+	 *
+	 * @return array list of literals
+	 * @api Smarty::getLiterals()
+	 *
+	 */
+	public function getLiterals() {
+		$smarty = $this->getSmarty();
+		return (array)$smarty->literals;
+	}
+
+	/**
+	 * Add literals
+	 *
+	 * @param array|string $literals literal or list of literals
+	 *                                                                                  to addto add
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 * @api Smarty::addLiterals()
+	 *
+	 */
+	public function addLiterals($literals = null) {
+		if (isset($literals)) {
+			$this->_setLiterals($this->getSmarty(), (array)$literals);
+		}
+		return $this;
+	}
+
+	/**
+	 * Set literals
+	 *
+	 * @param array|string $literals literal or list of literals
+	 *                                                                                  to setto set
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 * @api Smarty::setLiterals()
+	 *
+	 */
+	public function setLiterals($literals = null) {
+		$smarty = $this->getSmarty();
+		$smarty->literals = [];
+		if (!empty($literals)) {
+			$this->_setLiterals($smarty, (array)$literals);
+		}
+		return $this;
+	}
+
+	/**
+	 * common setter for literals for easier handling of duplicates the
+	 * Smarty::$literals array gets filled with identical key values
+	 *
+	 * @param Smarty $smarty
+	 * @param array $literals
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	private function _setLiterals(Smarty $smarty, $literals) {
+		$literals = array_combine($literals, $literals);
+		$error = isset($literals[$smarty->getLeftDelimiter()]) ? [$smarty->getLeftDelimiter()] : [];
+		$error = isset($literals[$smarty->getRightDelimiter()]) ? $error[] = $smarty->getRightDelimiter() : $error;
+		if (!empty($error)) {
+			throw new Exception(
+				'User defined literal(s) "' . $error .
+				'" may not be identical with left or right delimiter'
+			);
+		}
+		$smarty->literals = array_merge((array)$smarty->literals, (array)$literals);
+	}
+
+	/**
+	 * Registers static classes to be used in templates
+	 *
+	 * @param string $class_name
+	 * @param string $class_impl the referenced PHP class to
+	 *                                                                                    register
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 * @api  Smarty::registerClass()
+	 *
+	 */
+	public function registerClass($class_name, $class_impl) {
+		$smarty = $this->getSmarty();
+		// test if exists
+		if (!class_exists($class_impl)) {
+			throw new Exception("Undefined class '$class_impl' in register template class");
+		}
+		// register the class
+		$smarty->registered_classes[$class_name] = $class_impl;
+		return $this;
+	}
+
+	/**
+	 * Register config default handler
+	 *
+	 * @param callable $callback class/method name
+	 *
+	 * @return static
+	 * @throws Exception              if $callback is not callable
+	 * @api Smarty::registerDefaultConfigHandler()
+	 *
+	 */
+	public function registerDefaultConfigHandler($callback) {
+		$smarty = $this->getSmarty();
+		if (is_callable($callback)) {
+			$smarty->default_config_handler_func = $callback;
+		} else {
+			throw new Exception('Default config handler not callable');
+		}
+		return $this;
+	}
+
+	/**
+	 * Register template default handler
+	 *
+	 * @param callable $callback class/method name
+	 *
+	 * @return static
+	 * @throws Exception              if $callback is not callable
+	 * @api Smarty::registerDefaultTemplateHandler()
+	 *
+	 */
+	public function registerDefaultTemplateHandler($callback) {
+		$smarty = $this->getSmarty();
+		if (is_callable($callback)) {
+			$smarty->default_template_handler_func = $callback;
+		} else {
+			throw new Exception('Default template handler not callable');
+		}
+		return $this;
+	}
+
+	/**
+	 * Registers a resource to fetch a template
+	 *
+	 * @param string $name name of resource type
+	 * @param \Smarty\Resource\BasePlugin $resource_handler instance of Smarty\Resource\BasePlugin
+	 *
+	 * @return static
+	 *
+	 * @api  Smarty::registerResource()
+	 */
+	public function registerResource($name, \Smarty\Resource\BasePlugin $resource_handler) {
+		$smarty = $this->getSmarty();
+		$smarty->registered_resources[$name] = $resource_handler;
+		return $this;
+	}
+
+	/**
+	 * Unregisters a resource to fetch a template
+	 *
+	 * @param string $type name of resource type
+	 *
+	 * @return static
+	 * @api  Smarty::unregisterResource()
+	 *
+	 */
+	public function unregisterResource($type) {
+		$smarty = $this->getSmarty();
+		if (isset($smarty->registered_resources[$type])) {
+			unset($smarty->registered_resources[$type]);
+		}
+		return $this;
+	}
+
+	/**
+	 * set the debug template
+	 *
+	 * @param string $tpl_name
+	 *
+	 * @return static
+	 * @throws Exception if file is not readable
+	 * @api Smarty::setDebugTemplate()
+	 *
+	 */
+	public function setDebugTemplate($tpl_name) {
+		$smarty = $this->getSmarty();
+		if (!is_readable($tpl_name)) {
+			throw new Exception("Unknown file '{$tpl_name}'");
+		}
+		$smarty->debug_tpl = $tpl_name;
+		return $this;
+	}
+
+
+
+}
diff --git a/include/smarty/src/TestInstall.php b/include/smarty/src/TestInstall.php
new file mode 100644
index 000000000..e24c39848
--- /dev/null
+++ b/include/smarty/src/TestInstall.php
@@ -0,0 +1,211 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * Smarty Internal TestInstall
+ * Test Smarty installation
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+/**
+ * TestInstall class
+ *
+
+
+ */
+class TestInstall
+{
+    /**
+     * diagnose Smarty setup
+     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
+     *
+     * @param \Smarty $smarty
+     * @param array   $errors array to push results into rather than outputting them
+     *
+     * @return bool status, true if everything is fine, false else
+     */
+    public static function testInstall(Smarty $smarty, &$errors = null)
+    {
+        $status = true;
+        if ($errors === null) {
+            echo "<PRE>\n";
+            echo "Smarty Installation test...\n";
+            echo "Testing template directory...\n";
+        }
+        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
+        // test if all registered template_dir are accessible
+        foreach ($smarty->getTemplateDir() as $template_dir) {
+            $_template_dir = $template_dir;
+            $template_dir = realpath($template_dir);
+            // resolve include_path or fail existence
+            if (!$template_dir) {
+                $status = false;
+                $message = "FAILED: $_template_dir does not exist";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+                continue;
+            }
+            if (!is_dir($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } elseif (!is_readable($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$template_dir is OK.\n";
+                }
+            }
+        }
+        if ($errors === null) {
+            echo "Testing compile directory...\n";
+        }
+        // test if registered compile_dir is accessible
+        $__compile_dir = $smarty->getCompileDir();
+        $_compile_dir = realpath($__compile_dir);
+        if (!$_compile_dir) {
+            $status = false;
+            $message = "FAILED: {$__compile_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_dir($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_readable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_writable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_compile_dir} is OK.\n";
+            }
+        }
+        if ($errors === null) {
+            echo "Testing plugins directory...\n";
+        }
+        if ($errors === null) {
+            echo "Testing cache directory...\n";
+        }
+        // test if all registered cache_dir is accessible
+        $__cache_dir = $smarty->getCacheDir();
+        $_cache_dir = realpath($__cache_dir);
+        if (!$_cache_dir) {
+            $status = false;
+            $message = "FAILED: {$__cache_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_dir($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_readable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_writable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_cache_dir} is OK.\n";
+            }
+        }
+        if ($errors === null) {
+            echo "Testing configs directory...\n";
+        }
+        // test if all registered config_dir are accessible
+        foreach ($smarty->getConfigDir() as $config_dir) {
+            $_config_dir = $config_dir;
+            // resolve include_path or fail existence
+            if (!$config_dir) {
+                $status = false;
+                $message = "FAILED: $_config_dir does not exist";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+                continue;
+            }
+            if (!is_dir($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } elseif (!is_readable($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$config_dir is OK.\n";
+                }
+            }
+        }
+        if ($errors === null) {
+            echo "Tests complete.\n";
+            echo "</PRE>\n";
+        }
+        return $status;
+    }
+}
diff --git a/include/smarty/src/UndefinedVariable.php b/include/smarty/src/UndefinedVariable.php
new file mode 100644
index 000000000..53f13f416
--- /dev/null
+++ b/include/smarty/src/UndefinedVariable.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * class for undefined variable object
+ * This class defines an object for undefined variable handling
+ */
+class UndefinedVariable extends Variable {
+
+	/**
+	 * Always returns an empty string.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+		return '';
+	}
+}
diff --git a/include/smarty/src/Variable.php b/include/smarty/src/Variable.php
new file mode 100644
index 000000000..0e38d1257
--- /dev/null
+++ b/include/smarty/src/Variable.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * class for the Smarty variable object
+ * This class defines the Smarty variable object
+ *
+
+
+ */
+#[\AllowDynamicProperties]
+class Variable
+{
+    /**
+     * template variable
+     *
+     * @var mixed
+     */
+    public $value = null;
+
+	/**
+	 * Other r/w properties for foreach, for, while, etc.
+	 */
+	public $step, $total, $first, $last, $key, $show, $iteration, $index = null;
+
+	/**
+	 * @param mixed|null $value
+	 */
+	public function setValue($value): void {
+		$this->value = $value;
+	}
+
+    /**
+     * if true any output of this variable will be not cached
+     *
+     * @var boolean
+     */
+    private $nocache = false;
+
+	/**
+	 * @param bool $nocache
+	 */
+	public function setNocache(bool $nocache): void {
+		$this->nocache = $nocache;
+	}
+
+    /**
+     * create Smarty variable object
+     *
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     */
+    public function __construct($value = null, $nocache = false)
+    {
+        $this->value = $value;
+        $this->nocache = $nocache;
+    }
+
+	public function getValue() {
+		return $this->value;
+	}
+
+    /**
+     * <<magic>> String conversion
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string)$this->value;
+    }
+
+	/**
+	 * Handles ++$a and --$a in templates.
+	 *
+	 * @param $operator '++' or '--', defaults to '++'
+	 *
+	 * @return int|mixed
+	 * @throws Exception
+	 */
+	public function preIncDec($operator = '++') {
+		if ($operator == '--') {
+			return --$this->value;
+		} elseif ($operator == '++') {
+			return ++$this->value;
+		} else {
+			throw new Exception("Invalid incdec operator. Use '--' or '++'.");
+		}
+		return $this->value;
+	}
+
+	/**
+	 * Handles $a++ and $a-- in templates.
+	 *
+	 * @param $operator '++' or '--', defaults to '++'
+	 *
+	 * @return int|mixed
+	 * @throws Exception
+	 */
+	public function postIncDec($operator = '++') {
+		if ($operator == '--') {
+			return $this->value--;
+		} elseif ($operator == '++') {
+			return $this->value++;
+		} else {
+			throw new Exception("Invalid incdec operator. Use '--' or '++'.");
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isNocache(): bool {
+		return $this->nocache;
+	}
+
+}
diff --git a/include/smarty/libs/debug.tpl b/include/smarty/src/debug.tpl
similarity index 92%
rename from include/smarty/libs/debug.tpl
rename to include/smarty/src/debug.tpl
index 4f82a5820..ab093581d 100644
--- a/include/smarty/libs/debug.tpl
+++ b/include/smarty/src/debug.tpl
@@ -1,4 +1,4 @@
-{capture name='_smarty_debug' assign=debug_output}
+{capture name='_smarty_debug' assign='debug_output'}
     <!DOCTYPE html>
     <html lang="en">
     <head>
@@ -108,7 +108,7 @@
     </head>
     <body>
 
-    <h1>Smarty {Smarty::SMARTY_VERSION} Debug Console
+    <h1>Smarty {$smarty.version} Debug Console
         -  {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
 
     {if !empty($template_data)}
@@ -144,6 +144,7 @@
                         {$vars['attributes']|debug_print_var nofilter}
                     {/if}
                 </td>
+            </tr>
          {/foreach}
     </table>
 
@@ -166,10 +167,8 @@
     </body>
     </html>
 {/capture}
-<script type="text/javascript">
-    {$id = '__Smarty__'}
-    {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
-    _smarty_console = window.open("", "console{$id}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
+<script>
+    _smarty_console = window.open("", "console{$targetWindow}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
     _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
     _smarty_console.document.close();
 </script>
diff --git a/include/smarty/src/functions.php b/include/smarty/src/functions.php
new file mode 100644
index 000000000..590789ba3
--- /dev/null
+++ b/include/smarty/src/functions.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * This file is part of the Smarty package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Smarty\Exception;
+
+/**
+ * Converts the first characters in $string to uppercase (A-Z) if it is an ASCII lowercase character (a-z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_ucfirst_ascii($string): string {
+    return smarty_strtoupper_ascii(substr($string, 0, 1)) . substr($string, 1);
+}
+
+/**
+ * Converts all uppercase ASCII characters (A-Z) in $string to lowercase (a-z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_strtolower_ascii($string): string {
+    return strtr($string, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
+}
+
+/**
+ * Converts all lowercase ASCII characters (a-z) in $string to uppercase (A-Z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_strtoupper_ascii($string): string {
+    return strtr($string, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+}
+
+/**
+ * Function: smarty_make_timestamp
+ * Purpose:  used by other smarty functions to make a timestamp from a string.
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
+ *
+ * @return int
+ */
+function smarty_make_timestamp($string)
+{
+	if (empty($string)) {
+		// use "now":
+		return time();
+	} elseif ($string instanceof DateTime
+		|| (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)
+	) {
+		return (int)$string->format('U'); // PHP 5.2 BC
+	} elseif (strlen($string) === 14 && ctype_digit((string)$string)) {
+		// it is mysql timestamp format of YYYYMMDDHHMMSS?
+		return mktime(
+			substr($string, 8, 2),
+			substr($string, 10, 2),
+			substr($string, 12, 2),
+			substr($string, 4, 2),
+			substr($string, 6, 2),
+			substr($string, 0, 4)
+		);
+	} elseif (is_numeric($string)) {
+		// it is a numeric string, we handle it as timestamp
+		return (int)$string;
+	} else {
+		// strtotime should handle it
+		$time = strtotime($string);
+		if ($time === -1 || $time === false) {
+			// strtotime() was not able to parse $string, use "now":
+			return time();
+		}
+		return $time;
+	}
+}
+
+/**
+ * Multibyte string replace
+ *
+ * @param string|string[] $search  the string to be searched
+ * @param string|string[] $replace the replacement string
+ * @param string          $subject the source string
+ * @param int             &$count  number of matches found
+ *
+ * @return string replaced string
+ * @author Rodney Rehm
+ */
+function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
+{
+	if (!is_array($search) && is_array($replace)) {
+		return false;
+	}
+	if (is_array($subject)) {
+		// call mb_replace for each single string in $subject
+		foreach ($subject as &$string) {
+			$string = smarty_mb_str_replace($search, $replace, $string, $c);
+			$count += $c;
+		}
+	} elseif (is_array($search)) {
+		if (!is_array($replace)) {
+			foreach ($search as &$string) {
+				$subject = smarty_mb_str_replace($string, $replace, $subject, $c);
+				$count += $c;
+			}
+		} else {
+			$n = max(count($search), count($replace));
+			while ($n--) {
+				$subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
+				$count += $c;
+				next($search);
+				next($replace);
+			}
+		}
+	} else {
+		$mb_reg_charset = mb_regex_encoding();
+		// Check if mbstring regex is using UTF-8
+		$reg_is_unicode = !strcasecmp($mb_reg_charset, "UTF-8");
+		if(!$reg_is_unicode) {
+			// ...and set to UTF-8 if not
+			mb_regex_encoding("UTF-8");
+		}
+
+		// See if charset used by Smarty is matching one used by regex...
+		$current_charset = mb_regex_encoding();
+		$convert_result = (bool)strcasecmp(\Smarty\Smarty::$_CHARSET, $current_charset);
+		if($convert_result) {
+			// ...convert to it if not.
+			$subject = mb_convert_encoding($subject, $current_charset, \Smarty\Smarty::$_CHARSET);
+			$search = mb_convert_encoding($search, $current_charset, \Smarty\Smarty::$_CHARSET);
+			$replace = mb_convert_encoding($replace, $current_charset, \Smarty\Smarty::$_CHARSET);
+		}
+
+		$parts = mb_split(preg_quote($search), $subject ?? "") ?: array();
+		// If original regex encoding was not unicode...
+		if(!$reg_is_unicode) {
+			// ...restore original regex encoding to avoid breaking the system.
+			mb_regex_encoding($mb_reg_charset);
+		}
+		if($parts === false) {
+			// This exception is thrown if call to mb_split failed.
+			// Usually it happens, when $search or $replace are not valid for given mb_regex_encoding().
+			// There may be other cases for it to fail, please file an issue if you find a reproducible one.
+			throw new Exception("Source string is not a valid $current_charset sequence (probably)");
+		}
+
+		$count = count($parts) - 1;
+		$subject = implode($replace, $parts);
+		// Convert results back to charset used by Smarty, if needed.
+		if($convert_result) {
+			$subject = mb_convert_encoding($subject, \Smarty\Smarty::$_CHARSET, $current_charset);
+		}
+	}
+	return $subject;
+}
+/**
+ * escape_special_chars common function
+ * Function: smarty_function_escape_special_chars
+ * Purpose:  used by other smarty functions to escape
+ *           special chars except for already escaped ones
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string $string text that should by escaped
+ *
+ * @return string
+ */
+function smarty_function_escape_special_chars($string)
+{
+	if (!is_array($string)) {
+		$string = htmlspecialchars((string) $string, ENT_COMPAT, \Smarty\Smarty::$_CHARSET, false);
+	}
+	return $string;
+}
+
+/**
+ * Smarty wordwrap supporting multibyte
+ * Name:     smarty_mb_wordwrap
+ * Purpose:  Wrap a string to a given number of characters
+ *
+ * @link   https://php.net/manual/en/function.wordwrap.php for similarity
+ *
+ * @param string  $str   the string to wrap
+ * @param int     $width the width of the output
+ * @param string  $break the character used to break the line
+ * @param boolean $cut   ignored parameter, just for the sake of
+ *
+ * @return string  wrapped string
+ * @author Rodney Rehm
+ */
+function smarty_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
+{
+	// break words into tokens using white space as a delimiter
+	$tokens = preg_split('!(\s)!S' . \Smarty\Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+	$length = 0;
+	$t = '';
+	$_previous = false;
+	$_space = false;
+	foreach ($tokens as $_token) {
+		$token_length = mb_strlen($_token, \Smarty\Smarty::$_CHARSET);
+		$_tokens = array($_token);
+		if ($token_length > $width) {
+			if ($cut) {
+				$_tokens = preg_split(
+					'!(.{' . $width . '})!S' . \Smarty\Smarty::$_UTF8_MODIFIER,
+					$_token,
+					-1,
+					PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE
+				);
+			}
+		}
+		foreach ($_tokens as $token) {
+			$_space = !!preg_match('!^\s$!S' . \Smarty\Smarty::$_UTF8_MODIFIER, $token);
+			$token_length = mb_strlen($token, \Smarty\Smarty::$_CHARSET);
+			$length += $token_length;
+			if ($length > $width) {
+				// remove space before inserted break
+				if ($_previous) {
+					$t = mb_substr($t, 0, -1, \Smarty\Smarty::$_CHARSET);
+				}
+				if (!$_space) {
+					// add the break before the token
+					if (!empty($t)) {
+						$t .= $break;
+					}
+					$length = $token_length;
+				}
+			} elseif ($token === "\n") {
+				// hard break must reset counters
+				$length = 0;
+			}
+			$_previous = $_space;
+			// add the token
+			$t .= $token;
+		}
+	}
+	return $t;
+}
diff --git a/include/template.class.php b/include/template.class.php
index ba1f382bc..6defdea6a 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -11,7 +11,7 @@
  */
 
 require_once( PHPWG_ROOT_PATH .'include/smarty/libs/Smarty.class.php');
-
+use Smarty\Smarty;
 
 /** default rank for buttons */
 define('BUTTONS_RANK_NEUTRAL', 50);
@@ -63,11 +63,12 @@ class Template
   {
     global $conf, $lang_info;
 
-    SmartyException::$escape = false;
+    // \Smarty\Exception::$escape = false;
 
     $this->scriptLoader = new ScriptLoader;
     $this->cssLoader = new CssLoader;
     $this->smarty = new Smarty;
+    $this->smarty->escape_html = false;
     $this->smarty->debugging = $conf['debug_template'];
     if (!$this->smarty->debugging)
     {
@@ -111,6 +112,7 @@ class Template
     $this->smarty->registerPlugin('modifier', 'file_exists', 'file_exists');
     $this->smarty->registerPlugin('modifier', 'constant', 'constant');
     $this->smarty->registerPlugin('modifier', 'json_encode', 'json_encode');
+    $this->smarty->registerPlugin('modifier', 'json_decode', 'json_decode');
     $this->smarty->registerPlugin('modifier', 'htmlspecialchars', 'htmlspecialchars');
     $this->smarty->registerPlugin('modifier', 'implode', 'implode');
     $this->smarty->registerPlugin('modifier', 'stripslashes', 'stripslashes');
@@ -134,6 +136,20 @@ class Template
     $this->smarty->registerPlugin('compiler', 'get_combined_css', array($this, 'func_get_combined_css') );
     $this->smarty->registerPlugin('block', 'footer_script', array($this, 'block_footer_script') );
     $this->smarty->registerFilter('pre', array('Template', 'prefilter_white_space') );
+    $this->smarty->registerPlugin('modifier', 'url_is_remote', 'url_is_remote');
+    $this->smarty->registerPlugin('modifier', 'is_null', 'is_null');
+    $this->smarty->registerPlugin('modifier', 'l10n', 'l10n');
+    $this->smarty->registerPlugin('modifier', 'str_replace', 'str_replace');
+    $this->smarty->registerPlugin('modifier', 'is_admin', 'is_admin');
+    $this->smarty->registerPlugin('modifier', 'is_classic_user', 'is_classic_user');
+    $this->smarty->registerPlugin('modifier', 'get_device', 'get_device');
+    $this->smarty->registerPlugin('modifier', 'is_file', 'is_file');
+    $this->smarty->registerPlugin('modifier', 'strpos', 'strpos');
+    $this->smarty->registerPlugin('modifier', 'preg_match', 'preg_match');
+    $this->smarty->registerPlugin('modifier', 'get_gallery_home_url', 'get_gallery_home_url');
+    $this->smarty->registerPlugin('modifier', 'sizeOf', 'sizeOf');
+    $this->smarty->registerPlugin('modifier', 'array_key_exists', 'array_key_exists');
+
     if ( $conf['compiled_template_cache_language'] )
     {
       $this->smarty->registerFilter('post', array('Template', 'postfilter_language') );
@@ -1082,8 +1098,10 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
    */
   static function prefilter_white_space($source, $smarty)
   {
-    $ld = $smarty->left_delimiter;
-    $rd = $smarty->right_delimiter;
+    $ld = $smarty->getLeftDelimiter();
+    $rd = $smarty->getRightDelimiter();
+    // $ld = $smarty->left_delimiter;
+    // $rd = $smarty->right_delimiter;
     $ldq = preg_quote($ld, '#');
     $rdq = preg_quote($rd, '#');
 
diff --git a/themes/standard_pages/template/identification.tpl b/themes/standard_pages/template/identification.tpl
index 1fcec76e5..1bac1fd14 100644
--- a/themes/standard_pages/template/identification.tpl
+++ b/themes/standard_pages/template/identification.tpl
@@ -99,7 +99,7 @@
   <section id="language-switch">
     <div id="lang-select">
       <span id="other-languages">
-  {foreach from=$language_options key=$code item=$lang}
+  {foreach from=$language_options key=code item=lang}
           <span id="lang={$code}" onclick="setCookie('lang','{$code}',30)">{$lang}</span>
   {/foreach}
       </span>
diff --git a/themes/standard_pages/template/password.tpl b/themes/standard_pages/template/password.tpl
index a8b05c6b4..f8e28e4f7 100644
--- a/themes/standard_pages/template/password.tpl
+++ b/themes/standard_pages/template/password.tpl
@@ -139,7 +139,7 @@
   <section id="language-switch">
     <div id="lang-select">
       <span id="other-languages">
-  {foreach from=$language_options key=$code item=$lang}
+  {foreach from=$language_options key=code item=lang}
           <span id="lang={$code}" onclick="setCookie('lang','{$code}',30)">{$lang}</span>
   {/foreach}
       </span>
diff --git a/themes/standard_pages/template/profile.tpl b/themes/standard_pages/template/profile.tpl
index ed1c8a046..ec5283323 100644
--- a/themes/standard_pages/template/profile.tpl
+++ b/themes/standard_pages/template/profile.tpl
@@ -472,7 +472,7 @@ const str_must_not_empty = "{'must not be empty'|translate|escape:javascript}";
     <section id="language-switch">
       <div id="lang-select">
         <span id="other-languages">
-          {foreach from=$language_options key=$code item=$lang}
+          {foreach from=$language_options key=code item=lang}
             <span id="lang={$code}" onclick="setCookie('lang','{$code}',30)">{$lang}</span>
           {/foreach}
         </span>
diff --git a/themes/standard_pages/template/register.tpl b/themes/standard_pages/template/register.tpl
index 60b865872..632aeaa50 100644
--- a/themes/standard_pages/template/register.tpl
+++ b/themes/standard_pages/template/register.tpl
@@ -102,7 +102,7 @@
   <section id="language-switch">
     <div id="lang-select">
       <span id="other-languages">
-  {foreach from=$language_options key=$code item=$lang}
+  {foreach from=$language_options key=code item=lang}
           <span id="lang={$code}" onclick="setCookie('lang','{$code}',30)">{$lang}</span>
   {/foreach}
       </span>