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

Updated with paramaterized servicestart

Browse Source
This commit is contained in:
billz 2019-03-07 10:13:40 +00:00
parent b022777e55
commit 1df86a78a9
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
includes/hostapd.php
View File

@ -28,12 +28,9 @@ function DisplayHostAPDConfig()
if (CSRFValidate()) { if (CSRFValidate()) {
$status->addMessage('Attempting to start hotspot', 'info'); $status->addMessage('Attempting to start hotspot', 'info');
if ($arrHostapdConf['WifiAPEnable'] == 1) { if ($arrHostapdConf['WifiAPEnable'] == 1) {
//exec('sudo /etc/raspap/hostapd/servicesdisable.sh'); exec('sudo /etc/raspap/hostapd/servicestart.sh --interface uap0 --seconds 3', $return );
exec('sudo /etc/raspap/hostapd/servicestart.sh', $return );
} else { } else {
// Todo: remove uap0 interface before switching back to wlan0, else IAID conflict with dhcpcd exec( 'sudo /etc/raspap/hostapd/servicestart.sh --seconds 3', $return );
// Stop/start dhcpd.service
exec( 'sudo /etc/init.d/hostapd start', $return );
} }
foreach( $return as $line ) { foreach( $return as $line ) {
$status->addMessage($line, 'info'); $status->addMessage($line, 'info');
@ -87,7 +84,7 @@ function DisplayHostAPDConfig()
<li class="active"><a href="#basic" data-toggle="tab"><?php echo _("Basic"); ?></a></li> <li class="active"><a href="#basic" data-toggle="tab"><?php echo _("Basic"); ?></a></li>
<li><a href="#security" data-toggle="tab"><?php echo _("Security"); ?></a></li> <li><a href="#security" data-toggle="tab"><?php echo _("Security"); ?></a></li>
<li><a href="#advanced" data-toggle="tab"><?php echo _("Advanced"); ?></a></li> <li><a href="#advanced" data-toggle="tab"><?php echo _("Advanced"); ?></a></li>
<li><a href="#logoutput" data-toggle="tab"><?php echo _("Logfile output"); ?></a></li> <li><a href="#logoutput" data-toggle="tab"><?php echo _("Logfile"); ?></a></li>
</ul> </ul>
<!-- Tab panes --> <!-- Tab panes -->
@ -645,8 +642,6 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
if ($wifiAPEnable == 1) { if ($wifiAPEnable == 1) {
// Enable uap0 configuration in dnsmasq for Wifi client AP mode // Enable uap0 configuration in dnsmasq for Wifi client AP mode
$arrDnsmasqConf = parse_ini_file(RASPI_DNSMASQ_CONFIG);
$config = 'interface=lo,uap0 # Enable uap0 interface for wireless client AP mode'.PHP_EOL; $config = 'interface=lo,uap0 # Enable uap0 interface for wireless client AP mode'.PHP_EOL;
$config.= 'bind-interfaces # Bind to the interfaces'.PHP_EOL; $config.= 'bind-interfaces # Bind to the interfaces'.PHP_EOL;
$config.= 'server=8.8.8.8 # Forward DNS requests to Google DNS'.PHP_EOL; $config.= 'server=8.8.8.8 # Forward DNS requests to Google DNS'.PHP_EOL;
@ -655,7 +650,6 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
$config.= 'dhcp-range=192.168.50.50,192.168.50.150,12h'.PHP_EOL; $config.= 'dhcp-range=192.168.50.50,192.168.50.150,12h'.PHP_EOL;
} else { } else {
// Fallback to default config // Fallback to default config
// Todo:
$config = 'interface='.$_POST['interface'].PHP_EOL; $config = 'interface='.$_POST['interface'].PHP_EOL;
$config .= 'dhcp-range=10.3.141.50,10.3.141.255,255.255.255.0,12h'.PHP_EOL; $config .= 'dhcp-range=10.3.141.50,10.3.141.255,255.255.255.0,12h'.PHP_EOL;
} }