diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-11-18 08:54:30 +0545 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-11-18 07:55:39 -0500 |
| commit | d08aeac11a9be8a89a85341515063e98eee1943f (patch) | |
| tree | 65e3d774588a10ed3c17de18330528867b2cdd7e /src | |
| parent | bcfe27479ac50d37e4c68ef5de60319655b5fd1b (diff) | |
| download | pfsense-d08aeac11a9be8a89a85341515063e98eee1943f.zip pfsense-d08aeac11a9be8a89a85341515063e98eee1943f.tar.gz | |
Fix tooltip text for associated filter rules
1) Add a port forward with associated filter rule
2) Go to firewall_rules and hover over the icon on the left of the rule.
It says "traffic is ed".
The problem is that, for whatever reason, an associated rule does not have ['type'] specified, even in config.xml. It is that way in 2.2.5, so not a new thing or regression. I guess that the back-end rule generation works by assuming that a rule in config.xml that does not have 'type' defined should be a pass rule.
So we can't write code anywhere that assumes that every rule has a defined 'type'.
This text was different fixed stuff in 2.2.5, so there was no problem there.
In fixing this I also made the text explicit for each type. This will help with the gettext translation. The way it did it before, putting "ed" on the end, would not have worked for translation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/local/www/firewall_rules.php | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index cd44330..076bae9 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -361,19 +361,24 @@ for ($i = 0; isset($a_filter[$i]); $i++): <input type="checkbox" id="frc<?=$nrules;?>" onClick="fr_toggle(<?=$nrules;?>)" name="rule[]" value="<?=$i;?>"/> </td> - <td title="<?=gettext("traffic is ").$filterent['type']."ed"?>"> - <?php - if ($filterent['type'] == "block") + if ($filterent['type'] == "block") { $iconfn = "remove"; - else if ($filterent['type'] == "reject") + $title_text = gettext("traffic is blocked"); + } else if ($filterent['type'] == "reject") { $iconfn = "fire"; - else if ($filterent['type'] == "match") + $title_text = gettext("traffic is rejected"); + } else if ($filterent['type'] == "match") { $iconfn = "filter"; - else + $title_text = gettext("traffic is matched"); + } else { $iconfn = "ok"; + $title_text = gettext("traffic is passed"); + } ?> - <i class="icon icon-<?=$iconfn?>"></i> + <td title="<?=$title_text?>"> + + <i class="icon icon-<?=$iconfn?>"></i> <?php $isadvset = firewall_check_for_advanced_options($filterent); if ($isadvset) @@ -382,7 +387,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): if (isset($filterent['log'])) print '<i class="icon icon-tasks" title="'. gettext("traffic is logged") .'"></i>'; ?> - </td> + </td> <?php $alias = rule_columns_with_alias( $filterent['source']['address'], |
