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

fixed conflict

This commit is contained in:
alejandro-campos 2018-10-01 15:30:43 +02:00
parent 0c899f5078
commit 6b14754137
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/include/functions_ui.php
View File

@ -823,6 +823,26 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
else
return array ("", "", "", "", "", "", "");
}
if (defined('METACONSOLE')) {
$server = db_get_row ('tmetaconsole_setup', 'id', $alert['server_data']['id']);
if (metaconsole_connect($server) == NOERR) {
// Get agent data from node
$agente = db_get_row ('tagente', 'id_agente', $alert['id_agent']);
metaconsole_restore_db ();
}
} else {
// Get agent id
$id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
$agente = db_get_row ('tagente', 'id_agente', $id_agent);
}
$template = alerts_get_alert_template ($alert['id_alert_template']);
$description = io_safe_output($template['name']);