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

[Dovecot] Add sieve rule to move DeltaChat (https://delta.chat) messages to folder DeltaChat [Web] Add information about extended DNS config

3dece1a0

andryyy <[email protected]> 6 years ago

data/conf/dovecot/global_sieve_before | 12 ++++++++++++
 data/web/lang/lang.de.json            |  1 +
 data/web/lang/lang.en.json            |  1 +
 data/web/modals/mailbox.php           |  1 +
 4 files changed, 15 insertions(+)

Diff

diff --git a/data/conf/dovecot/global_sieve_before b/data/conf/dovecot/global_sieve_before
index e6a523d4..a71419d5 100644
--- a/data/conf/dovecot/global_sieve_before
+++ b/data/conf/dovecot/global_sieve_before
@@ -1,2 +1,14 @@
 # global_sieve_before script
 # global_sieve_before -> user sieve_before (mailcow UI) -> user sieve_after (mailcow UI) -> global_sieve_after
+
+require "fileinto";
+require "mailbox";
+
+if header :contains ["Chat-Version"] [""] {
+  if mailboxexists "DeltaChat" {
+    fileinto "DeltaChat";
+  } else {
+    fileinto :create "DeltaChat";
+  }
+  stop;
+}
diff --git a/data/web/lang/lang.de.json b/data/web/lang/lang.de.json
index 4ab9331c..8f909226 100644
--- a/data/web/lang/lang.de.json
+++ b/data/web/lang/lang.de.json
@@ -462,6 +462,7 @@
         "cname_from_a": "Wert abgeleitet von A/AAAA-Eintrag. Wird unterstützt, sofern der Eintrag auf die korrekte Ressource zeigt.",
         "dns_records": "DNS-Einträge",
         "dns_records_24hours": "Bitte beachten Sie, dass es bis zu 24 Stunden dauern kann, bis Änderungen an Ihren DNS-Einträgen als aktueller Status auf dieser Seite dargestellt werden. Diese Seite ist nur als Hilfsmittel gedacht, um die korrekten Werte für DNS-Einträge anzuzeigen und zu überprüfen, ob die Daten im DNS hinterlegt sind.",
+        "dns_records_docs": "Die <a target=\"_blank\" href=\"https://mailcow.github.io/mailcow-dockerized-docs/prerequisite-dns/\">Online-Dokumentation</a> enthält weitere Informationen zur DNS-Konfiguration.",
         "dns_records_data": "Korrekte Daten",
         "dns_records_name": "Name",
         "dns_records_status": "Aktueller Status",
diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json
index ceee60ed..3e1826e9 100644
--- a/data/web/lang/lang.en.json
+++ b/data/web/lang/lang.en.json
@@ -465,6 +465,7 @@
         "cname_from_a": "Value derived from A/AAAA record. This is supported as long as the record points to the correct resource.",
         "dns_records": "DNS Records",
         "dns_records_24hours": "Please note that changes made to DNS may take up to 24 hours to correctly have their current state reflected on this page. It is intended as a way for you to easily see how to configure your DNS records and to check whether all your records are correctly stored in DNS.",
+        "dns_records_docs": "Please also consult <a target=\"_blank\" href=\"https://mailcow.github.io/mailcow-dockerized-docs/prerequisite-dns/\">the documentation</a>.",
         "dns_records_data": "Correct Data",
         "dns_records_name": "Name",
         "dns_records_status": "Current State",
diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php
index c1362c4f..0806010e 100644
--- a/data/web/modals/mailbox.php
+++ b/data/web/modals/mailbox.php
@@ -824,6 +824,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
       <div class="modal-body">
         <p><?=$lang['diagnostics']['dns_records_24hours'];?></p>
         <div class="dns-modal-body"></div>
+        <p><?=$lang['diagnostics']['dns_records_docs'];?></p>
       </div>
     </div>
   </div>