From 10ba76b438174aebe0d352a657bea115beb80221 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 16 Apr 2020 12:32:26 +0200
Subject: [statistics] Show current user in client list

---
 modules-available/statistics/pages/list.inc.php        | 5 ++++-
 modules-available/statistics/templates/clientlist.html | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules-available/statistics/pages/list.inc.php b/modules-available/statistics/pages/list.inc.php
index e2e7ff09..97133aa2 100644
--- a/modules-available/statistics/pages/list.inc.php
+++ b/modules-available/statistics/pages/list.inc.php
@@ -46,7 +46,7 @@ class SubPage
 			}
 		}
 		$res = Database::simpleQuery("SELECT m.machineuuid, m.locationid, m.macaddr, m.clientip, m.lastseen,
-			m.logintime, m.state, m.realcores, m.mbram, m.kvmstate, m.cpumodel, m.id44mb, m.hostname, m.notes IS NOT NULL AS hasnotes,
+			m.logintime, m.state, m.currentuser, m.realcores, m.mbram, m.kvmstate, m.cpumodel, m.id44mb, m.hostname, m.notes IS NOT NULL AS hasnotes,
 			m.badsectors, Count(s.machineuuid) AS confvars $xtra FROM machine m
 			LEFT JOIN setting_machine s USING (machineuuid)
 			$join WHERE $where GROUP BY m.machineuuid $sort", $args);
@@ -102,6 +102,9 @@ class SubPage
 				if (!$row['isclient'] && $row['state'] === 'IDLE') {
 					$row['state'] = 'OCCUPIED';
 				}
+				if (!$row['isclient']) {
+					unset($row['currentuser']);
+				}
 			}
 			$row['state_' . $row['state']] = true;
 			$row['locationname'] = Location::getName($row['locationid']);
diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html
index dae09e2b..6fee9f27 100644
--- a/modules-available/statistics/templates/clientlist.html
+++ b/modules-available/statistics/templates/clientlist.html
@@ -102,6 +102,12 @@
 					<a class="slx-bold" href="?do=runmode&amp;module={{rmmodule}}">{{moduleName}}</a> / {{modeName}}
 				</div>
 			{{/rmmodule}}
+			{{#currentuser}}
+			<div class="small">
+				{{lang_user}}:
+				<b>{{currentuser}}</b>
+			</div>
+			{{/currentuser}}
 			</td>
 			<td data-sort-value="{{clientip}}">
 				<b><a href="?do=Statistics&amp;show=list&amp;filters=subnet={{subnet}}">{{subnet}}</a>{{lastoctet}}</b>
-- 
cgit v1.2.3-55-g7522