diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-10-07 14:49:09 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-10-07 14:49:09 -0400 |
| commit | e83aaa500e00ef448ed1459fa1986ad9ffe304b2 (patch) | |
| tree | 9561caf09a4f0508e873dbe50a6f03e3af790fd0 | |
| parent | 1d770fc77db1f0b34d49b54b16413bb2bb0e5d64 (diff) | |
| download | pfsense-e83aaa500e00ef448ed1459fa1986ad9ffe304b2.zip pfsense-e83aaa500e00ef448ed1459fa1986ad9ffe304b2.tar.gz | |
Fixed #5282
| -rw-r--r-- | src/usr/local/www/firewall_rules.php | 3 | ||||
| -rw-r--r-- | src/usr/local/www/guiconfig.inc | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index c09549e..8585647 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -556,6 +556,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): echo '</u></span>'; } } else echo "*"; + ?> </td> <td> @@ -578,7 +579,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): </td> <td> <?php if (isset($alias['dst'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['dst']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['dstport'])?>" data-html="true"> + <a href="/firewall_aliases_edit.php?id=<?=$alias['dst']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['dst'])?>" data-html="true"> <?php endif; ?> <?=htmlspecialchars(pprint_address($filterent['destination']))?> <?php if (isset($alias['dst'])): ?> diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index c2b1d4c..48e288b 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -1191,11 +1191,11 @@ function rule_columns_with_alias($src, $srcport, $dst, $dstport) { foreach ($config['aliases']['alias'] as $alias_id => $alias_name) { if ($alias_name['name'] == $src) $columns['src'] = $alias_id; - elseif ($alias_name['name'] == $srcport) + if ($alias_name['name'] == $srcport) $columns['srcport'] = $alias_id; - elseif ($alias_name['name'] == $dst ) + if ($alias_name['name'] == $dst ) $columns['dst'] = $alias_id; - elseif ($alias_name['name'] == $dstport) + if ($alias_name['name'] == $dstport) $columns['dstport'] = $alias_id; } |
