diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index b926c5a13a..60c74e9731 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -917,9 +917,11 @@ if ($get_response) {
if ($perform_event_response) {
global $config;
- $command = get_parameter('target', '');
-
$response_id = get_parameter('response_id');
+ $event_id = (int) get_parameter('event_id');
+ $server_id = (int) get_parameter('server_id', 0);
+
+ $command = events_get_response_target($event_id, $response_id, $server_id);
$event_response = db_get_row('tevent_response', 'id', $response_id);
@@ -1017,6 +1019,7 @@ if ($dialogue_event_response) {
$show_execute_again_btn = get_parameter('show_execute_again_btn');
$out_iterator = get_parameter('out_iterator');
$event_response = db_get_row('tevent_response', 'id', $response_id);
+ $server_id = get_parameter('server_id');
$event = db_get_row('tevento', 'id_evento', $event_id);
@@ -1067,7 +1070,8 @@ if ($dialogue_event_response) {
echo "
";
echo "
";
- html_print_button(__('Execute again'), 'btn_str', false, 'perform_response(\''.$command.'\', '.$response_id.');', "class='sub next'");
+ html_print_button(__('Execute again'), 'btn_str', false, "perform_response({'target':'".$command."','event_id':".$event_id.",'server_id':".$server_id.'}, '.$response_id.');', "class='sub next'");
+
echo '
';
}
break;
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 8a2546ad09..e176b863ad 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -118,30 +118,26 @@ function execute_response(event_id, server_id) {
}
response["target"] = get_response_target(event_id, response_id, server_id);
+ response["event_id"] = event_id;
+ response["server_id"] = server_id;
- switch (response["type"]) {
- case "command":
- show_response_dialog(event_id, response_id, response);
- break;
- case "url":
- if (response["new_window"] == 1) {
- window.open(response["target"], "_blank");
- } else {
- show_response_dialog(event_id, response_id, response);
- }
- break;
+ if (response["type"] == "url" && response["new_window"] == 1) {
+ window.open(response["target"], "_blank");
+ } else {
+ show_response_dialog(response_id, response);
}
}
//Show the modal window of an event response
-function show_response_dialog(event_id, response_id, response) {
+function show_response_dialog(response_id, response) {
var params = [];
params.push("page=include/ajax/events");
params.push("dialogue_event_response=1");
params.push("massive=0");
- params.push("event_id=" + event_id);
+ params.push("event_id=" + response["event_id"]);
params.push("target=" + response["target"]);
params.push("response_id=" + response_id);
+ params.push("server_id=" + response["server_id"]);
jQuery.ajax({
data: params.join("&"),
@@ -159,7 +155,7 @@ function show_response_dialog(event_id, response_id, response) {
draggable: true,
modal: false,
open: function() {
- perform_response(response["target"], response_id);
+ perform_response(response, response_id);
},
width: response["modal_width"],
height: response["modal_height"]
@@ -171,7 +167,6 @@ function show_response_dialog(event_id, response_id, response) {
//Show the modal window of event responses when multiple events are selected
function show_massive_response_dialog(
- event_id,
response_id,
response,
out_iterator,
@@ -183,13 +178,14 @@ function show_massive_response_dialog(
params.push("massive=1");
params.push("end=" + end);
params.push("out_iterator=" + out_iterator);
- params.push("event_id=" + event_id);
+ params.push("event_id=" + response["event_id"]);
params.push("target=" + response["target"]);
params.push("response_id=" + response_id);
+ params.push("server_id=" + response["server_id"]);
jQuery.ajax({
data: params.join("&"),
- response_tg: response["target"],
+ response_tg: response,
response_id: response_id,
out_iterator: out_iterator,
type: "POST",
@@ -384,7 +380,7 @@ function get_response_target(
}
// Perform a response and put the output into a div
-function perform_response(target, response_id) {
+function perform_response(response, response_id) {
$("#re_exec_command").hide();
$("#response_loading_command").show();
$("#response_out").html("");
@@ -392,8 +388,10 @@ function perform_response(target, response_id) {
var params = [];
params.push("page=include/ajax/events");
params.push("perform_event_response=1");
- params.push("target=" + target);
+ params.push("target=" + response["target"]);
params.push("response_id=" + response_id);
+ params.push("event_id=" + response["event_id"]);
+ params.push("server_id=" + response["server_id"]);
jQuery.ajax({
data: params.join("&"),
@@ -413,7 +411,7 @@ function perform_response(target, response_id) {
}
// Perform a response and put the output into a div
-function perform_response_massive(target, response_id, out_iterator) {
+function perform_response_massive(response, response_id, out_iterator) {
$("#re_exec_command").hide();
$("#response_loading_command_" + out_iterator).show();
$("#response_out_" + out_iterator).html("");
@@ -421,8 +419,10 @@ function perform_response_massive(target, response_id, out_iterator) {
var params = [];
params.push("page=include/ajax/events");
params.push("perform_event_response=1");
- params.push("target=" + target);
+ params.push("target=" + response["target"]);
params.push("response_id=" + response_id);
+ params.push("event_id=" + response["event_id"]);
+ params.push("server_id=" + response["server_id"]);
jQuery.ajax({
data: params.join("&"),
@@ -916,17 +916,24 @@ function check_massive_response_event(
$(".chk_val:checked").each(function() {
var event_id = $(this).val();
- var server_id = $("#hidden-server_id_" + event_id).val();
+ var meta = $("#hidden-meta").val();
+ var server_id = 0;
+ if (meta) {
+ server_id = $("#hidden-server_id_" + event_id).val();
+ }
+
response["target"] = get_response_target(
event_id,
response_id,
server_id,
response_command
);
+ response["server_id"] = server_id;
+ response["event_id"] = event_id;
if (total_checked - 1 === counter) end = 1;
- show_massive_response_dialog(event_id, response_id, response, counter, end);
+ show_massive_response_dialog(response_id, response, counter, end);
counter++;
});
diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php
index a07ec2a703..943068c0ec 100644
--- a/pandora_console/operation/events/events.build_table.php
+++ b/pandora_console/operation/events/events.build_table.php
@@ -1119,12 +1119,13 @@ if ($group_rep == 2) {
server_id,
response_command
);
+ response["server_id"] = server_id;
+ response["event_id"] = event_id;
if (total_checked-1 === counter)
end=1;
show_massive_response_dialog(
- event_id,
response_id,
response,
counter,
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index c842d65e59..1c91ebaf54 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -1765,6 +1765,9 @@ function process_datatables_item(item) {
evn += '('+item.event_rep+') ';
}
evn += item.evento+'';
+ if(item.meta === true) {
+ evn += '';
+ }
item.mini_severity = '';
item.mini_severity += output;