summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-09-24 09:30:57 -0400
committerjim-p <jimp@pfsense.org>2013-09-24 09:30:57 -0400
commit49e60fa6841fcd09a4be3452b7a18f0ba078972d (patch)
treeb061cf10885359b759146572e5fe1744c947c90f /usr
parentc7d488674c50a2cabb3a446faf9132f152b6bbf8 (diff)
downloadpfsense-49e60fa6841fcd09a4be3452b7a18f0ba078972d.zip
pfsense-49e60fa6841fcd09a4be3452b7a18f0ba078972d.tar.gz
Allow multiple valid time servers to be entered in the wizard, as they are allowed under System > General
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/wizards/setup_wizard.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml
index 137a188..42be07a 100644
--- a/usr/local/www/wizards/setup_wizard.xml
+++ b/usr/local/www/wizards/setup_wizard.xml
@@ -138,8 +138,6 @@
<description>Enter the hostname (FQDN) of the time server.</description>
<type>input</type>
<bindstofield>system->timeservers</bindstofield>
- <validate>^[a-z0-9.|-]+$</validate>
- <message>Invalid Time Server Field</message>
</field>
<field>
<name>Timezone</name>
@@ -153,9 +151,11 @@
</fields>
<stepsubmitphpaction>
<![CDATA[
- if(!empty($_POST['timeserverhostname']) && !(is_hostname($_POST['timeserverhostname']) || is_ipaddr($_POST['timeserverhostname']))) {
- print_info_box_np("Invalid Time Server. Please press back in your browser window and correct.");
- die;
+ foreach (explode(' ', $_POST['timeserverhostname']) as $ts) {
+ if (!is_domain($ts)) {
+ print_info_box_np(gettext("NTP Time Server names may only contain the characters a-z, 0-9, '-' and '.'. Entries may be separated by spaces. Please press back in your browser window and correct."));
+ die;
+ }
}
]]>
</stepsubmitphpaction>
OpenPOWER on IntegriCloud