aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Baker <warren@decoy.co.za>2011-06-12 16:09:39 +0200
committerWarren Baker <warren@decoy.co.za>2011-06-12 16:09:39 +0200
commitec437bd2e056cf2cbce378c30a88ac56a2c55d2e (patch)
tree6d844ed7c4e71b03119f465d31b529146fefbb3d
parentd1a76d47f2564975c5c6c852acfccfd405cd80fd (diff)
downloadpfsense-packages-ec437bd2e056cf2cbce378c30a88ac56a2c55d2e.tar.gz
pfsense-packages-ec437bd2e056cf2cbce378c30a88ac56a2c55d2e.tar.bz2
pfsense-packages-ec437bd2e056cf2cbce378c30a88ac56a2c55d2e.zip
Cater for Advanced page.
-rw-r--r--config/unbound/unbound_acls.xml7
-rw-r--r--config/unbound/unbound_status.php11
2 files changed, 8 insertions, 10 deletions
diff --git a/config/unbound/unbound_acls.xml b/config/unbound/unbound_acls.xml
index 028e4bb5..705f781f 100644
--- a/config/unbound/unbound_acls.xml
+++ b/config/unbound/unbound_acls.xml
@@ -41,7 +41,7 @@
<faq/>
<name>unboundacls</name>
<version>1.4.8</version>
- <title>Services: Unbound DNS Forwarder: ACLs</title>
+ <title>Services: Unbound DNS Forwarder: Access Lists</title>
<include_file>/usr/local/pkg/unbound.inc</include_file>
<menu>
<name>Unbound DNS</name>
@@ -55,9 +55,14 @@
<url>/pkg_edit.php?xml=unbound.xml&amp;id=0</url>
</tab>
<tab>
+ <text>Unbound DNS Advanced Settings</text>
+ <url>/pkg_edit.php?xml=unbound_advanced.xml&amp;id=0</url>
+ </tab>
+ <tab>
<text>Unbound DNS ACLs</text>
<url>/pkg.php?xml=unbound_acls.xml</url>
<active/>
+ <no_drop_down/>
</tab>
<tab>
<text>Unbound DNS Status</text>
diff --git a/config/unbound/unbound_status.php b/config/unbound/unbound_status.php
index 52dfc49d..405b24d4 100644
--- a/config/unbound/unbound_status.php
+++ b/config/unbound/unbound_status.php
@@ -39,10 +39,6 @@ if(!is_process_running("unbound")) {
$pgtitle = "Services: Unbound DNS Forwarder: Status";
include("head.inc");
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
- $one_two = true;
-
function doCmdT($title, $command, $rows) {
echo "<p>\n";
echo "<a name=\"" . $title . "\">\n";
@@ -121,10 +117,6 @@ function execCmds() {
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<?php if($one_two): ?>
-<p class="pgtitle"><?=$pgtitle?></font></p>
-<?php endif; ?>
-
<?php if ($savemsg) print_info_box($savemsg); ?>
<div id="mainlevel">
@@ -134,9 +126,10 @@ function execCmds() {
<?php
$tab_array = array();
$tab_array[] = array(gettext("Unbound DNS Settings"), false, "/pkg_edit.php?xml=unbound.xml&amp;id=0");
+ $tab_array[] = array(gettext("Unbound DNS Advanced Settings"), false, "/pkg_edit.php?xml=unbound_advanced.xml&amp;id=0");
$tab_array[] = array(gettext("Unbound DNS ACLs"), false, "/pkg.php?xml=unbound_acls.xml");
$tab_array[] = array(gettext("Unbound DNS Status"), true, "/unbound_status.php");
- display_top_tabs($tab_array);
+ display_top_tabs($tab_array, true);
?>
</td>
</tr>