From 290cad810740673589c86e3eeaab70b526887dde Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 24 May 2025 10:15:58 -0700 Subject: [PATCH] Update getWirelessClients() w/ interface parameter --- includes/dashboard.php | 2 +- src/RaspAP/UI/Dashboard.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/dashboard.php b/includes/dashboard.php index bf2b9c18..f0f6e3e8 100755 --- a/includes/dashboard.php +++ b/includes/dashboard.php @@ -32,7 +32,7 @@ function DisplayDashboard(&$extraFooterScripts): void $connectionType = $dashboard->getConnectionType(); $connectionIcon = $dashboard->getConnectionIcon($connectionType); $state = strtolower($details['state']); - $wirelessClients = $dashboard->getWirelessClients(); + $wirelessClients = $dashboard->getWirelessClients($interface); $ethernetClients = $dashboard->getEthernetClients(); $totalClients = $wirelessClients + $ethernetClients; $plugins = $pluginManager->getInstalledPlugins(); diff --git a/src/RaspAP/UI/Dashboard.php b/src/RaspAP/UI/Dashboard.php index a43dc04b..fea6804a 100644 --- a/src/RaspAP/UI/Dashboard.php +++ b/src/RaspAP/UI/Dashboard.php @@ -162,11 +162,13 @@ class Dashboard { /* * Parses the output of iw to obtain a list of wireless clients * + * @param string $interface * @return integer $clientCount */ - public function getWirelessClients() + public function getWirelessClients($interface): int { - exec('iw dev wlan0 station dump', $output, $status); + $cmd = 'iw dev '. escapeshellarg($interface) .' station dump'; + exec($cmd, $output, $status); if ($status !== 0) { return 0;