mirror of
https://github.com/billz/raspap-webgui.git
synced 2023-10-10 13:37:24 +02:00
Zbchristian fix wifi client connect #53
This commit is contained in:
parent
66c9095ba9
commit
d8626bd790
@ -6,9 +6,11 @@ function knownWifiStations(&$networks)
|
||||
{
|
||||
// Find currently configured networks
|
||||
exec(' sudo cat ' . RASPI_WPA_SUPPLICANT_CONFIG, $known_return);
|
||||
$index = 0;
|
||||
foreach ($known_return as $line) {
|
||||
if (preg_match('/network\s*=/', $line)) {
|
||||
$network = array('visible' => false, 'configured' => true, 'connected' => false);
|
||||
$network = array('visible' => false, 'configured' => true, 'connected' => false, 'index' => $index);
|
||||
++$index;
|
||||
} elseif (isset($network) && $network !== null) {
|
||||
if (preg_match('/^\s*}\s*$/', $line)) {
|
||||
$networks[$ssid] = $network;
|
||||
@ -68,6 +70,12 @@ function nearbyWifiStations(&$networks, $cached = true)
|
||||
exec('cat '.RASPI_HOSTAPD_CONFIG.' | sed -rn "s/ssid=(.*)\s*$/\1/p" ', $ap_ssid);
|
||||
$ap_ssid = $ap_ssid[0];
|
||||
|
||||
$index = 0;
|
||||
if ( !empty($networks) ) {
|
||||
$lastnet = end($networks);
|
||||
if ( isset($lastnet['index']) ) $index = $lastnet['index'] + 1;
|
||||
}
|
||||
|
||||
foreach (explode("\n", $scan_results) as $network) {
|
||||
$arrNetwork = preg_split("/[\t]+/", $network); // split result into array
|
||||
|
||||
@ -84,8 +92,6 @@ function nearbyWifiStations(&$networks, $cached = true)
|
||||
continue;
|
||||
}
|
||||
|
||||
$networks[$ssid]['ssid'] = $ssid;
|
||||
|
||||
// If network is saved
|
||||
if (array_key_exists($ssid, $networks)) {
|
||||
$networks[$ssid]['visible'] = true;
|
||||
@ -93,13 +99,16 @@ function nearbyWifiStations(&$networks, $cached = true)
|
||||
// TODO What if the security has changed?
|
||||
} else {
|
||||
$networks[$ssid] = array(
|
||||
'ssid' => $ssid,
|
||||
'configured' => false,
|
||||
'protocol' => ConvertToSecurity($arrNetwork[3]),
|
||||
'channel' => ConvertToChannel($arrNetwork[1]),
|
||||
'passphrase' => '',
|
||||
'visible' => true,
|
||||
'connected' => false
|
||||
'connected' => false,
|
||||
'index' => $index
|
||||
);
|
||||
++$index;
|
||||
}
|
||||
|
||||
// Save RSSI, if the current value is larger than the already stored
|
||||
|
@ -19,7 +19,8 @@
|
||||
<?php if (!empty($connected)): ?>
|
||||
<h4 class="h-underlined my-3"><?php echo _("Connected") ?></h4>
|
||||
<div class="card-grid">
|
||||
<?php foreach ($connected as $network) : ?>
|
||||
<?php foreach ($connected as $network) : ?>
|
||||
<?php $index = isset($network['index']) ? $network['index'] : -1; ?>
|
||||
<?php echo renderTemplate("wifi_stations/network", compact('network', 'index')) ?>
|
||||
<?php $index++; ?>
|
||||
<?php endforeach ?>
|
||||
@ -29,7 +30,8 @@
|
||||
<?php if (!empty($known)): ?>
|
||||
<h4 class="h-underlined my-3"><?php echo _("Known") ?></h4>
|
||||
<div class="card-grid">
|
||||
<?php foreach ($known as $network) : ?>
|
||||
<?php foreach ($known as $network) : ?>
|
||||
<?php $index = isset($network['index']) ? $network['index'] : -1; ?>
|
||||
<?php echo renderTemplate("wifi_stations/network", compact('network', 'index')) ?>
|
||||
<?php $index++; ?>
|
||||
<?php endforeach ?>
|
||||
@ -39,7 +41,8 @@
|
||||
<?php if (!empty($nearby)): ?>
|
||||
<h4 class="h-underlined my-3"><?php echo _("Nearby") ?></h4>
|
||||
<div class="card-grid">
|
||||
<?php foreach ($nearby as $network) : ?>
|
||||
<?php foreach ($nearby as $network) : ?>
|
||||
<?php $index = isset($network['index']) ? $network['index'] : -1; ?>
|
||||
<?php echo renderTemplate("wifi_stations/network", compact('network', 'index')) ?>
|
||||
<?php $index++; ?>
|
||||
<?php endforeach ?>
|
||||
|
Loading…
Reference in New Issue
Block a user