Skip to content

O
OpnSense
Commit 05528a54 authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

(legacy) refactor services_dnsmasq.php

parent 654e3d4d
Show whitespace changes
Inline Side-by-side
Showing with 474 additions and 454 deletions
src/www/services_dnsmasq.php
View file @ 05528a54
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>. Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>.
All rights reserved. All rights reserved.
...@@ -35,298 +35,343 @@ require_once("system.inc"); ...@@ -35,298 +35,343 @@ require_once("system.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("unbound.inc"); require_once("unbound.inc");
$pconfig['enable'] = isset($config['dnsmasq']['enable']); if (empty($config['dnsmasq']['hosts']) || !is_array($config['dnsmasq']['hosts'])) {
$pconfig['regdhcp'] = isset($config['dnsmasq']['regdhcp']);
$pconfig['regdhcpstatic'] = isset($config['dnsmasq']['regdhcpstatic']);
$pconfig['dhcpfirst'] = isset($config['dnsmasq']['dhcpfirst']);
$pconfig['strict_order'] = isset($config['dnsmasq']['strict_order']);
$pconfig['domain_needed'] = isset($config['dnsmasq']['domain_needed']);
$pconfig['no_private_reverse'] = isset($config['dnsmasq']['no_private_reverse']);
$pconfig['port'] = $config['dnsmasq']['port'];
$pconfig['custom_options'] = $config['dnsmasq']['custom_options'];
$pconfig['strictbind'] = isset($config['dnsmasq']['strictbind']);
if (!empty($config['dnsmasq']['interface']))
$pconfig['interface'] = explode(",", $config['dnsmasq']['interface']);
else
$pconfig['interface'] = array();
if (!is_array($config['dnsmasq']['hosts']))
$config['dnsmasq']['hosts'] = array(); $config['dnsmasq']['hosts'] = array();
}
if (!is_array($config['dnsmasq']['domainoverrides'])) if (empty($config['dnsmasq']['domainoverrides']) || !is_array($config['dnsmasq']['domainoverrides'])) {
$config['dnsmasq']['domainoverrides'] = array(); $config['dnsmasq']['domainoverrides'] = array();
}
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$a_hosts = &$config['dnsmasq']['hosts']; $pconfig = array();
$a_domainOverrides = &$config['dnsmasq']['domainoverrides']; // booleans
$pconfig['enable'] = isset($config['dnsmasq']['enable']);
if ($_POST && isset($_POST['submit'])) { $pconfig['regdhcp'] = isset($config['dnsmasq']['regdhcp']);
$pconfig['regdhcpstatic'] = isset($config['dnsmasq']['regdhcpstatic']);
$pconfig['dhcpfirst'] = isset($config['dnsmasq']['dhcpfirst']);
$pconfig['strict_order'] = isset($config['dnsmasq']['strict_order']);
$pconfig['domain_needed'] = isset($config['dnsmasq']['domain_needed']);
$pconfig['no_private_reverse'] = isset($config['dnsmasq']['no_private_reverse']);
$pconfig['strictbind'] = isset($config['dnsmasq']['strictbind']);
// simple text types
$pconfig['port'] = !empty($config['dnsmasq']['port']) ? $config['dnsmasq']['port'] : "";
$pconfig['custom_options'] = !empty($config['dnsmasq']['custom_options']) ? $config['dnsmasq']['custom_options'] : "";
// arrays
$pconfig['interface'] = !empty($config['dnsmasq']['interface']) ? explode(",", $config['dnsmasq']['interface']) : array();
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
$pconfig = $_POST; $pconfig = $_POST;
unset($input_errors); $input_errors = array();
if (isset($pconfig['submit'])) {
$config['dnsmasq']['enable'] = ($_POST['enable']) ? true : false; // validate
$config['dnsmasq']['regdhcp'] = ($_POST['regdhcp']) ? true : false; if (!empty($pconfig['port']) && !is_port($pconfig['port'])) {
$config['dnsmasq']['regdhcpstatic'] = ($_POST['regdhcpstatic']) ? true : false;
$config['dnsmasq']['dhcpfirst'] = ($_POST['dhcpfirst']) ? true : false;
$config['dnsmasq']['strict_order'] = ($_POST['strict_order']) ? true : false;
$config['dnsmasq']['domain_needed'] = ($_POST['domain_needed']) ? true : false;
$config['dnsmasq']['no_private_reverse'] = ($_POST['no_private_reverse']) ? true : false;
$config['dnsmasq']['custom_options'] = str_replace("\r\n", "\n", $_POST['custom_options']);
$config['dnsmasq']['strictbind'] = ($_POST['strictbind']) ? true : false;
if ($_POST['port'])
if(is_port($_POST['port']))
$config['dnsmasq']['port'] = $_POST['port'];
else
$input_errors[] = gettext("You must specify a valid port number"); $input_errors[] = gettext("You must specify a valid port number");
else if (isset($config['dnsmasq']['port'])) }
unset($config['dnsmasq']['port']); if (!empty($pconfig['enable']) && isset($config['unbound']['enable'])) {
$input_errors[] = gettext("The DNS Resolver is still active. Disable it before enabling the DNS Forwarder.");
if (is_array($_POST['interface'])) }
$config['dnsmasq']['interface'] = implode(",", $_POST['interface']);
elseif (isset($config['dnsmasq']['interface']))
unset($config['dnsmasq']['interface']);
if ($config['dnsmasq']['custom_options']) { if (!empty($pconfig['custom_options'])) {
$args = ''; $args = '';
foreach (preg_split('/\s+/', $config['dnsmasq']['custom_options']) as $c) foreach (preg_split('/\s+/', str_replace("\r\n", "\n", $pconfig['custom_options'])) as $c) {
$args .= escapeshellarg("--{$c}") . " "; $args .= escapeshellarg("--{$c}") . " ";
}
exec("/usr/local/sbin/dnsmasq --test $args", $output, $rc); exec("/usr/local/sbin/dnsmasq --test $args", $output, $rc);
if ($rc != 0) if ($rc != 0) {
$input_errors[] = gettext("Invalid custom options"); $input_errors[] = gettext("Invalid custom options");
} }
}
if (!$input_errors) { if (count($input_errors) == 0) {
// save form
$config['dnsmasq']['enable'] = !empty($pconfig['enable']);
$config['dnsmasq']['regdhcp'] = !empty($pconfig['regdhcp']);
$config['dnsmasq']['regdhcpstatic'] = !empty($pconfig['regdhcpstatic']);
$config['dnsmasq']['dhcpfirst'] = !empty($pconfig['dhcpfirst']);
$config['dnsmasq']['strict_order'] = !empty($pconfig['strict_order']);
$config['dnsmasq']['domain_needed'] = !empty($pconfig['domain_needed']);
$config['dnsmasq']['no_private_reverse'] = !empty($pconfig['no_private_reverse']);
$config['dnsmasq']['strictbind'] = !empty($pconfig['strictbind']);
if (!empty($pconfig['interface'])) {
$config['dnsmasq']['interface'] = implode(",", $pconfig['interface']);
} elseif (isset($config['dnsmasq']['interface'])) {
unset($config['dnsmasq']['interface']);
}
if (!empty($pconfig['port'])) {
$config['dnsmasq']['port'] = $pconfig['port'];
} elseif (isset($config['dnsmasq']['port'])) {
unset($config['dnsmasq']['port']);
}
if (!empty($pconfig['custom_options'])) {
$config['dnsmasq']['custom_options'] = str_replace("\r\n", "\n", $pconfig['custom_options']);
} elseif (isset($pconfig['custom_options'])) {
unset($pconfig['custom_options']);
}
write_config(); write_config();
services_dnsmasq_configure();
$retval = services_dnsmasq_configure(); header("Location: services_dnsmasq.php");
$savemsg = get_std_save_message(); exit;
} }
} elseif ($_POST && isset($_POST['apply']) ) { } elseif (isset($pconfig['apply'])) {
// Reload filter (we might need to sync to CARP hosts) // Reload filter (we might need to sync to CARP hosts)
filter_configure(); filter_configure();
/* Update resolv.conf in case the interface bindings exclude localhost. */ /* Update resolv.conf in case the interface bindings exclude localhost. */
system_resolvconf_generate(); system_resolvconf_generate();
system_hosts_generate(); system_hosts_generate();
$retval = services_dnsmasq_configure(); services_dnsmasq_configure();
$savemsg = get_std_save_message();
if ($retval == 0)
clear_subsystem_dirty('hosts'); clear_subsystem_dirty('hosts');
header("Location: services_dnsmasq.php");
} exit;
} elseif (!empty($pconfig['act']) && $pconfig['act'] == 'del') {
if ($_GET['act'] == "del") { $a_hosts = &$config['dnsmasq']['hosts'];
if ($_GET['type'] == 'host') { if (isset($pconfig['id']) && !empty($a_hosts[$pconfig['id']])) {
if ($a_hosts[$_GET['id']]) { unset($a_hosts[$pconfig['id']]);
unset($a_hosts[$_GET['id']]);
write_config(); write_config();
mark_subsystem_dirty('hosts'); mark_subsystem_dirty('hosts');
header("Location: services_dnsmasq.php");
exit; exit;
} }
} } elseif (!empty($pconfig['act']) && $pconfig['act'] == 'doverride') {
elseif ($_GET['type'] == 'doverride') { $a_domainOverrides = &$config['dnsmasq']['domainoverrides'];
if ($a_domainOverrides[$_GET['id']]) { if (isset($pconfig['id']) && !empty($a_domainOverrides[$pconfig['id']])) {
unset($a_domainOverrides[$_GET['id']]); unset($a_domainOverrides[$pconfig['id']]);
write_config(); write_config();
mark_subsystem_dirty('hosts'); mark_subsystem_dirty('hosts');
header("Location: services_dnsmasq.php");
exit; exit;
} }
} }
} }
legacy_html_escape_form_data($pconfig);
$service_hook = 'dnsmasq'; $service_hook = 'dnsmasq';
include("head.inc"); include("head.inc");
?> ?>
<body> <body>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function enable_change(enable_over) {
var endis;
endis = !(document.iform.enable.checked || enable_over);
document.iform.regdhcp.disabled = endis;
document.iform.regdhcpstatic.disabled = endis;
document.iform.dhcpfirst.disabled = endis;
}
function show_advanced_dns() { function show_advanced_dns() {
document.getElementById("showadvbox").innerHTML=''; document.getElementById("showadvbox").innerHTML='';
aodiv = document.getElementById('showadv'); aodiv = document.getElementById('showadv');
aodiv.style.display = "block"; aodiv.style.display = "block";
} }
$( document ).ready(function() {
// delete host action
$(".act_delete_host").click(function(event){
event.preventDefault();
var id = $(this).data("id");
// delete single
BootstrapDialog.show({
type:BootstrapDialog.TYPE_DANGER,
title: "<?= gettext("DNS Forwarder");?>",
message: "<?=gettext("Do you really want to delete this host?");?>",
buttons: [{
label: "<?= gettext("No");?>",
action: function(dialogRef) {
dialogRef.close();
}}, {
label: "<?= gettext("Yes");?>",
action: function(dialogRef) {
$.post(window.location, {act: 'del', id:id}, function(data) {
location.reload();
});
}
}]
});
});
$(".act_delete_override").click(function(event){
event.preventDefault();
var id = $(this).data("id");
// delete single
BootstrapDialog.show({
type:BootstrapDialog.TYPE_DANGER,
title: "<?= gettext("DNS Forwarder");?>",
message: "<?=gettext("Do you really want to delete this domain override?");?>",
buttons: [{
label: "<?= gettext("No");?>",
action: function(dialogRef) {
dialogRef.close();
}}, {
label: "<?= gettext("Yes");?>",
action: function(dialogRef) {
$.post(window.location, {act: 'doverride', id:id}, function(data) {
location.reload();
});
}
}]
});
});
});
//]]> //]]>
</script> </script>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?> <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<?php if (isset($savemsg)) print_info_box($savemsg); ?> <?php if (isset($savemsg)) print_info_box($savemsg); ?>
<?php if (is_subsystem_dirty('hosts')): ?><br/> <?php if (is_subsystem_dirty('hosts')): ?><br/>
<?php print_info_box_apply(gettext("The DNS forwarder configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));?><br /> <?php print_info_box_apply(gettext("The DNS forwarder configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
<?php endif; ?> <?php endif; ?>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<form method="post" name="iform" id="iform">
<form action="services_dnsmasq.php" method="post" name="iform" id="iform">
<header class="content-box-head container-fluid">
<h3><?=gettext("General DNS Forwarder Options");?></h3>
</header>
<div class="content-box-main">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped">
<tr>
<td valign="top"><strong><?=gettext("General DNS Forwarder Options");?></strong></td>
<td align="right">
<small><?=gettext("full help");?> </small>
<i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i>
</td>
</tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td> <td width="22%"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Enable");?></td>
<td width="78%" class="vtable"><p> <td width="78%">
<input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked=\"checked\"";?> onclick="enable_change(false)" /> <input name="enable" type="checkbox" id="enable" value="yes" <?=!empty($pconfig['enable']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Enable DNS forwarder");?><br /> </td>
</strong></p></td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("DHCP Registration");?></td> <td><a id="help_for_regdhcp" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DHCP Registration");?></td>
<td width="78%" class="vtable"><p> <td>
<input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if ($pconfig['regdhcp'] == "yes") echo "checked=\"checked\"";?> /> <input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?=!empty($pconfig['regdhcp']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Register DHCP leases in DNS forwarder");?><br /> <div class="hidden" for="help_for_regdhcp">
</strong><?php printf(gettext("If this option is set, then machines that specify". <strong><?=gettext("Register DHCP leases in DNS forwarder");?></strong><br/>
<?php printf(gettext("If this option is set, then machines that specify".
" their hostname when requesting a DHCP lease will be registered". " their hostname when requesting a DHCP lease will be registered".
" in the DNS forwarder, so that their name can be resolved.". " in the DNS forwarder, so that their name can be resolved.".
" You should also set the domain in %sSystem:". " You should also set the domain in %sSystem:".
" General setup%s to the proper value."),'<a href="system_general.php">','</a>')?></p> " General setup%s to the proper value."),'<a href="system_general.php">','</a>')?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Static DHCP");?></td> <td><a id="help_for_regdhcpstatic" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Static DHCP");?></td>
<td width="78%" class="vtable"><p> <td>
<input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if ($pconfig['regdhcpstatic'] == "yes") echo "checked=\"checked\"";?> /> <input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?=!empty($pconfig['regdhcpstatic']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Register DHCP static mappings in DNS forwarder");?><br /> <div class="hidden" for="help_for_regdhcpstatic">
</strong><?php printf(gettext("If this option is set, then DHCP static mappings will ". <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 ". "be registered in the DNS forwarder, so that their name can be ".
"resolved. You should also set the domain in %s". "resolved. You should also set the domain in %s".
"System: General setup%s to the proper value."),'<a href="system_general.php">','</a>');?></p> "System: General setup%s to the proper value."),'<a href="system_general.php">','</a>');?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Prefer DHCP");?></td> <td><a id="help_for_dhcpfirst" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Prefer DHCP");?></td>
<td width="78%" class="vtable"><p> <td>
<input name="dhcpfirst" type="checkbox" id="dhcpfirst" value="yes" <?php if ($pconfig['dhcpfirst'] == "yes") echo "checked=\"checked\"";?> /> <input name="dhcpfirst" type="checkbox" id="dhcpfirst" value="yes" <?=!empty($pconfig['dhcpfirst']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Resolve DHCP mappings first");?><br /> <div class="hidden" for="help_for_dhcpfirst">
</strong><?php printf(gettext("If this option is set, then DHCP mappings will ". <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 ". "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)."));?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td rowspan="3" width="22%" valign="top" class="vncellreq"><?=gettext("DNS Query Forwarding");?></td> <td rowspan="3"><a id="help_for_strict_order" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DNS Query Forwarding");?></td>
<td width="78%" class="vtable"><p> <td>
<input name="strict_order" type="checkbox" id="strict_order" value="yes" <?php if ($pconfig['strict_order'] == "yes") echo "checked=\"checked\"";?> /> <input name="strict_order" type="checkbox" id="strict_order" value="yes" <?=!empty($pconfig['strict_order']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Query DNS servers sequentially");?><br /> <strong><?=gettext("Query DNS servers sequentially");?></strong>
</strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ". <div class="hidden" for="help_for_strict_order">
<?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>), ". "query the DNS servers sequentially in the order specified (<i>System - General Setup - DNS Servers</i>), ".
"rather than all at once in parallel. ". "rather than all at once in parallel. ".
""), $g['product_name']); ?></p> ""), $g['product_name']); ?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="78%" class="vtable"><p> <td>
<input name="domain_needed" type="checkbox" id="domain_needed" value="yes" <?php if ($pconfig['domain_needed'] == "yes") echo "checked=\"checked\"";?> /> <input name="domain_needed" type="checkbox" id="domain_needed" value="yes" <?=!empty($pconfig['domain_needed']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Require domain");?><br /> <strong><?=gettext("Require domain");?></strong>
</strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ". <div class="hidden" for="help_for_strict_order">
<?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. ". "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. ". "If the name is not known from /etc/hosts or DHCP then a \"not found\" answer is returned. ".
""), $g['product_name']); ?></p> ""), $g['product_name']); ?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="78%" class="vtable"><p> <td>
<input name="no_private_reverse" type="checkbox" id="no_private_reverse" value="yes" <?php if ($pconfig['no_private_reverse'] == "yes") echo "checked=\"checked\"";?> /> <input name="no_private_reverse" type="checkbox" id="no_private_reverse" value="yes" <?=!empty($pconfig['no_private_reverse']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Do not forward private reverse lookups");?><br /> <strong><?=gettext("Do not forward private reverse lookups");?></strong>
</strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ". <div class="hidden" for="help_for_strict_order">
<?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. ". "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. ". "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. ". "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> ""), $g['product_name']); ?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Listen Port");?></td> <td><a id="help_for_port" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Listen Port");?></td>
<td width="78%" class="vtable"><p> <td>
<input name="port" type="text" id="port" size="6" <?php if ($pconfig['port']) echo "value=\"{$pconfig['port']}\"";?> /> <input name="port" type="text" id="port" size="6" <?=!empty($pconfig['port']) ? "value=\"{$pconfig['port']}\"" : "";?> />
<br /><br /> <div class="hidden" for="help_for_port">
<?=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> <?=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.");?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" rowspan="2" class="vncellreq"><?=gettext("Interfaces"); ?></td> <td rowspan="2"><a id="help_for_interfaces" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Interfaces"); ?></td>
<td width="78%" class="vtable"> <td>
<?php <select id="interface" name="interface[]" multiple="multiple" class="selectpicker">
$interface_addresses = get_possible_listen_ips(true); <option value="" <?=empty($pconfig['interface'][0]) ? 'selected="selected"' : ""; ?>>
$size=count($interface_addresses)+1; <?=gettext("All");?>
?> </option>
<?=gettext("Interface IPs used by the DNS Forwarder for responding to queries from clients. If an interface has both IPv4 and IPv6 IPs, both are used. Queries to other interface IPs not selected below are discarded. The default behavior is to respond to queries on every available IPv4 and IPv6 address.");?> <?php
<br /><br /> foreach (get_possible_listen_ips(true) as $laddr):?>
<select id="interface" name="interface[]" multiple="multiple" class="formselect" size="<?php echo $size; ?>"> <option value="<?=$laddr['value'];?>" <?=in_array($laddr['value'], $pconfig['interface']) ? 'selected="selected"' : "";?>>
<option value="" <?php if (empty($pconfig['interface']) || empty($pconfig['interface'][0])) echo 'selected="selected"'; ?>>All</option>
<?php foreach ($interface_addresses as $laddr):
$selected = "";
if (in_array($laddr['value'], $pconfig['interface']))
$selected = 'selected="selected"';
?>
<option value="<?=$laddr['value'];?>" <?=$selected;?>>
<?=htmlspecialchars($laddr['name']);?> <?=htmlspecialchars($laddr['name']);?>
</option> </option>
<?php endforeach; ?> <?php
endforeach; ?>
</select> </select>
<br /><br /> <div class="hidden" for="help_for_interfaces">
<?=gettext("Interface IPs used by the DNS Forwarder for responding to queries from clients. If an interface has both IPv4 and IPv6 IPs, both are used. Queries to other interface IPs not selected below are discarded. The default behavior is to respond to queries on every available IPv4 and IPv6 address.");?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="78%" class="vtable"><p> <td>
<input name="strictbind" type="checkbox" id="strictbind" value="yes" <?php if ($pconfig['strictbind'] == "yes") echo "checked=\"checked\"";?> /> <input name="strictbind" type="checkbox" id="strictbind" value="yes" <?= !empty($pconfig['strictbind']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Strict Interface Binding");?></strong> <strong><?=gettext("Strict Interface Binding");?></strong>
<br /> <div class="hidden" for="help_for_interfaces">
<?= 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."); ?> <?= 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 /> <br /><br />
<?= gettext("NOTE: This option does NOT work with IPv6. If set, dnsmasq will not bind to IPv6 addresses."); ?> <?= gettext("NOTE: This option does NOT work with IPv6. If set, dnsmasq will not bind to IPv6 addresses."); ?>
</p> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Advanced");?></td> <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Advanced");?></td>
<td width="78%" class="vtable"> <td>
<div id="showadvbox" <?php if ($pconfig['custom_options']) echo "style='display:none'"; ?>> <div id="showadvbox" <?=!empty($pconfig['custom_options']) ? "style='display:none'" : ""; ?>>
<input type="button" class="btn btn-default btn-xs" onclick="show_advanced_dns()" value="<?=gettext("Advanced"); ?>" /> - <?=gettext("Show advanced option");?> <input type="button" class="btn btn-default btn-xs" onclick="show_advanced_dns()" value="<?=gettext("Advanced"); ?>" /> - <?=gettext("Show advanced option");?>
</div> </div>
<div id="showadv" <?php if (empty($pconfig['custom_options'])) echo "style='display:none'"; ?>> <div id="showadv" <?=empty($pconfig['custom_options']) ? "style='display:none'" : ""; ?>>
<strong><?=gettext("Advanced");?><br /></strong> <strong><?=gettext("Advanced");?><br /></strong>
<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br /> <textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=$pconfig['custom_options'];?></textarea><br />
<?=gettext("Enter any additional options you would like to add to the dnsmasq configuration here, separated by a space or newline"); ?><br /> <?=gettext("Enter any additional options you would like to add to the dnsmasq configuration here, separated by a space or newline"); ?><br />
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<input name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" onclick="enable_change(true)" /> <input name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<p><span class="vexpl"><span class="text-danger"><strong><?=gettext("Note:");?><br /> <p><span class="vexpl"><span class="text-danger"><strong><?=gettext("Note:");?><br />
</strong></span><?php printf(gettext("If the DNS forwarder is enabled, the DHCP". </strong></span><?php printf(gettext("If the DNS forwarder is enabled, the DHCP".
...@@ -342,149 +387,124 @@ function show_advanced_dns() { ...@@ -342,149 +387,124 @@ function show_advanced_dns() {
'<a href="system_general.php">','</a>','<a href="system_general.php">','</a>');?><br /> '<a href="system_general.php">','</a>','<a href="system_general.php">','</a>');?><br />
</span></p> </span></p>
</div> </div>
</form>
<div class="table-responsive">
<table class="table table-striped table-sort">
<tr>
<td><?=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>
</div> </div>
</section>
<section class="col-xs-12">
<div class="content-box content-box-main">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<td width="20%" class="listhdrr"><?=gettext("Host");?></td> <th colspan="5"><?=gettext("Host Overrides");?></th>
<td width="25%" class="listhdrr"><?=gettext("Domain");?></td>
<td width="20%" class="listhdrr"><?=gettext("IP");?></td>
<td width="25%" class="listhdr"><?=gettext("Description");?></td>
<td width="10%" class="list">
<table border="0" cellspacing="0" cellpadding="1" summary="icons">
<tr>
<td width="17"></td>
<td valign="middle"><a href="services_dnsmasq_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a></td>
</tr> </tr>
</table> <tr>
</td> <th><?=gettext("Host");?></th>
<th><?=gettext("Domain");?></th>
<th><?=gettext("IP");?></th>
<th><?=gettext("Description");?></th>
<th>
<a href="services_dnsmasq_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $i = 0; foreach ($a_hosts as $hostent): ?> <?php
$i = 0;
foreach ($config['dnsmasq']['hosts'] as $hostent): ?>
<tr> <tr>
<td class="listlr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';"> <td><?=htmlspecialchars(strtolower($hostent['host']));?></td>
<?=strtolower($hostent['host']);?>&nbsp; <td><?=htmlspecialchars(strtolower($hostent['domain']));?></td>
</td> <td><?=htmlspecialchars($hostent['ip']);?></td>
<td class="listr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';"> <td><?=htmlspecialchars($hostent['descr']);?></td>
<?=strtolower($hostent['domain']);?>&nbsp; <td>
</td> <a href="services_dnsmasq_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
<td class="listr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';"> <a href="#" data-id="<?=$i;?>" class="act_delete_host"><button type="button" class="btn btn-xs btn-default"><span class="fa fa-trash text-muted"></span></button></a>
<?=$hostent['ip'];?>&nbsp;
</td>
<td class="listbg" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
<?=htmlspecialchars($hostent['descr']);?>&nbsp;
</td> </td>
<td valign="middle" class="list nowrap">
<table border="0" cellspacing="0" cellpadding="1" summary="icons">
<tr>
<td valign="middle"><a href="services_dnsmasq_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></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?");?>')" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a></td>
</tr>
</table>
</tr> </tr>
<?php if (isset($hostent['aliases']['item'])): ?> <?php
<?php foreach ($hostent['aliases']['item'] as $alias): ?> if (isset($hostent['aliases']['item'])):
foreach ($hostent['aliases']['item'] as $alias): ?>
<tr> <tr>
<td class="listlr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';"> <td><?=htmlspecialchars(strtolower($alias['host']));?></td>
<?=strtolower($alias['host']);?>&nbsp; <td><?=htmlspecialchars(strtolower($alias['domain']));?></td>
</td> <td><?=gettext("Alias for");?> <?=$hostent['host'] ? htmlspecialchars($hostent['host'] . '.' . $hostent['domain']) : htmlspecialchars($hostent['domain']);?></td>
<td class="listr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';"> <td><?=htmlspecialchars($alias['description']);?></td>
<?=strtolower($alias['domain']);?>&nbsp; <td>
</td>
<td class="listr" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
Alias for <?=$hostent['host'] ? $hostent['host'] . '.' . $hostent['domain'] : $hostent['domain'];?>&nbsp;
</td>
<td class="listbg" ondblclick="document.location='services_dnsmasq_edit.php?id=<?=$i;?>';">
<?=htmlspecialchars($alias['description']);?>&nbsp;
</td>
<td valign="middle" class="list nowrap">
<a href="services_dnsmasq_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a> <a href="services_dnsmasq_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php
<?php endif; ?> endforeach;
<?php $i++; endforeach; ?> endif; ?>
<tr style="display:none"><td></td></tr>
</tbody>
</table>
</div>
<div class="table-responsive"> <?php
<table class="table table-striped table-sort"> ++$i;
<tr> endforeach;?>
<td colspan="5" valign="top" class="listtopic"><?=gettext("Domain Overrides");?></td> </tbody>
</tr> <tfoot>
<tr> <tr>
<td><p><?=gettext("Entries in this area override an entire domain, and subdomains, by specifying an". <td colspan="5">
" authoritative DNS server to be queried for that domain.");?></p></td> <?=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>
</tfoot>
</table> </table>
</div>
</div>
<table class="table table-striped table-sort"> </section>
<section class="col-xs-12">
<div class="content-box content-box-main">
<div class="table-responsive">
<table class="table table-striped">
<thead> <thead>
<tr> <tr>
<td width="35%" class="listhdrr"><?=gettext("Domain");?></td> <th colspan="4"><?=gettext("Domain Overrides");?></th>
<td width="20%" class="listhdrr"><?=gettext("IP");?></td>
<td width="35%" class="listhdr"><?=gettext("Description");?></td>
<td width="10%" 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" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a></td>
</tr> </tr>
</table> <tr>
</td> <th><?=gettext("Domain");?></th>
<th><?=gettext("IP");?></th>
<th><?=gettext("Description");?></th>
<th>
<a href="services_dnsmasq_domainoverride_edit.php" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-plus"></span>
</a>
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $i = 0; foreach ($a_domainOverrides as $doment): ?> <?php
$i = 0;
foreach ($config['dnsmasq']['domainoverrides'] as $doment): ?>
<tr> <tr>
<td class="listlr"> <td><?=htmlspecialchars(strtolower($doment['domain']));?></td>
<?=strtolower($doment['domain']);?>&nbsp; <td><?=htmlspecialchars($doment['ip']);?></td>
<td><?=htmlspecialchars($doment['descr']);?></td>
<td>
<a href="services_dnsmasq_domainoverride_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="#" data-id="<?=$i;?>" class="act_delete_override"><button type="button" class="btn btn-xs btn-default"><span class="fa fa-trash text-muted"></span></button></a>
</td> </td>
<td class="listr">
<?=$doment['ip'];?>&nbsp;
</td>
<td class="listbg">
<?=htmlspecialchars($doment['descr']);?>&nbsp;
</td>
<td valign="middle" class="list nowrap"> <a href="services_dnsmasq_domainoverride_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></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?");?>')" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a></td>
</tr> </tr>
<?php $i++; endforeach; ?> <?php
<tr style="display:none"><td></td></tr> $i++;
endforeach; ?>
</tbody> </tbody>
<tfoot>
<tr>
<td colspan="4">
<?=gettext("Entries in this area override an entire domain, and subdomains, by specifying an"." authoritative DNS server to be queried for that domain.");?>
</td>
</tr>
</tfoot>
</table> </table>
</div> </div>
</div> </div>
</form>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<script type="text/javascript">
//<![CDATA[
enable_change(false);
//]]>
</script>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023