X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fsmarty%2Fplugins%2Ffunction.html_radios.php;h=c6b27edf2ca30d2e277e9707de72d52d169f8548;hb=28ce879b21b9582fff94abe70463f3384b276882;hp=af29b9af220a6dcefeec99b3e6d1b8566a3ddcce;hpb=3dfb9b34b34ba455fb276f2e4f52f810ed6752b7;p=gosa.git

diff --git a/gosa-core/include/smarty/plugins/function.html_radios.php b/gosa-core/include/smarty/plugins/function.html_radios.php
index af29b9af2..c6b27edf2 100644
--- a/gosa-core/include/smarty/plugins/function.html_radios.php
+++ b/gosa-core/include/smarty/plugins/function.html_radios.php
@@ -14,16 +14,6 @@
  * Name:       html_radios<br>
  * Date:       24.Feb.2003<br>
  * Purpose:    Prints out a list of radio input types<br>
- * Params:
- * <pre>
- * - name       (optional) - string default "radio"
- * - values     (required) - array
- * - options    (required) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - output     (optional) - the output next to each radio button
- * - assign     (optional) - assign the output as an array to this variable
- * </pre>
  * Examples:
  * <pre>
  * {html_radios values=$ids output=$names}
@@ -36,8 +26,16 @@
  * @author Christopher Kvarme <christopher.kvarme@flashjab.com> 
  * @author credits to Monte Ohrt <monte at ohrt dot com> 
  * @version 1.0
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @param array $params parameters
+ * Input:<br>
+ *            - name       (optional) - string default "radio"
+ *            - values     (required) - array
+ *            - options    (optional) - associative array
+ *            - checked    (optional) - array default not set
+ *            - separator  (optional) - ie <br> or &nbsp;
+ *            - output     (optional) - the output next to each radio button
+ *            - assign     (optional) - assign the output as an array to this variable
+ * @param object $template template object
  * @return string 
  * @uses smarty_function_escape_special_chars()
  */
@@ -59,41 +57,35 @@ function smarty_function_html_radios($params, $template)
         switch ($_key) {
             case 'name':
             case 'separator':
-                $$_key = (string) $_val;
+                $$_key = (string)$_val;
                 break;
 
             case 'checked':
             case 'selected':
                 if (is_array($_val)) {
                     trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_radios: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
-                    }
                 } else {
-                    $selected = (string) $_val;
+                    $selected = (string)$_val;
                 } 
                 break;
 
             case 'labels':
             case 'label_ids':
-                $$_key = (bool) $_val;
+                $$_key = (bool)$_val;
                 break;
 
             case 'options':
-                $$_key = (array) $_val;
+                $$_key = (array)$_val;
                 break;
 
             case 'values':
             case 'output':
-                $$_key = array_values((array) $_val);
+                $$_key = array_values((array)$_val);
                 break;
 
             case 'radios':
                 trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead', E_USER_WARNING);
-                $options = (array) $_val;
+                $options = (array)$_val;
                 break;
 
             case 'assign':
@@ -109,17 +101,15 @@ function smarty_function_html_radios($params, $template)
         } 
     } 
 
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
+    if (!isset($options) && !isset($values))
         return '';
-    }
+    /* raise error here? */
 
     $_html_result = array();
 
     if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
-        }
+        foreach ($options as $_key => $_val)
+        $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
     } else {
         foreach ($values as $_i => $_key) {
             $_val = isset($output[$_i]) ? $output[$_i] : '';
@@ -137,58 +127,27 @@ function smarty_function_html_radios($params, $template)
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids)
 {
     $_output = '';
-    
-    if (is_object($value)) {
-        if (method_exists($value, "__toString")) {
-            $value = (string) $value->__toString();
-        } else {
-            trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
-            return '';
-        }
-    } else {
-        $value = (string) $value;
-    }
-    
-    if (is_object($output)) {
-        if (method_exists($output, "__toString")) {
-            $output = (string) $output->__toString();
-        } else {
-            trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
-            return '';
-        }
-    } else {
-        $output = (string) $output;
-    }
-    
     if ($labels) {
         if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!u', '_', $name . '_' . $value));
+            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
             $_output .= '<label for="' . $_id . '">';
         } else {
             $_output .= '<label>';
         } 
-    }
-    
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    $output = smarty_function_escape_special_chars($output);
-    
-    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
-
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-
-    if ($value === $selected) {
+    } 
+    $_output .= '<input type="radio" name="'
+     . smarty_function_escape_special_chars($name) . '" value="'
+     . smarty_function_escape_special_chars($value) . '"';
+
+    if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+
+    if ((string)$value == $selected) {
         $_output .= ' checked="checked"';
-    }
-    
+    } 
     $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-    
+    if ($labels) $_output .= '</label>';
     $_output .= $separator;
+
     return $_output;
 }