frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Add detect managedModeEnabled state with iwgetid

Browse Source
This commit is contained in:
billz 2019-12-13 14:05:41 +00:00
parent 0d92cb636f
commit 5462e26d95
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/hostapd.php
View File

@ -19,6 +19,7 @@ function DisplayHostAPDConfig()
]; ];
$arrSecurity = array(1 => 'WPA', 2 => 'WPA2', 3 => 'WPA+WPA2', 'none' => _("None")); $arrSecurity = array(1 => 'WPA', 2 => 'WPA2', 3 => 'WPA+WPA2', 'none' => _("None"));
$arrEncType = array('TKIP' => 'TKIP', 'CCMP' => 'CCMP', 'TKIP CCMP' => 'TKIP+CCMP'); $arrEncType = array('TKIP' => 'TKIP', 'CCMP' => 'CCMP', 'TKIP CCMP' => 'TKIP+CCMP');
$managedModeEnabled = false;
exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces); exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces);
if (isset($_POST['SaveHostAPDSettings'])) { if (isset($_POST['SaveHostAPDSettings'])) {
@ -43,6 +44,10 @@ function DisplayHostAPDConfig()
exec('cat '. RASPI_HOSTAPD_CONFIG, $hostapdconfig); exec('cat '. RASPI_HOSTAPD_CONFIG, $hostapdconfig);
exec('pidof hostapd | wc -l', $hostapdstatus); exec('pidof hostapd | wc -l', $hostapdstatus);
exec('iwgetid '. RASPI_WIFI_CLIENT_INTERFACE. ' -r', $wifiNetworkID);
if ( !empty($wifiNetworkID[0])) {
$managedModeEnabled = true;
}
$serviceStatus = $hostapdstatus[0] == 0 ? "down" : "up"; $serviceStatus = $hostapdstatus[0] == 0 ? "down" : "up";
@ -61,6 +66,7 @@ function DisplayHostAPDConfig()
"status", "status",
"serviceStatus", "serviceStatus",
"hostapdstatus", "hostapdstatus",
"managedModeEnabled",
"interfaces", "interfaces",
"arrConfig", "arrConfig",
"arr80211Standard", "arr80211Standard",