Skip to content

Commit

Permalink
Merge remote-tracking branch 'corentin-soriano/hotfix/logged_in_users'
Browse files Browse the repository at this point in the history
  • Loading branch information
nilsteampassnet committed Dec 23, 2024
2 parents c63f975 + b990947 commit 46e2713
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions sources/logs.datatables.php
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,6 @@
}
}
$subclause2 = $sWhere->addClause('OR');
$subclause2->add('timestamp = ""');
$subclause2->add('session_end >= %i', time());

// Get the total number of records
Expand Down Expand Up @@ -814,7 +813,7 @@
}
$sOutput .= '"'.$user_role.'", ';
//col4
$time_diff = time() - strtotime($record['timestamp']);
$time_diff = time() - (int) $record['timestamp'];
$hoursDiff = round($time_diff / 3600, 0, PHP_ROUND_HALF_DOWN);
$minutesDiffRemainder = floor($time_diff % 3600 / 60);
$sOutput .= '"'.$hoursDiff.'h '.$minutesDiffRemainder.'m" ';
Expand Down

0 comments on commit 46e2713

Please sign in to comment.