From 3e69668c9e23b7ca0dc299ff8898037541f91065 Mon Sep 17 00:00:00 2001 From: Jore Date: Fri, 5 Apr 2024 09:48:40 +1100 Subject: [PATCH 1/6] occ: Improve timestamps for user:lastseen. Signed-off-by: Jore --- core/Command/User/LastSeen.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php index 3c2ec828d41..066377f4cf8 100644 --- a/core/Command/User/LastSeen.php +++ b/core/Command/User/LastSeen.php @@ -56,7 +56,7 @@ class LastSeen extends Base { } else { $date = new \DateTime(); $date->setTimestamp($lastLogin); - $output->writeln($user->getUID() . "'s last login: " . $date->format('Y-m-d H:i')); + $output->writeln($user->getUID() . "'s last login: " . $date->format('Y-m-d H:i:s T')); } return 0; @@ -74,7 +74,7 @@ class LastSeen extends Base { } else { $date = new \DateTime(); $date->setTimestamp($lastLogin); - $output->writeln($user->getUID() . "'s last login: " . $date->format('Y-m-d H:i')); + $output->writeln($user->getUID() . "'s last login: " . $date->format('Y-m-d H:i:s T')); } }); return 0; From bd81967fa18a557725a1dd2a5d644421ce976cb7 Mon Sep 17 00:00:00 2001 From: Jore Date: Fri, 5 Apr 2024 10:47:26 +1100 Subject: [PATCH 2/6] occ: Improve timestamps for user:info. Signed-off-by: Jore --- core/Command/User/Info.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php index 55298f0164c..f51c1365ff4 100644 --- a/core/Command/User/Info.php +++ b/core/Command/User/Info.php @@ -56,7 +56,7 @@ class Info extends Base { 'groups' => $groups, 'quota' => $user->getQuota(), 'storage' => $this->getStorageInfo($user), - 'last_seen' => date(\DateTimeInterface::ATOM, $user->getLastLogin()), // ISO-8601 + 'last_seen' => date('Y-m-d H:i:s T', $user->getLastLogin()), 'user_directory' => $user->getHome(), 'backend' => $user->getBackendClassName() ]; From e16e16c97222340ea7559423ef54cd670c607863 Mon Sep 17 00:00:00 2001 From: Jore Date: Fri, 5 Apr 2024 11:23:21 +1100 Subject: [PATCH 3/6] occ: Add check for never logged in for user:info. Signed-off-by: Jore --- core/Command/User/Info.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php index f51c1365ff4..48d6e074111 100644 --- a/core/Command/User/Info.php +++ b/core/Command/User/Info.php @@ -47,6 +47,11 @@ class Info extends Base { return 1; } $groups = $this->groupManager->getUserGroupIds($user); + if ($user->getLastLogin() == 0) { + $lastseen = "never"; + } else { + $lastseen = date('Y-m-d H:i:s T', $user->getLastLogin()); + } $data = [ 'user_id' => $user->getUID(), 'display_name' => $user->getDisplayName(), @@ -56,7 +61,7 @@ class Info extends Base { 'groups' => $groups, 'quota' => $user->getQuota(), 'storage' => $this->getStorageInfo($user), - 'last_seen' => date('Y-m-d H:i:s T', $user->getLastLogin()), + 'last_seen' => $lastseen, 'user_directory' => $user->getHome(), 'backend' => $user->getBackendClassName() ]; From a0566f881d57b5dd70bc7459f60f8f293818e289 Mon Sep 17 00:00:00 2001 From: Jore Date: Fri, 5 Apr 2024 12:59:37 +1100 Subject: [PATCH 4/6] occ: Add locale setting timezone to timestamps. Signed-off-by: Jore --- core/Command/User/Info.php | 7 +++++++ core/Command/User/LastSeen.php | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php index 48d6e074111..0d54ca412c6 100644 --- a/core/Command/User/Info.php +++ b/core/Command/User/Info.php @@ -46,12 +46,18 @@ class Info extends Base { $output->writeln('user not found'); return 1; } + $groups = $this->groupManager->getUserGroupIds($user); + + if (ini_get('date.timezone')) { + date_default_timezone_set(ini_get('date.timezone')); + } if ($user->getLastLogin() == 0) { $lastseen = "never"; } else { $lastseen = date('Y-m-d H:i:s T', $user->getLastLogin()); } + $data = [ 'user_id' => $user->getUID(), 'display_name' => $user->getDisplayName(), @@ -65,6 +71,7 @@ class Info extends Base { 'user_directory' => $user->getHome(), 'backend' => $user->getBackendClassName() ]; + $this->writeArrayInOutputFormat($input, $output, $data); return 0; } diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php index 066377f4cf8..2a94bb89baf 100644 --- a/core/Command/User/LastSeen.php +++ b/core/Command/User/LastSeen.php @@ -43,6 +43,11 @@ class LastSeen extends Base { protected function execute(InputInterface $input, OutputInterface $output): int { $singleUserId = $input->getArgument('uid'); + + if (ini_get('date.timezone')) { + date_default_timezone_set(ini_get('date.timezone')); + } + if ($singleUserId) { $user = $this->userManager->get($singleUserId); if (is_null($user)) { From 96638fd6b2544043b48f9c64eb11033086cf1685 Mon Sep 17 00:00:00 2001 From: Jore Date: Wed, 10 Apr 2024 07:36:01 +1000 Subject: [PATCH 5/6] occ: Remove timezone changes. Signed-off-by: Jore --- core/Command/User/Info.php | 3 --- core/Command/User/LastSeen.php | 4 ---- 2 files changed, 7 deletions(-) diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php index 0d54ca412c6..f8b76a40a1f 100644 --- a/core/Command/User/Info.php +++ b/core/Command/User/Info.php @@ -49,9 +49,6 @@ class Info extends Base { $groups = $this->groupManager->getUserGroupIds($user); - if (ini_get('date.timezone')) { - date_default_timezone_set(ini_get('date.timezone')); - } if ($user->getLastLogin() == 0) { $lastseen = "never"; } else { diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php index 2a94bb89baf..61a6c97ce72 100644 --- a/core/Command/User/LastSeen.php +++ b/core/Command/User/LastSeen.php @@ -44,10 +44,6 @@ class LastSeen extends Base { protected function execute(InputInterface $input, OutputInterface $output): int { $singleUserId = $input->getArgument('uid'); - if (ini_get('date.timezone')) { - date_default_timezone_set(ini_get('date.timezone')); - } - if ($singleUserId) { $user = $this->userManager->get($singleUserId); if (is_null($user)) { From 5ec3a7fcef6920d37ec09549dd8326235c48dbb0 Mon Sep 17 00:00:00 2001 From: nooblag Date: Fri, 2 Aug 2024 13:58:41 +1000 Subject: [PATCH 6/6] occ: Revert all changes to Info.php Signed-off-by: Jore --- core/Command/User/Info.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php index f8b76a40a1f..55298f0164c 100644 --- a/core/Command/User/Info.php +++ b/core/Command/User/Info.php @@ -46,15 +46,7 @@ class Info extends Base { $output->writeln('user not found'); return 1; } - $groups = $this->groupManager->getUserGroupIds($user); - - if ($user->getLastLogin() == 0) { - $lastseen = "never"; - } else { - $lastseen = date('Y-m-d H:i:s T', $user->getLastLogin()); - } - $data = [ 'user_id' => $user->getUID(), 'display_name' => $user->getDisplayName(), @@ -64,11 +56,10 @@ class Info extends Base { 'groups' => $groups, 'quota' => $user->getQuota(), 'storage' => $this->getStorageInfo($user), - 'last_seen' => $lastseen, + 'last_seen' => date(\DateTimeInterface::ATOM, $user->getLastLogin()), // ISO-8601 'user_directory' => $user->getHome(), 'backend' => $user->getBackendClassName() ]; - $this->writeArrayInOutputFormat($input, $output, $data); return 0; }