summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-04-26 00:45:09 -0500
committerChris Buechler <cmb@pfsense.org>2016-04-26 00:45:09 -0500
commitd051bdd1283d8fbd600deb12e1f741e68052d306 (patch)
treea5ca47cf25e58139ed71b16df838ce771ad4b0fe
parent50fa04bb2d4f17aa6111ad4fabf91d2cff34e3e7 (diff)
downloadpfsense-d051bdd1283d8fbd600deb12e1f741e68052d306.zip
pfsense-d051bdd1283d8fbd600deb12e1f741e68052d306.tar.gz
Allow port specification for Unbound domain overrides. Also fix display of input errors. Ticket #6091
-rw-r--r--src/usr/local/www/services_unbound_domainoverride_edit.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/usr/local/www/services_unbound_domainoverride_edit.php b/src/usr/local/www/services_unbound_domainoverride_edit.php
index d73a165..ed64580 100644
--- a/src/usr/local/www/services_unbound_domainoverride_edit.php
+++ b/src/usr/local/www/services_unbound_domainoverride_edit.php
@@ -146,6 +146,10 @@ $pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("General
$shortcut_section = "resolver";
include("head.inc");
+if ($input_errors) {
+ print_input_errors($input_errors);
+}
+
$form = new Form();
$section = new Form_Section('Domain Override');
@@ -162,7 +166,7 @@ $section->addInput(new Form_IpAddress(
'IP Address',
$pconfig['ip']
))->setHelp('IP address of the authoritative DNS server for this domain. e.g.: 192.168.100.100' . '<br />' .
- 'To use a nondefault port for communication, append an \'@\' with the port number.');
+ 'To use a non-default port for communication, append an \'@\' with the port number.')->setPattern('[a-zA-Z0-9\@\.\:]+');
$section->addInput(new Form_Input(
'descr',
OpenPOWER on IntegriCloud