From f46591efc82013aa695e74f8bfb0ea188cc77cfd Mon Sep 17 00:00:00 2001
From: giangndg <giangnd@bravebits.vn>
Date: Wed, 18 Dec 2019 17:48:02 +0700
Subject: [PATCH 1/2] Fix issue #121: Logged in users

---
 .../modules/mod_logged/tmpl/default.php          | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php
index 79f68fbd51d..f7029a2cafb 100644
--- a/administrator/modules/mod_logged/tmpl/default.php
+++ b/administrator/modules/mod_logged/tmpl/default.php
@@ -23,7 +23,7 @@
 						</div>
 					</div>
 
-					<div class="col-6 col-lg-3">
+					<div class="col-6 col-lg-4">
 						<?php if (isset($user->editLink)) : ?>
 							<a href="<?php echo $user->editLink; ?>">
 								<strong><?php echo htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8'); ?></strong>
@@ -37,7 +37,7 @@
 						</div>
 					</div>
 
-					<div class="d-none d-lg-block col-lg-3">
+					<div class="d-none d-lg-block col-lg-4">
 						<?php if ($user->client_id === null) : ?>
 							<?php // Don't display a client ?>
 						<?php elseif ($user->client_id) : ?>
@@ -52,11 +52,13 @@
 					</div>
 
 					<div class="col-auto ml-auto">
-						<form action="<?php echo $user->logoutLink; ?>" method="post" name="adminForm">
-							<button type="submit" class="btn btn-link btn-sm m-n2">
-								<span class="j-card-icon icon-exit"></span> <?php echo Text::_('JLOGOUT'); ?>
-							</button>
-						</form>
+						<?php if (!$user->client_id) : ?>	
+							<form action="<?php echo $user->logoutLink; ?>" method="post" name="adminForm">
+								<button type="submit" class="btn btn-link btn-sm m-n2">
+									<span class="j-card-icon icon-exit"></span> <?php echo Text::_('JLOGOUT'); ?>
+								</button>
+							</form>
+						<?php endif; ?>
 					</div>
 
 				</div>

From 7b65e2b85c1bfe00d9052c467b4a8246def2f09c Mon Sep 17 00:00:00 2001
From: giangndg <giangnd@bravebits.vn>
Date: Wed, 25 Dec 2019 18:12:47 +0700
Subject: [PATCH 2/2] Fix issue #121: Logged in users - revert all changes at
 core file and create an mod_logged override

---
 .../modules/mod_logged/tmpl/default.php       | 16 ++---
 .../khonsu/html/mod_logged/default.php        | 68 +++++++++++++++++++
 2 files changed, 75 insertions(+), 9 deletions(-)
 create mode 100644 administrator/templates/khonsu/html/mod_logged/default.php

diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php
index f7029a2cafb..79f68fbd51d 100644
--- a/administrator/modules/mod_logged/tmpl/default.php
+++ b/administrator/modules/mod_logged/tmpl/default.php
@@ -23,7 +23,7 @@
 						</div>
 					</div>
 
-					<div class="col-6 col-lg-4">
+					<div class="col-6 col-lg-3">
 						<?php if (isset($user->editLink)) : ?>
 							<a href="<?php echo $user->editLink; ?>">
 								<strong><?php echo htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8'); ?></strong>
@@ -37,7 +37,7 @@
 						</div>
 					</div>
 
-					<div class="d-none d-lg-block col-lg-4">
+					<div class="d-none d-lg-block col-lg-3">
 						<?php if ($user->client_id === null) : ?>
 							<?php // Don't display a client ?>
 						<?php elseif ($user->client_id) : ?>
@@ -52,13 +52,11 @@
 					</div>
 
 					<div class="col-auto ml-auto">
-						<?php if (!$user->client_id) : ?>	
-							<form action="<?php echo $user->logoutLink; ?>" method="post" name="adminForm">
-								<button type="submit" class="btn btn-link btn-sm m-n2">
-									<span class="j-card-icon icon-exit"></span> <?php echo Text::_('JLOGOUT'); ?>
-								</button>
-							</form>
-						<?php endif; ?>
+						<form action="<?php echo $user->logoutLink; ?>" method="post" name="adminForm">
+							<button type="submit" class="btn btn-link btn-sm m-n2">
+								<span class="j-card-icon icon-exit"></span> <?php echo Text::_('JLOGOUT'); ?>
+							</button>
+						</form>
 					</div>
 
 				</div>
diff --git a/administrator/templates/khonsu/html/mod_logged/default.php b/administrator/templates/khonsu/html/mod_logged/default.php
new file mode 100644
index 00000000000..83e1757415d
--- /dev/null
+++ b/administrator/templates/khonsu/html/mod_logged/default.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.khonsu
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+?>
+<div id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
+	<div class="list-group list-group-flush">
+		<?php foreach ($users as $user) : ?>
+			<div class="list-group-item py-4">
+				<div class="row align-items-center">
+					<div class="col-auto">
+						<div class="j-user-avatar">
+							<span class="icon-user" area-hidden="true"></span>
+						</div>
+					</div>
+
+					<div class="col-6 col-lg-4">
+						<?php if (isset($user->editLink)) : ?>
+							<a href="<?php echo $user->editLink; ?>">
+								<strong><?php echo htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8'); ?></strong>
+							</a>
+						<?php else : ?>
+							<strong><?php echo htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8'); ?></strong>
+						<?php endif; ?>
+
+						<div class="text-muted">
+							<?php echo htmlspecialchars($user->email, ENT_QUOTES, 'UTF-8'); ?>
+						</div>
+					</div>
+
+					<div class="d-none d-lg-block col-lg-4">
+						<?php if ($user->client_id === null) : ?>
+							<?php // Don't display a client ?>
+						<?php elseif ($user->client_id) : ?>
+							<?php echo Text::_('JADMINISTRATION'); ?>
+						<?php else: ?>
+							<?php echo Text::_('JSITE'); ?>
+						<?php endif; ?>
+
+						<div class="text-muted">
+							<?php echo HTMLHelper::_('date', $user->time, Text::_('DATE_FORMAT_LC5')); ?>
+						</div>
+					</div>
+
+					<div class="col-auto ml-auto">
+						<?php if (!$user->client_id) : ?>	
+							<form action="<?php echo $user->logoutLink; ?>" method="post" name="adminForm">
+								<button type="submit" class="btn btn-link btn-sm m-n2">
+									<span class="j-card-icon icon-exit"></span> <?php echo Text::_('JLOGOUT'); ?>
+								</button>
+							</form>
+						<?php endif; ?>
+					</div>
+
+				</div>
+			</div>
+		<?php endforeach; ?>
+	</div>
+</div>