From 4f475348249936b959324eedf7c10f02fced4f2d Mon Sep 17 00:00:00 2001 From: q16marvin Date: Fri, 9 Feb 2024 11:23:09 +0100 Subject: [PATCH 1/2] Update mailbox.js --- data/web/js/site/mailbox.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index cc316b713..4fa1980af 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -887,7 +887,7 @@ jQuery(function($){ item.quota.value = humanFileSize(item.quota_used) + "/" + item.quota.value; item.max_quota_for_mbox = humanFileSize(item.max_quota_for_mbox); - item.last_mail_login = item.last_imap_login + '/' + item.last_pop3_login + '/' + item.last_smtp_login; + item.last_mail_login = item.last_imap_login + '/' + item.last_pop3_login + '/' + item.last_smtp_login + '/' + item.last_sso_login; /* if (!item.rl) { item.rl = '∞'; @@ -1008,7 +1008,8 @@ jQuery(function($){ res = data.split("/"); return '
IMAP @ ' + unix_time_format(Number(res[0])) + '

' + '
POP3 @ ' + unix_time_format(Number(res[1])) + '

' + - '
SMTP @ ' + unix_time_format(Number(res[2])) + '
'; + '
SMTP @ ' + unix_time_format(Number(res[2])) + '

' + + '
SSO @ ' + unix_time_format(Number(res[3])) + '
'; } }, { From 19deda31bc92b56241286bac4ad1711d7b1eb520 Mon Sep 17 00:00:00 2001 From: q16marvin Date: Fri, 9 Feb 2024 11:23:47 +0100 Subject: [PATCH 2/2] Update functions.mailbox.inc.php --- data/web/inc/functions.mailbox.inc.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php index 0f48efbd5..5588c1aee 100644 --- a/data/web/inc/functions.mailbox.inc.php +++ b/data/web/inc/functions.mailbox.inc.php @@ -4501,6 +4501,9 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { } else if ($SaslLogs['service'] == 'pop3') { $last_pop3_login = strtotime($SaslLogs['datetime']); + } + else if ($SaslLogs['service'] == 'SSO') { + $last_sso_login = strtotime($SaslLogs['datetime']); } } if (!isset($last_imap_login) || $GLOBALS['SHOW_LAST_LOGIN'] === false) { @@ -4511,10 +4514,14 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { } if (!isset($last_pop3_login) || $GLOBALS['SHOW_LAST_LOGIN'] === false) { $last_pop3_login = 0; + } + if (!isset($last_sso_login) || $GLOBALS['SHOW_LAST_LOGIN'] === false) { + $last_sso_login = 0; } $mailboxdata['last_imap_login'] = $last_imap_login; $mailboxdata['last_smtp_login'] = $last_smtp_login; $mailboxdata['last_pop3_login'] = $last_pop3_login; + $mailboxdata['last_sso_login'] = $last_sso_login; if (!isset($_extra) || $_extra != 'reduced') { $rl = ratelimit('get', 'mailbox', $_data);