diff options
author | Ermal Luçi <eri@pfsense.org> | 2010-02-09 11:43:38 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2010-02-09 11:43:38 +0000 |
commit | e1d35ce8c433cbf604aeadf88c6d7f73464c2347 (patch) | |
tree | 530d6943dacc2e0caa1f4c7a49802fa308eb812a /usr/local/www | |
parent | 5d478ecca0a7f73c8cceeb600d2f3de56887e6b9 (diff) | |
download | pfsense-e1d35ce8c433cbf604aeadf88c6d7f73464c2347.zip pfsense-e1d35ce8c433cbf604aeadf88c6d7f73464c2347.tar.gz |
Ticket #348. Fix checking for existing alias name. Allow subnets to be defined in the import list.
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/firewall_aliases_import.php | 15 |
1 files changed, 5 insertions, 10 deletions
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"; } } |