Merge pull request #1682 from phil-davis/www-services-dnsmasq

3 files changed, 485 insertions, 362 deletions

diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php
index 80fcb01..638eeff 100644
--- a/usr/local/www/services_dnsmasq.php
+++ b/usr/local/www/services_dnsmasq.php
@@ -57,17 +57,19 @@ $pconfig['port'] = $config['dnsmasq']['port'];
 $pconfig['custom_options'] = $config['dnsmasq']['custom_options'];
 
 $pconfig['strictbind'] = isset($config['dnsmasq']['strictbind']);
-if (!empty($config['dnsmasq']['interface']))
+if (!empty($config['dnsmasq']['interface'])) {
 	$pconfig['interface'] = explode(",", $config['dnsmasq']['interface']);
-else
+} else {
 	$pconfig['interface'] = array();
+}
 
-if (!is_array($config['dnsmasq']['hosts']))
+if (!is_array($config['dnsmasq']['hosts'])) {
 	$config['dnsmasq']['hosts'] = array();
+}
 
-if (!is_array($config['dnsmasq']['domainoverrides']))
+if (!is_array($config['dnsmasq']['domainoverrides'])) {
 	$config['dnsmasq']['domainoverrides'] = array();
-
+}
 
 $a_hosts = &$config['dnsmasq']['hosts'];
 $a_domainOverrides = &$config['dnsmasq']['domainoverrides'];
@@ -88,30 +90,36 @@ if ($_POST) {
 	$config['dnsmasq']['strictbind'] = ($_POST['strictbind']) ? true : false;
 
 	if (isset($_POST['enable']) && isset($config['unbound']['enable'])) {
-		if ($_POST['port'] == $config['unbound']['port'])
+		if ($_POST['port'] == $config['unbound']['port']) {
 			$input_errors[] = "The DNS Resolver is enabled using this port. Choose a non-conflicting port, or disable DNS Resolver.";
+		}
 	}
-	
-	if ($_POST['port'])
-		if(is_port($_POST['port']))
+
+	if ($_POST['port']) {
+		if (is_port($_POST['port'])) {
 			$config['dnsmasq']['port'] = $_POST['port'];
-		else
+		} else {
 			$input_errors[] = gettext("You must specify a valid port number");
-	else if (isset($config['dnsmasq']['port']))
+		}
+	} else if (isset($config['dnsmasq']['port'])) {
 		unset($config['dnsmasq']['port']);
+	}
 
-	if (is_array($_POST['interface']))
+	if (is_array($_POST['interface'])) {
 		$config['dnsmasq']['interface'] = implode(",", $_POST['interface']);
-	elseif (isset($config['dnsmasq']['interface']))
+	} elseif (isset($config['dnsmasq']['interface'])) {
 		unset($config['dnsmasq']['interface']);
+	}
 
 	if ($config['dnsmasq']['custom_options']) {
 		$args = '';
-		foreach (preg_split('/\s+/', $config['dnsmasq']['custom_options']) as $c)
+		foreach (preg_split('/\s+/', $config['dnsmasq']['custom_options']) as $c) {
 			$args .= escapeshellarg("--{$c}") . " ";
+		}
 		exec("/usr/local/sbin/dnsmasq --test $args", $output, $rc);
-		if ($rc != 0)
+		if ($rc != 0) {
 			$input_errors[] = gettext("Invalid custom options");
+		}
 	}
 
 	if (!$input_errors) {
@@ -121,15 +129,16 @@ if ($_POST) {
 		$retval = services_dnsmasq_configure();
 		$savemsg = get_std_save_message($retval);
 
-		// Relaod filter (we might need to sync to CARP hosts)
+		// Reload filter (we might need to sync to CARP hosts)
 		filter_configure();
 		/* Update resolv.conf in case the interface bindings exclude localhost. */
 		system_resolvconf_generate();
 		/* Start or restart dhcpleases when it's necessary */
 		system_dhcpleases_configure();
 
-		if ($retval == 0)
+		if ($retval == 0) {
 			clear_subsystem_dirty('hosts');
+		}
 	}
 }
 
@@ -155,7 +164,7 @@ if ($_GET['act'] == "del") {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("DNS forwarder"));
+$pgtitle = array(gettext("Services"), gettext("DNS forwarder"));
 $shortcut_section = "forwarder";
 include("head.inc");
 
@@ -192,82 +201,109 @@ function show_advanced_dns() {
 	</tr>
 	<tr>
 		<td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td>
-		<td width="78%" class="vtable"><p>
-			<input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked=\"checked\"";?> onclick="enable_change(false)" />
-			<strong><?=gettext("Enable DNS forwarder");?><br />
-			</strong></p></td>
-		</tr>
+		<td width="78%" class="vtable">
+			<p>
+				<input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked=\"checked\"";?> onclick="enable_change(false)" />
+				<strong>
+					<?=gettext("Enable DNS forwarder");?><br />
+				</strong>
+			</p>
+		</td>
+	</tr>
 	<tr>
 		<td width="22%" valign="top" class="vncellreq"><?=gettext("DHCP Registration");?></td>
-		<td width="78%" class="vtable"><p>
-			<input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if ($pconfig['regdhcp'] == "yes") echo "checked=\"checked\"";?> />
-			<strong><?=gettext("Register DHCP leases in DNS forwarder");?><br />
-			</strong><?php printf(gettext("If this option is set, then machines that specify".
-			" their hostname when requesting a DHCP lease will be registered".
-			" in the DNS forwarder, so that their name can be resolved.".
-			" You should also set the domain in %sSystem:".
-			" General setup%s to the proper value."),'<a href="system.php">','</a>')?></p>
+		<td width="78%" class="vtable">
+			<p>
+				<input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if ($pconfig['regdhcp'] == "yes") echo "checked=\"checked\"";?> />
+				<strong>
+					<?=gettext("Register DHCP leases in DNS forwarder");?><br />
+				</strong>
+				<?php printf(gettext("If this option is set, then machines that specify".
+					" their hostname when requesting a DHCP lease will be registered".
+					" in the DNS forwarder, so that their name can be resolved.".
+					" You should also set the domain in %sSystem:".
+					" General setup%s to the proper value."),'<a href="system.php">','</a>')?>
+			</p>
 		</td>
 	</tr>
 	<tr>
 		<td width="22%" valign="top" class="vncellreq"><?=gettext("Static DHCP");?></td>
-		<td width="78%" class="vtable"><p>
-			<input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if ($pconfig['regdhcpstatic'] == "yes") echo "checked=\"checked\"";?> />
-			<strong><?=gettext("Register DHCP static mappings in DNS forwarder");?><br />
-			</strong><?php printf(gettext("If this option is set, then DHCP static mappings will ".
+		<td width="78%" class="vtable">
+			<p>
+				<input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if ($pconfig['regdhcpstatic'] == "yes") echo "checked=\"checked\"";?> />
+				<strong>
+					<?=gettext("Register DHCP static mappings in DNS forwarder");?><br />
+				</strong>
+				<?php printf(gettext("If this option is set, then DHCP static mappings will ".
 					"be registered in the DNS forwarder, so that their name can be ".
 					"resolved. You should also set the domain in %s".
-					"System: General setup%s to the proper value."),'<a href="system.php">','</a>');?></p>
+					"System: General setup%s to the proper value."),'<a href="system.php">','</a>');?>
+			</p>
 		</td>
 	</tr>
 	<tr>
 		<td width="22%" valign="top" class="vncellreq"><?=gettext("Prefer DHCP");?></td>
-		<td width="78%" class="vtable"><p>
-			<input name="dhcpfirst" type="checkbox" id="dhcpfirst" value="yes" <?php if ($pconfig['dhcpfirst'] == "yes") echo "checked=\"checked\"";?> />
-			<strong><?=gettext("Resolve DHCP mappings first");?><br />
-			</strong><?php printf(gettext("If this option is set, then DHCP mappings will ".
+		<td width="78%" class="vtable">
+			<p>
+				<input name="dhcpfirst" type="checkbox" id="dhcpfirst" value="yes" <?php if ($pconfig['dhcpfirst'] == "yes") echo "checked=\"checked\"";?> />
+				<strong>
+					<?=gettext("Resolve DHCP mappings first");?><br />
+				</strong>
+				<?php printf(gettext("If this option is set, then DHCP mappings will ".
 					"be resolved before the manual list of names below. This only ".
-					"affects the name given for a reverse lookup (PTR)."));?></p>
+					"affects the name given for a reverse lookup (PTR)."));?>
+			</p>
 		</td>
 	</tr>
 	<tr>
 		<td rowspan="3" width="22%" valign="top" class="vncellreq"><?=gettext("DNS Query Forwarding");?></td>
-		<td width="78%" class="vtable"><p>
-			<input name="strict_order" type="checkbox" id="strict_order" value="yes" <?php if ($pconfig['strict_order'] == "yes") echo "checked=\"checked\"";?> />
-			<strong><?=gettext("Query DNS servers sequentially");?><br />
-			</strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
+		<td width="78%" class="vtable">
+			<p>
+				<input name="strict_order" type="checkbox" id="strict_order" value="yes" <?php if ($pconfig['strict_order'] == "yes") echo "checked=\"checked\"";?> />
+				<strong>
+					<?=gettext("Query DNS servers sequentially");?><br />
+				</strong>
+				<?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
 					"query the DNS servers sequentially in the order specified (<i>System - General Setup - DNS Servers</i>), ".
-					"rather than all at once in parallel. ".
-					""), $g['product_name']); ?></p>
+					"rather than all at once in parallel. "), $g['product_name']); ?>
+			</p>
 		</td>
 	</tr>
 	<tr>
-		<td width="78%" class="vtable"><p>
-			<input name="domain_needed" type="checkbox" id="domain_needed" value="yes" <?php if ($pconfig['domain_needed'] == "yes") echo "checked=\"checked\"";?> />
-			<strong><?=gettext("Require domain");?><br />
-			</strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
+		<td width="78%" class="vtable">
+			<p>
+				<input name="domain_needed" type="checkbox" id="domain_needed" value="yes" <?php if ($pconfig['domain_needed'] == "yes") echo "checked=\"checked\"";?> />
+				<strong>
+					<?=gettext("Require domain");?><br />
+				</strong>
+				<?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
 					"not forward A or AAAA queries for plain names, without dots or domain parts, to upstream name servers.  ".
-					"If the name is not known from /etc/hosts or DHCP then a \"not found\" answer is returned. ".
-					""), $g['product_name']); ?></p>
+					"If the name is not known from /etc/hosts or DHCP then a \"not found\" answer is returned. "), $g['product_name']); ?>
+			</p>
 		</td>
 	</tr>
 	<tr>
-		<td width="78%" class="vtable"><p>
-			<input name="no_private_reverse" type="checkbox" id="no_private_reverse" value="yes" <?php if ($pconfig['no_private_reverse'] == "yes") echo "checked=\"checked\"";?> />
-			<strong><?=gettext("Do not forward private reverse lookups");?><br />
-			</strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
+		<td width="78%" class="vtable">
+			<p>
+				<input name="no_private_reverse" type="checkbox" id="no_private_reverse" value="yes" <?php if ($pconfig['no_private_reverse'] == "yes") echo "checked=\"checked\"";?> />
+				<strong>
+					<?=gettext("Do not forward private reverse lookups");?><br />
+				</strong>
+				<?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
 					"not forward reverse DNS lookups (PTR) for private addresses (RFC 1918) to upstream name servers.  ".
 					"Any entries in the Domain Overrides section forwarding private \"n.n.n.in-addr.arpa\" names to a specific server are still forwarded. ".
-					"If the IP to name is not known from /etc/hosts, DHCP or a specific domain override then a \"not found\" answer is immediately returned. ".
-					""), $g['product_name']); ?></p>
+					"If the IP to name is not known from /etc/hosts, DHCP or a specific domain override then a \"not found\" answer is immediately returned. "), $g['product_name']); ?>
+			</p>
 		</td>
 	</tr>
 	<tr>
 		<td width="22%" valign="top" class="vncellreq"><?=gettext("Listen Port");?></td>
-		<td width="78%" class="vtable"><p>
-			<input name="port" type="text" id="port" size="6" <?php if ($pconfig['port']) echo "value=\"{$pconfig['port']}\"";?> />
-			<br /><br />
-			<?=gettext("The port used for responding to DNS queries. It should normally be left blank unless another service needs to bind to TCP/UDP port 53.");?></p>
+		<td width="78%" class="vtable">
+			<p>
+				<input name="port" type="text" id="port" size="6" <?php if ($pconfig['port']) echo "value=\"{$pconfig['port']}\"";?> />
+				<br /><br />
+				<?=gettext("The port used for responding to DNS queries. It should normally be left blank unless another service needs to bind to TCP/UDP port 53.");?>
+			</p>
 		</td>
 	</tr>
 	<tr>
@@ -280,29 +316,33 @@ function show_advanced_dns() {
 			<br /><br />
 			<select id="interface" name="interface[]" multiple="multiple" class="formselect" size="5">
 				<option value="" <?php if (empty($pconfig['interface']) || empty($pconfig['interface'][0])) echo 'selected="selected"'; ?>>All</option>
-			<?php  foreach ($interface_addresses as $laddr => $ldescr):
+			<?php
+				foreach ($interface_addresses as $laddr => $ldescr):
 					$selected = "";
-					if (in_array($laddr, $pconfig['interface']))
+					if (in_array($laddr, $pconfig['interface'])) {
 						$selected = 'selected="selected"';
+					}
 			?>
 				<option value="<?=$laddr;?>" <?=$selected;?>>
 					<?=htmlspecialchars($ldescr);?>
 				</option>
-			<?php endforeach; 
-			   unset($interface_addresses);
+			<?php
+				endforeach;
+				unset($interface_addresses);
 			?>
 			</select>
 			<br /><br />
 		</td>
 	</tr>
 	<tr>
-		<td width="78%" class="vtable"><p>
-			<input name="strictbind" type="checkbox" id="strictbind" value="yes" <?php if ($pconfig['strictbind'] == "yes") echo "checked=\"checked\"";?> />
-			<strong><?=gettext("Strict Interface Binding");?></strong>
-			<br />
-			<?= gettext("If this option is set, the DNS forwarder will only bind to the interfaces containing the IP addresses selected above, rather than binding to all interfaces and discarding queries to other addresses."); ?>
-			<br /><br />
-			<?= gettext("NOTE: This option does NOT work with IPv6. If set, dnsmasq will not bind to IPv6 addresses."); ?>
+		<td width="78%" class="vtable">
+			<p>
+				<input name="strictbind" type="checkbox" id="strictbind" value="yes" <?php if ($pconfig['strictbind'] == "yes") echo "checked=\"checked\"";?> />
+				<strong><?=gettext("Strict Interface Binding");?></strong>
+				<br />
+				<?= gettext("If this option is set, the DNS forwarder will only bind to the interfaces containing the IP addresses selected above, rather than binding to all interfaces and discarding queries to other addresses."); ?>
+				<br /><br />
+				<?= gettext("NOTE: This option does NOT work with IPv6. If set, dnsmasq will not bind to IPv6 addresses."); ?>
 			</p>
 		</td>
 	</tr>
@@ -326,31 +366,39 @@ function show_advanced_dns() {
 	</tr>
 </table>
 
-<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
-</strong></span><?php printf(gettext("If the DNS forwarder is enabled, the DHCP".
-" service (if enabled) will automatically serve the LAN IP".
-" address as a DNS server to DHCP clients so they will use".
-" the forwarder. The DNS forwarder will use the DNS servers".
-" entered in %sSystem: General setup%s".
-" or those obtained via DHCP or PPP on WAN if the &quot;Allow".
-" DNS server list to be overridden by DHCP/PPP on WAN&quot;".
-" is checked. If you don't use that option (or if you use".
-" a static IP address on WAN), you must manually specify at".
-" least one DNS server on the %sSystem:".
-"General setup%s page."),'<a href="system.php">','</a>','<a href="system.php">','</a>');?><br />
-</span></p>
+<p>
+	<span class="vexpl">
+		<span class="red">
+			<strong>
+				<?=gettext("Note:");?><br />
+			</strong>
+		</span>
+		<?php printf(gettext("If the DNS forwarder is enabled, the DHCP".
+			" service (if enabled) will automatically serve the LAN IP".
+			" address as a DNS server to DHCP clients so they will use".
+			" the forwarder. The DNS forwarder will use the DNS servers".
+			" entered in %sSystem: General setup%s".
+			" or those obtained via DHCP or PPP on WAN if the &quot;Allow".
+			" DNS server list to be overridden by DHCP/PPP on WAN&quot;".
+			" is checked. If you don't use that option (or if you use".
+			" a static IP address on WAN), you must manually specify at".
+			" least one DNS server on the %sSystem:".
+			"General setup%s page."),'<a href="system.php">','</a>','<a href="system.php">','</a>');?><br />
+	</span>
+</p>
 
 &nbsp;<br />
 <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont" summary="host overrides">
-<tr>
-	<td colspan="5" valign="top" class="listtopic"><?=gettext("Host Overrides");?></td>
-</tr>
-<tr>
-	<td><br />
-	<?=gettext("Entries in this section override individual results from the forwarders.");?>
-	<?=gettext("Use these for changing DNS results or for adding custom DNS records.");?>
-	</td>
-</tr>
+	<tr>
+		<td colspan="5" valign="top" class="listtopic"><?=gettext("Host Overrides");?></td>
+	</tr>
+	<tr>
+		<td>
+			<br />
+			<?=gettext("Entries in this section override individual results from the forwarders.");?>
+			<?=gettext("Use these for changing DNS results or for adding custom DNS records.");?>
+		</td>
+	</tr>
 </table>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont sortable" summary="results">
 	<thead>
@@ -363,7 +411,9 @@ function show_advanced_dns() {
 			<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 				<tr>
 					<td width="17"></td>
-					<td valign="middle"><a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
+					<td valign="middle">
+						<a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a>
+					</td>
 				</tr>
 			</table>
 		</td>
@@ -376,14 +426,19 @@ function show_advanced_dns() {
 			<table border="0" cellspacing="0" cellpadding="1" summary="add">
 				<tr>
 					<td width="17"></td>
-					<td valign="middle"><a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
+					<td valign="middle">
+						<a href="services_dnsmasq_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a>
+					</td>
 				</tr>
 			</table>
 		</td>
 	</tr>
 	</tfoot>
 	<tbody>
-	<?php $i = 0; foreach ($a_hosts as $hostent): ?>
+<?php
+	$i = 0;
+	foreach ($a_hosts as $hostent):
+?>
 	<tr>
 		<td class="listlr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
 			<?=strtolower($hostent['host']);?>&nbsp;
@@ -401,13 +456,17 @@ function show_advanced_dns() {
 			<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 				<tr>
 					<td valign="middle"><a href="services_dnsmasq_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td>
-					<td><a href="services_dnsmasq.php?type=host&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
+					<td>
+						<a href="services_dnsmasq.php?type=host&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a>
+					</td>
 				</tr>
 			</table>
 		</td>
 	</tr>
-	<?php if ($hostent['aliases']['item'] && is_array($hostent['aliases']['item'])): ?>
-	<?php foreach ($hostent['aliases']['item'] as $alias): ?>
+<?php
+		if ($hostent['aliases']['item'] && is_array($hostent['aliases']['item'])):
+			foreach ($hostent['aliases']['item'] as $alias):
+?>
 	<tr>
 		<td class="listlr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
 			<?=strtolower($alias['host']);?>&nbsp;
@@ -425,21 +484,30 @@ function show_advanced_dns() {
 			<a href="services_dnsmasq_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a>
 		</td>
 	</tr>
-	<?php endforeach; ?>
-	<?php endif; ?>
-	<?php $i++; endforeach; ?>
-	<tr style="display:none"><td></td></tr>
+<?php
+			endforeach;
+		endif;
+		$i++;
+	endforeach;
+?>
+	<tr style="display:none">
+		<td></td>
+	</tr>
 	</tbody>
 </table>
 <br />
 <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont" summary="domain overrides">
-<tr>
-	<td colspan="5" valign="top" class="listtopic"><?=gettext("Domain Overrides");?></td>
-</tr>
-<tr>
-	<td><p><?=gettext("Entries in this area override an entire domain, and subdomains, by specifying an".
-	" authoritative DNS server to be queried for that domain.");?></p></td>
-</tr>
+	<tr>
+		<td colspan="5" valign="top" class="listtopic"><?=gettext("Domain Overrides");?></td>
+	</tr>
+	<tr>
+		<td>
+			<p>
+				<?=gettext("Entries in this area override an entire domain, and subdomains, by specifying an".
+					" authoritative DNS server to be queried for that domain.");?>
+			</p>
+		</td>
+	</tr>
 </table>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont sortable" summary="results">
 	<thead>
@@ -451,7 +519,9 @@ function show_advanced_dns() {
 			<table border="0" cellspacing="0" cellpadding="1" summary="add">
 				<tr>
 					<td width="17" height="17"></td>
-					<td><a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
+					<td>
+						<a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a>
+					</td>
 				</tr>
 			</table>
 		</td>
@@ -461,17 +531,22 @@ function show_advanced_dns() {
 	<tr>
 		<td class="list" colspan="3"></td>
 		<td class="list">
-		<table border="0" cellspacing="0" cellpadding="1" summary="add">
-			<tr>
-				<td width="17" height="17"></td>
-				<td><a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
-			</tr>
-		</table>
+			<table border="0" cellspacing="0" cellpadding="1" summary="add">
+				<tr>
+					<td width="17" height="17"></td>
+					<td>
+						<a href="services_dnsmasq_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a>
+					</td>
+				</tr>
+			</table>
 		</td>
 	</tr>
 	</tfoot>
 	<tbody>
-	<?php $i = 0; foreach ($a_domainOverrides as $doment): ?>
+<?php
+	$i = 0;
+	foreach ($a_domainOverrides as $doment):
+?>
 	<tr>
 		<td class="listlr">
 			<?=strtolower($doment['domain']);?>&nbsp;
@@ -482,11 +557,18 @@ function show_advanced_dns() {
 		<td class="listbg">
 			<?=htmlspecialchars($doment['descr']);?>&nbsp;
 		</td>
-		<td valign="middle" class="list nowrap"> <a href="services_dnsmasq_domainoverride_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a>
-			&nbsp;<a href="services_dnsmasq.php?act=del&amp;type=doverride&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
+		<td valign="middle" class="list nowrap">
+			<a href="services_dnsmasq_domainoverride_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a>
+			&nbsp;<a href="services_dnsmasq.php?act=del&amp;type=doverride&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a>
+		</td>
+	</tr>
+<?php
+		$i++;
+	endforeach;
+?>
+	<tr style="display:none">
+		<td></td>
 	</tr>
-	<?php $i++; endforeach; ?>
-	<tr style="display:none"><td></td></tr>
 	</tbody>
 </table>
 </form>
diff --git a/usr/local/www/services_dnsmasq_domainoverride_edit.php b/usr/local/www/services_dnsmasq_domainoverride_edit.php
index d2c3181..b992019 100644
--- a/usr/local/www/services_dnsmasq_domainoverride_edit.php
+++ b/usr/local/www/services_dnsmasq_domainoverride_edit.php
@@ -44,82 +44,84 @@ require("guiconfig.inc");
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
 
 if (!is_array($config['dnsmasq']['domainoverrides'])) {
-       $config['dnsmasq']['domainoverrides'] = array();
+	$config['dnsmasq']['domainoverrides'] = array();
 }
 $a_domainOverrides = &$config['dnsmasq']['domainoverrides'];
 
-if (is_numericint($_GET['id']))
+if (is_numericint($_GET['id'])) {
 	$id = $_GET['id'];
-if (isset($_POST['id']) && is_numericint($_POST['id']))
+}
+if (isset($_POST['id']) && is_numericint($_POST['id'])) {
 	$id = $_POST['id'];
+}
 
 if (isset($id) && $a_domainOverrides[$id]) {
-       $pconfig['domain'] = $a_domainOverrides[$id]['domain'];
-       if (is_ipaddr($a_domainOverrides[$id]['ip']) && ($a_domainOverrides[$id]['ip'] != '#')) {
-              $pconfig['ip'] = $a_domainOverrides[$id]['ip'];
-       }
-       else {
-             $dnsmasqpieces = explode('@', $a_domainOverrides[$id]['ip'], 2);
-             $pconfig['ip'] = $dnsmasqpieces[0];
-             $pconfig['dnssrcip'] = $dnsmasqpieces[1];
-       }
-       $pconfig['descr'] = $a_domainOverrides[$id]['descr'];
+	$pconfig['domain'] = $a_domainOverrides[$id]['domain'];
+	if (is_ipaddr($a_domainOverrides[$id]['ip']) && ($a_domainOverrides[$id]['ip'] != '#')) {
+		$pconfig['ip'] = $a_domainOverrides[$id]['ip'];
+	} else {
+		$dnsmasqpieces = explode('@', $a_domainOverrides[$id]['ip'], 2);
+		$pconfig['ip'] = $dnsmasqpieces[0];
+		$pconfig['dnssrcip'] = $dnsmasqpieces[1];
+	}
+	$pconfig['descr'] = $a_domainOverrides[$id]['descr'];
 }
 
 if ($_POST) {
 
-       unset($input_errors);
-       $pconfig = $_POST;
-
-       /* input validation */
-       $reqdfields = explode(" ", "domain ip");
-       $reqdfieldsn = array(gettext("Domain"),gettext("IP address"));
-
-       do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
-
-       function String_Begins_With($needle, $haystack) {
-           return (substr($haystack, 0, strlen($needle))==$needle);
-       }
-
-       if (String_Begins_With(_msdcs, $_POST['domain'])) {
-               $subdomainstr = substr($_POST['domain'], 7);
-               if ($subdomainstr && !is_domain($subdomainstr)) {
-                  $input_errors[] = gettext("A valid domain must be specified after _msdcs.");
-               }
-       }
-       elseif ($_POST['domain'] && !is_domain($_POST['domain'])) {
-               $input_errors[] = gettext("A valid domain must be specified.");
-       }
-       if ($_POST['ip'] && !is_ipaddr($_POST['ip']) && ($_POST['ip'] != '#') && ($_POST['ip'] != '!')) {
-              $input_errors[] = gettext("A valid IP address must be specified, or # for an exclusion or ! to not forward at all.");
-       }
-       if ($_POST['dnssrcip'] && !in_array($_POST['dnssrcip'], get_configured_ip_addresses())) {
-              $input_errors[] = gettext("An interface IP address must be specified for the DNS query source.");
-       }
-       if (!$input_errors) {
-			$doment = array();
-			$doment['domain'] = $_POST['domain'];
-                       if (empty($_POST['dnssrcip']))
-                                $doment['ip'] = $_POST['ip'];
-                       else
-                               $doment['ip'] = $_POST['ip'] . "@" . $_POST['dnssrcip'];
-			$doment['descr'] = $_POST['descr'];
-
-			if (isset($id) && $a_domainOverrides[$id])
-				$a_domainOverrides[$id] = $doment;
-			else
-				$a_domainOverrides[] = $doment;
-
-			$retval = services_dnsmasq_configure();
-
-			write_config();
-
-			header("Location: services_dnsmasq.php");
-			exit;
-       }
+	unset($input_errors);
+	$pconfig = $_POST;
+
+	/* input validation */
+	$reqdfields = explode(" ", "domain ip");
+	$reqdfieldsn = array(gettext("Domain"), gettext("IP address"));
+
+	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+
+	function String_Begins_With($needle, $haystack) {
+		return (substr($haystack, 0, strlen($needle)) == $needle);
+	}
+
+	if (String_Begins_With(_msdcs, $_POST['domain'])) {
+		$subdomainstr = substr($_POST['domain'], 7);
+		if ($subdomainstr && !is_domain($subdomainstr)) {
+			$input_errors[] = gettext("A valid domain must be specified after _msdcs.");
+		}
+	} elseif ($_POST['domain'] && !is_domain($_POST['domain'])) {
+		$input_errors[] = gettext("A valid domain must be specified.");
+	}
+	if ($_POST['ip'] && !is_ipaddr($_POST['ip']) && ($_POST['ip'] != '#') && ($_POST['ip'] != '!')) {
+		$input_errors[] = gettext("A valid IP address must be specified, or # for an exclusion or ! to not forward at all.");
+	}
+	if ($_POST['dnssrcip'] && !in_array($_POST['dnssrcip'], get_configured_ip_addresses())) {
+		$input_errors[] = gettext("An interface IP address must be specified for the DNS query source.");
+	}
+	if (!$input_errors) {
+		$doment = array();
+		$doment['domain'] = $_POST['domain'];
+		if (empty($_POST['dnssrcip'])) {
+			$doment['ip'] = $_POST['ip'];
+		} else {
+			$doment['ip'] = $_POST['ip'] . "@" . $_POST['dnssrcip'];
+		}
+		$doment['descr'] = $_POST['descr'];
+
+		if (isset($id) && $a_domainOverrides[$id]) {
+			$a_domainOverrides[$id] = $doment;
+		} else {
+			$a_domainOverrides[] = $doment;
+		}
+
+		$retval = services_dnsmasq_configure();
+
+		write_config();
+
+		header("Location: services_dnsmasq.php");
+		exit;
+	}
 }
 
-$pgtitle = array(gettext("Services"),gettext("DNS forwarder"),gettext("Edit Domain Override"));
+$pgtitle = array(gettext("Services"), gettext("DNS forwarder"), gettext("Edit Domain Override"));
 $shortcut_section = "forwarder";
 include("head.inc");
 
@@ -128,47 +130,62 @@ include("head.inc");
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-            <form action="services_dnsmasq_domainoverride_edit.php" method="post" name="iform" id="iform">
-              <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="domain override">
-                               <tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td>
-                  <td width="78%" class="vtable">
-                    <?=$mandfldhtml;?><input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("Domain to override (NOTE: this does not have to be a valid TLD!)"); ?><br />
-                    <?=gettext("e.g."); ?> <em><?=gettext("test"); ?></em> <?=gettext("or"); ?> <em>mycompany.localdomain</em> <?=gettext("or"); ?> <em>1.168.192.in-addr.arpa</em> </span></td>
-                </tr>
-                               <tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td>
-                  <td width="78%" class="vtable">
-                    <?=$mandfldhtml;?><input name="ip" type="text" class="formfld unknown" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("IP address of the authoritative DNS server for this domain"); ?><br />
-                    <?=gettext("e.g."); ?> <em>192.168.100.100</em><br /><?=gettext("Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override."); ?><br /><?=gettext("Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere."); ?></span></td>
-                </tr>
-                               <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Source IP");?></td>
-                  <td width="78%" class="vtable">
-                    <?=$mandfldhtml;?><input name="dnssrcip" type="text" class="formfld unknown" id="dnssrcip" size="40" value="<?=htmlspecialchars($pconfig['dnssrcip']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("Source IP address for queries to the DNS server for the override domain."); ?><br />
-                    <?=gettext("Leave blank unless your DNS server is accessed through a VPN tunnel."); ?></span></td>
-                </tr>
-                               <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("You may enter a description here".
-                    " for your reference (not parsed).");?></span></td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%">
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
-                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
-                    <?php if (isset($id) && $a_domainOverrides[$id]): ?>
-                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
-                    <?php endif; ?>
-                  </td>
-                </tr>
-              </table>
+<form action="services_dnsmasq_domainoverride_edit.php" method="post" name="iform" id="iform">
+	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="domain override">
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td>
+			<td width="78%" class="vtable">
+				<?=$mandfldhtml;?><input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>" />
+				<br /> 
+				<span class="vexpl">
+					<?=gettext("Domain to override (NOTE: this does not have to be a valid TLD!)"); ?><br />
+					<?=gettext("e.g."); ?> <em><?=gettext("test"); ?></em> <?=gettext("or"); ?> <em>mycompany.localdomain</em> <?=gettext("or"); ?> <em>1.168.192.in-addr.arpa</em>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td>
+			<td width="78%" class="vtable">
+				<?=$mandfldhtml;?><input name="ip" type="text" class="formfld unknown" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("IP address of the authoritative DNS server for this domain"); ?><br />
+					<?=gettext("e.g."); ?> <em>192.168.100.100</em><br /><?=gettext("Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override."); ?><br /><?=gettext("Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere."); ?>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Source IP");?></td>
+			<td width="78%" class="vtable">
+				<?=$mandfldhtml;?><input name="dnssrcip" type="text" class="formfld unknown" id="dnssrcip" size="40" value="<?=htmlspecialchars($pconfig['dnssrcip']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("Source IP address for queries to the DNS server for the override domain."); ?><br />
+					<?=gettext("Leave blank unless your DNS server is accessed through a VPN tunnel."); ?>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+			<td width="78%" class="vtable">
+				<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("You may enter a description here for your reference (not parsed).");?>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top">&nbsp;</td>
+			<td width="78%">
+				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
+				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
+				<?php if (isset($id) && $a_domainOverrides[$id]): ?>
+				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
+				<?php endif; ?>
+			</td>
+		</tr>
+	</table>
 </form>
 <?php include("fend.inc"); ?>
 </body>
diff --git a/usr/local/www/services_dnsmasq_edit.php b/usr/local/www/services_dnsmasq_edit.php
index d8d168a..879675f 100644
--- a/usr/local/www/services_dnsmasq_edit.php
+++ b/usr/local/www/services_dnsmasq_edit.php
@@ -1,23 +1,23 @@
-<?php 
+<?php
 /* $Id$ */
 /*
 	services_dnsmasq_edit.php
 	part of m0n0wall (http://m0n0.ch/wall)
-	
+
 	Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>.
 	Copyright (C) 2013-2015 Electric Sheep Fencing, LP
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
-	
+
 	1. Redistributions of source code must retain the above copyright notice,
 	   this list of conditions and the following disclaimer.
-	
+
 	2. Redistributions in binary form must reproduce the above copyright
 	   notice, this list of conditions and the following disclaimer in the
 	   documentation and/or other materials provided with the distribution.
-	
+
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -45,27 +45,31 @@ function hostcmp($a, $b) {
 }
 
 function hosts_sort() {
-        global $g, $config;
+	global $g, $config;
 
-        if (!is_array($config['dnsmasq']['hosts']))
-                return;
+	if (!is_array($config['dnsmasq']['hosts'])) {
+		return;
+	}
 
-        usort($config['dnsmasq']['hosts'], "hostcmp");
+	usort($config['dnsmasq']['hosts'], "hostcmp");
 }
 
 require("guiconfig.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
 
-if (!is_array($config['dnsmasq']['hosts'])) 
+if (!is_array($config['dnsmasq']['hosts'])) {
 	$config['dnsmasq']['hosts'] = array();
+}
 
 $a_hosts = &$config['dnsmasq']['hosts'];
 
-if (is_numericint($_GET['id']))
+if (is_numericint($_GET['id'])) {
 	$id = $_GET['id'];
-if (isset($_POST['id']) && is_numericint($_POST['id']))
+}
+if (isset($_POST['id']) && is_numericint($_POST['id'])) {
 	$id = $_POST['id'];
+}
 
 if (isset($id) && $a_hosts[$id]) {
 	$pconfig['host'] = $a_hosts[$id]['host'];
@@ -82,12 +86,12 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "domain ip");
-	$reqdfieldsn = array(gettext("Domain"),gettext("IP address"));
-	
+	$reqdfieldsn = array(gettext("Domain"), gettext("IP address"));
+
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
-	
+
 	if ($_POST['host']) {
-		if (!is_hostname($_POST['host'])) { 
+		if (!is_hostname($_POST['host'])) {
 			$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'. It may not start or end with '-'.");
 		} else {
 			if (!is_unqualified_hostname($_POST['host'])) {
@@ -96,11 +100,13 @@ if ($_POST) {
 		}
 	}
 
-	if (($_POST['domain'] && !is_domain($_POST['domain']))) 
+	if (($_POST['domain'] && !is_domain($_POST['domain']))) {
 		$input_errors[] = gettext("A valid domain must be specified.");
-		
-	if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) 
+	}
+
+	if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) {
 		$input_errors[] = gettext("A valid IP address must be specified.");
+	}
 
 	/* collect aliases */
 	$aliases = array();
@@ -146,11 +152,14 @@ if ($_POST) {
 
 	/* check for overlaps */
 	foreach ($a_hosts as $hostent) {
-		if (isset($id) && ($a_hosts[$id]) && ($a_hosts[$id] === $hostent))
+		if (isset($id) && ($a_hosts[$id]) && ($a_hosts[$id] === $hostent)) {
 			continue;
+		}
 
-		if (($hostent['host'] == $_POST['host']) && ($hostent['domain'] == $_POST['domain'])
-			&& ((is_ipaddrv4($hostent['ip']) && is_ipaddrv4($_POST['ip'])) || (is_ipaddrv6($hostent['ip']) && is_ipaddrv6($_POST['ip'])))) {
+		if (($hostent['host'] == $_POST['host']) &&
+		    ($hostent['domain'] == $_POST['domain']) &&
+		    ((is_ipaddrv4($hostent['ip']) && is_ipaddrv4($_POST['ip'])) ||
+		     (is_ipaddrv6($hostent['ip']) && is_ipaddrv6($_POST['ip'])))) {
 			$input_errors[] = gettext("This host/domain already exists.");
 			break;
 		}
@@ -164,22 +173,23 @@ if ($_POST) {
 		$hostent['descr'] = $_POST['descr'];
 		$hostent['aliases']['item'] = $aliases;
 
-		if (isset($id) && $a_hosts[$id])
+		if (isset($id) && $a_hosts[$id]) {
 			$a_hosts[$id] = $hostent;
-		else
+		} else {
 			$a_hosts[] = $hostent;
+		}
 		hosts_sort();
-		
+
 		mark_subsystem_dirty('hosts');
-		
+
 		write_config();
-		
+
 		header("Location: services_dnsmasq.php");
 		exit;
 	}
 }
 
-$pgtitle = array(gettext("Services"),gettext("DNS forwarder"),gettext("Edit host"));
+$pgtitle = array(gettext("Services"), gettext("DNS forwarder"), gettext("Edit host"));
 $shortcut_section = "forwarder";
 include("head.inc");
 
@@ -206,110 +216,124 @@ include("head.inc");
 </script>
 
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-        <form action="services_dnsmasq_edit.php" method="post" name="iform" id="iform">
-        <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="dns edit">
-				<tr>
-					<td colspan="2" valign="top" class="listtopic"><?=gettext("Edit DNS Forwarder entry");?></td>
-				</tr>	
-                <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Host");?></td>
-                  <td width="78%" class="vtable"> 
-                    <input name="host" type="text" class="formfld unknown" id="host" size="40" value="<?=htmlspecialchars($pconfig['host']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("Name of the host, without".
-                   " domain part"); ?><br />
-                   <?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em></span></td>
-                </tr>
-				<tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td>
-                  <td width="78%" class="vtable"> 
-                    <input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("Domain of the host"); ?><br />
-                   <?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em></span></td>
-                </tr>
-				<tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td>
-                  <td width="78%" class="vtable"> 
-                    <input name="ip" type="text" class="formfld unknown" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("IP address of the host"); ?><br />
-                   <?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em></span></td>
-                </tr>
-				<tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
-                  <td width="78%" class="vtable"> 
-                    <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("You may enter a description here".
-                   " for your reference (not parsed).");?></span></td>
-                </tr>
-				<tr>
-                  <td width="22%" valign="top" class="vncell"><div id="addressnetworkport"><?=gettext("Aliases"); ?></div></td>
-                  <td width="78%" class="vtable">
-                    <table id="maintable" summary="aliases">
-                      <tbody>
-                        <tr>
-                          <td colspan="4">
-                            <div style="padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066; background-color: #ffffff; color: #000000; font-size: 8pt;" id="itemhelp">
-                              <?=gettext("Enter additional names for this host."); ?>
-                            </div>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td><div id="onecolumn"><?=gettext("Host");?></div></td>
-                          <td><div id="twocolumn"><?=gettext("Domain");?></div></td>
-                          <td><div id="threecolumn"><?=gettext("Description");?></div></td>
-                        </tr>
-                        <?php
-                          $counter = 0;
-                          if($pconfig['aliases']['item']):
-                            foreach($pconfig['aliases']['item'] as $item):
-                              $host = $item['host'];
-                              $domain = $item['domain'];
-                              $description = $item['description'];
-                        ?>
-                        <tr>
-                          <td>
-                            <input autocomplete="off" name="aliashost<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliashost<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($host);?>" />
-                          </td>
-                          <td>
-                            <input autocomplete="off" name="aliasdomain<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdomain<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($domain);?>" />
-                          </td>
-                          <td>
-                            <input name="aliasdescription<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdescription<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($description);?>" />
-                          </td>
-                          <td>
-                            <a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" alt="" title="<?=gettext("remove this entry"); ?>" /></a>
-                          </td>
-                        </tr>
-                        <?php
-                              $counter++;
-                            endforeach;
-                          endif;
-                        ?>
-                      </tbody>
-                    </table>
-                    <a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#">
-                      <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
-                    </a>
-                    <script type="text/javascript">
-                    //<![CDATA[
-                      field_counter_js = 3;
-                      rows = 1;
-                      totalrows = <?php echo $counter; ?>;
-                      loaded = <?php echo $counter; ?>;
-                    //]]>
-                    </script>
-                  </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%"> 
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
-                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
-                    <?php if (isset($id) && $a_hosts[$id]): ?>
-                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
-                    <?php endif; ?>
-                  </td>
-                </tr>
-        </table>
+<form action="services_dnsmasq_edit.php" method="post" name="iform" id="iform">
+	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="dns edit">
+		<tr>
+			<td colspan="2" valign="top" class="listtopic"><?=gettext("Edit DNS Forwarder entry");?></td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Host");?></td>
+			<td width="78%" class="vtable">
+				<input name="host" type="text" class="formfld unknown" id="host" size="40" value="<?=htmlspecialchars($pconfig['host']);?>" />
+				<br /> 
+				<span class="vexpl">
+					<?=gettext("Name of the host, without domain part"); ?><br />
+					<?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td>
+			<td width="78%" class="vtable">
+				<input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("Domain of the host"); ?><br />
+					<?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td>
+			<td width="78%" class="vtable">
+				<input name="ip" type="text" class="formfld unknown" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("IP address of the host"); ?><br />
+					<?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+			<td width="78%" class="vtable">
+				<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("You may enter a description here for your reference (not parsed).");?>
+				</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><div id="addressnetworkport"><?=gettext("Aliases"); ?></div></td>
+			<td width="78%" class="vtable">
+				<table id="maintable" summary="aliases">
+					<tbody>
+					<tr>
+						<td colspan="4">
+							<div style="padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066; background-color: #ffffff; color: #000000; font-size: 8pt;" id="itemhelp">
+								<?=gettext("Enter additional names for this host."); ?>
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<td><div id="onecolumn"><?=gettext("Host");?></div></td>
+						<td><div id="twocolumn"><?=gettext("Domain");?></div></td>
+						<td><div id="threecolumn"><?=gettext("Description");?></div></td>
+					</tr>
+<?php
+	$counter = 0;
+	if ($pconfig['aliases']['item']):
+		foreach ($pconfig['aliases']['item'] as $item):
+			$host = $item['host'];
+			$domain = $item['domain'];
+			$description = $item['description'];
+?>
+					<tr>
+						<td>
+							<input autocomplete="off" name="aliashost<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliashost<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($host);?>" />
+						</td>
+						<td>
+							<input autocomplete="off" name="aliasdomain<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdomain<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($domain);?>" />
+						</td>
+						<td>
+							<input name="aliasdescription<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdescription<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($description);?>" />
+						</td>
+						<td>
+							<a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" alt="" title="<?=gettext("remove this entry"); ?>" /></a>
+						</td>
+					</tr>
+<?php
+			$counter++;
+		endforeach;
+	endif;
+?>
+					</tbody>
+				</table>
+				<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#">
+					<img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
+				</a>
+				<script type="text/javascript">
+				//<![CDATA[
+					field_counter_js = 3;
+					rows = 1;
+					totalrows = <?php echo $counter; ?>;
+					loaded = <?php echo $counter; ?>;
+				//]]>
+				</script>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top">&nbsp;</td>
+			<td width="78%">
+				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
+				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
+				<?php if (isset($id) && $a_hosts[$id]): ?>
+				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
+				<?php endif; ?>
+			</td>
+		</tr>
+	</table>
 </form>
 <?php include("fend.inc"); ?>
 </body>