From 703d743d698a4acc6e1092aaa5e636efac376021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Fri, 24 Jul 2009 07:31:07 +0000
Subject: Remove one global definition, unused. Fix style and use is_alias
 instead of doing our own testing.

---
 etc/inc/filter.inc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'etc/inc')

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index df4a38b..05d60f0 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -364,11 +364,9 @@ function filter_generate_nested_alias($name, $alias) {
 	$aliasnesting[$name] = $name;
 	foreach ($addresses as $address) {
 		$linelength = strlen($finallist);
-		if (isset($aliastable[$address])) {
+		if (is_alias($address)) {
+			/* We already expanded this alias so there is no neccessity to do it again. */
 			if (!isset($aliasnesting[$address]))
-				/* We already expanded this alias so there 
-				 * is no neccessity to do it again.
-				 */
 				$tmpline = filter_generate_nested_alias($address, $aliastable[$address]);
 		} else
 			$tmpline = " $address";
@@ -380,7 +378,7 @@ function filter_generate_nested_alias($name, $alias) {
 }
 
 function filter_generate_aliases() {
-	global $config, $FilterIflist, $aliastable, $aliasnesting;
+	global $config, $FilterIflist, $aliasnesting;
 	if(isset($config['system']['developerspew'])) {
 		$mt = microtime();
 		echo "filter_generate_aliases() being called $mt\n";
-- 
cgit v1.1