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

Merge branch '1367-radial-dinamic-details-dev' into 'develop' 

Added 3 and 4 points

See merge request artica/pandorafms!882
This commit is contained in:
vgilc 2017-10-26 11:32:28 +02:00
parent c38546fa65 aca4f2e481
commit 197e9a4a30
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_graph.php
View File

@ -3284,11 +3284,11 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta =
} }
else { else {
if ($meta) { if ($meta) {
$name = mb_substr (io_safe_output($row['agent_name']), 0, 14)." (".$row["count"].")"; $name = mb_substr (io_safe_output($row['agent_name']), 0, 25)." (".$row["count"].")";
} }
else { else {
$alias = agents_get_alias($row["id_agente"]); $alias = agents_get_alias($row["id_agente"]);
$name = mb_substr($alias, 0, 14)." #".$row["id_agente"]." (".$row["count"].")"; $name = mb_substr($alias, 0, 25)." #".$row["id_agente"]." (".$row["count"].")";
} }
$data[$name] = $row["count"]; $data[$name] = $row["count"];
} }
@ -5754,7 +5754,7 @@ function graph_monitor_wheel ($width = 550, $height = 600, $filter = false) {
if (!empty($data_groups)) { if (!empty($data_groups)) {
$filter = array('id_grupo' => array_keys($data_groups)); $filter = array('id_grupo' => array_keys($data_groups));
$fields = array('id_agente', 'id_parent', 'id_grupo', 'nombre'); $fields = array('id_agente', 'id_parent', 'id_grupo', 'alias');
$agents = agents_get_agents($filter, $fields); $agents = agents_get_agents($filter, $fields);
if (!empty($agents)) { if (!empty($agents)) {
@ -5787,7 +5787,7 @@ function graph_monitor_wheel ($width = 550, $height = 600, $filter = false) {
if (!isset($data_agents[$agent_id])) { if (!isset($data_agents[$agent_id])) {
$data_agents[$agent_id] = array(); $data_agents[$agent_id] = array();
$data_agents[$agent_id]['id'] = $agent_id; $data_agents[$agent_id]['id'] = $agent_id;
$data_agents[$agent_id]['name'] = io_safe_output($agents[$agent_id]['nombre']); $data_agents[$agent_id]['name'] = io_safe_output($agents[$agent_id]['alias']);
$data_agents[$agent_id]['group'] = (int) $agents[$agent_id]['id_grupo']; $data_agents[$agent_id]['group'] = (int) $agents[$agent_id]['id_grupo'];
$data_agents[$agent_id]['type'] = 'agent'; $data_agents[$agent_id]['type'] = 'agent';
$data_agents[$agent_id]['size'] = 30; $data_agents[$agent_id]['size'] = 30;
@ -5960,7 +5960,7 @@ function graph_monitor_wheel ($width = 550, $height = 600, $filter = false) {
if (!isset($data_agents[$id])) { if (!isset($data_agents[$id])) {
$data_agents[$id] = array(); $data_agents[$id] = array();
$data_agents[$id]['id'] = (int) $id; $data_agents[$id]['id'] = (int) $id;
$data_agents[$id]['name'] = io_safe_output($agent['nombre']); $data_agents[$id]['name'] = io_safe_output($agent['alias']);
$data_agents[$id]['type'] = 'agent'; $data_agents[$id]['type'] = 'agent';
$data_agents[$id]['color'] = COL_NOTINIT; $data_agents[$id]['color'] = COL_NOTINIT;
} }

35
pandora_console/operation/agentes/networkmap.dinamic.php
View File

@ -69,6 +69,41 @@ require_once ('include/functions_networkmap.php');
$strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']); $strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
$networkmap = db_get_row('tmap', 'id', $id);
$pure = (int) get_parameter ('pure', 0);
/* Main code */
if ($pure == 1) {
$buttons['screen'] = array('active' => false,
'text' => '<a href="index.php?sec=network&amp;' .
'sec2=operation/agentes/networkmap.dinamic&amp;' .
'activeTab=radial_dynamic&amp;id_networkmap=' . $id . '">' .
html_print_image("images/normal_screen.png", true,
array ('title' => __('Normal screen'))) .
'</a>');
}
else {
if (!$dash_mode) {
$buttons['screen'] = array('active' => false,
'text' => '<a href="index.php?sec=network&amp;' .
'sec2=operation/agentes/networkmap.dinamic&amp;' .
'pure=1&amp;activeTab=radial_dynamic&amp;id_networkmap=' . $id . '">' .
html_print_image("images/full_screen.png", true,
array ('title' => __('Full screen'))) .
'</a>');
$buttons['list'] = array('active' => false,
'text' => '<a href="index.php?sec=networkmapconsole&amp;' .
'sec2=operation/agentes/pandora_networkmap">' .
html_print_image("images/list.png", true,
array ('title' => __('List of networkmap'))) .
'</a>');
}
}
ui_print_page_header(io_safe_output($networkmap['name']),
"images/bricks.png", false, "network_map_enterprise",
false, $buttons, false, '', $config['item_title_size_text']);
global $width; global $width;
global $height; global $height;