diff --git a/.gitignore b/.gitignore
index 18df41c28..912337888 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,5 +25,6 @@ data/conf/rspamd/custom/*
data/conf/portainer/
data/gitea/
data/gogs/
+data/conf/sogo/plist_ldap
.github/
docker-compose.override.yml
diff --git a/data/web/admin.php b/data/web/admin.php
index 6c2e38b6e..d077bd7e4 100644
--- a/data/web/admin.php
+++ b/data/web/admin.php
@@ -11,7 +11,7 @@ $tfa_data = get_tfa();
diff --git a/data/web/inc/functions.quarantine.inc.php b/data/web/inc/functions.quarantine.inc.php
index 14f38b8f4..e854bca3d 100644
--- a/data/web/inc/functions.quarantine.inc.php
+++ b/data/web/inc/functions.quarantine.inc.php
@@ -349,16 +349,10 @@ function quarantine($_action, $_data = null) {
return $q_meta;
break;
case 'settings':
- if ($_SESSION['mailcow_cc_role'] != "admin") {
- $_SESSION['return'][] = array(
- 'type' => 'danger',
- 'log' => array(__FUNCTION__, $_action, $_data_log),
- 'msg' => 'access_denied'
- );
- return false;
- }
try {
- $settings['exclude_domains'] = json_decode($redis->Get('Q_EXCLUDE_DOMAINS'), true);
+ if ($_SESSION['mailcow_cc_role'] == "admin") {
+ $settings['exclude_domains'] = json_decode($redis->Get('Q_EXCLUDE_DOMAINS'), true);
+ }
$settings['max_size'] = $redis->Get('Q_MAX_SIZE');
$settings['retention_size'] = $redis->Get('Q_RETENTION_SIZE');
}
diff --git a/data/web/inc/header.inc.php b/data/web/inc/header.inc.php
index 15dc4f022..3353c55c1 100644
--- a/data/web/inc/header.inc.php
+++ b/data/web/inc/header.inc.php
@@ -78,6 +78,7 @@
?>
>= $lang['header']['administration']; ?>
>= $lang['header']['debug']; ?>
+
@@ -512,6 +515,7 @@ $lang['admin']['dkim_from_title'] = 'Quellobjekt für Duplizierung';
$lang['admin']['dkim_to_title'] = 'Ziel-Objekt(e) werden überschrieben';
$lang['admin']['dkim_domains_wo_keys'] = "Domains mit fehlenden Keys auswählen";
$lang['admin']['add'] = 'Hinzufügen';
+$lang['admin']['queue_manager'] = 'Queue Manager';
$lang['add']['add_domain_restart'] = 'Domain hinzufügen und SOGo neustarten';
$lang['add']['add_domain_only'] = 'Nur Domain hinzufügen';
$lang['admin']['configuration'] = 'Konfiguration';
@@ -656,9 +660,6 @@ $lang['warning']['fuzzy_learn_error'] = "Fuzzy Lernfehler: %s";
$lang['danger']['spam_learn_error'] = "Spam Lernfehler: %s";
$lang['success']['qlearn_spam'] = "Nachricht ID %s wurde als Spam gelernt und gelöscht";
-$lang['header']['quarantine'] = "Quarantäne";
-$lang['header']['debug'] = "Debugging";
-
$lang['debug']['log_info'] = '
mailcow in-memory Logs werden in Redis Listen gespeichert, die maximale Anzahl der Einträge pro Anwendung richtet sich nach LOG_LINES (%d).
In-memory Logs sind vergänglich und nicht zur ständigen Aufbewahrung bestimmt. Alle Anwendungen, die in-memory protokollieren, schreiben ebenso in den Docker Daemon.
Das in-memory Protokoll versteht sich als schnelle Übersicht zum Debugging eines Containers, für komplexere Protokolle sollte der Docker Daemon konsultiert werden.
diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index c72e54a29..fed53ea69 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -252,9 +252,12 @@ $lang['start']['imap_smtp_server_auth_info'] = 'Please use your full email addre
Your login data will be encrypted by the server-side mandatory encryption.';
$lang['start']['help'] = 'Show/Hide help panel';
$lang['header']['mailcow_settings'] = 'Configuration';
-$lang['header']['administration'] = 'Administration';
-$lang['header']['mailboxes'] = 'Mailboxes';
-$lang['header']['user_settings'] = 'User settings';
+$lang['header']['administration'] = 'Configuration & Details';
+$lang['header']['mailboxes'] = 'Mail Setup';
+$lang['header']['user_settings'] = 'User Settings';
+$lang['header']['quarantine'] = "Quarantine";
+$lang['header']['debug'] = "System Information";
+$lang['quarantine']['disabled_by_config'] = "The current system configuration disables the quarantine functionality.";
$lang['mailbox']['tls_policy_maps'] = 'TLS policy maps';
$lang['mailbox']['tls_policy_maps_long'] = 'Outgoing TLS policy map overrides';
$lang['mailbox']['tls_policy_maps_info'] = 'This policy map overrides outgoing TLS transport rules independently of a users TLS policy settings.
@@ -494,6 +497,7 @@ $lang['admin']['rspamd-com_settings'] = '
mailcow in-memory logs are collected in Redis lists and trimmed to LOG_LINES (%d) every minute to reduce hammering.
In-memory logs are not meant to be persistent. All applications that log in-memory, also log to the Docker daemon and therefore to the default logging driver.
The in-memory log type should be used for debugging minor issues with containers.
diff --git a/data/web/quarantine.php b/data/web/quarantine.php
index 1ddcc6696..f21f33041 100644
--- a/data/web/quarantine.php
+++ b/data/web/quarantine.php
@@ -14,6 +14,15 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
=$lang['quarantine']['quarantine'];?>