public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2025-12-13 18:06:01 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into nightly

Browse Source
This commit is contained in:
FreddleSpl0it
2024-12-05 14:33:41 +01:00
parent b6174fae23 6e8e13cebc
commit a41bb55c83
69 changed files with 959 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
data/web/js/site/mailbox.js
View File

@@ -692,8 +692,8 @@ jQuery(function($){
} else if (item.attributes.rl_frame === "d"){
item.attributes.rl_frame = lang_rl.day;
}
item.attributes.rl_value = escapeHtml(item.attributes.rl_value);
item.attributes.rl_value = (!item.attributes.rl_value) ? "∞" : escapeHtml(item.attributes.rl_value);
item.attributes.ratelimit = item.attributes.rl_value + " " + item.attributes.rl_frame;
if (item.template.toLowerCase() == "default"){
item.action = '<div class="btn-group">' +
@@ -817,14 +817,8 @@ jQuery(function($){
}
},
{
title: 'rl_frame',
data: 'attributes.rl_frame',
defaultContent: '',
class: 'none',
},
{
title: 'rl_value',
data: 'attributes.rl_value',
title: lang_edit.ratelimit,
data: 'attributes.ratelimit',
defaultContent: '',
class: 'none',
},
@@ -893,7 +887,10 @@ 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_sso_login;
item.last_mail_login = (item.attributes.imap_access == 1 ? '<div class="text-start badge bg-info mb-2" style="min-width: 70px;">IMAP @ ' + unix_time_format(Number(item.last_imap_login)) + '</div><br>' : '') +
(item.attributes.pop3_access == 1 ? '<div class="text-start badge bg-info mb-2" style="min-width: 70px;">POP3 @ ' + unix_time_format(Number(item.last_pop3_login)) + '</div><br>' : '') +
(item.attributes.smtp_access == 1 ? '<div class="text-start badge bg-info mb-2" style="min-width: 70px;">SMTP @ ' + unix_time_format(Number(item.last_smtp_login)) + '</div><br>' : '') +
'<div class="text-start badge bg-info" style="min-width: 70px;">SSO @ ' + unix_time_format(Number(item.last_sso_login)) + '</div>';
/*
if (!item.rl) {
item.rl = '∞';
@@ -1009,14 +1006,7 @@ jQuery(function($){
data: 'last_mail_login',
searchable: false,
defaultContent: '',
responsivePriority: 7,
render: function (data, type) {
res = data.split("/");
return '<div class="text-start badge bg-info mb-2" style="min-width: 70px;">IMAP @ ' + unix_time_format(Number(res[0])) + '</div><br>' +
'<div class="text-start badge bg-info mb-2" style="min-width: 70px;">POP3 @ ' + unix_time_format(Number(res[1])) + '</div><br>' +
'<div class="text-start badge bg-info mb-2" style="min-width: 70px;">SMTP @ ' + unix_time_format(Number(res[2])) + '</div><br>' +
'<div class="text-start badge bg-info" style="min-width: 70px;">SSO @ ' + unix_time_format(Number(res[3])) + '</div>';
}
responsivePriority: 7
},
{
title: lang.last_pw_change,
@@ -1191,7 +1181,8 @@ jQuery(function($){
} else if (item.attributes.rl_frame === "d"){
item.attributes.rl_frame = lang_rl.day;
}
item.attributes.rl_value = escapeHtml(item.attributes.rl_value);
item.attributes.rl_value = (!item.attributes.rl_value) ? "∞" : escapeHtml(item.attributes.rl_value);
item.attributes.ratelimit = item.attributes.rl_value + " " + item.attributes.rl_frame;
item.attributes.quota = humanFileSize(item.attributes.quota);
@@ -1336,14 +1327,8 @@ jQuery(function($){
}
},
{
title: "rl_frame",
data: 'attributes.rl_frame',
defaultContent: '',
class: 'none',
},
{
title: 'rl_value',
data: 'attributes.rl_value',
title: lang_edit.ratelimit,
data: 'attributes.ratelimit',
defaultContent: '',
class: 'none',
},