1 files changed, 36 insertions, 37 deletions
diff --git a/views/default/input/button.php b/views/default/input/button.php
index 72a1f653d..9957fdc54 100644
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -1,41 +1,40 @@
 <?php
-	/**
-	 * Create a input button
-	 * Use this view for forms rather than creating a submit/reset button tag in the wild as it provides
-	 * extra security which help prevent CSRF attacks.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @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['type'] Submit or reset, defaults to submit.
-	 * @uses $vars['src'] Src of an image
-	 * 
-	 */
+/**
+ * Create a input button
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['src']   Src of an image
+ * @uses $vars['class'] Additional CSS class
+ */
 
-	global $CONFIG;
-	
-	if (isset($vars['class'])) $class = $vars['class'];
-	if (!$class) $class = "submit_button";
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-button {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-button";
+}
 
-	if (isset($vars['type'])) { $type = strtolower($vars['type']); } else { $type = 'submit'; }
-	switch ($type)
-	{
-		case 'button' : $type='button'; break;
-		case 'reset' : $type='reset'; break;
-		case 'submit':
-		default: $type = 'submit';
-	}
-	
-	$value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
-	if (isset($vars['internalname'])) $name = $vars['internalname'];
-	if (isset($vars['src'])) $src = $vars['src'];
-	if (strpos($src,$CONFIG->wwwroot)===false) $src = ""; // blank src if trying to access an offsite image.
+$defaults = array(
+	'type' => 'button',
+);
+
+$vars = array_merge($defaults, $vars);
+
+switch ($vars['type']) {
+	case 'button':
+	case 'reset':
+	case 'submit':
+	case 'image':
+		break;
+	default:
+		$vars['type'] = 'button';
+		break;
+}
+
+// blank src if trying to access an offsite image. @todo why?
+if (isset($vars['src']) && strpos($vars['src'], elgg_get_site_url()) === false) {
+	$vars['src'] = "";
+}
 ?>
-<input type="<?php echo $type; ?>" class="<?php echo $class; ?>" <?php echo $vars['js']; ?> value="<?php echo $value; ?>" src="<?php echo $src; ?>" />
-\ No newline at end of file
+<input <?php echo elgg_format_attributes($vars); ?> />