paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[web] alerts - fixed double quotes and escaped html 

Signed-off-by: Kristian Feldsam <feldsam@gmail.com>
master
Kristian Feldsam 2021-10-16 15:23:39 +02:00
parent aa8d44f91e
commit a7612e6c39
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/web/inc/footer.inc.php
View File

@ -16,7 +16,7 @@ if (is_array($alertbox_log_parser)) {
} }
$alert = array_filter(array_unique($alerts)); $alert = array_filter(array_unique($alerts));
foreach($alert as $alert_type => $alert_msg) { foreach($alert as $alert_type => $alert_msg) {
$alerts[$alert_type] = json_encode(implode('<hr class="alert-hr">', $alert_msg)); $alerts[$alert_type] = implode('<hr class="alert-hr">', $alert_msg);
} }
unset($_SESSION['return']); unset($_SESSION['return']);
} }

2
data/web/templates/base.twig
View File

@ -170,7 +170,7 @@ function recursiveBase64StrToArrayBuffer(obj) {
// TFA, CSRF, Alerts in footer.inc.php // TFA, CSRF, Alerts in footer.inc.php
// Other general functions in mailcow.js // Other general functions in mailcow.js
{% for alert_type, alert_msg in alerts %} {% for alert_type, alert_msg in alerts %}
mailcow_alert_box("{{ alert_msg }}", "{{ alert_type }}"); mailcow_alert_box('{{ alert_msg|raw }}', '{{ alert_type }}');
{% endfor %} {% endfor %}
// Confirm TFA modal // Confirm TFA modal