From 77b1c0ac3329bfbe61b5db6280a987c0f7dfef88 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Tue, 6 Oct 2020 11:59:19 +0200
Subject: [PATCH] * Admin: fix session list did NOT show interactive sessions,
 if push is used

---
 admin/inc/class.admin_accesslog.inc.php | 20 +++++++++++++++++---
 api/src/Json/Push.php                   |  6 +++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/admin/inc/class.admin_accesslog.inc.php b/admin/inc/class.admin_accesslog.inc.php
index b9a0c83d84..307d479a56 100644
--- a/admin/inc/class.admin_accesslog.inc.php
+++ b/admin/inc/class.admin_accesslog.inc.php
@@ -70,14 +70,25 @@ class admin_accesslog
 		{
 			$query['col_filter']['lo'] = null;	// not logged out
 			$query['col_filter'][0] = 'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']);
+			// for push via fallback (no native push) we use the heartbeat (constant polling of notification app)
+			if (Api\Json\Push::onlyFallback())
+			{
+				$active_query = "notification_heartbeat > $heartbeat_limit";
+			}
+			else
+			{
+				// for native push we ask the push-server who is active
+				$online = (array)Api\Json\Push::online();
+				$active_query = $GLOBALS['egw']->db->expression(self::TABLE, ['account_id' => $online]);
+			}
 			switch((string)$query['session_list'])
 			{
 				case 'active':	// remove status != 'active', eg. CalDAV/eSync
-					$query['col_filter'][1] = "notification_heartbeat > $heartbeat_limit";
+					$query['col_filter'][1] = $active_query;
 					$query['col_filter'][3] = "session_php NOT LIKE '% %'";	// remove blocked, bad login, etc
 					break;
 				default:
-					$query['col_filter'][1] = "(notification_heartbeat IS NULL OR notification_heartbeat > $heartbeat_limit)";
+					$query['col_filter'][1] = "(notification_heartbeat IS NULL OR $active_query)";
 					break;
 			}
 			$query['col_filter'][2] = 'account_id>0';
@@ -89,7 +100,10 @@ class admin_accesslog
 		foreach($rows as &$row)
 		{
 			$row['sessionstatus'] = 'success';
-			if ($row['notification_heartbeat'] > $heartbeat_limit_user)
+			if (isset($online) ?
+				// we still need to check notification_heartbeat to distinguish from non-interactive session like *DAV
+				isset($row['notification_heartbeat']) && in_array($row['account_id'], $online) :
+				$row['notification_heartbeat'] > $heartbeat_limit_user)
 			{
 				$row['sessionstatus'] = 'active';
 			}
diff --git a/api/src/Json/Push.php b/api/src/Json/Push.php
index 341ad0443c..9d504e2916 100644
--- a/api/src/Json/Push.php
+++ b/api/src/Json/Push.php
@@ -90,7 +90,7 @@ class Push extends Msg
 	 *
 	 * @return array of integer account_id currently available for push
 	 */
-	public function online()
+	public static function online()
 	{
 		if (!isset(self::$online))
 		{
@@ -109,9 +109,9 @@ class Push extends Msg
 	 *
 	 * @return boolean
 	 */
-	public function isOnline($account_id)
+	public static function isOnline($account_id)
 	{
-		return in_array($account_id, $this->online());
+		return in_array($account_id, self::online());
 	}
 
 	/**