Reference correct unbound hosts edit file

2 files changed, 311 insertions, 9 deletions

diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php
index bd1c00b..b81d60f 100644
--- a/usr/local/www/services_unbound.php
+++ b/usr/local/www/services_unbound.php
@@ -28,7 +28,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-	pfSense_MODULE:	dnscache
+	pfSense_MODULE:	dnsresolver
 */
 
 ##|+PRIV
@@ -103,6 +103,8 @@ if ($_POST) {
 		$retval = 0;
 		$retval = services_unbound_configure();
 		$savemsg = get_std_save_message($retval);
+		if ($retval == 0)
+			clear_subsystem_dirty('unbound_hosts');
 	}
 }
 
@@ -130,7 +132,7 @@ function show_advanced_dns() {
 <form action="services_unbound.php" method="post" name="iform" id="iform">
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (is_subsystem_dirty('hosts')): ?><p>
+<?php if (is_subsystem_dirty('unbound_hosts')): ?><p>
 <?php print_info_box_np(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; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="services unbound">
@@ -328,7 +330,7 @@ function show_advanced_dns() {
 			<table border="0" cellspacing="0" cellpadding="1">
 				<tr>
 					<td width="17"></td>
-					<td valign="middle"><a href="services_unbound_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+					<td valign="middle"><a href="services_unbound_host_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
 				</tr>
 			</table>
 		</td>
@@ -337,22 +339,22 @@ function show_advanced_dns() {
 	<tbody>
 	<?php $i = 0; foreach ($a_hosts as $hostent): ?>
 	<tr>
-		<td class="listlr" ondblclick="document.location='services_unbound_edit.php?id=<?=$i;?>';">
+		<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_edit.php?id=<?=$i;?>';">
+		<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_edit.php?id=<?=$i;?>';">
+		<td class="listr" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';">
 			<?=$hostent['ip'];?>&nbsp;
 		</td>
-		<td class="listbg" ondblclick="document.location='services_unbound_edit.php?id=<?=$i;?>';">
+		<td class="listbg" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';">
 			<?=htmlspecialchars($hostent['descr']);?>&nbsp;
 		</td>
 		<td valign="middle" nowrap class="list">
 			<table border="0" cellspacing="0" cellpadding="1">
 				<tr>
-					<td valign="middle"><a href="services_unbound_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
+					<td valign="middle"><a href="services_unbound_host_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
 					<td><a href="services_unbound.php?type=host&act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
 				</tr>
 			</table>
@@ -366,7 +368,7 @@ function show_advanced_dns() {
 			<table border="0" cellspacing="0" cellpadding="1">
 				<tr>
 					<td width="17"></td>
-					<td valign="middle"><a href="services_unbound_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+					<td valign="middle"><a href="services_unbound_host_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
 				</tr>
 			</table>
 		</td>
diff --git a/usr/local/www/services_unbound_host_edit.php b/usr/local/www/services_unbound_host_edit.php
new file mode 100644
index 0000000..73bc6e5
--- /dev/null
+++ b/usr/local/www/services_unbound_host_edit.php
@@ -0,0 +1,300 @@
+<?php 
+/* $Id$ */
+/*
+	services_unbound_edit_host.php
+	part of the pfSense project (https://www.pfsense.org)
+	Copyright (C) 2014	Warren Baker (warren@pfsense.org)
+	All rights reserved.
+	
+	Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>.
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+	
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+	
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+	
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/*
+	pfSense_MODULE:	dnsforwarder
+*/
+
+##|+PRIV
+##|*IDENT=page-services-dnsresolver-edithost
+##|*NAME=Services: DNS Forwarder: Edit host page
+##|*DESCR=Allow access to the 'Services: DNS Forwarder: Edit host' page.
+##|*MATCH=services_dnsmasq_edit.php*
+##|-PRIV
+
+function hostcmp($a, $b) {
+	return strcasecmp($a['host'], $b['host']);
+}
+
+function hosts_sort() {
+	global $g, $config;
+
+	if (!is_array($config['unbound']['hosts']))
+		return;
+
+	usort($config['unbound']['hosts'], "hostcmp");
+}
+
+require("guiconfig.inc");
+
+if (!is_array($config['unbound']['hosts'])) 
+	$config['unbound']['hosts'] = array();
+
+$a_hosts = &$config['unbound']['hosts'];
+
+if (is_numericint($_GET['id']))
+	$id = $_GET['id'];
+if (isset($_POST['id']) && is_numericint($_POST['id']))
+	$id = $_POST['id'];
+
+if (isset($id) && $a_hosts[$id]) {
+	$pconfig['host'] = $a_hosts[$id]['host'];
+	$pconfig['domain'] = $a_hosts[$id]['domain'];
+	$pconfig['ip'] = $a_hosts[$id]['ip'];
+	$pconfig['descr'] = $a_hosts[$id]['descr'];
+	$pconfig['aliases'] = $a_hosts[$id]['aliases'];
+}
+
+if ($_POST) {
+
+	unset($input_errors);
+	$pconfig = $_POST;
+
+	/* input validation */
+	$reqdfields = explode(" ", "domain ip");
+	$reqdfieldsn = array(gettext("Domain"),gettext("IP address"));
+	
+	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+	
+	if (($_POST['host'] && !is_hostname($_POST['host']))) 
+		$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
+
+	if (($_POST['domain'] && !is_domain($_POST['domain']))) 
+		$input_errors[] = gettext("A valid domain must be specified.");
+		
+	if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) 
+		$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 */
+	foreach ($aliases as $idx => $alias) {
+		$aliasreqdfields = array('aliasdomain' . $idx);
+		$aliasreqdfieldsn = array(gettext("Alias Domain"));
+
+		var_dump(array('fields' => $aliasreqdfields, 'names' => $aliasreqdfieldsn, 'alias' => $alias));
+		do_input_validation($_POST, $aliasreqdfields, $aliasreqdfieldsn, $input_errors);
+		if (($alias['host'] && !is_hostname($alias['host'])))
+			$input_errors[] = gettext("Hostnames in alias list can only contain the characters A-Z, 0-9 and '-'.");
+		if (($alias['domain'] && !is_domain($alias['domain'])))
+			$input_errors[] = gettext("A valid domain must be specified in alias list.");
+	}
+
+	/* check for overlaps */
+	foreach ($a_hosts as $hostent) {
+		if (isset($id) && ($a_hosts[$id]) && ($a_hosts[$id] === $hostent))
+			continue;
+
+		if (($hostent['host'] == $_POST['host']) && ($hostent['domain'] == $_POST['domain'])
+			&& ((is_ipaddrv4($hostent['ip']) && is_ipaddrv4($_POST['ip'])) || (is_ipaddrv6($hostent['ip']) && is_ipaddrv6($_POST['ip'])))) {
+			$input_errors[] = gettext("This host/domain already exists.");
+			break;
+		}
+	}
+
+	if (!$input_errors) {
+		$hostent = array();
+		$hostent['host'] = $_POST['host'];
+		$hostent['domain'] = $_POST['domain'];
+		$hostent['ip'] = $_POST['ip'];
+		$hostent['descr'] = $_POST['descr'];
+		$hostent['aliases']['item'] = $aliases;
+
+		if (isset($id) && $a_hosts[$id])
+			$a_hosts[$id] = $hostent;
+		else
+			$a_hosts[] = $hostent;
+		hosts_sort();
+		
+		mark_subsystem_dirty('unbound_hosts');
+		
+		write_config();
+		
+		header("Location: services_unbound.php");
+		exit;
+	}
+}
+
+$pgtitle = array(gettext("Services"),gettext("DNS Resolver"),gettext("Edit host"));
+$shortcut_section = "resolver";
+include("head.inc");
+
+?>
+
+<body onload="<?= $jsevents["body"]["onload"] ?>">
+<?php include("fbegin.inc"); ?>
+
+<script type="text/javascript" src="/javascript/row_helper.js">
+</script>
+
+<script type="text/javascript">
+	rowname[0] = "aliashost";
+	rowtype[0] = "textbox";
+	rowsize[0] = "20";
+	rowname[1] = "aliasdomain";
+	rowtype[1] = "textbox";
+	rowsize[1] = "20";
+	rowname[2] = "aliasdescription";
+	rowtype[2] = "textbox";
+	rowsize[2] = "20";
+</script>
+
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+	<form action="services_unbound_host_edit.php" method="post" name="iform" id="iform">
+		<table width="100%" border="0" cellpadding="6" cellspacing="0">
+			<tr>
+				<td colspan="2" valign="top" class="listtopic"><?=gettext("Edit DNS Resolver entry");?></td>
+			</tr>
+			<tr>
+				<td width="22%" valign="top" class="vncell"><?=gettext("Host");?></td>
+				<td width="78%" class="vtable">
+					<input name="host" type="text" class="formfld" id="host" size="40" value="<?=htmlspecialchars($pconfig['host']);?>"><br />
+					<span class="vexpl"><?=gettext("Name of the host, without domain part"); ?><br />
+					<?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em></span>
+				</td>
+			</tr>
+			<tr>
+				<td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td>
+				<td width="78%" class="vtable">
+					<input name="domain" type="text" class="formfld" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>"><br />
+					<span class="vexpl"><?=gettext("Domain of the host"); ?><br />
+						<?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em></span>
+				</td>
+			</tr>
+			<tr>
+				<td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td>
+				<td width="78%" class="vtable">
+					<input name="ip" type="text" class="formfld" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>"><br />
+					<span class="vexpl"><?=gettext("IP address of the host"); ?><br />
+						<?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em></span>
+				</td>
+			</tr>
+			<tr>
+				<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+				<td width="78%" class="vtable">
+					<input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"><br />
+					<span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed).");?></span>
+				</td>
+			</tr>
+			<tr>
+				<td width="22%" valign="top" class="vncell"><div id="addressnetworkport"><?=gettext("Aliases"); ?></div></td>
+				<td width="78%" class="vtable">
+					<table id="maintable">
+						<tbody>
+							<tr>
+								<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>
+								</td>
+							</tr>
+							<tr>
+								<td><div id="onecolumn"><?=gettext("Host");?></div></td>
+								<td><div id="twocolumn"><?=gettext("Domain");?></div></td>
+								<td><div id="threecolumn"><?=gettext("Description");?></div></td>
+							</tr>
+							<?php
+								$counter = 0;
+								if ($pconfig['aliases']['item']):
+									foreach($pconfig['aliases']['item'] as $item):
+										$host = $item['host'];
+										$domain = $item['domain'];
+										$description = $item['description'];
+							?>
+							<tr>
+								<td>
+									<input autocomplete="off" name="aliashost<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliashost<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($host);?>" />
+								</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);?>" />
+								</td>
+								<td>
+									<input name="aliasdescription<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdescription<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($description);?>" />
+								</td>
+								<td>
+									<a onclick="removeRow(this); return false;" href="#">
+										<img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" alt="" title="<?=gettext("remove this entry"); ?>" />
+									</a>
+								</td>
+							</tr>
+							<?php
+										$counter++;
+									endforeach;
+								endif;
+							?>
+						</tbody>
+					</table>
+					<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#">
+						<img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
+					</a>
+					<script type="text/javascript">
+						field_counter_js = 3;
+						rows = 1;
+						totalrows = <?php echo $counter; ?>;
+						loaded = <?php echo $counter; ?>;
+					</script>
+				</td>
+			</tr>
+			<tr>
+				<td width="22%" valign="top">&nbsp;</td>
+				<td width="78%">
+					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> <input class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()">
+					<?php if (isset($id) && $a_hosts[$id]): ?>
+					<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>">
+					<?php endif; ?>
+				</td>
+			</tr>
+		</table>
+	</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>