Fix indent and whitespaces

1 files changed, 404 insertions, 402 deletions

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 4bc14dc..d5aca43 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -3,7 +3,7 @@
 /*
 	firewall_rules.php
 	part of pfSense (http://www.pfsense.com)
-        Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com)
+	Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com)
 
 	originally part of m0n0wall (http://m0n0.ch/wall)
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
@@ -109,14 +109,14 @@ if($_REQUEST['dragdroporder']) {
 	// Redirect back to page
 	mark_subsystem_dirty('filter');
 	$undo = array();
-	foreach($_REQUEST['dragtable'] as $dt) 
+	foreach($_REQUEST['dragtable'] as $dt)
 		$undo[] = "";
 	$counter = 0;
 	foreach($_REQUEST['dragtable'] as $dt) {
 		$undo[$dt] = $counter;
 		$counter++;
 	}
-	foreach($undo as $dt) 
+	foreach($undo as $dt)
 		$undotxt .= "&dragtable[]={$dt}";
 	Header("Location: firewall_rules.php?if=" . $_REQUEST['if'] . "&undodrag=true" . $undotxt);
 	exit;
@@ -149,15 +149,15 @@ if (is_array($config['ifgroups']['ifgroupentry']))
 			$iflist[$ifgen['ifname']] = $ifgen['ifname'];
 
 foreach ($ifdescs as $ifent => $ifdesc)
-	if(have_ruleint_access($ifent)) 
+	if(have_ruleint_access($ifent))
 		$iflist[$ifent] = $ifdesc;
 
 if ($config['l2tp']['mode'] == "server")
-        if(have_ruleint_access("l2tp"))
-                $iflist['l2tp'] = "L2TP VPN";
+	if(have_ruleint_access("l2tp"))
+		$iflist['l2tp'] = "L2TP VPN";
 
 if ($config['pptpd']['mode'] == "server")
-	if(have_ruleint_access("pptp")) 
+	if(have_ruleint_access("pptp"))
 		$iflist['pptp'] = "PPTP VPN";
 
 if (is_array($config['pppoes']['pppoe'])) {
@@ -168,19 +168,19 @@ if (is_array($config['pppoes']['pppoe'])) {
 
 /* add ipsec interfaces */
 if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
-	if(have_ruleint_access("enc0")) 
+	if(have_ruleint_access("enc0"))
 		$iflist["enc0"] = "IPsec";
 
 /* add openvpn/tun interfaces */
 if  ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"])
-   	$iflist["openvpn"] = "OpenVPN";
+	$iflist["openvpn"] = "OpenVPN";
 
 pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/interfaces_override");
 
 if (!$if || !isset($iflist[$if])) {
 	if ("any" == $if)
-                $if = "FloatingRules";
-        else if ("FloatingRules" != $if) {
+		$if = "FloatingRules";
+	else if ("FloatingRules" != $if) {
 		if (isset($iflist['wan']))
 			$if = "wan";
 		else
@@ -218,7 +218,7 @@ if ($_GET['act'] == "del") {
 }
 
 // Handle save msg if defined
-if($_REQUEST['savemsg']) 
+if($_REQUEST['savemsg'])
 	$savemsg = htmlentities($_REQUEST['savemsg']);
 
 if (isset($_POST['del_x'])) {
@@ -235,10 +235,10 @@ if (isset($_POST['del_x'])) {
 	}
 } else if ($_GET['act'] == "toggle") {
 	if ($a_filter[$_GET['id']]) {
-                if(isset($a_filter[$_GET['id']]['disabled']))
-                        unset($a_filter[$_GET['id']]['disabled']);
-                else
-                        $a_filter[$_GET['id']]['disabled'] = true;
+		if(isset($a_filter[$_GET['id']]['disabled']))
+			unset($a_filter[$_GET['id']]['disabled']);
+		else
+			$a_filter[$_GET['id']]['disabled'] = true;
 		if (write_config())
 			mark_subsystem_dirty('filter');
 		header("Location: firewall_rules.php?if=" . htmlspecialchars($if));
@@ -307,7 +307,7 @@ include("head.inc");
 <?php if (is_subsystem_dirty('filter')): ?><p>
 <?php
 if($_REQUEST['undodrag']) {
-	foreach($_REQUEST['dragtable'] as $dt) 
+	foreach($_REQUEST['dragtable'] as $dt)
 		$dragtable .= "&dragtable[]={$dt}";
 	print_info_box_np_undo(gettext("The firewall rule configuration has been changed.<br>You must apply the changes in order for them to take effect."), "apply" , gettext("Apply changes") , "firewall_rules.php?if={$_REQUEST['if']}&dragdroporder=true&{$dragtable}");
 } else {
@@ -324,15 +324,15 @@ if($_REQUEST['undodrag']) {
 	pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/before_table");
 ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td class="tabnavtbl">
-  <?php
+	<tr><td class="tabnavtbl">
+	<?php
 	/* active tabs */
 	$tab_array = array();
-       if ("FloatingRules" == $if)
-                        $active = true;
-                else
-                        $active = false;
-        $tab_array[] = array(gettext("Floating"), $active, "firewall_rules.php?if=FloatingRules");
+	if ("FloatingRules" == $if)
+		$active = true;
+	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)
 			$active = true;
@@ -341,22 +341,21 @@ if($_REQUEST['undodrag']) {
 		$tab_array[] = array($ifname, $active, "firewall_rules.php?if={$ifent}");
 	}
 	display_top_tabs($tab_array);
-  ?>
-  </td></tr>
-  <tr>
-    <td>
-	<div id="mainarea">
+	?>
+	</td></tr>
+	<tr><td>
+		<div id="mainarea">
 		<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-<?php
-		pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/before_first_tr");
-?>
+			<?php
+				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
+			<?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>
@@ -365,48 +364,49 @@ if($_REQUEST['undodrag']) {
 			<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
+			<?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">
-			   <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"><?php else: ?>
-				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" 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);?>&after=-1"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" width="17" height="17" border="0"></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')))):
-
-		$alports = implode('<br/>', filter_get_antilockout_ports(true));
-?>
-		<tr valign="top" id="antilockout">
+				<table border="0" cellspacing="0" cellpadding="1">
+					<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"><?php else: ?>
+						<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" 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);?>&after=-1"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" width="17" height="17" border="0"></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')))):
+
+					$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"></td>
 			<td class="listlr" style="background-color: #E0E0E0">&nbsp;</td>
-<?php
+			<?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>
@@ -432,124 +432,126 @@ if($_REQUEST['undodrag']) {
 <?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"></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" nowrap class="list">
-				    <table border="0" cellspacing="0" cellpadding="1">
+			<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"></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" nowrap class="list">
+				<table border="0" cellspacing="0" cellpadding="1">
 					<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");?>"></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"></a></td>
+					<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules before this rule");?>"></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"></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"></td>
+					<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"></td>
 					</tr>
-					</table>
-				  </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"></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" nowrap class="list">
-				    <table border="0" cellspacing="0" cellpadding="1">
+			<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"></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" nowrap class="list">
+				<table border="0" cellspacing="0" cellpadding="1">
 					<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");?>"></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"></a></td>
+					<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules before this rule");?>"></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"></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"></td>
+					<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"></td>
 					</tr>
-					</table>
-				  </td>
-				</tr>
+				</table>
+			</td>
+			</tr>
 <?php endif; ?>
-				<tbody id="dragtable" width="100%">
-				<?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\">";
-					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
-							$iconfn = "pass";
-						if (isset($filterent['disabled'])) {
-							$textss = "<span class=\"gray\">";
-							$textse = "</span>";
-							$iconfn .= "_d";
-						} else {
-							$textss = $textse = "";
-						}
-				  ?>
-				  <a href="?if=<?=htmlspecialchars($if);?>&act=toggle&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");?>"></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">
-				  <?php endif; ?>
-				  </td>
-				<?php
-				
+			<tbody id="dragtable" width="100%">
+<?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\">";
+	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
+					$iconfn = "pass";
+				if (isset($filterent['disabled'])) {
+					$textss = "<span class=\"gray\">";
+					$textse = "</span>";
+					$iconfn .= "_d";
+				} else {
+					$textss = $textse = "";
+				}
+			?>
+				<a href="?if=<?=htmlspecialchars($if);?>&act=toggle&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");?>"></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">
+<?php endif; ?>
+			</td>
+			<?php
+
 				//build Alias popup box
 				$alias_src_span_begin = "";
 				$alias_src_port_span_begin = "";
 				$alias_dst_span_begin = "";
 				$alias_dst_port_span_begin = "";
-				
+
 				$alias_popup = rule_popup($filterent['source']['address'],pprint_port($filterent['source']['port']),$filterent['destination']['address'],pprint_port($filterent['destination']['port']));
-					
+
 				$alias_src_span_begin = $alias_popup["src"];
 				$alias_src_port_span_begin = $alias_popup["srcport"];
 				$alias_dst_span_begin = $alias_popup["dst"];
 				$alias_dst_port_span_begin = $alias_popup["dstport"];
-					
+
 				$alias_src_span_end = $alias_popup["src_end"];
 				$alias_src_port_span_end = $alias_popup["srcport_end"];
 				$alias_dst_span_end = $alias_popup["dst_end"];
 				$alias_dst_port_span_end = $alias_popup["dstport_end"];
-					
+
 				//build Schedule popup box
 				$a_schedules = &$config['schedules']['schedule'];
 				$schedule_span_begin = "";
@@ -564,22 +566,22 @@ if($_REQUEST['undodrag']) {
 					{
 						if ($schedule['name'] == $filterent['sched'] ){
 							$schedstatus = filter_get_time_based_rule_status($schedule);
-							
+
 							foreach($schedule['timerange'] as $timerange) {
 								$tempFriendlyTime = "";
 								$tempID = "";
 								$firstprint = false;
 								if ($timerange){
 									$dayFriendly = "";
-									$tempFriendlyTime = "";							
-										
+									$tempFriendlyTime = "";
+
 									//get hours
 									$temptimerange = $timerange['hour'];
 									$temptimeseparator = strrpos($temptimerange, "-");
-									
-									$starttime = substr ($temptimerange, 0, $temptimeseparator); 
-									$stoptime = substr ($temptimerange, $temptimeseparator+1); 
-										
+
+									$starttime = substr ($temptimerange, 0, $temptimeseparator);
+									$stoptime = substr ($temptimerange, $temptimeseparator+1);
+
 									if ($timerange['month']){
 										$tempmontharray = explode(",", $timerange['month']);
 										$tempdayarray = explode(",",$timerange['day']);
@@ -589,14 +591,14 @@ if($_REQUEST['undodrag']) {
 										foreach ($tempmontharray as $monthtmp){
 											$month = $tempmontharray[$arraycounter];
 											$day = $tempdayarray[$arraycounter];
-											
+
 											if (!$firstDayFound)
 											{
 												$firstDay = $day;
 												$firstmonth = $month;
 												$firstDayFound = true;
 											}
-												
+
 											$currentDay = $day;
 											$nextDay = $tempdayarray[$arraycounter+1];
 											$currentDay++;
@@ -608,21 +610,21 @@ if($_REQUEST['undodrag']) {
 													$dayFriendly .= $monthArray[$firstmonth-1] . " " . $firstDay . " - " . $currentDay ;
 												else
 													$dayFriendly .=  $monthArray[$month-1] . " " . $day;
-												$firstDayFound = false;	
+												$firstDayFound = false;
 												$firstPrint = true;
-											}													
-											$arraycounter++;	
+											}
+											$arraycounter++;
 										}
 									}
 									else
 									{
 										$tempdayFriendly = $timerange['position'];
 										$firstDayFound = false;
-										$tempFriendlyDayArray = explode(",", $tempdayFriendly);								
+										$tempFriendlyDayArray = explode(",", $tempdayFriendly);
 										$currentDay = "";
 										$firstDay = "";
 										$nextDay = "";
-										$counter = 0;													
+										$counter = 0;
 										foreach ($tempFriendlyDayArray as $day){
 											if ($day != ""){
 												if (!$firstDayFound)
@@ -633,7 +635,7 @@ if($_REQUEST['undodrag']) {
 												$currentDay =$tempFriendlyDayArray[$counter];
 												//get next day
 												$nextDay = $tempFriendlyDayArray[$counter+1];
-												$currentDay++;					
+												$currentDay++;
 												if ($currentDay != $nextDay){
 													if ($firstprint)
 														$dayFriendly .= ", ";
@@ -642,13 +644,13 @@ if($_REQUEST['undodrag']) {
 														$dayFriendly .= $dayArray[$firstDay-1] . " - " . $dayArray[$currentDay-1];
 													else
 														$dayFriendly .= $dayArray[$firstDay-1];
-													$firstDayFound = false;	
-													$firstprint = true;			
+													$firstDayFound = false;
+													$firstprint = true;
 												}
 												$counter++;
 											}
 										}
-									}		
+									}
 									$timeFriendly = $starttime . " - " . $stoptime;
 									$description = $timerange['rangedescr'];
 									$sched_content .= $dayFriendly . "; " . $timeFriendly . "<br>";
@@ -663,242 +665,242 @@ if($_REQUEST['undodrag']) {
 				$printicon = false;
 				$alttext = "";
 				$image = "";
-				if (!isset($filterent['disabled'])){
-					 if ($schedstatus) 
-					 { 
-					 	if ($iconfn == "block" || $iconfn == "reject")
-					 	{
-					 		$image = "icon_block";
-					 		$alttext = gettext("Traffic matching this rule is currently being denied");
-					 	}
-					 	else
-					 	{
-					 		$image = "icon_pass";
-					 		$alttext = gettext("Traffic matching this rule is currently being allowed");
-					 	}
-					 	$printicon = true;
-					  }
-					  else if ($filterent['sched'])
-					  { 
-					 	if ($iconfn == "block" || $iconfn == "reject")
-					 		$image = "icon_block_d";
-					 	else
-					 		$image = "icon_block";
-					 	$alttext = gettext("This rule is not currently active because its period has expired");
-					 	$printicon = true;				  	
-					  }
+				if (!isset($filterent['disabled'])) {
+					if ($schedstatus) {
+						if ($iconfn == "block" || $iconfn == "reject") {
+							$image = "icon_block";
+							$alttext = gettext("Traffic matching this rule is currently being denied");
+						} else {
+							$image = "icon_pass";
+							$alttext = gettext("Traffic matching this rule is currently being allowed");
+						}
+						$printicon = true;
+					} else if ($filterent['sched']) {
+						if ($iconfn == "block" || $iconfn == "reject")
+							$image = "icon_block_d";
+						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>
-<?php
+			?>
+			<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;?><?php
-			if (isset($filterent['ipprotocol'])) {
-				switch($filterent['ipprotocol']) {
-					case "inet":
-						echo "IPv4 ";
-						break;
-					case "inet6":
-						echo "IPv6 ";
-						break;
-					case "inet46":
-						echo "IPv4+6 ";
-						break;
-				}
-			} else {
-				echo "IPv4 ";
-			}
-			if (isset($filterent['protocol'])) {
-				echo strtoupper($filterent['protocol']);
-				if (strtoupper($filterent['protocol']) == "ICMP" && !empty($filterent['icmptype'])) {
-					echo ' <span style="cursor: help;" title="ICMP type: ' . $icmptypes[$filterent['icmptype']] . '"><u>';
-					echo $filterent['icmptype'];
-					echo '</u></span>';
+			?>
+			<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']) {
+						case "inet":
+							echo "IPv4 ";
+							break;
+						case "inet6":
+							echo "IPv6 ";
+							break;
+						case "inet46":
+							echo "IPv4+6 ";
+							break;
+					}
+				} else {
+					echo "IPv4 ";
 				}
-			} 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;?>
-                          <?php
-							if (isset($filterent['ackqueue']) && isset($filterent['defaultqueue'])) {
-								$desc = $filterent['ackqueue'] ;
-							    echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['ackqueue']}&action=show\">{$desc}</a>";
-								$desc = $filterent['defaultqueue'];
-							    echo "/<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&action=show\">{$desc}</a>";
-							} else if (isset($filterent['defaultqueue'])) {
-								$desc = $filterent['defaultqueue'];
-							    echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&action=show\">{$desc}</a>"; }
-							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"><?php } ?>&nbsp;<?=$textss;?><?php echo $schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?><?php echo $schedule_span_end; ?><?=$textse;?>
-                  </td>
-<?php
+				if (isset($filterent['protocol'])) {
+					echo strtoupper($filterent['protocol']);
+					if (strtoupper($filterent['protocol']) == "ICMP" && !empty($filterent['icmptype'])) {
+						echo ' <span style="cursor: help;" title="ICMP type: ' . $icmptypes[$filterent['icmptype']] . '"><u>';
+						echo $filterent['icmptype'];
+						echo '</u></span>';
+					}
+				} 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;?>
+			<?php
+				if (isset($filterent['ackqueue']) && isset($filterent['defaultqueue'])) {
+					$desc = $filterent['ackqueue'] ;
+					echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['ackqueue']}&action=show\">{$desc}</a>";
+					$desc = $filterent['defaultqueue'];
+					echo "/<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&action=show\">{$desc}</a>";
+				} else if (isset($filterent['defaultqueue'])) {
+					$desc = $filterent['defaultqueue'];
+					echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&action=show\">{$desc}</a>"; }
+				} 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"><?php } ?>&nbsp;<?=$textss;?><?php echo $schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?><?php echo $schedule_span_end; ?><?=$textse;?>
+			</td>
+			<?php
 				pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/pre_descr_tr");
-?>
-                  <td class="listbg" onClick="fr_toggle(<?=$nrules;?>)" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';" class="descr">
-                    <?=$textss;?><?=htmlspecialchars($filterent['descr']);?>&nbsp;<?=$textse;?>
-                  </td>
-                  <td valign="middle" nowrap class="list">
-				    <table border="0" cellspacing="0" cellpadding="1">
+			?>
+			<td class="listbg" onClick="fr_toggle(<?=$nrules;?>)" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';" class="descr">
+				<?=$textss;?><?=htmlspecialchars($filterent['descr']);?>&nbsp;<?=$textse;?>
+			</td>
+			<td valign="middle" nowrap class="list">
+				<table border="0" cellspacing="0" cellpadding="1">
 					<tr>
-					  <td><input name="move_<?=$i;?>" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" 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"></a></td>
+					<td><input name="move_<?=$i;?>" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" 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"></a></td>
 					</tr>
 					<tr>
-					  <td align="center" valign="middle"><a href="firewall_rules.php?act=del&if=<?=htmlspecialchars($if);?>&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?')"></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"></a></td>
+					<td align="center" valign="middle"><a href="firewall_rules.php?act=del&if=<?=htmlspecialchars($if);?>&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?')"></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"></a></td>
 					</tr>
-					</table>
-				  </td>
-				</tr>
-			  <?php $nrules++; endfor; ?>
+				</table>
+			</td>
+			</tr>
+			<?php $nrules++; endfor; ?>
 			  </tbody>
-			  <?php if ($nrules == 0): ?>
-              <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/>
-			<?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/>
-			<?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="absmiddle"></a><?=gettext(" button to add a new rule.");?></span>
-			  </td>
-			  <?php endif; ?>
-                <tr id="fr<?=$nrules;?>">
-                  <td class="list"></td>
-                  <td class="list"></td>
-<?php
+<?php if ($nrules == 0): ?>
+			<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/>
+	<?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/>
+	<?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="absmiddle"></a><?=gettext(" button to add a new rule.");?></span>
+			</td>
+<?php endif; ?>
+			<tr id="fr<?=$nrules;?>">
+			<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">
-					<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"><?php else: ?><input name="move_<?=$i;?>" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" 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>
+			?>
+			<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">
 					<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"><?php else: ?>
-					  <input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" 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"></a></td>
+					<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"><?php else: ?><input name="move_<?=$i;?>" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" 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>
-				    </table>
-				  </td>
-				</tr>
-              </table>
-	      <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tr>
-                  <td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif" width="11" height="11"></td>
-                  <td><?=gettext("pass");?></td>
-                  <td width="14"></td>
-                  <td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" width="11" height="11"></td>
-                  <td><?=gettext("block");?></td>
-                  <td width="14"></td>
-                  <td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_reject.gif" width="11" height="11"></td>
-                  <td><?=gettext("reject");?></td>
-                  <td width="14"></td>
-                  <td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_log.gif" width="11" height="11"></td>
-                  <td><?=gettext("log");?></td>
-                </tr>
-                <tr>
-                  <td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass_d.gif" width="11" height="11"></td>
-                  <td nowrap><?=gettext("pass (disabled)");?></td>
-                  <td>&nbsp;</td>
-                  <td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block_d.gif" width="11" height="11"></td>
-                  <td nowrap><?=gettext("block (disabled)");?></td>
-                  <td>&nbsp;</td>
-                  <td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_reject_d.gif" width="11" height="11"></td>
-                  <td nowrap><?=gettext("reject (disabled)");?></td>
-                  <td>&nbsp;</td>
-                  <td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_log_d.gif" width="11" height="11"></td>
-                  <td nowrap><?=gettext("log (disabled)");?></td>
-                </tr>
-		<tr>
-		  <td colspan="10">
-  &nbsp;<p/>
-  <strong>
-	<span class="red"><?=gettext("Hint:");?></span>
-  </strong><br>
-	<ul>
-<?php if ("FloatingRules" != $if): ?>
-	<li><?=gettext("Rules are evaluated on a first-match basis (i.e. " .
-	"the action of the first rule to match a packet will be executed). " .
-	"This means that if you use block rules, you'll have to pay attention " .
-	"to the rule order. Everything that isn't explicitly passed is blocked " .
-	"by default. ");?>
-	</li>
-<?php else: ?>
-	<li><?=gettext("Floating rules are evaluated on a first-match basis (i.e. " .
-	"the action of the first rule to match a packet will be executed) only " .
-	"if the 'quick' option is checked on a rule. Otherwise they will only apply if no " .
-	"other rules match. Pay close attention to the rule order and options " .
-	"chosen. If no rule here matches, the per-interface or default rules are used. ");?>
-	</li>
+					<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"><?php else: ?>
+						<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" onclick="return confirm('<?=gettext('Do you really want to delete the selected rules?');?>')">
 <?php endif; ?>
-</ul>
-		 </td>
-	        </tr>
-              </table>
-	</div>
-    </td>
-  </tr>
+					</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"></a></td>
+					</tr>
+				</table>
+			</td>
+			</tr>
+		</table>
+		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif" width="11" height="11"></td>
+				<td><?=gettext("pass");?></td>
+				<td width="14"></td>
+				<td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" width="11" height="11"></td>
+				<td><?=gettext("block");?></td>
+				<td width="14"></td>
+				<td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_reject.gif" width="11" height="11"></td>
+				<td><?=gettext("reject");?></td>
+				<td width="14"></td>
+				<td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_log.gif" width="11" height="11"></td>
+				<td><?=gettext("log");?></td>
+			</tr>
+			<tr>
+				<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass_d.gif" width="11" height="11"></td>
+				<td nowrap><?=gettext("pass (disabled)");?></td>
+				<td>&nbsp;</td>
+				<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block_d.gif" width="11" height="11"></td>
+				<td nowrap><?=gettext("block (disabled)");?></td>
+				<td>&nbsp;</td>
+				<td><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_reject_d.gif" width="11" height="11"></td>
+				<td nowrap><?=gettext("reject (disabled)");?></td>
+				<td>&nbsp;</td>
+				<td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_log_d.gif" width="11" height="11"></td>
+				<td nowrap><?=gettext("log (disabled)");?></td>
+			</tr>
+			<tr>
+				<td colspan="10">
+					&nbsp;<p/>
+					<strong>
+						<span class="red"><?=gettext("Hint:");?></span>
+					</strong><br>
+					<ul>
+					<?php if ("FloatingRules" != $if): ?>
+						<li><?=gettext("Rules are evaluated on a first-match basis (i.e. " .
+						"the action of the first rule to match a packet will be executed). " .
+						"This means that if you use block rules, you'll have to pay attention " .
+						"to the rule order. Everything that isn't explicitly passed is blocked " .
+						"by default. ");?>
+						</li>
+					<?php else: ?>
+						<li><?=gettext("Floating rules are evaluated on a first-match basis (i.e. " .
+						"the action of the first rule to match a packet will be executed) only " .
+						"if the 'quick' option is checked on a rule. Otherwise they will only apply if no " .
+						"other rules match. Pay close attention to the rule order and options " .
+						"chosen. If no rule here matches, the per-interface or default rules are used. ");?>
+						</li>
+					<?php endif; ?>
+					</ul>
+				 </td>
+			</tr>
+		</table>
+		</div>
+	</td>
+	</tr>
 </table>
-  <input type="hidden" name="if" value="<?=htmlspecialchars($if);?>">
-  <script type="text/javascript">
+<input type="hidden" name="if" value="<?=htmlspecialchars($if);?>">
+<script type="text/javascript">
 	var number_of_rules = <?=$nrules?>;
-<?php $nrules = 0; for ($i = 0; isset($a_filter[$i]); $i++): ?>
-/*
-	Sortable.create("dragtable", { 
-		tag:"tr", 
-		format:"fr([0-9999999])",
-		containment:["dragtable"], 
-		onChange:function(affected) {
-			document.body.style.cursor = 'move';
-		},
-		onUpdate:function(container) { 
-			document.body.style.cursor = 'move';
-			updateOrder(Sortable.serialize('dragtable', 'tr'));
-		} 
-	});
-*/
-<?php endfor; ?>
+	<?php $nrules = 0; for ($i = 0; isset($a_filter[$i]); $i++): ?>
+	/*
+		Sortable.create("dragtable", {
+			tag:"tr",
+			format:"fr([0-9999999])",
+			containment:["dragtable"],
+			onChange:function(affected) {
+				document.body.style.cursor = 'move';
+			},
+			onUpdate:function(container) {
+				document.body.style.cursor = 'move';
+				updateOrder(Sortable.serialize('dragtable', 'tr'));
+			}
+		});
+	*/
+	<?php endfor; ?>
 	function updateOrder(order) {
 		if(document.getElementById("redboxtable"))
 			jQuery('#redboxtable').hide();
@@ -908,7 +910,7 @@ if($_REQUEST['undodrag']) {
 		return;
 	}
 	jQuery('#loading').hide();
-  </script>
+</script>
 </form>
 <?php include("fend.inc"); ?>
 </body>