mirror of
https://github.com/billz/raspap-webgui.git
synced 2023-10-10 13:37:24 +02:00
Split out php from html
This commit is contained in:
Joe Haig
parent
c7ed97dd8b
commit
ad76f7651a
@ -5,119 +5,171 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function DisplayWPAConfig(){
|
function DisplayWPAConfig(){
|
||||||
$status = '';
|
$status = new StatusMessages();
|
||||||
|
$scanned_networks = array();
|
||||||
|
|
||||||
|
if( isset($_POST['SaveWPAPSKSettings']) ) {
|
||||||
|
|
||||||
|
$config = 'ctrl_interface=DIR='. RASPI_WPA_CTRL_INTERFACE .' GROUP=netdev
|
||||||
|
update_config=1
|
||||||
|
';
|
||||||
|
$networks = $_POST['Networks'];
|
||||||
|
for( $x = 0; $x < $networks; $x++ ) {
|
||||||
|
$network = '';
|
||||||
|
$ssid = escapeshellarg( $_POST['ssid'.$x] );
|
||||||
|
$protocol = escapeshellarg( $_POST['protocol'.$x] );
|
||||||
|
$psk = escapeshellarg( $_POST['psk'.$x] );
|
||||||
|
|
||||||
|
if ( strlen($psk) >2 ) {
|
||||||
|
exec( 'wpa_passphrase '.$ssid. ' ' . $psk,$network );
|
||||||
|
foreach($network as $b) {
|
||||||
|
$config .= "$b
|
||||||
|
";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
exec( "echo '$config' > /tmp/wifidata", $return );
|
||||||
|
system( 'sudo cp /tmp/wifidata ' . RASPI_WPA_SUPPLICANT_CONFIG, $returnval );
|
||||||
|
if( $returnval == 0 ) {
|
||||||
|
$status->addMessage('Wifi settings updated successfully', 'success');
|
||||||
|
} else {
|
||||||
|
$status->addMessage('Wifi settings failed to be updated', 'danger');
|
||||||
|
}
|
||||||
|
} elseif( isset($_POST['Scan']) ) {
|
||||||
|
$return = '';
|
||||||
|
exec( 'sudo wpa_cli scan',$return );
|
||||||
|
sleep(3);
|
||||||
|
exec( 'sudo wpa_cli scan_results',$return );
|
||||||
|
for( $shift = 0; $shift < 4; $shift++ ) {
|
||||||
|
array_shift($return);
|
||||||
|
}
|
||||||
|
// display output
|
||||||
|
foreach( $return as $network ) {
|
||||||
|
$arrNetwork = preg_split("/[\t]+/",$network);
|
||||||
|
$scanned_networks[] = array(
|
||||||
|
'bssid' => $arrNetwork[0],
|
||||||
|
'channel' => ConvertToChannel($arrNetwork[1]),
|
||||||
|
'signal' => $arrNetwork[2] . " dBm",
|
||||||
|
'security' => ConvertToSecurity($arrNetwork[3]),
|
||||||
|
'ssid' => $arrNetwork[4]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
echo '</tbody></table>';
|
||||||
|
}
|
||||||
|
|
||||||
|
// default action, output configured network(s)
|
||||||
|
exec(' sudo cat ' . RASPI_WPA_SUPPLICANT_CONFIG, $supplicant_return);
|
||||||
|
$ssid = array();
|
||||||
|
$psk = array();
|
||||||
|
|
||||||
|
foreach($supplicant_return as $a) {
|
||||||
|
if(preg_match('/SSID/i',$a)) {
|
||||||
|
$arrssid = explode("=",$a);
|
||||||
|
$ssid[] = str_replace('"','',$arrssid[1]);
|
||||||
|
}
|
||||||
|
if(preg_match('/psk/i',$a)) {
|
||||||
|
$arrpsk = explode("=",$a);
|
||||||
|
$psk[] = str_replace('"','',$arrpsk[1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$numSSIDs = count($ssid);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<div class="panel panel-primary">
|
<div class="panel panel-primary">
|
||||||
<div class="panel-heading"><i class="fa fa-signal fa-fw"></i> Configure client
|
<div class="panel-heading"><i class="fa fa-signal fa-fw"></i> Configure client</div>
|
||||||
</div>
|
<!-- /.panel-heading -->
|
||||||
<!-- /.panel-heading -->
|
<div class="panel-body">
|
||||||
<div class="panel-body">
|
<p><?php $status->showMessages(); ?></p>
|
||||||
<?php echo $status; ?>
|
<h4>Client settings</h4>
|
||||||
<h4>Client settings</h4>
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
|
|
||||||
<?php
|
<form method="POST" action="?page=wpa_conf" id="wpa_conf_form">
|
||||||
// save WPA settings
|
<input type="hidden" id="Networks" name="Networks" />
|
||||||
if( isset($_POST['SaveWPAPSKSettings']) ) {
|
<div class="network" id="networkbox"></div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-6">
|
||||||
|
<input type="submit" class="btn btn-primary" value="Scan for networks" name="Scan" />
|
||||||
|
<input type="button" class="btn btn-primary" value="Add network" onClick="AddNetwork();" />
|
||||||
|
<input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<h4>Networks found</h4>
|
||||||
|
<div class="table-responsive">
|
||||||
|
<table class="table table-hover">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th></th>
|
||||||
|
<th>SSID</th>
|
||||||
|
<th>Channel</th>
|
||||||
|
<th>Signal</th>
|
||||||
|
<th>Security</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<?php foreach( $scanned_networks as $network ) { ?>
|
||||||
|
<tr>
|
||||||
|
<td><input type="button" class="btn btn-outline btn-primary" value="Connect" onClick="AddScanned('<?php echo $network['ssid'] ?>',<?php echo ($network['security'] === 'Open' ? 'true' : 'false')?>)" /></td>
|
||||||
|
<td><strong><?php echo $network['ssid'] ?></strong></td>
|
||||||
|
<td><?php echo $network['channel'] ?></td>
|
||||||
|
<td><?php echo $network['signal'] ?></td>
|
||||||
|
<td><?php echo $network['security'] ?></td>
|
||||||
|
</tr>
|
||||||
|
<?php } ?>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
$config = 'ctrl_interface=DIR='. RASPI_WPA_CTRL_INTERFACE .' GROUP=netdev
|
<div class="row">
|
||||||
update_config=1
|
<div class="col-lg-12">
|
||||||
';
|
<form method="POST" action="?page=wpa_conf" id="wpa_conf_form">
|
||||||
$networks = $_POST['Networks'];
|
<input type="hidden" id="Networks" name="Networks" />
|
||||||
for( $x = 0; $x < $networks; $x++ ) {
|
<div class="network" id="networkbox">
|
||||||
$network = '';
|
<?php for ($ssids = 0; $ssids < $numSSIDs; $ssids++) { ?>
|
||||||
$ssid = escapeshellarg( $_POST['ssid'.$x] );
|
<div id="Networkbox<?php echo $ssids ?>" class="NetworkBoxes">
|
||||||
$psk = escapeshellarg( $_POST['psk'.$x] );
|
<div class="row">
|
||||||
|
<div class="form-group col-md-4">
|
||||||
if ( strlen($psk) >2 ) {
|
<label for="code">Network <?php echo $ssids ?></label>
|
||||||
exec( 'wpa_passphrase '.$ssid. ' ' . $psk,$network );
|
</div>
|
||||||
foreach($network as $b) {
|
</div>
|
||||||
$config .= "$b
|
<div class="row">
|
||||||
";
|
<div class="form-group col-md-4">
|
||||||
}
|
<label for="code" id="lssid0">SSID</label>
|
||||||
}
|
<input type="text" class="form-control" id="ssid0" name="ssid<?php echo $ssids ?>" value="<?php echo $ssid[$ssids] ?>" onkeyup="CheckSSID(this)" />
|
||||||
}
|
</div>
|
||||||
exec( "echo '$config' > /tmp/wifidata", $return );
|
</div>
|
||||||
system( 'sudo cp /tmp/wifidata ' . RASPI_WPA_SUPPLICANT_CONFIG, $returnval );
|
<div class="row">
|
||||||
if( $returnval == 0 ) {
|
<div class="form-group col-md-4">
|
||||||
echo '<div class="alert alert-success alert-dismissable">Wifi settings updated successfully
|
<label for="code" id="lpsk0">PSK</label>
|
||||||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
|
<input type="password" class="form-control" id="psk0" name="psk<?php echo $ssids ?>" value="<?php echo $psk[$ssids] ?>" onkeyup="CheckPSK(this)" />
|
||||||
} else {
|
</div>
|
||||||
echo '<div class="alert alert-danger alert-dismissable">Wifi settings failed to be updated
|
</div>
|
||||||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
|
<div class="row">
|
||||||
}
|
<div class="form-group col-md-4">
|
||||||
|
<input type="button" class="btn btn-outline btn-primary" value="Delete" onClick="DeleteNetwork('<?php echo $ssids?>')" />
|
||||||
// scan networks
|
</div>
|
||||||
} elseif( isset($_POST['Scan']) ) {
|
</div>
|
||||||
$return = '';
|
<?php } ?>
|
||||||
exec( 'sudo wpa_cli scan',$return );
|
</div><!-- /#Networkbox -->
|
||||||
sleep(3);
|
<div class="row">
|
||||||
exec( 'sudo wpa_cli scan_results',$return );
|
<div class="col-lg-6">
|
||||||
for( $shift = 0; $shift < 4; $shift++ ) {
|
<input type="submit" class="btn btn-primary" value="Scan for networks" name="Scan" />
|
||||||
array_shift($return);
|
<input type="button" class="btn btn-primary" value="Add network" onClick="AddNetwork();" />
|
||||||
}
|
<input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled />
|
||||||
// display output
|
</form>
|
||||||
echo '<form method="POST" action="?page=wpa_conf" id="wpa_conf_form"><input type="hidden" id="Networks" name="Networks" /><div class="network" id="networkbox"></div>';
|
</div>
|
||||||
echo '<div class="row"><div class="col-lg-6"><input type="submit" class="btn btn-primary" value="Scan for networks" name="Scan" /> <input type="button" class="btn btn-primary" value="Add network" onClick="AddNetwork();" /> <input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled /></div></div>';
|
</div>
|
||||||
echo '<h4>Networks found</h4><div class="table-responsive"><table class="table table-hover">';
|
<script type="text/Javascript">UpdateNetworks(this)</script>
|
||||||
echo '<thead><tr><th></th><th>SSID</th><th>Channel</th><th>Signal</th><th>Security</th></tr></thead><tbody>';
|
</div>
|
||||||
foreach( $return as $network ) {
|
|
||||||
$arrNetwork = preg_split("/[\t]+/",$network);
|
|
||||||
$bssid = $arrNetwork[0];
|
|
||||||
$channel = ConvertToChannel($arrNetwork[1]);
|
|
||||||
$signal = $arrNetwork[2] . " dBm";
|
|
||||||
$security = $arrNetwork[3];
|
|
||||||
$ssid = $arrNetwork[4];
|
|
||||||
echo '<tr><td><input type="button" class="btn btn-outline btn-primary" value="Connect" onClick="AddScanned(\''.$ssid.'\')" /></td> <td><strong>' . $ssid . "</strong></td> <td>" . $channel . "</td><td>" . $signal . "</td><td>". ConvertToSecurity($security) ."</td></tr>";
|
|
||||||
}
|
|
||||||
echo '</tbody></table>';
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
// default action, output configured network(s)
|
|
||||||
exec(' sudo cat ' . RASPI_WPA_SUPPLICANT_CONFIG, $return);
|
|
||||||
$ssid = array();
|
|
||||||
$psk = array();
|
|
||||||
|
|
||||||
foreach($return as $a) {
|
|
||||||
if(preg_match('/SSID/i',$a)) {
|
|
||||||
$arrssid = explode("=",$a);
|
|
||||||
$ssid[] = str_replace('"','',$arrssid[1]);
|
|
||||||
}
|
|
||||||
if(preg_match('/psk/i',$a)) {
|
|
||||||
$arrpsk = explode("=",$a);
|
|
||||||
$psk[] = str_replace('"','',$arrpsk[1]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$numSSIDs = count($ssid);
|
|
||||||
$output = '<form method="POST" action="?page=wpa_conf" id="wpa_conf_form"><input type="hidden" id="Networks" name="Networks" /><div class="network" id="networkbox">';
|
|
||||||
|
|
||||||
if ( $numSSIDs > 0 ) {
|
|
||||||
for( $ssids = 0; $ssids < $numSSIDs; $ssids++ ) {
|
|
||||||
$output .= '<div id="Networkbox'.$ssids.'" class="NetworkBoxes">
|
|
||||||
<div class="row"><div class="form-group col-md-4"><label for="code">Network '.$ssids.'</label></div></div>
|
|
||||||
<div class="row"><div class="form-group col-md-4"><label for="code" id="lssid0">SSID</label><input type="text" class="form-control" id="ssid0" name="ssid'.$ssids.'" value="'.$ssid[$ssids].'" onkeyup="CheckSSID(this)" /></div></div>
|
|
||||||
<div class="row"><div class="form-group col-md-4"><label for="code" id="lpsk0">PSK</label><input type="password" class="form-control" id="psk0" name="psk'.$ssids.'" value="'.$psk[$ssids].'" onkeyup="CheckPSK(this)" /></div></div>
|
|
||||||
<div class="row"><div class="form-group col-md-4"><input type="button" class="btn btn-outline btn-primary" value="Delete" onClick="DeleteNetwork('.$ssids.')" /></div></div>';
|
|
||||||
}
|
|
||||||
$output .= '</div><!-- /#Networkbox -->';
|
|
||||||
} else {
|
|
||||||
$status = '<div class="alert alert-warning alert-dismissable">Not connected
|
|
||||||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
|
|
||||||
}
|
|
||||||
$output .= '<div class="row"><div class="col-lg-6"><input type="submit" class="btn btn-primary" value="Scan for networks" name="Scan" /> <input type="button" class="btn btn-primary" value="Add network" onClick="AddNetwork();" /> <input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled />';
|
|
||||||
$output .= '</form>';
|
|
||||||
echo $output;
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
<script type="text/Javascript">UpdateNetworks(this)</script>
|
|
||||||
</form>
|
|
||||||
</div><!-- ./ Panel body -->
|
</div><!-- ./ Panel body -->
|
||||||
</div><!-- /.panel-primary -->
|
</div><!-- /.panel-primary -->
|
||||||
</div><!-- /.col-lg-12 -->
|
</div><!-- /.col-lg-12 -->
|
||||||
</div><!-- /.row -->
|
</div><!-- /.row -->
|
||||||
<?php
|
<?php
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user