From f547a3531269e31ef4b9a710eae8cc2a66d18c32 Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 23 Nov 2025 09:47:58 +0100 Subject: [PATCH] Define constant for Open for security protocol --- includes/configure_client.php | 2 +- src/RaspAP/Networking/Hotspot/WiFiManager.php | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/includes/configure_client.php b/includes/configure_client.php index 097b9ac6..a9125806 100755 --- a/includes/configure_client.php +++ b/includes/configure_client.php @@ -78,7 +78,7 @@ function DisplayWPAConfig() $ok = true; foreach ($tmp_networks as $ssid => $network) { - if ($network['protocol'] === 'Open') { + if ($network['protocol'] === $wifi::SECURITY_OPEN) { fwrite($wpa_file, "network={".PHP_EOL); fwrite($wpa_file, "\tssid=\"".$ssid."\"".PHP_EOL); fwrite($wpa_file, "\tkey_mgmt=NONE".PHP_EOL); diff --git a/src/RaspAP/Networking/Hotspot/WiFiManager.php b/src/RaspAP/Networking/Hotspot/WiFiManager.php index 1c69e49e..76fdd0b0 100644 --- a/src/RaspAP/Networking/Hotspot/WiFiManager.php +++ b/src/RaspAP/Networking/Hotspot/WiFiManager.php @@ -16,6 +16,7 @@ class WiFiManager private const MIN_RSSI = -100; private const MAX_RSSI = -55; + const SECURITY_OPEN = 'OPEN'; public function knownWifiStations(&$networks) { @@ -127,7 +128,7 @@ class WiFiManager $networks[$ssid] = [ 'ssid' => $ssid, 'configured' => false, - 'protocol' => $current['security'] ?? 'OPEN', + 'protocol' => $current['security'] ?? self::SECURITY_OPEN, 'channel' => $channel, 'passphrase' => '', 'visible' => true, @@ -138,6 +139,10 @@ class WiFiManager ++$index; } }; + + if (is_string($scan_results)) { + $scan_results = explode("\n", trim($scan_results)); + } foreach ($scan_results as $line) { $line = trim($line); @@ -149,7 +154,7 @@ class WiFiManager 'ssid' => '', 'signal' => null, 'freq' => null, - 'security' => 'OPEN' + 'security' => self::SECURITY_OPEN ]; continue; }