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

Merge branch 'ent-6201-10495-macro-en-event-response-no-funciona' into 'develop' 

fix parameter macros in event responses

See merge request artica/pandorafms!3405
This commit is contained in:
Daniel Rodriguez 2020-08-17 09:38:47 +02:00
parent b4b3fc5866 0917a631ee
commit 55986ede39
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/ajax/events.php
View File

@ -1093,7 +1093,8 @@ if ($dialogue_event_response) {
}
} else {
echo "<div style='text-align:left'>";
echo $prompt.sprintf(__('Executing command: %s', $command));
echo $prompt."Executing command: $command";
echo '</div><br>';
echo "<div id='response_loading_command' style='display:none'>".html_print_image('images/spinner.gif', true).'</div>';

4
pandora_console/include/javascript/pandora_events.js
View File

@ -135,7 +135,7 @@ function show_response_dialog(response_id, response) {
params.push("dialogue_event_response=1");
params.push("massive=0");
params.push("event_id=" + response["event_id"]);
params.push("target=" + response["target"]);
params.push("target=" + encodeURIComponent(response["target"]));
params.push("response_id=" + response_id);
params.push("server_id=" + response["server_id"]);
@ -397,7 +397,7 @@ function perform_response(response, response_id) {
var params = [];
params.push("page=include/ajax/events");
params.push("perform_event_response=1");
params.push("target=" + response["target"]);
params.push("target=" + encodeURIComponent(response["target"]));
params.push("response_id=" + response_id);
params.push("event_id=" + response["event_id"]);
params.push("server_id=" + response["server_id"]);