Merge pull request #4827 from mailcow/staging

2022-10a
Merge pull request #4825 from mailcow/fix/qitems
2026-06-13 01:50:34 +00:00 · 2022-10-26 13:06:09 +02:00 · 2022-10-26 12:55:10 +02:00 · 2022-10-26 12:44:36 +02:00 · 2022-10-26 12:33:52 +02:00 · 2022-10-26 12:33:22 +02:00
3 changed files with 4 additions and 3 deletions
@@ -127,6 +127,7 @@ elseif (!empty($_GET['id']) && ctype_alnum($_GET['id'])) {
    $data['fuzzy_hashes'] = json_decode($mailc['fuzzy_hashes']);
    // Get text/plain content
    $data['text_plain'] = $mail_parser->getMessageBody('text');
+    if (!json_encode($data['text_plain'])) $data['text_plain'] = '';
    // Get html content and convert to text
    $data['text_html'] = $html2text->convert($mail_parser->getMessageBody('html'));
    if (empty($data['text_plain']) && empty($data['text_html'])) {
@@ -172,7 +172,7 @@ function recursiveBase64StrToArrayBuffer(obj) {
    // TFA, CSRF, Alerts in footer.inc.php
    // Other general functions in mailcow.js
    {% for alert_type, alert_msg in alerts %}
-    mailcow_alert_box('{{ alert_msg|raw }}', '{{ alert_type }}');
+    mailcow_alert_box('{{ alert_msg|raw|e("js") }}', '{{ alert_type }}');
    {% endfor %}

    // Confirm TFA modal
@@ -76,7 +76,7 @@ services:
            - clamd

    rspamd-mailcow:
-      image: mailcow/rspamd:1.91
+      image: mailcow/rspamd:1.90
      stop_grace_period: 30s
      depends_on:
        - dovecot-mailcow
@@ -424,7 +424,7 @@ services:
            - acme

    netfilter-mailcow:
-      image: mailcow/netfilter:1.48
+      image: mailcow/netfilter:1.49
      stop_grace_period: 30s
      depends_on:
        - dovecot-mailcow
Author	SHA1	Message	Date
Niklas Meyer	cb340d78e1	Merge pull request #4827 from mailcow/staging 2022-10a	2022-10-26 13:06:09 +02:00
Niklas Meyer	548d7b9833	Merge pull request #4825 from mailcow/fix/qitems Fix Error parsing Quarantine Items	2022-10-26 12:55:10 +02:00
Niklas Meyer	96dbbf4db6	Merge pull request #4823 from mailcow/feature/rspamd-downgrade [RSPAMD] Downgrade to 3.2 (stable)	2022-10-26 12:44:36 +02:00
DerLinkman	4f14462af7	[RSPAMD] Downgrade to 3.2 (stable)	2022-10-26 12:33:52 +02:00
FreddleSpl0it	1e08b4ece6	fix encoding failures of parsed text_plain mail	2022-10-26 12:33:22 +02:00
Niklas Meyer	6fd9efc30a	Merge pull request #4769 from ro78/patch-1 Update base.twig to escape simple quote	2022-10-26 11:14:37 +02:00
Niklas Meyer	6f212a41d8	Merge pull request #4820 from mailcow/feature/netfilter-compose [Compose] Use new (patched) Netfilter Image	2022-10-26 11:04:36 +02:00
DerLinkman	52314d1a35	[Compose] Use new (patched) Netfilter Image	2022-10-26 11:03:02 +02:00
Romain	623397d20a	Update base.twig to escape simple quote Update base.twig to escape simple quote See issue https://github.com/mailcow/mailcow-dockerized/issues/4718	2022-09-30 10:32:15 +02:00