Merge branch 'app-passwd-daveas' into staging

2021-10-29 06:50:23 +02:00
parent 6bf70cf846 e391b054d3
commit 09d763548c
26 changed files with 209 additions and 57 deletions
--- a/data/web/templates/base.twig
+++ b/data/web/templates/base.twig
@@ -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|replace({"\n": "", "\r": "", "\t": "<br>"}) }}', '{{ alert_type }}');
    {% endfor %}

    // Confirm TFA modal