From afe52ba9f880d05cb657d59031ab951d61c976d5 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 24 Mar 2018 12:50:12 -0700
Subject: [PATCH] Fix HTML form nesting
 https://sourceforge.net/p/webadmin/bugs/5098/

---
 mysql/edit_table.cgi      | 30 ++++++++++++++++++++----------
 postgresql/edit_table.cgi | 30 ++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/mysql/edit_table.cgi b/mysql/edit_table.cgi
index a8027093f..003cafb04 100755
--- a/mysql/edit_table.cgi
+++ b/mysql/edit_table.cgi
@@ -52,37 +52,47 @@ $hiddens = &ui_hidden("db", $in{'db'}).&ui_hidden("table", $in{'table'});
 print "<table><tr>\n";
 
 # Add field button
+print "<td nowrap>";
 print &ui_form_start("edit_field.cgi");
 print $hiddens;
-print "<td nowrap>",&ui_submit($text{'table_add'});
+print &ui_submit($text{'table_add'});
 print &ui_select("type", undef, \@type_list);
-print "</td>",&ui_form_end();
+print &ui_form_end();
+print "</td>\n";
 
 # View and edit data button
+print "<td>";
 print &ui_form_start("view_table.cgi", "form-data");
 print $hiddens;
-print "<td>",&ui_submit($text{'table_data'});
-print "</td>",&ui_form_end();
+print &ui_submit($text{'table_data'});
+print &ui_form_end();
+print "</td>\n";
 
 # CSV export button
+print "<td>";
 print &ui_form_start("csv_form.cgi");
 print $hiddens;
-print "<td>",&ui_submit($text{'table_csv'});
-print "</td>",&ui_form_end();
+print &ui_submit($text{'table_csv'});
+print &ui_form_end();
+print "</td>\n";
 
 if ($access{'indexes'}) {
 	# Create index button
+	print "<td>";
 	print &ui_form_start("edit_index.cgi");
 	print $hiddens;
-	print "<td>",&ui_submit($text{'table_index'});
-	print "</td>",&ui_form_end();
+	print &ui_submit($text{'table_index'});
+	print &ui_form_end();
+	print "</td>\n";
 	}
 
 # Drop table button
+print "<td>";
 print &ui_form_start("drop_table.cgi");
 print $hiddens;
-print "<td>",&ui_submit($text{'table_drop'});
-print "</td>",&ui_form_end();
+print &ui_submit($text{'table_drop'});
+print &ui_form_end();
+print "</td>\n";
 
 print "</tr></table>\n";
 
diff --git a/postgresql/edit_table.cgi b/postgresql/edit_table.cgi
index 81c3778f5..63dbb3f5f 100755
--- a/postgresql/edit_table.cgi
+++ b/postgresql/edit_table.cgi
@@ -46,37 +46,47 @@ $hiddens = &ui_hidden("db", $in{'db'}).&ui_hidden("table", $in{'table'});
 print "<table><tr>\n";
 
 # Add a field
+print "<td>\n";
 print &ui_form_start("edit_field.cgi");
 print $hiddens;
-print "<td nowrap>",&ui_submit($text{'table_add'});
+print &ui_submit($text{'table_add'});
 print &ui_select("type", undef, [ &list_types() ]);
-print "</td>",&ui_form_end();
+print &ui_form_end();
+print "</td>\n";
 
 # View and edit data button
+print "<td>\n";
 print &ui_form_start("view_table.cgi", "form-data");
 print $hiddens;
-print "<td>",&ui_submit($text{'table_data'});
-print "</td>",&ui_form_end();
+print &ui_submit($text{'table_data'});
+print &ui_form_end();
+print "</td>\n";
 
 # CSV export button
+print "<td>\n";
 print &ui_form_start("csv_form.cgi");
 print $hiddens;
-print "<td>",&ui_submit($text{'table_csv'});
-print "</td>",&ui_form_end();
+print &ui_submit($text{'table_csv'});
+print &ui_form_end();
+print "</td>\n";
 
 # Create index button
 if (&supports_indexes() && $access{'indexes'}) {
+	print "<td>\n";
 	print &ui_form_start("edit_index.cgi");
 	print $hiddens;
-	print "<td>",&ui_submit($text{'table_index'});
-	print "</td>",&ui_form_end();
+	print &ui_submit($text{'table_index'});
+	print &ui_form_end();
+	print "</td>\n";
 	}
 
 # Drop table button
+print "<td>\n";
 print &ui_form_start("drop_table.cgi");
 print $hiddens;
-print "<td>",&ui_submit($text{'table_drop'});
-print "</td>",&ui_form_end();
+print &ui_submit($text{'table_drop'});
+print &ui_form_end();
+print "</td>\n";
 
 print "</tr></table>\n";