From 9b8f5ee5d6cf0defc1b3eef5422b84e0d87eec91 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 5 Dec 2008 08:58:54 +0000
Subject: [PATCH] Button helpers moved to ui_input.inc, reusable button code.

---
 includes/ui/ui_controls.inc | 45 ----------------------------------
 includes/ui/ui_input.inc    | 48 ++++++++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 56 deletions(-)

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index d851544c..5d9f6113 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -184,51 +184,6 @@ function table_header($labels)
 		labelheader_cell($label);
 	end_row();
 }
-
-//-----------------------------------------------------------------------------------
-
-function set_icon($icon, $title=false)
-{
-	global $path_to_root;
-	return "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0'".($title ? " title='$title'" : "")." />\n";	
-}
-
-function button($name, $value, $title=false, $icon=false)
-{
-	// php silently changes dots,spaces,'[' and characters 128-159
-	// to underscore in POST names, to maintain compatibility with register_globals
-	if (user_graphic_links() && $icon)
-	{
-		if ($value == _("Delete")) // Helper during implementation
-			$icon = ICON_DELETE;
-		echo "<button type='submit' class='editbutton' name='".
-			htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))).
-			"' value=''" . ($title ? " title='$title'":" title='$value'")." />".set_icon($icon)."\n";
-	}
-	else
-		echo "<input type='submit' class='editbutton' name='"
-			.htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B')))
-			."' value='$value'"
-			.($title ? " title='$title'":'')." />\n";
-}
-
-function button_cell($name, $value, $title=false, $icon=false)
-{
-	echo "<td>";
-	button($name, $value, $title, $icon);
-	echo "</td>";
-}
-
-function delete_button_cell($name, $value, $title=false)
-{
-	button_cell($name, $value, $title, ICON_DELETE);
-}
-
-function edit_button_cell($name, $value, $title=false)
-{
-	button_cell($name, $value, $title, ICON_EDIT);
-}
-
 //-----------------------------------------------------------------------------------
 
 function start_row($param="")
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 64df8c49..aca6e1de 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -203,23 +203,49 @@ function submit_return($name, $value, $title=false, $async=false)
 		submit($name, $value, true, $title, $async);
 	}
 }
-//---------------------------------------------------------------------------------
-/*
-function button($name, $value, $onclick, $title=false)
+//-----------------------------------------------------------------------------------
+
+function set_icon($icon, $title=false)
 {
-  	default_focus($name);
-  	echo "<input type=\"button\" class=\"inputsubmit\" name=\"$name\" value=\"$value\" onclick=\"$onclick\""
-	    .($title ? " title='$title'" : '')
-	    ." />\n";
+	global $path_to_root;
+	return "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0'".($title ? " title='$title'" : "")." />\n";	
 }
 
-function button_cell($name, $value, $onclick, $title=false)
+function button($name, $value, $title=false, $icon=false)
+{
+	// php silently changes dots,spaces,'[' and characters 128-159
+	// to underscore in POST names, to maintain compatibility with register_globals
+	if (user_graphic_links() && $icon)
+	{
+		if ($value == _("Delete")) // Helper during implementation
+			$icon = ICON_DELETE;
+		return "<button type='submit' class='editbutton' name='".
+			htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))).
+			"' value=''" . ($title ? " title='$title'":" title='$value'")." />".set_icon($icon)."\n";
+	}
+	else
+		return "<input type='submit' class='editbutton' name='"
+			.htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B')))
+			."' value='$value'"
+			.($title ? " title='$title'":'')." />\n";
+}
+
+function button_cell($name, $value, $title=false, $icon=false)
 {
 	echo "<td>";
-	button($name, $value, $onclick, $title);
-	echo "</td>\n";
+	echo button($name, $value, $title, $icon);
+	echo "</td>";
+}
+
+function delete_button_cell($name, $value, $title=false)
+{
+	button_cell($name, $value, $title, ICON_DELETE);
+}
+
+function edit_button_cell($name, $value, $title=false)
+{
+	button_cell($name, $value, $title, ICON_EDIT);
 }
-*/
 //-----------------------------------------------------------------------------------
 
 function check_value($name)
-- 
2.30.2