X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=smarty%2Fplugins%2Ffunction.cycle.php;h=fe78bb87da02a617af79964a02c944543c68c27b;hb=cb2adba7030b7a2eba73afa7e4ec1f48b57a6073;hp=d5909a61a34371cfda5662d4838193e6ba1b52d9;hpb=aa36c490d2218814cb6faa20e31c10b5599d4483;p=contagged
diff --git a/smarty/plugins/function.cycle.php b/smarty/plugins/function.cycle.php
index d5909a6..fe78bb8 100644
--- a/smarty/plugins/function.cycle.php
+++ b/smarty/plugins/function.cycle.php
@@ -23,7 +23,7 @@
* - delimiter = the value delimiter, default is ","
* - assign = boolean, assigns to template var instead of
* printed.
- *
+ *
* Examples:
*
* {cycle values="#eeeeee,#d0d0d0d"}
@@ -32,7 +32,7 @@
*
* @link http://smarty.php.net/manual/en/language.function.cycle.php {cycle}
* (Smarty online manual)
- * @author Monte Ohrt
+ * @author Monte Ohrt
* @author credit to Mark Priatel
* @author credit to Gerard
* @author credit to Jason Sweat
@@ -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']);
+ if(is_array($cycle_vars[$name]['values'])) {
+ $cycle_array = $cycle_vars[$name]['values'];
} else {
- $cycle_array = $cycle_vars[$name]['values'];
+ $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) {
@@ -105,7 +88,7 @@ function smarty_function_cycle($params, &$smarty)
if($advance) {
if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
- $cycle_vars[$name]['index'] = 0;
+ $cycle_vars[$name]['index'] = 0;
} else {
$cycle_vars[$name]['index']++;
}