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

Merge branch 'master' of https://github.com/FIAV1/raspap-webgui

Browse Source
This commit is contained in:
Federico Frigo 2021-09-30 11:05:12 +01:00
commit 7ebd9eb75c
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/js/custom.js
View File

@ -278,7 +278,9 @@ function loadChannelSelect(selected) {
var countries_5Ghz_max48ch = data["5Ghz_max48ch"].countries; var countries_5Ghz_max48ch = data["5Ghz_max48ch"].countries;
// Map selected hw_mode and country to determine channel list // Map selected hw_mode and country to determine channel list
if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) { if (hw_mode === 'a') {
selectablechannels = data["5Ghz_max48ch"].channels;
} else if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {
selectablechannels = data["2_4GHz_max11ch"].channels; selectablechannels = data["2_4GHz_max11ch"].channels;
} else if (($.inArray(country_code, countries_2_4Ghz_max14ch) !== -1) && (hw_mode === 'b')) { } else if (($.inArray(country_code, countries_2_4Ghz_max14ch) !== -1) && (hw_mode === 'b')) {
selectablechannels = data["2_4GHz_max14ch"].channels; selectablechannels = data["2_4GHz_max14ch"].channels;

6
includes/dhcp.php
View File

@ -52,6 +52,7 @@ function DisplayDHCPConfig()
exec('cat '. RASPI_DNSMASQ_PREFIX.$ap_iface.'.conf', $return); exec('cat '. RASPI_DNSMASQ_PREFIX.$ap_iface.'.conf', $return);
$conf = array_merge(ParseConfig($return)); $conf = array_merge(ParseConfig($return));
$hosts = (array)$conf['dhcp-host']; $hosts = (array)$conf['dhcp-host'];
$upstreamServers = (array)$conf['server'];
exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces); exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces);
exec('cat ' . RASPI_DNSMASQ_LEASES, $leases); exec('cat ' . RASPI_DNSMASQ_LEASES, $leases);
@ -63,6 +64,7 @@ function DisplayDHCPConfig()
"ap_iface", "ap_iface",
"conf", "conf",
"hosts", "hosts",
"upstreamServers",
"interfaces", "interfaces",
"leases" "leases"
) )
@ -178,9 +180,7 @@ function compareIPs($ip1, $ip2)
function updateDnsmasqConfig($iface,$status) function updateDnsmasqConfig($iface,$status)
{ {
$config = '# RaspAP '.$iface.' configuration'.PHP_EOL; $config = '# RaspAP '.$iface.' configuration'.PHP_EOL;
$config .= 'interface='.$iface.PHP_EOL. $config .= 'interface='.$iface.PHP_EOL.'dhcp-range='.$_POST['RangeStart'].','.$_POST['RangeEnd'].','.$_POST['SubnetMask'].',';
'dhcp-range='.$_POST['RangeStart'].','.$_POST['RangeEnd'].
',255.255.255.0,';
if ($_POST['RangeLeaseTimeUnits'] !== 'infinite') { if ($_POST['RangeLeaseTimeUnits'] !== 'infinite') {
$config .= $_POST['RangeLeaseTime']; $config .= $_POST['RangeLeaseTime'];
} }

2
includes/hostapd.php
View File

@ -14,7 +14,7 @@ getWifiInterface();
function DisplayHostAPDConfig() function DisplayHostAPDConfig()
{ {
$status = new StatusMessages(); $status = new StatusMessages();
$system = new System(); $system = new \RaspAP\System\Sysinfo;
$arrConfig = array(); $arrConfig = array();
$arr80211Standard = [ $arr80211Standard = [
'a' => '802.11a - 5 GHz', 'a' => '802.11a - 5 GHz',

6
yarn.lock
View File

@ -3291,9 +3291,9 @@ path-is-absolute@^1.0.0:
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
path-parse@^1.0.6: path-parse@^1.0.6:
version "1.0.6" version "1.0.7"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
path-root-regex@^0.1.0: path-root-regex@^0.1.0:
version "0.1.2" version "0.1.2"