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

Zbchristian fix wifi client connect #53

Browse Source
This commit is contained in:
zbchristian 2021-09-02 10:58:34 +02:00 committed by billz
parent 66c9095ba9
commit d8626bd790
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
includes/wifi_functions.php
View File

@ -6,9 +6,11 @@ function knownWifiStations(&$networks)
{ {
// Find currently configured networks // Find currently configured networks
exec(' sudo cat ' . RASPI_WPA_SUPPLICANT_CONFIG, $known_return); exec(' sudo cat ' . RASPI_WPA_SUPPLICANT_CONFIG, $known_return);
$index = 0;
foreach ($known_return as $line) { foreach ($known_return as $line) {
if (preg_match('/network\s*=/', $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) { } elseif (isset($network) && $network !== null) {
if (preg_match('/^\s*}\s*$/', $line)) { if (preg_match('/^\s*}\s*$/', $line)) {
$networks[$ssid] = $network; $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); exec('cat '.RASPI_HOSTAPD_CONFIG.' | sed -rn "s/ssid=(.*)\s*$/\1/p" ', $ap_ssid);
$ap_ssid = $ap_ssid[0]; $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) { foreach (explode("\n", $scan_results) as $network) {
$arrNetwork = preg_split("/[\t]+/", $network); // split result into array $arrNetwork = preg_split("/[\t]+/", $network); // split result into array
@ -84,8 +92,6 @@ function nearbyWifiStations(&$networks, $cached = true)
continue; continue;
} }
$networks[$ssid]['ssid'] = $ssid;
// If network is saved // If network is saved
if (array_key_exists($ssid, $networks)) { if (array_key_exists($ssid, $networks)) {
$networks[$ssid]['visible'] = true; $networks[$ssid]['visible'] = true;
@ -93,13 +99,16 @@ function nearbyWifiStations(&$networks, $cached = true)
// TODO What if the security has changed? // TODO What if the security has changed?
} else { } else {
$networks[$ssid] = array( $networks[$ssid] = array(
'ssid' => $ssid,
'configured' => false, 'configured' => false,
'protocol' => ConvertToSecurity($arrNetwork[3]), 'protocol' => ConvertToSecurity($arrNetwork[3]),
'channel' => ConvertToChannel($arrNetwork[1]), 'channel' => ConvertToChannel($arrNetwork[1]),
'passphrase' => '', 'passphrase' => '',
'visible' => true, 'visible' => true,
'connected' => false 'connected' => false,
'index' => $index
); );
++$index;
} }
// Save RSSI, if the current value is larger than the already stored // Save RSSI, if the current value is larger than the already stored

9
templates/wifi_stations.php
View File

@ -19,7 +19,8 @@
<?php if (!empty($connected)): ?> <?php if (!empty($connected)): ?>
<h4 class="h-underlined my-3"><?php echo _("Connected") ?></h4> <h4 class="h-underlined my-3"><?php echo _("Connected") ?></h4>
<div class="card-grid"> <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 echo renderTemplate("wifi_stations/network", compact('network', 'index')) ?>
<?php $index++; ?> <?php $index++; ?>
<?php endforeach ?> <?php endforeach ?>
@ -29,7 +30,8 @@
<?php if (!empty($known)): ?> <?php if (!empty($known)): ?>
<h4 class="h-underlined my-3"><?php echo _("Known") ?></h4> <h4 class="h-underlined my-3"><?php echo _("Known") ?></h4>
<div class="card-grid"> <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 echo renderTemplate("wifi_stations/network", compact('network', 'index')) ?>
<?php $index++; ?> <?php $index++; ?>
<?php endforeach ?> <?php endforeach ?>
@ -39,7 +41,8 @@
<?php if (!empty($nearby)): ?> <?php if (!empty($nearby)): ?>
<h4 class="h-underlined my-3"><?php echo _("Nearby") ?></h4> <h4 class="h-underlined my-3"><?php echo _("Nearby") ?></h4>
<div class="card-grid"> <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 echo renderTemplate("wifi_stations/network", compact('network', 'index')) ?>
<?php $index++; ?> <?php $index++; ?>
<?php endforeach ?> <?php endforeach ?>