From c54fa76bebae04ff0609b15f6f8a169bc533febf Mon Sep 17 00:00:00 2001 From: andryyy Date: Fri, 18 Sep 2020 15:53:01 +0200 Subject: [PATCH] [Web] Add quick toggle for imap/pop3/smtp access; small rework of buttons on /mailbox; Minor fixes and changes --- data/web/css/site/debug.css | 2 +- data/web/debug.php | 2 +- data/web/js/build/014-mailcow.js | 7 ++-- data/web/js/site/mailbox.js | 6 +++ data/web/lang/lang.de.json | 1 + data/web/lang/lang.en.json | 1 + data/web/mailbox.php | 65 +++++++++++++++++++++++++++++++- 7 files changed, 78 insertions(+), 6 deletions(-) diff --git a/data/web/css/site/debug.css b/data/web/css/site/debug.css index a7ad5fc3..2209462a 100644 --- a/data/web/css/site/debug.css +++ b/data/web/css/site/debug.css @@ -41,7 +41,7 @@ table.footable>tbody>tr.footable-empty>td { tbody { font-size:14px; } -.container-indicator { +.status-indicator { width: 15px; height: 15px; } diff --git a/data/web/debug.php b/data/web/debug.php index 853cef95..6390be75 100644 --- a/data/web/debug.php +++ b/data/web/debug.php @@ -131,7 +131,7 @@ $clamd_status = (preg_match("/^([yY][eE][sS]|[yY])+$/", $_ENV["SKIP_CLAMD"])) ? ?> ( ), -   +   (' + lang_acl.prohibited + ')'); - $(this).selectpicker('refresh'); + $(this).selectpicker('destroy'); + $(this).replaceWith(function() { + return ''; + }); } if ($(this).hasClass('btn-group')) { $(this).find('a').each(function(){ diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index ff438be9..77d0b8bb 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -356,6 +356,9 @@ jQuery(function($){ {"name":"spam_aliases","filterable": false,"title":lang.spam_aliases,"breakpoints":"all"}, {"name":"tls_enforce_in","filterable": false,"title":lang.tls_enforce_in,"breakpoints":"all"}, {"name":"tls_enforce_out","filterable": false,"title":lang.tls_enforce_out,"breakpoints":"all"}, + {"name":"smtp_access","filterable": false,"title":"SMTP","breakpoints":"all"}, + {"name":"imap_access","filterable": false,"title":"IMAP","breakpoints":"all"}, + {"name":"pop3_access","filterable": false,"title":"POP3","breakpoints":"all"}, {"name":"last_mail_login","breakpoints":"xs sm","title":lang.last_mail_login,"style":{"width":"170px"}, "sortValue": function(value){ res = value.split("/"); @@ -403,6 +406,9 @@ jQuery(function($){ item.chkbox = ''; item.tls_enforce_in = ''; item.tls_enforce_out = ''; + item.pop3_access = ''; + item.imap_access = ''; + item.smtp_access = ''; if (item.attributes.quarantine_notification === 'never') { item.quarantine_notification = lang.never; } else if (item.attributes.quarantine_notification === 'hourly') { diff --git a/data/web/lang/lang.de.json b/data/web/lang/lang.de.json index 8bc0b8a6..31ba80c1 100644 --- a/data/web/lang/lang.de.json +++ b/data/web/lang/lang.de.json @@ -617,6 +617,7 @@ "alias_domain_alias_hint": "Alias-Adressen werden nicht automatisch auch auf Domain-Alias Adressen angewendet. Eine Alias-Adresse mein-alias@domain bildet demnach nicht die Adresse mein-alias@alias-domain ab.
E-Mail-Weiterleitungen an externe Postfächer sollten über Sieve (SOGo Weiterleitung oder im Reiter \"Filter\") angelegt werden.", "alias_domain_backupmx": "Alias-Domain für Relay-Domain inaktiv", "aliases": "Aliasse", + "allowed_protocols": "Allowed protocols", "backup_mx": "Relay Domain", "bcc": "BCC", "bcc_destination": "BCC-Ziel", diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json index 94c141c4..50c10965 100644 --- a/data/web/lang/lang.en.json +++ b/data/web/lang/lang.en.json @@ -616,6 +616,7 @@ "alias_domain_alias_hint": "Aliases are not applied on domain aliases automatically. An alias address my-alias@domain does not cover the address my-alias@alias-domain (where \"alias-domain\" is an imaginary alias domain for \"domain\").
Please use a sieve filter to redirect mail to an external mailbox (see tab \"Filters\" or use SOGo -> Forwarder).", "alias_domain_backupmx": "Alias domain inactive for relay domain", "aliases": "Aliases", + "allowed_protocols": "Allowed protocols", "backup_mx": "Relay domain", "bcc": "BCC", "bcc_destination": "BCC destination", diff --git a/data/web/mailbox.php b/data/web/mailbox.php index 18125049..bb42c585 100644 --- a/data/web/mailbox.php +++ b/data/web/mailbox.php @@ -102,7 +102,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
-
+ +