Release version 3.1.32

This reverts commit 216ada91f3.

.gitattributes

@@ -1,22 +1,11 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+# exclude from git export
+/travis.ini export-ignore
+/myconfig.ini export-ignore
+/.travis.yml export-ignore
+/.gitignore export-ignore
+/.gitattributes export-ignore
+/lexer/ export-ignore
+/utilities/ export-ignore

.gitignore

@@ -1,221 +1,8 @@
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-
-[Dd]ebug/
-[Rr]elease/
-x64/
-build/
-[Bb]in/
-[Oo]bj/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.log
-*.scc
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.Publish.xml
-*.pubxml
-
-# NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.[Pp]ublish.xml
-*.pfx
-*.publishsettings
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
-
-#############
-## Windows detritus
-#############
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Mac crap
-.DS_Store
-
-
-#############
-## Python
-#############
-
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist/
-build/
-eggs/
-parts/
-var/
-sdist/
-develop-eggs/
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
 
 .idea/
 
 # Smarty
 lexer/*.php
+lexer/*.php.bak
 lexer/*.out
+utilies/*.php

.travis.yml

@@ -1,12 +1,21 @@
+
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+sudo: false
+
+dist: trusty
+
+matrix:
+  include:
+   - php: 5.3
+     dist: precise
+   - php: 5.4
+   - php: 5.5
+   - php: 5.6
+   - php: 7.0
+   - php: 7.1
+   - php: 7.2
+  fast_finish: true
 
 services:
   - memcached
@@ -15,12 +24,22 @@ services:
 before_script:
     - if [ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]; then travis_retry composer --prefer-source --dev install; fi
     - if [ ${TRAVIS_PHP_VERSION:0:3} <= "5.6" ]; then  phpenv config-add travis.ini; fi
+    - if [ ${TRAVIS_PHP_VERSION:0:3} >= "5.3" ]; then  phpenv config-add error_reporting.ini; fi
+    - if [[ $TRAVIS_PHP_VERSION = 7.* ]]; then  composer require phpunit/phpunit 6.4.1; fi
     - mysql -e "create database IF NOT EXISTS test;" -uroot
 
+before_install:
+    - phpenv config-rm xdebug.ini || return 0
+
 install:
-   - git clone --depth=50 --branch v3.1.30 git://github.com/smarty-php/smarty-phpunit.git
+    - travis_retry composer install
+    - git clone --depth=50 --branch=master git://github.com/smarty-php/smarty-phpunit.git
 
 script:
    - cd smarty-phpunit
-   - phpunit ./
+   - if [[ $TRAVIS_PHP_VERSION = 7.* ]]; then
+        ../vendor/bin/phpunit ./;
+    else
+        phpunit ./;
+    fi
 

COMPOSER_RELEASE_NOTES.txt

@@ -27,3 +27,5 @@ To retrieve the development and documentation folders add
         "smarty/smarty-dev": "~3.1@dev"
     }
 
+If you are using (include) the composer generated autoloader.php which is located
+in the /vendor folder it is no longer needed to require the Smarty.class.php file.

INHERITANCE_RELEASE_NOTES.txt

@@ -1,3 +1,20 @@
+3.1.3"
+New tags for inheritance parent and chilD
+{parent}  == {$smarty.block.parent}
+{child}  == {$smarty.block.child}
+Both tags support the assign attribute like
+{child assign=foo}
+
+3.1.31
+New tags for inheritance parent and child
+{block_parent}  == {$smarty.block.parent}
+{block_child}  == {$smarty.block.child}
+
+Since 3.1.28 you can mix inheritance by extends resource with the {extends} tag.
+A template called by extends resource can extend a subtemplate or chain buy the {extends} tag.
+Since 3.1.31 this feature can be turned off by setting the new Smarty property Smarty::$extends_recursion to false.
+
+3.1.28
 Starting with version 3.1.28 template inheritance is no longer a compile time process.
 All {block} tag parent/child relations are resolved at run time.
 This does resolve all known existing restrictions (see below).
@@ -37,8 +54,8 @@ Any code outside root {block} tags in child templates is now executed but any ou
         ....
    {/block}
 
-Starting with 3.1.28 you can mix inheritance by extends resuorce with the {extends} tag.
-A template called by extends resoure can extend a subtemple or chain buy the {extends} tag.
+Starting with 3.1.28 you can mix inheritance by extends resource with the {extends} tag.
+A template called by extends resource can extend a subtemplate or chain buy the {extends} tag.
 
 NOTE There is a BC break. If you used the extends resource {extends} tags have been ignored.
 
@@ -52,7 +69,7 @@ the compiled code of {include} subtemplates gets also merged in compiled inherit
 Merging the code into a single compile template has some drawbacks.
 1. You could not use variable file names in {include} Smarty would use the {include} of compilation time.
 2. You could not use individual compile_id in {include}
-3. Seperate caching of subtemplate was not possible
+3. Separate caching of subtemplate was not possible
 4. Any change of the template directory structure between calls was not necessarily seen.
 
 Starting with 3.1.15 some of the above conditions got checked and resulted in an exception. It turned out
@@ -64,13 +81,11 @@ With this setting all {include} subtemplate will be merge into the compiled inhe
 could be rejected by exception.
 
 
-If $smarty->inheritance_merge_compiled_includes = false; {include} subtemplate will not be merged. 
-You must now manually merge all {include} subtemplate which do contain {block} tags. This is done by setting the "inline" option.
+If $smarty->inheritance_merge_compiled_includes = false; {include} subtemplate will not be merged.You must now manually merge all {include} subtemplate which do contain {block} tags. This is done by setting the "inline" option.
 {include file='foo.bar' inline}
 
 1. In case of a variable file name like {include file=$foo inline} you must use the variable in a compile_id  $smarty->compile_id = $foo;
-2. If you use individual compile_id in {include file='foo.tpl' compile_id=$bar inline} it must be used in the 
-   global compile_id as well  $smarty->compile_id = $bar;
+2. If you use individual compile_id in {include file='foo.tpl' compile_id=$bar inline} it must be used in the   global compile_id as well  $smarty->compile_id = $bar;
 3. If call templates with different template_dir configurations and a parent could same named child template from different folders
    you must make the folder name part of the compile_id.
 

LICENSE

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

NEW_FEATURES.txt

@@ -2,6 +2,59 @@
 
 This file contains a brief description of new features which have been added to Smarty 3.1
 
+Smarty 3.1.32    New tags for inheritance parent and child
+    =========================================
+    {parent}  == {$smarty.block.parent}
+    {child}  == {$smarty.block.child}
+    Both tags support the assign attribute like
+    {child assign=foo}
+
+    Deprecate functions Smarty::muteExpectedErrors() and Smarty::unmuteExpectedErrors()
+    ===================================================================================
+    These functions to start a special error handler are no longer needed as Smarty does
+    no longer use error suppression like @filemtime().
+    For backward compatibility the functions still can be called.
+
+    Using literals containing Smarty's left and right delimiter
+    ===========================================================
+    New Methods
+        $smarty->setLiterals(array $literals)
+        $smarty->addLiterals(array $literals)
+    to define literals  containing Smarty delimiter. This can avoid the need for extreme usage
+    of {literal} {/literal} tags.
+    A) Treat '{{' and '}}' as literal
+    If Smarty::$auto_literal is enabled
+        {{ foo }}
+    will be treated now as literal. (This does apply for any number of delimiter repeatations).
+    However {{foo}} is not an literal but will be interpreted as a recursive Smarty tag.
+    If you use
+         $smarty->setLiteral(array('{{','}}'));
+         {{foo}}  is now a literal as well.
+    NOTE: In the last example nested Smarty tags starting with '{{' or ending with '}}' will not
+    work any longer, but this should be very very raw occouring restriction.
+    B) Example 2
+    Assume your delimiter are '<-' , '->' and '<--' , '-->' shall be literals 
+          $smarty->setLiteral(array('<--','-->'));
+
+
+    The capture buffers can now be accessed as array
+    ================================================
+    {capture name='foo'}
+        bah
+     {\capture}
+     {capture name='buh'}
+       blar
+     {\capture}
+     {foreach $smarty.capture as $name => $buffer}
+        ....
+      {/foreach}
+
+Smarty 3.1.31
+    New tags for inheritance parent and child
+    =========================================
+    {block_parent}  == {$smarty.block.parent}
+    {block_child}  == {$smarty.block.child}
+
 Smarty 3.1.30
 
     Loop optimization {foreach} and {section}
@@ -39,8 +92,7 @@ Smarty 3.1.30
         {/foreach}
 
     The {foreach} loop is rendered while processing the compiled template, but $current is a nocache
-    variable. Normally the {if $current==$item.id} would fail as the $item variable is unkown in the 
-    cached template. {make_nocache $item} does make the current $item value known in thee cached template.
+    variable. Normally the {if $current==$item.id} would fail as the $item variable is unknown in the     cached template. {make_nocache $item} does make the current $item value known in thee cached template.
 
     {make_nocache} is ignored when caching is disabled or the variable does exists as nocache variable.
 
@@ -75,8 +127,7 @@ Smarty 3.1.30
     Supported scope are parent, tpl_root, smarty, global and root.
     A scope used together with the {include} tag will cause that with some exceptions any variable
     assignment within that sub-template will update/assign the variable in other scopes according
-    to the above rules. It does include also variables assigned by plugins, tags supporting the assign=foo 
-    attribute and direct assignments in {if} and {while} like {if $foo=$bar}.
+    to the above rules. It does include also variables assigned by plugins, tags supporting the assign=foo     attribute and direct assignments in {if} and {while} like {if $foo=$bar}.
     Excluded are the key and value variables of {foreach}, {for} loop variables , variables passed by attributes
     in {include} and direct increments/decrements like {$foo++}, {$foo--}
 
@@ -126,8 +177,8 @@ Smarty 3.1.28
     as the corresponding Smarty methods to get the content of another template.
     Example:
         $template->display();           Does display template of template object
-        $template->display('foo.tpl');  Does display template 'foo.bar' 
-
+        $template->display('foo.tpl');  Does display template 'foo.bar'     
+        
     File: resource
     ==============
     Multiple template_dir entries can now be selected  by a comma separated list of indices.

README

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

README.md

@@ -1,5 +1,12 @@
-#Smarty 3 template engine
-##Distribution repository
+# Smarty 3 template engine
+[smarty.net](https://www.smarty.net/) 
+
+## Documentation
+
+For documentation see 
+[www.smarty.net/docs/en/](https://www.smarty.net/docs/en/) 
+
+## Distribution repository
 
 > Smarty 3.1.28 introduces run time template inheritance
 
@@ -10,7 +17,7 @@ Smarty versions 3.1.11 or later are now on github and can be installed with Comp
 
 The "smarty/smarty" package will start at libs/....   subfolder.
 
-To get the latest stable version of Smarty 3.1 use
+To get the latest stable version of Smarty 3.1 use:
 
 ```json
 "require": {
@@ -20,7 +27,7 @@ To get the latest stable version of Smarty 3.1 use
 
 in your composer.json file.
 
-To get the trunk version use
+To get the trunk version use:
 
 ```json
 "require": {
@@ -28,7 +35,7 @@ To get the trunk version use
 }
 ```
 
-For a specific version use something like
+For a specific version use something like:
 
 ```json
 "require": {
@@ -36,7 +43,7 @@ For a specific version use something like
 }
 ```
 
-PHPUnit test can be installed by corresponding composer entries like
+PHPUnit test can be installed by corresponding composer entries like:
 
 ```json
 "require": {
@@ -44,7 +51,7 @@ PHPUnit test can be installed by corresponding composer entries like
 }
 ```
 
-Similar applies for the lexer/parser generator
+Similar applies for the lexer/parser generator.
 
 ```json
 "require": {
@@ -52,7 +59,7 @@ Similar applies for the lexer/parser generator
 }
 ```
 
-Or you could use
+Or you could use:
 
 ```json
 "require": {
@@ -60,6 +67,6 @@ Or you could use
 }
 ```
 
-Which is a wrapper to install all 3 packages
+Which is a wrapper to install all 3 packages.
 
-Composer can also be used for Smarty2 versions 2.6.24 to 2.6.28
+Composer can also be used for Smarty2 versions 2.6.24 to 2.6.30.

SMARTY_2_BC_NOTES.txt

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

SMARTY_3.0_BC_NOTES.txt

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

SMARTY_3.1_NOTES.txt

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

composer.json

@@ -28,11 +28,7 @@
         "php": ">=5.2"
     },
     "autoload": {
-        "classmap": [
-            "libs/Smarty.class.php",
-            "libs/SmartyBC.class.php",
-            "libs/sysplugins/"
-        ]
+            "files": ["libs/bootstrap.php"]
     },
     "extra": {
         "branch-alias": {

demo/plugins/cacheresource.pdo.php

@@ -91,7 +91,7 @@ class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
      * 
      * @param PDO $pdo PDO : active connection 
      * @param string $table : table (or view) name 
-     * @param string $database : optionnal - if table is located in another db 
+     * @param string $database : optional - if table is located in another db 
      */
     public function __construct(PDO $pdo, $table, $database = null)
     {

error_reporting.ini

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

lexer/smarty_internal_configfilelexer.plex

@@ -25,7 +25,13 @@ class Smarty_Internal_Configfilelexer
      * @var string
      */
     public $data;
-    /**
+      /**
+      * Source length
+      *
+      * @var int
+      */
+     public $dataLength = null;
+   /**
      * byte counter
      *
      * @var int
@@ -120,9 +126,8 @@ class Smarty_Internal_Configfilelexer
      */
     function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
     {
-        // set instance object
-        self::instance($this);
         $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->dataLength = strlen($data);
         $this->counter = 0;
         if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
             $this->counter += strlen($match[0]);
@@ -133,14 +138,9 @@ class Smarty_Internal_Configfilelexer
         $this->configBooleanize = $this->smarty->config_booleanize;
     }
 
-    public static function &instance($new_instance = null)
-    {
-        static $instance = null;
-        if (isset($new_instance) && is_object($new_instance)) {
-            $instance = $new_instance;
-        }
-        return $instance;
-    }
+   public function replace ($input) {
+        return $input;
+   }
 
     public function PrintTrace()
     {
@@ -235,7 +235,7 @@ double_quoted_string {
     $this->yypopstate();
 }
 maybe_bool {
-    if (!$this->configBooleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
+    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
@@ -250,7 +250,7 @@ naked_string {
 }
 newline {
     $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->value = "";
+    $this->value = '';
     $this->yypopstate();
 }
 
@@ -308,7 +308,7 @@ text {
   if (isset($match[0][1])) {
     $to = $match[0][1];
   } else {
-    $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+    $this->compiler->trigger_template_error ('missing or misspelled literal closing tag');
   }  
   $this->value = substr($this->data,$this->counter,$to-$this->counter);
   $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;

lexer/smarty_internal_configfileparser.y

@@ -80,7 +80,7 @@ class Smarty_Internal_Configfileparser
      *
      * @var array
      */
-    private static $escapes_single = Array('\\' => '\\',
+    private static $escapes_single = array('\\' => '\\',
                                            '\'' => '\'');
 
     /**
@@ -91,8 +91,6 @@ class Smarty_Internal_Configfileparser
      */
     function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
     {
-        // set instance object
-        self::instance($this);
         $this->lex = $lex;
         $this->smarty = $compiler->smarty;
         $this->compiler = $compiler;
@@ -100,20 +98,6 @@ class Smarty_Internal_Configfileparser
         $this->configReadHidden = $this->smarty->config_read_hidden;
     }
 
-    /**
-     * @param null $new_instance
-     *
-     * @return null
-     */
-    public static function &instance($new_instance = null)
-    {
-        static $instance = null;
-        if (isset($new_instance) && is_object($new_instance)) {
-            $instance = $new_instance;
-        }
-        return $instance;
-    }
-
     /**
      * parse optional boolean keywords
      *
@@ -147,7 +131,7 @@ class Smarty_Internal_Configfileparser
 
         $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
 
-        $str = "";
+        $str = '';
         foreach ($ss as $s) {
             if (strlen($s) === 2 && $s[0] === '\\') {
                 if (isset(self::$escapes_single[$s[1]])) {
@@ -190,10 +174,10 @@ class Smarty_Internal_Configfileparser
      * @param array $var
      * @param array $target_array
      */
-    private function set_var(Array $var, Array &$target_array)
+    private function set_var(array $var, array &$target_array)
     {
-        $key = $var["key"];
-        $value = $var["value"];
+        $key = $var['key'];
+        $value = $var['value'];
 
         if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
             $target_array['vars'][$key] = $value;
@@ -208,10 +192,10 @@ class Smarty_Internal_Configfileparser
      *
      * @param array $vars
      */
-    private function add_global_vars(Array $vars)
+    private function add_global_vars(array $vars)
     {
         if (!isset($this->compiler->config_data['vars'])) {
-            $this->compiler->config_data['vars'] = Array();
+            $this->compiler->config_data['vars'] = array();
         }
         foreach ($vars as $var) {
             $this->set_var($var, $this->compiler->config_data);
@@ -224,10 +208,10 @@ class Smarty_Internal_Configfileparser
      * @param string $section_name
      * @param array  $vars
      */
-    private function add_section_vars($section_name, 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();
+            $this->compiler->config_data['sections'][$section_name]['vars'] = array();
         }
         foreach ($vars as $var) {
             $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
@@ -254,7 +238,7 @@ class Smarty_Internal_Configfileparser
 %stack_overflow
 {
     $this->internalError = true;
-    $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
+    $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
 }
 
 // Complete config file
@@ -295,17 +279,17 @@ var_list(res) ::= var_list(vl) newline. {
 }
 
 var_list(res) ::= var_list(vl) var(v). {
-    res = array_merge(vl, Array(v));
+    res = array_merge(vl, array(v));
 }
 
 var_list(res) ::= . {
-    res = Array();
+    res = array();
 }
 
 
 // Var
 var(res) ::= ID(id) EQUAL value(v). {
-    res = Array("key" => id, "value" => v);
+    res = array('key' => id, 'value' => v);
 }
 
 

lexer/smarty_internal_templatelexer.plex

@@ -25,6 +25,13 @@ class Smarty_Internal_Templatelexer
      */
     public $data;
 
+    /**
+     * Source length
+     *
+     * @var int
+     */
+    public $dataLength = null;
+
     /**
      * byte counter
      *
@@ -67,35 +74,7 @@ class Smarty_Internal_Templatelexer
      */
     public $phpType = '';
 
-    /**
-     * escaped left delimiter
-     *
-     * @var string
-     */
-    public $ldel = '';
-
-    /**
-     * escaped left delimiter length
-     *
-     * @var int
-     */
-    public $ldel_length = 0;
-
-    /**
-     * escaped right delimiter
-     *
-     * @var string
-     */
-    public $rdel = '';
-
-    /**
-     * escaped right delimiter length
-     *
-     * @var int
-     */
-    public $rdel_length = 0;
-
-    /**
+   /**
      * state number
      *
      * @var int
@@ -116,19 +95,6 @@ class Smarty_Internal_Templatelexer
      */
     public $compiler = null;
 
-    /**
-     * literal tag nesting level
-     *
-     * @var int
-     */
-    private $literal_cnt = 0;
-
-    /**
-     * PHP start tag string
-     *
-     * @var string
-     */
-
     /**
      * trace file
      *
@@ -144,10 +110,10 @@ class Smarty_Internal_Templatelexer
     public $yyTracePrompt;
 
     /**
-    * XML flag true while processing xml
-    *
-    * @var bool
-    */
+     * XML flag true while processing xml
+     *
+     * @var bool
+     */
     public $is_xml = false;
 
     /**
@@ -158,101 +124,145 @@ class Smarty_Internal_Templatelexer
     public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
 
     /**
-     * storage for assembled token patterns
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+                                               'NOT'         => '(!,not)',
+                                               'OPENP'       => '(',
+                                               'CLOSEP'      => ')',
+                                               'OPENB'       => '[',
+                                               'CLOSEB'      => ']',
+                                               'PTR'         => '->',
+                                               'APTR'        => '=>',
+                                               'EQUAL'       => '=',
+                                               'NUMBER'      => 'number',
+                                               'UNIMATH'     => '+" , "-',
+                                               'MATH'        => '*" , "/" , "%',
+                                               'INCDEC'      => '++" , "--',
+                                               'SPACE'       => ' ',
+                                               'DOLLAR'      => '$',
+                                               'SEMICOLON'   => ';',
+                                               'COLON'       => ':',
+                                               'DOUBLECOLON' => '::',
+                                               'AT'          => '@',
+                                               'HATCH'       => '#',
+                                               'QUOTE'       => '"',
+                                               'BACKTICK'    => '`',
+                                               'VERT'        => '"|" modifier',
+                                               'DOT'         => '.',
+                                               'COMMA'       => '","',
+                                               'QMARK'       => '"?"',
+                                               'ID'          => 'id, name',
+                                               'TEXT'        => 'text',
+                                               'LDELSLASH'   => '{/..} closing tag',
+                                               'LDEL'        => '{...} Smarty tag',
+                                               'COMMENT'     => 'comment',
+                                               'AS'          => 'as',
+                                               'TO'          => 'to',
+                                               'PHP'         => '"<?php", "<%", "{php}" tag',
+                                               'LOGOP'       => '"<", "==" ... logical operator',
+                                               'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+                                               'SCOND'       => '"is even" ... if condition',
+    );
+
+    /**
+     * literal tag nesting level
+     *
+     * @var int
+     */
+    private $literal_cnt = 0;
+
+    /**
+     * preg token pattern for state TEXT
      *
      * @var string
      */
     private $yy_global_pattern1 = null;
 
+    /**
+     * preg token pattern for state TAG
+     *
+     * @var string
+     */
     private $yy_global_pattern2 = null;
 
+    /**
+     * preg token pattern for state TAGBODY
+     *
+     * @var string
+     */
     private $yy_global_pattern3 = null;
 
+    /**
+     * preg token pattern for state LITERAL
+     *
+     * @var string
+     */
     private $yy_global_pattern4 = null;
 
-    private $yy_global_pattern5 = null;
-
     /**
-     * token names
+     * preg token pattern for state DOUBLEQUOTEDSTRING
      *
-     * @var array
+     * @var null
      */
-   public $smarty_token_names = array(        // Text for parser error messages
-                                               'NOT'             => '(!,not)',
-                                               'OPENP'           => '(',
-                                               'CLOSEP'          => ')',
-                                               'OPENB'           => '[',
-                                               'CLOSEB'          => ']',
-                                               'PTR'             => '->',
-                                               'APTR'            => '=>',
-                                               'EQUAL'           => '=',
-                                               'NUMBER'          => 'number',
-                                               'UNIMATH'         => '+" , "-',
-                                               'MATH'            => '*" , "/" , "%',
-                                               'INCDEC'          => '++" , "--',
-                                               'SPACE'           => ' ',
-                                               'DOLLAR'          => '$',
-                                               'SEMICOLON'       => ';',
-                                               'COLON'           => ':',
-                                               'DOUBLECOLON'     => '::',
-                                               'AT'              => '@',
-                                               'HATCH'           => '#',
-                                               'QUOTE'           => '"',
-                                               'BACKTICK'        => '`',
-                                               'VERT'            => '"|" modifier',
-                                               'DOT'             => '.',
-                                               'COMMA'           => '","',
-                                               'QMARK'           => '"?"',
-                                               'ID'              => 'id, name',
-                                               'TEXT'            => 'text',
-                                               'LDELSLASH'       => '{/..} closing tag',
-                                               'LDEL'            => '{...} Smarty tag',
-                                               'COMMENT'         => 'comment',
-                                               'AS'              => 'as',
-                                               'TO'              => 'to',
-                                               'PHP'             => '"<?php", "<%", "{php}" tag',
-                                               'LOGOP'           => '"<", "==" ... logical operator',
-                                               'TLOGOP'           => '"lt", "eq" ... logical operator; "is div by" ... if condition',
-                                               'SCOND'           => '"is even" ... if condition',
-    );
+    private $yy_global_pattern5 = null;
 
     /**
      * constructor
      *
-     * @param   string                             $data template source
+     * @param   string                             $source template source
      * @param Smarty_Internal_TemplateCompilerBase $compiler
      */
-    function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler)
+    function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        $this->data = $data;
+        $this->data = $source;
+        $this->dataLength = strlen($this->data);
         $this->counter = 0;
         if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) {
             $this->counter += strlen($match[0]);
         }
         $this->line = 1;
-        $this->smarty = $compiler->smarty;
+        $this->smarty = $compiler->template->smarty;
         $this->compiler = $compiler;
-        $this->ldel = preg_quote($this->smarty->left_delimiter, '/');
-        $this->ldel_length = strlen($this->smarty->left_delimiter);
-        $this->rdel = preg_quote($this->smarty->right_delimiter, '/');
-        $this->rdel_length = strlen($this->smarty->right_delimiter);
-        $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter;
-        $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter;
+        $this->compiler->initDelimiterPreg();
+        $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter();
+        $this->smarty_token_names['RDEL'] = $this->smarty->getRightDelimiter();
     }
 
-   public function PrintTrace()
-   {
+    /**
+     * open lexer/parser trace file
+     *
+     */
+    public function PrintTrace()
+    {
         $this->yyTraceFILE = fopen('php://output', 'w');
         $this->yyTracePrompt = '<br>';
+    }
+
+   /**
+     * replace placeholders with runtime preg  code
+     *
+     * @param string $preg
+     *
+     * @return string
+     */
+   public function replace($preg)
+   {
+        return $this->compiler->replaceDelimiter($preg);
    }
 
-   /*
-    * Check if this tag is autoliteral
-    */
-   public function isAutoLiteral ()
-   {
-       return $this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false;
-   }
+    /**
+     * check if current value is an autoliteral left delimiter
+     *
+     * @return bool
+     */
+    public function isAutoLiteral()
+    {
+        return $this->smarty->getAutoLiteral() && isset($this->value[ $this->compiler->getLdelLength() ]) ?
+            strpos(" \n\t\r", $this->value[ $this->compiler->getLdelLength() ]) !== false : false;
+    }
 
      /*!lex2php
      %input $this->data
@@ -260,24 +270,22 @@ class Smarty_Internal_Templatelexer
      %token $this->token
      %value $this->value
      %line $this->line
-     linebreak = ~[\t ]*[\r\n]+[\t ]*~
-     text = ~[\S\s]~
-     textdoublequoted = ~([^"\\]*?)((?:\\.[^"\\]*?)*?)(?=(SMARTYldel|\$|`\$|"))~
+     userliteral = ~(SMARTYldel)SMARTYautoliteral\s+SMARTYliteral~
+     char = ~[\S\s]~
+     textdoublequoted = ~([^"\\]*?)((?:\\.[^"\\]*?)*?)(?=((SMARTYldel)SMARTYal|\$|`\$|"SMARTYliteral))~
      namespace = ~([0-9]*[a-zA-Z_]\w*)?(\\[0-9]*[a-zA-Z_]\w*)+~
-     all = ~[\S\s]+~
      emptyjava = ~[{][}]~
-     phptag = ~(SMARTYldel\s*php([ ].*?)?SMARTYrdel)|(SMARTYldel\s*[/]phpSMARTYrdel)~
-     phpstart = ~(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<script\s+language\s*=\s*["']?\s*php\s*["']?\s*>)|([?][>])|([%][>])~
+     phptag = ~(SMARTYldel)SMARTYalphp([ ].*?)?SMARTYrdel|(SMARTYldel)SMARTYal[/]phpSMARTYrdel~
+     phpstart = ~[<][?]((php\s+|=)|\s+)|[<][%]|[<][?]xml\s+|[<]script\s+language\s*=\s*["']?\s*php\s*["']?\s*[>]|[?][>]|[%][>]~
      slash = ~[/]~
-     ldel = ~SMARTYldel\s*~
+     ldel = ~(SMARTYldel)SMARTYal~
      rdel = ~\s*SMARTYrdel~
      nocacherdel = ~(\s+nocache)?\s*SMARTYrdel~
-     notblockid = ~(?:(?!block)[0-9]*[a-zA-Z_]\w*)~
      smartyblockchildparent = ~[\$]smarty\.block\.(child|parent)~
      integer = ~\d+~
      hex =  ~0[xX][0-9a-fA-F]+~
      math = ~\s*([*]{1,2}|[%/^&]|[<>]{2})\s*~
-     comment = ~SMARTYldel[*]~
+     comment = ~(SMARTYldel)SMARTYal[*]~
      incdec = ~([+]|[-]){2}~
      unimath = ~\s*([+]|[-])\s*~
      openP = ~\s*[(]\s*~
@@ -298,254 +306,240 @@ class Smarty_Internal_Templatelexer
      aptr = ~\s*[=][>]\s*~
      singlequotestring = ~'[^'\\]*(?:\\.[^'\\]*)*'~
      backtick = ~[`]~
-     vert = ~[|]~
+     vert = ~[|][@]?~
      qmark = ~\s*[?]\s*~
-     constant = ~([_]+[A-Z0-9][0-9A-Z_]*|[A-Z][0-9A-Z_]*)(?![0-9A-Z_]*[a-z])~
+     constant = ~[_]+[A-Z0-9][0-9A-Z_]*|[A-Z][0-9A-Z_]*(?![0-9A-Z_]*[a-z])~
      attr = ~\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\s*[=]\s*~
      id = ~[0-9]*[a-zA-Z_]\w*~
      literal = ~literal~
      strip = ~strip~
-     lop = ~\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\s*~
+     lop = ~\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\s*~
      slop = ~\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\s+~
-     tlop = ~\s+(is\s+(not\s+)?(odd|even|div)\s+by)\s+~
+     tlop = ~\s+is\s+(not\s+)?(odd|even|div)\s+by\s+~
      scond = ~\s+is\s+(not\s+)?(odd|even)~
      isin = ~\s+is\s+in\s+~
      as = ~\s+as\s+~
      to = ~\s+to\s+~
      step = ~\s+step\s+~
-     block = ~block~
      if = ~(if|elseif|else if|while)\s+~
      for = ~for\s+~
      makenocache = ~make_nocache\s+~
      foreach = ~foreach(?![^\s])~
      setfilter = ~setfilter\s+~
      instanceof = ~\s+instanceof\s+~
-     not = ~([!]\s*)|(not\s+)~
+     not = ~[!]\s*|not\s+~
      typecast = ~[(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\s*~
      double_quote = ~["]~
-     single_quote = ~[']~
+     text = ~(.*?)(?=((SMARTYldel)SMARTYal|[<][?]((php\s+|=)|\s+)|[<][%]|[<][?]xml\s+|[<]script\s+language\s*=\s*["']?\s*php\s*["']?\s*[>]|[?][>]|[%][>]SMARTYliteral))|[\s\S]+~
+     literaltext = ~(.*?)(?=(SMARTYldel)SMARTYal[/]?literalSMARTYrdel)~
      */
      /*!lex2php
      %statename TEXT
      emptyjava {
-       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      comment {
-        preg_match("/[*]{$this->rdel}/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+        preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1] + strlen($match[0][0]);
         } else {
-            $this->compiler->trigger_template_error ("missing or misspelled comment closing tag '*{$this->smarty->right_delimiter}'");
+            $this->compiler->trigger_template_error ("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
         }
         $this->value = substr($this->data,$this->counter,$to-$this->counter);
         return false;
      }
      phptag {
-       $obj = new Smarty_Internal_Compile_Private_Php();
-       $obj->parsePhp($this);
+        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
+     }
+     userliteral {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      ldel literal rdel {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-         $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-         $this->yypushstate(self::LITERAL);
-        }
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+        $this->yypushstate(self::LITERAL);
+     }
+     ldel slash literal rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+        $this->yypushstate(self::LITERAL);
      }
      ldel {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->yypushstate(self::TAG);
-          return true;
-       }
-     }
-     rdel {
-       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->yypushstate(self::TAG);
+        return true;
      }
      phpstart {
-       $obj = new Smarty_Internal_Compile_Private_Php();
-       $obj->parsePhp($this);
+        $this->compiler->getTagCompiler('private_php')->parsePhp($this);
      }
      text {
-       $to = strlen($this->data);
-       preg_match("/($this->ldel)|(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<script\s+language\s*=\s*[\"']?\s*php\s*[\"']?\s*>)|([?][>])|([%][>])/i",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
-       if (isset($match[0][1])) {
-         $to = $match[0][1];
-       }
-       $this->value = substr($this->data,$this->counter,$to-$this->counter);
-       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      */
      /*!lex2php
      %statename TAG
      ldel if {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-          $this->yybegin(self::TAGBODY);
-          $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
      }
      ldel for {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-          $this->yybegin(self::TAGBODY);
-          $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
      }
      ldel foreach {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-          $this->yybegin(self::TAGBODY);
-          $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
      }
      ldel setfilter {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-          $this->yybegin(self::TAGBODY);
-          $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
      }
      ldel makenocache {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
-          $this->yybegin(self::TAGBODY);
-          $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
      }
      ldel id nocacherdel {
-          $this->yypopstate();
-          $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
-          $this->taglineno = $this->line;
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
      }
-     ldel slash notblockid rdel {
+     ldel smartyblockchildparent rdel {
          $this->yypopstate();
-         $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+         $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
          $this->taglineno = $this->line;
      }
+     ldel slash id rdel {
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+     }
      ldel dollar id nocacherdel {
-         if ($this->_yy_stack[count($this->_yy_stack)-1] == self::TEXT) {
+        if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) {
             $this->yypopstate();
             $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
             $this->taglineno = $this->line;
-         } else {
-            $this->value = $this->smarty->left_delimiter;
+        } else {
+            $this->value = $this->smarty->getLeftDelimiter();
             $this->token = Smarty_Internal_Templateparser::TP_LDEL;
             $this->yybegin(self::TAGBODY);
             $this->taglineno = $this->line;
-         }
+        }
      }
      ldel slash {
-         $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-         $this->yybegin(self::TAGBODY);
-         $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
      }
      ldel {
-          $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-          $this->yybegin(self::TAGBODY);
-          $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
      }
      */
      /*!lex2php
      %statename TAGBODY
      rdel {
-       $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-       $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->yypopstate();
      }
      ldel {
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-           $this->yypushstate(self::TAG);
-           return true;
-        }
+        $this->yypushstate(self::TAG);
+        return true;
      }
-    double_quote {
-       $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-       $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+     double_quote {
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+        $this->compiler->enterDoubleQuote();
      }
      singlequotestring {
-       $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
-     }
-     smartyblockchildparent {
-          $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
-          $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
      }
      dollar id {
-       $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
      }
      dollar {
-       $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
      }
      isin {
-       $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
      }
      as {
-       $this->token = Smarty_Internal_Templateparser::TP_AS;
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
      }
      to {
-       $this->token = Smarty_Internal_Templateparser::TP_TO;
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
      }
      step {
-       $this->token = Smarty_Internal_Templateparser::TP_STEP;
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
      }
      instanceof {
-       $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
      }
      lop {
-       $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
      }
      slop {
-       $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
      }
      tlop {
-       $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
      }
      scond {
-       $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
      }
      not{
-       $this->token = Smarty_Internal_Templateparser::TP_NOT;
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
      }
      typecast {
-       $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
      }
      openP {
-       $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
      }
      closeP {
-       $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
      }
      openB {
-       $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
      }
      closeB {
-       $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
      }
      ptr {
-       $this->token = Smarty_Internal_Templateparser::TP_PTR;
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
      }
      aptr {
-       $this->token = Smarty_Internal_Templateparser::TP_APTR;
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
      }
      equal {
-       $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
      }
      incdec {
-       $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
      }
      unimath {
-       $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
      }
      math {
-       $this->token = Smarty_Internal_Templateparser::TP_MATH;
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
      }
      at {
-       $this->token = Smarty_Internal_Templateparser::TP_AT;
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
      }
      hatch {
-       $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
      }
      attr {
-       // resolve conflicts with shorttag and right_delimiter starting with '='
-       if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) {
-          preg_match("/\s+/",$this->value,$match);
-          $this->value = $match[0];
-          $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_ATTR;
-       }
+        // resolve conflicts with shorttag and right_delimiter starting with '='
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) {
+            preg_match('/\s+/',$this->value,$match);
+            $this->value = $match[0];
+            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+        }
      }
      namespace {
         $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
@@ -554,127 +548,105 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_ID;
      }
      integer {
-       $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
      }
      backtick {
-       $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-       $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->yypopstate();
      }
      vert {
-       $this->token = Smarty_Internal_Templateparser::TP_VERT;
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
      }
      dot {
-       $this->token = Smarty_Internal_Templateparser::TP_DOT;
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
      }
      comma {
-       $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
      }
      semicolon {
-       $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
      }
      doublecolon {
-       $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
      }
      colon {
-       $this->token = Smarty_Internal_Templateparser::TP_COLON;
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
      }
      qmark {
-       $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
      }
      hex {
-       $this->token = Smarty_Internal_Templateparser::TP_HEX;
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
      }
      space {
-       $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
      }
-     text {
-       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     char {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      */
 
      /*!lex2php
      %statename LITERAL
      ldel literal rdel {
-       $this->literal_cnt++;
-       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        $this->literal_cnt++;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
      }
      ldel slash literal rdel {
-       if ($this->literal_cnt) {
-         $this->literal_cnt--;
-         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-       } else {
-         $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-         $this->yypopstate();
-       }
+        if ($this->literal_cnt) {
+             $this->literal_cnt--;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+            $this->yypopstate();
+        }
      }
-     text {
-       $to = strlen($this->data);
-       preg_match("/{$this->ldel}[\/]?literal{$this->rdel}/i",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
-       if (isset($match[0][1])) {
-         $to = $match[0][1];
-       } else {
-         $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
-       }
-       $this->value = substr($this->data,$this->counter,$to-$this->counter);
-       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+     literaltext {
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
      }
      */
      /*!lex2php
      %statename DOUBLEQUOTEDSTRING
+     userliteral {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
      ldel literal rdel {
-         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      ldel slash literal rdel {
-         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      ldel slash {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->yypushstate(self::TAG);
-          return true;
-       }
+        $this->yypushstate(self::TAG);
+        return true;
      }
      ldel id {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->yypushstate(self::TAG);
-          return true;
-       }
+        $this->yypushstate(self::TAG);
+        return true;
      }
      ldel {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-          $this->taglineno = $this->line;
-          $this->yypushstate(self::TAGBODY);
-       }
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->taglineno = $this->line;
+        $this->yypushstate(self::TAGBODY);
      }
      double_quote {
-       $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-       $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypopstate();
      }
      backtick dollar {
-       $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-       $this->value = substr($this->value,0,-1);
-       $this->yypushstate(self::TAGBODY);
-       $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->value = substr($this->value,0,-1);
+        $this->yypushstate(self::TAGBODY);
+        $this->taglineno = $this->line;
      }
      dollar id {
-       $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
      }
      dollar {
-       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      textdoublequoted {
-       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-     }
-     text {
-       $to = strlen($this->data);
-       $this->value = substr($this->data,$this->counter,$to-$this->counter);
-       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      */
   }

lexer/smarty_internal_templateparser.y

@@ -21,9 +21,9 @@ class Smarty_Internal_Templateparser
 }
 %include_class
 {
-    const Err1 = "Security error: Call to private object member not allowed";
-    const Err2 = "Security error: Call to dynamic object member not allowed";
-    const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
+    const Err1 = 'Security error: Call to private object member not allowed';
+    const Err2 = 'Security error: Call to dynamic object member not allowed';
+    const Err3 = 'PHP in template not allowed. Use SmartyBC to enable it';
 
     /**
      * result status
@@ -135,7 +135,7 @@ class Smarty_Internal_Templateparser
     public $template_prefix = array();
 
     /**
-     * security object
+     * template prefix array
      *
      * @var \Smarty_Internal_ParseTree[]
      */
@@ -157,7 +157,7 @@ class Smarty_Internal_Templateparser
         $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
     }
 
-    /**
+     /**
      * insert PHP code in current buffer
      *
      * @param string $code
@@ -167,7 +167,21 @@ class Smarty_Internal_Templateparser
         $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
     }
 
-   /**
+    /**
+     * error rundown
+     *
+     */
+    public function errorRunDown()
+    {
+        while ($this->yystack !== array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    /**
      *  merge PHP code with prefix code and return parse tree tag object
      *
      * @param string $code
@@ -176,13 +190,13 @@ class Smarty_Internal_Templateparser
      */
     public function mergePrefixCode($code)
     {
-        $tmp ='';
+        $tmp = '';
         foreach ($this->compiler->prefix_code as $preCode) {
             $tmp .= $preCode;
         }
-        $this->compiler->prefix_code=array();
+        $this->compiler->prefix_code = array();
         $tmp .= $code;
-        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp,true));
+        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
     }
 
 }
@@ -206,11 +220,13 @@ class Smarty_Internal_Templateparser
 %stack_overflow
 {
     $this->internalError = true;
-    $this->compiler->trigger_template_error("Stack overflow in template parser");
+    $this->compiler->trigger_template_error('Stack overflow in template parser');
 }
 
-%left VERT.
+
+%right VERT.
 %left COLON.
+%left UNIMATH.
 
     //
     // complete template
@@ -221,146 +237,115 @@ start(res)       ::= template. {
     res = $this->root_buffer->to_smarty_php($this);
 }
 
-    //
-    // loop over template elements
-    //
-                      // single template element
-template       ::= template_element(e). {
-    if (e != null) {
-        $this->current_buffer->append_subtree($this, e);
-    }
-}
 
-                      // loop of elements
-template       ::= template template_element(e). {
-    if (e != null) {
-        // because of possible code injection
-        $this->current_buffer->append_subtree($this, e);
-    }
-}
-
-                      // empty template
-template       ::= . 
-
-//
-// template elements
-//
-                      // Smarty tag
-template_element(res)::= smartytag(st). {
-     if ($this->compiler->has_code) {
-         res = $this->mergePrefixCode(st);
-     } else {
-         res = null;
-     }
-    $this->compiler->has_variable_string = false;
-    $this->block_nesting_level = count($this->compiler->_tag_stack);
-} 
-
-                      // Literal
-template_element(res) ::= literal(l). {
-    res = new Smarty_Internal_ParseTree_Text(l);
-}
                       // php tags
-template_element(res)::= PHP(o). {
-    $code = $this->compiler->compileTag('private_php',array(array('code' => o), array('type' => $this->lex->phpType )),array());
+template       ::= template PHP(B). {
+    $code = $this->compiler->compileTag('private_php',array(array('code' => B), array('type' => $this->lex->phpType )),array());
     if ($this->compiler->has_code && !empty($code)) {
         $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
-        res = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp.$code,true));
-    } else {
-        res = null;
+         $this->current_buffer->append_subtree($this,  new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp.$code,true)));
     }
 }
 
-                      // nocache code
-template_element(res)::= NOCACHE(c). {
-        $this->compiler->tag_nocache = true;
-        $save = $this->template->compiled->has_nocache_code;
-        res = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode("<?php echo '{c}';?>\n", true));
-        $this->template->compiled->has_nocache_code = $save;
-}
                       // template text
-template_element(res)::= text_content(t). {
-        res = $this->compiler->processText(t);
+template       ::= template  TEXT(B). {
+         $this->current_buffer->append_subtree($this, $this->compiler->processText(B));
 }
-
-text_content(res) ::= TEXT(o). {
-    res = o;
-}
-
-text_content(res) ::= text_content(t) TEXT(o). {
-    res = t . o;
-}
-
                       // strip on
-template_element ::= STRIPON(d). {
+template       ::= template  STRIPON. {
     $this->strip = true;
 }
                       // strip off
-template_element ::= STRIPOFF(d). {
+template       ::= template STRIPOFF. {
     $this->strip = false;
 }
 
-                    // Litteral
-literal(res) ::= LITERALSTART LITERALEND. {
-    res = '';
+                     // Literal
+template       ::= template LITERALSTART literal_e2(B) LITERALEND. {
+       $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text(B));
 }
 
-literal(res) ::= LITERALSTART literal_elements(l) LITERALEND. {
-    res = l;
+
+literal_e2(A) ::= literal_e1(B) LITERALSTART literal_e1(C) LITERALEND. {
+    A = B.C;
 }
- 
-literal_elements(res) ::= literal_elements(l1) literal_element(l2). {
-    res = l1.l2;
+literal_e2(A) ::= literal_e1(B). {
+    A = B;
 }
 
-literal_elements(res) ::= . {
-    res = '';
+literal_e1(A) ::= literal_e1(B) LITERAL(C). {
+        A = B.C;
+
 }
 
-literal_element(res) ::= literal(l). {
-    res = l;
+literal_e1(A) ::= . {
+    A = '';
+}
+                      // Smarty tag
+template       ::= template smartytag(B). {
+      if ($this->compiler->has_code) {
+          $this->current_buffer->append_subtree($this, $this->mergePrefixCode(B));
+      }
+     $this->compiler->has_variable_string = false;
+     $this->block_nesting_level = count($this->compiler->_tag_stack);
 }
 
-literal_element(res) ::= LITERAL(l). {
-    res = l;
-}
 
-smartytag(res)   ::= tag(t) RDEL. {
-    res  = t;
-}
-//
-// output tags start here
-//
-smartytag(res)   ::= SIMPELOUTPUT(i). {
-    $var = trim(substr(i, $this->lex->ldel_length, -$this->lex->rdel_length), ' $');
+                      // empty template
+template       ::= .
+
+smartytag(A)   ::= SIMPELOUTPUT(B). {
+    $var = trim(substr(B, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
     if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
-        res = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
+        A = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
     } else {
-        res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
+        A = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
     }
 }
 
+// simple tag like {name}
+smartytag(A)::= SIMPLETAG(B). {
+    $tag = trim(substr(B, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
+    if ($tag == 'strip') {
+        $this->strip = true;
+        A = null;;
+    } else {
+        if (defined($tag)) {
+            if ($this->security) {
+               $this->security->isTrustedConstant($tag, $this->compiler);
+            }
+            A = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                A = $this->compiler->compileTag($match[1],array('\'nocache\''));
+            } else {
+                A = $this->compiler->compileTag($tag,array());
+            }
+        }
+    }
+}
+                  // {$smarty.block.child} or {$smarty.block.parent}
+smartytag(A)   ::= SMARTYBLOCKCHILDPARENT(i). {
+    $j = strrpos(i,'.');
+    if (i[$j+1] == 'c') {
+        // {$smarty.block.child}
+        A = $this->compiler->compileTag('child',array(),array(i));;
+    } else {
+        // {$smarty.block.parent}
+       A = $this->compiler->compileTag('parent',array(),array(i));;
+     }
+}
+
+smartytag(A)   ::= LDEL tagbody(B) RDEL. {
+    A  = B;
+}
+
+ smartytag(A)   ::=  tag(B) RDEL. {
+     A  = B;
+ }
                   // output with optional attributes
-tag(res)   ::= LDEL variable(e). {
-    res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
-}
-
-tag(res)   ::= LDEL variable(e) attributes(a). {
-    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
-}
-tag(res)   ::= LDEL value(e). {
-    res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
-}
-tag(res)   ::= LDEL value(e) attributes(a). {
-    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
-}
-
-tag(res)   ::= LDEL expr(e). {
-    res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
-}
-
-tag(res)   ::= LDEL expr(e) attributes(a). {
-    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
+tagbody(A) ::= outattr(B). {
+    A = $this->compiler->compileTag('private_print_expression',B[1],array('value'=>B[0]));
 }
 
 //
@@ -368,42 +353,30 @@ tag(res)   ::= LDEL expr(e) attributes(a). {
 //
 
                   // assign new style
-tag(res)   ::= LDEL DOLLARID(i) EQUAL value(e). {
-    res = $this->compiler->compileTag('assign',array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')));
-}
-                  
-tag(res)   ::= LDEL DOLLARID(i) EQUAL expr(e). {
-    res = $this->compiler->compileTag('assign',array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')));
-}
-                 
-tag(res)   ::= LDEL DOLLARID(i) EQUAL expr(e) attributes(a). {
-    res = $this->compiler->compileTag('assign',array_merge(array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')),a));
-}                  
-
-tag(res)   ::= LDEL varindexed(vi) EQUAL expr(e) attributes(a). {
-    res = $this->compiler->compileTag('assign',array_merge(array(array('value'=>e),array('var'=>vi['var'])),a),array('smarty_internal_index'=>vi['smarty_internal_index']));
+tagbody(A) ::= DOLLARID(B) eqoutattr(C). {
+    A = $this->compiler->compileTag('assign',array_merge(array(array('value'=>C[0]),array('var'=>'\''.substr(B,1).'\'')),C[1]));
 }
 
-// simple tag like {name}
-smartytag(res)::= SIMPLETAG(t). {
-    $tag = trim(substr(t, $this->lex->ldel_length, -$this->lex->rdel_length));
-    if ($tag == 'strip') {
-        $this->strip = true;
-        res = null;;
-    } else {
-        if (defined($tag)) {
-            if ($this->security) {
-               $this->security->isTrustedConstant($tag, $this->compiler);
-            }
-            res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
-        } else {
-            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
-                res = $this->compiler->compileTag($match[1],array("'nocache'"));
-            } else {
-                res = $this->compiler->compileTag($tag,array());
-            }
-        }
-    }
+tagbody(A) ::= varindexed(B) eqoutattr(C). {
+    A = $this->compiler->compileTag('assign',array_merge(array(array('value'=>C[0]),array('var'=>B['var'])),C[1]),array('smarty_internal_index'=>B['smarty_internal_index']));
+}
+
+eqoutattr(A) ::= EQUAL outattr(B). {
+       A = B;
+}
+
+outattr(A) ::= output(B) attributes(C). {
+    A = array(B,C);
+}
+
+output(A) ::= variable(B). {
+    A = B;
+}
+output(A) ::= value(B). {
+    A = B;
+}
+output(A) ::= expr(B). {
+    A = B;
 }
 
                   // tag with optional Smarty2 style attributes
@@ -458,23 +431,23 @@ tag(res)   ::= LDELMAKENOCACHE DOLLARID(i). {
 
                   // {if}, {elseif} and {while} tag
 tag(res)   ::= LDELIF(i) expr(ie). {
-    $tag = trim(substr(i,$this->lex->ldel_length)); 
-    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
+    $tag = trim(substr(i,$this->compiler->getLdelLength())); 
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
 }
 
 tag(res)   ::= LDELIF(i) expr(ie) attributes(a). {
-    $tag = trim(substr(i,$this->lex->ldel_length));
-    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
+    $tag = trim(substr(i,$this->compiler->getLdelLength()));
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
 }
 
 tag(res)   ::= LDELIF(i) statement(ie). {
-    $tag = trim(substr(i,$this->lex->ldel_length));
-    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
+    $tag = trim(substr(i,$this->compiler->getLdelLength()));
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
 }
 
 tag(res)   ::= LDELIF(i) statement(ie)  attributes(a). {
-    $tag = trim(substr(i,$this->lex->ldel_length));
-    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
+    $tag = trim(substr(i,$this->compiler->getLdelLength()));
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
 }
 
                   // {for} tag
@@ -499,19 +472,6 @@ tag(res)   ::= LDELFOR statement(st) TO expr(v) STEP expr(v2) attributes(a). {
 }
 
                   // {foreach} tag
-tag(res)   ::= LDELFOREACH attributes(a). {
-    res = $this->compiler->compileTag('foreach',a);
-}
-
-                  // {foreach $array as $var} tag
-tag(res)   ::= LDELFOREACH SPACE value(v1) AS varvar(v0) attributes(a). {
-    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>v1),array('item'=>v0))));
-}
-
-tag(res)   ::= LDELFOREACH SPACE value(v1) AS varvar(v2) APTR varvar(v0) attributes(a). {
-    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>v1),array('item'=>v0),array('key'=>v2))));
-}
-
 tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v0) attributes(a). {
     res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0))));
 }
@@ -519,6 +479,9 @@ tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v0) attributes(a). {
 tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v1) APTR varvar(v0) attributes(a). {
     res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0),array('key'=>v1))));
 }
+tag(res)   ::= LDELFOREACH attributes(a). {
+    res = $this->compiler->compileTag('foreach',a);
+}
 
                   // {setfilter}
 tag(res)   ::= LDELSETFILTER ID(m) modparameters(p). {
@@ -529,23 +492,11 @@ tag(res)   ::= LDELSETFILTER ID(m) modparameters(p) modifierlist(l). {
     res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array(m),p)),l)));
 }
 
-                  // {$smarty.block.child} or {$smarty.block.parent}
-tag(res)   ::= LDEL SMARTYBLOCKCHILDPARENT(i). {
-    $j = strrpos(i,'.');
-    if (i[$j+1] == 'c') {
-        // {$smarty.block.child}
-        res = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
-    } else {
-        // {$smarty.block.parent}
-        res = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler);
-    }
-}
-
                   
                   // end of block tag  {/....}                  
 smartytag(res)::= CLOSETAG(t). {
-    $tag = trim(substr(t, $this->lex->ldel_length, -$this->lex->rdel_length), ' /');
-    if ($tag == 'strip') {
+    $tag = trim(substr(t, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' /');
+    if ($tag === 'strip') {
         $this->strip = false;
         res = null;
     } else {
@@ -789,7 +740,7 @@ value(res)       ::= function(f). {
 
                   // expression
 value(res)       ::= OPENP expr(e) CLOSEP. {
-    res = "(". e .")";
+    res = '('. e .')';
 }
 
 value(res)        ::= variable(v1) INSTANCEOF(i) ns1(v2). {
@@ -812,10 +763,10 @@ value(res)       ::= doublequoted_with_quotes(s). {
 
 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']).';?>');
+    if (vi['var'] === '\'smarty\'') {
+        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).';?>');
      } else {
-        $this->compiler->appendPrefixCode("<?php $prefixVar" .' = '. $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].';?>');
+        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = ". $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].';?>');
     }
     res = $prefixVar .'::'.r[0].r[1];
 }
@@ -824,7 +775,7 @@ value(res)    ::= varindexed(vi) DOUBLECOLON static_class_access(r). {
 value(res)       ::= smartytag(st). {
     $prefixVar = $this->compiler->getNewPrefixVariable();
     $tmp = $this->compiler->appendCode('<?php ob_start();?>', st);
-    $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php $prefixVar" .'=ob_get_clean();?>'));
+    $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
     res = $prefixVar;
 }
 
@@ -846,7 +797,7 @@ value(res)       ::= ns1(c)DOUBLECOLON static_class_access(s). {
             res = c.'::'.s[0].s[1];
         } 
     } else {
-        $this->compiler->trigger_template_error ("static class '".c."' is undefined or not allowed by security setting");
+        $this->compiler->trigger_template_error ('static class \''.c.'\' is undefined or not allowed by security setting');
     }
 }
 //
@@ -872,7 +823,7 @@ variable(res)    ::= DOLLARID(i). {
    res = $this->compiler->compileVariable('\''.substr(i,1).'\'');
 }
 variable(res)    ::= varindexed(vi). {
-    if (vi['var'] == '\'smarty\'') {
+    if (vi['var'] === '\'smarty\'') {
         $smarty_var = $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']);
         res = $smarty_var;
     } else {
@@ -895,11 +846,11 @@ variable(res)    ::= object(o). {
 
                   // config variable
 variable(res)    ::= HATCH ID(i) HATCH. {
-    res = $this->compiler->compileConfigVariable("'" . i . "'");
+    res = $this->compiler->compileConfigVariable('\'' . i . '\'');
 }
 
 variable(res)    ::= HATCH ID(i) HATCH arrayindex(a). {
-    res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable("'" . i . "'") . ') ? $tmp'.a.' :null)';
+    res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . i . '\'') . ') ? $tmp'.a.' :null)';
 }
 
 variable(res)    ::= HATCH variable(v) HATCH. {
@@ -944,7 +895,7 @@ indexdef(res)    ::= DOT varvar(v) AT ID(p). {
 }
 
 indexdef(res)   ::= DOT ID(i). {
-    res = "['". i ."']";
+    res = '[\''. i .'\']';
 }
 
 indexdef(res)   ::= DOT INTEGER(n). {
@@ -1001,7 +952,7 @@ varvar(res)      ::= DOLLARID(i). {
 }
                     // single $
 varvar(res)      ::= DOLLAR. {
-    res = "''";
+    res = '\'\'';
 }
 
                     // sequence of identifier elements
@@ -1014,7 +965,7 @@ varvarele(res)   ::= ID(s). {
     res = '\''.s.'\'';
 }
 varvarele(res)   ::= SIMPELOUTPUT(i). {
-    $var = trim(substr(i, $this->lex->ldel_length, -$this->lex->rdel_length), ' $');
+    $var = trim(substr(i, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
     res = $this->compiler->compileVariable('\''.$var.'\'');
 }
 
@@ -1027,7 +978,7 @@ varvarele(res)   ::= LDEL expr(e) RDEL. {
 // objects
 //
 object(res)    ::= varindexed(vi) objectchain(oc). {
-    if (vi['var'] == '\'smarty\'') {
+    if (vi['var'] === '\'smarty\'') {
         res =  $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).oc;
     } else {
         res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].oc;
@@ -1046,7 +997,7 @@ objectchain(res) ::= objectchain(oc) objectelement(oe). {
 
                     // variable
 objectelement(res)::= PTR ID(i) arrayindex(a). {
-    if ($this->security && substr(i,0,1) == '_') {
+    if ($this->security && substr(i,0,1) === '_') {
         $this->compiler->trigger_template_error (self::Err1);
     }
     res = '->'.i.a;
@@ -1083,38 +1034,7 @@ objectelement(res)::= PTR method(f).  {
 // function
 //
 function(res)     ::= ns1(f) OPENP params(p) CLOSEP. {
-    if (!$this->security || $this->security->isTrustedPhpFunction(f, $this->compiler)) {
-        if (strcasecmp(f,'isset') === 0 || strcasecmp(f,'empty') === 0 || strcasecmp(f,'array') === 0 || is_callable(f)) {
-            $func_name = strtolower(f);
-            if ($func_name == 'isset') {
-                if (count(p) == 0) {
-                    $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
-                }
-                $par = implode(',',p);
-                if (strncasecmp($par,'$_smarty_tpl->smarty->ext->_config->_getConfigVariable',strlen('$_smarty_tpl->smarty->ext->_config->_getConfigVariable')) === 0) {
-                    $prefixVar = $this->compiler->getNewPrefixVariable();
-                    $this->compiler->appendPrefixCode("<?php $prefixVar" .'='.str_replace(')',', false)',$par).';?>');
-                    $isset_par = $prefixVar;
-                } else {
-                    $isset_par=str_replace("')->value","',null,true,false)->value",$par);
-                }
-                res = f . "(". $isset_par .")";
-            } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
-                if (count(p) != 1) {
-                    $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
-                }
-                if ($func_name == 'empty') {
-                    res = $func_name.'('.str_replace("')->value","',null,true,false)->value",p[0]).')';
-                } else {
-                    res = $func_name.'('.p[0].')';
-                }
-            } else {
-                res = f . "(". implode(',',p) .")";
-            }
-        } else {
-            $this->compiler->trigger_template_error ("unknown function \"" . f . "\"");
-        }
-    }
+    res = $this->compiler->compilePHPFunctionCall(f, p);
 }
 
 
@@ -1122,10 +1042,10 @@ function(res)     ::= ns1(f) OPENP params(p) CLOSEP. {
 // method
 //
 method(res)     ::= ID(f) OPENP params(p) CLOSEP. {
-    if ($this->security && substr(f,0,1) == '_') {
+    if ($this->security && substr(f,0,1) === '_') {
         $this->compiler->trigger_template_error (self::Err1);
     }
-    res = f . "(". implode(',',p) .")";
+    res = f . '('. implode(',',p) .')';
 }
 
 method(res)     ::= DOLLARID(f) OPENP params(p) CLOSEP.  {
@@ -1133,7 +1053,7 @@ 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->appendPrefixCode("<?php {$prefixVar} = ".$this->compiler->compileVariable('\''.substr(f,1).'\'').';?>');
     res = $prefixVar .'('. implode(',',p) .')';
 }
 
@@ -1301,13 +1221,14 @@ arrayelement(res)    ::=  expr(e). {
 
 
 //
-// double qouted strings
+// double quoted strings
 //
 doublequoted_with_quotes(res) ::= QUOTE QUOTE. {
-    res = "''";
+    res = '\'\'';
 }
 
 doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. {
+    $this->compiler->leaveDoubleQuote();
     res = s->to_smarty_php($this);
 }
 
@@ -1326,7 +1247,7 @@ doublequotedcontent(res)           ::=  BACKTICK variable(v) BACKTICK. {
 }
 
 doublequotedcontent(res)           ::=  BACKTICK expr(e) BACKTICK. {
-    res = new Smarty_Internal_ParseTree_Code('(string)'.e);
+    res = new Smarty_Internal_ParseTree_Code('(string)('.e.')');
 }
 
 doublequotedcontent(res)           ::=  DOLLARID(i). {

libs/Autoloader.php

@@ -11,27 +11,28 @@
  * @package    Smarty
  * @author     Uwe Tews
  *             Usage:
- *             require_once '...path/Autoloader.php';
- *             Smarty_Autoloader::register();
- *             $smarty = new Smarty();
- *             Note:       This autoloader is not needed if you use Composer.
- *             Composer will automatically add the classes of the Smarty package to it common autoloader.
+ *                  require_once '...path/Autoloader.php';
+ *                  Smarty_Autoloader::register();
+ *             or
+ *                  include '...path/bootstrap.php';
+ *
+ *                  $smarty = new Smarty();
  */
 class Smarty_Autoloader
 {
-    /**
+   /**
      * Filepath to Smarty root
      *
      * @var string
      */
-    public static $SMARTY_DIR = '';
+    public static $SMARTY_DIR = null;
 
     /**
      * Filepath to Smarty internal plugins
      *
      * @var string
      */
-    public static $SMARTY_SYSPLUGINS_DIR = '';
+    public static $SMARTY_SYSPLUGINS_DIR = null;
 
     /**
      * Array with Smarty core classes and their filename
@@ -75,7 +76,7 @@ class Smarty_Autoloader
         self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
         self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
             self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
-        if (version_compare(phpversion(), '5.3.0', '>=')) {
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
             spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
         } else {
             spl_autoload_register(array(__CLASS__, 'autoload'));
@@ -89,18 +90,20 @@ class Smarty_Autoloader
      */
     public static function autoload($class)
     {
-        $_class = strtolower($class);
-        if (strpos($_class, 'smarty') !== 0) {
+        if ($class[ 0 ] !== 'S' && strpos($class, 'Smarty') !== 0) {
             return;
         }
-        $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-        if (is_file($file)) {
-            include $file;
-        } else if (isset(self::$rootClasses[ $_class ])) {
+        $_class = strtolower($class);
+        if (isset(self::$rootClasses[ $_class ])) {
             $file = self::$SMARTY_DIR . self::$rootClasses[ $_class ];
             if (is_file($file)) {
                 include $file;
             }
+        } else {
+            $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
+            if (is_file($file)) {
+                include $file;
+            }
         }
         return;
     }

libs/SmartyBC.class.php

@@ -100,6 +100,8 @@ class SmartyBC extends Smarty
      * @param string $function_impl the name of the PHP function to register
      * @param bool   $cacheable
      * @param mixed  $cache_attrs
+     *
+     * @throws \SmartyException
      */
     public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
     {
@@ -153,6 +155,8 @@ class SmartyBC extends Smarty
      * @param string $block_impl PHP function to register
      * @param bool   $cacheable
      * @param mixed  $cache_attrs
+     *
+     * @throws \SmartyException
      */
     public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
     {
@@ -175,6 +179,8 @@ class SmartyBC extends Smarty
      * @param string $function      name of template function
      * @param string $function_impl name of PHP function to register
      * @param bool   $cacheable
+     *
+     * @throws \SmartyException
      */
     public function register_compiler_function($function, $function_impl, $cacheable = true)
     {
@@ -196,6 +202,8 @@ class SmartyBC extends Smarty
      *
      * @param string $modifier      name of template modifier
      * @param string $modifier_impl name of PHP function to register
+     *
+     * @throws \SmartyException
      */
     public function register_modifier($modifier, $modifier_impl)
     {
@@ -238,6 +246,8 @@ class SmartyBC extends Smarty
      * to a template before compiling
      *
      * @param callable $function
+     *
+     * @throws \SmartyException
      */
     public function register_prefilter($function)
     {
@@ -259,6 +269,8 @@ class SmartyBC extends Smarty
      * to a compiled template after compilation
      *
      * @param callable $function
+     *
+     * @throws \SmartyException
      */
     public function register_postfilter($function)
     {
@@ -280,6 +292,8 @@ class SmartyBC extends Smarty
      * to a template output
      *
      * @param callable $function
+     *
+     * @throws \SmartyException
      */
     public function register_outputfilter($function)
     {
@@ -301,6 +315,8 @@ class SmartyBC extends Smarty
      *
      * @param string $type filter type
      * @param string $name filter name
+     *
+     * @throws \SmartyException
      */
     public function load_filter($type, $name)
     {
@@ -341,7 +357,9 @@ class SmartyBC extends Smarty
      * @param  string $cache_id
      * @param  string $compile_id
      *
-     * @return boolean
+     * @return bool
+     * @throws \Exception
+     * @throws \SmartyException
      */
     public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
     {
@@ -377,7 +395,8 @@ class SmartyBC extends Smarty
      *
      * @param  string $tpl_file
      *
-     * @return boolean
+     * @return bool
+     * @throws \SmartyException
      */
     public function template_exists($tpl_file)
     {

libs/bootstrap.php

@@ -0,0 +1,17 @@
+<?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')) {
+    require dirname(__FILE__) . '/Autoloader.php';
+}
+Smarty_Autoloader::register(true);

libs/plugins/block.textformat.php

@@ -5,22 +5,21 @@
  * @package    Smarty
  * @subpackage PluginsBlock
  */
-
 /**
  * Smarty {textformat}{/textformat} block plugin
- * Type:     block function<br>
- * Name:     textformat<br>
+ * Type:     block function
+ * Name:     textformat
  * Purpose:  format text a certain way with preset styles
- *           or custom wrap/indent settings<br>
+ *           or custom wrap/indent settings
  * Params:
- * <pre>
+ *
  * - style         - string (email)
  * - indent        - integer (0)
  * - wrap          - integer (80)
  * - wrap_char     - string ("\n")
  * - indent_char   - string (" ")
  * - wrap_boundary - boolean (true)
- * </pre>
+ *
  *
  * @link   http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
  *         (Smarty online manual)
@@ -32,12 +31,17 @@
  *
  * @return string content re-formatted
  * @author Monte Ohrt <monte at ohrt dot com>
+ * @throws \SmartyException
  */
-function smarty_block_textformat($params, $content, $template, &$repeat)
+function smarty_block_textformat($params, $content, Smarty_Internal_Template $template, &$repeat)
 {
     if (is_null($content)) {
         return;
     }
+    if (Smarty::$_MBSTRING) {
+        $template->_checkPlugins(array(array('function' => 'smarty_modifier_mb_wordwrap',
+                                             'file' => SMARTY_PLUGINS_DIR . 'modifier.mb_wordwrap.php')));
+    }
 
     $style = null;
     $indent = 0;
@@ -68,11 +72,11 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
                 break;
 
             default:
-                trigger_error("textformat: unknown attribute '$_key'");
+                trigger_error("textformat: unknown attribute '{$_key}'");
         }
     }
 
-    if ($style == 'email') {
+    if ($style === 'email') {
         $wrap = 72;
     }
     // split into paragraphs
@@ -84,16 +88,17 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
         }
         // convert mult. spaces & special chars to single space
         $_paragraph =
-            preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER, '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER),
-                         array(' ', ''), $_paragraph);
+            preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER,
+                               '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER),
+                         array(' ',
+                               ''), $_paragraph);
         // indent first line
         if ($indent_first > 0) {
             $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
         }
         // wordwrap sentences
         if (Smarty::$_MBSTRING) {
-            require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php');
-            $_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+            $_paragraph = smarty_modifier_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
         } else {
             $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
         }

libs/plugins/function.counter.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty {counter} function plugin
- * Type:     function<br>
- * Name:     counter<br>
+ * Type:     function
+ * Name:     counter
  * Purpose:  print out a counter value
  *
  * @author Monte Ohrt <monte at ohrt dot com>
@@ -63,7 +63,7 @@ function smarty_function_counter($params, $template)
         $counter[ 'direction' ] = $params[ 'direction' ];
     }
 
-    if ($counter[ 'direction' ] == "down") {
+    if ($counter[ 'direction' ] === 'down') {
         $counter[ 'count' ] -= $counter[ 'skip' ];
     } else {
         $counter[ 'count' ] += $counter[ 'skip' ];

libs/plugins/function.cycle.php

@@ -8,12 +8,12 @@
 
 /**
  * Smarty {cycle} function plugin
- * Type:     function<br>
- * Name:     cycle<br>
- * Date:     May 3, 2002<br>
- * Purpose:  cycle through given values<br>
+ * Type:     function
+ * Name:     cycle
+ * Date:     May 3, 2002
+ * Purpose:  cycle through given values
  * Params:
- * <pre>
+ *
  * - name      - name of cycle (optional)
  * - values    - comma separated list of values to cycle, or an array of values to cycle
  *               (this can be left out for subsequent calls)
@@ -22,13 +22,13 @@
  * - advance   - boolean - whether or not to advance the cycle
  * - delimiter - the value delimiter, default is ","
  * - assign    - boolean, assigns to template var instead of printed.
- * </pre>
- * Examples:<br>
- * <pre>
+ *
+ * Examples:
+ *
  * {cycle values="#eeeeee,#d0d0d0d"}
  * {cycle name=row values="one,two,three" reset=true}
  * {cycle name=row}
- * </pre>
+ *
  *
  * @link     http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
  *           (Smarty online manual)
@@ -55,12 +55,12 @@ function smarty_function_cycle($params, $template)
 
     if (!isset($params[ 'values' ])) {
         if (!isset($cycle_vars[ $name ][ 'values' ])) {
-            trigger_error("cycle: missing 'values' parameter");
+            trigger_error('cycle: missing \'values\' parameter');
 
             return;
         }
     } else {
-        if (isset($cycle_vars[ $name ][ 'values' ]) && $cycle_vars[ $name ][ 'values' ] != $params[ 'values' ]) {
+        if (isset($cycle_vars[ $name ][ 'values' ]) && $cycle_vars[ $name ][ 'values' ] !== $params[ 'values' ]) {
             $cycle_vars[ $name ][ 'index' ] = 0;
         }
         $cycle_vars[ $name ][ 'values' ] = $params[ 'values' ];

libs/plugins/function.fetch.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty {fetch} plugin
- * Type:     function<br>
- * Name:     fetch<br>
+ * Type:     function
+ * Name:     fetch
  * Purpose:  fetch file, web or ftp data and display results
  *
  * @link   http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
@@ -25,7 +25,7 @@
 function smarty_function_fetch($params, $template)
 {
     if (empty($params[ 'file' ])) {
-        trigger_error("[plugin] fetch parameter 'file' cannot be empty", E_USER_NOTICE);
+        trigger_error('[plugin] fetch parameter \'file\' cannot be empty', E_USER_NOTICE);
 
         return;
     }
@@ -55,15 +55,15 @@ function smarty_function_fetch($params, $template)
     }
 
     $content = '';
-    if ($protocol == 'http') {
+    if ($protocol === 'http') {
         // http fetch
         if ($uri_parts = parse_url($params[ 'file' ])) {
             // set defaults
             $host = $server_name = $uri_parts[ 'host' ];
             $timeout = 30;
-            $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-            $agent = "Smarty Template Engine " . Smarty::SMARTY_VERSION;
-            $referer = "";
+            $accept = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
+            $agent = 'Smarty Template Engine ' . Smarty::SMARTY_VERSION;
+            $referer = '';
             $uri = !empty($uri_parts[ 'path' ]) ? $uri_parts[ 'path' ] : '/';
             $uri .= !empty($uri_parts[ 'query' ]) ? '?' . $uri_parts[ 'query' ] : '';
             $_is_proxy = false;
@@ -81,29 +81,29 @@ function smarty_function_fetch($params, $template)
             // loop through parameters, setup headers
             foreach ($params as $param_key => $param_value) {
                 switch ($param_key) {
-                    case "file":
-                    case "assign":
-                    case "assign_headers":
+                    case 'file':
+                    case 'assign':
+                    case 'assign_headers':
                         break;
-                    case "user":
+                    case 'user':
                         if (!empty($param_value)) {
                             $user = $param_value;
                         }
                         break;
-                    case "pass":
+                    case 'pass':
                         if (!empty($param_value)) {
                             $pass = $param_value;
                         }
                         break;
-                    case "accept":
+                    case 'accept':
                         if (!empty($param_value)) {
                             $accept = $param_value;
                         }
                         break;
-                    case "header":
+                    case 'header':
                         if (!empty($param_value)) {
                             if (!preg_match('![\w\d-]+: .+!', $param_value)) {
-                                trigger_error("[plugin] invalid header format '" . $param_value . "'", E_USER_NOTICE);
+                                trigger_error("[plugin] invalid header format '{$param_value}'", E_USER_NOTICE);
 
                                 return;
                             } else {
@@ -111,41 +111,41 @@ function smarty_function_fetch($params, $template)
                             }
                         }
                         break;
-                    case "proxy_host":
+                    case 'proxy_host':
                         if (!empty($param_value)) {
                             $proxy_host = $param_value;
                         }
                         break;
-                    case "proxy_port":
+                    case 'proxy_port':
                         if (!preg_match('!\D!', $param_value)) {
                             $proxy_port = (int) $param_value;
                         } else {
-                            trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE);
+                            trigger_error("[plugin] invalid value for attribute '{$param_key }'", E_USER_NOTICE);
 
                             return;
                         }
                         break;
-                    case "agent":
+                    case 'agent':
                         if (!empty($param_value)) {
                             $agent = $param_value;
                         }
                         break;
-                    case "referer":
+                    case 'referer':
                         if (!empty($param_value)) {
                             $referer = $param_value;
                         }
                         break;
-                    case "timeout":
+                    case 'timeout':
                         if (!preg_match('!\D!', $param_value)) {
                             $timeout = (int) $param_value;
                         } else {
-                            trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE);
+                            trigger_error("[plugin] invalid value for attribute '{$param_key}'", E_USER_NOTICE);
 
                             return;
                         }
                         break;
                     default:
-                        trigger_error("[plugin] unrecognized attribute '" . $param_key . "'", E_USER_NOTICE);
+                        trigger_error("[plugin] unrecognized attribute '{$param_key}'", E_USER_NOTICE);
 
                         return;
                 }
@@ -185,7 +185,7 @@ function smarty_function_fetch($params, $template)
                     }
                 }
                 if (!empty($user) && !empty($pass)) {
-                    fputs($fp, "Authorization: BASIC " . base64_encode("$user:$pass") . "\r\n");
+                    fputs($fp, 'Authorization: BASIC ' . base64_encode("$user:$pass") . "\r\n");
                 }
 
                 fputs($fp, "\r\n");

libs/plugins/function.html_checkboxes.php

@@ -5,22 +5,21 @@
  * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {html_checkboxes} function plugin
- * File:       function.html_checkboxes.php<br>
- * Type:       function<br>
- * Name:       html_checkboxes<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of checkbox input types<br>
+ * File:       function.html_checkboxes.php
+ * Type:       function
+ * Name:       html_checkboxes
+ * Date:       24.Feb.2003
+ * Purpose:    Prints out a list of checkbox input types
  * Examples:
- * <pre>
+ *
  * {html_checkboxes values=$ids output=$names}
  * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
  * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
+ *
  * Params:
- * <pre>
+ *
  * - name       (optional) - string default "checkbox"
  * - values     (required) - array
  * - options    (optional) - associative array
@@ -29,7 +28,7 @@
  * - output     (optional) - the output next to each checkbox
  * - assign     (optional) - assign the output as an array to this variable
  * - escape     (optional) - escape the content (not value), defaults to true
- * </pre>
+ *
  *
  * @link       http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
  *             (Smarty online manual)
@@ -37,15 +36,17 @@
  * @author     credits to Monte Ohrt <monte at ohrt dot com>
  * @version    1.0
  *
- * @param array  $params   parameters
- * @param object $template template object
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
  *
  * @return string
  * @uses       smarty_function_escape_special_chars()
+ * @throws \SmartyException
  */
-function smarty_function_html_checkboxes($params, $template)
+function smarty_function_html_checkboxes($params, Smarty_Internal_Template $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+    $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+                                         'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
 
     $name = 'checkbox';
     $values = null;
@@ -87,11 +88,11 @@ function smarty_function_html_checkboxes($params, $template)
                     $selected = array();
                     foreach ($_val as $_sel) {
                         if (is_object($_sel)) {
-                            if (method_exists($_sel, "__toString")) {
+                            if (method_exists($_sel, '__toString')) {
                                 $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
                             } else {
-                                trigger_error("html_checkboxes: selected attribute contains an object of class '" .
-                                              get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
+                                trigger_error('html_checkboxes: selected attribute contains an object of class \'' .
+                                              get_class($_sel) . '\' without __toString() method', E_USER_NOTICE);
                                 continue;
                             }
                         } else {
@@ -100,11 +101,11 @@ function smarty_function_html_checkboxes($params, $template)
                         $selected[ $_sel ] = true;
                     }
                 } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
+                    if (method_exists($_val, '__toString')) {
                         $selected = smarty_function_escape_special_chars((string) $_val->__toString());
                     } else {
-                        trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) .
-                                      "' without __toString() method", E_USER_NOTICE);
+                        trigger_error('html_checkboxes: selected attribute is an object of class \'' . get_class($_val) .
+                                      '\' without __toString() method', E_USER_NOTICE);
                     }
                 } else {
                     $selected = smarty_function_escape_special_chars((string) $_val);
@@ -127,7 +128,7 @@ function smarty_function_html_checkboxes($params, $template)
             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",
+                        trigger_error("html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
                                       E_USER_NOTICE);
                     }
 
@@ -143,7 +144,7 @@ function smarty_function_html_checkboxes($params, $template)
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
-                    trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                    trigger_error("html_checkboxes: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
@@ -176,18 +177,30 @@ function smarty_function_html_checkboxes($params, $template)
         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)
+                                                   $label_ids, $escape = true)
 {
     $_output = '';
 
     if (is_object($value)) {
-        if (method_exists($value, "__toString")) {
+        if (method_exists($value, '__toString')) {
             $value = (string) $value->__toString();
         } else {
-            trigger_error("html_options: value is an object of class '" . get_class($value) .
-                          "' without __toString() method", E_USER_NOTICE);
+            trigger_error('html_options: value is an object of class \'' . get_class($value) .
+                          '\' without __toString() method', E_USER_NOTICE);
 
             return '';
         }
@@ -196,11 +209,11 @@ function smarty_function_html_checkboxes_output($name, $value, $output, $selecte
     }
 
     if (is_object($output)) {
-        if (method_exists($output, "__toString")) {
+        if (method_exists($output, '__toString')) {
             $output = (string) $output->__toString();
         } else {
-            trigger_error("html_options: output is an object of class '" . get_class($output) .
-                          "' without __toString() method", E_USER_NOTICE);
+            trigger_error('html_options: output is an object of class \'' . get_class($output) .
+                          '\' without __toString() method', E_USER_NOTICE);
 
             return '';
         }

libs/plugins/function.html_image.php

@@ -8,20 +8,20 @@
 
 /**
  * Smarty {html_image} function plugin
- * Type:     function<br>
- * Name:     html_image<br>
- * Date:     Feb 24, 2003<br>
- * Purpose:  format HTML tags for the image<br>
- * Examples: {html_image file="/images/masthead.gif"}<br>
- * Output:   <img src="/images/masthead.gif" width=400 height=23><br>
+ * Type:     function
+ * Name:     html_image
+ * Date:     Feb 24, 2003
+ * Purpose:  format HTML tags for the image
+ * Examples: {html_image file="/images/masthead.gif"}
+ * Output:   <img src="/images/masthead.gif" width=400 height=23>
  * Params:
- * <pre>
+ *
  * - file        - (required) - file (and path) of image
  * - height      - (optional) - image height (default actual height)
  * - width       - (optional) - image width (default actual width)
  * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
  * - path_prefix - prefix for path output (optional, default empty)
- * </pre>
+ *
  *
  * @link    http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
  *          (Smarty online manual)
@@ -36,9 +36,10 @@
  * @return string
  * @uses    smarty_function_escape_special_chars()
  */
-function smarty_function_html_image($params, $template)
+function smarty_function_html_image($params, Smarty_Internal_Template $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+    $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+                                         'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
 
     $alt = '';
     $file = '';
@@ -64,7 +65,7 @@ function smarty_function_html_image($params, $template)
                 if (!is_array($_val)) {
                     $$_key = smarty_function_escape_special_chars($_val);
                 } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                    throw new SmartyException ("html_image: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
                 }
                 break;
 
@@ -78,19 +79,19 @@ function smarty_function_html_image($params, $template)
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                    throw new SmartyException ("html_image: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
     }
 
     if (empty($file)) {
-        trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
+        trigger_error('html_image: missing \'file\' parameter', E_USER_NOTICE);
 
         return;
     }
 
-    if ($file[ 0 ] == '/') {
+    if ($file[ 0 ] === '/') {
         $_image_path = $basedir . $file;
     } else {
         $_image_path = $file;
@@ -124,15 +125,15 @@ function smarty_function_html_image($params, $template)
         // FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
         if (!$_image_data = @getimagesize($_image_path)) {
             if (!file_exists($_image_path)) {
-                trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
+                trigger_error("html_image: unable to find '{$_image_path}'", E_USER_NOTICE);
 
                 return;
             } elseif (!is_readable($_image_path)) {
-                trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
+                trigger_error("html_image: unable to read '{$_image_path}'", E_USER_NOTICE);
 
                 return;
             } else {
-                trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
+                trigger_error("html_image: '{$_image_path}' is not a valid image file", E_USER_NOTICE);
 
                 return;
             }

libs/plugins/function.html_options.php

@@ -5,15 +5,14 @@
  * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {html_options} function plugin
- * Type:     function<br>
- * Name:     html_options<br>
+ * Type:     function
+ * Name:     html_options
  * Purpose:  Prints the list of <option> tags generated from
- *           the passed parameters<br>
+ *           the passed parameters
  * Params:
- * <pre>
+ *
  * - name       (optional) - string default "select"
  * - values     (required) - if no options supplied) - array
  * - options    (required) - if no values supplied) - associative array
@@ -21,21 +20,25 @@
  * - output     (required) - if not options supplied) - array
  * - id         (optional) - string default not set
  * - class      (optional) - string default not set
- * </pre>
+ *
  *
  * @link     http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
  *           (Smarty online manual)
  * @author   Monte Ohrt <monte at ohrt dot com>
  * @author   Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
  *
- * @param array $params parameters
+ * @param array                     $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
  *
  * @return string
  * @uses     smarty_function_escape_special_chars()
+ * @throws \SmartyException
  */
-function smarty_function_html_options($params)
+function smarty_function_html_options($params, Smarty_Internal_Template $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+    $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+                                         'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
 
     $name = null;
     $values = null;
@@ -69,11 +72,11 @@ function smarty_function_html_options($params)
                     $selected = array();
                     foreach ($_val as $_sel) {
                         if (is_object($_sel)) {
-                            if (method_exists($_sel, "__toString")) {
+                            if (method_exists($_sel, '__toString')) {
                                 $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
                             } else {
-                                trigger_error("html_options: selected attribute contains an object of class '" .
-                                              get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
+                                trigger_error('html_options: selected attribute contains an object of class \'' .
+                                              get_class($_sel) . '\' without __toString() method', E_USER_NOTICE);
                                 continue;
                             }
                         } else {
@@ -82,11 +85,11 @@ function smarty_function_html_options($params)
                         $selected[ $_sel ] = true;
                     }
                 } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
+                    if (method_exists($_val, '__toString')) {
                         $selected = smarty_function_escape_special_chars((string) $_val->__toString());
                     } else {
-                        trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) .
-                                      "' without __toString() method", E_USER_NOTICE);
+                        trigger_error('html_options: selected attribute is an object of class \'' . get_class($_val) .
+                                      '\' without __toString() method', E_USER_NOTICE);
                     }
                 } else {
                     $selected = smarty_function_escape_special_chars((string) $_val);
@@ -100,7 +103,7 @@ function smarty_function_html_options($params)
             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",
+                        trigger_error("html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
                                       E_USER_NOTICE);
                     }
 
@@ -116,7 +119,7 @@ function smarty_function_html_options($params)
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
-                    trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                    trigger_error("html_options: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
@@ -152,7 +155,16 @@ function smarty_function_html_options($params)
 
     return $_html_result;
 }
-
+/**
+ * @param $key
+ * @param $value
+ * @param $selected
+ * @param $id
+ * @param $class
+ * @param $idx
+ *
+ * @return string
+ */
 function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
 {
     if (!is_array($value)) {
@@ -168,11 +180,11 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c
         $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
         $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
         if (is_object($value)) {
-            if (method_exists($value, "__toString")) {
+            if (method_exists($value, '__toString')) {
                 $value = smarty_function_escape_special_chars((string) $value->__toString());
             } else {
-                trigger_error("html_options: value is an object of class '" . get_class($value) .
-                              "' without __toString() method", E_USER_NOTICE);
+                trigger_error('html_options: value is an object of class \'' . get_class($value) .
+                              '\' without __toString() method', E_USER_NOTICE);
 
                 return '';
             }
@@ -191,7 +203,16 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c
 
     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";

libs/plugins/function.html_radios.php

@@ -5,16 +5,15 @@
  * @package    Smarty
  * @subpackage PluginsFunction
  */
-
 /**
  * Smarty {html_radios} function plugin
- * File:       function.html_radios.php<br>
- * Type:       function<br>
- * Name:       html_radios<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of radio input types<br>
+ * File:       function.html_radios.php
+ * Type:       function
+ * Name:       html_radios
+ * Date:       24.Feb.2003
+ * Purpose:    Prints out a list of radio input types
  * Params:
- * <pre>
+ *
  * - name       (optional) - string default "radio"
  * - values     (required) - array
  * - options    (required) - associative array
@@ -23,13 +22,13 @@
  * - output     (optional) - the output next to each radio button
  * - assign     (optional) - assign the output as an array to this variable
  * - escape     (optional) - escape the content (not value), defaults to true
- * </pre>
+ *
  * Examples:
- * <pre>
+ *
  * {html_radios values=$ids output=$names}
  * {html_radios values=$ids name='box' separator='<br>' output=$names}
  * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
+ *
  *
  * @link    http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
  *          (Smarty online manual)
@@ -42,10 +41,12 @@
  *
  * @return string
  * @uses    smarty_function_escape_special_chars()
+ * @throws \SmartyException
  */
-function smarty_function_html_radios($params, $template)
+function smarty_function_html_radios($params, Smarty_Internal_Template $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+    $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+                                         'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
 
     $name = 'radio';
     $values = null;
@@ -70,11 +71,11 @@ function smarty_function_html_radios($params, $template)
                 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")) {
+                    if (method_exists($_val, '__toString')) {
                         $selected = smarty_function_escape_special_chars((string) $_val->__toString());
                     } else {
-                        trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) .
-                                      "' without __toString() method", E_USER_NOTICE);
+                        trigger_error('html_radios: selected attribute is an object of class \'' . get_class($_val) .
+                                      '\' without __toString() method', E_USER_NOTICE);
                     }
                 } else {
                     $selected = (string) $_val;
@@ -112,7 +113,7 @@ function smarty_function_html_radios($params, $template)
             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",
+                        trigger_error("html_options: {$_key} attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
                                       E_USER_NOTICE);
                     }
 
@@ -128,7 +129,7 @@ function smarty_function_html_radios($params, $template)
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
-                    trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                    trigger_error("html_radios: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
@@ -163,18 +164,30 @@ function smarty_function_html_radios($params, $template)
         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)
+                                               $escape)
 {
     $_output = '';
 
     if (is_object($value)) {
-        if (method_exists($value, "__toString")) {
+        if (method_exists($value, '__toString')) {
             $value = (string) $value->__toString();
         } else {
-            trigger_error("html_options: value is an object of class '" . get_class($value) .
-                          "' without __toString() method", E_USER_NOTICE);
+            trigger_error('html_options: value is an object of class \'' . get_class($value) .
+                          '\' without __toString() method', E_USER_NOTICE);
 
             return '';
         }
@@ -183,11 +196,11 @@ function smarty_function_html_radios_output($name, $value, $output, $selected, $
     }
 
     if (is_object($output)) {
-        if (method_exists($output, "__toString")) {
+        if (method_exists($output, '__toString')) {
             $output = (string) $output->__toString();
         } else {
-            trigger_error("html_options: output is an object of class '" . get_class($output) .
-                          "' without __toString() method", E_USER_NOTICE);
+            trigger_error('html_options: output is an object of class \'' . get_class($output) .
+                         '\' without __toString() method', E_USER_NOTICE);
 
             return '';
         }

libs/plugins/function.html_select_date.php

@@ -5,23 +5,13 @@
  * @package    Smarty
  * @subpackage PluginsFunction
  */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
 /**
  * Smarty {html_select_date} plugin
- * Type:     function<br>
- * Name:     html_select_date<br>
+ * Type:     function
+ * Name:     html_select_date
  * Purpose:  Prints the dropdowns for date selection.
  * ChangeLog:
- * <pre>
+ *
  *            - 1.0 initial release
  *            - 1.1 added support for +/- N syntax for begin
  *              and end year values. (Monte)
@@ -37,7 +27,7 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
  *              of 0000-00-00 dates (cybot, boots)
  *            - 2.0 complete rewrite for performance,
  *              added attributes month_names, *_id
- * </pre>
+ *
  *
  * @link     http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
  *           (Smarty online manual)
@@ -46,12 +36,17 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
  * @author   Monte Ohrt <monte at ohrt dot com>
  * @author   Rodney Rehm
  *
- * @param array $params parameters
+ * @param array                     $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
  *
  * @return string
+ * @throws \SmartyException
  */
-function smarty_function_html_select_date($params)
+function smarty_function_html_select_date($params, Smarty_Internal_Template $template)
 {
+    $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+                                         'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
     // generate timestamps used for month names only
     static $_month_timestamps = null;
     static $_current_year = null;
@@ -64,18 +59,18 @@ function smarty_function_html_select_date($params)
     }
 
     /* Default values. */
-    $prefix = "Date_";
+    $prefix = 'Date_';
     $start_year = null;
     $end_year = null;
     $display_days = true;
     $display_months = true;
     $display_years = true;
-    $month_format = "%B";
+    $month_format = '%B';
     /* Write months as numbers by default  GL */
-    $month_value_format = "%m";
-    $day_format = "%02d";
+    $month_value_format = '%m';
+    $day_format = '%02d';
     /* Write day values using this format MB */
-    $day_value_format = "%d";
+    $day_value_format = '%d';
     $year_as_text = false;
     /* Display years in reverse order? Ie. 2000,1999,.... */
     $reverse_years = false;
@@ -116,15 +111,17 @@ function smarty_function_html_select_date($params)
         switch ($_key) {
             case 'time':
                 if (!is_array($_value) && $_value !== null) {
+                    $template->_checkPlugins(array(array('function' => 'smarty_make_timestamp',
+                                                         'file' => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php')));
                     $time = smarty_make_timestamp($_value);
                 }
                 break;
 
             case 'month_names':
-                if (is_array($_value) && count($_value) == 12) {
+                if (is_array($_value) && count($_value) === 12) {
                     $$_key = $_value;
                 } else {
-                    trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
+                    trigger_error('html_select_date: month_names must be an array of 12 strings', E_USER_NOTICE);
                 }
                 break;
 
@@ -169,7 +166,7 @@ function smarty_function_html_select_date($params)
                 if (!is_array($_value)) {
                     $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
                 } else {
-                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                    trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
@@ -180,7 +177,9 @@ function smarty_function_html_select_date($params)
     if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
         if (isset($params[ 'time' ][ $prefix . 'Year' ])) {
             // $_REQUEST[$field_array] given
-            foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+            foreach (array('Y' => 'Year',
+                           'm' => 'Month',
+                           'd' => 'Day') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName =
                     isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
@@ -188,7 +187,9 @@ function smarty_function_html_select_date($params)
             }
         } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Year' ])) {
             // $_REQUEST given
-            foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+            foreach (array('Y' => 'Year',
+                           'm' => 'Month',
+                           'd' => 'Day') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
                     $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
@@ -209,14 +210,15 @@ function smarty_function_html_select_date($params)
 
     // make syntax "+N" or "-N" work with $start_year and $end_year
     // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
-    foreach (array('start', 'end') as $key) {
+    foreach (array('start',
+                   'end') as $key) {
         $key .= '_year';
         $t = $$key;
         if ($t === null) {
             $$key = (int) $_current_year;
-        } elseif ($t[ 0 ] == '+') {
+        } elseif ($t[ 0 ] === '+') {
             $$key = (int) ($_current_year + (int) trim(substr($t, 1)));
-        } elseif ($t[ 0 ] == '-') {
+        } elseif ($t[ 0 ] === '-') {
             $$key = (int) ($_current_year - (int) trim(substr($t, 1)));
         } else {
             $$key = (int) $$key;
@@ -304,8 +306,8 @@ function smarty_function_html_select_date($params)
         for ($i = 1; $i <= 12; $i ++) {
             $_val = sprintf('%02d', $i);
             $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
-                ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
-            $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
+                ($month_format === '%m' ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
+            $_value = $month_value_format === '%m' ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
             $_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
                              '>' . $_text . '</option>' . $option_separator;
         }
@@ -342,8 +344,8 @@ function smarty_function_html_select_date($params)
 
         for ($i = 1; $i <= 31; $i ++) {
             $_val = sprintf('%02d', $i);
-            $_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
-            $_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i);
+            $_text = $day_format === '%02d' ? $_val : sprintf($day_format, $i);
+            $_value = $day_value_format === '%02d' ? $_val : sprintf($day_value_format, $i);
             $_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' .
                            $_text . '</option>' . $option_separator;
         }

libs/plugins/function.html_select_time.php

@@ -5,20 +5,10 @@
  * @package    Smarty
  * @subpackage PluginsFunction
  */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
 /**
  * Smarty {html_select_time} function plugin
- * Type:     function<br>
- * Name:     html_select_time<br>
+ * Type:     function
+ * Name:     html_select_time
  * Purpose:  Prints the dropdowns for time selection
  *
  * @link     http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
@@ -26,14 +16,19 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
  * @author   Roberto Berto <roberto@berto.net>
  * @author   Monte Ohrt <monte AT ohrt DOT com>
  *
- * @param array $params parameters
+ * @param array                     $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
  *
  * @return string
  * @uses     smarty_make_timestamp()
+ * @throws \SmartyException
  */
-function smarty_function_html_select_time($params)
+function smarty_function_html_select_time($params, Smarty_Internal_Template $template)
 {
-    $prefix = "Time_";
+    $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+                                         'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
+    $prefix = 'Time_';
     $field_array = null;
     $field_separator = "\n";
     $option_separator = "\n";
@@ -83,6 +78,8 @@ function smarty_function_html_select_time($params)
         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;
@@ -142,7 +139,7 @@ function smarty_function_html_select_time($params)
                 if (!is_array($_value)) {
                     $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
                 } else {
-                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                    trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
@@ -151,7 +148,9 @@ function smarty_function_html_select_time($params)
     if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
         if (isset($params[ 'time' ][ $prefix . 'Hour' ])) {
             // $_REQUEST[$field_array] given
-            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+            foreach (array('H' => 'Hour',
+                           'i' => 'Minute',
+                           's' => 'Second') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName =
                     isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
@@ -164,7 +163,9 @@ function smarty_function_html_select_time($params)
             list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
         } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Hour' ])) {
             // $_REQUEST given
-            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+            foreach (array('H' => 'Hour',
+                           'i' => 'Minute',
+                           's' => 'Second') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
                     $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
@@ -219,8 +220,8 @@ function smarty_function_html_select_time($params)
         $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);
+            $_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);
@@ -266,8 +267,8 @@ function smarty_function_html_select_time($params)
         $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
         for ($i = 0; $i <= 59; $i += $minute_interval) {
             $_val = sprintf('%02d', $i);
-            $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
-            $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
+            $_text = $minute_format === '%02d' ? $_val : sprintf($minute_format, $i);
+            $_value = $minute_value_format === '%02d' ? $_val : sprintf($minute_value_format, $i);
             $_html_minutes .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
                               '>' . $_text . '</option>' . $option_separator;
         }
@@ -307,8 +308,8 @@ function smarty_function_html_select_time($params)
         $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
         for ($i = 0; $i <= 59; $i += $second_interval) {
             $_val = sprintf('%02d', $i);
-            $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
-            $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
+            $_text = $second_format === '%02d' ? $_val : sprintf($second_format, $i);
+            $_value = $second_value_format === '%02d' ? $_val : sprintf($second_value_format, $i);
             $_html_seconds .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
                               '>' . $_text . '</option>' . $option_separator;
         }
@@ -353,7 +354,10 @@ function smarty_function_html_select_time($params)
     }
 
     $_html = '';
-    foreach (array('_html_hours', '_html_minutes', '_html_seconds', '_html_meridian') as $k) {
+    foreach (array('_html_hours',
+                   '_html_minutes',
+                   '_html_seconds',
+                   '_html_meridian') as $k) {
         if (isset($$k)) {
             if ($_html) {
                 $_html .= $field_separator;

libs/plugins/function.html_table.php

@@ -8,12 +8,12 @@
 
 /**
  * Smarty {html_table} function plugin
- * Type:     function<br>
- * Name:     html_table<br>
- * Date:     Feb 17, 2003<br>
- * Purpose:  make an html table from an array of data<br>
+ * Type:     function
+ * Name:     html_table
+ * Date:     Feb 17, 2003
+ * Purpose:  make an html table from an array of data
  * Params:
- * <pre>
+ *
  * - loop       - array to loop through
  * - cols       - number of columns, comma separated list of column names
  *                or array of column names
@@ -28,13 +28,13 @@
  * - hdir       - horizontal direction (default: "right", means left-to-right)
  * - inner      - inner loop (default "cols": print $loop line by line,
  *                $loop will be printed column by column otherwise)
- * </pre>
+ *
  * Examples:
- * <pre>
+ *
  * {table loop=$data}
  * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
  * {table loop=$data cols="first,second,third" tr_attr=$colors}
- * </pre>
+ *
  *
  * @author   Monte Ohrt <monte at ohrt dot com>
  * @author   credit to Messju Mohr <messju at lammfellpuschen dot de>
@@ -127,7 +127,7 @@ function smarty_function_html_table($params)
     }
 
     if (is_array($cols)) {
-        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
+        $cols = ($hdir === 'right') ? $cols : array_reverse($cols);
         $output .= "<thead><tr>\n";
 
         for ($r = 0; $r < $cols_count; $r ++) {
@@ -141,11 +141,11 @@ function smarty_function_html_table($params)
     $output .= "<tbody>\n";
     for ($r = 0; $r < $rows; $r ++) {
         $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
+        $rx = ($vdir === 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
 
         for ($c = 0; $c < $cols_count; $c ++) {
-            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
-            if ($inner != 'cols') {
+            $x = ($hdir === 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
+            if ($inner !== 'cols') {
                 /* shuffle x to loop over rows*/
                 $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
             }
@@ -163,7 +163,13 @@ function smarty_function_html_table($params)
 
     return $output;
 }
-
+/**
+ * @param $name
+ * @param $var
+ * @param $no
+ *
+ * @return string
+ */
 function smarty_function_html_table_cycle($name, $var, $no)
 {
     if (!is_array($var)) {

libs/plugins/function.mailto.php

@@ -8,35 +8,35 @@
 
 /**
  * Smarty {mailto} function plugin
- * Type:     function<br>
- * Name:     mailto<br>
+ * Type:     function
+ * Name:     mailto
  * Date:     May 21, 2002
- * Purpose:  automate mailto address link creation, and optionally encode them.<br>
+ * Purpose:  automate mailto address link creation, and optionally encode them.
  * Params:
- * <pre>
+ *
  * - address    - (required) - e-mail address
  * - text       - (optional) - text to display, default is address
  * - encode     - (optional) - can be one of:
  *                             * none : no encoding (default)
  *                             * javascript : encode with javascript
  *                             * javascript_charcode : encode with javascript charcode
- *                             * hex : encode with hexidecimal (no javascript)
+ *                             * hex : encode with hexadecimal (no javascript)
  * - cc         - (optional) - address(es) to carbon copy
  * - bcc        - (optional) - address(es) to blind carbon copy
  * - subject    - (optional) - e-mail subject
  * - newsgroups - (optional) - newsgroup(s) to post to
  * - followupto - (optional) - address(es) to follow up to
  * - extra      - (optional) - extra tags for the href link
- * </pre>
+ *
  * Examples:
- * <pre>
+ *
  * {mailto address="me@domain.com"}
  * {mailto address="me@domain.com" encode="javascript"}
  * {mailto address="me@domain.com" encode="hex"}
  * {mailto address="me@domain.com" subject="Hello to you!"}
  * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
  * {mailto address="me@domain.com" extra='class="mailto"'}
- * </pre>
+ *
  *
  * @link     http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
  *           (Smarty online manual)
@@ -103,7 +103,7 @@ function smarty_function_mailto($params)
         return;
     }
     // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
-    if ($encode == 'javascript') {
+    if ($encode === 'javascript') {
         $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
 
         $js_encode = '';
@@ -112,7 +112,7 @@ function smarty_function_mailto($params)
         }
 
         return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
-    } elseif ($encode == 'javascript_charcode') {
+    } elseif ($encode === 'javascript_charcode') {
         $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
 
         for ($x = 0, $y = strlen($string); $x < $y; $x ++) {
@@ -123,7 +123,7 @@ function smarty_function_mailto($params)
                 implode(',', $ord) . "))" . "}\n" . "</script>\n";
 
         return $_ret;
-    } elseif ($encode == 'hex') {
+    } elseif ($encode === 'hex') {
         preg_match('!^(.*)(\?.*)$!', $address, $match);
         if (!empty($match[ 2 ])) {
             trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);

libs/plugins/function.math.php

@@ -9,8 +9,8 @@
 
 /**
  * Smarty {math} function plugin
- * Type:     function<br>
- * Name:     math<br>
+ * Type:     function
+ * Name:     math
  * Purpose:  handle math computations in template
  *
  * @link     http://www.smarty.net/manual/en/language.function.math.php {math}
@@ -38,7 +38,7 @@ function smarty_function_math($params, $template)
     $equation = $params[ 'equation' ];
 
     // make sure parenthesis are balanced
-    if (substr_count($equation, "(") != substr_count($equation, ")")) {
+    if (substr_count($equation, '(') !== substr_count($equation, ')')) {
         trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
 
         return;
@@ -58,30 +58,35 @@ function smarty_function_math($params, $template)
         return;
     }
 
+    foreach ($params as $key => $val) {
+        if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+            // make sure value is not empty
+            if (strlen($val) === 0) {
+                trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING);
+
+                return;
+            }
+            if (!is_numeric($val)) {
+                trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING);
+
+                return;
+            }
+        }
+    }
+
     // match all vars in equation, make sure all are passed
     preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match);
 
     foreach ($match[ 1 ] as $curr_var) {
         if ($curr_var && !isset($params[ $curr_var ]) && !isset($_allowed_funcs[ $curr_var ])) {
-            trigger_error("math: function call $curr_var not allowed", E_USER_WARNING);
+            trigger_error("math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'", E_USER_WARNING);
 
             return;
         }
     }
 
     foreach ($params as $key => $val) {
-        if ($key != "equation" && $key != "format" && $key != "assign") {
-            // make sure value is not empty
-            if (strlen($val) == 0) {
-                trigger_error("math: parameter $key is empty", E_USER_WARNING);
-
-                return;
-            }
-            if (!is_numeric($val)) {
-                trigger_error("math: parameter $key: is not numeric", E_USER_WARNING);
-
-                return;
-            }
+        if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
             $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
         }
     }

libs/plugins/modifier.capitalize.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty capitalize modifier plugin
- * Type:     modifier<br>
- * Name:     capitalize<br>
+ * Type:     modifier
+ * Name:     capitalize
  * Purpose:  capitalize words in the string
  * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
  *
@@ -72,7 +72,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
     return $upper_string;
 }
 
-/* 
+/*
  *
  * Bug: create_function() use exhausts memory when used in long loops
  * Fix: use declared functions for callbacks instead of using create_function()
@@ -80,21 +80,38 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
  *
  * @author Kyle Renfrow
  */
+/**
+ * @param $matches
+ *
+ * @return string
+ */
 function smarty_mod_cap_mbconvert_cb($matches)
 {
     return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
 }
-
+/**
+ * @param $matches
+ *
+ * @return string
+ */
 function smarty_mod_cap_mbconvert2_cb($matches)
 {
     return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
 }
-
+/**
+ * @param $matches
+ *
+ * @return string
+ */
 function smarty_mod_cap_ucfirst_cb($matches)
 {
     return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
 }
-
+/**
+ * @param $matches
+ *
+ * @return string
+ */
 function smarty_mod_cap_ucfirst2_cb($matches)
 {
     return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));

libs/plugins/modifier.date_format.php

@@ -8,10 +8,10 @@
 
 /**
  * Smarty date_format modifier plugin
- * Type:     modifier<br>
- * Name:     date_format<br>
- * Purpose:  format datestamps via strftime<br>
- * Input:<br>
+ * Type:     modifier
+ * Name:     date_format
+ * Purpose:  format datestamps via strftime
+ * Input:
  *          - string: input date string
  *          - format: strftime format for output
  *          - default_date: default date if $string is empty
@@ -35,18 +35,36 @@ function smarty_modifier_date_format($string, $format = null, $default_date = ''
     /**
      * require_once the {@link shared.make_timestamp.php} plugin
      */
-    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-    if ($string != '' && $string != '0000-00-00' && $string != '0000-00-00 00:00:00') {
+    static $is_loaded = false;
+    if (!$is_loaded) {
+        if (!is_callable('smarty_make_timestamp')) {
+            require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
+        }
+        $is_loaded = true;
+    }
+    if ($string !== '' && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
         $timestamp = smarty_make_timestamp($string);
-    } elseif ($default_date != '') {
+    } elseif ($default_date !== '') {
         $timestamp = smarty_make_timestamp($default_date);
     } else {
         return;
     }
-    if ($formatter == 'strftime' || ($formatter == 'auto' && strpos($format, '%') !== false)) {
-        if (DS == '\\') {
-            $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
-            $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
+    if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) {
+        if (Smarty::$_IS_WINDOWS) {
+            $_win_from = array('%D',
+                               '%h',
+                               '%n',
+                               '%r',
+                               '%R',
+                               '%t',
+                               '%T');
+            $_win_to = array('%m/%d/%y',
+                             '%b',
+                             "\n",
+                             '%I:%M:%S %p',
+                             '%H:%M',
+                             "\t",
+                             '%H:%M:%S');
             if (strpos($format, '%e') !== false) {
                 $_win_from[] = '%e';
                 $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));

libs/plugins/modifier.debug_print_var.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty debug_print_var modifier plugin
- * Type:     modifier<br>
- * Name:     debug_print_var<br>
+ * Type:     modifier
+ * Name:     debug_print_var
  * Purpose:  formats variable contents for display in the console
  *
  * @author Monte Ohrt <monte at ohrt dot com>
@@ -28,7 +28,7 @@ function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth =
     switch (gettype($var)) {
         case 'array' :
             $results = '<b>Array (' . count($var) . ')</b>';
-            if ($depth == $max) {
+            if ($depth === $max) {
                 break;
             }
             foreach ($var as $curr_key => $curr_val) {
@@ -46,7 +46,7 @@ function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth =
                 $results .= ' called recursive';
                 break;
             }
-            if ($depth == $max) {
+            if ($depth === $max) {
                 break;
             }
             $objects[] = $var;

libs/plugins/modifier.escape.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty escape modifier plugin
- * Type:     modifier<br>
- * Name:     escape<br>
+ * Type:     modifier
+ * Name:     escape
  * Purpose:  escape string for output
  *
  * @link   http://www.smarty.net/docs/en/language.modifier.escape
@@ -25,6 +25,8 @@
 function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
 {
     static $_double_encode = null;
+    static $is_loaded_1 = false;
+    static $is_loaded_2 = false;
     if ($_double_encode === null) {
         $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
     }
@@ -46,7 +48,9 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                     // php <5.2.3 - prevent double encoding
                     $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
                     $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                    $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+                    $string = str_replace(array('%%%SMARTY_START%%%',
+                                                '%%%SMARTY_END%%%'), array('&',
+                                                                           ';'), $string);
 
                     return $string;
                 }
@@ -67,7 +71,9 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                         $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
                         $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
                         $string =
-                            str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+                            str_replace(array('%%%SMARTY_START%%%',
+                                              '%%%SMARTY_END%%%'), array('&',
+                                                                         ';'), $string);
 
                         return $string;
                     }
@@ -86,7 +92,9 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                 } else {
                     $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
                     $string = htmlentities($string, ENT_QUOTES, $char_set);
-                    $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+                    $string = str_replace(array('%%%SMARTY_START%%%',
+                                                '%%%SMARTY_END%%%'), array('&',
+                                                                           ';'), $string);
 
                     return $string;
                 }
@@ -116,7 +124,12 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
         case 'hexentity':
             $return = '';
             if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
+                if (!$is_loaded_1) {
+                    if (!is_callable('smarty_mb_to_unicode')) {
+                        require_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)) . ';';
@@ -135,7 +148,12 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
         case 'decentity':
             $return = '';
             if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
+                if (!$is_loaded_1) {
+                    if (!is_callable('smarty_mb_to_unicode')) {
+                        require_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 . ';';
@@ -153,23 +171,40 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
 
         case 'javascript':
             // escape quotes and backslashes, newlines, etc.
-            return strtr($string, array('\\' => '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n',
+            return strtr($string, array('\\' => '\\\\',
+                                        "'" => "\\'",
+                                        '"' => '\\"',
+                                        "\r" => '\\r',
+                                        "\n" => '\\n',
                                         '</' => '<\/'));
 
         case 'mail':
             if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-
-                return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
+                if (!$is_loaded_2) {
+                    if (!is_callable('smarty_mb_str_replace')) {
+                        require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+                    }
+                    $is_loaded_2 = true;
+                }
+                return smarty_mb_str_replace(array('@',
+                                                   '.'), array(' [AT] ',
+                                                               ' [DOT] '), $string);
             }
             // no MBString fallback
-            return str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
+            return str_replace(array('@',
+                                     '.'), array(' [AT] ',
+                                                 ' [DOT] '), $string);
 
         case 'nonstd':
             // escape non-standard chars, such as ms document quotes
             $return = '';
             if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
+                if (!$is_loaded_1) {
+                    if (!is_callable('smarty_mb_to_unicode')) {
+                        require_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 . ';';

libs/plugins/modifier.mb_wordwrap.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty wordwrap modifier plugin
+ * Type:     modifier
+ * Name:     mb_wordwrap
+ * Purpose:  Wrap a string to a given number of characters
+ *
+
+ * @link   http://php.net/manual/en/function.wordwrap.php for similarity
+ *
+ * @param  string  $str   the string to wrap
+ * @param  int     $width the width of the output
+ * @param  string  $break the character used to break the line
+ * @param  boolean $cut   ignored parameter, just for the sake of
+ *
+ * @return string  wrapped string
+ * @author Rodney Rehm
+ */
+function smarty_modifier_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
+{
+    // break words into tokens using white space as a delimiter
+    $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+    $length = 0;
+    $t = '';
+    $_previous = false;
+    $_space = false;
+
+    foreach ($tokens as $_token) {
+        $token_length = mb_strlen($_token, Smarty::$_CHARSET);
+        $_tokens = array($_token);
+        if ($token_length > $width) {
+            if ($cut) {
+                $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER,
+                                      $_token,
+                                      -1,
+                                      PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+            }
+        }
+
+        foreach ($_tokens as $token) {
+            $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
+            $token_length = mb_strlen($token, Smarty::$_CHARSET);
+            $length += $token_length;
+
+            if ($length > $width) {
+                // remove space before inserted break
+                if ($_previous) {
+                    $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
+                }
+
+                if (!$_space) {
+                    // add the break before the token
+                    if (!empty($t)) {
+                        $t .= $break;
+                    }
+                    $length = $token_length;
+                }
+            } else if ($token === "\n") {
+                // hard break must reset counters
+                $length = 0;
+            }
+            $_previous = $_space;
+            // add the token
+            $t .= $token;
+        }
+    }
+
+    return $t;
+}

libs/plugins/modifier.regex_replace.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty regex_replace modifier plugin
- * Type:     modifier<br>
- * Name:     regex_replace<br>
+ * Type:     modifier
+ * Name:     regex_replace
  * Purpose:  regular expression search/replace
  *
  * @link    http://smarty.php.net/manual/en/language.modifier.regex.replace.php

libs/plugins/modifier.replace.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty replace modifier plugin
- * Type:     modifier<br>
- * Name:     replace<br>
+ * Type:     modifier
+ * Name:     replace
  * Purpose:  simple search/replace
  *
  * @link   http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
@@ -24,10 +24,15 @@
  */
 function smarty_modifier_replace($string, $search, $replace)
 {
+    static $is_loaded = false;
     if (Smarty::$_MBSTRING) {
-        require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-
-        return smarty_mb_str_replace($search, $replace, $string);
+        if (!$is_loaded) {
+            if (!is_callable('smarty_mb_str_replace')) {
+                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+            }
+            $is_loaded = true;
+        }
+         return smarty_mb_str_replace($search, $replace, $string);
     }
 
     return str_replace($search, $replace, $string);

libs/plugins/modifier.spacify.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty spacify modifier plugin
- * Type:     modifier<br>
- * Name:     spacify<br>
+ * Type:     modifier
+ * Name:     spacify
  * Purpose:  add spaces between characters in a string
  *
  * @link   http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)

libs/plugins/modifier.truncate.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty truncate modifier plugin
- * Type:     modifier<br>
- * Name:     truncate<br>
+ * Type:     modifier
+ * Name:     truncate
  * Purpose:  Truncate a string to a certain length if necessary,
  *               optionally splitting in the middle of a word, and
  *               appending the $etc string or inserting $etc into the middle.
@@ -27,7 +27,7 @@
  */
 function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
 {
-    if ($length == 0) {
+    if ($length === 0) {
         return '';
     }
 

libs/plugins/modifiercompiler.cat.php

@@ -8,11 +8,11 @@
 
 /**
  * Smarty cat modifier plugin
- * Type:     modifier<br>
- * Name:     cat<br>
- * Date:     Feb 24, 2003<br>
- * Purpose:  catenate a value to a variable<br>
- * Input:    string to catenate<br>
+ * Type:     modifier
+ * Name:     cat
+ * Date:     Feb 24, 2003
+ * Purpose:  catenate a value to a variable
+ * Input:    string to catenate
  * Example:  {$var|cat:"foo"}
  *
  * @link     http://smarty.php.net/manual/en/language.modifier.cat.php cat

libs/plugins/modifiercompiler.count_characters.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty count_characters modifier plugin
- * Type:     modifier<br>
- * Name:     count_characteres<br>
+ * Type:     modifier
+ * Name:     count_characters
  * Purpose:  count the number of characters in a text
  *
  * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
@@ -21,7 +21,7 @@
  */
 function smarty_modifiercompiler_count_characters($params)
 {
-    if (!isset($params[ 1 ]) || $params[ 1 ] != 'true') {
+    if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
         return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
     }
     if (Smarty::$_MBSTRING) {

libs/plugins/modifiercompiler.count_paragraphs.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty count_paragraphs modifier plugin
- * Type:     modifier<br>
- * Name:     count_paragraphs<br>
+ * Type:     modifier
+ * Name:     count_paragraphs
  * Purpose:  count the number of paragraphs in a text
  *
  * @link    http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php

libs/plugins/modifiercompiler.count_sentences.php

@@ -8,7 +8,7 @@
 
 /**
  * Smarty count_sentences modifier plugin
- * Type:     modifier<br>
+ * Type:     modifier
  * Name:     count_sentences
  * Purpose:  count the number of sentences in a text
  *

libs/plugins/modifiercompiler.count_words.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty count_words modifier plugin
- * Type:     modifier<br>
- * Name:     count_words<br>
+ * Type:     modifier
+ * Name:     count_words
  * Purpose:  count the number of words in a text
  *
  * @link   http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)

libs/plugins/modifiercompiler.default.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty default modifier plugin
- * Type:     modifier<br>
- * Name:     default<br>
+ * Type:     modifier
+ * Name:     default
  * Purpose:  designate default value for empty variables
  *
  * @link   http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)

libs/plugins/modifiercompiler.escape.php

@@ -5,29 +5,27 @@
  * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php');
-
 /**
  * Smarty escape modifier plugin
- * Type:     modifier<br>
- * Name:     escape<br>
+ * Type:     modifier
+ * Name:     escape
  * Purpose:  escape string for output
  *
  * @link   http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
  * @author Rodney Rehm
  *
- * @param array $params parameters
- * @param       $compiler
+ * @param array                                 $params parameters
+ * @param  Smarty_Internal_TemplateCompilerBase $compiler
  *
  * @return string with compiled code
+ * @throws \SmartyException
  */
-function smarty_modifiercompiler_escape($params, $compiler)
+function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
     static $_double_encode = null;
+    static $is_loaded = false;
+    $compiler->template->_checkPlugins(array(array('function' => 'smarty_literal_compiler_param',
+                                         'file' => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php')));
     if ($_double_encode === null) {
         $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
     }
@@ -102,14 +100,14 @@ function smarty_modifiercompiler_escape($params, $compiler)
 
     // could not optimize |escape call, so fallback to regular plugin
     if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-        $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] =
             SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-        $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] =
             'smarty_modifier_escape';
     } else {
-        $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] =
             SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-        $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] =
             'smarty_modifier_escape';
     }
 

libs/plugins/modifiercompiler.from_charset.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty from_charset modifier plugin
- * Type:     modifier<br>
- * Name:     from_charset<br>
+ * Type:     modifier
+ * Name:     from_charset
  * Purpose:  convert character encoding from $charset to internal encoding
  *
  * @author Rodney Rehm

libs/plugins/modifiercompiler.indent.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty indent modifier plugin
- * Type:     modifier<br>
- * Name:     indent<br>
+ * Type:     modifier
+ * Name:     indent
  * Purpose:  indent lines of text
  *
  * @link   http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)

libs/plugins/modifiercompiler.lower.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty lower modifier plugin
- * Type:     modifier<br>
- * Name:     lower<br>
+ * Type:     modifier
+ * Name:     lower
  * Purpose:  convert string to lowercase
  *
  * @link   http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)

libs/plugins/modifiercompiler.noprint.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty noprint modifier plugin
- * Type:     modifier<br>
- * Name:     noprint<br>
+ * Type:     modifier
+ * Name:     noprint
  * Purpose:  return an empty string
  *
  * @author   Uwe Tews

libs/plugins/modifiercompiler.string_format.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty string_format modifier plugin
- * Type:     modifier<br>
- * Name:     string_format<br>
+ * Type:     modifier
+ * Name:     string_format
  * Purpose:  format strings via sprintf
  *
  * @link   http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)

libs/plugins/modifiercompiler.strip.php

@@ -8,11 +8,11 @@
 
 /**
  * Smarty strip modifier plugin
- * Type:     modifier<br>
- * Name:     strip<br>
+ * Type:     modifier
+ * Name:     strip
  * Purpose:  Replace all repeated spaces, newlines, tabs
- *              with a single space or supplied replacement string.<br>
- * Example:  {$var|strip} {$var|strip:"&nbsp;"}<br>
+ *              with a single space or supplied replacement string.
+ * Example:  {$var|strip} {$var|strip:"&nbsp;"}
  * Date:     September 25th, 2002
  *
  * @link   http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)

libs/plugins/modifiercompiler.strip_tags.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty strip_tags modifier plugin
- * Type:     modifier<br>
- * Name:     strip_tags<br>
+ * Type:     modifier
+ * Name:     strip_tags
  * Purpose:  strip html tags from text
  *
  * @link   http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
@@ -21,7 +21,7 @@
  */
 function smarty_modifiercompiler_strip_tags($params)
 {
-    if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') == 'true') {
+    if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
         return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
     } else {
         return 'strip_tags(' . $params[ 0 ] . ')';

libs/plugins/modifiercompiler.to_charset.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty to_charset modifier plugin
- * Type:     modifier<br>
- * Name:     to_charset<br>
+ * Type:     modifier
+ * Name:     to_charset
  * Purpose:  convert character encoding from internal encoding to $charset
  *
  * @author Rodney Rehm

libs/plugins/modifiercompiler.unescape.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty unescape modifier plugin
- * Type:     modifier<br>
- * Name:     unescape<br>
+ * Type:     modifier
+ * Name:     unescape
  * Purpose:  unescape html entities
  *
  * @author Rodney Rehm
@@ -26,7 +26,7 @@ function smarty_modifiercompiler_unescape($params)
     if (!isset($params[ 2 ])) {
         $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
     } else {
-        $params[ 2 ] = "'" . $params[ 2 ] . "'";
+        $params[ 2 ] = "'{$params[ 2 ]}'";
     }
 
     switch (trim($params[ 1 ], '"\'')) {

libs/plugins/modifiercompiler.upper.php

@@ -8,8 +8,8 @@
 
 /**
  * Smarty upper modifier plugin
- * Type:     modifier<br>
- * Name:     lower<br>
+ * Type:     modifier
+ * Name:     lower
  * Purpose:  convert string to uppercase
  *
  * @link   http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)

libs/plugins/modifiercompiler.wordwrap.php

@@ -5,22 +5,22 @@
  * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
-
 /**
  * Smarty wordwrap modifier plugin
- * Type:     modifier<br>
- * Name:     wordwrap<br>
+ * Type:     modifier
+ * Name:     wordwrap
  * Purpose:  wrap a string of text at a given length
  *
  * @link   http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
  * @author Uwe Tews
  *
- * @param array $params parameters
- * @param       $compiler
+ * @param array                                 $params parameters
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler
  *
  * @return string with compiled code
+ * @throws \SmartyException
  */
-function smarty_modifiercompiler_wordwrap($params, $compiler)
+function smarty_modifiercompiler_wordwrap($params, Smarty_Internal_TemplateCompilerBase $compiler)
 {
     if (!isset($params[ 1 ])) {
         $params[ 1 ] = 80;
@@ -33,19 +33,7 @@ function smarty_modifiercompiler_wordwrap($params, $compiler)
     }
     $function = 'wordwrap';
     if (Smarty::$_MBSTRING) {
-        if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-            $compiler->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ 'wordwrap' ][ 'modifier' ][ 'file' ] =
-                SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
-            $compiler->template->required_plugins[ 'nocache' ][ 'wordwrap' ][ 'modifier' ][ 'function' ] =
-                'smarty_mb_wordwrap';
-        } else {
-            $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'wordwrap' ][ 'modifier' ][ 'file' ] =
-                SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
-            $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ 'wordwrap' ][ 'modifier' ][ 'function' ] =
-                'smarty_mb_wordwrap';
-        }
-        $function = 'smarty_mb_wordwrap';
+        $function = $compiler->getPlugin('mb_wordwrap','modifier');
     }
-
     return $function . '(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
 }

libs/plugins/outputfilter.trimwhitespace.php

@@ -24,7 +24,7 @@ function smarty_outputfilter_trimwhitespace($source)
     $_offset = 0;
 
     // Unify Line-Breaks to \n
-    $source = preg_replace("/\015\012|\015|\012/", "\n", $source);
+    $source = preg_replace('/\015\012|\015|\012/', "\n", $source);
 
     // capture Internet Explorer and KnockoutJS Conditional Comments
     if (preg_match_all('#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is', $source, $matches,

libs/plugins/shared.escape_special_chars.php

@@ -8,7 +8,7 @@
 
 /**
  * escape_special_chars common function
- * Function: smarty_function_escape_special_chars<br>
+ * Function: smarty_function_escape_special_chars
  * Purpose:  used by other smarty functions to escape
  *           special chars except for already escaped ones
  *

libs/plugins/shared.make_timestamp.php

@@ -7,7 +7,7 @@
  */
 
 /**
- * Function: smarty_make_timestamp<br>
+ * Function: smarty_make_timestamp
  * Purpose:  used by other smarty functions to make a timestamp from a string.
  *
  * @author   Monte Ohrt <monte at ohrt dot com>
@@ -25,7 +25,7 @@ function smarty_make_timestamp($string)
               (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)
     ) {
         return (int) $string->format('U'); // PHP 5.2 BC
-    } elseif (strlen($string) == 14 && ctype_digit($string)) {
+    } 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));
@@ -35,7 +35,7 @@ function smarty_make_timestamp($string)
     } else {
         // strtotime should handle it
         $time = strtotime($string);
-        if ($time == - 1 || $time === false) {
+        if ($time === - 1 || $time === false) {
             // strtotime() was not able to parse $string, use "now":
             return time();
         }

libs/plugins/shared.mb_str_replace.php

@@ -6,14 +6,13 @@
  * @subpackage PluginsShared
  */
 if (!function_exists('smarty_mb_str_replace')) {
-
     /**
      * Multibyte string replace
      *
-     * @param  string $search  the string to be searched
-     * @param  string $replace the replacement string
-     * @param  string $subject the source string
-     * @param  int    &$count  number of matches found
+     * @param  string|string[] $search  the string to be searched
+     * @param  string|string[] $replace the replacement string
+     * @param  string          $subject the source string
+     * @param  int             &$count  number of matches found
      *
      * @return string replaced string
      * @author Rodney Rehm
@@ -29,7 +28,7 @@ if (!function_exists('smarty_mb_str_replace')) {
                 $string = smarty_mb_str_replace($search, $replace, $string, $c);
                 $count += $c;
             }
-        } elseif (is_array($search)) {
+        } else if (is_array($search)) {
             if (!is_array($replace)) {
                 foreach ($search as &$string) {
                     $subject = smarty_mb_str_replace($string, $replace, $subject, $c);
@@ -37,7 +36,7 @@ if (!function_exists('smarty_mb_str_replace')) {
                 }
             } else {
                 $n = max(count($search), count($replace));
-                while ($n --) {
+                while ($n--) {
                     $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
                     $count += $c;
                     next($search);
@@ -49,7 +48,6 @@ if (!function_exists('smarty_mb_str_replace')) {
             $count = count($parts) - 1;
             $subject = implode($replace, $parts);
         }
-
         return $subject;
     }
 }

libs/plugins/shared.mb_unicode.php

@@ -20,12 +20,12 @@
 function smarty_mb_to_unicode($string, $encoding = null)
 {
     if ($encoding) {
-        $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
+        $expanded = mb_convert_encoding($string, 'UTF-32BE', $encoding);
     } else {
-        $expanded = mb_convert_encoding($string, "UTF-32BE");
+        $expanded = mb_convert_encoding($string, 'UTF-32BE');
     }
 
-    return unpack("N*", $expanded);
+    return unpack('N*', $expanded);
 }
 
 /**
@@ -46,8 +46,8 @@ function smarty_mb_from_unicode($unicode, $encoding = null)
         $encoding = mb_internal_encoding();
     }
     foreach ((array) $unicode as $utf32be) {
-        $character = pack("N*", $utf32be);
-        $t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
+        $character = pack('N*', $utf32be);
+        $t .= mb_convert_encoding($character, $encoding, 'UTF-32BE');
     }
 
     return $t;

libs/plugins/shared.mb_wordwrap.php

@@ -1,75 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-if (!function_exists('smarty_mb_wordwrap')) {
-
-    /**
-     * Wrap a string to a given number of characters
-     *
-     * @link   http://php.net/manual/en/function.wordwrap.php for similarity
-     *
-     * @param  string  $str   the string to wrap
-     * @param  int     $width the width of the output
-     * @param  string  $break the character used to break the line
-     * @param  boolean $cut   ignored parameter, just for the sake of
-     *
-     * @return string  wrapped string
-     * @author Rodney Rehm
-     */
-    function smarty_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
-    {
-        // break words into tokens using white space as a delimiter
-        $tokens =
-            preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, - 1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-        $length = 0;
-        $t = '';
-        $_previous = false;
-        $_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
-                    $_previous = 0;
-                    $length = 0;
-                }
-                $_previous = $_space;
-                // add the token
-                $t .= $token;
-            }
-        }
-
-        return $t;
-    }
-}

libs/plugins/variablefilter.htmlspecialchars.php

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

libs/sysplugins/smarty_cacheresource_custom.php

@@ -138,7 +138,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
                          $_smarty_tpl->compile_id, $content, $timestamp);
         }
         if (isset($content)) {
-            eval("?>" . $content);
+            eval('?>' . $content);
             $cached->content = null;
             return true;
         }
@@ -204,7 +204,8 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
      * @param  string  $compile_id    compile id
      * @param  integer $exp_time      expiration time (number of seconds, not timestamp)
      *
-     * @return integer number of cache files deleted
+     * @return int number of cache files deleted
+     * @throws \SmartyException
      */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {

libs/sysplugins/smarty_cacheresource_keyvaluestore.php

@@ -104,7 +104,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
             }
         }
         if (isset($content)) {
-            eval("?>" . $content);
+            eval('?>' . $content);
 
             return true;
         }
@@ -180,7 +180,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      * @param  string  $compile_id    compile id
      * @param  integer $exp_time      expiration time [being ignored]
      *
-     * @return integer number of cache files deleted [always -1]
+     * @return int number of cache files deleted [always -1]
+     * @throws \SmartyException
      * @uses buildCachedFilepath() to generate the CacheID
      * @uses invalidate() to mark CacheIDs parent chain as outdated
      * @uses delete() to remove CacheID from cache
@@ -272,8 +273,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      */
     protected function addMetaTimestamp(&$content)
     {
-        $mt = explode(" ", microtime());
-        $ts = pack("NN", $mt[ 1 ], (int) ($mt[ 0 ] * 100000000));
+        $mt = explode(' ', microtime());
+        $ts = pack('NN', $mt[ 1 ], (int) ($mt[ 0 ] * 100000000));
         $content = $ts . $content;
     }
 
@@ -370,7 +371,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
 
     /**
      * Translate a CacheID into the list of applicable InvalidationKeys.
-     * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
+     * Splits 'some|chain|into|an|array' into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
      *
      * @param  string $cid           CacheID to translate
      * @param  string $resource_name template name

libs/sysplugins/smarty_data.php

@@ -61,8 +61,8 @@ class Smarty_Data extends Smarty_Internal_Data
             foreach ($_parent as $_key => $_val) {
                 $this->tpl_vars[ $_key ] = new Smarty_Variable($_val);
             }
-        } elseif ($_parent != null) {
-            throw new SmartyException("Wrong type for template variables");
+        } elseif ($_parent !== null) {
+            throw new SmartyException('Wrong type for template variables');
         }
     }
 }

libs/sysplugins/smarty_internal_block.php

@@ -38,7 +38,7 @@ class Smarty_Internal_Block
     public $prepend = false;
 
     /**
-     * Block calls {$smarty.block.child}
+     * Block calls $smarty.block.child
      *
      * @var bool
      */
@@ -67,7 +67,7 @@ class Smarty_Internal_Block
 
     /**
      * Smarty_Internal_Block constructor.
-     * - if outer level {block} of child template ($state == 1) save it as child root block
+     * - if outer level {block} of child template ($state === 1) save it as child root block
      * - otherwise process inheritance and render
      *
      * @param string   $name     block name

libs/sysplugins/smarty_internal_cacheresource_file.php

@@ -7,7 +7,6 @@
  * @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.
@@ -29,11 +28,14 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
     {
         $source = &$_template->source;
         $smarty = &$_template->smarty;
-        $_compile_dir_sep = $smarty->use_sub_dirs ? DS : '^';
+        $_compile_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
         $_filepath = sha1($source->uid . $smarty->_joined_template_dir);
         $cached->filepath = $smarty->getCacheDir();
         if (isset($_template->cache_id)) {
-            $cached->filepath .= preg_replace(array('![^\w|]+!', '![|]+!'), array('_', $_compile_dir_sep),
+            $cached->filepath .= preg_replace(array('![^\w|]+!',
+                                                    '![|]+!'),
+                                              array('_',
+                                                    $_compile_dir_sep),
                                               $_template->cache_id) . $_compile_dir_sep;
         }
         if (isset($_template->compile_id)) {
@@ -41,8 +43,10 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
         }
         // if use_sub_dirs, break file into directories
         if ($smarty->use_sub_dirs) {
-            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DS . $_filepath[ 2 ] . $_filepath[ 3 ] . DS .
-                                 $_filepath[ 4 ] . $_filepath[ 5 ] . DS;
+            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] .
+                                 $_filepath[ 3 ] .
+                                 DIRECTORY_SEPARATOR .
+                                 $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
         }
         $cached->filepath .= $_filepath;
         $basename = $source->handler->getBasename($source);
@@ -83,12 +87,13 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      *
      * @return boolean true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_smarty_tpl, Smarty_Template_Cached $cached = null,
+    public function process(Smarty_Internal_Template $_smarty_tpl,
+                            Smarty_Template_Cached $cached = null,
                             $update = false)
     {
         $_smarty_tpl->cached->valid = false;
         if ($update && defined('HHVM_VERSION')) {
-            eval("?>" . file_get_contents($_smarty_tpl->cached->filepath));
+            eval('?>' . file_get_contents($_smarty_tpl->cached->filepath));
             return true;
         } else {
             return @include $_smarty_tpl->cached->filepath;
@@ -101,16 +106,20 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      * @param Smarty_Internal_Template $_template template object
      * @param string                   $content   content to cache
      *
-     * @return boolean success
+     * @return bool success
+     * @throws \SmartyException
      */
     public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
-        if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath, $content,
+        if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath,
+                                                           $content,
                                                            $_template->smarty) === true
         ) {
-            if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
+            if (function_exists('opcache_invalidate') &&
+                (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api'))) < 1
+            ) {
                 opcache_invalidate($_template->cached->filepath, true);
-            } elseif (function_exists('apc_compile_file')) {
+            } else if (function_exists('apc_compile_file')) {
                 apc_compile_file($_template->cached->filepath);
             }
             $cached = $_template->cached;
@@ -148,7 +157,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      */
     public function clearAll(Smarty $smarty, $exp_time = null)
     {
-        return Smarty_Internal_Extension_Clear::clear($smarty, null, null, null, $exp_time);
+        return $smarty->ext->_cacheResourceFile->clear($smarty, null, null, null, $exp_time);
     }
 
     /**
@@ -164,7 +173,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        return Smarty_Internal_Extension_Clear::clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+        return $smarty->ext->_cacheResourceFile->clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
     }
 
     /**

libs/sysplugins/smarty_internal_compile_append.php

@@ -24,6 +24,7 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
      * @param  array                                $parameter array with compilation parameter
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {

libs/sysplugins/smarty_internal_compile_assign.php

@@ -71,7 +71,7 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
             $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
         }
         // optional parameter
-        $_params = "";
+        $_params = '';
         if ($_nocache || $_scope) {
             $_params .= ' ,' . var_export($_nocache, true);
         }
@@ -85,9 +85,9 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
             $output .= "settype(\$_tmp_array, 'array');\n";
             $output .= "}\n";
             $output .= "\$_tmp_array{$parameter['smarty_internal_index']} = {$_attr['value']};\n";
-            $output .= "\$_smarty_tpl->_assignInScope({$_var}, \$_tmp_array{$_params});\n?>";
+            $output .= "\$_smarty_tpl->_assignInScope({$_var}, \$_tmp_array{$_params});?>";
         } else {
-            $output = "<?php \$_smarty_tpl->_assignInScope({$_var}, {$_attr['value']}{$_params});\n?>";
+            $output = "<?php \$_smarty_tpl->_assignInScope({$_var}, {$_attr['value']}{$_params});?>";
         }
         return $output;
     }

libs/sysplugins/smarty_internal_compile_block.php

@@ -22,7 +22,6 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
-
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -30,7 +29,6 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
-
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -38,7 +36,6 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher
      * @see Smarty_Internal_CompileBase
      */
     public $option_flags = array('hide', 'nocache');
-
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -47,20 +44,6 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher
      */
     public $optional_attributes = array('assign');
 
-    /**
-     * nesting level of block tags
-     *
-     * @var int
-     */
-    public static $blockTagNestingLevel = 0;
-
-    /**
-     * Saved compiler object
-     *
-     * @var Smarty_Internal_TemplateCompilerBase
-     */
-    public $compiler = null;
-
     /**
      * Compiles code for the {block} tag
      *
@@ -68,14 +51,13 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher
      * @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)
     {
         if (!isset($compiler->_cache[ 'blockNesting' ])) {
             $compiler->_cache[ 'blockNesting' ] = 0;
         }
-        if ($compiler->_cache[ 'blockNesting' ] == 0) {
+        if ($compiler->_cache[ 'blockNesting' ] === 0) {
             // make sure that inheritance gets initialized in template code
             $this->registerInit($compiler);
             $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
@@ -84,68 +66,24 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inher
         }
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        $compiler->_cache[ 'blockNesting' ] ++;
+        ++$compiler->_cache[ 'blockNesting' ];
+        $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
         $compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
+        $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ] = $_className;
         $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
-        $this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
-                                                 $compiler->template->compiled->has_nocache_code,
-                                                 $compiler->template->caching));
-        // must whole block be nocache ?
-        if ($compiler->tag_nocache) {
-            $i = 0;
-        }
+        $compiler->_cache[ 'blockParams' ][ 1 ][ 'subBlocks' ][ trim($_attr[ 'name' ], '"\'') ][] = $_className;
+        $this->openTag($compiler,
+                       'block',
+                       array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
+                             $compiler->template->compiled->has_nocache_code,
+                             $compiler->template->caching));
+        $compiler->saveRequiredPlugins(true);
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        // $compiler->suppressNocacheProcessing = true;
-        if ($_attr[ 'nocache' ] === true) {
-            //$compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->taglineno);
-        }
         $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
         $compiler->template->compiled->has_nocache_code = false;
         $compiler->suppressNocacheProcessing = true;
     }
-
-    /**
-     * Compile saved child block source
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase compiler object
-     * @param string                                $_name   optional name of child block
-     *
-     * @return string   compiled code of child block
-     */
-    static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
-    {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
-                                              $compiler->parser->lex->taglineno);
-        }
-        $compiler->has_code = true;
-        $compiler->suppressNocacheProcessing = true;
-        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
-        $output = "<?php \n\$_smarty_tpl->inheritance->callChild(\$_smarty_tpl, \$this);\n?>\n";
-        return $output;
-    }
-
-    /**
-     * Compile $smarty.block.parent
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     * @param string                                $_name    optional name of child block
-     *
-     * @return string   compiled code of child block
-     */
-    static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
-    {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
-                                              $compiler->parser->lex->taglineno);
-        }
-        $compiler->suppressNocacheProcessing = true;
-        $compiler->has_code = true;
-        $output = "<?php \n\$_smarty_tpl->inheritance->callParent(\$_smarty_tpl, \$this);\n?>\n";
-        return $output;
-    }
 }
-
 /**
  * Smarty Internal Plugin Compile BlockClose Class
  *
@@ -171,11 +109,11 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_
         $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
         unset($_attr[ 'assign' ], $_attr[ 'name' ]);
         foreach ($_attr as $name => $stat) {
-            if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
+            if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat !== 'false')) {
                 $_block[ $name ] = 'true';
             }
         }
-        $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
+        $_className = $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ];
         // get compiled block code
         $_functionCode = $compiler->parser->current_buffer;
         // setup buffer for template function code
@@ -186,10 +124,11 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_
         $output .= "class {$_className} extends Smarty_Internal_Block\n";
         $output .= "{\n";
         foreach ($_block as $property => $value) {
-            $output .= "public \${$property} = {$value};\n";
+            $output .= "public \${$property} = " . var_export($value,true) .";\n";
         }
         $output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\n";
-        //$output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n";
+        $output .= $compiler->compileRequiredPlugins();
+        $compiler->restoreRequiredPlugins();
         if ($compiler->template->compiled->has_nocache_code) {
             $output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
         }
@@ -212,32 +151,22 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_
         $compiler->parser->current_buffer->append_subtree($compiler->parser,
                                                           new Smarty_Internal_ParseTree_Tag($compiler->parser,
                                                                                             $output));
-        $compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        $compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
         $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        // nocache plugins must be copied
-        if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
-            foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
-                        $data;
-                }
-            }
-        }
-
         // restore old status
         $compiler->template->compiled->has_nocache_code = $_has_nocache_code;
         $compiler->tag_nocache = $compiler->nocache;
         $compiler->nocache = $_nocache;
         $compiler->parser->current_buffer = $_buffer;
         $output = "<?php \n";
-        if ($compiler->_cache[ 'blockNesting' ] == 1) {
+        if ($compiler->_cache[ 'blockNesting' ] === 1) {
             $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
         } else {
             $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
         }
         $output .= "?>\n";
-        $compiler->_cache[ 'blockNesting' ] --;
-        if ($compiler->_cache[ 'blockNesting' ] == 0) {
+        --$compiler->_cache[ 'blockNesting' ];
+        if ($compiler->_cache[ 'blockNesting' ] === 0) {
             unset($compiler->_cache[ 'blockNesting' ]);
         }
         $compiler->has_code = true;

libs/sysplugins/smarty_internal_compile_block_child.php

@@ -0,0 +1,24 @@
+<?php
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Child Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Block_Child extends Smarty_Internal_Compile_Child
+{
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'block_child';
+}

libs/sysplugins/smarty_internal_compile_block_parent.php

@@ -0,0 +1,31 @@
+<?php
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Parent Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Block_Parent extends Smarty_Internal_Compile_Child
+{
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'block_parent';
+
+    /**
+     * Block type
+     *
+     * @var string
+     */
+    public $blockType = 'Parent';
+}

libs/sysplugins/smarty_internal_compile_break.php

@@ -32,17 +32,48 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('levels');
 
+    /**
+    * Tag name may be overloaded by Smarty_Internal_Compile_Continue
+    *
+    * @var string
+    */
+    public $tag = 'break';
+
     /**
      * Compiles code for the {break} tag
      *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
      * @throws \SmartyCompilerException
      */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        list($levels, $foreachLevels) = $this->checkLevels($args, $compiler);
+        $output = "<?php ";
+        if ($foreachLevels > 0 && $this->tag === 'continue') {
+            $foreachLevels--;
+        }
+        if ($foreachLevels > 0) {
+            /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
+            $foreachCompiler = $compiler->getTagCompiler('foreach');
+            $output .= $foreachCompiler->compileRestore($foreachLevels);
+        }
+        $output .= "{$this->tag} {$levels};?>";
+        return $output;
+    }
+
+    /**
+     * check attributes and return array of break and foreach levels
+     *
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return array
+     * @throws \SmartyCompilerException
+     */
+    public function checkLevels($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
         // check and get attributes
@@ -56,22 +87,33 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
             if (!is_numeric($_attr[ 'levels' ])) {
                 $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
             }
-            $_levels = $_attr[ 'levels' ];
+            $levels = $_attr[ 'levels' ];
         } else {
-            $_levels = 1;
+            $levels = 1;
         }
-        $level_count = $_levels;
+        $level_count = $levels;
         $stack_count = count($compiler->_tag_stack) - 1;
+        $foreachLevels = 0;
+        $lastTag = '';
         while ($level_count > 0 && $stack_count >= 0) {
             if (isset($_is_loopy[ $compiler->_tag_stack[ $stack_count ][ 0 ] ])) {
+                $lastTag = $compiler->_tag_stack[ $stack_count ][ 0 ];
+                if ($level_count === 0) {
+                    break;
+                }
                 $level_count --;
+                if ($compiler->_tag_stack[ $stack_count ][ 0 ] === 'foreach') {
+                    $foreachLevels ++;
+                }
             }
             $stack_count --;
         }
-        if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot break {$_levels} level(s)", null, true);
+        if ($level_count !== 0) {
+            $compiler->trigger_template_error("cannot {$this->tag} {$levels} level(s)", null, true);
         }
-
-        return "<?php break {$_levels};?>";
+        if ($lastTag === 'foreach' && $this->tag === 'break' && $foreachLevels > 0) {
+            $foreachLevels --;
+        }
+        return array($levels, $foreachLevels);
     }
 }

libs/sysplugins/smarty_internal_compile_call.php

@@ -57,7 +57,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
             // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr[ 'assign' ];
         }
-        //$_name = trim($_attr['name'], "'\"");
+        //$_name = trim($_attr['name'], "''");
         $_name = $_attr[ 'name' ];
         unset($_attr[ 'name' ], $_attr[ 'assign' ], $_attr[ 'nocache' ]);
         // set flag (compiled code of {function} must be included in cache file
@@ -74,15 +74,15 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
                 $_paramsArray[] = "'$_key'=>$_value";
             }
         }
-        $_params = 'array(' . implode(",", $_paramsArray) . ')';
+        $_params = 'array(' . implode(',', $_paramsArray) . ')';
         //$compiler->suppressNocacheProcessing = true;
         // was there an assign attribute
         if (isset($_assign)) {
             $_output =
-                "<?php ob_start();\n\$_smarty_tpl->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
+                "<?php ob_start();\n\$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
         } else {
             $_output =
-                "<?php \$_smarty_tpl->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
+                "<?php \$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
         }
         return $_output;
     }

libs/sysplugins/smarty_internal_compile_capture.php

@@ -45,11 +45,11 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
     public static function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter = null)
     {
         $tag = trim($parameter[ 0 ], '"\'');
-        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
+        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : null;
         if (!$name) {
-            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+            //$compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
         }
-        return "\$_smarty_tpl->smarty->ext->_capture->getBuffer(\$_smarty_tpl, '{$name}')";
+        return '$_smarty_tpl->smarty->ext->_capture->getBuffer($_smarty_tpl'.(isset($name)?", '{$name}')":')');
     }
 
     /**
@@ -73,7 +73,7 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
         $compiler->_cache[ 'capture_stack' ][] = array($compiler->nocache);
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $_output = "<?php \$_smarty_tpl->smarty->ext->_capture->open(\$_smarty_tpl, $buffer, $assign, $append);\n?>\n";
+        $_output = "<?php \$_smarty_tpl->smarty->ext->_capture->open(\$_smarty_tpl, $buffer, $assign, $append);?>";
 
         return $_output;
     }
@@ -107,6 +107,6 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
 
         list($compiler->nocache) = array_pop($compiler->_cache[ 'capture_stack' ]);
 
-        return "<?php \$_smarty_tpl->smarty->ext->_capture->close(\$_smarty_tpl);\n?>\n";
+        return "<?php \$_smarty_tpl->smarty->ext->_capture->close(\$_smarty_tpl);?>";
     }
 }

libs/sysplugins/smarty_internal_compile_child.php

@@ -0,0 +1,77 @@
+<?php
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Child Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Child extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
+
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'child';
+
+    /**
+     * Block type
+     *
+     * @var string
+     */
+    public $blockType = 'Child';
+
+    /**
+     * Compiles code for the {child} tag
+     *
+     * @param  array                                 $args      array with attributes from parser
+     * @param  \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $tag = isset($parameter[0]) ? "'{$parameter[0]}'" : "'{{$this->tag}}'";
+        if (!isset($compiler->_cache[ 'blockNesting' ])) {
+            $compiler->trigger_template_error("{$tag} used outside {block} tags ",
+                                              $compiler->parser->lex->taglineno);
+        }
+        $compiler->has_code = true;
+        $compiler->suppressNocacheProcessing = true;
+        if ($this->blockType === 'Child') {
+            $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
+        }
+        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
+        $output = "<?php \n";
+        if (isset($_assign)) {
+            $output .= "ob_start();\n";
+        }
+        $output .= '$_smarty_tpl->inheritance->call' . $this->blockType . '($_smarty_tpl, $this' .
+                   ($this->blockType === 'Child' ? '' : ", {$tag}"). ");\n";
+        if (isset($_assign)) {
+            $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        $output .="?>\n";
+        return $output;
+    }
+}

libs/sysplugins/smarty_internal_compile_config_load.php

@@ -55,7 +55,7 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
      */
     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);
+                                 'smarty' => Smarty::SCOPE_SMARTY, 'global' => Smarty::SCOPE_SMARTY);
 
     /**
      * Compiles code for the {config_load} tag

libs/sysplugins/smarty_internal_compile_continue.php

@@ -14,64 +14,12 @@
  * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
+class Smarty_Internal_Compile_Continue extends Smarty_Internal_Compile_Break
 {
     /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @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');
-
-    /**
-     * Compiles code for the {continue} tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', null, true);
-        }
-
-        if (isset($_attr[ 'levels' ])) {
-            if (!is_numeric($_attr[ 'levels' ])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
-            }
-            $_levels = $_attr[ 'levels' ];
-        } else {
-            $_levels = 1;
-        }
-        $level_count = $_levels;
-        $stack_count = count($compiler->_tag_stack) - 1;
-        while ($level_count > 0 && $stack_count >= 0) {
-            if (isset($_is_loopy[ $compiler->_tag_stack[ $stack_count ][ 0 ] ])) {
-                $level_count --;
-            }
-            $stack_count --;
-        }
-        if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot continue {$_levels} level(s)", null, true);
-        }
-
-        return "<?php continue {$_levels};?>";
-    }
+    * Tag name
+    *
+    * @var string
+    */
+    public $tag = 'continue';
 }

libs/sysplugins/smarty_internal_compile_eval.php

@@ -58,13 +58,12 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
         }
 
         // create template object
-        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'." . $_attr[ 'var' ] .
-                   ", \$_smarty_tpl->smarty, \$_smarty_tpl);";
+        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.{$_attr[ 'var' ]}, \$_smarty_tpl->smarty, \$_smarty_tpl);";
         //was there an assign attribute?
         if (isset($_assign)) {
             $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
         } else {
-            $_output .= "echo \$_template->fetch();";
+            $_output .= 'echo $_template->fetch();';
         }
 
         return "<?php $_output ?>";

libs/sysplugins/smarty_internal_compile_extends.php

@@ -64,18 +64,18 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inh
         // add code to initialize inheritance
         $this->registerInit($compiler, true);
         $file = trim($_attr[ 'file' ], '\'"');
-        if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
+        if (strlen($file) > 8 && substr($file, 0, 8) === 'extends:') {
             // generate code for each template
             $files = array_reverse(explode('|', substr($file, 8)));
             $i = 0;
             foreach ($files as $file) {
-                if ($file[ 0 ] == '"') {
+                if ($file[ 0 ] === '"') {
                     $file = trim($file, '".');
                 } else {
                     $file = "'{$file}'";
                 }
                 $i ++;
-                if ($i == count($files) && isset($_attr[ 'extends_resource' ])) {
+                if ($i === count($files) && isset($_attr[ 'extends_resource' ])) {
                     $this->compileEndChild($compiler);
                 }
                 $this->compileInclude($compiler, $file);
@@ -84,8 +84,7 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inh
                 $this->compileEndChild($compiler);
             }
         } else {
-            $this->compileEndChild($compiler);
-            $this->compileInclude($compiler, $_attr[ 'file' ]);
+            $this->compileEndChild($compiler, $_attr[ 'file' ]);
         }
         $compiler->has_code = false;
         return '';
@@ -95,40 +94,58 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inh
      * Add code for inheritance endChild() method to end of template
      *
      * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param null|string                           $template optional inheritance parent template
+     *
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler)
+    private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler, $template = null)
     {
+        $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();\n?>\n");
+                                                                                  '<?php $_smarty_tpl->inheritance->endChild($_smarty_tpl' .
+                                                                                  (isset($template) ?
+                                                                                      ", {$template}{$inlineUids}" :
+                                                                                      '') . ");\n?>");
     }
 
     /**
      * Add code for including subtemplate to end of template
      *
      * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param  string                               $file subtemplate name
+     * @param  string                               $template subtemplate name
+     *
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $file)
+    private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $template)
     {
         $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
                                                                                   $compiler->compileTag('include',
-                                                                                                        array($file,
+                                                                                                        array($template,
                                                                                                               array('scope' => 'parent'))));
     }
 
     /**
      * Create source code for {extends} from source components array
      *
-     * @param []\Smarty_Internal_Template_Source $components
+     * @param \Smarty_Internal_Template $template
      *
      * @return string
      */
-    public static function extendsSourceArrayCode($components)
+    public static function extendsSourceArrayCode(Smarty_Internal_Template $template)
     {
         $resources = array();
-        foreach ($components as $source) {
+        foreach ($template->source->components as $source) {
             $resources[] = $source->resource;
         }
-        return '{extends file=\'extends:' . join('|', $resources) . '\' extends_resource=true}';
+        return $template->smarty->left_delimiter . 'extends file=\'extends:' . join('|', $resources) .
+               '\' extends_resource=true' . $template->smarty->right_delimiter;
     }
 }

libs/sysplugins/smarty_internal_compile_for.php

@@ -35,7 +35,7 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
     public function compile($args, $compiler, $parameter)
     {
         $compiler->loopNesting ++;
-        if ($parameter == 0) {
+        if ($parameter === 0) {
             $this->required_attributes = array('start', 'to');
             $this->optional_attributes = array('max', 'step');
         } else {
@@ -47,7 +47,7 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
         $_attr = $this->getAttributes($compiler, $args);
 
         $output = "<?php\n";
-        if ($parameter == 1) {
+        if ($parameter === 1) {
             foreach ($_attr[ 'start' ] as $_statement) {
                 if (is_array($_statement[ 'var' ])) {
                     $var = $_statement[ 'var' ][ 'var' ];
@@ -89,10 +89,10 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
             }
             $output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
             $output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
-            $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration == 1;";
-            $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration == \$_smarty_tpl->tpl_vars[$var]->total;";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration === 1;";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration === \$_smarty_tpl->tpl_vars[$var]->total;";
         }
-        $output .= "?>";
+        $output .= '?>';
 
         $this->openTag($compiler, 'for', array('for', $compiler->nocache));
         // maybe nocache because of nocache variables
@@ -161,10 +161,10 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
         list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
 
         $output = "<?php }\n";
-        if ($openTag != 'forelse') {
+        if ($openTag !== 'forelse') {
             $output .= "}\n";
         }
-        $output .= "?>\n";
+        $output .= "?>";
         return $output;
     }
 }

libs/sysplugins/smarty_internal_compile_foreach.php

@@ -78,14 +78,14 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
     /**
      * Compiles code for the {foreach} tag
      *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
      * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $compiler->loopNesting ++;
         // init
@@ -118,7 +118,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
         $fromName = $compiler->getVariableName($_attr[ 'from' ]);
         if ($fromName) {
             foreach (array('item', 'key') as $a) {
-                if (isset($attributes[ $a ]) && $attributes[ $a ] == $fromName) {
+                if (isset($attributes[ $a ]) && $attributes[ $a ] === $fromName) {
                     $compiler->trigger_template_error("'{$a}' and 'from' may not have same variable name '{$fromName}'",
                                                       null, true);
                 }
@@ -137,7 +137,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
         if (!empty($this->matchResults[ 'named' ])) {
             $namedAttr = $this->matchResults[ 'named' ];
         }
-        if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) {
+        if (isset($_attr[ 'properties' ]) && preg_match_all('/[\'](.*?)[\']/', $_attr[ 'properties' ], $match)) {
             foreach ($match[ 1 ] as $prop) {
                 if (in_array($prop, $this->itemProperties)) {
                     $itemAttr[ $prop ] = true;
@@ -229,9 +229,9 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
             $output .= "{$itemVar}->first = !{$itemVar}->index;\n";
         }
         if (isset($itemAttr[ 'last' ])) {
-            $output .= "{$itemVar}->last = {$itemVar}->iteration == {$itemVar}->total;\n";
+            $output .= "{$itemVar}->last = {$itemVar}->iteration === {$itemVar}->total;\n";
         }
-        if ($this->isNamed) {
+        if (isset($foreachVar)) {
             if (isset($namedAttr[ 'iteration' ])) {
                 $output .= "{$foreachVar}->value['iteration']++;\n";
             }
@@ -242,16 +242,28 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
                 $output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n";
             }
             if (isset($namedAttr[ 'last' ])) {
-                $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] == {$foreachVar}->value['total'];\n";
+                $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] === {$foreachVar}->value['total'];\n";
             }
         }
         if (!empty($itemAttr)) {
             $output .= "{$local}saved = {$itemVar};\n";
         }
-        $output .= "?>";
+        $output .= '?>';
 
         return $output;
     }
+
+    /**
+     * Compiles code for to restore saved template variables
+     *
+     * @param int $levels number of levels to restore
+     *
+     * @return string compiled code
+     */
+    public function compileRestore($levels)
+    {
+        return "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl, {$levels});";
+    }
 }
 
 /**
@@ -265,13 +277,12 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {foreachelse} tag
      *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
      */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -279,10 +290,10 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
         list($openTag, $nocache, $local, $itemVar, $restore) = $this->closeTag($compiler, array('foreach'));
         $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $itemVar, 0));
         $output = "<?php\n";
-        if ($restore == 2) {
+        if ($restore === 2) {
             $output .= "{$itemVar} = {$local}saved;\n";
         }
-        $output .= "}\n} else {\n?>\n";
+        $output .= "}\n} else {\n?>";
         return $output;
     }
 }
@@ -298,13 +309,13 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {/foreach} tag
      *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+     * @throws \SmartyCompilerException
+      */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $compiler->loopNesting --;
         // must endblock be nocache?
@@ -316,15 +327,17 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
             $this->closeTag($compiler, array('foreach', 'foreachelse'));
         $output = "<?php\n";
 
-        if ($restore == 2) {
+        if ($restore === 2) {
             $output .= "{$itemVar} = {$local}saved;\n";
         }
         if ($restore > 0) {
             $output .= "}\n";
         }
         $output .= "}\n";
-        $output .= "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl);\n";
-        $output .= "?>\n";
+        /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
+        $foreachCompiler = $compiler->getTagCompiler('foreach');
+        $output .= $foreachCompiler->compileRestore(1);
+        $output .= "?>";
         return $output;
     }
 }

libs/sysplugins/smarty_internal_compile_function.php

@@ -44,14 +44,13 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {function} tag
      *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return bool true
      * @throws \SmartyCompilerException
      */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -60,7 +59,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
             $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         unset($_attr[ 'nocache' ]);
-        $_name = trim($_attr[ 'name' ], "'\"");
+        $_name = trim($_attr[ 'name' ], '\'"');
         $compiler->parent_compiler->tpl_function[ $_name ] = array();
         $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
                       $compiler->template->caching);
@@ -68,6 +67,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
         // Init temporary context
         $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
         $compiler->template->compiled->has_nocache_code = false;
+        $compiler->saveRequiredPlugins(true);
         return true;
     }
 }
@@ -91,18 +91,17 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {/function} tag
      *
-     * @param  array                                       $args      array with attributes from parser
-     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                       $parameter array with compilation parameter
+     * @param  array                                       $args     array with attributes from parser
+     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return bool true
      */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $this->compiler = $compiler;
         $saved_data = $this->closeTag($compiler, array('function'));
         $_attr = $saved_data[ 0 ];
-        $_name = trim($_attr[ 'name' ], "'\"");
+        $_name = trim($_attr[ 'name' ], '\'"');
         $compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
             $compiler->parent_compiler->template->compiled->filepath;
         $compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
@@ -118,7 +117,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
             }
         }
         if (!empty($_paramsArray)) {
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+            $_params = 'array(' . implode(',', $_paramsArray) . ')';
             $_paramsCode = "\$params = array_merge($_params, \$params);\n";
         } else {
             $_paramsCode = '';
@@ -134,21 +133,22 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
             $output = "<?php\n";
             $output .= "/* {$_funcNameCaching} */\n";
             $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
-            $output .= "function {$_funcNameCaching} (\$_smarty_tpl,\$params) {\n";
+            $output .= "function {$_funcNameCaching} (Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
             $output .= "ob_start();\n";
+            $output .= $compiler->compileRequiredPlugins();
             $output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
             $output .= $_paramsCode;
-            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}";
+            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n";
             $output .= "\$params = var_export(\$params, true);\n";
             $output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
-            $output .= "\\\$_smarty_tpl->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
-            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n\";?>";
+            $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";?>";
             $compiler->parser->current_buffer->append_subtree($compiler->parser,
                                                               new Smarty_Internal_ParseTree_Tag($compiler->parser,
                                                                                                 $output));
             $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
             $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
-            $output .= "\\\$_smarty_tpl->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
+            $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
             $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
             $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
             $output .= "}\n}\n";
@@ -166,9 +166,11 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
         $output = "<?php\n";
         $output .= "/* {$_funcName} */\n";
         $output .= "if (!function_exists('{$_funcName}')) {\n";
-        $output .= "function {$_funcName}(\$_smarty_tpl,\$params) {\n";
+        $output .= "function {$_funcName}(Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
         $output .= $_paramsCode;
-        $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}?>";
+        $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));
@@ -180,19 +182,10 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
                                                           new Smarty_Internal_ParseTree_Tag($compiler->parser,
                                                                                             $output));
         $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
-        // nocache plugins must be copied
-        if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
-            foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
-                        $data;
-                }
-            }
-        }
-        // restore old buffer
-
+       // restore old buffer
         $compiler->parser->current_buffer = $saved_data[ 1 ];
         // restore old status
+        $compiler->restoreRequiredPlugins();
         $compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
         $compiler->template->caching = $saved_data[ 3 ];
         return true;
@@ -200,7 +193,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
 
     /**
      * Remove nocache code
-     * 
+     *
      * @param $match
      *
      * @return string

libs/sysplugins/smarty_internal_compile_if.php

@@ -34,32 +34,34 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
         // must whole block be nocache ?
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
 
-        if (!array_key_exists("if condition", $parameter)) {
-            $compiler->trigger_template_error("missing if condition", null, true);
+        if (!isset($parameter['if condition'])) {
+            $compiler->trigger_template_error('missing if condition', null, true);
         }
 
         if (is_array($parameter[ 'if condition' ])) {
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+            } else {
+                $var = $parameter[ 'if condition' ][ 'var' ];
+            }
             if ($compiler->nocache) {
                 // create nocache var to make it know for further compiling
-                if (is_array($parameter[ 'if condition' ][ 'var' ])) {
-                    $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-                } else {
-                    $var = $parameter[ 'if condition' ][ 'var' ];
-                }
                 $compiler->setNocacheInVariable($var);
             }
-            $assignCompiler = new Smarty_Internal_Compile_Assign();
+            $prefixVar = $compiler->getNewPrefixVariable();
+            $_output = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
             $assignAttr = array();
-            $assignAttr[][ 'value' ] = $parameter[ 'if condition' ][ 'value' ];
+            $assignAttr[][ 'value' ] = $prefixVar;
+            $assignCompiler = new Smarty_Internal_Compile_Assign();
             if (is_array($parameter[ 'if condition' ][ 'var' ])) {
                 $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-                $_output = $assignCompiler->compile($assignAttr, $compiler,
+                $_output .= $assignCompiler->compile($assignAttr, $compiler,
                                                     array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ]));
             } else {
                 $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
-                $_output = $assignCompiler->compile($assignAttr, $compiler, array());
+                $_output .= $assignCompiler->compile($assignAttr, $compiler, array());
             }
-            $_output .= "<?php if (" . $parameter[ 'if condition' ][ 'value' ] . ") {?>";
+            $_output .= "<?php if ({$prefixVar}) {?>";
             return $_output;
         } else {
             return "<?php if ({$parameter['if condition']}) {?>";
@@ -78,18 +80,17 @@ class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {else} tag
      *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+      */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
         $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
 
-        return "<?php } else { ?>";
+        return '<?php } else { ?>';
     }
 }
 
@@ -118,32 +119,35 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
 
         list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
 
-        if (!array_key_exists("if condition", $parameter)) {
-            $compiler->trigger_template_error("missing elseif condition", null, true);
+        if (!isset($parameter['if condition'])) {
+            $compiler->trigger_template_error('missing elseif condition', null, true);
         }
 
         $assignCode = '';
+        $var = '';
         if (is_array($parameter[ 'if condition' ])) {
             $condition_by_assign = true;
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+            } else {
+                $var = $parameter[ 'if condition' ][ 'var' ];
+            }
             if ($compiler->nocache) {
                 // create nocache var to make it know for further compiling
-                if (is_array($parameter[ 'if condition' ][ 'var' ])) {
-                    $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-                } else {
-                    $var = $parameter[ 'if condition' ][ 'var' ];
-                }
                 $compiler->setNocacheInVariable($var);
             }
+            $prefixVar = $compiler->getNewPrefixVariable();
+            $assignCode = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
             $assignCompiler = new Smarty_Internal_Compile_Assign();
             $assignAttr = array();
-            $assignAttr[][ 'value' ] = $parameter[ 'if condition' ][ 'value' ];
+            $assignAttr[][ 'value' ] = $prefixVar;
             if (is_array($parameter[ 'if condition' ][ 'var' ])) {
                 $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-                $assignCode = $assignCompiler->compile($assignAttr, $compiler,
+                $assignCode .= $assignCompiler->compile($assignAttr, $compiler,
                                                        array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ]));
             } else {
                 $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
-                $assignCode = $assignCompiler->compile($assignAttr, $compiler, array());
+                $assignCode .= $assignCompiler->compile($assignAttr, $compiler, array());
             }
         } else {
             $condition_by_assign = false;
@@ -154,8 +158,7 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
             if ($condition_by_assign) {
                 $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
                 $_output = $compiler->appendCode("<?php } else {\n?>", $assignCode);
-                return $compiler->appendCode($_output,
-                                             "<?php if (" . $parameter[ 'if condition' ][ 'value' ] . ") {\n?>");
+                return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
             } else {
                 $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
                 return "<?php } elseif ({$parameter['if condition']}) {?>";
@@ -165,8 +168,7 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
             $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
             if ($condition_by_assign) {
                 $_output = $compiler->appendCode($_output, $assignCode);
-                return $compiler->appendCode($_output,
-                                             "<?php if (" . $parameter[ 'if condition' ][ 'value' ] . ") {\n?>");
+                return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
             } else {
                 return $compiler->appendCode($_output, "<?php if ({$parameter['if condition']}) {?>");
             }
@@ -185,13 +187,12 @@ class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {/if} tag
      *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
      */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // must endblock be nocache?
         if ($compiler->nocache) {

libs/sysplugins/smarty_internal_compile_include.php

@@ -7,7 +7,6 @@
  * @subpackage Compiler
  * @author     Uwe Tews
  */
-
 /**
  * Smarty Internal Plugin Compile Include Class
  *
@@ -20,7 +19,6 @@ 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.
      *
@@ -28,7 +26,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('file');
-
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -36,7 +33,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('file');
-
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -44,7 +40,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $option_flags = array('nocache', 'inline', 'caching');
-
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -52,7 +47,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('_any');
-
     /**
      * Valid scope names
      *
@@ -65,19 +59,19 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {include} tag
      *
-     * @param  array                                  $args      array with attributes from parser
-     * @param  Smarty_Internal_SmartyTemplateCompiler $compiler  compiler object
-     * @param  array                                  $parameter array with compilation parameter
+     * @param  array                                  $args     array with attributes from parser
+     * @param  Smarty_Internal_SmartyTemplateCompiler $compiler compiler object
      *
-     * @throws SmartyCompilerException
-     * @return string compiled code
+     * @return string
+     * @throws \Exception
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler, $parameter)
+    public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler)
     {
         $uid = $t_hash = null;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-
         $fullResourceName = $source_resource = $_attr[ 'file' ];
         $variable_template = false;
         $cache_tpl = false;
@@ -90,11 +84,11 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
                 $variable_template = true;
             }
             if (!$variable_template) {
-                if ($type != 'string') {
+                if ($type !== 'string') {
                     $fullResourceName = "{$type}:{$name}";
                     $compiled = $compiler->parent_compiler->template->compiled;
                     if (isset($compiled->includes[ $fullResourceName ])) {
-                        $compiled->includes[ $fullResourceName ] ++;
+                        $compiled->includes[ $fullResourceName ]++;
                         $cache_tpl = true;
                     } else {
                         if ("{$compiler->template->source->type}:{$compiler->template->source->name}" ==
@@ -107,7 +101,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
                             $compiled->includes[ $fullResourceName ] = 1;
                         }
                     }
-                    $fullResourceName = '"' . $fullResourceName . '"';
+                    $fullResourceName = $match[ 1 ] . $fullResourceName . $match[ 1 ];
                 }
             }
             if (empty($match[ 5 ])) {
@@ -116,10 +110,8 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
         } else {
             $variable_template = true;
         }
-
         // scope setup
         $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
-
         // set flag to cache subtemplate object when called within loop or template name is variable.
         if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) {
             $_cache_tpl = 'true';
@@ -128,18 +120,14 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
         }
         // assume caching is off
         $_caching = Smarty::CACHING_OFF;
-
         $call_nocache = $compiler->tag_nocache || $compiler->nocache;
-
         // caching was on and {include} is not in nocache mode
         if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
             $_caching = self::CACHING_NOCACHE_CODE;
         }
-
         // flag if included template code should be merged into caller
         $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr[ 'inline' ] === true) &&
                                    !$compiler->template->source->handler->recompiled;
-
         if ($merge_compiled_includes) {
             // variable template name ?
             if ($variable_template) {
@@ -150,7 +138,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
                 $merge_compiled_includes = false;
             }
         }
-
         /*
         * if the {include} tag provides individual parameter for caching or compile_id
         * the subtemplate must not be included into the common cache file and is treated like
@@ -158,7 +145,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
         *
         */
         if ($_attr[ 'nocache' ] !== true && $_attr[ 'caching' ]) {
-            $_caching = $_new_caching = (int) $_attr[ 'caching' ];
+            $_caching = $_new_caching = (int)$_attr[ 'caching' ];
             $call_nocache = true;
         } else {
             $_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
@@ -182,7 +169,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
         } else {
             $_compile_id = '$_smarty_tpl->compile_id';
         }
-
         // if subtemplate will be called in nocache mode do not merge
         if ($compiler->template->caching && $call_nocache) {
             $merge_compiled_includes = false;
@@ -200,7 +186,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
                 $_assign = $_attr[ 'assign' ];
             }
         }
-
         $has_compiled_template = false;
         if ($merge_compiled_includes) {
             $c_id = isset($_attr[ 'compile_id' ]) ? $_attr[ 'compile_id' ] : $compiler->template->compile_id;
@@ -232,17 +217,17 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
             $_vars = 'array(' . join(',', $_pairs) . ')';
         }
         $update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache &&
-                             $_compile_id != '$_smarty_tpl->compile_id';
+                             $_compile_id !== '$_smarty_tpl->compile_id';
         if ($has_compiled_template && !$call_nocache) {
             $_output = "<?php\n";
             if ($update_compile_id) {
                 $_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
             }
-            if (!empty($_attr) && $_caching == 9999 && $compiler->template->caching) {
+            if (!empty($_attr) && $_caching === 9999 && $compiler->template->caching) {
                 $_vars_nc = "foreach ($_vars as \$ik => \$iv) {\n";
                 $_vars_nc .= "\$_smarty_tpl->tpl_vars[\$ik] =  new Smarty_Variable(\$iv);\n";
                 $_vars_nc .= "}\n";
-                $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, - 3);
+                $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, -3);
             }
             if (isset($_assign)) {
                 $_output .= "ob_start();\n";
@@ -254,11 +239,9 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
             if ($update_compile_id) {
                 $_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
             }
-            $_output .= "?>\n";
-
+            $_output .= "?>";
             return $_output;
         }
-
         if ($call_nocache) {
             $compiler->tag_nocache = true;
         }
@@ -277,7 +260,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
         if ($update_compile_id) {
             $_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
         }
-        $_output .= "?>\n";
+        $_output .= "?>";
         return $_output;
     }
 
@@ -289,14 +272,16 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
      * @param  string                                 $t_hash
      *
      * @return bool
+     * @throws \Exception
+     * @throws \SmartyException
      */
     public function compileInlineTemplate(Smarty_Internal_SmartyTemplateCompiler $compiler,
-                                          Smarty_Internal_Template $tpl, $t_hash)
+                                          Smarty_Internal_Template $tpl,
+                                          $t_hash)
     {
         $uid = $tpl->source->type . $tpl->source->uid;
         if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
-            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] =
-                $tpl->source->uid;
+            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] = $tpl->source->uid;
             if (isset($compiler->template->inheritance)) {
                 $tpl->inheritance = clone $compiler->template->inheritance;
             }
@@ -310,29 +295,30 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
             $tpl->mustCompile = true;
             $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'nocache_hash' ] =
                 $tpl->compiled->nocache_hash;
-            if ($compiler->template->source->type == 'file') {
-                $sourceInfo = $compiler->template->source->filepath;
+            if ($tpl->source->type === 'file') {
+                $sourceInfo = $tpl->source->filepath;
             } else {
-                $basename = $compiler->template->source->handler->getBasename($compiler->template->source);
-                $sourceInfo = $compiler->template->source->type . ':' .
-                              ($basename ? $basename : $compiler->template->source->name);
+                $basename = $tpl->source->handler->getBasename($tpl->source);
+                $sourceInfo = $tpl->source->type . ':' .
+                              ($basename ? $basename : $tpl->source->name);
             }
             // get compiled code
             $compiled_code = "<?php\n\n";
             $compiled_code .= "/* Start inline template \"{$sourceInfo}\" =============================*/\n";
-            $compiled_code .= "function {$tpl->compiled->unifunc} (\$_smarty_tpl) {\n";
+            $compiled_code .= "function {$tpl->compiled->unifunc} (Smarty_Internal_Template \$_smarty_tpl) {\n";
             $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
             $compiled_code .= "<?php\n";
             $compiled_code .= "}\n?>\n";
             $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
             $compiled_code .= "<?php\n\n";
             $compiled_code .= "/* End inline template \"{$sourceInfo}\" =============================*/\n";
-            $compiled_code .= "?>";
+            $compiled_code .= '?>';
             unset($tpl->compiler);
             if ($tpl->compiled->has_nocache_code) {
                 // replace nocache_hash
                 $compiled_code =
-                    str_replace("{$tpl->compiled->nocache_hash}", $compiler->template->compiled->nocache_hash,
+                    str_replace("{$tpl->compiled->nocache_hash}",
+                                $compiler->template->compiled->nocache_hash,
                                 $compiled_code);
                 $compiler->template->compiled->has_nocache_code = true;
             }

libs/sysplugins/smarty_internal_compile_include_php.php

@@ -7,7 +7,6 @@
  * @subpackage Compiler
  * @author     Uwe Tews
  */
-
 /**
  * Smarty Internal Plugin Compile Insert Class
  *
@@ -57,7 +56,6 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
         }
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-
         /** @var Smarty_Internal_Template $_smarty_tpl
          * used in evaluated code
          */
@@ -74,8 +72,8 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
                 $_dir = $compiler->smarty->trusted_dir;
             }
             if (!empty($_dir)) {
-                foreach ((array) $_dir as $_script_dir) {
-                    $_path = $compiler->smarty->_realpath($_script_dir . DS . $_file, true);
+                foreach ((array)$_dir as $_script_dir) {
+                    $_path = $compiler->smarty->_realpath($_script_dir . DIRECTORY_SEPARATOR . $_file, true);
                     if (file_exists($_path)) {
                         $_filepath = $_path;
                         break;
@@ -83,25 +81,22 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
                 }
             }
         }
-        if ($_filepath == false) {
+        if ($_filepath === false) {
             $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true);
         }
-
         if (isset($compiler->smarty->security_policy)) {
             $compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
         }
-
         if (isset($_attr[ 'assign' ])) {
             // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr[ 'assign' ];
         }
         $_once = '_once';
         if (isset($_attr[ 'once' ])) {
-            if ($_attr[ 'once' ] == 'false') {
+            if ($_attr[ 'once' ] === 'false') {
                 $_once = '';
             }
         }
-
         if (isset($_assign)) {
             return "<?php ob_start();\ninclude{$_once} ('{$_filepath}');\n\$_smarty_tpl->assign({$_assign},ob_get_clean());\n?>";
         } else {

libs/sysplugins/smarty_internal_compile_insert.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Smarty Internal Plugin Compile Insert
  * Compiles the {insert} tag
@@ -24,7 +23,6 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
-
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -32,7 +30,6 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
-
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -49,14 +46,12 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
      *
      * @return string compiled code
      * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        //Does tag create output
-        $compiler->has_output = isset($_attr[ 'assign' ]) ? false : true;
-
         $nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache);
         if (!$nocacheParam) {
             // do not compile as nocache code
@@ -66,7 +61,6 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
         $_smarty_tpl = $compiler->template;
         $_name = null;
         $_script = null;
-
         $_output = '<?php ';
         // save possible attributes
         eval('$_name = @' . $_attr[ 'name' ] . ';');
@@ -74,7 +68,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
             // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr[ 'assign' ];
             // create variable to make sure that the compiler knows about its nocache status
-            $var = trim($_attr[ 'assign' ], "'");
+            $var = trim($_attr[ 'assign' ], '\'');
             if (isset($compiler->template->tpl_vars[ $var ])) {
                 $compiler->template->tpl_vars[ $var ]->nocache = true;
             } else {
@@ -96,8 +90,8 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
                     $_dir = $compiler->smarty instanceof SmartyBC ? $compiler->smarty->trusted_dir : null;
                 }
                 if (!empty($_dir)) {
-                    foreach ((array) $_dir as $_script_dir) {
-                        $_script_dir = rtrim($_script_dir, '/\\') . DS;
+                    foreach ((array)$_dir as $_script_dir) {
+                        $_script_dir = rtrim($_script_dir, '/\\') . DIRECTORY_SEPARATOR;
                         if (file_exists($_script_dir . $_script)) {
                             $_filepath = $_script_dir . $_script;
                             break;
@@ -105,7 +99,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
                     }
                 }
             }
-            if ($_filepath == false) {
+            if ($_filepath === false) {
                 $compiler->trigger_template_error("{insert} missing script file '{$_script}'", null, true);
             }
             // code for script file loading
@@ -113,7 +107,8 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
             require_once $_filepath;
             if (!is_callable($_function)) {
                 $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'",
-                                                  null, true);
+                                                  null,
+                                                  true);
             }
         } else {
             $_filepath = 'null';
@@ -122,7 +117,8 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
             if (!is_callable($_function)) {
                 // try plugin
                 if (!$_function = $compiler->getPlugin($_name, 'insert')) {
-                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", null,
+                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'",
+                                                      null,
                                                       true);
                 }
             }
@@ -149,7 +145,6 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
                 $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
             }
         }
-
         return $_output;
     }
 }

libs/sysplugins/smarty_internal_compile_ldelim.php

@@ -16,7 +16,7 @@
  */
 class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
 {
-    /**
+   /**
      * Compiles code for the {ldelim} tag
      * This tag does output the left delimiter
      *
@@ -32,9 +32,6 @@ class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
         if ($_attr[ 'nocache' ] === true) {
             $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
-        // this tag does not return compiled code
-        $compiler->has_code = true;
-
         return $compiler->smarty->left_delimiter;
     }
 }

libs/sysplugins/smarty_internal_compile_make_nocache.php

@@ -41,20 +41,18 @@ class Smarty_Internal_Compile_Make_Nocache extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {make_nocache} tag
      *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+      */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         if ($compiler->template->caching) {
             $output = "<?php \$_smarty_tpl->smarty->ext->_make_nocache->save(\$_smarty_tpl, {$_attr[ 'var' ]});\n?>\n";
-            $compiler->has_code = true;
+            $compiler->template->compiled->has_nocache_code = true;
             $compiler->suppressNocacheProcessing = true;
             return $output;
         } else {

libs/sysplugins/smarty_internal_compile_parent.php

@@ -0,0 +1,32 @@
+<?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';
+}