From 57aa379a2a0e8fc093c1d9826ac4563706bb5d9d Mon Sep 17 00:00:00 2001 From: andryyy Date: Fri, 30 Nov 2018 19:04:18 +0100 Subject: [PATCH] [Compose] Updated PHP-FPM image [Web] Rename configuration menu [Web] Show warning when configuration disabled quarantine --- .gitignore | 1 + data/web/admin.php | 2 +- data/web/inc/functions.quarantine.inc.php | 12 +++--------- data/web/inc/header.inc.php | 1 + data/web/lang/lang.de.php | 11 ++++++----- data/web/lang/lang.en.php | 13 +++++++------ data/web/quarantine.php | 9 +++++++++ docker-compose.yml | 2 +- 8 files changed, 29 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 18df41c2..91233788 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 6c2e38b6..d077bd7e 100644 --- a/data/web/admin.php +++ b/data/web/admin.php @@ -11,7 +11,7 @@ $tfa_data = get_tfa();
    • -
  • Queue manager
    • +
    • diff --git a/data/web/inc/functions.quarantine.inc.php b/data/web/inc/functions.quarantine.inc.php index 14f38b8f..e854bca3 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 15dc4f02..3353c55c 100644 --- a/data/web/inc/header.inc.php +++ b/data/web/inc/header.inc.php @@ -78,6 +78,7 @@ ?> > > +
  • @@ -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 c72e54a2..fed53ea6 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'] = '

    +

    + + + +

    diff --git a/docker-compose.yml b/docker-compose.yml index 616aa1b2..8942fe6e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: - rspamd php-fpm-mailcow: - image: mailcow/phpfpm:1.23 + image: mailcow/phpfpm:1.24 build: ./data/Dockerfiles/phpfpm command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" depends_on: