diff --git a/data/Dockerfiles/dockerapi/dockerapi.py b/data/Dockerfiles/dockerapi/dockerapi.py
index 1ce47265..965fc906 100644
--- a/data/Dockerfiles/dockerapi/dockerapi.py
+++ b/data/Dockerfiles/dockerapi/dockerapi.py
@@ -494,27 +494,14 @@ class DockerUtils:
for container in (await self.docker_client.containers.list()):
if container._id == container_id:
- cmd = "/usr/bin/rspamadm pw -e -p '" + request_json['raw'].replace("'", "'\\''") + "' 2> /dev/null"
+ cmd = "./set_worker_password.sh '" + request_json['raw'].replace("'", "'\\''") + "' 2> /dev/null"
rspamd_password_exec = await container.exec(cmd, user='_rspamd')
async with rspamd_password_exec.start(detach=False) as stream:
rspamd_password_return = await stream.read_out()
-
- matched = False
- for line in rspamd_password_return.data.decode('utf-8').split("\n"):
- if '$2$' in line:
- hash = line.strip()
- hash_out = re.search('\$2\$.+$', hash).group(0)
- rspamd_passphrase_hash = re.sub('[^0-9a-zA-Z\$]+', '', hash_out.rstrip())
- rspamd_password_filename = "/etc/rspamd/override.d/worker-controller-password.inc"
- cmd = '''/bin/echo 'enable_password = "%s";' > %s && cat %s''' % (rspamd_passphrase_hash, rspamd_password_filename, rspamd_password_filename)
- rspamd_password_exec = await container.exec(cmd, user='_rspamd')
- async with rspamd_password_exec.start(detach=False) as stream:
- rspamd_password_return = await stream.read_out()
-
- if rspamd_passphrase_hash.startswith("$2$") and rspamd_passphrase_hash in rspamd_password_return.data.decode('utf-8'):
- await container.restart()
- matched = True
+ if "OK" in rspamd_password_return.data.decode('utf-8'):
+ matched = True
+ await container.restart()
if matched:
res = {
diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile
index 23fcbb3f..2520ddcc 100644
--- a/data/Dockerfiles/rspamd/Dockerfile
+++ b/data/Dockerfiles/rspamd/Dockerfile
@@ -26,6 +26,7 @@ RUN apt-get update && apt-get install -y \
COPY settings.conf /etc/rspamd/settings.conf
COPY metadata_exporter.lua /usr/share/rspamd/plugins/metadata_exporter.lua
+COPY set_worker_password.sh /set_worker_password.sh
COPY docker-entrypoint.sh /docker-entrypoint.sh
ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/data/Dockerfiles/rspamd/set_worker_password.sh b/data/Dockerfiles/rspamd/set_worker_password.sh
new file mode 100755
index 00000000..7205e888
--- /dev/null
+++ b/data/Dockerfiles/rspamd/set_worker_password.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+password_file='/etc/rspamd/override.d/worker-controller-password.inc'
+password_hash=`/usr/bin/rspamadm pw -e -p $1`
+
+echo 'enable_password = "'$password_hash'";' > $password_file
+
+if grep -q "$password_hash" "$password_file"; then
+ echo "OK"
+else
+ echo "ERROR"
+fi
\ No newline at end of file
diff --git a/data/web/admin.php b/data/web/admin.php
index a68ec033..e53d18fd 100644
--- a/data/web/admin.php
+++ b/data/web/admin.php
@@ -90,7 +90,6 @@ $template_data = [
'fido2_cid' => @$_SESSION['fido2_cid'],
'fido2_data' => $fido2_data,
'gal' => @$_SESSION['gal'],
- 'license_guid' => license('guid'),
'api' => [
'ro' => admin_api('ro', 'get'),
'rw' => admin_api('rw', 'get'),
diff --git a/data/web/css/build/013-mailcow.css b/data/web/css/build/013-mailcow.css
index 9580492d..374d484d 100644
--- a/data/web/css/build/013-mailcow.css
+++ b/data/web/css/build/013-mailcow.css
@@ -275,23 +275,6 @@ code {
font-weight: 600;
}
-.dataTables_info {
- margin: 15px 0 !important;
- padding: 0px !important;
-}
-.dataTables_paginate, .dataTables_length, .dataTables_filter {
- margin: 15px 0 !important;
-}
-.dtr-details {
- width: 100%;
-}
-.dtr-title {
- width: 20%;
-}
-table.dataTable>tbody>tr.child ul.dtr-details>li {
- border-bottom: 1px solid rgba(0, 0, 0, 0.129);
- padding: 0.5em 0;
-}
.tag-box {
display: flex;
@@ -339,42 +322,6 @@ table.dataTable>tbody>tr.child ul.dtr-details>li {
padding: 10px;
}
-table.dataTable.dtr-inline.collapsed>tbody>tr>td.dtr-control:before:hover,
-table.dataTable.dtr-inline.collapsed>tbody>tr>th.dtr-control:before:hover {
- background-color: #5e5e5e;
-}
-table.dataTable.dtr-inline.collapsed>tbody>tr>td.dtr-control:before,
-table.dataTable.dtr-inline.collapsed>tbody>tr>th.dtr-control:before,
-table.dataTable td.dt-control:before {
- background-color: #979797 !important;
- border: 1.5px solid #616161 !important;
- border-radius: 2px !important;
- color: #fff;
- height: 1em;
- width: 1em;
- line-height: 1.25em;
- border-radius: 0px;
- box-shadow: none;
- font-size: 14px;
- transition: 0.5s all;
-}
-table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td.dtr-control:before,
-table.dataTable.dtr-inline.collapsed>tbody>tr.parent>th.dtr-control:before,
-table.dataTable td.dt-control:before {
- background-color: #979797 !important;
-}
-table.dataTable.dtr-inline.collapsed>tbody>tr>td.child,
-table.dataTable.dtr-inline.collapsed>tbody>tr>th.child,
-table.dataTable.dtr-inline.collapsed>tbody>tr>td.dataTables_empty {
- background-color: #fbfbfb;
-}
-table.dataTable.table-striped>tbody>tr>td {
- vertical-align: middle;
-}
-table.dataTable.table-striped>tbody>tr>td>input[type="checkbox"] {
- margin-top: 7px;
-}
-
.btn-check-label {
color: #555;
diff --git a/data/web/css/build/015-datatables.css b/data/web/css/build/015-datatables.css
new file mode 100644
index 00000000..e5518ff8
--- /dev/null
+++ b/data/web/css/build/015-datatables.css
@@ -0,0 +1,80 @@
+.dataTables_info {
+ margin: 15px 0 !important;
+ padding: 0px !important;
+}
+.dataTables_paginate, .dataTables_length, .dataTables_filter {
+ margin: 15px 0 !important;
+}
+.dtr-details {
+ width: 100%;
+}
+.table-striped>tbody>tr:nth-of-type(odd) {
+ background-color: #F2F2F2;
+}
+td.child>ul>li {
+ display: flex;
+}
+table.dataTable>tbody>tr.child ul.dtr-details>li {
+ border-bottom: 1px solid rgba(0, 0, 0, 0.129);
+ padding: 0.5em 0;
+}
+table.dataTable.dtr-inline.collapsed>tbody>tr>td.dtr-control:before:hover,
+table.dataTable.dtr-inline.collapsed>tbody>tr>th.dtr-control:before:hover {
+ background-color: #5e5e5e;
+}
+table.dataTable.dtr-inline.collapsed>tbody>tr>td.dtr-control:before,
+table.dataTable.dtr-inline.collapsed>tbody>tr>th.dtr-control:before,
+table.dataTable td.dt-control:before {
+ background-color: #979797 !important;
+ border: 1.5px solid #616161 !important;
+ border-radius: 2px !important;
+ color: #fff;
+ height: 1em;
+ width: 1em;
+ line-height: 1.25em;
+ border-radius: 0px;
+ box-shadow: none;
+ font-size: 14px;
+ transition: 0.5s all;
+}
+table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td.dtr-control:before,
+table.dataTable.dtr-inline.collapsed>tbody>tr.parent>th.dtr-control:before,
+table.dataTable td.dt-control:before {
+ background-color: #979797 !important;
+}
+table.dataTable.dtr-inline.collapsed>tbody>tr>td.child,
+table.dataTable.dtr-inline.collapsed>tbody>tr>th.child,
+table.dataTable.dtr-inline.collapsed>tbody>tr>td.dataTables_empty {
+ background-color: #fbfbfb;
+}
+table.dataTable.table-striped>tbody>tr>td {
+ vertical-align: middle;
+}
+table.dataTable.table-striped>tbody>tr>td>input[type="checkbox"] {
+ margin-top: 7px;
+}
+td.dtr-col-lg {
+ min-width: 350px;
+ word-break: break-word;
+}
+td.dtr-col-md {
+ min-width: 250px;
+ word-break: break-word;
+}
+td.dtr-col-sm {
+ min-width: 125px;
+ word-break: break-word;
+}
+.dt-data-w100 .dtr-data {
+ width: 100%;
+}
+li .dtr-data {
+ word-break: break-all;
+ flex: 1;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+table.dataTable>tbody>tr.child span.dtr-title {
+ width: 30%;
+ max-width: 250px;
+}
\ No newline at end of file
diff --git a/data/web/debug.php b/data/web/debug.php
index e9b426c4..5618ec00 100644
--- a/data/web/debug.php
+++ b/data/web/debug.php
@@ -47,21 +47,6 @@ foreach ($containers as $container => $container_info) {
// get mailcow data
$hostname = getenv('MAILCOW_HOSTNAME');
$timezone = getenv('TZ');
-// get public ips
-$curl = curl_init();
-curl_setopt($curl, CURLOPT_URL, 'http://ipv4.mailcow.email');
-curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-curl_setopt($curl, CURLOPT_POST, 0);
-$ipv4 = curl_exec($curl);
-curl_setopt($curl, CURLOPT_URL, 'http://ipv6.mailcow.email');
-curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-curl_setopt($curl, CURLOPT_POST, 0);
-$ipv6 = curl_exec($curl);
-$ips = array(
- "ipv4" => $ipv4,
- "ipv6" => $ipv6
-);
-curl_close($curl);
$template = 'debug.twig';
$template_data = [
@@ -69,7 +54,7 @@ $template_data = [
'vmail_df' => $vmail_df,
'hostname' => $hostname,
'timezone' => $timezone,
- 'ips' => $ips,
+ 'license_guid' => license('guid'),
'solr_status' => $solr_status,
'solr_uptime' => round($solr_status['status']['dovecot-fts']['uptime'] / 1000 / 60 / 60),
'clamd_status' => $clamd_status,
diff --git a/data/web/js/build/012-api.js b/data/web/js/build/012-api.js
index b9887940..c657c134 100644
--- a/data/web/js/build/012-api.js
+++ b/data/web/js/build/012-api.js
@@ -380,4 +380,18 @@ $(document).ready(function() {
$('#ConfirmDeleteModal').modal('hide');
});
});
+
+ // toggle jquery datatables child rows
+ $('button[data-datatables-expand], a[data-datatables-expand]').on('click', function (e) {
+ e.preventDefault();
+ var tableId = e.target.getAttribute("data-datatables-expand");
+ var table = $("#" + tableId).DataTable();
+ table.rows(':not(.parent)').nodes().to$().find('td:first-child').trigger('click');
+ });
+ $('button[data-datatables-collapse], a[data-datatables-collapse]').on('click', function (e) {
+ e.preventDefault();
+ var tableId = e.target.getAttribute("data-datatables-collapse");
+ var table = $("#" + tableId).DataTable();
+ table.rows('.parent').nodes().to$().find('td:first-child').trigger('click');
+ });
});
diff --git a/data/web/js/site/debug.js b/data/web/js/site/debug.js
index deb0215e..dcc04210 100644
--- a/data/web/js/site/debug.js
+++ b/data/web/js/site/debug.js
@@ -47,7 +47,9 @@ $(document).ready(function() {
if (mailcow_info.branch === "master"){
check_update(mailcow_info.version_tag, mailcow_info.project_url);
}
- update_container_stats()
+ // get public ips
+ get_public_ips();
+ update_container_stats();
});
jQuery(function($){
if (localStorage.getItem("current_page") === null) {
@@ -90,6 +92,7 @@ jQuery(function($){
title: lang.time,
data: 'time',
defaultContent: '',
+ responsivePriority: 1,
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"});
@@ -98,22 +101,27 @@ jQuery(function($){
{
title: 'User-Agent',
data: 'ua',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-md',
+ responsivePriority: 5
},
{
title: 'Username',
data: 'user',
- defaultContent: ''
+ defaultContent: '',
+ responsivePriority: 4
},
{
title: 'IP',
data: 'ip',
- defaultContent: ''
+ defaultContent: '',
+ responsivePriority: 2
},
{
title: 'Service',
data: 'service',
- defaultContent: ''
+ defaultContent: '',
+ responsivePriority: 3
}
]
});
@@ -155,7 +163,8 @@ jQuery(function($){
{
title: lang.message,
data: 'message',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-md text-break'
}
]
});
@@ -240,7 +249,7 @@ jQuery(function($){
title: 'URI',
data: 'uri',
defaultContent: '',
- className: 'text-break min-tablet none'
+ className: 'dtr-col-md dtr-break-all'
},
{
title: 'Method',
@@ -255,7 +264,8 @@ jQuery(function($){
{
title: 'Data',
data: 'data',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-md dtr-break-all'
}
]
});
@@ -394,28 +404,32 @@ jQuery(function($){
{
title: 'User',
data: 'user',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-sm'
},
{
title: 'Role',
data: 'role',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-sm'
},
{
title: 'IP',
data: 'remote',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-md dtr-break-all'
},
{
title: lang.message,
data: 'msg',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-md dtr-break-all'
},
{
title: 'Call',
data: 'call',
defaultContent: '',
- className: 'none text-break'
+ className: 'none dtr-col-md dtr-break-all'
}
]
});
@@ -453,7 +467,8 @@ jQuery(function($){
{
title: 'IP',
data: 'real_rip',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-md text-break'
},
{
title: lang.login_time,
@@ -499,7 +514,8 @@ jQuery(function($){
{
title: lang.message,
data: 'message',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-md dtr-break-all'
}
]
});
@@ -541,7 +557,8 @@ jQuery(function($){
{
title: lang.message,
data: 'message',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-md text-break'
}
]
});
@@ -583,7 +600,8 @@ jQuery(function($){
{
title: lang.message,
data: 'message',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-md text-break'
}
]
});
@@ -625,7 +643,8 @@ jQuery(function($){
{
title: lang.message,
data: 'message',
- defaultContent: ''
+ defaultContent: '',
+ className: 'dtr-col-md text-break'
}
]
});
@@ -757,7 +776,8 @@ jQuery(function($){
{
title: 'Symbols',
data: 'symbols',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none dtr-col-md'
},
{
title: 'Msg size',
@@ -1200,6 +1220,20 @@ function update_container_stats(timeout=5){
// run again in n seconds
setTimeout(update_container_stats, timeout * 1000);
}
+// get public ips
+function get_public_ips(){
+ window.fetch("/api/v1/get/status/host/ip", {method:'GET',cache:'no-cache'}).then(function(response) {
+ return response.json();
+ }).then(function(data) {
+ console.log(data);
+
+ if (data){
+ // display host ips
+ $("#host_ipv4").text(data.ipv4);
+ $("#host_ipv6").text(data.ipv6);
+ }
+ });
+}
// format hosts uptime seconds to readable string
function formatUptime(seconds){
seconds = Number(seconds);
diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js
index c74494aa..77da5029 100644
--- a/data/web/js/site/mailbox.js
+++ b/data/web/js/site/mailbox.js
@@ -142,7 +142,9 @@ jQuery(function($){
$(".refresh_table").on('click', function(e) {
e.preventDefault();
var table_name = $(this).data('table');
- $('#' + table_name).DataTable().ajax.reload();
+
+ if ($.fn.DataTable.isDataTable('#' + table_name))
+ $('#' + table_name).DataTable().ajax.reload();
});
function draw_domain_table() {
// just recalc width if instance already exists
@@ -177,9 +179,9 @@ jQuery(function($){
item.chkbox = '';
item.action = '';
+ item.action += ' ' + lang.edit + '' +
+ ' ' + lang.remove + '' +
+ ' DNS';
}
else {
item.action += ' ' + lang.edit + '' +
@@ -288,18 +290,20 @@ jQuery(function($){
{
title: lang.domain_admins,
data: 'domain_admins',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: 'Tags',
data: 'tags',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: lang.active,
data: 'active',
defaultContent: '',
- responsivePriority: 5,
+ responsivePriority: 6,
render: function (data, type) {
return 1==data?'':(0==data?'':2==data&&'—');
}
@@ -307,7 +311,7 @@ jQuery(function($){
{
title: lang.action,
data: 'action',
- className: 'text-md-end dt-sm-head-hidden dt-body-right',
+ className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md',
responsivePriority: 5,
defaultContent: ''
},
@@ -378,11 +382,11 @@ jQuery(function($){
if (acl_data.login_as === 1) {
item.action = '';
}
@@ -431,13 +435,13 @@ jQuery(function($){
{
title: lang.username,
data: 'username',
- responsivePriority: 1,
+ responsivePriority: 3,
defaultContent: ''
},
{
title: lang.domain_quota,
data: 'quota',
- responsivePriority: 2,
+ responsivePriority: 8,
defaultContent: '',
render: function (data, type) {
data = data.split("/");
@@ -449,7 +453,7 @@ jQuery(function($){
title: lang.last_mail_login,
data: 'last_mail_login',
defaultContent: '',
- responsivePriority: 3,
+ responsivePriority: 7,
render: function (data, type) {
res = data.split("/");
return 'IMAP @ ' + unix_time_format(Number(res[0])) + '
' +
@@ -466,57 +470,68 @@ jQuery(function($){
title: lang.in_use,
data: 'in_use',
defaultContent: '',
- responsivePriority: 4
+ responsivePriority: 9,
+ className: 'dt-data-w100'
},
{
title: lang.fname,
data: 'name',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: lang.domain,
data: 'domain',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: lang.tls_enforce_in,
data: 'tls_enforce_in',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: lang.tls_enforce_out,
data: 'tls_enforce_out',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: 'SMTP',
data: 'smtp_access',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: 'IMAP',
data: 'imap_access',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: 'POP3',
data: 'pop3_access',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: 'SIEVE',
data: 'sieve_access',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: lang.quarantine_notification,
data: 'quarantine_notification',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: lang.quarantine_category,
data: 'quarantine_category',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: lang.msg_num,
@@ -527,13 +542,14 @@ jQuery(function($){
{
title: 'Tags',
data: 'tags',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: lang.active,
data: 'active',
defaultContent: '',
- responsivePriority: 6,
+ responsivePriority: 4,
render: function (data, type) {
return 1==data?'':(0==data?'':2==data&&'—');
}
@@ -541,8 +557,8 @@ jQuery(function($){
{
title: lang.action,
data: 'action',
- className: 'text-md-end dt-sm-head-hidden dt-body-right',
- responsivePriority: 5,
+ className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md',
+ responsivePriority: 6,
defaultContent: ''
},
]
@@ -572,8 +588,8 @@ jQuery(function($){
item.multiple_bookings = '' + lang.booking_custom_short + ' (' + item.multiple_bookings + ')';
}
item.action = '';
item.chkbox = '';
item.name = escapeHtml(item.name);
@@ -639,9 +655,9 @@ jQuery(function($){
{
title: lang.action,
data: 'action',
- className: 'text-md-end dt-sm-head-hidden dt-body-right',
responsivePriority: 5,
- defaultContent: ''
+ defaultContent: '',
+ className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md dt-body-right'
},
]
});
@@ -691,8 +707,8 @@ jQuery(function($){
dataSrc: function(json){
$.each(json, function (i, item) {
item.action = '';
item.chkbox = '';
item.local_dest = escapeHtml(item.local_dest);
@@ -763,7 +779,7 @@ jQuery(function($){
{
title: lang.action,
data: 'action',
- className: 'text-md-end dt-sm-head-hidden dt-body-right',
+ className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md dt-body-right',
responsivePriority: 5,
defaultContent: ''
},
@@ -791,8 +807,8 @@ jQuery(function($){
item.recipient_map_old = escapeHtml(item.recipient_map_old);
item.recipient_map_new = escapeHtml(item.recipient_map_new);
item.action = '';
item.chkbox = '';
});
@@ -832,7 +848,8 @@ jQuery(function($){
{
title: lang.recipient_map_new,
data: 'recipient_map_new',
- defaultContent: ''
+ defaultContent: '',
+ responsivePriority: 4
},
{
title: lang.active,
@@ -845,8 +862,8 @@ jQuery(function($){
{
title: lang.action,
data: 'action',
- className: 'text-md-end dt-sm-head-hidden dt-body-right',
- responsivePriority: 4,
+ className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md dt-body-right',
+ responsivePriority: 5,
defaultContent: ''
},
]
@@ -867,6 +884,7 @@ jQuery(function($){
type: "GET",
url: "/api/v1/get/tls-policy-map/all",
dataSrc: function(json){
+ console.log(json);
if (role !== "admin") return null;
$.each(json, function (i, item) {
@@ -878,8 +896,8 @@ jQuery(function($){
item.parameters = '' + escapeHtml(item.parameters) + '';
}
item.action = '';
item.chkbox = '';
});
@@ -914,7 +932,8 @@ jQuery(function($){
{
title: lang.tls_map_dest,
data: 'dest',
- defaultContent: ''
+ defaultContent: '',
+ responsivePriority: 4
},
{
title: lang.tls_map_policy,
@@ -926,12 +945,6 @@ jQuery(function($){
data: 'parameters',
defaultContent: ''
},
- {
- title: lang.domain,
- data: 'domain',
- responsivePriority: 4,
- defaultContent: ''
- },
{
title: lang.active,
data: 'active',
@@ -943,7 +956,7 @@ jQuery(function($){
{
title: lang.action,
data: 'action',
- className: 'text-md-end dt-sm-head-hidden dt-body-right',
+ className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md dt-body-right',
responsivePriority: 5,
defaultContent: ''
},
@@ -967,8 +980,8 @@ jQuery(function($){
dataSrc: function(json){
$.each(json, function (i, item) {
item.action = '';
item.chkbox = '';
item.goto = escapeHtml(item.goto.replace(/,/g, " "));
@@ -1083,7 +1096,7 @@ jQuery(function($){
{
title: lang.action,
data: 'action',
- className: 'text-md-end dt-sm-head-hidden dt-body-right',
+ className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md dt-body-right',
responsivePriority: 5,
defaultContent: ''
},
@@ -1107,9 +1120,9 @@ jQuery(function($){
dataSrc: function(json){
$.each(json, function (i, item) {
item.action = '' +
+ ' ' + lang.edit + '' +
+ ' ' + lang.remove + '' +
+ ' DNS' +
'';
item.chkbox = '';
if(item.parent_is_backupmx == '1') {
@@ -1163,7 +1176,7 @@ jQuery(function($){
{
title: lang.action,
data: 'action',
- className: 'text-md-end dt-sm-head-hidden dt-body-right',
+ className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md dt-body-right',
responsivePriority: 5,
defaultContent: ''
},
@@ -1195,8 +1208,8 @@ jQuery(function($){
}
item.server_w_port = escapeHtml(item.user1) + '@' + item.host1 + ':' + item.port1;
item.action = '';
item.chkbox = '';
if (item.is_running == 1) {
@@ -1290,17 +1303,19 @@ jQuery(function($){
{
title: lang.excludes,
data: 'exclude',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: lang.mins_interval,
data: 'mins_interval',
- defaultContent: ''
+ defaultContent: '',
+ className: 'none'
},
{
title: lang.action,
data: 'action',
- className: 'text-md-end dt-sm-head-hidden dt-body-right',
+ className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md dt-body-right',
responsivePriority: 5,
defaultContent: ''
},
@@ -1329,11 +1344,11 @@ jQuery(function($){
} else {
item.active = '' + lang.inactive + '';
}
- item.script_data = '' + escapeHtml(item.script_data) + '
'
+ item.script_data = '' + escapeHtml(item.script_data) + '
'
item.filter_type = '' + item.filter_type.charAt(0).toUpperCase() + item.filter_type.slice(1).toLowerCase() + '
'
item.action = '';
item.chkbox = ''
});
@@ -1396,7 +1411,7 @@ jQuery(function($){
{
title: lang.action,
data: 'action',
- className: 'text-md-end dt-sm-head-hidden dt-body-right',
+ className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md dt-body-right',
responsivePriority: 5,
defaultContent: ''
},
diff --git a/data/web/js/site/user.js b/data/web/js/site/user.js
index 2d09bcea..36bcfa63 100644
--- a/data/web/js/site/user.js
+++ b/data/web/js/site/user.js
@@ -276,14 +276,16 @@ jQuery(function($){
data: null,
searchable: false,
orderable: false,
- defaultContent: ''
+ defaultContent: '',
+ responsivePriority: 1
},
{
title: '',
data: 'chkbox',
searchable: false,
orderable: false,
- defaultContent: ''
+ defaultContent: '',
+ responsivePriority: 2
},
{
title: 'ID',
@@ -299,7 +301,8 @@ jQuery(function($){
{
title: lang.username,
data: 'user1',
- defaultContent: ''
+ defaultContent: '',
+ responsivePriority: 3
},
{
title: lang.last_run,
@@ -328,7 +331,7 @@ jQuery(function($){
title: lang.status,
data: 'is_running',
defaultContent: '',
- responsivePriority: 4
+ responsivePriority: 5
},
{
title: lang.encryption,
diff --git a/data/web/json_api.php b/data/web/json_api.php
index 15bc8b5e..1953d17c 100644
--- a/data/web/json_api.php
+++ b/data/web/json_api.php
@@ -1506,8 +1506,28 @@ if (isset($_GET['query'])) {
));
break;
case "host":
- $stats = docker("host_stats");
- echo json_encode($stats);
+ if (!$extra){
+ $stats = docker("host_stats");
+ echo json_encode($stats);
+ }
+ else if ($extra == "ip") {
+ // get public ips
+ $curl = curl_init();
+ curl_setopt($curl, CURLOPT_URL, 'http://ipv4.mailcow.email');
+ curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($curl, CURLOPT_POST, 0);
+ $ipv4 = curl_exec($curl);
+ curl_setopt($curl, CURLOPT_URL, 'http://ipv6.mailcow.email');
+ curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($curl, CURLOPT_POST, 0);
+ $ipv6 = curl_exec($curl);
+ $ips = array(
+ "ipv4" => $ipv4,
+ "ipv6" => $ipv6
+ );
+ curl_close($curl);
+ echo json_encode($ips);
+ }
break;
case "version":
echo json_encode(array(
diff --git a/data/web/lang/lang.de.json b/data/web/lang/lang.de.json
index 98c2cc3b..3086c1c7 100644
--- a/data/web/lang/lang.de.json
+++ b/data/web/lang/lang.de.json
@@ -466,8 +466,10 @@
"yotp_verification_failed": "Yubico OTP-Verifizierung fehlgeschlagen: %s"
},
"datatables": {
+ "collapse_all": "Alle Einklappen",
"decimal": "",
"emptyTable": "Keine Daten in der Tabelle vorhanden",
+ "expand_all": "Alle Ausklappen",
"info": "_START_ bis _END_ von _TOTAL_ Einträgen",
"infoEmpty": "0 bis 0 von 0 Einträgen",
"infoFiltered": "(gefiltert von _MAX_ Einträgen)",
diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json
index ea7ed96d..5bc9ca39 100644
--- a/data/web/lang/lang.en.json
+++ b/data/web/lang/lang.en.json
@@ -466,8 +466,10 @@
"yotp_verification_failed": "Yubico OTP verification failed: %s"
},
"datatables": {
+ "collapse_all": "Collapse All",
"decimal": "",
"emptyTable": "No data available in table",
+ "expand_all": "Expand All",
"info": "Showing _START_ to _END_ of _TOTAL_ entries",
"infoEmpty": "Showing 0 to 0 of 0 entries",
"infoFiltered": "(filtered from _MAX_ total entries)",
diff --git a/data/web/templates/admin/tab-config-admins.twig b/data/web/templates/admin/tab-config-admins.twig
index 1d2d05f2..0221a8e7 100644
--- a/data/web/templates/admin/tab-config-admins.twig
+++ b/data/web/templates/admin/tab-config-admins.twig
@@ -1,6 +1,6 @@