-move upnp_action to services.inc

-make sure to clear rules when stopping miniupnpd
-fix status_upnp and status_services pages so they use upnp_action and not the rcfile

2 files changed, 4 insertions, 8 deletions

diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php
index 42c0da1..f603507 100755
--- a/usr/local/www/status_services.php
+++ b/usr/local/www/status_services.php
@@ -54,8 +54,7 @@ if($_GET['mode'] == "restartservice" and $_GET['service']) {
 			services_dhcpd_configure();
 			break;
 		case 'miniupnpd':
-			if(file_exists('/usr/local/etc/rc.d/miniupnpd.sh'))
-				mwexec('/usr/local/etc/rc.d/miniupnpd.sh restart');
+			upnp_action('restart');	
 			break;
 		case 'racoon':
 			exec("killall -9 racoon");
@@ -95,8 +94,7 @@ if($_GET['mode'] == "startservice" and $_GET['service']) {
 			services_dhcpd_configure();
 			break;
 		case 'miniupnpd':
-			if(file_exists('/usr/local/etc/rc.d/miniupnpd.sh'))
-				mwexec('/usr/local/etc/rc.d/miniupnpd.sh start');
+			upnp_action('start');
 			break;
 		case 'racoon':
 			exec("killall -9 racoon");
@@ -140,9 +138,7 @@ if($_GET['mode'] == "stopservice" && $_GET['service']) {
 			killbypid("{$g['varrun_path']}/dnsmasq.pid");
 			break;
 		case 'miniupnpd':
-			/* can't just killbyname since we need to clear pf rules */
-			if(file_exists('/usr/local/etc/rc.d/miniupnpd.sh'))
-				mwexec('/usr/local/etc/rc.d/miniupnpd.sh stop');
+			upnp_action('stop');
 			break;
 		case 'ntpd':
 			killbyname("ntpd");
diff --git a/usr/local/www/status_upnp.php b/usr/local/www/status_upnp.php
index f13c6d8..cea49a8 100644
--- a/usr/local/www/status_upnp.php
+++ b/usr/local/www/status_upnp.php
@@ -33,7 +33,7 @@ require("guiconfig.inc");
 
 if ($_POST) {
 	if ($_POST['clear'] == "Clear") {
-		mwexec("/bin/sh /usr/local/etc/rc.d/miniupnpd.sh restart");
+		upnp_action('restart');
 		$savemsg = "Rules have been cleared and the daemon restarted";
 	}
 }