summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/firewall_rules.php
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-01-19 16:56:43 +0545
committerPhil Davis <phil.davis@inf.org>2016-01-19 16:56:43 +0545
commit5db29ca79323a2d7e8b002f66f08168f2a797e7a (patch)
treef0f14fe1f22035bdfcc94085194f671b1349bced /src/usr/local/www/firewall_rules.php
parentbf2103299d521659459f335d18954e451debecaf (diff)
downloadpfsense-5db29ca79323a2d7e8b002f66f08168f2a797e7a.zip
pfsense-5db29ca79323a2d7e8b002f66f08168f2a797e7a.tar.gz
Fixup firewall rules schedule status images
1) $iconfn is not the var that contains the 'type' of block or reject. 2) In the bottom if-else of the diff "times-circle" was repeated twice. 3) It seemed odd to me that wen the schedule was out of its time that the icons would always be in "text-danger" color. My suggestion, make them "text-warning" which distinguishes them from the green or red that is shown when the schedule is active.
Diffstat (limited to 'src/usr/local/www/firewall_rules.php')
-rw-r--r--src/usr/local/www/firewall_rules.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index 615f3bc..f416353 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -528,7 +528,7 @@ for ($i = 0; isset($a_filter[$i]); $i++):
$image = "";
if (!isset($filterent['disabled'])) {
if ($schedstatus) {
- if ($iconfn == "block" || $iconfn == "reject") {
+ if ($filterent['type'] == "block" || $filterent['type'] == "reject") {
$image = "times-circle";
$dispcolor = "text-danger";
$alttext = gettext("Traffic matching this rule is currently being denied");
@@ -539,13 +539,13 @@ for ($i = 0; isset($a_filter[$i]); $i++):
}
$printicon = true;
} else if ($filterent['sched']) {
- if ($iconfn == "block" || $iconfn == "reject") {
+ if ($filterent['type'] == "block" || $filterent['type'] == "reject") {
$image = "times-circle";
} else {
- $image = "times-circle";
+ $image = "play-circle";
}
$alttext = gettext("This rule is not currently active because its period has expired");
- $dispcolor = "text-danger";
+ $dispcolor = "text-warning";
$printicon = true;
}
}
OpenPOWER on IntegriCloud