From 1af67f41961c0b528bd72066ad02922ca2d6ee47 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 21 Oct 2022 09:19:47 +0200
Subject: [PATCH] dns/dyndns: use service_log() #6099

---
 .../src/etc/inc/plugins.inc.d/dyndns.inc      | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns.inc b/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns.inc
index 54f1db403..455d68d7d 100644
--- a/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns.inc
+++ b/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns.inc
@@ -34,11 +34,11 @@ require_once('plugins.inc.d/dyndns/r53.inc');
 
 function dyndns_configure()
 {
-    return array(
-        'bootup' => array('dyndns_configure_do'),
-        'local' => array('dyndns_configure_do'),
-        'newwanip' => array('dyndns_configure_do:2'),
-    );
+    return [
+        'bootup' => ['dyndns_configure_do'],
+        'local' => ['dyndns_configure_do'],
+        'newwanip' => ['dyndns_configure_do:2'],
+    ];
 }
 
 function dyndns_enabled()
@@ -58,19 +58,15 @@ function dyndns_enabled()
 
 function dyndns_services()
 {
-    global $config;
-
-    $services = array();
+    $services = [];
 
     if (dyndns_enabled()) {
-        $services[] = array(
+        $services[] = [
             'description' => gettext('Dynamic DNS'),
-            'configd' => array(
-                'restart' => array('dyndns reload'),
-            ),
+            'configd' => [ 'restart' => ['dyndns reload'] ],
             'nocheck' => true,
             'name' => 'dyndns',
-        );
+        ];
     }
 
     return $services;
@@ -78,10 +74,10 @@ function dyndns_services()
 
 function dyndns_cron()
 {
-    $jobs = array();
+    $jobs = [];
 
     if (dyndns_enabled()) {
-        $jobs[]['autocron'] = array('/usr/local/etc/rc.dyndns', '11', '1');
+        $jobs[]['autocron'] = ['/usr/local/etc/rc.dyndns', '11', '1'];
     }
 
     return $jobs;
@@ -95,7 +91,7 @@ function dyndns_list()
      * https://github.com/openwrt/packages/blob/master/net/ddns-scripts/files/services
      */
 
-    return array(
+    return [
         '1984-hosting' => '1984 Hosting Company',
         '3322' => '3322',
         'all-inkl' => 'All-Inkl',
@@ -154,7 +150,7 @@ function dyndns_list()
         'strato' => 'STRATO',
         'strato-v6' => 'STRATO (v6)',
         'zoneedit' => 'ZoneEdit',
-    );
+    ];
 }
 
 function dyndns_cache_file($conf, $ipver = 4)
@@ -206,10 +202,7 @@ function dyndns_configure_do($verbose = false, $int = '')
     $dyndnscfg = $config['dyndnses']['dyndns'];
     $gwgroups = return_gateway_groups_array();
 
-    if ($verbose) {
-        echo 'Configuring dynamic DNS clients...';
-        flush();
-    }
+    service_log('Configuring dynamic DNS clients...', $verbose);
 
     foreach ($dyndnscfg as $dyndns) {
         if ((empty($int)) || ($int == $dyndns['interface']) || (is_array($gwgroups[$dyndns['interface']]))) {
@@ -221,9 +214,7 @@ function dyndns_configure_do($verbose = false, $int = '')
         }
     }
 
-    if ($verbose) {
-        echo "done.\n";
-    }
+    service_log("done.\n", $verbose);
 }
 
 function dyndns_failover_interface($interface, $family = 'all')