diff options
| author | Phil Davis <phil.davis@inf.org> | 2016-04-28 13:31:26 +0545 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2016-04-28 08:34:58 -0400 |
| commit | d72e6feb7187ea30edfcd830a9cc2d17a194c84a (patch) | |
| tree | 9b08c2c5fb7ed43e26b17de556456acd0e76e7c1 /src/usr/local/www/firewall_aliases_edit.php | |
| parent | 37d9732f6d5b5d3f5beef42f2566da9c3faf2290 (diff) | |
| download | pfsense-d72e6feb7187ea30edfcd830a9cc2d17a194c84a.zip pfsense-d72e6feb7187ea30edfcd830a9cc2d17a194c84a.tar.gz | |
Provide better messages for invalid alias name errors
(cherry picked from commit e1f5381f4ecae20922a379b75820af1c9e57927e)
Diffstat (limited to 'src/usr/local/www/firewall_aliases_edit.php')
| -rwxr-xr-x | src/usr/local/www/firewall_aliases_edit.php | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index 5d2ac60..f96ae3e 100755 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -175,16 +175,10 @@ if ($_POST) { do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); - $x = is_validaliasname($_POST['name']); - if (!isset($x)) { - $input_errors[] = gettext("Reserved word used for alias name."); - } else if ($_POST['type'] == "port" && (getservbyname($_POST['name'], "tcp") || getservbyname($_POST['name'], "udp"))) { - $input_errors[] = gettext("Reserved word used for alias name."); - } else { - if (is_validaliasname($_POST['name']) == false) { - $input_errors[] = sprintf(gettext("The alias name must be less than 32 characters long, may not consist of only numbers, may not consist of only underscores, and may only contain the following characters: %s"), 'a-z, A-Z, 0-9, _'); - } + if (!is_validaliasname($_POST['name'])) { + $input_errors[] = invalidaliasnamemsg($_POST['name']); } + /* check for name conflicts */ foreach ($a_aliases as $key => $alias) { if (($alias['name'] == $_POST['name']) && (empty($a_aliases[$id]) || ($key != $id))) { |
