Revert "Feature#1603. URL table aliases should be usable within network type aliases."

This reverts commit ae660b3ce7d7e2b1f34cb9f1b52eb4ce21e17c42.

2 files changed, 2 insertions, 24 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index f5ec71a..627b6fd 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -456,15 +456,6 @@ function filter_generate_scrubing() {
 	return $scrubrules;
 }
 
-function get_alias_type($name) {
-        global $config;
-
-        foreach ($config['aliases']['alias'] as $alias)
-                if ($name == $alias['name'])
-                        return $alias['type'];
-        return "";
-}
-
 function filter_generate_nested_alias($name, $alias, &$aliasnesting, &$aliasaddrnesting) {
 	global $aliastable, $filterdns;
 
@@ -478,18 +469,8 @@ function filter_generate_nested_alias($name, $alias, &$aliasnesting, &$aliasaddr
 		$linelength = strlen($builtlist);
 		$tmpline = "";
 		if(is_alias($address)) {
-			if (get_alias_type($address) == 'urltable'){
-				// Feature#1603. For this type of alias we do not need to recursively call filter_generate_nested_alias. Just load IPs from the file.
-				$urlfn = alias_expand_urltable($address);
-				if ($file_as_arr=file($urlfn)){
-					foreach($file_as_arr as $line){
-						$address= rtrim($line);
-						$tmpline .= " $address";
-					}
-				}
-			}
 			/* We already expanded this alias so there is no neccessity to do it again. */
-			else if(!isset($aliasnesting[$address]))
+			if(!isset($aliasnesting[$address]))
 				$tmpline = filter_generate_nested_alias($address, $aliastable[$address], $aliasnesting, $aliasaddrnesting);
 		} else if(!isset($aliasaddrnesting[$address])) {
 			if(!is_ipaddr($address) && !is_subnet($address) && !is_port($address)) {
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.");