public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

[Web] Show quarantine settings in /quarantine

a95cad71

andryyy <[email protected]> 5 years ago

data/web/lang/lang.de.json |  1 +
 data/web/lang/lang.en.json |  1 +
 data/web/quarantine.php    | 11 ++++++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

Diff

diff --git a/data/web/lang/lang.de.json b/data/web/lang/lang.de.json
index e6e1307f..86158dc8 100644
--- a/data/web/lang/lang.de.json
+++ b/data/web/lang/lang.de.json
@@ -798,6 +798,7 @@
         "danger": "Gefahr",
         "deliver_inbox": "In Posteingang zustellen",
         "disabled_by_config": "Die derzeitige Konfiguration deaktiviert die Funktion des Quarantäne-Systems. Zur Funktion muss eine Anzahl an Rückhaltungen pro Mailbox sowie ein Limit für die maximale Größe pro Element definiert werden.",
+        "settings_info": "Maximale Anzahl der zurückgehaltenen E-Mails: %s<br>Maximale Größe einer zu speichernden E-Mail: %s MiB",
         "download_eml": "Herunterladen (.eml)",
         "empty": "Keine Einträge",
         "high_danger": "Hoch",
diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json
index cc4d12c6..822e82de 100644
--- a/data/web/lang/lang.en.json
+++ b/data/web/lang/lang.en.json
@@ -799,6 +799,7 @@
         "danger": "Danger",
         "deliver_inbox": "Deliver to inbox",
         "disabled_by_config": "The current system configuration disables the quarantine functionality. Please set \"retentions per mailbox\" and a \"maximum size\" for quarantine elements.",
+        "settings_info": "Maximum amount of elements to be quarantined: %s<br>Maximum email size: %s MiB",
         "download_eml": "Download (.eml)",
         "empty": "No results",
         "high_danger": "High",
diff --git a/data/web/quarantine.php b/data/web/quarantine.php
index d5c71a0f..ca2d1b18 100644
--- a/data/web/quarantine.php
+++ b/data/web/quarantine.php
@@ -4,7 +4,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
 if (isset($_SESSION['mailcow_cc_role'])) {
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/header.inc.php';
 $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
-
+$quarantine_settings = quarantine('settings');
 ?>
 <div class="container">
 	<div class="row">
@@ -30,11 +30,16 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
         <p style="margin:10px" class="help-block"><?=$lang['quarantine']['qinfo'];?></p>
         <p style="margin:10px">
         <?php
-        if (empty(quarantine('settings')['retention_size']) || empty(quarantine('settings')['max_size'])):
+        if (empty($quarantine_settings['retention_size'] || $quarantine_settings['max_size'])) {
         ?>
         <div class="panel-body"><div class="alert alert-info"><?=$lang['quarantine']['disabled_by_config'];?></div></div>
         <?php
-        endif;
+        }
+        else {
+        ?>
+        <p style="margin:10px" class="help-block"><?=sprintf($lang['quarantine']['settings_info'], $quarantine_settings['retention_size'], $quarantine_settings['max_size']);?></p>
+        <?php
+        }
         ?>
         </p>
         <div class="table-responsive">