Revert "Feature #1603. Correct nested urltable alias code to be more fullproof to errors and does not break the ruleset on large lists of urltables. Though this needs a revisit to work properly since it breaks urltable alias property of reloading contents."

This reverts commit 3a26fb7f03a0336ed8dd642c46c6e513fca794da.

1 files changed, 6 insertions, 22 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index f2889d3..96a48c72 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -886,7 +886,6 @@ function alias_make_table($config) {
 		}
 	}
 }
-
 /* check if an alias exists */
 function is_alias($name) {
 	global $aliastable;
@@ -894,19 +893,6 @@ function is_alias($name) {
 	return isset($aliastable[$name]);
 }
 
-function alias_get_type($name) {
-        global $config;
-        
-	if (is_array($config['aliases']['alias'])) {
-		foreach ($config['aliases']['alias'] as $alias) {
-			if ($name == $alias['name'])
-				return $alias['type'];
-		}
-	}
-
-        return "";
-}
-
 /* expand a host or network alias, if necessary */
 function alias_expand($name) {
 	global $aliastable;
@@ -924,14 +910,12 @@ function alias_expand_urltable($name) {
 	$urltable_prefix = "/var/db/aliastables/";
 	$urltable_filename = $urltable_prefix . $name . ".txt";
 
-	if (is_array($config['aliases']['alias'])) {
-		foreach ($config['aliases']['alias'] as $alias) {
-			if (($alias['type'] == 'urltable') && ($alias['name'] == $name)) {
-				if (is_URL($alias["url"]) && file_exists($urltable_filename) && filesize($urltable_filename))
-					return $urltable_filename;
-				else if (process_alias_urltable($name, $alias["url"], 0, true))
-					return $urltable_filename;
-			}
+	foreach ($config['aliases']['alias'] as $alias) {
+		if (($alias['type'] == 'urltable') && ($alias['name'] == $name)) {
+			if (is_URL($alias["url"]) && file_exists($urltable_filename) && filesize($urltable_filename))
+				return $urltable_filename;
+			else if (process_alias_urltable($name, $alias["url"], 0, true))
+				return $urltable_filename;
 		}
 	}
 	return null;