Skip to content

Commit 3dece1a

Browse files
committed
[Dovecot] Add sieve rule to move DeltaChat (https://delta.chat) messages to folder DeltaChat
[Web] Add information about extended DNS config
1 parent 0072363 commit 3dece1a

File tree

4 files changed

+15
-0
lines changed

4 files changed

+15
-0
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,14 @@
11
# global_sieve_before script
22
# global_sieve_before -> user sieve_before (mailcow UI) -> user sieve_after (mailcow UI) -> global_sieve_after
3+
4+
require "fileinto";
5+
require "mailbox";
6+
7+
if header :contains ["Chat-Version"] [""] {
8+
if mailboxexists "DeltaChat" {
9+
fileinto "DeltaChat";
10+
} else {
11+
fileinto :create "DeltaChat";
12+
}
13+
stop;
14+
}

data/web/lang/lang.de.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@
462462
"cname_from_a": "Wert abgeleitet von A/AAAA-Eintrag. Wird unterstützt, sofern der Eintrag auf die korrekte Ressource zeigt.",
463463
"dns_records": "DNS-Einträge",
464464
"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.",
465+
"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.",
465466
"dns_records_data": "Korrekte Daten",
466467
"dns_records_name": "Name",
467468
"dns_records_status": "Aktueller Status",

data/web/lang/lang.en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@
465465
"cname_from_a": "Value derived from A/AAAA record. This is supported as long as the record points to the correct resource.",
466466
"dns_records": "DNS Records",
467467
"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.",
468+
"dns_records_docs": "Please also consult <a target=\"_blank\" href=\"https://mailcow.github.io/mailcow-dockerized-docs/prerequisite-dns/\">the documentation</a>.",
468469
"dns_records_data": "Correct Data",
469470
"dns_records_name": "Name",
470471
"dns_records_status": "Current State",

data/web/modals/mailbox.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,7 @@
824824
<div class="modal-body">
825825
<p><?=$lang['diagnostics']['dns_records_24hours'];?></p>
826826
<div class="dns-modal-body"></div>
827+
<p><?=$lang['diagnostics']['dns_records_docs'];?></p>
827828
</div>
828829
</div>
829830
</div>

0 commit comments

Comments
 (0)