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] 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>