paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Show hint when SOGo admin login is enabed, fix sieve preset in API

master
andryyy 2019-12-18 06:48:46 +01:00
parent 7017360b8c
commit 9b6d915160
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/web/json_api.php
View File

@ -1105,8 +1105,8 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
switch ($object) { switch ($object) {
case "rspamd": case "rspamd":
process_get_return(presets('get', 'rspamd')); process_get_return(presets('get', 'rspamd'));
case "sieve":
break; break;
case "sieve":
process_get_return(presets('get', 'sieve')); process_get_return(presets('get', 'sieve'));
break; break;
} }

1
data/web/lang/lang.de.json
View File

@ -556,6 +556,7 @@
}, },
"mailbox": { "mailbox": {
"tls_policy_maps": "TLS-Richtlinien", "tls_policy_maps": "TLS-Richtlinien",
"sogo_allow_admin_hint": "Administrative SOGo Logins sind nur für Mailboxen verfügbar, die bereits ein SOGo Profil besitzen. Ein Benutzer muss zumindest einmal in SOGo eingeloggt gewesen sein, um ein Profil zu besitzen.",
"tls_policy_maps_long": "Ausgehende TLS-Richtlinien", "tls_policy_maps_long": "Ausgehende TLS-Richtlinien",
"tls_policy_maps_info": "Nachstehende Richtlinien erzwingen TLS-Transportregeln unabhängig von TLS-Richtlinieneinstellungen eines Benutzers.<br>\r\n Für weitere Informationen zur Syntax sollte <a href=\"http://www.postfix.org/postconf.5.html#smtp_tls_policy_maps\" target=\"_blank\">die \"smtp_tls_policy_maps\" Dokumentation</a> konsultiert werden.", "tls_policy_maps_info": "Nachstehende Richtlinien erzwingen TLS-Transportregeln unabhängig von TLS-Richtlinieneinstellungen eines Benutzers.<br>\r\n Für weitere Informationen zur Syntax sollte <a href=\"http://www.postfix.org/postconf.5.html#smtp_tls_policy_maps\" target=\"_blank\">die \"smtp_tls_policy_maps\" Dokumentation</a> konsultiert werden.",
"tls_enforce_in": "TLS eingehend erzwingen", "tls_enforce_in": "TLS eingehend erzwingen",

1
data/web/lang/lang.en.json
View File

@ -555,6 +555,7 @@
}, },
"mailbox": { "mailbox": {
"tls_policy_maps": "TLS policy maps", "tls_policy_maps": "TLS policy maps",
"sogo_allow_admin_hint": "Administrative SOGo logins are only available for mailboxes with an existing SOGo profile. A user must have been logged in to SOGo at least once.",
"tls_policy_maps_long": "Outgoing TLS policy map overrides", "tls_policy_maps_long": "Outgoing TLS policy map overrides",
"tls_policy_maps_info": "This policy map overrides outgoing TLS transport rules independently of a users TLS policy settings.<br>\r\n Please check <a href=\"http://www.postfix.org/postconf.5.html#smtp_tls_policy_maps\" target=\"_blank\">the \"smtp_tls_policy_maps\" docs</a> for further information.", "tls_policy_maps_info": "This policy map overrides outgoing TLS transport rules independently of a users TLS policy settings.<br>\r\n Please check <a href=\"http://www.postfix.org/postconf.5.html#smtp_tls_policy_maps\" target=\"_blank\">the \"smtp_tls_policy_maps\" docs</a> for further information.",
"tls_enforce_in": "Enforce TLS incoming", "tls_enforce_in": "Enforce TLS incoming",

9
data/web/mailbox.php
View File

@ -67,6 +67,15 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
<button class="btn btn-xs btn-default refresh_table" data-draw="draw_mailbox_table" data-table="mailbox_table"><?=$lang['admin']['refresh'];?></button> <button class="btn btn-xs btn-default refresh_table" data-draw="draw_mailbox_table" data-table="mailbox_table"><?=$lang['admin']['refresh'];?></button>
</div> </div>
</div> </div>
<?php
if (preg_match("/^([yY][eE][sS]|[yY])+$/", $_ENV["ALLOW_ADMIN_EMAIL_LOGIN"])):
?>
<div class="panel-body help-block">
<?=$lang['mailbox']['sogo_allow_admin_hint'];?>
</div>
<?php
endif;
?>
<div class="table-responsive"> <div class="table-responsive">
<table id="mailbox_table" class="table table-striped"></table> <table id="mailbox_table" class="table table-striped"></table>
</div> </div>