From 3f9f70cbf589e23688a586cf22279ec204e23bf2 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 30 Aug 2011 13:32:36 -0400
Subject: Move the option to exclude localhost as a DNS server under System >
 General so it is grouped with other system DNS options in a more logical
 location.

---
 usr/local/www/system.php               | 16 ++++++++++++++++
 usr/local/www/system_advanced_misc.php | 21 ---------------------
 2 files changed, 16 insertions(+), 21 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index 0074548..0f4ef47 100755
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -60,6 +60,8 @@ $pconfig['timeupdateinterval'] = $config['system']['time-update-interval'];
 $pconfig['timeservers'] = $config['system']['timeservers'];
 $pconfig['theme'] = $config['system']['theme'];
 
+$pconfig['dnslocalhost'] = isset($config['system']['dnslocalhost']);
+
 if (!isset($pconfig['timeupdateinterval']))
 	$pconfig['timeupdateinterval'] = 300;
 if (!$pconfig['timezone'])
@@ -181,6 +183,11 @@ if ($_POST) {
 		unset($config['system']['dnsallowoverride']);
 		$config['system']['dnsallowoverride'] = $_POST['dnsallowoverride'] ? true : false;
 
+		if($_POST['dnslocalhost'] == "yes")
+			$config['system']['dnslocalhost'] = true;
+		else
+			unset($config['system']['dnslocalhost']);
+
 		/* which interface should the dns servers resolve through? */
 		if($_POST['dns1gwint']) 
 			$config['system']['dns1gwint'] = $pconfig['dns1gwint'];
@@ -338,6 +345,15 @@ include("head.inc");
 							"for its own purposes (including the DNS forwarder). " .
 							"However, they will not be assigned to DHCP and PPTP " .
 							"VPN clients."), $g['product_name']); ?>
+							<br />
+							<br />
+							<input name="dnslocalhost" type="checkbox" id="dnslocalhost" value="yes" <?php if ($pconfig['dnslocalhost']) echo "checked"; ?> />
+							<strong>
+								<?=gettext("Do not use the DNS Forwarder as a DNS server for the firewall"); ?>
+							</strong>
+							<br />
+							<?=gettext("By default localhost (127.0.0.1) will be used as the first DNS server where the DNS forwarder is enabled, so system can use the DNS forwarder to perform lookups. ".
+							"Checking this box omits localhost from the list of DNS servers."); ?>
 						</span>
 					</p>
 				</td>
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 5005c96..1390992 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -65,7 +65,6 @@ $pconfig['powerd_enable'] = isset($config['system']['powerd_enable']);
 $pconfig['glxsb_enable'] = isset($config['system']['glxsb_enable']);
 $pconfig['schedule_states'] = isset($config['system']['schedule_states']);
 $pconfig['kill_states'] = isset($config['system']['kill_states']);
-$pconfig['dnslocalhost'] = isset($config['system']['dnslocalhost']);
 
 if ($_POST) {
 
@@ -159,11 +158,6 @@ if ($_POST) {
                 else
                         unset($config['system']['kill_states']);
 
-		if($_POST['dnslocalhost'] == "yes")
-                        $config['system']['dnslocalhost'] = true;
-                else
-                        unset($config['system']['dnslocalhost']);
-
 		write_config();
 
 		$retval = 0;
@@ -398,21 +392,6 @@ function maxmss_checked(obj) {
                                                                 <td colspan="2" class="list" height="12">&nbsp;</td>
                                                         </tr>
                                                         <tr>
-                                                                <td colspan="2" valign="top" class="listtopic"><?=gettext("DNS Forwarder"); ?></td>
-                                                        </tr>
-                                                        <tr>
-                                                                <td width="22%" valign="top" class="vncell"><?=gettext("Localhost exclusion"); ?></td>
-                                                                <td width="78%" class="vtable">
-                                                                        <input name="dnslocalhost" type="checkbox" id="dnslocalhost" value="yes" <?php if ($pconfig['dnslocalhost']) echo "checked"; ?> />
-                                                                        <br />
-									<?=gettext("By default localhost (127.0.0.1) will be used as the first DNS server where the DNS forwarder is enabled, so this system uses the DNS forwarder to perform lookups. ".
-									"Checking this box omits localhost from the list of DNS servers."); ?>
-                                                                </td>
-                                                        </tr>
-                                                        <tr>
-                                                                <td colspan="2" class="list" height="12">&nbsp;</td>
-                                                        </tr>
-                                                        <tr>
                                                                 <td colspan="2" valign="top" class="listtopic"><?=gettext("Gateway Monitoring"); ?></td>
                                                         </tr>
                                                         <tr>
-- 
cgit v1.1