tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-6406-No-se-ven-los-datos-string-en-el-tree' into 'develop'

Browse Source 
fixed bad module id reference

See merge request artica/pandorafms!3505
This commit is contained in:
Daniel Rodriguez 2020-12-01 11:55:56 +01:00
commit f869fbb7cd
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/class/Tree.class.php
View File

@ -565,7 +565,6 @@ class Tree
$module['id_module_type'] = (int) $module['id_tipo_modulo']; $module['id_module_type'] = (int) $module['id_tipo_modulo'];
$module['server_type'] = (int) $module['id_modulo']; $module['server_type'] = (int) $module['id_modulo'];
$module['status'] = $module['estado']; $module['status'] = $module['estado'];
$module['value'] = modules_get_agentmodule_data_for_humans($module);
if (is_metaconsole()) { if (is_metaconsole()) {
$module['serverID'] = $this->serverID; $module['serverID'] = $this->serverID;
@ -575,6 +574,8 @@ class Tree
$module['serverID'] = false; $module['serverID'] = false;
} }
$module['value'] = modules_get_agentmodule_data_for_humans($module);
if (!isset($module['value'])) { if (!isset($module['value'])) {
$module['value'] = modules_get_last_value($module['id']); $module['value'] = modules_get_last_value($module['id']);
} }

5
pandora_console/include/functions_modules.php
View File

@ -2359,9 +2359,10 @@ function modules_get_agentmodule_data_for_humans($module)
} else { } else {
$salida = ui_print_module_string_value( $salida = ui_print_module_string_value(
$module['datos'], $module['datos'],
$module['id_agente_modulo'], $module['id'],
$module['current_interval'], $module['current_interval'],
$module['module_name'] $module['module_name'],
$module['serverID'] ? $module['serverID'] : 0
); );
} }
} }

6
pandora_console/include/functions_ui.php
View File

@ -5617,7 +5617,8 @@ function ui_print_module_string_value(
$value, $value,
$id_agente_module, $id_agente_module,
$current_interval, $current_interval,
$module_name=null $module_name=null,
$server_id=0
) { ) {
global $config; global $config;
@ -5662,6 +5663,7 @@ function ui_print_module_string_value(
'last_data' => $value, 'last_data' => $value,
'interval' => $current_interval, 'interval' => $current_interval,
'module_name' => $module_name, 'module_name' => $module_name,
'id_node' => $server_id ? $server_id : 0,
] ]
); );
$salida = ui_get_snapshot_image($link, $is_snapshot).'  '; $salida = ui_get_snapshot_image($link, $is_snapshot).'  ';
@ -5769,7 +5771,7 @@ function ui_get_snapshot_link($params, $only_params=false)
$params = array_merge($default_params, $params); $params = array_merge($default_params, $params);
// First parameter of js winopeng_var. // First parameter of js winopeng_var.
$page = $config['homeurl'].'/operation/agentes/snapshot_view.php'; $page = ui_get_full_url('operation/agentes/snapshot_view.php', false, false, false);
$url = $page.'?id='.$params['id_module'].'&label='.rawurlencode(urlencode(io_safe_output($params['module_name']))).'&id_node='.$params['id_node']; $url = $page.'?id='.$params['id_module'].'&label='.rawurlencode(urlencode(io_safe_output($params['module_name']))).'&id_node='.$params['id_node'];