summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNOYB <Al_Stu@Frontier.com>2016-01-18 01:35:33 -0800
committerNOYB <Al_Stu@Frontier.com>2016-01-18 01:35:33 -0800
commita591072b1203b918086ac1b208e5897c5b76017f (patch)
tree8a9c09d65c807943e73a6d980a7561951a92fce5
parenteca491c30678083bcd7f11098d127cfe244484ad (diff)
downloadpfsense-a591072b1203b918086ac1b208e5897c5b76017f.zip
pfsense-a591072b1203b918086ac1b208e5897c5b76017f.tar.gz
Alias name consistency in Firewall alias edit and schedules edit.
-rwxr-xr-xsrc/usr/local/www/firewall_aliases_edit.php2
-rw-r--r--src/usr/local/www/firewall_schedule_edit.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php
index 89ee9dc..8f2ca24 100755
--- a/src/usr/local/www/firewall_aliases_edit.php
+++ b/src/usr/local/www/firewall_aliases_edit.php
@@ -172,7 +172,7 @@ if ($_POST) {
$input_errors[] = gettext("Reserved word used for alias name.");
} else {
if (is_validaliasname($_POST['name']) == false) {
- $input_errors[] = gettext("The alias name must be less than 32 characters long, may not consist of only numbers, and may only contain the following characters") . " a-z, A-Z, 0-9, _.";
+ $input_errors[] = 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:") . ' a-z, A-Z, 0-9, _';
}
}
/* check for name conflicts */
diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php
index 31238d0..019722e 100644
--- a/src/usr/local/www/firewall_schedule_edit.php
+++ b/src/usr/local/www/firewall_schedule_edit.php
@@ -130,7 +130,7 @@ if ($_POST) {
$input_errors[] = gettext("Reserved word used for schedule name.");
} else {
if (is_validaliasname($_POST['name']) == false) {
- $input_errors[] = gettext("The schedule name may only consist of the characters a-z, A-Z, 0-9");
+ $input_errors[] = gettext("The schedule 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:") . ' a-z, A-Z, 0-9, _';
}
}
@@ -395,7 +395,7 @@ $input = new Form_Input(
$pconfig['name']
);
-$input->setHelp((is_schedule_inuse($pconfig['name']) != true) ? 'The name of the alias may only consist of the characters a-z, A-Z and 0-9':
+$input->setHelp((is_schedule_inuse($pconfig['name']) != true) ? 'The name of the alias may only consist of the characters "a-z, A-Z, 0-9 and _".':
'This schedule is in use so the name may not be modified!');
if (is_schedule_inuse($pconfig['name']) == true) {
OpenPOWER on IntegriCloud