M_Viper/ts-website
M_Viper
/
ts-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an exception in viewer, when client had an empty away message

This commit is contained in:
Wruczek 2020-10-23 18:06:46 +02:00
parent c751001c61
commit 9a5e05ca84
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/private/php/ViewerRenderer.php
View File

@ -220,11 +220,12 @@ EOD;
$clientName = implode(" ", $beforeName); // prefix groups $clientName = implode(" ", $beforeName); // prefix groups
$clientName .= " {$client["client_nickname"]} "; // nickname $clientName .= " {$client["client_nickname"]} "; // nickname
$clientName .= implode(" ", $afterName); // suffix groups $clientName .= implode(" ", $afterName); // suffix groups
$clientName = Utils::escape(trim($clientName)); // trim and sanitize $clientName = Utils::escape(trim($clientName)); // trim and sanitize
$this->add( $this->add(
$html, $html,
$isQuery ? " is-query" : "", $client["client_database_id"], $isQuery ? " is-query" : "",
$client["client_database_id"],
$clientIcon, $clientIcon,
$clientName, $clientName,
$suffixIcons $suffixIcons
@ -284,7 +285,13 @@ EOD;
} }
if($client["client_away"]) { 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"]) { if(!$client["client_output_hardware"]) {