From aca4f2e481a36797ad36114f1e030ac218c114aa Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 4 Oct 2017 17:49:46 +0200
Subject: [PATCH] Added 3 and 4 points

---
 pandora_console/include/functions_graph.php   | 10 +++---
 .../operation/agentes/networkmap.dinamic.php  | 35 +++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 493047cafc..a00fdeb3fa 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -3279,11 +3279,11 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta =
 			}
 			else {
 				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 {
 					$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"];
 			}
@@ -5742,7 +5742,7 @@ function graph_monitor_wheel ($width = 550, $height = 600, $filter = false) {
 
 	if (!empty($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);
 
 		if (!empty($agents)) {
@@ -5775,7 +5775,7 @@ function graph_monitor_wheel ($width = 550, $height = 600, $filter = false) {
 					if (!isset($data_agents[$agent_id])) {
 						$data_agents[$agent_id] = array();
 						$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]['type'] = 'agent';
 						$data_agents[$agent_id]['size'] = 30;
@@ -5948,7 +5948,7 @@ function graph_monitor_wheel ($width = 550, $height = 600, $filter = false) {
 				if (!isset($data_agents[$id])) {
 					$data_agents[$id] = array();
 					$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]['color'] = COL_NOTINIT;
 				}
diff --git a/pandora_console/operation/agentes/networkmap.dinamic.php b/pandora_console/operation/agentes/networkmap.dinamic.php
index 89db930aed..c2fdf605a2 100644
--- a/pandora_console/operation/agentes/networkmap.dinamic.php
+++ b/pandora_console/operation/agentes/networkmap.dinamic.php
@@ -69,6 +69,41 @@ require_once ('include/functions_networkmap.php');
 
 $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 $height;