Process post code above form so that the checkboxes get checked correctly.

1 files changed, 140 insertions, 140 deletions

diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php
index c27b231..4f29e0c 100755
--- a/usr/local/www/system_advanced.php
+++ b/usr/local/www/system_advanced.php
@@ -1,9 +1,9 @@
 <?php
 /* $Id$ */
 /*
-	system_advanced.php
+		system_advanced.php
         part of pfSense
-        Copyright (C) 2005 Scott Ullrich
+        Copyright (C) 2005-2007 Scott Ullrich
 
 	originally part of m0n0wall (http://m0n0.ch/wall)
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
@@ -101,6 +101,144 @@ if ($_POST) {
 
 }
 
+if ($_POST) {
+    ob_flush();
+    flush();
+	if (!$input_errors) {
+		if($_POST['disablefilter'] == "yes") {
+			$config['system']['disablefilter'] = "enabled";
+		} else {
+			unset($config['system']['disablefilter']);
+		}
+		if($_POST['enablesshd'] == "yes") {
+			$config['system']['enablesshd'] = "enabled";
+			touch("{$g['tmp_path']}/start_sshd");
+		} else {
+			unset($config['system']['enablesshd']);
+			mwexec("/usr/bin/killall sshd");
+		}
+		$oldsshport = $config['system']['ssh']['port'];
+		$config['system']['ssh']['port'] = $_POST['sshport'];
+
+		if($_POST['polling_enable'] == "yes") {
+			$config['system']['polling'] = true;
+			setup_polling();
+		} else {
+			unset($config['system']['polling']);
+			setup_polling();
+		}
+
+		if($_POST['sharednet'] == "yes") {
+			$config['system']['sharednet'] = true;
+			system_disable_arp_wrong_if();
+		} else {
+			unset($config['system']['sharednet']);
+			system_enable_arp_wrong_if();
+		}
+
+		if($_POST['scrubnodf'] == "yes")
+			$config['system']['scrubnodf'] = "enabled";
+		else
+			unset($config['system']['scrubnodf']);
+
+		if($_POST['rfc959workaround'] == "yes")
+			$config['system']['rfc959workaround'] = "enabled";
+		else
+			unset($config['system']['rfc959workaround']);
+
+		if($_POST['ipv6nat_enable'] == "yes") {
+			$config['diag']['ipv6nat']['enable'] = true;
+			$config['diag']['ipv6nat']['ipaddr'] = $_POST['ipv6nat_ipaddr'];
+		} else {
+			unset($config['diag']['ipv6nat']['enable']);
+			unset($config['diag']['ipv6nat']['ipaddr']);
+		}
+		$oldcert = $config['system']['webgui']['certificate'];
+		$oldkey = $config['system']['webgui']['private-key'];
+		$config['system']['webgui']['certificate'] = base64_encode($_POST['cert']);
+		$config['system']['webgui']['private-key'] = base64_encode($_POST['key']);
+		if($_POST['disableconsolemenu'] == "yes") {
+			$config['system']['disableconsolemenu'] = true;
+			auto_login(true);
+		} else {
+			unset($config['system']['disableconsolemenu']);
+			auto_login(false);
+		}
+		unset($config['system']['webgui']['expanddiags']);
+		$config['system']['optimization'] = $_POST['optimization'];
+
+		if($_POST['disablefirmwarecheck'] == "yes")
+			$config['system']['disablefirmwarecheck'] = true;
+		else
+			unset($config['system']['disablefirmwarecheck']);
+
+		if ($_POST['enableserial'] == "yes")
+			$config['system']['enableserial'] = true;
+		else
+			unset($config['system']['enableserial']);
+
+		if($_POST['harddiskstandby'] <> "") {
+			$config['system']['harddiskstandby'] = $_POST['harddiskstandby'];
+			system_set_harddisk_standby();
+		} else
+			unset($config['system']['harddiskstandby']);
+
+		if ($_POST['noantilockout'] == "yes")
+			$config['system']['webgui']['noantilockout'] = true;
+		else
+			unset($config['system']['webgui']['noantilockout']);
+
+		/* Firewall and ALTQ options */
+		$config['system']['maximumstates'] = $_POST['maximumstates'];
+
+		if($_POST['enablesshd'] == "yes") {
+			$config['system']['enablesshd'] = $_POST['enablesshd'];
+		} else {
+			unset($config['system']['enablesshd']);
+		}
+
+		if($_POST['disablechecksumoffloading'] == "yes") {
+			$config['system']['disablechecksumoffloading'] = $_POST['disablechecksumoffloading'];
+		} else {
+			unset($config['system']['disablechecksumoffloading']);
+		}
+
+		if($_POST['disablenatreflection'] == "yes") {
+			$config['system']['disablenatreflection'] = $_POST['disablenatreflection'];
+		} else {
+			unset($config['system']['disablenatreflection']);
+		}
+
+		$config['ipsec']['preferoldsa'] = $_POST['preferoldsa_enable'] ? true : false;
+		$config['bridge']['filteringbridge'] = $_POST['filteringbridge_enable'] ? true : false;
+		$config['filter']['bypassstaticroutes'] = $_POST['bypassstaticroutes'] ? true : false;
+
+		write_config();
+
+		$retval = 0;
+		config_lock();
+		$retval = filter_configure();
+		if(stristr($retval, "error") <> true)
+		    $savemsg = get_std_save_message($retval);
+		else
+		    $savemsg = $retval;
+
+		config_unlock();
+
+		setup_filter_bridge();
+		
+		conf_mount_rw();
+
+		setup_serial_port();
+
+		setup_filter_bridge();
+
+		conf_mount_ro();		
+		
+
+	}
+}
+
 $pgtitle = "System: Advanced functions";
 include("head.inc");
 
@@ -461,144 +599,6 @@ include("head.inc");
 
 <?php
 
-if ($_POST) {
-    ob_flush();
-    flush();
-	if (!$input_errors) {
-		if($_POST['disablefilter'] == "yes") {
-			$config['system']['disablefilter'] = "enabled";
-		} else {
-			unset($config['system']['disablefilter']);
-		}
-		if($_POST['enablesshd'] == "yes") {
-			$config['system']['enablesshd'] = "enabled";
-			touch("{$g['tmp_path']}/start_sshd");
-		} else {
-			unset($config['system']['enablesshd']);
-			mwexec("/usr/bin/killall sshd");
-		}
-		$oldsshport = $config['system']['ssh']['port'];
-		$config['system']['ssh']['port'] = $_POST['sshport'];
-
-		if($_POST['polling_enable'] == "yes") {
-			$config['system']['polling'] = true;
-			setup_polling();
-		} else {
-			unset($config['system']['polling']);
-			setup_polling();
-		}
-
-		if($_POST['sharednet'] == "yes") {
-			$config['system']['sharednet'] = true;
-			system_disable_arp_wrong_if();
-		} else {
-			unset($config['system']['sharednet']);
-			system_enable_arp_wrong_if();
-		}
-
-		if($_POST['scrubnodf'] == "yes")
-			$config['system']['scrubnodf'] = "enabled";
-		else
-			unset($config['system']['scrubnodf']);
-
-		if($_POST['rfc959workaround'] == "yes")
-			$config['system']['rfc959workaround'] = "enabled";
-		else
-			unset($config['system']['rfc959workaround']);
-
-		if($_POST['ipv6nat_enable'] == "yes") {
-			$config['diag']['ipv6nat']['enable'] = true;
-			$config['diag']['ipv6nat']['ipaddr'] = $_POST['ipv6nat_ipaddr'];
-		} else {
-			unset($config['diag']['ipv6nat']['enable']);
-			unset($config['diag']['ipv6nat']['ipaddr']);
-		}
-		$oldcert = $config['system']['webgui']['certificate'];
-		$oldkey = $config['system']['webgui']['private-key'];
-		$config['system']['webgui']['certificate'] = base64_encode($_POST['cert']);
-		$config['system']['webgui']['private-key'] = base64_encode($_POST['key']);
-		if($_POST['disableconsolemenu'] == "yes") {
-			$config['system']['disableconsolemenu'] = true;
-			auto_login(true);
-		} else {
-			unset($config['system']['disableconsolemenu']);
-			auto_login(false);
-		}
-		unset($config['system']['webgui']['expanddiags']);
-		$config['system']['optimization'] = $_POST['optimization'];
-
-		if($_POST['disablefirmwarecheck'] == "yes")
-			$config['system']['disablefirmwarecheck'] = true;
-		else
-			unset($config['system']['disablefirmwarecheck']);
-
-		if ($_POST['enableserial'] == "yes")
-			$config['system']['enableserial'] = true;
-		else
-			unset($config['system']['enableserial']);
-
-		if($_POST['harddiskstandby'] <> "") {
-			$config['system']['harddiskstandby'] = $_POST['harddiskstandby'];
-			system_set_harddisk_standby();
-		} else
-			unset($config['system']['harddiskstandby']);
-
-		if ($_POST['noantilockout'] == "yes")
-			$config['system']['webgui']['noantilockout'] = true;
-		else
-			unset($config['system']['webgui']['noantilockout']);
-
-		/* Firewall and ALTQ options */
-		$config['system']['maximumstates'] = $_POST['maximumstates'];
-
-		if($_POST['enablesshd'] == "yes") {
-			$config['system']['enablesshd'] = $_POST['enablesshd'];
-		} else {
-			unset($config['system']['enablesshd']);
-		}
-
-		if($_POST['disablechecksumoffloading'] == "yes") {
-			$config['system']['disablechecksumoffloading'] = $_POST['disablechecksumoffloading'];
-		} else {
-			unset($config['system']['disablechecksumoffloading']);
-		}
-
-		if($_POST['disablenatreflection'] == "yes") {
-			$config['system']['disablenatreflection'] = $_POST['disablenatreflection'];
-		} else {
-			unset($config['system']['disablenatreflection']);
-		}
-
-		$config['ipsec']['preferoldsa'] = $_POST['preferoldsa_enable'] ? true : false;
-		$config['bridge']['filteringbridge'] = $_POST['filteringbridge_enable'] ? true : false;
-		$config['filter']['bypassstaticroutes'] = $_POST['bypassstaticroutes'] ? true : false;
-
-		write_config();
-
-		$retval = 0;
-		config_lock();
-		$retval = filter_configure();
-		if(stristr($retval, "error") <> true)
-		    $savemsg = get_std_save_message($retval);
-		else
-		    $savemsg = $retval;
-
-		config_unlock();
-
-		setup_filter_bridge();
-		
-		conf_mount_rw();
-
-		setup_serial_port();
-
-		setup_filter_bridge();
-
-		conf_mount_ro();		
-		
-
-	}
-}
-
 if (($config['system']['webgui']['certificate'] != $oldcert)
 		|| ($config['system']['webgui']['private-key'] != $oldkey)) {
     ob_flush();