tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-26 03:19:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

add new macros response events pandora_enterprise#9423

Browse Source
This commit is contained in:
Daniel Barbero 2022-09-28 09:30:30 +02:00
parent 755432b381
commit 8d8140faa4
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1093,7 +1093,9 @@ if ($get_response === true) {
$event_response['target'] = events_get_response_target( $event_response['target'] = events_get_response_target(
$event_id, $event_id,
$event_response, $event_response,
$response_parameters $response_parameters,
$server_id,
($server_id !== 0) ? $node->server_name() : 'Metaconsole'
); );
} catch (\Exception $e) { } catch (\Exception $e) {
// Unexistent agent. // Unexistent agent.

36
pandora_console/include/functions_events.php
View File

@ -3522,16 +3522,20 @@ function events_page_responses($event)
/** /**
* Replace macros in the target of a response and return it. * Replace macros in the target of a response and return it.
* *
* @param integer $event_id Event identifier. * @param integer $event_id Event identifier.
* @param array $event_response Event Response. * @param array $event_response Event Response.
* @param array|null $response_parameters If parameters response values. * @param array|null $response_parameters If parameters response values.
* @param integer|null $server_id Server Id.
* @param string|null $server_name Name server.
* *
* @return string The response text with the macros applied. * @return string The response text with the macros applied.
*/ */
function events_get_response_target( function events_get_response_target(
int $event_id, int $event_id,
array $event_response, array $event_response,
?array $response_parameters=null ?array $response_parameters=null,
?int $server_id=0,
?string $server_name=''
) { ) {
global $config; global $config;
@ -3899,6 +3903,26 @@ function events_get_response_target(
); );
} }
if (is_metaconsole() === true
&& strpos($target, '_node_id_') !== false
) {
$target = str_replace(
'_node_id_',
$server_id,
$target
);
}
if (is_metaconsole() === true
&& strpos($target, '_node_name_') !== false
) {
$target = str_replace(
'_node_name_',
$server_name,
$target
);
}
return $target; return $target;
} }
@ -5635,7 +5659,9 @@ function get_events_get_response_target(
return events_get_response_target( return events_get_response_target(
$event_id, $event_id,
$event_response, $event_response,
$response_parameters $response_parameters,
$server_id,
($server_id !== 0) ? $node->server_name() : 'Metaconsole'
); );
} catch (\Exception $e) { } catch (\Exception $e) {
// Unexistent agent. // Unexistent agent.