From fc357b8c14a8337e1bfde7aee2028c222decaea4 Mon Sep 17 00:00:00 2001
From: Shigekazu Aoyagi <aoyagi@rworks.jp>
Date: Tue, 11 Apr 2017 03:32:58 +0000
Subject: [PATCH 01/67] add initialize $conf->{'verbosity'} when not defined
 config file.

---
 pandora_server/util/pandora_db.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index fcec542ed8..48c9471141 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -669,6 +669,7 @@ sub pandora_load_config ($) {
 	$conf->{'dbengine'} = 'mysql' unless defined ($conf->{'dbengine'});
 	$conf->{'dbport'} = '3306' unless defined ($conf->{'dbport'});
 	$conf->{'claim_back_snmp_modules'} = '1' unless defined ($conf->{'claim_back_snmp_modules'});
+    $conf->{'verbosity'} = '3' unless defined ($conf->{'verbosity'});
 
     # Dynamic interval configuration.                                                                                                                             
 	$conf->{"dynamic_constant"} = 0.10 unless defined($conf->{"dynamic_constant"});

From 311ac744c6227f477d693a4bcf04186f400f00de Mon Sep 17 00:00:00 2001
From: Shigekazu Aoyagi <aoyagi@rworks.jp>
Date: Tue, 11 Apr 2017 03:35:12 +0000
Subject: [PATCH 02/67] move logging $conf->{'_days_delete_unknown'} after
 defined checking

---
 pandora_server/util/pandora_db.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 48c9471141..3eea7ec0a4 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -840,10 +840,10 @@ sub pandora_checkdb_consistency {
 		log_message ('CHECKDB', "Ignoring not-init data.");
 	}
 	
-	log_message ('CHECKDB',
-		"Deleting unknown data (More than " . $conf{'_days_delete_unknown'} . " days).");
-	
 	if (defined($conf{'_days_delete_unknown'}) && $conf{'_days_delete_unknown'} > 0) {
+	    log_message ('CHECKDB',
+		    "Deleting unknown data (More than " . $conf{'_days_delete_unknown'} . " days).");
+	
 		my @modules = get_db_rows($dbh,
 			'SELECT tagente_modulo.id_agente_modulo, tagente_modulo.id_agente
 			FROM tagente_modulo, tagente_estado

From 200b821a203d648bf8c87372b0ad138a5bb09b5c Mon Sep 17 00:00:00 2001
From: Shigekazu Aoyagi <aoyagi@rworks.jp>
Date: Tue, 11 Apr 2017 03:37:23 +0000
Subject: [PATCH 03/67] add defined check for $conf->{'_inventory_purge'}

---
 pandora_server/util/pandora_db.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 3eea7ec0a4..28c5adca1d 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -93,7 +93,7 @@ sub pandora_purgedb ($$) {
 	}
 
 	# Delete old inventory data
-	if ($conf->{'_inventory_purge'} > 0) {
+	if (defined ($conf->{'_inventory_purge'}) && $conf->{'_inventory_purge'} > 0) {
 		if (enterprise_load (\%conf) != 0) {
 			my $ulimit_timestamp_inventory = time() - (86400 * $conf->{'_inventory_purge'});
 

From b6d4416921defec844d014d2410d019a157b3a72 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 28 Jun 2017 12:37:40 +0200
Subject: [PATCH 04/67] Let use png logo images for reports - #1057

---
 pandora_console/godmode/setup/setup_visuals.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 85a3260494..97d1b5deac 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -576,7 +576,7 @@ $row++;
 
 $dirItems = scandir($config['homedir'] . '/images/custom_logo');
 foreach ($dirItems as $entryDir) {
-	if (strstr($entryDir, '.jpg') !== false) {
+	if (strstr($entryDir, '.jpg') !== false || strstr($entryDir, '.png') !== false) {
 		$customLogos['images/custom_logo/' . $entryDir] = $entryDir;
 	}
 }
@@ -599,7 +599,7 @@ $table_other->data['custom_report_front-font'][1] = html_print_select ($_fonts,
 $table_other->data['custom_report_front-logo'][0] =  __('Custom report front') . ' - ' .
 	__('Custom logo') .
 	ui_print_help_tip(
-		__("The dir of custom logos is in your www Pandora Console in \"images/custom_logo\". You can upload more files (ONLY JPEG) in upload tool in console."), true);
+		__("The dir of custom logos is in your www Pandora Console in \"images/custom_logo\". You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), true);
 $table_other->data['custom_report_front-logo'][1] = html_print_select(
 	$customLogos,
 	'custom_report_front_logo',

From 95184cab2124d77b0b55c70f8f3dc5f84db224e2 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 29 Jun 2017 18:19:58 +0200
Subject: [PATCH 05/67] Change pandorin dialog font color with black theme -
 #1060

---
 pandora_console/include/help/clippy/homepage.php | 4 ++--
 pandora_console/include/styles/pandora_black.css | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/help/clippy/homepage.php b/pandora_console/include/help/clippy/homepage.php
index 8ba7ac2f57..be52096875 100644
--- a/pandora_console/include/help/clippy/homepage.php
+++ b/pandora_console/include/help/clippy/homepage.php
@@ -55,12 +55,12 @@ function clippy_start_page_homepage() {
 	$return_tours['tours']['homepage']['steps'][] = array(
 		'element'=> '#clippy',
 		'intro' => 
-			'<div style="text-align: left; padding-left: 20px; padding-right: 20px;">'.
+			'<div class="clippy_body" style="text-align: left; padding-left: 20px; padding-right: 20px;">'.
 			__('Hi, can I help you?') . '<br/><br/>' .
 			__('Let me introduce my self: I am Pandorin, the annoying assistant of Pandora FMS. You can follow my steps to do basic tasks in Pandora FMS or you can close me and never see me again.') .
 			'<br /> ' .
 			'<br /> ' .
-			'<div style="font-size: 7pt;">' .
+			'<div class="clippy_body" style="font-size: 7pt;">' .
 				html_print_checkbox_extended
 					('clippy_is_annoying', 1, $clippy_is_annoying, false,
 					'set_clippy_annoying()', '', true) .
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 981b6223fa..3dca8bdbf9 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -2951,6 +2951,10 @@ table#policy_modules td * {
 	border-top-right-radius: 2px;
 }
 
+.clippy_body {
+	color: black;
+}
+
 #dialog-double_auth-container {
 	width: 100%;
 	text-align: center;

From d75511ba92491fa1218ce0abe307fdf9b08b5b2f Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 3 Jul 2017 12:58:36 +0200
Subject: [PATCH 06/67] Fixed module counter

---
 pandora_console/include/functions_tactical.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_tactical.php b/pandora_console/include/functions_tactical.php
index a2bc1b9105..eb736d6b5c 100644
--- a/pandora_console/include/functions_tactical.php
+++ b/pandora_console/include/functions_tactical.php
@@ -250,7 +250,7 @@ function tactical_get_data ($id_user = false, $user_strict = false, $acltags, $r
 			SUM(ta.warning_count) as warning,SUM(ta.unknown_count) as unknown,
 			SUM(ta.notinit_count) as not_init, SUM(fired_count) as alerts_fired
 			FROM tagente ta
-			WHERE id_grupo IN ($user_groups_ids)");
+			WHERE disabled = 0 AND id_grupo IN ($user_groups_ids)");
 		
 		$list['_agents_unknown_'] = $group_stat[0]["unknown"];
 		$list['_monitors_alerts_fired_'] = $group_stat[0]["alerts_fired"];		

From ba829e78ce0c1ea2759f9af216b50b891fb3e465 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 5 Jul 2017 09:07:55 +0200
Subject: [PATCH 07/67] Removed interface link function in fictional nodes

---
 .../include/functions_pandora_networkmap.php  |  5 ++++-
 .../functions_pandora_networkmap.js           | 22 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php
index 97a4fd079e..660e53f95d 100644
--- a/pandora_console/include/functions_pandora_networkmap.php
+++ b/pandora_console/include/functions_pandora_networkmap.php
@@ -309,7 +309,7 @@ function networkmap_db_node_to_js_node($node, &$count, &$count_item_holding_area
 	
 	$item = array();
 	$item['id'] = $count;
-	
+
 	if (enterprise_installed()) {
 		enterprise_include_once('include/functions_pandora_networkmap.php');
 		$item['id_db'] = $node['id_in_db'];
@@ -328,6 +328,9 @@ function networkmap_db_node_to_js_node($node, &$count, &$count_item_holding_area
 		$item['id_agent'] = (int)$node['style']['id_agent'];
 		$item['id_module'] = (int)$node['source_data'];
 	}
+	else {
+		$item['type'] = 3;
+	}
 	
 	$item['fixed'] = true;
 	$item['x'] = (int)$node['x'];
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index 86ab6bd914..0aec15c35d 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -1589,8 +1589,14 @@ function show_menu(item, data) {
 					name: interface_link_add,
 					icon: "interface_link_children",
 					disabled : function() {
+						console.log(data);
 						if (enterprise_installed) {
-							return false;
+							if (data.type == 3) {
+								return true;
+							}
+							else {
+								return false;
+							}
 						}
 						else {
 							return true;
@@ -1657,7 +1663,12 @@ function show_menu(item, data) {
 						icon: "interface_link_parent",
 						disabled : function() {
 							if (enterprise_installed) {
-								return false;
+								if (data.type == 3) {
+									return true;
+								}
+								else {
+									return false;
+								}
 							}
 							else {
 								return true;
@@ -1681,7 +1692,12 @@ function show_menu(item, data) {
 					icon: "interface_link_cancel",
 					disabled : function() {
 						if (enterprise_installed) {
-							return false;
+							if (data.type == 3) {
+								return true;
+							}
+							else {
+								return false;
+							}
 						}
 						else {
 							return true;

From ce35af3e61ed65ad0b6f122dfc84b947ac066aff Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 5 Jul 2017 19:08:40 +0200
Subject: [PATCH 08/67] Multiple erasure and displacement of elements in visual
 console - #624

---
 .../visual_console_builder.editor.js          | 156 +++++++++++++++++-
 1 file changed, 147 insertions(+), 9 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 4926a215ca..1185074424 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -15,6 +15,7 @@ var creationItem = null;
 var is_opened_palette = false;
 var idItem = 0;
 var selectedItem = null;
+var selectedItems = null;
 var lines = Array();
 var user_lines = Array();
 var toolbuttonActive = null;
@@ -1518,7 +1519,6 @@ function set_static_graph_status(idElement, image, status) {
 			data: parameter,
 			success: function (data) {
 				set_static_graph_status(idElement, image, data);
-				
 				if($('#'+idElement+' table').css('float') == 'right' || $('#'+idElement+ ' table').css('float') == 'left'){
 					$('#'+idElement+ ' img').css('margin-top', parseInt($('#'+idElement).css('height'))/2 - parseInt($('#'+idElement+ ' img').css('height'))/2);	
 				}
@@ -1554,7 +1554,6 @@ function set_static_graph_status(idElement, image, status) {
 			suffix = ".png";
 			break;
 	}
-
 	set_image("image", idElement, image  + suffix);
 }
 
@@ -2025,6 +2024,10 @@ function createItem(type, values, id_data) {
 				if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
 					$image.attr('width', '70')
 						.attr('height', '70');
+				}
+				else{
+					$image.attr('width', $('#preview > img')[0].naturalWidth)
+						.attr('height', $('#preview > img')[0].naturalHeight);
 				}			
 			}
 			else {
@@ -2761,10 +2764,19 @@ function activeToolboxButton(id, active) {
 }
 
 function click_delete_item_callback() {
-	activeToolboxButton('edit_item', false);
-	deleteDB(idItem);
-	idItem = 0;
-	selectedItem = null;
+	if(selectedItems == null){
+		activeToolboxButton('edit_item', false);
+		deleteDB(idItem);
+		idItem = 0;
+		selectedItem = null;
+	}
+	else{
+		idItem = 0;
+		selectedItem = null;
+		selectedItems.forEach( function(valor, indice, array) {
+			deleteDB(valor);
+		});
+	}
 }
 
 /**
@@ -2783,6 +2795,7 @@ function eventsItems(drag) {
 	//$(".item").resizable(); //Disable but run in ff and in the waste (aka micro$oft IE) show ungly borders
 
 	$('.item').bind('click', function(event, ui) {
+		
 		event.stopPropagation();
 		if (!is_opened_palette) {
 			var divParent = $(event.target);
@@ -2891,6 +2904,62 @@ function eventsItems(drag) {
 				enterprise_click_item_callback(divParent);
 			}
 		}
+		
+		
+		
+		if(!event.ctrlKey){
+			firstItem = event.currentTarget.id;
+			selectedItems = null;
+			selectedItems = Array();
+			selectedItems.push(event.currentTarget.id);
+
+		}
+		else{
+			
+			selectedItem = null;
+			
+			unselectAll();
+			
+			if(selectedItems.indexOf(event.currentTarget.id) > -1){
+					
+						$('#'+event.currentTarget.id).css('left', '+=1');
+						$('#'+event.currentTarget.id).css('top', '+=1');
+						$('#'+event.currentTarget.id).css('border', '');
+						$('#'+event.currentTarget.id).attr('withborder') == 'false';
+				
+				
+				selectedItems.splice(selectedItems.indexOf(event.currentTarget.id),1);
+			}
+			else{
+						$('#'+event.currentTarget.id).css('left', '-=1');
+						$('#'+event.currentTarget.id).css('top', '-=1');
+						$('#'+event.currentTarget.id).css('border', '1px dotted rgb(0, 0, 255)');
+						$('#'+event.currentTarget.id).attr('withborder') == 'true';
+				
+				
+				selectedItems.push(event.currentTarget.id);
+			}
+			
+			
+			selectedItems.forEach( function(valor, indice, array) {
+				if(selectedItems.indexOf(valor) > -1 && $('#'+valor).css('border') != '1px dotted rgb(0, 0, 255)'){
+					// $('#'+valor).css('left', '-=1');
+					// $('#'+valor).css('top', '-=1');
+					$('#'+valor).css('border', '1px dotted rgb(0, 0, 255)');
+					$('#'+valor).attr('withborder') == 'true';
+				}
+			});
+			
+			$('#'+firstItem).css('left', '-=1');
+			$('#'+firstItem).css('top', '-=1');
+			
+			firstItem = null;
+			
+	}
+	
+	
+	
+	
 	});
 
 	//Double click in the item
@@ -2907,8 +2976,9 @@ function eventsItems(drag) {
 	$(".item").draggable({containment: "#background", grid: drag});
 
 	$('.item').bind('dragstart', function(event, ui) {
-
-		event.stopPropagation();
+		
+		if(selectedItems == null || selectedItems.length < 2){
+			event.stopPropagation();
 		if (!is_opened_palette) {
 			unselectAll();
 			$(event.target).css('border', '1px blue dotted');
@@ -2974,6 +3044,7 @@ function eventsItems(drag) {
 						break;
 					default:
 						idItem = $(event.target).attr('id');
+						
 						break;
 				}
 				activeToolboxButton('copy_item', true);
@@ -2981,10 +3052,17 @@ function eventsItems(drag) {
 				activeToolboxButton('delete_item', true);
 			}
 		}
+		}
+		else{
+			console.log('Dragstart');
+			
+			multiDragStart(event);
+			
+		}
 	});
 
 	$('.item').bind('dragstop', function(event, ui) {
-
+		if(selectedItems == null || selectedItems.length < 2){
 		event.stopPropagation();
 
 		var values = {};
@@ -2992,9 +3070,16 @@ function eventsItems(drag) {
 		values['mov_top'] = ui.position.top;
 
 		updateDB(selectedItem, idItem, values, 'dragstop');
+		}
+		else{
+			
+				console.log('Dragstop');
+			multidragStop(event);
+		}
 	});
 
 	$('.item').bind('drag', function(event, ui) {
+		if(selectedItems == null || selectedItems.length < 2){
 		if ($(event.target).hasClass('handler_start')) {
 			selectedItem = 'handler_start';
 		}
@@ -3075,6 +3160,11 @@ function eventsItems(drag) {
 				draw_user_lines("", 0, 0, 0 , 0, 0, true);
 				break;
 		}
+	}
+	else{
+		console.log('Drag');
+		
+	}
 	});
 }
 
@@ -3140,6 +3230,8 @@ function eventsBackground() {
 
 	// Event click for background
 	$("#background").click(function(event) {
+		selectedItems = null;
+		selectedItems = Array();
 		event.stopPropagation();
 		if (!is_opened_palette) {
 			unselectAll();
@@ -3510,3 +3602,49 @@ function showGrid() {
 		eventsItems();
 	}
 }
+
+function multiDragStart(event){
+	multiDragMouse(event);
+	
+}
+
+function multidragStop(event){
+	$('#background').off("mousemove");
+	values = [];
+	selectedItems.forEach( function(valor, indice, array) {
+		$('#'+valor).css('left','+=1');
+		$('#'+valor).css('top','+=1');
+		classItem =  $('#'+valor).attr('class').replace(/item|ui-draggable|ui-draggable-dragging|-dragging/g, '').trim();
+		values['mov_left'] = parseInt($('#'+valor).css('left'));
+		values['mov_top'] = parseInt($('#'+valor).css('top'));
+		updateDB(classItem, valor, values,'dragstop');
+	});
+	
+}
+
+
+
+function multiDragMouse(eventDrag){
+	var preX  = [];
+	var preY  = [];
+	
+	selectedItems.forEach( function(valor, indice, array) {
+		preX[indice]  = $('#'+valor).css('left');
+		preY[indice]  =	$('#'+valor).css('top');
+	});
+	
+	$('#background').on('mousemove',function(event){
+		var moveDiffX =  event.clientX - eventDrag.clientX;
+		var moveDiffY = event.clientY - eventDrag.clientY;
+		selectedItems.forEach( function(valor, indice, array) {
+			if(!(parseInt($('#'+valor).css('left')) < 0 && parseInt(moveDiffX)+parseInt(preX[indice]) < 0) && 
+			!(parseInt($('#'+valor).css('left')) + parseInt($('#'+valor).css('width')) > parseInt($('#background').css('width')) && parseInt(moveDiffX+preX[indice]) > 0)){
+				$('#'+valor).css('left',parseInt(moveDiffX)+parseInt(preX[indice])+'px');
+			}
+			if(!(parseInt($('#'+valor).css('top')) < 0 && parseInt(moveDiffY)+parseInt(preY[indice]) < 0) && 
+			!(parseInt($('#'+valor).css('top')) + parseInt($('#'+valor).css('height')) > parseInt($('#background').css('height')) && parseInt(moveDiffY+preY[indice]) > 0)){
+				$('#'+valor).css('top',parseInt(moveDiffY)+parseInt(preY[indice])+'px');
+			}
+		});
+	});
+}
\ No newline at end of file

From dac5b6f2378bb1a069f6f5e5efc0497ae93bd38c Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 10 Jul 2017 10:04:04 +0200
Subject: [PATCH 09/67] Added correct filter name

---
 pandora_console/operation/agentes/status_monitor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 2cc03db08d..58f221bb76 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -561,9 +561,8 @@ $selectDataDown = '';
 $selectTimestampUp = '';
 $selectTimestampDown = '';
 $order = null;
-
 switch ($sortField) {
-	case 'agent_name':
+	case 'agent_alias':
 		switch ($sort) {
 			case 'up':
 				$selectAgentNameUp = $selected;

From 70a226540e1910d0401609e7a8f405e03dffee73 Mon Sep 17 00:00:00 2001
From: Hirofumi Kosaka <kosaka@rworks.jp>
Date: Mon, 14 Aug 2017 12:03:35 +0900
Subject: [PATCH 10/67] "Massive Operations" had remained at Pandora Console.
 #161

---
 pandora_console/godmode/massive/massive_operations.php | 2 +-
 pandora_console/godmode/setup/setup_general.php        | 2 +-
 pandora_console/include/functions_config.php           | 2 +-
 pandora_console/include/help/en/help_profile.php       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php
index 494e95e3f5..276ab4c478 100755
--- a/pandora_console/godmode/massive/massive_operations.php
+++ b/pandora_console/godmode/massive/massive_operations.php
@@ -212,7 +212,7 @@ You can of course remove the warnings, that's why we include the source and do n
 */
 
 ui_print_page_header(
-	__('Massive operations') . ' &raquo; '. $options[$option],
+	__('Bulk operations') . ' &raquo; '. $options[$option],
 	"images/gm_massive_operations.png", false, "", true, $onheader,true, "massivemodal");
 
 // Checks if the PHP configuration is correctly
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index 23a8805570..dc83d2d7f6 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -209,7 +209,7 @@ $table->data[34][0] = __('Allow create planned downtimes in the past') .
 $table->data[34][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('past_planned_downtimes', 1, '', $config["past_planned_downtimes"], true).'&nbsp;&nbsp;';
 $table->data[34][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('past_planned_downtimes', 0, '', $config["past_planned_downtimes"], true);
 
-$table->data[35][0] = __('Limit parameters massive') .
+$table->data[35][0] = __('Limit parameters bulk') .
 	ui_print_help_tip(__('Your PHP environment is setted with %d max_input_vars. Maybe you must not set this value with upper values.', ini_get("max_input_vars")), true);
 $table->data[35][1] = html_print_input_text('limit_parameters_massive',
 	$config['limit_parameters_massive'], '', 10, 10, true);
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 0317a34141..632dad5455 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -201,7 +201,7 @@ function config_update_config () {
 					if (!config_update_value ('past_planned_downtimes', get_parameter('past_planned_downtimes')))
 						$error_update[] = __('Allow create planned downtimes in the past');
 					if (!config_update_value ('limit_parameters_massive', get_parameter('limit_parameters_massive')))
-						$error_update[] = __('Limit parameters massive');
+						$error_update[] = __('Limit parameters bulk');
 					if (!config_update_value ('identification_reminder', get_parameter('identification_reminder')))
 						$error_update[] = __('Identification_reminder');
 					if (!config_update_value ('include_agents', (bool)get_parameter('include_agents')))
diff --git a/pandora_console/include/help/en/help_profile.php b/pandora_console/include/help/en/help_profile.php
index 58327eb36a..1222af8668 100644
--- a/pandora_console/include/help/en/help_profile.php
+++ b/pandora_console/include/help/en/help_profile.php
@@ -51,7 +51,7 @@
 <tr><td>Group Management<td>PM
 <tr><td>Creating inventory modules<td>PM
 <tr><td>Module Management (includes all suboptions)<td>PM
-<tr><td>Massive Management Operations	<td>AW
+<tr><td>Bulk Management Operations	<td>AW
 <tr><td>Creating agents<td>AW
 <tr><td>Duplicating remote configurations<td>AW
 <tr><td>Downtime Management<td>AW

From f70763d7390ff0954a06dedd087c78ce95e20031 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 21 Aug 2017 10:48:03 +0200
Subject: [PATCH 11/67] Apply padding to event 24h event history bar for agent
 view - #1203

---
 pandora_console/operation/agentes/estado_generalagente.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 23b5dabed8..111abffeee 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -601,7 +601,7 @@ $data[0][0] .=
 		<tr><th>' .
 			__('Events (24h)') .
 		'</th></tr>' .
-		'<tr><td style="text-align:center;"><br />' .
+		'<tr><td style="text-align:center;padding-left:20px;padding-right:20px;"><br />' .
 		graph_graphic_agentevents ($id_agente, 450, 15, SECONDS_1DAY, '', true, true) . 
 		'<br /></td></tr>' . 
 	'</table>';

From a399652873220c090c8cd7fceb1d665ad6fcc5c2 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 21 Aug 2017 11:29:58 +0200
Subject: [PATCH 12/67] Fix dbmanager when insert db activity in activity login
 info panel - #1194

---
 pandora_console/extensions/dbmanager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php
index c74332b1eb..ccc4c77c65 100644
--- a/pandora_console/extensions/dbmanager.php
+++ b/pandora_console/extensions/dbmanager.php
@@ -167,7 +167,7 @@ function dbmgr_extension_main () {
 		echo '<strong>An error has occured when querying the database.</strong><br />';
 		echo $error;
 		
-		db_pandora_audit("Extension DB inface", "Error in SQL", false, false, $sql);
+		db_pandora_audit("DB Interface Extension", "Error in SQL", false, false, $sql);
 		
 		return;
 	}
@@ -175,7 +175,7 @@ function dbmgr_extension_main () {
 	if (! is_array ($result)) {
 		echo "<strong>Output: <strong>".$result;
 		
-		db_pandora_audit("Extension DB inface", "SQL", false, false, $sql);
+		db_pandora_audit("DB Interface Extension", "SQL", false, false, $sql);
 		
 		return;
 	}

From 2f5127d517d50a48618db57968d23ed5336bdd9c Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 21 Aug 2017 15:58:19 +0200
Subject: [PATCH 13/67] Change pandora help window style - #1122

---
 pandora_console/include/styles/pandora.css | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 9d7deb64db..454ed07ecb 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4139,6 +4139,8 @@ div#main_help_new_content {
     padding-top: 10px;
     background: white;
     height: 100%;
+		font-size: 12pt;
+		font-family: 'lato-bolder';
 }
 
 div#main_help_new_content h1 {
@@ -4150,6 +4152,15 @@ div#main_help_new_content p {
 	font-family: 'lato-bolder';
 	font-size: 12pt;
 }
+div#main_help_new_content b {
+	font-family: 'lato-bolder';
+	font-size: 12pt;
+}
+
+div#main_help_new_content li {
+	font-family: 'lato-bolder';
+	font-size: 12pt;
+}
 
 div#footer_help{
 	background: #333;

From 44cf079b2061ffb3bdb8626362f921a0cb2c9035 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 22 Aug 2017 11:33:15 +0200
Subject: [PATCH 14/67] Change 24h event histogram function in pandora mobile
 to same that desktop pandora - #1170

---
 pandora_console/mobile/operation/agent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php
index de7833f1b1..c104857683 100644
--- a/pandora_console/mobile/operation/agent.php
+++ b/pandora_console/mobile/operation/agent.php
@@ -85,7 +85,7 @@ class Agent {
 					$agent_id = $system->getRequest('agent_id', '0');
 					$width = $system->getRequest('width', '400');
 					graph_graphic_agentevents(
-						$this->id, $width, 30, SECONDS_1DAY, ui_get_full_url(false));
+						$agent_id, $width, 30, SECONDS_1DAY, ui_get_full_url(false));
 					exit;
 			}
 		}

From 418906add50a84c04f07a5f7b65cf4a611ddc4e7 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 22 Aug 2017 17:24:26 +0200
Subject: [PATCH 15/67] Fix bad ordination in mobile pandora events list -
 #1169

---
 pandora_console/include/functions_events.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index fe34c2ebdb..c4c85cd85b 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -126,7 +126,7 @@ function events_get_events_no_grouped($sql_post, $offset = 0,
 
 function events_get_events_grouped($sql_post, $offset = 0,
 	$pagination = 1, $meta = false, $history = false, $total = false, 
-	$history_db = false, $order = "ASC") {
+	$history_db = false, $order = "DESC") {
 	
 	global $config; 
 	

From bc557573ec453c790f378d7789571b5f056f0d4c Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 23 Aug 2017 10:19:56 +0200
Subject: [PATCH 16/67] Fixed combo in editor

---
 .../include/functions_networkmap.php          |  2 +-
 .../include/functions_pandora_networkmap.php  |  8 +++--
 .../operation/agentes/pandora_networkmap.php  | 30 ++++++++++++++++++-
 .../agentes/pandora_networkmap.view.php       |  1 +
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index c775ef0329..7393c083e9 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -1447,7 +1447,7 @@ function networkmap_open_graph ($layout, $nooverlap, $pure, $zoom,
 	$head .= "size=\"$size\";";
 	
 	$head .= "\n";
-	
+
 	return $head;
 }
 
diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php
index 641f9e850b..4048ee5072 100644
--- a/pandora_console/include/functions_pandora_networkmap.php
+++ b/pandora_console/include/functions_pandora_networkmap.php
@@ -69,6 +69,7 @@ function networkmap_process_networkmap($id = 0) {
 			$layout = "spring2";
 			break;
 	}
+
 	$simple = 0;
 	$font_size = 12;
 	$nooverlap = false;
@@ -85,7 +86,7 @@ function networkmap_process_networkmap($id = 0) {
 		case 1:
 			$recon_task = db_get_row_filter('trecon_task',
 				array('id_rt' => $networkmap['source_data']));
-				
+			
 			$ip_mask = $recon_task['subnet'];
 			break;
 		case 2:
@@ -140,7 +141,7 @@ function networkmap_process_networkmap($id = 0) {
 			$filename_dot .= "_nooverlap";
 		}
 		$filename_dot .= "_" . $id . ".dot";
-		
+
 		file_put_contents($filename_dot, $graph);
 
 		switch (PHP_OS) {
@@ -154,11 +155,12 @@ function networkmap_process_networkmap($id = 0) {
 				break;
 			default:
 				$filename_plain = sys_get_temp_dir() . "/plain.txt";
+
 				$cmd = "$filter -Tplain -o " . $filename_plain . " " .
 					$filename_dot;
 				break;
 		}
-		
+
 		system ($cmd);
 		
 		unlink($filename_dot);
diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php
index 85acec24d5..2c1bd6f29c 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.php
@@ -207,12 +207,14 @@ else if ($update_networkmap || $copy_networkmap || $delete) {
 		
 		$recon_task_id = (int) get_parameter(
 			'recon_task_id', 0);
-			
+		
 		$source = (string)get_parameter('source', 'group');
 		
 		$values = array();
 		$values['name'] = $name;
 		$values['id_group'] = $id_group;
+
+		/*
 		if ($source == 'group') {
 			$values['source'] = 0;
 			$values['source_data'] = $id_group;
@@ -225,6 +227,32 @@ else if ($update_networkmap || $copy_networkmap || $delete) {
 			$values['source'] = 2;
 			$values['source_data'] = $ip_mask;
 		}
+		*/
+
+		switch ($method) {
+			case 'twopi':
+				$values['generation_method'] = 2;
+				break;
+			case 'dot':
+				$values['generation_method'] = 1;
+				break;
+			case 'circo':
+				$values['generation_method'] = 0;
+				break;
+			case 'neato':
+				$values['generation_method'] = 3;
+				break;
+			case 'fdp':
+				$values['generation_method'] = 4;
+				break;
+			case 'radial_dinamic':
+				$values['generation_method'] = 6;
+				break;
+			default:
+				$values['generation_method'] = 2;
+				break;
+		}
+
 		$description = get_parameter('description', '');
 		$values['description'] = $description;
 		
diff --git a/pandora_console/operation/agentes/pandora_networkmap.view.php b/pandora_console/operation/agentes/pandora_networkmap.view.php
index 5b34ee442c..5c5d2969c4 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.view.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.view.php
@@ -756,6 +756,7 @@ else {
 	}
 	
 	$nodes_and_relations = networkmap_process_networkmap($id);
+	
 	show_networkmap($id, $user_readonly, $nodes_and_relations, $dash_mode, $map_dash_details);
 }
 ?>

From 7b949cb5bff2ef0379ff0a95a3d34239a5028f0b Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 31 Aug 2017 10:09:49 +0200
Subject: [PATCH 17/67] Added function to get all interfaces

---
 .../include/functions_networkmap.php          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index c775ef0329..ec1db59247 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -1808,6 +1808,26 @@ function networkmap_get_new_nodes_from_ip_mask($ip_mask,
 	return $agents;
 }
 
+function modules_get_all_interfaces($id_agent) {
+	$return = array();
+	
+	$modules = db_get_all_rows_filter('tagente_modulo',
+		array('id_agente' => $id_agent));
+	
+	if (empty($modules))
+		$modules = array();
+	
+	foreach ($modules as $module) {
+		if (preg_match ("/(.+)_ifOperStatus$/" , (string)$module['nombre'], $matches)) {
+			if ($matches[1]) {
+				$return[] = $module;
+			}
+		}
+	}
+	
+	return $return;
+}
+
 ?>
 <script language="javascript" type="text/javascript">
 	$(document).ready (function () {

From f6c6e2a6ba0af81bea2d1890cba96823336b41d2 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 31 Aug 2017 15:09:04 +0200
Subject: [PATCH 18/67] Add show_statistics option for group item - #1245

---
 .../visual_console_builder.editor.js          | 201 +++++++++++++-----
 .../reporting/visual_console_builder.php      |   2 +
 .../images/console/signes/group_status.png    | Bin 0 -> 5798 bytes
 .../ajax/visual_console_builder.ajax.php      |   6 +
 .../include/functions_visual_map.php          | 143 ++++++++++---
 .../include/functions_visual_map_editor.php   |   7 +
 6 files changed, 283 insertions(+), 76 deletions(-)
 create mode 100644 pandora_console/images/console/signes/group_status.png

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 3cea48be21..cdf1a9ac88 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -303,34 +303,64 @@ function update_button_palette_callback() {
 				alert('Undefined height');
 				return false;
 			}
-		
+			
 			$("#text_" + idItem).html(values['label']);
-			if ((values['width'] == 0) || (values['height'] == 0)) {
-				if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
-					$("#image_" + idItem).removeAttr('width');
-					$("#image_" + idItem).removeAttr('height');
-					$("#image_" + idItem).attr('width', 70);
-					$("#image_" + idItem).attr('height', 70);
-					$("#image_" + idItem).css('width', '70px');
-					$("#image_" + idItem).css('height', '70px');
+			
+			if(values['show_statistics'] == 1){
+				
+				
+				if ((values['width'] == 0) || (values['height'] == 0)) {
+						$("#image_" + idItem).removeAttr('width');
+						$("#image_" + idItem).removeAttr('height');
+						$("#image_" + idItem).attr('width', 450);
+						$("#image_" + idItem).attr('height', 80);
+						$("#image_" + idItem).css('width', '450px');
+						$("#image_" + idItem).css('height', '80px');
+						$("#image_" + idItem).attr('src', 'images/console/signes/group_status.png');
+							
 				}
-				else{
+				else {
 					$("#image_" + idItem).removeAttr('width');
 					$("#image_" + idItem).removeAttr('height');
-					$("#image_" + idItem).attr('width', $('#preview > img')[0].naturalHeight);
-					$("#image_" + idItem).attr('height', $('#preview > img')[0].naturalHeight);
-					$("#image_" + idItem).css('width', $('#preview > img')[0].naturalHeight+'px');
-					$("#image_" + idItem).css('height', $('#preview > img')[0].naturalHeight+'px');	
-				}			
+					$("#image_" + idItem).attr('width', values['width']);
+					$("#image_" + idItem).attr('height', values['height']);
+					$("#image_" + idItem).css('width', values['width'] + 'px');
+					$("#image_" + idItem).css('height', values['height'] + 'px');
+					$("#image_" + idItem).attr('src', 'images/console/signes/group_status.png');
+				}				
+				
 			}
-			else {
-				$("#image_" + idItem).removeAttr('width');
-				$("#image_" + idItem).removeAttr('height');
-				$("#image_" + idItem).attr('width', values['width']);
-				$("#image_" + idItem).attr('height', values['height']);
-				$("#image_" + idItem).css('width', values['width'] + 'px');
-				$("#image_" + idItem).css('height', values['height'] + 'px');
+			else{
+				
+				if ((values['width'] == 0) || (values['height'] == 0)) {
+					if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
+						$("#image_" + idItem).removeAttr('width');
+						$("#image_" + idItem).removeAttr('height');
+						$("#image_" + idItem).attr('width', 70);
+						$("#image_" + idItem).attr('height', 70);
+						$("#image_" + idItem).css('width', '70px');
+						$("#image_" + idItem).css('height', '70px');
+					}
+					else{
+						$("#image_" + idItem).removeAttr('width');
+						$("#image_" + idItem).removeAttr('height');
+						$("#image_" + idItem).attr('width', $('#preview > img')[0].naturalHeight);
+						$("#image_" + idItem).attr('height', $('#preview > img')[0].naturalHeight);
+						$("#image_" + idItem).css('width', $('#preview > img')[0].naturalHeight+'px');
+						$("#image_" + idItem).css('height', $('#preview > img')[0].naturalHeight+'px');	
+					}			
+				}
+				else {
+					$("#image_" + idItem).removeAttr('width');
+					$("#image_" + idItem).removeAttr('height');
+					$("#image_" + idItem).attr('width', values['width']);
+					$("#image_" + idItem).attr('height', values['height']);
+					$("#image_" + idItem).css('width', values['width'] + 'px');
+					$("#image_" + idItem).css('height', values['height'] + 'px');
+				}
+				
 			}
+			
 			break;
 		case 'percentile_bar':
 		case 'percentile_item':
@@ -613,6 +643,7 @@ function readFields() {
 		$("input[name='line_width']").val());
 	values['line_color'] = $("input[name='line_color']").val();
 	values['label_position'] = $(".labelpos[sel=yes]").attr('position');
+	values['show_statistics'] = $("input[name=show_statistics]").is(':checked') ? 1 : 0;
 	
 	if (is_metaconsole()) {
 		values['metaconsole'] = 1;
@@ -1140,6 +1171,17 @@ function loadFieldsFromDB(item) {
 					}
 				}
 				
+				if (key == 'show_statistics') {
+					if (val == "1") {
+						$("input[name=show_statistics]")
+							.prop("checked", true);
+					}
+					else {
+						$("input[name=show_statistics]")
+							.prop("checked", false);
+					}
+				}
+				
 				if (key == 'type_graph') {
 					$("select[name=type_graph]").val(val);
 				}
@@ -1427,6 +1469,9 @@ function hiddenFields(item) {
 
 	$("#enable_link_row").css('display', 'none');
 	$("#enable_link_row." + item).css('display', '');
+	
+	$("#show_statistics_row").css('display', 'none');
+	$("#show_statistics_row." + item).css('display', '');
 
 	$("#preview_row").css('display', 'none');
 	$("#preview_row." + item).css('display', '');
@@ -1621,11 +1666,13 @@ function set_static_graph_status(idElement, image, status) {
 			data: parameter,
 			success: function (data) {
 				set_static_graph_status(idElement, image, data);
-				if($('#'+idElement+' table').css('float') == 'right' || $('#'+idElement+ ' table').css('float') == 'left'){
-					$('#'+idElement+ ' img').css('margin-top', parseInt($('#'+idElement).css('height'))/2 - parseInt($('#'+idElement+ ' img').css('height'))/2);	
-				}
-				else{
-					$('#'+idElement+ ' img').css('margin-left', parseInt($('#'+idElement).css('width'))/2 - parseInt($('#'+idElement+ ' img').css('width'))/2);
+				if(values['show_statistics'] == 1){
+					if($('#'+idElement+' table').css('float') == 'right' || $('#'+idElement+ ' table').css('float') == 'left'){
+						$('#'+idElement+ ' img').css('margin-top', parseInt($('#'+idElement).css('height'))/2 - parseInt($('#'+idElement+ ' img').css('height'))/2);	
+					}
+					else{
+						$('#'+idElement+ ' img').css('margin-left', parseInt($('#'+idElement).css('width'))/2 - parseInt($('#'+idElement+ ' img').css('width'))/2);
+					}
 				}
 			}
 		});
@@ -1660,15 +1707,25 @@ function set_static_graph_status(idElement, image, status) {
 }
 
 function set_image(type, idElement, image) {
-	if (type == "image") {
+	
+	if(image == 'show_statistics_bad.png' || image == 'show_statistics_ok.png' || image == 'show_statistics_warning.png' || image == 'show_statistics.png'){
 		item = "#image_" + idElement;
-		img_src = "images/console/icons/" + image;
+		img_src = "images/console/signes/group_status.png";
 	}
-	else if (type == "background") {
-		item = "#background_img";
-		img_src = "images/console/background/" + image;
+	else{
+			
+		if (type == "image") {
+			item = "#image_" + idElement;
+			img_src = "images/console/icons/" + image;
+		}
+		else if (type == "background") {
+			item = "#background_img";
+			img_src = "images/console/background/" + image;
+		}
+			
 	}
-
+	
+	
 	var params = [];
 	params.push("get_image_path=1");
 	params.push("img_src=" + img_src);
@@ -1682,6 +1739,12 @@ function set_image(type, idElement, image) {
 		url: get_url_ajax(),
 		success: function (data) {
 			$(item).attr('src', data);
+			
+			if(image == 'show_statistics_bad.png' || image == 'show_statistics_ok.png' || image == 'show_statistics_warning.png' || image == 'show_statistics.png'){
+				$(item).attr('width', 450);
+				$(item).attr('height', 80);
+			}
+			
 		}
 	});
 }
@@ -2173,21 +2236,28 @@ function createItem(type, values, id_data) {
 				
 			}
 				
-			if ((values['width'] == 0) || (values['height'] == 0)) {
-				// Do none
-				if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
-					$image.attr('width', '70')
-						.attr('height', '70');
+			if(values['show_statistics'] != 1){
+				
+					if ((values['width'] == 0) || (values['height'] == 0)) {
+						// Do none
+						if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
+							$image.attr('width', '70')
+								.attr('height', '70');
+						}
+						else{
+							$image.attr('width', $('#preview > img')[0].naturalWidth)
+								.attr('height', $('#preview > img')[0].naturalHeight);
+						}			
+					}
+					else {
+						$image.attr('width', values['width'])
+							.attr('height', values['height']);
+					}
 				}
-				else{
-					$image.attr('width', $('#preview > img')[0].naturalWidth)
-						.attr('height', $('#preview > img')[0].naturalHeight);
-				}			
-			}
-			else {
-				$image.attr('width', values['width'])
-					.attr('height', values['height']);
-			}
+				// else{
+				// 	$('#image_'+id_data).css('width', values['width']+'px');
+				// 	$('#image_'+id_data).css('height', values['height']+'px');
+				// }
 /*
 			var $span = $('<span></span>')
 				.attr('id', 'text_' + id_data)
@@ -2245,8 +2315,32 @@ function createItem(type, values, id_data) {
 					.append($image)
 					.append($input);				
 			}
-
-			set_static_graph_status(id_data, values['image']);
+			
+			if(values['show_statistics'] != 1){
+				set_static_graph_status(id_data, values['image']);
+			}
+			else{
+				set_static_graph_status(id_data, 'show_statistics');
+			}
+			
+			if(values['show_statistics'] != 1){
+				
+					if ((values['width'] == 0) || (values['height'] == 0)) {
+						// Do none
+						if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
+							$image.attr('width', '70')
+								.attr('height', '70');
+						}
+						else{
+							$image.attr('width', $('#preview > img')[0].naturalWidth)
+								.attr('height', $('#preview > img')[0].naturalHeight);
+						}			
+					}
+					else {
+						$image.attr('width', values['width'])
+							.attr('height', values['height']);
+					}
+				}
 
 			break;
 		case 'auto_sla_graph':
@@ -2580,9 +2674,9 @@ function updateDB_visual(type, idElement , values, event, top, left) {
 		case 'static_graph':
 			if ((event != 'resizestop') && (event != 'show_grid')
 				&& (event != 'dragstop')) {
-
-				set_static_graph_status(idElement, values['image']);
-
+					if(values['show_statistics'] != 1){
+							set_static_graph_status(idElement, values['image']);
+					}
 			}
 			break;
 		case 'percentile_item':
@@ -2811,6 +2905,9 @@ function updateDB(type, idElement , values, event) {
 }
 
 function copyDB(idItem) {
+	
+	console.log(idItem);
+	
 	metaconsole = $("input[name='metaconsole']").val();
 
 	parameter = Array();
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index 1baaab1cd5..fa997be6e5 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -357,6 +357,7 @@ switch ($activeTab) {
 							break;
 						case GROUP_ITEM:
 							$values['id_group'] = get_parameter('group_' . $id, 0);
+							$values['show_statistics'] = get_parameter('show_statistics', 0);
 							break;
 					}
 					$agentName = get_parameter('agent_' .  $id, '');
@@ -410,6 +411,7 @@ switch ($activeTab) {
 				$width = (int) get_parameter ("width", 0);
 				$height = (int) get_parameter ("height", 0);
 				$period = (int) get_parameter ("period", 0);
+				$show_statistics = get_parameter ("show_statistics", 0);
 				$process_value = (int) get_parameter ("process_value", 0);
 				$percentileitem_width = (int) get_parameter ("percentileitem_width", 0);
 				$max_value = (int) get_parameter ("max_value", 0);
diff --git a/pandora_console/images/console/signes/group_status.png b/pandora_console/images/console/signes/group_status.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd3f76a5f3bfb1ea2dad7558667c60d12652d839
GIT binary patch
literal 5798
zcmZ8lWl$VUlU`hcExr)kgKKzkmc<ES2^My7cXyY?AxI#&y9FnB2%6yT7Tn!KINrOe
ztNU(hemv7Zx_V~1`|0jTHC1_BYzk}u0D!Bg08s}3kP2R~DJJ?0f@3-?z8pZVvO2CG
z9L!xkjGWB?(xwi^X0(cSMiyr3W=5u7PCw1W002@2MToS9=c2J8c~~H@-}CY2_<3WU
z&dA6}j+tPyFPiK*{DTTF?!eYS@H@u?ki4+yy8yDxr~N4wwJW@*RAVzUgo!K9Zaeqv
zcPTt#U*lWJ*G9C&rF#$30(D}VNo!MMWaR2NZ+kfB9qS3WzSz~#^f(PZ7)n9EqgPPG
z`(FWMz6|X0)`>HX*aZF#0$lrlTh4Is`0kpy>RkC?=xz9rAl`bc%9;B2{`QsrW5URH
z-NFzh$*nEKYwW@FpuWGkV;^$qsVYjsWW@!S0YnX@q^9I(A(Q~r@iW_D39pMSNfwsf
z8dh5J@DD@2Izq;Z*5C0Et<gvQ?88%J2G!D5F~&BP^oP>+e*^Dw0y@4g81|t_xd-#i
zBrWe-yaL6EWn-IvZBN0rk07)TIrbZm{PBEsi56BOjce=+FfHly#Jm<aeM5q85pFZm
zPZ2W6i)=r5z$Jfv<!;G9f-Z$;X0g+4O~WB{-q>54;{1)GQl^-ig0o3p96|$7vBD42
zgW=Hz%1x-T?MbcAR>4k#aJ7OaXhCA@b6*W`5)%_6py(13ofDW8rh&1scAm2}J-`}*
z3Ic6qGHscZaaN8}l8!xfMilNg)ONu*vA8&~KQWcm0?RQR7?UB<`26^V7%g7_D7pGb
z3b>_>4h$Kw#*(d~QqEDxvu9j5T#a|jC<k&Yp7kN!%0-}}CD}%Wd}e^GFst(f139rJ
z53icR#lsTSIwnLL|DZki!FTTxX>Wzs^wQ9r_EuARhatKfnMjY*HV(NZCsLV{>-PIY
z?I`wkNY@kYVfgQ%qTC5=H3;pkM?z2{?Rgmislpx>^5=TPosgq}w-YE7j#7BG&VWIG
zowZC2{=MuZ&jm(I)rFv_U}71{&#yx(S5@91QSa?J?-g*>d=vv?q0FtLd#iRch1p6r
zIpLb}!V4r&GuA_y2gd7paUz^7H>dgG%uDEmf&J%^ql(|uw^(yGQwd5p1+dZYBT!tY
zr316Fp2Ye2FD(agc<yeFVR`B4i>L&Yw17vg$|)WkNVF7zEJuVtKmj^kCfThnq!s3m
zVFP9H4=G}>0o`Gz*k{r63aB%s<l@AW?T4C-#t|hlSDln;F3qoRW&1guto&4_wVYlt
zt3KgcQf!Y<d<YVbYffuxV~uxJNL-_{>k^F=##~PDYEFx9a2QiWrc*q_7e*jdy43`0
z)xvv^-Br{nA-SZeiKz68jDrghkp{ZK=!VWb8saz?dddcx$sqfXe<-)ZP|xqLc~j%a
z?prE_z9QU{Je#Aw*cxQ4%O~lPal%;2xD)`QqS<7>suc=DfExd-H$QvnH=-VgFRIW}
zVj@rQVE^?O$RtL6d;OfmEB__wk8o!Nl37EJxrqrp6Xn6l&knip-Rj<oc%*8IxeyCO
z4<K~+_OTuRntNz+JD#ZPBgN8?xlj!5&n2zdS(wKhs*x#Vr3%RAD9?;&!qIuB7Q8n5
zKH%5oSq5bn=XcpTH;=576XDHqv{H8TldoI~Sp6&>ui1Nx2@hp4ihl?4t?Ngf^Ej3N
z+7)GqH2;iSjvD)_M~Qac85kd1U{AoKm8P?w*eF9Nv8rL&jb!5V5%Q*ZQ}%g<%AELw
zUnqZY+|lQoqhC`6`}pk6gN{+_*u=>=$r-XW=l#evim1Nk?E$f2Rk{m{B|3=ZlM(r-
zD%=7yT;ScdQ4@EYs3Lful(3B`5fwbSVFH_9k%e9zdu68<$<yA$$J$_zodHZc`=pAA
zIKi~Sgvv)ie^kTM7^e)(d>))cGwfHdtP*&rk`*!FL18G4!Ngbapp3$zb-?RDW)e1f
zD6|-c_76gNlY8T1kEcaHf7_w(;q!-l)>`qlG%ttMjF~?US4<ELNQpRj+EdJ5kRo>a
z!|%P1TwgwERm|-BN=Pb;5Vl7BG<B{rg-7tX={>_mr$rzA4xM@ygSH@G#?tbGW05^y
zJdwm?MIe~bi`12o4kF>qNGFmzHQ-c66(n(L;Lp}N>MAlb7`Y*$UMj3HPN%;siYkkT
zAa7ux5@GWTY=ep1=-)g)?qUS)FS=W;b*WmGxT}y%qb}`!n5>%jbEb;2$~MSidYtOA
zSadCd{XJ|sPPxKex&hh?Z5(23E2O1v92uLknbZ<CS7XoqIx0rba`<(&GaHSw5iJXB
z$d`)4l4yDV@I#aJ@yz2^kYDH7``r`H;03GM5j#S8X{0;Ta*Z&tThi7rtZtzhVtQy2
zyp*&{(=;2#YgdG8tKv1AvKHWPo3B26A2=8vmD`e(e9b$lm@h=6Qe9KQxf3tU22?B4
zlMlryVjGDl(npUH*9JbXrJw$^{rU`>>Y?gtk{vFaplK`9VKsXf<euu!?8e7ZO!W|l
zSv$73u4)cnqS}-=H93phD#l4!y|<FH72o=rp`v{(LWB+}eDJ<!BfmZZtd~%Uz?MD_
z9)zY&0L4=c!E6SY(RCV*j#(K#3~w6CIDdbF;hhv3mbn>>x)R$kR<t?PbB6_}uN0YU
zza{&4Y{)7+b-%b?d4%yw2YoRv-PGKI)AcPZV2OCs>P?lAW<=#x7>L)VHY0#V&^;mX
z0hr=OA)kLY_scDR8U?9>qVK&m%I7%BCuJe2?p%ZG+jmjN)(^-2d(UsVC02`5W4_8V
z%_9728?72gHr88;#Ffm$xm0y6!s?ehxRaa2HHYlFu3TEwx(4Dj{8*K)GdpW<e`_#J
z*viA&s}>wjfmXFT%R_Ga^PRCJ4Nra`!TLr6gMGT9{qV_89fj`Yx(sn7$BjhbIL6S|
ziV@x8jDlU&<x0DguYf_wW%Ub3PCWEZ<RA6sN~S{z!L~hle$_-+bfE;{JqAegq8TZr
z`NA=x6#KMz!4P$>%;1IO2Ch=KwePW4oVv1L8pav~``pYM-3Bf@s2(y?sVq}(M1KCf
z*cY$j&GSs3(-!WeQ8CF@*3~a9E~8$f_c>oi3j)BHFZ#(SPAz4KWj|RrE?#<fRBI5*
zj7>~T3~p>}yhM<-Ibp(1T&QEnQ|Il?&53L8^b+G{qKs4qVLX9-Yr=w0J(39j`J$!3
zPO=7=@fB8V><35|(a?n_34PZ2`MH;Yva7*Q28f7>i3!81qbepa48j=tfA`=>0RO8Y
z8{)9MzMnr8w=>CAfCzHLj6*25t+<3lKfTm;IyoGO$V~=<>05IRL%eOX?N1hBao3Kk
ztd7TtPw?k?B<)_o!~&jnb=%X#ngsgg9+xrK&`(}@;(Ic-aOnH)>KXA1`8cSq4Q1j9
zh?r2M-df-e9moCwMvf~FZl4ohz<nKBKYYthcBMY;ZZM&y{Zz5o=3@y7g~%d#Aad8b
zd?QwHhryoA0xS0xIOy^iqB86FkPOmb+#3_98=kPxyfK)0)5Z74Rh9>0<PR*pBw=Wj
zS2bi*T693|S^whVFey7+WA^qYXqQp%RMdeoJI#xhG6i`Y8}%Cp1(f~K+KGQ7P5RF2
zF-BdgNr#oo^!IfcB6pS^_mXN){<C?nEYd<s8gc6rJl?#~m{doD>kdnL;fB{MCxc{*
z7tK_HNEPIcrp=5Z*&7Qf3RF{WYxk~8-+vH8=<w*}QU2iZz8fd6#8yG6<d}_b+O>t^
z>o#4etkoTH_pBOKX+yKI`?$xLbt9A@ATZ92)np}Q^lzeqg@;_NBl$jPzhK@*-3npb
zkKH#$cP}<-8c2Gq%l3Y2!8vr-#-&*dxcl?ywub#-@}JN`O%QgyX2s;|MKqW+&cSCZ
z^eTyj62q3|XL#*D@}E^|w|I$**Y>{>>V3Oc%?Mb%wti{=vW5yCNp{x(!-x3z8^%D|
z8Y2VG;yGXJzs6PCa@;&r{~6V!2(emt9~NwljR_tiB5i6jT23aEQNnzUffgDs7){3U
z2I<mgeE6F}c=l75zU2~$M)H#s+1~SdTUxLj#R5a3b)<73l#f4Y;UE{lG-7ZjLdth#
zrNTZSCwJ?ZPVhd~fb&?i_ImKp;1_9f-h1k|_WZqWSP967Z(Y?(r1@9*zuMf7H$%vI
zqc<-d`hL5FVgd4k^)3;vvwBJ8osW~*;RI;%6T#5lpP3{Cp~JTu3DaLVei`-u#Y1<S
z|84Iof6ACIC7c_GeBbiD^qnp9vYp!z0U{v42rK3ejO8BcSD?e;TWxgD$2N(y+hI8~
z&X<lMQy!1_`4L@ySnR9{-ANW{u9%c~bemM2g`amJ426>ro5`9b)SRxsOu1QWGaixT
zZHsj05e7*ukqS#w{s2cIGnel6V<qtXN+Wvc6rLmKo3`$9rowS4-Dl{ZBHoo4wm^2-
z*s5^ZPQPu4vkGGHAK7oSU{)Qu=L}0~CpDzc$}yN(|DhIvnHGs0LIK3mHQggY!$pkh
zHwLb0OK|l!Qomvfn)jt6Ix)%V_5Ye*V6ON??t@N)#@*1j`6$tTKkS36&6CPb4}S24
z+x;jK{Wv+@*<?AG-d|=HTEObf|58EbDsX;D7E=~Cybrg7Q^v||0N<KJNQi1mIhR(@
zO6kTdcHf>#NoNb}4Ok?TI6F&Q>8A5NRoMEe;qC71Sjz~CkP$kNF`Y>2W#e{!Js=@@
zQVFRG@~rE0S-t9V+<>>O;C1e9ZJ8EoCD|1V8+?9~AAi>&kuX*#OHYWxnIBC`j|oNB
zy<zx|Y!n|6D$GsqUBL*Xr#k9CB!*VZ==MJd&_VbxFfd@Nj@2vn4s4O3XZ2lOpU_M8
zNr0;M4i4-^p=X$u9v-*T0orF=km!6%FIU&A{odYCb=6Y*>3tNsP<|NgOQr>5@)G<Z
z$?d4eiao&YIh!%(D`e~@uwtA{jEGS$g<7^v1pm%&QmfIi)YIUcPOhkilf2PuIrydd
zs>+=%ST=9`08Bq^zX+b5)WWF9ldZJ_7h(~yq>n$wtzHfPe9B7m;pdmY*XN78-TmW#
zdf(}C0{V;e(!~M*(~Wl0wK~(V4UsTbB>=z?<nbvQ0X7m7<n`u|$nkJ>wLLjFa2632
zWpf7rbigfeccr4l`kI<tPLnm4zJ2Ev<13v|xwf`8?d?l1B@h5Wh&44lJS={@8Al6^
z@`b^p+gw_fbpiq;!KeU0WP-bbjEIOxKm6T4@$>x7+>4#g+rK6{J0+Be0DuE?Yip&v
zHqNGS;%(6JuA4RhU`hN*(5(6CmX(*ndF71~J^-MOpbC32ofjDZkcxS^z<&VCMYp8^
z|HXvGjx~@(mX*G9OXk$llClj7z*3M`De3Ruzbe_6>)j}RKB84P09xc9t^h!w1?s+|
z&qLkiX4YnMj^d!?%yGNGw>1#RbLjRtDeS$Q<ciJI_v~N0-&Dp{+&UjOQ(X>Mi{|Gl
zj~C#IZT|fmN7wi-<@I(qO7h`m;+FU0val_@W2j@-zof+F-O901zH3j*)ov}sYW&gz
zkE+^N3-+)vN``Bb6R!U{R&4jj9dviGx23%6dTUPjQC}G3WtYCM2`ZOJ+9{bmJggG!
z#pEjyll)+{W!)~_?|nUWNG2=2dkCj`;1CgQMM1FcWxG=h?;d)9(5OT_Zo}S#Pd)4|
zGF>)iC%#*xjXe(djZ!s-cw1>(bof0vE4#|oQ>!p&YLZsd&E{RMuDJ3gq-JE^d41*A
z>ul>S{R(TeJI{VI6uCgDxodY6Fe4m5tFd+5@VL#5WsT89poz|A|G=mYb<1$`p2`Qh
zg_BDc!|xAW&8|#+nE3u4SXu#@xi0KgpPXxyIDX(n=G@k}+|?}Ay7y7sA9|mD<TGt9
z=9)3<oibgj4+qC?ml@!5MYUdBZO?R!KEgUx|GaL*no{Tk5!}T!tcYM%U@V!${WAEh
zZHuQ6rq|QfWMNwCS7CqcqvKtt;-D)~exi%E6SD}2rMII?1b#VJ`Vf(?=K1rc?vGrX
zzCu4~zF&2GFOc5B)Mj_?k{AYD+GFKb?D5T32=}TR83a{~>U*826;Y+RvDYSAHu6{L
zctlJP#Zk?w55(H^PVE>B8Q!_Ef^=bp0_s&})x9^Z(|Jk5qJkB47h)^AVmw3$<!v`F
zYSXDkGY>UmZxjj*ujBRWYnt#Vt+om4m&Xy`xQk7ZN52t3G~X=DQ)<!|=-k?*NMrG}
zH^w1989x&ht-;DwNt_$SMMi>Ves3S7`)QS`Z&$TKOO+&<0MeH+ADcn-9jsy&c;$>r
zge>?De@peOidt<@he3^WM%1#)nsQFs7=0i0N>rIXF-7uLv9y=k*kD<iDJGufi6Mh_
zyca{>t}*6)pgfbC%htAz3KX-c!X9?69?538Xs4%)oEj-RCF@ubzLc+8{gTmfLcoA|
zof0e-E#16nja3&3wvu-F2Rc8-tGyFhI8?N`l}GAOs~Hajxn6cuJJ`HI*XsY3IdJKN
zCMEYie6(Ih*2*Y+c}q6HXH#a)<(MZKqGDGBR9??WGym6-N&BSGhmUgSn8z?EoPE3+
z=1Ofy7`kS}cglsmj2>P$VY6CM=Yz$CdMcWP^g7DK(v85alhi`C`nDLw1Iz`*b;_by
zH)7Df56%J2&!kM|POFmE&7ED#ZgUE${MIN(UgTKO9j#n8GB(}@2dq&J;qTfP=|J1k
z1)Yq8?3b`%An`@L=)nl;D=K2GI&mJaEKY}IU$GSd=(myAm{w}}1WuVfDmE#X^8V-&
zKj}fZ4f!W?*e~B0<RH@^jvpH%ki!7gjhlIkJ(5<D^BEmWT@CY{3%xt_mgatXX<W5x
ziKd*03S)#(9(ECQgZ5Iw$Vy=7rgx@8IeR9iKrK14y-(QgyS_fR(fE(Z2DS9gTCkJi
zYQZ^Ws9B@)B()eD&6}<o=jwKkl82h!IS1(b`Z+xcf?^v6=}F6p)$Z@nblez(<W=Z=
zxXoZJ>2q6d{2d`4e{^=$kEJ04X}y}3103~*r_5&O#!ljYPC1z`DL&^k=R6C{G%Ret
z-swY6?tpaLo?5e~pS|}%Hn{Y%UfYRdxiJnN^nn}^P7ePY%$2IY-}%~nzFX?OFXwa#
z7HOoY!K+d!x7bdJZKhBt5Octj`dtcztA#@`u0_g1f562_rtce`B1Jqn<p$aLlP3yl
zChnz96>e!xmbAR|*?Tty$<Ho`cFupwX!y%zFC<0Q{4#mlqu}k&Npw=)yfmd<4v|7m
zK=5k8&aw;I;rEXfN+668HzvE15nT_fTKXf&=)T{U4i2a8el+iA3-A5p6omvUF;3YT
z?<5!if%3znqasD>`wDq#cY}XKUE~0Onj^6Uqt=(6!J7Jo9-^2l)F=P|4$08{|IZfx
z%O4Sh1?TtoUP@R1K#FEeoXz3Opf^y?@%gXclW>MY3^w9N9|D13STw)|0CK4dnI?&~
zVJSy{TIok|qx$ljSf~$APTVi<#h6}3#<gr;hDQH~0r4d1qB!MJShId^JIm<l>5V!c
z?Yw9h8Czb4n}wf*<I}{ob#;Om!Ge*{Kw&$NPnyKy0Km6FlvZ*kiGRuYzt_0yAB@@d
VvrUfo>}UT96lGN*)nLQm{{p6x=VAZ=

literal 0
HcmV?d00001

diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 6f2bae0b40..e854a31c49 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -132,6 +132,7 @@ $get_element_status = get_parameter('get_element_status', 0);
 $enable_link = get_parameter('enable_link', 1);
 $type_graph = get_parameter('type_graph', 'area');
 $label_position = get_parameter('label_position', 'down');
+$show_statistics = get_parameter('show_statistics', 0);
 
 switch ($action) {
 	case 'get_font':
@@ -569,6 +570,9 @@ switch ($action) {
 						if ($height !== null) {
 							$values['height'] = $height;
 						}
+						if ($show_statistics !== null) {
+							$values['show_statistics'] = $show_statistics;
+						}
 						break;
 					case 'module_graph':
 						if ($height_module_graph !== null) {
@@ -640,6 +644,7 @@ switch ($action) {
 					switch ($type) {
 						case 'group_item':
 							unset($values['id_group']);
+							unset($values['show_statistics']);
 							break;
 						case 'module_graph':
 							unset($values['image']);
@@ -948,6 +953,7 @@ switch ($action) {
 				$values['width'] = $width;
 				$values['height'] = $height;
 				$values['id_group'] = $id_group;
+				$values['show_statistics'] = $show_statistics;
 				breaK;
 			case 'simple_value':
 				//This allows min, max and avg process in a simple value
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index dcb4123113..91442813f0 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1274,35 +1274,130 @@ function visual_map_print_item($mode = "read", $layoutData,
 				
 				$varsize = getimagesize($img);
 				
-				if ($width == 0 || $height == 0) {
-					if($varsize[0] > 150 || $varsize[1] > 150){
-						echo html_print_image($img, true,
-						array("class" => "image",
-						"id" => "image_" . $id,
-						"width" => "70px",
-						"height" => "70px",
-						"title" => $img_style_title,
-						"style" => $borderStyle.$imgpos), false,
-						false, false, $isExternalLink);
+				
+				if($layoutData['show_statistics'] == 1){
+					
+					if (get_parameter('action') == 'edit') {
+								
+						if ($width == 0 || $height == 0) {
+							
+						 echo '<img id="image_'.$id.'" src="images/console/signes/group_status.png" style="width:450px;height:80px;'.$imgpos.'">';
+						}
+						else{
+						 echo '<img id="image_'.$id.'" src="images/console/signes/group_status.png" style="width:'.$width.'px;height:'.$height.'px;'.$imgpos.'">';
+						}
+						
 					}
 					else{
-						echo html_print_image($img, true,
-						array("class" => "image",
-						"id" => "image_" . $id,
-						"title" => $img_style_title,
-						"style" => $borderStyle.$imgpos), false,
-						false, false, $isExternalLink);
+						
+							$agents_critical = agents_get_agents(array (
+										'disabled' => 0,
+										'id_grupo' => $layoutData['id_group'],
+										'status' => AGENT_STATUS_CRITICAL),
+										array ('COUNT(*) as total'), 'AR', false);
+						
+							$agents_warning = agents_get_agents(array (
+										'disabled' => 0,
+										'id_grupo' => $layoutData['id_group'],
+										'status' => AGENT_STATUS_WARNING),
+										array ('COUNT(*) as total'), 'AR', false);
+										
+							$agents_unknown = agents_get_agents(array (
+											'disabled' => 0,
+											'id_grupo' => $layoutData['id_group'],
+											'status' => AGENT_STATUS_UNKNOWN),
+											array ('COUNT(*) as total'), 'AR', false);
+														
+							$agents_ok = agents_get_agents(array (
+											'disabled' => 0,
+											'id_grupo' => $layoutData['id_group'],
+											'status' => AGENT_STATUS_OK),
+											array ('COUNT(*) as total'), 'AR', false);
+											
+						 $total_agents = $agents_critical[0]['total'] + $agents_warning[0]['total'] + $agents_unknown[0]['total'] + $agents_ok[0]['total'];
+						 
+						 $stat_agent_ok = $agents_ok[0]['total']/$total_agents*100;
+						 $stat_agent_wa = $agents_warning[0]['total']/$total_agents*100;
+						 $stat_agent_cr = $agents_critical[0]['total']/$total_agents*100;
+						 $stat_agent_un = $agents_unknown[0]['total']/$total_agents*100;
+							
+							if($width == 0 || $height == 0){
+								$dyn_width = 450;			
+								$dyn_height = 80;
+							}
+							else{
+								$dyn_width = $width;			
+								$dyn_height = $height;
+							}
+							
+							
+							echo '<table cellpadding="0" cellspacing="0" border="0" class="databox" style="width:'.$dyn_width.'px;height:'.$dyn_height.'px;text-align:center;';
+							
+							if($layoutData['label_position'] == 'left'){
+								echo "float:right;";
+							}
+							elseif ($layoutData['label_position'] == 'right') {
+								echo "float:left;";
+							}
+							
+							echo '">';
+								
+								echo "<tr style='height:10%;'>";
+									echo "<th style='text-align:center;background-color:#9d9ea0;color:black;font-weight:bold;'>" .groups_get_name($layoutData['id_group'],true) . "</th>";
+								
+								echo "</tr>";
+								echo "<tr style='background-color:whitesmoke;height:90%;'>";
+									echo "<td>";
+										echo "<div style='margin-left:2%;color: #FFF;font-size: 15px;display:inline;background-color:#FC4444;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_cr, 2)) ."%</div>";
+										echo "<div style='background-color:white;color: black ;font-size: 15px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Critical</div>";
+										echo "<div style='margin-left:2%;color: #FFF;font-size: 15px;display:inline;background-color:#f8db3f;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_wa, 2)) ."%</div>";
+										echo "<div style='background-color:white;color: black ;font-size: 15px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Warning</div>";
+										echo "<div style='margin-left:2%;color: #FFF;font-size: 15px;display:inline;background-color:#84b83c;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_ok, 2)) ."%</div>";
+										echo "<div style='background-color:white;color: black ;font-size: 15px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Normal</div>";
+										echo "<div style='margin-left:2%;color: #FFF;font-size: 15px;display:inline;background-color:#9d9ea0;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_un, 2)) ."%</div>";
+										echo "<div style='background-color:white;color: black ;font-size: 15px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Unknown</div>";
+									
+									echo "</td>";
+								echo "</tr>";
+							echo "</table>";
+						
+						
 					}
+		
 				}
 				else{
-				echo html_print_image($img, true,
-					array("class" => "image",
-						"id" => "image_" . $id,
-						"width" => $width,
-						"height" => $height,
-						"title" => $img_style_title,
-						"style" => $borderStyle.$imgpos), false,
-						false, false, $isExternalLink);
+				
+					if ($width == 0 || $height == 0) {
+						if($varsize[0] > 150 || $varsize[1] > 150){
+							echo html_print_image($img, true,
+							array("class" => "image",
+							"id" => "image_" . $id,
+							"width" => "70px",
+							"height" => "70px",
+							"title" => $img_style_title,
+							"style" => $borderStyle.$imgpos), false,
+							false, false, $isExternalLink);
+						}
+						else{
+							echo html_print_image($img, true,
+							array("class" => "image",
+							"id" => "image_" . $id,
+							"title" => $img_style_title,
+							"style" => $borderStyle.$imgpos), false,
+							false, false, $isExternalLink);
+						}
+					}
+					else{
+					echo html_print_image($img, true,
+						array("class" => "image",
+							"id" => "image_" . $id,
+							"width" => $width,
+							"height" => $height,
+							"title" => $img_style_title,
+							"style" => $borderStyle.$imgpos), false,
+							false, false, $isExternalLink);
+					}
+			
 				}
 					
 			}
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index c0c261ea57..54db2d8008 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -453,6 +453,13 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['period_row']['html'] = '<td align="left">' . __('Period') . '</td>
 				<td align="left">' .  html_print_extended_select_for_time ('period', SECONDS_5MINUTES, '', '', '', false, true) . '</td>';
 			
+			$form_items['show_statistics_row'] = array();
+			$form_items['show_statistics_row']['items'] = array('group_item');
+			$form_items['show_statistics_row']['html'] = 
+				'<td align="left" style="">' . __('Show statistics') . '</td>
+				<td align="left" style="">' .
+				html_print_checkbox('show_statistics', 1, '', true) . '</td>';
+			
 			
 			$form_items['module_graph_size_row'] = array();
 			$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos');

From 4ebc0818552131f9b8ba38508daa34e6142459e8 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 4 Sep 2017 10:26:30 +0200
Subject: [PATCH 19/67] Added image to planned downtime

---
 .../godmode/agentes/modificar_agente.php          |  13 +++++++++++++
 pandora_console/images/minireloj-16.png           | Bin 0 -> 439 bytes
 2 files changed, 13 insertions(+)
 create mode 100644 pandora_console/images/minireloj-16.png

diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index e067569640..5f8e2ffcc1 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -561,10 +561,23 @@ if ($agents !== false) {
 			'<span style="font-size: 7pt" title="' . $agent["nombre"] . '">'.$agent["alias"].'</span>' .
 			"</a>";
 		echo "</strong>";
+
+		$in_planned_downtime = db_get_value_filter('id', 'tplanned_downtime_agents', array('id_agent' => $agent["id_agente"]));
+
 		if ($agent["disabled"]) {
 			ui_print_help_tip(__('Disabled'));
+
+			if (!$in_planned_downtime) {
+				echo "</em>";
+			}
+		}
+
+		if ($in_planned_downtime) {
+			ui_print_help_tip (__('Agent in planned downtime'), false, 'images/minireloj-16.png');
+
 			echo "</em>";
 		}
+
 		echo '</span><div class="left actions" style="visibility: hidden; clear: left">';
 		if (check_acl ($config["id_user"], $agent["id_grupo"], "AW")) {
 			echo '<a href="index.php?sec=gagente&
diff --git a/pandora_console/images/minireloj-16.png b/pandora_console/images/minireloj-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..b78bb2e5aa21475f0f422fe4454826f9bfd03f0e
GIT binary patch
literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s7X!Otb0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzSxH1eRCwBAU;qMpdwT~a5CLSb2M8br
z3;+;7a0FEHAFBjF0KsGxKo~<Qh|L6~1)&@R5E~?L9wcz^;K2(ZHb4NO*aB4rR*hmS
zkduJTIUsQsC|e&U2sD}zC{X~C2jT~eNUA}0KLFy1K%5W63P8n%00D&V9|vflV0d&s
z5U)q#uLp@C>neb;krWkx`Dm_oKo4LhG}|6P9gCvsJ{C8<hsl9VFa$F8BP#%UPY^0*
z$cPjXAfpSRYWhKvp!fg?Fh(rKJ3ti}V2OHA1Qr4{9>5k>{m=+SjyC~#cp=3fR2|3?
z2AC7)L!-tKi);3S;unjBAU{4}fhI+et%eMw0Z@3HX9Al304gAWt^(>;MUZV!XEz{8
z3m|);0h+=Tfto(x%RJD)1sM#A--*b{6(q4Anq&i!T!wA{C{coFN379^l!N@Cwkbdj
h1x4XTpr!@LY5{u8ieA}Ng17(x002ovPDHLkV1k@bnBM>Z

literal 0
HcmV?d00001


From 1dae6983330f89c5431e919ce2469d5e07766065 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 5 Sep 2017 13:40:57 +0200
Subject: [PATCH 20/67] Added disabled option to get ggroup agents function

---
 pandora_console/include/functions_agents.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 260596649b..838fb58d55 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -853,11 +853,13 @@ function agents_get_group_agents ($id_group = 0, $search = false,
 		//No added search. Show both disabled and non-disabled
 	}
 	else if (is_array ($search)) {
-		$filter['disabled'] = 0;
-		if (isset ($search["disabled"])) {
-			$filter['disabled'] = (int) $search["disabled"];
-			
-			unset ($search["disabled"]);
+		if (!$search['all_agents']) {
+			$filter['disabled'] = 0;
+			if (isset ($search["disabled"])) {
+				$filter['disabled'] = (int) $search["disabled"];
+				
+				unset ($search["disabled"]);
+			}
 		}
 		
 		if (isset ($search["string"])) {

From 8f9fd4cf3d8aa396b4fad7b2d64911363b92729a Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 5 Sep 2017 14:39:36 +0200
Subject: [PATCH 21/67] fixed snmp comunity field

---
 pandora_console/godmode/massive/massive_edit_modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index 7e2db21c3c..dfafbb7559 100755
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -501,7 +501,7 @@ $table->data['edit3'][1] = html_print_extended_select_for_post_process('post_pro
 			
 $table->data['edit3'][2] = __('SMNP community');
 $table->data['edit3'][3] = html_print_input_text ('snmp_community', '',
-	'', 10, 15, true);
+	'', 10, 100, true);
 
 $target_ip_values = array();
 $target_ip_values['auto']      = __('Auto');

From 5664c72f8b68644c8a650c26b4616a4c4d064acf Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 5 Sep 2017 16:23:21 +0200
Subject: [PATCH 22/67] Added option to short data or not

---
 pandora_console/include/graphs/flot/pandora.flot.js | 11 ++++++++---
 pandora_console/include/graphs/functions_flot.php   | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index b3b0f9f4b4..f3124a3c5b 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -835,7 +835,8 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 	alert_ids, legend_alerts, yellow_threshold, red_threshold,
 	force_integer, separator, separator2, 
 	yellow_up, red_up, yellow_inverse, red_inverse,
-	series_suffix_str, dashboard, vconsole, xaxisname,background_color,legend_color) {
+	series_suffix_str, dashboard, vconsole, xaxisname,background_color,legend_color,
+	short_data) {
 	
 	var threshold = true;
 	var thresholded = false;
@@ -1714,7 +1715,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				y = y / 1000000;
 			}
 			else if (y < -1000) {
-				console.log('entra por negativo');
 				how_bigger = "K";
 				y = y / 1000;	
 			}
@@ -1880,7 +1880,12 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 
 	function yFormatter(v, axis) {
 		axis.datamin = 0;
-		var formatted = number_format(v, force_integer, "");
+		if (short_data) {
+			var formatted = number_format(v, force_integer, "");
+		}
+		else {
+			var formatted = v;
+		}
 
 		return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>';
 	}
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 4eebbfe3a2..319e69cab0 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -489,6 +489,16 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 	// Trick to get translated string from javascript
 	$return .= html_print_input_hidden('unknown_text', __('Unknown'),
 		true);
+
+	if (!isset($config["short_module_graph_data"]))
+		$config["short_module_graph_data"] = true;
+	
+	if ($config["short_module_graph_data"]) {
+		$short_data = true;
+	}
+	else {
+		$short_data = false;
+	}
 	
 	// Javascript code
 	$return .= "<script type='text/javascript'>";
@@ -530,7 +540,8 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 		" . json_encode($vconsole) . ",\n" .
 		"'$xaxisname', \n" .
 		"'$background_color', \n" .
-		"'$legend_color'
+		"'$legend_color', \n" .
+		"'$short_data'
 	);";
 	$return .= "});";
 	$return .= "</script>";

From ad2cf22fa4154e72f3a236cc4f5439e3bbdc0d92 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 5 Sep 2017 17:33:38 +0200
Subject: [PATCH 23/67] Added new format to string data

---
 pandora_console/include/ajax/module.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index d97d51264f..c78c4d8adf 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -275,12 +275,16 @@ if ($get_module_detail) {
 				// Detect string data with \n and convert to <br>'s
 				$datos = $row[$attr[0]];
 
-				// Because this *SHIT* of print_table monster, I cannot format properly this cells
-				// so, eat this, motherfucker :))
-				$datos =  preg_replace("/\n/", "</br></br>", $datos);
+				$datos = preg_replace ('/</', '&lt;', $datos);
+				$datos = preg_replace ('/>/', '&gt;', $datos);
+				$datos = preg_replace ('/\n/i','<br>',$datos);
+				$datos = preg_replace ('/\s/i','&nbsp;',$datos);
+				$datos_format = "<div id='result_div' style='width: 100%; height: 100%; overflow: scroll; padding: 10px; font-size: 14px; line-height: 16px; font-family: mono,monospace; text-align: left'>";
+				$datos_format .= $datos;
+				$datos_format .= "</div>";
 
 				// I dont why, but using index (value) method, data is automatically converted to html entities ¿?
-				$data[] = $datos;
+				$data[] = $datos_format;
 			}
 			elseif ($is_web_content_string) {
 				//Fixed the goliat sends the strings from web

From 8ce6920e44cf08905630062d59498d2309afd415 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 7 Sep 2017 12:11:13 +0200
Subject: [PATCH 24/67] DB changes for visual console group elements - #1245

---
 pandora_console/extras/mr/7.sql                               | 4 ++++
 pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 1 +
 pandora_console/pandoradb.sql                                 | 1 +
 3 files changed, 6 insertions(+)
 create mode 100644 pandora_console/extras/mr/7.sql

diff --git a/pandora_console/extras/mr/7.sql b/pandora_console/extras/mr/7.sql
new file mode 100644
index 0000000000..8bbe1a7df2
--- /dev/null
+++ b/pandora_console/extras/mr/7.sql
@@ -0,0 +1,4 @@
+
+START TRANSACTION;
+ALTER TABLE tlayout_data ADD COLUMN `show_statistics` tinyint(2) NOT NULL default '0';
+COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index c5012eac00..4e31057a89 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1230,6 +1230,7 @@ ALTER TABLE tlayout ADD `background_color` varchar(50) NOT NULL default '#FFF';
 -- ---------------------------------------------------------------------
 ALTER TABLE tlayout_data ADD `type_graph` varchar(50) NOT NULL default 'area';
 ALTER TABLE tlayout_data ADD `label_position` varchar(50) NOT NULL default 'down';
+ALTER TABLE tlayout_data ADD COLUMN `show_statistics` tinyint(2) NOT NULL default '0';
 
 -- ---------------------------------------------------------------------
 -- Table `tagent_custom_fields`
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 41bb6aae81..3640357a8f 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1355,6 +1355,7 @@ CREATE TABLE IF NOT EXISTS `tlayout_data` (
 	`label_position` varchar(50) NOT NULL default 'down',
 	`border_color` varchar(200) DEFAULT "",
 	`fill_color` varchar(200) DEFAULT "",
+	`show_statistics` tinyint(2) NOT NULL default '0',
 	PRIMARY KEY(`id`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;
 

From a66a210db19b3305d12291ac7902a93875b96403 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Thu, 7 Sep 2017 16:15:17 +0200
Subject: [PATCH 25/67] Update log report

---
 .../reporting_builder.item_editor.php         | 50 +++++++++++++++++--
 .../godmode/reporting/reporting_builder.php   | 12 ++++-
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 0662ff8b0d..00df36a2c7 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -69,6 +69,8 @@ $exception_condition = REPORT_EXCEPTION_CONDITION_EVERYTHING;
 $exception_condition_value = 10;
 $modulegroup = 0;
 $period = SECONDS_1DAY;
+$search = "";
+$log_number = 1000;
 // Added support for projection graphs
 $period_pg = SECONDS_5DAY;
 $projection_period = SECONDS_5DAY;
@@ -201,9 +203,12 @@ switch ($action) {
 				case 'event_report_log':
 					$period = $item['period'];
 					$description = $item['description'];
+					
 					$es = json_decode($item['external_source'], true);
 					$id_agents = $es['id_agents'];
 					$source = $es['source'];
+					$search = $es['search'];
+					$log_number = empty($es['log_number']) ? $log_number : $es['log_number'];
 					break;
 				case 'simple_graph':
 					$only_avg = isset($style['only_avg']) ? (bool) $style['only_avg'] : true;
@@ -705,6 +710,29 @@ You can of course remove the warnings, that's why we include the source and do n
 			</td>
 		</tr>
 		
+		<tr id="row_search" style="" class="datos">
+			<td style="font-weight:bold;">
+				<?php echo __('Search') ?>
+			</td>
+			<td style="">
+				<?php
+				html_print_input_text('search', $search, '', 40, 100);
+				?>
+			</td>
+		</tr>
+		
+		<tr id="row_log_number" style="" class="datos">
+			<td style="font-weight:bold;">
+				<?php echo __('Log number');
+				ui_print_help_tip(__('Warning: this parameter limits the contents of the logs and affects the performance.')); ?>
+			</td>
+			<td style="">
+				<?php
+				echo "<input name='log_number' max='10000' min='1' size='10' type='number' value='$log_number'>";
+				?>
+			</td>
+		</tr>
+		
 		<tr id="row_period" style="" class="datos">
 			<td style="font-weight:bold;">
 				<?php
@@ -1026,20 +1054,30 @@ You can of course remove the warnings, that's why we include the source and do n
 			<td style="font-weight:bold;"><?php echo __('Agents'); ?></td>
 			<td>
 				<?php 
-					$agents = agents_get_group_agents($group);
-					if ((empty($agents)) || $agents == -1) $agents = array();
+					$sql = 'SELECT id_agente, alias
+						FROM tagente, tagent_module_log
+						WHERE tagente.id_agente = tagent_module_log.id_agent';
+					$all_agent_log = db_get_all_rows_sql($sql);
+					
+					foreach ($all_agent_log as $key => $value) {
+						$agents2[$value['id_agente']] = $value['alias'];
+					}
+					
+					// $agents = agents_get_group_agents($group);
+					if ((empty($agents2)) || $agents2 == -1) $agents = array();
 					
 					$agents_select = array();
 					if (is_array($id_agents) || is_object($id_agents)){
 						foreach ($id_agents as $id) {
-							foreach ($agents as $key => $a) {
+							foreach ($agents2 as $key => $a) {
 								if ($key == (int)$id) {
 									$agents_select[$key] = $key;
 								}
 							}
 						}
 					}
-					html_print_select($agents, 'id_agents2[]', $agents_select, $script = '', "", 0, false, true, true, '', false, "min-width: 180px");
+					// html_debug($agents);
+					html_print_select($agents2, 'id_agents2[]', $agents_select, $script = '', "", 0, false, true, true, '', false, "min-width: 180px");
 				?>
 			</td>
 		</tr>
@@ -2578,6 +2616,8 @@ function chooseType() {
 	$("#row_agent").hide();
 	$("#row_module").hide();
 	$("#row_period").hide();
+	$("#row_search").hide();
+	$("#row_log_number").hide();
 	$("#row_period1").hide();
 	$("#row_estimate").hide();
 	$("#row_interval").hide();
@@ -2675,6 +2715,8 @@ function chooseType() {
 			$("#log_help_tip").css("visibility", "visible");
 			$("#row_description").show();
 			$("#row_period").show();
+			$("#row_search").show();
+			$("#row_log_number").show();
 			$("#agents_row").show();
 			$("#row_source").show();
 			$("#row_historical_db_check").hide();
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index ac6d35d4b4..705f49c2d0 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -925,9 +925,13 @@ switch ($action) {
 							case 'event_report_log':
 								$agents_to_report = get_parameter('id_agents2');
 								$source = get_parameter('source', "");
-
+								$search = get_parameter('search', "");
+								$log_number = get_parameter('log_number', "");
+							
 								$es['source'] = $source;
 								$es['id_agents'] = $agents_to_report;
+								$es['search']=$search;
+								$es['log_number']=$log_number;
 
 								$values['external_source'] = json_encode($es);
 								$values['period'] = get_parameter('period');
@@ -1281,9 +1285,13 @@ switch ($action) {
 							case 'event_report_log':
 								$agents_to_report = get_parameter('id_agents2');
 								$source = get_parameter('source', "");
-
+								$search = get_parameter('search', "");
+								$log_number = get_parameter('log_number', "");
+								
 								$es['source'] = $source;
 								$es['id_agents'] = $agents_to_report;
+								$es['search']=$search;
+								$es['log_number']=$log_number;
 
 								$values['external_source'] = json_encode($es);
 								$values['period'] = get_parameter('period');

From 598b04c2dbaec812b18977af99ba566e935987cd Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 7 Sep 2017 16:17:41 +0200
Subject: [PATCH 26/67] Added a change to boolean charts

---
 pandora_console/include/functions_graph.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 10433ef91a..e59bb737fc 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -3952,8 +3952,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 				$k++;
 			}
 		}
-		html_debug($data2);
-		html_debug($data);
+
 		$data = array_merge($data2, $data);
 		$resolution += $previus_datas_cont;
 	}
@@ -3963,7 +3962,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 	for ($i = 0; $i <= $resolution; $i++) {
 		$timestamp = $datelimit + ($interval * $i);
 
-		if ($fullscale && ($resolution > ($config['graph_res'] * 50))) {
+		if ($fullscale) {
 			$timestamp = $data[$i]['utimestamp'];
 		}
 		
@@ -4046,7 +4045,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 		}
 		elseif ($period < SECONDS_1MONTH) {
 			$time_format = 'M d H\h';
-		} 
+		}
 		else {
 			$time_format = 'M d H\h';
 		}

From f2f9cc666e989036d6d7cd6eb504e3e9f2b98b1e Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 7 Sep 2017 18:11:42 +0200
Subject: [PATCH 27/67] boolean graphs

---
 pandora_console/include/functions_graph.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index e59bb737fc..d6ced0e99c 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -3962,7 +3962,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 	for ($i = 0; $i <= $resolution; $i++) {
 		$timestamp = $datelimit + ($interval * $i);
 
-		if ($fullscale) {
+		if ($fullscale && ($resolution > ($config['graph_res'] * 50))) {
 			$timestamp = $data[$i]['utimestamp'];
 		}
 		

From 7f3539ecf089c62e52f662d048af89973a38d427 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 8 Sep 2017 00:01:19 +0200
Subject: [PATCH 28/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index ac9f29f903..2469475802 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170907
+Version: 7.0NG.712-170908
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index b0512382ef..fa27849ada 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170907"
+pandora_version="7.0NG.712-170908"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 45d9dc393c..18bc995e59 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170907';
+use constant AGENT_BUILD => '170908';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 496d2f1c33..71c275798f 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170907
+%define release     170908
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 58310150d3..6ab308fc5c 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170907
+%define release     170908
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index a371299d3e..d65123bfdd 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170907"
+PI_BUILD="170908"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 155b4bffd2..f2eb7a424c 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170907}
+{170908}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 669a02f1f2..8adf0ead32 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170907)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170908)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3fe8e32536..fc578b0d73 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170907))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170908))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 99b2acd74f..b183226957 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170907
+Version: 7.0NG.712-170908
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 7bf21fd9d7..d89326f528 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170907"
+pandora_version="7.0NG.712-170908"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index c58d86b343..8fb6b5254c 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170907';
+$build_version = 'PC170908';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b803306db9..2a6d995054 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170907';
+$build = '170908';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 35af80ae25..5d7387d37a 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170907
+%define release     170908
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index af8fd47960..318089875f 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170907
+%define release     170908
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 31256f7dd4..260d6c9ee5 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170907
+Version: 7.0NG.712-170908
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index ef77866e95..8ccd5fe847 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170907"
+pandora_version="7.0NG.712-170908"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 7c313a02c1..1ca19bf76e 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170907";
+my $pandora_build = "170908";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index dafc26119e..03220f6d29 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170907
+%define release     170908
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 8f22818e7c..95cec5a1ca 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170907
+%define release     170908
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 00f899739d..9b640c3903 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170907"
+PI_BUILD="170908"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1e41ccea1e..12acb3a5f8 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170907";
+my $version = "7.0NG.712 PS170908";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index e34c5ca550..7548b6833f 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170907";
+my $version = "7.0NG.712 PS170908";
 
 # save program name for logging
 my $progname = basename($0);

From 32fa42a378e22abec98199ecdeb2e98b2700a41b Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Fri, 8 Sep 2017 12:32:21 +0200
Subject: [PATCH 29/67] Added modules selection mode

---
 .../agentes/planned_downtime.editor.php       | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index 2d0bfe3be1..71bed3d10d 100644
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -88,6 +88,8 @@ $id_agent 				= (int) get_parameter ('id_agent');
 $insert_downtime_agent 	= (int) get_parameter ('insert_downtime_agent');
 $delete_downtime_agent 	= (int) get_parameter ('delete_downtime_agent');
 
+$modules_selection_mode = (string) get_parameter('modules_selection_mode');
+
 // User groups with AD or AW permission for ACL checks
 $user_groups_ad = array_keys(users_get_groups($config['id_user'], $access));
 
@@ -116,7 +118,20 @@ if ($insert_downtime_agent === 1) {
 	}
 	else {
 		foreach ($agents as $agent_id) {
-			
+			//check module belongs to the agent
+			if($modules_selection_mode == 'all'){
+				$check = false;
+				foreach ($module_names as $module_name) {
+					$check_module = modules_get_agentmodule_id($module_name, $agent_id);
+					if (!empty($check_module)){
+						$check = true;
+					}
+				}
+
+				if (!$check){
+					continue;
+				}
+			}
 			// Check AD permission on agent
 			$agent_group = db_get_value('id_grupo', 'tagente', 'id_agente', $agent_id);
 			
@@ -710,13 +725,25 @@ if ($id_downtime > 0) {
 	echo "<form method=post action='index.php?sec=estado&sec2=godmode/agentes/planned_downtime.editor&insert_downtime_agent=1&id_downtime=$id_downtime'>";
 	
 	echo html_print_select ($agents, "id_agents[]", -1, '', _("Any"), -2, false, true, true, '', false, 'width: 180px;');
+	
+	if ($type_downtime != 'quiet'){
+		echo '<div id="available_modules_selection_mode" style="padding-top:20px;display: none;">';
+	} else {
+		echo '<div id="available_modules_selection_mode" style="padding-top:20px">';
+	}
+	echo html_print_select (array('common' => __('Show common modules'), 'all' => __('Show all modules')), 'modules_selection_mode',
+			'common', false, '', '', true,false,true,'',false,'min-width:180px;');
+	echo '</div>';
+		
 	echo '<h4>' . __('Available modules:') . 
 		ui_print_help_tip (__('Only for type Quiet for downtimes.'), true) . '</h4>';
 	
-	if ($type_downtime != 'quiet')
+	if ($type_downtime != 'quiet'){
 		echo '<div id="available_modules" style="display: none;">';
-	else
+	} else {
 		echo '<div id="available_modules" style="">';
+	}
+	
 	echo html_print_select (array(), "module[]", '', '', '', 0, false, true, true, '', false, 'width: 180px;');
 	echo "</div>";
 	echo "<br /><br /><br />";
@@ -904,8 +931,10 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
 			case 'disable_agents_alerts':
 			case 'disable_agents':
 				$("#available_modules").hide();
+				$("#available_modules_selection_mode").hide();
 				break;
 			case 'quiet':
+				$("#available_modules_selection_mode").show();
 				$("#available_modules").show();
 				break;
 		}

From 1a56c78808e41046d05ee8204645facb2ca3ea52 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Fri, 8 Sep 2017 12:39:00 +0200
Subject: [PATCH 30/67] Added degree in io_safe_input

---
 pandora_console/include/functions_io.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php
index 7c11505ed3..f0cf25587e 100755
--- a/pandora_console/include/functions_io.php
+++ b/pandora_console/include/functions_io.php
@@ -102,14 +102,15 @@ function io_safe_input($value) {
 	// Replace ( for the html entitie
 	$valueHtmlEncode = str_replace(')', "&#41;", $valueHtmlEncode);
 	
-	$valueHtmlEncode = str_replace(')', "&#41;", $valueHtmlEncode);
-	
 	
 	// Fixed the º character, because the Perl in the Pandora Server
 	// use the hex value instead the human readble.
 	// TICKET: #1495
 	$valueHtmlEncode = str_replace('&ordm;', "&#xba;", $valueHtmlEncode);
 	
+	// Fixed the ° character.
+	// TICKET: 1223
+	$valueHtmlEncode = str_replace('&deg;', "&#176;", $valueHtmlEncode);
 	
 	
 	//Replace some characteres for html entities

From 61fd2c6d61a264a967c72ce1ce552fc1e8804d6d Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Fri, 8 Sep 2017 13:04:19 +0200
Subject: [PATCH 31/67] Delete old tgraph_source data

---
 pandora_server/util/pandora_db.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 12acb3a5f8..892bdd273a 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -431,6 +431,9 @@ sub pandora_purgedb ($$) {
 				WHERE date < CURDATE() - $conf->{'_num_past_special_days'} AND date > '0001-01-01'");
 		}
 	}
+	
+	# Delete old tgraph_source data
+	db_do ($dbh,"DELETE FROM tgraph_source WHERE id_graph NOT IN (SELECT id_graph FROM tgraph)");
 }
 
 ###############################################################################

From 8a7b0a0f7998e5cd4f8dda84015ab0ae690417cb Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 8 Sep 2017 13:55:03 +0200
Subject: [PATCH 32/67] fixed errors in new macro graph treshold

---
 pandora_console/include/functions_api.php | 58 +++++++++++++----------
 pandora_server/lib/PandoraFMS/Core.pm     | 19 ++++++--
 2 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index bba8cb1cc3..5ecac3a944 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -9941,7 +9941,14 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
 		$other['data'][0]
 		:
 		SECONDS_1HOUR; // 1 hour by default
-	
+
+	$graph_threshold =
+		(!empty($other) && isset($other['data'][2]))
+		?
+		$other['data'][2]
+		:
+		0;
+
 	if (is_nan($graph_seconds) || $graph_seconds <= 0) {
 		// returnError('error_module_graph', __(''));
 		return;
@@ -9952,41 +9959,44 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
 		$id_module, $graph_seconds, false, 600, 300, '',
 		'', false, false, true, time(), '', 0, 0, true, true,
 		ui_get_full_url(false) . '/', 1, false, '', false, true,
-		true, 'white', null, false, false, $config['type_module_charts']);
+		true, 'white', null, false, false, $config['type_module_charts'], 
+		false, false);
 		
-       $graph_image_file_encoded = false;
+        $graph_image_file_encoded = false;
         if (preg_match("/<img src='(.+)'./", $graph_html, $matches)) {
                 $file_url = $matches[1];
 
-                if (preg_match("/\?(.+)&(.+)&(.+)&(.+)/", $file_url,$parameters)) {
-                        array_shift ($parameters);
-                        foreach ($parameters as $parameter){
-                                $value = explode ("=",$parameter);
+            if (preg_match("/\?(.+)&(.+)&(.+)&(.+)/", $file_url,$parameters)) {
+                    array_shift ($parameters);
+                foreach ($parameters as $parameter){
+                        $value = explode ("=",$parameter);
 
-                                if (strcmp($value[0], "static_graph") == 0){
-                                        $static_graph = $value[1];
-                                }
-                                elseif (strcmp($value[0], "graph_type") == 0){
-                                        $graph_type = $value[1];
-                                }
-                                elseif (strcmp($value[0], "ttl") == 0){
-                                        $ttl = $value[1];
-                                }
-                                elseif (strcmp($value[0], "id_graph") == 0){
-                                        $id_graph = $value[1];
-                                }
-                        }
+                    if (strcmp($value[0], "static_graph") == 0){
+                            $static_graph = $value[1];
+                    }
+                    elseif (strcmp($value[0], "graph_type") == 0){
+                            $graph_type = $value[1];
+                    }
+                    elseif (strcmp($value[0], "ttl") == 0){
+                            $ttl = $value[1];
+                    }
+                    elseif (strcmp($value[0], "id_graph") == 0){
+                            $id_graph = $value[1];
+                    }
                 }
+            }
         }
 
         // Check values are OK
         if ( (isset ($graph_type))
         && (isset ($ttl))
         && (isset ($id_graph))) {
-                        $_GET["ttl"] = $ttl;
-                        $_GET["id_graph"] = $id_graph;
-                        $_GET["graph_type"] = $graph_type;
-                        $_GET["static_graph"] = $static_graph;
+            $_GET["ttl"]             = $ttl;
+            $_GET["id_graph"]        = $id_graph;
+            $_GET["graph_type"]      = $graph_type;
+            $_GET["static_graph"]    = $static_graph;
+            $_GET["graph_threshold"] = $graph_threshold;
+            $_GET["id_module"]       = $id_module;
         }
 
         ob_start();
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 1e7b6a42ab..88edb0a11a 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1110,8 +1110,10 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		$field3 = subst_alert_macros ($field3, \%macros, $pa_config, $dbh, $agent, $module);
 		
 		# Check for _module_graph_Xh_ macros
+		# Check for _module_graph_Xh_ macros and _module_graphth_Xh_ 
 		my $module_graph_list = {};
 		my $macro_regexp = "_modulegraph_(\\d+)h_";
+		my $macro_regexp2 = "_modulegraphth_(\\d+)h_";
 		
 		# API connection
 		my $ua = new LWP::UserAgent;
@@ -1124,13 +1126,21 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		$params->{"op"} = "get";
 		$params->{"op2"} = "module_graph";
 		$params->{"id"} = $module->{'id_agente_modulo'};
-		
+		my $cid ='';
 		my $subst_func = sub {
 			my $hours = shift;
+			my $threshold = shift;
 			my $period = $hours * 3600; # Hours to seconds
-			$params->{"other"} = $period . '%7C0';
+			if($threshold == 0){
+				$params->{"other"} = $period . '%7C0%7C0';
+				$cid = 'module_graph_' . $hours . 'h';
+			}
+			else{
+				$params->{"other"} = $period . '%7C0%7C1';
+				$cid = 'module_graphth_' . $hours . 'h';
+			}
+
 			$params->{"other_mode"} = 'url_encode_separator_%7C';
-			my $cid = 'module_graph_' . $hours . 'h';
 			
 			if (! exists($module_graph_list->{$cid}) && defined $url) {
 				# Get the module graph image in base 64
@@ -1150,7 +1160,8 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		eval {
 			no warnings;
 			local $SIG{__DIE__};
-			$field3 =~ s/$macro_regexp/$subst_func->($1)/ige;
+			$field3 =~ s/$macro_regexp/$subst_func->($1, 0)/ige;
+			$field3 =~ s/$macro_regexp2/$subst_func->($1, 1)/ige;
 		};
 		
 		# Default content type

From 731e9bf91784e6de11a86cde2dafeeeffe42d304 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 8 Sep 2017 16:10:31 +0200
Subject: [PATCH 33/67] fixed error in full_scale

---
 pandora_console/include/functions_graph.php | 60 +++++++++------------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index d6ced0e99c..6ec7e8587c 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -3851,13 +3851,27 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 	
 	if ($fullscale) {
 		// Get module data
-		$data = db_get_all_rows_filter ('tagente_datos',
-			array ('id_agente_modulo' => $agent_module_id,
-				"utimestamp > $datelimit",
-				"utimestamp < $date",
-				'order' => 'utimestamp ASC'),
-			array ('datos', 'utimestamp'), 'AND', true);
-
+		
+		$data_uncompress = db_uncompress_module_data($agent_module_id, $datelimit, $date);
+	
+		$i = 0;
+		$j = 0;
+		$array_unknown = array();
+		$data = array();
+		if(is_array($data_uncompress)){
+			foreach ($data_uncompress as $value) {
+				foreach ($value['data'] as $key => $value) {
+					$data[$i]['datos'] = $value['datos'];
+					if(empty($value['datos'])){
+						$events[$j]['utimestamp'] = $value['utimestamp'];
+						$j++;
+					}
+					$data[$i]['utimestamp'] = $value['utimestamp'];	
+					$i++;
+				}
+			}
+		}
+	
 		if (count($data) > $resolution) {
 			$resolution = count($data); //Number of points of the graph
 			$interval = (int) ($period / $resolution);
@@ -3937,25 +3951,6 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 	}
 	
 	$max_value = 0;
-
-	if ($fullscale) {
-		$data2 = array();
-		$previus_datas_cont = -1;
-		$k = 0;
-		for ($i = 0; $i <= $resolution; $i++) {
-			$timestamp = $datelimit + ($interval * $i);
-
-			if ($timestamp < $data[0]['utimestamp']) {
-				$previus_datas_cont++;
-				$data2[$k]['utimestamp'] = $timestamp;
-				$data2[$k]['datos'] = 0;
-				$k++;
-			}
-		}
-
-		$data = array_merge($data2, $data);
-		$resolution += $previus_datas_cont;
-	}
 	
 	// Calculate chart data
 	$last_known = $previous_data;
@@ -4013,19 +4008,12 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 				$alert_ids[] = $events[$k]['id_evento'];
 			}
 			if ($show_unknown) {
-				if ($events[$k]['event_type'] == 'going_unknown') {
-					if ($is_unknown == false) {
-						$first_unknown = true;
-					}
-					$is_unknown = true;
-				}
-				else if (substr ($events[$k]['event_type'], 0, 5) == 'going') {
-					$is_unknown = false;
-				}
+				$first_unknown = true;
+				$is_unknown = true;
 			}
 			$k++;
 		}
-		
+
 		// In some cases, can be marked as known because a recovery event
 		// was found in same interval. For this cases first_unknown is 
 		// checked too

From cc36e2756f4b7f974a09d2607cbc000f86e054f4 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 9 Sep 2017 00:01:22 +0200
Subject: [PATCH 34/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 2469475802..87e27ba284 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170908
+Version: 7.0NG.712-170909
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index fa27849ada..06cb471157 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170908"
+pandora_version="7.0NG.712-170909"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 18bc995e59..5efab9b68d 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170908';
+use constant AGENT_BUILD => '170909';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 71c275798f..94c34fc48b 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170908
+%define release     170909
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 6ab308fc5c..4bcb25cf11 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170908
+%define release     170909
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index d65123bfdd..d13aeb1652 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170908"
+PI_BUILD="170909"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index f2eb7a424c..42dadc7de8 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170908}
+{170909}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 8adf0ead32..4ff5e9f618 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170908)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170909)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index fc578b0d73..c085ea3955 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170908))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170909))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b183226957..5eb1b94a28 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170908
+Version: 7.0NG.712-170909
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index d89326f528..ddfde65353 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170908"
+pandora_version="7.0NG.712-170909"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 8fb6b5254c..97574f7f90 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170908';
+$build_version = 'PC170909';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 2a6d995054..93ace4e752 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170908';
+$build = '170909';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 5d7387d37a..6ea95b8f38 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170908
+%define release     170909
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 318089875f..07611153b9 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170908
+%define release     170909
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 260d6c9ee5..2c41269638 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170908
+Version: 7.0NG.712-170909
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 8ccd5fe847..31e9285966 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170908"
+pandora_version="7.0NG.712-170909"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 1ca19bf76e..ceb42263b9 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170908";
+my $pandora_build = "170909";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 03220f6d29..6b607ec249 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170908
+%define release     170909
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 95cec5a1ca..c62f11a592 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170908
+%define release     170909
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 9b640c3903..a73039c745 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170908"
+PI_BUILD="170909"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 12acb3a5f8..09fbfe585a 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170908";
+my $version = "7.0NG.712 PS170909";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7548b6833f..643e8bca84 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170908";
+my $version = "7.0NG.712 PS170909";
 
 # save program name for logging
 my $progname = basename($0);

From e651f64c85df9a41e43863481a54b457d46c692c Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 10 Sep 2017 00:01:18 +0200
Subject: [PATCH 35/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 87e27ba284..e5d92c7445 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170909
+Version: 7.0NG.712-170910
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 06cb471157..742f930df3 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170909"
+pandora_version="7.0NG.712-170910"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 5efab9b68d..fbcae8aa69 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170909';
+use constant AGENT_BUILD => '170910';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 94c34fc48b..3a90a747c3 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170909
+%define release     170910
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 4bcb25cf11..1b41fa43d3 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170909
+%define release     170910
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index d13aeb1652..0806a18c91 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170909"
+PI_BUILD="170910"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 42dadc7de8..ea01f51c10 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170909}
+{170910}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 4ff5e9f618..a440614213 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170909)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170910)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index c085ea3955..9a9c08f670 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170909))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170910))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 5eb1b94a28..8a12b6f2d6 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170909
+Version: 7.0NG.712-170910
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index ddfde65353..085d6e1276 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170909"
+pandora_version="7.0NG.712-170910"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 97574f7f90..afa886bce0 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170909';
+$build_version = 'PC170910';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 93ace4e752..544317321c 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170909';
+$build = '170910';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 6ea95b8f38..72e01e5553 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170909
+%define release     170910
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 07611153b9..fdf1d970d3 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170909
+%define release     170910
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 2c41269638..c20e24f5da 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170909
+Version: 7.0NG.712-170910
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 31e9285966..1b4fd17e42 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170909"
+pandora_version="7.0NG.712-170910"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index ceb42263b9..8479bde781 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170909";
+my $pandora_build = "170910";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 6b607ec249..2e135ff4c4 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170909
+%define release     170910
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c62f11a592..251a40866e 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170909
+%define release     170910
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index a73039c745..1e025208b7 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170909"
+PI_BUILD="170910"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 09fbfe585a..4777ae5276 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170909";
+my $version = "7.0NG.712 PS170910";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 643e8bca84..604b8b1f9a 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170909";
+my $version = "7.0NG.712 PS170910";
 
 # save program name for logging
 my $progname = basename($0);

From 291871fae0f4ff15b8dd88ce2fd2b9bfac08917a Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 11 Sep 2017 00:01:20 +0200
Subject: [PATCH 36/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index e5d92c7445..f6597b9e55 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170910
+Version: 7.0NG.712-170911
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 742f930df3..5e0a33978d 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170910"
+pandora_version="7.0NG.712-170911"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index fbcae8aa69..257381ab82 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170910';
+use constant AGENT_BUILD => '170911';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 3a90a747c3..f5c681d322 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170910
+%define release     170911
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 1b41fa43d3..95f9ce0c3d 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170910
+%define release     170911
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 0806a18c91..0e8c3acb11 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170910"
+PI_BUILD="170911"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ea01f51c10..b167f19d2d 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170910}
+{170911}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index a440614213..62915f9fbf 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170910)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170911)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 9a9c08f670..66df2c4752 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170910))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170911))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 8a12b6f2d6..af4af12e0e 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170910
+Version: 7.0NG.712-170911
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 085d6e1276..5e9ea5af28 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170910"
+pandora_version="7.0NG.712-170911"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index afa886bce0..6c84bae80d 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170910';
+$build_version = 'PC170911';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 544317321c..b787c944f9 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170910';
+$build = '170911';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 72e01e5553..51701de31d 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170910
+%define release     170911
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index fdf1d970d3..475a8e0bb0 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170910
+%define release     170911
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index c20e24f5da..828985a853 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170910
+Version: 7.0NG.712-170911
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 1b4fd17e42..fa44570e42 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170910"
+pandora_version="7.0NG.712-170911"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 8479bde781..40d1d68d61 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170910";
+my $pandora_build = "170911";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 2e135ff4c4..aa04ffc465 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170910
+%define release     170911
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 251a40866e..6714413fdb 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170910
+%define release     170911
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 1e025208b7..1d637ba0ff 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170910"
+PI_BUILD="170911"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 4777ae5276..b7a623a749 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170910";
+my $version = "7.0NG.712 PS170911";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 604b8b1f9a..48e42b5d2f 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170910";
+my $version = "7.0NG.712 PS170911";
 
 # save program name for logging
 my $progname = basename($0);

From 975267eff0259b2b9beb9f2e3defd262ae10fcfa Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 11 Sep 2017 13:51:35 +0200
Subject: [PATCH 37/67] added filter by user groups

---
 .../include/functions_reporting_html.php        | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 690a55d630..22fb6dafac 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -3881,7 +3881,21 @@ function reporting_get_event_histogram_meta ($width) {
 		EVENT_CRIT_MAJOR => COL_MAJOR,
 		EVENT_CRIT_CRITICAL => COL_CRITICAL
 	);
+	
+	$user_groups = users_get_groups($config['id_user'], 'ER');
+	$user_groups_ids = array_keys($user_groups);
+	
+	if (empty($user_groups)) {
+		$groups_condition = ' 1 = 0 ';
+	}
+	else {
+		$groups_condition = ' id_grupo IN (' . implode(',', $user_groups_ids) . ') ';
+	}
 
+	if (!check_acl ($config['id_user'], 0, "PM")) {
+		$groups_condition .= " AND id_grupo != 0";
+	}
+	
 	$cont = 0;
 	for ($i = 0; $i < $interval; $i++) {
 		$bottom = $datelimit + ($periodtime * $i);
@@ -3912,7 +3926,8 @@ function reporting_get_event_histogram_meta ($width) {
 		$event = db_get_row_filter ('tmetaconsole_event',
 			array (
 				'utimestamp > '.$bottom,
-				'utimestamp < '.$top), 
+				'utimestamp < '.$top,
+				$groups_condition), 
 				'criticity, utimestamp');
 		
 		if (!empty($event['utimestamp'])) {

From ac36c701f79fe0f790d55f1b490b250354756c27 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 11 Sep 2017 16:09:13 +0200
Subject: [PATCH 38/67] Added a first contact with the new functions

---
 pandora_server/util/pandora_manage.pl | 105 +++++++++++++++++++++++++-
 1 file changed, 104 insertions(+), 1 deletion(-)

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 48e42b5d2f..3fafbf8d25 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -213,6 +213,15 @@ sub help_screen{
     help_screen_line('--create_tag', '<tag_name> <tag_description> [<tag_url>] [<tag_email>]', 'Create a new tag');
     help_screen_line('--add_tag_to_user_profile', '<user_id> <tag_name> <group_name> <profile_name>', 'Add a tag to the given user profile');
     help_screen_line('--add_tag_to_module', '<agent_name> <module_name> <tag_name>', 'Add a tag to the given module');
+
+	print "\nVISUAL CONSOLES\n\n" unless $param ne '';
+	help_screen_line('--create_visual_console', '<name> <background> <width> <height> <group> [<background_color>] [<elements>]', 'Create a new visual console');
+	help_screen_line('--edit_visual_console', '<id> <name> <background> <width> <height> <group> [<background_color>] [<elements>]', 'Edit a visual console');
+	help_screen_line('--delete_visual_console', '<id>', 'Delete a visual console');
+	help_screen_line('--delete_visual_console_objects', '<id> <mode> <id_mode>', 'Delete a visual console elements');
+	help_screen_line('--duplicate_visual_console', '<id> <times> [<prefix>]', 'Duplicate a visual console');
+	help_screen_line('--export_json_visual_console', '<id>', 'Creates a json with the visual console elements information');
+
 	
 	print "\n";
 	exit;
@@ -4753,6 +4762,76 @@ sub cli_delete_special_day() {
 	exist_check($result,'special day',$special_day);
 }
 
+##############################################################################
+# Creates a new visual console.
+# Related option: --create_visual_console
+##############################################################################
+
+sub cli_create_visual_console() {
+	my ($name,$background,$width,$height,$group,$background_color,$elements) = @ARGV[2..8];
+
+	if($name eq '') {
+		print_log "[ERROR] Name field cannot be empty.\n\n";
+		exit 1;
+	}
+	elsif ($background eq '') {
+		print_log "[ERROR] Background field cannot be empty.\n\n";
+		exit 1;
+	}
+	elsif (($width eq '') || ($height eq '')) {
+		print_log "[ERROR] Please specify size.\n\n";
+		exit 1;
+	}
+	elsif ($group eq '') {
+		print_log "[ERROR] Group field cannot be empty.\n\n";
+		exit 1;
+	}
+
+	if ($background_color eq '') {
+		$background_color = '#FFF';
+	}
+
+	print_log "[INFO] Creating visual console '$name' \n\n";
+
+	my $vc_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout (name, id_group, background, width, height, background_color)
+                         VALUES (?, ?, ?, ?, ?, ?)', safe_input($name), $group, $background, $width, $height, $background_color);
+
+	print_log "[INFO] The visual console id is '$vc_id' \n\n";
+
+	if ($elements ne '') {
+		my @elements_in_array = json_decoce($elements);
+
+		foreach my $elem (@elements_in_array) {
+			print_log $elem . "\n\n";
+		}
+	}
+}
+
+##############################################################################
+# Delete a visual console.
+# Related option: --delete_visual_console
+##############################################################################
+
+sub cli_delete_visual_console() {
+	my ($id) = @ARGV[2];
+
+	if($id eq '') {
+		print_log "[ERROR] ID field cannot be empty.\n\n";
+		exit 1;
+	}
+
+	print_log "[INFO] Delete visual console with ID '$id' \n\n";
+
+	my $delete_layout = db_do($dbh, 'DELETE FROM tlayout WHERE id = ?', $id);
+
+	if ($delete_layout eq 1) {
+		db_do($dbh, 'DELETE FROM tlayout_data WHERE id_layout = ?', $id);
+	}
+	else {
+		print_log "[ERROR] Error at remove the visual console.\n\n";
+		exit 1;
+	}
+}
 
 ###############################################################################
 ###############################################################################
@@ -5183,7 +5262,31 @@ sub pandora_manage_main ($$$) {
 		elsif ($param eq '--locate_agent') {
 			param_check($ltotal, 1);
 			cli_locate_agent();
-		} 
+		}
+		elsif ($param eq '--create_visual_console') {
+			param_check($ltotal, 7, 2);
+			cli_create_visual_console();
+		}
+		elsif ($param eq '--edit_visual_console') {
+			param_check($ltotal, 6, 2);
+			cli_edit_visual_console();
+		}
+		elsif ($param eq '--delete_visual_console') {
+			param_check($ltotal, 1);
+			cli_delete_visual_console();
+		}
+		elsif ($param eq '--delete_visual_console_objects') {
+			param_check($ltotal, 3);
+			cli_delete_visual_console_objects();
+		}
+		elsif ($param eq '--duplicate_visual_console') {
+			param_check($ltotal, 2, 1);
+			cli_duplicate_visual_console();
+		}
+		elsif ($param eq '--export_json_visual_console') {
+			param_check($ltotal, 1);
+			cli_export_visual_console();
+		}
 		else {
 			print_log "[ERROR] Invalid option '$param'.\n\n";
 			$param = '';

From 787fb00d16b0ca8296aaf794edf67c040a492da0 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 11 Sep 2017 17:46:56 +0200
Subject: [PATCH 39/67] Avoid to overwrite the os_version when is empty

---
 pandora_server/lib/PandoraFMS/DataServer.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index effd0f317a..a9043d3d36 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -312,7 +312,7 @@ sub process_xml_data ($$$$$) {
 	
 	# Check some variables
 	$interval = 300 if (! defined ($interval) || $interval eq '');
-	$os_version = 'N/A' if (! defined ($os_version) || $os_version eq '');
+	$os_version = undef if (! defined ($os_version) || $os_version eq '');
 	
 	# Get agent address from the XML if available
 	my $address = '' ;

From 89fc3c457a7281699f74fdc3daec49f1a7ef8fa0 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 11 Sep 2017 17:54:28 +0200
Subject: [PATCH 40/67] Fixed no os_version on event agent view

---
 pandora_console/include/functions_events.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 11d2f58667..b2fd31beee 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2031,7 +2031,8 @@ function events_page_details ($event, $server = "") {
 		
 		$data = array();
 		$data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('OS').'</div>';
-		$data[1] = ui_print_os_icon ($agent["id_os"], true, true).' ('.$agent["os_version"].')';
+		$data[1] = ui_print_os_icon ($agent["id_os"], true, true);
+		if (!empty($agent["os_version"])) $data[1] .= ' ('.$agent["os_version"].')';
 		$table_details->data[] = $data;
 		
 		$data = array();

From 4dec318607349db8519c4786db03ac4dc0ad2b63 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 11 Sep 2017 17:56:42 +0200
Subject: [PATCH 41/67] Added function to create visual console with elements
 in cli

---
 pandora_server/util/pandora_manage.pl | 30 ++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 3fafbf8d25..ee45368900 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -21,6 +21,7 @@ use JSON qw(decode_json encode_json);
 use MIME::Base64;
 use Encode qw(decode encode_utf8);
 use LWP::Simple;
+use Data::Dumper;
 
 # Default lib dir for RPM and DEB packages
 use lib '/usr/lib/perl5';
@@ -4799,10 +4800,33 @@ sub cli_create_visual_console() {
 	print_log "[INFO] The visual console id is '$vc_id' \n\n";
 
 	if ($elements ne '') {
-		my @elements_in_array = json_decoce($elements);
+		my $elements_in_array = decode_json($elements);
 
-		foreach my $elem (@elements_in_array) {
-			print_log $elem . "\n\n";
+		foreach my $elem (@$elements_in_array) {
+			my $pos_x = $elem->{'pos_x'};
+			my $pos_y = $elem->{'pos_y'};
+			my $width = $elem->{'width'};
+			my $height = $elem->{'height'};
+			my $label = $elem->{'label'};
+			my $image = $elem->{'image'};
+			my $type = $elem->{'type'};
+			my $period = $elem->{'period'};
+			my $id_agente_modulo = $elem->{'id_agente_modulo'};
+			my $id_agent = $elem->{'id_agent'};
+			my $id_layout_linked = $elem->{'id_layout_linked'};
+			my $parent_item = $elem->{'parent_item'};
+			my $enable_link = $elem->{'enable_link'};
+			my $id_metaconsole = $elem->{'id_metaconsole'};
+			my $id_group = $elem->{'id_group'};
+			my $id_custom_graph = $elem->{'id_custom_graph'};
+			my $border_width = $elem->{'border_width'};
+			my $type_graph = $elem->{'type_graph'};
+			my $label_position = $elem->{'label_position'};
+			my $border_color = $elem->{'border_color'};
+			my $fill_color = $elem->{'fill_color'};
+
+			db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+                         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $vc_id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
 		}
 	}
 }

From 870a59ba578488aa4508e52c6136c469f8ce47cd Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 12 Sep 2017 00:01:21 +0200
Subject: [PATCH 42/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index f6597b9e55..873deaf0b9 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170911
+Version: 7.0NG.712-170912
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 5e0a33978d..aaf1f19a52 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170911"
+pandora_version="7.0NG.712-170912"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 257381ab82..0f3402c1cc 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170911';
+use constant AGENT_BUILD => '170912';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index f5c681d322..9af68235c7 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170911
+%define release     170912
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 95f9ce0c3d..e507d21c31 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170911
+%define release     170912
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 0e8c3acb11..385a1a21bb 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170911"
+PI_BUILD="170912"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index b167f19d2d..f43d2e11bc 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170911}
+{170912}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 62915f9fbf..f502f6abdb 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170911)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170912)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 66df2c4752..7a12e30069 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170911))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170912))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index af4af12e0e..078e3c91ad 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170911
+Version: 7.0NG.712-170912
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 5e9ea5af28..ae87b6449b 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170911"
+pandora_version="7.0NG.712-170912"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 6c84bae80d..5061b82a51 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170911';
+$build_version = 'PC170912';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b787c944f9..32ec64c478 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170911';
+$build = '170912';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 51701de31d..b93469208f 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170911
+%define release     170912
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 475a8e0bb0..73c9f41e32 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170911
+%define release     170912
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 828985a853..0f27779b59 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170911
+Version: 7.0NG.712-170912
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index fa44570e42..eba5936763 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170911"
+pandora_version="7.0NG.712-170912"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 40d1d68d61..bff46ef371 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170911";
+my $pandora_build = "170912";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index aa04ffc465..c675a9fdbf 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170911
+%define release     170912
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6714413fdb..61beb9899c 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170911
+%define release     170912
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 1d637ba0ff..683eed5000 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170911"
+PI_BUILD="170912"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 10077674f5..89f888cd0c 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170911";
+my $version = "7.0NG.712 PS170912";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 48e42b5d2f..4955bfa0eb 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170911";
+my $version = "7.0NG.712 PS170912";
 
 # save program name for logging
 my $progname = basename($0);

From 3f6f544dc7214074a9d825d8fb490668023285dc Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 12 Sep 2017 16:39:31 +0200
Subject: [PATCH 43/67] Fix SLA visual map item - #1318

---
 pandora_console/include/functions_visual_map.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 91442813f0..9205e29cab 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1094,12 +1094,10 @@ function visual_map_print_item($mode = "read", $layoutData,
 			else {
 				if ($width == 0 || $height == 0) {
 					if ($layoutData['label_position']=='left') {
-						$img = '<div style="float:left;height:'.$himg.'px;">' . 
-							$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], 500, 50, $layoutData['period'], '', true);
+						$img = '<div style="float:left;height:'.$himg.'px;">' .graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], 500, 50, $layoutData['period'], '', true).'</div>';
 					}
 					elseif ($layoutData['label_position']=='right') {
-						$img = '<div style="float:right;height:'.$himg.'px;">' . 
-							$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], 500, 50, $layoutData['period'], '', true);
+						$img = '<div style="float:right;height:'.$himg.'px;">' . graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], 500, 50, $layoutData['period'], '', true).'</div>';
 					}
 					else {
 						$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], 500, 50, $layoutData['period'], '', true);
@@ -1107,12 +1105,10 @@ function visual_map_print_item($mode = "read", $layoutData,
 				}
 				else{
 					if ($layoutData['label_position']=='left') {
-						$img = '<div style="float:left;height:'.$himg.'px;">' . 
-							$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], $width, $height, $layoutData['period'], '', true);
+						$img = '<div style="float:left;height:'.$himg.'px;">' . graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], $width, $height, $layoutData['period'], '', true).'</div>';
 					}
 					elseif ($layoutData['label_position']=='right') {
-						$img = '<div style="float:right;height:'.$himg.'px;">' . 
-							$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], $width, $height, $layoutData['period'], '', true);
+						$img = '<div style="float:right;height:'.$himg.'px;">' .graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], $width, $height, $layoutData['period'], '', true).'</div>';
 					}
 					else {
 						$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], $width, $height, $layoutData['period'], '', true);

From 4cc2a5da0a55bf5b560986081b40864c7e6cd24b Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 13 Sep 2017 00:01:21 +0200
Subject: [PATCH 44/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 873deaf0b9..fd6d5a53f9 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170912
+Version: 7.0NG.712-170913
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index aaf1f19a52..8cc2cba035 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170912"
+pandora_version="7.0NG.712-170913"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 0f3402c1cc..34492724e6 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170912';
+use constant AGENT_BUILD => '170913';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 9af68235c7..6bc81068b7 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170912
+%define release     170913
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index e507d21c31..e0fe0086f9 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170912
+%define release     170913
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 385a1a21bb..e23d6f50fc 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170912"
+PI_BUILD="170913"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index f43d2e11bc..19ab97dd74 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170912}
+{170913}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index f502f6abdb..5da784ecab 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170912)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170913)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 7a12e30069..3453421253 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170912))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170913))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 078e3c91ad..72d8da5388 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170912
+Version: 7.0NG.712-170913
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index ae87b6449b..82b8a90cac 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170912"
+pandora_version="7.0NG.712-170913"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 5061b82a51..68298fece6 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170912';
+$build_version = 'PC170913';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 32ec64c478..45a90186c3 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170912';
+$build = '170913';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index b93469208f..09056112a3 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170912
+%define release     170913
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 73c9f41e32..feebee18f0 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170912
+%define release     170913
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 0f27779b59..4634adaee7 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170912
+Version: 7.0NG.712-170913
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index eba5936763..a641d767a7 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170912"
+pandora_version="7.0NG.712-170913"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index bff46ef371..c8a1cb3c4c 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170912";
+my $pandora_build = "170913";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index c675a9fdbf..112912bc2b 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170912
+%define release     170913
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 61beb9899c..19d4805217 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170912
+%define release     170913
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 683eed5000..998cae8cb5 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170912"
+PI_BUILD="170913"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 89f888cd0c..475b87183e 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170912";
+my $version = "7.0NG.712 PS170913";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 4955bfa0eb..7280c3f187 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170912";
+my $version = "7.0NG.712 PS170913";
 
 # save program name for logging
 my $progname = basename($0);

From e7cdf9b049660be547c87d0162b0a036be418660 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 13 Sep 2017 13:27:37 +0200
Subject: [PATCH 45/67] Added creation when elements position is auto

---
 pandora_server/util/pandora_manage.pl | 149 +++++++++++++++++++++-----
 1 file changed, 122 insertions(+), 27 deletions(-)

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index ee45368900..f258082280 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -216,7 +216,7 @@ sub help_screen{
     help_screen_line('--add_tag_to_module', '<agent_name> <module_name> <tag_name>', 'Add a tag to the given module');
 
 	print "\nVISUAL CONSOLES\n\n" unless $param ne '';
-	help_screen_line('--create_visual_console', '<name> <background> <width> <height> <group> [<background_color>] [<elements>]', 'Create a new visual console');
+	help_screen_line('--create_visual_console', '<name> <background> <width> <height> <group> <mode> [<position_to_locate_elements>] [<background_color>] [<elements>]', 'Create a new visual console');
 	help_screen_line('--edit_visual_console', '<id> <name> <background> <width> <height> <group> [<background_color>] [<elements>]', 'Edit a visual console');
 	help_screen_line('--delete_visual_console', '<id>', 'Delete a visual console');
 	help_screen_line('--delete_visual_console_objects', '<id> <mode> <id_mode>', 'Delete a visual console elements');
@@ -4769,7 +4769,7 @@ sub cli_delete_special_day() {
 ##############################################################################
 
 sub cli_create_visual_console() {
-	my ($name,$background,$width,$height,$group,$background_color,$elements) = @ARGV[2..8];
+	my ($name,$background,$width,$height,$group,$mode,$element_square_positions,$background_color,$elements) = @ARGV[2..10];
 
 	if($name eq '') {
 		print_log "[ERROR] Name field cannot be empty.\n\n";
@@ -4787,6 +4787,10 @@ sub cli_create_visual_console() {
 		print_log "[ERROR] Group field cannot be empty.\n\n";
 		exit 1;
 	}
+	elsif ($mode eq '') {
+		print_log "[ERROR] Mode parameter must be 'static_objects' or 'auto_creation'.\n\n";
+		exit 1;
+	}
 
 	if ($background_color eq '') {
 		$background_color = '#FFF';
@@ -4802,31 +4806,120 @@ sub cli_create_visual_console() {
 	if ($elements ne '') {
 		my $elements_in_array = decode_json($elements);
 
-		foreach my $elem (@$elements_in_array) {
-			my $pos_x = $elem->{'pos_x'};
-			my $pos_y = $elem->{'pos_y'};
-			my $width = $elem->{'width'};
-			my $height = $elem->{'height'};
-			my $label = $elem->{'label'};
-			my $image = $elem->{'image'};
-			my $type = $elem->{'type'};
-			my $period = $elem->{'period'};
-			my $id_agente_modulo = $elem->{'id_agente_modulo'};
-			my $id_agent = $elem->{'id_agent'};
-			my $id_layout_linked = $elem->{'id_layout_linked'};
-			my $parent_item = $elem->{'parent_item'};
-			my $enable_link = $elem->{'enable_link'};
-			my $id_metaconsole = $elem->{'id_metaconsole'};
-			my $id_group = $elem->{'id_group'};
-			my $id_custom_graph = $elem->{'id_custom_graph'};
-			my $border_width = $elem->{'border_width'};
-			my $type_graph = $elem->{'type_graph'};
-			my $label_position = $elem->{'label_position'};
-			my $border_color = $elem->{'border_color'};
-			my $fill_color = $elem->{'fill_color'};
+		if ($mode eq 'static_objects') {
+			my $elem_count = 1;
 
-			db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
-                         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $vc_id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+			foreach my $elem (@$elements_in_array) {
+				my $pos_x = $elem->{'pos_x'};
+				my $pos_y = $elem->{'pos_y'};
+				my $width = $elem->{'width'};
+				my $height = $elem->{'height'};
+				my $label = $elem->{'label'};
+				my $image = $elem->{'image'};
+				my $type = $elem->{'type'};
+				my $period = $elem->{'period'};
+				my $id_agente_modulo = $elem->{'id_agente_modulo'};
+				my $id_agent = $elem->{'id_agent'};
+				my $id_layout_linked = $elem->{'id_layout_linked'};
+				my $parent_item = $elem->{'parent_item'};
+				my $enable_link = $elem->{'enable_link'};
+				my $id_metaconsole = $elem->{'id_metaconsole'};
+				my $id_group = $elem->{'id_group'};
+				my $id_custom_graph = $elem->{'id_custom_graph'};
+				my $border_width = $elem->{'border_width'};
+				my $type_graph = $elem->{'type_graph'};
+				my $label_position = $elem->{'label_position'};
+				my $border_color = $elem->{'border_color'};
+				my $fill_color = $elem->{'fill_color'};
+
+				my $elem_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+							VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $vc_id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+
+				print_log "[INFO] The element id in position $elem_count is '$elem_id' \n\n";
+
+				$elem_count++;
+			}
+		}
+		elsif ($mode eq 'auto_creation') {
+			if ($element_square_positions eq '') {
+				print_log "[ERROR] With this mode, square positions is obligatory'.\n\n";
+				exit 1;
+			}
+			else {
+				my $positions = decode_json($element_square_positions);
+
+				my $pos1X = $positions->{'pos1x'};
+				my $pos1Y = $positions->{'pos1y'};
+				my $pos2X = $positions->{'pos2x'};
+				my $pos2Y = $positions->{'pos2y'};
+
+				my $number_of_elements = scalar(@$elements_in_array);
+				
+				my $x_divider = 4;
+				my $y_divider = 1;
+
+				for (my $i = 1; $i <= 1000; $i++) {
+					if (($i * 4) < $number_of_elements) {
+						$y_divider++;
+					}
+					else {
+						last;
+					}
+				}
+
+				my $elem_width = ($pos2X - $pos1X) / $x_divider;
+				my $elem_height = ($pos2Y - $pos1Y) / $y_divider;
+
+				if ($number_of_elements < 4) {
+					$elem_height = ($pos2Y - $pos1Y) / 3;
+				}
+
+				my $elem_count = 1;
+				my $pos_helper_x = 0;
+				my $pos_helper_y = 0;
+				foreach my $elem (@$elements_in_array) {
+					my $pos_x = $pos_helper_x * $elem_width;
+					my $pos_y = $pos_helper_y * $elem_height;
+					my $width = $elem_width;
+					my $height = $elem_height;
+					my $label = $elem->{'label'};
+					my $image = $elem->{'image'};
+					my $type = $elem->{'type'};
+					my $period = $elem->{'period'};
+					my $id_agente_modulo = $elem->{'id_agente_modulo'};
+					my $id_agent = $elem->{'id_agent'};
+					my $id_layout_linked = $elem->{'id_layout_linked'};
+					my $parent_item = $elem->{'parent_item'};
+					my $enable_link = $elem->{'enable_link'};
+					my $id_metaconsole = $elem->{'id_metaconsole'};
+					my $id_group = $elem->{'id_group'};
+					my $id_custom_graph = $elem->{'id_custom_graph'};
+					my $border_width = $elem->{'border_width'};
+					my $type_graph = $elem->{'type_graph'};
+					my $label_position = $elem->{'label_position'};
+					my $border_color = $elem->{'border_color'};
+					my $fill_color = $elem->{'fill_color'};
+
+					my $elem_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+								VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $vc_id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+
+					print_log "[INFO] The element id in position $elem_count is '$elem_id' \n\n";
+
+					$elem_count++;
+
+					if ($pos_helper_x == 3) {
+						$pos_helper_x = 0;
+						$pos_helper_y++;
+					}
+					else {
+						$pos_helper_x++;
+					}
+				}
+			}
+		}
+		else {
+			print_log "[ERROR] Mode parameter must be 'static_objects' or 'auto_creation'.\n\n";
+			exit 1;
 		}
 	}
 }
@@ -4850,6 +4943,8 @@ sub cli_delete_visual_console() {
 
 	if ($delete_layout eq 1) {
 		db_do($dbh, 'DELETE FROM tlayout_data WHERE id_layout = ?', $id);
+
+		print_log "[INFO] Delete visual console elements with console ID '$id' \n\n";
 	}
 	else {
 		print_log "[ERROR] Error at remove the visual console.\n\n";
@@ -5288,7 +5383,7 @@ sub pandora_manage_main ($$$) {
 			cli_locate_agent();
 		}
 		elsif ($param eq '--create_visual_console') {
-			param_check($ltotal, 7, 2);
+			param_check($ltotal, 9, 3);
 			cli_create_visual_console();
 		}
 		elsif ($param eq '--edit_visual_console') {

From 26522ecaaa459e67c3fa1fc5baa9a7cbc2e3fff8 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 13 Sep 2017 15:19:41 +0200
Subject: [PATCH 46/67] Added remove console items function to cli

---
 pandora_server/util/pandora_manage.pl | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f258082280..67e1214907 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -4952,6 +4952,39 @@ sub cli_delete_visual_console() {
 	}
 }
 
+##############################################################################
+# Delete a visual console objects.
+# Related option: --delete_visual_console_objects
+##############################################################################
+
+sub cli_delete_visual_console_objects() {
+	my ($id_console,$mode,$id_mode) = @ARGV[2..4];
+
+	if($id_console eq '') {
+		print_log "[ERROR] Console ID field cannot be empty.\n\n";
+		exit 1;
+	}
+	elsif ($mode eq '') {
+		print_log "[ERROR] Mode field cannot be empty.\n\n";
+		exit 1;
+	}
+	elsif ($id_mode eq '') {
+		print_log "[ERROR] Mode index field cannot be empty.\n\n";
+		exit 1;
+	}
+
+	if (($mode eq 'type') || ($mode eq 'image') || ($mode eq 'id_agent') || 
+		($mode eq 'id_agente_modulo') || ($mode eq 'id_group') || ($mode eq 'type_graph')) {
+		print_log "[INFO] Removind objects with mode '$mode' and id '$id_mode' \n\n";
+		
+		db_do($dbh, 'DELETE FROM tlayout_data WHERE id_layout = ' . $id_console . ' AND ' . $mode . ' = "' . $id_mode . '"');
+	}
+	else {
+		print_log "[ERROR] Mode is not correct.\n\n";
+		exit 1;
+	}
+}
+
 ###############################################################################
 ###############################################################################
 # MAIN

From 7b2e2fadc6592b1f5a343f78b1e7854c7bbc9862 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 13 Sep 2017 17:07:35 +0200
Subject: [PATCH 47/67] Let create a group status visual map element without
 image selected - #1245

---
 .../godmode/reporting/visual_console_builder.editor.js          | 2 +-
 pandora_console/include/functions_visual_map.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 6b1954f014..7e0ff10cec 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -691,7 +691,7 @@ function create_button_palette_callback() {
 				alert('Undefined height');
 				validate = false;
 			}
-			if ((values['label'] == '') && (values['image'] == '')) {
+			if ((values['label'] == '') && (values['image'] == '') && (values['show_statistics']) == false) {
 				alert($("#message_alert_no_label_no_image").html());
 				validate = false;
 			}
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 9205e29cab..b83abdfa2c 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1213,7 +1213,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 			break;
 		case STATIC_GRAPH:
 		case GROUP_ITEM:
-			if ($layoutData['image'] != null) {
+			if ($layoutData['image'] != null || $layoutData['show_statistics'] == 1) {
 						
 				
 				$img_style_title = strip_tags($label);

From 351f9e27b19f436d6e668bdf2550188d05d33e21 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 13 Sep 2017 17:39:17 +0200
Subject: [PATCH 48/67] Added duplicate function

---
 pandora_server/util/pandora_manage.pl | 74 +++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 67e1214907..e0322c3718 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -4985,6 +4985,80 @@ sub cli_delete_visual_console_objects() {
 	}
 }
 
+sub cli_duplicate_visual_console () {
+	my ($id_console,$prefix) = @ARGV[2..3];
+
+	if($id_console eq '') {
+		print_log "[ERROR] Console ID field cannot be empty.\n\n";
+		exit 1;
+	}
+
+	my $console = get_db_single_row ($dbh, "SELECT * 
+			FROM tlayout 
+			WHERE id = $id_console");
+
+	my $name_to_compare = $console->{'name'};
+	my $new_name = $console->{'name'} . "_1";
+	my $name_count = 2;
+
+	if ($prefix ne '') {
+		$new_name = $prefix;
+		$name_to_compare = $prefix;
+		$name_count = 1;
+	}
+
+	my $exist = 1;
+	while ($exist == 1) {
+		my $name_in_db = get_db_single_row ($dbh, "SELECT name FROM tlayout WHERE name = '$new_name'");
+		
+		if (defined($name_in_db->{'name'}) && ($name_in_db->{'name'} eq $new_name)) {
+			$new_name = $name_to_compare . "_" . $name_count;
+			$name_count++;
+		}
+		else {
+			$exist = 0;
+		}
+	}
+
+	my $new_console_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout (name, id_group, background, width, height, background_color)
+                         VALUES (?, ?, ?, ?, ?, ?)', $new_name, $console->{'id_group'}, $console->{'background'}, $console->{'width'}, $console->{'height'}, $console->{'background_color'});
+	
+	print_log "[INFO] The new visual console '$new_name' has been created. The new ID is '$new_console_id' \n\n";
+
+	my @console_elements = get_db_rows ($dbh, "SELECT * 
+			FROM tlayout_data 
+			WHERE id_layout = $id_console");
+
+	foreach my $element (@console_elements) {
+		my $pos_x = $element->{'pos_x'};
+		my $pos_y = $element->{'pos_y'};
+		my $width = $element->{'width'};
+		my $height = $element->{'height'};
+		my $label = $element->{'label'};
+		my $image = $element->{'image'};
+		my $type = $element->{'type'};
+		my $period = $element->{'period'};
+		my $id_agente_modulo = $element->{'id_agente_modulo'};
+		my $id_agent = $element->{'id_agent'};
+		my $id_layout_linked = $element->{'id_layout_linked'};
+		my $parent_item = $element->{'parent_item'};
+		my $enable_link = $element->{'enable_link'};
+		my $id_metaconsole = $element->{'id_metaconsole'};
+		my $id_group = $element->{'id_group'};
+		my $id_custom_graph = $element->{'id_custom_graph'};
+		my $border_width = $element->{'border_width'};
+		my $type_graph = $element->{'type_graph'};
+		my $label_position = $element->{'label_position'};
+		my $border_color = $element->{'border_color'};
+		my $fill_color = $element->{'fill_color'};
+
+		my $element_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+					VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $new_console_id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+	
+		print_log "[INFO] Element with ID " . $element->{"id"} . " has been duplicated to the new console \n\n";
+	}
+}
+
 ###############################################################################
 ###############################################################################
 # MAIN

From f03514c77106912b753891da7c768a7dd850b20b Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 13 Sep 2017 18:07:45 +0200
Subject: [PATCH 49/67] Added first version to export console elements to json

---
 pandora_server/util/pandora_manage.pl | 86 +++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index e0322c3718..34c42053e4 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -4985,6 +4985,11 @@ sub cli_delete_visual_console_objects() {
 	}
 }
 
+##############################################################################
+# Duplicate a visual console.
+# Related option: --duplicate_visual_console
+##############################################################################
+
 sub cli_duplicate_visual_console () {
 	my ($id_console,$prefix) = @ARGV[2..3];
 
@@ -5059,6 +5064,87 @@ sub cli_duplicate_visual_console () {
 	}
 }
 
+##############################################################################
+# Export a visual console elements to json.
+# Related option: --export_json_visual_console
+##############################################################################
+
+sub cli_export_visual_console() {
+	my ($id) = @ARGV[2];
+
+	if($id eq '') {
+		print_log "[ERROR] ID field cannot be empty.\n\n";
+		exit 1;
+	}
+
+	print_log "[INFO] Exporting visual console elements with ID '$id' \n\n";
+
+	my @console_elements = get_db_rows ($dbh, "SELECT * 
+			FROM tlayout_data 
+			WHERE id_layout = $id");
+
+	my $data_to_json = '[';
+	my $first = 1;
+
+	foreach my $element (@console_elements) {
+		my $pos_x = $element->{'pos_x'};
+		my $pos_y = $element->{'pos_y'};
+		my $width = $element->{'width'};
+		my $height = $element->{'height'};
+		my $label = $element->{'label'};
+		my $image = $element->{'image'};
+		my $type = $element->{'type'};
+		my $period = $element->{'period'};
+		my $id_agente_modulo = $element->{'id_agente_modulo'};
+		my $id_agent = $element->{'id_agent'};
+		my $id_layout_linked = $element->{'id_layout_linked'};
+		my $parent_item = $element->{'parent_item'};
+		my $enable_link = $element->{'enable_link'};
+		my $id_metaconsole = $element->{'id_metaconsole'};
+		my $id_group = $element->{'id_group'};
+		my $id_custom_graph = $element->{'id_custom_graph'};
+		my $border_width = $element->{'border_width'};
+		my $type_graph = $element->{'type_graph'};
+		my $label_position = $element->{'label_position'};
+		my $border_color = $element->{'border_color'};
+		my $fill_color = $element->{'fill_color'};
+
+		if ($first == 0) {
+			$data_to_json .= ','
+		}
+		else {
+			$first = 0;
+		}
+
+		$data_to_json .= '{"image":"' . $image . '"';
+		$data_to_json .= ',"pos_y":' . $pos_y;
+		$data_to_json .= ',"pos_x":' . $pos_x;
+		$data_to_json .= ',"width":' . $width;
+		$data_to_json .= ',"height":' . $height;
+		$data_to_json .= ',"label":"' . $label . '"';
+		$data_to_json .= ',"type":' . $type;
+		$data_to_json .= ',"period":' . $period;
+		$data_to_json .= ',"id_agente_modulo":' . $id_agente_modulo;
+		$data_to_json .= ',"id_agent":' . $id_agent;
+		$data_to_json .= ',"id_layout_linked":' . $id_layout_linked;
+		$data_to_json .= ',"parent_item":' . $parent_item;
+		$data_to_json .= ',"enable_link":' . $enable_link;
+		$data_to_json .= ',"id_metaconsole":' . $id_metaconsole;
+		$data_to_json .= ',"id_group":' . $id_group;
+		$data_to_json .= ',"id_custom_graph":' . $id_custom_graph;
+		$data_to_json .= ',"border_width":' . $border_width;
+		$data_to_json .= ',"type_graph":"' . $type_graph . '"';
+		$data_to_json .= ',"label_position":"' . $label_position . '"';
+		$data_to_json .= ',"border_color":"' . $border_color . '"';
+		$data_to_json .= ',"fill_color":"' . $fill_color . '"';
+		$data_to_json .= '}';
+	}
+
+	$data_to_json .= ']';
+
+	print_log "[INFO] JSON file now contents: \n" . $data_to_json . "\n\n";
+}
+
 ###############################################################################
 ###############################################################################
 # MAIN

From 41956caa5ce3735e51b0d909a398f3eb8dadacc1 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 14 Sep 2017 00:01:20 +0200
Subject: [PATCH 50/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index fd6d5a53f9..5a75c5dca4 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170913
+Version: 7.0NG.712-170914
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 8cc2cba035..9d4335697a 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170913"
+pandora_version="7.0NG.712-170914"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 34492724e6..89945c274d 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170913';
+use constant AGENT_BUILD => '170914';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 6bc81068b7..adaa8404c3 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170913
+%define release     170914
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index e0fe0086f9..e77bed63f0 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170913
+%define release     170914
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index e23d6f50fc..aa7c62cb6c 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170913"
+PI_BUILD="170914"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 19ab97dd74..3979f27147 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170913}
+{170914}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 5da784ecab..e0770c3c57 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170913)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170914)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3453421253..e25d77599a 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170913))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170914))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 72d8da5388..f03a7cbd15 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170913
+Version: 7.0NG.712-170914
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 82b8a90cac..057d259316 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170913"
+pandora_version="7.0NG.712-170914"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 68298fece6..0a07b5ca99 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170913';
+$build_version = 'PC170914';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 45a90186c3..004fc2f7d8 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170913';
+$build = '170914';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 09056112a3..fb64779b67 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170913
+%define release     170914
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index feebee18f0..c31d871307 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170913
+%define release     170914
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 4634adaee7..00106fa71a 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170913
+Version: 7.0NG.712-170914
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index a641d767a7..1211bd9650 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170913"
+pandora_version="7.0NG.712-170914"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index c8a1cb3c4c..a09614a35a 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170913";
+my $pandora_build = "170914";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 112912bc2b..d112f654ec 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170913
+%define release     170914
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 19d4805217..dc178baa49 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170913
+%define release     170914
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 998cae8cb5..9054bd91f7 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170913"
+PI_BUILD="170914"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 475b87183e..f944e22d7c 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170913";
+my $version = "7.0NG.712 PS170914";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7280c3f187..e49098c95d 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170913";
+my $version = "7.0NG.712 PS170914";
 
 # save program name for logging
 my $progname = basename($0);

From aa8ee4278d36f969080d0ab30f2cd9d0ddb5f908 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 14 Sep 2017 09:37:45 +0200
Subject: [PATCH 51/67] Added export to JSON function to cli

---
 pandora_server/util/pandora_manage.pl | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 34c42053e4..a34d918338 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -221,7 +221,7 @@ sub help_screen{
 	help_screen_line('--delete_visual_console', '<id>', 'Delete a visual console');
 	help_screen_line('--delete_visual_console_objects', '<id> <mode> <id_mode>', 'Delete a visual console elements');
 	help_screen_line('--duplicate_visual_console', '<id> <times> [<prefix>]', 'Duplicate a visual console');
-	help_screen_line('--export_json_visual_console', '<id>', 'Creates a json with the visual console elements information');
+	help_screen_line('--export_json_visual_console', '<id> [<path>]', 'Creates a json with the visual console elements information');
 
 	
 	print "\n";
@@ -5070,7 +5070,7 @@ sub cli_duplicate_visual_console () {
 ##############################################################################
 
 sub cli_export_visual_console() {
-	my ($id) = @ARGV[2];
+	my ($id,$path) = @ARGV[2..3];
 
 	if($id eq '') {
 		print_log "[ERROR] ID field cannot be empty.\n\n";
@@ -5142,6 +5142,15 @@ sub cli_export_visual_console() {
 
 	$data_to_json .= ']';
 
+	if ($path eq '') {
+		open(FicheroJSON, ">console_" . $id . "_elements");
+	}
+	else {
+		open(FicheroJSON, ">" . $path . "/console_" . $id . "_elements");
+	}
+
+	print FicheroJSON $data_to_json;
+
 	print_log "[INFO] JSON file now contents: \n" . $data_to_json . "\n\n";
 }
 
@@ -5596,7 +5605,7 @@ sub pandora_manage_main ($$$) {
 			cli_duplicate_visual_console();
 		}
 		elsif ($param eq '--export_json_visual_console') {
-			param_check($ltotal, 1);
+			param_check($ltotal, 2, 1);
 			cli_export_visual_console();
 		}
 		else {

From 8907b393df23d86d920e0b93082c1f852e40bf04 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 14 Sep 2017 10:27:11 +0200
Subject: [PATCH 52/67] Fix - Horizontal scrolling of elements with hyperlink
 in label for VC - #1327

---
 .../operation/visual_console/render_view.php       | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php
index 4364bfda9f..261205818b 100755
--- a/pandora_console/operation/visual_console/render_view.php
+++ b/pandora_console/operation/visual_console/render_view.php
@@ -282,7 +282,12 @@ $ignored_params['refr'] = '';
 		
 		$('.item:not(.icon) img:not(.b64img)').each( function() {
 			if ($(this).css('float')=='left' || $(this).css('float')=='right') {
-				$(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
+				if(	$(this).parent()[0].tagName == 'DIV'){
+					$(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
+				}
+				else if (	$(this).parent()[0].tagName == 'A') {
+					$(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
+				}
 				$(this).css('margin-left','');
 			}
 			else {
@@ -290,7 +295,12 @@ $ignored_params['refr'] = '';
 					$(this).css('margin-left','');
 					$(this).css('margin-top','');
 				} else {
-					$(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+					if(	$(this).parent()[0].tagName == 'DIV'){
+						$(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+					}
+					else if (	$(this).parent()[0].tagName == 'A') {
+						$(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+					}
 					$(this).css('margin-top','');
 				}
 			}

From bb0e15261a17c4c27beed7c85a0cd1291cd793ba Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 14 Sep 2017 12:07:52 +0200
Subject: [PATCH 53/67] Added editor function when static option is enabled

---
 pandora_server/util/pandora_manage.pl | 275 +++++++++++++++++++++++++-
 1 file changed, 273 insertions(+), 2 deletions(-)

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a34d918338..8cdb7df9b8 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -217,7 +217,7 @@ sub help_screen{
 
 	print "\nVISUAL CONSOLES\n\n" unless $param ne '';
 	help_screen_line('--create_visual_console', '<name> <background> <width> <height> <group> <mode> [<position_to_locate_elements>] [<background_color>] [<elements>]', 'Create a new visual console');
-	help_screen_line('--edit_visual_console', '<id> <name> <background> <width> <height> <group> [<background_color>] [<elements>]', 'Edit a visual console');
+	help_screen_line('--edit_visual_console', '<id> [<name>] [<background>] [<width>] [<height>] [<group>] [<mode>] [<position_to_locate_elements>] [<background_color>] [<elements>]', 'Edit a visual console');
 	help_screen_line('--delete_visual_console', '<id>', 'Delete a visual console');
 	help_screen_line('--delete_visual_console_objects', '<id> <mode> <id_mode>', 'Delete a visual console elements');
 	help_screen_line('--duplicate_visual_console', '<id> <times> [<prefix>]', 'Duplicate a visual console');
@@ -4924,6 +4924,277 @@ sub cli_create_visual_console() {
 	}
 }
 
+##############################################################################
+# Edit a visual console.
+# Related option: --edit_visual_console
+##############################################################################
+
+sub cli_edit_visual_console() {
+	my ($id,$name,$background,$width,$height,$group,$mode,$element_square_positions,$background_color,$elements) = @ARGV[2..11];
+
+	if($id eq '') {
+		print_log "[ERROR] ID field cannot be empty.\n\n";
+		exit 1;
+	}
+
+	my $console = get_db_single_row ($dbh, "SELECT * 
+			FROM tlayout 
+			WHERE id = $id");
+
+	my $new_name = $console->{'name'};
+	my $new_background = $console->{'background'};
+	my $new_console_width = $console->{'width'};
+	my $new_console_height = $console->{'height'};
+	my $new_console_id_group = $console->{'id_group'};
+	my $new_background_color = $console->{'background_color'};
+
+	if($name ne '') {
+		$new_name = $name;
+	}
+	if ($background ne '') {
+		$new_background = $background;
+	}
+	if ($width ne '') {
+		$new_console_width = $width;
+	}
+	if ($height ne '') {
+		$new_console_height = $height;
+	}
+	if ($group ne '') {
+		$new_console_id_group = $group;
+	}
+	if ($background_color ne '') {
+		$new_background_color = $background_color;
+	}
+
+	print_log "[INFO] The visual console with id $id is updated \n\n";
+
+	db_update ($dbh, "UPDATE tlayout SET name = '" . $new_name . "', background = '" . $new_background . "', width = " . $new_console_width . ", height = " . $new_console_height . ", id_group = " . $new_console_id_group . ", background_color = '" . $new_background_color . "' WHERE id = " . $id);
+
+	if ($elements ne '') {
+		my $elements_in_array = decode_json($elements);
+
+		if ($mode eq 'static_objects') {
+			foreach my $elem (@$elements_in_array) {
+				if (defined($elem->{'id'})) {
+
+					print_log "[INFO] Edit element with id " . $elem->{'id'} . " \n\n";
+
+					my $element_in_db = get_db_single_row ($dbh, "SELECT * 
+						FROM tlayout_data 
+						WHERE id = " . $elem->{'id'});
+
+					my $new_pos_x = $element_in_db->{'pos_x'};
+					my $new_pos_y = $element_in_db->{'pos_y'};
+					my $new_width = $element_in_db->{'width'};
+					my $new_height = $element_in_db->{'height'};
+					my $new_label = $element_in_db->{'label'};
+					my $new_image = $element_in_db->{'image'};
+					my $new_type = $element_in_db->{'type'};
+					my $new_period = $element_in_db->{'period'};
+					my $new_id_agente_modulo = $element_in_db->{'id_agente_modulo'};
+					my $new_id_agent = $element_in_db->{'id_agent'};
+					my $new_id_layout_linked = $element_in_db->{'id_layout_linked'};
+					my $new_parent_item = $element_in_db->{'parent_item'};
+					my $new_enable_link = $element_in_db->{'enable_link'};
+					my $new_id_metaconsole = $element_in_db->{'id_metaconsole'};
+					my $new_id_group = $element_in_db->{'id_group'};
+					my $new_id_custom_graph = $element_in_db->{'id_custom_graph'};
+					my $new_border_width = $element_in_db->{'border_width'};
+					my $new_type_graph = $element_in_db->{'type_graph'};
+					my $new_label_position = $element_in_db->{'label_position'};
+					my $new_border_color = $element_in_db->{'border_color'};
+					my $new_fill_color = $element_in_db->{'fill_color'};
+
+					if(defined($elem->{'pos_x'})) {
+						$new_pos_x = $elem->{'pos_x'};
+					}
+					if(defined($elem->{'pos_y'})) {
+						$new_pos_y = $elem->{'pos_y'};
+					}
+					if(defined($elem->{'width'})) {
+						$new_width = $elem->{'width'};
+					}
+					if(defined($elem->{'height'})) {
+						$new_height = $elem->{'height'};
+					}
+					if(defined($elem->{'label'})) {
+						$new_label = $elem->{'label'};
+					}
+					if(defined($elem->{'image'})) {
+						$new_image = $elem->{'image'};
+					}
+					if(defined($elem->{'type'})) {
+						$new_type = $elem->{'type'};
+					}
+					if(defined($elem->{'period'})) {
+						$new_period = $elem->{'period'};
+					}
+					if(defined($elem->{'id_agente_modulo'})) {
+						$new_id_agente_modulo = $elem->{'id_agente_modulo'};
+					}
+					if(defined($elem->{'id_agent'})) {
+						$new_id_agent = $elem->{'id_agent'};
+					}
+					if(defined($elem->{'id_layout_linked'})) {
+						$new_id_layout_linked = $elem->{'id_layout_linked'};
+					}
+					if(defined($elem->{'parent_item'})) {
+						$new_parent_item = $elem->{'parent_item'};
+					}
+					if(defined($elem->{'enable_link'})) {
+						$new_enable_link = $elem->{'enable_link'};
+					}
+					if(defined($elem->{'id_metaconsole'})) {
+						$new_id_metaconsole = $elem->{'id_metaconsole'};
+					}
+					if(defined($elem->{'id_group'})) {
+						$new_id_group = $elem->{'id_group'};
+					}
+					if(defined($elem->{'id_custom_graph'})) {
+						$new_id_custom_graph = $elem->{'id_custom_graph'};
+					}
+					if(defined($elem->{'border_width'})) {
+						$new_border_width = $elem->{'border_width'};
+					}
+					if(defined($elem->{'type_graph'})) {
+						$new_type_graph = $elem->{'type_graph'};
+					}
+					if(defined($elem->{'label_position'})) {
+						$new_label_position = $elem->{'label_position'};
+					}
+					if(defined($elem->{'border_color'})) {
+						$new_border_color = $elem->{'border_color'};
+					}
+					if(defined($elem->{'fill_color'})) {
+						$new_fill_color = $elem->{'fill_color'};
+					}
+
+					db_update ($dbh, "UPDATE tlayout_data SET pos_x = " . $new_pos_x . ", pos_y = " . $new_pos_y . ", width = " . $new_width . 
+						", height = " . $new_height . ", label = '" . $new_label . "', image = '" . $new_image . 
+						"', type = " . $new_type . ", period = " . $new_period . ", id_agente_modulo = " . $new_id_agente_modulo . 
+						", id_agent = " . $new_id_agent . ", id_layout_linked = " . $new_id_layout_linked . ", parent_item = " . $new_parent_item . 
+						", enable_link = " . $new_enable_link . ", id_metaconsole = " . $new_id_metaconsole . ", id_group = " . $new_id_group . 
+						", id_custom_graph = " . $new_id_custom_graph . ", border_width = " . $new_border_width . ", type_graph = '" . $new_type_graph . 
+						"', label_position = '" . $new_label_position . "', border_color = '" . $new_border_color . "', fill_color = '" . $new_fill_color . 
+						"' WHERE id = " . $elem->{'id'});
+					
+					print_log "[INFO] Element with id " . $elem->{'id'} . " has been updated \n\n";
+				}
+				else {
+					my $pos_x = $elem->{'pos_x'};
+					my $pos_y = $elem->{'pos_y'};
+					my $width = $elem->{'width'};
+					my $height = $elem->{'height'};
+					my $label = $elem->{'label'};
+					my $image = $elem->{'image'};
+					my $type = $elem->{'type'};
+					my $period = $elem->{'period'};
+					my $id_agente_modulo = $elem->{'id_agente_modulo'};
+					my $id_agent = $elem->{'id_agent'};
+					my $id_layout_linked = $elem->{'id_layout_linked'};
+					my $parent_item = $elem->{'parent_item'};
+					my $enable_link = $elem->{'enable_link'};
+					my $id_metaconsole = $elem->{'id_metaconsole'};
+					my $id_group = $elem->{'id_group'};
+					my $id_custom_graph = $elem->{'id_custom_graph'};
+					my $border_width = $elem->{'border_width'};
+					my $type_graph = $elem->{'type_graph'};
+					my $label_position = $elem->{'label_position'};
+					my $border_color = $elem->{'border_color'};
+					my $fill_color = $elem->{'fill_color'};
+
+					my $new_elem_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+						VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+				
+					print_log "[INFO] New element with id $new_elem_id has been created \n\n";
+				}
+			}
+		}
+		elsif ($mode eq 'auto_creation') {
+			if ($element_square_positions eq '') {
+				print_log "[ERROR] With this mode, square positions is obligatory'.\n\n";
+				exit 1;
+			}
+			else {
+				my $positions = decode_json($element_square_positions);
+
+				my $pos1X = $positions->{'pos1x'};
+				my $pos1Y = $positions->{'pos1y'};
+				my $pos2X = $positions->{'pos2x'};
+				my $pos2Y = $positions->{'pos2y'};
+
+				my $number_of_elements = scalar(@$elements_in_array);
+				
+				my $x_divider = 4;
+				my $y_divider = 1;
+
+				for (my $i = 1; $i <= 1000; $i++) {
+					if (($i * 4) < $number_of_elements) {
+						$y_divider++;
+					}
+					else {
+						last;
+					}
+				}
+
+				my $elem_width = ($pos2X - $pos1X) / $x_divider;
+				my $elem_height = ($pos2Y - $pos1Y) / $y_divider;
+
+				if ($number_of_elements < 4) {
+					$elem_height = ($pos2Y - $pos1Y) / 3;
+				}
+
+				my $elem_count = 1;
+				my $pos_helper_x = 0;
+				my $pos_helper_y = 0;
+				foreach my $elem (@$elements_in_array) {
+					my $pos_x = $pos_helper_x * $elem_width;
+					my $pos_y = $pos_helper_y * $elem_height;
+					my $width = $elem_width;
+					my $height = $elem_height;
+					my $label = $elem->{'label'};
+					my $image = $elem->{'image'};
+					my $type = $elem->{'type'};
+					my $period = $elem->{'period'};
+					my $id_agente_modulo = $elem->{'id_agente_modulo'};
+					my $id_agent = $elem->{'id_agent'};
+					my $id_layout_linked = $elem->{'id_layout_linked'};
+					my $parent_item = $elem->{'parent_item'};
+					my $enable_link = $elem->{'enable_link'};
+					my $id_metaconsole = $elem->{'id_metaconsole'};
+					my $id_group = $elem->{'id_group'};
+					my $id_custom_graph = $elem->{'id_custom_graph'};
+					my $border_width = $elem->{'border_width'};
+					my $type_graph = $elem->{'type_graph'};
+					my $label_position = $elem->{'label_position'};
+					my $border_color = $elem->{'border_color'};
+					my $fill_color = $elem->{'fill_color'};
+
+					my $elem_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+								VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+
+					print_log "[INFO] The element id in position $elem_count is '$elem_id' \n\n";
+
+					$elem_count++;
+
+					if ($pos_helper_x == 3) {
+						$pos_helper_x = 0;
+						$pos_helper_y++;
+					}
+					else {
+						$pos_helper_x++;
+					}
+				}
+			}
+		}
+		else {
+			print_log "[ERROR] Mode parameter must be 'static_objects' or 'auto_creation'.\n\n";
+			exit 1;
+		}
+	}
+}
+
 ##############################################################################
 # Delete a visual console.
 # Related option: --delete_visual_console
@@ -5589,7 +5860,7 @@ sub pandora_manage_main ($$$) {
 			cli_create_visual_console();
 		}
 		elsif ($param eq '--edit_visual_console') {
-			param_check($ltotal, 6, 2);
+			param_check($ltotal, 10, 9);
 			cli_edit_visual_console();
 		}
 		elsif ($param eq '--delete_visual_console') {

From 4fd4783bc56733368813bd2a87f6fb8ccf2dc2bb Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 14 Sep 2017 13:14:31 +0200
Subject: [PATCH 54/67] Added edit function with auto position

---
 pandora_server/util/pandora_manage.pl | 171 ++++++++++++++++++++++----
 1 file changed, 144 insertions(+), 27 deletions(-)

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 8cdb7df9b8..9af7840fe9 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -5117,6 +5117,135 @@ sub cli_edit_visual_console() {
 				exit 1;
 			}
 			else {
+				foreach my $elem (@$elements_in_array) {
+					if (defined($elem->{'id'})) {
+						print_log "[INFO] Edit element with id " . $elem->{'id'} . " \n\n";
+
+						my $element_in_db = get_db_single_row ($dbh, "SELECT * 
+							FROM tlayout_data 
+							WHERE id = " . $elem->{'id'});
+
+						my $new_pos_x = $element_in_db->{'pos_x'};
+						my $new_pos_y = $element_in_db->{'pos_y'};
+						my $new_width = $element_in_db->{'width'};
+						my $new_height = $element_in_db->{'height'};
+						my $new_label = $element_in_db->{'label'};
+						my $new_image = $element_in_db->{'image'};
+						my $new_type = $element_in_db->{'type'};
+						my $new_period = $element_in_db->{'period'};
+						my $new_id_agente_modulo = $element_in_db->{'id_agente_modulo'};
+						my $new_id_agent = $element_in_db->{'id_agent'};
+						my $new_id_layout_linked = $element_in_db->{'id_layout_linked'};
+						my $new_parent_item = $element_in_db->{'parent_item'};
+						my $new_enable_link = $element_in_db->{'enable_link'};
+						my $new_id_metaconsole = $element_in_db->{'id_metaconsole'};
+						my $new_id_group = $element_in_db->{'id_group'};
+						my $new_id_custom_graph = $element_in_db->{'id_custom_graph'};
+						my $new_border_width = $element_in_db->{'border_width'};
+						my $new_type_graph = $element_in_db->{'type_graph'};
+						my $new_label_position = $element_in_db->{'label_position'};
+						my $new_border_color = $element_in_db->{'border_color'};
+						my $new_fill_color = $element_in_db->{'fill_color'};
+
+						if(defined($elem->{'width'})) {
+							$new_width = $elem->{'width'};
+						}
+						if(defined($elem->{'height'})) {
+							$new_height = $elem->{'height'};
+						}
+						if(defined($elem->{'label'})) {
+							$new_label = $elem->{'label'};
+						}
+						if(defined($elem->{'image'})) {
+							$new_image = $elem->{'image'};
+						}
+						if(defined($elem->{'type'})) {
+							$new_type = $elem->{'type'};
+						}
+						if(defined($elem->{'period'})) {
+							$new_period = $elem->{'period'};
+						}
+						if(defined($elem->{'id_agente_modulo'})) {
+							$new_id_agente_modulo = $elem->{'id_agente_modulo'};
+						}
+						if(defined($elem->{'id_agent'})) {
+							$new_id_agent = $elem->{'id_agent'};
+						}
+						if(defined($elem->{'id_layout_linked'})) {
+							$new_id_layout_linked = $elem->{'id_layout_linked'};
+						}
+						if(defined($elem->{'parent_item'})) {
+							$new_parent_item = $elem->{'parent_item'};
+						}
+						if(defined($elem->{'enable_link'})) {
+							$new_enable_link = $elem->{'enable_link'};
+						}
+						if(defined($elem->{'id_metaconsole'})) {
+							$new_id_metaconsole = $elem->{'id_metaconsole'};
+						}
+						if(defined($elem->{'id_group'})) {
+							$new_id_group = $elem->{'id_group'};
+						}
+						if(defined($elem->{'id_custom_graph'})) {
+							$new_id_custom_graph = $elem->{'id_custom_graph'};
+						}
+						if(defined($elem->{'border_width'})) {
+							$new_border_width = $elem->{'border_width'};
+						}
+						if(defined($elem->{'type_graph'})) {
+							$new_type_graph = $elem->{'type_graph'};
+						}
+						if(defined($elem->{'label_position'})) {
+							$new_label_position = $elem->{'label_position'};
+						}
+						if(defined($elem->{'border_color'})) {
+							$new_border_color = $elem->{'border_color'};
+						}
+						if(defined($elem->{'fill_color'})) {
+							$new_fill_color = $elem->{'fill_color'};
+						}
+
+						db_update ($dbh, "UPDATE tlayout_data SET pos_x = " . $new_pos_x . ", pos_y = " . $new_pos_y . ", width = " . $new_width . 
+							", height = " . $new_height . ", label = '" . $new_label . "', image = '" . $new_image . 
+							"', type = " . $new_type . ", period = " . $new_period . ", id_agente_modulo = " . $new_id_agente_modulo . 
+							", id_agent = " . $new_id_agent . ", id_layout_linked = " . $new_id_layout_linked . ", parent_item = " . $new_parent_item . 
+							", enable_link = " . $new_enable_link . ", id_metaconsole = " . $new_id_metaconsole . ", id_group = " . $new_id_group . 
+							", id_custom_graph = " . $new_id_custom_graph . ", border_width = " . $new_border_width . ", type_graph = '" . $new_type_graph . 
+							"', label_position = '" . $new_label_position . "', border_color = '" . $new_border_color . "', fill_color = '" . $new_fill_color . 
+							"' WHERE id = " . $elem->{'id'});
+						
+						print_log "[INFO] Element with id " . $elem->{'id'} . " has been updated \n\n";
+					}
+					else {
+						my $pos_x = 0;
+						my $pos_y = 0;
+						my $width = $elem->{'width'};
+						my $height = $elem->{'height'};
+						my $label = $elem->{'label'};
+						my $image = $elem->{'image'};
+						my $type = $elem->{'type'};
+						my $period = $elem->{'period'};
+						my $id_agente_modulo = $elem->{'id_agente_modulo'};
+						my $id_agent = $elem->{'id_agent'};
+						my $id_layout_linked = $elem->{'id_layout_linked'};
+						my $parent_item = $elem->{'parent_item'};
+						my $enable_link = $elem->{'enable_link'};
+						my $id_metaconsole = $elem->{'id_metaconsole'};
+						my $id_group = $elem->{'id_group'};
+						my $id_custom_graph = $elem->{'id_custom_graph'};
+						my $border_width = $elem->{'border_width'};
+						my $type_graph = $elem->{'type_graph'};
+						my $label_position = $elem->{'label_position'};
+						my $border_color = $elem->{'border_color'};
+						my $fill_color = $elem->{'fill_color'};
+
+						my $new_elem_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
+							VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+					
+						print_log "[INFO] New element with id $new_elem_id has been created \n\n";
+					}
+				}
+
 				my $positions = decode_json($element_square_positions);
 
 				my $pos1X = $positions->{'pos1x'};
@@ -5124,8 +5253,12 @@ sub cli_edit_visual_console() {
 				my $pos2X = $positions->{'pos2x'};
 				my $pos2Y = $positions->{'pos2y'};
 
-				my $number_of_elements = scalar(@$elements_in_array);
-				
+				my @console_elements = get_db_rows ($dbh, "SELECT * 
+						FROM tlayout_data 
+						WHERE id_layout = $id");
+
+				my $number_of_elements = scalar(@console_elements);
+
 				my $x_divider = 4;
 				my $y_divider = 1;
 
@@ -5148,33 +5281,17 @@ sub cli_edit_visual_console() {
 				my $elem_count = 1;
 				my $pos_helper_x = 0;
 				my $pos_helper_y = 0;
-				foreach my $elem (@$elements_in_array) {
-					my $pos_x = $pos_helper_x * $elem_width;
-					my $pos_y = $pos_helper_y * $elem_height;
-					my $width = $elem_width;
-					my $height = $elem_height;
-					my $label = $elem->{'label'};
-					my $image = $elem->{'image'};
-					my $type = $elem->{'type'};
-					my $period = $elem->{'period'};
-					my $id_agente_modulo = $elem->{'id_agente_modulo'};
-					my $id_agent = $elem->{'id_agent'};
-					my $id_layout_linked = $elem->{'id_layout_linked'};
-					my $parent_item = $elem->{'parent_item'};
-					my $enable_link = $elem->{'enable_link'};
-					my $id_metaconsole = $elem->{'id_metaconsole'};
-					my $id_group = $elem->{'id_group'};
-					my $id_custom_graph = $elem->{'id_custom_graph'};
-					my $border_width = $elem->{'border_width'};
-					my $type_graph = $elem->{'type_graph'};
-					my $label_position = $elem->{'label_position'};
-					my $border_color = $elem->{'border_color'};
-					my $fill_color = $elem->{'fill_color'};
+				foreach my $elem (@console_elements) {
+					my $new_pos_x = $pos_helper_x * $elem_width;
+					my $new_pos_y = $pos_helper_y * $elem_height;
+					my $new_elem_width = $elem_width;
+					my $new_elem_height = $elem_height;
 
-					my $elem_id = db_insert ($dbh, 'id', 'INSERT INTO tlayout_data (id_layout, pos_x, pos_y, height, width, label, image, type, period, id_agente_modulo, id_agent, id_layout_linked, parent_item, enable_link, id_metaconsole, id_group, id_custom_graph, border_width, type_graph, label_position, border_color, fill_color, show_statistics)
-								VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $id, $pos_x, $pos_y, $height, $width, $label, $image, $type, $period, $id_agente_modulo, $id_agent, $id_layout_linked, $parent_item, $enable_link, $id_metaconsole, $id_group, $id_custom_graph, $border_width, $type_graph, $label_position, $border_color, $fill_color, 0);
+					db_update ($dbh, "UPDATE tlayout_data SET pos_x = " . $new_pos_x . ", pos_y = " . $new_pos_y . 
+							", width = " . $new_elem_width . ", height = " . $new_elem_height . 
+							" WHERE id = " . $elem->{'id'});
 
-					print_log "[INFO] The element id in position $elem_count is '$elem_id' \n\n";
+					print_log "[INFO] Recolocate element with id " . $elem->{'id'} . " \n\n";
 
 					$elem_count++;
 

From eb6e67e1ca028c8deb3d031d8eabb604008ddb74 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 14 Sep 2017 17:56:57 +0200
Subject: [PATCH 55/67] Added servers sction in menu to RR perms

---
 pandora_console/godmode/menu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 38c0f2dfc6..b929a1ec84 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -196,7 +196,7 @@ if (!empty($sub)) {
 }
 
 
-if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "PM")) {
+if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "PM") || check_acl ($config['id_user'], 0, "RR")) {
 	// Servers
 	$menu_godmode["gservers"]["text"] = __('Servers');
 	$menu_godmode["gservers"]["sec2"] = "godmode/servers/modificar_server";

From 802a782c9ac812c2d03f868c69682aba9039e8ba Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 15 Sep 2017 00:01:21 +0200
Subject: [PATCH 56/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 5a75c5dca4..21580b7e8c 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170914
+Version: 7.0NG.712-170915
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 9d4335697a..e7e42e4c6a 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170914"
+pandora_version="7.0NG.712-170915"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 89945c274d..86e0ebfa7f 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170914';
+use constant AGENT_BUILD => '170915';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index adaa8404c3..61b2f9e67e 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170914
+%define release     170915
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index e77bed63f0..9db99dbde2 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170914
+%define release     170915
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index aa7c62cb6c..2c3bd737c8 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170914"
+PI_BUILD="170915"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 3979f27147..804ce5dc7a 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170914}
+{170915}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e0770c3c57..b9837b99ff 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170914)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170915)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index e25d77599a..73d4b21d79 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170914))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170915))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index f03a7cbd15..156efc60ee 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170914
+Version: 7.0NG.712-170915
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 057d259316..3b0fd9286a 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170914"
+pandora_version="7.0NG.712-170915"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 0a07b5ca99..7b42fe4333 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170914';
+$build_version = 'PC170915';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 004fc2f7d8..cc96071e5c 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170914';
+$build = '170915';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index fb64779b67..f0459a2e82 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170914
+%define release     170915
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index c31d871307..4ec2f41e7c 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170914
+%define release     170915
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 00106fa71a..0421655c77 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170914
+Version: 7.0NG.712-170915
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 1211bd9650..6119f1f776 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170914"
+pandora_version="7.0NG.712-170915"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index a09614a35a..ae4907db19 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170914";
+my $pandora_build = "170915";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index d112f654ec..558d187c97 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170914
+%define release     170915
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index dc178baa49..7f89268cc9 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170914
+%define release     170915
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 9054bd91f7..91fe4cbde2 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170914"
+PI_BUILD="170915"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index f944e22d7c..9e20eddce3 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170914";
+my $version = "7.0NG.712 PS170915";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 5c872f4f87..0205add7ce 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170914";
+my $version = "7.0NG.712 PS170915";
 
 # save program name for logging
 my $progname = basename($0);

From e3d42a878aef358cb75dac8567bd55bda03d549b Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Fri, 15 Sep 2017 13:21:51 +0200
Subject: [PATCH 57/67] Added changes to NODE

---
 .../include/functions_reporting.php           | 91 +++++++++++++++++--
 1 file changed, 82 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index d46ea0759a..877a0e54b7 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -129,12 +129,51 @@ function reporting_make_reporting_data($report = null, $id_report,
 		}
 		
 		$content['style'] = json_decode(io_safe_output($content['style']), true);
+
+		$graphs_to_macro = db_get_all_rows_field_filter ("tgraph_source",
+			"id_graph", $content['id_gs']);
+		
+		if ($graphs_to_macro === false)
+			$graphs_to_macro = array();
+
+		$modules_to_macro = array ();
+		$agents_to_macro = array();
+		foreach ($graphs_to_macro as $graph_item) {
+			if ($type == 'automatic_graph') {
+				array_push ($modules_to_macro, array(
+					'module' => $graph_item['id_agent_module'],
+					'server' => $graph_item['id_server']));
+			}
+			else {
+				array_push ($modules_to_macro, $graph_item['id_agent_module']);
+			}
+
+			if (in_array('label', $content['style'])) {
+				if (defined('METACONSOLE')) {
+					array_push ($agents_to_macro, $content['id_agent']);
+				}
+				else {
+					array_push ($agents_to_macro, modules_get_agentmodule_agent($graph_item['id_agent_module']));
+				}
+			}
+		}
+
+		$agents_to_macro_aux = array();
+		foreach ($agents_to_macro as $ag) {
+			if (!in_array($ag, $agents_to_macro_aux)) {
+				$agents_to_macro_aux[$ag] = $ag;
+			}
+		}
+		$agents_to_macro = $agents_to_macro_aux;
+
 		if(isset($content['style']['name_label'])){
 			//Add macros name
 			$items_label = array();
 			$items_label['type'] = $content['type'];
 			$items_label['id_agent'] = $content['id_agent'];
 			$items_label['id_agent_module'] = $content['id_agent_module'];
+			$items_label['modules'] = $modules_to_macro;
+			$items_label['agents'] = $agents_to_macro;
 			$metaconsole_on = is_metaconsole();
 			$server_name = $content['server_name'];
 			
@@ -5852,11 +5891,12 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 							'id_agent_module'=>$graph_item['id_agent_module']);
 			}
 			else {
-			$item = array('type' => 'custom_graph',
-						'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
-						'id_agent_module'=>$graph_item['id_agent_module']);
+				$item = array('type' => 'custom_graph',
+							'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
+							'id_agent_module'=>$graph_item['id_agent_module']);
 			}
 			
+			$label = reporting_label_macro($item, $content['style']['label']);
 			$labels[$graph_item['id_agent_module']] = $label;
 		}
 	}
@@ -10313,32 +10353,65 @@ function reporting_label_macro ($item, $label) {
 		case 'MTTR':
 		case 'automatic_graph':
 			if (preg_match("/_agent_/", $label)) {
-				$agent_name = agents_get_alias($item['id_agent']);
+				if (count($item['agents']) > 1) {
+					$agent_name = count($item['agents']) . __(' agents');
+				}
+				else {
+					$agent_name = agents_get_alias($item['id_agent']);
+				}
+				
 				$label = str_replace("_agent_", $agent_name, $label);
 			}
 			
 			if (preg_match("/_agentdescription_/", $label)) {
-				$agent_name = agents_get_description($item['id_agent']);
+				if (count($item['agents']) > 1) {
+					$agent_name = "";
+				}
+				else {
+					$agent_name = agents_get_description($item['id_agent']);
+				}
 				$label = str_replace("_agentdescription_", $agent_name, $label);
 			}
 			
 			if (preg_match("/_agentgroup_/", $label)) {
-				$agent_name = groups_get_name(agents_get_agent_group($item['id_agent']),true);
+				if (count($item['agents']) > 1) {
+					$agent_name = "";
+				}
+				else {
+					$agent_name = groups_get_name(agents_get_agent_group($item['id_agent']),true);
+				}
 				$label = str_replace("_agentgroup_", $agent_name, $label);
 			}
 			
 			if (preg_match("/_address_/", $label)) {
-				$agent_name = agents_get_address($item['id_agent']);
+				if (count($item['agents']) > 1) {
+					$agent_name = "";
+				}
+				else {
+					$agent_name = agents_get_address($item['id_agent']);
+				}
 				$label = str_replace("_address_", $agent_name, $label);
 			}
 			
 			if (preg_match("/_module_/", $label)) {
-				$module_name = modules_get_agentmodule_name($item['id_agent_module']);
+				if (count($item['modules']) > 1) {
+					$module_name = count($item['modules']) . __(' modules');
+				}
+				else {
+					$module_name = modules_get_agentmodule_name($item['id_agent_module']);
+				}
+				
 				$label = str_replace("_module_", $module_name, $label);
 			}
 			
 			if (preg_match("/_moduledescription_/", $label)) {
-				$module_description = modules_get_agentmodule_descripcion($item['id_agent_module']);
+				if (count($item['modules']) > 1) {
+					$module_description = "";
+				}
+				else {
+					$module_description = modules_get_agentmodule_descripcion($item['id_agent_module']);
+				}
+
 				$label = str_replace("_moduledescription_", $module_description, $label);
 			}
 			break;

From d35a88e439632f4f71d25634867751a6b0715b0a Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 16 Sep 2017 00:01:20 +0200
Subject: [PATCH 58/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 21580b7e8c..aba821340b 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170915
+Version: 7.0NG.712-170916
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index e7e42e4c6a..2d0722e17b 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170915"
+pandora_version="7.0NG.712-170916"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 86e0ebfa7f..98a538d954 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170915';
+use constant AGENT_BUILD => '170916';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 61b2f9e67e..3efb067815 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170915
+%define release     170916
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 9db99dbde2..7484582db2 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170915
+%define release     170916
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 2c3bd737c8..80eeda97f0 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170915"
+PI_BUILD="170916"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 804ce5dc7a..e78951cd01 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170915}
+{170916}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index b9837b99ff..cfce19d1cf 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170915)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170916)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 73d4b21d79..aee954e3d2 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170915))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170916))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 156efc60ee..4cdbb59da8 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170915
+Version: 7.0NG.712-170916
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 3b0fd9286a..a9ec6f7a02 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170915"
+pandora_version="7.0NG.712-170916"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 7b42fe4333..53a06acf2f 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170915';
+$build_version = 'PC170916';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index cc96071e5c..99b27bdcec 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170915';
+$build = '170916';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index f0459a2e82..34eb45ac9b 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170915
+%define release     170916
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 4ec2f41e7c..6b687193f8 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170915
+%define release     170916
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 0421655c77..e29b359d73 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170915
+Version: 7.0NG.712-170916
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 6119f1f776..e1124ecb1c 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170915"
+pandora_version="7.0NG.712-170916"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index ae4907db19..115a3a2946 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170915";
+my $pandora_build = "170916";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 558d187c97..a954937f13 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170915
+%define release     170916
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7f89268cc9..93880a996d 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170915
+%define release     170916
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 91fe4cbde2..9fe9b6046b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170915"
+PI_BUILD="170916"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 9e20eddce3..fe4afa480e 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170915";
+my $version = "7.0NG.712 PS170916";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 0205add7ce..f6eecdfeab 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170915";
+my $version = "7.0NG.712 PS170916";
 
 # save program name for logging
 my $progname = basename($0);

From 14cea700ad9e1ada4db074ac6c6f39e6c10e94ac Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 17 Sep 2017 00:01:19 +0200
Subject: [PATCH 59/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index aba821340b..dad82e973b 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170916
+Version: 7.0NG.712-170917
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 2d0722e17b..f85bd8f352 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170916"
+pandora_version="7.0NG.712-170917"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 98a538d954..7f427ba5a8 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170916';
+use constant AGENT_BUILD => '170917';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 3efb067815..65dc2a1781 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170916
+%define release     170917
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 7484582db2..e55c6d650f 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170916
+%define release     170917
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 80eeda97f0..3800e1e24b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170916"
+PI_BUILD="170917"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index e78951cd01..8bccd65c98 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170916}
+{170917}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index cfce19d1cf..35c099d00e 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170916)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170917)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index aee954e3d2..6fcd384ff5 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170916))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170917))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 4cdbb59da8..7e3f15e946 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170916
+Version: 7.0NG.712-170917
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index a9ec6f7a02..1006eb6138 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170916"
+pandora_version="7.0NG.712-170917"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 53a06acf2f..fe59b2cf0d 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170916';
+$build_version = 'PC170917';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 99b27bdcec..d618b21787 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170916';
+$build = '170917';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 34eb45ac9b..25ff8bbf35 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170916
+%define release     170917
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 6b687193f8..976022cf30 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170916
+%define release     170917
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index e29b359d73..b33f7243cb 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170916
+Version: 7.0NG.712-170917
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index e1124ecb1c..9dbb4956a3 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170916"
+pandora_version="7.0NG.712-170917"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 115a3a2946..be378d189f 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170916";
+my $pandora_build = "170917";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index a954937f13..072f49cff4 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170916
+%define release     170917
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 93880a996d..77dc2d4045 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170916
+%define release     170917
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 9fe9b6046b..b74af287dd 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170916"
+PI_BUILD="170917"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index fe4afa480e..0ed71b8a0e 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170916";
+my $version = "7.0NG.712 PS170917";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f6eecdfeab..4f1d2335f5 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170916";
+my $version = "7.0NG.712 PS170917";
 
 # save program name for logging
 my $progname = basename($0);

From 9a6a22718e628e40d156fae90dcdf116964a80d0 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 18 Sep 2017 00:01:20 +0200
Subject: [PATCH 60/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index dad82e973b..319b9576b3 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170917
+Version: 7.0NG.712-170918
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index f85bd8f352..51ad8a1022 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170917"
+pandora_version="7.0NG.712-170918"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 7f427ba5a8..888503e250 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170917';
+use constant AGENT_BUILD => '170918';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 65dc2a1781..c203ededfe 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170917
+%define release     170918
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index e55c6d650f..cbe8810399 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170917
+%define release     170918
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 3800e1e24b..2514106d2c 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170917"
+PI_BUILD="170918"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 8bccd65c98..b7a5656323 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170917}
+{170918}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 35c099d00e..4f30f872f7 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170917)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170918)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 6fcd384ff5..0b5f8e9f34 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170917))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170918))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 7e3f15e946..adfa26fdfe 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170917
+Version: 7.0NG.712-170918
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 1006eb6138..194ef391f0 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170917"
+pandora_version="7.0NG.712-170918"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index fe59b2cf0d..7b40d5695a 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170917';
+$build_version = 'PC170918';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index d618b21787..e735b43e01 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170917';
+$build = '170918';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 25ff8bbf35..3eee1e3c6f 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170917
+%define release     170918
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 976022cf30..90f1924c0a 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170917
+%define release     170918
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index b33f7243cb..da4056e72a 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170917
+Version: 7.0NG.712-170918
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 9dbb4956a3..a674b48f56 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170917"
+pandora_version="7.0NG.712-170918"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index be378d189f..be540c0c16 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170917";
+my $pandora_build = "170918";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 072f49cff4..eea9abe45f 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170917
+%define release     170918
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 77dc2d4045..4173e82e5c 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170917
+%define release     170918
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index b74af287dd..c702e6471e 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170917"
+PI_BUILD="170918"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 0ed71b8a0e..8b290f3d20 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170917";
+my $version = "7.0NG.712 PS170918";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 4f1d2335f5..91c6dcf263 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170917";
+my $version = "7.0NG.712 PS170918";
 
 # save program name for logging
 my $progname = basename($0);

From e3c01374b17dd0f61e801589d3ab7f953e89106d Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 18 Sep 2017 10:18:38 +0200
Subject: [PATCH 61/67] Added changes to meta report templates

---
 .../include/functions_reporting.php           | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 877a0e54b7..66b36f98f1 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -149,15 +149,10 @@ function reporting_make_reporting_data($report = null, $id_report,
 			}
 
 			if (in_array('label', $content['style'])) {
-				if (defined('METACONSOLE')) {
-					array_push ($agents_to_macro, $content['id_agent']);
-				}
-				else {
-					array_push ($agents_to_macro, modules_get_agentmodule_agent($graph_item['id_agent_module']));
-				}
+				array_push ($agents_to_macro, modules_get_agentmodule_agent($graph_item['id_agent_module']));
 			}
 		}
-
+		
 		$agents_to_macro_aux = array();
 		foreach ($agents_to_macro as $ag) {
 			if (!in_array($ag, $agents_to_macro_aux)) {
@@ -5885,17 +5880,11 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 		
 		array_push ($weights, $graph_item["weight"]);
 		if (in_array('label',$content['style'])) {
-			if (defined('METACONSOLE')) {
-				$item = array('type' => 'custom_graph',
-							'id_agent' =>$content['id_agent'],
-							'id_agent_module'=>$graph_item['id_agent_module']);
-			}
-			else {
-				$item = array('type' => 'custom_graph',
-							'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
-							'id_agent_module'=>$graph_item['id_agent_module']);
-			}
+			$item = array('type' => 'custom_graph',
+						'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
+						'id_agent_module'=>$graph_item['id_agent_module']);
 			
+			//html_debug($item);
 			$label = reporting_label_macro($item, $content['style']['label']);
 			$labels[$graph_item['id_agent_module']] = $label;
 		}

From e05d0bab25c60deeab4afc1da5394dc968458192 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 18 Sep 2017 11:07:59 +0200
Subject: [PATCH 62/67] Compatible with all browsers - #1245

---
 .../visual_console_builder.editor.js          |  6 +++---
 .../include/functions_visual_map.php          | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 7e0ff10cec..2c98fb5493 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -313,9 +313,9 @@ function update_button_palette_callback() {
 				if ((values['width'] == 0) || (values['height'] == 0)) {
 						$("#image_" + idItem).removeAttr('width');
 						$("#image_" + idItem).removeAttr('height');
-						$("#image_" + idItem).attr('width', 450);
+						$("#image_" + idItem).attr('width', 520);
 						$("#image_" + idItem).attr('height', 80);
-						$("#image_" + idItem).css('width', '450px');
+						$("#image_" + idItem).css('width', '520px');
 						$("#image_" + idItem).css('height', '80px');
 						$("#image_" + idItem).attr('src', 'images/console/signes/group_status.png');
 							
@@ -1742,7 +1742,7 @@ function set_image(type, idElement, image) {
 			$(item).attr('src', data);
 			
 			if(image == 'show_statistics_bad.png' || image == 'show_statistics_ok.png' || image == 'show_statistics_warning.png' || image == 'show_statistics.png'){
-				$(item).attr('width', 450);
+				$(item).attr('width', 520);
 				$(item).attr('height', 80);
 			}
 			
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index b83abdfa2c..b06a0c6d5c 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1277,7 +1277,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 								
 						if ($width == 0 || $height == 0) {
 							
-						 echo '<img id="image_'.$id.'" src="images/console/signes/group_status.png" style="width:450px;height:80px;'.$imgpos.'">';
+						 echo '<img id="image_'.$id.'" src="images/console/signes/group_status.png" style="width:520px;height:80px;'.$imgpos.'">';
 						}
 						else{
 						 echo '<img id="image_'.$id.'" src="images/console/signes/group_status.png" style="width:'.$width.'px;height:'.$height.'px;'.$imgpos.'">';
@@ -1318,7 +1318,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 						 $stat_agent_un = $agents_unknown[0]['total']/$total_agents*100;
 							
 							if($width == 0 || $height == 0){
-								$dyn_width = 450;			
+								$dyn_width = 520;			
 								$dyn_height = 80;
 							}
 							else{
@@ -1344,14 +1344,14 @@ function visual_map_print_item($mode = "read", $layoutData,
 								echo "</tr>";
 								echo "<tr style='background-color:whitesmoke;height:90%;'>";
 									echo "<td>";
-										echo "<div style='margin-left:2%;color: #FFF;font-size: 15px;display:inline;background-color:#FC4444;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_cr, 2)) ."%</div>";
-										echo "<div style='background-color:white;color: black ;font-size: 15px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Critical</div>";
-										echo "<div style='margin-left:2%;color: #FFF;font-size: 15px;display:inline;background-color:#f8db3f;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_wa, 2)) ."%</div>";
-										echo "<div style='background-color:white;color: black ;font-size: 15px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Warning</div>";
-										echo "<div style='margin-left:2%;color: #FFF;font-size: 15px;display:inline;background-color:#84b83c;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_ok, 2)) ."%</div>";
-										echo "<div style='background-color:white;color: black ;font-size: 15px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Normal</div>";
-										echo "<div style='margin-left:2%;color: #FFF;font-size: 15px;display:inline;background-color:#9d9ea0;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_un, 2)) ."%</div>";
-										echo "<div style='background-color:white;color: black ;font-size: 15px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Unknown</div>";
+									echo "<div style='margin-left:2%;color: #FFF;font-size: 12px;display:inline;background-color:#FC4444;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_cr, 2)) ."%</div>";
+									echo "<div style='background-color:white;color: black ;font-size: 12px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Critical</div>";
+									echo "<div style='margin-left:2%;color: #FFF;font-size: 12px;display:inline;background-color:#f8db3f;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_wa, 2)) ."%</div>";
+									echo "<div style='background-color:white;color: black ;font-size: 12px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Warning</div>";
+									echo "<div style='margin-left:2%;color: #FFF;font-size: 12px;display:inline;background-color:#84b83c;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_ok, 2)) ."%</div>";
+									echo "<div style='background-color:white;color: black ;font-size: 12px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Normal</div>";
+									echo "<div style='margin-left:2%;color: #FFF;font-size: 12px;display:inline;background-color:#9d9ea0;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>". remove_right_zeros(number_format($stat_agent_un, 2)) ."%</div>";
+									echo "<div style='background-color:white;color: black ;font-size: 12px;display:inline;position:relative;height:80%;width:9.4%;height:80%;border-radius:2px;text-align:center;padding:5px;'>Unknown</div>";
 									
 									echo "</td>";
 								echo "</tr>";

From 4d2709367909319404ae7ecaaedbb95082c983ad Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 18 Sep 2017 11:50:40 +0200
Subject: [PATCH 63/67] Fixed down server time calculation

---
 pandora_server/bin/pandora_server | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 709b6c7b04..ef617343aa 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -607,7 +607,10 @@ sub main() {
 				$server->update();
 			}
 	
-			db_do ($DBH, "UPDATE tserver SET status = 0 WHERE now()-keepalive > 2*server_keepalive");
+			db_do ($DBH,
+				"UPDATE tserver SET status = 0
+				WHERE UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(keepalive) > 2*server_keepalive"
+			);
 
 			# Set the master server
 			pandora_set_master(\%Config, $DBH);

From d54509fd1e2c1db4ccfbba0d55f6f85c0696e4c6 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 18 Sep 2017 17:57:43 +0200
Subject: [PATCH 64/67] fixed errors in TIP boolean graphs

---
 pandora_console/include/functions_graph.php | 77 +++++++++++++++++----
 1 file changed, 65 insertions(+), 12 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 6ec7e8587c..0ef5e1d9d3 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -3794,7 +3794,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 	$unit_name, $show_alerts, $avg_only = 0,
 	$date = 0, $series_suffix = '', $series_suffix_str = '', $show_unknown = false,
 	$fullscale = false) {
-	
+
 	global $config;
 	global $chart;
 	global $color;
@@ -3851,22 +3851,65 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 	
 	if ($fullscale) {
 		// Get module data
+		$events = db_get_all_rows_filter('tevento',
+			array ('id_agentmodule' => $agent_module_id,
+				"utimestamp > $datelimit",
+				"utimestamp < $date",
+				'order' => 'utimestamp ASC'),
+			array ('evento', 'utimestamp', 'event_type', 'id_evento'));
+
+		$table = "tagente_datos";
+		$module_type_str = modules_get_type_name ($agent_module_id);
+		if (strstr ($module_type_str, 'string') !== false) {
+			$table = "tagente_datos_string";
+		}
+
+		$query  = " SELECT utimestamp, datos FROM $table ";
+		$query .= " WHERE id_agente_modulo=$agent_module_id ";
+		$query .= " ORDER BY utimestamp ASC LIMIT 1";
+
+		$ret = db_get_all_rows_sql( $query , true);
+		
+		$first_data = $ret[0]['utimestamp'];
+		/*
+		// Get the last event after inverval to know if graph start on unknown
+		$prev_event = db_get_row_filter ('tevento',
+			array ('id_agentmodule' => $agent_module_id,
+				"utimestamp <= $datelimit",
+				'order' => 'utimestamp DESC'));
+		if (isset($prev_event['event_type']) && $prev_event['event_type'] == 'going_unknown') {
+			$start_unknown = true;
+		}
+		*/
+		if ($events === false) {
+			$events = array ();
+		}
 		
 		$data_uncompress = db_uncompress_module_data($agent_module_id, $datelimit, $date);
-	
+
 		$i = 0;
-		$j = 0;
-		$array_unknown = array();
 		$data = array();
 		if(is_array($data_uncompress)){
 			foreach ($data_uncompress as $value) {
 				foreach ($value['data'] as $key => $value) {
 					$data[$i]['datos'] = $value['datos'];
 					if(empty($value['datos'])){
-						$events[$j]['utimestamp'] = $value['utimestamp'];
-						$j++;
+						if($value['utimestamp'] < $first_data){
+							$data[$i]['unknown']    = 0;
+							$data[$i]['not_init']   = 1;
+							$data[$i]['utimestamp'] = $value['utimestamp'];
+						}
+						else{
+							$data[$i]['not_init']   = 0;
+							$data[$i]['unknown']    = 1;
+							$data[$i]['utimestamp'] = $value['utimestamp'];
+						}
 					}
-					$data[$i]['utimestamp'] = $value['utimestamp'];	
+					else{
+						$data[$i]['not_init']   = 0;
+						$data[$i]['unknown']    = 0;
+					}
+					$data[$i]['utimestamp'] = $value['utimestamp'];
 					$i++;
 				}
 			}
@@ -3964,7 +4007,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 		$zero = 0;
 		$total = 0;
 		$count = 0;
-		
+		$is_unknown = false;
 		// Read data that falls in the current interval
 		while (isset ($data[$j]) &&
 			$data[$j]['utimestamp'] >= $timestamp &&
@@ -3978,6 +4021,10 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 			}
 			
 			$last_known = $data[$j]['datos'];
+
+			if ($show_unknown && $data[$j]['unknown']){
+				$is_unknown = true;
+			}
 			$j++;
 		}
 		
@@ -3990,7 +4037,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 		$event_value = 0;
 		$alert_value = 0;
 		$unknown_value = 0;
-		$is_unknown = false;
+		
 		// Is the first point of a unknown interval
 		$first_unknown = false;
 		
@@ -4008,8 +4055,15 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 				$alert_ids[] = $events[$k]['id_evento'];
 			}
 			if ($show_unknown) {
-				$first_unknown = true;
-				$is_unknown = true;
+				if ($events[$k]['event_type'] == 'going_unknown') {
+					if ($is_unknown == false) {
+						$first_unknown = true;
+					}
+					$is_unknown = true;
+				}
+				else if (substr ($events[$k]['event_type'], 0, 5) == 'going') {
+					$is_unknown = false;
+				}
 			}
 			$k++;
 		}
@@ -4094,7 +4148,6 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 			if (!isset($chart[$timestamp]['unknown'.$series_suffix])) {
 				$chart[$timestamp]['unknown'.$series_suffix] = 0;
 			}
-			
 			$chart[$timestamp]['unknown'.$series_suffix] = $unknown_value;
 			$series_type['unknown'.$series_suffix] = 'area';
 		}

From 2e802e1b705aae35f52cadca65bdf4c6a0584cb8 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 19 Sep 2017 00:01:21 +0200
Subject: [PATCH 65/67] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 319b9576b3..a06e7378ca 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.712-170918
+Version: 7.0NG.712-170919
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 51ad8a1022..f8d8fb9030 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170918"
+pandora_version="7.0NG.712-170919"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 888503e250..2549bfd26c 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.712';
-use constant AGENT_BUILD => '170918';
+use constant AGENT_BUILD => '170919';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index c203ededfe..78c0aa401c 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170918
+%define release     170919
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index cbe8810399..c288bed121 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.712
-%define release     170918
+%define release     170919
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 2514106d2c..b5beb38046 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170918"
+PI_BUILD="170919"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index b7a5656323..1b6c70f863 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170918}
+{170919}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 4f30f872f7..73695629ba 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.712(Build 170918)")
+#define PANDORA_VERSION ("7.0NG.712(Build 170919)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 0b5f8e9f34..3adac4c3c5 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.712(Build 170918))"
+      VALUE "ProductVersion", "(7.0NG.712(Build 170919))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index adfa26fdfe..192f84302a 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.712-170918
+Version: 7.0NG.712-170919
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 194ef391f0..e967db8d6a 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170918"
+pandora_version="7.0NG.712-170919"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 7b40d5695a..cbcd7ec774 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC170918';
+$build_version = 'PC170919';
 $pandora_version = 'v7.0NG.712';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index e735b43e01..6acecb6d2e 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.712';
-$build = '170918';
+$build = '170919';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 3eee1e3c6f..733e684376 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170918
+%define release     170919
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 90f1924c0a..948cda6ed7 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.712
-%define release     170918
+%define release     170919
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index da4056e72a..cc2d4081e1 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.712-170918
+Version: 7.0NG.712-170919
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index a674b48f56..643efc757c 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.712-170918"
+pandora_version="7.0NG.712-170919"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index be540c0c16..1891fd9cbf 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.712";
-my $pandora_build = "170918";
+my $pandora_build = "170919";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index eea9abe45f..4e178f4c22 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170918
+%define release     170919
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 4173e82e5c..6f9fe3303c 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.712
-%define release     170918
+%define release     170919
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index c702e6471e..c195760796 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.712"
-PI_BUILD="170918"
+PI_BUILD="170919"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 25de60c6d3..b56b5b77c4 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.712 PS170918";
+my $version = "7.0NG.712 PS170919";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 91c6dcf263..ea41ed6a3f 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.712 PS170918";
+my $version = "7.0NG.712 PS170919";
 
 # save program name for logging
 my $progname = basename($0);

From da763824a93a37c43dd98c0409b5cf3dcdda5b7d Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 19 Sep 2017 10:48:30 +0200
Subject: [PATCH 66/67] Added a minor change to test optimization

---
 pandora_console/include/functions.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index f59032071f..c5830bfbfa 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1806,7 +1806,18 @@ function check_acl($id_user, $id_group, $access, $onlyOneGroup = false) {
 	else {
 		$id_group = (int) $id_group;
 	}
-	
+
+	$three_eyes_crow_groups = db_get_all_rows_sql("SELECT tperfil.*, tusuario_perfil.id_perfil FROM tperfil, tusuario_perfil WHERE tusuario_perfil.id_usuario = '" . 
+													$id_user . "' AND tusuario_perfil.id_grupo = 0 AND tusuario_perfil.id_perfil = tperfil.id_perfil");
+	if ($three_eyes_crow_groups && !empty($three_eyes_crow_groups)) {
+		$acl_column = get_acl_column($access);
+		foreach ($three_eyes_crow_groups as $three_eyes_crow_group) {
+			if (isset($three_eyes_crow_group[$acl_column])) {
+				return 1;
+			}
+		}
+	}
+
 	$parents_id = array($id_group);
 	if ($id_group != 0 && $onlyOneGroup !== true) {
 		$group = db_get_row_filter('tgrupo', array('id_grupo' => $id_group));

From 36c13e44c6f931e59842dd9204a520b937f98135 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 20 Sep 2017 10:48:06 +0200
Subject: [PATCH 67/67] Added some changes to label and name macros in custom
 graphs

---
 .../include/functions_reporting.php           | 73 +++++++++++++------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 66b36f98f1..0baeb463f7 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -122,6 +122,8 @@ function reporting_make_reporting_data($report = null, $id_report,
 	if (empty($contents)) {
 		return reporting_check_structure_report($report);
 	}
+
+	$metaconsole_on = is_metaconsole();
 	
 	foreach ($contents as $content) {
 		if (!empty($period)) {
@@ -136,20 +138,27 @@ function reporting_make_reporting_data($report = null, $id_report,
 		if ($graphs_to_macro === false)
 			$graphs_to_macro = array();
 
-		$modules_to_macro = array ();
+		$modules_to_macro = 0;
 		$agents_to_macro = array();
 		foreach ($graphs_to_macro as $graph_item) {
-			if ($type == 'automatic_graph') {
-				array_push ($modules_to_macro, array(
-					'module' => $graph_item['id_agent_module'],
-					'server' => $graph_item['id_server']));
-			}
-			else {
-				array_push ($modules_to_macro, $graph_item['id_agent_module']);
-			}
+			$modules_to_macro++;
 
 			if (in_array('label', $content['style'])) {
-				array_push ($agents_to_macro, modules_get_agentmodule_agent($graph_item['id_agent_module']));
+				if ($content['id_agent'] == 0) {
+					//Metaconsole connection
+					if ($metaconsole_on && $server_name != '') {
+						$connection = metaconsole_get_connection($server_name);
+						if (!metaconsole_load_external_db($connection)) {
+							//ui_print_error_message ("Error connecting to ".$server_name);
+							continue;
+						}
+					}
+					array_push ($agents_to_macro, modules_get_agentmodule_agent($graph_item['id_agent_module']));
+					if ($metaconsole_on) {
+						//Restore db connection
+						metaconsole_restore_db();
+					}
+				}
 			}
 		}
 		
@@ -169,7 +178,6 @@ function reporting_make_reporting_data($report = null, $id_report,
 			$items_label['id_agent_module'] = $content['id_agent_module'];
 			$items_label['modules'] = $modules_to_macro;
 			$items_label['agents'] = $agents_to_macro;
-			$metaconsole_on = is_metaconsole();
 			$server_name = $content['server_name'];
 			
 			//Metaconsole connection
@@ -181,7 +189,6 @@ function reporting_make_reporting_data($report = null, $id_report,
 				}
 			}
 			
-			
 			if(sizeof($content['id_agent']) != 1){
 				$content['style']['name_label'] = str_replace("_agent_",sizeof($content['id_agent']).__(' agents'),$content['style']['name_label']);
 			}
@@ -5834,12 +5841,6 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 	
 	require_once ($config["homedir"] . '/include/functions_graph.php');
 	
-	if ($config['metaconsole'] && $type_report != 'automatic_graph') {
-		$id_meta = metaconsole_get_id_server($content["server_name"]);	
-		$server = metaconsole_get_connection_by_id ($id_meta);
-		metaconsole_connect($server);
-	}
-	
 	$graph = db_get_row ("tgraph", "id_graph", $content['id_gs']);
 	$return = array();
 	$return['type'] = 'custom_graph';
@@ -5878,18 +5879,42 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 			array_push ($modules, $graph_item['id_agent_module']);
 		}
 		
-		array_push ($weights, $graph_item["weight"]);
 		if (in_array('label',$content['style'])) {
-			$item = array('type' => 'custom_graph',
+			if (defined('METACONSOLE')) {
+				$server_name = $content['server_name'];
+				$connection = metaconsole_get_connection($server_name);
+				if (!metaconsole_load_external_db($connection)) {
+					//ui_print_error_message ("Error connecting to ".$server_name);
+					continue;
+				}
+				$item = array('type' => 'custom_graph',
 						'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
 						'id_agent_module'=>$graph_item['id_agent_module']);
+			}
+			else {
+				$item = array('type' => 'custom_graph',
+						'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
+						'id_agent_module'=>$graph_item['id_agent_module']);
+			}
 			
-			//html_debug($item);
 			$label = reporting_label_macro($item, $content['style']['label']);
+
 			$labels[$graph_item['id_agent_module']] = $label;
+			if (defined('METACONSOLE')) {
+				//Restore db connection
+				metaconsole_restore_db();
+			}
 		}
+
+		array_push ($weights, $graph_item["weight"]);
 	}
 	
+	if ($config['metaconsole'] && $type_report != 'automatic_graph') {
+		$id_meta = metaconsole_get_id_server($content["server_name"]);	
+		$server = metaconsole_get_connection_by_id ($id_meta);
+		metaconsole_connect($server);
+	}
+
 	$return['chart'] = '';
 	// Get chart
 	reporting_set_conf_charts($width, $height, $only_image, $type,
@@ -10383,8 +10408,8 @@ function reporting_label_macro ($item, $label) {
 			}
 			
 			if (preg_match("/_module_/", $label)) {
-				if (count($item['modules']) > 1) {
-					$module_name = count($item['modules']) . __(' modules');
+				if ($item['modules'] > 1) {
+					$module_name = $item['modules'] . __(' modules');
 				}
 				else {
 					$module_name = modules_get_agentmodule_name($item['id_agent_module']);
@@ -10394,7 +10419,7 @@ function reporting_label_macro ($item, $label) {
 			}
 			
 			if (preg_match("/_moduledescription_/", $label)) {
-				if (count($item['modules']) > 1) {
+				if ($item['modules'] > 1) {
 					$module_description = "";
 				}
 				else {