smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix some $smarty special template variables are no longer accessed as real variable.

Browse Source 
using them on calls like {if isset($smarty.foo)} or {if empty($smarty.foo)} will fail
    http://www.smarty.net/forums/viewtopic.php?t=26222
This commit is contained in:
uwetews
2016-09-20 14:21:39 +02:00
parent d9a6938473
commit b8acd7ea17
5 changed files with 92 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
change_log.txt
View File

@@ -1,4 +1,9 @@
===== 3.1.31-dev ===== (xx.xx.xx) ===== 3.1.31-dev ===== (xx.xx.xx)
20.09.2016
- bugfix some $smarty special template variables are no longer accessed as real variable.
using them on calls like {if isset($smarty.foo)} or {if empty($smarty.foo)} will fail
http://www.smarty.net/forums/viewtopic.php?t=26222
19.09.2016 19.09.2016
- optimization clear compiled and cached folder completely on detected version change - optimization clear compiled and cached folder completely on detected version change
- cleanup convert cache resource file method clear into runtime extension - cleanup convert cache resource file method clear into runtime extension

33
lexer/smarty_internal_templateparser.y
View File

@@ -1083,38 +1083,7 @@ objectelement(res)::= PTR method(f). {
// function // function
// //
function(res) ::= ns1(f) OPENP params(p) CLOSEP. { function(res) ::= ns1(f) OPENP params(p) CLOSEP. {
if (!$this->security || $this->security->isTrustedPhpFunction(f, $this->compiler)) { res = $this->compiler->compilePHPFunctionCall(f, p);
if (strcasecmp(f,'isset') === 0 || strcasecmp(f,'empty') === 0 || strcasecmp(f,'array') === 0 || is_callable(f)) {
$func_name = strtolower(f);
if ($func_name == 'isset') {
if (count(p) == 0) {
$this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
}
$par = implode(',',p);
if (strncasecmp($par,'$_smarty_tpl->smarty->ext->_config->_getConfigVariable',strlen('$_smarty_tpl->smarty->ext->_config->_getConfigVariable')) === 0) {
$prefixVar = $this->compiler->getNewPrefixVariable();
$this->compiler->appendPrefixCode("<?php $prefixVar" .'='.str_replace(')',', false)',$par).';?>');
$isset_par = $prefixVar;
} else {
$isset_par=str_replace("')->value","',null,true,false)->value",$par);
}
res = f . "(". $isset_par .")";
} elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
if (count(p) != 1) {
$this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
}
if ($func_name == 'empty') {
res = $func_name.'('.str_replace("')->value","',null,true,false)->value",p[0]).')';
} else {
res = $func_name.'('.p[0].')';
}
} else {
res = f . "(". implode(',',p) .")";
}
} else {
$this->compiler->trigger_template_error ("unknown function \"" . f . "\"");
}
}
} }

2
libs/Smarty.class.php
View File

@@ -114,7 +114,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.31-dev/25'; const SMARTY_VERSION = '3.1.31-dev/26';
/** /**
* define variable scopes * define variable scopes

55
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -771,6 +771,61 @@ abstract class Smarty_Internal_TemplateCompilerBase
return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')'; return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')';
} }
/**
* compile PHP function call
*
* @param string $name
* @param array $parameter
*
* @return string
*/
public function compilePHPFunctionCall($name, $parameter)
{
if (!$this->smarty->security_policy || $this->smarty->security_policy->isTrustedPhpFunction($name, $this)) {
if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0 ||
strcasecmp($name, 'array') === 0 || is_callable($name)
) {
$func_name = strtolower($name);
$par = implode(',', $parameter);
$parHasFuction = strpos($par, '(') !== false;
if ($func_name == 'isset') {
if (count($parameter) == 0) {
$this->trigger_template_error('Illegal number of paramer in "isset()"');
}
if ($parHasFuction) {
$prefixVar = $this->getNewPrefixVariable();
$this->appendPrefixCode("<?php $prefixVar" . '=' . $par . ';?>');
$isset_par = $prefixVar;
} else {
$isset_par = str_replace("')->value", "',null,true,false)->value", $par);
}
return $name . "(" . $isset_par . ")";
} elseif (in_array($func_name, array('empty', 'reset', 'current', 'end', 'prev', 'next'))) {
if (count($parameter) != 1) {
$this->trigger_template_error('Illegal number of paramer in "empty()"');
}
if ($func_name == 'empty') {
if ($parHasFuction) {
$prefixVar = $this->getNewPrefixVariable();
$this->appendPrefixCode("<?php $prefixVar" . '=' . $par . ';?>');
return $func_name . '(' . $prefixVar . ')';
} else {
return $func_name . '(' .
str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
}
} else {
return $func_name . '(' . $parameter[ 0 ] . ')';
}
} else {
return $name . "(" . implode(',', $parameter) . ")";
}
} else {
$this->trigger_template_error("unknown function \"" . $name . "\"");
}
}
}
/** /**
* This method is called from parser to process a text content section * This method is called from parser to process a text content section
* - remove text from inheritance child templates as they may generate output * - remove text from inheritance child templates as they may generate output

103
libs/sysplugins/smarty_internal_templateparser.php
View File

@@ -2455,54 +2455,11 @@ class Smarty_Internal_Templateparser
#line 1085 "../smarty/lexer/smarty_internal_templateparser.y" #line 1085 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r155() function yy_r155()
{ {
if (!$this->security || $this->_retvalue = $this->compiler->compilePHPFunctionCall($this->yystack[ $this->yyidx + - 3 ]->minor,
$this->security->isTrustedPhpFunction($this->yystack[ $this->yyidx + - 3 ]->minor, $this->compiler) $this->yystack[ $this->yyidx + - 1 ]->minor);
) {
if (strcasecmp($this->yystack[ $this->yyidx + - 3 ]->minor, 'isset') === 0 ||
strcasecmp($this->yystack[ $this->yyidx + - 3 ]->minor, 'empty') === 0 ||
strcasecmp($this->yystack[ $this->yyidx + - 3 ]->minor, 'array') === 0 ||
is_callable($this->yystack[ $this->yyidx + - 3 ]->minor)
) {
$func_name = strtolower($this->yystack[ $this->yyidx + - 3 ]->minor);
if ($func_name == 'isset') {
if (count($this->yystack[ $this->yyidx + - 1 ]->minor) == 0) {
$this->compiler->trigger_template_error('Illegal number of paramer in "isset()"');
}
$par = implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor);
if (strncasecmp($par, '$_smarty_tpl->smarty->ext->_config->_getConfigVariable',
strlen('$_smarty_tpl->smarty->ext->_config->_getConfigVariable')) === 0
) {
$prefixVar = $this->compiler->getNewPrefixVariable();
$this->compiler->appendPrefixCode("<?php $prefixVar" . '=' .
str_replace(')', ', false)', $par) . ';?>');
$isset_par = $prefixVar;
} else {
$isset_par = str_replace("')->value", "',null,true,false)->value", $par);
}
$this->_retvalue = $this->yystack[ $this->yyidx + - 3 ]->minor . "(" . $isset_par . ")";
} elseif (in_array($func_name, array('empty', 'reset', 'current', 'end', 'prev', 'next'))) {
if (count($this->yystack[ $this->yyidx + - 1 ]->minor) != 1) {
$this->compiler->trigger_template_error('Illegal number of paramer in "empty()"');
}
if ($func_name == 'empty') {
$this->_retvalue = $func_name . '(' . str_replace("')->value", "',null,true,false)->value",
$this->yystack[ $this->yyidx +
- 1 ]->minor[ 0 ]) . ')';
} else {
$this->_retvalue = $func_name . '(' . $this->yystack[ $this->yyidx + - 1 ]->minor[ 0 ] . ')';
}
} else {
$this->_retvalue = $this->yystack[ $this->yyidx + - 3 ]->minor . "(" .
implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor) . ")";
}
} else {
$this->compiler->trigger_template_error("unknown function \"" .
$this->yystack[ $this->yyidx + - 3 ]->minor . "\"");
}
}
} }
#line 1124 "../smarty/lexer/smarty_internal_templateparser.y" #line 1093 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r156() function yy_r156()
{ {
if ($this->security && substr($this->yystack[ $this->yyidx + - 3 ]->minor, 0, 1) == '_') { if ($this->security && substr($this->yystack[ $this->yyidx + - 3 ]->minor, 0, 1) == '_') {
@@ -2512,7 +2469,7 @@ class Smarty_Internal_Templateparser
implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor) . ")"; implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor) . ")";
} }
#line 1131 "../smarty/lexer/smarty_internal_templateparser.y" #line 1100 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r157() function yy_r157()
{ {
if ($this->security) { if ($this->security) {
@@ -2527,14 +2484,14 @@ class Smarty_Internal_Templateparser
$this->_retvalue = $prefixVar . '(' . implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor) . ')'; $this->_retvalue = $prefixVar . '(' . implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor) . ')';
} }
#line 1142 "../smarty/lexer/smarty_internal_templateparser.y" #line 1111 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r158() function yy_r158()
{ {
$this->_retvalue = $this->_retvalue =
array_merge($this->yystack[ $this->yyidx + - 2 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor)); array_merge($this->yystack[ $this->yyidx + - 2 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor));
} }
#line 1159 "../smarty/lexer/smarty_internal_templateparser.y" #line 1128 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r161() function yy_r161()
{ {
$this->_retvalue = array_merge($this->yystack[ $this->yyidx + - 2 ]->minor, $this->_retvalue = array_merge($this->yystack[ $this->yyidx + - 2 ]->minor,
@@ -2542,53 +2499,53 @@ class Smarty_Internal_Templateparser
$this->yystack[ $this->yyidx + 0 ]->minor))); $this->yystack[ $this->yyidx + 0 ]->minor)));
} }
#line 1163 "../smarty/lexer/smarty_internal_templateparser.y" #line 1132 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r162() function yy_r162()
{ {
$this->_retvalue = $this->_retvalue =
array(array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor)); array(array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor));
} }
#line 1171 "../smarty/lexer/smarty_internal_templateparser.y" #line 1140 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r164() function yy_r164()
{ {
$this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor); $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
} }
#line 1179 "../smarty/lexer/smarty_internal_templateparser.y" #line 1148 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r165() function yy_r165()
{ {
$this->_retvalue = $this->_retvalue =
array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor); array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
} }
#line 1198 "../smarty/lexer/smarty_internal_templateparser.y" #line 1167 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r169() function yy_r169()
{ {
$this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '', 'method'); $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '', 'method');
} }
#line 1203 "../smarty/lexer/smarty_internal_templateparser.y" #line 1172 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r170() function yy_r170()
{ {
$this->_retvalue = $this->_retvalue =
array($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'method'); array($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'method');
} }
#line 1208 "../smarty/lexer/smarty_internal_templateparser.y" #line 1177 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r171() function yy_r171()
{ {
$this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, ''); $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '');
} }
#line 1213 "../smarty/lexer/smarty_internal_templateparser.y" #line 1182 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r172() function yy_r172()
{ {
$this->_retvalue = $this->_retvalue =
array($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'property'); array($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'property');
} }
#line 1218 "../smarty/lexer/smarty_internal_templateparser.y" #line 1187 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r173() function yy_r173()
{ {
$this->_retvalue = array($this->yystack[ $this->yyidx + - 2 ]->minor, $this->_retvalue = array($this->yystack[ $this->yyidx + - 2 ]->minor,
@@ -2596,13 +2553,13 @@ class Smarty_Internal_Templateparser
$this->yystack[ $this->yyidx + 0 ]->minor, 'property'); $this->yystack[ $this->yyidx + 0 ]->minor, 'property');
} }
#line 1224 "../smarty/lexer/smarty_internal_templateparser.y" #line 1193 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r174() function yy_r174()
{ {
$this->_retvalue = ' ' . trim($this->yystack[ $this->yyidx + 0 ]->minor) . ' '; $this->_retvalue = ' ' . trim($this->yystack[ $this->yyidx + 0 ]->minor) . ' ';
} }
#line 1228 "../smarty/lexer/smarty_internal_templateparser.y" #line 1197 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r175() function yy_r175()
{ {
static $lops = static $lops =
@@ -2613,7 +2570,7 @@ class Smarty_Internal_Templateparser
$this->_retvalue = $lops[ $op ]; $this->_retvalue = $lops[ $op ];
} }
#line 1247 "../smarty/lexer/smarty_internal_templateparser.y" #line 1216 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r176() function yy_r176()
{ {
static $tlops = static $tlops =
@@ -2626,7 +2583,7 @@ class Smarty_Internal_Templateparser
$this->_retvalue = $tlops[ $op ]; $this->_retvalue = $tlops[ $op ];
} }
#line 1260 "../smarty/lexer/smarty_internal_templateparser.y" #line 1229 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r177() function yy_r177()
{ {
static $scond = static $scond =
@@ -2635,59 +2592,59 @@ class Smarty_Internal_Templateparser
$this->_retvalue = $scond[ $op ]; $this->_retvalue = $scond[ $op ];
} }
#line 1274 "../smarty/lexer/smarty_internal_templateparser.y" #line 1243 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r178() function yy_r178()
{ {
$this->_retvalue = 'array(' . $this->yystack[ $this->yyidx + - 1 ]->minor . ')'; $this->_retvalue = 'array(' . $this->yystack[ $this->yyidx + - 1 ]->minor . ')';
} }
#line 1282 "../smarty/lexer/smarty_internal_templateparser.y" #line 1251 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r180() function yy_r180()
{ {
$this->_retvalue = $this->_retvalue =
$this->yystack[ $this->yyidx + - 2 ]->minor . ',' . $this->yystack[ $this->yyidx + 0 ]->minor; $this->yystack[ $this->yyidx + - 2 ]->minor . ',' . $this->yystack[ $this->yyidx + 0 ]->minor;
} }
#line 1290 "../smarty/lexer/smarty_internal_templateparser.y" #line 1259 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r182() function yy_r182()
{ {
$this->_retvalue = $this->_retvalue =
$this->yystack[ $this->yyidx + - 2 ]->minor . '=>' . $this->yystack[ $this->yyidx + 0 ]->minor; $this->yystack[ $this->yyidx + - 2 ]->minor . '=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
} }
#line 1294 "../smarty/lexer/smarty_internal_templateparser.y" #line 1263 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r183() function yy_r183()
{ {
$this->_retvalue = $this->_retvalue =
'\'' . $this->yystack[ $this->yyidx + - 2 ]->minor . '\'=>' . $this->yystack[ $this->yyidx + 0 ]->minor; '\'' . $this->yystack[ $this->yyidx + - 2 ]->minor . '\'=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
} }
#line 1310 "../smarty/lexer/smarty_internal_templateparser.y" #line 1279 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r186() function yy_r186()
{ {
$this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor->to_smarty_php($this); $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor->to_smarty_php($this);
} }
#line 1315 "../smarty/lexer/smarty_internal_templateparser.y" #line 1284 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r187() function yy_r187()
{ {
$this->yystack[ $this->yyidx + - 1 ]->minor->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor); $this->yystack[ $this->yyidx + - 1 ]->minor->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor);
$this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor; $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor;
} }
#line 1320 "../smarty/lexer/smarty_internal_templateparser.y" #line 1289 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r188() function yy_r188()
{ {
$this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[ $this->yyidx + 0 ]->minor); $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[ $this->yyidx + 0 ]->minor);
} }
#line 1324 "../smarty/lexer/smarty_internal_templateparser.y" #line 1293 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r189() function yy_r189()
{ {
$this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[ $this->yyidx + - 1 ]->minor); $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[ $this->yyidx + - 1 ]->minor);
} }
#line 1332 "../smarty/lexer/smarty_internal_templateparser.y" #line 1301 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r191() function yy_r191()
{ {
$this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' . $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' .
@@ -2695,20 +2652,20 @@ class Smarty_Internal_Templateparser
'\']->value'); '\']->value');
} }
#line 1340 "../smarty/lexer/smarty_internal_templateparser.y" #line 1309 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r193() function yy_r193()
{ {
$this->_retvalue = $this->_retvalue =
new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[ $this->yyidx + - 1 ]->minor . ')'); new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[ $this->yyidx + - 1 ]->minor . ')');
} }
#line 1344 "../smarty/lexer/smarty_internal_templateparser.y" #line 1313 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r194() function yy_r194()
{ {
$this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[ $this->yyidx + 0 ]->minor); $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[ $this->yyidx + 0 ]->minor);
} }
#line 1348 "../smarty/lexer/smarty_internal_templateparser.y" #line 1317 "../smarty/lexer/smarty_internal_templateparser.y"
function yy_r195() function yy_r195()
{ {
$this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[ $this->yyidx + 0 ]->minor); $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[ $this->yyidx + 0 ]->minor);