From 9a5e05ca841df291ee448c0fadf8d695fcb99e5f Mon Sep 17 00:00:00 2001
From: Wruczek <wruczekk@gmail.com>
Date: Fri, 23 Oct 2020 18:06:46 +0200
Subject: [PATCH] Fix an exception in viewer, when client had an empty away
 message

---
 src/private/php/ViewerRenderer.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/private/php/ViewerRenderer.php b/src/private/php/ViewerRenderer.php
index ab4a982..16712c9 100644
--- a/src/private/php/ViewerRenderer.php
+++ b/src/private/php/ViewerRenderer.php
@@ -220,11 +220,12 @@ EOD;
         $clientName = implode(" ", $beforeName);           // prefix groups
         $clientName .= " {$client["client_nickname"]} ";   // nickname
         $clientName .= implode(" ", $afterName);           // suffix groups
-        $clientName = Utils::escape(trim($clientName)); // trim and sanitize
+        $clientName = Utils::escape(trim($clientName));    // trim and sanitize
 
         $this->add(
             $html,
-            $isQuery ? " is-query" : "", $client["client_database_id"],
+            $isQuery ? " is-query" : "",
+            $client["client_database_id"],
             $clientIcon,
             $clientName,
             $suffixIcons
@@ -284,7 +285,13 @@ EOD;
         }
 
         if($client["client_away"]) {
-            return $this->getIcon("away.svg", Utils::escape($client["client_away_message"]) ?: __get("VIEWER_CLIENT_AWAY"));
+            if ($client["client_away_message"] !== null) {
+                $awayTooltip = Utils::escape($client["client_away_message"]);
+            } else {
+                $awayTooltip = __get("VIEWER_CLIENT_AWAY");
+            }
+
+            return $this->getIcon("away.svg", $awayTooltip);
         }
 
         if(!$client["client_output_hardware"]) {