From ba5f0198365627aeaecdda9dfe40e2eb3c809fb8 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Thu, 28 Sep 2006 20:45:31 +0000
Subject: Kill trailing space.  Remove commented out code that is not being
 used.

---
 packages/miniupnpd/miniupnpd.inc | 8 +++-----
 packages/miniupnpd/miniupnpd.xml | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/miniupnpd/miniupnpd.inc b/packages/miniupnpd/miniupnpd.inc
index 47736018..b3829ff3 100644
--- a/packages/miniupnpd/miniupnpd.inc
+++ b/packages/miniupnpd/miniupnpd.inc
@@ -16,17 +16,15 @@
 		else if($config['installedpackages']['miniupnpd']['config'][0]['overridewanip'])
 			$overridewanip = $config['installedpackages']['miniupnpd']['config'][0]['overridewanip'];
 
-		if(is_array($_POST['interface_array']))
+		if($_POST['interface_array'])
 			$interface_array = $_POST['interface_array'];
-		else if($config['installedpackages']['miniupnpd']['config'][0]['interface_array'])
+		else if(is_array($config['installedpackages']['miniupnpd']['config'][0]['interface_array']))
 			$interface_array = $config['installedpackages']['miniupnpd']['config'][0]['interface_array'];
 
 		if($interface_array) {
 			foreach($_POST['interface_array'] as $iface) {
 				$if = convert_friendly_interface_to_real_interface_name($iface);
 				if($if) {
-				    //if($first == 1)
-					//$ifaces_final .= ",";
 					$addr = find_interface_ip($if);
 				    $ifaces_final .= " -i {$wanif} -a {$addr}";
 				    $first = 1;
@@ -59,4 +57,4 @@
 		config_unlock();
 		conf_mount_ro();
 	}
-?>
+?>
\ No newline at end of file
diff --git a/packages/miniupnpd/miniupnpd.xml b/packages/miniupnpd/miniupnpd.xml
index 98a3b7f5..f786f754 100644
--- a/packages/miniupnpd/miniupnpd.xml
+++ b/packages/miniupnpd/miniupnpd.xml
@@ -70,6 +70,6 @@
         sync_package_miniupnpd();
 	</custom_add_php_command>
 	<custom_php_deinstall_command>
-		exec("rm /usr/local/etc/rc.d/miniupnpd*");
+		exec("rm -f /usr/local/etc/rc.d/miniupnpd*");
 	</custom_php_deinstall_command>
 </packagegui>
-- 
cgit v1.2.3