diff options
| author | jim-p <jimp@pfsense.org> | 2011-08-30 13:32:36 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-08-30 13:32:36 -0400 |
| commit | 8ca95ed86f66d1c779ef06b3ba8b72248d3480af (patch) | |
| tree | 89662897e133329dd507ca422b20f3ae14134092 /usr/local/www | |
| parent | 973444a8dd1ce0d08757f7eef47864ecd8b1d3cb (diff) | |
| download | pfsense-8ca95ed86f66d1c779ef06b3ba8b72248d3480af.zip pfsense-8ca95ed86f66d1c779ef06b3ba8b72248d3480af.tar.gz | |
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.
Diffstat (limited to 'usr/local/www')
| -rwxr-xr-x | usr/local/www/system.php | 16 | ||||
| -rw-r--r-- | usr/local/www/system_advanced_misc.php | 21 |
2 files changed, 16 insertions, 21 deletions
diff --git a/usr/local/www/system.php b/usr/local/www/system.php index 5f27f15..2a623d7 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -62,6 +62,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']) @@ -189,6 +191,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? */ for ($dnscounter=1; $dnscounter<5; $dnscounter++) { $dnsname="dns{$dnscounter}"; @@ -341,6 +348,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 847a16e..932ad06 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"> </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"> </td> - </tr> - <tr> <td colspan="2" valign="top" class="listtopic"><?=gettext("Gateway Monitoring"); ?></td> </tr> <tr> |
