diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-11-11 16:10:01 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-11-11 16:10:01 -0500 |
commit | 824329d2c3f096aba45a91675a1a6d46ce62f90d (patch) | |
tree | 3b3172edbb8ffe6201dab35ce751bea9ba61a853 /src/usr/local/www/firewall_rules.php | |
parent | 270de3df711fa7178cae03e7ba11e960e61e4adb (diff) | |
download | pfsense-824329d2c3f096aba45a91675a1a6d46ce62f90d.zip pfsense-824329d2c3f096aba45a91675a1a6d46ce62f90d.tar.gz |
Minor cosmetic changes (whitespace, capitalization etc)
Diffstat (limited to 'src/usr/local/www/firewall_rules.php')
-rw-r--r-- | src/usr/local/www/firewall_rules.php | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 073e0c1..6cda885 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -99,6 +99,7 @@ filter_rules_sort(); $a_filter = &$config['filter']['rule']; $if = $_GET['if']; + if ($_POST['if']) { $if = $_POST['if']; } @@ -164,11 +165,11 @@ if ($_POST) { clear_subsystem_dirty('filter'); - $savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br />You can also %s monitor %s the reload progress"), "<a href='status_filter_reload.php'>", "</a>"); + $savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br />You can also %s monitor %s the reload progress"), + "<a href='status_filter_reload.php'>", "</a>"); } } - if ($_GET['act'] == "del") { if ($a_filter[$_GET['id']]) { if (!empty($a_filter[$_GET['id']]['associated-rule-id'])) { @@ -349,10 +350,10 @@ $nrules = 0; for ($i = 0; isset($a_filter[$i]); $i++): $filterent = $a_filter[$i]; - $display = ""; - if ( ($filterent['interface'] != $if && !isset($filterent['floating'])) || (isset($filterent['floating']) && "FloatingRules" != $if) ) { $display = 'style="display: none;"'; + } else { + $display = ""; } ?> <tr id="fr<?=$nrules;?>" <?=$display?> onClick="fr_toggle(<?=$nrules;?>)" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';" <?=(isset($filterent['disabled']) ? ' class="disabled"' : '')?>> @@ -673,15 +674,15 @@ for ($i = 0; isset($a_filter[$i]); $i++): <dl class="dl-horizontal responsive"> <!-- Legend --> <dt><?=gettext('Legend')?></dt> <dd></dd> - <dt><i class="icon icon-ok"></i></dt> <dd><?=gettext("pass");?></dd> - <dt><i class="icon icon-filter"></i></dt> <dd><?=gettext("match");?></dd> - <dt><i class="icon icon-remove"></i></dt> <dd><?=gettext("block");?></dd> - <dt><i class="icon icon-fire"></i></dt> <dd><?=gettext("reject");?></dd> - <dt><i class="icon icon-tasks"></i></dt> <dd> <?=gettext("log");?></dd> - <dt><i class="icon icon-cog"></i></dt> <dd> <?=gettext("advanced filter");?></dd> + <dt><i class="icon icon-ok"></i></dt> <dd><?=gettext("Pass");?></dd> + <dt><i class="icon icon-filter"></i></dt> <dd><?=gettext("Match");?></dd> + <dt><i class="icon icon-remove"></i></dt> <dd><?=gettext("Block");?></dd> + <dt><i class="icon icon-fire"></i></dt> <dd><?=gettext("Reject");?></dd> + <dt><i class="icon icon-tasks"></i></dt> <dd> <?=gettext("Log");?></dd> + <dt><i class="icon icon-cog"></i></dt> <dd> <?=gettext("Advanced filter");?></dd> </dl> - <?php +<?php if ("FloatingRules" != $if) print(gettext("Rules are evaluated on a first-match basis (i.e. " . "the action of the first rule to match a packet will be executed). ") . '<br />' . @@ -694,11 +695,11 @@ for ($i = 0; isset($a_filter[$i]); $i++): "if the 'quick' option is checked on a rule. Otherwise they will only match 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. ")); - ?> +?> </div> </div> -<script> +<script> events.push(function() { stripe_table(); @@ -718,4 +719,5 @@ events.push(function() { }); }); </script> + <?php include("foot.inc");?> |