From e1d35ce8c433cbf604aeadf88c6d7f73464c2347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=E7i?= Date: Tue, 9 Feb 2010 11:43:38 +0000 Subject: Ticket #348. Fix checking for existing alias name. Allow subnets to be defined in the import list. --- usr/local/www/firewall_aliases_import.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'usr/local/www/firewall_aliases_import.php') diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php index e0334cd..0f26edb 100755 --- a/usr/local/www/firewall_aliases_import.php +++ b/usr/local/www/firewall_aliases_import.php @@ -42,6 +42,7 @@ $pgtitle = array("Firewall","Aliases","Import"); $reserved_keywords = array("pass", "out", "queue", "max", "min", "pptp"); require("guiconfig.inc"); +require_once("util.inc"); require("filter.inc"); require("shaper.inc"); @@ -63,16 +64,10 @@ if($_POST['aliasimport'] <> "") { if (is_validaliasname($_POST['name']) == false) $input_errors[] = "The alias name may only consist of the characters a-z, A-Z, 0-9, _."; - /* check for name conflicts */ - foreach ($a_aliases as $alias) { - if (isset($id) && ($a_aliases[$id]) && ($a_aliases[$id] === $alias)) - continue; + /* check for name duplicates */ + if (is_alias($_POST['name'])) + $input_errors[] = "An alias with this name already exists."; - if ($alias['name'] == $_POST['name']) { - $input_errors[] = "An alias with this name already exists."; - break; - } - } /* Check for reserved keyword names */ foreach($reserved_keywords as $rk) @@ -90,7 +85,7 @@ if($_POST['aliasimport'] <> "") { if ($_POST['aliasimport']) { $toimport = split("\n", $_POST['aliasimport']); foreach ($toimport as $impip) { - if (!is_ipaddr(trim($impip))) + if (!is_ipaddr(trim($impip)) && !is_subnet(trim($impip))) $input_errors[] = "$impip is not an ip address. Please correct the error to continue"; } } -- cgit v1.1