miniupnpd: add enabled helper

(cherry picked from commit c1628bbf)
(cherry picked from commit 3a25b4b7)
(cherry picked from commit 4c253df1)

src/etc/inc/plugins.inc.d/miniupnpd.inc

@@ -26,33 +26,39 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-function miniupnpd_firewall($fw)
+function miniupnpd_enabled()
 {
     global $config;
 
-    if (isset($config['installedpackages']['miniupnpd']['config'][0]['enable'])) {
-        $fw->registerAnchor("miniupnpd/*", "rdr");
-        $fw->registerAnchor("miniupnpd/*", "fw");
+    return isset($config['installedpackages']['miniupnpd']['config'][0]['enable']);
+}
+
+function miniupnpd_firewall($fw)
+{
+    if (!miniupnpd_enabled()) {
+        return;
     }
+
+    $fw->registerAnchor('miniupnpd/*', 'rdr');
+    $fw->registerAnchor('miniupnpd/*', 'fw');
 }
 
 function miniupnpd_services()
 {
-    global $config;
-
     $services = array();
 
-    if (isset($config['installedpackages']['miniupnpd']['config'][0]['enable'])) {
+    if (!miniupnpd_enabled()) {
+        return $services;
+    }
+
     $pconfig = array();
-        $pconfig['name'] = "miniupnpd";
-        $pconfig['description'] = gettext("UPnP Service");
-        $pconfig['description'] = gettext("UPnP Service");
+    $pconfig['name'] = 'miniupnpd';
+    $pconfig['description'] = gettext('Univeral Plug and Play');
     $pconfig['php']['restart'] = array('miniupnpd_stop', 'miniupnpd_start');
     $pconfig['php']['start'] = array('miniupnpd_start');
     $pconfig['php']['stop'] = array('miniupnpd_stop');
     $pconfig['pidfile'] = '/var/run/miniupnpd.pid';
     $services[] = $pconfig;
-    }
 
     return $services;
 }
@@ -79,13 +85,13 @@ function miniupnpd_configure()
 
 function miniupnpd_configure_do()
 {
-    global $config;
+    if (!miniupnpd_enabled()) {
+        return;
+    }
 
-    if (!empty($config['installedpackages']['miniupnpd']['config'][0]['enable'])) {
-        echo gettext("Starting UPnP service... ");
+    echo "Starting UPnP service...";
     miniupnpd_sync_package();
     echo "done.\n";
-    }
 }
 
 function miniupnpd_uuid()

src/www/services_upnp.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
+require_once("filter.inc");
 require_once("system.inc");
 require_once("plugins.inc.d/miniupnpd.inc");
 
@@ -150,6 +151,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
         write_config('Modified Universal Plug and Play settings');
         miniupnpd_sync_package();
+        filter_configure();
         header(url_safe('Location: /services_upnp.php'));
         exit;
     }