Merge pull request #3610 from stilez/patch-57

3 files changed, 55 insertions, 10 deletions

diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php
index 3f767c9..74ef389 100644
--- a/src/usr/local/www/services_unbound.php
+++ b/src/usr/local/www/services_unbound.php
@@ -441,8 +441,8 @@ events.push(function() {
 			<thead>
 				<tr>
 					<th><?=gettext("Host")?></th>
-					<th><?=gettext("Domain")?></th>
-					<th><?=gettext("IP")?></th>
+					<th><?=gettext("Parent domain of host")?></th>
+					<th><?=gettext("IP to return for host")?></th>
 					<th><?=gettext("Description")?></th>
 					<th><?=gettext("Actions")?></th>
 				</tr>
@@ -504,6 +504,14 @@ endforeach;
 	</div>
 </div>
 
+<span class="help-block">
+	Enter any individual hosts for which the resolver's standard DNS lookup process should be overridden and a specific
+	IPv4 or IPv6 address should automatically be returned by the resolver. Standard and also non-standard names and parent domains 
+	can be entered, such as 'test', 'mycompany.localdomain', '1.168.192.in-addr.arpa', or 'somesite.com'. Any lookup attempt for 
+	the host will automatically return the given IP address, and the usual lookup server for the domain will not be queried for 
+	the host's records.
+</span>
+
 <nav class="action-buttons">
 	<a href="services_unbound_host_edit.php" class="btn btn-sm btn-success">
 		<i class="fa fa-plus icon-embed-btn"></i>
@@ -518,7 +526,7 @@ endforeach;
 			<thead>
 				<tr>
 					<th><?=gettext("Domain")?></th>
-					<th><?=gettext("IP")?></th>
+					<th><?=gettext("Lookup Server IP Address")?></th>
 					<th><?=gettext("Description")?></th>
 					<th><?=gettext("Actions")?></th>
 				</tr>
@@ -553,6 +561,13 @@ endforeach;
 	</div>
 </div>
 
+<span class="help-block">
+	Enter any domains for which the resolver's standard DNS lookup process should be overridden and a different (non-standard) 
+	lookup server should be queried instead. Non-standard, 'invalid' and local domains, and subdomains, can also be entered, 
+	such as 'test', 'mycompany.localdomain', '1.168.192.in-addr.arpa', or 'somesite.com'. The IP address is treated as the 
+	authoritative lookup server for the domain (including all of its subdomains), and other lookup servers will not be queried.
+</span>
+
 <nav class="action-buttons">
 	<a href="services_unbound_domainoverride_edit.php" class="btn btn-sm btn-success">
 		<i class="fa fa-plus icon-embed-btn"></i>
diff --git a/src/usr/local/www/services_unbound_domainoverride_edit.php b/src/usr/local/www/services_unbound_domainoverride_edit.php
index 17f2fee..f37f366 100644
--- a/src/usr/local/www/services_unbound_domainoverride_edit.php
+++ b/src/usr/local/www/services_unbound_domainoverride_edit.php
@@ -114,20 +114,20 @@ if ($input_errors) {
 
 $form = new Form();
 
-$section = new Form_Section('Domain Override');
+$section = new Form_Section('Domains to Override with Custom Lookup Servers');
 
 $section->addInput(new Form_Input(
 	'domain',
 	'*Domain',
 	'text',
 	$pconfig['domain']
-))->setHelp('Domain to override (NOTE: this does not have to be a valid TLD!) e.g.: test or mycompany.localdomain or 1.168.192.in-addr.arpa');
+))->setHelp('Domain whose lookups will be directed to a user-specified DNS lookup server.');
 
 $section->addInput(new Form_IpAddress(
 	'ip',
 	'*IP Address',
 	$pconfig['ip']
-))->setHelp('IP address of the authoritative DNS server for this domain. e.g.: 192.168.100.100%1$s' .
+))->setHelp('IPv4 or IPv6 address of the authoritative DNS server for this domain. e.g.: 192.168.100.100%1$s' .
 			'To use a non-default port for communication, append an \'@\' with the port number.', '<br />')->setPattern('[a-zA-Z0-9@.:]+');
 
 $section->addInput(new Form_Input(
@@ -146,6 +146,17 @@ if (isset($id) && $a_domainOverrides[$id]) {
 	));
 }
 
+$section->addInput(new Form_StaticText(
+	'',
+	'<span class="help-block">' .
+	gettext("This page is used to specify domains for which the resolver's standard DNS lookup process will be overridden, " .
+	"and the resolver will query a different (non-standard) lookup server instead. It is possible to enter 'non-standard', 'invalid' " .
+	"and 'local' domains such as 'test', 'mycompany.localdomain', or '1.168.192.in-addr.arpa', as well as usual publicly resolvable " .
+	"domains such as 'org', 'info', or 'google.co.uk'.  The IP address entered will be treated as the IP address of an authoritative " .
+	"lookup server for the domain (including all of its subdomains), and other lookup servers will not be queried.") .
+	'</span>'
+));
+
 $form->add($section);
 
 print $form;
diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php
index c374631..a5fcd3d 100644
--- a/src/usr/local/www/services_unbound_host_edit.php
+++ b/src/usr/local/www/services_unbound_host_edit.php
@@ -192,21 +192,21 @@ $section->addInput(new Form_Input(
 	'text',
 	$pconfig['host']
 ))->setHelp('Name of the host, without the domain part%1$s' .
-			'e.g.: "myhost"', '<br />');
+			'e.g. enter "myhost" if the full domain name is "myhost.example.com"', '<br />');
 
 $section->addInput(new Form_Input(
 	'domain',
 	'*Domain',
 	'text',
 	$pconfig['domain']
-))->setHelp('Domain of the host%1$s' .
-			'e.g.: "example.com"', '<br />');
+))->setHelp('Parent domain of the host%1$s' .
+			'e.g. enter "example.com" for "myhost.example.com"', '<br />');
 
 $section->addInput(new Form_IpAddress(
 	'ip',
 	'*IP Address',
 	$pconfig['ip']
-))->setHelp('IP address of the host%1$s' .
+))->setHelp('IPv4 or IPv6 address to be returned for the host%1$s' .
 			'e.g.: 192.168.100.100 or fd00:abcd::1', '<br />');
 
 $section->addInput(new Form_Input(
@@ -225,6 +225,18 @@ if (isset($id) && $a_hosts[$id]) {
 	));
 }
 
+$section->addInput(new Form_StaticText(
+	'',
+	'<span class="help-block">' .
+	gettext("This page is used to override the usual lookup process for a specific host. A host is defined by its name " .
+		"and parent domain (e.g., 'somesite.google.com' is entered as host='somesite' and parent domain='google.com'). Any " .
+		"attempt to lookup that host will automatically return the given IP address, and any usual external lookup server for " .
+		"the domain will not be queried. Both the name and parent domain can contain 'non-standard', 'invalid' and 'local' " .
+		"domains such as 'test', 'mycompany.localdomain', or '1.168.192.in-addr.arpa', as well as usual publicly resolvable names ".
+		"such as 'www' or 'google.co.uk'.") .
+	'</span>'
+));
+
 $form->add($section);
 
 $section = new Form_Section('Additional Names for this Host');
@@ -281,6 +293,13 @@ $form->addGlobal(new Form_Button(
 	'fa-plus'
 ))->removeClass('btn-primary')->addClass('btn-success addbtn');
 
+$section->addInput(new Form_StaticText(
+	'',
+	'<span class="help-block">'.
+	gettext("If the host can be accessed using multiple names, then enter any other names for the host which should also be overridden.") .
+	'</span>'
+));
+
 $form->add($section);
 print($form);