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

[web] fixed html in alerts 

Signed-off-by: Kristian Feldsam <feldsam@gmail.com>
master
Kristian Feldsam 2021-11-28 22:48:08 +01:00
parent f74e60c024
commit 08f8eeb2e6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,8 @@ $alertbox_log_parser = alertbox_log_parser($_SESSION);
$alerts = []; $alerts = [];
if (is_array($alertbox_log_parser)) { if (is_array($alertbox_log_parser)) {
foreach ($alertbox_log_parser as $log) { foreach ($alertbox_log_parser as $log) {
$alerts[trim($log['type'], '"')][] = trim($log['msg'], '"'); $message = strtr($log['msg'], ["\n" => '', "\r" => '', "\t" => '<br>']);
$alerts[trim($log['type'], '"')][] = trim($message, '"');
} }
$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) {

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

@ -172,7 +172,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|raw|replace({"\n": "", "\r": "", "\t": "<br>"}) }}', '{{ alert_type }}'); mailcow_alert_box('{{ alert_msg|raw }}', '{{ alert_type }}');
{% endfor %} {% endfor %}
// Confirm TFA modal // Confirm TFA modal