-bump miniupnpd version 20070521

-dropped status tab from upnp services page
-dropped tabs from upnp status page

3 files changed, 8 insertions, 14 deletions

diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index dedadc1..160c598 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -173,7 +173,7 @@ require_once("notices.inc");
 							<li><a href="/pkg_edit.php?xml=olsrd.xml&id=0" class="navlnk">OLSR</a></li>
 							<li><a href="/pkg_edit.php?xml=routed/routed.xml&id=0" class="navlnk">RIP</a></li>
 							<li><a href="/services_snmp.php" class="navlnk">SNMP</a></li>
-							<li><a href="/status_upnp.php" class="navlnk">UPnP</a></li>
+							<li><a href="/pkg_edit.php?xml=miniupnpd.xml&id=0" class="navlnk">UPnP</a></li>
 							<li><a href="/pkg_edit.php?xml=openntpd.xml&id=0" class="navlnk">OpenNTPD</a></li>
 							<li><a href="/services_wol.php" class="navlnk">Wake on LAN</a></li>
 							<?php echo return_ext_menu("Services"); ?>
diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php
index b4a8750..03c6c7a 100755
--- a/usr/local/www/status_services.php
+++ b/usr/local/www/status_services.php
@@ -232,7 +232,7 @@ if(isset($config['proxyarp']['proxyarpnet'])) {
 
 if($config['installedpackages']['miniupnpd']['config'][0]['enable']) {
     $pconfig['name'] = "miniupnpd";
-    $pconfig['description'] = gettext("MiniUPnPd Service");
+    $pconfig['description'] = gettext("UPnP Service");
     $services[] = $pconfig;
     unset($pconfig);
 }
diff --git a/usr/local/www/status_upnp.php b/usr/local/www/status_upnp.php
index 87e2294..d74aef6 100644
--- a/usr/local/www/status_upnp.php
+++ b/usr/local/www/status_upnp.php
@@ -31,11 +31,6 @@
 
 require("guiconfig.inc");
 
-/* Defaults to this page but if no settings are present, redirect to setup page */
-if(!$config['installedpackages']['miniupnpd']['config'][0]['iface_array'] ||
-	!$config['installedpackages']['miniupnpd']['config'][0]['enable'])
-	Header("Location: /pkg_edit.php?xml=miniupnpd.xml&id=0");
-
 if ($_POST) {
 	if ($_POST['clear'] == "Clear") {
 		mwexec("/bin/sh /usr/local/etc/rc.d/miniupnpd.sh restart");
@@ -61,16 +56,15 @@ include("head.inc");
 <?php include("fbegin.inc"); ?>
 <p class="pgtitle"><?=$pgtitle?></font></p>
 <?php if ($savemsg) print_info_box($savemsg); ?>
-
 <div id="mainlevel">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
 <?php
-	$tab_array = array();
-	$tab_array[] = array(gettext("UPnP Status "), true, "/status_upnp.php");
-	$tab_array[] = array(gettext("MiniUPnPd Settings "), false, "/pkg_edit.php?xml=miniupnpd.xml&id=0");
-	display_top_tabs($tab_array);
+if(!$config['installedpackages']['miniupnpd']['config'][0]['iface_array'] ||
+	!$config['installedpackages']['miniupnpd']['config'][0]['enable']) {
+	echo gettext("UPnP is currently disabled.");
+	include("fend.inc");
+	exit;
+}
 ?>
-</table>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
    <tr>
      <td class="tabcont" >