beenull/raspap-webgui-mirror
1
0
Fork 0
mirror of https://github.com/RaspAP/raspap-webgui.git synced 2024-11-22 07:30:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove valid RASPI_5GHZ_ISO_ALPHA2 country, set hwModeDisabled

Browse source
This commit is contained in:
billz 2023-11-05 14:36:18 +00:00
parent e16c69c446
commit 5e802e8a0b
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/functions.php
View file

@ -881,12 +881,12 @@ function getCountryCodes($locale = 'en', $flag = true) {
if (count($parts) >= 2) { if (count($parts) >= 2) {
$countryCode = $parts[0]; $countryCode = $parts[0];
if ($flag) { if ($flag) {
$countryFlag = $parts[3] . ' '; $countryFlag = $parts[3];
$countryName = $parts[4]; $countryName = $parts[4] .' ';
} else { } else {
$countryName = $parts[3]; $countryName = $parts[3];
} }
$countryData[$countryCode] = $countryFlag .$countryName; $countryData[$countryCode] = $countryName.$countryFlag;
} }
} }
return $countryData; return $countryData;

10
includes/hostapd.php
View file

@ -117,7 +117,6 @@ function DisplayHostAPDConfig()
} }
} }
$countries_5Ghz_max48ch = RASPI_5GHZ_ISO_ALPHA2;
$selectedHwMode = $arrConfig['hw_mode']; $selectedHwMode = $arrConfig['hw_mode'];
if (isset($arrConfig['ieee80211n'])) { if (isset($arrConfig['ieee80211n'])) {
if (strval($arrConfig['ieee80211n']) === '1') { if (strval($arrConfig['ieee80211n']) === '1') {
@ -134,14 +133,6 @@ function DisplayHostAPDConfig()
$selectedHwMode = 'w'; $selectedHwMode = 'w';
} }
} }
if (!in_array($arrConfig['country_code'], $countries_5Ghz_max48ch)) {
$hwModeDisabled = 'ac';
if ($selectedHwMode === $hwModeDisabled) {
unset($selectedHwMode);
}
} else {
$hwModeDisabled = null;
}
echo renderTemplate( echo renderTemplate(
"hostapd", compact( "hostapd", compact(
@ -160,7 +151,6 @@ function DisplayHostAPDConfig()
"arrHostapdConf", "arrHostapdConf",
"operatingSystem", "operatingSystem",
"selectedHwMode", "selectedHwMode",
"hwModeDisabled",
"countryCodes" "countryCodes"
) )
); );