summaryrefslogtreecommitdiffstats
path: root/usr/local/www
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-08-15 19:36:26 +0000
committerErmal <eri@pfsense.org>2011-08-15 19:36:26 +0000
commit619e42295a27d023bd74ac46c36edde8a0f5baa5 (patch)
tree863133f3cb0769469072cd6ded981cf78a004fd4 /usr/local/www
parentdf58fd4680ca5a9df8ad7dc3d09ea7c7d6dfd4a7 (diff)
downloadpfsense-619e42295a27d023bd74ac46c36edde8a0f5baa5.zip
pfsense-619e42295a27d023bd74ac46c36edde8a0f5baa5.tar.gz
Revert "Feature#1603. URL table aliases should be usable within network type aliases."
This reverts commit ae660b3ce7d7e2b1f34cb9f1b52eb4ce21e17c42.
Diffstat (limited to 'usr/local/www')
-rwxr-xr-xusr/local/www/firewall_aliases_edit.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 96f7ce8..752b425 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -252,10 +252,7 @@ if ($_POST) {
if($_POST["address{$x}"] <> "") {
if (is_alias($_POST["address{$x}"])) {
if (!alias_same_type($_POST["address{$x}"], $_POST['type']))
- // 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}"];
+ $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.");
OpenPOWER on IntegriCloud