1 files changed, 60 insertions, 29 deletions

diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index fe7335b8a..ef860a773 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -3,43 +3,74 @@
  * Elgg radio input
  * Displays a radio input field
  *
+ * @warning Passing integers as labels does not currently work due to a
+ * deprecated hack that will be removed in Elgg 1.9. To use integer labels,
+ * the labels must be character codes: 1 would be 1
+ *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
- * @uses $vars['options'] An array of strings representing the options for the radio field as "label" => option
  *
+ * @uses $vars['value']    The current value, if any
+ * @uses $vars['name']     The name of the input field
+ * @uses $vars['options']  An array of strings representing the options for the
+ *                         radio field as "label" => option
+ * @uses $vars['class']    Additional class of the list. Optional.
+ * @uses $vars['align']    'horizontal' or 'vertical' Default: 'vertical'
  */
 
-$class = $vars['class'];
-if (!$class) {
-	$class = "input_radio";
+$defaults = array(
+	'align' => 'vertical',
+	'value' => array(),
+	'disabled' => false,
+	'options' => array(),
+	'name' => '',
+);
+
+$vars = array_merge($defaults, $vars);
+
+$id = '';
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
+	unset($vars['id']);
 }
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
+$class = "elgg-input-radios elgg-{$vars['align']}";
+if (isset($vars['class'])) {
+	$class .= " {$vars['class']}";
+	unset($vars['class']);
 }
+unset($vars['align']);
+$vars['class'] = 'elgg-input-radio';
 
-foreach($vars['options'] as $label => $option) {
-	if (strtolower($option) != strtolower($vars['value'])) {
-		$selected = "";
-	} else {
-		$selected = "checked = \"checked\"";
-	}
-	$labelint = (int) $label;
-	if ("{$label}" == "{$labelint}") {
-		$label = $option;
-	}
+if (is_array($vars['value'])) {
+	$vars['value'] = array_map('elgg_strtolower', $vars['value']);
+} else {
+	$vars['value'] = array(elgg_strtolower($vars['value']));
+}
 
-	if (isset($vars['internalid'])) {
-		$id = "id=\"{$vars['internalid']}\"";
-	}
-	if ($vars['disabled']) {
-		$disabled = ' disabled="yes" ';
+$options = $vars['options'];
+unset($vars['options']);
+
+$value = $vars['value'];
+unset($vars['value']);
+
+if ($options && count($options) > 0) {
+	echo "<ul class=\"$class\" $id>";
+	foreach ($options as $label => $option) {
+
+		$vars['checked'] = in_array(elgg_strtolower($option), $value);
+		$vars['value'] = $option;
+
+		$attributes = elgg_format_attributes($vars);
+
+		// handle indexed array where label is not specified
+		// @deprecated 1.8 Remove in 1.9
+		if (is_integer($label)) {
+			elgg_deprecated_notice('$vars[\'options\'] must be an associative array in input/radio', 1.8);
+			$label = $option;
+		}
+
+		echo "<li><label><input type=\"radio\" $attributes />$label</label></li>";
 	}
-	echo "<label><input type=\"radio\" $disabled {$vars['js']} name=\"{$vars['internalname']}\" $id value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
-}
\ No newline at end of file
+	echo '</ul>';
+}