From 0917a631ee48abfc2de6fadfc47da9eaf9ae1536 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Fri, 14 Aug 2020 14:48:34 +0200 Subject: [PATCH] fix parameter macros in event responses --- pandora_console/include/ajax/events.php | 3 ++- pandora_console/include/javascript/pandora_events.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 459e9849a4..230b55a476 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1093,7 +1093,8 @@ if ($dialogue_event_response) { } } else { echo "
"; - echo $prompt.sprintf(__('Executing command: %s', $command)); + + echo $prompt."Executing command: $command"; echo '

'; echo "'; diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index b1bb90d02b..55c8ecb74a 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -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"]);