Fixed #5025

All system_advanced_* pages had made-up lement names instead of hte correct config system names.
All (several hundred) have been corrected, and tested where possible.

6 files changed, 146 insertions, 139 deletions

diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php
index 2520b1b..4b38b49 100644
--- a/src/usr/local/www/system_advanced_admin.php
+++ b/src/usr/local/www/system_advanced_admin.php
@@ -34,7 +34,7 @@
 */
 /*
 	pfSense_BUILDER_BINARIES:	/usr/bin/killall
-	pfSense_MODULE:	system
+	pfSense_MODULE: system
 */
 
 ##|+PRIV
@@ -231,8 +231,8 @@ if ($_POST) {
 		}
 
 		if (($sshd_enabled != $config['system']['enablesshd']) ||
-		    ($sshd_keyonly != $config['system']['sshdkeyonly']) ||
-		    ($sshd_port != $config['system']['ssh']['port'])) {
+			($sshd_keyonly != $config['system']['sshdkeyonly']) ||
+			($sshd_port != $config['system']['ssh']['port'])) {
 			$restart_sshd = true;
 		}
 
@@ -287,7 +287,7 @@ include("head.inc");
 
 if ($input_errors)
 	print_input_errors($input_errors);
-	
+
 if ($savemsg)
 	print_info_box($savemsg, 'success');
 
@@ -326,7 +326,7 @@ $group->add(new Form_Checkbox(
 $group->setHelp($certs_available ? '':'No Certificates have been defined. You must '.
 	'<a href="system_certmanager.php">'. gettext("Create or Import").'</a> '.
 	'a Certificate before SSL can be enabled.');
-	
+
 $section->add($group);
 
 $values = array();
@@ -360,7 +360,7 @@ $section->addInput(new Form_Input(
 	'users/browsers to access the GUI concurrently.');
 
 $section->addInput(new Form_Checkbox(
-	'webgui-redirect',
+	'disablehttpredirect',
 	'WebGUI redirect',
 	'Disable webConfigurator redirect rule',
 	$pconfig['disablehttpredirect']
@@ -369,7 +369,7 @@ $section->addInput(new Form_Checkbox(
 	'Check this box to disable this automatically added redirect rule.');
 
 $section->addInput(new Form_Checkbox(
-	'webgui-login-autocomplete',
+	'loginautocomplete',
 	'WebGUI Login Autocomplete',
 	'Enable webConfigurator login autocomplete',
 	$pconfig['loginautocomplete']
@@ -380,7 +380,7 @@ $section->addInput(new Form_Checkbox(
 	'this option).');
 
 $section->addInput(new Form_Checkbox(
-	'webgui-login-messages',
+	'quietlogin',
 	'WebGUI login messages',
 	'Disable logging of webConfigurator successful logins',
 	$pconfig['quietlogin']
@@ -393,7 +393,7 @@ else
 	$lockout_interface = "WAN";
 
 $section->addInput(new Form_Checkbox(
-	'anti-lockout',
+	'noantilockout',
 	'Anti-lockout',
 	'Disable webConfigurator anti-lockout rule',
 	$pconfig['noantilockout']
@@ -406,7 +406,7 @@ $section->addInput(new Form_Checkbox(
 	'option in the console menu resets this setting as well.</em>', [$lockout_interface]);
 
 $section->addInput(new Form_Checkbox(
-	'dns-rebind-check',
+	'nodnsrebindcheck',
 	'DNS Rebind Check',
 	'Disable DNS Rebinding Checks',
 	$pconfig['nodnsrebindcheck']
@@ -417,7 +417,7 @@ $section->addInput(new Form_Checkbox(
 	'name resolution in your environment.');
 
 $section->addInput(new Form_Input(
-	'alternate-hostnames',
+	'althostnames',
 	'Alternate Hostnames',
 	'text',
 	htmlspecialchars($pconfig['althostnames'])
@@ -426,7 +426,7 @@ $section->addInput(new Form_Input(
 	'bypass the DNS Rebinding Attack checks. Separate hostnames with spaces.');
 
 $section->addInput(new Form_Checkbox(
-	'browser-http_referer-enforcement',
+	'nohttpreferercheck',
 	'Browser HTTP_REFERER enforcement',
 	'Disable HTTP_REFERER enforcement check',
 	$pconfig['nohttpreferercheck']
@@ -434,11 +434,11 @@ $section->addInput(new Form_Checkbox(
 	'against HTTP_REFERER redirection attempts. Check this box to disable this '.
 	'protection if you find that it interferes with webConfigurator access in certain '.
 	'corner cases such as using external scripts to interact with this system. More '.
-	'information on HTTP_REFERER is available from<a target="_blank" '.
+	'information on HTTP_REFERER is available from <a target="_blank" '.
 	'href="http://en.wikipedia.org/wiki/HTTP_referrer">Wikipedia</a>.');
 
 $section->addInput(new Form_Checkbox(
-	'browser-tab-text',
+	'pagenamefirst',
 	'Browser tab text',
 	'Display page name first in browser tab',
 	$pconfig['pagenamefirst']
@@ -484,13 +484,13 @@ if (!$g['enableserial_force'] && ($g['platform'] == "pfSense" || $g['platform']
 		'Serial Terminal',
 		'Enables the first serial port with 115200/8/N/1 by default, or another speed selectable below.',
 		isset($pconfig['enableserial'])
-	))->setHelp('Note:  This will redirect the console output and messages to '.
+	))->setHelp('Note:	This will redirect the console output and messages to '.
 		'the serial port. You can still access the console menu from the internal video '.
 		'card/keyboard. A<b>null modem</b>serial cable or adapter is required to use the '.
 		'serial console.');
 
 	$section->addInput(new Form_Select(
-		'enableserial',
+		'serialspeed',
 		'Serial Speed',
 		$pconfig['serialspeed'],
 		array(115200, 57600, 38400, 19200, 14400, 9600)
@@ -524,28 +524,28 @@ print $form;
 
 ?>
 <script>
-//<![CDATA[   
+//<![CDATA[
 events.push(function(){
-    
-    // Hides the <div> in which the specified input element lives so that the input, its label and help text are hidden
-    function hideInput(id, hide) {
-        if(hide)
-            $('#' + id).parent().parent('div').addClass('hidden');
-        else
-            $('#' + id).parent().parent('div').removeClass('hidden');            
-    }
-    
-    // On page load . . 
+
+	// Hides the <div> in which the specified input element lives so that the input, its label and help text are hidden
+	function hideInput(id, hide) {
+		if(hide)
+			$('#' + id).parent().parent('div').addClass('hidden');
+		else
+			$('#' + id).parent().parent('div').removeClass('hidden');
+	}
+
+	// On page load . .
 	hideInput('ssl-certificate', $('input[name=webguiproto]:checked').val() == 'http');
-	
+
 	// On click . .
-     $('[id=webguiproto]').click(function () {
-        hideInput('ssl-certificate', $('input[name=webguiproto]:checked').val() == 'http');
-    });       
+	 $('[id=webguiproto]').click(function () {
+		hideInput('ssl-certificate', $('input[name=webguiproto]:checked').val() == 'http');
+	});
 });
-//]]>  
+//]]>
 </script>
-    
+
 <?php
 include("foot.inc");
 
diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php
index 2202b7e..677c2e0 100644
--- a/src/usr/local/www/system_advanced_firewall.php
+++ b/src/usr/local/www/system_advanced_firewall.php
@@ -33,7 +33,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-	pfSense_MODULE:	system
+	pfSense_MODULE: system
 */
 
 ##|+PRIV
@@ -364,7 +364,7 @@ if ($_POST) {
 
 		// Kill filterdns when value changes, filter_configure() will restart it
 		if (($old_aliasesresolveinterval != $config['system']['aliasesresolveinterval']) &&
-		    isvalidpid("{$g['varrun_path']}/filterdns.pid")) {
+			isvalidpid("{$g['varrun_path']}/filterdns.pid")) {
 			killbypid("{$g['varrun_path']}/filterdns.pid");
 		}
 
@@ -402,7 +402,7 @@ $form = new Form;
 $section = new Form_Section('Firewall Advanced');
 
 $section->addInput(new Form_Checkbox(
-	'ip-do-not-fragment-compatibility',
+	'scrubnodf',
 	'IP Do-Not-Fragment compatibility',
 	'Clear invalid DF bits instead of dropping the packets',
 	isset($config['system']['scrubnodf'])
@@ -412,7 +412,7 @@ $section->addInput(new Form_Checkbox(
 	'fragment bit.');
 
 $section->addInput(new Form_Checkbox(
-	'ip-random-id-generation',
+	'scrubrnid',
 	'IP Random id generation',
 	'Insert a stronger id into IP header of packets passing through the filter.',
 	isset($config['system']['scrubrnid'])
@@ -422,7 +422,7 @@ $section->addInput(new Form_Checkbox(
 	'reassembly.');
 
 $section->addInput($input = new Form_Select(
-	'firewall-optimization-options',
+	'optimization',
 	'Firewall Optimization Options',
 	$config['system']['optimization'],
 	array(
@@ -434,7 +434,7 @@ $section->addInput($input = new Form_Select(
 ))->setHelp('Select the type of state table optimization to use');
 
 $section->addInput(new Form_Checkbox(
-	'disable-firewall',
+	'disablefilter',
 	'Disable Firewall',
 	'Disable all packet filtering.',
 	isset($config['system']['disablefilter'])
@@ -444,7 +444,7 @@ $section->addInput(new Form_Checkbox(
 	'NAT</a>page.', [$g["product_name"]]);
 
 $section->addInput(new Form_Checkbox(
-	'disable-firewall-scrub',
+	'disablescrub',
 	'Disable Firewall Scrub',
 	'Disables the PF scrubbing option which can sometimes interfere with NFS and PPTP traffic.',
 	isset($config['system']['disablescrub'])
@@ -453,7 +453,7 @@ $section->addInput(new Form_Checkbox(
 $group = new Form_Group('Firewall Adaptive Timeouts');
 
 $group->add(new Form_Input(
-	'adaptive-start',
+	'adaptivestart',
 	'Adaptive start',
 	'number',
 	$pconfig['adaptivestart'],
@@ -463,7 +463,7 @@ $group->add(new Form_Input(
 	'(adaptive.end - number of states) / (adaptive.end - adaptive.start).');
 
 $group->add(new Form_Input(
-	'adaptive-end',
+	'adaptiveend',
 	'Adaptive end',
 	'number',
 	$pconfig['adaptiveend'],
@@ -479,7 +479,7 @@ $group->setHelp('Timeouts for states can be scaled adaptively as the number of '
 $section->add($group);
 
 $section->addInput(new Form_Input(
-	'firewall-maximum-states',
+	'maximumstates',
 	'Firewall Maximum States',
 	'number',
 	$pconfig['maximumstates'],
@@ -489,7 +489,7 @@ $section->addInput(new Form_Input(
 	'size is: %d', [pfsense_default_state_size()]);
 
 $section->addInput(new Form_Input(
-	'firewall-maximum-table-entries',
+	'maximumtableentries',
 	'Firewall Maximum Table Entries',
 	'text',
 	$pconfig['maximumtableentries'],
@@ -499,8 +499,15 @@ $section->addInput(new Form_Input(
 	'default. On your system the default size is: %d',
 	[pfsense_default_table_entries_size()]);
 
+$section->addINput(new Form_Input(
+	'maximumfrags',
+	'Firewall Maximum Fragment Entries',
+	'text',
+	$pconfig['maximumfrags']
+))->setHelp('Maximum number of packet fragments to hold for reassembly by scrub rules. Leave this blank for the default (5000)');
+
 $section->addInput(new Form_Checkbox(
-	'static-route-filtering',
+	'bypassstaticroutes',
 	'Static route filtering',
 	'Bypass firewall rules for traffic on the same interface',
 	$pconfig['bypassstaticroutes']
@@ -510,7 +517,7 @@ $section->addInput(new Form_Checkbox(
 	'situations where multiple subnets are connected to the same interface.');
 
 $section->addInput(new Form_Checkbox(
-	'disable-auto-added-vpn-rules',
+	'disablevpnrules',
 	'Disable Auto-added VPN rules',
 	'Disable all auto-added VPN rules.',
 	isset($config['system']['disablevpnrules'])
@@ -518,7 +525,7 @@ $section->addInput(new Form_Checkbox(
 	'PPTP.</span>');
 
 $section->addInput(new Form_Checkbox(
-	'disable-reply-to',
+	'disablereplyto',
 	'Disable reply-to',
 	'Disable reply-to on WAN rules',
 	$pconfig['disablereplyto']
@@ -528,7 +535,7 @@ $section->addInput(new Form_Checkbox(
 	'different from the gateway IP of the hosts behind the bridged interface.');
 
 $section->addInput(new Form_Checkbox(
-	'disable-negate-rules',
+	'disablenegate',
 	'Disable Negate rules',
 	'Disable Negate rule on policy routing rules',
 	$pconfig['disablenegate']
@@ -538,17 +545,17 @@ $section->addInput(new Form_Checkbox(
 	'networks');
 
 $section->addInput(new Form_Input(
-	'aliases-hostnames-resolve-interval',
+	'aliasesresolveinterval',
 	'Aliases Hostnames Resolve Interval',
 	'text',
 	$pconfig['aliasesresolveinterval'],
 	['placeholder' => '300']
 ))->setHelp('Interval, in seconds, that will be used to resolve hostnames '.
-	'configured on aliases.. <br/>Note:  Leave this blank for the default '.
+	'configured on aliases.. <br/>Note:	 Leave this blank for the default '.
 	'(300s).');
 
 $section->addInput(new Form_Checkbox(
-	'check-certificate-of-aliases-urls',
+	'checkaliasesurlcert',
 	'Check certificate of aliases URLs',
 	'Verify HTTPS certificates when downloading alias URLs',
 	$pconfig['checkaliasesurlcert']
@@ -559,7 +566,7 @@ $form->add($section);
 $section = new Form_Section('Bogon Networks');
 
 $section->addInput(new Form_Select(
-	'update-frequency',
+	'bogonsinterval',
 	'Update Frequency',
 	empty($pconfig['bogonsinterval']) ? 'monthly' : $pconfig['bogonsinterval'],
 	array(
@@ -584,7 +591,7 @@ if (count($config['interfaces']) > 1)
 		$value = 'purenat';
 
 	$section->addInput(new Form_Select(
-		'nat-reflection-mode-for-port-forwards',
+		'natreflection',
 		'NAT Reflection mode for port forwards',
 		$value,
 		array(
@@ -609,7 +616,7 @@ if (count($config['interfaces']) > 1)
 		'this system setting on a per-rule basis.');
 
 	$section->addInput(new Form_Input(
-		'reflection-timeout',
+		'reflectiontimeout',
 		'Reflection Timeout',
 		'number',
 		$config['system']['reflectiontimeout'],
@@ -618,7 +625,7 @@ if (count($config['interfaces']) > 1)
 		'applies to Reflection on port forwards in NAT + proxy mode.');
 
 	$section->addInput(new Form_Checkbox(
-		'enable-nat-reflection-for-1-1-nat',
+		'enablebinatreflection',
 		'Enable NAT Reflection for 1:1 NAT',
 		'Automatic creation of additional NAT redirect rules from within your internal networks.',
 		isset($config['system']['enablebinatreflection'])
@@ -629,7 +636,7 @@ if (count($config['interfaces']) > 1)
 		'per-rule basis.');
 
 	$section->addInput(new Form_Checkbox(
-		'enable-automatic-outbound-nat-for-reflection',
+		'enablenatreflectionhelper',
 		'Enable automatic outbound NAT for Reflection',
 		'Automatic create outbound NAT rules that direct traffic back out to the same subnet it originated from.',
 		isset($config['system']['enablenatreflectionhelper'])
@@ -639,7 +646,7 @@ if (count($config['interfaces']) > 1)
 		'outbound NAT rules that direct the reply packets back through the router.');
 
 	$section->addInput(new Form_Select(
-		'tftp-proxy',
+		'tftpinterface',
 		'TFTP Proxy',
 		$pconfig['tftpinterface'],
 		get_configured_interface_with_descr(),
@@ -714,38 +721,38 @@ print $form;
 
 ?>
 <script>
-//<![CDATA[   
+//<![CDATA[
 events.push(function(){
 	// Change help text based on the selector value
 	function setHelpText(id, text) {
 		$('#' + id).parent().parent('div').find('span').html(text);
 	}
-	
+
 	function setOptText(val) {
 		var htext = '<font color="green">';
-		
-        if(val == 'normal')
-        	htext += 'The default optimization algorithm';	
-        else if (val == 'high-latency')
-        	htext += 'Used for eg. satellite links. Expires idle connections later than default';
-        else if (val == 'aggressive')
-        	htext += 'Expires idle connections quicker. More efficient use of CPU and memory but can drop legitimate idle connections';
-        else if (val == 'conservative')
-        	htext += 'Tries to avoid dropping any legitimate idle connections at the expense of increased memory usage and CPU utilization';		
+
+		if(val == 'normal')
+			htext += 'The default optimization algorithm';
+		else if (val == 'high-latency')
+			htext += 'Used for eg. satellite links. Expires idle connections later than default';
+		else if (val == 'aggressive')
+			htext += 'Expires idle connections quicker. More efficient use of CPU and memory but can drop legitimate idle connections';
+		else if (val == 'conservative')
+			htext += 'Tries to avoid dropping any legitimate idle connections at the expense of increased memory usage and CPU utilization';
 
 		htext += '</font>';
 		setHelpText('firewall-optimization-options', htext);
 	}
-	
-	// On click . . 
-    $('#firewall-optimization-options').on('change', function() {
-        setOptText(this.value);
-    });
-    	
-    // At page load . . 
+
+	// On click . .
+	$('#firewall-optimization-options').on('change', function() {
+		setOptText(this.value);
+	});
+
+	// At page load . .
 	setOptText($('#firewall-optimization-options').val())
 });
-//]]>  
+//]]>
 </script>
 <?php
 include("foot.inc");
\ No newline at end of file
diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php
index 17676a8..2dba952 100644
--- a/src/usr/local/www/system_advanced_misc.php
+++ b/src/usr/local/www/system_advanced_misc.php
@@ -33,7 +33,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-	pfSense_MODULE:	system
+	pfSense_MODULE: system
 */
 
 ##|+PRIV
@@ -121,15 +121,15 @@ if ($_POST) {
 	if (!empty($_POST['proxyport']) && !is_port($_POST['proxyport'])) {
 		$input_errors[] = gettext("Proxy port must be a valid port number, 1-65535.");
 	}
-	
+
 	if (!empty($_POST['proxyurl']) && !is_fqdn($_POST['proxyurl']) && !is_ipaddr($_POST['proxyurl'])) {
 		$input_errors[] = gettext("Proxy URL must be a valid IP address or FQDN.");
 	}
-	
+
 	if (!empty($_POST['proxyuser']) && preg_match("/[^a-zA-Z0-9\.\-_@]/", $_POST['proxyuser'])) {
 		$input_errors[] = gettext("The proxy username contains invalid characters.");
 	}
-	
+
 	if (!$input_errors) {
 
 		if ($_POST['harddiskstandby'] <> "") {
@@ -316,7 +316,7 @@ $form = new Form;
 $section = new Form_Section('Proxy support');
 
 $section->addInput(new Form_Input(
-	'proxy-url',
+	'proxyurl',
 	'Proxy URL',
 	'text',
 	$pconfig['proxyurl']
@@ -324,14 +324,14 @@ $section->addInput(new Form_Input(
 	'use for its outbound Internet access.');
 
 $section->addInput(new Form_Input(
-	'proxy-port',
+	'proxyport',
 	'Proxy Port',
 	'text',
 	$pconfig['proxyport']
 ))->setHelp('Port where proxy server is listening.');
 
 $section->addInput(new Form_Input(
-	'proxy-username',
+	'proxyuser',
 	'Proxy Username',
 	'text',
 	$pconfig['proxyuser']
@@ -339,7 +339,7 @@ $section->addInput(new Form_Input(
 	'leave blank to not use authentication.');
 
 $section->addInput(new Form_Input(
-	'proxy-password',
+	'password',
 	'Proxy Password',
 	'text',
 	$pconfig['proxypass']
@@ -351,7 +351,7 @@ $section = new Form_Section('Load Balancing');
 $group = new Form_Group('Load Balancing');
 
 $group->add(new Form_Checkbox(
-	'use-sticky-connections',
+	'lb_use_sticky',
 	'Use sticky connections',
 	'Use sticky connections',
 	$pconfig['lb_use_sticky']
@@ -364,7 +364,7 @@ $group->add(new Form_Checkbox(
 	'restart the Load Balancing service.');
 
 $group->add(new Form_Input(
-	'source-tracking-timeout',
+	'srctrack',
 	'Source tracking timeout',
 	'number',
 	$pconfig['srctrack'],
@@ -377,7 +377,7 @@ $group->add(new Form_Input(
 $section->add($group);
 
 $section->addInput(new Form_Checkbox(
-	'default-gateway-switching',
+	'gw_switch_default',
 	'Default gateway switching',
 	'Enable default gateway switching',
 	$pconfig['gw_switch_default']
@@ -389,7 +389,7 @@ $form->add($section);
 $section = new Form_Section('Power savings');
 
 $section->addInput(new Form_Checkbox(
-	'powerd',
+	'powerd_enable',
 	'PowerD',
 	'Enable PowerD',
 	$pconfig['powerd_enable']
@@ -397,14 +397,14 @@ $section->addInput(new Form_Checkbox(
 	'the system state and sets various power control options accordingly.  It offers '.
 	'four modes (maximum, minimum, adaptive and hiadaptive) that can be individually '.
 	'selected while on AC power or batteries. The modes maximum, minimum, adaptive '.
-	'and hiadaptive may be abbreviated max, min, adp, hadp.  Maximum mode chooses the '.
+	'and hiadaptive may be abbreviated max, min, adp, hadp.	 Maximum mode chooses the '.
 	'highest performance values.  Minimum mode selects the lowest performance values '.
 	'to get the most power savings. Adaptive mode attempts to strike a balance by '.
 	'degrading performance when the system appears idle and increasing it when the '.
 	'system is busy.  It offers a good balance between a small performance loss for '.
 	'greatly increased power savings.  Hiadaptive mode is alike adaptive mode, but '.
 	'tuned for systems where performance and interactivity are more important than '.
-	'power consumption.  It raises frequency faster, drops slower and keeps twice '.
+	'power consumption.	 It raises frequency faster, drops slower and keeps twice '.
 	'lower CPU load.');
 
 $modes = array(
@@ -415,21 +415,21 @@ $modes = array(
 );
 
 $section->addInput(new Form_Select(
-	'ac-power',
+	'powerd_ac_mode',
 	'AC Power',
 	$pconfig['powerd_ac_mode'],
 	$modes
 ));
 
 $section->addInput(new Form_Select(
-	'battery-power',
+	'powerd_battery_mode',
 	'Battery Power',
 	$pconfig['powerd_battery_mode'],
 	$modes
 ));
 
 $section->addInput(new Form_Select(
-	'unknown-power',
+	'powerd_normal_mode',
 	'Unknown Power',
 	$pconfig['powerd_normal_mode'],
 	$modes
@@ -439,7 +439,7 @@ $form->add($section);
 $section = new Form_Section('Cryptographic & Thermal Hardware');
 
 $section->addInput(new Form_Select(
-	'cryptographic-hardware',
+	'crypto_hardware',
 	'Cryptographic Hardware',
 	$pconfig['crypto_hardware'],
 	$crypto_modules
@@ -454,7 +454,7 @@ $section->addInput(new Form_Select(
 	'unload the selected module, set this option to "none" and then reboot.');
 
 $section->addInput(new Form_Select(
-	'thermal-sensors',
+	'thermal_hardware',
 	'Thermal Sensors',
 	$pconfig['thermal_hardware'],
 	array('' => 'None/ACPI') + $thermal_hardware_modules
@@ -470,7 +470,7 @@ $form->add($section);
 $section = new Form_Section('Schedules');
 
 $section->addInput(new Form_Checkbox(
-	'schedule-states',
+	'schedule_states',
 	'Schedule States',
 	'Do not kill connections when schedule expires',
 	$pconfig['schedule_states']
@@ -482,7 +482,7 @@ $form->add($section);
 $section = new Form_Section('Gateway Monitoring');
 
 $section->addInput(new Form_Checkbox(
-	'state-killing-on-gateway-failure',
+	'kill_states',
 	'State Killing on Gateway Failure',
 	'Flush states for a gateway that goes down',
 	$pconfig['kill_states']
@@ -490,7 +490,7 @@ $section->addInput(new Form_Checkbox(
 	'if this box is not checked. Check this box to disable this behavior.');
 
 $section->addInput(new Form_Checkbox(
-	'skip-rules-when-gateway-is-down',
+	'skip_rules_gw_down',
 	'Skip rules when gateway is down',
 	'Do not create rules when gateway is down',
 	$pconfig['skip_rules_gw_down']
@@ -499,7 +499,7 @@ $section->addInput(new Form_Checkbox(
 	'behavior by omitting the entire rule instead.');
 
 $section->addInput(new Form_Checkbox(
-	'gateway-monitoring-logging',
+	'apinger_debug',
 	'Gateway monitoring logging',
 	'Enable debug logging',
 	$pconfig['apinger_debug']
@@ -510,7 +510,7 @@ $form->add($section);
 $section = new Form_Section('RAM Disk Settings (Reboot to Apply Changes)');
 
 $section->addInput(new Form_Checkbox(
-	'use-ram-disks',
+	'use_mfs_tmpvar',
 	'Use RAM Disks',
 	'Use memory file system for /tmp and /var',
 	($pconfig['use_mfs_tmpvar'] || $g['platform'] != "pfSense")
@@ -520,7 +520,7 @@ $section->addInput(new Form_Checkbox(
 	'and DHCP Leases will be retained.');
 
 $section->addInput(new Form_Input(
-	'-tmp-ram-disk-size',
+	'use_mfs_tmp_size',
 	'/tmp RAM Disk Size',
 	'number',
 	$pconfig['use_mfs_tmp_size'],
@@ -529,7 +529,7 @@ $section->addInput(new Form_Input(
 	'RAM disk. Leave blank for 40MB. Do not set lower than 40.');
 
 $section->addInput(new Form_Input(
-	'-var-ram-disk-size',
+	'use_mfs_var_size',
 	'/var RAM Disk Size',
 	'number',
 	$pconfig['use_mfs_var_size'],
@@ -538,7 +538,7 @@ $section->addInput(new Form_Input(
 	'RAM disk. Leave blank for 60MB. Do not set lower than 60.');
 
 $section->addInput(new Form_Input(
-	'periodic-rrd-backup',
+	'rrdbackup',
 	'Periodic RRD Backup',
 	'number',
 	$config['system']['rrdbackup'],
@@ -548,7 +548,7 @@ $section->addInput(new Form_Input(
 	'frequent the backup, the more writes will happen to your media.');
 
 $section->addInput(new Form_Input(
-	'periodic-dhcp-leases-backup',
+	'dhcpbackup',
 	'Periodic DHCP Leases Backup',
 	'number',
 	$config['system']['rrdbackup'],
@@ -561,7 +561,7 @@ $form->add($section);
 $section = new Form_Section('Package settings');
 
 $section->addInput(new Form_Checkbox(
-	'package-signature',
+	'pkg_nochecksig',
 	'Package signature',
 	'Disable check package signature',
 	$pconfig['pkg_nochecksig']
diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php
index c770603..0a69be9 100644
--- a/src/usr/local/www/system_advanced_network.php
+++ b/src/usr/local/www/system_advanced_network.php
@@ -32,7 +32,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-	pfSense_MODULE:	system
+	pfSense_MODULE: system
 */
 
 ##|+PRIV
@@ -170,7 +170,7 @@ $form = new Form;
 $section = new Form_Section('IPv6 Options');
 
 $section->addInput(new Form_Checkbox(
-	'allow-ipv6',
+	'ipv6allow',
 	'Allow IPv6',
 	'All IPv6 traffic will be blocked by the firewall unless this box is checked',
 	$pconfig['ipv6allow']
@@ -179,15 +179,15 @@ $section->addInput(new Form_Checkbox(
 
 $group = new Form_Group('IPv6 over IPv4 Tunneling');
 $group->add(new Form_Checkbox(
-	'ipv6-over-ipv4-tunneling',
+	'ipv6nat_enable',
 	'IPv6 over IPv4 Tunneling',
 	'Enable IPv4 NAT encapsulation of IPv6 packets',
-	$pconfig['ipv6allow']
+	$pconfig['ipv6nat_enable']
 ))->setHelp('NOTE: This does not disable any IPv6 features on the firewall, it only '.
 	'blocks traffic.');
 
 $group->add(new Form_Input(
-	'ip-address',
+	'ipv6nat_ipaddr',
 	'IP address',
 	'text',
 	$pconfig['ipv6nat_ipaddr']
@@ -199,7 +199,7 @@ $group->add(new Form_Input(
 $section->add($group);
 
 $section->addInput(new Form_Checkbox(
-	'prefer-ipv4-over-ipv6',
+	'prefer_ipv4',
 	'Prefer IPv4 over IPv6',
 	'Prefer to use IPv4 even if IPv6 is available',
 	$pconfig['prefer_ipv4']
@@ -210,7 +210,7 @@ $form->add($section);
 $section = new Form_Section('Network Interfaces');
 
 $section->addInput(new Form_Checkbox(
-	'device-polling',
+	'polling_enable',
 	'Device polling',
 	'Enable device polling',
 	$pconfig['polling_enable']
@@ -222,7 +222,7 @@ $section->addInput(new Form_Checkbox(
 
 
 $section->addInput(new Form_Checkbox(
-	'hardware-checksum-offloading',
+	'disablechecksumoffloading',
 	'Hardware Checksum Offloading',
 	'Disable hardware checksum offload',
 	isset($config['system']['disablechecksumoffloading'])
@@ -233,7 +233,7 @@ $section->addInput(new Form_Checkbox(
 	'interface.');
 
 $section->addInput(new Form_Checkbox(
-	'hardware-tcp-segmentation-offloading',
+	'disablesegmentationoffloading',
 	'Hardware TCP Segmentation Offloading',
 	'Disable hardware TCP segmentation offload',
 	isset($config['system']['disablesegmentationoffloading'])
@@ -243,7 +243,7 @@ $section->addInput(new Form_Checkbox(
 	'effect after you reboot the machine or re-configure each interface.');
 
 $section->addInput(new Form_Checkbox(
-	'hardware-large-receive-offloading',
+	'disablelargereceiveoffloading',
 	'Hardware Large Receive Offloading',
 	'Disable hardware large receive offload',
 	isset($config['system']['disablelargereceiveoffloading'])
@@ -253,7 +253,7 @@ $section->addInput(new Form_Checkbox(
 	'machine or re-configure each interface.');
 
 $section->addInput(new Form_Checkbox(
-	'arp-handling',
+	'sharednet',
 	'ARP Handling',
 	'Suppress ARP messages',
 	isset($pconfig['sharednet'])
@@ -263,7 +263,7 @@ $section->addInput(new Form_Checkbox(
 if (get_freebsd_version() == 8)
 {
 	$section->addInput(new Form_Checkbox(
-		'Enable Flowtable',
+		'flowtable',
 		'Enable flowtable support',
 		$pconfig['flowtable']
 	))->setHelp('Enables infrastructure for caching flows as a means of accelerating '.
diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php
index 91a3f70..0a01cbc 100644
--- a/src/usr/local/www/system_advanced_notifications.php
+++ b/src/usr/local/www/system_advanced_notifications.php
@@ -28,7 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-	pfSense_MODULE:	system
+	pfSense_MODULE: system
 */
 
 ##|+PRIV
@@ -123,13 +123,13 @@ if ($_POST) {
 		} else {
 			unset($config['notifications']['smtp']['ssl']);
 		}
-		
+
 		if (isset($_POST['smtptls'])) {
 			$config['notifications']['smtp']['tls'] = true;
 		} else {
 			unset($config['notifications']['smtp']['tls']);
 		}
-		
+
 		$config['notifications']['smtp']['notifyemailaddress'] = $_POST['smtpnotifyemailaddress'];
 		$config['notifications']['smtp']['username'] = $_POST['smtpusername'];
 		$config['notifications']['smtp']['password'] = $_POST['smtppassword'];
@@ -158,7 +158,7 @@ if ($_POST) {
 	if (isset($_POST['test-growl'])) {
 		// Send test message via growl
 		if ($config['notifications']['growl']['ipaddress'] &&
-		    $config['notifications']['growl']['password'] = $_POST['password']) {
+			$config['notifications']['growl']['password'] = $_POST['password']) {
 			unlink_if_exists($g['vardb_path'] . "/growlnotices_lastmsg.txt");
 			register_via_growl();
 			notify_via_growl(sprintf(gettext("This is a test message from %s.  It is safe to ignore this message."), $g['product_name']), true);
@@ -170,7 +170,7 @@ if ($_POST) {
 		if (file_exists("/var/db/notices_lastmsg.txt")) {
 			unlink("/var/db/notices_lastmsg.txt");
 		}
-		$savemsg = notify_via_smtp(sprintf(gettext("This is a test message from %s.  It is safe to ignore this message."), $g['product_name']), true);
+		$savemsg = notify_via_smtp(sprintf(gettext("This is a test message from %s.	 It is safe to ignore this message."), $g['product_name']), true);
 	}
 }
 
@@ -198,7 +198,7 @@ $form = new Form;
 $section = new Form_Section('Growl');
 
 $section->addInput(new Form_Checkbox(
-	'disable-growl',
+	'disable_growl',
 	'Disable Growl',
 	'Disable Growl Notifications',
 	$pconfig['disable_growl']
@@ -206,7 +206,7 @@ $section->addInput(new Form_Checkbox(
 	'settings below.');
 
 $section->addInput(new Form_Input(
-	'registration-name',
+	'name',
 	'Registration Name',
 	'text',
 	$pconfig['name'],
@@ -214,7 +214,7 @@ $section->addInput(new Form_Input(
 ))->setHelp('Enter the name to register with the Growl server.');
 
 $section->addInput(new Form_Input(
-	'notification-name',
+	'notification_name',
 	'Notification Name',
 	'text',
 	$pconfig['notification_name'],
@@ -223,7 +223,7 @@ $section->addInput(new Form_Input(
 ))->setHelp('Enter a name for the Growl notifications');
 
 $section->addInput(new Form_Input(
-	'ip-address',
+	'ipaddress',
 	'IP Address',
 	'text',
 	$pconfig['ipaddress']
@@ -238,7 +238,7 @@ $section->addInput(new Form_Input(
 ))->setHelp('Enter the password of the remote growl notification device.');
 
 $section->addInput(new Form_Input(
-	'test-growl',
+	'test_growl',
 	'Test Growl',
 	'submit',
 	'Test Growl settings'
@@ -249,7 +249,7 @@ $form->add($section);
 $section = new Form_Section('E-Mail');
 
 $section->addInput(new Form_Checkbox(
-	'disable-smtp',
+	'disable_smtp',
 	'Disable SMTP',
 	'Disable SMTP Notifications',
 	$pconfig['disable_smtp']
@@ -258,7 +258,7 @@ $section->addInput(new Form_Checkbox(
 	'in place to function.');
 
 $section->addInput(new Form_Input(
-	'e-mail-server',
+	'mtpipaddress',
 	'E-Mail server',
 	'text',
 	$pconfig['smtpipaddress']
@@ -266,7 +266,7 @@ $section->addInput(new Form_Input(
 	'which notifications will be sent.');
 
 $section->addInput(new Form_Input(
-	'smtp-port-of-e-mail-server',
+	'smtpport',
 	'SMTP Port of E-Mail server',
 	'number',
 	$pconfig['smtpport']
@@ -275,14 +275,14 @@ $section->addInput(new Form_Input(
 
 $group = new Form_Group('Secure SMTP Connection');
 $group->add(new Form_Checkbox(
-	'enable-ssl-tls',
+	'smtpssl',
 	'Enable SSL/TLS',
 	'Enable SMTP over SSL/TLS',
 	isset($pconfig['smtpssl'])
 ));
 
 $group->add(new Form_Checkbox(
-	'secure-starttls',
+	'smtptls',
 	'Secure STARTTLS',
 	'Enable STARTTLS',
 	isset($pconfig['smtptls'])
@@ -291,14 +291,14 @@ $group->add(new Form_Checkbox(
 $section->add($group);
 
 $section->addInput(new Form_Input(
-	'from-e-mail-address',
+	'smtpfromaddress',
 	'From e-mail address',
 	'text',
 	$pconfig['smtpfromaddress']
 ))->setHelp('This is the e-mail address that will appear in the from field.');
 
 $section->addInput(new Form_Input(
-	'notification-e-mail-address',
+	'smtpnotifyemailaddress',
 	'Notification E-Mail address',
 	'text',
 	$pconfig['smtpnotifyemailaddress']
@@ -306,21 +306,21 @@ $section->addInput(new Form_Input(
 	'notifications sent to.');
 
 $section->addInput(new Form_Input(
-	'notification-e-mail-auth-username-optional-',
+	'smtpusername',
 	'Notification E-Mail auth username (optional)',
 	'text',
 	$pconfig['smtpusername']
 ))->setHelp('Enter the e-mail address username for SMTP authentication.');
 
 $section->addInput(new Form_Input(
-	'notification-e-mail-auth-password',
+	'smtppassword',
 	'Notification E-Mail auth password',
 	'password',
 	$pconfig['smtppassword']
 ))->setHelp('Enter the e-mail address password for SMTP authentication.');
 
 $section->addInput(new Form_Input(
-	'test-smtp',
+	'test_smtp',
 	'Test SMTP',
 	'submit',
 	'Test SMTP settings'
@@ -328,7 +328,7 @@ $section->addInput(new Form_Input(
 	'marked as disabled.');
 
 $section->addInput(new Form_Checkbox(
-	'startup-shutdown-sound',
+	'disablebeep',
 	'Startup/Shutdown Sound',
 	'Disable the startup/shutdown beep',
 	$pconfig['disablebeep']
diff --git a/src/usr/local/www/system_advanced_sysctl.php b/src/usr/local/www/system_advanced_sysctl.php
index 9e7da14..00a2590 100644
--- a/src/usr/local/www/system_advanced_sysctl.php
+++ b/src/usr/local/www/system_advanced_sysctl.php
@@ -33,7 +33,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-	pfSense_MODULE:	system
+	pfSense_MODULE: system
 */
 
 ##|+PRIV