From fd0fdafa262fafed46205d18ed26754fbb178ddc Mon Sep 17 00:00:00 2001 From: bergware Date: Sat, 29 Mar 2025 16:02:34 +0100 Subject: [PATCH] Wireless: always include stored networks --- emhttp/plugins/dynamix/include/Wireless.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/emhttp/plugins/dynamix/include/Wireless.php b/emhttp/plugins/dynamix/include/Wireless.php index 72331a6fc..747b7c76d 100644 --- a/emhttp/plugins/dynamix/include/Wireless.php +++ b/emhttp/plugins/dynamix/include/Wireless.php @@ -85,18 +85,15 @@ case 'list': $port = array_key_first($wifi); $carrier = "/sys/class/net/$port/carrier"; $echo = []; - if ($load && count(array_keys($wifi)) > 1) { - foreach ($wifi as $network => $block) { - if ($network == $port) continue; - $wlan[$network][0] = $block['ATTR1'] ?? ''; - $wlan[$network][2] = $block['ATTR2'] ?? ''; - $wlan[$network][4] = $block['ATTR3'] ?? $block['SECURITY'] ?? ''; - $wlan[$network][1] = $block['ATTR4'] ?? ''; - $wlan[$network][3] = $network; - } - } else { - $wlan = scanWifi($port); + foreach ($wifi as $network => $block) { + if ($network == $port) continue; + $wlan[$network][0] = $block['ATTR1'] ?? ''; + $wlan[$network][1] = $block['ATTR4'] ?? ''; + $wlan[$network][2] = $block['ATTR2'] ?? ''; + $wlan[$network][3] = $network; + $wlan[$network][4] = $block['ATTR3'] ?? $block['SECURITY'] ?? ''; } + if (!$load) $wlan = array_replace_recursive($wlan, scanWifi($port)); if (count($wlan)) { try { $up = @file_get_contents($carrier) == 1;