tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with line breaks in alert commands

This commit is contained in:
Tatiana Llorente 2019-11-14 12:29:02 +01:00
parent 0199c6312a
commit 9a17a02d61
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/alerts/alert_commands.php
View File

@ -56,7 +56,7 @@ if (is_ajax()) {
// If is setted a description, we change the carriage return by <br> tags
if (isset($command['description'])) {
$command['description'] = io_safe_input(str_replace("\r\n", '<br>', io_safe_output($command['description'])));
$command['description'] = str_replace("\r\n", '<br>', io_safe_output($command['description']));
}
// Descriptions are stored in json.

2
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -295,7 +295,7 @@ $(document).ready (function () {
var origicommand_descriptionnal_command;
if (<?php echo (int) $id_command; ?>) {
original_command = "<?php echo addslashes(io_safe_output(alerts_get_alert_command_command($id_command))); ?>";
original_command = "<?php echo str_replace("\r\n", '<br>', addslashes(io_safe_output(alerts_get_alert_command_command($id_command)))); ?>";
render_command_preview(original_command);
command_description = "<?php echo str_replace("\r\n", '<br>', addslashes(io_safe_output(alerts_get_alert_command_description($id_command)))); ?>";