From 9d154beea2bd402d38797164e655badc3f382029 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 18 Sep 2024 08:54:44 +0200 Subject: [PATCH] system: port web GUI to plugins_argument_map() --- src/etc/inc/plugins.inc.d/webgui.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/webgui.inc b/src/etc/inc/plugins.inc.d/webgui.inc index 9cb74eddc..c6c719543 100644 --- a/src/etc/inc/plugins.inc.d/webgui.inc +++ b/src/etc/inc/plugins.inc.d/webgui.inc @@ -60,16 +60,25 @@ function webgui_configure_do($verbose = false, $interface_map = null) { global $config; + if (!plugins_argument_map($interface_map)) { + return; + } + $interfaces = []; + if (!empty($config['system']['webgui']['interfaces'])) { $interfaces = explode(',', $config['system']['webgui']['interfaces']); /* place loopback with good IPv4 first for server.bind */ array_unshift($interfaces, 'lo0'); } - /* 'newwanip_map' configuration is the only event to take second argument */ if (!empty($interface_map)) { - if (!count(array_intersect(explode(',', $interface_map), $interfaces))) { + /* + * Match explicit interfaces reload request to bound interfaces. + * If none are configured we do not reload either as we are bound + * to all. + */ + if (!count(array_intersect($interface_map, $interfaces))) { return; } }