diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-11-03 10:52:09 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-11-03 10:52:09 -0200 |
| commit | 2783e408c429e8c2028704aba5054118cd5163a4 (patch) | |
| tree | 3a6c2c6b825a614ad430600d96d966fc3fd1e448 /usr/local | |
| parent | 7bb24e18e03662bf4a3baad89678f6b61352dac6 (diff) | |
| download | pfsense-2783e408c429e8c2028704aba5054118cd5163a4.zip pfsense-2783e408c429e8c2028704aba5054118cd5163a4.tar.gz | |
Revert "Indent better"
This reverts commit a431bfc9e698c753d9a54218af9076184deb6251.
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/services_unbound.php | 762 | ||||
| -rw-r--r-- | usr/local/www/services_unbound_acls.php | 572 | ||||
| -rw-r--r-- | usr/local/www/services_unbound_advanced.php | 678 |
3 files changed, 1006 insertions, 1006 deletions
diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php index 70e14a5..b23cb4d 100644 --- a/usr/local/www/services_unbound.php +++ b/usr/local/www/services_unbound.php @@ -42,19 +42,19 @@ require_once("guiconfig.inc"); require_once("unbound.inc"); if (!is_array($config['unbound'])) { - $config['unbound'] = array(); + $config['unbound'] = array(); } $a_unboundcfg =& $config['unbound']; if (!is_array($config['unbound']['hosts'])) { - $config['unbound']['hosts'] = array(); + $config['unbound']['hosts'] = array(); } $a_hosts =& $config['unbound']['hosts']; if (!is_array($config['unbound']['domainoverrides'])) { - $config['unbound']['domainoverrides'] = array(); + $config['unbound']['domainoverrides'] = array(); } $a_domainOverrides = &$config['unbound']['domainoverrides']; @@ -82,116 +82,116 @@ $pconfig['port'] = $config['unbound']['port']; $pconfig['custom_options'] = $config['unbound']['custom_options']; if (empty($config['unbound']['active_interface'])) { - $pconfig['active_interface'] = array(); + $pconfig['active_interface'] = array(); } else { - $pconfig['active_interface'] = explode(",", $config['unbound']['active_interface']); + $pconfig['active_interface'] = explode(",", $config['unbound']['active_interface']); } if (empty($config['unbound']['outgoing_interface'])) { - $pconfig['outgoing_interface'] = array(); + $pconfig['outgoing_interface'] = array(); } else { - $pconfig['outgoing_interface'] = explode(",", $config['unbound']['outgoing_interface']); + $pconfig['outgoing_interface'] = explode(",", $config['unbound']['outgoing_interface']); } if ($_POST) { - $pconfig = $_POST; - unset($input_errors); - - if ($_POST['apply']) { - $retval = services_unbound_configure(); - $savemsg = get_std_save_message($retval); - if ($retval == 0) { - clear_subsystem_dirty('unbound'); + $pconfig = $_POST; + unset($input_errors); + + if ($_POST['apply']) { + $retval = services_unbound_configure(); + $savemsg = get_std_save_message($retval); + if ($retval == 0) { + clear_subsystem_dirty('unbound'); } - /* Update resolv.conf in case the interface bindings exclude localhost. */ - system_resolvconf_generate(); - } else { - if (isset($_POST['enable']) && isset($config['dnsmasq']['enable'])) { - $input_errors[] = "The system dns-forwarder is still active. Disable it before enabling the DNS Resolver."; + /* Update resolv.conf in case the interface bindings exclude localhost. */ + system_resolvconf_generate(); + } else { + if (isset($_POST['enable']) && isset($config['dnsmasq']['enable'])) { + $input_errors[] = "The system dns-forwarder is still active. Disable it before enabling the DNS Resolver."; } - if (empty($_POST['active_interface'])) { - $input_errors[] = "A single network interface needs to be selected for the DNS Resolver to bind to."; + if (empty($_POST['active_interface'])) { + $input_errors[] = "A single network interface needs to be selected for the DNS Resolver to bind to."; } - if (empty($_POST['outgoing_interface'])) { - $input_errors[] = "A single outgoing network interface needs to be selected for the DNS Resolver to use for outgoing DNS requests."; + if (empty($_POST['outgoing_interface'])) { + $input_errors[] = "A single outgoing network interface needs to be selected for the DNS Resolver to use for outgoing DNS requests."; } - if ($_POST['port']) { - if (is_port($_POST['port'])) { - $a_unboundcfg['port'] = $_POST['port']; + if ($_POST['port']) { + if (is_port($_POST['port'])) { + $a_unboundcfg['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['unbound']['port'])) { - unset($config['unbound']['port']); + unset($config['unbound']['port']); } - if (isset($_POST['enable'])) { - $a_unboundcfg['enable'] = true; + if (isset($_POST['enable'])) { + $a_unboundcfg['enable'] = true; } else { - unset($a_unboundcfg['enable']); + unset($a_unboundcfg['enable']); } - if (isset($_POST['dnssec'])) { - $a_unboundcfg['dnssec'] = true; + if (isset($_POST['dnssec'])) { + $a_unboundcfg['dnssec'] = true; } else { - unset($a_unboundcfg['dnssec']); + unset($a_unboundcfg['dnssec']); } - if (isset($_POST['forwarding'])) { - $a_unboundcfg['forwarding'] = true; + if (isset($_POST['forwarding'])) { + $a_unboundcfg['forwarding'] = true; } else { - unset($a_unboundcfg['forwarding']); + unset($a_unboundcfg['forwarding']); } if (isset($_POST['regdhcp'])) { - $a_unboundcfg['regdhcp'] = true; + $a_unboundcfg['regdhcp'] = true; } else { - unset($a_unboundcfg['regdhcp']); + unset($a_unboundcfg['regdhcp']); } - if (isset($_POST['regdhcpstatic'])) { - $a_unboundcfg['regdhcpstatic'] = true; + if (isset($_POST['regdhcpstatic'])) { + $a_unboundcfg['regdhcpstatic'] = true; } else { - unset($a_unboundcfg['regdhcpstatic']); + unset($a_unboundcfg['regdhcpstatic']); } - if (isset($_POST['txtsupport'])) { - $a_unboundcfg['txtsupport'] = true; + if (isset($_POST['txtsupport'])) { + $a_unboundcfg['txtsupport'] = true; } else { - unset($a_unboundcfg['txtsupport']); + unset($a_unboundcfg['txtsupport']); } - if (is_array($_POST['active_interface']) && !empty($_POST['active_interface'])) { - $a_unboundcfg['active_interface'] = implode(",", $_POST['active_interface']); + if (is_array($_POST['active_interface']) && !empty($_POST['active_interface'])) { + $a_unboundcfg['active_interface'] = implode(",", $_POST['active_interface']); } - if (is_array($_POST['outgoing_interface']) && !empty($_POST['outgoing_interface'])) { - $a_unboundcfg['outgoing_interface'] = implode(",", $_POST['outgoing_interface']); + if (is_array($_POST['outgoing_interface']) && !empty($_POST['outgoing_interface'])) { + $a_unboundcfg['outgoing_interface'] = implode(",", $_POST['outgoing_interface']); } - $a_unboundcfg['custom_options'] = str_replace("\r\n", "\n", $_POST['custom_options']); + $a_unboundcfg['custom_options'] = str_replace("\r\n", "\n", $_POST['custom_options']); - if (!$input_errors) { - write_config("DNS Resolver configured."); - mark_subsystem_dirty('unbound'); - } - } + if (!$input_errors) { + write_config("DNS Resolver configured."); + mark_subsystem_dirty('unbound'); + } + } } if ($_GET['act'] == "del") { - if ($_GET['type'] == 'host') { - if ($a_hosts[$_GET['id']]) { - unset($a_hosts[$_GET['id']]); - write_config(); - mark_subsystem_dirty('unbound'); - header("Location: services_unbound.php"); - exit; - } - } elseif ($_GET['type'] == 'doverride') { - if ($a_domainOverrides[$_GET['id']]) { - unset($a_domainOverrides[$_GET['id']]); - write_config(); - mark_subsystem_dirty('unbound'); - header("Location: services_unbound.php"); - exit; - } - } + if ($_GET['type'] == 'host') { + if ($a_hosts[$_GET['id']]) { + unset($a_hosts[$_GET['id']]); + write_config(); + mark_subsystem_dirty('unbound'); + header("Location: services_unbound.php"); + exit; + } + } elseif ($_GET['type'] == 'doverride') { + if ($a_domainOverrides[$_GET['id']]) { + unset($a_domainOverrides[$_GET['id']]); + write_config(); + mark_subsystem_dirty('unbound'); + header("Location: services_unbound.php"); + exit; + } + } } $closehead = false; @@ -201,17 +201,17 @@ include_once("head.inc"); ?> <script type="text/javascript"> - //<![CDATA[ - function enable_change(enable_over) { - var endis; - endis = !(jQuery('#enable').is(":checked") || enable_over); - jQuery("#active_interface,#outgoing_interface,#dnssec,#forwarding,#regdhcp,#regdhcpstatic,#dhcpfirst,#port,#txtsupport,#custom_options").prop('disabled', endis); - } - function show_advanced_dns() { - jQuery("#showadv").show(); - jQuery("#showadvbox").hide(); - } - //]]> +//<![CDATA[ +function enable_change(enable_over) { + var endis; + endis = !(jQuery('#enable').is(":checked") || enable_over); + jQuery("#active_interface,#outgoing_interface,#dnssec,#forwarding,#regdhcp,#regdhcpstatic,#dhcpfirst,#port,#txtsupport,#custom_options").prop('disabled', endis); +} +function show_advanced_dns() { + jQuery("#showadv").show(); + jQuery("#showadvbox").hide(); +} +//]]> </script> </head> @@ -221,323 +221,323 @@ include_once("head.inc"); <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (is_subsystem_dirty('unbound')): ?><br/> - <?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 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"> - <tbody> - <tr> - <td class="tabnavtbl"> - <?php - $tab_array = array(); - $tab_array[] = array(gettext("General settings"), true, "services_unbound.php"); - $tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_advanced.php"); - $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php"); - display_top_tabs($tab_array, true); - ?> - </td> - </tr> - <tr> - <td id="mainarea"> - <div class="tabcont"> - <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> - <tbody> - <tr> - <td colspan="2" valign="top" class="listtopic"><?=gettext("General DNS Resolver Options");?></td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td> - <td width="78%" class="vtable"><p> - <input name="enable" type="checkbox" id="enable" value="yes" <?php if (isset($pconfig['enable'])) echo "checked=\"checked\"";?> onclick="enable_change(false)" /> - <strong><?=gettext("Enable DNS Resolver");?><br /> - </strong></p> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Listen Port");?></td> - <td width="78%" class="vtable"> - <p> - <input name="port" type="text" id="port" size="6" <?php if ($pconfig['port']) echo "value=\"{$pconfig['port']}\"";?> /> - <br /><br /> - <?=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> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Network Interfaces"); ?></td> - <td width="78%" class="vtable"> - <?php - $interface_addresses = get_possible_listen_ips(true); - $size=count($interface_addresses)+1; - ?> - <?=gettext("Interface IPs used by the DNS Resolver 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.");?> - <br /><br /> - <select id="active_interface" name="active_interface[]" multiple="multiple" size="3"> - <option value="" <?php if (empty($pconfig['active_interface']) || empty($pconfig['active_interface'][0])) echo 'selected="selected"'; ?>>All</option> - <?php - foreach ($interface_addresses as $laddr): - $selected = ""; - if (in_array($laddr['value'], $pconfig['active_interface'])) - $selected = 'selected="selected"'; - ?> - <option value="<?=$laddr['value'];?>" <?=$selected;?>> - <?=htmlspecialchars($laddr['name']);?> - </option> - <?php endforeach; ?> - </select> - <br /><br /> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Outgoing Network Interfaces"); ?></td> - <td width="78%" class="vtable"> - <?php - $interface_addresses = get_possible_listen_ips(true); - $size=count($interface_addresses)+1; - ?> - <?=gettext("Utilize different network interface(s) that the DNS Resolver will use to send queries to authoritative servers and receive their replies. By default all interfaces are used.");?> - <br /><br /> - <select id="outgoing_interface" name="outgoing_interface[]" multiple="multiple" size="3"> - <option value="" <?php if (empty($pconfig['outgoing_interface']) || empty($pconfig['outgoing_interface'][0])) echo 'selected="selected"'; ?>>All</option> - <?php - foreach ($interface_addresses as $laddr): - $selected = ""; - if (in_array($laddr['value'], $pconfig['outgoing_interface'])) - $selected = 'selected="selected"'; - ?> - <option value="<?=$laddr['value'];?>" <?=$selected;?>> - <?=htmlspecialchars($laddr['name']);?> - </option> - <?php endforeach; ?> - </select> - <br /><br /> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("DNSSEC");?></td> - <td width="78%" class="vtable"><p> - <input name="dnssec" type="checkbox" id="dnssec" value="yes" <?php echo (isset($pconfig['dnssec']) ? "checked=\"checked\"" : "");?> /> - <strong><?=gettext("Enable DNSSEC Support");?><br /> - </strong></p> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("DNS Query Forwarding");?></td> - <td width="78%" class="vtable"><p> - <input name="forwarding" type="checkbox" id="forwarding" value="yes" <?php echo (isset($pconfig['forwarding']) ? "checked=\"checked\"" : "");?> /> - <strong><?=gettext("Enable Forwarding Mode");?></strong><br /></p> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("DHCP Registration");?></td> - <td width="78%" class="vtable"><p> - <input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if (isset($pconfig['regdhcp'])) echo "checked=\"checked\"";?> /> - <strong><?=gettext("Register DHCP leases in the DNS Resolver");?><br /> - </strong><?php printf(gettext("If this option is set, then machines that specify". - " their hostname when requesting a DHCP lease will be registered". - " in the DNS Resolver, so that their name can be resolved.". - " You should also set the domain in %sSystem:". - " General setup%s to the proper value."),'<a href="system.php">','</a>')?></p> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Static DHCP");?></td> - <td width="78%" class="vtable"><p> - <input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if (isset($pconfig['regdhcpstatic'])) echo "checked=\"checked\"";?> /> - <strong><?=gettext("Register DHCP static mappings in the DNS Resolver");?><br /> - </strong><?php printf(gettext("If this option is set, then DHCP static mappings will ". - "be registered in the DNS Resolver, so that their name can be ". - "resolved. You should also set the domain in %s". - "System: General setup%s to the proper value."),'<a href="system.php">','</a>');?></p> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("TXT Comment Support");?></td> - <td width="78%" class="vtable"><p> - <input name="txtsupport" type="checkbox" id="txtsupport" value="yes" <?php echo (isset($pconfig['txtsupport']) ? "checked=\"checked\"" : "");?> /> - <strong><?=gettext("If this option is set, then any descriptions associated with Host entries and DHCP Static mappings will create a corresponding TXT record.");?><br /> - </strong></p> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Advanced");?></td> - <td width="78%" class="vtable"> - <div id="showadvbox" <?php if ($pconfig['custom_options']) echo "style='display:none'"; ?>> - <input type="button" onclick="show_advanced_dns()" value="<?=gettext("Advanced"); ?>" /> - <?=gettext("Show advanced option");?> - </div> - <div id="showadv" <?php if (empty($pconfig['custom_options'])) echo "style='display:none'"; ?>> - <strong><?=gettext("Advanced");?><br /></strong> - <textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br /> - <?=gettext("Enter any additional options you would like to add to the DNS Resolver configuration here, separated by a space or newline"); ?><br /> - </div> - </td> - </tr> - <tr> - <td colspan="2"> - <input name="submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)" /> - </td> - </tr> - </tbody> - </table> - </div> - </td> - </tr> - </tbody> + <tbody> + <tr> + <td class="tabnavtbl"> + <?php + $tab_array = array(); + $tab_array[] = array(gettext("General settings"), true, "services_unbound.php"); + $tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_advanced.php"); + $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php"); + display_top_tabs($tab_array, true); + ?> + </td> + </tr> + <tr> + <td id="mainarea"> + <div class="tabcont"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> + <tbody> + <tr> + <td colspan="2" valign="top" class="listtopic"><?=gettext("General DNS Resolver Options");?></td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td> + <td width="78%" class="vtable"><p> + <input name="enable" type="checkbox" id="enable" value="yes" <?php if (isset($pconfig['enable'])) echo "checked=\"checked\"";?> onclick="enable_change(false)" /> + <strong><?=gettext("Enable DNS Resolver");?><br /> + </strong></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Listen Port");?></td> + <td width="78%" class="vtable"> + <p> + <input name="port" type="text" id="port" size="6" <?php if ($pconfig['port']) echo "value=\"{$pconfig['port']}\"";?> /> + <br /><br /> + <?=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> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Network Interfaces"); ?></td> + <td width="78%" class="vtable"> + <?php + $interface_addresses = get_possible_listen_ips(true); + $size=count($interface_addresses)+1; + ?> + <?=gettext("Interface IPs used by the DNS Resolver 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.");?> + <br /><br /> + <select id="active_interface" name="active_interface[]" multiple="multiple" size="3"> + <option value="" <?php if (empty($pconfig['active_interface']) || empty($pconfig['active_interface'][0])) echo 'selected="selected"'; ?>>All</option> + <?php + foreach ($interface_addresses as $laddr): + $selected = ""; + if (in_array($laddr['value'], $pconfig['active_interface'])) + $selected = 'selected="selected"'; + ?> + <option value="<?=$laddr['value'];?>" <?=$selected;?>> + <?=htmlspecialchars($laddr['name']);?> + </option> + <?php endforeach; ?> + </select> + <br /><br /> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Outgoing Network Interfaces"); ?></td> + <td width="78%" class="vtable"> + <?php + $interface_addresses = get_possible_listen_ips(true); + $size=count($interface_addresses)+1; + ?> + <?=gettext("Utilize different network interface(s) that the DNS Resolver will use to send queries to authoritative servers and receive their replies. By default all interfaces are used.");?> + <br /><br /> + <select id="outgoing_interface" name="outgoing_interface[]" multiple="multiple" size="3"> + <option value="" <?php if (empty($pconfig['outgoing_interface']) || empty($pconfig['outgoing_interface'][0])) echo 'selected="selected"'; ?>>All</option> + <?php + foreach ($interface_addresses as $laddr): + $selected = ""; + if (in_array($laddr['value'], $pconfig['outgoing_interface'])) + $selected = 'selected="selected"'; + ?> + <option value="<?=$laddr['value'];?>" <?=$selected;?>> + <?=htmlspecialchars($laddr['name']);?> + </option> + <?php endforeach; ?> + </select> + <br /><br /> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("DNSSEC");?></td> + <td width="78%" class="vtable"><p> + <input name="dnssec" type="checkbox" id="dnssec" value="yes" <?php echo (isset($pconfig['dnssec']) ? "checked=\"checked\"" : "");?> /> + <strong><?=gettext("Enable DNSSEC Support");?><br /> + </strong></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("DNS Query Forwarding");?></td> + <td width="78%" class="vtable"><p> + <input name="forwarding" type="checkbox" id="forwarding" value="yes" <?php echo (isset($pconfig['forwarding']) ? "checked=\"checked\"" : "");?> /> + <strong><?=gettext("Enable Forwarding Mode");?></strong><br /></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("DHCP Registration");?></td> + <td width="78%" class="vtable"><p> + <input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if (isset($pconfig['regdhcp'])) echo "checked=\"checked\"";?> /> + <strong><?=gettext("Register DHCP leases in the DNS Resolver");?><br /> + </strong><?php printf(gettext("If this option is set, then machines that specify". + " their hostname when requesting a DHCP lease will be registered". + " in the DNS Resolver, so that their name can be resolved.". + " You should also set the domain in %sSystem:". + " General setup%s to the proper value."),'<a href="system.php">','</a>')?></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Static DHCP");?></td> + <td width="78%" class="vtable"><p> + <input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if (isset($pconfig['regdhcpstatic'])) echo "checked=\"checked\"";?> /> + <strong><?=gettext("Register DHCP static mappings in the DNS Resolver");?><br /> + </strong><?php printf(gettext("If this option is set, then DHCP static mappings will ". + "be registered in the DNS Resolver, so that their name can be ". + "resolved. You should also set the domain in %s". + "System: General setup%s to the proper value."),'<a href="system.php">','</a>');?></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("TXT Comment Support");?></td> + <td width="78%" class="vtable"><p> + <input name="txtsupport" type="checkbox" id="txtsupport" value="yes" <?php echo (isset($pconfig['txtsupport']) ? "checked=\"checked\"" : "");?> /> + <strong><?=gettext("If this option is set, then any descriptions associated with Host entries and DHCP Static mappings will create a corresponding TXT record.");?><br /> + </strong></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Advanced");?></td> + <td width="78%" class="vtable"> + <div id="showadvbox" <?php if ($pconfig['custom_options']) echo "style='display:none'"; ?>> + <input type="button" onclick="show_advanced_dns()" value="<?=gettext("Advanced"); ?>" /> - <?=gettext("Show advanced option");?> + </div> + <div id="showadv" <?php if (empty($pconfig['custom_options'])) echo "style='display:none'"; ?>> + <strong><?=gettext("Advanced");?><br /></strong> + <textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br /> + <?=gettext("Enter any additional options you would like to add to the DNS Resolver configuration here, separated by a space or newline"); ?><br /> + </div> + </td> + </tr> + <tr> + <td colspan="2"> + <input name="submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)" /> + </td> + </tr> + </tbody> + </table> + </div> + </td> + </tr> + </tbody> </table> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br /> - </strong></span><?php printf(gettext("If the DNS Resolver is enabled, the DHCP". - " service (if enabled) will automatically serve the LAN IP". - " address as a DNS server to DHCP clients so they will use". - " the DNS Resolver. If Forwarding, is enabled, the DNS Resolver will use the DNS servers". - " entered in %sSystem: General setup%s". - " or those obtained via DHCP or PPP on WAN if the "Allow". - " DNS server list to be overridden by DHCP/PPP on WAN"". - " is checked."),'<a href="system.php">','</a>');?><br /> +</strong></span><?php printf(gettext("If the DNS Resolver is enabled, the DHCP". +" service (if enabled) will automatically serve the LAN IP". +" address as a DNS server to DHCP clients so they will use". +" the DNS Resolver. If Forwarding, is enabled, the DNS Resolver will use the DNS servers". +" entered in %sSystem: General setup%s". +" or those obtained via DHCP or PPP on WAN if the "Allow". +" DNS server list to be overridden by DHCP/PPP on WAN"". +" is checked."),'<a href="system.php">','</a>');?><br /> </span></p> <br /> <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont" summary="host overrides"> - <tr> - <td colspan="5" valign="top" class="listtopic"><?=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> +<tr> + <td colspan="5" valign="top" class="listtopic"><?=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> <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont sortable" summary="results"> - <thead> - <tr> - <td width="20%" class="listhdrr"><?=gettext("Host");?></td> - <td width="25%" class="listhdrr"><?=gettext("Domain");?></td> - <td width="20%" class="listhdrr"><?=gettext("IP");?></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"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> - </tr> - </table> - </td> - </tr> - </thead> - <tfoot> - <tr> - <td class="list" colspan="4"></td> - <td 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"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> - </tr> - </table> - </td> - </tr> - </tfoot> - <tbody> - <?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']);?> - </td> - <td class="listr" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';"> - <?=strtolower($hostent['domain']);?> - </td> - <td class="listr" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';"> - <?=$hostent['ip'];?> - </td> - <td class="listbg" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';"> - <?=htmlspecialchars($hostent['descr']);?> - </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;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></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" alt="delete" /></a></td> - </tr> - </table> - </tr> - <?php $i++; endforeach; ?> - <tr style="display:none"><td></td></tr> - </tbody> + <thead> + <tr> + <td width="20%" class="listhdrr"><?=gettext("Host");?></td> + <td width="25%" class="listhdrr"><?=gettext("Domain");?></td> + <td width="20%" class="listhdrr"><?=gettext("IP");?></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"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> + </tr> + </table> + </td> + </tr> + </thead> + <tfoot> + <tr> + <td class="list" colspan="4"></td> + <td 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"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> + </tr> + </table> + </td> + </tr> + </tfoot> + <tbody> + <?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']);?> + </td> + <td class="listr" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';"> + <?=strtolower($hostent['domain']);?> + </td> + <td class="listr" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';"> + <?=$hostent['ip'];?> + </td> + <td class="listbg" ondblclick="document.location='services_unbound_host_edit.php?id=<?=$i;?>';"> + <?=htmlspecialchars($hostent['descr']);?> + </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;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></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" alt="delete" /></a></td> + </tr> + </table> + </tr> + <?php $i++; endforeach; ?> + <tr style="display:none"><td></td></tr> + </tbody> </table> <br /> <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont" summary="domain overrides"> - <tr> - <td colspan="5" valign="top" class="listtopic"><?=gettext("Domain Overrides");?></td> - </tr> - <tr> - <td><p><?=gettext("Entries in this area override an entire domain by specifying an". - " authoritative DNS server to be queried for that domain.");?></p></td> - </tr> +<tr> + <td colspan="5" valign="top" class="listtopic"><?=gettext("Domain Overrides");?></td> +</tr> +<tr> + <td><p><?=gettext("Entries in this area override an entire domain by specifying an". + " authoritative DNS server to be queried for that domain.");?></p></td> +</tr> </table> <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont sortable" summary="results"> - <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"> - <tr> - <td width="17" height="17"></td> - <td><a href="services_unbound_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> - </tr> - </table> - </td> - </tr> - </thead> - <tfoot> - <tr> - <td class="list" colspan="3"></td> - <td class="list"> - <table border="0" cellspacing="0" cellpadding="1" summary="add"> - <tr> - <td width="17" height="17"></td> - <td><a href="services_unbound_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> - </tr> - </table> - </td> - </tr> - </tfoot> - <tbody> - <?php $i = 0; foreach ($a_domainOverrides as $doment): ?> - <tr> - <td class="listlr"> - <?=strtolower($doment['domain']);?> - </td> - <td class="listr"> - <?=$doment['ip'];?> - </td> - <td class="listbg"> - <?=htmlspecialchars($doment['descr']);?> - </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;?>"> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /> - </a></td> - <td valign="middle"><a href="services_unbound.php?act=del&type=doverride&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /> - </a></td> - </tr> - </table> - </td> - </tr> - <?php $i++; endforeach; ?> - <tr style="display:none"><td></td></tr> - </tbody> + <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"> + <tr> + <td width="17" height="17"></td> + <td><a href="services_unbound_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> + </tr> + </table> + </td> + </tr> + </thead> + <tfoot> + <tr> + <td class="list" colspan="3"></td> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1" summary="add"> + <tr> + <td width="17" height="17"></td> + <td><a href="services_unbound_domainoverride_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td> + </tr> + </table> + </td> + </tr> + </tfoot> + <tbody> + <?php $i = 0; foreach ($a_domainOverrides as $doment): ?> + <tr> + <td class="listlr"> + <?=strtolower($doment['domain']);?> + </td> + <td class="listr"> + <?=$doment['ip'];?> + </td> + <td class="listbg"> + <?=htmlspecialchars($doment['descr']);?> + </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;?>"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /> + </a></td> + <td valign="middle"><a href="services_unbound.php?act=del&type=doverride&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /> + </a></td> + </tr> + </table> + </td> + </tr> + <?php $i++; endforeach; ?> + <tr style="display:none"><td></td></tr> + </tbody> </table> </form> <script type="text/javascript"> - //<![CDATA[ - enable_change(false); - //]]> +//<![CDATA[ +enable_change(false); +//]]> </script> <?php include("fend.inc"); ?> </body> diff --git a/usr/local/www/services_unbound_acls.php b/usr/local/www/services_unbound_acls.php index 46ae4d3..9d124e8 100644 --- a/usr/local/www/services_unbound_acls.php +++ b/usr/local/www/services_unbound_acls.php @@ -35,111 +35,111 @@ require("unbound.inc"); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_unbound_acls.php'); if (!is_array($config['unbound']['acls'])) { - $config['unbound']['acls'] = array(); + $config['unbound']['acls'] = array(); } $a_acls = &$config['unbound']['acls']; $id = $_GET['id']; if (isset($_POST['aclid'])) { - $id = $_POST['aclid']; + $id = $_POST['aclid']; } $act = $_GET['act']; if (isset($_POST['act'])) { - $act = $_POST['act']; + $act = $_POST['act']; } if ($act == "del") { - if (!$a_acls[$id]) { - pfSenseHeader("services_unbound_acls.php"); - exit; - } - - unset($a_acls[$id]); - write_config(); - mark_subsystem_dirty('unbound'); + if (!$a_acls[$id]) { + pfSenseHeader("services_unbound_acls.php"); + exit; + } + + unset($a_acls[$id]); + write_config(); + mark_subsystem_dirty('unbound'); } if ($act == "new") { - $id = unbound_get_next_id(); + $id = unbound_get_next_id(); } if ($act == "edit") { - if (isset($id) && $a_acls[$id]) { - $pconfig = $a_acls[$id]; - $networkacl = $a_acls[$id]['row']; - } + if (isset($id) && $a_acls[$id]) { + $pconfig = $a_acls[$id]; + $networkacl = $a_acls[$id]['row']; + } } if ($_POST) { - unset($input_errors); - $pconfig = $_POST; - - if ($_POST['apply']) { - $retval = services_unbound_configure(); - $savemsg = get_std_save_message($retval); - if ($retval == 0) - clear_subsystem_dirty('unbound'); - } else { - - // input validation - only allow 50 entries in a single ACL - for($x=0; $x<50; $x++) { - if (isset($pconfig["acl_network{$x}"])) { - $networkacl[$x] = array(); - $networkacl[$x]['acl_network'] = $pconfig["acl_network{$x}"]; - $networkacl[$x]['mask'] = $pconfig["mask{$x}"]; - $networkacl[$x]['description'] = $pconfig["description{$x}"]; - if (!is_ipaddr($networkacl[$x]['acl_network'])) { - $input_errors[] = gettext("You must enter a valid network IP address for {$networkacl[$x]['acl_network']}."); + unset($input_errors); + $pconfig = $_POST; + + if ($_POST['apply']) { + $retval = services_unbound_configure(); + $savemsg = get_std_save_message($retval); + if ($retval == 0) + clear_subsystem_dirty('unbound'); + } else { + + // input validation - only allow 50 entries in a single ACL + for($x=0; $x<50; $x++) { + if (isset($pconfig["acl_network{$x}"])) { + $networkacl[$x] = array(); + $networkacl[$x]['acl_network'] = $pconfig["acl_network{$x}"]; + $networkacl[$x]['mask'] = $pconfig["mask{$x}"]; + $networkacl[$x]['description'] = $pconfig["description{$x}"]; + if (!is_ipaddr($networkacl[$x]['acl_network'])) { + $input_errors[] = gettext("You must enter a valid network IP address for {$networkacl[$x]['acl_network']}."); } - if (is_ipaddr($networkacl[$x]['acl_network'])) { - if (!is_subnet($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { - $input_errors[] = gettext("You must enter a valid IPv4 netmask for {$networkacl[$x]['acl_network']}/{$networkacl[$x]['mask']}."); + if (is_ipaddr($networkacl[$x]['acl_network'])) { + if (!is_subnet($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { + $input_errors[] = gettext("You must enter a valid IPv4 netmask for {$networkacl[$x]['acl_network']}/{$networkacl[$x]['mask']}."); } - } else if (function_exists("is_ipaddrv6")) { - if (!is_ipaddrv6($networkacl[$x]['acl_network'])) { - $input_errors[] = gettext("You must enter a valid IPv6 address for {$networkacl[$x]['acl_network']}."); + } else if (function_exists("is_ipaddrv6")) { + if (!is_ipaddrv6($networkacl[$x]['acl_network'])) { + $input_errors[] = gettext("You must enter a valid IPv6 address for {$networkacl[$x]['acl_network']}."); } else if (!is_subnetv6($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { - $input_errors[] = gettext("You must enter a valid IPv6 netmask for {$networkacl[$x]['acl_network']}/{$networkacl[$x]['mask']}."); + $input_errors[] = gettext("You must enter a valid IPv6 netmask for {$networkacl[$x]['acl_network']}/{$networkacl[$x]['mask']}."); } - } else { - $input_errors[] = gettext("You must enter a valid IPv4 address for {$networkacl[$x]['acl_network']}."); + } else { + $input_errors[] = gettext("You must enter a valid IPv4 address for {$networkacl[$x]['acl_network']}."); } - } else if (isset($networkacl[$x])) { - unset($networkacl[$x]); + } else if (isset($networkacl[$x])) { + unset($networkacl[$x]); } - } - - if (!$input_errors) { - if ($pconfig['Submit'] == gettext("Save")) { - $acl_entry = array(); - $acl_entry['aclid'] = $pconfig['aclid']; - $acl_entry['aclname'] = $pconfig['aclname']; - $acl_entry['aclaction'] = $pconfig['aclaction']; - $acl_entry['description'] = $pconfig['description']; - $acl_entry['aclid'] = $pconfig['aclid']; - $acl_entry['row'] = array(); - foreach ($networkacl as $acl) { - $acl_entry['row'][] = $acl; + } + + if (!$input_errors) { + if ($pconfig['Submit'] == gettext("Save")) { + $acl_entry = array(); + $acl_entry['aclid'] = $pconfig['aclid']; + $acl_entry['aclname'] = $pconfig['aclname']; + $acl_entry['aclaction'] = $pconfig['aclaction']; + $acl_entry['description'] = $pconfig['description']; + $acl_entry['aclid'] = $pconfig['aclid']; + $acl_entry['row'] = array(); + foreach ($networkacl as $acl) { + $acl_entry['row'][] = $acl; } - if (isset($id) && $a_acls[$id]) { - $a_acls[$id] = $acl_entry; + if (isset($id) && $a_acls[$id]) { + $a_acls[$id] = $acl_entry; } else { - $a_acls[] = $acl_entry; + $a_acls[] = $acl_entry; } - mark_subsystem_dirty("unbound"); - write_config(); + mark_subsystem_dirty("unbound"); + write_config(); - pfSenseHeader("/services_unbound_acls.php"); - exit; - } + pfSenseHeader("/services_unbound_acls.php"); + exit; + } - } - } + } + } } $closehead = false; @@ -152,19 +152,19 @@ include("head.inc"); <script type="text/javascript" src="/javascript/row_helper.js"></script> <script type="text/javascript"> - //<![CDATA[ - rowname[0] = "acl_network"; - rowtype[0] = "textbox,ipv4v6"; - rowsize[0] = "30"; - - rowname[1] = "mask"; - rowtype[1] = "select,ipv4v6"; - rowsize[1] = "1"; - - rowname[2] = "description"; - rowtype[2] = "textbox"; - rowsize[2] = "40"; - //]]> +//<![CDATA[ + rowname[0] = "acl_network"; + rowtype[0] = "textbox,ipv4v6"; + rowsize[0] = "30"; + + rowname[1] = "mask"; + rowtype[1] = "select,ipv4v6"; + rowsize[1] = "1"; + + rowname[2] = "description"; + rowtype[2] = "textbox"; + rowsize[2] = "40"; +//]]> </script> </head> @@ -175,216 +175,216 @@ include("head.inc"); <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (is_subsystem_dirty('unbound')): ?><br/> - <?php print_info_box_np(gettext("The configuration of the DNS Resolver, has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br /> +<?php print_info_box_np(gettext("The configuration of 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 acls"> -<tbody> -<tr> - <td class="tabnavtbl"> - <?php - $tab_array = array(); - $tab_array[] = array(gettext("General Settings"), false, "/services_unbound.php"); - $tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_advanced.php"); - $tab_array[] = array(gettext("Access Lists"), true, "/services_unbound_acls.php"); - display_top_tabs($tab_array, true); - ?> - </td> -</tr> -<tr> - <td id="mainarea"> - <div class="tabcont"> - <?php if($act=="new" || $act=="edit"): ?> - <input name="aclid" type="hidden" value="<?=$id;?>" /> - <input name="act" type="hidden" value="<?=$act;?>" /> - - <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> - <tr> - <td colspan="2" valign="top" class="listtopic"><?=ucwords(sprintf(gettext("%s Access List"),$act));?></td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Access List name");?></td> - <td width="78%" class="vtable"> - <input name="aclname" type="text" class="formfld" id="aclname" size="30" maxlength="30" value="<?=htmlspecialchars($pconfig['aclname']);?>" /> - <br /> - <span class="vexpl"><?=gettext("Provide an Access List name.");?></span> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Action");?></td> - <td width="78%" class="vtable"> - <select name="aclaction" class="formselect"> - <?php $types = explode(",", "Allow,Deny,Refuse,Allow Snoop"); foreach ($types as $type): ?> - <option value="<?=strtolower($type);?>" <?php if (strtolower($type) == strtolower($pconfig['aclaction'])) echo "selected=\"selected\""; ?>> - <?=htmlspecialchars($type);?> - </option> - <?php endforeach; ?> - </select> - <br /> + <tbody> + <tr> + <td class="tabnavtbl"> + <?php + $tab_array = array(); + $tab_array[] = array(gettext("General Settings"), false, "/services_unbound.php"); + $tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_advanced.php"); + $tab_array[] = array(gettext("Access Lists"), true, "/services_unbound_acls.php"); + display_top_tabs($tab_array, true); + ?> + </td> + </tr> + <tr> + <td id="mainarea"> + <div class="tabcont"> + <?php if($act=="new" || $act=="edit"): ?> + <input name="aclid" type="hidden" value="<?=$id;?>" /> + <input name="act" type="hidden" value="<?=$act;?>" /> + + <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> + <tr> + <td colspan="2" valign="top" class="listtopic"><?=ucwords(sprintf(gettext("%s Access List"),$act));?></td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Access List name");?></td> + <td width="78%" class="vtable"> + <input name="aclname" type="text" class="formfld" id="aclname" size="30" maxlength="30" value="<?=htmlspecialchars($pconfig['aclname']);?>" /> + <br /> + <span class="vexpl"><?=gettext("Provide an Access List name.");?></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Action");?></td> + <td width="78%" class="vtable"> + <select name="aclaction" class="formselect"> + <?php $types = explode(",", "Allow,Deny,Refuse,Allow Snoop"); foreach ($types as $type): ?> + <option value="<?=strtolower($type);?>" <?php if (strtolower($type) == strtolower($pconfig['aclaction'])) echo "selected=\"selected\""; ?>> + <?=htmlspecialchars($type);?> + </option> + <?php endforeach; ?> + </select> + <br /> <span class="vexpl"> <?=gettext("Choose what to do with DNS requests that match the criteria specified below.");?> <br /> - <?=gettext("<b>Deny:</b> This action stops queries from hosts within the netblock defined below.");?> <br /> - <?=gettext("<b>Refuse:</b> This action also stops queries from hosts within the netblock defined below, but sends a DNS rcode REFUSED error message back to the client.");?> <br /> - <?=gettext("<b>Allow:</b> This action allows queries from hosts within the netblock defined below.");?> <br /> - <?=gettext("<b>Allow Snoop:</b> This action allows recursive and nonrecursive access from hosts within the netblock defined below. Used for cache snooping and ideally should only be configured for your administrative host.");?> <br /> + <?=gettext("<b>Deny:</b> This action stops queries from hosts within the netblock defined below.");?> <br /> + <?=gettext("<b>Refuse:</b> This action also stops queries from hosts within the netblock defined below, but sends a DNS rcode REFUSED error message back to the client.");?> <br /> + <?=gettext("<b>Allow:</b> This action allows queries from hosts within the netblock defined below.");?> <br /> + <?=gettext("<b>Allow Snoop:</b> This action allows recursive and nonrecursive access from hosts within the netblock defined below. Used for cache snooping and ideally should only be configured for your administrative host.");?> <br /> </span> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Networks");?></td> - <td width="78%" class="vtable"> - <table id="maintable" summary="networks"> - <tbody> - <tr> - <td><div id="onecolumn"><?=gettext("Network");?></div></td> - <td><div id="twocolumn"><?=gettext("CIDR");?></div></td> - <td><div id="threecolumn"><?=gettext("Description");?></div></td> - </tr> - <?php $counter = 0; ?> - <?php - if($networkacl) - foreach($networkacl as $item): - ?> - <?php - $network = $item['acl_network']; - $cidr = $item['mask']; - $description = $item['description']; - ?> - <tr> - <td> - <input name="acl_network<?=$counter;?>" type="text" class="formfld unknown ipv4v6" id="acl_network<?=$counter;?>" size="30" value="<?=htmlspecialchars($network);?>" /> - </td> - <td> - <select name="mask<?=$counter;?>" class="formselect ipv4v6" id="mask<?=$counter;?>"> - <?php - for ($i = 128; $i > 0; $i--) { - echo "<option value=\"$i\" "; - if ($i == $cidr) echo "selected=\"selected\""; - echo ">" . $i . "</option>"; - } - ?> - </select> - </td> - <td> - <input name="description<?=$counter;?>" type="text" class="formfld unknown" id="description<?=$counter;?>" size="40" value="<?=htmlspecialchars($description);?>" /> - </td> - <td> - <a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" alt="delete" /></a> - </td> - </tr> - <?php $counter++; ?> - <?php endforeach; ?> - </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"> - //<![CDATA[ - field_counter_js = 3; - rows = 1; - totalrows = <?php echo $counter; ?>; - loaded = <?php echo $counter; ?>; - //]]> - </script> - - </td> - </tr> - - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> - <td width="78%" class="vtable"> - <input name="description" type="text" class="formfld unknown" id="description" size="52" maxlength="52" value="<?=htmlspecialchars($pconfig['description']);?>" /> - <br /> - <span class="vexpl"><?=gettext("You may enter a description here for your reference.");?></span> - </td> - </tr> - <tr> - <td> </td> - </tr> - <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <br /> - <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> - <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" /> - </td> - </tr> - </table> - - <?php else: ?> - - <table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0" summary="results"> - <thead> - <tr> - <td width="25%" class="listhdrr"><?=gettext("Access List Name"); ?></td> - <td width="25%" class="listhdrr"><?=gettext("Action"); ?></td> - <td width="45%" class="listhdr"><?=gettext("Description"); ?></td> - <td width="5%" class="list"> </td> - </tr> - </thead> - <tfoot> - <tr> - <td class="list" colspan="3"> </td> - <td class="list"> - <table border="0" cellspacing="0" cellpadding="1" summary="icons"> - <tr> - <td width="17"> </td> - <td valign="middle"><a href="services_unbound_acls.php?act=new"> - <img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("Add new Access List"); ?>" border="0" alt="add" /> - </a></td> - </tr> - </table> - </td> - </tr> - <tr> - <td colspan="4"> - <p> - <?=gettext("Access Lists to control access to the DNS Resolver can be defined here.");?> - </p> - </td> - </tr> - </tfoot> - <tbody> - <?php - $i = 0; - foreach($a_acls as $acl): - ?> - <tr ondblclick="document.location='services_unbound_acls.php?act=edit&id=<?=$i;?>'"> - <td class="listlr"> - <?=htmlspecialchars($acl['aclname']);?> - </td> - <td class="listr"> - <?=htmlspecialchars($acl['aclaction']);?> - </td> - <td class="listbg"> - <?=htmlspecialchars($acl['description']);?> - </td> - <td valign="middle" class="list nowrap"> - <table border="0" cellspacing="0" cellpadding="1" summary="icons"> - <tr> - <td valign="middle"><a href="services_unbound_acls.php?act=edit&id=<?=$i;?>"> - <img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit access list"); ?>" width="17" height="17" border="0" alt="edit" /> - </a></td> - <td valign="middle"><a href="services_unbound_acls.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this access list?"); ?>')"> - <img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete access list"); ?>" width="17" height="17" border="0" alt="delete" /> - </a></td> - </tr> - </table> - </td> - </tr> - <?php - $i++; - endforeach; - ?> - <tr style="display:none"><td></td></tr> - </tbody> - </table> - <?php endif; ?> - </div> - </td> -</tr> -</tbody> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Networks");?></td> + <td width="78%" class="vtable"> + <table id="maintable" summary="networks"> + <tbody> + <tr> + <td><div id="onecolumn"><?=gettext("Network");?></div></td> + <td><div id="twocolumn"><?=gettext("CIDR");?></div></td> + <td><div id="threecolumn"><?=gettext("Description");?></div></td> + </tr> + <?php $counter = 0; ?> + <?php + if($networkacl) + foreach($networkacl as $item): + ?> + <?php + $network = $item['acl_network']; + $cidr = $item['mask']; + $description = $item['description']; + ?> + <tr> + <td> + <input name="acl_network<?=$counter;?>" type="text" class="formfld unknown ipv4v6" id="acl_network<?=$counter;?>" size="30" value="<?=htmlspecialchars($network);?>" /> + </td> + <td> + <select name="mask<?=$counter;?>" class="formselect ipv4v6" id="mask<?=$counter;?>"> + <?php + for ($i = 128; $i > 0; $i--) { + echo "<option value=\"$i\" "; + if ($i == $cidr) echo "selected=\"selected\""; + echo ">" . $i . "</option>"; + } + ?> + </select> + </td> + <td> + <input name="description<?=$counter;?>" type="text" class="formfld unknown" id="description<?=$counter;?>" size="40" value="<?=htmlspecialchars($description);?>" /> + </td> + <td> + <a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" alt="delete" /></a> + </td> + </tr> + <?php $counter++; ?> + <?php endforeach; ?> + </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"> + //<![CDATA[ + field_counter_js = 3; + rows = 1; + totalrows = <?php echo $counter; ?>; + loaded = <?php echo $counter; ?>; + //]]> + </script> + + </td> + </tr> + + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> + <td width="78%" class="vtable"> + <input name="description" type="text" class="formfld unknown" id="description" size="52" maxlength="52" value="<?=htmlspecialchars($pconfig['description']);?>" /> + <br /> + <span class="vexpl"><?=gettext("You may enter a description here for your reference.");?></span> + </td> + </tr> + <tr> + <td> </td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <br /> + <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> + <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" /> + </td> + </tr> + </table> + + <?php else: ?> + + <table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0" summary="results"> + <thead> + <tr> + <td width="25%" class="listhdrr"><?=gettext("Access List Name"); ?></td> + <td width="25%" class="listhdrr"><?=gettext("Action"); ?></td> + <td width="45%" class="listhdr"><?=gettext("Description"); ?></td> + <td width="5%" class="list"> </td> + </tr> + </thead> + <tfoot> + <tr> + <td class="list" colspan="3"> </td> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1" summary="icons"> + <tr> + <td width="17"> </td> + <td valign="middle"><a href="services_unbound_acls.php?act=new"> + <img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("Add new Access List"); ?>" border="0" alt="add" /> + </a></td> + </tr> + </table> + </td> + </tr> + <tr> + <td colspan="4"> + <p> + <?=gettext("Access Lists to control access to the DNS Resolver can be defined here.");?> + </p> + </td> + </tr> + </tfoot> + <tbody> + <?php + $i = 0; + foreach($a_acls as $acl): + ?> + <tr ondblclick="document.location='services_unbound_acls.php?act=edit&id=<?=$i;?>'"> + <td class="listlr"> + <?=htmlspecialchars($acl['aclname']);?> + </td> + <td class="listr"> + <?=htmlspecialchars($acl['aclaction']);?> + </td> + <td class="listbg"> + <?=htmlspecialchars($acl['description']);?> + </td> + <td valign="middle" class="list nowrap"> + <table border="0" cellspacing="0" cellpadding="1" summary="icons"> + <tr> + <td valign="middle"><a href="services_unbound_acls.php?act=edit&id=<?=$i;?>"> + <img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit access list"); ?>" width="17" height="17" border="0" alt="edit" /> + </a></td> + <td valign="middle"><a href="services_unbound_acls.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this access list?"); ?>')"> + <img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete access list"); ?>" width="17" height="17" border="0" alt="delete" /> + </a></td> + </tr> + </table> + </td> + </tr> + <?php + $i++; + endforeach; + ?> + <tr style="display:none"><td></td></tr> + </tbody> + </table> + <?php endif; ?> + </div> + </td> + </tr> + </tbody> </table> </form> diff --git a/usr/local/www/services_unbound_advanced.php b/usr/local/www/services_unbound_advanced.php index 936795f..9640074 100644 --- a/usr/local/www/services_unbound_advanced.php +++ b/usr/local/www/services_unbound_advanced.php @@ -42,26 +42,26 @@ require_once("guiconfig.inc"); require_once("unbound.inc"); if(!is_array($config['unbound'])) { - $config['unbound'] = array(); + $config['unbound'] = array(); } if (isset($config['unbound']['hideidentity'])) { - $pconfig['hideidentity'] = true; + $pconfig['hideidentity'] = true; } if (isset($config['unbound']['hideversion'])){ - $pconfig['hideversion'] = true; + $pconfig['hideversion'] = true; } if (isset($config['unbound']['prefetch'])) { - $pconfig['prefetch'] = true; + $pconfig['prefetch'] = true; } if (isset($config['unbound']['prefetchkey'])) { - $pconfig['prefetchkey'] = true; + $pconfig['prefetchkey'] = true; } if (isset($config['unbound']['hardenglue'])) { - $pconfig['hardenglue'] = true; + $pconfig['hardenglue'] = true; } if (isset($config['unbound']['dnssecstripped'])) { - $pconfig['dnssecstripped'] = true; + $pconfig['dnssecstripped'] = true; } $pconfig['msgcachesize'] = $config['unbound']['msgcachesize']; @@ -79,62 +79,62 @@ $pconfig['unwanted_reply_threshold'] = $config['unbound']['unwanted_reply_thresh $pconfig['log_verbosity'] = isset($config['unbound']['log_verbosity']) ? $config['unbound']['log_verbosity'] : "1"; if ($_POST) { - $pconfig = $_POST; + $pconfig = $_POST; - if ($_POST['apply']) { - $retval = services_unbound_configure(); - $savemsg = get_std_save_message($retval); - if ($retval == 0) { - clear_subsystem_dirty('unbound'); + if ($_POST['apply']) { + $retval = services_unbound_configure(); + $savemsg = get_std_save_message($retval); + if ($retval == 0) { + clear_subsystem_dirty('unbound'); } - } else { - if (isset($_POST['hideidentity'])) { - $config['unbound']['hideidentity'] = true; + } else { + if (isset($_POST['hideidentity'])) { + $config['unbound']['hideidentity'] = true; } else { - unset($config['unbound']['hideidentity']); + unset($config['unbound']['hideidentity']); } - if (isset($_POST['hideversion'])) { - $config['unbound']['hideversion'] = true; + if (isset($_POST['hideversion'])) { + $config['unbound']['hideversion'] = true; } else { - unset($config['unbound']['hideversion']); + unset($config['unbound']['hideversion']); } - if (isset($_POST['prefetch'])) { - $config['unbound']['prefetch'] = true; + if (isset($_POST['prefetch'])) { + $config['unbound']['prefetch'] = true; } else { - unset($config['unbound']['prefetch']); + unset($config['unbound']['prefetch']); } - if (isset($_POST['prefetchkey'])) { - $config['unbound']['prefetchkey'] = true; + if (isset($_POST['prefetchkey'])) { + $config['unbound']['prefetchkey'] = true; } else { - unset($config['unbound']['prefetchkey']); + unset($config['unbound']['prefetchkey']); } - if (isset($_POST['hardenglue'])) { - $config['unbound']['hardenglue'] = true; + if (isset($_POST['hardenglue'])) { + $config['unbound']['hardenglue'] = true; } else { - unset($config['unbound']['hardenglue']); + unset($config['unbound']['hardenglue']); } - if (isset($_POST['dnssecstripped'])) { - $config['unbound']['dnssecstripped'] = true; + if (isset($_POST['dnssecstripped'])) { + $config['unbound']['dnssecstripped'] = true; } else { - unset($config['unbound']['dnssecstripped']); + unset($config['unbound']['dnssecstripped']); } - $config['unbound']['msgcachesize'] = $_POST['msgcachesize']; - $config['unbound']['outgoing_num_tcp'] = $_POST['outgoing_num_tcp']; - $config['unbound']['incoming_num_tcp'] = $_POST['incoming_num_tcp']; - $config['unbound']['edns_buffer_size'] = $_POST['edns_buffer_size']; - $config['unbound']['num_queries_per_thread'] = $_POST['num_queries_per_thread']; - $config['unbound']['jostle_timeout'] = $_POST['jostle_timeout']; - $config['unbound']['cache_max_ttl'] = $_POST['cache_max_ttl']; - $config['unbound']['cache_min_ttl'] = $_POST['cache_min_ttl']; - $config['unbound']['infra_host_ttl'] = $_POST['infra_host_ttl']; - $config['unbound']['infra_lame_ttl'] = $_POST['infra_lame_ttl']; - $config['unbound']['infra_cache_numhosts'] = $_POST['infra_cache_numhosts']; - $config['unbound']['unwanted_reply_threshold'] = $_POST['unwanted_reply_threshold']; - $config['unbound']['log_verbosity'] = $_POST['log_verbosity']; - write_config("DNS Resolver configured."); + $config['unbound']['msgcachesize'] = $_POST['msgcachesize']; + $config['unbound']['outgoing_num_tcp'] = $_POST['outgoing_num_tcp']; + $config['unbound']['incoming_num_tcp'] = $_POST['incoming_num_tcp']; + $config['unbound']['edns_buffer_size'] = $_POST['edns_buffer_size']; + $config['unbound']['num_queries_per_thread'] = $_POST['num_queries_per_thread']; + $config['unbound']['jostle_timeout'] = $_POST['jostle_timeout']; + $config['unbound']['cache_max_ttl'] = $_POST['cache_max_ttl']; + $config['unbound']['cache_min_ttl'] = $_POST['cache_min_ttl']; + $config['unbound']['infra_host_ttl'] = $_POST['infra_host_ttl']; + $config['unbound']['infra_lame_ttl'] = $_POST['infra_lame_ttl']; + $config['unbound']['infra_cache_numhosts'] = $_POST['infra_cache_numhosts']; + $config['unbound']['unwanted_reply_threshold'] = $_POST['unwanted_reply_threshold']; + $config['unbound']['log_verbosity'] = $_POST['log_verbosity']; + write_config("DNS Resolver configured."); - mark_subsystem_dirty('unbound'); - } + mark_subsystem_dirty('unbound'); + } } $closehead = false; @@ -144,305 +144,305 @@ include_once("head.inc"); ?> </head> - + <body> <?php include("fbegin.inc"); ?> <form action="services_unbound_advanced.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('unbound')): ?><br/> - <?php print_info_box_np(gettext("The configuration of the DNS Resolver, has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br /> +<?php print_info_box_np(gettext("The configuration of 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 advanced"> -<tbody> -<tr> - <td class="tabnavtbl"> - <?php - $tab_array = array(); - $tab_array[] = array(gettext("General settings"), false, "services_unbound.php"); - $tab_array[] = array(gettext("Advanced settings"), true, "services_unbound_advanced.php"); - $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php"); - display_top_tabs($tab_array, true); - ?> - </td> -</tr> -<tr> -<td id="mainarea"> -<div class="tabcont"> -<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> -<tbody> -<tr> - <td colspan="2" valign="top" class="listtopic"><?=gettext("Advanced Resolver Options");?></td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Hide Identity");?></td> - <td width="78%" class="vtable"> - <p><input name="hideidentity" type="checkbox" id="hideidentity" value="yes" <?php if (isset($pconfig['hideidentity'])) echo "checked=\"checked\"";?> /><br /> - <?=gettext("If enabled, id.server and hostname.bind queries are refused.");?></p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Hide Version");?></td> - <td width="78%" class="vtable"> - <p><input name="hideversion" type="checkbox" id="hideversion" value="yes" <?php if (isset($pconfig['hideversion'])) echo "checked=\"checked\"";?> /><br /> - <?=gettext("If enabled, version.server and version.bind queries are refused.");?></p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Prefetch Support");?></td> - <td width="78%" class="vtable"> - <p><input name="prefetch" type="checkbox" id="prefetch" value="yes" <?php if (isset($pconfig['prefetch'])) echo "checked=\"checked\"";?> /><br /> - <?=gettext("Message cache elements are prefetched before they expire to help keep the cache up to date. When enabled, this option can cause an increase of around 10% more DNS traffic and load on the server, but frequently requested items will not expire from the cache.");?></p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Prefetch DNS Key Support");?></td> - <td width="78%" class="vtable"> - <p><input name="prefetchkey" type="checkbox" id="prefetchkey" value="yes" <?php if (isset($pconfig['prefetchkey'])) echo "checked=\"checked\"";?> /><br /> - <?=sprintf(gettext("DNSKEY's are fetched earlier in the validation process when a %sDelegation signer%s is encountered. This helps lower the latency of requests but does utilize a little more CPU."), "<a href='http://en.wikipedia.org/wiki/List_of_DNS_record_types'>", "</a>");?></p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Harden Glue");?></td> - <td width="78%" class="vtable"> - <p><input name="hardenglue" type="checkbox" id="hardenglue" value="yes" <?php if (isset($pconfig['hardenglue'])) echo "checked=\"checked\"";?> /><br /> - <?=gettext("Only trust glue if it is within the servers authority.");?></p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Harden DNSSEC data");?></td> - <td width="78%" class="vtable"> - <p><input name="dnssecstripped" type="checkbox" id="dnssecstripped" value="yes" <?php if (isset($pconfig['dnssecstripped'])) echo "checked=\"checked\"";?> /><br /> - <?=gettext("DNSSEC data is required for trust-anchored zones. If such data is absent, the zone becomes bogus. If this is disabled and no DNSSEC data is received, then the zone is made insecure.");?></p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Message Cache Size");?></td> - <td width="78%" class="vtable"> - <p> - <select id="msgcachesize" name="msgcachesize"> - <?php - foreach (array("4", "10", "20", "50", "100", "250", "512") as $size) : - ?> - <option value="<?php echo $size; ?>" <?php if ($pconfig['msgcachesize'] == "{$size}") echo "selected=\"selected\""; ?>> - <?php echo $size; ?>MB - </option> - <?php - endforeach; - ?> - </select><br /> - <?=gettext("Size of the message cache. The message cache stores DNS rcodes and validation statuses. The RRSet cache will automatically be set to twice this amount. The RRSet cache contains the actual RR data. The default is 4 megabytes.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Outgoing TCP Buffers");?></td> - <td width="78%" class="vtable"> - <p> - <select id="outgoing_num_tcp" name="outgoing_num_tcp"> - <?php - for ($num_tcp = 0; $num_tcp <= 50; $num_tcp += 10): - ?> - <option value="<?php echo $num_tcp; ?>" <?php if ($pconfig['outgoing_num_tcp'] == "{$num_tcp}") echo "selected=\"selected\""; ?>> - <?php echo $num_tcp; ?> - </option> - <?php - endfor; - ?> - </select><br /> - <?=gettext("The number of outgoing TCP buffers to allocate per thread. The default value is 10. If 0 is selected then no TCP queries, to authoritative servers, are done.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Incoming TCP Buffers");?></td> - <td width="78%" class="vtable"> - <p> - <select id="incoming_num_tcp" name="incoming_num_tcp"> - <?php - for ($num_tcp = 0; $num_tcp <= 50; $num_tcp += 10): - ?> - <option value="<?php echo $num_tcp; ?>" <?php if ($pconfig['incoming_num_tcp'] == "{$num_tcp}") echo "selected=\"selected\""; ?>> - <?php echo $num_tcp; ?> - </option> - <?php - endfor; - ?> - </select><br /> - <?=gettext("The number of incoming TCP buffers to allocate per thread. The default value is 10. If 0 is selected then no TCP queries, from clients, are accepted.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("EDNS Buffer Size");?></td> - <td width="78%" class="vtable"> - <p> - <select id="edns_buffer_size" name="edns_buffer_size"> - <?php - foreach (array("512", "1480", "4096") as $size) : - ?> - <option value="<?php echo $size; ?>" <?php if ($pconfig['edns_buffer_size'] == "{$size}") echo "selected=\"selected\""; ?>> - <?php echo $size; ?> - </option> - <?php - endforeach; - ?> - </select><br /> - <?=gettext("Number of bytes size to advertise as the EDNS reassembly buffer size. This is the value that is used in UDP datagrams sent to peers. RFC recommendation is 4096 (which is the default). If you have fragmentation reassemble problems, usually seen as timeouts, then a value of 1480 should help. The 512 value bypasses most MTU path problems, but it can generate an excessive amount of TCP fallback.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Number of queries per thread");?></td> - <td width="78%" class="vtable"> - <p> - <select id="num_queries_per_thread" name="num_queries_per_thread"> - <?php - foreach (array("512", "1024", "2048") as $queries) : - ?> - <option value="<?php echo $queries; ?>" <?php if ($pconfig['num_queries_per_thread'] == "{$queries}") echo "selected=\"selected\""; ?>> - <?php echo $queries; ?> - </option> - <?php - endforeach; - ?> - </select><br /> - <?=gettext("The number of queries that every thread will service simultaneously. If more queries arrive that need to be serviced, and no queries can be jostled, then these queries are dropped.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Jostle Timeout");?></td> - <td width="78%" class="vtable"> - <p> - <select id="jostle_timeout" name="jostle_timeout"> - <?php - foreach (array("100", "200", "500", "1000") as $timeout) : - ?> - <option value="<?php echo $timeout; ?>" <?php if ($pconfig['jostle_timeout'] == "{$timeout}") echo "selected=\"selected\""; ?>> - <?php echo $timeout; ?> - </option> - <?php - endforeach; - ?> - </select><br /> - <?=gettext("This timeout is used for when the server is very busy. This protects against denial of service by slow queries or high query rates. The default value is 200 milliseconds.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Maximum TTL for RRsets and messages");?></td> - <td width="78%" class="vtable"> - <p> - <input type="text" id="cache_max_ttl" name="cache_max_ttl" size="5" value="<?php if(isset($pconfig['cache_max_ttl'])) echo $pconfig['cache_max_ttl']; ?>" /><br /> - <?=gettext("Configure a maximum Time to live for RRsets and messages in the cache. The default is 86400 seconds (1 day). When the internal TTL expires the cache item is expired. This can be configured to force the resolver to query for data more often and not trust (very large) TTL values.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Minimum TTL for RRsets and messages");?></td> - <td width="78%" class="vtable"> - <p> - <input type="text" id="cache_min_ttl" name="cache_min_ttl" size="5" value="<?php if(isset($pconfig['cache_min_ttl'])) echo $pconfig['cache_min_ttl']; ?>" /><br /> - <?=gettext("Configure a minimum Time to live for RRsets and messages in the cache. The default is 0 seconds. If the minimum value kicks in, the data is cached for longer than the domain owner intended, and thus less queries are made to look up the data. The 0 value ensures the data in the cache is as the domain owner intended. High values can lead to trouble as the data in the cache might not match up with the actual data anymore.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("TTL for Host cache entries");?></td> - <td width="78%" class="vtable"> - <p> - <select id="infra_host_ttl" name="infra_host_ttl"> - <option value="60" <?php if ($pconfig['infra_host_ttl'] == "60") echo "selected=\"selected\""; ?>>1 minute</option> - <option value="120" <?php if ($pconfig['infra_host_ttl'] == "120") echo "selected=\"selected\""; ?>>2 minutes</option> - <option value="300" <?php if ($pconfig['infra_host_ttl'] == "300") echo "selected=\"selected\""; ?>>5 minutes</option> - <option value="600" <?php if ($pconfig['infra_host_ttl'] == "600") echo "selected=\"selected\""; ?>>10 minutes</option> - <option value="900" <?php if ($pconfig['infra_host_ttl'] == "900") echo "selected=\"selected\""; ?>>15 minutes</option> - </select><br /> - <?=gettext("Time to live for entries in the host cache. The host cache contains roundtrip timing and EDNS support information. The default is 15 minutes.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("TTL for lame delegation");?></td> - <td width="78%" class="vtable"> - <p> - <select id="infra_lame_ttl" name="infra_lame_ttl"> - <option value="60" <?php if ($pconfig['infra_lame_ttl'] == "60") echo "selected=\"selected\""; ?>>1 minute</option> - <option value="120" <?php if ($pconfig['infra_lame_ttl'] == "120") echo "selected=\"selected\""; ?>>2 minutes</option> - <option value="300" <?php if ($pconfig['infra_lame_ttl'] == "300") echo "selected=\"selected\""; ?>>5 minutes</option> - <option value="600" <?php if ($pconfig['infra_lame_ttl'] == "600") echo "selected=\"selected\""; ?>>10 minutes</option> - <option value="900" <?php if ($pconfig['infra_lame_ttl'] == "900") echo "selected=\"selected\""; ?>>15 minutes</option> - </select><br /> - <?=gettext("Time to live for when a delegation is considered to be lame. The default is 15 minutes.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Number of Hosts to cache");?></td> - <td width="78%" class="vtable"> - <p> - <select id="infra_cache_numhosts" name="infra_cache_numhosts"> - <option value="1000" <?php if ($pconfig['infra_cache_numhosts'] == "1000") echo "selected=\"selected\""; ?>>1000</option> - <option value="5000" <?php if ($pconfig['infra_cache_numhosts'] == "5000") echo "selected=\"selected\""; ?>>5000</option> - <option value="10000" <?php if ($pconfig['infra_cache_numhosts'] == "10000") echo "selected=\"selected\""; ?>>10 000</option> - <option value="20000" <?php if ($pconfig['infra_cache_numhosts'] == "20000") echo "selected=\"selected\""; ?>>20 000</option> - <option value="50000" <?php if ($pconfig['infra_cache_numhosts'] == "50000") echo "selected=\"selected\""; ?>>50 000</option> - </select><br /> - <?=gettext("Number of hosts for which information is cached. The default is 10,000.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Unwanted Reply Threshold");?></td> - <td width="78%" class="vtable"> - <p> - <select id="unwanted_reply_threshold" name="unwanted_reply_threshold"> - <option value="disabled" <?php if ($pconfig['unwanted_reply_threshold'] == "disabled") echo "selected=\"selected\""; ?>>disabled</option> - <option value="5000000" <?php if ($pconfig['unwanted_reply_threshold'] == "5000000") echo "selected=\"selected\""; ?>>5 million</option> - <option value="10000000" <?php if ($pconfig['unwanted_reply_threshold'] == "10000000") echo "selected=\"selected\""; ?>>10 million</option> - <option value="20000000" <?php if ($pconfig['unwanted_reply_threshold'] == "20000000") echo "selected=\"selected\""; ?>>20 million</option> - <option value="40000000" <?php if ($pconfig['unwanted_reply_threshold'] == "40000000") echo "selected=\"selected\""; ?>>40 million</option> - <option value="50000000" <?php if ($pconfig['unwanted_reply_threshold'] == "50000000") echo "selected=\"selected\""; ?>>50 million</option> - </select><br /> - <?=gettext("If enabled, a total number of unwanted replies is kept track of in every thread. When it reaches the threshold, a defensive action is taken and a warning is printed to the log file. This defensive action is to clear the RRSet and message caches, hopefully flushing away any poison. The default is disabled, but if enabled a value of 10 million is suggested.");?> - </p> - </td> -</tr> -<tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Log level verbosity");?></td> - <td width="78%" class="vtable"> - <p> - <select id="log_verbosity" name="log_verbosity"> - <?php - for ($level = 0; $level <= 5; $level++): - ?> - <option value="<?php echo $level; ?>" <?php if ($pconfig['log_verbosity'] == "{$level}") echo "selected=\"selected\""; ?>> - Level <?php echo $level; ?> - </option> - <?php - endfor; - ?> - </select><br /> - <?=gettext("Select the log verbosity.");?> - </p> - </td> -</tr> -<tr> - <td colspan="2"> </td> -</tr> -<tr> - <td width="22%"></td> - <td width="78%"> - <input type="submit" name="Save" class="formbtn" id="save" value="Save" /> - </td> -</tr> -</tbody> -</table> -</div> -</td> -</tr> -</tbody> + <tbody> + <tr> + <td class="tabnavtbl"> + <?php + $tab_array = array(); + $tab_array[] = array(gettext("General settings"), false, "services_unbound.php"); + $tab_array[] = array(gettext("Advanced settings"), true, "services_unbound_advanced.php"); + $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php"); + display_top_tabs($tab_array, true); + ?> + </td> + </tr> + <tr> + <td id="mainarea"> + <div class="tabcont"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> + <tbody> + <tr> + <td colspan="2" valign="top" class="listtopic"><?=gettext("Advanced Resolver Options");?></td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Hide Identity");?></td> + <td width="78%" class="vtable"> + <p><input name="hideidentity" type="checkbox" id="hideidentity" value="yes" <?php if (isset($pconfig['hideidentity'])) echo "checked=\"checked\"";?> /><br /> + <?=gettext("If enabled, id.server and hostname.bind queries are refused.");?></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Hide Version");?></td> + <td width="78%" class="vtable"> + <p><input name="hideversion" type="checkbox" id="hideversion" value="yes" <?php if (isset($pconfig['hideversion'])) echo "checked=\"checked\"";?> /><br /> + <?=gettext("If enabled, version.server and version.bind queries are refused.");?></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Prefetch Support");?></td> + <td width="78%" class="vtable"> + <p><input name="prefetch" type="checkbox" id="prefetch" value="yes" <?php if (isset($pconfig['prefetch'])) echo "checked=\"checked\"";?> /><br /> + <?=gettext("Message cache elements are prefetched before they expire to help keep the cache up to date. When enabled, this option can cause an increase of around 10% more DNS traffic and load on the server, but frequently requested items will not expire from the cache.");?></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Prefetch DNS Key Support");?></td> + <td width="78%" class="vtable"> + <p><input name="prefetchkey" type="checkbox" id="prefetchkey" value="yes" <?php if (isset($pconfig['prefetchkey'])) echo "checked=\"checked\"";?> /><br /> + <?=sprintf(gettext("DNSKEY's are fetched earlier in the validation process when a %sDelegation signer%s is encountered. This helps lower the latency of requests but does utilize a little more CPU."), "<a href='http://en.wikipedia.org/wiki/List_of_DNS_record_types'>", "</a>");?></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Harden Glue");?></td> + <td width="78%" class="vtable"> + <p><input name="hardenglue" type="checkbox" id="hardenglue" value="yes" <?php if (isset($pconfig['hardenglue'])) echo "checked=\"checked\"";?> /><br /> + <?=gettext("Only trust glue if it is within the servers authority.");?></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Harden DNSSEC data");?></td> + <td width="78%" class="vtable"> + <p><input name="dnssecstripped" type="checkbox" id="dnssecstripped" value="yes" <?php if (isset($pconfig['dnssecstripped'])) echo "checked=\"checked\"";?> /><br /> + <?=gettext("DNSSEC data is required for trust-anchored zones. If such data is absent, the zone becomes bogus. If this is disabled and no DNSSEC data is received, then the zone is made insecure.");?></p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Message Cache Size");?></td> + <td width="78%" class="vtable"> + <p> + <select id="msgcachesize" name="msgcachesize"> +<?php + foreach (array("4", "10", "20", "50", "100", "250", "512") as $size) : +?> + <option value="<?php echo $size; ?>" <?php if ($pconfig['msgcachesize'] == "{$size}") echo "selected=\"selected\""; ?>> + <?php echo $size; ?>MB + </option> +<?php + endforeach; +?> + </select><br /> + <?=gettext("Size of the message cache. The message cache stores DNS rcodes and validation statuses. The RRSet cache will automatically be set to twice this amount. The RRSet cache contains the actual RR data. The default is 4 megabytes.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Outgoing TCP Buffers");?></td> + <td width="78%" class="vtable"> + <p> + <select id="outgoing_num_tcp" name="outgoing_num_tcp"> +<?php + for ($num_tcp = 0; $num_tcp <= 50; $num_tcp += 10): +?> + <option value="<?php echo $num_tcp; ?>" <?php if ($pconfig['outgoing_num_tcp'] == "{$num_tcp}") echo "selected=\"selected\""; ?>> + <?php echo $num_tcp; ?> + </option> +<?php + endfor; +?> + </select><br /> + <?=gettext("The number of outgoing TCP buffers to allocate per thread. The default value is 10. If 0 is selected then no TCP queries, to authoritative servers, are done.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Incoming TCP Buffers");?></td> + <td width="78%" class="vtable"> + <p> + <select id="incoming_num_tcp" name="incoming_num_tcp"> +<?php + for ($num_tcp = 0; $num_tcp <= 50; $num_tcp += 10): +?> + <option value="<?php echo $num_tcp; ?>" <?php if ($pconfig['incoming_num_tcp'] == "{$num_tcp}") echo "selected=\"selected\""; ?>> + <?php echo $num_tcp; ?> + </option> +<?php + endfor; +?> + </select><br /> + <?=gettext("The number of incoming TCP buffers to allocate per thread. The default value is 10. If 0 is selected then no TCP queries, from clients, are accepted.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("EDNS Buffer Size");?></td> + <td width="78%" class="vtable"> + <p> + <select id="edns_buffer_size" name="edns_buffer_size"> +<?php + foreach (array("512", "1480", "4096") as $size) : +?> + <option value="<?php echo $size; ?>" <?php if ($pconfig['edns_buffer_size'] == "{$size}") echo "selected=\"selected\""; ?>> + <?php echo $size; ?> + </option> +<?php + endforeach; +?> + </select><br /> + <?=gettext("Number of bytes size to advertise as the EDNS reassembly buffer size. This is the value that is used in UDP datagrams sent to peers. RFC recommendation is 4096 (which is the default). If you have fragmentation reassemble problems, usually seen as timeouts, then a value of 1480 should help. The 512 value bypasses most MTU path problems, but it can generate an excessive amount of TCP fallback.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Number of queries per thread");?></td> + <td width="78%" class="vtable"> + <p> + <select id="num_queries_per_thread" name="num_queries_per_thread"> +<?php + foreach (array("512", "1024", "2048") as $queries) : +?> + <option value="<?php echo $queries; ?>" <?php if ($pconfig['num_queries_per_thread'] == "{$queries}") echo "selected=\"selected\""; ?>> + <?php echo $queries; ?> + </option> +<?php + endforeach; +?> + </select><br /> + <?=gettext("The number of queries that every thread will service simultaneously. If more queries arrive that need to be serviced, and no queries can be jostled, then these queries are dropped.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Jostle Timeout");?></td> + <td width="78%" class="vtable"> + <p> + <select id="jostle_timeout" name="jostle_timeout"> +<?php + foreach (array("100", "200", "500", "1000") as $timeout) : +?> + <option value="<?php echo $timeout; ?>" <?php if ($pconfig['jostle_timeout'] == "{$timeout}") echo "selected=\"selected\""; ?>> + <?php echo $timeout; ?> + </option> +<?php + endforeach; +?> + </select><br /> + <?=gettext("This timeout is used for when the server is very busy. This protects against denial of service by slow queries or high query rates. The default value is 200 milliseconds.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Maximum TTL for RRsets and messages");?></td> + <td width="78%" class="vtable"> + <p> + <input type="text" id="cache_max_ttl" name="cache_max_ttl" size="5" value="<?php if(isset($pconfig['cache_max_ttl'])) echo $pconfig['cache_max_ttl']; ?>" /><br /> + <?=gettext("Configure a maximum Time to live for RRsets and messages in the cache. The default is 86400 seconds (1 day). When the internal TTL expires the cache item is expired. This can be configured to force the resolver to query for data more often and not trust (very large) TTL values.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Minimum TTL for RRsets and messages");?></td> + <td width="78%" class="vtable"> + <p> + <input type="text" id="cache_min_ttl" name="cache_min_ttl" size="5" value="<?php if(isset($pconfig['cache_min_ttl'])) echo $pconfig['cache_min_ttl']; ?>" /><br /> + <?=gettext("Configure a minimum Time to live for RRsets and messages in the cache. The default is 0 seconds. If the minimum value kicks in, the data is cached for longer than the domain owner intended, and thus less queries are made to look up the data. The 0 value ensures the data in the cache is as the domain owner intended. High values can lead to trouble as the data in the cache might not match up with the actual data anymore.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("TTL for Host cache entries");?></td> + <td width="78%" class="vtable"> + <p> + <select id="infra_host_ttl" name="infra_host_ttl"> + <option value="60" <?php if ($pconfig['infra_host_ttl'] == "60") echo "selected=\"selected\""; ?>>1 minute</option> + <option value="120" <?php if ($pconfig['infra_host_ttl'] == "120") echo "selected=\"selected\""; ?>>2 minutes</option> + <option value="300" <?php if ($pconfig['infra_host_ttl'] == "300") echo "selected=\"selected\""; ?>>5 minutes</option> + <option value="600" <?php if ($pconfig['infra_host_ttl'] == "600") echo "selected=\"selected\""; ?>>10 minutes</option> + <option value="900" <?php if ($pconfig['infra_host_ttl'] == "900") echo "selected=\"selected\""; ?>>15 minutes</option> + </select><br /> + <?=gettext("Time to live for entries in the host cache. The host cache contains roundtrip timing and EDNS support information. The default is 15 minutes.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("TTL for lame delegation");?></td> + <td width="78%" class="vtable"> + <p> + <select id="infra_lame_ttl" name="infra_lame_ttl"> + <option value="60" <?php if ($pconfig['infra_lame_ttl'] == "60") echo "selected=\"selected\""; ?>>1 minute</option> + <option value="120" <?php if ($pconfig['infra_lame_ttl'] == "120") echo "selected=\"selected\""; ?>>2 minutes</option> + <option value="300" <?php if ($pconfig['infra_lame_ttl'] == "300") echo "selected=\"selected\""; ?>>5 minutes</option> + <option value="600" <?php if ($pconfig['infra_lame_ttl'] == "600") echo "selected=\"selected\""; ?>>10 minutes</option> + <option value="900" <?php if ($pconfig['infra_lame_ttl'] == "900") echo "selected=\"selected\""; ?>>15 minutes</option> + </select><br /> + <?=gettext("Time to live for when a delegation is considered to be lame. The default is 15 minutes.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Number of Hosts to cache");?></td> + <td width="78%" class="vtable"> + <p> + <select id="infra_cache_numhosts" name="infra_cache_numhosts"> + <option value="1000" <?php if ($pconfig['infra_cache_numhosts'] == "1000") echo "selected=\"selected\""; ?>>1000</option> + <option value="5000" <?php if ($pconfig['infra_cache_numhosts'] == "5000") echo "selected=\"selected\""; ?>>5000</option> + <option value="10000" <?php if ($pconfig['infra_cache_numhosts'] == "10000") echo "selected=\"selected\""; ?>>10 000</option> + <option value="20000" <?php if ($pconfig['infra_cache_numhosts'] == "20000") echo "selected=\"selected\""; ?>>20 000</option> + <option value="50000" <?php if ($pconfig['infra_cache_numhosts'] == "50000") echo "selected=\"selected\""; ?>>50 000</option> + </select><br /> + <?=gettext("Number of hosts for which information is cached. The default is 10,000.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Unwanted Reply Threshold");?></td> + <td width="78%" class="vtable"> + <p> + <select id="unwanted_reply_threshold" name="unwanted_reply_threshold"> + <option value="disabled" <?php if ($pconfig['unwanted_reply_threshold'] == "disabled") echo "selected=\"selected\""; ?>>disabled</option> + <option value="5000000" <?php if ($pconfig['unwanted_reply_threshold'] == "5000000") echo "selected=\"selected\""; ?>>5 million</option> + <option value="10000000" <?php if ($pconfig['unwanted_reply_threshold'] == "10000000") echo "selected=\"selected\""; ?>>10 million</option> + <option value="20000000" <?php if ($pconfig['unwanted_reply_threshold'] == "20000000") echo "selected=\"selected\""; ?>>20 million</option> + <option value="40000000" <?php if ($pconfig['unwanted_reply_threshold'] == "40000000") echo "selected=\"selected\""; ?>>40 million</option> + <option value="50000000" <?php if ($pconfig['unwanted_reply_threshold'] == "50000000") echo "selected=\"selected\""; ?>>50 million</option> + </select><br /> + <?=gettext("If enabled, a total number of unwanted replies is kept track of in every thread. When it reaches the threshold, a defensive action is taken and a warning is printed to the log file. This defensive action is to clear the RRSet and message caches, hopefully flushing away any poison. The default is disabled, but if enabled a value of 10 million is suggested.");?> + </p> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Log level verbosity");?></td> + <td width="78%" class="vtable"> + <p> + <select id="log_verbosity" name="log_verbosity"> +<?php + for ($level = 0; $level <= 5; $level++): +?> + <option value="<?php echo $level; ?>" <?php if ($pconfig['log_verbosity'] == "{$level}") echo "selected=\"selected\""; ?>> + Level <?php echo $level; ?> + </option> +<?php + endfor; +?> + </select><br /> + <?=gettext("Select the log verbosity.");?> + </p> + </td> + </tr> + <tr> + <td colspan="2"> </td> + </tr> + <tr> + <td width="22%"></td> + <td width="78%"> + <input type="submit" name="Save" class="formbtn" id="save" value="Save" /> + </td> + </tr> + </tbody> + </table> + </div> + </td> + </tr> + </tbody> </table> </form> <?php include("fend.inc"); ?> |
