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

removed extract() from parameter-parsing

Browse Source
This commit is contained in:
messju
2003-12-19 08:49:17 +00:00
parent f10a08162f
commit cc87a960f4
2 changed files with 23 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libs/plugins/function.counter.php
View File

@@ -22,16 +22,7 @@ function smarty_function_counter($params, &$smarty)
{
static $counters = array();
extract($params);
if (!isset($name)) {
if(isset($id)) {
$name = $id;
} else {
$name = "default";
}
}
$name = (isset($params['name'])) ? $params['name'] : 'default';
if (!isset($counters[$name])) {
$counters[$name] = array(
'start'=>1,
@@ -42,20 +33,20 @@ function smarty_function_counter($params, &$smarty)
}
$counter =& $counters[$name];
if (isset($start)) {
$counter['start'] = $counter['count'] = $start;
if (isset($params['start'])) {
$counter['start'] = $counter['count'] = (int)$params['start'];
}
if (!empty($assign)) {
$counter['assign'] = $assign;
if (!empty($params['assign'])) {
$counter['assign'] = $params['assign'];
}
if (isset($counter['assign'])) {
$smarty->assign($counter['assign'], $counter['count']);
}
if (isset($print)) {
$print = (bool)$print;
if (isset($params['print'])) {
$print = (bool)$params['print'];
} else {
$print = empty($counter['assign']);
}
@@ -66,12 +57,12 @@ function smarty_function_counter($params, &$smarty)
$retval = null;
}
if (isset($skip)) {
$counter['skip'] = $skip;
if (isset($params['skip'])) {
$counter['skip'] = $params['skip'];
}
if (isset($direction)) {
$counter['direction'] = $direction;
if (isset($params['direction'])) {
$counter['direction'] = $params['direction'];
}
if ($counter['direction'] == "down")

41
libs/plugins/function.cycle.php
View File

@@ -45,23 +45,10 @@ function smarty_function_cycle($params, &$smarty)
{
static $cycle_vars;
extract($params);
if (empty($name)) {
$name = 'default';
}
if (!isset($print)) {
$print = true;
}
if (!isset($advance)) {
$advance = true;
}
if (!isset($reset)) {
$reset = false;
}
$name = (empty($params['name'])) ? 'default' : $params['name'];
$print = (isset($params['print'])) ? (bool)$params['print'] : true;
$advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
$reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
if (!in_array('values', array_keys($params))) {
if(!isset($cycle_vars[$name]['values'])) {
@@ -70,31 +57,27 @@ function smarty_function_cycle($params, &$smarty)
}
} else {
if(isset($cycle_vars[$name]['values'])
&& $cycle_vars[$name]['values'] != $values ) {
&& $cycle_vars[$name]['values'] != $params['values'] ) {
$cycle_vars[$name]['index'] = 0;
}
$cycle_vars[$name]['values'] = $values;
$cycle_vars[$name]['values'] = $params['values'];
}
if (isset($delimiter)) {
$cycle_vars[$name]['delimiter'] = $delimiter;
} elseif (!isset($cycle_vars[$name]['delimiter'])) {
$cycle_vars[$name]['delimiter'] = ',';
}
$cycle_vars[$name]['delimiter'] = (isset($params['delimiter'])) ? $params['delimiter'] : ',';
if(!is_array($cycle_vars[$name]['values'])) {
$cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
} else {
if(is_array($cycle_vars[$name]['values'])) {
$cycle_array = $cycle_vars[$name]['values'];
} else {
$cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
}
if(!isset($cycle_vars[$name]['index']) || $reset ) {
$cycle_vars[$name]['index'] = 0;
}
if (isset($assign)) {
if (isset($params['assign'])) {
$print = false;
$smarty->assign($assign, $cycle_array[$cycle_vars[$name]['index']]);
$smarty->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
}
if($print) {