Skip to content

Enhance sorting logic in SessionsDataRetrieval #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rfcmaXi wants to merge 2 commits into
base: fix-session-status
Choose a base branch
from
Open

Enhance sorting logic in SessionsDataRetrieval #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9ce41d
Enhance sorting logic in SessionsDataRetrieval
rfcmaXi Aug 17, 2026
c03cbc1
Fix session comparison logic for user sessions
rfcmaXi Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Management/SessionsDataRetrieval.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ private function getRelativPosition(
array $user_b_values,
string $direction
): int {
// Handle sorting for "Logged In" status
if ($order_key === ManagementGUI::COLUMN_LOGGED_IN) {
$user_a_session_active = $this->user_session_repo
->getSessionForUserId($user_a_values['usr_id'])
Expand All @@ -192,7 +193,7 @@ private function getRelativPosition(
->getSessionForUserId($user_b_values['usr_id'])
->isSessionActive();

if ($user_a_session_active === $user_b_values) {
if ($user_a_session_active === $user_b_session_active) {
return 0;
}

Expand All @@ -204,6 +205,17 @@ private function getRelativPosition(
return -1;
}

// Handle sorting for IP address
if ($order_key === ManagementGUI::COLUMN_LAST_LOGIN_IP) {
$ip_a = $this->user_session_repo->getSessionForUserId($user_a_values['usr_id'])->getLoginIp();
$ip_b = $this->user_session_repo->getSessionForUserId($user_b_values['usr_id'])->getLoginIp();
if ($direction === 'ASC') {
return strnatcasecmp($ip_a, $ip_b);
}
return strnatcasecmp($ip_b, $ip_a);
}

// Standard alphabetical sorting for all other basic user fields
$value_a = $user_a_values[$order_key] ?? '';
$value_b = $user_b_values[$order_key] ?? '';
if ($direction === 'ASC') {
Expand Down