Skip to content

O
OpnSense
Commit 8b43d302 authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner
Browse files
Options

(legacy) refactor services_unbound_overrides.php 

(cherry picked from commit c3049819)
parent f1c67535
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 237 deletions
src/www/services_unbound_overrides.php
View file @ 8b43d302
......@@ -2,7 +2,7 @@
/*
Copyright (C) 2015 Manuel Faux <mfaux@conf.at>
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2014 Warren Baker <warren@pfsense.org>
All rights reserved.
......@@ -35,128 +35,150 @@ require_once("system.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");
if (!is_array($config['unbound']))
if (empty($config['unbound']) || !is_array($config['unbound'])) {
$config['unbound'] = array();
$a_unboundcfg =& $config['unbound'];
}
if (!is_array($config['unbound']['hosts']))
if (empty($config['unbound']['hosts']) || !is_array($config['unbound']['hosts'])) {
$config['unbound']['hosts'] = array();
}
$a_hosts =& $config['unbound']['hosts'];
/* Backwards compatibility for records created before introducing RR types. */
foreach ($a_hosts as $i => $hostent) {
if (!isset($hostent['rr'])) {
$a_hosts[$i]['rr'] = (is_ipaddrv6($hostent['ip'])) ? 'AAAA' : 'A';
$a_hosts[$i]['rr'] = is_ipaddrv6($hostent['ip']) ? 'AAAA' : 'A';
}
}
if (!is_array($config['unbound']['domainoverrides']))
if (empty($config['unbound']['domainoverrides']) || !is_array($config['unbound']['domainoverrides'])) {
$config['unbound']['domainoverrides'] = array();
$a_domainOverrides = &$config['unbound']['domainoverrides'];
if ($_POST) {
unset($input_errors);
}
if ($_POST['apply']) {
$retval = services_unbound_configure();
$savemsg = get_std_save_message();
if ($retval == 0) {
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$pconfig = $_POST;
if (!empty($pconfig['apply'])) {
services_unbound_configure();
clear_subsystem_dirty('unbound');
}
/* Update resolv.conf in case the interface bindings exclude localhost. */
system_resolvconf_generate();
}
}
if ($_GET['act'] == "del") {
if ($_GET['type'] == 'host') {
if ($a_hosts[$_GET['id']]) {
unset($a_hosts[$_GET['id']]);
header("Location: services_unbound_overrides.php");
exit;
} elseif (!empty($pconfig['act']) && $pconfig['act'] == 'del') {
if (isset($pconfig['id']) && !empty($a_hosts[$pconfig['id']])) {
unset($a_hosts[$pconfig['id']]);
write_config();
mark_subsystem_dirty('unbound');
header("Location: services_unbound_overrides.php");
exit;
}
} elseif ($_GET['type'] == 'doverride') {
if ($a_domainOverrides[$_GET['id']]) {
unset($a_domainOverrides[$_GET['id']]);
} elseif (!empty($pconfig['act']) && $pconfig['act'] == 'doverride') {
$a_domainOverrides = &$config['unbound']['domainoverrides'];
if (isset($pconfig['id']) && !empty($a_domainOverrides[$pconfig['id']])) {
unset($a_domainOverrides[$pconfig['id']]);
write_config();
mark_subsystem_dirty('unbound');
header("Location: services_unbound_overrides.php");
exit;
}
}
}
$service_hook = 'unbound';
legacy_html_escape_form_data($a_hosts);
include_once("head.inc");
?>
<body>
<?php include("fbegin.inc"); ?>
<script type="text/javascript">
$( 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 Resolver");?>",
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 Resolver");?>",
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>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<?php if (isset($savemsg)) print_info_box($savemsg); ?>
<?php if (is_subsystem_dirty('unbound')): ?><br/>
<?php print_info_box_apply(gettext("The configuration for the DNS Resolver, has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
<?php endif; ?>
<form action="services_unbound_overrides.php" method="post" name="iform" id="iform" onsubmit="presubmit()">
<form method="post" name="iform" id="iform">
<section class="col-xs-12">
<div class="content-box">
<header class="content-box-head container-fluid">
<h3><?=gettext("Host Overrides");?></h3>
</header>
<div class="content-box-main col-xs-12">
<?=gettext("Entries in this section override individual results from the forwarders.");?>
<?=gettext("Use these for changing DNS results or for adding custom DNS records.");?>
<?=gettext("Keep in mind that all resource record types (i.e. A, AAAA, MX, etc. records) of a specified host below are being overwritten.");?>
</div>
<div class="content-box-main col-xs-12">
<div class="table-responsive">
<table class="table table-striped table-sort">
<table class="table table-striped">
<thead>
<tr>
<td width="20%" class="listhdrr"><?=gettext("Host");?></td>
<td width="20%" class="listhdrr"><?=gettext("Domain");?></td>
<td width="5%" class="listhdrr"><?=gettext("Type");?></td>
<td width="20%" class="listhdrr"><?=gettext("Value");?></td>
<td width="30%" class="listhdr"><?=gettext("Description");?></td>
<td width="5%" class="list">
<table border="0" cellspacing="0" cellpadding="1" summary="add">
<tr>
<td width="17"></td>
<td valign="middle"><a href="services_unbound_host_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a></td>
<th colspan="6"><?=gettext("Host Overrides");?></th>
</tr>
</table>
</td>
<tr>
<th><?=gettext("Host");?></th>
<th><?=gettext("Domain");?></th>
<th><?=gettext("Type");?></th>
<th><?=gettext("Value");?></th>
<th><?=gettext("Description");?></th>
<th>
<a href="services_unbound_host_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
</th>
</tr>
</thead>
<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_unbound_host_edit.php?id=<?=$i;?>';">
<?=strtolower($hostent['host']);?>&nbsp;
</td>
<td class="listr" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';">
<?=strtolower($hostent['domain']);?>&nbsp;
</td>
<td class="listr" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';">
<?=strtoupper($hostent['rr']);?>&nbsp;
</td>
<td class="listr" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';">
<?php
<td><?=strtolower($hostent['host']);?></td>
<td><?=strtolower($hostent['domain']);?></td>
<td><?=strtoupper($hostent['rr']);?></td>
<td>
<?php
/* Presentation of DNS value differs between chosen RR type. */
switch ($hostent['rr']) {
case 'A':
......@@ -169,101 +191,83 @@ include_once("head.inc");
default:
print '&nbsp;';
break;
}
?>
}?>
</td>
<td class="listbg" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';">
<?=htmlspecialchars($hostent['descr']);?>&nbsp;
<td><?=$hostent['descr'];?></td>
<td>
<a href="services_unbound_host_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_host"><button type="button" class="btn btn-xs btn-default"><span class="fa fa-trash text-muted"></span></button></a>
</td>
<td valign="middle" class="list nowrap">
<table border="0" cellspacing="0" cellpadding="1" summary="icons">
<tr>
<td valign="middle"><a href="services_unbound_host_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a></td>
<td><a href="services_unbound_overrides.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>
<?php $i++; endforeach; ?>
<tr style="display:none"><td></td></tr>
<?php
$i++;
endforeach; ?>
</tbody>
<tfoot>
<tr>
<td colspan="6">
<?=gettext("Entries in this section override individual results from the forwarders.");?>
<?=gettext("Use these for changing DNS results or for adding custom DNS records.");?>
<?=gettext("Keep in mind that all resource record types (i.e. A, AAAA, MX, etc. records) of a specified host below are being overwritten.");?>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
</section>
<section class="col-xs-12">
<div class="content-box">
<header class="content-box-head container-fluid">
<h3><?=gettext("Domain Overrides");?></h3>
</header>
<div class="content-box-main col-xs-12">
<p><?=gettext("Entries in this area override an entire domain by specifying an".
" authoritative DNS server to be queried for that domain.");?></p>
</div>
<div class="content-box-main col-xs-12">
<div class="table-responsive">
<table class="table table-striped table-sort"><thead>
<tr>
<td width="35%" class="listhdrr"><?=gettext("Domain");?></td>
<td width="20%" class="listhdrr"><?=gettext("IP");?></td>
<td width="40%" class="listhdr"><?=gettext("Description");?></td>
<td width="5%" class="list">
<table border="0" cellspacing="0" cellpadding="1" summary="add">
<table class="table table-striped">
<thead>
<tr>
<td width="17" height="17"></td>
<td><a href="services_unbound_domainoverride_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a></td>
<th colspan="4">
<?=gettext("Domain Overrides");?>
</th>
</tr>
</table>
</td>
<tr>
<th><?=gettext("Domain");?></th>
<th><?=gettext("IP");?></th>
<th><?=gettext("Description");?></th>
<th>
<a href="services_unbound_domainoverride_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
</th>
</tr>
</thead>
<tbody>
<?php $i = 0; foreach ($a_domainOverrides as $doment): ?>
<?php
$i = 0;
foreach ($config['unbound']['domainoverrides'] as $doment): ?>
<tr>
<td class="listlr" ondblclick="document.location='services_unbound_domainoverride_edit.php?id=<?=$i;?>';">
<?=strtolower($doment['domain']);?>&nbsp;
</td>
<td class="listr" ondblclick="document.location='services_unbound_domainoverride_edit.php?id=<?=$i;?>';">
<?=$doment['ip'];?>&nbsp;
</td>
<td class="listbg" ondblclick="document.location='services_unbound_domainoverride_edit.php?id=<?=$i;?>';">
<?=htmlspecialchars($doment['descr']);?>&nbsp;
<td><?=strtolower(htmlspecialchars($doment['domain']));?></td>
<td><?=htmlspecialchars($doment['ip']);?></td>
<td><?=htmlspecialchars($doment['descr']);?></td>
<td>
<a href="services_unbound_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 valign="middle" class="list nowrap">
<table border="0" cellspacing="0" cellpadding="1" summary="icons">
<tr>
<td valign="middle"><a href="services_unbound_domainoverride_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a></td>
<td valign="middle"><a href="services_unbound_overrides.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>
</table>
<?php
$i++;
endforeach; ?>
</tbody>
<tfoot>
<tr>
<td colspan="4">
<?=gettext("Entries in this area override an entire domain by specifying an"." authoritative DNS server to be queried for that domain.");?>
</td>
</tr>
<?php $i++; endforeach; ?>
<tr style="display:none"><td></td></tr>
</tbody>
</tfoot>
</table>
</div>
</div>
</div>
</section>
</form>
</div>
</div>
</section>
<script type="text/javascript">
//<![CDATA[
enable_change(false);
//]]>
</script>
<?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