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

Merge branch 'revert-80962856' into 'develop' 

Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'"

See merge request artica/pandorafms!2935
This commit is contained in:
vgilc 2019-12-03 16:01:56 +01:00
parent 809628560b 810fe8f860
commit 516fa8569b
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 is setted a description, we change the carriage return by <br> tags
if (isset($command['description'])) { if (isset($command['description'])) {
$command['description'] = str_replace("\r\n", '<br>', io_safe_output($command['description'])); $command['description'] = io_safe_input(str_replace("\r\n", '<br>', io_safe_output($command['description'])));
} }
// Descriptions are stored in json. // 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; var origicommand_descriptionnal_command;
if (<?php echo (int) $id_command; ?>) { if (<?php echo (int) $id_command; ?>) {
original_command = "<?php echo str_replace("\r\n", '<br>', addslashes(io_safe_output(alerts_get_alert_command_command($id_command)))); ?>"; original_command = "<?php echo addslashes(io_safe_output(alerts_get_alert_command_command($id_command))); ?>";
render_command_preview(original_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)))); ?>"; command_description = "<?php echo str_replace("\r\n", '<br>', addslashes(io_safe_output(alerts_get_alert_command_description($id_command)))); ?>";