holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Admin: fix session list did NOT show interactive sessions, if push is used

Browse Source
This commit is contained in:
Ralf Becker 2020-10-06 11:59:19 +02:00
parent 70931da220
commit e826249411
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
admin/inc/class.admin_accesslog.inc.php
View File

@ -70,14 +70,25 @@ class admin_accesslog
{ {
$query['col_filter']['lo'] = null; // not logged out $query['col_filter']['lo'] = null; // not logged out
$query['col_filter'][0] = 'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']); $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']) switch((string)$query['session_list'])
{ {
case 'active': // remove status != 'active', eg. CalDAV/eSync 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 $query['col_filter'][3] = "session_php NOT LIKE '% %'"; // remove blocked, bad login, etc
break; break;
default: 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; break;
} }
$query['col_filter'][2] = 'account_id>0'; $query['col_filter'][2] = 'account_id>0';
@ -89,7 +100,10 @@ class admin_accesslog
foreach($rows as &$row) foreach($rows as &$row)
{ {
$row['sessionstatus'] = 'success'; $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'; $row['sessionstatus'] = 'active';
} }

6
api/src/Json/Push.php
View File

@ -90,7 +90,7 @@ class Push extends Msg
* *
* @return array of integer account_id currently available for push * @return array of integer account_id currently available for push
*/ */
public function online() public static function online()
{ {
if (!isset(self::$online)) if (!isset(self::$online))
{ {
@ -109,9 +109,9 @@ class Push extends Msg
* *
* @return boolean * @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());
} }
/** /**