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 global to select wireless interface for wifi client

Browse Source
This commit is contained in:
Emmanuel Geoffray 2017-12-07 19:00:48 +00:00
parent d22cdd6e68
commit 3228114dd8
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/config.php
View File

@ -3,6 +3,7 @@
define('RASPI_CONFIG', '/etc/raspap'); define('RASPI_CONFIG', '/etc/raspap');
define('RASPI_CONFIG_NETWORKING',RASPI_CONFIG.'/networking'); define('RASPI_CONFIG_NETWORKING',RASPI_CONFIG.'/networking');
define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth'); define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth');
define('RASPI_WIFI_CLIENT_INTERFACE', 'wifiKey');
// Constants for configuration file paths. // Constants for configuration file paths.
// These are typical for default RPi installs. Modify if needed. // These are typical for default RPi installs. Modify if needed.

4
includes/configure_client.php
View File

@ -134,7 +134,7 @@ function DisplayWPAConfig(){
} }
} }
exec( 'iwconfig wlan0', $iwconfig_return ); exec( 'iwconfig ' . RASPI_WIFI_CLIENT_INTERFACE, $iwconfig_return );
foreach ($iwconfig_return as $line) { foreach ($iwconfig_return as $line) {
if (preg_match( '/ESSID:\"([^"]+)\"/i',$line,$iwconfig_ssid )) { if (preg_match( '/ESSID:\"([^"]+)\"/i',$line,$iwconfig_ssid )) {
$networks[$iwconfig_ssid[1]]['connected'] = true; $networks[$iwconfig_ssid[1]]['connected'] = true;
@ -149,7 +149,7 @@ function DisplayWPAConfig(){
<!-- /.panel-heading --> <!-- /.panel-heading -->
<div class="panel-body"> <div class="panel-body">
<p><?php $status->showMessages(); ?></p> <p><?php $status->showMessages(); ?></p>
<h4>Client settings</h4> <h4>Client settings for interface <?php echo RASPI_WIFI_CLIENT_INTERFACE ?></h4>
<div class="btn-group btn-block"> <div class="btn-group btn-block">
<a href=".?<?php echo $_SERVER['QUERY_STRING']; ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info" id="update">Rescan</a> <a href=".?<?php echo $_SERVER['QUERY_STRING']; ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info" id="update">Rescan</a>
</div> </div>

20
includes/dashboard.php
View File

@ -8,8 +8,8 @@ function DisplayDashboard(){
$status = new StatusMessages(); $status = new StatusMessages();
exec( 'ip a s wlan0', $return ); exec( 'ip a s ' . RASPI_WIFI_CLIENT_INTERFACE , $return );
exec( 'iwconfig wlan0', $return ); exec( 'iwconfig ' . RASPI_WIFI_CLIENT_INTERFACE, $return );
$strWlan0 = implode( " ", $return ); $strWlan0 = implode( " ", $return );
$strWlan0 = preg_replace( '/\s\s+/', ' ', $strWlan0 ); $strWlan0 = preg_replace( '/\s\s+/', ' ', $strWlan0 );
@ -58,17 +58,17 @@ function DisplayDashboard(){
} }
if( isset($_POST['ifdown_wlan0']) ) { if( isset($_POST['ifdown_wlan0']) ) {
exec( 'ifconfig wlan0 | grep -i running | wc -l',$test ); exec( 'ifconfig ' . RASPI_WIFI_CLIENT_INTERFACE . ' | grep -i running | wc -l',$test );
if($test[0] == 1) { if($test[0] == 1) {
exec( 'sudo ip link set wlan0 down',$return ); exec( 'sudo ip link set ' . RASPI_WIFI_CLIENT_INTERFACE . ' down',$return );
} else { } else {
echo 'Interface already down'; echo 'Interface already down';
} }
} elseif( isset($_POST['ifup_wlan0']) ) { } elseif( isset($_POST['ifup_wlan0']) ) {
exec( 'ifconfig wlan0 | grep -i running | wc -l',$test ); exec( 'ifconfig ' . RASPI_WIFI_CLIENT_INTERFACE . ' | grep -i running | wc -l',$test );
if($test[0] == 0) { if($test[0] == 0) {
exec( 'sudo ip link set wlan0 up',$return ); exec( 'sudo ip link set ' . RASPI_WIFI_CLIENT_INTERFACE . ' up',$return );
exec( 'sudo ip -s a f label wlan0',$return); exec( 'sudo ip -s a f label ' . RASPI_WIFI_CLIENT_INTERFACE,$return);
} else { } else {
echo 'Interface already up'; echo 'Interface already up';
} }
@ -85,7 +85,7 @@ function DisplayDashboard(){
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<h4>Interface Information</h4> <h4>Interface Information</h4>
<div class="info-item">Interface Name</div> wlan0</br> <div class="info-item">Interface Name</div> <?php echo RASPI_WIFI_CLIENT_INTERFACE ?></br>
<div class="info-item">IP Address</div> <?php echo $strIPAddress ?></br> <div class="info-item">IP Address</div> <?php echo $strIPAddress ?></br>
<div class="info-item">Subnet Mask</div> <?php echo $strNetMask ?></br> <div class="info-item">Subnet Mask</div> <?php echo $strNetMask ?></br>
<div class="info-item">Mac Address</div> <?php echo $strHWAddress ?></br></br> <div class="info-item">Mac Address</div> <?php echo $strHWAddress ?></br></br>
@ -126,9 +126,9 @@ function DisplayDashboard(){
<div class="row"> <div class="row">
<form action="?page=wlan0_info" method="POST"> <form action="?page=wlan0_info" method="POST">
<?php if ( !$wlan0up ) { <?php if ( !$wlan0up ) {
echo '<input type="submit" class="btn btn-success" value="Start wlan0" name="ifup_wlan0" />'; echo '<input type="submit" class="btn btn-success" value="Start ' . RASPI_WIFI_CLIENT_INTERFACE . '" name="ifup_wlan0" />';
} else { } else {
echo '<input type="submit" class="btn btn-warning" value="Stop wlan0" name="ifdown_wlan0" />'; echo '<input type="submit" class="btn btn-warning" value="Stop ' . RASPI_WIFI_CLIENT_INTERFACE . '" name="ifdown_wlan0" />';
} }
?> ?>
<input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" /> <input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" />