summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2013-01-08 02:14:56 -0800
committerChris Buechler <cmb@pfsense.org>2013-01-08 02:14:56 -0800
commitd9ce908f28c849b5cfffea5f1512bdd486c27d79 (patch)
tree8b72c3e70fb3b5ca6f6d391c4fab060eb85e0020
parent3042761accdea0982089fe879ced13b3458694c2 (diff)
parent889cbaefc75b8b242ac7e7889daf0b4ae681d036 (diff)
downloadpfsense-d9ce908f28c849b5cfffea5f1512bdd486c27d79.zip
pfsense-d9ce908f28c849b5cfffea5f1512bdd486c27d79.tar.gz
Merge pull request #314 from phil-davis/master
Display gateways with matching IP protocol in Gateways list
-rwxr-xr-xusr/local/www/firewall_rules_edit.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index c88c57c..3bec648 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -1364,9 +1364,9 @@ $i--): ?>
foreach($gateways as $gwname => $gw) {
if(($pconfig['ipprotocol'] == "inet46"))
continue;
- if(($pconfig['ipprotocol'] == "inet6") && !is_ipaddrv6($gw['gateway']))
+ if(($pconfig['ipprotocol'] == "inet6") && !(($gw['ipprotocol'] == "inet6") || (is_ipaddrv6($gw['gateway']))))
continue;
- if(($pconfig['ipprotocol'] == "inet") && !is_ipaddrv4($gw['gateway']))
+ if(($pconfig['ipprotocol'] == "inet") && !(($gw['ipprotocol'] == "inet") || (is_ipaddrv4($gw['gateway']))))
continue;
if($gw == "")
continue;
OpenPOWER on IntegriCloud