Fix some Save button quirks. Ticket #5965

3 files changed, 4 insertions, 5 deletions

diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index 434a35e..4f0eb6a 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -242,7 +242,7 @@ function validate_partial_mac_list($maclist) {
 	return true;
 }
 
-if (isset($_POST['submit'])) {
+if (isset($_POST['save'])) {
 
 	unset($input_errors);
 
@@ -616,7 +616,7 @@ if (isset($_POST['submit'])) {
 	}
 }
 
-if ((isset($_POST['submit']) || isset($_POST['apply'])) && (!$input_errors)) {
+if ((isset($_POST['save']) || isset($_POST['apply'])) && (!$input_errors)) {
 	$retval = 0;
 	$retvaldhcp = 0;
 	$retvaldns = 0;
@@ -780,7 +780,6 @@ if ($tabscounter == 0) {
 
 display_top_tabs($tab_array);
 
-// This form uses a non-standard submit button name
 $form = new Form();
 
 $section = new Form_Section('General Options');
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index dfe611e..41cb14a 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -222,7 +222,7 @@ if (is_array($dhcrelaycfg) && isset($dhcrelaycfg['enable']) && isset($dhcrelaycf
 
 if ($_POST['apply'] == "Apply Changes") {
 	$savemsg = dhcpv6_apply_changes(false);
-} elseif ($_POST['Submit'] == "Save") {
+} elseif ($_POST['save'] == "Save") {
 	unset($input_errors);
 
 	$old_dhcpdv6_enable = ($pconfig['enable'] == true);
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index edfff98..e4db4e4 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -996,7 +996,7 @@ print $form;
 	$form->add($section);
 
 	$form->addGlobal(new Form_Button(
-		'Submit',
+		'save',
 		'Update',
 		null,
 		'fa-save'