From ae660b3ce7d7e2b1f34cb9f1b52eb4ce21e17c42 Mon Sep 17 00:00:00 2001
From: Evgeny Yurchenko <ey@tm-k.com>
Date: Sun, 3 Jul 2011 03:18:23 -0400
Subject: Feature#1603. URL table aliases should be usable within network type
 aliases.

---
 usr/local/www/firewall_aliases_edit.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'usr/local/www/firewall_aliases_edit.php')

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.");
-- 
cgit v1.1