-bump miniupnpd version 20070521

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

4 files changed, 18 insertions, 29 deletions

diff --git a/usr/local/pkg/miniupnpd.xml b/usr/local/pkg/miniupnpd.xml
index aca89b3..bac2337 100644
--- a/usr/local/pkg/miniupnpd.xml
+++ b/usr/local/pkg/miniupnpd.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <packagegui>
-	<title>Services: MiniUPnPd</title>
+	<title>Services: UPnP</title>
 	<name>miniupnpd</name>
-	<version>20070208</version>
+	<version>20070521</version>
 	<savetext>Change</savetext>
 	<include_file>/usr/local/pkg/miniupnpd.inc</include_file>
-	<aftersaveredirect>/status_upnp.php</aftersaveredirect>
 	<menu>
-		<name>MiniUPnPd</name>
-		<tooltiptext>Set miniupnpd settings such as interfaces to listen on.</tooltiptext>
+		<name>UPnP</name>
+		<tooltiptext>Set UPnP settings such as interfaces to listen on.</tooltiptext>
 		<section>Services</section>
-		<url>/status_upnp.php</url>
+		<url>/pkg_edit.php?xml=miniupnpd.xml&amp;id=0</url>
 	</menu>
 	<additional_files_needed>
 		<item>http://www.pfsense.org/packages/config/miniupnpd/miniupnpd.inc</item>
@@ -34,18 +33,14 @@
 	</service>
 	<tabs>
 		<tab>
-			<text>UPnP Status</text>
-			<url>/status_upnp.php</url>
-		</tab>
-		<tab>
-			<text>MiniUPnPd Settings</text>
+			<text>UPnP Settings</text>
 			<url>/pkg_edit.php?xml=miniupnpd.xml&amp;id=0</url>
 			<active/>
 		</tab>
 	</tabs>
 	<fields>
 		<field>
-			<fielddescr>Enable MiniUPnPd</fielddescr>
+			<fielddescr>Enable UPnP</fielddescr>
 			<fieldname>enable</fieldname>
 			<type>checkbox</type>
 		</field>			
@@ -75,17 +70,17 @@
 			<type>input</type>
 		</field>
 		<field>
-			<fielddescr>Log packets handled by miniupnpd rules?</fielddescr>
+			<fielddescr>Log packets handled by UPnP rules?</fielddescr>
 			<fieldname>logpackets</fieldname>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fielddescr>Use system uptime instead of miniupnpd uptime?</fielddescr>
+			<fielddescr>Use system uptime instead of UPnP service uptime?</fielddescr>
 			<fieldname>sysuptime</fieldname>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fielddescr>By default deny access to miniupnpd?</fielddescr>
+			<fielddescr>By default deny access to UPnP?</fielddescr>
 			<fieldname>permdefault</fieldname>
 			<type>checkbox</type>
 		</field>
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" >