Ver código fonte

[Web] Show quarantine settings in /quarantine

andryyy 4 anos atrás
pai
commit
a95cad7133
3 arquivos alterados com 10 adições e 3 exclusões
  1. 1 0
      data/web/lang/lang.de.json
  2. 1 0
      data/web/lang/lang.en.json
  3. 8 3
      data/web/quarantine.php

+ 1 - 0
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",

+ 1 - 0
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",

+ 8 - 3
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">