From 0c46a06a70b4db7a092d761dbffcbbd00eca5822 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 21 Oct 2022 09:07:59 +0200
Subject: [PATCH] net/upnp: use service_log() #6099

---
 .../src/etc/inc/plugins.inc.d/miniupnpd.inc   | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc
index 68738d042..1ecb50780 100644
--- a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc
+++ b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc
@@ -45,18 +45,18 @@ function miniupnpd_firewall($fw)
 
 function miniupnpd_services()
 {
-    $services = array();
+    $services = [];
 
     if (!miniupnpd_enabled()) {
         return $services;
     }
 
-    $pconfig = array();
+    $pconfig = [];
     $pconfig['name'] = 'miniupnpd';
     $pconfig['description'] = gettext('Universal Plug and Play');
-    $pconfig['php']['restart'] = array('miniupnpd_stop', 'miniupnpd_start');
-    $pconfig['php']['start'] = array('miniupnpd_start');
-    $pconfig['php']['stop'] = array('miniupnpd_stop');
+    $pconfig['php']['restart'] = ['miniupnpd_stop', 'miniupnpd_start'];
+    $pconfig['php']['start'] = ['miniupnpd_start'];
+    $pconfig['php']['stop'] = ['miniupnpd_stop'];
     $pconfig['pidfile'] = '/var/run/miniupnpd.pid';
     $services[] = $pconfig;
 
@@ -85,7 +85,7 @@ function miniupnpd_stop()
 
 function miniupnpd_configure()
 {
-    return array('bootup' => array('miniupnpd_configure_do'));
+    return ['bootup' => ['miniupnpd_configure_do']];
 }
 
 function miniupnpd_uuid()
@@ -98,7 +98,7 @@ function miniupnpd_uuid()
 
 function miniupnpd_permuser_list()
 {
-    $ret = array();
+    $ret = [];
     $count = 8;
 
     for ($i = 1; $i <= $count; $i++) {
@@ -118,18 +118,13 @@ function miniupnpd_configure_do($verbose = false)
         return;
     }
 
-    if ($verbose) {
-        echo 'Starting UPnP service...';
-        flush();
-    }
+    service_log('Starting UPnP service...', $verbose);
 
     $upnp_config = $config['installedpackages']['miniupnpd']['config'][0];
 
     $ext_ifname = get_real_interface($upnp_config['ext_iface']);
     if ($ext_ifname == $upnp_config['ext_iface']) {
-        if ($verbose) {
-            echo "failed.\n";
-        }
+        service_log("failed.\n", $verbose);
         return;
     }
 
@@ -234,7 +229,5 @@ function miniupnpd_configure_do($verbose = false)
         }
     }
 
-    if ($verbose) {
-        echo "done.\n";
-    }
+    service_verbose("done.\n", $verbose);
 }