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-8201-Bug-en-widget-latest-events-Dashboard-metaconsola' into 'develop' 

Ent 8201 bug en widget latest events dashboard metaconsola

See merge request artica/pandorafms!4571
This commit is contained in:
Daniel Rodriguez 2021-12-23 12:11:08 +00:00
parent 5a0c25b3fc e24987d03e
commit 3ec6ba0e6d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1362,6 +1362,10 @@ if ($get_extended_event) {
$timestamp_first = $event['min_timestamp']; $timestamp_first = $event['min_timestamp'];
$timestamp_last = $event['max_timestamp']; $timestamp_last = $event['max_timestamp'];
$server_id = $event['server_id']; $server_id = $event['server_id'];
if (empty($server_id) && !empty($event['server_name']) && is_metaconsole()) {
$server_id = metaconsole_get_id_server($event['server_name']);
}
$comments = $event['comments']; $comments = $event['comments'];
$event['similar_ids'] = $similar_ids; $event['similar_ids'] = $similar_ids;
@ -1537,7 +1541,7 @@ if ($get_extended_event) {
$console_url = ''; $console_url = '';
// If metaconsole switch to node to get details and custom fields. // If metaconsole switch to node to get details and custom fields.
if ($meta) { if ($meta || (is_metaconsole() && !empty($server_id))) {
$server = metaconsole_get_connection_by_id($server_id); $server = metaconsole_get_connection_by_id($server_id);
} else { } else {
$server = ''; $server = '';
@ -1550,7 +1554,7 @@ if ($get_extended_event) {
} }
$connected = true; $connected = true;
if ($meta) { if ($meta || (is_metaconsole() && !empty($server_id))) {
if (metaconsole_connect($server) === NOERR) { if (metaconsole_connect($server) === NOERR) {
$connected = true; $connected = true;
} else { } else {