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

Merge pull request #1666 from RaspAP/feat/hostapd-userconf

Browse source 
Add support for custom hostapd.conf.users file
This commit is contained in:
Bill Zimmerman 2024-09-27 10:02:35 +02:00 committed by GitHub
commit 20ce71070c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
includes/hostapd.php
View file

@ -135,6 +135,7 @@ function DisplayHostAPDConfig()
$selectedHwMode = 'w'; $selectedHwMode = 'w';
} }
} }
exec('sudo /bin/chmod o+r '.RASPI_HOSTAPD_LOG); exec('sudo /bin/chmod o+r '.RASPI_HOSTAPD_LOG);
$logdata = getLogLimited(RASPI_HOSTAPD_LOG); $logdata = getLogLimited(RASPI_HOSTAPD_LOG);
@ -395,8 +396,9 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $reg_dom
} }
$dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG); $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG);
$skip_dhcp = false;
if (preg_match('/wlan[2-9]\d*|wlan[1-9]\d+/', $ap_iface)) { if (preg_match('/wlan[2-9]\d*|wlan[1-9]\d+/', $ap_iface)) {
$skip_dhcp = true;; $skip_dhcp = true;
} elseif ($bridgedEnable == 1 || $wifiAPEnable == 1) { } elseif ($bridgedEnable == 1 || $wifiAPEnable == 1) {
$dhcp_cfg = join(PHP_EOL, $config); $dhcp_cfg = join(PHP_EOL, $config);
$status->addMessage(sprintf(_('DHCP configuration for %s enabled.'), $ap_iface), 'success'); $status->addMessage(sprintf(_('DHCP configuration for %s enabled.'), $ap_iface), 'success');
@ -508,6 +510,9 @@ function updateHostapdConfig($ignore_broadcast_ssid,$wifiAPEnable,$bridgedEnable
if (isset($_POST['max_num_sta'])) { if (isset($_POST['max_num_sta'])) {
$config.= 'max_num_sta='.$_POST['max_num_sta'].PHP_EOL; $config.= 'max_num_sta='.$_POST['max_num_sta'].PHP_EOL;
} }
$config.= parseUserHostapdCfg();
file_put_contents("/tmp/hostapddata", $config); file_put_contents("/tmp/hostapddata", $config);
system("sudo cp /tmp/hostapddata " . RASPI_HOSTAPD_CONFIG, $result); system("sudo cp /tmp/hostapddata " . RASPI_HOSTAPD_CONFIG, $result);
return $result; return $result;
@ -528,3 +533,25 @@ function iwRegSet(string $country_code, $status)
return $result; return $result;
} }
/**
* Parses optional /etc/hostapd/hostapd.conf.users file
*
* @return string $tmp
*/
function parseUserHostapdCfg()
{
if (file_exists(RASPI_HOSTAPD_CONFIG . '.users')) {
exec('cat '. RASPI_HOSTAPD_CONFIG . '.users', $hostapdconfigusers);
foreach ($hostapdconfigusers as $hostapdconfigusersline) {
if (strlen($hostapdconfigusersline) === 0) {
continue;
}
if ($hostapdconfigusersline[0] != "#") {
$arrLine = explode("=", $hostapdconfigusersline);
$tmp.= $arrLine[0]."=".$arrLine[1].PHP_EOL;;
}
}
return $tmp;
}
}