From 7335de7968ab6c718a7efd9666e3b7789bb1d620 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Wed, 23 Sep 2020 21:14:55 +0100
Subject: [PATCH 1/4] Cleanup debug output

---
 templates/wifi_stations.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php
index 63df3b54..c987e61a 100755
--- a/templates/wifi_stations.php
+++ b/templates/wifi_stations.php
@@ -4,7 +4,6 @@
 <?php endif ?>
 <?php $index = 0; ?>
 <div class="row ml-1 mr-1 w-100">
-<?php $networks = array_slice($networks, 1,1); ?>
 <?php
 if (count($networks) == 1) {
     $prop_col = "col-sm-12";

From 88600f05deff77d42f807d8ab63669a9383e17f2 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Wed, 23 Sep 2020 23:12:24 +0100
Subject: [PATCH 2/4] Indicate wireless client iface in UI, thx @RobertDuncan42

---
 templates/configure_client.php | 19 +++++++++++++++++++
 templates/dashboard.php        |  1 +
 2 files changed, 20 insertions(+)

diff --git a/templates/configure_client.php b/templates/configure_client.php
index f9e64feb..afb3aeb3 100755
--- a/templates/configure_client.php
+++ b/templates/configure_client.php
@@ -1,3 +1,16 @@
+<?php
+$arrHostapdConf = parse_ini_file(RASPI_CONFIG.'/hostapd.ini');
+if ($arrHostapdConf['WifiAPEnable'] == 1) {
+    $client_interface = 'uap0';
+} else {
+    $client_interface = $_SESSION['wifi_client_interface'];
+}
+exec('ip a show '.$client_interface, $stdoutIp);
+$stdoutIpAllLinesGlued = implode(" ", $stdoutIp);
+$stdoutIpWRepeatedSpaces = preg_replace('/\s\s+/', ' ', $stdoutIpAllLinesGlued);
+preg_match('/state (UP|DOWN)/i', $stdoutIpWRepeatedSpaces, $matchesState) || $matchesState[1] = 'unknown';
+$ifaceStatus = strtolower($matchesState[1]) ? "up" : "down";
+?>
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
@@ -6,6 +19,12 @@
           <div class="col">
             <i class="fas fa-wifi mr-2"></i><?php echo _("WiFi client"); ?>
           </div>
+            <div class="col">
+              <button class="btn btn-light btn-icon-split btn-sm service-status float-right">
+                <span class="icon"><i class="fas fa-circle service-status-<?php echo $ifaceStatus ?>"></i></span>
+                <span class="text service-status"><?php echo strtolower($client_interface) .' '. _($ifaceStatus) ?></span>
+              </button>
+            </div>
         </div><!-- /.row -->
       </div><!-- /.card-header -->
       <div class="card-body">
diff --git a/templates/dashboard.php b/templates/dashboard.php
index 5b606255..49b2d524 100755
--- a/templates/dashboard.php
+++ b/templates/dashboard.php
@@ -55,6 +55,7 @@ $ifaceStatus = $wlan0up ? "up" : "down";
                 <div class="row justify-content-md-center">
                 <div class="col-md">
                 <div class="info-item"><?php echo _("Connected To"); ?></div><div><?php echo htmlspecialchars($connectedSSID, ENT_QUOTES); ?></div>
+                <div class="info-item"><?php echo _("Interface"); ?></div><div><?php echo htmlspecialchars($_SESSION['wifi_client_interface']); ?></div>
                 <div class="info-item"><?php echo _("AP Mac Address"); ?></div><div><?php echo htmlspecialchars($connectedBSSID, ENT_QUOTES); ?></div>
                 <div class="info-item"><?php echo _("Bitrate"); ?></div><div><?php echo htmlspecialchars($bitrate, ENT_QUOTES); ?></div>
                 <div class="info-item"><?php echo _("Signal Level"); ?></div><div><?php echo htmlspecialchars($signalLevel, ENT_QUOTES); ?></div>

From 65381ecdbba340fbb7ac34e45fb1c9062418ba96 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 24 Sep 2020 08:55:06 +0100
Subject: [PATCH 3/4] Prettify php

---
 templates/wifi_stations.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/templates/wifi_stations.php b/templates/wifi_stations.php
index c987e61a..bd34246c 100755
--- a/templates/wifi_stations.php
+++ b/templates/wifi_stations.php
@@ -1,11 +1,7 @@
-<?php if (empty($networks)) : ?>
+<?php if (empty($networks)) { ?>
   <p class="lead text-center"><?php echo _('No Wifi stations found') ?></p>
   <p class="text-center"><?php echo _('Click "Rescan" to search for nearby Wifi stations.') ?></p>
-<?php endif ?>
-<?php $index = 0; ?>
-<div class="row ml-1 mr-1 w-100">
-<?php
-if (count($networks) == 1) {
+<?php } elseif (count($networks) == 1) { 
     $prop_col = "col-sm-12";
     $prop_w = "w-50";
 } else {
@@ -13,7 +9,9 @@ if (count($networks) == 1) {
     $prop_w = "w-100";
 }
 ?>
-  <?php foreach ($networks as $ssid => $network) : ?>
+<?php $index = 0; ?>
+<div class="row ml-1 mr-1 w-100">
+ <?php foreach ($networks as $ssid => $network) : ?>
     <div class="<?php echo $prop_col; ?> align-items-stretch mb-3">
     <div class="card h-100 <?php echo $prop_w; ?>">
       <div class="card-body">

From dd772a7bdfeb7d3f46050e78efe6746684e69f88 Mon Sep 17 00:00:00 2001
From: Bill Zimmerman <billzimmerman@gmail.com>
Date: Sat, 26 Sep 2020 12:31:21 +0200
Subject: [PATCH 4/4] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f2a8fe5a..896cf95b 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ By default RaspAP configures a routed AP for your clients to connect to. A bridg
 More information on Bridged AP mode is provided [on our wiki](https://github.com/billz/raspap-webgui/wiki/Bridged-AP-mode).
 
 ## Simultaneous AP and Wifi client
-RaspAP lets you create an AP with a Wifi client configuration, often called AP-STA mode. With your system configured in managed mode, enable the AP from the **Advanced** tab of **Configure hotspot** by sliding the **Wifi client AP mode** toggle. Save settings and start the hotspot. The managed mode AP is functional without restart.
+RaspAP lets you create an AP with a Wifi client configuration, often called [AP-STA mode](https://github.com/billz/raspap-webgui/wiki/RPi-Zero-W-AP-STA-mode). With your system configured in managed mode, enable the AP from the **Advanced** tab of **Configure hotspot** by sliding the **Wifi client AP mode** toggle. Save settings and start the hotspot. The managed mode AP is functional without restart.
 
 **Note:** This option is disabled until you configure your system as a wireless client. For a device operating in [managed mode](https://github.com/billz/raspap-webgui/wiki/FAQs#how-do-i-prepare-the-sd-card-to-connect-to-wifi-in-headless-mode) without an `eth0` connection, this configuration must be enabled [_before_ a reboot](https://github.com/billz/raspap-webgui/wiki/RPi-Zero-W-AP-STA-mode).