diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-10-05 15:16:32 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-10-05 15:16:32 -0400 |
| commit | 9c82e8ed2338be92ee227797cabe0e5608199472 (patch) | |
| tree | a1a760bbf89a23b44f3c56861512da9cb50ef688 /src/usr | |
| parent | b503269138414c43de23012c00b8f3b0c35ed3ff (diff) | |
| parent | 42d74bad939764acb8715ce74fc2d0485f4b15d1 (diff) | |
| download | pfsense-9c82e8ed2338be92ee227797cabe0e5608199472.zip pfsense-9c82e8ed2338be92ee227797cabe0e5608199472.tar.gz | |
Merge pull request #1945 from phil-davis/patch-5
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index b3363b2..f7cfb4b 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1242,12 +1242,15 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) { ))->setWidth(2); $ruleType = $pconfig[$type]; - if (is_specialnet($pconfig[$type])) + if ($pconfig[$type] == 'any') { + $ruleType = 'any'; + } elseif (is_specialnet($pconfig[$type])) { $ruleType = 'network'; - elseif ((is_ipaddrv6($pconfig[$type]) && $pconfig[$type.'mask'] == 128) || + } elseif ((is_ipaddrv6($pconfig[$type]) && $pconfig[$type.'mask'] == 128) || (is_ipaddrv4($pconfig[$type]) && $pconfig[$type.'mask'] == 32) || - (is_alias($pconfig[$type]))) + (is_alias($pconfig[$type]))) { $ruleType = 'single'; + } $ruleValues = array( 'any' => 'any', @@ -1273,7 +1276,7 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) { $group->add(new Form_Select( $type . 'type', $name .' Type', - $type == 'src' ? $pconfig['src']:$pconfig['dst'], + $ruleType, $ruleValues )); |
