From bbab80a8b897d7e2b5e018b4f9fe2dc65040974a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 22 Aug 2024 17:02:36 +0200
Subject: [PATCH] interfaces: fix previous

Should not code cross-device.
---
 src/etc/inc/plugins.inc.d/webgui.inc | 4 ++--
 src/etc/rc.newwanipv6                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/webgui.inc b/src/etc/inc/plugins.inc.d/webgui.inc
index cc44e837a..0d9e2a3b8 100644
--- a/src/etc/inc/plugins.inc.d/webgui.inc
+++ b/src/etc/inc/plugins.inc.d/webgui.inc
@@ -56,7 +56,7 @@ function webgui_configure_defer($verbose = false, $sleep = 3)
     service_log("deferred.\n", $verbose);
 }
 
-function webgui_configure_do($verbose = false, $interface_map = '')
+function webgui_configure_do($verbose = false, $interface_map = null)
 {
     global $config;
 
@@ -69,7 +69,7 @@ function webgui_configure_do($verbose = false, $interface_map = '')
 
     /* 'newwanip_map' configuration is the only event to take second argument */
     if (!empty($interface_map)) {
-        if (!count(array_intersect($interface_map, $interfaces)) {
+        if (!count(array_intersect(explode(',', $interface_map), $interfaces))) {
             return;
         }
     }
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 55e86d286..82dc1faf9 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -132,5 +132,5 @@ foreach ($interfaces as $interface) {
     plugins_configure('newwanip', false, [$interface, 'inet6']);
 }
 
-plugins_configure('newwanip_map', false, [join(',' $interfaces), 'inet6']);
+plugins_configure('newwanip_map', false, [join(',', $interfaces), 'inet6']);
 rrd_configure();