diff --git a/bundled-libs/Smarty/README b/bundled-libs/Smarty/README index 11cf265e..d7b5df3e 100644 --- a/bundled-libs/Smarty/README +++ b/bundled-libs/Smarty/README @@ -1,4 +1,4 @@ -Smarty 3.1.17 +Smarty 3.1.18 Author: Monte Ohrt Author: Uwe Tews diff --git a/bundled-libs/Smarty/change_log.txt b/bundled-libs/Smarty/change_log.txt index 64fd1f87..22db50b3 100644 --- a/bundled-libs/Smarty/change_log.txt +++ b/bundled-libs/Smarty/change_log.txt @@ -1,4 +1,33 @@ ===== trunk ===== + ===== 3.1.18 ===== + 06.04.2014 + - bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187) + - bugfix update of composer file (Issue 168 and 184) + + 05.04.2014 + - bugfix default date format leads to extra spaces when displaying dates with single digit days (Issue 182) + + 26.03.2014 + - bugfix Smart_Resource_Custom should not lowercase the resource name (Issue 183) + + 24.03.2014 + - bugfix using a {foreach} property like @iteration could fail when used in inheritance parent templates (Issue 182) + + 20.03.2014 + - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899) + + 18.03.2014 + - revert change of 17.03.2014 + + 17.03.2014 + - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899) + + 15.03.2014 + - bugfix Smarty_CacheResource_Keyvaluestore did use different keys on read/writes and clearCache() calls (Issue 169) + + 13.03.2014 + - bugfix clearXxx() change of 27.1.2014 did not work when specifing cache_id or compile_id (forum topic 24868 and 24867) + ===== 3.1.17 ===== 08.03.2014 - bugfix relative file path {include} within {block} of child templates did throw exception on first call (Issue 177) diff --git a/bundled-libs/Smarty/libs/Smarty.class.php b/bundled-libs/Smarty/libs/Smarty.class.php index 0275e89a..9debb6c3 100644 --- a/bundled-libs/Smarty/libs/Smarty.class.php +++ b/bundled-libs/Smarty/libs/Smarty.class.php @@ -2,7 +2,7 @@ /** * Project: Smarty: the PHP compiling template engine * File: Smarty.class.php - * SVN: $Id: Smarty.class.php 4814 2014-02-16 18:34:08Z Uwe.Tews@googlemail.com $ + * SVN: $Id: Smarty.class.php 4828 2014-04-04 23:38:36Z Uwe.Tews@googlemail.com $ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,7 +28,7 @@ * @author Uwe Tews * @author Rodney Rehm * @package Smarty - * @version 3.1.17 + * @version 3.1-18 */ /** @@ -70,7 +70,7 @@ if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) { /** * @deprecated in favor of Smarty::$_DATE_FORMAT */ - define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y'); + define('SMARTY_RESOURCE_DATE_FORMAT', '%b %-e, %Y'); } /** @@ -113,7 +113,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = 'Smarty-3.1.17'; + const SMARTY_VERSION = 'Smarty-3.1.18'; /** * define variable scopes diff --git a/bundled-libs/Smarty/libs/plugins/modifier.capitalize.php b/bundled-libs/Smarty/libs/plugins/modifier.capitalize.php index 8e7a55fa..c1e3adb1 100644 --- a/bundled-libs/Smarty/libs/plugins/modifier.capitalize.php +++ b/bundled-libs/Smarty/libs/plugins/modifier.capitalize.php @@ -62,7 +62,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals return $upper_string; } -/* +/** * * Bug: create_function() use exhausts memory when used in long loops * Fix: use declared functions for callbacks instead of using create_function() diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/bundled-libs/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php index 0b927aab..1c7c7814 100644 --- a/bundled-libs/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php +++ b/bundled-libs/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php @@ -54,7 +54,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template) { $cached->filepath = $_template->source->uid - . '#' . $this->sanitize($cached->source->name) + . '#' . $this->sanitize($cached->source->resource) . '#' . $this->sanitize($cached->cache_id) . '#' . $this->sanitize($cached->compile_id); diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_block.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_block.php index 377288df..02546c0b 100644 --- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_block.php +++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_block.php @@ -84,7 +84,7 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase $this->template->block_data[$_name]['source'] = ''; // build {block} for child block self::$block_data[$_name]['source'] = - "{$compiler->smarty->left_delimiter}private_child_block name={$_attr['name']} file='{$compiler->template->source->filepath}'" . + "{$compiler->smarty->left_delimiter}private_child_block name={$_attr['name']} file='{$compiler->template->source->filepath}' type='{$compiler->template->source->type}' resource='{$compiler->template->template_resource}'" . " uid='{$compiler->template->source->uid}' line={$compiler->lex->line}"; if ($_attr['nocache']) { self::$block_data[$_name]['source'] .= ' nocache'; @@ -361,7 +361,7 @@ class Smarty_Internal_Compile_Private_Child_Block extends Smarty_Internal_Compil * @var array * @see Smarty_Internal_CompileBase */ - public $required_attributes = array('name', 'file', 'uid', 'line'); + public $required_attributes = array('name', 'file', 'uid', 'line', 'type', 'resource'); /** @@ -377,7 +377,11 @@ class Smarty_Internal_Compile_Private_Child_Block extends Smarty_Internal_Compil $_attr = $this->getAttributes($compiler, $args); // update template with original template resource of {block} - $compiler->template->template_resource = realpath(trim($_attr['file'], "'")); + if (trim($_attr['type'], "'") == 'file') { + $compiler->template->template_resource = realpath(trim($_attr['file'], "'")); + } else { + $compiler->template->template_resource = trim($_attr['resource'], "'"); + } // source object unset ($compiler->template->source); $exists = $compiler->template->source->exists; diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php index 7d138398..06ef00cd 100644 --- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php +++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php @@ -49,7 +49,6 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase */ public function compile($args, $compiler, $parameter) { - $tpl = $compiler->template; // check and get attributes $_attr = $this->getAttributes($compiler, $args); @@ -80,12 +79,12 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase $ItemVarName = '$' . trim($item, '\'"') . '@'; // evaluates which Smarty variables and properties have to be computed if ($has_name) { - $usesSmartyFirst = strpos($tpl->source->content, $SmartyVarName . 'first') !== false; - $usesSmartyLast = strpos($tpl->source->content, $SmartyVarName . 'last') !== false; - $usesSmartyIndex = strpos($tpl->source->content, $SmartyVarName . 'index') !== false; - $usesSmartyIteration = strpos($tpl->source->content, $SmartyVarName . 'iteration') !== false; - $usesSmartyShow = strpos($tpl->source->content, $SmartyVarName . 'show') !== false; - $usesSmartyTotal = strpos($tpl->source->content, $SmartyVarName . 'total') !== false; + $usesSmartyFirst = strpos($compiler->lex->data, $SmartyVarName . 'first') !== false; + $usesSmartyLast = strpos($compiler->lex->data, $SmartyVarName . 'last') !== false; + $usesSmartyIndex = strpos($compiler->lex->data, $SmartyVarName . 'index') !== false; + $usesSmartyIteration = strpos($compiler->lex->data, $SmartyVarName . 'iteration') !== false; + $usesSmartyShow = strpos($compiler->lex->data, $SmartyVarName . 'show') !== false; + $usesSmartyTotal = strpos($compiler->lex->data, $SmartyVarName . 'total') !== false; } else { $usesSmartyFirst = false; $usesSmartyLast = false; @@ -93,12 +92,12 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase $usesSmartyShow = false; } - $usesPropFirst = $usesSmartyFirst || strpos($tpl->source->content, $ItemVarName . 'first') !== false; - $usesPropLast = $usesSmartyLast || strpos($tpl->source->content, $ItemVarName . 'last') !== false; - $usesPropIndex = $usesPropFirst || strpos($tpl->source->content, $ItemVarName . 'index') !== false; - $usesPropIteration = $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'iteration') !== false; - $usesPropShow = strpos($tpl->source->content, $ItemVarName . 'show') !== false; - $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'total') !== false; + $usesPropFirst = $usesSmartyFirst || strpos($compiler->lex->data, $ItemVarName . 'first') !== false; + $usesPropLast = $usesSmartyLast || strpos($compiler->lex->data, $ItemVarName . 'last') !== false; + $usesPropIndex = $usesPropFirst || strpos($compiler->lex->data, $ItemVarName . 'index') !== false; + $usesPropIteration = $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'iteration') !== false; + $usesPropShow = strpos($compiler->lex->data, $ItemVarName . 'show') !== false; + $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'total') !== false; // generate output code $output = "tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n"; diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php index 4b607208..49554b62 100644 --- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php +++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php @@ -23,10 +23,9 @@ class Smarty_Internal_Configfilelexer public $yyTraceFILE; public $yyTracePrompt; public $state_name = array (1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE'); - public $smarty_token_names = array ( // Text for parser error messages + public $smarty_token_names = array (// Text for parser error messages ); - function __construct($data, $smarty) { // set instance object diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_configfileparser.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_configfileparser.php index 4edd024d..9219bc04 100644 --- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_configfileparser.php +++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_configfileparser.php @@ -102,6 +102,7 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser $this->smarty = $compiler->smarty; $this->compiler = $compiler; } + public static function &instance($new_instance = null) { static $instance = null; diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatelexer.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatelexer.php index 1661166d..8803222e 100644 --- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatelexer.php +++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_templatelexer.php @@ -1,15 +1,16 @@ 'TEXT', 2 => 'SMARTY', 3 => 'LITERAL', 4 => 'DOUBLEQUOTEDSTRING', 5 => 'CHILDBODY'); - public $smarty_token_names = array ( // Text for parser error messages - 'IDENTITY' => '===', - 'NONEIDENTITY' => '!==', - 'EQUALS' => '==', - 'NOTEQUALS' => '!=', - 'GREATEREQUAL' => '(>=,ge)', - 'LESSEQUAL' => '(<=,le)', - 'GREATERTHAN' => '(>,gt)', - 'LESSTHAN' => '(<,lt)', - 'MOD' => '(%,mod)', - 'NOT' => '(!,not)', - 'LAND' => '(&&,and)', - 'LOR' => '(||,or)', - 'LXOR' => 'xor', - 'OPENP' => '(', - 'CLOSEP' => ')', - 'OPENB' => '[', - 'CLOSEB' => ']', - 'PTR' => '->', - 'APTR' => '=>', - 'EQUAL' => '=', - 'NUMBER' => 'number', - 'UNIMATH' => '+" , "-', - 'MATH' => '*" , "/" , "%', - 'INCDEC' => '++" , "--', - 'SPACE' => ' ', - 'DOLLAR' => '$', - 'SEMICOLON' => ';', - 'COLON' => ':', - 'DOUBLECOLON' => '::', - 'AT' => '@', - 'HATCH' => '#', - 'QUOTE' => '"', - 'BACKTICK' => '`', - 'VERT' => '|', - 'DOT' => '.', - 'COMMA' => '","', - 'ANDSYM' => '"&"', - 'QMARK' => '"?"', - 'ID' => 'identifier', - 'TEXT' => 'text', - 'FAKEPHPSTARTTAG' => 'Fake PHP start tag', - 'PHPSTARTTAG' => 'PHP start tag', - 'PHPENDTAG' => 'PHP end tag', - 'LITERALSTART' => 'Literal start', - 'LITERALEND' => 'Literal end', - 'LDELSLASH' => 'closing tag', - 'COMMENT' => 'comment', - 'AS' => 'as', - 'TO' => 'to', - ); - - - function __construct($data,$compiler) + public $state_name = array(1 => 'TEXT', 2 => 'SMARTY', 3 => 'LITERAL', 4 => 'DOUBLEQUOTEDSTRING', 5 => 'CHILDBODY'); + public $smarty_token_names = array( // Text for parser error messages + 'IDENTITY' => '===', + 'NONEIDENTITY' => '!==', + 'EQUALS' => '==', + 'NOTEQUALS' => '!=', + 'GREATEREQUAL' => '(>=,ge)', + 'LESSEQUAL' => '(<=,le)', + 'GREATERTHAN' => '(>,gt)', + 'LESSTHAN' => '(<,lt)', + 'MOD' => '(%,mod)', + 'NOT' => '(!,not)', + 'LAND' => '(&&,and)', + 'LOR' => '(||,or)', + 'LXOR' => 'xor', + 'OPENP' => '(', + 'CLOSEP' => ')', + 'OPENB' => '[', + 'CLOSEB' => ']', + 'PTR' => '->', + 'APTR' => '=>', + 'EQUAL' => '=', + 'NUMBER' => 'number', + 'UNIMATH' => '+" , "-', + 'MATH' => '*" , "/" , "%', + 'INCDEC' => '++" , "--', + 'SPACE' => ' ', + 'DOLLAR' => '$', + 'SEMICOLON' => ';', + 'COLON' => ':', + 'DOUBLECOLON' => '::', + 'AT' => '@', + 'HATCH' => '#', + 'QUOTE' => '"', + 'BACKTICK' => '`', + 'VERT' => '|', + 'DOT' => '.', + 'COMMA' => '","', + 'ANDSYM' => '"&"', + 'QMARK' => '"?"', + 'ID' => 'identifier', + 'TEXT' => 'text', + 'FAKEPHPSTARTTAG' => 'Fake PHP start tag', + 'PHPSTARTTAG' => 'PHP start tag', + 'PHPENDTAG' => 'PHP end tag', + 'LITERALSTART' => 'Literal start', + 'LITERALEND' => 'Literal end', + 'LDELSLASH' => 'closing tag', + 'COMMENT' => 'comment', + 'AS' => 'as', + 'TO' => 'to', + ); + + function __construct($data, $compiler) { -// $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data); + // $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data); $this->data = $data; $this->counter = 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; + $this->ldel = preg_quote($this->smarty->left_delimiter, '/'); + $this->ldel_length = strlen($this->smarty->left_delimiter); + $this->rdel = preg_quote($this->smarty->right_delimiter, '/'); + $this->rdel_length = strlen($this->smarty->right_delimiter); + $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter; + $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter; $this->mbstring_overload = ini_get('mbstring.func_overload') & 2; - } + } public function PrintTrace() { @@ -100,7 +100,6 @@ class Smarty_Internal_Templatelexer $this->yyTracePrompt = '
'; } - private $_yy_state = 1; private $_yy_stack = array(); @@ -112,85 +111,82 @@ class Smarty_Internal_Templatelexer public function yypushstate($state) { if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); + fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } array_push($this->_yy_stack, $this->_yy_state); $this->_yy_state = $state; if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); + fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } } public function yypopstate() { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } - $this->_yy_state = array_pop($this->_yy_stack); if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); + fprintf($this->yyTraceFILE, "%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; + $this->_yy_state = $state; if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); + fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } } - - public function yylex1() { - $tokenMap = array ( - 1 => 0, - 2 => 1, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 1, - 9 => 0, - 10 => 0, - 11 => 0, - 12 => 0, - 13 => 0, - 14 => 0, - 15 => 0, - 16 => 0, - 17 => 0, - 18 => 0, - 19 => 0, - ); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + $tokenMap = array( + 1 => 0, + 2 => 1, + 4 => 0, + 5 => 0, + 6 => 0, + 7 => 1, + 9 => 0, + 10 => 0, + 11 => 0, + 12 => 0, + 13 => 0, + 14 => 0, + 15 => 0, + 16 => 0, + 17 => 0, + 18 => 0, + 19 => 0, + ); + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } - $yy_global_pattern = "/\G(\\{\\})|\G(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|\G(".$this->ldel."\\s*strip\\s*".$this->rdel.")|\G(".$this->ldel."\\s*\/strip\\s*".$this->rdel.")|\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\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*\/)|\G(".$this->ldel."\\s*)|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(\\s*".$this->rdel.")|\G(<%)|\G(%>)|\G([\S\s])/iS"; + $yy_global_pattern = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\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*\/)|\G(" . $this->ldel . "\\s*)|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(\\s*" . $this->rdel . ")|\G(<%)|\G(%>)|\G([\S\s])/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns - if (!count($yymatches)) { + if (! count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state TEXT'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state TEXT'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } $this->value = current($yymatches); // token value $r = $this->{'yy_r1_' . $this->token}($yysubmatches); if ($r === null) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); // accept this token return true; @@ -199,278 +195,293 @@ class Smarty_Internal_Templatelexer // process this token in the new state return $this->yylex(); } elseif ($r === false) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } // skip this token continue; - } } else { + } + } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } // end function - const TEXT = 1; + function yy_r1_1($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } + function yy_r1_2($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_COMMENT; + $this->token = Smarty_Internal_Templateparser::TP_COMMENT; } + function yy_r1_4($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_STRIPON; - } + 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_STRIPON; + } } + function yy_r1_5($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; - } + 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_STRIPOFF; + } } + function yy_r1_6($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; - $this->yypushstate(self::LITERAL); - } + 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); + } } + function yy_r1_7($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELIF; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELIF; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r1_9($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELFOR; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r1_10($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELFOREACH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r1_11($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELSETFILTER; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r1_12($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELSLASH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r1_13($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r1_14($yy_subpatterns) { - if (in_array($this->value, Array('token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG; - } elseif ($this->value == 'token = Smarty_Internal_Templateparser::TP_XMLTAG; - } else { - $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG; - $this->value = substr($this->value, 0, 2); - } - } + if (in_array($this->value, Array('token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG; + } elseif ($this->value == 'token = Smarty_Internal_Templateparser::TP_XMLTAG; + } else { + $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG; + $this->value = substr($this->value, 0, 2); + } + } + function yy_r1_15($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG; + $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG; } + function yy_r1_16($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } + function yy_r1_17($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG; + $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG; } + function yy_r1_18($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG; + $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG; } + function yy_r1_19($yy_subpatterns) { - if ($this->mbstring_overload) { - $to = mb_strlen($this->data,'latin1'); - } else { - $to = strlen($this->data); - } - preg_match("/{$this->ldel}|<\?|\?>|<%|%>/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter); - if (isset($match[0][1])) { - $to = $match[0][1]; - } - if ($this->mbstring_overload) { - $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1'); - } else { - $this->value = substr($this->data,$this->counter,$to-$this->counter); - } - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + if ($this->mbstring_overload) { + $to = mb_strlen($this->data, 'latin1'); + } else { + $to = strlen($this->data); + } + preg_match("/{$this->ldel}|<\?|\?>|<%|%>/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); + if (isset($match[0][1])) { + $to = $match[0][1]; + } + if ($this->mbstring_overload) { + $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1'); + } else { + $this->value = substr($this->data, $this->counter, $to - $this->counter); + } + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - public function yylex2() { - $tokenMap = array ( - 1 => 0, - 2 => 0, - 3 => 1, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - 9 => 0, - 10 => 0, - 11 => 0, - 12 => 0, - 13 => 0, - 14 => 0, - 15 => 1, - 17 => 1, - 19 => 1, - 21 => 0, - 22 => 0, - 23 => 0, - 24 => 0, - 25 => 0, - 26 => 0, - 27 => 0, - 28 => 0, - 29 => 0, - 30 => 0, - 31 => 0, - 32 => 0, - 33 => 0, - 34 => 0, - 35 => 0, - 36 => 0, - 37 => 0, - 38 => 3, - 42 => 0, - 43 => 0, - 44 => 0, - 45 => 0, - 46 => 0, - 47 => 0, - 48 => 0, - 49 => 0, - 50 => 1, - 52 => 1, - 54 => 0, - 55 => 0, - 56 => 0, - 57 => 0, - 58 => 0, - 59 => 0, - 60 => 0, - 61 => 0, - 62 => 0, - 63 => 0, - 64 => 0, - 65 => 0, - 66 => 0, - 67 => 0, - 68 => 0, - 69 => 0, - 70 => 1, - 72 => 0, - 73 => 0, - 74 => 0, - 75 => 0, - 76 => 0, - ); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + $tokenMap = array( + 1 => 0, + 2 => 0, + 3 => 1, + 5 => 0, + 6 => 0, + 7 => 0, + 8 => 0, + 9 => 0, + 10 => 0, + 11 => 0, + 12 => 0, + 13 => 0, + 14 => 0, + 15 => 1, + 17 => 1, + 19 => 1, + 21 => 0, + 22 => 0, + 23 => 0, + 24 => 0, + 25 => 0, + 26 => 0, + 27 => 0, + 28 => 0, + 29 => 0, + 30 => 0, + 31 => 0, + 32 => 0, + 33 => 0, + 34 => 0, + 35 => 0, + 36 => 0, + 37 => 0, + 38 => 3, + 42 => 0, + 43 => 0, + 44 => 0, + 45 => 0, + 46 => 0, + 47 => 0, + 48 => 0, + 49 => 0, + 50 => 1, + 52 => 1, + 54 => 0, + 55 => 0, + 56 => 0, + 57 => 0, + 58 => 0, + 59 => 0, + 60 => 0, + 61 => 0, + 62 => 0, + 63 => 0, + 64 => 0, + 65 => 0, + 66 => 0, + 67 => 0, + 68 => 0, + 69 => 0, + 70 => 1, + 72 => 0, + 73 => 0, + 74 => 0, + 75 => 0, + 76 => 0, + ); + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } - $yy_global_pattern = "/\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$)|\G(\\s*".$this->rdel.")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\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(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\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*\/)|\G(".$this->ldel."\\s*)|\G([\S\s])/iS"; + $yy_global_pattern = "/\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$)|\G(\\s*" . $this->rdel . ")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\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(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\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*\/)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns - if (!count($yymatches)) { + if (! count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state SMARTY'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state SMARTY'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } $this->value = current($yymatches); // token value $r = $this->{'yy_r2_' . $this->token}($yysubmatches); if ($r === null) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); // accept this token return true; @@ -479,436 +490,499 @@ class Smarty_Internal_Templatelexer // process this token in the new state return $this->yylex(); } elseif ($r === false) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } // skip this token continue; - } } else { + } + } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } // end function - const SMARTY = 2; + function yy_r2_1($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_QUOTE; - $this->yypushstate(self::DOUBLEQUOTEDSTRING); + $this->token = Smarty_Internal_Templateparser::TP_QUOTE; + $this->yypushstate(self::DOUBLEQUOTEDSTRING); } + function yy_r2_2($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING; + $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING; } + function yy_r2_3($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT; - $this->taglineno = $this->line; + $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT; + $this->taglineno = $this->line; } + function yy_r2_5($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_DOLLAR; + $this->token = Smarty_Internal_Templateparser::TP_DOLLAR; } + function yy_r2_6($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_RDEL; - $this->yypopstate(); + $this->token = Smarty_Internal_Templateparser::TP_RDEL; + $this->yypopstate(); } + function yy_r2_7($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISIN; + $this->token = Smarty_Internal_Templateparser::TP_ISIN; } + function yy_r2_8($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_AS; + $this->token = Smarty_Internal_Templateparser::TP_AS; } + function yy_r2_9($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TO; + $this->token = Smarty_Internal_Templateparser::TP_TO; } + function yy_r2_10($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_STEP; + $this->token = Smarty_Internal_Templateparser::TP_STEP; } + function yy_r2_11($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF; + $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF; } + function yy_r2_12($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_IDENTITY; + $this->token = Smarty_Internal_Templateparser::TP_IDENTITY; } + function yy_r2_13($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY; + $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY; } + function yy_r2_14($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_EQUALS; + $this->token = Smarty_Internal_Templateparser::TP_EQUALS; } + function yy_r2_15($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS; + $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS; } + function yy_r2_17($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL; + $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL; } + function yy_r2_19($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL; + $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL; } + function yy_r2_21($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN; + $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN; } + function yy_r2_22($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN; + $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN; } + function yy_r2_23($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_MOD; + $this->token = Smarty_Internal_Templateparser::TP_MOD; } + function yy_r2_24($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_NOT; + $this->token = Smarty_Internal_Templateparser::TP_NOT; } + function yy_r2_25($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_LAND; + $this->token = Smarty_Internal_Templateparser::TP_LAND; } + function yy_r2_26($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_LOR; + $this->token = Smarty_Internal_Templateparser::TP_LOR; } + function yy_r2_27($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_LXOR; + $this->token = Smarty_Internal_Templateparser::TP_LXOR; } + function yy_r2_28($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISODDBY; + $this->token = Smarty_Internal_Templateparser::TP_ISODDBY; } + function yy_r2_29($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY; + $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY; } + function yy_r2_30($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISODD; + $this->token = Smarty_Internal_Templateparser::TP_ISODD; } + function yy_r2_31($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD; + $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD; } + function yy_r2_32($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY; + $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY; } + function yy_r2_33($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY; + $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY; } + function yy_r2_34($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISEVEN; + $this->token = Smarty_Internal_Templateparser::TP_ISEVEN; } + function yy_r2_35($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN; + $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN; } + function yy_r2_36($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY; + $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY; } + function yy_r2_37($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY; + $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY; } + function yy_r2_38($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TYPECAST; + $this->token = Smarty_Internal_Templateparser::TP_TYPECAST; } + function yy_r2_42($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_OPENP; + $this->token = Smarty_Internal_Templateparser::TP_OPENP; } + function yy_r2_43($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_CLOSEP; + $this->token = Smarty_Internal_Templateparser::TP_CLOSEP; } + function yy_r2_44($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_OPENB; + $this->token = Smarty_Internal_Templateparser::TP_OPENB; } + function yy_r2_45($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_CLOSEB; + $this->token = Smarty_Internal_Templateparser::TP_CLOSEB; } + function yy_r2_46($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_PTR; + $this->token = Smarty_Internal_Templateparser::TP_PTR; } + function yy_r2_47($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_APTR; + $this->token = Smarty_Internal_Templateparser::TP_APTR; } + function yy_r2_48($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_EQUAL; + $this->token = Smarty_Internal_Templateparser::TP_EQUAL; } + function yy_r2_49($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_INCDEC; + $this->token = Smarty_Internal_Templateparser::TP_INCDEC; } + function yy_r2_50($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_UNIMATH; + $this->token = Smarty_Internal_Templateparser::TP_UNIMATH; } + function yy_r2_52($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_MATH; + $this->token = Smarty_Internal_Templateparser::TP_MATH; } + function yy_r2_54($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_AT; + $this->token = Smarty_Internal_Templateparser::TP_AT; } + function yy_r2_55($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_HATCH; + $this->token = Smarty_Internal_Templateparser::TP_HATCH; } + function yy_r2_56($yy_subpatterns) { - // 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; + } } + function yy_r2_57($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ID; + $this->token = Smarty_Internal_Templateparser::TP_ID; } + function yy_r2_58($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_INTEGER; + $this->token = Smarty_Internal_Templateparser::TP_INTEGER; } + function yy_r2_59($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; - $this->yypopstate(); + $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; + $this->yypopstate(); } + function yy_r2_60($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_VERT; + $this->token = Smarty_Internal_Templateparser::TP_VERT; } + function yy_r2_61($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_DOT; + $this->token = Smarty_Internal_Templateparser::TP_DOT; } + function yy_r2_62($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_COMMA; + $this->token = Smarty_Internal_Templateparser::TP_COMMA; } + function yy_r2_63($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON; + $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON; } + function yy_r2_64($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON; + $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON; } + function yy_r2_65($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_COLON; + $this->token = Smarty_Internal_Templateparser::TP_COLON; } + function yy_r2_66($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ANDSYM; + $this->token = Smarty_Internal_Templateparser::TP_ANDSYM; } + function yy_r2_67($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_QMARK; + $this->token = Smarty_Internal_Templateparser::TP_QMARK; } + function yy_r2_68($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_HEX; + $this->token = Smarty_Internal_Templateparser::TP_HEX; } + function yy_r2_69($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_SPACE; + $this->token = Smarty_Internal_Templateparser::TP_SPACE; } + function yy_r2_70($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELIF; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELIF; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r2_72($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELFOR; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r2_73($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELFOREACH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r2_74($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELSLASH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r2_75($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r2_76($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - - public function yylex3() { - $tokenMap = array ( - 1 => 0, - 2 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - ); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + $tokenMap = array( + 1 => 0, + 2 => 0, + 3 => 0, + 4 => 0, + 5 => 0, + 6 => 0, + 7 => 0, + ); + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } - $yy_global_pattern = "/\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS"; + $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns - if (!count($yymatches)) { + if (! count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state LITERAL'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state LITERAL'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } $this->value = current($yymatches); // token value $r = $this->{'yy_r3_' . $this->token}($yysubmatches); if ($r === null) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); // accept this token return true; @@ -917,134 +991,139 @@ class Smarty_Internal_Templatelexer // process this token in the new state return $this->yylex(); } elseif ($r === false) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } // skip this token continue; - } } else { + } + } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } // end function - const LITERAL = 3; + function yy_r3_1($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; - $this->yypushstate(self::LITERAL); - } + 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); + } } + function yy_r3_2($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LITERALEND; - $this->yypopstate(); - } + 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_LITERALEND; + $this->yypopstate(); + } } + function yy_r3_3($yy_subpatterns) { - if (in_array($this->value, Array('token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG; - } else { - $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG; - $this->value = substr($this->value, 0, 2); - } + if (in_array($this->value, Array('token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG; + } else { + $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG; + $this->value = substr($this->value, 0, 2); + } } + function yy_r3_4($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG; + $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG; } + function yy_r3_5($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG; + $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG; } + function yy_r3_6($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG; + $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG; } + function yy_r3_7($yy_subpatterns) { - if ($this->mbstring_overload) { - $to = mb_strlen($this->data,'latin1'); - } else { - $to = strlen($this->data); - } - preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/",$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"); - } - if ($this->mbstring_overload) { - $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1'); - } else { - $this->value = substr($this->data,$this->counter,$to-$this->counter); - } - $this->token = Smarty_Internal_Templateparser::TP_LITERAL; + if ($this->mbstring_overload) { + $to = mb_strlen($this->data, 'latin1'); + } else { + $to = strlen($this->data); + } + preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/", $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"); + } + if ($this->mbstring_overload) { + $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1'); + } else { + $this->value = substr($this->data, $this->counter, $to - $this->counter); + } + $this->token = Smarty_Internal_Templateparser::TP_LITERAL; } - public function yylex4() { - $tokenMap = array ( - 1 => 1, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - 9 => 0, - 10 => 0, - 11 => 3, - 15 => 0, - ); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + $tokenMap = array( + 1 => 1, + 3 => 0, + 4 => 0, + 5 => 0, + 6 => 0, + 7 => 0, + 8 => 0, + 9 => 0, + 10 => 0, + 11 => 3, + 15 => 0, + ); + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } - $yy_global_pattern = "/\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*\/)|\G(".$this->ldel."\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|\G([\S\s])/iS"; + $yy_global_pattern = "/\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*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns - if (!count($yymatches)) { + if (! count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state DOUBLEQUOTEDSTRING'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state DOUBLEQUOTEDSTRING'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } $this->value = current($yymatches); // token value $r = $this->{'yy_r4_' . $this->token}($yysubmatches); if ($r === null) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); // accept this token return true; @@ -1053,160 +1132,169 @@ class Smarty_Internal_Templatelexer // process this token in the new state return $this->yylex(); } elseif ($r === false) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } // skip this token continue; - } } else { + } + } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } // end function - const DOUBLEQUOTEDSTRING = 4; + function yy_r4_1($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELIF; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELIF; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r4_3($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELFOR; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r4_4($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELFOREACH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r4_5($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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_LDELSLASH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r4_6($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + 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->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r4_7($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_QUOTE; - $this->yypopstate(); + $this->token = Smarty_Internal_Templateparser::TP_QUOTE; + $this->yypopstate(); } + function yy_r4_8($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; - $this->value = substr($this->value,0,-1); - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; + $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; + $this->value = substr($this->value, 0, - 1); + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; } + function yy_r4_9($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_DOLLARID; + $this->token = Smarty_Internal_Templateparser::TP_DOLLARID; } + function yy_r4_10($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } + function yy_r4_11($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } + function yy_r4_15($yy_subpatterns) { - if ($this->mbstring_overload) { - $to = mb_strlen($this->data,'latin1'); - } else { - $to = strlen($this->data); - } - if ($this->mbstring_overload) { - $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1'); - } else { - $this->value = substr($this->data,$this->counter,$to-$this->counter); - } - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + if ($this->mbstring_overload) { + $to = mb_strlen($this->data, 'latin1'); + } else { + $to = strlen($this->data); + } + if ($this->mbstring_overload) { + $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1'); + } else { + $this->value = substr($this->data, $this->counter, $to - $this->counter); + } + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - public function yylex5() { - $tokenMap = array ( - 1 => 0, - 2 => 0, - 3 => 0, - 4 => 0, - ); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + $tokenMap = array( + 1 => 0, + 2 => 0, + 3 => 0, + 4 => 0, + ); + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } - $yy_global_pattern = "/\G(".$this->ldel."\\s*strip\\s*".$this->rdel.")|\G(".$this->ldel."\\s*\/strip\\s*".$this->rdel.")|\G(".$this->ldel."\\s*block)|\G([\S\s])/iS"; + $yy_global_pattern = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns - if (!count($yymatches)) { + if (! count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state CHILDBODY'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state CHILDBODY'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } $this->value = current($yymatches); // token value $r = $this->{'yy_r5_' . $this->token}($yysubmatches); if ($r === null) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); // accept this token return true; @@ -1215,108 +1303,110 @@ class Smarty_Internal_Templatelexer // process this token in the new state return $this->yylex(); } elseif ($r === false) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } // skip this token continue; - } } else { + } + } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } // end function - const CHILDBODY = 5; + function yy_r5_1($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - return false; - } else { - $this->token = Smarty_Internal_Templateparser::TP_STRIPON; - } + if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { + return false; + } else { + $this->token = Smarty_Internal_Templateparser::TP_STRIPON; + } } + function yy_r5_2($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - return false; - } else { - $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; - } + if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { + return false; + } else { + $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; + } } + function yy_r5_3($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - return false; - } else { - $this->yypopstate(); - return true; - } + if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { + return false; + } else { + $this->yypopstate(); + return true; + } } + function yy_r5_4($yy_subpatterns) { - if ($this->mbstring_overload) { - $to = mb_strlen($this->data,'latin1'); - } else { - $to = strlen($this->data); - } - preg_match("/".$this->ldel."\s*((\/)?strip\s*".$this->rdel."|block\s+)/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter); - if (isset($match[0][1])) { - $to = $match[0][1]; - } - if ($this->mbstring_overload) { - $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1'); - } else { - $this->value = substr($this->data,$this->counter,$to-$this->counter); - } - return false; + if ($this->mbstring_overload) { + $to = mb_strlen($this->data, 'latin1'); + } else { + $to = strlen($this->data); + } + preg_match("/" . $this->ldel . "\s*((\/)?strip\s*" . $this->rdel . "|block\s+)/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); + if (isset($match[0][1])) { + $to = $match[0][1]; + } + if ($this->mbstring_overload) { + $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1'); + } else { + $this->value = substr($this->data, $this->counter, $to - $this->counter); + } + return false; } - public function yylex6() { - $tokenMap = array ( - 1 => 0, - 2 => 0, - 3 => 1, - 5 => 0, - ); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + $tokenMap = array( + 1 => 0, + 2 => 0, + 3 => 1, + 5 => 0, + ); + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } - $yy_global_pattern = "/\G(".$this->ldel."\\s*block)|\G(".$this->ldel."\\s*\/block)|\G(".$this->ldel."\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS"; + $yy_global_pattern = "/\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*\/block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns - if (!count($yymatches)) { + if (! count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state CHILDBLOCK'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state CHILDBLOCK'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } $this->value = current($yymatches); // token value $r = $this->{'yy_r6_' . $this->token}($yysubmatches); if ($r === null) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); // accept this token return true; @@ -1325,72 +1415,74 @@ class Smarty_Internal_Templatelexer // process this token in the new state return $this->yylex(); } elseif ($r === false) { - $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); + $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { + if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { return false; // end of input } // skip this token continue; - } } else { + } + } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); - } // end function - const CHILDBLOCK = 6; + function yy_r6_1($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - } else { - $this->yypopstate(); - return true; - } + 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_BLOCKSOURCE; + } else { + $this->yypopstate(); + return true; + } } + function yy_r6_2($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - } else { - $this->yypopstate(); - return true; - } + 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_BLOCKSOURCE; + } else { + $this->yypopstate(); + return true; + } } + function yy_r6_3($yy_subpatterns) { - if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - } else { - $this->yypopstate(); - return true; - } + 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_BLOCKSOURCE; + } else { + $this->yypopstate(); + return true; + } } + function yy_r6_5($yy_subpatterns) { - if ($this->mbstring_overload) { - $to = mb_strlen($this->data,'latin1'); - } else { - $to = strlen($this->data); - } - preg_match("/".$this->ldel."\s*((\/)?block(\s|".$this->rdel.")|[\$]smarty\.block\.(child|parent)\s*".$this->rdel.")/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter); - if (isset($match[0][1])) { - $to = $match[0][1]; - } - if ($this->mbstring_overload) { - $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1'); - } else { - $this->value = substr($this->data,$this->counter,$to-$this->counter); - } - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; + if ($this->mbstring_overload) { + $to = mb_strlen($this->data, 'latin1'); + } else { + $to = strlen($this->data); + } + preg_match("/" . $this->ldel . "\s*((\/)?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent)\s*" . $this->rdel . ")/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); + if (isset($match[0][1])) { + $to = $match[0][1]; + } + if ($this->mbstring_overload) { + $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1'); + } else { + $this->value = substr($this->data, $this->counter, $to - $this->counter); + } + $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; } - } diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_utility.php b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_utility.php index a1f853e9..82f200df 100644 --- a/bundled-libs/Smarty/libs/sysplugins/smarty_internal_utility.php +++ b/bundled-libs/Smarty/libs/sysplugins/smarty_internal_utility.php @@ -182,7 +182,7 @@ class Smarty_Internal_Utility */ public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty) { - $_compile_dir = realpath($smarty->getCompileDir()) . '/'; + $_compile_dir = realpath($smarty->getCompileDir()).'/'; $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null; $_dir_sep = $smarty->use_sub_dirs ? DS : '^'; if (isset($resource_name)) { diff --git a/bundled-libs/Smarty/libs/sysplugins/smarty_resource_custom.php b/bundled-libs/Smarty/libs/sysplugins/smarty_resource_custom.php index bf5c4ea6..e2aadabf 100644 --- a/bundled-libs/Smarty/libs/sysplugins/smarty_resource_custom.php +++ b/bundled-libs/Smarty/libs/sysplugins/smarty_resource_custom.php @@ -48,7 +48,7 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource */ public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) { - $source->filepath = strtolower($source->type . ':' . $source->name); + $source->filepath = $source->type . ':' . $source->name; $source->uid = sha1($source->type . ':' . $source->name); $mtime = $this->fetchTimestamp($source->name);