From 7344c323eedde2fc2a82e6d024e4287302cb95af Mon Sep 17 00:00:00 2001
From: zbchristian <33725910+zbchristian@users.noreply.github.com>
Date: Wed, 18 Aug 2021 22:10:33 +0200
Subject: [PATCH] Fix display of non-ASCII SSID

---
 ajax/networking/wifi_stations.php   | 1 +
 includes/get_clients.php            | 2 ++
 templates/dashboard.php             | 2 +-
 templates/wifi_stations/network.php | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ajax/networking/wifi_stations.php b/ajax/networking/wifi_stations.php
index aca5bc89..ecc9c098 100644
--- a/ajax/networking/wifi_stations.php
+++ b/ajax/networking/wifi_stations.php
@@ -14,6 +14,7 @@ knownWifiStations($networks);
 nearbyWifiStations($networks, !isset($_REQUEST["refresh"]));
 connectedWifiStations($networks);
 sortNetworksByRSSI($networks);
+foreach ($networks as $ssid => $network) $networks[$ssid]["ssidutf8"] = ssid2utf8( $ssid ); 
 
 $connected = array_filter($networks, function($n) { return $n['connected']; } );
 $known     = array_filter($networks, function($n) { return !$n['connected'] && $n['configured']; } );
diff --git a/includes/get_clients.php b/includes/get_clients.php
index c05ef61b..c167a538 100644
--- a/includes/get_clients.php
+++ b/includes/get_clients.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once 'includes/functions.php';
+require_once 'includes/wifi_functions.php';
 
 function getClients($simple=true)
 {
@@ -73,6 +74,7 @@ function getClients($simple=true)
                 if (!$simple && !empty($ssid=preg_only_match("/.*SSID:\s*([^\"]*).*/", $retiw)) ) {
                     $cl["device"][$i]["connected"] = "y";
                     $cl["device"][$i]["ssid"] = $ssid;
+                    $cl["device"][$i]["ssidutf8"] = ssid2utf8($ssid);
                     $cl["device"][$i]["ap-mac"] = preg_only_match("/^Connected to ([0-9a-f\:]*).*$/", $retiw);
                     $sig = preg_only_match("/.*signal: (.*)$/", $retiw);
                     $val = preg_only_match("/^([0-9\.-]*).*$/", $sig);
diff --git a/templates/dashboard.php b/templates/dashboard.php
index e443db8d..113d004d 100755
--- a/templates/dashboard.php
+++ b/templates/dashboard.php
@@ -38,7 +38,7 @@
                     <?php $valEcho=function($cl,$id) {$val = isset($cl[$id])&& !empty($cl[$id]) ? $cl[$id] : "-"; echo  htmlspecialchars($val,ENT_QUOTES);} ?>
                     <?php if ($clientinfo["type"] == "wlan") : // WIRELESS ?>
                       <div class="row mb-1">
-                        <div class="info-item col-xs-3"><?php echo _("Connected To"); ?></div><div class="info-value col-xs-3"><?php $valEcho($clientinfo,"ssid"); ?></div>
+                        <div class="info-item col-xs-3"><?php echo _("Connected To"); ?></div><div class="info-value col-xs-3"><?php $valEcho($clientinfo,"ssidutf8"); ?></div>
                       </div>
                       <div class="row mb-1">
                         <div class="info-item col-xs-3"><?php echo _("AP Mac Address"); ?></div><div class="info-value col-xs-3"><?php $valEcho($clientinfo,"ap-mac"); ?></div>
diff --git a/templates/wifi_stations/network.php b/templates/wifi_stations/network.php
index e0a9684c..4d20fb2f 100644
--- a/templates/wifi_stations/network.php
+++ b/templates/wifi_stations/network.php
@@ -4,7 +4,7 @@
 		<?php if (strlen($network['ssid']) == 0) {
 			$network['ssid'] = "(unknown)";
 		} ?>
-		<h5 class="card-title"><?php echo htmlspecialchars($network['ssid'], ENT_QUOTES); ?></h5>
+		<h5 class="card-title"><?php echo htmlspecialchars($network['ssidutf8'], ENT_QUOTES); ?></h5>
 
 		<div class="info-item-wifi"><?php echo _("Status"); ?></div>
 		<div>