public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
[BS5] Replace FooTable with jquery Datatables
f13530d8
data/web/js/site/mailbox.js | 4 -
data/web/js/site/user.js | 407 +++++++++++++++---------
data/web/templates/user/AppPasswds.twig | 39 ++-
data/web/templates/user/Pushover.twig | 137 ++++----
data/web/templates/user/SpamAliases.twig | 69 ++--
data/web/templates/user/Spamfilter.twig | 141 ++++----
data/web/templates/user/Syncjobs.twig | 37 ++-
data/web/templates/user_domainadmin_common.twig | 1 +
data/web/user.php | 1 +
9 files changed, 484 insertions(+), 352 deletions(-)Diff
diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js
index 684fb8fd..bd0878aa 100644
--- a/data/web/js/site/mailbox.js
+++ b/data/web/js/site/mailbox.js
@@ -1179,10 +1179,6 @@ jQuery(function($){
});
};
- $('body').on('click', 'span.footable-toggle', function () {
- event.stopPropagation();
- })
-
// detect element visibility changes
function onVisible(element, callback) {
$(element).ready(function() {
diff --git a/data/web/js/site/user.js b/data/web/js/site/user.js
index f601d61c..2375a25c 100644
--- a/data/web/js/site/user.js
+++ b/data/web/js/site/user.js
@@ -128,23 +128,15 @@ jQuery(function($){
}
function draw_tla_table() {
- ft_tla_table = FooTable.init('#tla_table', {
- "columns": [
- {"name":"chkbox","title":"","style":{"min-width":"60px","width":"60px","text-align":"center"},"filterable": false,"sortable": false,"type":"html"},
- {"name":"address","title":lang.alias},
- {"name":"validity","formatter":function unix_time_format(tm) { var date = new Date(tm ? tm * 1000 : 0); return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});},"title":lang.alias_valid_until,"style":{"width":"170px"}},
- {"sorted": true,"sortValue": function(value){res = new Date(value);return res.getTime();},"direction":"DESC","name":"created","formatter":function date_format(datetime) { var date = new Date(datetime.replace(/-/g, "/")); return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});},"title":lang.created_on,"style":{"width":"170px"}},
- {"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","min-width":"220px","width":"220px"},"type":"html","title":lang.action,"breakpoints":"xs sm"}
- ],
- "empty": lang.empty,
- "rows": $.ajax({
- dataType: 'json',
- url: '/api/v1/get/time_limited_aliases',
- jsonp: false,
- error: function () {
- console.log('Cannot draw tla table');
- },
- success: function (data) {
+ $('#tla_table').DataTable({
+ processing: true,
+ serverSide: false,
+ language: lang_datatables,
+ ajax: {
+ type: "GET",
+ url: "/api/v1/get/time_limited_aliases",
+ dataSrc: function(data){
+ console.log(data);
$.each(data, function (i, item) {
if (acl_data.spam_alias === 1) {
item.action = '<div class="btn-group footable-actions">' +
@@ -158,46 +150,52 @@ jQuery(function($){
item.action = '<span>-</span>';
}
});
+
+ return data;
}
- }),
- "paging": {
- "enabled": true,
- "limit": 5,
- "size": pagination_size
},
- "state": {"enabled": true},
- "sorting": {
- "enabled": true
- },
- "toggleSelector": "table tbody span.footable-toggle"
+ columns: [
+ {
+ // placeholder, so checkbox will not block child row toggle
+ title: '',
+ data: null,
+ searchable: false,
+ orderable: false,
+ defaultContent: ''
+ },
+ {
+ title: '',
+ data: 'chkbox'
+ },
+ {
+ title: lang.alias,
+ data: 'address'
+ },
+ {
+ title: lang.alias_valid_until,
+ data: 'validity',
+ render: function (data, type) {
+ var date = new Date(data ? data * 1000 : 0);
+ return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
+ }
+ },
+ {
+ title: lang.action,
+ data: 'action'
+ }
+ ]
});
}
function draw_sync_job_table() {
- ft_syncjob_table = FooTable.init('#sync_job_table', {
- "columns": [
- {"name":"chkbox","title":"","style":{"min-width":"60px","width":"60px","text-align":"center"},"filterable": false,"sortable": false,"type":"html"},
- {"sorted": true,"name":"id","title":"ID","style":{"maxWidth":"60px","width":"60px","text-align":"center"}},
- {"name":"server_w_port","title":"Server","breakpoints":"xs sm md","style":{"word-break":"break-all"}},
- {"name":"enc1","title":lang.encryption,"breakpoints":"all"},
- {"name":"user1","title":lang.username},
- {"name":"exclude","title":lang.excludes,"breakpoints":"all"},
- {"name":"mins_interval","title":lang.interval + " (min)","breakpoints":"all"},
- {"name":"last_run","title":lang.last_run,"breakpoints":"xs sm md"},
- {"name":"exit_status","filterable": false,"title":lang.syncjob_last_run_result},
- {"name":"log","title":"Log"},
- {"name":"active","filterable": false,"style":{"maxWidth":"70px","width":"70px"},"title":lang.active,"formatter": function(value){return 1==value?'<i class="bi bi-check-lg"></i>':0==value&&'<i class="bi bi-x-lg"></i>';}},
- {"name":"is_running","filterable": false,"style":{"maxWidth":"120px","width":"100px"},"title":lang.status},
- {"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","min-width":"260px","width":"260px"},"type":"html","title":lang.action,"breakpoints":"xs sm"}
- ],
- "empty": lang.empty,
- "rows": $.ajax({
- dataType: 'json',
+ $('#sync_job_table').DataTable({
+ processing: true,
+ serverSide: false,
+ language: lang_datatables,
+ ajax: {
+ type: "GET",
url: '/api/v1/get/syncjobs/' + encodeURIComponent(mailcow_cc_username) + '/no_log',
- jsonp: false,
- error: function () {
- console.log('Cannot draw sync job table');
- },
- success: function (data) {
+ dataSrc: function(data){
+ console.log(data);
$.each(data, function (i, item) {
item.user1 = escapeHtml(item.user1);
item.log = '<a href="#syncjobLogModal" data-bs-toggle="modal" data-syncjob-id="' + item.id + '">' + lang.open_logs + '</a>'
@@ -239,39 +237,87 @@ jQuery(function($){
}
item.exit_status = item.success + ' ' + item.exit_status;
});
+
+ return data;
}
- }),
- "paging": {
- "enabled": true,
- "limit": 5,
- "size": pagination_size
- },
- "state": {"enabled": true},
- "sorting": {
- "enabled": true
},
- "toggleSelector": "table tbody span.footable-toggle"
+ columns: [
+ {
+ // placeholder, so checkbox will not block child row toggle
+ title: '',
+ data: null,
+ searchable: false,
+ orderable: false,
+ defaultContent: ''
+ },
+ {
+ title: '',
+ data: 'chkbox'
+ },
+ {
+ title: 'ID',
+ data: 'id'
+ },
+ {
+ title: 'Server',
+ data: 'server_w_port'
+ },
+ {
+ title: lang.encryption,
+ data: 'enc1'
+ },
+ {
+ title: lang.username,
+ data: 'user1'
+ },
+ {
+ title: lang.excludes,
+ data: 'exclude'
+ },
+ {
+ title: lang.interval + " (min)",
+ data: 'mins_interval'
+ },
+ {
+ title: lang.last_run,
+ data: 'last_run'
+ },
+ {
+ title: lang.syncjob_last_run_result,
+ data: 'exit_status'
+ },
+ {
+ title: 'Log',
+ data: 'log'
+ },
+ {
+ title: lang.active,
+ data: 'active',
+ render: function (data, type) {
+ return 1==data?'<i class="bi bi-check-lg"></i>':0==data&&'<i class="bi bi-x-lg"></i>'
+ }
+ },
+ {
+ title: lang.status,
+ data: 'is_running'
+ },
+ {
+ title: lang.action,
+ data: 'action'
+ }
+ ]
});
}
function draw_app_passwd_table() {
- ft_apppasswd_table = FooTable.init('#app_passwd_table', {
- "columns": [
- {"name":"chkbox","title":"","style":{"maxWidth":"60px","width":"60px","text-align":"center"},"filterable": false,"sortable": false,"type":"html"},
- {"sorted": true,"name":"id","title":"ID","style":{"maxWidth":"60px","width":"60px","text-align":"center"}},
- {"name":"name","title":lang.app_name},
- {"name":"protocols","title":lang.allowed_protocols},
- {"name":"active","filterable": false,"style":{"maxWidth":"70px","width":"70px"},"title":lang.active,"formatter": function(value){return 1==value?'<i class="bi bi-check-lg"></i>':0==value&&'<i class="bi bi-x-lg"></i>';}},
- {"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","min-width":"220px","width":"220px"},"type":"html","title":lang.action,"breakpoints":"xs sm"}
- ],
- "empty": lang.empty,
- "rows": $.ajax({
- dataType: 'json',
+ $('#app_passwd_table').DataTable({
+ processing: true,
+ serverSide: false,
+ language: lang_datatables,
+ ajax: {
+ type: "GET",
url: '/api/v1/get/app-passwd/all',
- jsonp: false,
- error: function () {
- console.log('Cannot draw app passwd table');
- },
- success: function (data) {
+ dataSrc: function(data){
+ console.log(data);
$.each(data, function (i, item) {
item.name = escapeHtml(item.name)
item.protocols = []
@@ -294,37 +340,59 @@ jQuery(function($){
item.chkbox = '<input type="checkbox" disabled />';
}
});
+
+ return data;
}
- }),
- "paging": {
- "enabled": true,
- "limit": 5,
- "size": pagination_size
},
- "state": {"enabled": true},
- "sorting": {
- "enabled": true
- },
- "toggleSelector": "table tbody span.footable-toggle"
+ columns: [
+ {
+ // placeholder, so checkbox will not block child row toggle
+ title: '',
+ data: null,
+ searchable: false,
+ orderable: false,
+ defaultContent: ''
+ },
+ {
+ title: '',
+ data: 'chkbox'
+ },
+ {
+ title: 'ID',
+ data: 'id'
+ },
+ {
+ title: lang.app_name,
+ data: 'name'
+ },
+ {
+ title: lang.allowed_protocols,
+ data: 'protocols'
+ },
+ {
+ title: lang.active,
+ data: 'active',
+ render: function (data, type) {
+ return 1==data?'<i class="bi bi-check-lg"></i>':0==data&&'<i class="bi bi-x-lg"></i>'
+ }
+ },
+ {
+ title: lang.action,
+ data: 'action'
+ }
+ ]
});
}
function draw_wl_policy_mailbox_table() {
- ft_wl_policy_mailbox_table = FooTable.init('#wl_policy_mailbox_table', {
- "columns": [
- {"name":"chkbox","title":"","style":{"maxWidth":"40px","width":"40px","text-align":"center"},"filterable": false,"sortable": false,"type":"html"},
- {"name":"prefid","style":{"maxWidth":"40px","width":"40px"},"title":"ID","filterable": false,"sortable": false},
- {"sorted": true,"name":"value","title":lang.spamfilter_table_rule},
- {"name":"object","title":"Scope"}
- ],
- "empty": lang.empty,
- "rows": $.ajax({
- dataType: 'json',
+ $('#wl_policy_mailbox_table').DataTable({
+ processing: true,
+ serverSide: false,
+ language: lang_datatables,
+ ajax: {
+ type: "GET",
url: '/api/v1/get/policy_wl_mailbox',
- jsonp: false,
- error: function () {
- console.log('Cannot draw mailbox policy wl table');
- },
- success: function (data) {
+ dataSrc: function(data){
+ console.log(data);
$.each(data, function (i, item) {
if (validateEmail(item.object)) {
item.chkbox = '<input type="checkbox" data-id="policy_wl_mailbox" name="multi_select" value="' + item.prefid + '" />';
@@ -336,36 +404,48 @@ jQuery(function($){
item.chkbox = '<input type="checkbox" disabled />';
}
});
+
+ return data;
}
- }),
- "state": {"enabled": true},
- "paging": {
- "enabled": true,
- "limit": 5,
- "size": pagination_size
},
- "sorting": {
- "enabled": true
- }
+ columns: [
+ {
+ // placeholder, so checkbox will not block child row toggle
+ title: '',
+ data: null,
+ searchable: false,
+ orderable: false,
+ defaultContent: ''
+ },
+ {
+ title: '',
+ data: 'chkbox'
+ },
+ {
+ title: 'ID',
+ data: 'prefid'
+ },
+ {
+ title: lang.spamfilter_table_rule,
+ data: 'name'
+ },
+ {
+ title:'Scope',
+ data: 'object'
+ }
+ ]
});
}
function draw_bl_policy_mailbox_table() {
- ft_bl_policy_mailbox_table = FooTable.init('#bl_policy_mailbox_table', {
- "columns": [
- {"name":"chkbox","title":"","style":{"maxWidth":"40px","width":"40px","text-align":"center"},"filterable": false,"sortable": false,"type":"html"},
- {"name":"prefid","style":{"maxWidth":"40px","width":"40px"},"title":"ID","filterable": false,"sortable": false},
- {"sorted": true,"name":"value","title":lang.spamfilter_table_rule},
- {"name":"object","title":"Scope"}
- ],
- "empty": lang.empty,
- "rows": $.ajax({
- dataType: 'json',
+ $('#bl_policy_mailbox_table').DataTable({
+ processing: true,
+ serverSide: false,
+ language: lang_datatables,
+ ajax: {
+ type: "GET",
url: '/api/v1/get/policy_bl_mailbox',
- jsonp: false,
- error: function () {
- console.log('Cannot draw mailbox policy bl table');
- },
- success: function (data) {
+ dataSrc: function(data){
+ console.log(data);
$.each(data, function (i, item) {
if (validateEmail(item.object)) {
item.chkbox = '<input type="checkbox" data-id="policy_bl_mailbox" name="multi_select" value="' + item.prefid + '" />';
@@ -377,31 +457,39 @@ jQuery(function($){
item.chkbox = '<input type="checkbox" disabled />';
}
});
+
+ return data;
}
- }),
- "paging": {
- "enabled": true,
- "limit": 5,
- "size": pagination_size
},
- "state": {"enabled": true},
- "sorting": {
- "enabled": true
- }
+ columns: [
+ {
+ // placeholder, so checkbox will not block child row toggle
+ title: '',
+ data: null,
+ searchable: false,
+ orderable: false,
+ defaultContent: ''
+ },
+ {
+ title: '',
+ data: 'chkbox'
+ },
+ {
+ title: 'ID',
+ data: 'prefid'
+ },
+ {
+ title: lang.spamfilter_table_rule,
+ data: 'name'
+ },
+ {
+ title:'Scope',
+ data: 'object'
+ }
+ ]
});
}
- $('body').on('click', 'span.footable-toggle', function () {
- event.stopPropagation();
- })
-
- draw_sync_job_table();
- draw_app_passwd_table();
- draw_tla_table();
- draw_wl_policy_mailbox_table();
- draw_bl_policy_mailbox_table();
- last_logins('get');
-
// FIDO2 friendly name modal
$('#fido2ChangeFn').on('show.bs.modal', function (e) {
rename_link = $(e.relatedTarget)
@@ -433,4 +521,29 @@ jQuery(function($){
$('#userFilterModal').on('hidden.bs.modal', function () {
$('#user_sieve_filter').text(lang.loading);
});
+
+ // detect element visibility changes
+ function onVisible(element, callback) {
+ $(element).ready(function() {
+ element_object = document.querySelector(element)
+ new IntersectionObserver((entries, observer) => {
+ entries.forEach(entry => {
+ if(entry.intersectionRatio > 0) {
+ callback(element_object);
+ observer.disconnect();
+ }
+ });
+ }).observe(element_object);
+ });
+ }
+
+ // Load only if the tab is visible
+ onVisible("[id^=SpamAliases]", () => draw_tla_table());
+ onVisible("[id^=Spamfilter]", () => {
+ draw_wl_policy_mailbox_table();
+ draw_bl_policy_mailbox_table();
+ });
+ onVisible("[id^=Syncjobs]", () => draw_sync_job_table());
+ onVisible("[id^=AppPasswds]", () => draw_app_passwd_table());
+ last_logins('get');
});
diff --git a/data/web/templates/user/AppPasswds.twig b/data/web/templates/user/AppPasswds.twig
index 5079ff9a..d1e31ad3 100644
--- a/data/web/templates/user/AppPasswds.twig
+++ b/data/web/templates/user/AppPasswds.twig
@@ -1,22 +1,27 @@
<div role="tabpanel" class="tab-pane fade" id="AppPasswds" role="tabpanel" aria-labelledby="AppPasswds">
- <p>{{ lang.user.app_hint|raw }}</p>
- <div class="table-responsive">
- <table class="table table-striped" id="app_passwd_table"></table>
- </div>
- <div class="mass-actions-user">
- <div class="btn-group" data-acl="{{ acl.app_passwds }}">
- <div class="btn-group">
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="apppasswd" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
- <ul class="dropdown-menu">
- <li><a class="dropdown-item" data-action="edit_selected" data-id="apppasswd" data-api-url='edit/app-passwd' data-api-attr='{"active":"1"}' href="#">{{ lang.mailbox.activate }}</a></li>
- <li><a class="dropdown-item" data-action="edit_selected" data-id="apppasswd" data-api-url='edit/app-passwd' data-api-attr='{"active":"0"}' href="#">{{ lang.mailbox.deactivate }}</a></li>
- <li><hr class="dropdown-divider"></li>
- <li><a class="dropdown-item" data-action="delete_selected" data-id="apppasswd" data-api-url='delete/app-passwd' href="#">{{ lang.mailbox.remove }}</a></li>
- </ul>
+ <div class="card">
+ <div class="card-header">{{ lang.user.app_passwds }}</div>
+ <div class="card-body">
+ <p>{{ lang.user.app_hint|raw }}</p>
+ <div class="table-responsive">
+ <table class="table table-striped" id="app_passwd_table"></table>
</div>
- <div class="btn-group">
- <a class="btn btn-sm d-block d-sm-inline btn-success" href="#" data-bs-toggle="modal" data-bs-target="#addAppPasswdModal"><i class="bi bi-plus-lg"></i> {{ lang.user.create_app_passwd }}</a>
+ <div class="mass-actions-user">
+ <div class="btn-group" data-acl="{{ acl.app_passwds }}">
+ <div class="btn-group">
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="apppasswd" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
+ <ul class="dropdown-menu">
+ <li><a class="dropdown-item" data-action="edit_selected" data-id="apppasswd" data-api-url='edit/app-passwd' data-api-attr='{"active":"1"}' href="#">{{ lang.mailbox.activate }}</a></li>
+ <li><a class="dropdown-item" data-action="edit_selected" data-id="apppasswd" data-api-url='edit/app-passwd' data-api-attr='{"active":"0"}' href="#">{{ lang.mailbox.deactivate }}</a></li>
+ <li><hr class="dropdown-divider"></li>
+ <li><a class="dropdown-item" data-action="delete_selected" data-id="apppasswd" data-api-url='delete/app-passwd' href="#">{{ lang.mailbox.remove }}</a></li>
+ </ul>
+ </div>
+ <div class="btn-group">
+ <a class="btn btn-sm d-block d-sm-inline btn-success" href="#" data-bs-toggle="modal" data-bs-target="#addAppPasswdModal"><i class="bi bi-plus-lg"></i> {{ lang.user.create_app_passwd }}</a>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/data/web/templates/user/Pushover.twig b/data/web/templates/user/Pushover.twig
index f68cb833..5fdca3e8 100644
--- a/data/web/templates/user/Pushover.twig
+++ b/data/web/templates/user/Pushover.twig
@@ -1,78 +1,83 @@
<div role="tabpanel" class="tab-pane fade" id="Pushover" role="tabpanel" aria-labelledby="Pushover">
- <form data-id="pushover" class="form well" method="post">
- <input type="hidden" value="0" name="evaluate_x_prio">
- <input type="hidden" value="0" name="only_x_prio">
- <input type="hidden" value="0" name="active">
- <div class="row">
- <div class="col-sm-1">
- <p class="text-muted"><a href="https://pushover.net" target="_blank"><img src="data:image/png;base64,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" class="img img-fluid"></a></p>
- </div>
- <div class="col-sm-10">
- <p class="text-muted">{{ lang.user.pushover_info|format(mailcow_cc_username)|raw }}</p>
- <p class="text-muted">{{ lang.user.pushover_vars|raw }}: <code>{SUBJECT}</code>, <code>{SENDER}</code></p>
+ <div class="card">
+ <div class="card-header">Pushover API</div>
+ <div class="card-body">
+ <form data-id="pushover" class="form well" method="post">
+ <input type="hidden" value="0" name="evaluate_x_prio">
+ <input type="hidden" value="0" name="only_x_prio">
+ <input type="hidden" value="0" name="active">
<div class="row">
- <div class="col-sm-6">
- <div class="form-group">
- <label for="token">API Token/Key (Application)</label>
- <input type="text" class="form-control" name="token" maxlength="30" value="{{ pushover_data.token }}" required>
- </div>
- </div>
- <div class="col-sm-6">
- <div class="form-group">
- <label for="key">User/Group Key</label>
- <input type="text" class="form-control" name="key" maxlength="30" value="{{ pushover_data.key }}" required>
- </div>
- </div>
- <div class="col-sm-6">
- <div class="form-group">
- <label for="title">{{ lang.user.pushover_title }}</label>
- <input type="text" class="form-control" name="title" value="{{ pushover_data.title }}" placeholder="Mail">
- </div>
- </div>
- <div class="col-sm-6">
- <div class="form-group">
- <label for="text">{{ lang.user.pushover_text }}</label>
- <input type="text" class="form-control" name="text" value="{{ pushover_data.text }}" placeholder="You've got mail 📧">
- </div>
+ <div class="col-sm-1">
+ <p class="text-muted"><a href="https://pushover.net" target="_blank"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAACglBMVEUAAAAAAAEAAAAilecFGigAAAAAAAAAAAAAAAANj+c3n+Ypm+oeYI4KWI4MieAtkdQbleoJcLcjmeswmN4Rit4KgdMKUYQJKUAQSnILL0kMNlMSTngimOoNPF0hlOQBBgkNOlkRS3MHIjUhk+IPf8wKLUYsjM0AAAASTngAAAAAAAAPfckbdLIbdrYUWIgegsgce70knfEAAAAknfENOVkGHi8YaaIjnvEdgMUhkuAQSG8aca0hleQUh9YLjOM4nOEMgtMcbaYWa6YemO02ltkKhNktgLodYZEPXJEyi8kKesktfLUzj84cWYMiluckZ5YJXJYeW4Y0k9YKfs4yjs0pc6YHZaUviskLfMkqmugak+cqkNcViNcqeK4Iaq4XRmYGPmYMKDsFJTstgr0LdL0ti84CCQ4BCQ4Qgc8rlt8XjN8shcQsi8wZSGgEP2cRMEUDKkUAAAD///8dmvEamfExo/EXmPEWl/ERlvElnvEsofEjnfETl/Enn/Ezo/E4pvEvovEfm/E1pPEzpPEvofEOlfEpoPEamPEQlfEYmfE6p/EgnPEVlvEroPE3pfE2pfENk/Ern/E3pPEcmfEfmvEnnvBlufT6/P0soPAknPDd7/zs9vzo9PxBqfItofAqoPD9/f3B4/q43/mx2/l/xfZ6w/Vxv/VtvfVgt/RXtPNTsfNEq/L3+/31+v3a7fvR6vvH5fqs2vmc0/jx+P3v9/3h8fzW7PvV7PvL5/q13fmo1/mh1PiY0fiNy/aHyfZ2wfVou/Vdt/RPsPM3oeoQkuowmeAgjdgcgMQbeLrw9/3k8vy74Pm63/mX0PdYtfNNr/Ikm+4wnOchkuAVjOAfdrMVcrOdoJikAAAAcnRSTlMAIQ8IzzweFwf+/fvw8P79+/Xt7e3p6eji4d7U08y8qZyTiIWDgn53bWxqaWBKQ0JBOjUwMCkoJCEfHBkT/vz8/Pv7+vr69/b29PTy7ezm5ubm5N7e29vQ0M/Pv7+4uLW1pqaWloWDg3x7e21mUVFFRUXdPracAAAEbElEQVRIx4WUZbvaQBCFF+ru7u7u7u7u7t4mvVwSoBC0JIUCLRQolLq7u7vr/+nMLkmQyvlwyfPcd86e3ZldUqwyQ/p329J+XfutPQYOLUP+q55rFtQJRvY79+xxlZTUWbKpz7/xrrMr2+3BoNPpdLn2lJQ4HEeqLOr1d7z7XNkesQed4A848G63Oy4Gmg/6Mz542QvZbqe8C/Ig73CLYiYTrtLmT3zfqbIcAR7y4wIqH/B6M9Fo0+Ldb6sM9ph/v4ozPuz12mxRofaAAr7jCNkuoz/jNf9AGHibkBCm51fsGKvxsAGWx4H+jBcEi6V2birDpCL/9Klrd1KHbiSvPWP8V0tTnTfO03iXi57P6WNHOVUf44IFdFDRz6pV5fw8Zy5z3JVH5+R48OwxqDiGvKJIY9R+9JsCuJ5HPg74OVEMpz+nbdEPUHEWeEk6IDUnTC1l5r+f8uffc0cfxc8fS17kLso24SwUPFDA/6DE82xKDOPliJ7n/GGOOyWK9zD9CdjvOfg9Dv6AH+AX04LW9gj2i8W/APx1UbxwCAu+wPmcpgUKL/EHdvtq4uwaZwCuznPJVY5LHhED15G/isd5Hz4eKui/e/du02YoKFeD5mHzHIN/nxEDe25gQQwKorAid04CfyzwL4XutXvl1Pt1guMOwwKPkU8mYIFT8JHK+vv8prpDScUVL+j8s3lOctw1GIhbWHAS+HgKPk7xPM/4UtNAYmzizJkf6NgTb/gM8jePQLsewMdthS3g95tMpT1IhVm6v1s8fYmLeb13Odwp8Fh5KY048y/d14WUrwrb1e/X/rNp73nkD8kWS+wi/MZ4XuetG4mhKubJm3/WNEvi8SHwB56nPKjUam0LBdp9ARwupFemTYudvgN/L1+A/Ko/LGBuS8pPy+YR1fuCTWNKnUyoeUyYx2o2dyEVGmr5xTD42xzvkD16+Pb9WIIH6fmt1r3mbsTY7Bvw+n23naT8BUWh86bz6G/e259UXPUK3gfAxQDlo7Rpx3Geqb2e3wp83SGEdKpB7zvwYbzvT2n65xLwbH6YP+M9C8vA8E1wxLU8gkCbdhXGUyrMgwVrcbzLHonr78lzDvWM3q/C/HtDlXoSUIe3YkblhRPIX4E8Oo/9siLv8dRjV7SBlkdgTXvKS7nzsA/9AfeEuhKq9T8zWIDv1Sd6ETAP4D6/H/1V+1BojvruNa4SZXz4JhY84dV5MOF5agUvu5OsOo+KRpG30KalEnoeDccFlutPZYs38D5n3zcpr1/0fBhfb3DOY1z2tSAgLxWezz6zuoHhfUmOejf6blHQH/sFuJYfcMZX307ytKvRa3ifoV/586P5j+tICtS77BuJxzxYAPZsntX8k3eSIhlajK4p8b7iefCEKs03kD/I2LnxL9ovH+43y4fAv1YrI/mzDBsavAX/UppfzVOrZT/ydxk6lJ047MfLfVbcb6hS9ZEzWxekKQ5WrtPqZg3rV6tWrX6Tle3KQZj/q6KxQnmDoXwFY0VSrN9e8FRXBCTAvwAAAABJRU5ErkJggg==" class="img img-fluid"></a></p>
</div>
- <div class="col-sm-12">
- <div class="form-group">
- <label for="text">{{ lang.user.pushover_sender_array|raw }}</label>
- <input type="text" class="form-control" name="senders" value="{{ pushover_data.senders }}" placeholder="[email protected], [email protected]">
- </div>
- </div>
- <div class="col-sm-12">
- <div class="checkbox">
- <label><input type="checkbox" value="1" name="active"{% if pushover_data.active == '1' %} checked{% endif %}> {{ lang.user.active }}</label>
- </div>
- </div>
- <div class="col-sm-12">
- <legend style="cursor:pointer;margin-top:10px" data-bs-target="#po_advanced" unselectable="on" data-bs-toggle="collapse">
- <i style="font-size:10pt;" class="bi bi-plus-square"></i> {{ lang.user.advanced_settings }}
- </legend>
- <hr />
- </div>
- <div class="col-sm-12">
- <div id="po_advanced" class="collapse">
- <div class="form-group">
- <label for="text">{{ lang.user.pushover_sender_regex }}</label>
- <input type="text" class="form-control" name="senders_regex" value="{{ pushover_data.senders_regex }}" placeholder="/(.*@example\.org$|^foo@example\.com$)/i" regex="true">
- <div class="checkbox">
- <label><input type="checkbox" value="1" name="evaluate_x_prio"{% if pushover_data.attributes.evaluate_x_prio == '1' %} checked{% endif %}> {{ lang.user.pushover_evaluate_x_prio|raw }}</label>
+ <div class="col-sm-10">
+ <p class="text-muted">{{ lang.user.pushover_info|format(mailcow_cc_username)|raw }}</p>
+ <p class="text-muted">{{ lang.user.pushover_vars|raw }}: <code>{SUBJECT}</code>, <code>{SENDER}</code></p>
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label for="token">API Token/Key (Application)</label>
+ <input type="text" class="form-control" name="token" maxlength="30" value="{{ pushover_data.token }}" required>
</div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label for="key">User/Group Key</label>
+ <input type="text" class="form-control" name="key" maxlength="30" value="{{ pushover_data.key }}" required>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label for="title">{{ lang.user.pushover_title }}</label>
+ <input type="text" class="form-control" name="title" value="{{ pushover_data.title }}" placeholder="Mail">
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label for="text">{{ lang.user.pushover_text }}</label>
+ <input type="text" class="form-control" name="text" value="{{ pushover_data.text }}" placeholder="You've got mail 📧">
+ </div>
+ </div>
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label for="text">{{ lang.user.pushover_sender_array|raw }}</label>
+ <input type="text" class="form-control" name="senders" value="{{ pushover_data.senders }}" placeholder="[email protected], [email protected]">
+ </div>
+ </div>
+ <div class="col-sm-12">
<div class="checkbox">
- <label><input type="checkbox" value="1" name="only_x_prio"{% if pushover_data.attributes.only_x_prio == '1' %} checked{% endif %}> {{ lang.user.pushover_only_x_prio|raw }}</label>
+ <label><input type="checkbox" value="1" name="active"{% if pushover_data.active == '1' %} checked{% endif %}> {{ lang.user.active }}</label>
+ </div>
+ </div>
+ <div class="col-sm-12">
+ <legend style="cursor:pointer;margin-top:10px" data-bs-target="#po_advanced" unselectable="on" data-bs-toggle="collapse">
+ <i style="font-size:10pt;" class="bi bi-plus-square"></i> {{ lang.user.advanced_settings }}
+ </legend>
+ <hr />
+ </div>
+ <div class="col-sm-12">
+ <div id="po_advanced" class="collapse">
+ <div class="form-group">
+ <label for="text">{{ lang.user.pushover_sender_regex }}</label>
+ <input type="text" class="form-control" name="senders_regex" value="{{ pushover_data.senders_regex }}" placeholder="/(.*@example\.org$|^foo@example\.com$)/i" regex="true">
+ <div class="checkbox">
+ <label><input type="checkbox" value="1" name="evaluate_x_prio"{% if pushover_data.attributes.evaluate_x_prio == '1' %} checked{% endif %}> {{ lang.user.pushover_evaluate_x_prio|raw }}</label>
+ </div>
+ <div class="checkbox">
+ <label><input type="checkbox" value="1" name="only_x_prio"{% if pushover_data.attributes.only_x_prio == '1' %} checked{% endif %}> {{ lang.user.pushover_only_x_prio|raw }}</label>
+ </div>
+ </div>
</div>
</div>
</div>
+ <div class="btn-group mass-actions-user" data-acl="{{ acl.pushover }}">
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-success" data-action="edit_selected" data-id="pushover" data-item="{{ mailcow_cc_username }}" data-api-url='edit/pushover' data-api-attr='{}' href="#">{{ lang.user.save }}</a>
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" data-action="edit_selected" data-id="pushover-test" data-item="{{ mailcow_cc_username }}" data-api-url='edit/pushover-test' data-api-attr='{}' href="#"><i class="bi bi-check-all"></i> {{ lang.user.pushover_verify }}</a>
+ <a id="pushover_delete" class="btn btn-sm d-block d-sm-inline btn-danger" data-action="edit_selected" data-id="pushover-delete" data-item="{{ mailcow_cc_username }}" data-api-url='edit/pushover' data-api-attr='{"delete":"true"}' href="#"><i class="bi bi-trash"></i> {{ lang.user.remove }}</a>
+ </div>
</div>
</div>
- <div class="btn-group mass-actions-user" data-acl="{{ acl.pushover }}">
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-success" data-action="edit_selected" data-id="pushover" data-item="{{ mailcow_cc_username }}" data-api-url='edit/pushover' data-api-attr='{}' href="#">{{ lang.user.save }}</a>
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" data-action="edit_selected" data-id="pushover-test" data-item="{{ mailcow_cc_username }}" data-api-url='edit/pushover-test' data-api-attr='{}' href="#"><i class="bi bi-check-all"></i> {{ lang.user.pushover_verify }}</a>
- <a id="pushover_delete" class="btn btn-sm d-block d-sm-inline btn-danger" data-action="edit_selected" data-id="pushover-delete" data-item="{{ mailcow_cc_username }}" data-api-url='edit/pushover' data-api-attr='{"delete":"true"}' href="#"><i class="bi bi-trash"></i> {{ lang.user.remove }}</a>
- </div>
- </div>
+ </form>
</div>
- </form>
+ </div>
</div>
diff --git a/data/web/templates/user/SpamAliases.twig b/data/web/templates/user/SpamAliases.twig
index f07b89be..9695ee46 100644
--- a/data/web/templates/user/SpamAliases.twig
+++ b/data/web/templates/user/SpamAliases.twig
@@ -1,38 +1,41 @@
<div role="tabpanel" class="tab-pane fade" id="SpamAliases" role="tabpanel" aria-labelledby="SpamAliases">
- <div class="row">
- <div class="col-md-12 col-sm-12 col-12">
- <div class="table-responsive">
- <table class="table table-striped" id="tla_table"></table>
+ <div class="card">
+ <div class="card-header">{{ lang.user.spam_aliases }}</div>
+ <div class="card-body">
+ <div class="row">
+ <div class="col-md-12 col-sm-12 col-12">
+ <table id="tla_table" class="table table-striped dt-responsive w-100"></table>
+ </div>
</div>
- </div>
- </div>
- <div class="mass-actions-user">
- <div class="btn-group" data-acl="{{ acl.spam_alias }}">
- <div class="btn-group">
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="tla" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
- <ul class="dropdown-menu">
- <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"1"}' href="#">{{ lang.user.expire_in }} 1 {{ lang.user.hour }}</a></li>
- <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"24"}' href="#">{{ lang.user.expire_in }} 1 {{ lang.user.day }}</a></li>
- <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"168"}' href="#">{{ lang.user.expire_in }} 1 {{ lang.user.week }}</a></li>
- <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"744"}' href="#">{{ lang.user.expire_in }} 1 {{ lang.user.month }}</a></li>
- <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"8760"}' href="#">{{ lang.user.expire_in }} 1 {{ lang.user.year }}</a></li>
- <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"87600"}' href="#">{{ lang.user.expire_in }} 10 {{ lang.user.years }}</a></li>
- <li><hr class="dropdown-divider"></li>
- <li><a class="dropdown-item" data-action="delete_selected" data-id="tla" data-api-url='delete/time_limited_alias' href="#">{{ lang.mailbox.remove }}</a></li>
- </ul>
- </div>
- <div class="btn-group">
- <a class="btn btn-sm d-block d-sm-inline btn-success dropdown-toggle" data-bs-toggle="dropdown" href="#"><i class="bi bi-plus-lg"></i> {{ lang.user.alias_create_random }}, 1 {{ lang.user.year }}</a>
- <ul class="dropdown-menu">
- {% for domain in user_domains %}
- <li>
- <a class="dropdown-item" data-action="add_item" data-api-url='add/time_limited_alias' data-api-attr='{"domain":"{{ domain }}"}' href="#">
- @ {{ domain }}
- </a>
- </li>
- {% endfor %}
- </ul>
+ <div class="mass-actions-user">
+ <div class="btn-group" data-acl="{{ acl.spam_alias }}">
+ <div class="btn-group">
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="tla" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
+ <ul class="dropdown-menu">
+ <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"1"}' href="#">{{ lang.user.expire_in }} 1 {{ lang.user.hour }}</a></li>
+ <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"24"}' href="#">{{ lang.user.expire_in }} 1 {{ lang.user.day }}</a></li>
+ <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"168"}' href="#">{{ lang.user.expire_in }} 1 {{ lang.user.week }}</a></li>
+ <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"744"}' href="#">{{ lang.user.expire_in }} 1 {{ lang.user.month }}</a></li>
+ <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"8760"}' href="#">{{ lang.user.expire_in }} 1 {{ lang.user.year }}</a></li>
+ <li><a class="dropdown-item" data-action="edit_selected" data-id="tla" data-api-url='edit/time_limited_alias' data-api-attr='{"validity":"87600"}' href="#">{{ lang.user.expire_in }} 10 {{ lang.user.years }}</a></li>
+ <li><hr class="dropdown-divider"></li>
+ <li><a class="dropdown-item" data-action="delete_selected" data-id="tla" data-api-url='delete/time_limited_alias' href="#">{{ lang.mailbox.remove }}</a></li>
+ </ul>
+ </div>
+ <div class="btn-group">
+ <a class="btn btn-sm d-block d-sm-inline btn-success dropdown-toggle" data-bs-toggle="dropdown" href="#"><i class="bi bi-plus-lg"></i> {{ lang.user.alias_create_random }}, 1 {{ lang.user.year }}</a>
+ <ul class="dropdown-menu">
+ {% for domain in user_domains %}
+ <li>
+ <a class="dropdown-item" data-action="add_item" data-api-url='add/time_limited_alias' data-api-attr='{"domain":"{{ domain }}"}' href="#">
+ @ {{ domain }}
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/data/web/templates/user/Spamfilter.twig b/data/web/templates/user/Spamfilter.twig
index 13aa371e..89e72919 100644
--- a/data/web/templates/user/Spamfilter.twig
+++ b/data/web/templates/user/Spamfilter.twig
@@ -1,75 +1,80 @@
<div role="tabpanel" class="tab-pane fade" id="Spamfilter" role="tabpanel" aria-labelledby="Spamfilter">
- <h4>{{ lang.user.spamfilter_behavior }}</h4>
- <div class="row">
- <div class="col-sm-12">
- <form class="form-horizontal" role="form" data-id="spam_score" method="post">
- <div class="row">
- <div class="col-lg-8 col-sm-12">
- <div id="spam_score" data-provide="slider" data-acl="{{ acl.spam_score }}"></div>
- <input id="spam_score_value" name="spam_score" type="hidden" value="{{ user_spam_score }}">
- <ul class="list-group list-group-flush">
- <li class="list-group-item"><span class="label label-ham spam-ham-score"></span> {{ lang.user.spamfilter_green }}</li>
- <li class="list-group-item"><span class="label label-spam spam-spam-score"></span> {{ lang.user.spamfilter_yellow }}</li>
- <li class="list-group-item"><span class="label label-reject spam-reject-score"></span> {{ lang.user.spamfilter_red }}</li>
- </ul>
- </div>
- </div>
- <div class="btn-group" data-acl="{{ acl.spam_score }}">
- <a type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-success" data-action="edit_selected"
- data-item="{{ mailcow_cc_username }}"
- data-id="spam_score"
- data-api-url='edit/spam-score'
- data-api-attr='{}'><i class="bi bi-save"></i> {{ lang.user.save_changes }}</a>
- <a type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" data-action="edit_selected"
- data-item="{{ mailcow_cc_username }}"
- data-id="spam_score_reset"
- data-api-url='edit/spam-score'
- data-api-attr='{"spam_score":"default"}'>{{ lang.user.spam_score_reset }}</a>
- </div>
- </form>
- </div>
- </div>
- <hr>
- <div class="row">
- <div class="col-sm-6">
- <h4>{{ lang.user.spamfilter_wl }}</h4>
- <p>{{ lang.user.spamfilter_wl_desc|raw }}</p>
- <form class="form-inline mb-4" data-id="add_wl_policy_mailbox">
- <div class="input-group" data-acl="{{ acl.spam_policy }}">
- <input type="text" class="form-control" name="object_from" placeholder="*@example.org" required>
- <span class="input-group-btn">
- <button class="btn btn-secondary" data-action="add_item" data-id="add_wl_policy_mailbox" data-api-url='add/mailbox-policy' data-api-attr='{"username": {{ mailcow_cc_username|json_encode|raw }},"object_list":"wl"}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.user.spamfilter_table_add }}</button>
- </span>
- </div>
- </form>
- <div class="table-responsive">
- <table class="table table-striped table-condensed" id="wl_policy_mailbox_table"></table>
- </div>
- <div class="mass-actions-user">
- <div class="btn-group" data-acl="{{ acl.spam_policy }}">
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="policy_wl_mailbox" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-danger" data-action="delete_selected" data-id="policy_wl_mailbox" data-api-url='delete/mailbox-policy' href="#">{{ lang.mailbox.remove }}</a>
+ <div class="card">
+ <div class="card-header">{{ lang.user.spamfilter }}</div>
+ <div class="card-body">
+ <h4>{{ lang.user.spamfilter_behavior }}</h4>
+ <div class="row">
+ <div class="col-sm-12">
+ <form class="form-horizontal" role="form" data-id="spam_score" method="post">
+ <div class="row">
+ <div class="col-lg-8 col-sm-12">
+ <div id="spam_score" data-provide="slider" data-acl="{{ acl.spam_score }}"></div>
+ <input id="spam_score_value" name="spam_score" type="hidden" value="{{ user_spam_score }}">
+ <ul class="list-group list-group-flush">
+ <li class="list-group-item"><span class="label label-ham spam-ham-score"></span> {{ lang.user.spamfilter_green }}</li>
+ <li class="list-group-item"><span class="label label-spam spam-spam-score"></span> {{ lang.user.spamfilter_yellow }}</li>
+ <li class="list-group-item"><span class="label label-reject spam-reject-score"></span> {{ lang.user.spamfilter_red }}</li>
+ </ul>
+ </div>
+ </div>
+ <div class="btn-group" data-acl="{{ acl.spam_score }}">
+ <a type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-success" data-action="edit_selected"
+ data-item="{{ mailcow_cc_username }}"
+ data-id="spam_score"
+ data-api-url='edit/spam-score'
+ data-api-attr='{}'><i class="bi bi-save"></i> {{ lang.user.save_changes }}</a>
+ <a type="button" class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" data-action="edit_selected"
+ data-item="{{ mailcow_cc_username }}"
+ data-id="spam_score_reset"
+ data-api-url='edit/spam-score'
+ data-api-attr='{"spam_score":"default"}'>{{ lang.user.spam_score_reset }}</a>
+ </div>
+ </form>
</div>
</div>
- </div>
- <div class="col-sm-6">
- <h4>{{ lang.user.spamfilter_bl }}</h4>
- <p>{{ lang.user.spamfilter_bl_desc|raw }}</p>
- <form class="form-inline mb-4" data-id="add_bl_policy_mailbox">
- <div class="input-group" data-acl="{{ acl.spam_policy }}">
- <input type="text" class="form-control" name="object_from" placeholder="*@example.org" required>
- <span class="input-group-btn">
- <button class="btn btn-secondary" data-action="add_item" data-id="add_bl_policy_mailbox" data-api-url='add/mailbox-policy' data-api-attr='{"username": {{ mailcow_cc_username|json_encode|raw }},"object_list":"bl"}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.user.spamfilter_table_add }}</button>
- </span>
+ <hr>
+ <div class="row">
+ <div class="col-sm-6">
+ <h4>{{ lang.user.spamfilter_wl }}</h4>
+ <p>{{ lang.user.spamfilter_wl_desc|raw }}</p>
+ <form class="form-inline mb-4" data-id="add_wl_policy_mailbox">
+ <div class="input-group" data-acl="{{ acl.spam_policy }}">
+ <input type="text" class="form-control" name="object_from" placeholder="*@example.org" required>
+ <span class="input-group-btn">
+ <button class="btn btn-secondary" data-action="add_item" data-id="add_wl_policy_mailbox" data-api-url='add/mailbox-policy' data-api-attr='{"username": {{ mailcow_cc_username|json_encode|raw }},"object_list":"wl"}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.user.spamfilter_table_add }}</button>
+ </span>
+ </div>
+ </form>
+ <div class="table-responsive">
+ <table class="table table-striped table-condensed" id="wl_policy_mailbox_table"></table>
+ </div>
+ <div class="mass-actions-user">
+ <div class="btn-group" data-acl="{{ acl.spam_policy }}">
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="policy_wl_mailbox" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-danger" data-action="delete_selected" data-id="policy_wl_mailbox" data-api-url='delete/mailbox-policy' href="#">{{ lang.mailbox.remove }}</a>
+ </div>
+ </div>
</div>
- </form>
- <div class="table-responsive">
- <table class="table table-striped table-condensed" id="bl_policy_mailbox_table"></table>
- </div>
- <div class="mass-actions-user">
- <div class="btn-group" data-acl="{{ acl.spam_policy }}">
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="policy_bl_mailbox" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-danger" data-action="delete_selected" data-id="policy_bl_mailbox" data-api-url='delete/mailbox-policy' href="#">{{ lang.mailbox.remove }}</a>
+ <div class="col-sm-6">
+ <h4>{{ lang.user.spamfilter_bl }}</h4>
+ <p>{{ lang.user.spamfilter_bl_desc|raw }}</p>
+ <form class="form-inline mb-4" data-id="add_bl_policy_mailbox">
+ <div class="input-group" data-acl="{{ acl.spam_policy }}">
+ <input type="text" class="form-control" name="object_from" placeholder="*@example.org" required>
+ <span class="input-group-btn">
+ <button class="btn btn-secondary" data-action="add_item" data-id="add_bl_policy_mailbox" data-api-url='add/mailbox-policy' data-api-attr='{"username": {{ mailcow_cc_username|json_encode|raw }},"object_list":"bl"}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.user.spamfilter_table_add }}</button>
+ </span>
+ </div>
+ </form>
+ <div class="table-responsive">
+ <table class="table table-striped table-condensed" id="bl_policy_mailbox_table"></table>
+ </div>
+ <div class="mass-actions-user">
+ <div class="btn-group" data-acl="{{ acl.spam_policy }}">
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="policy_bl_mailbox" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-danger" data-action="delete_selected" data-id="policy_bl_mailbox" data-api-url='delete/mailbox-policy' href="#">{{ lang.mailbox.remove }}</a>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/data/web/templates/user/Syncjobs.twig b/data/web/templates/user/Syncjobs.twig
index 2df2ec90..628b9e78 100644
--- a/data/web/templates/user/Syncjobs.twig
+++ b/data/web/templates/user/Syncjobs.twig
@@ -1,21 +1,24 @@
<div role="tabpanel" class="tab-pane fade" id="Syncjobs" role="tabpanel" aria-labelledby="Syncjobs">
- <div class="table-responsive">
- <table class="table table-striped" id="sync_job_table"></table>
- </div>
- <div class="mass-actions-user">
- <div class="btn-group" data-acl="{{ acl.syncjobs }}">
- <div class="btn-group">
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="syncjob" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
- <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
- <ul class="dropdown-menu">
- <li><a class="dropdown-item" data-action="edit_selected" data-id="syncjob" data-api-url='edit/syncjob' data-api-attr='{"active":"1"}' href="#">{{ lang.mailbox.activate }}</a></li>
- <li><a class="dropdown-item" data-action="edit_selected" data-id="syncjob" data-api-url='edit/syncjob' data-api-attr='{"active":"0"}' href="#">{{ lang.mailbox.deactivate }}</a></li>
- <li><hr class="dropdown-divider"></li>
- <li><a class="dropdown-item" data-action="delete_selected" data-id="syncjob" data-api-url='delete/syncjob' href="#">{{ lang.mailbox.remove }}</a></li>
- </ul>
- </div>
- <div class="btn-group">
- <a class="btn btn-sm d-block d-sm-inline btn-success" href="#" data-bs-toggle="modal" data-bs-target="#addSyncJobModal"><i class="bi bi-plus-lg"></i> {{ lang.user.create_syncjob }}</a>
+ <div class="card">
+ <div class="card-header">{{ lang.user.sync_jobs }}</div>
+ <div class="card-body">
+ <table id="sync_job_table" class="table table-striped dt-responsive w-100"></table>
+ <div class="mass-actions-user">
+ <div class="btn-group" data-acl="{{ acl.syncjobs }}">
+ <div class="btn-group">
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="syncjob" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
+ <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
+ <ul class="dropdown-menu">
+ <li><a class="dropdown-item" data-action="edit_selected" data-id="syncjob" data-api-url='edit/syncjob' data-api-attr='{"active":"1"}' href="#">{{ lang.mailbox.activate }}</a></li>
+ <li><a class="dropdown-item" data-action="edit_selected" data-id="syncjob" data-api-url='edit/syncjob' data-api-attr='{"active":"0"}' href="#">{{ lang.mailbox.deactivate }}</a></li>
+ <li><hr class="dropdown-divider"></li>
+ <li><a class="dropdown-item" data-action="delete_selected" data-id="syncjob" data-api-url='delete/syncjob' href="#">{{ lang.mailbox.remove }}</a></li>
+ </ul>
+ </div>
+ <div class="btn-group">
+ <a class="btn btn-sm d-block d-sm-inline btn-success" href="#" data-bs-toggle="modal" data-bs-target="#addSyncJobModal"><i class="bi bi-plus-lg"></i> {{ lang.user.create_syncjob }}</a>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/data/web/templates/user_domainadmin_common.twig b/data/web/templates/user_domainadmin_common.twig
index be8bff23..8a7ace39 100644
--- a/data/web/templates/user_domainadmin_common.twig
+++ b/data/web/templates/user_domainadmin_common.twig
@@ -7,4 +7,5 @@
var pagination_size = '{{ pagination_size }}';
var mailcow_cc_username = '{{ mailcow_cc_username }}';
var user_spam_score = [{{ user_spam_score }}];
+ var lang_datatables = {{ lang_datatables|raw }};
</script>
diff --git a/data/web/user.php b/data/web/user.php
index 5bf60917..1ab93e81 100644
--- a/data/web/user.php
+++ b/data/web/user.php
@@ -88,6 +88,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
'pushover_data' => $pushover_data,
'lang_user' => json_encode($lang['user']),
'number_of_app_passwords' => $number_of_app_passwords,
+ 'lang_datatables' => json_encode($lang['datatables']),
];
}