YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php

Doc Comments +5 added lines, -5 removed lines

@@ -299,7 +299,7 @@ 
     /**
      * method to compile a Smarty template
      *
-     * @param mixed $_content template source
+     * @param string $_content template source
      * @param bool  $isTemplateSource
      *
      * @return bool true if compiling succeeded, false if it failed
@@ -324,7 +324,7 @@ 
      * @param  bool                                     $nocache  true is shall be compiled in nocache mode
      * @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
      *
-     * @return bool true if compiling succeeded, false if it failed
+     * @return string true if compiling succeeded, false if it failed
      * @throws \Exception
      */
     public function compileTemplate(Smarty_Internal_Template $template, $nocache = null,
@@ -841,7 +841,7 @@ 
      * @param  string $tag    tag name
      * @param  array  $args   list of tag attributes
      * @param  mixed  $param1 optional parameter
-     * @param  mixed  $param2 optional parameter
+     * @param  string  $param2 optional parameter
      * @param  mixed  $param3 optional parameter
      *
      * @return string compiled code
@@ -1052,7 +1052,7 @@ 
      *
      * @param string $input
      *
-     * @return bool|string
+     * @return string|false
      */
     public function getId($input)
     {
@@ -1067,7 +1067,7 @@ 
      *
      * @param string $input
      *
-     * @return bool|string
+     * @return string|false
      */
     public function getVariableName($input)
     {

Indentation +1268 added lines, -1268 removed lines

@@ -23,1273 +23,1273 @@
 abstract class Smarty_Internal_TemplateCompilerBase
 {
 
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * Parser object
-     *
-     * @var Smarty_Internal_Templateparser
-     */
-    public $parser = null;
-
-    /**
-     * hash for nocache sections
-     *
-     * @var mixed
-     */
-    public $nocache_hash = null;
-
-    /**
-     * suppress generation of nocache code
-     *
-     * @var bool
-     */
-    public $suppressNocacheProcessing = false;
-
-    /**
-     * compile tag objects cache
-     *
-     * @var array
-     */
-    static $_tag_objects = array();
-
-    /**
-     * tag stack
-     *
-     * @var array
-     */
-    public $_tag_stack = array();
-
-    /**
-     * current template
-     *
-     * @var Smarty_Internal_Template
-     */
-    public $template = null;
-
-    /**
-     * merged included sub template data
-     *
-     * @var array
-     */
-    public $mergedSubTemplatesData = array();
-
-    /**
-     * merged sub template code
-     *
-     * @var array
-     */
-    public $mergedSubTemplatesCode = array();
-
-    /**
-     * collected template properties during compilation
-     *
-     * @var array
-     */
-    public $templateProperties = array();
-
-    /**
-     * source line offset for error messages
-     *
-     * @var int
-     */
-    public $trace_line_offset = 0;
-
-    /**
-     * trace uid
-     *
-     * @var string
-     */
-    public $trace_uid = '';
-
-    /**
-     * trace file path
-     *
-     * @var string
-     */
-    public $trace_filepath = '';
-
-    /**
-     * stack for tracing file and line of nested {block} tags
-     *
-     * @var array
-     */
-    public $trace_stack = array();
-
-    /**
-     * plugins loaded by default plugin handler
-     *
-     * @var array
-     */
-    public $default_handler_plugins = array();
-
-    /**
-     * saved preprocessed modifier list
-     *
-     * @var mixed
-     */
-    public $default_modifier_list = null;
-
-    /**
-     * force compilation of complete template as nocache
-     *
-     * @var boolean
-     */
-    public $forceNocache = false;
-
-    /**
-     * flag if compiled template file shall we written
-     *
-     * @var bool
-     */
-    public $write_compiled_code = true;
-
-    /**
-     * Template functions
-     *
-     * @var array
-     */
-    public $tpl_function = array();
-
-    /**
-     * called sub functions from template function
-     *
-     * @var array
-     */
-    public $called_functions = array();
-
-    /**
-     * compiled template or block function code
-     *
-     * @var string
-     */
-    public $blockOrFunctionCode = '';
-
-    /**
-     * php_handling setting either from Smarty or security
-     *
-     * @var int
-     */
-    public $php_handling = 0;
-
-    /**
-     * flags for used modifier plugins
-     *
-     * @var array
-     */
-    public $modifier_plugins = array();
-
-    /**
-     * type of already compiled modifier
-     *
-     * @var array
-     */
-    public $known_modifier_type = array();
-
-    /**
-     * parent compiler object for merged subtemplates and template functions
-     *
-     * @var Smarty_Internal_TemplateCompilerBase
-     */
-    public $parent_compiler = null;
-
-    /**
-     * Flag true when compiling nocache section
-     *
-     * @var bool
-     */
-    public $nocache = false;
-
-    /**
-     * Flag true when tag is compiled as nocache
-     *
-     * @var bool
-     */
-    public $tag_nocache = false;
-
-    /**
-     * Compiled tag prefix code
-     *
-     * @var array
-     */
-    public $prefix_code = array();
-
-    /**
-     * Prefix code  stack
-     *
-     * @var array
-     */
-    public $prefixCodeStack = array();
-
-    /**
-     * Tag has compiled code
-     *
-     * @var bool
-     */
-    public $has_code = false;
-
-    /**
-     * A variable string was compiled
-     *
-     * @var bool
-     */
-    public $has_variable_string = false;
-
-    /**
-     * Tag creates output
-     *
-     * @var bool
-     */
-    public $has_output = false;
-
-    /**
-     * Stack for {setfilter} {/setfilter}
-     *
-     * @var array
-     */
-    public $variable_filter_stack = array();
-
-    /**
-     * variable filters for {setfilter} {/setfilter}
-     *
-     * @var array
-     */
-    public $variable_filters = array();
-
-    /**
-     * Nesting count of looping tags like {foreach}, {for}, {section}, {while}
-     *
-     * @var int
-     */
-    public $loopNesting = 0;
-
-    /**
-     * Strip preg pattern
-     *
-     * @var string
-     */
-    public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
-
-    /**
-     * plugin search order
-     *
-     * @var array
-     */
-    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
-
-    /**
-     * General storage area for tag compiler plugins
-     *
-     * @var array
-     */
-    public $_cache = array();
-
-    /**
-     * counter for prefix variable number
-     *
-     * @var int
-     */
-    public static $prefixVariableNumber = 0;
-
-    /**
-     * method to compile a Smarty template
-     *
-     * @param mixed $_content template source
-     * @param bool  $isTemplateSource
-     *
-     * @return bool true if compiling succeeded, false if it failed
-     */
-    abstract protected function doCompile($_content, $isTemplateSource = false);
-
-    /**
-     * Initialize compiler
-     *
-     * @param Smarty $smarty global instance
-     */
-    public function __construct(Smarty $smarty)
-    {
-        $this->smarty = $smarty;
-        $this->nocache_hash = str_replace(array('.', ','), '_', uniqid(rand(), true));
-    }
-
-    /**
-     * Method to compile a Smarty template
-     *
-     * @param  Smarty_Internal_Template                 $template template object to compile
-     * @param  bool                                     $nocache  true is shall be compiled in nocache mode
-     * @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
-     *
-     * @return bool true if compiling succeeded, false if it failed
-     * @throws \Exception
-     */
-    public function compileTemplate(Smarty_Internal_Template $template, $nocache = null,
-                                    Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
-    {
-        // get code frame of compiled template
-        $_compiled_code = $template->smarty->ext->_codeFrame->create($template,
-                                                                     $this->compileTemplateSource($template, $nocache,
-                                                                                                  $parent_compiler),
-                                                                     $this->postFilter($this->blockOrFunctionCode) .
-                                                                     join('', $this->mergedSubTemplatesCode), false,
-                                                                     $this);
-        return $_compiled_code;
-    }
-
-    /**
-     * Compile template source and run optional post filter
-     *
-     * @param \Smarty_Internal_Template             $template
-     * @param null|bool                             $nocache flag if template must be compiled in nocache mode
-     * @param \Smarty_Internal_TemplateCompilerBase $parent_compiler
-     *
-     * @return string
-     * @throws \Exception
-     */
-    public function compileTemplateSource(Smarty_Internal_Template $template, $nocache = null,
-                                          Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
-    {
-        try {
-            // save template object in compiler class
-            $this->template = $template;
-            if (property_exists($this->template->smarty, 'plugin_search_order')) {
-                $this->plugin_search_order = $this->template->smarty->plugin_search_order;
-            }
-            if ($this->smarty->debugging) {
-                if (!isset($this->smarty->_debug)) {
-                    $this->smarty->_debug = new Smarty_Internal_Debug();
-                }
-                $this->smarty->_debug->start_compile($this->template);
-            }
-            if (isset($this->template->smarty->security_policy)) {
-                $this->php_handling = $this->template->smarty->security_policy->php_handling;
-            } else {
-                $this->php_handling = $this->template->smarty->php_handling;
-            }
-            $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
-            $nocache = isset($nocache) ? $nocache : false;
-            if (empty($template->compiled->nocache_hash)) {
-                $template->compiled->nocache_hash = $this->nocache_hash;
-            } else {
-                $this->nocache_hash = $template->compiled->nocache_hash;
-            }
-            // flag for nocache sections
-            $this->nocache = $nocache;
-            $this->tag_nocache = false;
-            // reset has nocache code flag
-            $this->template->compiled->has_nocache_code = false;
-            $this->has_variable_string = false;
-            $this->prefix_code = array();
-            // add file dependency
-            if ($this->smarty->merge_compiled_includes || $this->template->source->handler->checkTimestamps()) {
-                $this->parent_compiler->template->compiled->file_dependency[ $this->template->source->uid ] =
-                    array($this->template->source->filepath, $this->template->source->getTimeStamp(),
-                          $this->template->source->type,);
-            }
-            $this->smarty->_current_file = $this->template->source->filepath;
-            // get template source
-            if (!empty($this->template->source->components)) {
-                // we have array of inheritance templates by extends: resource
-                // generate corresponding source code sequence
-                $_content =
-                    Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template->source->components);
-            } else {
-                // get template source
-                $_content = $this->template->source->getContent();
-            }
-            $_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true));
-        }
-        catch (Exception $e) {
-            if ($this->smarty->debugging) {
-                $this->smarty->_debug->end_compile($this->template);
-            }
-            $this->_tag_stack = array();
-            // free memory
-            $this->parent_compiler = null;
-            $this->template = null;
-            $this->parser = null;
-            throw $e;
-        }
-        if ($this->smarty->debugging) {
-            $this->smarty->_debug->end_compile($this->template);
-        }
-        $this->parent_compiler = null;
-        $this->parser = null;
-        return $_compiled_code;
-    }
-
-    /**
-     * Optionally process compiled code by post filter
-     *
-     * @param string $code compiled code
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function postFilter($code)
-    {
-        // run post filter if on code
-        if (!empty($code) &&
-            (isset($this->smarty->autoload_filters[ 'post' ]) || isset($this->smarty->registered_filters[ 'post' ]))
-        ) {
-            return $this->smarty->ext->_filterHandler->runFilter('post', $code, $this->template);
-        } else {
-            return $code;
-        }
-    }
-
-    /**
-     * Run optional prefilter
-     *
-     * @param string $_content template source
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function preFilter($_content)
-    {
-        // run pre filter if required
-        if ($_content != '' &&
-            ((isset($this->smarty->autoload_filters[ 'pre' ]) || isset($this->smarty->registered_filters[ 'pre' ])))
-        ) {
-            return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template);
-        } else {
-            return $_content;
-        }
-    }
-
-    /**
-     * Compile Tag
-     * This is a call back from the lexer/parser
-     *
-     * Save current prefix code
-     * Compile tag
-     * Merge tag prefix code with saved one
-     * (required nested tags in attributes)
-     *
-     * @param  string $tag       tag name
-     * @param  array  $args      array with tag attributes
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @throws SmartyCompilerException
-     * @throws SmartyException
-     * @return string compiled code
-     */
-    public function compileTag($tag, $args, $parameter = array())
-    {
-        $this->prefixCodeStack[] = $this->prefix_code;
-        $this->prefix_code = array();
-        $result = $this->compileTag2($tag, $args, $parameter);
-        $this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
-        return $result;
-    }
-
-    /**
-     * Compile Tag
-     *
-     * @param  string $tag       tag name
-     * @param  array  $args      array with tag attributes
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @throws SmartyCompilerException
-     * @throws SmartyException
-     * @return string compiled code
-     */
-    private function compileTag2($tag, $args, $parameter)
-    {
-        $plugin_type = '';
-        // $args contains the attributes parsed and compiled by the lexer/parser
-        // assume that tag does compile into code, but creates no HTML output
-        $this->has_code = true;
-        $this->has_output = false;
-        // log tag/attributes
-        if (isset($this->smarty->_cache[ 'get_used_tags' ])) {
-            $this->template->_cache[ 'used_tags' ][] = array($tag, $args);
-        }
-        // check nocache option flag
-        foreach ($args as $arg) {
-            if (!is_array($arg)) {
-                if ($arg == "'nocache'") {
-                    $this->tag_nocache = true;
-                }
-            } else {
-                foreach ($arg as $k => $v) {
-                    if ($k == "'nocache'" && (trim($v, "'\" ") == 'true')) {
-                        $this->tag_nocache = true;
-                    }
-                }
-            }
-        }
-        // compile the smarty tag (required compile classes to compile the tag are auto loaded)
-        if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
-            if (isset($this->parent_compiler->tpl_function[ $tag ])) {
-                // template defined by {template} tag
-                $args[ '_attr' ][ 'name' ] = "'" . $tag . "'";
-                $_output = $this->callTagCompiler('call', $args, $parameter);
-            }
-        }
-        if ($_output !== false) {
-            if ($_output !== true) {
-                // did we get compiled code
-                if ($this->has_code) {
-                    // Does it create output?
-                    if ($this->has_output) {
-                        $_output .= "\n";
-                    }
-                    // return compiled code
-                    return $_output;
-                }
-            }
-            // tag did not produce compiled code
-            return null;
-        } else {
-            // map_named attributes
-            if (isset($args[ '_attr' ])) {
-                foreach ($args[ '_attr' ] as $key => $attribute) {
-                    if (is_array($attribute)) {
-                        $args = array_merge($args, $attribute);
-                    }
-                }
-            }
-            // not an internal compiler tag
-            if (strlen($tag) < 6 || substr($tag, - 5) != 'close') {
-                // check if tag is a registered object
-                if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) {
-                    $method = $parameter[ 'object_method' ];
-                    if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ]) &&
-                        (empty($this->smarty->registered_objects[ $tag ][ 1 ]) ||
-                         in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ]))
-                    ) {
-                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
-                    } elseif (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
-                                                      $method);
-                    } else {
-                        // throw exception
-                        $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' .
-                                                      $tag . '"', null, true);
-                    }
-                }
-                // check if tag is registered
-                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK,) as $plugin_type)
-                {
-                    if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) {
-                        // if compiler function plugin call it now
-                        if ($plugin_type == Smarty::PLUGIN_COMPILER) {
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                                if (is_array($mixed)) {
-                                    $new_args = array_merge($new_args, $mixed);
-                                } else {
-                                    $new_args[ $key ] = $mixed;
-                                }
-                            }
-                            if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) {
-                                $this->tag_nocache = true;
-                            }
-                            return call_user_func_array($this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ],
-                                                        array($new_args, $this));
-                        }
-                        // compile registered function or block function
-                        if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
-                                                          $tag);
-                        }
-                    }
-                }
-                // check plugins from plugins folder
-                foreach ($this->plugin_search_order as $plugin_type) {
-                    if ($plugin_type == Smarty::PLUGIN_COMPILER &&
-                        $this->smarty->loadPlugin('smarty_compiler_' . $tag) &&
-                        (!isset($this->smarty->security_policy) ||
-                         $this->smarty->security_policy->isTrustedTag($tag, $this))
-                    ) {
-                        $plugin = 'smarty_compiler_' . $tag;
-                        if (is_callable($plugin)) {
-                            // convert arguments format for old compiler plugins
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                                if (is_array($mixed)) {
-                                    $new_args = array_merge($new_args, $mixed);
-                                } else {
-                                    $new_args[ $key ] = $mixed;
-                                }
-                            }
-
-                            return $plugin($new_args, $this->smarty);
-                        }
-                        if (class_exists($plugin, false)) {
-                            $plugin_object = new $plugin;
-                            if (method_exists($plugin_object, 'compile')) {
-                                return $plugin_object->compile($args, $this);
-                            }
-                        }
-                        throw new SmartyException("Plugin \"{$tag}\" not callable");
-                    } else {
-                        if ($function = $this->getPlugin($tag, $plugin_type)) {
-                            if (!isset($this->smarty->security_policy) ||
-                                $this->smarty->security_policy->isTrustedTag($tag, $this)
-                            ) {
-                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter,
-                                                              $tag, $function);
-                            }
-                        }
-                    }
-                }
-                if (is_callable($this->smarty->default_plugin_handler_func)) {
-                    $found = false;
-                    // look for already resolved tags
-                    foreach ($this->plugin_search_order as $plugin_type) {
-                        if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) {
-                            $found = true;
-                            break;
-                        }
-                    }
-                    if (!$found) {
-                        // call default handler
-                        foreach ($this->plugin_search_order as $plugin_type) {
-                            if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
-                                $found = true;
-                                break;
-                            }
-                        }
-                    }
-                    if ($found) {
-                        // if compiler function plugin call it now
-                        if ($plugin_type == Smarty::PLUGIN_COMPILER) {
-                            $new_args = array();
-                            foreach ($args as $mixed) {
-                                $new_args = array_merge($new_args, $mixed);
-                            }
-                            return call_user_func_array($this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ],
-                                                        array($new_args, $this));
-                        } else {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
-                                                          $tag);
-                        }
-                    }
-                }
-            } else {
-                // compile closing tag of block function
-                $base_tag = substr($tag, 0, - 5);
-                // check if closing tag is a registered object
-                if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) {
-                    $method = $parameter[ 'object_method' ];
-                    if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
-                                                      $method);
-                    } else {
-                        // throw exception
-                        $this->trigger_template_error('not allowed closing tag method "' . $method .
-                                                      '" in registered object "' . $base_tag . '"', null, true);
-                    }
-                }
-                // registered block tag ?
-                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ]) ||
-                    isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
-                ) {
-                    return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
-                }
-                // registered function tag ?
-                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
-                    return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
-                }
-                // block plugin?
-                if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
-                    return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
-                }
-                // function plugin?
-                if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) {
-                    if (!isset($this->smarty->security_policy) ||
-                        $this->smarty->security_policy->isTrustedTag($tag, $this)
-                    ) {
-                        return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function);
-                    }
-                }
-                // registered compiler plugin ?
-                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) {
-                    // if compiler function plugin call it now
-                    $args = array();
-                    if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) {
-                        $this->tag_nocache = true;
-                    }
-                    return call_user_func_array($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ],
-                                                array($args, $this));
-                }
-                if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
-                    $plugin = 'smarty_compiler_' . $tag;
-                    if (is_callable($plugin)) {
-                        return $plugin($args, $this->smarty);
-                    }
-                    if (class_exists($plugin, false)) {
-                        $plugin_object = new $plugin;
-                        if (method_exists($plugin_object, 'compile')) {
-                            return $plugin_object->compile($args, $this);
-                        }
-                    }
-                    throw new SmartyException("Plugin \"{$tag}\" not callable");
-                }
-            }
-            $this->trigger_template_error("unknown tag \"" . $tag . "\"", null, true);
-        }
-    }
-
-    /**
-     * compile variable
-     *
-     * @param string $variable
-     *
-     * @return string
-     */
-    public function compileVariable($variable)
-    {
-        if (strpos($variable, '(') == 0) {
-            // not a variable variable
-            $var = trim($variable, '\'');
-            $this->tag_nocache = $this->tag_nocache |
-                                 $this->template->ext->getTemplateVars->_getVariable($this->template, $var, null, true,
-                                                                                     false)->nocache;
-            // todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache;
-        }
-        return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
-    }
-
-    /**
-     * compile config variable
-     *
-     * @param string $variable
-     *
-     * @return string
-     */
-    public function compileConfigVariable($variable)
-    {
-        // return '$_smarty_tpl->config_vars[' . $variable . ']';
-        return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')';
-    }
-
-    /**
-     * This method is called from parser to process a text content section
-     * - remove text from inheritance child templates as they may generate output
-     * - strip text if strip is enabled
-     *
-     * @param string $text
-     *
-     * @return null|\Smarty_Internal_ParseTree_Text
-     */
-    public function processText($text)
-    {
-        if ((string) $text != '') {
-            $store = array();
-            $_store = 0;
-            if ($this->parser->strip) {
-                if (strpos($text, '<') !== false) {
-                    // capture html elements not to be messed with
-                    $_offset = 0;
-                    if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
-                                       $text, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-                        foreach ($matches as $match) {
-                            $store[] = $match[ 0 ][ 0 ];
-                            $_length = strlen($match[ 0 ][ 0 ]);
-                            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-                            $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
-
-                            $_offset += $_length - strlen($replace);
-                            $_store ++;
-                        }
-                    }
-                    $expressions = array(// replace multiple spaces between tags by a single space
-                                         '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s' => '\1 \2',
-                                         // remove newline between tags
-                                         '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s' => '\1\2',
-                                         // remove multiple spaces between attributes (but not in attribute values!)
-                                         '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
-                                         '#>[\040\011]+$#Ss' => '> ', '#>[\040\011]*[\n]\s*$#Ss' => '>',
-                                         $this->stripRegEx => '',);
-
-                    $text = preg_replace(array_keys($expressions), array_values($expressions), $text);
-                    $_offset = 0;
-                    if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $text, $matches,
-                                       PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-                        foreach ($matches as $match) {
-                            $_length = strlen($match[ 0 ][ 0 ]);
-                            $replace = $store[ $match[ 1 ][ 0 ] ];
-                            $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
-
-                            $_offset += strlen($replace) - $_length;
-                            $_store ++;
-                        }
-                    }
-                } else {
-                    $text = preg_replace($this->stripRegEx, '', $text);
-                }
-            }
-            return new Smarty_Internal_ParseTree_Text($text);
-        }
-        return null;
-    }
-
-    /**
-     * lazy loads internal compile plugin for tag and calls the compile method
-     * compile objects cached for reuse.
-     * class name format:  Smarty_Internal_Compile_TagName
-     * plugin filename format: Smarty_Internal_TagName.php
-     *
-     * @param  string $tag    tag name
-     * @param  array  $args   list of tag attributes
-     * @param  mixed  $param1 optional parameter
-     * @param  mixed  $param2 optional parameter
-     * @param  mixed  $param3 optional parameter
-     *
-     * @return string compiled code
-     */
-    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
-    {
-        // re-use object if already exists
-        if (!isset(self::$_tag_objects[ $tag ])) {
-            // lazy load internal compiler plugin
-            $_tag = explode('_', $tag);
-            $_tag = array_map('ucfirst', $_tag);
-            $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
-            if (class_exists($class_name) &&
-                (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
-            ) {
-                self::$_tag_objects[ $tag ] = new $class_name;
-            } else {
-                self::$_tag_objects[ $tag ] = false;
-                return false;
-            }
-        }
-        // compile this tag
-        return self::$_tag_objects[ $tag ] === false ? false :
-            self::$_tag_objects[ $tag ]->compile($args, $this, $param1, $param2, $param3);
-    }
-
-    /**
-     * Check for plugins and return function name
-     *
-     * @param         $plugin_name
-     * @param  string $plugin_type type of plugin
-     *
-     * @return string call name of function
-     */
-    public function getPlugin($plugin_name, $plugin_type)
-    {
-        $function = null;
-        if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-            if (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
-                $function =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
-            } elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
-                $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ];
-                $function =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
-            }
-        } else {
-            if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
-                $function =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
-            } elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
-                $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ];
-                $function =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
-            }
-        }
-        if (isset($function)) {
-            if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[ $plugin_name ] = true;
-            }
-
-            return $function;
-        }
-        // loop through plugin dirs and find the plugin
-        $function = 'smarty_' . $plugin_type . '_' . $plugin_name;
-        $file = $this->smarty->loadPlugin($function, false);
-
-        if (is_string($file)) {
-            if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
-                    $file;
-                $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
-                    $function;
-            } else {
-                $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
-                    $file;
-                $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
-                    $function;
-            }
-            if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[ $plugin_name ] = true;
-            }
-
-            return $function;
-        }
-        if (is_callable($function)) {
-            // plugin function is defined in the script
-            return $function;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check for plugins by default plugin handler
-     *
-     * @param  string $tag         name of tag
-     * @param  string $plugin_type type of plugin
-     *
-     * @return boolean true if found
-     */
-    public function getPluginFromDefaultHandler($tag, $plugin_type)
-    {
-        $callback = null;
-        $script = null;
-        $cacheable = true;
-        $result = call_user_func_array($this->smarty->default_plugin_handler_func,
-                                       array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable,));
-        if ($result) {
-            $this->tag_nocache = $this->tag_nocache || !$cacheable;
-            if ($script !== null) {
-                if (is_file($script)) {
-                    if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                        $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] =
-                            $script;
-                        $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] =
-                            $callback;
-                    } else {
-                        $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] =
-                            $script;
-                        $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] =
-                            $callback;
-                    }
-                    require_once $script;
-                } else {
-                    $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
-                }
-            }
-            if (is_callable($callback)) {
-                $this->default_handler_plugins[ $plugin_type ][ $tag ] = array($callback, true, array());
-
-                return true;
-            } else {
-                $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable");
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Append code segments and remove unneeded ?> <?php transitions
-     *
-     * @param string $left
-     * @param string $right
-     *
-     * @return string
-     */
-    public function appendCode($left, $right)
-    {
-        if (preg_match('/\s*\?>\s*$/', $left) && preg_match('/^\s*<\?php\s+/', $right)) {
-            $left = preg_replace('/\s*\?>\s*$/', "\n", $left);
-            $left .= preg_replace('/^\s*<\?php\s+/', '', $right);
-        } else {
-            $left .= $right;
-        }
-        return $left;
-    }
-
-    /**
-     * Inject inline code for nocache template sections
-     * This method gets the content of each template element from the parser.
-     * If the content is compiled code and it should be not cached the code is injected
-     * into the rendered output.
-     *
-     * @param  string  $content content of template element
-     * @param  boolean $is_code true if content is compiled code
-     *
-     * @return string  content
-     */
-    public function processNocacheCode($content, $is_code)
-    {
-        // If the template is not evaluated and we have a nocache section and or a nocache tag
-        if ($is_code && !empty($content)) {
-            // generate replacement code
-            if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->template->caching &&
-                !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
-            ) {
-                $this->template->compiled->has_nocache_code = true;
-                $_output = addcslashes($content, '\'\\');
-                $_output = str_replace("^#^", "'", $_output);
-                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output .
-                           "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
-                // make sure we include modifier plugins for nocache code
-                foreach ($this->modifier_plugins as $plugin_name => $dummy) {
-                    if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) {
-                        $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] =
-                            $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ];
-                    }
-                }
-            } else {
-                $_output = $content;
-            }
-        } else {
-            $_output = $content;
-        }
-        $this->modifier_plugins = array();
-        $this->suppressNocacheProcessing = false;
-        $this->tag_nocache = false;
-
-        return $_output;
-    }
-
-    /**
-     * Get Id
-     *
-     * @param string $input
-     *
-     * @return bool|string
-     */
-    public function getId($input)
-    {
-        if (preg_match('~^([\'"]*)([0-9]*[a-zA-Z_]\w*)\1$~', $input, $match)) {
-            return $match[ 2 ];
-        }
-        return false;
-    }
-
-    /**
-     * Get variable name from string
-     *
-     * @param string $input
-     *
-     * @return bool|string
-     */
-    public function getVariableName($input)
-    {
-        if (preg_match('~^[$]_smarty_tpl->tpl_vars\[[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]->value$~', $input, $match)) {
-            return $match[ 1 ];
-        }
-        return false;
-    }
-
-    /**
-     * Set nocache flag in variable or create new variable
-     *
-     * @param string $varName
-     */
-    public function setNocacheInVariable($varName)
-    {
-        // create nocache var to make it know for further compiling
-        if ($_var = $this->getId($varName)) {
-            if (isset($this->template->tpl_vars[ $_var ])) {
-                $this->template->tpl_vars[ $_var ] = clone $this->template->tpl_vars[ $_var ];
-                $this->template->tpl_vars[ $_var ]->nocache = true;
-            } else {
-                $this->template->tpl_vars[ $_var ] = new Smarty_Variable(null, true);
-            }
-        }
-    }
-
-    /**
-     * @param array $_attr tag attributes
-     * @param array $validScopes
-     *
-     * @return int|string
-     * @throws \SmartyCompilerException
-     */
-    public function convertScope($_attr, $validScopes)
-    {
-        $_scope = 0;
-        if (isset($_attr[ 'scope' ])) {
-            $_scopeName = trim($_attr[ 'scope' ], "'\"");
-            if (is_numeric($_scopeName) && in_array($_scopeName, $validScopes)) {
-                $_scope = $_scopeName;
-            } elseif (is_string($_scopeName)) {
-                $_scopeName = trim($_scopeName, "'\"");
-                $_scope = isset($validScopes[ $_scopeName ]) ? $validScopes[ $_scopeName ] : false;
-            } else {
-                $_scope = false;
-            }
-            if ($_scope === false) {
-                $err = var_export($_scopeName, true);
-                $this->trigger_template_error("illegal value '{$err}' for \"scope\" attribute", null, true);
-            }
-        }
-        return $_scope;
-    }
-
-    /**
-     * Generate nocache code string
-     *
-     * @param string $code PHP code
-     *
-     * @return string
-     */
-    public function makeNocacheCode($code)
-    {
-        return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/<?php " .
-               str_replace("^#^", "'", addcslashes($code, '\'\\')) .
-               "?>/*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n";
-    }
-
-    /**
-     * display compiler error messages without dying
-     * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about expected tokens.
-     * If parameter $args contains a string this is used as error message
-     *
-     * @param  string   $args    individual error message or null
-     * @param  string   $line    line-number
-     * @param null|bool $tagline if true the line number of last tag
-     *
-     * @throws \SmartyCompilerException when an unexpected token is found
-     */
-    public function trigger_template_error($args = null, $line = null, $tagline = null)
-    {
-        $lex = $this->parser->lex;
-        if ($tagline === true) {
-            // get line number of Tag
-            $line = $lex->taglineno;
-        } elseif (!isset($line)) {
-            // get template source line which has error
-            $line = $lex->line;
-        } else {
-            $line = (int) $line;
-        }
-
-        if (in_array($this->template->source->type, array('eval', 'string'))) {
-            $templateName = $this->template->source->type . ':' . trim(preg_replace('![\t\r\n]+!', ' ',
-                                                                                    strlen($lex->data) > 40 ?
-                                                                                        substr($lex->data, 0, 40) .
-                                                                                        '...' : $lex->data));
-        } else {
-            $templateName = $this->template->source->type . ':' . $this->template->source->filepath;
-        }
-
-        //        $line += $this->trace_line_offset;
-        $match = preg_split("/\n/", $lex->data);
-        $error_text =
-            'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
-            '"  on line ' . ($line + $this->trace_line_offset) . ' "' .
-            trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ])) . '" ';
-        if (isset($args)) {
-            // individual error message
-            $error_text .= $args;
-        } else {
-            $expect = array();
-            // expected token from parser
-            $error_text .= ' - Unexpected "' . $lex->value . '"';
-            if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
-                foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                    $exp_token = $this->parser->yyTokenName[ $token ];
-                    if (isset($lex->smarty_token_names[ $exp_token ])) {
-                        // token type from lexer
-                        $expect[] = '"' . $lex->smarty_token_names[ $exp_token ] . '"';
-                    } else {
-                        // otherwise internal token name
-                        $expect[] = $this->parser->yyTokenName[ $token ];
-                    }
-                }
-                $error_text .= ', expected one of: ' . implode(' , ', $expect);
-            }
-        }
-        $e = new SmartyCompilerException($error_text);
-        $e->line = $line;
-        $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
-        $e->desc = $args;
-        $e->template = $this->template->source->filepath;
-        throw $e;
-    }
-
-    /**
-     * Return var_export() value with all white spaces removed
-     *
-     * @param  mixed $value
-     *
-     * @return string
-     */
-    public function getVarExport($value)
-    {
-        return preg_replace('/\s/', '', var_export($value, true));
-    }
-
-    /**
-     * Check if $value contains variable elements
-     *
-     * @param mixed $value
-     *
-     * @return bool|int
-     */
-    public function isVariable($value)
-    {
-        if (is_string($value)) {
-            return preg_match('/[$(]/', $value);
-        }
-        if (is_bool($value) || is_numeric($value)) {
-            return false;
-        }
-        if (is_array($value)) {
-            foreach ($value as $k => $v) {
-                if ($this->isVariable($k) || $this->isVariable($v)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        return false;
-    }
-
-    /**
-     * Get new prefix variable name
-     *
-     * @return string
-     */
-    public function getNewPrefixVariable()
-    {
-        self::$prefixVariableNumber ++;
-        return $this->getPrefixVariable();
-    }
-
-    /**
-     * Get current prefix variable name
-     *
-     * @return string
-     */
-    public function getPrefixVariable()
-    {
-        return '$_prefixVariable' . self::$prefixVariableNumber;
-    }
-
-    /**
-     * append  code to prefix buffer
-     *
-     * @param string $code
-     */
-    public function appendPrefixCode($code)
-    {
-        $this->prefix_code[] = $code;
-    }
-
-    /**
-     * get prefix code string
-     *
-     * @return string
-     */
-    public function getPrefixCode()
-    {
-        $code = '';
-        $prefixArray = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
-        $this->prefixCodeStack[] = array();
-        foreach ($prefixArray as $c) {
-            $code = $this->appendCode($code, $c);
-        }
-        $this->prefix_code = array();
-        return $code;
-    }
+	/**
+	 * Smarty object
+	 *
+	 * @var Smarty
+	 */
+	public $smarty = null;
+
+	/**
+	 * Parser object
+	 *
+	 * @var Smarty_Internal_Templateparser
+	 */
+	public $parser = null;
+
+	/**
+	 * hash for nocache sections
+	 *
+	 * @var mixed
+	 */
+	public $nocache_hash = null;
+
+	/**
+	 * suppress generation of nocache code
+	 *
+	 * @var bool
+	 */
+	public $suppressNocacheProcessing = false;
+
+	/**
+	 * compile tag objects cache
+	 *
+	 * @var array
+	 */
+	static $_tag_objects = array();
+
+	/**
+	 * tag stack
+	 *
+	 * @var array
+	 */
+	public $_tag_stack = array();
+
+	/**
+	 * current template
+	 *
+	 * @var Smarty_Internal_Template
+	 */
+	public $template = null;
+
+	/**
+	 * merged included sub template data
+	 *
+	 * @var array
+	 */
+	public $mergedSubTemplatesData = array();
+
+	/**
+	 * merged sub template code
+	 *
+	 * @var array
+	 */
+	public $mergedSubTemplatesCode = array();
+
+	/**
+	 * collected template properties during compilation
+	 *
+	 * @var array
+	 */
+	public $templateProperties = array();
+
+	/**
+	 * source line offset for error messages
+	 *
+	 * @var int
+	 */
+	public $trace_line_offset = 0;
+
+	/**
+	 * trace uid
+	 *
+	 * @var string
+	 */
+	public $trace_uid = '';
+
+	/**
+	 * trace file path
+	 *
+	 * @var string
+	 */
+	public $trace_filepath = '';
+
+	/**
+	 * stack for tracing file and line of nested {block} tags
+	 *
+	 * @var array
+	 */
+	public $trace_stack = array();
+
+	/**
+	 * plugins loaded by default plugin handler
+	 *
+	 * @var array
+	 */
+	public $default_handler_plugins = array();
+
+	/**
+	 * saved preprocessed modifier list
+	 *
+	 * @var mixed
+	 */
+	public $default_modifier_list = null;
+
+	/**
+	 * force compilation of complete template as nocache
+	 *
+	 * @var boolean
+	 */
+	public $forceNocache = false;
+
+	/**
+	 * flag if compiled template file shall we written
+	 *
+	 * @var bool
+	 */
+	public $write_compiled_code = true;
+
+	/**
+	 * Template functions
+	 *
+	 * @var array
+	 */
+	public $tpl_function = array();
+
+	/**
+	 * called sub functions from template function
+	 *
+	 * @var array
+	 */
+	public $called_functions = array();
+
+	/**
+	 * compiled template or block function code
+	 *
+	 * @var string
+	 */
+	public $blockOrFunctionCode = '';
+
+	/**
+	 * php_handling setting either from Smarty or security
+	 *
+	 * @var int
+	 */
+	public $php_handling = 0;
+
+	/**
+	 * flags for used modifier plugins
+	 *
+	 * @var array
+	 */
+	public $modifier_plugins = array();
+
+	/**
+	 * type of already compiled modifier
+	 *
+	 * @var array
+	 */
+	public $known_modifier_type = array();
+
+	/**
+	 * parent compiler object for merged subtemplates and template functions
+	 *
+	 * @var Smarty_Internal_TemplateCompilerBase
+	 */
+	public $parent_compiler = null;
+
+	/**
+	 * Flag true when compiling nocache section
+	 *
+	 * @var bool
+	 */
+	public $nocache = false;
+
+	/**
+	 * Flag true when tag is compiled as nocache
+	 *
+	 * @var bool
+	 */
+	public $tag_nocache = false;
+
+	/**
+	 * Compiled tag prefix code
+	 *
+	 * @var array
+	 */
+	public $prefix_code = array();
+
+	/**
+	 * Prefix code  stack
+	 *
+	 * @var array
+	 */
+	public $prefixCodeStack = array();
+
+	/**
+	 * Tag has compiled code
+	 *
+	 * @var bool
+	 */
+	public $has_code = false;
+
+	/**
+	 * A variable string was compiled
+	 *
+	 * @var bool
+	 */
+	public $has_variable_string = false;
+
+	/**
+	 * Tag creates output
+	 *
+	 * @var bool
+	 */
+	public $has_output = false;
+
+	/**
+	 * Stack for {setfilter} {/setfilter}
+	 *
+	 * @var array
+	 */
+	public $variable_filter_stack = array();
+
+	/**
+	 * variable filters for {setfilter} {/setfilter}
+	 *
+	 * @var array
+	 */
+	public $variable_filters = array();
+
+	/**
+	 * Nesting count of looping tags like {foreach}, {for}, {section}, {while}
+	 *
+	 * @var int
+	 */
+	public $loopNesting = 0;
+
+	/**
+	 * Strip preg pattern
+	 *
+	 * @var string
+	 */
+	public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
+
+	/**
+	 * plugin search order
+	 *
+	 * @var array
+	 */
+	public $plugin_search_order = array('function', 'block', 'compiler', 'class');
+
+	/**
+	 * General storage area for tag compiler plugins
+	 *
+	 * @var array
+	 */
+	public $_cache = array();
+
+	/**
+	 * counter for prefix variable number
+	 *
+	 * @var int
+	 */
+	public static $prefixVariableNumber = 0;
+
+	/**
+	 * method to compile a Smarty template
+	 *
+	 * @param mixed $_content template source
+	 * @param bool  $isTemplateSource
+	 *
+	 * @return bool true if compiling succeeded, false if it failed
+	 */
+	abstract protected function doCompile($_content, $isTemplateSource = false);
+
+	/**
+	 * Initialize compiler
+	 *
+	 * @param Smarty $smarty global instance
+	 */
+	public function __construct(Smarty $smarty)
+	{
+		$this->smarty = $smarty;
+		$this->nocache_hash = str_replace(array('.', ','), '_', uniqid(rand(), true));
+	}
+
+	/**
+	 * Method to compile a Smarty template
+	 *
+	 * @param  Smarty_Internal_Template                 $template template object to compile
+	 * @param  bool                                     $nocache  true is shall be compiled in nocache mode
+	 * @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
+	 *
+	 * @return bool true if compiling succeeded, false if it failed
+	 * @throws \Exception
+	 */
+	public function compileTemplate(Smarty_Internal_Template $template, $nocache = null,
+									Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
+	{
+		// get code frame of compiled template
+		$_compiled_code = $template->smarty->ext->_codeFrame->create($template,
+																	 $this->compileTemplateSource($template, $nocache,
+																								  $parent_compiler),
+																	 $this->postFilter($this->blockOrFunctionCode) .
+																	 join('', $this->mergedSubTemplatesCode), false,
+																	 $this);
+		return $_compiled_code;
+	}
+
+	/**
+	 * Compile template source and run optional post filter
+	 *
+	 * @param \Smarty_Internal_Template             $template
+	 * @param null|bool                             $nocache flag if template must be compiled in nocache mode
+	 * @param \Smarty_Internal_TemplateCompilerBase $parent_compiler
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	public function compileTemplateSource(Smarty_Internal_Template $template, $nocache = null,
+										  Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
+	{
+		try {
+			// save template object in compiler class
+			$this->template = $template;
+			if (property_exists($this->template->smarty, 'plugin_search_order')) {
+				$this->plugin_search_order = $this->template->smarty->plugin_search_order;
+			}
+			if ($this->smarty->debugging) {
+				if (!isset($this->smarty->_debug)) {
+					$this->smarty->_debug = new Smarty_Internal_Debug();
+				}
+				$this->smarty->_debug->start_compile($this->template);
+			}
+			if (isset($this->template->smarty->security_policy)) {
+				$this->php_handling = $this->template->smarty->security_policy->php_handling;
+			} else {
+				$this->php_handling = $this->template->smarty->php_handling;
+			}
+			$this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
+			$nocache = isset($nocache) ? $nocache : false;
+			if (empty($template->compiled->nocache_hash)) {
+				$template->compiled->nocache_hash = $this->nocache_hash;
+			} else {
+				$this->nocache_hash = $template->compiled->nocache_hash;
+			}
+			// flag for nocache sections
+			$this->nocache = $nocache;
+			$this->tag_nocache = false;
+			// reset has nocache code flag
+			$this->template->compiled->has_nocache_code = false;
+			$this->has_variable_string = false;
+			$this->prefix_code = array();
+			// add file dependency
+			if ($this->smarty->merge_compiled_includes || $this->template->source->handler->checkTimestamps()) {
+				$this->parent_compiler->template->compiled->file_dependency[ $this->template->source->uid ] =
+					array($this->template->source->filepath, $this->template->source->getTimeStamp(),
+						  $this->template->source->type,);
+			}
+			$this->smarty->_current_file = $this->template->source->filepath;
+			// get template source
+			if (!empty($this->template->source->components)) {
+				// we have array of inheritance templates by extends: resource
+				// generate corresponding source code sequence
+				$_content =
+					Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template->source->components);
+			} else {
+				// get template source
+				$_content = $this->template->source->getContent();
+			}
+			$_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true));
+		}
+		catch (Exception $e) {
+			if ($this->smarty->debugging) {
+				$this->smarty->_debug->end_compile($this->template);
+			}
+			$this->_tag_stack = array();
+			// free memory
+			$this->parent_compiler = null;
+			$this->template = null;
+			$this->parser = null;
+			throw $e;
+		}
+		if ($this->smarty->debugging) {
+			$this->smarty->_debug->end_compile($this->template);
+		}
+		$this->parent_compiler = null;
+		$this->parser = null;
+		return $_compiled_code;
+	}
+
+	/**
+	 * Optionally process compiled code by post filter
+	 *
+	 * @param string $code compiled code
+	 *
+	 * @return string
+	 * @throws \SmartyException
+	 */
+	public function postFilter($code)
+	{
+		// run post filter if on code
+		if (!empty($code) &&
+			(isset($this->smarty->autoload_filters[ 'post' ]) || isset($this->smarty->registered_filters[ 'post' ]))
+		) {
+			return $this->smarty->ext->_filterHandler->runFilter('post', $code, $this->template);
+		} else {
+			return $code;
+		}
+	}
+
+	/**
+	 * Run optional prefilter
+	 *
+	 * @param string $_content template source
+	 *
+	 * @return string
+	 * @throws \SmartyException
+	 */
+	public function preFilter($_content)
+	{
+		// run pre filter if required
+		if ($_content != '' &&
+			((isset($this->smarty->autoload_filters[ 'pre' ]) || isset($this->smarty->registered_filters[ 'pre' ])))
+		) {
+			return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template);
+		} else {
+			return $_content;
+		}
+	}
+
+	/**
+	 * Compile Tag
+	 * This is a call back from the lexer/parser
+	 *
+	 * Save current prefix code
+	 * Compile tag
+	 * Merge tag prefix code with saved one
+	 * (required nested tags in attributes)
+	 *
+	 * @param  string $tag       tag name
+	 * @param  array  $args      array with tag attributes
+	 * @param  array  $parameter array with compilation parameter
+	 *
+	 * @throws SmartyCompilerException
+	 * @throws SmartyException
+	 * @return string compiled code
+	 */
+	public function compileTag($tag, $args, $parameter = array())
+	{
+		$this->prefixCodeStack[] = $this->prefix_code;
+		$this->prefix_code = array();
+		$result = $this->compileTag2($tag, $args, $parameter);
+		$this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+		return $result;
+	}
+
+	/**
+	 * Compile Tag
+	 *
+	 * @param  string $tag       tag name
+	 * @param  array  $args      array with tag attributes
+	 * @param  array  $parameter array with compilation parameter
+	 *
+	 * @throws SmartyCompilerException
+	 * @throws SmartyException
+	 * @return string compiled code
+	 */
+	private function compileTag2($tag, $args, $parameter)
+	{
+		$plugin_type = '';
+		// $args contains the attributes parsed and compiled by the lexer/parser
+		// assume that tag does compile into code, but creates no HTML output
+		$this->has_code = true;
+		$this->has_output = false;
+		// log tag/attributes
+		if (isset($this->smarty->_cache[ 'get_used_tags' ])) {
+			$this->template->_cache[ 'used_tags' ][] = array($tag, $args);
+		}
+		// check nocache option flag
+		foreach ($args as $arg) {
+			if (!is_array($arg)) {
+				if ($arg == "'nocache'") {
+					$this->tag_nocache = true;
+				}
+			} else {
+				foreach ($arg as $k => $v) {
+					if ($k == "'nocache'" && (trim($v, "'\" ") == 'true')) {
+						$this->tag_nocache = true;
+					}
+				}
+			}
+		}
+		// compile the smarty tag (required compile classes to compile the tag are auto loaded)
+		if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
+			if (isset($this->parent_compiler->tpl_function[ $tag ])) {
+				// template defined by {template} tag
+				$args[ '_attr' ][ 'name' ] = "'" . $tag . "'";
+				$_output = $this->callTagCompiler('call', $args, $parameter);
+			}
+		}
+		if ($_output !== false) {
+			if ($_output !== true) {
+				// did we get compiled code
+				if ($this->has_code) {
+					// Does it create output?
+					if ($this->has_output) {
+						$_output .= "\n";
+					}
+					// return compiled code
+					return $_output;
+				}
+			}
+			// tag did not produce compiled code
+			return null;
+		} else {
+			// map_named attributes
+			if (isset($args[ '_attr' ])) {
+				foreach ($args[ '_attr' ] as $key => $attribute) {
+					if (is_array($attribute)) {
+						$args = array_merge($args, $attribute);
+					}
+				}
+			}
+			// not an internal compiler tag
+			if (strlen($tag) < 6 || substr($tag, - 5) != 'close') {
+				// check if tag is a registered object
+				if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) {
+					$method = $parameter[ 'object_method' ];
+					if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ]) &&
+						(empty($this->smarty->registered_objects[ $tag ][ 1 ]) ||
+						 in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ]))
+					) {
+						return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
+					} elseif (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) {
+						return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
+													  $method);
+					} else {
+						// throw exception
+						$this->trigger_template_error('not allowed method "' . $method . '" in registered object "' .
+													  $tag . '"', null, true);
+					}
+				}
+				// check if tag is registered
+				foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK,) as $plugin_type)
+				{
+					if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) {
+						// if compiler function plugin call it now
+						if ($plugin_type == Smarty::PLUGIN_COMPILER) {
+							$new_args = array();
+							foreach ($args as $key => $mixed) {
+								if (is_array($mixed)) {
+									$new_args = array_merge($new_args, $mixed);
+								} else {
+									$new_args[ $key ] = $mixed;
+								}
+							}
+							if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) {
+								$this->tag_nocache = true;
+							}
+							return call_user_func_array($this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ],
+														array($new_args, $this));
+						}
+						// compile registered function or block function
+						if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) {
+							return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
+														  $tag);
+						}
+					}
+				}
+				// check plugins from plugins folder
+				foreach ($this->plugin_search_order as $plugin_type) {
+					if ($plugin_type == Smarty::PLUGIN_COMPILER &&
+						$this->smarty->loadPlugin('smarty_compiler_' . $tag) &&
+						(!isset($this->smarty->security_policy) ||
+						 $this->smarty->security_policy->isTrustedTag($tag, $this))
+					) {
+						$plugin = 'smarty_compiler_' . $tag;
+						if (is_callable($plugin)) {
+							// convert arguments format for old compiler plugins
+							$new_args = array();
+							foreach ($args as $key => $mixed) {
+								if (is_array($mixed)) {
+									$new_args = array_merge($new_args, $mixed);
+								} else {
+									$new_args[ $key ] = $mixed;
+								}
+							}
+
+							return $plugin($new_args, $this->smarty);
+						}
+						if (class_exists($plugin, false)) {
+							$plugin_object = new $plugin;
+							if (method_exists($plugin_object, 'compile')) {
+								return $plugin_object->compile($args, $this);
+							}
+						}
+						throw new SmartyException("Plugin \"{$tag}\" not callable");
+					} else {
+						if ($function = $this->getPlugin($tag, $plugin_type)) {
+							if (!isset($this->smarty->security_policy) ||
+								$this->smarty->security_policy->isTrustedTag($tag, $this)
+							) {
+								return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter,
+															  $tag, $function);
+							}
+						}
+					}
+				}
+				if (is_callable($this->smarty->default_plugin_handler_func)) {
+					$found = false;
+					// look for already resolved tags
+					foreach ($this->plugin_search_order as $plugin_type) {
+						if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) {
+							$found = true;
+							break;
+						}
+					}
+					if (!$found) {
+						// call default handler
+						foreach ($this->plugin_search_order as $plugin_type) {
+							if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
+								$found = true;
+								break;
+							}
+						}
+					}
+					if ($found) {
+						// if compiler function plugin call it now
+						if ($plugin_type == Smarty::PLUGIN_COMPILER) {
+							$new_args = array();
+							foreach ($args as $mixed) {
+								$new_args = array_merge($new_args, $mixed);
+							}
+							return call_user_func_array($this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ],
+														array($new_args, $this));
+						} else {
+							return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
+														  $tag);
+						}
+					}
+				}
+			} else {
+				// compile closing tag of block function
+				$base_tag = substr($tag, 0, - 5);
+				// check if closing tag is a registered object
+				if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) {
+					$method = $parameter[ 'object_method' ];
+					if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) {
+						return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
+													  $method);
+					} else {
+						// throw exception
+						$this->trigger_template_error('not allowed closing tag method "' . $method .
+													  '" in registered object "' . $base_tag . '"', null, true);
+					}
+				}
+				// registered block tag ?
+				if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ]) ||
+					isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
+				) {
+					return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
+				}
+				// registered function tag ?
+				if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
+					return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
+				}
+				// block plugin?
+				if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
+					return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
+				}
+				// function plugin?
+				if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) {
+					if (!isset($this->smarty->security_policy) ||
+						$this->smarty->security_policy->isTrustedTag($tag, $this)
+					) {
+						return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function);
+					}
+				}
+				// registered compiler plugin ?
+				if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) {
+					// if compiler function plugin call it now
+					$args = array();
+					if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) {
+						$this->tag_nocache = true;
+					}
+					return call_user_func_array($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ],
+												array($args, $this));
+				}
+				if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
+					$plugin = 'smarty_compiler_' . $tag;
+					if (is_callable($plugin)) {
+						return $plugin($args, $this->smarty);
+					}
+					if (class_exists($plugin, false)) {
+						$plugin_object = new $plugin;
+						if (method_exists($plugin_object, 'compile')) {
+							return $plugin_object->compile($args, $this);
+						}
+					}
+					throw new SmartyException("Plugin \"{$tag}\" not callable");
+				}
+			}
+			$this->trigger_template_error("unknown tag \"" . $tag . "\"", null, true);
+		}
+	}
+
+	/**
+	 * compile variable
+	 *
+	 * @param string $variable
+	 *
+	 * @return string
+	 */
+	public function compileVariable($variable)
+	{
+		if (strpos($variable, '(') == 0) {
+			// not a variable variable
+			$var = trim($variable, '\'');
+			$this->tag_nocache = $this->tag_nocache |
+								 $this->template->ext->getTemplateVars->_getVariable($this->template, $var, null, true,
+																					 false)->nocache;
+			// todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache;
+		}
+		return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
+	}
+
+	/**
+	 * compile config variable
+	 *
+	 * @param string $variable
+	 *
+	 * @return string
+	 */
+	public function compileConfigVariable($variable)
+	{
+		// return '$_smarty_tpl->config_vars[' . $variable . ']';
+		return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')';
+	}
+
+	/**
+	 * This method is called from parser to process a text content section
+	 * - remove text from inheritance child templates as they may generate output
+	 * - strip text if strip is enabled
+	 *
+	 * @param string $text
+	 *
+	 * @return null|\Smarty_Internal_ParseTree_Text
+	 */
+	public function processText($text)
+	{
+		if ((string) $text != '') {
+			$store = array();
+			$_store = 0;
+			if ($this->parser->strip) {
+				if (strpos($text, '<') !== false) {
+					// capture html elements not to be messed with
+					$_offset = 0;
+					if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+									   $text, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+						foreach ($matches as $match) {
+							$store[] = $match[ 0 ][ 0 ];
+							$_length = strlen($match[ 0 ][ 0 ]);
+							$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+							$text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+
+							$_offset += $_length - strlen($replace);
+							$_store ++;
+						}
+					}
+					$expressions = array(// replace multiple spaces between tags by a single space
+										 '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s' => '\1 \2',
+										 // remove newline between tags
+										 '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s' => '\1\2',
+										 // remove multiple spaces between attributes (but not in attribute values!)
+										 '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+										 '#>[\040\011]+$#Ss' => '> ', '#>[\040\011]*[\n]\s*$#Ss' => '>',
+										 $this->stripRegEx => '',);
+
+					$text = preg_replace(array_keys($expressions), array_values($expressions), $text);
+					$_offset = 0;
+					if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $text, $matches,
+									   PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+						foreach ($matches as $match) {
+							$_length = strlen($match[ 0 ][ 0 ]);
+							$replace = $store[ $match[ 1 ][ 0 ] ];
+							$text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+
+							$_offset += strlen($replace) - $_length;
+							$_store ++;
+						}
+					}
+				} else {
+					$text = preg_replace($this->stripRegEx, '', $text);
+				}
+			}
+			return new Smarty_Internal_ParseTree_Text($text);
+		}
+		return null;
+	}
+
+	/**
+	 * lazy loads internal compile plugin for tag and calls the compile method
+	 * compile objects cached for reuse.
+	 * class name format:  Smarty_Internal_Compile_TagName
+	 * plugin filename format: Smarty_Internal_TagName.php
+	 *
+	 * @param  string $tag    tag name
+	 * @param  array  $args   list of tag attributes
+	 * @param  mixed  $param1 optional parameter
+	 * @param  mixed  $param2 optional parameter
+	 * @param  mixed  $param3 optional parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
+	{
+		// re-use object if already exists
+		if (!isset(self::$_tag_objects[ $tag ])) {
+			// lazy load internal compiler plugin
+			$_tag = explode('_', $tag);
+			$_tag = array_map('ucfirst', $_tag);
+			$class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
+			if (class_exists($class_name) &&
+				(!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
+			) {
+				self::$_tag_objects[ $tag ] = new $class_name;
+			} else {
+				self::$_tag_objects[ $tag ] = false;
+				return false;
+			}
+		}
+		// compile this tag
+		return self::$_tag_objects[ $tag ] === false ? false :
+			self::$_tag_objects[ $tag ]->compile($args, $this, $param1, $param2, $param3);
+	}
+
+	/**
+	 * Check for plugins and return function name
+	 *
+	 * @param         $plugin_name
+	 * @param  string $plugin_type type of plugin
+	 *
+	 * @return string call name of function
+	 */
+	public function getPlugin($plugin_name, $plugin_type)
+	{
+		$function = null;
+		if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
+			if (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+				$function =
+					$this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+			} elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+				$this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] =
+					$this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ];
+				$function =
+					$this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+			}
+		} else {
+			if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+				$function =
+					$this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+			} elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+				$this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] =
+					$this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ];
+				$function =
+					$this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+			}
+		}
+		if (isset($function)) {
+			if ($plugin_type == 'modifier') {
+				$this->modifier_plugins[ $plugin_name ] = true;
+			}
+
+			return $function;
+		}
+		// loop through plugin dirs and find the plugin
+		$function = 'smarty_' . $plugin_type . '_' . $plugin_name;
+		$file = $this->smarty->loadPlugin($function, false);
+
+		if (is_string($file)) {
+			if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
+				$this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+					$file;
+				$this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+					$function;
+			} else {
+				$this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+					$file;
+				$this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+					$function;
+			}
+			if ($plugin_type == 'modifier') {
+				$this->modifier_plugins[ $plugin_name ] = true;
+			}
+
+			return $function;
+		}
+		if (is_callable($function)) {
+			// plugin function is defined in the script
+			return $function;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check for plugins by default plugin handler
+	 *
+	 * @param  string $tag         name of tag
+	 * @param  string $plugin_type type of plugin
+	 *
+	 * @return boolean true if found
+	 */
+	public function getPluginFromDefaultHandler($tag, $plugin_type)
+	{
+		$callback = null;
+		$script = null;
+		$cacheable = true;
+		$result = call_user_func_array($this->smarty->default_plugin_handler_func,
+									   array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable,));
+		if ($result) {
+			$this->tag_nocache = $this->tag_nocache || !$cacheable;
+			if ($script !== null) {
+				if (is_file($script)) {
+					if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
+						$this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] =
+							$script;
+						$this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] =
+							$callback;
+					} else {
+						$this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] =
+							$script;
+						$this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] =
+							$callback;
+					}
+					require_once $script;
+				} else {
+					$this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
+				}
+			}
+			if (is_callable($callback)) {
+				$this->default_handler_plugins[ $plugin_type ][ $tag ] = array($callback, true, array());
+
+				return true;
+			} else {
+				$this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable");
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Append code segments and remove unneeded ?> <?php transitions
+	 *
+	 * @param string $left
+	 * @param string $right
+	 *
+	 * @return string
+	 */
+	public function appendCode($left, $right)
+	{
+		if (preg_match('/\s*\?>\s*$/', $left) && preg_match('/^\s*<\?php\s+/', $right)) {
+			$left = preg_replace('/\s*\?>\s*$/', "\n", $left);
+			$left .= preg_replace('/^\s*<\?php\s+/', '', $right);
+		} else {
+			$left .= $right;
+		}
+		return $left;
+	}
+
+	/**
+	 * Inject inline code for nocache template sections
+	 * This method gets the content of each template element from the parser.
+	 * If the content is compiled code and it should be not cached the code is injected
+	 * into the rendered output.
+	 *
+	 * @param  string  $content content of template element
+	 * @param  boolean $is_code true if content is compiled code
+	 *
+	 * @return string  content
+	 */
+	public function processNocacheCode($content, $is_code)
+	{
+		// If the template is not evaluated and we have a nocache section and or a nocache tag
+		if ($is_code && !empty($content)) {
+			// generate replacement code
+			if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->template->caching &&
+				!$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
+			) {
+				$this->template->compiled->has_nocache_code = true;
+				$_output = addcslashes($content, '\'\\');
+				$_output = str_replace("^#^", "'", $_output);
+				$_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output .
+						   "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
+				// make sure we include modifier plugins for nocache code
+				foreach ($this->modifier_plugins as $plugin_name => $dummy) {
+					if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) {
+						$this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] =
+							$this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ];
+					}
+				}
+			} else {
+				$_output = $content;
+			}
+		} else {
+			$_output = $content;
+		}
+		$this->modifier_plugins = array();
+		$this->suppressNocacheProcessing = false;
+		$this->tag_nocache = false;
+
+		return $_output;
+	}
+
+	/**
+	 * Get Id
+	 *
+	 * @param string $input
+	 *
+	 * @return bool|string
+	 */
+	public function getId($input)
+	{
+		if (preg_match('~^([\'"]*)([0-9]*[a-zA-Z_]\w*)\1$~', $input, $match)) {
+			return $match[ 2 ];
+		}
+		return false;
+	}
+
+	/**
+	 * Get variable name from string
+	 *
+	 * @param string $input
+	 *
+	 * @return bool|string
+	 */
+	public function getVariableName($input)
+	{
+		if (preg_match('~^[$]_smarty_tpl->tpl_vars\[[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]->value$~', $input, $match)) {
+			return $match[ 1 ];
+		}
+		return false;
+	}
+
+	/**
+	 * Set nocache flag in variable or create new variable
+	 *
+	 * @param string $varName
+	 */
+	public function setNocacheInVariable($varName)
+	{
+		// create nocache var to make it know for further compiling
+		if ($_var = $this->getId($varName)) {
+			if (isset($this->template->tpl_vars[ $_var ])) {
+				$this->template->tpl_vars[ $_var ] = clone $this->template->tpl_vars[ $_var ];
+				$this->template->tpl_vars[ $_var ]->nocache = true;
+			} else {
+				$this->template->tpl_vars[ $_var ] = new Smarty_Variable(null, true);
+			}
+		}
+	}
+
+	/**
+	 * @param array $_attr tag attributes
+	 * @param array $validScopes
+	 *
+	 * @return int|string
+	 * @throws \SmartyCompilerException
+	 */
+	public function convertScope($_attr, $validScopes)
+	{
+		$_scope = 0;
+		if (isset($_attr[ 'scope' ])) {
+			$_scopeName = trim($_attr[ 'scope' ], "'\"");
+			if (is_numeric($_scopeName) && in_array($_scopeName, $validScopes)) {
+				$_scope = $_scopeName;
+			} elseif (is_string($_scopeName)) {
+				$_scopeName = trim($_scopeName, "'\"");
+				$_scope = isset($validScopes[ $_scopeName ]) ? $validScopes[ $_scopeName ] : false;
+			} else {
+				$_scope = false;
+			}
+			if ($_scope === false) {
+				$err = var_export($_scopeName, true);
+				$this->trigger_template_error("illegal value '{$err}' for \"scope\" attribute", null, true);
+			}
+		}
+		return $_scope;
+	}
+
+	/**
+	 * Generate nocache code string
+	 *
+	 * @param string $code PHP code
+	 *
+	 * @return string
+	 */
+	public function makeNocacheCode($code)
+	{
+		return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/<?php " .
+			   str_replace("^#^", "'", addcslashes($code, '\'\\')) .
+			   "?>/*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n";
+	}
+
+	/**
+	 * display compiler error messages without dying
+	 * If parameter $args is empty it is a parser detected syntax error.
+	 * In this case the parser is called to obtain information about expected tokens.
+	 * If parameter $args contains a string this is used as error message
+	 *
+	 * @param  string   $args    individual error message or null
+	 * @param  string   $line    line-number
+	 * @param null|bool $tagline if true the line number of last tag
+	 *
+	 * @throws \SmartyCompilerException when an unexpected token is found
+	 */
+	public function trigger_template_error($args = null, $line = null, $tagline = null)
+	{
+		$lex = $this->parser->lex;
+		if ($tagline === true) {
+			// get line number of Tag
+			$line = $lex->taglineno;
+		} elseif (!isset($line)) {
+			// get template source line which has error
+			$line = $lex->line;
+		} else {
+			$line = (int) $line;
+		}
+
+		if (in_array($this->template->source->type, array('eval', 'string'))) {
+			$templateName = $this->template->source->type . ':' . trim(preg_replace('![\t\r\n]+!', ' ',
+																					strlen($lex->data) > 40 ?
+																						substr($lex->data, 0, 40) .
+																						'...' : $lex->data));
+		} else {
+			$templateName = $this->template->source->type . ':' . $this->template->source->filepath;
+		}
+
+		//        $line += $this->trace_line_offset;
+		$match = preg_split("/\n/", $lex->data);
+		$error_text =
+			'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
+			'"  on line ' . ($line + $this->trace_line_offset) . ' "' .
+			trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ])) . '" ';
+		if (isset($args)) {
+			// individual error message
+			$error_text .= $args;
+		} else {
+			$expect = array();
+			// expected token from parser
+			$error_text .= ' - Unexpected "' . $lex->value . '"';
+			if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
+				foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+					$exp_token = $this->parser->yyTokenName[ $token ];
+					if (isset($lex->smarty_token_names[ $exp_token ])) {
+						// token type from lexer
+						$expect[] = '"' . $lex->smarty_token_names[ $exp_token ] . '"';
+					} else {
+						// otherwise internal token name
+						$expect[] = $this->parser->yyTokenName[ $token ];
+					}
+				}
+				$error_text .= ', expected one of: ' . implode(' , ', $expect);
+			}
+		}
+		$e = new SmartyCompilerException($error_text);
+		$e->line = $line;
+		$e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
+		$e->desc = $args;
+		$e->template = $this->template->source->filepath;
+		throw $e;
+	}
+
+	/**
+	 * Return var_export() value with all white spaces removed
+	 *
+	 * @param  mixed $value
+	 *
+	 * @return string
+	 */
+	public function getVarExport($value)
+	{
+		return preg_replace('/\s/', '', var_export($value, true));
+	}
+
+	/**
+	 * Check if $value contains variable elements
+	 *
+	 * @param mixed $value
+	 *
+	 * @return bool|int
+	 */
+	public function isVariable($value)
+	{
+		if (is_string($value)) {
+			return preg_match('/[$(]/', $value);
+		}
+		if (is_bool($value) || is_numeric($value)) {
+			return false;
+		}
+		if (is_array($value)) {
+			foreach ($value as $k => $v) {
+				if ($this->isVariable($k) || $this->isVariable($v)) {
+					return true;
+				}
+			}
+			return false;
+		}
+		return false;
+	}
+
+	/**
+	 * Get new prefix variable name
+	 *
+	 * @return string
+	 */
+	public function getNewPrefixVariable()
+	{
+		self::$prefixVariableNumber ++;
+		return $this->getPrefixVariable();
+	}
+
+	/**
+	 * Get current prefix variable name
+	 *
+	 * @return string
+	 */
+	public function getPrefixVariable()
+	{
+		return '$_prefixVariable' . self::$prefixVariableNumber;
+	}
+
+	/**
+	 * append  code to prefix buffer
+	 *
+	 * @param string $code
+	 */
+	public function appendPrefixCode($code)
+	{
+		$this->prefix_code[] = $code;
+	}
+
+	/**
+	 * get prefix code string
+	 *
+	 * @return string
+	 */
+	public function getPrefixCode()
+	{
+		$code = '';
+		$prefixArray = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+		$this->prefixCodeStack[] = array();
+		foreach ($prefixArray as $c) {
+			$code = $this->appendCode($code, $c);
+		}
+		$this->prefix_code = array();
+		return $code;
+	}
 
 }

Spacing +85 added lines, -86 removed lines

@@ -386,7 +386,7 @@ 
             $this->prefix_code = array();
             // add file dependency
             if ($this->smarty->merge_compiled_includes || $this->template->source->handler->checkTimestamps()) {
-                $this->parent_compiler->template->compiled->file_dependency[ $this->template->source->uid ] =
+                $this->parent_compiler->template->compiled->file_dependency[$this->template->source->uid] =
                     array($this->template->source->filepath, $this->template->source->getTimeStamp(),
                           $this->template->source->type,);
             }
@@ -434,7 +434,7 @@ 
     {
         // run post filter if on code
         if (!empty($code) &&
-            (isset($this->smarty->autoload_filters[ 'post' ]) || isset($this->smarty->registered_filters[ 'post' ]))
+            (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post']))
         ) {
             return $this->smarty->ext->_filterHandler->runFilter('post', $code, $this->template);
         } else {
@@ -454,7 +454,7 @@ 
     {
         // run pre filter if required
         if ($_content != '' &&
-            ((isset($this->smarty->autoload_filters[ 'pre' ]) || isset($this->smarty->registered_filters[ 'pre' ])))
+            ((isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])))
         ) {
             return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template);
         } else {
@@ -507,8 +507,8 @@ 
         $this->has_code = true;
         $this->has_output = false;
         // log tag/attributes
-        if (isset($this->smarty->_cache[ 'get_used_tags' ])) {
-            $this->template->_cache[ 'used_tags' ][] = array($tag, $args);
+        if (isset($this->smarty->_cache['get_used_tags'])) {
+            $this->template->_cache['used_tags'][] = array($tag, $args);
         }
         // check nocache option flag
         foreach ($args as $arg) {
@@ -526,9 +526,9 @@ 
         }
         // compile the smarty tag (required compile classes to compile the tag are auto loaded)
         if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
-            if (isset($this->parent_compiler->tpl_function[ $tag ])) {
+            if (isset($this->parent_compiler->tpl_function[$tag])) {
                 // template defined by {template} tag
-                $args[ '_attr' ][ 'name' ] = "'" . $tag . "'";
+                $args['_attr']['name'] = "'" . $tag . "'";
                 $_output = $this->callTagCompiler('call', $args, $parameter);
             }
         }
@@ -548,8 +548,8 @@ 
             return null;
         } else {
             // map_named attributes
-            if (isset($args[ '_attr' ])) {
-                foreach ($args[ '_attr' ] as $key => $attribute) {
+            if (isset($args['_attr'])) {
+                foreach ($args['_attr'] as $key => $attribute) {
                     if (is_array($attribute)) {
                         $args = array_merge($args, $attribute);
                     }
@@ -558,14 +558,14 @@ 
             // not an internal compiler tag
             if (strlen($tag) < 6 || substr($tag, - 5) != 'close') {
                 // check if tag is a registered object
-                if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) {
-                    $method = $parameter[ 'object_method' ];
-                    if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ]) &&
-                        (empty($this->smarty->registered_objects[ $tag ][ 1 ]) ||
-                         in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ]))
+                if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_method'])) {
+                    $method = $parameter['object_method'];
+                    if (!in_array($method, $this->smarty->registered_objects[$tag][3]) &&
+                        (empty($this->smarty->registered_objects[$tag][1]) ||
+                         in_array($method, $this->smarty->registered_objects[$tag][1]))
                     ) {
                         return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
-                    } elseif (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) {
+                    } elseif (in_array($method, $this->smarty->registered_objects[$tag][3])) {
                         return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
                                                       $method);
                     } else {
@@ -577,7 +577,7 @@ 
                 // check if tag is registered
                 foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK,) as $plugin_type)
                 {
-                    if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) {
+                    if (isset($this->smarty->registered_plugins[$plugin_type][$tag])) {
                         // if compiler function plugin call it now
                         if ($plugin_type == Smarty::PLUGIN_COMPILER) {
                             $new_args = array();
@@ -585,13 +585,13 @@ 
                                 if (is_array($mixed)) {
                                     $new_args = array_merge($new_args, $mixed);
                                 } else {
-                                    $new_args[ $key ] = $mixed;
+                                    $new_args[$key] = $mixed;
                                 }
                             }
-                            if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) {
+                            if (!$this->smarty->registered_plugins[$plugin_type][$tag][1]) {
                                 $this->tag_nocache = true;
                             }
-                            return call_user_func_array($this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ],
+                            return call_user_func_array($this->smarty->registered_plugins[$plugin_type][$tag][0],
                                                         array($new_args, $this));
                         }
                         // compile registered function or block function
@@ -616,7 +616,7 @@ 
                                 if (is_array($mixed)) {
                                     $new_args = array_merge($new_args, $mixed);
                                 } else {
-                                    $new_args[ $key ] = $mixed;
+                                    $new_args[$key] = $mixed;
                                 }
                             }
 
@@ -644,7 +644,7 @@ 
                     $found = false;
                     // look for already resolved tags
                     foreach ($this->plugin_search_order as $plugin_type) {
-                        if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) {
+                        if (isset($this->default_handler_plugins[$plugin_type][$tag])) {
                             $found = true;
                             break;
                         }
@@ -665,7 +665,7 @@ 
                             foreach ($args as $mixed) {
                                 $new_args = array_merge($new_args, $mixed);
                             }
-                            return call_user_func_array($this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ],
+                            return call_user_func_array($this->default_handler_plugins[$plugin_type][$tag][0],
                                                         array($new_args, $this));
                         } else {
                             return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
@@ -677,9 +677,9 @@ 
                 // compile closing tag of block function
                 $base_tag = substr($tag, 0, - 5);
                 // check if closing tag is a registered object
-                if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) {
-                    $method = $parameter[ 'object_method' ];
-                    if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) {
+                if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_method'])) {
+                    $method = $parameter['object_method'];
+                    if (in_array($method, $this->smarty->registered_objects[$base_tag][3])) {
                         return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
                                                       $method);
                     } else {
@@ -689,13 +689,13 @@ 
                     }
                 }
                 // registered block tag ?
-                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ]) ||
-                    isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
+                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) ||
+                    isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])
                 ) {
                     return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
                 }
                 // registered function tag ?
-                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
+                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
                     return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
                 }
                 // block plugin?
@@ -711,13 +711,13 @@ 
                     }
                 }
                 // registered compiler plugin ?
-                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) {
+                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag])) {
                     // if compiler function plugin call it now
                     $args = array();
-                    if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) {
+                    if (!$this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][1]) {
                         $this->tag_nocache = true;
                     }
-                    return call_user_func_array($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ],
+                    return call_user_func_array($this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0],
                                                 array($args, $this));
                 }
                 if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
@@ -792,13 +792,13 @@ 
                     if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
                                        $text, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
                         foreach ($matches as $match) {
-                            $store[] = $match[ 0 ][ 0 ];
-                            $_length = strlen($match[ 0 ][ 0 ]);
+                            $store[] = $match[0][0];
+                            $_length = strlen($match[0][0]);
                             $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-                            $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+                            $text = substr_replace($text, $replace, $match[0][1] - $_offset, $_length);
 
                             $_offset += $_length - strlen($replace);
-                            $_store ++;
+                            $_store++;
                         }
                     }
                     $expressions = array(// replace multiple spaces between tags by a single space
@@ -815,12 +815,12 @@ 
                     if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $text, $matches,
                                        PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
                         foreach ($matches as $match) {
-                            $_length = strlen($match[ 0 ][ 0 ]);
-                            $replace = $store[ $match[ 1 ][ 0 ] ];
-                            $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+                            $_length = strlen($match[0][0]);
+                            $replace = $store[$match[1][0]];
+                            $text = substr_replace($text, $replace, $match[0][1] + $_offset, $_length);
 
                             $_offset += strlen($replace) - $_length;
-                            $_store ++;
+                            $_store++;
                         }
                     }
                 } else {
@@ -849,7 +849,7 @@ 
     public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
     {
         // re-use object if already exists
-        if (!isset(self::$_tag_objects[ $tag ])) {
+        if (!isset(self::$_tag_objects[$tag])) {
             // lazy load internal compiler plugin
             $_tag = explode('_', $tag);
             $_tag = array_map('ucfirst', $_tag);
@@ -857,15 +857,14 @@ 
             if (class_exists($class_name) &&
                 (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
             ) {
-                self::$_tag_objects[ $tag ] = new $class_name;
+                self::$_tag_objects[$tag] = new $class_name;
             } else {
-                self::$_tag_objects[ $tag ] = false;
+                self::$_tag_objects[$tag] = false;
                 return false;
             }
         }
         // compile this tag
-        return self::$_tag_objects[ $tag ] === false ? false :
-            self::$_tag_objects[ $tag ]->compile($args, $this, $param1, $param2, $param3);
+        return self::$_tag_objects[$tag] === false ? false : self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
     }
 
     /**
@@ -880,29 +879,29 @@ 
     {
         $function = null;
         if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-            if (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+            if (isset($this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type])) {
                 $function =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
-            } elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
-                $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ];
+                    $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
+            } elseif (isset($this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type])) {
+                $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type] =
+                    $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type];
                 $function =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+                    $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
             }
         } else {
-            if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+            if (isset($this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type])) {
                 $function =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
-            } elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
-                $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ];
+                    $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
+            } elseif (isset($this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type])) {
+                $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type] =
+                    $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type];
                 $function =
-                    $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+                    $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
             }
         }
         if (isset($function)) {
             if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[ $plugin_name ] = true;
+                $this->modifier_plugins[$plugin_name] = true;
             }
 
             return $function;
@@ -913,18 +912,18 @@ 
 
         if (is_string($file)) {
             if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+                $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] =
                     $file;
-                $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+                $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] =
                     $function;
             } else {
-                $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+                $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] =
                     $file;
-                $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+                $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] =
                     $function;
             }
             if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[ $plugin_name ] = true;
+                $this->modifier_plugins[$plugin_name] = true;
             }
 
             return $function;
@@ -957,14 +956,14 @@ 
             if ($script !== null) {
                 if (is_file($script)) {
                     if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                        $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] =
+                        $this->parent_compiler->template->compiled->required_plugins['nocache'][$tag][$plugin_type]['file'] =
                             $script;
-                        $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] =
+                        $this->parent_compiler->template->compiled->required_plugins['nocache'][$tag][$plugin_type]['function'] =
                             $callback;
                     } else {
-                        $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] =
+                        $this->parent_compiler->template->compiled->required_plugins['compiled'][$tag][$plugin_type]['file'] =
                             $script;
-                        $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] =
+                        $this->parent_compiler->template->compiled->required_plugins['compiled'][$tag][$plugin_type]['function'] =
                             $callback;
                     }
                     require_once $script;
@@ -973,7 +972,7 @@ 
                 }
             }
             if (is_callable($callback)) {
-                $this->default_handler_plugins[ $plugin_type ][ $tag ] = array($callback, true, array());
+                $this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array());
 
                 return true;
             } else {
@@ -1029,9 +1028,9 @@ 
                            "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
                 // make sure we include modifier plugins for nocache code
                 foreach ($this->modifier_plugins as $plugin_name => $dummy) {
-                    if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) {
-                        $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] =
-                            $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ];
+                    if (isset($this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name]['modifier'])) {
+                        $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name]['modifier'] =
+                            $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name]['modifier'];
                     }
                 }
             } else {
@@ -1057,7 +1056,7 @@ 
     public function getId($input)
     {
         if (preg_match('~^([\'"]*)([0-9]*[a-zA-Z_]\w*)\1$~', $input, $match)) {
-            return $match[ 2 ];
+            return $match[2];
         }
         return false;
     }
@@ -1072,7 +1071,7 @@ 
     public function getVariableName($input)
     {
         if (preg_match('~^[$]_smarty_tpl->tpl_vars\[[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]->value$~', $input, $match)) {
-            return $match[ 1 ];
+            return $match[1];
         }
         return false;
     }
@@ -1086,11 +1085,11 @@ 
     {
         // create nocache var to make it know for further compiling
         if ($_var = $this->getId($varName)) {
-            if (isset($this->template->tpl_vars[ $_var ])) {
-                $this->template->tpl_vars[ $_var ] = clone $this->template->tpl_vars[ $_var ];
-                $this->template->tpl_vars[ $_var ]->nocache = true;
+            if (isset($this->template->tpl_vars[$_var])) {
+                $this->template->tpl_vars[$_var] = clone $this->template->tpl_vars[$_var];
+                $this->template->tpl_vars[$_var]->nocache = true;
             } else {
-                $this->template->tpl_vars[ $_var ] = new Smarty_Variable(null, true);
+                $this->template->tpl_vars[$_var] = new Smarty_Variable(null, true);
             }
         }
     }
@@ -1105,13 +1104,13 @@ 
     public function convertScope($_attr, $validScopes)
     {
         $_scope = 0;
-        if (isset($_attr[ 'scope' ])) {
-            $_scopeName = trim($_attr[ 'scope' ], "'\"");
+        if (isset($_attr['scope'])) {
+            $_scopeName = trim($_attr['scope'], "'\"");
             if (is_numeric($_scopeName) && in_array($_scopeName, $validScopes)) {
                 $_scope = $_scopeName;
             } elseif (is_string($_scopeName)) {
                 $_scopeName = trim($_scopeName, "'\"");
-                $_scope = isset($validScopes[ $_scopeName ]) ? $validScopes[ $_scopeName ] : false;
+                $_scope = isset($validScopes[$_scopeName]) ? $validScopes[$_scopeName] : false;
             } else {
                 $_scope = false;
             }
@@ -1176,7 +1175,7 @@ 
         $error_text =
             'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
             '"  on line ' . ($line + $this->trace_line_offset) . ' "' .
-            trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ])) . '" ';
+            trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1])) . '" ';
         if (isset($args)) {
             // individual error message
             $error_text .= $args;
@@ -1186,13 +1185,13 @@ 
             $error_text .= ' - Unexpected "' . $lex->value . '"';
             if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
                 foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                    $exp_token = $this->parser->yyTokenName[ $token ];
-                    if (isset($lex->smarty_token_names[ $exp_token ])) {
+                    $exp_token = $this->parser->yyTokenName[$token];
+                    if (isset($lex->smarty_token_names[$exp_token])) {
                         // token type from lexer
-                        $expect[] = '"' . $lex->smarty_token_names[ $exp_token ] . '"';
+                        $expect[] = '"' . $lex->smarty_token_names[$exp_token] . '"';
                     } else {
                         // otherwise internal token name
-                        $expect[] = $this->parser->yyTokenName[ $token ];
+                        $expect[] = $this->parser->yyTokenName[$token];
                     }
                 }
                 $error_text .= ', expected one of: ' . implode(' , ', $expect);
@@ -1200,7 +1199,7 @@ 
         }
         $e = new SmartyCompilerException($error_text);
         $e->line = $line;
-        $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
+        $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1]));
         $e->desc = $args;
         $e->template = $this->template->source->filepath;
         throw $e;
@@ -1251,7 +1250,7 @@ 
      */
     public function getNewPrefixVariable()
     {
-        self::$prefixVariableNumber ++;
+        self::$prefixVariableNumber++;
         return $this->getPrefixVariable();
     }
 

Braces +1 added lines, -2 removed lines

@@ -213,8 +213,7 @@
                 error_reporting($_smarty_old_error_level);
             }
             return $result;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             while (ob_get_level() > $level) {
                 ob_end_clean();
             }

libraries/Smarty/libs/sysplugins/smarty_internal_templatelexer.php

Doc Comments +6 added lines

@@ -241,6 +241,9 @@ 
         return $this->{'yylex' . $this->_yy_state}();
     }
 
+    /**
+     * @param integer $state
+     */
     public function yypushstate($state)
     {
         if ($this->yyTraceFILE) {
@@ -272,6 +275,9 @@ 
         }
     }
 
+    /**
+     * @param integer $state
+     */
     public function yybegin($state)
     {
         $this->_yy_state = $state;

Spacing +42 added lines, -47 removed lines

@@ -204,7 +204,7 @@ 
         $this->data = $data;
         $this->counter = 0;
         if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) {
-            $this->counter += strlen($match[ 0 ]);
+            $this->counter += strlen($match[0]);
         }
         $this->line = 1;
         $this->smarty = $compiler->smarty;
@@ -213,8 +213,8 @@ 
         $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->smarty_token_names['LDEL'] = $this->smarty->left_delimiter;
+        $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter;
     }
 
     public function PrintTrace()
@@ -228,8 +228,8 @@ 
      */
     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;
+        return $this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ?
+            strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false;
     }
 
     private $_yy_state = 1;
@@ -245,15 +245,13 @@ 
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
+                    isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
+                    isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
@@ -261,14 +259,12 @@ 
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
+                    isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
         $this->_yy_state = array_pop($this->_yy_stack);
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
+                    isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
@@ -277,8 +273,7 @@ 
         $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
+                    isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
@@ -298,7 +293,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -330,7 +325,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -349,8 +344,8 @@ 
     {
 
         preg_match("/[*]{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[ 0 ][ 1 ])) {
-            $to = $match[ 0 ][ 1 ] + strlen($match[ 0 ][ 0 ]);
+        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}'");
         }
@@ -368,8 +363,8 @@ 
     function yy_r1_7()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
-            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        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 {
@@ -381,8 +376,8 @@ 
     function yy_r1_8()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
-            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        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 {
@@ -410,8 +405,8 @@ 
         $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 ];
+        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;
@@ -435,7 +430,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -467,7 +462,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -535,7 +530,7 @@ 
     function yy_r2_10()
     {
 
-        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;
@@ -576,7 +571,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -608,7 +603,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -627,8 +622,8 @@ 
     function yy_r3_2()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
-            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        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 {
@@ -815,7 +810,7 @@ 
             $this->smarty->right_delimiter
         ) {
             preg_match("/\s+/", $this->value, $match);
-            $this->value = $match[ 0 ];
+            $this->value = $match[0];
             $this->token = Smarty_Internal_Templateparser::TP_SPACE;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_ATTR;
@@ -921,7 +916,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -953,7 +948,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -965,7 +960,7 @@ 
     function yy_r4_1()
     {
 
-        $this->literal_cnt ++;
+        $this->literal_cnt++;
         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
 
@@ -973,7 +968,7 @@ 
     {
 
         if ($this->literal_cnt) {
-            $this->literal_cnt --;
+            $this->literal_cnt--;
             $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
@@ -987,8 +982,8 @@ 
         $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 ];
+        if (isset($match[0][1])) {
+            $to = $match[0][1];
         } else {
             $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
         }
@@ -1013,7 +1008,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -1045,7 +1040,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -1069,8 +1064,8 @@ 
     function yy_r5_3()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
-            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        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 {
@@ -1082,8 +1077,8 @@ 
     function yy_r5_4()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
-            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        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 {
@@ -1095,8 +1090,8 @@ 
     function yy_r5_5()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
-            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        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 {

Indentation +1069 added lines, -1069 removed lines

@@ -18,1136 +18,1136 @@
  */
 class Smarty_Internal_Templatelexer
 {
-    /**
-     * Source
-     *
-     * @var string
-     */
-    public $data;
-
-    /**
-     * byte counter
-     *
-     * @var int
-     */
-    public $counter;
-
-    /**
-     * token number
-     *
-     * @var int
-     */
-    public $token;
-
-    /**
-     * token value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * current line
-     *
-     * @var int
-     */
-    public $line;
-
-    /**
-     * tag start line
-     *
-     * @var
-     */
-    public $taglineno;
-
-    /**
-     * php code type
-     *
-     * @var string
-     */
-    public $phpType = '';
-
-    /**
-     * 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
-     */
-    public $state = 1;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * compiler object
-     *
-     * @var Smarty_Internal_TemplateCompilerBase
-     */
-    public $compiler = null;
-
-    /**
-     * literal tag nesting level
-     *
-     * @var int
-     */
-    private $literal_cnt = 0;
-
-    /**
-     * PHP start tag string
-     *
-     * @var string
-     */
-
-    /**
-     * trace file
-     *
-     * @var resource
-     */
-    public $yyTraceFILE;
-
-    /**
-     * trace prompt
-     *
-     * @var string
-     */
-    public $yyTracePrompt;
-
-    /**
-     * XML flag true while processing xml
-     *
-     * @var bool
-     */
-    public $is_xml = false;
-
-    /**
-     * state names
-     *
-     * @var array
-     */
-    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
-
-    /**
-     * storage for assembled token patterns
-     *
-     * @var string
-     */
-    private $yy_global_pattern1 = null;
-
-    private $yy_global_pattern2 = null;
-
-    private $yy_global_pattern3 = null;
-
-    private $yy_global_pattern4 = null;
-
-    private $yy_global_pattern5 = null;
-
-    /**
-     * 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',);
-
-    /**
-     * constructor
-     *
-     * @param   string                             $data template source
-     * @param Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    public function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $this->data = $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->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;
-    }
-
-    public function PrintTrace()
-    {
-        $this->yyTraceFILE = fopen('php://output', 'w');
-        $this->yyTracePrompt = '<br>';
-    }
-
-    /*
+	/**
+	 * Source
+	 *
+	 * @var string
+	 */
+	public $data;
+
+	/**
+	 * byte counter
+	 *
+	 * @var int
+	 */
+	public $counter;
+
+	/**
+	 * token number
+	 *
+	 * @var int
+	 */
+	public $token;
+
+	/**
+	 * token value
+	 *
+	 * @var string
+	 */
+	public $value;
+
+	/**
+	 * current line
+	 *
+	 * @var int
+	 */
+	public $line;
+
+	/**
+	 * tag start line
+	 *
+	 * @var
+	 */
+	public $taglineno;
+
+	/**
+	 * php code type
+	 *
+	 * @var string
+	 */
+	public $phpType = '';
+
+	/**
+	 * 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
+	 */
+	public $state = 1;
+
+	/**
+	 * Smarty object
+	 *
+	 * @var Smarty
+	 */
+	public $smarty = null;
+
+	/**
+	 * compiler object
+	 *
+	 * @var Smarty_Internal_TemplateCompilerBase
+	 */
+	public $compiler = null;
+
+	/**
+	 * literal tag nesting level
+	 *
+	 * @var int
+	 */
+	private $literal_cnt = 0;
+
+	/**
+	 * PHP start tag string
+	 *
+	 * @var string
+	 */
+
+	/**
+	 * trace file
+	 *
+	 * @var resource
+	 */
+	public $yyTraceFILE;
+
+	/**
+	 * trace prompt
+	 *
+	 * @var string
+	 */
+	public $yyTracePrompt;
+
+	/**
+	 * XML flag true while processing xml
+	 *
+	 * @var bool
+	 */
+	public $is_xml = false;
+
+	/**
+	 * state names
+	 *
+	 * @var array
+	 */
+	public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+	/**
+	 * storage for assembled token patterns
+	 *
+	 * @var string
+	 */
+	private $yy_global_pattern1 = null;
+
+	private $yy_global_pattern2 = null;
+
+	private $yy_global_pattern3 = null;
+
+	private $yy_global_pattern4 = null;
+
+	private $yy_global_pattern5 = null;
+
+	/**
+	 * 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',);
+
+	/**
+	 * constructor
+	 *
+	 * @param   string                             $data template source
+	 * @param Smarty_Internal_TemplateCompilerBase $compiler
+	 */
+	public function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		$this->data = $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->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;
+	}
+
+	public function PrintTrace()
+	{
+		$this->yyTraceFILE = fopen('php://output', 'w');
+		$this->yyTracePrompt = '<br>';
+	}
+
+	/*
      * Check if this tag is autoliteral
      */
-    public function isAutoLiteral()
-    {
-        return $this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
-            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false;
-    }
-
-    private $_yy_state = 1;
-
-    private $_yy_stack = array();
-
-    public function yylex()
-    {
-        return $this->{'yylex' . $this->_yy_state}();
-    }
-
-    public function yypushstate($state)
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
-        }
-        array_push($this->_yy_stack, $this->_yy_state);
-        $this->_yy_state = $state;
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
-        }
-    }
-
-    public function yypopstate()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
-        }
-        $this->_yy_state = array_pop($this->_yy_stack);
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
-        }
-    }
-
-    public function yybegin($state)
-    {
-        $this->_yy_state = $state;
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
-        }
-    }
-
-    public function yylex1()
-    {
-        if (!isset($this->yy_global_pattern1)) {
-            $this->yy_global_pattern1 =
-                "/\G([{][}])|\G(" . $this->ldel . "[*])|\G((" . $this->ldel . "\\s*php([ ].*?)?" . $this->rdel . ")|(" .
-                $this->ldel . "\\s*[\/]php" . $this->rdel . "))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel .
-                ")|\G(" . $this->ldel . "\\s*)|\G(\\s*" . $this->rdel .
-                ")|\G((<[?]((php\\s+|=)|\\s+))|(<[%])|(<[?]xml\\s+)|(<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|([?][>])|([%][>]))|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state TEXT');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const TEXT = 1;
-
-    public function yy_r1_1()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yy_r1_2()
-    {
-
-        preg_match("/[*]{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[ 0 ][ 1 ])) {
-            $to = $match[ 0 ][ 1 ] + strlen($match[ 0 ][ 0 ]);
-        } else {
-            $this->compiler->trigger_template_error("missing or misspelled comment closing tag '*{$this->smarty->right_delimiter}'");
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        return false;
-    }
-
-    public function yy_r1_3()
-    {
-
-        $obj = new Smarty_Internal_Compile_Private_Php();
-        $obj->parsePhp($this);
-    }
-
-    public function yy_r1_7()
-    {
-
-        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);
-        }
-    }
-
-    public function yy_r1_8()
-    {
-
-        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;
-        }
-    }
-
-    public function yy_r1_9()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yy_r1_10()
-    {
-
-        $obj = new Smarty_Internal_Compile_Private_Php();
-        $obj->parsePhp($this);
-    }
-
-    public function yy_r1_19()
-    {
-
-        $to = strlen($this->data);
-        preg_match("/($this->ldel)|(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<script\s+language\s*=\s*[\"']?\s*php\s*[\"']?\s*>)|([?][>])|([%][>])/i",
-                   $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[ 0 ][ 1 ])) {
-            $to = $match[ 0 ][ 1 ];
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yylex2()
-    {
-        if (!isset($this->yy_global_pattern2)) {
-            $this->yy_global_pattern2 =
-                "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" .
-                $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel .
-                "\\s*make_nocache\\s+)|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel .
-                ")|\G(" . $this->ldel . "\\s*[\/](?:(?!block)[0-9]*[a-zA-Z_]\\w*)\\s*" . $this->rdel . ")|\G(" .
-                $this->ldel . "\\s*[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel .
-                "\\s*[\/])|\G(" . $this->ldel . "\\s*)/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state TAG');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const TAG = 2;
-
-    public function yy_r2_1()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    public function yy_r2_3()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    public function yy_r2_4()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    public function yy_r2_5()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    public function yy_r2_6()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    public function yy_r2_7()
-    {
-
-        $this->yypopstate();
-        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
-        $this->taglineno = $this->line;
-    }
-
-    public function yy_r2_9()
-    {
-
-        $this->yypopstate();
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
-        $this->taglineno = $this->line;
-    }
-
-    public function yy_r2_10()
-    {
-
-        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;
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yybegin(self::TAGBODY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    public function yy_r2_12()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    public function yy_r2_13()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-        $this->yybegin(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    public function yylex3()
-    {
-        if (!isset($this->yy_global_pattern3)) {
-            $this->yy_global_pattern3 = "/\G(\\s*" . $this->rdel . ")|\G(" . $this->ldel .
-                                        "\\s*)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+(is\\s+(not\\s+)?(odd|even|div)\\s+by)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G(([!]\\s*)|(not\\s+))|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|])|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state TAGBODY');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const TAGBODY = 3;
-
-    public function yy_r3_1()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-        $this->yypopstate();
-    }
-
-    public function yy_r3_2()
-    {
-
-        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;
-        }
-    }
-
-    public function yy_r3_3()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
-    }
-
-    public function yy_r3_4()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
-    }
-
-    public function yy_r3_5()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
-        $this->taglineno = $this->line;
-    }
-
-    public function yy_r3_7()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
-
-    public function yy_r3_8()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
-    }
+	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;
+	}
+
+	private $_yy_state = 1;
+
+	private $_yy_stack = array();
+
+	public function yylex()
+	{
+		return $this->{'yylex' . $this->_yy_state}();
+	}
+
+	public function yypushstate($state)
+	{
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
+					isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+						$this->_yy_state);
+		}
+		array_push($this->_yy_stack, $this->_yy_state);
+		$this->_yy_state = $state;
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+					isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+						$this->_yy_state);
+		}
+	}
+
+	public function yypopstate()
+	{
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
+					isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+						$this->_yy_state);
+		}
+		$this->_yy_state = array_pop($this->_yy_stack);
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+					isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+						$this->_yy_state);
+		}
+	}
+
+	public function yybegin($state)
+	{
+		$this->_yy_state = $state;
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
+					isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+						$this->_yy_state);
+		}
+	}
+
+	public function yylex1()
+	{
+		if (!isset($this->yy_global_pattern1)) {
+			$this->yy_global_pattern1 =
+				"/\G([{][}])|\G(" . $this->ldel . "[*])|\G((" . $this->ldel . "\\s*php([ ].*?)?" . $this->rdel . ")|(" .
+				$this->ldel . "\\s*[\/]php" . $this->rdel . "))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel .
+				")|\G(" . $this->ldel . "\\s*)|\G(\\s*" . $this->rdel .
+				")|\G((<[?]((php\\s+|=)|\\s+))|(<[%])|(<[?]xml\\s+)|(<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|([?][>])|([%][>]))|\G([\S\s])/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state TEXT');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r1_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const TEXT = 1;
+
+	public function yy_r1_1()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
+	}
+
+	public function yy_r1_2()
+	{
+
+		preg_match("/[*]{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+		if (isset($match[ 0 ][ 1 ])) {
+			$to = $match[ 0 ][ 1 ] + strlen($match[ 0 ][ 0 ]);
+		} else {
+			$this->compiler->trigger_template_error("missing or misspelled comment closing tag '*{$this->smarty->right_delimiter}'");
+		}
+		$this->value = substr($this->data, $this->counter, $to - $this->counter);
+		return false;
+	}
+
+	public function yy_r1_3()
+	{
+
+		$obj = new Smarty_Internal_Compile_Private_Php();
+		$obj->parsePhp($this);
+	}
+
+	public function yy_r1_7()
+	{
+
+		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);
+		}
+	}
+
+	public function yy_r1_8()
+	{
+
+		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;
+		}
+	}
+
+	public function yy_r1_9()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
+	}
+
+	public function yy_r1_10()
+	{
+
+		$obj = new Smarty_Internal_Compile_Private_Php();
+		$obj->parsePhp($this);
+	}
+
+	public function yy_r1_19()
+	{
+
+		$to = strlen($this->data);
+		preg_match("/($this->ldel)|(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<script\s+language\s*=\s*[\"']?\s*php\s*[\"']?\s*>)|([?][>])|([%][>])/i",
+				   $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+		if (isset($match[ 0 ][ 1 ])) {
+			$to = $match[ 0 ][ 1 ];
+		}
+		$this->value = substr($this->data, $this->counter, $to - $this->counter);
+		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
+	}
+
+	public function yylex2()
+	{
+		if (!isset($this->yy_global_pattern2)) {
+			$this->yy_global_pattern2 =
+				"/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" .
+				$this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel .
+				"\\s*make_nocache\\s+)|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel .
+				")|\G(" . $this->ldel . "\\s*[\/](?:(?!block)[0-9]*[a-zA-Z_]\\w*)\\s*" . $this->rdel . ")|\G(" .
+				$this->ldel . "\\s*[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel .
+				"\\s*[\/])|\G(" . $this->ldel . "\\s*)/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state TAG');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r2_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const TAG = 2;
+
+	public function yy_r2_1()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+		$this->yybegin(self::TAGBODY);
+		$this->taglineno = $this->line;
+	}
+
+	public function yy_r2_3()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+		$this->yybegin(self::TAGBODY);
+		$this->taglineno = $this->line;
+	}
+
+	public function yy_r2_4()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+		$this->yybegin(self::TAGBODY);
+		$this->taglineno = $this->line;
+	}
+
+	public function yy_r2_5()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+		$this->yybegin(self::TAGBODY);
+		$this->taglineno = $this->line;
+	}
+
+	public function yy_r2_6()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
+		$this->yybegin(self::TAGBODY);
+		$this->taglineno = $this->line;
+	}
+
+	public function yy_r2_7()
+	{
+
+		$this->yypopstate();
+		$this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+		$this->taglineno = $this->line;
+	}
+
+	public function yy_r2_9()
+	{
+
+		$this->yypopstate();
+		$this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+		$this->taglineno = $this->line;
+	}
+
+	public function yy_r2_10()
+	{
+
+		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;
+			$this->token = Smarty_Internal_Templateparser::TP_LDEL;
+			$this->yybegin(self::TAGBODY);
+			$this->taglineno = $this->line;
+		}
+	}
+
+	public function yy_r2_12()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+		$this->yybegin(self::TAGBODY);
+		$this->taglineno = $this->line;
+	}
+
+	public function yy_r2_13()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_LDEL;
+		$this->yybegin(self::TAGBODY);
+		$this->taglineno = $this->line;
+	}
+
+	public function yylex3()
+	{
+		if (!isset($this->yy_global_pattern3)) {
+			$this->yy_global_pattern3 = "/\G(\\s*" . $this->rdel . ")|\G(" . $this->ldel .
+										"\\s*)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+(is\\s+(not\\s+)?(odd|even|div)\\s+by)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G(([!]\\s*)|(not\\s+))|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|])|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state TAGBODY');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r3_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const TAGBODY = 3;
+
+	public function yy_r3_1()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_RDEL;
+		$this->yypopstate();
+	}
+
+	public function yy_r3_2()
+	{
+
+		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;
+		}
+	}
+
+	public function yy_r3_3()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+		$this->yypushstate(self::DOUBLEQUOTEDSTRING);
+	}
+
+	public function yy_r3_4()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+	}
+
+	public function yy_r3_5()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+		$this->taglineno = $this->line;
+	}
+
+	public function yy_r3_7()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+	}
+
+	public function yy_r3_8()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+	}
 
-    public function yy_r3_9()
-    {
+	public function yy_r3_9()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_ISIN;
+	}
 
-    public function yy_r3_10()
-    {
+	public function yy_r3_10()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_AS;
+	}
 
-    public function yy_r3_11()
-    {
+	public function yy_r3_11()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_TO;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_TO;
+	}
 
-    public function yy_r3_12()
-    {
+	public function yy_r3_12()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_STEP;
+	}
 
-    public function yy_r3_13()
-    {
+	public function yy_r3_13()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+	}
 
-    public function yy_r3_14()
-    {
+	public function yy_r3_14()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+	}
 
-    public function yy_r3_19()
-    {
+	public function yy_r3_19()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+	}
 
-    public function yy_r3_21()
-    {
+	public function yy_r3_21()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+	}
 
-    public function yy_r3_25()
-    {
+	public function yy_r3_25()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+	}
 
-    public function yy_r3_28()
-    {
+	public function yy_r3_28()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_NOT;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_NOT;
+	}
 
-    public function yy_r3_31()
-    {
+	public function yy_r3_31()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+	}
 
-    public function yy_r3_35()
-    {
+	public function yy_r3_35()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_OPENP;
+	}
 
-    public function yy_r3_36()
-    {
+	public function yy_r3_36()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+	}
 
-    public function yy_r3_37()
-    {
+	public function yy_r3_37()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_OPENB;
+	}
 
-    public function yy_r3_38()
-    {
+	public function yy_r3_38()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+	}
 
-    public function yy_r3_39()
-    {
+	public function yy_r3_39()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_PTR;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_PTR;
+	}
 
-    public function yy_r3_40()
-    {
+	public function yy_r3_40()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_APTR;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_APTR;
+	}
 
-    public function yy_r3_41()
-    {
+	public function yy_r3_41()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+	}
 
-    public function yy_r3_42()
-    {
+	public function yy_r3_42()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+	}
 
-    public function yy_r3_44()
-    {
+	public function yy_r3_44()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+	}
 
-    public function yy_r3_46()
-    {
+	public function yy_r3_46()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_MATH;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_MATH;
+	}
 
-    public function yy_r3_48()
-    {
+	public function yy_r3_48()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_AT;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_AT;
+	}
 
-    public function yy_r3_49()
-    {
+	public function yy_r3_49()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_HATCH;
+	}
 
-    public function yy_r3_50()
-    {
+	public function yy_r3_50()
+	{
 
-        // 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->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;
+		}
+	}
 
-    public function yy_r3_51()
-    {
+	public function yy_r3_51()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+	}
 
-    public function yy_r3_54()
-    {
+	public function yy_r3_54()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_ID;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_ID;
+	}
 
-    public function yy_r3_55()
-    {
+	public function yy_r3_55()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+	}
 
-    public function yy_r3_56()
-    {
+	public function yy_r3_56()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-        $this->yypopstate();
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+		$this->yypopstate();
+	}
 
-    public function yy_r3_57()
-    {
+	public function yy_r3_57()
+	{
 
-        $this->token = Smarty_Internal_Templateparser::TP_VERT;
-    }
+		$this->token = Smarty_Internal_Templateparser::TP_VERT;
+	}
 
-    public function yy_r3_58()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOT;
-    }
-
-    public function yy_r3_59()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
-    }
-
-    public function yy_r3_60()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
-    }
-
-    public function yy_r3_61()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
-    }
-
-    public function yy_r3_62()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_COLON;
-    }
-
-    public function yy_r3_63()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
-    }
-
-    public function yy_r3_64()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_HEX;
-    }
-
-    public function yy_r3_65()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-    }
-
-    public function yy_r3_66()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yylex4()
-    {
-        if (!isset($this->yy_global_pattern4)) {
-            $this->yy_global_pattern4 =
-                "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" .
-                $this->rdel . ")|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state LITERAL');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const LITERAL = 4;
-
-    public function yy_r4_1()
-    {
-
-        $this->literal_cnt ++;
-        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-
-    public function yy_r4_2()
-    {
-
-        if ($this->literal_cnt) {
-            $this->literal_cnt --;
-            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-            $this->yypopstate();
-        }
-    }
-
-    public function yy_r4_3()
-    {
-
-        $to = strlen($this->data);
-        preg_match("/{$this->ldel}[\/]?literal{$this->rdel}/i", $this->data, $match, PREG_OFFSET_CAPTURE,
-                   $this->counter);
-        if (isset($match[ 0 ][ 1 ])) {
-            $to = $match[ 0 ][ 1 ];
-        } else {
-            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-
-    public function yylex5()
-    {
-        if (!isset($this->yy_global_pattern5)) {
-            $this->yy_global_pattern5 =
-                "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" .
-                $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*)|\G(" .
-                $this->ldel .
-                "\\s*)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" .
-                $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const DOUBLEQUOTEDSTRING = 5;
-
-    public function yy_r5_1()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yy_r5_2()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yy_r5_3()
-    {
-
-        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;
-        }
-    }
-
-    public function yy_r5_4()
-    {
-
-        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;
-        }
-    }
-
-    public function yy_r5_5()
-    {
-
-        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);
-        }
-    }
-
-    public function yy_r5_6()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-        $this->yypopstate();
-    }
-
-    public function yy_r5_7()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-        $this->value = substr($this->value, 0, - 1);
-        $this->yypushstate(self::TAGBODY);
-        $this->taglineno = $this->line;
-    }
-
-    public function yy_r5_8()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
-
-    public function yy_r5_9()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yy_r5_10()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    public function yy_r5_14()
-    {
-
-        $to = strlen($this->data);
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
+	public function yy_r3_58()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_DOT;
+	}
+
+	public function yy_r3_59()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_COMMA;
+	}
+
+	public function yy_r3_60()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+	}
+
+	public function yy_r3_61()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+	}
+
+	public function yy_r3_62()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_COLON;
+	}
+
+	public function yy_r3_63()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_QMARK;
+	}
+
+	public function yy_r3_64()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_HEX;
+	}
+
+	public function yy_r3_65()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_SPACE;
+	}
+
+	public function yy_r3_66()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
+	}
+
+	public function yylex4()
+	{
+		if (!isset($this->yy_global_pattern4)) {
+			$this->yy_global_pattern4 =
+				"/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" .
+				$this->rdel . ")|\G([\S\s])/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state LITERAL');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r4_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const LITERAL = 4;
+
+	public function yy_r4_1()
+	{
+
+		$this->literal_cnt ++;
+		$this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+	}
+
+	public function yy_r4_2()
+	{
+
+		if ($this->literal_cnt) {
+			$this->literal_cnt --;
+			$this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+		} else {
+			$this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+			$this->yypopstate();
+		}
+	}
+
+	public function yy_r4_3()
+	{
+
+		$to = strlen($this->data);
+		preg_match("/{$this->ldel}[\/]?literal{$this->rdel}/i", $this->data, $match, PREG_OFFSET_CAPTURE,
+				   $this->counter);
+		if (isset($match[ 0 ][ 1 ])) {
+			$to = $match[ 0 ][ 1 ];
+		} else {
+			$this->compiler->trigger_template_error("missing or misspelled literal closing tag");
+		}
+		$this->value = substr($this->data, $this->counter, $to - $this->counter);
+		$this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+	}
+
+	public function yylex5()
+	{
+		if (!isset($this->yy_global_pattern5)) {
+			$this->yy_global_pattern5 =
+				"/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" .
+				$this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*)|\G(" .
+				$this->ldel .
+				"\\s*)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" .
+				$this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r5_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const DOUBLEQUOTEDSTRING = 5;
+
+	public function yy_r5_1()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
+	}
+
+	public function yy_r5_2()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
+	}
+
+	public function yy_r5_3()
+	{
+
+		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;
+		}
+	}
+
+	public function yy_r5_4()
+	{
+
+		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;
+		}
+	}
+
+	public function yy_r5_5()
+	{
+
+		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);
+		}
+	}
+
+	public function yy_r5_6()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+		$this->yypopstate();
+	}
+
+	public function yy_r5_7()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+		$this->value = substr($this->value, 0, - 1);
+		$this->yypushstate(self::TAGBODY);
+		$this->taglineno = $this->line;
+	}
+
+	public function yy_r5_8()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+	}
+
+	public function yy_r5_9()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
+	}
+
+	public function yy_r5_10()
+	{
+
+		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
+	}
+
+	public function yy_r5_14()
+	{
+
+		$to = strlen($this->data);
+		$this->value = substr($this->data, $this->counter, $to - $this->counter);
+		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
+	}
 
 }
 
-     
\ No newline at end of file
+	 
\ No newline at end of file

libraries/Smarty/libs/sysplugins/smarty_resource.php

Doc Comments +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
      * @param  string $resource_name    template_resource or config_resource to parse
      * @param  string $default_resource the default resource_type defined in $smarty
      *
-     * @return array with parsed resource name and type
+     * @return string[] with parsed resource name and type
      */
     public static function parseResourceName($resource_name, $default_resource)
     {

Spacing +13 added lines, -13 removed lines

@@ -129,28 +129,28 @@ 
     public static function load(Smarty $smarty, $type)
     {
         // try smarty's cache
-        if (isset($smarty->_cache[ 'resource_handlers' ][ $type ])) {
-            return $smarty->_cache[ 'resource_handlers' ][ $type ];
+        if (isset($smarty->_cache['resource_handlers'][$type])) {
+            return $smarty->_cache['resource_handlers'][$type];
         }
 
         // try registered resource
-        if (isset($smarty->registered_resources[ $type ])) {
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] =
-                $smarty->registered_resources[ $type ] instanceof Smarty_Resource ?
-                    $smarty->registered_resources[ $type ] : new Smarty_Internal_Resource_Registered();
+        if (isset($smarty->registered_resources[$type])) {
+            return $smarty->_cache['resource_handlers'][$type] =
+                $smarty->registered_resources[$type] instanceof Smarty_Resource ?
+                    $smarty->registered_resources[$type] : new Smarty_Internal_Resource_Registered();
         }
 
         // try sysplugins dir
-        if (isset(self::$sysplugins[ $type ])) {
+        if (isset(self::$sysplugins[$type])) {
             $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
+            return $smarty->_cache['resource_handlers'][$type] = new $_resource_class();
         }
 
         // try plugins dir
         $_resource_class = 'Smarty_Resource_' . ucfirst($type);
         if ($smarty->loadPlugin($_resource_class)) {
             if (class_exists($_resource_class, false)) {
-                return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
+                return $smarty->_cache['resource_handlers'][$type] = new $_resource_class();
             } else {
                 $smarty->registerResource($type,
                                           array("smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
@@ -167,7 +167,7 @@ 
             if (is_object($smarty->security_policy)) {
                 $smarty->security_policy->isTrustedStream($type);
             }
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] = new Smarty_Internal_Resource_Stream();
+            return $smarty->_cache['resource_handlers'][$type] = new Smarty_Internal_Resource_Stream();
         }
 
         // TODO: try default_(template|config)_handler
@@ -188,8 +188,8 @@ 
     public static function parseResourceName($resource_name, $default_resource)
     {
         if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]/', $resource_name, $match)) {
-            $type = $match[ 1 ];
-            $name = substr($resource_name, strlen($match[ 0 ]));
+            $type = $match[1];
+            $name = substr($resource_name, strlen($match[0]));
         } else {
             // no resource given, use default
             // or single character before the colon is not a resource type, but part of the filepath
@@ -214,7 +214,7 @@ 
         // TODO: optimize for Smarty's internal resource types
         $resource = Smarty_Resource::load($smarty, $type);
         // go relative to a given template?
-        $_file_is_dotted = $name[ 0 ] == '.' && ($name[ 1 ] == '.' || $name[ 1 ] == '/');
+        $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/');
         if ($obj->_objType == 2 && $_file_is_dotted &&
             ($obj->source->type == 'file' || $obj->parent->source->type == 'extends')
         ) {

Indentation +221 added lines, -221 removed lines

@@ -20,231 +20,231 @@
  */
 abstract class Smarty_Resource
 {
-    /**
-     * Source is bypassing compiler
-     *
-     * @var boolean
-     */
-    public $uncompiled = false;
-
-    /**
-     * Source must be recompiled on every occasion
-     *
-     * @var boolean
-     */
-    public $recompiled = false;
-
-    /**
-     * resource types provided by the core
-     *
-     * @var array
-     */
-    public static $sysplugins = array('file' => 'smarty_internal_resource_file.php',
-                                      'string' => 'smarty_internal_resource_string.php',
-                                      'extends' => 'smarty_internal_resource_extends.php',
-                                      'stream' => 'smarty_internal_resource_stream.php',
-                                      'eval' => 'smarty_internal_resource_eval.php',
-                                      'php' => 'smarty_internal_resource_php.php');
-
-    /**
-     * Flag if resource does implement populateCompiledFilepath() method
-     *
-     * @var bool
-     */
-    public $hasCompiledHandler = false;
-
-    /**
-     * Load template's source into current template object
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    abstract public function getContent(Smarty_Template_Source $source);
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param  Smarty  $smarty        Smarty instance
-     * @param  string  $resource_name resource_name to make unique
-     * @param  boolean $isConfig      flag for config resource
-     *
-     * @return string unique resource name
-     */
-    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
-    {
-        if ($isConfig) {
-            if (!isset($smarty->_joined_config_dir)) {
-                $smarty->getTemplateDir(null, true);
-            }
-            return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name;
-        } else {
-            if (!isset($smarty->_joined_template_dir)) {
-                $smarty->getTemplateDir();
-            }
-            return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name;
-        }
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return basename(preg_replace('![^\w]+!', '_', $source->name));
-    }
-
-    /**
-     * Load Resource Handler
-     *
-     * @param  Smarty $smarty smarty object
-     * @param  string $type   name of the resource
-     *
-     * @throws SmartyException
-     * @return Smarty_Resource Resource Handler
-     */
-    public static function load(Smarty $smarty, $type)
-    {
-        // try smarty's cache
-        if (isset($smarty->_cache[ 'resource_handlers' ][ $type ])) {
-            return $smarty->_cache[ 'resource_handlers' ][ $type ];
-        }
-
-        // try registered resource
-        if (isset($smarty->registered_resources[ $type ])) {
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] =
-                $smarty->registered_resources[ $type ] instanceof Smarty_Resource ?
-                    $smarty->registered_resources[ $type ] : new Smarty_Internal_Resource_Registered();
-        }
-
-        // try sysplugins dir
-        if (isset(self::$sysplugins[ $type ])) {
-            $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
-        }
-
-        // try plugins dir
-        $_resource_class = 'Smarty_Resource_' . ucfirst($type);
-        if ($smarty->loadPlugin($_resource_class)) {
-            if (class_exists($_resource_class, false)) {
-                return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
-            } else {
-                $smarty->registerResource($type,
-                                          array("smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
-                                                "smarty_resource_{$type}_secure", "smarty_resource_{$type}_trusted"));
-                // give it another try, now that the resource is registered properly
-                return self::load($smarty, $type);
-            }
-        }
-
-        // try streams
-        $_known_stream = stream_get_wrappers();
-        if (in_array($type, $_known_stream)) {
-            // is known stream
-            if (is_object($smarty->security_policy)) {
-                $smarty->security_policy->isTrustedStream($type);
-            }
-            return $smarty->_cache[ 'resource_handlers' ][ $type ] = new Smarty_Internal_Resource_Stream();
-        }
-
-        throw new SmartyException("Unknown resource type '{$type}'");
-    }
-
-    /**
-     * extract resource_type and resource_name from template_resource and config_resource
-     * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
-     *
-     * @param  string $resource_name    template_resource or config_resource to parse
-     * @param  string $default_resource the default resource_type defined in $smarty
-     *
-     * @return array with parsed resource name and type
-     */
-    public static function parseResourceName($resource_name, $default_resource)
-    {
-        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]/', $resource_name, $match)) {
-            $type = $match[ 1 ];
-            $name = substr($resource_name, strlen($match[ 0 ]));
-        } else {
-            // no resource given, use default
-            // or single character before the colon is not a resource type, but part of the filepath
-            $type = $default_resource;
-            $name = $resource_name;
-        }
-        return array($name, $type);
-    }
-
-    /**
-     * modify template_resource according to resource handlers specifications
-     *
-     * @param  \Smarty_Internal_Template|\Smarty $obj               Smarty instance
-     * @param  string                            $template_resource template_resource to extract resource handler and name of
-     *
-     * @return string unique resource name
-     */
-    public static function getUniqueTemplateName($obj, $template_resource)
-    {
-        $smarty = $obj->_objType == 2 ? $obj->smarty : $obj;
-        list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
-        $resource = Smarty_Resource::load($smarty, $type);
-        // go relative to a given template?
-        $_file_is_dotted = $name[ 0 ] == '.' && ($name[ 1 ] == '.' || $name[ 1 ] == '/');
-        if ($obj->_objType == 2 && $_file_is_dotted &&
-            ($obj->source->type == 'file' || $obj->parent->source->type == 'extends')
-        ) {
-             $name = $smarty->_realpath(dirname($obj->parent->source->filepath) . DS . $name);
-        }
-        return $resource->buildUniqueResourceName($smarty, $name);
-    }
-
-    /*
+	/**
+	 * Source is bypassing compiler
+	 *
+	 * @var boolean
+	 */
+	public $uncompiled = false;
+
+	/**
+	 * Source must be recompiled on every occasion
+	 *
+	 * @var boolean
+	 */
+	public $recompiled = false;
+
+	/**
+	 * resource types provided by the core
+	 *
+	 * @var array
+	 */
+	public static $sysplugins = array('file' => 'smarty_internal_resource_file.php',
+									  'string' => 'smarty_internal_resource_string.php',
+									  'extends' => 'smarty_internal_resource_extends.php',
+									  'stream' => 'smarty_internal_resource_stream.php',
+									  'eval' => 'smarty_internal_resource_eval.php',
+									  'php' => 'smarty_internal_resource_php.php');
+
+	/**
+	 * Flag if resource does implement populateCompiledFilepath() method
+	 *
+	 * @var bool
+	 */
+	public $hasCompiledHandler = false;
+
+	/**
+	 * Load template's source into current template object
+	 *
+	 * @param  Smarty_Template_Source $source source object
+	 *
+	 * @return string                 template source
+	 * @throws SmartyException        if source cannot be loaded
+	 */
+	abstract public function getContent(Smarty_Template_Source $source);
+
+	/**
+	 * populate Source Object with meta data from Resource
+	 *
+	 * @param Smarty_Template_Source   $source    source object
+	 * @param Smarty_Internal_Template $_template template object
+	 */
+	abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
+
+	/**
+	 * populate Source Object with timestamp and exists from Resource
+	 *
+	 * @param Smarty_Template_Source $source source object
+	 */
+	public function populateTimestamp(Smarty_Template_Source $source)
+	{
+		// intentionally left blank
+	}
+
+	/**
+	 * modify resource_name according to resource handlers specifications
+	 *
+	 * @param  Smarty  $smarty        Smarty instance
+	 * @param  string  $resource_name resource_name to make unique
+	 * @param  boolean $isConfig      flag for config resource
+	 *
+	 * @return string unique resource name
+	 */
+	public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+	{
+		if ($isConfig) {
+			if (!isset($smarty->_joined_config_dir)) {
+				$smarty->getTemplateDir(null, true);
+			}
+			return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name;
+		} else {
+			if (!isset($smarty->_joined_template_dir)) {
+				$smarty->getTemplateDir();
+			}
+			return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name;
+		}
+	}
+
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @param  Smarty_Template_Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(Smarty_Template_Source $source)
+	{
+		return basename(preg_replace('![^\w]+!', '_', $source->name));
+	}
+
+	/**
+	 * Load Resource Handler
+	 *
+	 * @param  Smarty $smarty smarty object
+	 * @param  string $type   name of the resource
+	 *
+	 * @throws SmartyException
+	 * @return Smarty_Resource Resource Handler
+	 */
+	public static function load(Smarty $smarty, $type)
+	{
+		// try smarty's cache
+		if (isset($smarty->_cache[ 'resource_handlers' ][ $type ])) {
+			return $smarty->_cache[ 'resource_handlers' ][ $type ];
+		}
+
+		// try registered resource
+		if (isset($smarty->registered_resources[ $type ])) {
+			return $smarty->_cache[ 'resource_handlers' ][ $type ] =
+				$smarty->registered_resources[ $type ] instanceof Smarty_Resource ?
+					$smarty->registered_resources[ $type ] : new Smarty_Internal_Resource_Registered();
+		}
+
+		// try sysplugins dir
+		if (isset(self::$sysplugins[ $type ])) {
+			$_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
+			return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
+		}
+
+		// try plugins dir
+		$_resource_class = 'Smarty_Resource_' . ucfirst($type);
+		if ($smarty->loadPlugin($_resource_class)) {
+			if (class_exists($_resource_class, false)) {
+				return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
+			} else {
+				$smarty->registerResource($type,
+										  array("smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
+												"smarty_resource_{$type}_secure", "smarty_resource_{$type}_trusted"));
+				// give it another try, now that the resource is registered properly
+				return self::load($smarty, $type);
+			}
+		}
+
+		// try streams
+		$_known_stream = stream_get_wrappers();
+		if (in_array($type, $_known_stream)) {
+			// is known stream
+			if (is_object($smarty->security_policy)) {
+				$smarty->security_policy->isTrustedStream($type);
+			}
+			return $smarty->_cache[ 'resource_handlers' ][ $type ] = new Smarty_Internal_Resource_Stream();
+		}
+
+		throw new SmartyException("Unknown resource type '{$type}'");
+	}
+
+	/**
+	 * extract resource_type and resource_name from template_resource and config_resource
+	 * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
+	 *
+	 * @param  string $resource_name    template_resource or config_resource to parse
+	 * @param  string $default_resource the default resource_type defined in $smarty
+	 *
+	 * @return array with parsed resource name and type
+	 */
+	public static function parseResourceName($resource_name, $default_resource)
+	{
+		if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]/', $resource_name, $match)) {
+			$type = $match[ 1 ];
+			$name = substr($resource_name, strlen($match[ 0 ]));
+		} else {
+			// no resource given, use default
+			// or single character before the colon is not a resource type, but part of the filepath
+			$type = $default_resource;
+			$name = $resource_name;
+		}
+		return array($name, $type);
+	}
+
+	/**
+	 * modify template_resource according to resource handlers specifications
+	 *
+	 * @param  \Smarty_Internal_Template|\Smarty $obj               Smarty instance
+	 * @param  string                            $template_resource template_resource to extract resource handler and name of
+	 *
+	 * @return string unique resource name
+	 */
+	public static function getUniqueTemplateName($obj, $template_resource)
+	{
+		$smarty = $obj->_objType == 2 ? $obj->smarty : $obj;
+		list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
+		$resource = Smarty_Resource::load($smarty, $type);
+		// go relative to a given template?
+		$_file_is_dotted = $name[ 0 ] == '.' && ($name[ 1 ] == '.' || $name[ 1 ] == '/');
+		if ($obj->_objType == 2 && $_file_is_dotted &&
+			($obj->source->type == 'file' || $obj->parent->source->type == 'extends')
+		) {
+			 $name = $smarty->_realpath(dirname($obj->parent->source->filepath) . DS . $name);
+		}
+		return $resource->buildUniqueResourceName($smarty, $name);
+	}
+
+	/*
      * Check if resource must check time stamps when when loading complied or cached templates.
      * Resources like 'extends' which use source components my disable timestamp checks on own resource.
      *
      * @return bool
      */
-    public function checkTimestamps()
-    {
-        return true;
-    }
-
-    /**
-     * initialize Source Object for given resource
-     * wrapper for backward compatibility to versions < 3.1.22
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param  Smarty_Internal_Template $_template         template object
-     * @param  Smarty                   $smarty            smarty object
-     * @param  string                   $template_resource resource identifier
-     *
-     * @return Smarty_Template_Source   Source Object
-     */
-    public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
-                                  $template_resource = null)
-    {
-        return Smarty_Template_Source::load($_template, $smarty, $template_resource);
-    }
+	public function checkTimestamps()
+	{
+		return true;
+	}
+
+	/**
+	 * initialize Source Object for given resource
+	 * wrapper for backward compatibility to versions < 3.1.22
+	 * Either [$_template] or [$smarty, $template_resource] must be specified
+	 *
+	 * @param  Smarty_Internal_Template $_template         template object
+	 * @param  Smarty                   $smarty            smarty object
+	 * @param  string                   $template_resource resource identifier
+	 *
+	 * @return Smarty_Template_Source   Source Object
+	 */
+	public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
+								  $template_resource = null)
+	{
+		return Smarty_Template_Source::load($_template, $smarty, $template_resource);
+	}
 }
 

libraries/Smarty/libs/sysplugins/smarty_security.php

Doc Comments +7 added lines, -7 removed lines

@@ -258,7 +258,7 @@ 
      * Check if PHP function is trusted.
      *
      * @param  string $function_name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if function is trusted
      * @throws SmartyCompilerException if php function is not trusted
@@ -303,7 +303,7 @@ 
      *
      * @param  string $class_name
      * @param  string $params
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if class method is trusted
      * @throws SmartyCompilerException if static class method is not trusted
@@ -341,7 +341,7 @@ 
      * Check if PHP modifier is trusted.
      *
      * @param  string $modifier_name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if modifier is trusted
      * @throws SmartyCompilerException if modifier is not trusted
@@ -363,7 +363,7 @@ 
      * Check if tag is trusted.
      *
      * @param  string $tag_name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if tag is trusted
      * @throws SmartyCompilerException if modifier is not trusted
@@ -398,7 +398,7 @@ 
      * Check if special $smarty variable is trusted.
      *
      * @param  string $var_name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if tag is trusted
      * @throws SmartyCompilerException if modifier is not trusted
@@ -419,7 +419,7 @@ 
      * Check if modifier plugin is trusted.
      *
      * @param  string $modifier_name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return boolean                 true if tag is trusted
      * @throws SmartyCompilerException if modifier is not trusted
@@ -454,7 +454,7 @@ 
      * Check if constants are enabled or trusted
      *
      * @param  string $const    constant name
-     * @param  object $compiler compiler object
+     * @param  Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return bool
      */

Spacing +27 added lines, -27 removed lines

@@ -250,8 +250,8 @@ 
     public function __construct($smarty)
     {
         $this->smarty = $smarty;
-        $this->smarty->_cache[ 'template_dir_new' ] = true;
-        $this->smarty->_cache[ 'config_dir_new' ] = true;
+        $this->smarty->_cache['template_dir_new'] = true;
+        $this->smarty->_cache['config_dir_new'] = true;
     }
 
     /**
@@ -310,25 +310,25 @@ 
      */
     public function isTrustedStaticClassAccess($class_name, $params, $compiler)
     {
-        if (!isset($params[ 2 ])) {
+        if (!isset($params[2])) {
             // fall back
             return $this->isTrustedStaticClass($class_name, $compiler);
         }
-        if ($params[ 2 ] == 'method') {
+        if ($params[2] == 'method') {
             $allowed = $this->trusted_static_methods;
-            $name = substr($params[ 0 ], 0, strpos($params[ 0 ], '('));
+            $name = substr($params[0], 0, strpos($params[0], '('));
         } else {
             $allowed = $this->trusted_static_properties;
             // strip '$'
-            $name = substr($params[ 0 ], 1);
+            $name = substr($params[0], 1);
         }
         if (isset($allowed)) {
             if (empty($allowed)) {
                 // fall back
                 return $this->isTrustedStaticClass($class_name, $compiler);
             }
-            if (isset($allowed[ $class_name ]) &&
-                (empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
+            if (isset($allowed[$class_name]) &&
+                (empty($allowed[$class_name]) || in_array($name, $allowed[$class_name]))
             ) {
                 return true;
             }
@@ -507,55 +507,55 @@ 
     {
         if ($this->_include_path_status !== $this->smarty->use_include_path) {
             foreach ($this->_include_dir as $directory) {
-                unset($this->_resource_dir[ $directory ]);
+                unset($this->_resource_dir[$directory]);
             }
             if ($this->smarty->use_include_path) {
                 $this->_include_dir = array();
                 $_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty);
                 foreach ($_dirs as $directory) {
                     $this->_include_dir[] = $directory;
-                    $this->_resource_dir[ $directory ] = true;
+                    $this->_resource_dir[$directory] = true;
                 }
             }
             $this->_include_path_status = $this->smarty->use_include_path;
         }
         if ($isConfig !== true &&
-            (!isset($this->smarty->_cache[ 'template_dir_new' ]) || $this->smarty->_cache[ 'template_dir_new' ])
+            (!isset($this->smarty->_cache['template_dir_new']) || $this->smarty->_cache['template_dir_new'])
         ) {
             $_dir = $this->smarty->getTemplateDir();
             if ($this->_template_dir !== $_dir) {
                 foreach ($this->_template_dir as $directory) {
-                    unset($this->_resource_dir[ $directory ]);
+                    unset($this->_resource_dir[$directory]);
                 }
                 foreach ($_dir as $directory) {
-                    $this->_resource_dir[ $directory ] = true;
+                    $this->_resource_dir[$directory] = true;
                 }
                 $this->_template_dir = $_dir;
             }
-            $this->smarty->_cache[ 'template_dir_new' ] = false;
+            $this->smarty->_cache['template_dir_new'] = false;
         }
         if ($isConfig !== false &&
-            (!isset($this->smarty->_cache[ 'config_dir_new' ]) || $this->smarty->_cache[ 'config_dir_new' ])
+            (!isset($this->smarty->_cache['config_dir_new']) || $this->smarty->_cache['config_dir_new'])
         ) {
             $_dir = $this->smarty->getConfigDir();
             if ($this->_config_dir !== $_dir) {
                 foreach ($this->_config_dir as $directory) {
-                    unset($this->_resource_dir[ $directory ]);
+                    unset($this->_resource_dir[$directory]);
                 }
                 foreach ($_dir as $directory) {
-                    $this->_resource_dir[ $directory ] = true;
+                    $this->_resource_dir[$directory] = true;
                 }
                 $this->_config_dir = $_dir;
             }
-            $this->smarty->_cache[ 'config_dir_new' ] = false;
+            $this->smarty->_cache['config_dir_new'] = false;
         }
         if ($this->_secure_dir !== (array) $this->secure_dir) {
             foreach ($this->_secure_dir as $directory) {
-                unset($this->_resource_dir[ $directory ]);
+                unset($this->_resource_dir[$directory]);
             }
             foreach ((array) $this->secure_dir as $directory) {
                 $directory = $this->smarty->_realpath($directory . DS, true);
-                $this->_resource_dir[ $directory ] = true;
+                $this->_resource_dir[$directory] = true;
             }
             $this->_secure_dir = (array) $this->secure_dir;
         }
@@ -578,8 +578,8 @@ 
     public function isTrustedUri($uri)
     {
         $_uri = parse_url($uri);
-        if (!empty($_uri[ 'scheme' ]) && !empty($_uri[ 'host' ])) {
-            $_uri = $_uri[ 'scheme' ] . '://' . $_uri[ 'host' ];
+        if (!empty($_uri['scheme']) && !empty($_uri['host'])) {
+            $_uri = $_uri['scheme'] . '://' . $_uri['host'];
             foreach ($this->trusted_uri as $pattern) {
                 if (preg_match($pattern, $_uri)) {
                     return true;
@@ -611,7 +611,7 @@ 
             $this->_trusted_dir = $this->trusted_dir;
             foreach ((array) $this->trusted_dir as $directory) {
                 $directory = $this->smarty->_realpath($directory . DS, true);
-                $this->_php_resource_dir[ $directory ] = true;
+                $this->_php_resource_dir[$directory] = true;
             }
         }
 
@@ -635,9 +635,9 @@ 
         $_directory = array();
         while (true) {
             // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[ $directory ] = true;
+            $_directory[$directory] = true;
             // test if the directory is trusted
-            if (isset($dirs[ $directory ])) {
+            if (isset($dirs[$directory])) {
                 // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
                 $dirs = array_merge($dirs, $_directory);
 
@@ -693,7 +693,7 @@ 
      */
     public function startTemplate($template)
     {
-        if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
+        if ($this->max_template_nesting > 0 && $this->_current_template_nesting++ >= $this->max_template_nesting) {
             throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
         }
     }
@@ -705,7 +705,7 @@ 
     public function endTemplate()
     {
         if ($this->max_template_nesting > 0) {
-            $this->_current_template_nesting --;
+            $this->_current_template_nesting--;
         }
     }
 

Indentation +705 added lines, -705 removed lines

@@ -13,710 +13,710 @@
  */
 class Smarty_Security
 {
-    /**
-     * This determines how Smarty handles "<?php ... ?>" tags in templates.
-     * possible values:
-     * <ul>
-     *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
-     *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
-     *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
-     *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $php_handling = Smarty::PHP_PASSTHRU;
-
-    /**
-     * This is the list of template directories that are considered secure.
-     * $template_dir is in this list implicitly.
-     *
-     * @var array
-     */
-    public $secure_dir = array();
-
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     * {@link $security} is disabled during their inclusion/execution.
-     *
-     * @var array
-     */
-    public $trusted_dir = array();
-
-    /**
-     * List of regular expressions (PCRE) that include trusted URIs
-     *
-     * @var array
-     */
-    public $trusted_uri = array();
-
-    /**
-     * List of trusted constants names
-     *
-     * @var array
-     */
-    public $trusted_constants = array();
-
-    /**
-     * This is an array of trusted static classes.
-     * If empty access to all static classes is allowed.
-     * If set to 'none' none is allowed.
-     *
-     * @var array
-     */
-    public $static_classes = array();
-
-    /**
-     * This is an nested array of trusted classes and static methods.
-     * If empty access to all static classes and methods is allowed.
-     * Format:
-     * array (
-     *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
-     *         'class_2' => array(),                       // all methods of class allowed
-     *       )
-     * If set to null none is allowed.
-     *
-     * @var array
-     */
-    public $trusted_static_methods = array();
-
-    /**
-     * This is an array of trusted static properties.
-     * If empty access to all static classes and properties is allowed.
-     * Format:
-     * array (
-     *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
-     *         'class_2' => array(),                   // all properties of class allowed
-     *       )
-     * If set to null none is allowed.
-     *
-     * @var array
-     */
-    public $trusted_static_properties = array();
-
-    /**
-     * This is an array of trusted PHP functions.
-     * If empty all functions are allowed.
-     * To disable all PHP functions set $php_functions = null.
-     *
-     * @var array
-     */
-    public $php_functions = array('isset', 'empty', 'count', 'sizeof', 'in_array', 'is_array', 'time',);
-
-    /**
-     * This is an array of trusted PHP modifiers.
-     * If empty all modifiers are allowed.
-     * To disable all modifier set $php_modifiers = null.
-     *
-     * @var array
-     */
-    public $php_modifiers = array('escape', 'count', 'nl2br',);
-
-    /**
-     * This is an array of allowed tags.
-     * If empty no restriction by allowed_tags.
-     *
-     * @var array
-     */
-    public $allowed_tags = array();
-
-    /**
-     * This is an array of disabled tags.
-     * If empty no restriction by disabled_tags.
-     *
-     * @var array
-     */
-    public $disabled_tags = array();
-
-    /**
-     * This is an array of allowed modifier plugins.
-     * If empty no restriction by allowed_modifiers.
-     *
-     * @var array
-     */
-    public $allowed_modifiers = array();
-
-    /**
-     * This is an array of disabled modifier plugins.
-     * If empty no restriction by disabled_modifiers.
-     *
-     * @var array
-     */
-    public $disabled_modifiers = array();
-
-    /**
-     * This is an array of disabled special $smarty variables.
-     *
-     * @var array
-     */
-    public $disabled_special_smarty_vars = array();
-
-    /**
-     * This is an array of trusted streams.
-     * If empty all streams are allowed.
-     * To disable all streams set $streams = null.
-     *
-     * @var array
-     */
-    public $streams = array('file');
-
-    /**
-     * + flag if constants can be accessed from template
-     *
-     * @var boolean
-     */
-    public $allow_constants = true;
-
-    /**
-     * + flag if super globals can be accessed from template
-     *
-     * @var boolean
-     */
-    public $allow_super_globals = true;
-
-    /**
-     * max template nesting level
-     *
-     * @var int
-     */
-    public $max_template_nesting = 0;
-
-    /**
-     * current template nesting level
-     *
-     * @var int
-     */
-    private $_current_template_nesting = 0;
-
-    /**
-     * Cache for $resource_dir lookup
-     *
-     * @var array
-     */
-    protected $_resource_dir = array();
-
-    /**
-     * Cache for $template_dir lookup
-     *
-     * @var array
-     */
-    protected $_template_dir = array();
-
-    /**
-     * Cache for $config_dir lookup
-     *
-     * @var array
-     */
-    protected $_config_dir = array();
-
-    /**
-     * Cache for $secure_dir lookup
-     *
-     * @var array
-     */
-    protected $_secure_dir = array();
-
-    /**
-     * Cache for $php_resource_dir lookup
-     *
-     * @var array
-     */
-    protected $_php_resource_dir = null;
-
-    /**
-     * Cache for $trusted_dir lookup
-     *
-     * @var array
-     */
-    protected $_trusted_dir = null;
-
-    /**
-     * Cache for include path status
-     *
-     * @var bool
-     */
-    protected $_include_path_status = false;
-
-    /**
-     * Cache for $_include_array lookup
-     *
-     * @var array
-     */
-    protected $_include_dir = array();
-
-    /**
-     * @param Smarty $smarty
-     */
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-        $this->smarty->_cache[ 'template_dir_new' ] = true;
-        $this->smarty->_cache[ 'config_dir_new' ] = true;
-    }
-
-    /**
-     * Check if PHP function is trusted.
-     *
-     * @param  string $function_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if function is trusted
-     * @throws SmartyCompilerException if php function is not trusted
-     */
-    public function isTrustedPhpFunction($function_name, $compiler)
-    {
-        if (isset($this->php_functions) &&
-            (empty($this->php_functions) || in_array($function_name, $this->php_functions))
-        ) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if static class is trusted.
-     *
-     * @param  string $class_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if class is trusted
-     * @throws SmartyCompilerException if static class is not trusted
-     */
-    public function isTrustedStaticClass($class_name, $compiler)
-    {
-        if (isset($this->static_classes) &&
-            (empty($this->static_classes) || in_array($class_name, $this->static_classes))
-        ) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if static class method/property is trusted.
-     *
-     * @param  string $class_name
-     * @param  string $params
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if class method is trusted
-     * @throws SmartyCompilerException if static class method is not trusted
-     */
-    public function isTrustedStaticClassAccess($class_name, $params, $compiler)
-    {
-        if (!isset($params[ 2 ])) {
-            // fall back
-            return $this->isTrustedStaticClass($class_name, $compiler);
-        }
-        if ($params[ 2 ] == 'method') {
-            $allowed = $this->trusted_static_methods;
-            $name = substr($params[ 0 ], 0, strpos($params[ 0 ], '('));
-        } else {
-            $allowed = $this->trusted_static_properties;
-            // strip '$'
-            $name = substr($params[ 0 ], 1);
-        }
-        if (isset($allowed)) {
-            if (empty($allowed)) {
-                // fall back
-                return $this->isTrustedStaticClass($class_name, $compiler);
-            }
-            if (isset($allowed[ $class_name ]) &&
-                (empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
-            ) {
-                return true;
-            }
-        }
-        $compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if PHP modifier is trusted.
-     *
-     * @param  string $modifier_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if modifier is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedPhpModifier($modifier_name, $compiler)
-    {
-        if (isset($this->php_modifiers) &&
-            (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
-        ) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if tag is trusted.
-     *
-     * @param  string $tag_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedTag($tag_name, $compiler)
-    {
-        // check for internal always required tags
-        if (in_array($tag_name,
-                     array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin',
-                           'private_object_block_function', 'private_object_function', 'private_registered_function',
-                           'private_registered_block', 'private_special_variable', 'private_print_expression',
-                           'private_modifier'))) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_tags)) {
-            if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
-            }
-        } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if special $smarty variable is trusted.
-     *
-     * @param  string $var_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedSpecialSmartyVar($var_name, $compiler)
-    {
-        if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("special variable '\$smarty.{$var_name}' not allowed by security setting",
-                                              null, true);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if modifier plugin is trusted.
-     *
-     * @param  string $modifier_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedModifier($modifier_name, $compiler)
-    {
-        // check for internal always allowed modifier
-        if (in_array($modifier_name, array('default'))) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_modifiers)) {
-            if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", null,
-                                                  true);
-            }
-        } elseif (in_array($modifier_name, $this->allowed_modifiers) &&
-                  !in_array($modifier_name, $this->disabled_modifiers)
-        ) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", null,
-                                              true);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if constants are enabled or trusted
-     *
-     * @param  string $const    constant name
-     * @param  object $compiler compiler object
-     *
-     * @return bool
-     */
-    public function isTrustedConstant($const, $compiler)
-    {
-        if (in_array($const, array('true', 'false', 'null'))) {
-            return true;
-        }
-        if (!empty($this->trusted_constants)) {
-            if (!in_array($const, $this->trusted_constants)) {
-                $compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
-                return false;
-            }
-            return true;
-        }
-        if ($this->allow_constants) {
-            return true;
-        }
-        $compiler->trigger_template_error("Security: access to constants not permitted");
-        return false;
-    }
-
-    /**
-     * Check if stream is trusted.
-     *
-     * @param  string $stream_name
-     *
-     * @return boolean         true if stream is trusted
-     * @throws SmartyException if stream is not trusted
-     */
-    public function isTrustedStream($stream_name)
-    {
-        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
-            return true;
-        }
-
-        throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
-    }
-
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param  string   $filepath
-     * @param null|bool $isConfig
-     *
-     * @return bool true if directory is trusted
-     * @throws \SmartyException if directory is not trusted
-     */
-    public function isTrustedResourceDir($filepath, $isConfig = null)
-    {
-        if ($this->_include_path_status !== $this->smarty->use_include_path) {
-            foreach ($this->_include_dir as $directory) {
-                unset($this->_resource_dir[ $directory ]);
-            }
-            if ($this->smarty->use_include_path) {
-                $this->_include_dir = array();
-                $_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty);
-                foreach ($_dirs as $directory) {
-                    $this->_include_dir[] = $directory;
-                    $this->_resource_dir[ $directory ] = true;
-                }
-            }
-            $this->_include_path_status = $this->smarty->use_include_path;
-        }
-        if ($isConfig !== true &&
-            (!isset($this->smarty->_cache[ 'template_dir_new' ]) || $this->smarty->_cache[ 'template_dir_new' ])
-        ) {
-            $_dir = $this->smarty->getTemplateDir();
-            if ($this->_template_dir !== $_dir) {
-                foreach ($this->_template_dir as $directory) {
-                    unset($this->_resource_dir[ $directory ]);
-                }
-                foreach ($_dir as $directory) {
-                    $this->_resource_dir[ $directory ] = true;
-                }
-                $this->_template_dir = $_dir;
-            }
-            $this->smarty->_cache[ 'template_dir_new' ] = false;
-        }
-        if ($isConfig !== false &&
-            (!isset($this->smarty->_cache[ 'config_dir_new' ]) || $this->smarty->_cache[ 'config_dir_new' ])
-        ) {
-            $_dir = $this->smarty->getConfigDir();
-            if ($this->_config_dir !== $_dir) {
-                foreach ($this->_config_dir as $directory) {
-                    unset($this->_resource_dir[ $directory ]);
-                }
-                foreach ($_dir as $directory) {
-                    $this->_resource_dir[ $directory ] = true;
-                }
-                $this->_config_dir = $_dir;
-            }
-            $this->smarty->_cache[ 'config_dir_new' ] = false;
-        }
-        if ($this->_secure_dir !== (array) $this->secure_dir) {
-            foreach ($this->_secure_dir as $directory) {
-                unset($this->_resource_dir[ $directory ]);
-            }
-            foreach ((array) $this->secure_dir as $directory) {
-                $directory = $this->smarty->_realpath($directory . DS, true);
-                $this->_resource_dir[ $directory ] = true;
-            }
-            $this->_secure_dir = (array) $this->secure_dir;
-        }
-        $this->_resource_dir = $this->_checkDir($filepath, $this->_resource_dir);
-        return true;
-    }
-
-    /**
-     * Check if URI (e.g. {fetch} or {html_image}) is trusted
-     * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
-     * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
-     * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
-     *
-     * @param  string $uri
-     *
-     * @return boolean         true if URI is trusted
-     * @throws SmartyException if URI is not trusted
-     * @uses $trusted_uri for list of patterns to match against $uri
-     */
-    public function isTrustedUri($uri)
-    {
-        $_uri = parse_url($uri);
-        if (!empty($_uri[ 'scheme' ]) && !empty($_uri[ 'host' ])) {
-            $_uri = $_uri[ 'scheme' ] . '://' . $_uri[ 'host' ];
-            foreach ($this->trusted_uri as $pattern) {
-                if (preg_match($pattern, $_uri)) {
-                    return true;
-                }
-            }
-        }
-
-        throw new SmartyException("URI '{$uri}' not allowed by security setting");
-    }
-
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param  string $filepath
-     *
-     * @return boolean         true if directory is trusted
-     * @throws SmartyException if PHP directory is not trusted
-     */
-    public function isTrustedPHPDir($filepath)
-    {
-        if (empty($this->trusted_dir)) {
-            throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
-        }
-
-        // check if index is outdated
-        if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
-            $this->_php_resource_dir = array();
-
-            $this->_trusted_dir = $this->trusted_dir;
-            foreach ((array) $this->trusted_dir as $directory) {
-                $directory = $this->smarty->_realpath($directory . DS, true);
-                $this->_php_resource_dir[ $directory ] = true;
-            }
-        }
-
-        $this->_php_resource_dir =
-            $this->_checkDir($this->smarty->_realpath($filepath, true), $this->_php_resource_dir);
-        return true;
-    }
+	/**
+	 * This determines how Smarty handles "<?php ... ?>" tags in templates.
+	 * possible values:
+	 * <ul>
+	 *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
+	 *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
+	 *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
+	 *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
+	 * </ul>
+	 *
+	 * @var integer
+	 */
+	public $php_handling = Smarty::PHP_PASSTHRU;
+
+	/**
+	 * This is the list of template directories that are considered secure.
+	 * $template_dir is in this list implicitly.
+	 *
+	 * @var array
+	 */
+	public $secure_dir = array();
+
+	/**
+	 * This is an array of directories where trusted php scripts reside.
+	 * {@link $security} is disabled during their inclusion/execution.
+	 *
+	 * @var array
+	 */
+	public $trusted_dir = array();
+
+	/**
+	 * List of regular expressions (PCRE) that include trusted URIs
+	 *
+	 * @var array
+	 */
+	public $trusted_uri = array();
+
+	/**
+	 * List of trusted constants names
+	 *
+	 * @var array
+	 */
+	public $trusted_constants = array();
+
+	/**
+	 * This is an array of trusted static classes.
+	 * If empty access to all static classes is allowed.
+	 * If set to 'none' none is allowed.
+	 *
+	 * @var array
+	 */
+	public $static_classes = array();
+
+	/**
+	 * This is an nested array of trusted classes and static methods.
+	 * If empty access to all static classes and methods is allowed.
+	 * Format:
+	 * array (
+	 *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
+	 *         'class_2' => array(),                       // all methods of class allowed
+	 *       )
+	 * If set to null none is allowed.
+	 *
+	 * @var array
+	 */
+	public $trusted_static_methods = array();
+
+	/**
+	 * This is an array of trusted static properties.
+	 * If empty access to all static classes and properties is allowed.
+	 * Format:
+	 * array (
+	 *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+	 *         'class_2' => array(),                   // all properties of class allowed
+	 *       )
+	 * If set to null none is allowed.
+	 *
+	 * @var array
+	 */
+	public $trusted_static_properties = array();
+
+	/**
+	 * This is an array of trusted PHP functions.
+	 * If empty all functions are allowed.
+	 * To disable all PHP functions set $php_functions = null.
+	 *
+	 * @var array
+	 */
+	public $php_functions = array('isset', 'empty', 'count', 'sizeof', 'in_array', 'is_array', 'time',);
+
+	/**
+	 * This is an array of trusted PHP modifiers.
+	 * If empty all modifiers are allowed.
+	 * To disable all modifier set $php_modifiers = null.
+	 *
+	 * @var array
+	 */
+	public $php_modifiers = array('escape', 'count', 'nl2br',);
+
+	/**
+	 * This is an array of allowed tags.
+	 * If empty no restriction by allowed_tags.
+	 *
+	 * @var array
+	 */
+	public $allowed_tags = array();
+
+	/**
+	 * This is an array of disabled tags.
+	 * If empty no restriction by disabled_tags.
+	 *
+	 * @var array
+	 */
+	public $disabled_tags = array();
+
+	/**
+	 * This is an array of allowed modifier plugins.
+	 * If empty no restriction by allowed_modifiers.
+	 *
+	 * @var array
+	 */
+	public $allowed_modifiers = array();
+
+	/**
+	 * This is an array of disabled modifier plugins.
+	 * If empty no restriction by disabled_modifiers.
+	 *
+	 * @var array
+	 */
+	public $disabled_modifiers = array();
+
+	/**
+	 * This is an array of disabled special $smarty variables.
+	 *
+	 * @var array
+	 */
+	public $disabled_special_smarty_vars = array();
+
+	/**
+	 * This is an array of trusted streams.
+	 * If empty all streams are allowed.
+	 * To disable all streams set $streams = null.
+	 *
+	 * @var array
+	 */
+	public $streams = array('file');
+
+	/**
+	 * + flag if constants can be accessed from template
+	 *
+	 * @var boolean
+	 */
+	public $allow_constants = true;
+
+	/**
+	 * + flag if super globals can be accessed from template
+	 *
+	 * @var boolean
+	 */
+	public $allow_super_globals = true;
+
+	/**
+	 * max template nesting level
+	 *
+	 * @var int
+	 */
+	public $max_template_nesting = 0;
+
+	/**
+	 * current template nesting level
+	 *
+	 * @var int
+	 */
+	private $_current_template_nesting = 0;
+
+	/**
+	 * Cache for $resource_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_resource_dir = array();
+
+	/**
+	 * Cache for $template_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_template_dir = array();
+
+	/**
+	 * Cache for $config_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_config_dir = array();
+
+	/**
+	 * Cache for $secure_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_secure_dir = array();
+
+	/**
+	 * Cache for $php_resource_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_php_resource_dir = null;
+
+	/**
+	 * Cache for $trusted_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_trusted_dir = null;
+
+	/**
+	 * Cache for include path status
+	 *
+	 * @var bool
+	 */
+	protected $_include_path_status = false;
+
+	/**
+	 * Cache for $_include_array lookup
+	 *
+	 * @var array
+	 */
+	protected $_include_dir = array();
+
+	/**
+	 * @param Smarty $smarty
+	 */
+	public function __construct($smarty)
+	{
+		$this->smarty = $smarty;
+		$this->smarty->_cache[ 'template_dir_new' ] = true;
+		$this->smarty->_cache[ 'config_dir_new' ] = true;
+	}
+
+	/**
+	 * Check if PHP function is trusted.
+	 *
+	 * @param  string $function_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if function is trusted
+	 * @throws SmartyCompilerException if php function is not trusted
+	 */
+	public function isTrustedPhpFunction($function_name, $compiler)
+	{
+		if (isset($this->php_functions) &&
+			(empty($this->php_functions) || in_array($function_name, $this->php_functions))
+		) {
+			return true;
+		}
+
+		$compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if static class is trusted.
+	 *
+	 * @param  string $class_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if class is trusted
+	 * @throws SmartyCompilerException if static class is not trusted
+	 */
+	public function isTrustedStaticClass($class_name, $compiler)
+	{
+		if (isset($this->static_classes) &&
+			(empty($this->static_classes) || in_array($class_name, $this->static_classes))
+		) {
+			return true;
+		}
+
+		$compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if static class method/property is trusted.
+	 *
+	 * @param  string $class_name
+	 * @param  string $params
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if class method is trusted
+	 * @throws SmartyCompilerException if static class method is not trusted
+	 */
+	public function isTrustedStaticClassAccess($class_name, $params, $compiler)
+	{
+		if (!isset($params[ 2 ])) {
+			// fall back
+			return $this->isTrustedStaticClass($class_name, $compiler);
+		}
+		if ($params[ 2 ] == 'method') {
+			$allowed = $this->trusted_static_methods;
+			$name = substr($params[ 0 ], 0, strpos($params[ 0 ], '('));
+		} else {
+			$allowed = $this->trusted_static_properties;
+			// strip '$'
+			$name = substr($params[ 0 ], 1);
+		}
+		if (isset($allowed)) {
+			if (empty($allowed)) {
+				// fall back
+				return $this->isTrustedStaticClass($class_name, $compiler);
+			}
+			if (isset($allowed[ $class_name ]) &&
+				(empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
+			) {
+				return true;
+			}
+		}
+		$compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if PHP modifier is trusted.
+	 *
+	 * @param  string $modifier_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if modifier is trusted
+	 * @throws SmartyCompilerException if modifier is not trusted
+	 */
+	public function isTrustedPhpModifier($modifier_name, $compiler)
+	{
+		if (isset($this->php_modifiers) &&
+			(empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
+		) {
+			return true;
+		}
+
+		$compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if tag is trusted.
+	 *
+	 * @param  string $tag_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 * @throws SmartyCompilerException if modifier is not trusted
+	 */
+	public function isTrustedTag($tag_name, $compiler)
+	{
+		// check for internal always required tags
+		if (in_array($tag_name,
+					 array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin',
+						   'private_object_block_function', 'private_object_function', 'private_registered_function',
+						   'private_registered_block', 'private_special_variable', 'private_print_expression',
+						   'private_modifier'))) {
+			return true;
+		}
+		// check security settings
+		if (empty($this->allowed_tags)) {
+			if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
+				return true;
+			} else {
+				$compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
+			}
+		} elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
+			return true;
+		} else {
+			$compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
+		}
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if special $smarty variable is trusted.
+	 *
+	 * @param  string $var_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 * @throws SmartyCompilerException if modifier is not trusted
+	 */
+	public function isTrustedSpecialSmartyVar($var_name, $compiler)
+	{
+		if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
+			return true;
+		} else {
+			$compiler->trigger_template_error("special variable '\$smarty.{$var_name}' not allowed by security setting",
+											  null, true);
+		}
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if modifier plugin is trusted.
+	 *
+	 * @param  string $modifier_name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 * @throws SmartyCompilerException if modifier is not trusted
+	 */
+	public function isTrustedModifier($modifier_name, $compiler)
+	{
+		// check for internal always allowed modifier
+		if (in_array($modifier_name, array('default'))) {
+			return true;
+		}
+		// check security settings
+		if (empty($this->allowed_modifiers)) {
+			if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
+				return true;
+			} else {
+				$compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", null,
+												  true);
+			}
+		} elseif (in_array($modifier_name, $this->allowed_modifiers) &&
+				  !in_array($modifier_name, $this->disabled_modifiers)
+		) {
+			return true;
+		} else {
+			$compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", null,
+											  true);
+		}
+
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if constants are enabled or trusted
+	 *
+	 * @param  string $const    constant name
+	 * @param  object $compiler compiler object
+	 *
+	 * @return bool
+	 */
+	public function isTrustedConstant($const, $compiler)
+	{
+		if (in_array($const, array('true', 'false', 'null'))) {
+			return true;
+		}
+		if (!empty($this->trusted_constants)) {
+			if (!in_array($const, $this->trusted_constants)) {
+				$compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
+				return false;
+			}
+			return true;
+		}
+		if ($this->allow_constants) {
+			return true;
+		}
+		$compiler->trigger_template_error("Security: access to constants not permitted");
+		return false;
+	}
+
+	/**
+	 * Check if stream is trusted.
+	 *
+	 * @param  string $stream_name
+	 *
+	 * @return boolean         true if stream is trusted
+	 * @throws SmartyException if stream is not trusted
+	 */
+	public function isTrustedStream($stream_name)
+	{
+		if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
+			return true;
+		}
+
+		throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
+	}
+
+	/**
+	 * Check if directory of file resource is trusted.
+	 *
+	 * @param  string   $filepath
+	 * @param null|bool $isConfig
+	 *
+	 * @return bool true if directory is trusted
+	 * @throws \SmartyException if directory is not trusted
+	 */
+	public function isTrustedResourceDir($filepath, $isConfig = null)
+	{
+		if ($this->_include_path_status !== $this->smarty->use_include_path) {
+			foreach ($this->_include_dir as $directory) {
+				unset($this->_resource_dir[ $directory ]);
+			}
+			if ($this->smarty->use_include_path) {
+				$this->_include_dir = array();
+				$_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty);
+				foreach ($_dirs as $directory) {
+					$this->_include_dir[] = $directory;
+					$this->_resource_dir[ $directory ] = true;
+				}
+			}
+			$this->_include_path_status = $this->smarty->use_include_path;
+		}
+		if ($isConfig !== true &&
+			(!isset($this->smarty->_cache[ 'template_dir_new' ]) || $this->smarty->_cache[ 'template_dir_new' ])
+		) {
+			$_dir = $this->smarty->getTemplateDir();
+			if ($this->_template_dir !== $_dir) {
+				foreach ($this->_template_dir as $directory) {
+					unset($this->_resource_dir[ $directory ]);
+				}
+				foreach ($_dir as $directory) {
+					$this->_resource_dir[ $directory ] = true;
+				}
+				$this->_template_dir = $_dir;
+			}
+			$this->smarty->_cache[ 'template_dir_new' ] = false;
+		}
+		if ($isConfig !== false &&
+			(!isset($this->smarty->_cache[ 'config_dir_new' ]) || $this->smarty->_cache[ 'config_dir_new' ])
+		) {
+			$_dir = $this->smarty->getConfigDir();
+			if ($this->_config_dir !== $_dir) {
+				foreach ($this->_config_dir as $directory) {
+					unset($this->_resource_dir[ $directory ]);
+				}
+				foreach ($_dir as $directory) {
+					$this->_resource_dir[ $directory ] = true;
+				}
+				$this->_config_dir = $_dir;
+			}
+			$this->smarty->_cache[ 'config_dir_new' ] = false;
+		}
+		if ($this->_secure_dir !== (array) $this->secure_dir) {
+			foreach ($this->_secure_dir as $directory) {
+				unset($this->_resource_dir[ $directory ]);
+			}
+			foreach ((array) $this->secure_dir as $directory) {
+				$directory = $this->smarty->_realpath($directory . DS, true);
+				$this->_resource_dir[ $directory ] = true;
+			}
+			$this->_secure_dir = (array) $this->secure_dir;
+		}
+		$this->_resource_dir = $this->_checkDir($filepath, $this->_resource_dir);
+		return true;
+	}
+
+	/**
+	 * Check if URI (e.g. {fetch} or {html_image}) is trusted
+	 * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
+	 * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
+	 * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
+	 *
+	 * @param  string $uri
+	 *
+	 * @return boolean         true if URI is trusted
+	 * @throws SmartyException if URI is not trusted
+	 * @uses $trusted_uri for list of patterns to match against $uri
+	 */
+	public function isTrustedUri($uri)
+	{
+		$_uri = parse_url($uri);
+		if (!empty($_uri[ 'scheme' ]) && !empty($_uri[ 'host' ])) {
+			$_uri = $_uri[ 'scheme' ] . '://' . $_uri[ 'host' ];
+			foreach ($this->trusted_uri as $pattern) {
+				if (preg_match($pattern, $_uri)) {
+					return true;
+				}
+			}
+		}
+
+		throw new SmartyException("URI '{$uri}' not allowed by security setting");
+	}
+
+	/**
+	 * Check if directory of file resource is trusted.
+	 *
+	 * @param  string $filepath
+	 *
+	 * @return boolean         true if directory is trusted
+	 * @throws SmartyException if PHP directory is not trusted
+	 */
+	public function isTrustedPHPDir($filepath)
+	{
+		if (empty($this->trusted_dir)) {
+			throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
+		}
+
+		// check if index is outdated
+		if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
+			$this->_php_resource_dir = array();
+
+			$this->_trusted_dir = $this->trusted_dir;
+			foreach ((array) $this->trusted_dir as $directory) {
+				$directory = $this->smarty->_realpath($directory . DS, true);
+				$this->_php_resource_dir[ $directory ] = true;
+			}
+		}
+
+		$this->_php_resource_dir =
+			$this->_checkDir($this->smarty->_realpath($filepath, true), $this->_php_resource_dir);
+		return true;
+	}
     
-    /**
-     * Check if file is inside a valid directory
-     *
-     * @param string $filepath
-     * @param array  $dirs valid directories
-     *
-     * @return array
-     * @throws \SmartyException
-     */
-    private function _checkDir($filepath, $dirs)
-    {
-        $directory = dirname($filepath) . DS;
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[ $directory ] = true;
-            // test if the directory is trusted
-            if (isset($dirs[ $directory ])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
-                $dirs = array_merge($dirs, $_directory);
-
-                return $dirs;
-            }
-            // abort if we've reached root
-            if (!preg_match('#[\\\/][^\\\/]+[\\\/]$#', $directory)) {
-                break;
-            }
-            // bubble up one level
-            $directory = preg_replace('#[\\\/][^\\\/]+[\\\/]$#', DS, $directory);
-        }
-
-        // give up
-        throw new SmartyException("directory '{$filepath}' not allowed by security setting");
-    }
-
-    /**
-     * Loads security class and enables security
-     *
-     * @param \Smarty                 $smarty
-     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
-     *
-     * @return \Smarty current Smarty instance for chaining
-     * @throws \SmartyException when an invalid class name is provided
-     */
-    public static function enableSecurity(Smarty $smarty, $security_class)
-    {
-        if ($security_class instanceof Smarty_Security) {
-            $smarty->security_policy = $security_class;
-            return;
-        } elseif (is_object($security_class)) {
-            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
-        }
-        if ($security_class === null) {
-            $security_class = $smarty->security_class;
-        }
-        if (!class_exists($security_class)) {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
-            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
-        } else {
-            $smarty->security_policy = new $security_class($smarty);
-        }
-        return;
-    }
-    /**
-     * Start template processing
-     *
-     * @param $template
-     *
-     * @throws SmartyException
-     */
-    public function startTemplate($template)
-    {
-        if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
-            throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
-        }
-    }
-
-    /**
-     * Exit template processing
-     *
-     */
-    public function endTemplate()
-    {
-        if ($this->max_template_nesting > 0) {
-            $this->_current_template_nesting --;
-        }
-    }
-
-    /**
-     * Register callback functions call at start/end of template rendering
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function registerCallBacks(Smarty_Internal_Template $template)
-    {
-        $template->startRenderCallbacks[] = array($this, 'startTemplate');
-        $template->endRenderCallbacks[] = array($this, 'endTemplate');
-    }
+	/**
+	 * Check if file is inside a valid directory
+	 *
+	 * @param string $filepath
+	 * @param array  $dirs valid directories
+	 *
+	 * @return array
+	 * @throws \SmartyException
+	 */
+	private function _checkDir($filepath, $dirs)
+	{
+		$directory = dirname($filepath) . DS;
+		$_directory = array();
+		while (true) {
+			// remember the directory to add it to _resource_dir in case we're successful
+			$_directory[ $directory ] = true;
+			// test if the directory is trusted
+			if (isset($dirs[ $directory ])) {
+				// merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
+				$dirs = array_merge($dirs, $_directory);
+
+				return $dirs;
+			}
+			// abort if we've reached root
+			if (!preg_match('#[\\\/][^\\\/]+[\\\/]$#', $directory)) {
+				break;
+			}
+			// bubble up one level
+			$directory = preg_replace('#[\\\/][^\\\/]+[\\\/]$#', DS, $directory);
+		}
+
+		// give up
+		throw new SmartyException("directory '{$filepath}' not allowed by security setting");
+	}
+
+	/**
+	 * Loads security class and enables security
+	 *
+	 * @param \Smarty                 $smarty
+	 * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
+	 *
+	 * @return \Smarty current Smarty instance for chaining
+	 * @throws \SmartyException when an invalid class name is provided
+	 */
+	public static function enableSecurity(Smarty $smarty, $security_class)
+	{
+		if ($security_class instanceof Smarty_Security) {
+			$smarty->security_policy = $security_class;
+			return;
+		} elseif (is_object($security_class)) {
+			throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
+		}
+		if ($security_class === null) {
+			$security_class = $smarty->security_class;
+		}
+		if (!class_exists($security_class)) {
+			throw new SmartyException("Security class '$security_class' is not defined");
+		} elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
+			throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
+		} else {
+			$smarty->security_policy = new $security_class($smarty);
+		}
+		return;
+	}
+	/**
+	 * Start template processing
+	 *
+	 * @param $template
+	 *
+	 * @throws SmartyException
+	 */
+	public function startTemplate($template)
+	{
+		if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
+			throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
+		}
+	}
+
+	/**
+	 * Exit template processing
+	 *
+	 */
+	public function endTemplate()
+	{
+		if ($this->max_template_nesting > 0) {
+			$this->_current_template_nesting --;
+		}
+	}
+
+	/**
+	 * Register callback functions call at start/end of template rendering
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function registerCallBacks(Smarty_Internal_Template $template)
+	{
+		$template->startRenderCallbacks[] = array($this, 'startTemplate');
+		$template->endRenderCallbacks[] = array($this, 'endTemplate');
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_template_source.php

Doc Comments -1 removed lines

@@ -126,7 +126,6 @@
     /**
      * create Source Object container
      *
-     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
      * @param Smarty          $smarty   Smarty instance this source object belongs to
      * @param string          $resource full template_resource
      * @param string          $type     type of resource

Indentation +196 added lines, -196 removed lines

@@ -11,200 +11,200 @@
  */
 class Smarty_Template_Source
 {
-    /**
-     * Unique Template ID
-     *
-     * @var string
-     */
-    public $uid = null;
-
-    /**
-     * Template Resource (Smarty_Internal_Template::$template_resource)
-     *
-     * @var string
-     */
-    public $resource = null;
-
-    /**
-     * Resource Type
-     *
-     * @var string
-     */
-    public $type = null;
-
-    /**
-     * Resource Name
-     *
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * Source Filepath
-     *
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Source Timestamp
-     *
-     * @var integer
-     */
-    public $timestamp = null;
-
-    /**
-     * Source Existence
-     *
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Source File Base name
-     *
-     * @var string
-     */
-    public $basename = null;
-
-    /**
-     * The Components an extended template is made of
-     *
-     * @var \Smarty_Template_Source[]
-     */
-    public $components = null;
-
-    /**
-     * Resource Handler
-     *
-     * @var \Smarty_Resource
-     */
-    public $handler = null;
-
-    /**
-     * Smarty instance
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * Resource is source
-     *
-     * @var bool
-     */
-    public $isConfig = false;
-
-    /**
-     * Template source content eventually set by default handler
-     *
-     * @var string
-     */
-    public $content = null;
-
-    /**
-     * Name of the Class to compile this resource's contents with
-     *
-     * @var string
-     */
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     *
-     * @var string
-     */
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     *
-     * @var string
-     */
-    public $template_parser_class = 'Smarty_Internal_Templateparser';
-
-    /**
-     * create Source Object container
-     *
-     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
-     * @param Smarty          $smarty   Smarty instance this source object belongs to
-     * @param string          $resource full template_resource
-     * @param string          $type     type of resource
-     * @param string          $name     resource name
-     *
-     */
-    public function __construct(Smarty $smarty, $resource, $type, $name)
-    {
-        $this->handler =
-            isset($smarty->_cache[ 'resource_handlers' ][ $type ]) ? $smarty->_cache[ 'resource_handlers' ][ $type ] :
-                Smarty_Resource::load($smarty, $type);
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-    }
-
-    /**
-     * initialize Source Object for given resource
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param  Smarty_Internal_Template $_template         template object
-     * @param  Smarty                   $smarty            smarty object
-     * @param  string                   $template_resource resource identifier
-     *
-     * @return Smarty_Template_Source Source Object
-     * @throws SmartyException
-     */
-    public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
-                                $template_resource = null)
-    {
-        if ($_template) {
-            $smarty = $_template->smarty;
-            $template_resource = $_template->template_resource;
-        }
-        if (empty($template_resource)) {
-            throw new SmartyException('Source: Missing  name');
-        }
-        // parse resource_name, load resource handler, identify unique resource name
-        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
-            $type = $match[ 1 ];
-            $name = $match[ 2 ];
-        } else {
-            // no resource given, use default
-            // or single character before the colon is not a resource type, but part of the filepath
-            $type = $smarty->default_resource_type;
-            $name = $template_resource;
-        }
-        // create new source  object
-        $source = new Smarty_Template_Source($smarty, $template_resource, $type, $name);
-        $source->handler->populate($source, $_template);
-        if (!$source->exists && isset($_template->smarty->default_template_handler_func)) {
-            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
-            $source->handler->populate($source, $_template);
-        }
-        return $source;
-    }
-
-    /**
-     * Get source time stamp
-     *
-     * @return int
-     */
-    public function getTimeStamp()
-    {
-        if (!isset($this->timestamp)) {
-            $this->handler->populateTimestamp($this);
-        }
-        return $this->timestamp;
-    }
-
-    /**
-     * Get source content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        return isset($this->content) ? $this->content : $this->handler->getContent($this);
-    }
+	/**
+	 * Unique Template ID
+	 *
+	 * @var string
+	 */
+	public $uid = null;
+
+	/**
+	 * Template Resource (Smarty_Internal_Template::$template_resource)
+	 *
+	 * @var string
+	 */
+	public $resource = null;
+
+	/**
+	 * Resource Type
+	 *
+	 * @var string
+	 */
+	public $type = null;
+
+	/**
+	 * Resource Name
+	 *
+	 * @var string
+	 */
+	public $name = null;
+
+	/**
+	 * Source Filepath
+	 *
+	 * @var string
+	 */
+	public $filepath = null;
+
+	/**
+	 * Source Timestamp
+	 *
+	 * @var integer
+	 */
+	public $timestamp = null;
+
+	/**
+	 * Source Existence
+	 *
+	 * @var boolean
+	 */
+	public $exists = false;
+
+	/**
+	 * Source File Base name
+	 *
+	 * @var string
+	 */
+	public $basename = null;
+
+	/**
+	 * The Components an extended template is made of
+	 *
+	 * @var \Smarty_Template_Source[]
+	 */
+	public $components = null;
+
+	/**
+	 * Resource Handler
+	 *
+	 * @var \Smarty_Resource
+	 */
+	public $handler = null;
+
+	/**
+	 * Smarty instance
+	 *
+	 * @var Smarty
+	 */
+	public $smarty = null;
+
+	/**
+	 * Resource is source
+	 *
+	 * @var bool
+	 */
+	public $isConfig = false;
+
+	/**
+	 * Template source content eventually set by default handler
+	 *
+	 * @var string
+	 */
+	public $content = null;
+
+	/**
+	 * Name of the Class to compile this resource's contents with
+	 *
+	 * @var string
+	 */
+	public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+
+	/**
+	 * Name of the Class to tokenize this resource's contents with
+	 *
+	 * @var string
+	 */
+	public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+
+	/**
+	 * Name of the Class to parse this resource's contents with
+	 *
+	 * @var string
+	 */
+	public $template_parser_class = 'Smarty_Internal_Templateparser';
+
+	/**
+	 * create Source Object container
+	 *
+	 * @param Smarty_Resource $handler  Resource Handler this source object communicates with
+	 * @param Smarty          $smarty   Smarty instance this source object belongs to
+	 * @param string          $resource full template_resource
+	 * @param string          $type     type of resource
+	 * @param string          $name     resource name
+	 *
+	 */
+	public function __construct(Smarty $smarty, $resource, $type, $name)
+	{
+		$this->handler =
+			isset($smarty->_cache[ 'resource_handlers' ][ $type ]) ? $smarty->_cache[ 'resource_handlers' ][ $type ] :
+				Smarty_Resource::load($smarty, $type);
+		$this->smarty = $smarty;
+		$this->resource = $resource;
+		$this->type = $type;
+		$this->name = $name;
+	}
+
+	/**
+	 * initialize Source Object for given resource
+	 * Either [$_template] or [$smarty, $template_resource] must be specified
+	 *
+	 * @param  Smarty_Internal_Template $_template         template object
+	 * @param  Smarty                   $smarty            smarty object
+	 * @param  string                   $template_resource resource identifier
+	 *
+	 * @return Smarty_Template_Source Source Object
+	 * @throws SmartyException
+	 */
+	public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
+								$template_resource = null)
+	{
+		if ($_template) {
+			$smarty = $_template->smarty;
+			$template_resource = $_template->template_resource;
+		}
+		if (empty($template_resource)) {
+			throw new SmartyException('Source: Missing  name');
+		}
+		// parse resource_name, load resource handler, identify unique resource name
+		if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
+			$type = $match[ 1 ];
+			$name = $match[ 2 ];
+		} else {
+			// no resource given, use default
+			// or single character before the colon is not a resource type, but part of the filepath
+			$type = $smarty->default_resource_type;
+			$name = $template_resource;
+		}
+		// create new source  object
+		$source = new Smarty_Template_Source($smarty, $template_resource, $type, $name);
+		$source->handler->populate($source, $_template);
+		if (!$source->exists && isset($_template->smarty->default_template_handler_func)) {
+			Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+			$source->handler->populate($source, $_template);
+		}
+		return $source;
+	}
+
+	/**
+	 * Get source time stamp
+	 *
+	 * @return int
+	 */
+	public function getTimeStamp()
+	{
+		if (!isset($this->timestamp)) {
+			$this->handler->populateTimestamp($this);
+		}
+		return $this->timestamp;
+	}
+
+	/**
+	 * Get source content
+	 *
+	 * @return string
+	 */
+	public function getContent()
+	{
+		return isset($this->content) ? $this->content : $this->handler->getContent($this);
+	}
 }

Spacing +3 added lines, -4 removed lines

@@ -136,8 +136,7 @@ 
     public function __construct(Smarty $smarty, $resource, $type, $name)
     {
         $this->handler =
-            isset($smarty->_cache[ 'resource_handlers' ][ $type ]) ? $smarty->_cache[ 'resource_handlers' ][ $type ] :
-                Smarty_Resource::load($smarty, $type);
+            isset($smarty->_cache['resource_handlers'][$type]) ? $smarty->_cache['resource_handlers'][$type] : Smarty_Resource::load($smarty, $type);
         $this->smarty = $smarty;
         $this->resource = $resource;
         $this->type = $type;
@@ -167,8 +166,8 @@ 
         }
         // parse resource_name, load resource handler, identify unique resource name
         if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
-            $type = $match[ 1 ];
-            $name = $match[ 2 ];
+            $type = $match[1];
+            $name = $match[2];
         } else {
             // no resource given, use default
             // or single character before the colon is not a resource type, but part of the filepath

modules/Accounts/Accounts.php

Doc Comments +2 added lines, -1 removed lines

@@ -611,6 +611,7 @@ 
 	 * @param  integer   $id      		- accountid
 	 * @param  array   $parent_accounts   - Array of all the parent accounts
 	 * returns All the parent accounts of the given accountid in array format
+	 * @param integer[] $encountered_accounts
 	 */
 	public function __getParentAccounts($id, &$parent_accounts, &$encountered_accounts, $depthBase = 0)
 	{
@@ -673,7 +674,7 @@ 
 	 * Function to Recursively get all the child accounts of a given Account
 	 * @param  integer   $id      		- accountid
 	 * @param  array   $child_accounts   - Array of all the child accounts
-	 * @param  integer   $depth          - Depth at which the particular account has to be placed in the hierarchy
+	 * @param  integer   $depthBase          - Depth at which the particular account has to be placed in the hierarchy
 	 * returns All the child accounts of the given accountid in array format
 	 */
 	public function __getChildAccounts($id, &$child_accounts, $depthBase)

Braces +23 added lines, -16 removed lines

@@ -113,10 +113,11 @@ 
 		$query .= $this->getNonAdminAccessControlQuery('Accounts', $current_user);
 		$where_auto = " vtiger_crmentity.deleted = 0 ";
 
-		if ($where != '')
-			$query .= sprintf(' where (%s) && %s', $where, $where_auto);
-		else
-			$query .= sprintf(' where %s', $where_auto);
+		if ($where != '') {
+					$query .= sprintf(' where (%s) && %s', $where, $where_auto);
+		} else {
+					$query .= sprintf(' where %s', $where_auto);
+		}
 
 		\App\Log::trace("Exiting create_export_query method ...");
 		return $query;
@@ -435,8 +436,9 @@ 
 	public function unlinkRelationship($id, $return_module, $return_id, $relatedName = false)
 	{
 
-		if (empty($return_module) || empty($return_id))
-			return;
+		if (empty($return_module) || empty($return_id)) {
+					return;
+		}
 
 		if ($return_module == 'Campaigns') {
 			$this->db->delete('vtiger_campaign_records', 'crmid=? && campaignid=?', [$id, $return_id]);
@@ -451,8 +453,9 @@ 
 	public function save_related_module($module, $crmid, $with_module, $with_crmids, $relatedName = false)
 	{
 		$db = PearDatabase::getInstance();
-		if (!is_array($with_crmids))
-			$with_crmids = [$with_crmids];
+		if (!is_array($with_crmids)) {
+					$with_crmids = [$with_crmids];
+		}
 		if (!in_array($with_module, ['Products', 'Campaigns'])) {
 			parent::save_related_module($module, $crmid, $with_module, $with_crmids, $relatedName);
 		} else {
@@ -502,10 +505,12 @@ 
 					continue;
 				}
 				// Setup the default JOIN conditions if not specified
-				if (empty($relmap[1]))
-					$relmap[1] = $other->table_name;
-				if (empty($relmap[2]))
-					$relmap[2] = $relmap[0];
+				if (empty($relmap[1])) {
+									$relmap[1] = $other->table_name;
+				}
+				if (empty($relmap[2])) {
+									$relmap[2] = $relmap[0];
+				}
 				$join .= " LEFT JOIN $tname ON $tname.$relmap[0] = $relmap[1].$relmap[2]";
 			}
 		}
@@ -530,14 +535,16 @@ 
 	public function getRelatedContactsIds($id = null)
 	{
 
-		if ($id === null)
-			$id = $this->id;
+		if ($id === null) {
+					$id = $this->id;
+		}
 		$query = (new \App\Db\Query())->select('contactid')->from('vtiger_contactdetails')
 			->innerJoin('vtiger_crmentity', 'vtiger_contactdetails.contactid = vtiger_crmentity.crmid')
 			->where(['vtiger_contactdetails.parentid' => $id, 'vtiger_crmentity.deleted' => 0]);
 		$entityIds = $query->column();
-		if (empty($entityIds))
-			$entityIds = [];
+		if (empty($entityIds)) {
+					$entityIds = [];
+		}
 
 		return $entityIds;
 	}

modules/Assets/dashboards/ExpiringSoldProducts.php

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
 		}
 	}
 
+	/**
+	 * @param Vtiger_Widget_Model $widget
+	 */
 	public function getData(Vtiger_Request $request, $widget)
 	{
 		$db = PearDatabase::getInstance();

modules/Calendar/Appointment.php

Doc Comments +4 added lines, -1 removed lines

@@ -56,7 +56,7 @@ 
 	 * @param $userid -- The user Id:: Type integer
 	 * @param $from_datetime -- The start date Obj :: Type Array
 	 * @param $to_datetime -- The end date Obj :: Type Array
-	 * @param $view -- The calendar view :: Type String
+	 * @param string $view -- The calendar view :: Type String
 	 * @returns $list :: Type Array
 	 */
 	public function readAppointment($userid, &$from_datetime, &$to_datetime, $view)
@@ -286,6 +286,9 @@ 
 	return ($a->start_time->ts < $b->start_time->ts) ? -1 : 1;
 }
 
+/**
+ * @param string $fldname
+ */
 function getRoleBasesdPickList($fldname, $exist_val)
 {
 	$adb = PearDatabase::getInstance();

Braces +16 added lines, -11 removed lines

@@ -222,13 +222,15 @@ 
 				$que = "select * from vtiger_sharedcalendar where sharedid=? and userid=?";
 				$row = $adb->pquery($que, array($currentUser->id, $act_array["smownerid"]));
 				$no = $adb->getRowCount($row);
-				if ($no > 0)
-					$this->shared = true;
+				if ($no > 0) {
+									$this->shared = true;
+				}
 			}
 		}
 		$this->image_name = $act_array["activitytype"] . ".gif";
-		if (!empty($act_array["recurringid"]) && !empty($act_array["recurringtype"]))
-			$this->recurring = "Recurring.gif";
+		if (!empty($act_array["recurringid"]) && !empty($act_array["recurringtype"])) {
+					$this->recurring = "Recurring.gif";
+		}
 
 		$this->record = $act_array["activityid"];
 		$date = new DateTimeField($act_array["date_start"] . ' ' . $act_array['time_start']);
@@ -296,8 +298,9 @@ 
 		$roleid = $currentUser->roleid;
 		$roleids = Array();
 		$subrole = getRoleSubordinates($roleid);
-		if (count($subrole) > 0)
-			$roleids = $subrole;
+		if (count($subrole) > 0) {
+					$roleids = $subrole;
+		}
 		array_push($roleids, $roleid);
 
 		//here we are checking wheather the table contains the sortorder column .If  sortorder is present in the main picklist table, then the role2picklist will be applicable for this table...
@@ -311,12 +314,14 @@ 
 			$res_val = $adb->pquery($pick_query, array($roleids));
 			$num_val = $adb->num_rows($res_val);
 		}
-		if ($num_val > 0)
+		if ($num_val > 0) {
+					$pick_val = $exist_val;
+		} else {
+					$pick_val = \App\Language::translate('LBL_NOT_ACCESSIBLE');
+		}
+	} else {
 			$pick_val = $exist_val;
-		else
-			$pick_val = \App\Language::translate('LBL_NOT_ACCESSIBLE');
-	} else
-		$pick_val = $exist_val;
+	}
 
 	return $pick_val;
 }

modules/Calendar/Date.php

Doc Comments +1 added lines, -5 removed lines

@@ -384,7 +384,7 @@ 
 
 	/**
 	 *
-	 * @return Date
+	 * @return string
 	 */
 	public function get_DB_formatted_date()
 	{
@@ -529,10 +529,6 @@ 
 	 * This should be used whereever possible
 	 *
 	 * @param integer       $index - number between 0 to 42
-	 * @param string        $day   - date
-	 * @param string        $month - month
-	 * @param string        $year  - year
-	 * return vt_DateTime obj  $datetimevalue
 	 */
 	public function getThisMonthsDayByIndex($index)
 	{

Braces +37 added lines, -26 removed lines

@@ -87,12 +87,15 @@ 
 	 */
 	public function getTodayDatetimebyIndex($index, $day = '', $month = '', $year = '')
 	{
-		if ($day === '')
-			$day = $this->day;
-		if ($month === '')
-			$month = $this->month;
-		if ($year === '')
-			$year = $this->year;
+		if ($day === '') {
+					$day = $this->day;
+		}
+		if ($month === '') {
+					$month = $this->month;
+		}
+		if ($year === '') {
+					$year = $this->year;
+		}
 		$day_array = array();
 
 		if ($index < 0 || $index > 23) {
@@ -140,12 +143,15 @@ 
 	 */
 	public function getThismonthDaysbyIndex($index, $day = '', $month = '', $year = '')
 	{
-		if ($day == '')
-			$day = $index + 1;
-		if ($month == '')
-			$month = $this->month;
-		if ($year == '')
-			$year = $this->year;
+		if ($day == '') {
+					$day = $index + 1;
+		}
+		if ($month == '') {
+					$month = $this->month;
+		}
+		if ($year == '') {
+					$year = $this->year;
+		}
 		$month_array = array();
 		$month_array['day'] = $day;
 		$month_array['month'] = $month;
@@ -356,8 +362,9 @@ 
 		} else {
 			die("year was not set");
 		}
-		if (empty($hour) && $hour !== 0)
-			$hour = 0;
+		if (empty($hour) && $hour !== 0) {
+					$hour = 0;
+		}
 		$this->ts = mktime($hour, $minute, $second, $month, $day, $year);
 		$this->setDateTime($this->ts);
 	}
@@ -399,10 +406,12 @@ 
 	{
 		$hour = $this->z_hour;
 		$min = $this->minute;
-		if (empty($hour))
-			$hour = '00';
-		if (empty($min))
-			$min = '00';
+		if (empty($hour)) {
+					$hour = '00';
+		}
+		if (empty($min)) {
+					$min = '00';
+		}
 		return $hour . ':' . $min;
 	}
 
@@ -413,10 +422,11 @@ 
 	 */
 	public function get_changed_day($mode)
 	{
-		if ($mode == 'increment')
-			$day = $this->day + 1;
-		else
-			$day = $this->day - 1;
+		if ($mode == 'increment') {
+					$day = $this->day + 1;
+		} else {
+					$day = $this->day - 1;
+		}
 		$date_data = array('day' => $day,
 			'month' => $this->month,
 			'year' => $this->year
@@ -432,10 +442,11 @@ 
 	public function get_first_day_of_changed_week($mode)
 	{
 		$first_day = $this->getThisweekDaysbyIndex(1);
-		if ($mode == 'increment')
-			$day = $first_day->day + 7;
-		else
-			$day = $first_day->day - 7;
+		if ($mode == 'increment') {
+					$day = $first_day->day + 7;
+		} else {
+					$day = $first_day->day - 7;
+		}
 		$date_data = array('day' => $day,
 			'month' => $first_day->month,
 			'year' => $first_day->year