Skip to content

O
OpnSense
Commit 674fa982 authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

(legacy) refactor services_dnsmasq_edit.php

parent 9fe3e401
Show whitespace changes
Inline Side-by-side
Showing with 272 additions and 281 deletions
src/www/services_dnsmasq_edit.php
View file @ 674fa982
<?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.
...@@ -36,267 +36,258 @@ function hostcmp($a, $b) ...@@ -36,267 +36,258 @@ function hostcmp($a, $b)
return strcasecmp($a['host'], $b['host']); return strcasecmp($a['host'], $b['host']);
} }
function hosts_sort() if (empty($config['dnsmasq']['hosts']) || !is_array($config['dnsmasq']['hosts'])) {
{
global $config;
if (!isset($config['dnsmasq']['hosts'])) {
return;
}
usort($config['dnsmasq']['hosts'], "hostcmp");
}
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
if (!is_array($config['dnsmasq']['hosts']))
$config['dnsmasq']['hosts'] = array(); $config['dnsmasq']['hosts'] = array();
}
$a_hosts = &$config['dnsmasq']['hosts']; $a_hosts = &$config['dnsmasq']['hosts'];
if (is_numericint($_GET['id'])) if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (isset($_GET['id']) && !empty($a_hosts[$_GET['id']])) {
$id = $_GET['id']; $id = $_GET['id'];
if (isset($_POST['id']) && is_numericint($_POST['id'])) }
$id = $_POST['id']; $config_copy_fieldnames = array('host', 'domain', 'ip', 'descr', 'aliases');
foreach ($config_copy_fieldnames as $fieldname) {
if (isset($id) && $a_hosts[$id]) { if (isset($id) && isset($a_hosts[$id][$fieldname])) {
$pconfig['host'] = $a_hosts[$id]['host']; $pconfig[$fieldname] = $a_hosts[$id][$fieldname];
$pconfig['domain'] = $a_hosts[$id]['domain']; } else {
$pconfig['ip'] = $a_hosts[$id]['ip']; $pconfig[$fieldname] = null;
$pconfig['descr'] = $a_hosts[$id]['descr']; }
$pconfig['aliases'] = $a_hosts[$id]['aliases']; }
}
if ($_POST) {
unset($input_errors); } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (isset($_POST['id']) && !empty($a_hosts[$_POST['id']])) {
$id = $_POST['id'];
}
$input_errors = array();
$pconfig = $_POST; $pconfig = $_POST;
$pconfig['aliases'] = array();
if (isset($pconfig['aliases_host'])) {
$pconfig['aliases']['item'] = array();
foreach ($pconfig['aliases_host'] as $opt_seq => $opt_host) {
if (!empty($opt_host)) {
$pconfig['aliases']['item'][] = array('host' => $opt_host,
'domain' => $pconfig['aliases_domain'][$opt_seq],
'description' => $pconfig['aliases_description'][$opt_seq]
);
}
}
}
/* input validation */ /* input validation */
$reqdfields = explode(" ", "domain ip"); $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); do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
if (($_POST['host'] && !is_hostname($_POST['host']))) if (!empty($pconfig['host']) && !is_hostname($pconfig['host'])) {
$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'."); $input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
}
if (($_POST['domain'] && !is_domain($_POST['domain']))) if (!empty($pconfig['domain']) && !is_domain($pconfig['domain'])) {
$input_errors[] = gettext("A valid domain must be specified."); $input_errors[] = gettext("A valid domain must be specified.");
}
if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) if (!empty($pconfig['ip']) && !is_ipaddr($pconfig['ip'])) {
$input_errors[] = gettext("A valid IP address must be specified."); $input_errors[] = gettext("A valid IP address must be specified.");
/* collect aliases */
$aliases = array();
foreach ($_POST as $key => $value) {
$entry = '';
if (!substr_compare('aliashost', $key, 0, 9)) {
$entry = substr($key, 9);
$field = 'host';
}
elseif (!substr_compare('aliasdomain', $key, 0, 11)) {
$entry = substr($key, 11);
$field = 'domain';
} }
elseif (!substr_compare('aliasdescription', $key, 0, 16)) {
$entry = substr($key, 16);
$field = 'description';
}
if (ctype_digit($entry)) {
$aliases[$entry][$field] = $value;
}
}
$pconfig['aliases']['item'] = $aliases;
/* validate aliases */ /* validate aliases */
foreach ($aliases as $idx => $alias) { foreach ($pconfig['aliases']['item'] as $idx => $alias) {
$aliasreqdfields = array('aliasdomain' . $idx); $aliasreqdfields = array('domain');
$aliasreqdfieldsn = array(gettext("Alias Domain")); $aliasreqdfieldsn = array(gettext("Alias Domain"));
//var_dump(array('fields' => $aliasreqdfields, 'names' => $aliasreqdfieldsn, 'alias' => $alias)); do_input_validation($alias, $aliasreqdfields, $aliasreqdfieldsn, $input_errors);
do_input_validation($_POST, $aliasreqdfields, $aliasreqdfieldsn, $input_errors); if (!empty($alias['host']) && !is_hostname($alias['host'])) {
if (($alias['host'] && !is_hostname($alias['host']))) {
$input_errors[] = gettext("Hostnames in alias list can only contain the characters A-Z, 0-9 and '-'."); $input_errors[] = gettext("Hostnames in alias list can only contain the characters A-Z, 0-9 and '-'.");
} }
if (($alias['domain'] && !is_domain($alias['domain']))) { if (!empty($alias['domain']) && !is_domain($alias['domain'])) {
$input_errors[] = gettext("A valid domain must be specified in alias list."); $input_errors[] = gettext("A valid domain must be specified in alias list.");
} }
} }
/* check for overlaps */ /* check for overlaps */
foreach ($a_hosts as $hostent) { foreach ($a_hosts as $hostent) {
if (isset($id) && ($a_hosts[$id]) && ($a_hosts[$id] === $hostent)) if (isset($id) && $a_hosts[$id] === $hostent) {
continue; continue;
}
if (($hostent['host'] == $_POST['host']) && ($hostent['domain'] == $_POST['domain']) if (($hostent['host'] == $pconfig['host']) && ($hostent['domain'] == $pconfig['domain'])
&& ((is_ipaddrv4($hostent['ip']) && is_ipaddrv4($_POST['ip'])) || (is_ipaddrv6($hostent['ip']) && is_ipaddrv6($_POST['ip'])))) { && ((is_ipaddrv4($hostent['ip']) && is_ipaddrv4($pconfig['ip'])) || (is_ipaddrv6($hostent['ip']) && is_ipaddrv6($pconfig['ip'])))) {
$input_errors[] = gettext("This host/domain already exists."); $input_errors[] = gettext("This host/domain already exists.");
break; break;
} }
} }
if (!$input_errors) { if (count($input_errors) == 0) {
$hostent = array(); $hostent = array();
$hostent['host'] = $_POST['host']; $hostent['host'] = $pconfig['host'];
$hostent['domain'] = $_POST['domain']; $hostent['domain'] = $pconfig['domain'];
$hostent['ip'] = $_POST['ip']; $hostent['ip'] = $pconfig['ip'];
$hostent['descr'] = $_POST['descr']; $hostent['descr'] = $pconfig['descr'];
$hostent['aliases']['item'] = $aliases; $hostent['aliases'] = $pconfig['aliases'];
if (isset($id) && $a_hosts[$id]) if (isset($id)) {
$a_hosts[$id] = $hostent; $a_hosts[$id] = $hostent;
else } else {
$a_hosts[] = $hostent; $a_hosts[] = $hostent;
hosts_sort(); }
usort($config['dnsmasq']['hosts'], "hostcmp");
mark_subsystem_dirty('hosts'); mark_subsystem_dirty('hosts');
write_config(); write_config();
header("Location: services_dnsmasq.php"); header("Location: services_dnsmasq.php");
exit; exit;
} }
} }
$service_hook = 'dnsmasq';
include("head.inc");
$service_hook = 'dnsmasq';
legacy_html_escape_form_data($pconfig);
include("head.inc");
?> ?>
<body> <body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<script type="text/javascript" src="/javascript/row_helper.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ $( document ).ready(function() {
rowname[0] = "aliashost"; /**
rowtype[0] = "textbox"; * Aliases
rowsize[0] = "20"; */
rowname[1] = "aliasdomain"; function removeRow() {
rowtype[1] = "textbox"; if ( $('#aliases_table > tbody > tr').length == 1 ) {
rowsize[1] = "20"; $('#aliases_table > tbody > tr:last > td > input').each(function(){
rowname[2] = "aliasdescription"; $(this).val("");
rowtype[2] = "textbox"; });
rowsize[2] = "20"; } else {
//]]> $(this).parent().parent().remove();
}
}
// add new detail record
$("#addNew").click(function(){
// copy last row and reset values
$('#aliases_table > tbody').append('<tr>'+$('#aliases_table > tbody > tr:last').html()+'</tr>');
$('#aliases_table > tbody > tr:last > td > input').each(function(){
$(this).val("");
});
$(".act-removerow").click(removeRow);
});
$(".act-removerow").click(removeRow);
});
</script> </script>
<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); ?>
<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_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped">
<tr>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Edit DNS Forwarder entry");?></td>
</tr>
<tr> <tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Host");?></td> <td width="22%"><strong><?=gettext("Edit DNS Forwarder entry");?></strong></td>
<td width="78%" class="vtable"> <td width="78%" align="right">
<input name="host" type="text" class="formfld" id="host" size="40" value="<?=htmlspecialchars($pconfig['host']);?>" /> <small><?=gettext("full help"); ?> </small>
<br /> <span class="vexpl"><?=gettext("Name of the host, without". <i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i></a>
" domain part"); ?><br /> </td>
<?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em></span></td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td> <td><a id="help_for_host" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Host");?></td>
<td width="78%" class="vtable"> <td>
<input name="domain" type="text" class="formfld" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>" /> <input name="host" type="text" id="host" value="<?=$pconfig['host'];?>" />
<br /> <span class="vexpl"><?=gettext("Domain of the host"); ?><br /> <div class="hidden" for="help_for_host">
<?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em></span></td> <?=gettext("Name of the host, without"." domain part"); ?><br />
<?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em>
</div>
</td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td> <td><a id="help_for_domain" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Domain");?></td>
<td width="78%" class="vtable"> <td>
<input name="ip" type="text" class="formfld" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>" /> <input name="domain" type="text" id="domain" value="<?=$pconfig['domain'];?>" />
<br /> <span class="vexpl"><?=gettext("IP address of the host"); ?><br /> <div class="hidden" for="help_for_domain">
<?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em></span></td> <?=gettext("Domain of the host"); ?><br />
<?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em>
</div>
</td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> <td><a id="help_for_ip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("IP address");?></td>
<td width="78%" class="vtable"> <td>
<input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" /> <input name="ip" type="text" id="ip" value="<?=$pconfig['ip'];?>" />
<br /> <span class="vexpl"><?=gettext("You may enter a description here". <div class="hidden" for="help_for_ip">
" for your reference (not parsed).");?></span></td> <?=gettext("IP address of the host"); ?><br />
<?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em><
</div>
</td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncell"><div id="addressnetworkport"><?=gettext("Aliases"); ?></div></td> <td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description");?></td>
<td width="78%" class="vtable"> <td>
<table id="maintable" summary="aliases"> <input name="descr" type="text" id="descr" value="<?=$pconfig['descr'];?>" />
<tbody> <div class="hidden" for="help_for_descr">
<tr> <?=gettext("You may enter a description here"." for your reference (not parsed).");?>
<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> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><div id="onecolumn"><?=gettext("Host");?></div></td> <td><a id="help_for_alias" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Aliases"); ?></td>
<td><div id="twocolumn"><?=gettext("Domain");?></div></td> <td>
<td><div id="threecolumn"><?=gettext("Description");?></div></td> <table class="table table-striped table-condensed" id="aliases_table">
<thead>
<tr>
<th></th>
<th id="detailsHeading1"><?=gettext("Host"); ?></th>
<th id="detailsHeading3"><?=gettext("Domain"); ?></th>
<th id="updatefreqHeader" ><?=gettext("Description");?></th>
</tr> </tr>
<?php </thead>
$counter = 0; <tbody>
if (isset($pconfig['aliases']['item'])): <?php
foreach($pconfig['aliases']['item'] as $item): if (empty($pconfig['aliases']['item'])) {
$host = $item['host']; $aliases = array();
$domain = $item['domain']; $aliases[] = array('number' => null, 'value' => null, 'type' => null);
$description = $item['description']; } else {
?> $aliases = $pconfig['aliases']['item'];
}
foreach($aliases as $item):?>
<tr> <tr>
<td> <td>
<input autocomplete="off" name="aliashost<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliashost<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($host);?>" /> <div style="cursor:pointer;" class="act-removerow btn btn-default btn-xs" alt="remove"><span class="glyphicon glyphicon-minus"></span></div>
</td> </td>
<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);?>" /> <input name="aliases_host[]" type="text" value="<?=$item['host'];?>" />
</td> </td>
<td> <td>
<input name="aliasdescription<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdescription<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($description);?>" /> <input name="aliases_domain[]" type="text" value="<?=$item['domain'];?>" />
</td> </td>
<td> <td>
<a onclick="removeRow(this); return false;" href="#" title="<?=gettext("remove this entry"); ?>"> <input name="aliases_description[]" type="text" value="<?=$item['description'];?>" />
<div style="cursor:pointer;" class="act-removerow btn btn-default btn-xs" alt="remove"><span class="glyphicon glyphicon-minus"></span></div>
</a>
</td> </td>
</tr> </tr>
<?php <?php
$counter++; endforeach;?>
endforeach;
endif;
?>
</tbody> </tbody>
<tfoot>
<tr>
<td colspan="4">
<div id="addNew" style="cursor:pointer;" class="btn btn-default btn-xs" alt="add"><span class="glyphicon glyphicon-plus"></span></div>
</td>
</tr>
</tfoot>
</table> </table>
<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a> <div class="hidden" for="help_for_alias">
<script type="text/javascript"> <?=gettext("Enter additional names for this host."); ?>
//<![CDATA[ </div>
field_counter_js = 3;
rows = 1;
totalrows = <?php echo $counter; ?>;
loaded = <?php echo $counter; ?>;
//]]>
</script>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top">&nbsp;</td> <td>&nbsp;</td>
<td width="78%"> <td>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" /> <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" />
<input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" /> <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');?>'" />
<?php if (isset($id) && $a_hosts[$id]): ?> <?php if (isset($id)): ?>
<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" /> <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
<?php endif; ?> <?php endif; ?>
</td> </td>
...@@ -308,6 +299,6 @@ include("head.inc"); ...@@ -308,6 +299,6 @@ include("head.inc");
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?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