Code style Firewall Rules

1 files changed, 372 insertions, 317 deletions

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index c05b001..4f2856e 100644
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -53,14 +53,17 @@ $shortcut_section = "firewall";
 function delete_nat_association($id) {
 	global $config;
 
-	if (!$id || !is_array($config['nat']['rule']))
+	if (!$id || !is_array($config['nat']['rule'])) {
 		return;
+	}
 
 	$a_nat = &$config['nat']['rule'];
 
-	foreach ($a_nat as &$natent)
-		if ($natent['associated-rule-id'] == $id)
+	foreach ($a_nat as &$natent) {
+		if ($natent['associated-rule-id'] == $id) {
 			$natent['associated-rule-id'] = '';
+		}
+	}
 }
 
 if (!is_array($config['filter']['rule'])) {
@@ -70,54 +73,70 @@ filter_rules_sort();
 $a_filter = &$config['filter']['rule'];
 
 $if = $_GET['if'];
-if ($_POST['if'])
+if ($_POST['if']) {
 	$if = $_POST['if'];
+}
 
 $ifdescs = get_configured_interface_with_descr();
 
 /* add group interfaces */
-if (is_array($config['ifgroups']['ifgroupentry']))
-	foreach($config['ifgroups']['ifgroupentry'] as $ifgen)
-		if (have_ruleint_access($ifgen['ifname']))
+if (is_array($config['ifgroups']['ifgroupentry'])) {
+	foreach ($config['ifgroups']['ifgroupentry'] as $ifgen) {
+		if (have_ruleint_access($ifgen['ifname'])) {
 			$iflist[$ifgen['ifname']] = $ifgen['ifname'];
+		}
+	}
+}
 
-foreach ($ifdescs as $ifent => $ifdesc)
-	if(have_ruleint_access($ifent))
+foreach ($ifdescs as $ifent => $ifdesc) {
+	if (have_ruleint_access($ifent)) {
 		$iflist[$ifent] = $ifdesc;
+	}
+}
 
-if ($config['l2tp']['mode'] == "server")
-	if(have_ruleint_access("l2tp"))
+if ($config['l2tp']['mode'] == "server") {
+	if (have_ruleint_access("l2tp")) {
 		$iflist['l2tp'] = "L2TP VPN";
+	}
+}
 
-if ($config['pptpd']['mode'] == "server")
-	if(have_ruleint_access("pptp"))
+if ($config['pptpd']['mode'] == "server") {
+	if (have_ruleint_access("pptp")) {
 		$iflist['pptp'] = "PPTP VPN";
+	}
+}
 
 if (is_array($config['pppoes']['pppoe'])) {
-	foreach ($config['pppoes']['pppoe'] as $pppoes)
-		if (($pppoes['mode'] == 'server') && have_ruleint_access("pppoe"))
+	foreach ($config['pppoes']['pppoe'] as $pppoes) {
+		if (($pppoes['mode'] == 'server') && have_ruleint_access("pppoe")) {
 			$iflist['pppoe'] = "PPPoE Server";
+		}
+	}
 }
 
 /* add ipsec interfaces */
-if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
-	if(have_ruleint_access("enc0"))
+if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) {
+	if (have_ruleint_access("enc0")) {
 		$iflist["enc0"] = "IPsec";
+	}
+}
 
 /* add openvpn/tun interfaces */
-if  ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"])
+if  ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"]) {
 	$iflist["openvpn"] = "OpenVPN";
+}
 
 pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/interfaces_override");
 
 if (!$if || !isset($iflist[$if])) {
-	if ("any" == $if)
+	if ("any" == $if) {
 		$if = "FloatingRules";
-	else if ("FloatingRules" != $if) {
-		if (isset($iflist['wan']))
+	} else if ("FloatingRules" != $if) {
+		if (isset($iflist['wan'])) {
 			$if = "wan";
-		else
+		} else {
 			$if = "FloatingRules";
+		}
 	}
 }
 
@@ -143,16 +162,18 @@ if ($_GET['act'] == "del") {
 			delete_nat_association($a_filter[$_GET['id']]['associated-rule-id']);
 		}
 		unset($a_filter[$_GET['id']]);
-		if (write_config())
+		if (write_config()) {
 			mark_subsystem_dirty('filter');
+		}
 		header("Location: firewall_rules.php?if=" . htmlspecialchars($if));
 		exit;
 	}
 }
 
 // Handle save msg if defined
-if($_REQUEST['savemsg'])
+if ($_REQUEST['savemsg']) {
 	$savemsg = htmlentities($_REQUEST['savemsg']);
+}
 
 if (isset($_POST['del_x'])) {
 	/* delete selected rules */
@@ -161,19 +182,22 @@ if (isset($_POST['del_x'])) {
 			delete_nat_association($a_filter[$rulei]['associated-rule-id']);
 			unset($a_filter[$rulei]);
 		}
-		if (write_config())
+		if (write_config()) {
 			mark_subsystem_dirty('filter');
+		}
 		header("Location: firewall_rules.php?if=" . htmlspecialchars($if));
 		exit;
 	}
 } else if ($_GET['act'] == "toggle") {
 	if ($a_filter[$_GET['id']]) {
-		if(isset($a_filter[$_GET['id']]['disabled']))
+		if (isset($a_filter[$_GET['id']]['disabled'])) {
 			unset($a_filter[$_GET['id']]['disabled']);
-		else
+		} else {
 			$a_filter[$_GET['id']]['disabled'] = true;
-		if (write_config())
+		}
+		if (write_config()) {
 			mark_subsystem_dirty('filter');
+		}
 		header("Location: firewall_rules.php?if=" . htmlspecialchars($if));
 		exit;
 	}
@@ -193,31 +217,37 @@ if (isset($_POST['del_x'])) {
 
 		/* copy all rules < $movebtn and not selected */
 		for ($i = 0; $i < $movebtn; $i++) {
-			if (!in_array($i, $_POST['rule']))
+			if (!in_array($i, $_POST['rule'])) {
 				$a_filter_new[] = $a_filter[$i];
+			}
 		}
 
 		/* copy all selected rules */
 		for ($i = 0; $i < count($a_filter); $i++) {
-			if ($i == $movebtn)
+			if ($i == $movebtn) {
 				continue;
-			if (in_array($i, $_POST['rule']))
+			}
+			if (in_array($i, $_POST['rule'])) {
 				$a_filter_new[] = $a_filter[$i];
+			}
 		}
 
 		/* copy $movebtn rule */
-		if ($movebtn < count($a_filter))
+		if ($movebtn < count($a_filter)) {
 			$a_filter_new[] = $a_filter[$movebtn];
+		}
 
 		/* copy all rules > $movebtn and not selected */
 		for ($i = $movebtn+1; $i < count($a_filter); $i++) {
-			if (!in_array($i, $_POST['rule']))
+			if (!in_array($i, $_POST['rule'])) {
 				$a_filter_new[] = $a_filter[$i];
+			}
 		}
 
 		$a_filter = $a_filter_new;
-		if (write_config())
+		if (write_config()) {
 			mark_subsystem_dirty('filter');
+		}
 		header("Location: firewall_rules.php?if=" . htmlspecialchars($if));
 		exit;
 	}
@@ -248,16 +278,20 @@ include("head.inc");
 	<?php
 	/* active tabs */
 	$tab_array = array();
-	if ("FloatingRules" == $if)
+	if ("FloatingRules" == $if) {
 		$active = true;
-	else
+	} else {
 		$active = false;
+	}
 	$tab_array[] = array(gettext("Floating"), $active, "firewall_rules.php?if=FloatingRules");
-	$tabscounter = 0; $i = 0; foreach ($iflist as $ifent => $ifname) {
-		if ($ifent == $if)
+	$tabscounter = 0;
+	$i = 0;
+	foreach ($iflist as $ifent => $ifname) {
+		if ($ifent == $if) {
 			$active = true;
-		else
+		} else {
 			$active = false;
+		}
 		$tab_array[] = array($ifname, $active, "firewall_rules.php?if={$ifent}");
 	}
 	display_top_tabs($tab_array);
@@ -270,190 +304,203 @@ include("head.inc");
 				pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/before_first_tr");
 			?>
 			<tr id="frheader">
-			<td width="3%" class="list">&nbsp;</td>
-			<td width="5%" class="list">&nbsp;</td>
-			<td width="3%" class="listhdrr"><?=gettext("ID");?></td>
-			<?php
-				pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_id_tablehead");
-			?>
-			<td width="6%" class="listhdrr"><?=gettext("Proto");?></td>
-			<td width="12%" class="listhdrr"><?=gettext("Source");?></td>
-			<td width="6%" class="listhdrr"><?=gettext("Port");?></td>
-			<td width="12%" class="listhdrr"><?=gettext("Destination");?></td>
-			<td width="6%" class="listhdrr"><?=gettext("Port");?></td>
-			<td width="5%" class="listhdrr"><?=gettext("Gateway");?></td>
-			<td width="8%" class="listhdrr"><?=gettext("Queue");?></td>
-			<td width="5%" class="listhdrr"><?=gettext("Schedule");?></td>
-			<?php
-				pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_desc_tablehead");
-			?>
-			<td width="19%" class="listhdr"><?=gettext("Description");?></td>
-			<td width="10%" class="list">
-				<table border="0" cellspacing="0" cellpadding="1" summary="delete selected rules">
-					<tr>
-					<?php
-						$nrules = 0;
-						for ($i = 0; isset($a_filter[$i]); $i++) {
-							$filterent = $a_filter[$i];
-							if ($filterent['interface'] != $if && !isset($filterent['floating']))
-								continue;
-							if (isset($filterent['floating']) && "FloatingRules" != $if)
-								continue;
-							$nrules++;
-						}
-					?>
-					<td>
-					<?php if ($nrules == 0): ?>
-						<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?gettext("delete selected rules"); ?>" border="0" alt="delete" /><?php else: ?>
-						<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" style="width:17;height:17" title="<?=gettext("delete selected rules");?>" onclick="return confirm('<?=gettext('Do you really want to delete the selected rules?');?>')" />
-					<?php endif; ?>
-					</td>
-					<td align="center" valign="middle"><a href="firewall_rules_edit.php?if=<?=htmlspecialchars($if);?>&amp;after=-1"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" width="17" height="17" border="0" alt="add" /></a></td>
-					</tr>
-				</table>
-			</td>
+				<td width="3%" class="list">&nbsp;</td>
+				<td width="5%" class="list">&nbsp;</td>
+				<td width="3%" class="listhdrr"><?=gettext("ID");?></td>
+				<?php
+					pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_id_tablehead");
+				?>
+				<td width="6%" class="listhdrr"><?=gettext("Proto");?></td>
+				<td width="12%" class="listhdrr"><?=gettext("Source");?></td>
+				<td width="6%" class="listhdrr"><?=gettext("Port");?></td>
+				<td width="12%" class="listhdrr"><?=gettext("Destination");?></td>
+				<td width="6%" class="listhdrr"><?=gettext("Port");?></td>
+				<td width="5%" class="listhdrr"><?=gettext("Gateway");?></td>
+				<td width="8%" class="listhdrr"><?=gettext("Queue");?></td>
+				<td width="5%" class="listhdrr"><?=gettext("Schedule");?></td>
+				<?php
+					pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_desc_tablehead");
+				?>
+				<td width="19%" class="listhdr"><?=gettext("Description");?></td>
+				<td width="10%" class="list">
+					<table border="0" cellspacing="0" cellpadding="1" summary="delete selected rules">
+						<tr>
+						<?php
+							$nrules = 0;
+							for ($i = 0; isset($a_filter[$i]); $i++) {
+								$filterent = $a_filter[$i];
+								if ($filterent['interface'] != $if && !isset($filterent['floating'])) {
+									continue;
+								}
+								if (isset($filterent['floating']) && "FloatingRules" != $if) {
+									continue;
+								}
+								$nrules++;
+							}
+						?>
+							<td>
+							<?php if ($nrules == 0): ?>
+								<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?gettext("delete selected rules"); ?>" border="0" alt="delete" /><?php else: ?>
+								<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" style="width:17;height:17" title="<?=gettext("delete selected rules");?>" onclick="return confirm('<?=gettext('Do you really want to delete the selected rules?');?>')" />
+							<?php endif; ?>
+							</td>
+							<td align="center" valign="middle">
+								<a href="firewall_rules_edit.php?if=<?=htmlspecialchars($if);?>&amp;after=-1">
+									<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" width="17" height="17" border="0" alt="add" />
+								</a>
+							</td>
+						</tr>
+					</table>
+				</td>
 			</tr>
 			<?php   // Show the anti-lockout rule if it's enabled, and we are on LAN with an if count > 1, or WAN with an if count of 1.
 				if (!isset($config['system']['webgui']['noantilockout']) &&
-					(((count($config['interfaces']) > 1) && ($if == 'lan'))
-					|| ((count($config['interfaces']) == 1) && ($if == 'wan')))):
+				    (((count($config['interfaces']) > 1) && ($if == 'lan')) ||
+				     ((count($config['interfaces']) == 1) && ($if == 'wan')))):
 
 					$alports = implode('<br />', filter_get_antilockout_ports(true));
 			?>
 			<tr valign="top" id="antilockout">
-			<td class="list">&nbsp;</td>
-			<td class="listt" align="center"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif" width="11" height="11" border="0" alt="pass" /></td>
-			<td class="listlr" style="background-color: #E0E0E0">&nbsp;</td>
-			<?php
-				pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_id_tr_antilockout");
-			?>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0"><?=$iflist[$if];?> Address</td>
-			<td class="listr" style="background-color: #E0E0E0"><?= $alports ?></td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">&nbsp;</td>
-			<td class="listbg"><?=gettext("Anti-Lockout Rule");?></td>
-			<td valign="middle" class="list nowrap">
-			<table border="0" cellspacing="0" cellpadding="1" summary="move rules before">
-				<tr>
-					<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules before this rule");?>" alt="move" /></td>
-					<td><a href="system_advanced_admin.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit rule");?>" width="17" height="17" border="0" alt="edit" /></a></td>
-				</tr>
-				<tr>
-					<td align="center" valign="middle"></td>
-					<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus_d.gif" title="<?=gettext("add a new rule based on this one");?>" width="17" height="17" border="0" alt="add" /></td>
-				</tr>
-				</table>
-			</td>
+				<td class="list">&nbsp;</td>
+				<td class="listt" align="center"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif" width="11" height="11" border="0" alt="pass" /></td>
+				<td class="listlr" style="background-color: #E0E0E0">&nbsp;</td>
+				<?php
+					pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_id_tr_antilockout");
+				?>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0"><?=$iflist[$if];?> Address</td>
+				<td class="listr" style="background-color: #E0E0E0"><?= $alports ?></td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">&nbsp;</td>
+				<td class="listbg"><?=gettext("Anti-Lockout Rule");?></td>
+				<td valign="middle" class="list nowrap">
+					<table border="0" cellspacing="0" cellpadding="1" summary="move rules before">
+						<tr>
+							<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules before this rule");?>" alt="move" /></td>
+							<td><a href="system_advanced_admin.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit rule");?>" width="17" height="17" border="0" alt="edit" /></a></td>
+						</tr>
+						<tr>
+							<td align="center" valign="middle"></td>
+							<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus_d.gif" title="<?=gettext("add a new rule based on this one");?>" width="17" height="17" border="0" alt="add" /></td>
+						</tr>
+					</table>
+				</td>
 			</tr>
 <?php endif; ?>
 
 <?php if (isset($config['interfaces'][$if]['blockpriv'])): ?>
 			<tr valign="top" id="frrfc1918">
-			<td class="list">&nbsp;</td>
-			<td class="listt" align="center"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" width="11" height="11" border="0" alt="block" /></td>
-			<td class="listlr" style="background-color: #E0E0E0">&nbsp;</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0"><?=gettext("RFC 1918 networks");?></td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">&nbsp;</td>
-			<td class="listbg"><?=gettext("Block private networks");?></td>
-			<td valign="middle" class="list nowrap">
-				<table border="0" cellspacing="0" cellpadding="1" summary="move rules before">
-					<tr>
-					<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules before this rule");?>" alt="edit" /></td>
-					<td><a href="interfaces.php?if=<?=htmlspecialchars($if)?>#rfc1918"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit rule");?>" width="17" height="17" border="0" alt="edit" /></a></td>
-					</tr>
-					<tr>
-					<td align="center" valign="middle"></td>
-					<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus_d.gif" title="<?=gettext("add a new rule based on this one");?>" width="17" height="17" border="0" alt="add" /></td>
-					</tr>
-				</table>
-			</td>
+				<td class="list">&nbsp;</td>
+				<td class="listt" align="center"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" width="11" height="11" border="0" alt="block" /></td>
+				<td class="listlr" style="background-color: #E0E0E0">&nbsp;</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0"><?=gettext("RFC 1918 networks");?></td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">&nbsp;</td>
+				<td class="listbg"><?=gettext("Block private networks");?></td>
+				<td valign="middle" class="list nowrap">
+					<table border="0" cellspacing="0" cellpadding="1" summary="move rules before">
+						<tr>
+							<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules before this rule");?>" alt="edit" /></td>
+							<td><a href="interfaces.php?if=<?=htmlspecialchars($if)?>#rfc1918"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit rule");?>" width="17" height="17" border="0" alt="edit" /></a></td>
+						</tr>
+						<tr>
+							<td align="center" valign="middle"></td>
+							<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus_d.gif" title="<?=gettext("add a new rule based on this one");?>" width="17" height="17" border="0" alt="add" /></td>
+						</tr>
+					</table>
+				</td>
 			</tr>
 <?php endif; ?>
 <?php if (isset($config['interfaces'][$if]['blockbogons'])): ?>
 			<tr valign="top" id="frrfc1918">
-			<td class="list">&nbsp;</td>
-			<td class="listt" align="center"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" width="11" height="11" border="0" alt="block" /></td>
-			<td class="listlr" style="background-color: #E0E0E0">&nbsp;</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0"><?=gettext("Reserved/not assigned by IANA");?></td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listr" style="background-color: #E0E0E0">*</td>
-			<td class="listbg"><?=gettext("Block bogon networks");?></td>
-			<td valign="middle" class="list nowrap">
-				<table border="0" cellspacing="0" cellpadding="1" summary="move rules before">
-					<tr>
-					<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules before this rule");?>" alt="move" /></td>
-					<td><a href="interfaces.php?if=<?=htmlspecialchars($if)?>#rfc1918"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit rule");?>" width="17" height="17" border="0" alt=" edit" /></a></td>
-					</tr>
-					<tr>
-					<td align="center" valign="middle"></td>
-					<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus_d.gif" title="<?=gettext("add a new rule based on this one");?>" width="17" height="17" border="0" alt="add" /></td>
-					</tr>
-				</table>
-			</td>
+				<td class="list">&nbsp;</td>
+				<td class="listt" align="center"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" width="11" height="11" border="0" alt="block" /></td>
+				<td class="listlr" style="background-color: #E0E0E0">&nbsp;</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0"><?=gettext("Reserved/not assigned by IANA");?></td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listr" style="background-color: #E0E0E0">*</td>
+				<td class="listbg"><?=gettext("Block bogon networks");?></td>
+				<td valign="middle" class="list nowrap">
+					<table border="0" cellspacing="0" cellpadding="1" summary="move rules before">
+						<tr>
+							<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules before this rule");?>" alt="move" /></td>
+							<td><a href="interfaces.php?if=<?=htmlspecialchars($if)?>#rfc1918"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit rule");?>" width="17" height="17" border="0" alt=" edit" /></a></td>
+						</tr>
+						<tr>
+							<td align="center" valign="middle"></td>
+							<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus_d.gif" title="<?=gettext("add a new rule based on this one");?>" width="17" height="17" border="0" alt="add" /></td>
+						</tr>
+					</table>
+				</td>
 			</tr>
 <?php endif; ?>
 			<tbody>
-<?php $nrules = 0; for ($i = 0; isset($a_filter[$i]); $i++):
-	pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/row_start");
-	$filterent = $a_filter[$i];
-	if ($filterent['interface'] != $if && !isset($filterent['floating']))
-		continue;
-	if (isset($filterent['floating']) && "FloatingRules" != $if)
-		continue;
-	$isadvset = firewall_check_for_advanced_options($filterent);
-	if($isadvset)
-		$advanced_set = "<img src=\"./themes/{$g['theme']}/images/icons/icon_advanced.gif\" title=\"" . gettext("advanced settings set") . ": {$isadvset}\" border=\"0\" alt=\"avanced\" />";
-	else
-		$advanced_set = "";
+<?php
+	$nrules = 0;
+	for ($i = 0; isset($a_filter[$i]); $i++):
+		pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/row_start");
+		$filterent = $a_filter[$i];
+		if ($filterent['interface'] != $if && !isset($filterent['floating'])) {
+			continue;
+		}
+		if (isset($filterent['floating']) && "FloatingRules" != $if) {
+			continue;
+		}
+		$isadvset = firewall_check_for_advanced_options($filterent);
+		if ($isadvset) {
+			$advanced_set = "<img src=\"./themes/{$g['theme']}/images/icons/icon_advanced.gif\" title=\"" . gettext("advanced settings set") . ": {$isadvset}\" border=\"0\" alt=\"avanced\" />";
+		} else {
+			$advanced_set = "";
+		}
 ?>
 			<tr valign="top" id="fr<?=$nrules;?>">
-			<td class="listt">
-				<input type="checkbox" id="frc<?=$nrules;?>" name="rule[]" value="<?=$i;?>" onclick="fr_bgcolor('<?=$nrules;?>')" style="margin: 0; padding: 0; width: 15px; height: 15px;" />
-				<?php echo $advanced_set; ?>
-			</td>
-			<td class="listt" align="center">
-			<?php
-				if ($filterent['type'] == "block")
-					$iconfn = "block";
-				else if ($filterent['type'] == "reject")
-					$iconfn = "reject";
-				else if ($filterent['type'] == "match")
-					$iconfn = "match";
-				else
-					$iconfn = "pass";
-				if (isset($filterent['disabled'])) {
-					$textss = "<span class=\"gray\">";
-					$textse = "</span>";
-					$iconfn .= "_d";
-				} else {
-					$textss = $textse = "";
-				}
-			?>
-				<a href="?if=<?=htmlspecialchars($if);?>&amp;act=toggle&amp;id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_<?=$iconfn;?>.gif" width="11" height="11" border="0" title="<?=gettext("click to toggle enabled/disabled status");?>" alt="icon" /></a>
-			<?php
-				if (isset($filterent['log'])):
-					$iconfnlog = "log_s";
-				if (isset($filterent['disabled']))
-					$iconfnlog .= "_d";
-			?>
-			<br /><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_<?=$iconfnlog;?>.gif" width="11" height="15" border="0" alt="icon" />
+				<td class="listt">
+					<input type="checkbox" id="frc<?=$nrules;?>" name="rule[]" value="<?=$i;?>" onclick="fr_bgcolor('<?=$nrules;?>')" style="margin: 0; padding: 0; width: 15px; height: 15px;" />
+					<?php echo $advanced_set; ?>
+				</td>
+				<td class="listt" align="center">
+				<?php
+					if ($filterent['type'] == "block") {
+						$iconfn = "block";
+					} else if ($filterent['type'] == "reject") {
+						$iconfn = "reject";
+					} else if ($filterent['type'] == "match") {
+						$iconfn = "match";
+					} else {
+						$iconfn = "pass";
+					}
+					if (isset($filterent['disabled'])) {
+						$textss = "<span class=\"gray\">";
+						$textse = "</span>";
+						$iconfn .= "_d";
+					} else {
+						$textss = $textse = "";
+					}
+				?>
+					<a href="?if=<?=htmlspecialchars($if);?>&amp;act=toggle&amp;id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_<?=$iconfn;?>.gif" width="11" height="11" border="0" title="<?=gettext("click to toggle enabled/disabled status");?>" alt="icon" /></a>
+<?php
+	if (isset($filterent['log'])):
+		$iconfnlog = "log_s";
+		if (isset($filterent['disabled'])) {
+			$iconfnlog .= "_d";
+		}
+?>
+					<br /><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_<?=$iconfnlog;?>.gif" width="11" height="15" border="0" alt="icon" />
 <?php endif; ?>
-			</td>
+				</td>
 			<?php
 
 				//build Alias popup box
@@ -483,17 +530,16 @@ include("head.inc");
 				$schedstatus = false;
 				$dayArray = array (gettext('Mon'),gettext('Tues'),gettext('Wed'),gettext('Thur'),gettext('Fri'),gettext('Sat'),gettext('Sun'));
 				$monthArray = array (gettext('January'),gettext('February'),gettext('March'),gettext('April'),gettext('May'),gettext('June'),gettext('July'),gettext('August'),gettext('September'),gettext('October'),gettext('November'),gettext('December'));
-				if($config['schedules']['schedule'] <> "" and is_array($config['schedules']['schedule'])) {
-					foreach ($a_schedules as $schedule)
-					{
-						if ($schedule['name'] == $filterent['sched'] ){
+				if ($config['schedules']['schedule'] <> "" and is_array($config['schedules']['schedule'])) {
+					foreach ($a_schedules as $schedule) {
+						if ($schedule['name'] == $filterent['sched']) {
 							$schedstatus = filter_get_time_based_rule_status($schedule);
 
-							foreach($schedule['timerange'] as $timerange) {
+							foreach ($schedule['timerange'] as $timerange) {
 								$tempFriendlyTime = "";
 								$tempID = "";
 								$firstprint = false;
-								if ($timerange){
+								if ($timerange) {
 									$dayFriendly = "";
 									$tempFriendlyTime = "";
 
@@ -504,18 +550,17 @@ include("head.inc");
 									$starttime = substr ($temptimerange, 0, $temptimeseparator);
 									$stoptime = substr ($temptimerange, $temptimeseparator+1);
 
-									if ($timerange['month']){
+									if ($timerange['month']) {
 										$tempmontharray = explode(",", $timerange['month']);
 										$tempdayarray = explode(",",$timerange['day']);
 										$arraycounter = 0;
 										$firstDayFound = false;
 										$firstPrint = false;
-										foreach ($tempmontharray as $monthtmp){
+										foreach ($tempmontharray as $monthtmp) {
 											$month = $tempmontharray[$arraycounter];
 											$day = $tempdayarray[$arraycounter];
 
-											if (!$firstDayFound)
-											{
+											if (!$firstDayFound) {
 												$firstDay = $day;
 												$firstmonth = $month;
 												$firstDayFound = true;
@@ -524,22 +569,22 @@ include("head.inc");
 											$currentDay = $day;
 											$nextDay = $tempdayarray[$arraycounter+1];
 											$currentDay++;
-											if (($currentDay != $nextDay) || ($tempmontharray[$arraycounter] != $tempmontharray[$arraycounter+1])){
-												if ($firstPrint)
+											if (($currentDay != $nextDay) || ($tempmontharray[$arraycounter] != $tempmontharray[$arraycounter+1])) {
+												if ($firstPrint) {
 													$dayFriendly .= ", ";
+												}
 												$currentDay--;
-												if ($currentDay != $firstDay)
+												if ($currentDay != $firstDay) {
 													$dayFriendly .= $monthArray[$firstmonth-1] . " " . $firstDay . " - " . $currentDay ;
-												else
+												} else {
 													$dayFriendly .=  $monthArray[$month-1] . " " . $day;
+												}
 												$firstDayFound = false;
 												$firstPrint = true;
 											}
 											$arraycounter++;
 										}
-									}
-									else
-									{
+									} else {
 										$tempdayFriendly = $timerange['position'];
 										$firstDayFound = false;
 										$tempFriendlyDayArray = explode(",", $tempdayFriendly);
@@ -547,10 +592,9 @@ include("head.inc");
 										$firstDay = "";
 										$nextDay = "";
 										$counter = 0;
-										foreach ($tempFriendlyDayArray as $day){
-											if ($day != ""){
-												if (!$firstDayFound)
-												{
+										foreach ($tempFriendlyDayArray as $day) {
+											if ($day != "") {
+												if (!$firstDayFound) {
 													$firstDay = $tempFriendlyDayArray[$counter];
 													$firstDayFound = true;
 												}
@@ -558,14 +602,16 @@ include("head.inc");
 												//get next day
 												$nextDay = $tempFriendlyDayArray[$counter+1];
 												$currentDay++;
-												if ($currentDay != $nextDay){
-													if ($firstprint)
+												if ($currentDay != $nextDay) {
+													if ($firstprint) {
 														$dayFriendly .= ", ";
+													}
 													$currentDay--;
-													if ($currentDay != $firstDay)
+													if ($currentDay != $firstDay) {
 														$dayFriendly .= $dayArray[$firstDay-1] . " - " . $dayArray[$currentDay-1];
-													else
+													} else {
 														$dayFriendly .= $dayArray[$firstDay-1];
+													}
 													$firstDayFound = false;
 													$firstprint = true;
 												}
@@ -598,26 +644,27 @@ include("head.inc");
 						}
 						$printicon = true;
 					} else if ($filterent['sched']) {
-						if ($iconfn == "block" || $iconfn == "reject")
+						if ($iconfn == "block" || $iconfn == "reject") {
 							$image = "icon_block_d";
-						else
+						} else {
 							$image = "icon_block";
+						}
 						$alttext = gettext("This rule is not currently active because its period has expired");
 						$printicon = true;
 					}
 				}
 			?>
-			<td class="listlr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
-				<?=$textss;?><?php if (isset($filterent['id'])) echo $filterent['id']."&nbsp;"; else echo "&nbsp;"; ?><?=$textse;?>
-			</td>
+				<td class="listlr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
+					<?=$textss;?><?php if (isset($filterent['id'])) echo $filterent['id']."&nbsp;"; else echo "&nbsp;"; ?><?=$textse;?>
+				</td>
 			<?php
 				pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_id_tr");
 			?>
-			<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
-			<?=$textss;?>
+				<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
+					<?=$textss;?>
 			<?php
 				if (isset($filterent['ipprotocol'])) {
-					switch($filterent['ipprotocol']) {
+					switch ($filterent['ipprotocol']) {
 						case "inet":
 							echo "IPv4 ";
 							break;
@@ -635,32 +682,34 @@ include("head.inc");
 					echo strtoupper($filterent['protocol']);
 					if (strtoupper($filterent['protocol']) == "ICMP" && !empty($filterent['icmptype'])) {
 						echo ' <span style="cursor: help;" title="ICMP type: ' .
-							( $filterent['ipprotocol'] == "inet6" ?  $icmp6types[$filterent['icmptype']] : $icmptypes[$filterent['icmptype']] ) .
+							($filterent['ipprotocol'] == "inet6" ?  $icmp6types[$filterent['icmptype']] : $icmptypes[$filterent['icmptype']]) .
 							'"><u>';
 						echo $filterent['icmptype'];
 						echo '</u></span>';
 					}
-				} else echo "*";
+				} else {
+					echo "*";
+				}
 			?>
-			<?=$textse;?>
-			</td>
-			<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
-				<?=$textss;?><?php echo $alias_src_span_begin;?><?php echo htmlspecialchars(pprint_address($filterent['source']));?><?php echo $alias_src_span_end;?><?=$textse;?>
-			</td>
-			<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
-				<?=$textss;?><?php echo $alias_src_port_span_begin;?><?php echo htmlspecialchars(pprint_port($filterent['source']['port'])); ?><?php echo $alias_src_port_span_end;?><?=$textse;?>
-			</td>
-			<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
-				<?=$textss;?><?php echo $alias_dst_span_begin;?><?php echo htmlspecialchars(pprint_address($filterent['destination'])); ?><?php echo $alias_dst_span_end;?><?=$textse;?>
-			</td>
-			<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
-				<?=$textss;?><?php echo $alias_dst_port_span_begin;?><?php echo htmlspecialchars(pprint_port($filterent['destination']['port'])); ?><?php echo $alias_dst_port_span_end;?><?=$textse;?>
-			</td>
-			<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
-				<?=$textss;?><?php if (isset($config['interfaces'][$filterent['gateway']]['descr'])) echo htmlspecialchars($config['interfaces'][$filterent['gateway']]['descr']); else  echo htmlspecialchars(pprint_port($filterent['gateway'])); ?><?=$textse;?>
-			</td>
-			<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
-			<?=$textss;?>
+					<?=$textse;?>
+				</td>
+				<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
+					<?=$textss;?><?php echo $alias_src_span_begin;?><?php echo htmlspecialchars(pprint_address($filterent['source']));?><?php echo $alias_src_span_end;?><?=$textse;?>
+				</td>
+				<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
+					<?=$textss;?><?php echo $alias_src_port_span_begin;?><?php echo htmlspecialchars(pprint_port($filterent['source']['port'])); ?><?php echo $alias_src_port_span_end;?><?=$textse;?>
+				</td>
+				<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
+					<?=$textss;?><?php echo $alias_dst_span_begin;?><?php echo htmlspecialchars(pprint_address($filterent['destination'])); ?><?php echo $alias_dst_span_end;?><?=$textse;?>
+				</td>
+				<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
+					<?=$textss;?><?php echo $alias_dst_port_span_begin;?><?php echo htmlspecialchars(pprint_port($filterent['destination']['port'])); ?><?php echo $alias_dst_port_span_end;?><?=$textse;?>
+				</td>
+				<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
+					<?=$textss;?><?php if (isset($config['interfaces'][$filterent['gateway']]['descr'])) echo htmlspecialchars($config['interfaces'][$filterent['gateway']]['descr']); else  echo htmlspecialchars(pprint_port($filterent['gateway'])); ?><?=$textse;?>
+				</td>
+				<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
+					<?=$textss;?>
 			<?php
 				if (isset($filterent['ackqueue']) && isset($filterent['defaultqueue'])) {
 					$desc = $filterent['ackqueue'] ;
@@ -670,85 +719,92 @@ include("head.inc");
 				} else if (isset($filterent['defaultqueue'])) {
 					$desc = $filterent['defaultqueue'];
 					echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&amp;action=show\">{$desc}</a>";
-				} else
+				} else {
 					echo gettext("none");
+				}
 			?>
-			<?=$textse;?>
-			</td>
-			<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';"><font color="black">
-				<?php if ($printicon) { ?><img src="./themes/<?= $g['theme']; ?>/images/icons/<?php echo $image; ?>.gif" title="<?php echo $alttext;?>" border="0" alt="icon" /><?php } ?><?=$textss;?><?php echo $schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?>&nbsp;<?php echo $schedule_span_end; ?><?=$textse;?>
-			</font></td>
+					<?=$textse;?>
+				</td>
+				<td class="listr" onclick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
+					<font color="black">
+						<?php if ($printicon) { ?><img src="./themes/<?= $g['theme']; ?>/images/icons/<?php echo $image; ?>.gif" title="<?php echo $alttext;?>" border="0" alt="icon" /><?php } ?><?=$textss;?><?php echo $schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?>&nbsp;<?php echo $schedule_span_end; ?><?=$textse;?>
+					</font>
+				</td>
 			<?php
 				pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_descr_tr");
 			?>
-			<td class="listbg descr" onclick="fr_toggle(<?=$nrules;?>)" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
-				<?=$textss;?><?=htmlspecialchars($filterent['descr']);?>&nbsp;<?=$textse;?>
-			</td>
-			<td valign="middle" class="list nowrap">
-				<table border="0" cellspacing="0" cellpadding="1" summary="move before">
-					<tr>
-					<td><input name="move_<?=$i;?>" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" style="width:17;height:17" title="<?=gettext("move selected rules before this rule"); ?>" onmouseover="fr_insline(<?=$nrules;?>, true)" onmouseout="fr_insline(<?=$nrules;?>, false)" /></td>
-					<td><a href="firewall_rules_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit rule"); ?>" width="17" height="17" border="0" alt="edit" /></a></td>
-					</tr>
-					<tr>
-					<td align="center" valign="middle"><a href="firewall_rules.php?act=del&amp;if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete rule"); ?>" onclick="return confirm('Do you really want to delete this rule?')" alt="delete" /></a></td>
-					<td><a href="firewall_rules_edit.php?dup=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add a new rule based on this one"); ?>" width="17" height="17" border="0" alt="add" /></a></td>
-					</tr>
-				</table>
-			</td>
+				<td class="listbg descr" onclick="fr_toggle(<?=$nrules;?>)" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
+					<?=$textss;?><?=htmlspecialchars($filterent['descr']);?>&nbsp;<?=$textse;?>
+				</td>
+				<td valign="middle" class="list nowrap">
+					<table border="0" cellspacing="0" cellpadding="1" summary="move before">
+						<tr>
+							<td><input name="move_<?=$i;?>" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" style="width:17;height:17" title="<?=gettext("move selected rules before this rule"); ?>" onmouseover="fr_insline(<?=$nrules;?>, true)" onmouseout="fr_insline(<?=$nrules;?>, false)" /></td>
+							<td><a href="firewall_rules_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit rule"); ?>" width="17" height="17" border="0" alt="edit" /></a></td>
+						</tr>
+						<tr>
+							<td align="center" valign="middle"><a href="firewall_rules.php?act=del&amp;if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete rule"); ?>" onclick="return confirm('Do you really want to delete this rule?')" alt="delete" /></a></td>
+							<td><a href="firewall_rules_edit.php?dup=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add a new rule based on this one"); ?>" width="17" height="17" border="0" alt="add" /></a></td>
+						</tr>
+					</table>
+				</td>
 			</tr>
 			<?php $nrules++; endfor; ?>
-			  <tr><td></td></tr></tbody>
+			<tr><td></td></tr>
+			</tbody>
 <?php if ($nrules == 0): ?>
 			<tr>
-			<td class="listt"></td>
-			<td class="listt"></td>
-			<td class="listlr" colspan="10" align="center" valign="middle">
-			<span class="gray">
+				<td class="listt"></td>
+				<td class="listt"></td>
+				<td class="listlr" colspan="10" align="center" valign="middle">
+					<span class="gray">
 	<?php if ($_REQUEST['if'] == "FloatingRules"): ?>
-				<?=gettext("No floating rules are currently defined."); ?><br /><br />
+					<?=gettext("No floating rules are currently defined."); ?><br /><br />
 	<?php else: ?>
-				<?=gettext("No rules are currently defined for this interface"); ?><br />
-				<?=gettext("All incoming connections on this interface will be blocked until you add pass rules."); ?><br /><br />
+					<?=gettext("No rules are currently defined for this interface"); ?><br />
+					<?=gettext("All incoming connections on this interface will be blocked until you add pass rules."); ?><br /><br />
 	<?php endif; ?>
-				<?=gettext("Click the"); ?> <a href="firewall_rules_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" border="0" width="17" height="17" align="middle" alt="add" /></a><?=gettext(" button to add a new rule.");?></span>
-			</td>
+					<?=gettext("Click the"); ?> <a href="firewall_rules_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" border="0" width="17" height="17" align="middle" alt="add" /></a><?=gettext(" button to add a new rule.");?></span>
+				</td>
 			</tr>
 <?php endif; ?>
 			<tr id="fr<?=$nrules;?>">
-			<td class="list"></td>
-			<td class="list"></td>
+				<td class="list"></td>
+				<td class="list"></td>
 			<?php
 				pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_id_tr_belowtable");
 			?>
-			<td class="list">&nbsp;</td>
-			<td class="list">&nbsp;</td>
-			<td class="list">&nbsp;</td>
-			<td class="list">&nbsp;</td>
-			<td class="list">&nbsp;</td>
-			<td class="list">&nbsp;</td>
-			<td class="list">&nbsp;</td>
-			<td class="list">&nbsp;</td>
-			<td class="list">&nbsp;</td>
-			<td class="list">&nbsp;</td>
-			<td class="list">
-				<table border="0" cellspacing="0" cellpadding="1" summary="move rules">
-					<tr>
-					<td>
-						<?php if ($nrules == 0): ?><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules to end");?>" border="0" alt="move" /><?php else: ?><input name="move_<?=$i;?>" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" style="width:17;height:17" title="<?=gettext("move selected rules to end");?>" onmouseover="fr_insline(<?=$nrules;?>, true)" onmouseout="fr_insline(<?=$nrules;?>, false)" /><?php endif; ?></td>
-					<td></td>
-					</tr>
-					<tr>
-					<td>
+				<td class="list">&nbsp;</td>
+				<td class="list">&nbsp;</td>
+				<td class="list">&nbsp;</td>
+				<td class="list">&nbsp;</td>
+				<td class="list">&nbsp;</td>
+				<td class="list">&nbsp;</td>
+				<td class="list">&nbsp;</td>
+				<td class="list">&nbsp;</td>
+				<td class="list">&nbsp;</td>
+				<td class="list">&nbsp;</td>
+				<td class="list">
+					<table border="0" cellspacing="0" cellpadding="1" summary="move rules">
+						<tr>
+							<td>
+								<?php if ($nrules == 0): ?><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules to end");?>" border="0" alt="move" /><?php else: ?><input name="move_<?=$i;?>" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" style="width:17;height:17" title="<?=gettext("move selected rules to end");?>" onmouseover="fr_insline(<?=$nrules;?>, true)" onmouseout="fr_insline(<?=$nrules;?>, false)" /><?php endif; ?>
+							</td>
+							<td></td>
+						</tr>
+						<tr>
+							<td>
 <?php if ($nrules == 0): ?>
-						<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" border="0" alt="delete" /><?php else: ?>
-						<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" style="width:17;height:17" title="<?=gettext("delete selected rules");?>" onclick="return confirm('<?=gettext('Do you really want to delete the selected rules?');?>')" />
+								<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" border="0" alt="delete" /><?php else: ?>
+								<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" style="width:17;height:17" title="<?=gettext("delete selected rules");?>" onclick="return confirm('<?=gettext('Do you really want to delete the selected rules?');?>')" />
 <?php endif; ?>
-					</td>
-			                <td><a href="firewall_rules_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" width="17" height="17" border="0" alt="add" /></a></td>
-					</tr>
-				</table>
-			</td>
+							</td>
+							<td>
+								<a href="firewall_rules_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" width="17" height="17" border="0" alt="add" /></a>
+							</td>
+						</tr>
+					</table>
+				</td>
 			</tr>
 		</table>
 		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0" summary="icons">
@@ -807,12 +863,11 @@ include("head.inc");
 						</li>
 					<?php endif; ?>
 					</ul>
-				 </td>
+				</td>
 			</tr>
 		</table>
 		</div>
-	</td>
-	</tr>
+	</td></tr>
 </table>
 <input type="hidden" name="if" value="<?=htmlspecialchars($if);?>" />
 </form>