fixed property

[gosa.git] / gosa-core / include / smarty / plugins / function.cycle.php

diff --git a/gosa-core/include/smarty/plugins/function.cycle.php b/gosa-core/include/smarty/plugins/function.cycle.php
index fe78bb87da02a617af79964a02c944543c68c27b..f1cb46ba65e27f0ce93cc54312e8e4cac87f117d 100644 (file)
--- a/gosa-core/include/smarty/plugins/function.cycle.php
+++ b/gosa-core/include/smarty/plugins/function.cycle.php
@@ -2,7 +2,7 @@
 /**
  * Smarty plugin
  * @package Smarty
- * @subpackage plugins
+ * @subpackage PluginsFunction
  */
 
 /**
@@ -12,17 +12,6 @@
  * Name:     cycle<br>
  * Date:     May 3, 2002<br>
  * Purpose:  cycle through given values<br>
- * Input:
- *         - name = name of cycle (optional)
- *         - values = comma separated list of values to cycle,
- *                    or an array of values to cycle
- *                    (this can be left out for subsequent calls)
- *         - reset = boolean - resets given var to true
- *         - print = boolean - print var or not. default is true
- *         - advance = boolean - whether or not to advance the cycle
- *         - delimiter = the value delimiter, default is ","
- *         - assign = boolean, assigns to template var instead of
- *                    printed.
  *
  * Examples:<br>
  * <pre>
@@ -36,67 +25,77 @@
  * @author credit to Mark Priatel <mpriatel@rogers.com>
  * @author credit to Gerard <gerard@interfold.com>
  * @author credit to Jason Sweat <jsweat_php@yahoo.com>
- * @version  1.3
- * @param array
- * @param Smarty
+ * @param array $params parameters
+ * Input:
+ *         - name = name of cycle (optional)
+ *         - values = comma separated list of values to cycle,
+ *                    or an array of values to cycle
+ *                    (this can be left out for subsequent calls)
+ *         - reset = boolean - resets given var to true
+ *         - print = boolean - print var or not. default is true
+ *         - advance = boolean - whether or not to advance the cycle
+ *         - delimiter = the value delimiter, default is ","
+ *         - assign = boolean, assigns to template var instead of
+ *                    printed.
+ * @param object $smarty Smarty object
+ * @param object $template template object
  * @return string|null
  */
-function smarty_function_cycle($params, &$smarty)
+function smarty_function_cycle($params, $smarty, $template)
 {
-    static $cycle_vars;
-    
     $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'])) {
-            $smarty->trigger_error("cycle: missing 'values' parameter");
+        if(!isset($template->plugin_data['cycle'][$name]['values'])) {
+            trigger_error("cycle: missing 'values' parameter",E_USER_WARNING);
             return;
         }
     } else {
-        if(isset($cycle_vars[$name]['values'])
-            && $cycle_vars[$name]['values'] != $params['values'] ) {
-            $cycle_vars[$name]['index'] = 0;
+        if(isset($template->plugin_data['cycle'][$name]['values'])
+            && $template->plugin_data['cycle'][$name]['values'] != $params['values'] ) {
+            $template->plugin_data['cycle'][$name]['index'] = 0;
         }
-        $cycle_vars[$name]['values'] = $params['values'];
+        $template->plugin_data['cycle'][$name]['values'] = $params['values'];
     }
 
-    $cycle_vars[$name]['delimiter'] = (isset($params['delimiter'])) ? $params['delimiter'] : ',';
+    if (isset($params['delimiter'])) {
+      $template->plugin_data['cycle'][$name]['delimiter'] = $params['delimiter'];
+    } elseif (!isset($template->plugin_data['cycle'][$name]['delimiter'])) {
+      $template->plugin_data['cycle'][$name]['delimiter'] = ',';
+    }
     
-    if(is_array($cycle_vars[$name]['values'])) {
-        $cycle_array = $cycle_vars[$name]['values'];
+    if(is_array($template->plugin_data['cycle'][$name]['values'])) {
+        $cycle_array = $template->plugin_data['cycle'][$name]['values'];
     } else {
-        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
+        $cycle_array = explode($template->plugin_data['cycle'][$name]['delimiter'],$template->plugin_data['cycle'][$name]['values']);
     }
     
-    if(!isset($cycle_vars[$name]['index']) || $reset ) {
-        $cycle_vars[$name]['index'] = 0;
+    if(!isset($template->plugin_data['cycle'][$name]['index']) || $reset ) {
+        $template->plugin_data['cycle'][$name]['index'] = 0;
     }
     
     if (isset($params['assign'])) {
         $print = false;
-        $smarty->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
+        $template->assign($params['assign'], $cycle_array[$template->plugin_data['cycle'][$name]['index']]);
     }
         
     if($print) {
-        $retval = $cycle_array[$cycle_vars[$name]['index']];
+        $retval = $cycle_array[$template->plugin_data['cycle'][$name]['index']];
     } else {
         $retval = null;
     }
 
     if($advance) {
-        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
-            $cycle_vars[$name]['index'] = 0;
+        if ( $template->plugin_data['cycle'][$name]['index'] >= count($cycle_array) -1 ) {
+            $template->plugin_data['cycle'][$name]['index'] = 0;
         } else {
-            $cycle_vars[$name]['index']++;
+            $template->plugin_data['cycle'][$name]['index']++;
         }
     }
     
     return $retval;
 }
-
-/* vim: set expandtab: */
-
 ?>