diff --git a/NEWS b/NEWS
index 4c474824..df57fa3f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
-    - html_options passthru all unknown paramters now
+    - html_checkboxes and html_radios passthru all unknown paramters now
+      additionally their output is now XHTML compliant (messju)
+    - html_options passthru all unknown paramters now (messju)
     - fix link functionality of html_image, also make
       output XHTML compatible (Hinrich Donner, Monte)
     - append "@" to default modifier vars/args
diff --git a/libs/plugins/function.html_checkboxes.php b/libs/plugins/function.html_checkboxes.php
index 0c06ef5e..cb18d173 100644
--- a/libs/plugins/function.html_checkboxes.php
+++ b/libs/plugins/function.html_checkboxes.php
@@ -24,41 +24,75 @@
  */
 function smarty_function_html_checkboxes($params, &$smarty)
 {
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+   require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+  
+   $name = 'checkbox';
+   $values = null;
+   $checkboxes = null;
+   $checked = null;
+   $separator = '';
+   $output = null;
+   
+   $extra = '';
+   
+   foreach($params as $_key => $_val) {	
+      switch($_key) {
+      case 'name':
+      case 'separator':
+	 $$_key = $_val;
+	 break;
 
-    extract($params);
+      case 'checkboxes':
+	 $$_key = (array)$_val;
+	 break;
 
-    $_html_result = '';
-	if(!isset($name)){
-	$name = 'checkbox';
-	}
-    settype($checked, 'array');
-    if (isset($checkboxes)) {
-        settype($checkboxes, 'array');
-        foreach ($checkboxes as $_key => $_val) {
-			$_html_result .= smarty_function_html_checkboxes_output($name, $_key, $_val, $checked, $separator);
-        }
-    } else {
-        settype($output, 'array');
-        settype($values, 'array');
-        for ($_i = 0, $_for_max = count($output); $_i < $_for_max; $_i++) {
-			$_html_result .= smarty_function_html_checkboxes_output($name, $values[$_i], $output[$_i], $checked, $separator);
-        }
-    }
+      case 'values':
+      case 'output':
+      case 'checked':
+	 $$_key = array_values((array)$_val);      
+	 break;
 
-    return $_html_result;
+      default:
+	 $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
+	 break;					
+      }
+   }
+
+   if (!isset($checkboxes) && !isset($values))
+      return ''; /* raise error here? */
+
+   settype($checked, 'array');
+   $_html_result = '';
+
+   if (is_array($checkboxes)) {
+
+      foreach ($checkboxes as $_key=>$_val)
+	 $_html_result .= smarty_function_html_checkboxes_output($name, $_key, $_val, $checked, $extra, $separator);      
+    
+
+   } else {  
+      foreach ($values as $_i=>$_key) {
+	 $_val = isset($output[$_i]) ? $output[$_i] : '';
+	 $_html_result .= smarty_function_html_checkboxes_output($name, $_key, $_val, $checked, $extra, $separator);      
+      }
+
+   }
+
+   return $_html_result;
+  
 }
 
-function smarty_function_html_checkboxes_output($name, $value, $output, $checked, $separator) {
-	$_output = '<input type="checkbox" name="' . smarty_function_escape_special_chars($name) . '[]' .'" value="' . smarty_function_escape_special_chars($value) . '"';
-	
-    if (in_array($value, $checked)) {
-       	$_output .= " checked=\"checked\"";
-	}
-    $_output .= '>' . $output . $separator . "\n";
-
-	return $_output;	
+function smarty_function_html_checkboxes_output($name, $value, $output, $checked, $extra, $separator) {
+   $_output = '<input type="checkbox" name="' 
+      . smarty_function_escape_special_chars($name) . '[]" value="' 
+      . smarty_function_escape_special_chars($value) . '"';
+  
+   if (in_array($value, $checked)) {
+      $_output .= ' checked="checked"';
+   }
+   $_output .= $extra . ' />' . $output . $separator . "\n";
+  
+   return $_output;        
 }
 
-
 ?>
diff --git a/libs/plugins/function.html_options.php b/libs/plugins/function.html_options.php
index 30477e21..1b3cd509 100644
--- a/libs/plugins/function.html_options.php
+++ b/libs/plugins/function.html_options.php
@@ -5,71 +5,96 @@
  * -------------------------------------------------------------
  * Type:     function
  * Name:     html_options
+ * Input:      name       (optional) - string default "select"
+ *             values     (required if no options supplied) - array
+ *             options    (required if no values supplied) - associative array
+ *             selected   (optional) - string default not set
+ *             output     (required if not options supplied) - array
  * Purpose:  Prints the list of <option> tags generated from
  *           the passed parameters
  * -------------------------------------------------------------
  */
 function smarty_function_html_options($params, &$smarty)
 {
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+   require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+  
+   $name = 'select';
+   $values = null;
+   $options = null;
+   $selected = array();
+   $output = null;
 
-    extract($params);
+   $extra = '';
+  
+   foreach($params as $_key => $_val) {	
+      switch($_key) {
+      case 'name':
+	 $$_key = (string)$_val;
+	 break;
 
-    $html_result = '';
+      case 'options':
+	 $$_key = (array)$_val;
+	 break;
 
-    settype($selected, 'array');
-    if (isset($options)) {
-        settype($options, 'array');
-        foreach ($options as $key => $value) {
-			$html_result .= smarty_function_html_options_optoutput($key, $value, $selected);
-        }
-    } else {
-        settype($output, 'array');
-        settype($values, 'array');
-        for ($i = 0, $for_max = count($output); $i < $for_max; $i++) {
-            if ($i < count($values)) {
-				$html_result .= smarty_function_html_options_optoutput($values[$i], $output[$i], $selected);
-			} else {
-				$html_result .= smarty_function_html_options_optoutput($output[$i], $output[$i], $selected);
-			}
-        }
-    }
+      case 'selected':
+      case 'values':
+      case 'output':
+	 $$_key = array_values((array)$_val);      
+	 break;
 
-    /* passthru all unknown params to $extra */
-    $extra = '';
-    unset($params['values']);
-    unset($params['output']);
-    unset($params['selected']);
-    unset($params['options']);
-    unset($params['name']);
-    foreach ($params as $key=>$value) $extra .= ' ' . $key . '="'. htmlspecialchars($value) . '"';
+      default:
+	 $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
+	 break;					
+      }
+   }
+
+   if (!isset($options) && !isset($values))
+      return ''; /* raise error here? */
+
+   $_html_result = '';
+
+   if (is_array($options)) {
+
+      foreach ($options as $_key=>$_val)
+	 $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);      
+    
+   } else {  
+
+      foreach ((array)$values as $_i=>$_key) {
+	 $_val = isset($output[$_i]) ? $output[$_i] : '';
+	 $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);      
+      }
+
+   }
+
+   if(!empty($name)) {
+      $_html_result = '<select name="' . $name . '"' . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
+   }
+
+   return $_html_result;
 
-    if(!empty($name)) {
-        $html_result = '<select name="' . $name . '"' . $extra . '>' . "\n" . $html_result . '</select>' . "\n";
-    }
-    return $html_result;
 }
 
 function smarty_function_html_options_optoutput($key, $value, $selected) {
-	if(!is_array($value)) {
-    	$html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' . 
-				smarty_function_escape_special_chars($key) . '"';
-    	if (in_array($key, $selected))
-        	$html_result .= " selected=\"selected\"";
-    	$html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
-	} else {
-		$html_result = smarty_function_html_options_optgroup($key, $value, $selected);
-	}
-		return $html_result;	
+   if(!is_array($value)) {
+      $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' . 
+	 smarty_function_escape_special_chars($key) . '"';
+      if (in_array($key, $selected))
+	 $_html_result .= ' selected="selected"';
+      $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
+   } else {
+      $_html_result = smarty_function_html_options_optgroup($key, $value, $selected);
+   }
+   return $_html_result;	
 }
 
 function smarty_function_html_options_optgroup($key, $values, $selected) {
-	$optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($value) . '">' . "\n";
-	foreach ($values as $key => $value) {
-		$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
-	}
-	$optgroup_html .= "</optgroup>\n";
-	return $optgroup_html;
+   $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($value) . '">' . "\n";
+   foreach ($values as $key => $value) {
+      $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
+   }
+   $optgroup_html .= "</optgroup>\n";
+   return $optgroup_html;
 }
 
 /* vim: set expandtab: */
diff --git a/libs/plugins/function.html_radios.php b/libs/plugins/function.html_radios.php
index ae3e8a6e..88b48830 100644
--- a/libs/plugins/function.html_radios.php
+++ b/libs/plugins/function.html_radios.php
@@ -22,42 +22,75 @@
  *             {html_radios values=$ids checked=$checked separator='<br>' output=$names}
  * -------------------------------------------------------------
  */
-require_once $this->_get_plugin_filepath('shared','escape_special_chars');
 function smarty_function_html_radios($params, &$smarty)
 {
-    extract($params);
+   require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
 
-    $_html_result = '';
-	if(!isset($name)){
-	$name = 'radio';
-	}
-    settype($checked, 'array');
-    if (isset($radios)) {
-        settype($radios, 'array');
-        foreach ($radios as $_key => $_val) {
-			$_html_result .= smarty_function_html_radios_output($name, $_key, $_val, $checked, $separator);
-        }
-    } else {
-        settype($output, 'array');
-        settype($values, 'array');
-        for ($_i = 0, $_for_max = count($output); $_i < $_for_max; $_i++) {
-			$_html_result .= smarty_function_html_radios_output($name, $values[$_i], $output[$_i], $checked, $separator);
-        }
-    }
+   $name = 'radio';
+   $values = null;
+   $radios = null;
+   $checked = null;
+   $separator = '';
+   $output = null;
+   $extra = '';
+  
+   foreach($params as $_key => $_val) {	
+      switch($_key) {
+      case 'name':
+      case 'separator':
+      case 'checked':
+	 $$_key = (string)$_val;
+	 break;
 
-    return $_html_result;
+      case 'radios':
+	 $$_key = (array)$_val;
+	 break;
+
+      case 'values':
+      case 'output':
+	 $$_key = array_values((array)$_val);      
+	 break;
+
+      default:
+	 $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
+	 break;					
+      }
+   }
+
+   if (!isset($radios) && !isset($values))
+      return ''; /* raise error here? */
+
+   $_html_result = '';
+
+   if (isset($radios) && is_array($radios)) {
+
+      foreach ((array)$radios as $_key=>$_val)
+	 $_html_result .= smarty_function_html_radios_output($name, $_key, $_val, $checked, $extra, $separator);
+   
+   } else {  
+
+      foreach ((array)$values as $_i=>$_key) {
+	 $_val = isset($output[$_i]) ? $output[$_i] : '';
+	 $_html_result .= smarty_function_html_radios_output($name, $_key, $_val, $checked, $extra, $separator);      
+      }
+
+   }
+
+   return $_html_result;
+  
 }
 
-function smarty_function_html_radios_output($name, $value, $output, $checked, $separator) {
-	$_output = '<input type="radio" name="' . smarty_function_escape_special_chars($name) . '" value="' . smarty_function_escape_special_chars($value) . '"';
-	
-    if (in_array($value, $checked)) {
-       	$_output .= " checked=\"checked\"";
-	}
-    $_output .= '>' . $output . $separator . "\n";
+function smarty_function_html_radios_output($name, $value, $output, $checked, $extra, $separator) {
+   $_output = '<input type="radio" name="' 
+      . smarty_function_escape_special_chars($name) . '" value="' 
+      . smarty_function_escape_special_chars($value) . '"';
 
-	return $_output;	
+   if ($value==$checked) {
+      $_output .= ' checked="checked"';
+   }
+   $_output .= $extra . ' />' . $output . $separator . "\n";
+  
+   return $_output;        
 }
 
-
 ?>