mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-04 10:24:26 +02:00
- bugfix {$smarty.section.customer.loop} did throw compiler error https://github.com/smarty-php/smarty/issues/161
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
26.01.2016
|
||||
- improvement observe Smarty::$_CHARSET in debugging console https://github.com/smarty-php/smarty/issues/169
|
||||
- bugfix compiling {section} did create warning
|
||||
- bugfix {$smarty.section.customer.loop} did throw compiler error https://github.com/smarty-php/smarty/issues/161
|
||||
|
||||
02.01.2016
|
||||
- update scope handling
|
||||
|
@@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase
|
||||
/**
|
||||
* smarty version
|
||||
*/
|
||||
const SMARTY_VERSION = '3.1.30-dev/18';
|
||||
const SMARTY_VERSION = '3.1.30-dev/19';
|
||||
|
||||
/**
|
||||
* define variable scopes
|
||||
|
@@ -16,6 +16,14 @@
|
||||
*/
|
||||
class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_ForeachSection
|
||||
{
|
||||
/**
|
||||
* Valid properties of $smarty.section.name.xxx variable
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'rownum', 'index_prev',
|
||||
'index_next', 'loop');
|
||||
|
||||
/**
|
||||
* Attribute definition: Overwrites base class.
|
||||
*
|
||||
@@ -54,14 +62,6 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
|
||||
*/
|
||||
public $tagName = 'section';
|
||||
|
||||
/**
|
||||
* Valid properties of $smarty.section.name.xxx variable
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'rownum',
|
||||
'index_prev', 'index_next');
|
||||
|
||||
/**
|
||||
* {section} tag has no item properties
|
||||
*
|
||||
@@ -79,19 +79,20 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
|
||||
/**
|
||||
* Compiles code for the {section} tag
|
||||
*
|
||||
* @param array $args array with attributes from parser
|
||||
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
|
||||
* @param array $args array with attributes from parser
|
||||
* @param \Smarty_Internal_TemplateCompiler $compiler compiler object
|
||||
* @param null $parameter
|
||||
*
|
||||
* @return string compiled code
|
||||
* @throws \SmartyCompilerException
|
||||
*/
|
||||
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
|
||||
public function compile($args, Smarty_Internal_TemplateCompiler $compiler, $parameter = null)
|
||||
{
|
||||
$compiler->loopNesting++;
|
||||
$compiler->loopNesting ++;
|
||||
// check and get attributes
|
||||
$_attr = $this->getAttributes($compiler, $args);
|
||||
$attributes = array('name' => $compiler->getId($_attr['name']));
|
||||
unset($_attr['name']);
|
||||
$attributes = array('name' => $compiler->getId($_attr[ 'name' ]));
|
||||
unset($_attr[ 'name' ]);
|
||||
foreach ($attributes as $a => $v) {
|
||||
if ($v === false) {
|
||||
$compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
|
||||
@@ -103,7 +104,8 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
|
||||
// maybe nocache because of nocache variables
|
||||
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
|
||||
|
||||
$initLocal = array('saved' => "isset(\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']) ? \$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}'] : false",);
|
||||
$initLocal =
|
||||
array('saved' => "isset(\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']) ? \$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}'] : false",);
|
||||
$initNamedProperty = array();
|
||||
$initFor = array();
|
||||
$incFor = array();
|
||||
@@ -115,11 +117,12 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
|
||||
$propType = array('index' => 2, 'iteration' => 2, 'show' => 0, 'step' => 0,);
|
||||
// search for used tag attributes
|
||||
$this->scanForProperties($attributes, $compiler);
|
||||
if (!empty($this->matchResults['named'])) {
|
||||
$namedAttr = $this->matchResults['named'];
|
||||
if (!empty($this->matchResults[ 'named' ])) {
|
||||
$namedAttr = $this->matchResults[ 'named' ];
|
||||
}
|
||||
$namedAttr['index'] = true;
|
||||
$output = "<?php\n";
|
||||
$namedAttr[ 'index' ] = true;
|
||||
$v = $t = null;
|
||||
$output = '';
|
||||
foreach ($_attr as $attr_name => $attr_value) {
|
||||
switch ($attr_name) {
|
||||
case 'loop':
|
||||
@@ -130,13 +133,13 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
|
||||
$v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
|
||||
$t = 1;
|
||||
}
|
||||
if (isset($namedAttr['loop'])) {
|
||||
$initNamedProperty['loop'] = "'loop' => {$v}";
|
||||
if (isset($namedAttr[ 'loop' ])) {
|
||||
$initNamedProperty[ 'loop' ] = "'loop' => {$v}";
|
||||
if ($t == 1) {
|
||||
$v = "{$sectionVar}->value['loop']";
|
||||
}
|
||||
} elseif ($t == 1) {
|
||||
$initLocal['loop'] = $v;
|
||||
$initLocal[ 'loop' ] = $v;
|
||||
$v = "{$local}loop";
|
||||
}
|
||||
break;
|
||||
@@ -156,7 +159,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
|
||||
$t = 0;
|
||||
break;
|
||||
}
|
||||
$initLocal['step'] = "((int)@$attr_value) == 0 ? 1 : (int)@$attr_value";
|
||||
$initLocal[ 'step' ] = "((int)@$attr_value) == 0 ? 1 : (int)@$attr_value";
|
||||
$v = "{$local}step";
|
||||
$t = 2;
|
||||
break;
|
||||
@@ -175,166 +178,171 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
|
||||
if ($t == 3 && $compiler->getId($attr_value)) {
|
||||
$t = 1;
|
||||
}
|
||||
$propValue[$attr_name] = $v;
|
||||
$propType[$attr_name] = $t;
|
||||
$propValue[ $attr_name ] = $v;
|
||||
$propType[ $attr_name ] = $t;
|
||||
}
|
||||
|
||||
if (isset($namedAttr['step'])) {
|
||||
$initNamedProperty['step'] = $propValue['step'];
|
||||
if (isset($namedAttr[ 'step' ])) {
|
||||
$initNamedProperty[ 'step' ] = $propValue[ 'step' ];
|
||||
}
|
||||
if (isset($namedAttr['iteration'])) {
|
||||
$propValue['iteration'] = "{$sectionVar}->value['iteration']";
|
||||
if (isset($namedAttr[ 'iteration' ])) {
|
||||
$propValue[ 'iteration' ] = "{$sectionVar}->value['iteration']";
|
||||
}
|
||||
$incFor['iteration'] = "{$propValue['iteration']}++";
|
||||
$initFor['iteration'] = "{$propValue['iteration']} = 1";
|
||||
$incFor[ 'iteration' ] = "{$propValue['iteration']}++";
|
||||
$initFor[ 'iteration' ] = "{$propValue['iteration']} = 1";
|
||||
|
||||
if ($propType['step'] == 0) {
|
||||
if ($propValue['step'] == 1) {
|
||||
$incFor['index'] = "{$sectionVar}->value['index']++";
|
||||
} elseif ($propValue['step'] > 1) {
|
||||
$incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
|
||||
if ($propType[ 'step' ] == 0) {
|
||||
if ($propValue[ 'step' ] == 1) {
|
||||
$incFor[ 'index' ] = "{$sectionVar}->value['index']++";
|
||||
} elseif ($propValue[ 'step' ] > 1) {
|
||||
$incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}";
|
||||
} else {
|
||||
$incFor['index'] = "{$sectionVar}->value['index'] -= " . - $propValue['step'];
|
||||
$incFor[ 'index' ] = "{$sectionVar}->value['index'] -= " . - $propValue[ 'step' ];
|
||||
}
|
||||
} else {
|
||||
$incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
|
||||
$incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}";
|
||||
}
|
||||
|
||||
if (!isset($propValue['max'])) {
|
||||
$propValue['max'] = $propValue['loop'];
|
||||
$propType['max'] = $propType['loop'];
|
||||
} elseif ($propType['max'] != 0) {
|
||||
$propValue['max'] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
|
||||
$propType['max'] = 1;
|
||||
if (!isset($propValue[ 'max' ])) {
|
||||
$propValue[ 'max' ] = $propValue[ 'loop' ];
|
||||
$propType[ 'max' ] = $propType[ 'loop' ];
|
||||
} elseif ($propType[ 'max' ] != 0) {
|
||||
$propValue[ 'max' ] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
|
||||
$propType[ 'max' ] = 1;
|
||||
} else {
|
||||
if ($propValue['max'] < 0) {
|
||||
$propValue['max'] = $propValue['loop'];
|
||||
$propType['max'] = $propType['loop'];
|
||||
if ($propValue[ 'max' ] < 0) {
|
||||
$propValue[ 'max' ] = $propValue[ 'loop' ];
|
||||
$propType[ 'max' ] = $propType[ 'loop' ];
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($propValue['start'])) {
|
||||
$start_code = array(1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue['loop'],
|
||||
5 => ' - 1');
|
||||
if ($propType['loop'] == 0) {
|
||||
$start_code[5] = '';
|
||||
$start_code[4] = $propValue['loop'] - 1;
|
||||
if (!isset($propValue[ 'start' ])) {
|
||||
$start_code =
|
||||
array(1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue[ 'loop' ], 5 => ' - 1');
|
||||
if ($propType[ 'loop' ] == 0) {
|
||||
$start_code[ 5 ] = '';
|
||||
$start_code[ 4 ] = $propValue[ 'loop' ] - 1;
|
||||
}
|
||||
if ($propType['step'] == 0) {
|
||||
if ($propValue['step'] > 0) {
|
||||
if ($propType[ 'step' ] == 0) {
|
||||
if ($propValue[ 'step' ] > 0) {
|
||||
$start_code = array(1 => '0');
|
||||
$propType['start'] = 0;
|
||||
$propType[ 'start' ] = 0;
|
||||
} else {
|
||||
$start_code[1] = $start_code[2] = $start_code[3] = '';
|
||||
$propType['start'] = $propType['loop'];
|
||||
$start_code[ 1 ] = $start_code[ 2 ] = $start_code[ 3 ] = '';
|
||||
$propType[ 'start' ] = $propType[ 'loop' ];
|
||||
}
|
||||
} else {
|
||||
$propType['start'] = 1;
|
||||
$propType[ 'start' ] = 1;
|
||||
}
|
||||
$propValue['start'] = join('', $start_code);
|
||||
$propValue[ 'start' ] = join('', $start_code);
|
||||
} else {
|
||||
$start_code = array(1 => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ",
|
||||
4 => '0', 5 => ' : ', 6 => '-1', 7 => ', ',
|
||||
8 => "{$propValue['start']} + {$propValue['loop']}", 10 => ')', 11 => ' : ',
|
||||
12 => 'min(', 13 => $propValue['start'], 14 => ', ',
|
||||
15 => "{$propValue['step']} > 0 ? ", 16 => $propValue['loop'], 17 => ' : ',
|
||||
18 => $propType['loop'] == 0 ? $propValue['loop'] - 1 : "{$propValue['loop']} - 1",
|
||||
19 => ')');
|
||||
if ($propType['step'] == 0) {
|
||||
$start_code[3] = $start_code[5] = $start_code[15] = $start_code[17] = '';
|
||||
if ($propValue['step'] > 0) {
|
||||
$start_code[6] = $start_code[18] = '';
|
||||
$start_code =
|
||||
array(1 => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ", 4 => '0',
|
||||
5 => ' : ', 6 => '-1', 7 => ', ', 8 => "{$propValue['start']} + {$propValue['loop']}", 10 => ')',
|
||||
11 => ' : ', 12 => 'min(', 13 => $propValue[ 'start' ], 14 => ', ',
|
||||
15 => "{$propValue['step']} > 0 ? ", 16 => $propValue[ 'loop' ], 17 => ' : ',
|
||||
18 => $propType[ 'loop' ] == 0 ? $propValue[ 'loop' ] - 1 : "{$propValue['loop']} - 1",
|
||||
19 => ')');
|
||||
if ($propType[ 'step' ] == 0) {
|
||||
$start_code[ 3 ] = $start_code[ 5 ] = $start_code[ 15 ] = $start_code[ 17 ] = '';
|
||||
if ($propValue[ 'step' ] > 0) {
|
||||
$start_code[ 6 ] = $start_code[ 18 ] = '';
|
||||
} else {
|
||||
$start_code[4] = $start_code[16] = '';
|
||||
$start_code[ 4 ] = $start_code[ 16 ] = '';
|
||||
}
|
||||
}
|
||||
if ($propType['start'] == 0) {
|
||||
if ($propType['loop'] == 0) {
|
||||
$start_code[8] = $propValue['start'] + $propValue['loop'];
|
||||
if ($propType[ 'start' ] == 0) {
|
||||
if ($propType[ 'loop' ] == 0) {
|
||||
$start_code[ 8 ] = $propValue[ 'start' ] + $propValue[ 'loop' ];
|
||||
}
|
||||
$propType['start'] = $propType['step'] + $propType['loop'];
|
||||
$start_code[1] = '';
|
||||
if ($propValue['start'] < 0) {
|
||||
$propType[ 'start' ] = $propType[ 'step' ] + $propType[ 'loop' ];
|
||||
$start_code[ 1 ] = '';
|
||||
if ($propValue[ 'start' ] < 0) {
|
||||
for ($i = 11; $i <= 19; $i ++) {
|
||||
$start_code[$i] = '';
|
||||
$start_code[ $i ] = '';
|
||||
}
|
||||
if ($propType['start'] == 0) {
|
||||
$start_code = array(max($propValue['step'] > 0 ? 0 : - 1, $propValue['start'] +
|
||||
$propValue['loop']));
|
||||
if ($propType[ 'start' ] == 0) {
|
||||
$start_code = array(max($propValue[ 'step' ] > 0 ? 0 : - 1,
|
||||
$propValue[ 'start' ] + $propValue[ 'loop' ]));
|
||||
}
|
||||
} else {
|
||||
for ($i = 1; $i <= 11; $i ++) {
|
||||
$start_code[$i] = '';
|
||||
$start_code[ $i ] = '';
|
||||
}
|
||||
if ($propType['start'] == 0) {
|
||||
$start_code = array(min($propValue['step'] > 0 ? $propValue['loop'] : $propValue['loop'] -
|
||||
1, $propValue['start']));
|
||||
if ($propType[ 'start' ] == 0) {
|
||||
$start_code =
|
||||
array(min($propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] : $propValue[ 'loop' ] - 1,
|
||||
$propValue[ 'start' ]));
|
||||
}
|
||||
}
|
||||
}
|
||||
$propValue['start'] = join('', $start_code);
|
||||
$propValue[ 'start' ] = join('', $start_code);
|
||||
}
|
||||
if ($propType['start'] != 0) {
|
||||
$initLocal['start'] = $propValue['start'];
|
||||
$propValue['start'] = "{$local}start";
|
||||
if ($propType[ 'start' ] != 0) {
|
||||
$initLocal[ 'start' ] = $propValue[ 'start' ];
|
||||
$propValue[ 'start' ] = "{$local}start";
|
||||
}
|
||||
|
||||
$initFor['index'] = "{$sectionVar}->value['index'] = {$propValue['start']}";
|
||||
$initFor[ 'index' ] = "{$sectionVar}->value['index'] = {$propValue['start']}";
|
||||
|
||||
if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
|
||||
$propValue['total'] = $propValue['loop'];
|
||||
$propType['total'] = $propType['loop'];
|
||||
if (!isset($_attr[ 'start' ]) && !isset($_attr[ 'step' ]) && !isset($_attr[ 'max' ])) {
|
||||
$propValue[ 'total' ] = $propValue[ 'loop' ];
|
||||
$propType[ 'total' ] = $propType[ 'loop' ];
|
||||
} else {
|
||||
$propType['total'] = $propType['start'] + $propType['loop'] + $propType['step'] + $propType['max'];
|
||||
if ($propType['total'] == 0) {
|
||||
$propValue['total'] = min(ceil(($propValue['step'] > 0 ? $propValue['loop'] -
|
||||
$propValue['start'] : (int) $propValue['start'] + 1) /
|
||||
abs($propValue['step'])), $propValue['max']);
|
||||
$propType[ 'total' ] =
|
||||
$propType[ 'start' ] + $propType[ 'loop' ] + $propType[ 'step' ] + $propType[ 'max' ];
|
||||
if ($propType[ 'total' ] == 0) {
|
||||
$propValue[ 'total' ] =
|
||||
min(ceil(($propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] - $propValue[ 'start' ] :
|
||||
(int) $propValue[ 'start' ] + 1) / abs($propValue[ 'step' ])), $propValue[ 'max' ]);
|
||||
} else {
|
||||
$total_code = array(1 => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
|
||||
5 => $propValue['loop'], 6 => ' - ', 7 => $propValue['start'], 8 => ' : ',
|
||||
9 => $propValue['start'], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
|
||||
14 => $propValue['step'], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",);
|
||||
if (!isset($propValue['max'])) {
|
||||
$total_code[1] = $total_code[17] = '';
|
||||
5 => $propValue[ 'loop' ], 6 => ' - ', 7 => $propValue[ 'start' ], 8 => ' : ',
|
||||
9 => $propValue[ 'start' ], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
|
||||
14 => $propValue[ 'step' ], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",);
|
||||
if (!isset($propValue[ 'max' ])) {
|
||||
$total_code[ 1 ] = $total_code[ 17 ] = '';
|
||||
}
|
||||
if ($propType['loop'] + $propType['start'] == 0) {
|
||||
$total_code[5] = $propValue['loop'] - $propValue['start'];
|
||||
$total_code[6] = $total_code[7] = '';
|
||||
if ($propType[ 'loop' ] + $propType[ 'start' ] == 0) {
|
||||
$total_code[ 5 ] = $propValue[ 'loop' ] - $propValue[ 'start' ];
|
||||
$total_code[ 6 ] = $total_code[ 7 ] = '';
|
||||
}
|
||||
if ($propType['start'] == 0) {
|
||||
$total_code[9] = (int) $propValue['start'] + 1;
|
||||
$total_code[10] = '';
|
||||
if ($propType[ 'start' ] == 0) {
|
||||
$total_code[ 9 ] = (int) $propValue[ 'start' ] + 1;
|
||||
$total_code[ 10 ] = '';
|
||||
}
|
||||
if ($propType['step'] == 0) {
|
||||
$total_code[13] = $total_code[15] = '';
|
||||
if ($propValue['step'] == 1 || $propValue['step'] == - 1) {
|
||||
$total_code[2] = $total_code[12] = $total_code[14] = $total_code[16] = '';
|
||||
} elseif ($propValue['step'] < 0) {
|
||||
$total_code[14] = - $propValue['step'];
|
||||
if ($propType[ 'step' ] == 0) {
|
||||
$total_code[ 13 ] = $total_code[ 15 ] = '';
|
||||
if ($propValue[ 'step' ] == 1 || $propValue[ 'step' ] == - 1) {
|
||||
$total_code[ 2 ] = $total_code[ 12 ] = $total_code[ 14 ] = $total_code[ 16 ] = '';
|
||||
} elseif ($propValue[ 'step' ] < 0) {
|
||||
$total_code[ 14 ] = - $propValue[ 'step' ];
|
||||
}
|
||||
$total_code[4] = '';
|
||||
if ($propValue['step'] > 0) {
|
||||
$total_code[8] = $total_code[9] = $total_code[10] = '';
|
||||
$total_code[ 4 ] = '';
|
||||
if ($propValue[ 'step' ] > 0) {
|
||||
$total_code[ 8 ] = $total_code[ 9 ] = $total_code[ 10 ] = '';
|
||||
} else {
|
||||
$total_code[5] = $total_code[6] = $total_code[7] = $total_code[8] = '';
|
||||
$total_code[ 5 ] = $total_code[ 6 ] = $total_code[ 7 ] = $total_code[ 8 ] = '';
|
||||
}
|
||||
}
|
||||
$propValue['total'] = join('', $total_code);
|
||||
$propValue[ 'total' ] = join('', $total_code);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($namedAttr['total'])) {
|
||||
$initNamedProperty['total'] = "'total' => {$propValue['total']}";
|
||||
if ($propType['total'] > 0) {
|
||||
$propValue['total'] = "{$sectionVar}->value['total']";
|
||||
if (isset($namedAttr[ 'total' ])) {
|
||||
$initNamedProperty[ 'loop' ] = "'loop' => {$propValue['total']}";
|
||||
}
|
||||
if (isset($namedAttr[ 'total' ])) {
|
||||
$initNamedProperty[ 'total' ] = "'total' => {$propValue['total']}";
|
||||
if ($propType[ 'total' ] > 0) {
|
||||
$propValue[ 'total' ] = "{$sectionVar}->value['total']";
|
||||
}
|
||||
} elseif ($propType['total'] > 0) {
|
||||
$initLocal['total'] = $propValue['total'];
|
||||
$propValue['total'] = "{$local}total";
|
||||
} elseif ($propType[ 'total' ] > 0) {
|
||||
$initLocal[ 'total' ] = $propValue[ 'total' ];
|
||||
$propValue[ 'total' ] = "{$local}total";
|
||||
}
|
||||
|
||||
$cmpFor['iteration'] = "{$propValue['iteration']} <= {$propValue['total']}";
|
||||
$cmpFor[ 'iteration' ] = "{$propValue['iteration']} <= {$propValue['total']}";
|
||||
|
||||
foreach ($initLocal as $key => $code) {
|
||||
$output .= "{$local}{$key} = {$code};\n";
|
||||
@@ -343,17 +351,17 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
|
||||
$_vars = 'array(' . join(', ', $initNamedProperty) . ')';
|
||||
$output .= "{$sectionVar} = new Smarty_Variable({$_vars});\n";
|
||||
$cond_code = "{$propValue['total']} != 0";
|
||||
if ($propType['total'] == 0) {
|
||||
if ($propValue['total'] == 0) {
|
||||
if ($propType[ 'total' ] == 0) {
|
||||
if ($propValue[ 'total' ] == 0) {
|
||||
$cond_code = 'false';
|
||||
} else {
|
||||
$cond_code = 'true';
|
||||
}
|
||||
}
|
||||
if ($propType['show'] > 0) {
|
||||
if ($propType[ 'show' ] > 0) {
|
||||
$output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n";
|
||||
$output .= "if ({$local}show) {\n";
|
||||
} elseif ($propValue['show'] == 'true') {
|
||||
} elseif ($propValue[ 'show' ] == 'true') {
|
||||
$output .= "if ({$cond_code}) {\n";
|
||||
} else {
|
||||
$output .= "if (false) {\n";
|
||||
@@ -362,23 +370,21 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
|
||||
$jcmp = join(', ', $cmpFor);
|
||||
$jinc = join(', ', $incFor);
|
||||
$output .= "for ({$jinit}; {$jcmp}; {$jinc}){\n";
|
||||
if (isset($namedAttr['rownum'])) {
|
||||
if (isset($namedAttr[ 'rownum' ])) {
|
||||
$output .= "{$sectionVar}->value['rownum'] = {$propValue['iteration']};\n";
|
||||
}
|
||||
if (isset($namedAttr['index_prev'])) {
|
||||
if (isset($namedAttr[ 'index_prev' ])) {
|
||||
$output .= "{$sectionVar}->value['index_prev'] = {$propValue['index']} - {$propValue['step']};\n";
|
||||
}
|
||||
if (isset($namedAttr['index_next'])) {
|
||||
if (isset($namedAttr[ 'index_next' ])) {
|
||||
$output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n";
|
||||
}
|
||||
if (isset($namedAttr['first'])) {
|
||||
if (isset($namedAttr[ 'first' ])) {
|
||||
$output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} == 1);\n";
|
||||
}
|
||||
if (isset($namedAttr['last'])) {
|
||||
if (isset($namedAttr[ 'last' ])) {
|
||||
$output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} == {$propValue['total']});\n";
|
||||
}
|
||||
$output .= "?>";
|
||||
|
||||
return $output;
|
||||
}
|
||||
}
|
||||
@@ -394,12 +400,13 @@ class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
|
||||
/**
|
||||
* Compiles code for the {sectionelse} tag
|
||||
*
|
||||
* @param array $args array with attributes from parser
|
||||
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
|
||||
* @param array $args array with attributes from parser
|
||||
* @param \Smarty_Internal_TemplateCompiler $compiler compiler object
|
||||
* @param null $parameter
|
||||
*
|
||||
* @return string compiled code
|
||||
*/
|
||||
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
|
||||
public function compile($args, Smarty_Internal_TemplateCompiler $compiler, $parameter = null)
|
||||
{
|
||||
// check and get attributes
|
||||
$_attr = $this->getAttributes($compiler, $args);
|
||||
@@ -407,7 +414,7 @@ class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
|
||||
list($openTag, $nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section'));
|
||||
$this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache, $local, $sectionVar));
|
||||
|
||||
return "<?php }} else {\n ?>";
|
||||
return "}\n} else {\n";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -422,23 +429,24 @@ class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
|
||||
/**
|
||||
* Compiles code for the {/section} tag
|
||||
*
|
||||
* @param array $args array with attributes from parser
|
||||
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
|
||||
* @param array $args array with attributes from parser
|
||||
* @param \Smarty_Internal_TemplateCompiler $compiler compiler object
|
||||
* @param null $parameter
|
||||
*
|
||||
* @return string compiled code
|
||||
*/
|
||||
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
|
||||
public function compile($args, Smarty_Internal_TemplateCompiler $compiler, $parameter = null)
|
||||
{
|
||||
$compiler->loopNesting--;
|
||||
$compiler->loopNesting --;
|
||||
// must endblock be nocache?
|
||||
if ($compiler->nocache) {
|
||||
$compiler->tag_nocache = true;
|
||||
}
|
||||
|
||||
list($openTag, $compiler->nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section',
|
||||
'sectionelse'));
|
||||
list($openTag, $compiler->nocache, $local, $sectionVar) =
|
||||
$this->closeTag($compiler, array('section', 'sectionelse'));
|
||||
|
||||
$output = "<?php\n";
|
||||
$output = '';
|
||||
if ($openTag == 'sectionelse') {
|
||||
$output .= "}\n";
|
||||
} else {
|
||||
@@ -447,8 +455,6 @@ class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
|
||||
$output .= "if ({$local}saved) {\n";
|
||||
$output .= "{$sectionVar} = {$local}saved;\n";
|
||||
$output .= "}\n";
|
||||
$output .= "?>";
|
||||
|
||||
return $output;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user