diff options
| author | Evgeny Yurchenko <ey@tm-k.com> | 2011-07-03 03:18:23 -0400 |
|---|---|---|
| committer | Evgeny Yurchenko <ey@tm-k.com> | 2011-07-03 03:18:23 -0400 |
| commit | ae660b3ce7d7e2b1f34cb9f1b52eb4ce21e17c42 (patch) | |
| tree | d22bc2d9ad34581762523f0f4aaeef28c46b4b0e /usr/local/www/firewall_aliases_edit.php | |
| parent | 2ba6c4ab463a6e42dd9b72b6c8905e6e3b5237c2 (diff) | |
| download | pfsense-ae660b3ce7d7e2b1f34cb9f1b52eb4ce21e17c42.zip pfsense-ae660b3ce7d7e2b1f34cb9f1b52eb4ce21e17c42.tar.gz | |
Feature#1603. URL table aliases should be usable within network type aliases.
Diffstat (limited to 'usr/local/www/firewall_aliases_edit.php')
| -rwxr-xr-x | usr/local/www/firewall_aliases_edit.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 8602740..9d0f120 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -252,7 +252,10 @@ if ($_POST) { if($_POST["address{$x}"] <> "") { if (is_alias($_POST["address{$x}"])) { if (!alias_same_type($_POST["address{$x}"], $_POST['type'])) - $wrongaliases .= " " . $_POST["address{$x}"]; + // But alias type network can include alias type urltable. Feature#1603. + if (!($_POST['type'] == 'network' && + get_alias_type($_POST["address{$x}"]) == 'urltable')) + $wrongaliases .= " " . $_POST["address{$x}"]; } else if ($_POST['type'] == "port") { if (!is_port($_POST["address{$x}"])) $input_errors[] = $_POST["address{$x}"] . " " . gettext("is not a valid port or alias."); |
