Merge with latest bootstrap code

1 files changed, 4 insertions, 11 deletions

diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php
index 1162dea..9b00fdd 100644
--- a/src/usr/local/www/firewall_rules_edit.php
+++ b/src/usr/local/www/firewall_rules_edit.php
@@ -1193,7 +1193,7 @@ $section->addInput(new Form_Select(
 $section->addInput(new Form_Select(
 	'proto',
 	'Protocol',
-	$pconfig['ipprotocol'],
+	$pconfig['proto'],
 	array(
 		'tcp' => 'TCP',
 		'udp' => 'UDP',
@@ -1211,7 +1211,7 @@ $section->addInput(new Form_Select(
 		'carp' => 'CARP',
 		'pfsync' => 'PFSYNC',
 	)
-))->setHelp('Choose which IP protocol this rule should match. In most cases, you should specify TCP here.');
+))->setHelp('Choose which IP protocol this rule should match.');
 
 $section->addInput(new Form_Select(
 	'icmptype',
@@ -1294,7 +1294,7 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) {
 		))->removeClass('btn-primary');
 	}
 
-	$portValues = ['any' => 'any', '' => '(other)'];
+	$portValues = ['' => '(other)', 'any' => 'any'];
 
 	foreach ($wkports as $port => $portName)
 		$portValues[$port] = $portName.' ('. $port .')';
@@ -1477,18 +1477,11 @@ $section->addInput(new Form_Input(
 	['min' => 1, 'max' => 3600]
 ))->setHelp('State Timeout in seconds (TCP only)');
 
-//$form->add($section);
-//$section = new Form_Section('TCP Flags');
-//$section->addClass('tcpflags');
-
 $section->addInput(new Form_StaticText(
 	'TCP Flags',
 	build_flag_table()
 ))->setHelp('Use this to choose TCP flags that must be set or cleared for this rule to match.');
 
-// $form->add($section);
-// $section = new Form_Section('State Type');
-
 $section->addInput(new Form_Checkbox(
 	'nopfsync',
 	'No pfSync',
@@ -1976,4 +1969,4 @@ events.push(function(){
 </script>
 
 <?php
-include("foot.inc");
\ No newline at end of file
+include("foot.inc");