tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-2316-5594-fallo-redireccion.linked-visual-consoles-desde-Metaconsola-2' into 'develop'

Browse Source 
Fixed visualconsole status modules and agents in metaconsole

See merge request artica/pandorafms!1519
This commit is contained in:
vgilc 2018-06-07 16:09:59 +02:00
commit 7cc0520a1d
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pandora_console/include/functions_visual_map.php
View File

@ -3684,7 +3684,8 @@ function visual_map_get_layout_status ($id_layout = 0, $depth = 0, $elements_in_
'id_layout_linked_weight', 'id_layout_linked_weight',
'id', 'id',
'id_layout', 'id_layout',
'element_group')); 'element_group',
'id_metaconsole'));
if ($result === false) if ($result === false)
return VISUAL_MAP_STATUS_NORMAL; return VISUAL_MAP_STATUS_NORMAL;
@ -3781,10 +3782,24 @@ function visual_map_get_layout_status ($id_layout = 0, $depth = 0, $elements_in_
} }
// Module // Module
elseif ($data["id_agente_modulo"] != 0) { elseif ($data["id_agente_modulo"] != 0) {
//Metaconsole db connection
if ($data['id_metaconsole'] != 0) {
$connection = db_get_row_filter ('tmetaconsole_setup',
array('id' => $data['id_metaconsole']));
if (metaconsole_load_external_db($connection) != NOERR) {
continue;
}
}
$status = modules_get_agentmodule_status($data["id_agente_modulo"]); $status = modules_get_agentmodule_status($data["id_agente_modulo"]);
if ($status == 4){ if ($status == 4){
$status = 3; $status = 3;
} }
//Restore db connection
if ($data['id_metaconsole'] != 0) {
metaconsole_restore_db();
}
} }
// Agent // Agent
else { else {
@ -3792,8 +3807,20 @@ function visual_map_get_layout_status ($id_layout = 0, $depth = 0, $elements_in_
// ADDED NO CHECK ACL FOR AVOID CHECK TAGS THAT // ADDED NO CHECK ACL FOR AVOID CHECK TAGS THAT
// MAKE VERY SLOW THE VISUALMAPS WITH ACL TAGS // MAKE VERY SLOW THE VISUALMAPS WITH ACL TAGS
//-------------------------------------------------- //--------------------------------------------------
//Metaconsole db connection
if ($data['id_metaconsole'] != 0) {
$connection = db_get_row_filter ('tmetaconsole_setup',
array('id' => $data['id_metaconsole']));
if (metaconsole_load_external_db($connection) != NOERR) {
continue;
}
}
$status = agents_get_status($data["id_agent"], true); $status = agents_get_status($data["id_agent"], true);
//Restore db connection
if ($data['id_metaconsole'] != 0) {
metaconsole_restore_db();
}
} }
break; break;
} }