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

Added 'max' and 'start' section attributes.

Browse Source 
Added 'total' and 'iteration' section properties.
This commit is contained in:
andrey
2001-06-26 21:12:54 +00:00
parent 439d7563f4
commit b0bd98fadd
7 changed files with 103 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -1,3 +1,6 @@
- added 'total' and 'iteration' section properties. (Andrei)
- added 'start' and 'max' section attributes/properties. (Andrei)
- fixed a bug in security checking of functions inside {if} tags. (Andrei)
- fixed a bug in Config_File that would incorrectly booleanize values that
weren't really booleans. (Andrei)

2
Smarty.class.php
View File

@@ -104,7 +104,7 @@ class Smarty
var $security = false; // enable template security (default false)
var $secure_dir = array("./templates"); // array of directories considered secure
var $secure_dir = array('./templates'); // array of directories considered secure
var $security_settings = array(
'PHP_HANDLING' => false,
'IF_FUNCS' => array('array', 'list',

57
Smarty_Compiler.class.php
View File

@@ -421,43 +421,64 @@ class Smarty_Compiler extends Smarty {
foreach ($attrs as $attr_name => $attr_value) {
switch ($attr_name) {
case 'loop':
$output .= "{$section_props}['loop'] = is_array($attr_value) ? count($attr_value) : $attr_value;\n";
$output .= "{$section_props}['loop'] = is_array($attr_value) ? count($attr_value) : max(0, (int)$attr_value);\n";
break;
case 'show':
if (is_bool($attr_value))
$attr_value = $attr_value ? 'true' : 'false';
$show_attr_value = $attr_value ? 'true' : 'false';
else
$show_attr_value = $attr_value;
break;
case 'name':
$output .= "{$section_props}['$attr_name'] = $attr_value;\n";
break;
case 'max':
$output .= "{$section_props}['$attr_name'] = max(0, (int)$attr_value);\n";
break;
case 'start':
$output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
break;
default:
$output .= "{$section_props}['$attr_name'] = $attr_value;\n";
$this->_syntax_error("unknown section attribute - '$attr_name'");
break;
}
}
if (isset($attrs['loop'])) {
$loop_check_code = "{$section_props}['loop'] > 0 && ";
} else {
if (!isset($attrs['loop']))
$output .= "{$section_props}['loop'] = 1;\n";
}
if (isset($attrs['show'])) {
$show_check_code = "{$section_props}['show'] && ";
} else {
$output .= "{$section_props}['show'] = {$section_props}['loop'] > 0;\n";
}
if (!isset($attrs['max']))
$output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
$output .= "if ($loop_check_code $show_check_code true): ";
if (!isset($attrs['start']))
$output .= "{$section_props}['start'] = 0;\n";
else
$output .= "if ({$section_props}['start'] < 0)\n" .
" {$section_props}['start'] = max(0, (int)({$section_props}['loop'] + {$section_props}['start']));\n";
if (isset($attrs['show']))
$show_attr_code .= "$show_attr_value &&";
$output .= "{$section_props}['show'] = $show_attr_code {$section_props}['loop'] > 0 && {$section_props}['max'] > 0 && {$section_props}['start'] < {$section_props}['loop'];\n";
$output .= "if ({$section_props}['show'])\n" .
" {$section_props}['total'] = min({$section_props}['loop'] - {$section_props}['start'], {$section_props}['max']);\n" .
"else\n" .
" {$section_props}['total'] = 0;\n";
$output .= "if ({$section_props}['show']):\n";
$output .= "
for ({$section_props}['index'] = 0;
{$section_props}['index'] < {$section_props}['loop'];
{$section_props}['index']++):\n";
for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
{$section_props}['index'] < {$section_props}['loop'] && {$section_props}['iteration'] <= {$section_props}['max'];
{$section_props}['index']++, {$section_props}['iteration']++):\n";
$output .= "{$section_props}['rownum'] = {$section_props}['index'] + 1;\n";
$output .= "{$section_props}['index_prev'] = {$section_props}['index'] - 1;\n";
$output .= "{$section_props}['index_next'] = {$section_props}['index'] + 1;\n";
$output .= "{$section_props}['first'] = ({$section_props}['index'] == 0);\n";
$output .= "{$section_props}['first'] = ({$section_props}['index'] == {$section_props}['start']);\n";
$output .= "{$section_props}['last'] = ({$section_props}['index'] == {$section_props}['loop']-1);\n";
$output .= "?>";
@@ -566,7 +587,7 @@ class Smarty_Compiler extends Smarty {
default:
if($this->security &&
$tokens[$i+1] == '(' &&
!preg_match("|[^a-zA-Z_]|",$tokens[$i]) &&
preg_match('!^[a-zA-Z_]\w+$!', $tokens[$i]) &&
!in_array($tokens[$i], $this->security_settings['IF_FUNCS'])) {
$this->_syntax_error("(secure mode) '".$tokens[$i]."' not allowed in if statement");
}

1
demo/index.php
View File

@@ -5,7 +5,6 @@ require("Smarty.class.php");
$smarty = new Smarty;
$smarty->compile_check = true;
$smarty->debugging = true;
$smarty->assign("now", time());

1
index.php
View File

@@ -5,7 +5,6 @@ require("Smarty.class.php");
$smarty = new Smarty;
$smarty->compile_check = true;
$smarty->debugging = true;
$smarty->assign("now", time());

2
libs/Smarty.class.php
View File

@@ -104,7 +104,7 @@ class Smarty
var $security = false; // enable template security (default false)
var $secure_dir = array("./templates"); // array of directories considered secure
var $secure_dir = array('./templates'); // array of directories considered secure
var $security_settings = array(
'PHP_HANDLING' => false,
'IF_FUNCS' => array('array', 'list',

57
libs/Smarty_Compiler.class.php
View File

@@ -421,43 +421,64 @@ class Smarty_Compiler extends Smarty {
foreach ($attrs as $attr_name => $attr_value) {
switch ($attr_name) {
case 'loop':
$output .= "{$section_props}['loop'] = is_array($attr_value) ? count($attr_value) : $attr_value;\n";
$output .= "{$section_props}['loop'] = is_array($attr_value) ? count($attr_value) : max(0, (int)$attr_value);\n";
break;
case 'show':
if (is_bool($attr_value))
$attr_value = $attr_value ? 'true' : 'false';
$show_attr_value = $attr_value ? 'true' : 'false';
else
$show_attr_value = $attr_value;
break;
case 'name':
$output .= "{$section_props}['$attr_name'] = $attr_value;\n";
break;
case 'max':
$output .= "{$section_props}['$attr_name'] = max(0, (int)$attr_value);\n";
break;
case 'start':
$output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
break;
default:
$output .= "{$section_props}['$attr_name'] = $attr_value;\n";
$this->_syntax_error("unknown section attribute - '$attr_name'");
break;
}
}
if (isset($attrs['loop'])) {
$loop_check_code = "{$section_props}['loop'] > 0 && ";
} else {
if (!isset($attrs['loop']))
$output .= "{$section_props}['loop'] = 1;\n";
}
if (isset($attrs['show'])) {
$show_check_code = "{$section_props}['show'] && ";
} else {
$output .= "{$section_props}['show'] = {$section_props}['loop'] > 0;\n";
}
if (!isset($attrs['max']))
$output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
$output .= "if ($loop_check_code $show_check_code true): ";
if (!isset($attrs['start']))
$output .= "{$section_props}['start'] = 0;\n";
else
$output .= "if ({$section_props}['start'] < 0)\n" .
" {$section_props}['start'] = max(0, (int)({$section_props}['loop'] + {$section_props}['start']));\n";
if (isset($attrs['show']))
$show_attr_code .= "$show_attr_value &&";
$output .= "{$section_props}['show'] = $show_attr_code {$section_props}['loop'] > 0 && {$section_props}['max'] > 0 && {$section_props}['start'] < {$section_props}['loop'];\n";
$output .= "if ({$section_props}['show'])\n" .
" {$section_props}['total'] = min({$section_props}['loop'] - {$section_props}['start'], {$section_props}['max']);\n" .
"else\n" .
" {$section_props}['total'] = 0;\n";
$output .= "if ({$section_props}['show']):\n";
$output .= "
for ({$section_props}['index'] = 0;
{$section_props}['index'] < {$section_props}['loop'];
{$section_props}['index']++):\n";
for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
{$section_props}['index'] < {$section_props}['loop'] && {$section_props}['iteration'] <= {$section_props}['max'];
{$section_props}['index']++, {$section_props}['iteration']++):\n";
$output .= "{$section_props}['rownum'] = {$section_props}['index'] + 1;\n";
$output .= "{$section_props}['index_prev'] = {$section_props}['index'] - 1;\n";
$output .= "{$section_props}['index_next'] = {$section_props}['index'] + 1;\n";
$output .= "{$section_props}['first'] = ({$section_props}['index'] == 0);\n";
$output .= "{$section_props}['first'] = ({$section_props}['index'] == {$section_props}['start']);\n";
$output .= "{$section_props}['last'] = ({$section_props}['index'] == {$section_props}['loop']-1);\n";
$output .= "?>";
@@ -566,7 +587,7 @@ class Smarty_Compiler extends Smarty {
default:
if($this->security &&
$tokens[$i+1] == '(' &&
!preg_match("|[^a-zA-Z_]|",$tokens[$i]) &&
preg_match('!^[a-zA-Z_]\w+$!', $tokens[$i]) &&
!in_array($tokens[$i], $this->security_settings['IF_FUNCS'])) {
$this->_syntax_error("(secure mode) '".$tokens[$i]."' not allowed in if statement");
}