From 139c4d0d4070913b95a3213a30263a911f5c1132 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Thu, 16 Mar 2017 16:38:24 +0100
Subject: [PATCH 01/63] Fixed styles and reorganizate elements of graphs.
 Gitlab: #537

---
 pandora_console/include/functions.php         |  3 +-
 .../include/graphs/flot/pandora.flot.js       | 61 +++++++++----------
 .../include/graphs/functions_flot.php         |  7 ++-
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index ae6cce3efc..1892b216ef 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1531,7 +1531,7 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '',
 				$snmpwalk_bin = '/usr/pkg/bin/snmpwalk';
 				break;
 			default:
-				$snmpwalk_bin = 'snmpwalk';
+				$snmpwalk_bin = 'snmpbulkwalk';
 				break;
 		}
 	}
@@ -1598,6 +1598,7 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '',
 			break;
 	}
 	
+	html_debug($command_str, true);
 	exec($command_str, $output, $rc);
 	
 	// Parse the output of snmpwalk
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index b6f1eb2308..a777f9a7cc 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1540,33 +1540,30 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				tickColor: background_color,
 				markings: markings,
 				color: legend_color
-				},
-			xaxes: [ {
-					axisLabelFontSizePixels: font_size,
-					axisLabelUseCanvas: false,
-					axisLabel: xaxisname,
-					tickFormatter: xFormatter,
-					//~ minTickSize: steps,
-					color: '',
-					font: font
-				} ],
-			yaxes: [ {
-						tickFormatter: yFormatter,
-						color: ''
-					},
-					{
-						// align if we are to the right
-						alignTicksWithAxis: 1,
-						position: 'right',
-						font: font
-						//tickFormatter: dFormatter
-					} ]
-					,
+			},
+			xaxes: [{
+				axisLabelFontSizePixels: font_size,
+				axisLabelUseCanvas: false,
+				axisLabel: xaxisname,
+				tickFormatter: xFormatter,
+				labelHeight: 50,
+				color: '',
+				font: font
+			}],
+			yaxes: [{
+				tickFormatter: yFormatter,
+				color: '',
+				alignTicksWithAxis: 1,
+				position: 'left',
+				font: font,
+				labelWidth: 50,
+				reserveSpace: true,
+			}],
 			legend: {
 				position: 'se',
 				container: $('#legend_' + graph_id),
 				labelFormatter: lFormatter
-				}
+			}
 		};
 	if (vconsole) {
 		options.grid['hoverable'] = false;
@@ -1874,18 +1871,18 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		if (labels[v] == undefined) {
 			return '';
 		}
-		return '<div class='+font+' style=font-size:'+font_size+'pt>'+labels[v]+'</div>';
+		return '<div class='+font+' style="font-size:'+font_size+'pt; margin-top:15px; transform:rotate(-28deg)">'+labels[v]+'</div>';
 	}
 
 	function yFormatter(v, axis) {
 		axis.datamin = 0;
 		var formatted = number_format(v,force_integer,unit);
 
-		return '<div class='+font+' style=font-size:'+font_size+'pt>'+formatted+'</div>';
+		return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>';
 	}
 
 	function lFormatter(v, item) {
-		return '<div style=font-size:'+font_size+'pt>'+v+'</div>';
+		return '<div style="font-size:'+font_size+'pt;">'+v+'</div>';
 		// Prepared to turn series with a checkbox
 		//return '<div style=color:;font-size:'+font_size+'pt><input type="checkbox" id="' + graph_id + '_' + item.id +'" checked="checked" class="check_serie_'+graph_id+'">'+v+'</div>';
 	}
@@ -1994,7 +1991,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		$('#legend_'+graph_id).css('margin-bottom', '10px');
 		parent_height = parseInt(
 			$('#menu_'+graph_id).parent().css('height').split('px')[0]);
-		adjust_menu(graph_id, plot, parent_height);
+		adjust_menu(graph_id, plot, parent_height, width);
 	}
 	
 	if (!dashboard) {
@@ -2028,16 +2025,16 @@ function adjust_menu(graph_id, plot, parent_height, width) {
 		menu_height = $('#menu_'+graph_id).height();
 	}
 
-	offset_between_graph_and_div_graph_container = $('#' + graph_id).offset().top -
-		$('#' + graph_id).parent().offset().top;
+	offset = $('#' + graph_id).offsetTop;
+	
 	$('#menu_' + graph_id)
 		.css('top',
-			((offset_between_graph_and_div_graph_container - menu_height - 5) + 'px'));
+			((offset + 10) + 'px'));
 
 	//$('#legend_' + graph_id).css('width',plot.width());
 
-	$('#menu_' + graph_id)
-		.css('left',width - $('#menu_'+graph_id).width());
+	$('#menu_' + graph_id).css('left', $('#'+graph_id)[0].offsetWidth);
+	
 	$('#menu_' + graph_id).show();
 }
 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index d3bf902fd9..1c191a288e 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -203,7 +203,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 	}
 	
 	// Parent layer
-	$return = "<div class='parent_graph' style='width: " . $width . "px; " . $background_style . "'>";
+	$return = "<div class='parent_graph' style='width: " . ($width + 100) . "px; height: ".($height + 200 )."px; " . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
 	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:".$font_size."pt'></p>";
 	
@@ -245,9 +245,10 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 			$return .= "<div id='menu_$graph_id' class='menu_graph' " .
 				"style='display: none; " .
 					"text-align: center; " .
-					"width: " . $menu_width . "px; ".
+					"width: 25px; ".
 					"border-bottom: 0px; " .
-					"padding: 4px 4px 4px 4px;margin-bottom:5px;'>
+					"padding: 4px 4px 4px 4px;
+					margin-bottom:5px;'>
 				<a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
 			if ($threshold) {
 				$return .= " <a href='javascript:'><img id='menu_threshold_$graph_id' src='".$homeurl."images/chart_curve_threshold.png' alt='".__('Warning and Critical thresholds')."' title='".__('Warning and Critical thresholds')."'></a>";

From 2cce1d20c3dbaa89059fe06dc1e50e18a17a8771 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Fri, 17 Mar 2017 11:07:13 +0100
Subject: [PATCH 02/63] Remove debug traces

---
 pandora_console/include/functions.php    | 1 -
 pandora_console/include/functions_db.php | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 1892b216ef..8dab8ef3ce 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1598,7 +1598,6 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '',
 			break;
 	}
 	
-	html_debug($command_str, true);
 	exec($command_str, $output, $rc);
 	
 	// Parse the output of snmpwalk
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index faca98b40f..8244a000f7 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -1742,8 +1742,7 @@ function db_check_minor_relase_available_to_um ($package) {
 				$exists = false;
 				foreach ($sqlfiles_num as $num) {
 					$file_dest = $config["homedir"] . "/extras/mr/updated/$num.sql";
-					html_debug("AAAAA " . $file_dest, true);
-					html_debug(file_exists($file_dest), true);
+					
 					if (file_exists($file_dest)) {
 						$exists = true;
 						unlink("$dir/$num.sql");

From b8045691bd38fa89366d7c8f65a1231e7a529d2e Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Fri, 17 Mar 2017 11:20:54 +0100
Subject: [PATCH 03/63] Ad margin in second graph.

---
 pandora_console/include/graphs/functions_flot.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 1c191a288e..72606cb62d 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -203,7 +203,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 	}
 	
 	// Parent layer
-	$return = "<div class='parent_graph' style='width: " . ($width + 100) . "px; height: ".($height + 200 )."px; " . $background_style . "'>";
+	$return = "<div class='parent_graph' style='width: " . ($width + 100) . "px; " . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
 	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:".$font_size."pt'></p>";
 	
@@ -274,7 +274,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 		$height = 1;
 	}
 	if (!$dashboard && !$vconsole)
-		$return .= "<div id='overview_$graph_id' class='overview_graph' style='display: none; margin-left:0px; margin-top:20px; width: ".$width."px; height: ".$height ."px;'></div>";
+		$return .= "<div id='overview_$graph_id' class='overview_graph' style='display: none; margin-left:0px; margin-top:20px; margin-bottom:50px; width: ".$width."px; height: ".$height ."px;'></div>";
 	
 	if ($water_mark != '') {
 		$return .= "<div id='watermark_$graph_id' style='display:none; position:absolute;'><img id='watermark_image_$graph_id' src='$water_mark'></div>";

From 1d5afbb36a2e00ba9ad573baff280bd8c51e616c Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 17 Mar 2017 11:23:28 +0100
Subject: [PATCH 04/63] Added _alert_unkown_instructions_ macro

---
 pandora_console/include/help/en/help_alert_macros.php | 1 +
 pandora_console/include/help/es/help_alert_macros.php | 1 +
 pandora_console/include/help/ja/help_alert_macros.php | 1 +
 pandora_server/lib/PandoraFMS/Core.pm                 | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php
index 6753e2c59a..a1e5e6269b 100644
--- a/pandora_console/include/help/en/help_alert_macros.php
+++ b/pandora_console/include/help/en/help_alert_macros.php
@@ -60,6 +60,7 @@ Besides the defined module macros, the following macros are available:
 <li>_moduletags_: URLs associated to the module’s tags.</li>
 <li>_alert_critical_instructions_: Instructions for CRITICAL status contained in the module.</li>
 <li>_alert_warning_instructions_: Instructions for WARNING status contained in the module.</li>
+<li>_alert_unknown_instructions_: Instructions for UNKNOWN status contained in the module.</li>
 <li>_modulegraph_<i>n</i>h_: (>=6.0) (Only for alerts that use the command <i>eMail</i>)
 Returns an image encoded in base64 of a module’s graph with a period of <i>n</i> hours (eg. _modulegraph_24h_).
 A correct setup of the connection between the server and the console's API is required.
diff --git a/pandora_console/include/help/es/help_alert_macros.php b/pandora_console/include/help/es/help_alert_macros.php
index f4c8f476d9..007c4ef24e 100644
--- a/pandora_console/include/help/es/help_alert_macros.php
+++ b/pandora_console/include/help/es/help_alert_macros.php
@@ -60,6 +60,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
 <li>_moduletags_: URLs asociadas a los tags de módulos.</li>
 <li>_alert_critical_instructions_: Instrucciones contenidas en el módulo para un estado CRITICAL.</li>
 <li>_alert_warning_instructions_: Instrucciones contenidas en el módulo para un estado WARNING.</li>
+<li>_alert_unknown_instructions_: Instrucciones contenidas en el módulo para un estado UNKNOWN.</li>
 <li>_modulegraph_<i>n</i>h_: (>=6.0) (Solo para alertas que usen el comando <i>eMail</i>)
 Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de <i>n</i> horas (eg. _modulegraph_24h_).
 Requiere de una configuración correcta de la conexión del servidor a la consola vía api,
diff --git a/pandora_console/include/help/ja/help_alert_macros.php b/pandora_console/include/help/ja/help_alert_macros.php
index 15b892651c..a020d7a233 100644
--- a/pandora_console/include/help/ja/help_alert_macros.php
+++ b/pandora_console/include/help/ja/help_alert_macros.php
@@ -59,6 +59,7 @@
 <li>_moduletags_ : モジュールタグに関連付けられた URL。</li>
 <li>_alert_critical_instructions_: モジュールの障害状態時手順。</li>
 <li>_alert_warning_instructions_: モジュールの警告状態時手順。</li>
+<li>_alert_unknown_instructions_: Instructions for UNKNOWN status contained in the module.</li>
 <li>_modulegraph_<i>n</i>h_: (>=6.0) (<i>eMail</i>コマンドを使うアラートのみ)
 n で示す期間の base64 でエンコードされたモジュールグラフを返します。(例: _modulegraph_24h_) サーバとコンソールの API の設定が正しくできている必要があります。この設定は、サーバの設定ファイルで行います。 </li>
 </ul>
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 19717beae2..5a182c4cfc 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -560,6 +560,7 @@ sub pandora_process_alert ($$$$$$$$;$) {
 
 		$alert->{'critical_instructions'} = $critical_instructions;
 		$alert->{'warning_instructions'} = $warning_instructions;
+		$alert->{'unknown_instructions'} = $unknown_instructions;
 		
 		# Generate an event
 		if ($table eq 'tevent_alert') {
@@ -769,6 +770,7 @@ sub pandora_execute_alert ($$$$$$$$$;$) {
 
 	$alert->{'critical_instructions'} = $critical_instructions;
 	$alert->{'warning_instructions'} = $warning_instructions;
+	$alert->{'unknown_instructions'} = $unknown_instructions;
 
 	# Execute actions
 	my $event_generated = 0;
@@ -994,6 +996,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 				_alert_text_severity_ => get_priority_name($alert->{'priority'}),
 				_alert_critical_instructions_ => $alert->{'critical_instructions'},
 				_alert_warning_instructions_ => $alert->{'warning_instructions'},
+				_alert_unknown_instructions_ => $alert->{'unknown_instructions'},
 				_groupcontact_ => (defined ($group)) ? $group->{'contact'} : '',
 				_groupcustomid_ => (defined ($group)) ? $group->{'custom_id'} : '',
 				_groupother_ => (defined ($group)) ? $group->{'other'} : '',

From 9e1b467850507a9a7f849b624e7a2291ddfeeac0 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Fri, 17 Mar 2017 13:30:11 +0100
Subject: [PATCH 05/63] new changes in graphs

---
 .../include/graphs/flot/pandora.flot.js       | 17 ++++++++--------
 .../include/graphs/functions_flot.php         | 20 ++++++++++++-------
 .../operation/agentes/stat_win.php            |  2 +-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index a777f9a7cc..c08da03046 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1556,7 +1556,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				alignTicksWithAxis: 1,
 				position: 'left',
 				font: font,
-				labelWidth: 50,
 				reserveSpace: true,
 			}],
 			legend: {
@@ -1871,7 +1870,11 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		if (labels[v] == undefined) {
 			return '';
 		}
-		return '<div class='+font+' style="font-size:'+font_size+'pt; margin-top:15px; transform:rotate(-28deg)">'+labels[v]+'</div>';
+		
+		extra_css = '';
+		if (!dashboard || !vconsole)
+			 extra_css = " transform:rotate(-28deg); margin-left: -50px;";
+		return '<div class='+font+' style="font-size:'+font_size+'pt; margin-top:15px;'+extra_css+'">'+labels[v]+'</div>';
 	}
 
 	function yFormatter(v, axis) {
@@ -2025,15 +2028,13 @@ function adjust_menu(graph_id, plot, parent_height, width) {
 		menu_height = $('#menu_'+graph_id).height();
 	}
 
-	offset = $('#' + graph_id).offsetTop;
-	
-	$('#menu_' + graph_id)
-		.css('top',
-			((offset + 10) + 'px'));
+	offset = $('#' + graph_id)[0].offsetTop;
+	console.log(offset);
+	$('#menu_' + graph_id).css('top', ((offset) + 'px'));
 
 	//$('#legend_' + graph_id).css('width',plot.width());
 
-	$('#menu_' + graph_id).css('left', $('#'+graph_id)[0].offsetWidth);
+	//~ $('#menu_' + graph_id).css('left', $('#'+graph_id)[0].offsetWidth);
 	
 	$('#menu_' + graph_id).show();
 }
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 72606cb62d..ea7a3a122a 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -203,7 +203,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 	}
 	
 	// Parent layer
-	$return = "<div class='parent_graph' style='width: " . ($width + 100) . "px; " . $background_style . "'>";
+	$return = "<div class='parent_graph' style='width: " . ($width) . "px; " . $background_style . "'>";
 	// Set some containers to legend, graph, timestamp tooltip, etc.
 	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:".$font_size."pt'></p>";
 	
@@ -242,13 +242,18 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 		}
 		$menu_width = 25 * $nbuttons + 15;
 		if ( $dashboard == false AND $vconsole == false) {
-			$return .= "<div id='menu_$graph_id' class='menu_graph' " .
+			$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
+							width: 30px;
+							height: 250px;
+							left: " . $width . "px;
+							position: absolute;
+							top: 0px;
+							background-color: white;'>";
+			$return .= "<div id='menu_$graph_id' " .
 				"style='display: none; " .
-					"text-align: center; " .
-					"width: 25px; ".
-					"border-bottom: 0px; " .
-					"padding: 4px 4px 4px 4px;
-					margin-bottom:5px;'>
+					"text-align: center;" .
+					"position: relative;".
+					"border-bottom: 0px;'>
 				<a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
 			if ($threshold) {
 				$return .= " <a href='javascript:'><img id='menu_threshold_$graph_id' src='".$homeurl."images/chart_curve_threshold.png' alt='".__('Warning and Critical thresholds')."' title='".__('Warning and Critical thresholds')."'></a>";
@@ -262,6 +267,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 			//$return .= " <a href='javascript:'><img id='menu_export_json_$graph_id' src='".$homeurl."images/json.png' alt='".__('Export to JSON')."' title='".__('Export to JSON')."'></a>";
 			
 			$return .= "</div>";
+			$return .= "</div>";
 		}
 	}
 	$return .= html_print_input_hidden('line_width_graph', $config['custom_graph_width'], true);
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 935917c11a..79b3aaad9d 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -201,7 +201,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		// log4x doesnt support flash yet
 		//
 		if ($config['flash_charts'] == 1)
-			echo '<div style="margin-left: 70px; padding-top: 10px;">';
+			echo '<div style="margin-left: 100px; padding-top: 10px;">';
 		else
 			echo '<div style="margin-left: 50px; padding-top: 10px;">';
 		

From 169d388fe4acd2e25b195b1ae8d26aee4fd67abf Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Fri, 17 Mar 2017 13:35:19 +0100
Subject: [PATCH 06/63] Fixed errors merge

---
 pandora_console/include/functions.php    | 2 +-
 pandora_console/include/functions_db.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 8dab8ef3ce..ae6cce3efc 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1531,7 +1531,7 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '',
 				$snmpwalk_bin = '/usr/pkg/bin/snmpwalk';
 				break;
 			default:
-				$snmpwalk_bin = 'snmpbulkwalk';
+				$snmpwalk_bin = 'snmpwalk';
 				break;
 		}
 	}
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 8244a000f7..2ded4e7adb 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -1742,7 +1742,6 @@ function db_check_minor_relase_available_to_um ($package) {
 				$exists = false;
 				foreach ($sqlfiles_num as $num) {
 					$file_dest = $config["homedir"] . "/extras/mr/updated/$num.sql";
-					
 					if (file_exists($file_dest)) {
 						$exists = true;
 						unlink("$dir/$num.sql");

From 36255d9693e07ac06a6be00ce9a5c767cd5b8b8e Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Wed, 22 Mar 2017 09:08:49 +0100
Subject: [PATCH 07/63] Remove rotate legend in graphs. Gitlab: #537

---
 pandora_console/include/graphs/flot/pandora.flot.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index c08da03046..00f2e44467 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1872,8 +1872,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		}
 		
 		extra_css = '';
-		if (!dashboard || !vconsole)
-			 extra_css = " transform:rotate(-28deg); margin-left: -50px;";
 		return '<div class='+font+' style="font-size:'+font_size+'pt; margin-top:15px;'+extra_css+'">'+labels[v]+'</div>';
 	}
 

From 2b74fbe57ea20bb7b01c0c9308b8fe1d27d68bde Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 27 Mar 2017 15:32:05 +0200
Subject: [PATCH 08/63] Modified menu position to fit it with ACL enterprise

---
 pandora_console/include/functions_menu.php    | 40 ++++++++++++++++-
 pandora_console/include/styles/menu.css       | 43 -------------------
 pandora_console/include/styles/pandora.css    |  2 +-
 .../include/styles/pandora_black.css          |  2 +-
 .../include/styles/pandora_green_old.css      |  2 +-
 5 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 6915fd76a2..1dbaecae0b 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -49,6 +49,9 @@ function menu_print_menu (&$menu) {
 			'') .
 		'>';
 	
+	// Use $config because a global var is required because normal
+	// and godmode menu are painted separately
+	if (!isset($config['count_main_menu'])) $config['count_main_menu'] = 0;
 	foreach ($menu as $mainsec => $main) {
 		$extensionInMenuParameter = (string) get_parameter ('extension_in_menu','');
 		
@@ -369,6 +372,12 @@ function menu_print_menu (&$menu) {
 					$sub_title = '';
 				}
 				
+				// Added a top on inline styles
+				$top = menu_calculate_top($config['count_main_menu'], $count_sub, $count_sub2);
+				if ($top !== 0) {
+					$display = rtrim($display, "'");
+					$display .= "top: " . $top . "px;'";
+				}
 				//Add submenu2 to submenu string
 				$submenu_output .= "<ul id='sub" . str_replace(' ','_',$sub["id"]) . "' class=submenu2 $display>";
 				$submenu_output .= $submenu2_list;
@@ -419,10 +428,12 @@ function menu_print_menu (&$menu) {
 				$visible = false;
 			}
 			
-			$output .= '<ul id="subicon_'.$id.'" class="submenu'.($visible ? '' : ' invisible').'">';
+			$top = menu_calculate_top($config["count_main_menu"], $count_sub);
+			$output .= '<ul id="subicon_'.$id.'" class="submenu'.($visible ? '' : ' invisible').'" style="top: ' . $top . 'px">';
 			$output .= $submenu_output;
 			$output .= '</ul>';
 		}
+		$config["count_main_menu"]++;
 		$output .= '</li>';
 		echo $output;
 		$menu_selected = false;
@@ -718,4 +729,31 @@ function menu_sec3_in_sec2($sec,$sec2,$sec3) {
 	
 	return false;
 }
+
+// Positionate the menu element. Added a negative top.
+// 35px is the height of a menu item
+function menu_calculate_top($level1, $level2, $level3 = false) {
+	$level2--;
+	if ($level3 !== false) {
+		// If level3 is set, the position is calculated like box is in the center.
+		// wiouth considering level2 box can be moved.
+		$level3--;
+		$total = $level1 + $level3;
+		$comp = $level3;
+	} else {
+		$total = $level1 + $level2;
+		$comp = $level2;
+
+	}
+	// Positionate in the middle
+	if ($total > 12 && (($total < 18) || (($level1 - $comp) <= 2))) {
+		return - ( floor($comp/2) * 35);
+	}
+	// Positionate in the bottom
+	if ($total >= 18) {
+		return - $comp * 35;
+	}
+	// return 0 by default
+	return 0;
+}
 ?>
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index d38b609b96..763604e51c 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -201,49 +201,6 @@ li:hover ul { display: block; }
 	background: url(../../images/um_messages.menu.png) no-repeat 50% 50%;
 }
 
-#subicon_god-setup {
-	top: -140px;
-}
-#subBulk_operations {
-	top: -210px;
-}
-
-#subicon_god-servers {
-	top: -120px;
-}
-
-#subicon_god-alerts {
-	top: -70px;
-}
-
-#subicon_god-links {
-	top: -140px;
-}
-
-#subicon_god-extensions {
-	top: -180px;
-}
-
-#subicon_god-um_messages {
-	top: -90px;
-}
-
-#subicon_god-configuration {
-	top: -100px;
-}
-
-#subDB_maintenance {
-	top: -120px;
-}
-
-#subExtension_manager {
-	top: -100px;
-}
-
-#subSetup {
-	top: -80px;
-}
-
 #menu_container {
 	z-index: 3;
 	position: absolute;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 29b30f7198..2054b7dd51 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1884,7 +1884,7 @@ div.warn {
 /* Submenus havent borders */
 .submenu_not_selected, .submenu_selected, .submenu2 {
 	border: 0px !important;
-	min-height: 0px !important;
+	min-height: 35px !important;
 }
 
 /* Pandora width style theme */
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index fea5aca60b..981b6223fa 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -1948,7 +1948,7 @@ div.warn {
 /* Submenus havent borders */
 .submenu_not_selected, .submenu_selected, .submenu2 {
 	border: 0px !important;
-	min-height: 0px !important;
+	min-height: 35px !important;
 }
 
 /* Pandora width style theme */
diff --git a/pandora_console/include/styles/pandora_green_old.css b/pandora_console/include/styles/pandora_green_old.css
index 90d15eb0d7..e983e6047d 100644
--- a/pandora_console/include/styles/pandora_green_old.css
+++ b/pandora_console/include/styles/pandora_green_old.css
@@ -1939,7 +1939,7 @@ div.warn {
 /* Submenus havent borders */
 .submenu_not_selected, .submenu_selected, .submenu2 {
 	border: 0px !important;
-	min-height: 0px !important;
+	min-height: 35px !important;
 }
 
 /* Pandora width style theme */

From d7fbc62eca58d900fa7cfd844e165ff32f4f20e5 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 27 Mar 2017 15:47:48 +0200
Subject: [PATCH 09/63] Modified menu_calculate_top to works well with fixed
 menu option

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

diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 1dbaecae0b..913c6a63cd 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -746,7 +746,7 @@ function menu_calculate_top($level1, $level2, $level3 = false) {
 
 	}
 	// Positionate in the middle
-	if ($total > 12 && (($total < 18) || (($level1 - $comp) <= 2))) {
+	if ($total > 12 && (($total < 18) || (($level1 - $comp) <= 4))) {
 		return - ( floor($comp/2) * 35);
 	}
 	// Positionate in the bottom

From af7af852b7ca23f738e4fdc1594dda057d25fff4 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Thu, 30 Mar 2017 12:33:23 +0200
Subject: [PATCH 10/63] Fixed tet in a help pop-up.

---
 .../include/help/clippy/extension_cron_send_email.php           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pandora_console/include/help/clippy/extension_cron_send_email.php b/pandora_console/include/help/clippy/extension_cron_send_email.php
index cd6cf216d4..6df2d3119d 100755
--- a/pandora_console/include/help/clippy/extension_cron_send_email.php
+++ b/pandora_console/include/help/clippy/extension_cron_send_email.php
@@ -36,9 +36,11 @@ function clippy_extension_cron_send_email() {
 		'intro' => '<table>' .
 			'<tr>' .
 			'<td class="context_help_body">' .
+			'<div style="word-break: break-word;">' . 
 			__('The configuration of email for the task email is in the file:') . '<br />' .
 			'&lt;www&gt;/pandora_console/enterprise/extensions/cron/email_config.php <br />' .
 			__('Please check if the email configuration is correct.') .
+			'</div>' .
 			'</td>' .
 			'</tr>' .
 			'</table>'

From 2177d465d26b2b2943024a2e181b2693df636649 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 31 Mar 2017 13:21:39 +0200
Subject: [PATCH 11/63] Added php5.6 deps to debian console package

---
 pandora_console/DEBIAN/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index fc1395f622..9e064109de 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -6,5 +6,5 @@ Section: admin
 Installed-Size: 42112
 Maintainer: Artica ST <deptec@artica.es>
 Homepage: http://pandorafms.org/
-Depends: php5, php5-snmp, php5-gd, php5-mysql, php-db, php5-xmlrpc, php-gettext, php5-curl, graphviz, dbconfig-common, php5-ldap, mysql-client | virtual-mysql-client
+Depends: php5.6 | php5, php5.6-snmp | php5-snmp, php5.6-gd | php5-gd, php5.6-mysql | php5-mysql, php-db, php5.6-xmlrpc | php5-xmlrpc, php-gettext, php5.6-curl | php5-curl, graphviz, dbconfig-common, php5.6-ldap | php5-ldap, mysql-client | virtual-mysql-client
 Description: Pandora FMS is an Open Source monitoring tool. It monitor your systems and applications, and allows you to control the status of any element of them. The web console is the graphical user interface (GUI) to manage the pool and to generate reports and graphs from the Pandora FMS monitoring process.

From 94d85d9f6ee6190babe702cdb2f9e02e5fb91022 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 4 Apr 2017 17:35:11 +0200
Subject: [PATCH 12/63] Translations changed

---
 .../godmode/update_manager/update_manager.offline.php        | 5 +++--
 .../godmode/update_manager/update_manager.online.php         | 2 +-
 pandora_console/include/functions_update_manager.php         | 5 +++--
 pandora_console/include/javascript/update_manager.js         | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php
index bd2591f0e1..00825e29e1 100644
--- a/pandora_console/godmode/update_manager/update_manager.offline.php
+++ b/pandora_console/godmode/update_manager/update_manager.offline.php
@@ -54,8 +54,9 @@ $baseurl = ui_get_full_url(false, false, false, false);
 	var package_success = "<?php echo __('Package updated successfully'); ?>\n";
 	var package_error = "<?php echo __('Error in package updated'); ?>\n";
 	var bad_mr_file = "<?php echo __('Database MR version is inconsistent, do you want to apply the package?'); ?>\n";
-	var text1_mr_file = "<?php echo __('There are a new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
-	var text2_mr_file = "<?php echo __('We recommend launch a '); ?>\n";
+	var mr_available_header = "<?php echo __('There are db changes'); ?>\n";
+	var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
+	var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
 	var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
 	var text4_mr_file = "<?php echo __(' to this process'); ?>\n";
 	var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";
diff --git a/pandora_console/godmode/update_manager/update_manager.online.php b/pandora_console/godmode/update_manager/update_manager.online.php
index 747b6a0ece..666709604f 100644
--- a/pandora_console/godmode/update_manager/update_manager.online.php
+++ b/pandora_console/godmode/update_manager/update_manager.online.php
@@ -82,7 +82,7 @@ echo "<span class='loading' style='font-size:18pt;'>";
 echo "<img src='images/wait.gif' />";
 echo "</span><br><br>";
 
-echo "<div><b>" . __('The last version of package installed is:') . "</b></div><br>";
+echo "<div><b>" . __('The latest version of package installed is:') . "</b></div><br>";
 echo "<div id='pkg_version' style='color:#82b92e;font-size:40pt;font-weight:bold;'>" . $current_package . "</div>";
 
 	echo "<div class='checking_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>";
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 92c6f38331..ceaff5255c 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -354,8 +354,9 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
 					var package_success = "<?php echo __('Package updated successfully'); ?>\n";
 					var package_error = "<?php echo __('Error in package updated'); ?>\n";
 					var bad_mr_file = "<?php echo __('Database MR version is inconsistent, do you want to apply the package?'); ?>\n";
-					var text1_mr_file = "<?php echo __('There are a new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
-					var text2_mr_file = "<?php echo __('We recommend launch a '); ?>\n";
+					var mr_available_header = "<?php echo __('There are db changes'); ?>\n";
+					var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
+					var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
 					var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
 					var text4_mr_file = "<?php echo __(' to this process'); ?>\n";
 					var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";
diff --git a/pandora_console/include/javascript/update_manager.js b/pandora_console/include/javascript/update_manager.js
index b5fdde9121..a9ba2cc23f 100644
--- a/pandora_console/include/javascript/update_manager.js
+++ b/pandora_console/include/javascript/update_manager.js
@@ -607,7 +607,7 @@ function install_package (package, homeurl) {
 							
 							var dialog_have_mr_text = "<div>";
 							dialog_have_mr_text = dialog_have_mr_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_warning_mr.png'></div>";
-							dialog_have_mr_text = dialog_have_mr_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>There are a DB changes</strong></h3>";
+							dialog_have_mr_text = dialog_have_mr_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" + mr_available_header + "</strong></h3>";
 							dialog_have_mr_text = dialog_have_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>" + text1_mr_file + "</p>";
 							dialog_have_mr_text = dialog_have_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>" + text2_mr_file + "<a style='font-family:Verdana bold; font-size:12pt; color:#82B92E'href=\"index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list\">" + text3_mr_file + "</a>" + text4_mr_file + "</p></div>";
 							dialog_have_mr_text = dialog_have_mr_text + "</div>";
@@ -1242,7 +1242,7 @@ function install_free_package_prev_step(package, version, homeurl) {
 							
 							var dialog_have_mr_text = "<div>";
 							dialog_have_mr_text = dialog_have_mr_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_warning_mr.png'></div>";
-							dialog_have_mr_text = dialog_have_mr_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>There are a DB changes</strong></h3>";
+							dialog_have_mr_text = dialog_have_mr_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" + mr_available_header + "</strong></h3>";
 							dialog_have_mr_text = dialog_have_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>" + text1_mr_file + "</p>";
 							dialog_have_mr_text = dialog_have_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>" + text2_mr_file + "<a style='font-family:Verdana bold; font-size:12pt; color:#82B92E'href=\"index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list\">" + text3_mr_file + "</a>" + text4_mr_file + "</p></div>";
 							dialog_have_mr_text = dialog_have_mr_text + "</div>";

From eb4b5b9f43a456223a98a2b54c8413adbb57ffa3 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Thu, 6 Apr 2017 16:17:54 +0200
Subject: [PATCH 13/63] added home screen in the creation and modification of
 users

---
 .../godmode/users/configure_user.php          | 161 ++++++++++++++++--
 1 file changed, 145 insertions(+), 16 deletions(-)

diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 73b1f5ede0..bbd876a2de 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -23,6 +23,7 @@ enterprise_hook('open_meta_frame');
 include_once($config['homedir'] . "/include/functions_profile.php");
 include_once($config['homedir'] . '/include/functions_users.php');
 include_once ($config['homedir'] . '/include/functions_groups.php');
+include_once ($config['homedir'] . '/include/functions_visual_map.php');
 
 $meta = false;
 if(enterprise_installed() && defined("METACONSOLE")) {
@@ -30,6 +31,7 @@ if(enterprise_installed() && defined("METACONSOLE")) {
 }
 
 $isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
+enterprise_include_once ('include/functions_dashboard.php');
 
 //Add the columns for the enterprise Pandora edition.
 $enterprise_include = false;
@@ -129,6 +131,9 @@ if ($new_user && $config['admin_can_add_user']) {
 	if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
 		$user_info['id_skin'] = '';
 	}
+	
+	$user_info['section'] = '';
+	$user_info['data_section'] = '';
 	//This attributes are inherited from global configuration
 	$user_info['block_size'] = $config["block_size"];
 	$user_info['flash_chart'] = $config["flash_charts"];
@@ -158,12 +163,25 @@ if ($create_user) {
 	$values['comments'] = (string) get_parameter ('comments');
 	$values['is_admin'] = (int) get_parameter ('is_admin', 0);
 	$values['language'] = get_parameter ('language', 'default');
+	$dashboard = get_parameter('dashboard', '');
+	$visual_console = get_parameter('visual_console', '');
 	if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
 		$values['id_skin'] = (int) get_parameter ('skin', 0);
 	}
 	$values['block_size'] = (int) get_parameter ('block_size', $config["block_size"]);
 	$values['flash_chart'] = (int) get_parameter ('flash_charts', $config["flash_charts"]);
 	
+	$values['section'] = get_parameter ('section');
+	if (($values['section'] == 'Event list') || ($values['section'] == 'Group view') || ($values['section'] == 'Alert detail') || ($values['section'] == 'Tactical view') || ($values['section'] == 'Default')) {
+		$values["data_section"] = '';
+	} else if ($values['section'] == 'Dashboard') {
+		$values["data_section"] = $dashboard;
+	} else if (io_safe_output($values['section']) == 'Visual console') {
+		$values["data_section"] = $visual_console;
+	} else if ($values['section'] == 'Other'){
+		$values["data_section"] = get_parameter ('data_section');
+	}
+	
 	if (enterprise_installed()) {
 		$values['force_change_pass'] = 1;
 		$values['last_pass_change'] = date ("Y/m/d H:i:s", get_system_time());
@@ -266,12 +284,27 @@ if ($update_user) {
 	$values['comments'] = (string) get_parameter ('comments');
 	$values['is_admin'] = get_parameter ('is_admin', 0 );
 	$values['language'] = (string) get_parameter ('language');
+	$dashboard = get_parameter('dashboard', '');
+	$visual_console = get_parameter('visual_console', '');
+	
 	if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
 		$values['id_skin'] = get_parameter ('skin', 0);
 	}
 	$values['block_size'] = get_parameter ('block_size', $config["block_size"]);
 	$values['flash_chart'] = get_parameter ('flash_charts', $config["flash_charts"]);
 	
+	
+	$values['section'] = get_parameter ('section');
+	if (($values['section'] == 'Event list') || ($values['section'] == 'Group view') || ($values['section'] == 'Alert detail') || ($values['section'] == 'Tactical view') || ($values['section'] == 'Default')) {
+		$values["data_section"] = '';
+	} else if ($values['section'] == 'Dashboard') {
+		$values["data_section"] = $dashboard;
+	} else if (io_safe_output($values['section']) == 'Visual console') {
+		$values["data_section"] = $visual_console;
+	} else if ($values['section'] == 'Other'){
+		$values["data_section"] = get_parameter ('data_section');
+	}
+	
 	if(enterprise_installed() && defined('METACONSOLE')) {
 		$values['metaconsole_access'] = get_parameter ('metaconsole_access');
 		$values['metaconsole_agents_manager'] = get_parameter ('metaconsole_agents_manager', '0');
@@ -282,6 +315,7 @@ if ($update_user) {
 	$values["strict_acl"] = (bool)get_parameter ('strict_acl', false);
 	$values["session_time"] = (int)get_parameter('session_time', 0);
 	
+
 	$res1 = update_user ($id, $values);
 	
 	if ($config['user_can_update_password']) {
@@ -324,7 +358,8 @@ if ($update_user) {
 				' Phone: ' . $values['phone'] . ' Comments: ' . $values['comments'] .
 				' Is_admin: ' . $values['is_admin'] .
 				' Language: ' . $values['language'] . 
-				' Block size: ' . $values['block_size'] . ' Flash Chats: ' . $values['flash_chart'];
+				' Block size: ' . $values['block_size'] . ' Flash Chats: ' . $values['flash_chart'] .
+				' Section: ' . $values['section'];
 			
 			if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
 				$info .= ' Skin: ' . $values['id_skin'];
@@ -512,15 +547,59 @@ if (!$meta) {
 	}
 }
 
-$table->data[11][0] = __('Interactive charts'). ' ' .ui_print_help_tip(__('Whether to use Javascript or static PNG graphs'), true) ;
+$table->data[11][0] = __('Interactive charts').' '.ui_print_help_tip(__('Whether to use Javascript or static PNG graphs'), true) ;
 $values = array(-1 => __('Use global conf'), 1 => __('Yes'), 0 => __('No'));
 $table->data[11][1] = html_print_select($values, 'flash_charts',
 	$user_info["flash_chart"], '', '', -1, true, false, false);
-$table->data[12][0] = __('Block size for pagination');
-$table->data[12][1] = html_print_input_text ('block_size', $user_info["block_size"], '', 5, 5, true);
+
+$table->data[12][0] = __('Home screen').
+		ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true);
+$values = array (
+	'Default' =>__('Default'),
+	'Visual console'=>__('Visual console'),
+	'Event list'=>__('Event list'),
+	'Group view'=>__('Group view'),
+	'Tactical view'=>__('Tactical view'),
+	'Alert detail' => __('Alert detail'),
+	'Other'=>__('Other'));
+if (enterprise_installed()) {
+	$values['Dashboard'] = __('Dashboard');
+}
+$table->data[12][1] = html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false);	
+
+if (enterprise_installed()) {
+	$dashboards = dashboard_get_dashboards();
+	$dashboards_aux = array();
+	if ($dashboards === false) {
+		$dashboards = array('None'=>'None');
+	}
+	else {
+		foreach ($dashboards as $key => $dashboard) {
+			$dashboards_aux[$dashboard['name']] = $dashboard['name'];
+		}
+	}
+	$table->data[12][1] .= html_print_select ($dashboards_aux, 'dashboard', $user_info["data_section"], '', '', '', true);
+}
+
+$layouts = visual_map_get_user_layouts ($config['id_user'], true);
+$layouts_aux = array();
+if ($layouts === false) {
+	$layouts_aux = array('None'=>'None');
+}
+else {
+	foreach ($layouts as $layout) {
+		$layouts_aux[$layout] = $layout;
+	}
+}
+
+$table->data[12][1] .= html_print_select ($layouts_aux, 'visual_console', $user_info["data_section"], '', '', '', true);
+$table->data[12][1] .=  html_print_input_text ('data_section', $user_info["data_section"], '', 60, 255, true, false);
+	
+$table->data[13][0] = __('Block size for pagination');
+$table->data[13][1] = html_print_input_text ('block_size', $user_info["block_size"], '', 5, 5, true);
 
 if ($id == $config['id_user']) {
-	$table->data[12][1] .= html_print_input_hidden('quick_language_change', 1, true);
+	$table->data[13][1] .= html_print_input_hidden('quick_language_change', 1, true);
 }
 
 if (enterprise_installed() && defined('METACONSOLE')) {
@@ -528,25 +607,25 @@ if (enterprise_installed() && defined('METACONSOLE')) {
 	if (isset($user_info["metaconsole_access"])) {
 		$user_info_metaconsole_access = $user_info["metaconsole_access"];
 	}
-	$table->data[12][0] = __('Metaconsole access'). ' ' .ui_print_help_icon ('meta_access', true);
+	$table->data[13][0] = __('Metaconsole access'). ' ' .ui_print_help_icon ('meta_access', true);
 	$metaconsole_accesses = array('basic' => __('Basic'),
 		'advanced' => __('Advanced'));
-	$table->data[12][1] = html_print_select($metaconsole_accesses,
+	$table->data[13][1] = html_print_select($metaconsole_accesses,
 		'metaconsole_access', $user_info_metaconsole_access,
 		'','',-1,true, false, false);
 }
 
-$table->data[13][0] = __('Not Login');
-$table->data[13][0] .= ui_print_help_tip(__('The user with not login set only can access to API.'), true);
-$table->data[13][1] = html_print_checkbox('not_login', 1, $user_info["not_login"], true);
+$table->data[14][0] = __('Not Login');
+$table->data[14][0] .= ui_print_help_tip(__('The user with not login set only can access to API.'), true);
+$table->data[14][1] = html_print_checkbox('not_login', 1, $user_info["not_login"], true);
 
-$table->data[14][0] = __('Strict ACL');
-$table->data[14][0] .= ui_print_help_tip(__('With this option enabled, the user will can access to accurate information. It is not recommended for admin users because performance could be affected'), true);
-$table->data[14][1] = html_print_checkbox('strict_acl', 1, $user_info["strict_acl"], true);
+$table->data[15][0] = __('Strict ACL');
+$table->data[15][0] .= ui_print_help_tip(__('With this option enabled, the user will can access to accurate information. It is not recommended for admin users because performance could be affected'), true);
+$table->data[15][1] = html_print_checkbox('strict_acl', 1, $user_info["strict_acl"], true);
 
-$table->data[15][0] = __('Session Time');
-$table->data[15][0] .= ui_print_help_tip(__('This is defined in minutes, If you wish a permanent session should putting -1 in this field.'), true);
-$table->data[15][1] = html_print_input_text ('session_time', $user_info["session_time"], '', 5, 5, true);
+$table->data[16][0] = __('Session Time');
+$table->data[16][0] .= ui_print_help_tip(__('This is defined in minutes, If you wish a permanent session should putting -1 in this field.'), true);
+$table->data[16][1] = html_print_input_text ('session_time', $user_info["session_time"], '', 5, 5, true);
 	
 if($meta) {
 	enterprise_include('include/functions_metaconsole.php');
@@ -738,6 +817,56 @@ $(document).ready (function () {
 	
 	$('input:radio[name="is_admin"]').trigger('change');
 	$('#checkbox-metaconsole_agents_manager').trigger('change');
+	
+	show_data_section();
 });
+
+function show_data_section () {
+	section = $("#section").val();
+	
+	switch (section) {
+		case <?php echo "'" . 'Dashboard' . "'"; ?>:
+			$("#text-data_section").css("display", "none");
+			$("#dashboard").css("display", "");
+			$("#visual_console").css("display", "none");
+			break;
+		case <?php echo "'" . 'Visual console' . "'"; ?>:
+			$("#text-data_section").css("display", "none");
+			$("#dashboard").css("display", "none");
+			$("#visual_console").css("display", "");
+			break;
+		case <?php echo "'" . 'Event list' . "'"; ?>:
+			$("#text-data_section").css("display", "none");
+			$("#dashboard").css("display", "none");
+			$("#visual_console").css("display", "none");
+			break;
+		case <?php echo "'" . 'Group view' . "'"; ?>:
+			$("#text-data_section").css("display", "none");
+			$("#dashboard").css("display", "none");
+			$("#visual_console").css("display", "none");
+			break;
+		case <?php echo "'" . 'Tactical view' . "'"; ?>:
+			$("#text-data_section").css("display", "none");
+			$("#dashboard").css("display", "none");
+			$("#visual_console").css("display", "none");
+			break;
+		case <?php echo "'" . 'Alert detail' . "'"; ?>:
+			$("#text-data_section").css("display", "none");
+			$("#dashboard").css("display", "none");
+			$("#visual_console").css("display", "none");
+			break;
+		case <?php echo "'" . 'Other' . "'"; ?>:
+			$("#text-data_section").css("display", "");
+			$("#dashboard").css("display", "none");
+			$("#visual_console").css("display", "none");
+			break;
+		case <?php echo "'" . 'Default' . "'"; ?>:
+			$("#text-data_section").css("display", "none");
+			$("#dashboard").css("display", "none");
+			$("#visual_console").css("display", "none");
+			break;
+	}
+}
+
 /* ]]> */
 </script>

From 41b49770ee04f63af8b2fdd8d2522d502778da11 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 10 Apr 2017 11:10:32 +0200
Subject: [PATCH 14/63] Added new ranges to graph period

---
 pandora_console/include/functions_graph.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 8582655e82..9ba692708b 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -353,9 +353,12 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
 			elseif ($period < SECONDS_1MONTH) {
 				$time_format = "M \nd H\h";
 			} 
-			else {
+			elseif ($period < SECONDS_6MONTHS) {
 				$time_format = "M \nd H\h";
 			}
+			else {
+				$time_format = "M Y";
+			}
 		}
 		else {
 			// Set the title and time format
@@ -371,9 +374,12 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
 			elseif ($period < SECONDS_1MONTH) {
 				$time_format = "M d H\h";
 			} 
-			else {
+			elseif ($period < SECONDS_6MONTHS) {
 				$time_format = "M d H\h";
 			}
+			else {
+				$time_format = "M Y";
+			}
 		}
 		
 		$timestamp_short = date($time_format, $timestamp);

From 622edc1369a93adaec9950feaf6644908ec5f801 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 17 Apr 2017 12:50:46 +0200
Subject: [PATCH 15/63] new feature: added agent_alias_cmd in pandora_agent

---
 pandora_agents/unix/Linux/pandora_agent.conf  |  6 +++
 pandora_agents/unix/pandora_agent             | 20 +++++++++-
 pandora_agents/win32/pandora_agent_conf.cc    |  9 +++++
 .../win32/pandora_windows_service.cc          | 38 +++++++++++++++----
 4 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 4475226edf..37d9de9efc 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -46,6 +46,12 @@ agent_name_cmd __rand__
 #Parent agent_name
 #parent_agent_name caprica
 
+# By default, agent takes machine alias
+#agent_alias
+
+# To define agent alias by specific command, define 'agent_alias_cmd'.
+#agent_alias_cmd
+
 # Agent description
 #description This is a demo agent for Linux
 
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 0bdb5ea11e..14e5b08eba 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -135,9 +135,10 @@ my %DefaultConf = (
 	'interval' => 300,
 	'debug' => 0,		
 	'agent_name' => '',
-	'agent_alias' => hostname(),
+	'agent_alias' => '',
 	'ehorus_conf' => undef,
 	'agent_name_cmd' => '',
+	'agent_alias_cmd' => '',
 	'description' => '',
 	'group' => '',
 	'group_id' => undef,
@@ -802,6 +803,23 @@ sub read_config (;$) {
 	
 	# Module, plugin and collection definitions
 	parse_conf_modules(\@file);
+	
+	# If agent_alias_cmd is defined, agent_alias is set by command result.
+	if ($Conf{'agent_alias'} eq '') {
+		if ($Conf{'agent_alias_cmd'} ne '') {
+			my $result = `$Conf{'agent_alias_cmd'}`;
+			# Use only the first line.
+			my ($temp_agent_alias, $remain2) = split(/\n/, $result);
+			chomp ($temp_agent_alias);
+	
+			# Remove white spaces of the first and last.
+			$temp_agent_alias =~ s/^ *(.*?) *$/$1/;
+	
+			$Conf{'agent_alias'} = $temp_agent_alias if ($temp_agent_alias ne '');
+		} else {
+			$Conf{'agent_alias'} = hostname();
+		}
+	}
 
 	# If agent_name_cmd is defined, agent_name is set by command result.
 	if ($Conf{'agent_name'} eq '') {
diff --git a/pandora_agents/win32/pandora_agent_conf.cc b/pandora_agents/win32/pandora_agent_conf.cc
index 83675cdde6..94617243d5 100644
--- a/pandora_agents/win32/pandora_agent_conf.cc
+++ b/pandora_agents/win32/pandora_agent_conf.cc
@@ -228,6 +228,15 @@ Pandora::Pandora_Agent_Conf::setFile (string *all_conf){
 				key_values->push_back (kv);
 				continue;
 			}
+			
+			/*Check if is a agent_alias_cmd"*/
+			pos = buffer.find("agent_alias_cmd");
+			if (pos != string::npos){
+				Key_Value kv;
+				kv.parseLineByPosition(buffer, 15);
+				key_values->push_back (kv);
+				continue;
+			}
 
 			/*Check if is a collection*/
 			pos = buffer.find("file_collection");
diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index 45c2189385..a7c1105975 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -257,7 +257,36 @@ Pandora_Windows_Service::pandora_init () {
 	// Read modules
 	this->modules = new Pandora_Module_List (conf_file);
 	delete []all_conf;
-	
+    
+    // Get the agent alias.
+	agent_alias = conf->getValue ("agent_alias");
+	if (agent_alias == "") {
+        agent_alias_cmd = conf->getValue ("agent_alias_cmd");
+        if (agent_alias_cmd != "") {
+            agent_alias_cmd = "cmd.exe /c \"" + agent_alias_cmd + "\"";
+			static string temp_agent_alias = getAgentNameFromCmdExec(agent_alias_cmd);
+
+			// Delete new line and carriage return.
+			pos = temp_agent_alias.find("\n");
+			if(pos != string::npos) {
+				temp_agent_alias.erase(pos, temp_agent_alias.size () - pos);
+			}
+			pos = temp_agent_alias.find("\r");
+			if(pos != string::npos) {
+				temp_agent_alias.erase(pos, temp_agent_alias.size () - pos);
+			}
+
+			// Remove leading and trailing white spaces.
+			temp_agent_alias = trim(temp_agent_alias);
+			if (temp_agent_alias != "") {
+				agent_alias = temp_agent_alias;
+            }
+        } else {
+            agent_alias = Pandora_Windows_Info::getSystemName ();
+        }
+	}
+	this->conf->setValue("agent_alias", agent_alias);
+    
 	// Get the agent name.
 	agent_name = conf->getValue ("agent_name");
 	if (agent_name == "") {
@@ -299,13 +328,6 @@ Pandora_Windows_Service::pandora_init () {
 		this->conf->setValue("agent_name", agent_name);
 	}
 
-	// Get the agent alias.
-	agent_alias = conf->getValue ("agent_alias");
-	if (agent_alias == "") {
-		agent_alias = Pandora_Windows_Info::getSystemName ();
-		this->conf->setValue("agent_alias", agent_alias);
-	}
-
 	pandora_agent = "PANDORA_AGENT=" + agent_name;
 	putenv(pandora_agent.c_str());
 	

From f13085ed3a5b8ac49ff4ef990b207f7b7ebda878 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 17 Apr 2017 14:45:42 +0200
Subject: [PATCH 16/63] Changed agent name by agent alias

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

diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index f691a10728..972f1add67 100755
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -589,7 +589,7 @@ if ($traps !== false) {
 				continue;
 			}
 			$data[1] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'" title="'.__('View agent details').'">';
-			$data[1] .= '<strong>'.$agent["nombre"].ui_print_help_tip($trap['source'], true);'</strong></a>';
+			$data[1] .= '<strong>'.$agent["alias"].ui_print_help_tip($trap['source'], true);'</strong></a>';
 		}
 		
 		//OID

From 42c7a400f0df97a203dc6fb2d196602bec805303 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 18 Apr 2017 10:42:23 +0200
Subject: [PATCH 17/63] Changed name by alias when deleting agent

---
 pandora_console/godmode/agentes/modificar_agente.php | 10 ++++++----
 pandora_console/include/functions_agents.php         |  6 ++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 9487a5519c..8dae33a036 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -99,6 +99,7 @@ if ($agent_to_delete) {
 
 if ($enable_agent) {
 	$result = db_process_sql_update('tagente', array('disabled' => 0), array('id_agente' => $enable_agent));
+	$alias = agents_get_alias($enable_agent);
 	
 	if ($result) {
 		// Update the agent from the metaconsole cache
@@ -106,10 +107,10 @@ if ($enable_agent) {
 		$values = array('disabled' => 0);
 		enterprise_hook ('agent_update_from_cache', array($enable_agent, $values));
 		
-		db_pandora_audit("Agent management", 'Enable  ' . $enable_agent);
+		db_pandora_audit("Agent management", 'Enable  ' . $alias);
 	}
 	else {
-		db_pandora_audit("Agent management", 'Fail to enable ' . $enable_agent);
+		db_pandora_audit("Agent management", 'Fail to enable ' . $alias);
 	}
 	
 	ui_print_result_message ($result,
@@ -118,6 +119,7 @@ if ($enable_agent) {
 
 if ($disable_agent) {
 	$result = db_process_sql_update('tagente', array('disabled' => 1), array('id_agente' => $disable_agent));
+	$alias = agents_get_alias($disable_agent);
 	
 	if ($result) {
 		// Update the agent from the metaconsole cache
@@ -125,10 +127,10 @@ if ($disable_agent) {
 		$values = array('disabled' => 1);
 		enterprise_hook ('agent_update_from_cache', array($disable_agent, $values));
 		
-		db_pandora_audit("Agent management", 'Disable  ' . $disable_agent);
+		db_pandora_audit("Agent management", 'Disable  ' . $alias);
 	}
 	else {
-		db_pandora_audit("Agent management", 'Fail to disable ' . $disable_agent);
+		db_pandora_audit("Agent management", 'Fail to disable ' . $alias);
 	}
 	
 	ui_print_result_message ($result,
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index ea2aca64bd..a17b664932 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -1836,6 +1836,7 @@ function agents_delete_agent ($id_agents, $disableACL = false) {
 		continue;
 		
 		$agent_name = agents_get_name($id_agent, "");
+		$agent_alias = io_safe_output(agents_get_alias($id_agent));
 		
 		/* Check for deletion permissions */
 		$id_group = agents_get_agent_group ($id_agent);
@@ -1943,6 +1944,7 @@ function agents_delete_agent ($id_agents, $disableACL = false) {
 				if (enterprise_hook('config_agents_has_remote_configuration', array($id_agent))) {
 					$agent_name = agents_get_name($id_agent);
 					$agent_name = io_safe_output($agent_name);
+					$agent_alias = io_safe_output(agents_get_alias($id_agent));
 					$agent_md5 = md5 ($agent_name, false);
 					
 					// Agent remote configuration editor
@@ -1957,7 +1959,7 @@ function agents_delete_agent ($id_agents, $disableACL = false) {
 					
 					if ($error) {
 						db_pandora_audit( "Agent management",
-							"Error: Deleted agent '$agent_name', the error is in the delete conf or md5.");
+							"Error: Deleted agent '$agent_alias', the error is in the delete conf or md5.");
 					}
 				}
 			}
@@ -1969,7 +1971,7 @@ function agents_delete_agent ($id_agents, $disableACL = false) {
 		db_process_sql ("delete from ttag_module where id_agente_modulo in (select id_agente_modulo from tagente_modulo where id_agente = ".$id_agent.")");
 		
 		db_pandora_audit( "Agent management",
-			"Deleted agent '$agent_name'");
+			"Deleted agent '$agent_alias'");
 		
 		// Delete the agent from the metaconsole cache
 		enterprise_include_once('include/functions_agents.php');

From 8f1d93c0084fa8d797f839fdd2a46abb750470db Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 18 Apr 2017 11:46:57 +0200
Subject: [PATCH 18/63] Support link changed in pandora enterprise

---
 pandora_console/general/login_page.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 858ad945c0..48d06376a0 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -83,12 +83,19 @@ echo '<div id="header_login">';
 			echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="pandora_console">';	
 		}
 	echo '</div>';
-	echo '<div id="list_icon_docs_support"><ul>';
-		echo '<li><a href="http://wiki.pandorafms.com/" target="_blank"><img src="images/icono_docs.png" alt="docs pandora"></a></li>';
-		echo '<li>' . __('Docs') . '</li>';
-		echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
-		echo '<li>' . __('Support') . '</li>';
-	echo '</ul></div>';	
+	
+		echo '<div id="list_icon_docs_support"><ul>';
+			echo '<li><a href="http://wiki.pandorafms.com/" target="_blank"><img src="images/icono_docs.png" alt="docs pandora"></a></li>';
+			echo '<li>' . __('Docs') . '</li>';
+			if (defined ('PANDORA_ENTERPRISE')) {
+				echo '<li id="li_margin_left"><a href="https://support.artica.es" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
+			} else {
+				echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
+			}
+			echo '<li>' . __('Support') . '</li>';
+		echo '</ul></div>';
+	
+		
 echo '</div>';
 
 echo '<div class="container_login">';

From 8531e9847bab8c0b2c4afaf4d30038957dad49d3 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 18 Apr 2017 17:46:50 +0200
Subject: [PATCH 19/63] Added lost id to dynamic threshold select

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

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 2af6eebf8e..d94a2bfde7 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -737,7 +737,7 @@ function html_print_extended_select_for_time ($name, $selected = '',
 	if (!is_user_admin($config['id_user'])) {
 		unset($fields[-1]);
 		
-		$returnString = html_print_select ($fields, $name, $selected,"" . $script,
+		$returnString = html_print_select ($fields, $name . '_select', $selected,"" . $script,
 			$nothing, $nothing_value, true, false, false, '', false, 'font-size: xx-small;'.$select_style);
 		
 		if ($return) {

From b21b3cabf665c8e4f40bf1a6a21995c4b05d5469 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 19 Apr 2017 15:10:55 +0200
Subject: [PATCH 20/63] Not show scroll bar in config permission error dialog
 in index - #728

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

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 858ad945c0..b6655d3af8 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -424,7 +424,7 @@ html_print_div(array('id' => 'forced_title_layer', 'class' => 'forced_title_laye
 				draggable: false,
 				modal: true,
 				width: 600,
-				height: 250,
+				height: 280,
 				overlay: {
 					opacity: 0.5,
 					background: "black"

From fcf3da2acf52b2a9dfa406548afec1ca10862728 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Thu, 20 Apr 2017 12:10:52 +0200
Subject: [PATCH 21/63] Remove temporality links to help. And in future chenge
 this help

---
 pandora_console/godmode/alerts/alert_templates.php          | 3 ++-
 pandora_console/godmode/alerts/configure_alert_template.php | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index ff0605390a..cda35892a4 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -129,7 +129,8 @@ if (!$delete_template) {
 		alerts_meta_print_header ();
 	}
 	else {
-		ui_print_page_header (__('Alerts')." &raquo; ". __('Alert templates'), "images/gm_alerts.png", false, "alerts_config", true);
+		//~ ui_print_page_header (__('Alerts')." &raquo; ". __('Alert templates'), "images/gm_alerts.png", false, "alerts_config", true);
+		ui_print_page_header (__('Alerts')." &raquo; ". __('Alert templates'), "images/gm_alerts.png", false, "", true);
 	}
 }
 
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index 206a0fb2b8..d2cc13a702 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -59,9 +59,12 @@ if ($a_template !== false) {
 			alerts_meta_print_header();
 		}
 		else {
+			//~ ui_print_page_header (__('Alerts') .
+				//~ ' &raquo; ' . __('Configure alert template'), "",
+				//~ false, "alerts_config", true);
 			ui_print_page_header (__('Alerts') .
 				' &raquo; ' . __('Configure alert template'), "",
-				false, "alerts_config", true);
+				false, "", true);
 		}
 	}
 	else {

From 87f37984992830a68a5d05b072102f5881904d7d Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 17:36:26 +0200
Subject: [PATCH 22/63] Added dashboards to "edit my user" section

---
 pandora_console/include/functions.php         | 29 +++++++++++++++++--
 pandora_console/operation/users/user_edit.php |  1 +
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 3ce4eed8da..059e4c5e41 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1990,9 +1990,32 @@ function get_os_name ($id_os) {
  * @return array Dashboard name of the given user.
  */
 function get_user_dashboards ($id_user) {
-	$sql = "SELECT name
-		FROM tdashboard
-		WHERE id_user="."'".$id_user."'";
+	if (users_is_admin($id_user)) {
+		$sql = "SELECT name
+			FROM tdashboard";
+	}
+	else {
+		$user_can_manage_all = users_can_manage_group_all('RR');
+		if ($user_can_manage_all) {
+			$sql = "SELECT name
+				FROM tdashboard";
+		}
+		else {
+			$user_groups = users_get_groups($id_user, "RR", false);
+			if (empty($user_groups)) {
+				return false;
+			}
+
+			$u_groups = array();
+			foreach ($user_groups as $id => $group_name) {
+				$u_groups[] = $id;
+			}
+
+			$sql = "SELECT name
+				FROM tdashboard
+				WHERE id_group IN (" . implode(",", $u_groups) . ")";
+		}
+	}
 	
 	return db_get_all_rows_sql ($sql);
 }
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 8b5d55e777..bf2e8a6539 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -288,6 +288,7 @@ if (!$meta) {
 
 	if (enterprise_installed()) {
 		$dashboards = get_user_dashboards ($config['id_user']);
+		
 		$dashboards_aux = array();
 		if ($dashboards === false) {
 			$dashboards = array('None'=>'None');

From b10f1f422ffeecfd461e0842ad1b9b8f730691a6 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 18:02:34 +0200
Subject: [PATCH 23/63] Added more restrictions to user dashboard function

---
 pandora_console/include/functions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 059e4c5e41..bb4d6696e8 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1992,13 +1992,13 @@ function get_os_name ($id_os) {
 function get_user_dashboards ($id_user) {
 	if (users_is_admin($id_user)) {
 		$sql = "SELECT name
-			FROM tdashboard";
+			FROM tdashboard WHERE id_user = '" . $id_user ."' OR id_user = ''";
 	}
 	else {
 		$user_can_manage_all = users_can_manage_group_all('RR');
 		if ($user_can_manage_all) {
 			$sql = "SELECT name
-				FROM tdashboard";
+				FROM tdashboard WHERE id_user = '" . $id_user ."' OR id_user = ''";
 		}
 		else {
 			$user_groups = users_get_groups($id_user, "RR", false);
@@ -2013,7 +2013,7 @@ function get_user_dashboards ($id_user) {
 
 			$sql = "SELECT name
 				FROM tdashboard
-				WHERE id_group IN (" . implode(",", $u_groups) . ")";
+				WHERE id_group IN (" . implode(",", $u_groups) . ") AND (id_user = '" . $id_user ."' OR id_user = '')";
 		}
 	}
 	

From a2cff4195f9f2bae3e5e04444b3d41b75b7b99c8 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Fri, 21 Apr 2017 14:32:31 +0200
Subject: [PATCH 24/63] Added code to autocomplete with ux transactions

---
 pandora_console/include/functions_ui.php | 52 ++++++++++++++++++------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index c951576511..68fe027615 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1638,20 +1638,12 @@ function ui_pagination ($count, $url = false, $offset = 0,
 	}
 	
 	$number_of_pages = ceil($count / $pagination);
-	//~ html_debug_print('number_of_pages');
-	//~ html_debug_print($number_of_pages);
 	$actual_page = floor($offset / $pagination);
-	//~ html_debug_print('actual_page');
-	//~ html_debug_print($actual_page);
 	$ini_page = floor($actual_page / $block_limit) * $block_limit;
-	//~ html_debug_print('ini_page');
-	//~ html_debug_print($ini_page);
 	$end_page = $ini_page + $block_limit - 1;
 	if ($end_page > $number_of_pages) {
 		$end_page = $number_of_pages - 1;
 	}
-	//~ html_debug_print('end_page');
-	//~ html_debug_print($end_page);
 	
 	
 	$output = "<div class='pagination $other_class'>";
@@ -2907,6 +2899,11 @@ function ui_print_agent_autocomplete_input($parameters) {
 	if (isset($parameters['input_id_server_value'])) {
 		$input_id_server_value = $parameters['input_id_server_value'];
 	}
+
+	$from_ux_transaction = ''; //Default value
+	if (isset($parameters['from_ux'])) {
+		$from_ux_transaction = $parameters['from_ux'];
+	}
 	
 	
 	$metaconsole_enabled = false; //Default value
@@ -2994,10 +2991,39 @@ function ui_print_agent_autocomplete_input($parameters) {
 	if (isset($parameters['javascript_name_function_select'])) {
 		$javascript_name_function_select = $parameters['javascript_name_function_select'];
 	}
-	
-	
-	
-	$javascript_code_function_select = '
+
+	if ($from_ux_transaction != "") {
+		$javascript_code_function_select = '
+		function function_select_' . $input_name . '(agent_name) {
+			console.log(agent_name);
+			$("#' . $selectbox_id . '").empty();
+			
+			var inputs = [];
+			inputs.push ("id_agent=" + $("#' . $hidden_input_idagent_id . '").val());
+			inputs.push ("get_agent_transactions=1");
+			inputs.push ("page=enterprise/include/ajax/ux_transaction.ajax");
+			
+			jQuery.ajax ({
+				data: inputs.join ("&"),
+				type: "POST",
+				url: action="' . $javascript_ajax_page . '",
+				dataType: "json",
+				success: function (data) {
+					if (data) {
+						$("#' . $selectbox_id . '").append ($("<option value=0>None</option>"));
+						jQuery.each (data, function (id, value) {
+							$("#' . $selectbox_id . '").append ($("<option value=" + id + ">" + value + "</option>"));
+						});
+					}
+				}
+			});
+			
+			return false;
+		}
+		';
+	}
+	else {
+		$javascript_code_function_select = '
 		function function_select_' . $input_name . '(agent_name) {
 			
 			$("#' . $selectbox_id . '").empty ();
@@ -3058,6 +3084,8 @@ function ui_print_agent_autocomplete_input($parameters) {
 			return false;
 		}
 		';
+	}
+	
 	if (isset($parameters['javascript_code_function_select'])) {
 		$javascript_code_function_select = $parameters['javascript_code_function_select'];
 	}

From 3f6adf9f65c9448d4dc721bfdbcc0a83a3e321c7 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 24 Apr 2017 12:39:11 +0200
Subject: [PATCH 25/63] Fixed error in cron

---
 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 8ccc4d53d4..88599c6629 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 078d5e43578c88387e96c2238d7ba071da64fc7d Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 25 Apr 2017 15:34:11 +0200
Subject: [PATCH 26/63] Added data donut to ux widget

---
 .../include/graphs/functions_d3.php           |  31 ++++
 pandora_console/include/graphs/pandora.d3.js  | 166 ++++++++++++++++++
 2 files changed, 197 insertions(+)

diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php
index 12d069c621..f181492b7a 100644
--- a/pandora_console/include/graphs/functions_d3.php
+++ b/pandora_console/include/graphs/functions_d3.php
@@ -278,4 +278,35 @@ function d3_gauges($chart_data, $width, $height, $color, $legend,
 
 	return $output;
 }
+
+function ux_console_phases_donut ($phases, $id, $return = false) {
+	global $config;
+
+	foreach ($phases as $i => $phase) {
+		$phases[$i]['phase_name'] = io_safe_output($phase['phase_name']);
+	}
+
+	if (is_array($phases))
+		$phases = json_encode($phases);
+	
+	$recipient_name = "phases_donut_" . $id;
+	$recipient_name_to_js = "#phases_donut_" . $id;
+
+	$output = "<div id=" . $recipient_name .  " style='overflow: hidden;'></div>";
+	$output .= include_javascript_d3(true);
+	$output .= "<style type=\"text/css\">
+					path {
+						stroke: #fff;
+						fill-rule: evenodd;
+					}
+				</style>";
+	$output .= "<script language=\"javascript\" type=\"text/javascript\">
+					print_phases_donut('" . $recipient_name_to_js . "', " . $phases . ");
+				</script>";
+
+	if (!$return)
+		echo $output;
+	
+	return $output;
+}
 ?>
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index e940e1877e..6d2449811d 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1326,4 +1326,170 @@ function Gauge(placeholderName, configuration, font)
 	
 	// initialization
 	this.configure(configuration);
+}
+
+function print_phases_donut (recipient, phases) {
+	var svg = d3.select(recipient)
+		.append("svg")
+			.attr("width", 500)
+			.attr("height", 200)
+		.append("g");
+
+	svg.append("g")
+		.attr("class", "slices");
+	svg.append("g")
+		.attr("class", "labels");
+	svg.append("g")
+		.attr("class", "lines");
+
+	var width = 500,
+		height = 200,
+		radius = Math.min(width, height) / 2;
+
+	var pie = d3.layout.pie()
+		.sort(null)
+		.value(function(d) {
+			return 1;
+		});
+
+	var arc = d3.svg.arc()
+		.outerRadius(radius * 0.8)
+		.innerRadius(radius * 0.4);
+
+	var outerArc = d3.svg.arc()
+		.innerRadius(radius * 0.9)
+		.outerRadius(radius * 0.9);
+
+	svg.attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+
+	var key = function(d){ return d.data.label; };
+
+	function phasesData (){
+		return phases.map(function(phase){
+			return { label: phase_name(phase, 1), label2: phase_name(phase, 2), value: phase.status }
+		});
+	}
+
+	function phase_name (phase, index) {
+		if (index == 1) {
+			return phase.phase_name;
+		}
+		else {
+			return phase.phase_time + "ms";
+		}
+	}
+
+	print_phases(phasesData());
+
+	function print_phases(data) {
+		/* ------- PIE SLICES -------*/
+		var slice = svg.select(".slices").selectAll("path.slice")
+			.data(pie(data), key);
+
+		slice.enter()
+			.insert("path")
+			.style("fill", function(d) {
+				if (d.data.value == 0) {
+					return "#80BA27";
+				}
+				else {
+					return "#FC4444";
+				}
+			})
+			.attr("class", "slice");
+
+		slice
+			.transition().duration(0)
+			.attrTween("d", function(d) {
+				this._current = this._current || d;
+				var interpolate = d3.interpolate(this._current, d);
+				this._current = interpolate(0);
+				return function(t) {
+					return arc(interpolate(t));
+				};
+			})
+
+		slice.exit()
+			.remove();
+
+		/* ------- TEXT LABELS -------*/
+
+		var text = svg.select(".labels").selectAll("text")
+			.data(pie(data), key);
+
+		text.enter()
+			.append("text")
+				.append("tspan")
+					.attr("dy", ".1em")
+					.text(function(d) {
+						return d.data.label;
+					})
+					.style("font-family", "Verdana")
+					.style("font-size", "10px")
+				.append("tspan")
+					.attr("dy", "1.4em")
+					.attr("dx", "-6em")
+					.text(function(d) {
+						return d.data.label2;
+					})
+					.style("font-family", "Verdana")
+					.style("font-size", "10px");
+		
+		function midAngle(d){
+			return d.startAngle + (d.endAngle - d.startAngle)/2;
+		}
+
+		text.transition().duration(0)
+			.attrTween("transform", function(d) {
+				this._current = this._current || d;
+				var interpolate = d3.interpolate(this._current, d);
+				this._current = interpolate(0);
+				return function(t) {
+					var d2 = interpolate(t);
+					var pos = outerArc.centroid(d2);
+					pos[0] = radius * (midAngle(d2) < Math.PI ? 1 : -1);
+					return "translate("+ pos +")";
+				};
+			})
+			.styleTween("text-anchor", function(d){
+				this._current = this._current || d;
+				var interpolate = d3.interpolate(this._current, d);
+				this._current = interpolate(0);
+				return function(t) {
+					var d2 = interpolate(t);
+					return midAngle(d2) < Math.PI ? "start":"end";
+				};
+			});
+
+		text.exit()
+			.remove();
+
+		/* ------- SLICE TO TEXT POLYLINES -------*/
+
+		var polyline = svg.select(".lines").selectAll("polyline")
+			.data(pie(data), key);
+		
+		polyline.enter()
+			.append("polyline");
+
+		polyline.transition().duration(0)
+			.attrTween("points", function(d){
+				this._current = this._current || d;
+				var interpolate = d3.interpolate(this._current, d);
+				this._current = interpolate(0);
+				return function(t) {
+					var d2 = interpolate(t);
+					var pos = outerArc.centroid(d2);
+					pos[0] = radius * 0.95 * (midAngle(d2) < Math.PI ? 1 : -1);
+					return [arc.centroid(d2), outerArc.centroid(d2), pos];
+				};			
+			})
+			.style("stroke", "black")
+			.style("opacity", ".3")
+			.style("stroke-width", "2px")
+			.style("fill", "none");
+		
+		polyline.exit()
+			.remove();
+	}
 }
\ No newline at end of file

From 7ee4c77897fc9baa9720eb38c6adf24c889739e8 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 25 Apr 2017 15:37:52 +0200
Subject: [PATCH 27/63] Change update manager offline icon - #783

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

diff --git a/pandora_console/godmode/update_manager/update_manager.php b/pandora_console/godmode/update_manager/update_manager.php
index ff49bf9c6d..c54aedc3bb 100644
--- a/pandora_console/godmode/update_manager/update_manager.php
+++ b/pandora_console/godmode/update_manager/update_manager.php
@@ -36,7 +36,7 @@ $buttons = array(
 	'offline' => array(
 		'active' => ($tab == 'offline') ? true : false,
 		'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=offline">' . 
-			html_print_image ("images/box.disabled.png", true, array ("title" => __('Offline update manager'))) .'</a>'),
+			html_print_image ("images/box.png", true, array ("title" => __('Offline update manager'))) .'</a>'),
 	'online' => array(
 		'active' => ($tab == 'online') ? true : false,
 		'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online">' . 

From 8383552a1fc0e695553a3a5fa6a46b7766056767 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 25 Apr 2017 16:16:25 +0200
Subject: [PATCH 28/63] Added minor changes to ux widget

---
 pandora_console/include/graphs/pandora.d3.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 6d2449811d..6cfa619bb5 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1413,7 +1413,6 @@ function print_phases_donut (recipient, phases) {
 			.remove();
 
 		/* ------- TEXT LABELS -------*/
-
 		var text = svg.select(".labels").selectAll("text")
 			.data(pie(data), key);
 
@@ -1465,7 +1464,6 @@ function print_phases_donut (recipient, phases) {
 			.remove();
 
 		/* ------- SLICE TO TEXT POLYLINES -------*/
-
 		var polyline = svg.select(".lines").selectAll("polyline")
 			.data(pie(data), key);
 		

From f91d59b2368e479a997320c63e4296f470d36eca Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 25 Apr 2017 16:33:28 +0200
Subject: [PATCH 29/63] Change Map quest tile server url to free version - #703

---
 pandora_console/pandoradb_data.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index c8b076c982..41447158ff 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -1091,7 +1091,7 @@ INSERT INTO `tlocal_component` (`id`, `name`, `data`, `description`, `id_os`, `o
 
 -- GIS Data
 INSERT INTO `tgis_map` VALUES (1,'Sample',-3.708187,40.42056,0,16,'',-3.708187,40.42056,0,0,1);
-INSERT INTO `tgis_map_connection` VALUES (1,'OpenStreetMap (MapQuest Open)','OSM','{\"type\":\"OSM\",\"url\":\"http://otile1.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0);
+INSERT INTO `tgis_map_connection` VALUES (1,'OpenStreetMap (MapQuest Open)','OSM','{\"type\":\"OSM\",\"url\":\"http://tile.openstreetmap.org/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0);
 INSERT INTO `tgis_map_connection` VALUES (2,'OpenStreetMap (Standard)','OSM','{\"type\":\"OSM\",\"url\":\"http://tile.openstreetmap.org/${z}/${x}/${y}.png\"}',19,16,-3.708187,40.42056,0,-3.708187,40.42056,0,0);
 INSERT INTO `tgis_map_has_tgis_map_con` VALUES (1,1,'2010-03-01 09:46:48',1);
 INSERT INTO `tgis_map_layer` VALUES (1,'Group All',1,0,1,0);

From ed195ff909caa5dd3135da2b049fbac6cf2427da Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 25 Apr 2017 16:57:59 +0200
Subject: [PATCH 30/63] Added pie slice by time, good job arturo. Thanks
 arturo.

---
 pandora_console/include/graphs/pandora.d3.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 6cfa619bb5..f2aa08f3f4 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1332,7 +1332,7 @@ function print_phases_donut (recipient, phases) {
 	var svg = d3.select(recipient)
 		.append("svg")
 			.attr("width", 500)
-			.attr("height", 200)
+			.attr("height", 300)
 		.append("g");
 
 	svg.append("g")
@@ -1343,13 +1343,13 @@ function print_phases_donut (recipient, phases) {
 		.attr("class", "lines");
 
 	var width = 500,
-		height = 200,
+		height = 300,
 		radius = Math.min(width, height) / 2;
 
 	var pie = d3.layout.pie()
 		.sort(null)
 		.value(function(d) {
-			return 1;
+			return parseFloat(d.label2);
 		});
 
 	var arc = d3.svg.arc()
@@ -1375,7 +1375,7 @@ function print_phases_donut (recipient, phases) {
 			return phase.phase_name;
 		}
 		else {
-			return phase.phase_time + "ms";
+			return phase.phase_time;
 		}
 	}
 
@@ -1429,7 +1429,7 @@ function print_phases_donut (recipient, phases) {
 					.attr("dy", "1.4em")
 					.attr("dx", "-6em")
 					.text(function(d) {
-						return d.data.label2;
+						return d.data.label2 + "ms";
 					})
 					.style("font-family", "Verdana")
 					.style("font-size", "10px");

From 1a6051caebedb22ba9ea8aed0fd58039f471f475 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 25 Apr 2017 17:24:32 +0200
Subject: [PATCH 31/63] Change update manager advice when there are db changes
 - #759

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

diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php
index c6843034f3..db58e61fdb 100644
--- a/pandora_console/godmode/update_manager/update_manager.offline.php
+++ b/pandora_console/godmode/update_manager/update_manager.offline.php
@@ -41,7 +41,7 @@ $baseurl = ui_get_full_url(false, false, false, false);
 	var click_on_the_file_below_to_begin = "<?php echo __('Click on the file below to begin.'); ?>\n";
 	var updating = "<?php echo __('Updating'); ?>\n";
 	var package_updated_successfully = "<?php echo __('Package updated successfully.'); ?>\n";
-	var if_there_are_any_database_change = "<?php echo __('If there are any database change, it will be applied on the next login.'); ?>\n";
+	var if_there_are_any_database_change = "<?php echo __('If there are any database change, it will be applied.'); ?>\n";
 	var mr_available = "<?php echo __('Minor release available'); ?>\n";
 	var package_available = "<?php echo __('New package available'); ?>\n";
 	var mr_not_accepted = "<?php echo __('Minor release rejected. Changes will not apply.'); ?>\n";

From 40a42a6a293b7209d620d3711cf12effd3a3c66a Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 25 Apr 2017 17:43:26 +0200
Subject: [PATCH 32/63] Added ; to code

---
 pandora_console/include/graphs/pandora.d3.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index f2aa08f3f4..8abf2697c3 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1407,7 +1407,7 @@ function print_phases_donut (recipient, phases) {
 				return function(t) {
 					return arc(interpolate(t));
 				};
-			})
+			});
 
 		slice.exit()
 			.remove();

From 504665aaf06283693cb423450d3089c1b3f63fba Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 26 Apr 2017 13:27:53 +0200
Subject: [PATCH 33/63] Added more width to widget container

---
 pandora_console/include/graphs/pandora.d3.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 8abf2697c3..f569f67587 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1331,7 +1331,7 @@ function Gauge(placeholderName, configuration, font)
 function print_phases_donut (recipient, phases) {
 	var svg = d3.select(recipient)
 		.append("svg")
-			.attr("width", 500)
+			.attr("width", 600)
 			.attr("height", 300)
 		.append("g");
 
@@ -1342,7 +1342,7 @@ function print_phases_donut (recipient, phases) {
 	svg.append("g")
 		.attr("class", "lines");
 
-	var width = 500,
+	var width = 550,
 		height = 300,
 		radius = Math.min(width, height) / 2;
 

From a916844f70a9cfbc8e0da69cca3f8e98f06b70f7 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 3 May 2017 17:24:33 +0200
Subject: [PATCH 34/63] Changed elements colocation in planned downtime
 elements

---
 pandora_console/godmode/agentes/planned_downtime.editor.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index b1311a7846..c797b268a3 100644
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -633,8 +633,6 @@ echo '</form>';
 if ($id_downtime > 0) {
 	
 	echo "<td valign=top style='width:300px;padding-left:20px;'>";
-	// Show available agents to include into downtime
-	echo '<h4>' . __('Available agents') . ':</h4>';
 	
 	$filter_group = (int) get_parameter("filter_group", 0);
 	
@@ -707,7 +705,8 @@ if ($id_downtime > 0) {
 	echo "<br /><br />";
 	html_print_submit_button (__('Filter by group'), '', false, 'class="sub next"',false);
 	echo "</form>";
-	
+	// Show available agents to include into downtime
+	echo '<h4>' . __('Available agents') . ':</h4>';
 	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;');

From 2b72053992307f9477b26e0ba966461b166f69ce Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Fri, 5 May 2017 12:14:17 +0200
Subject: [PATCH 35/63] Revert "Fixed license failure"

This reverts commit 14e7d4b448580c860986163f10e70c6b76275673.
---
 pandora_console/index.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 05ac148870..78997fbe56 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -101,6 +101,11 @@ if ($config['metaconsole'] == 1 && $config['enterprise_installed'] == 1) {
 	header ("Location: " . $config['homeurl'] . "enterprise/meta");
 }
 
+/* Enterprise support */
+if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
+	include_once (ENTERPRISE_DIR . "/load_enterprise.php");
+}
+
 if (file_exists (ENTERPRISE_DIR . "/include/functions_login.php")) {
 	include_once (ENTERPRISE_DIR . "/include/functions_login.php");
 }
@@ -582,12 +587,6 @@ else {
 		}
 	}
 }
-
-/* Enterprise support */
-if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
-	include_once (ENTERPRISE_DIR . "/load_enterprise.php");
-}
-
 // Log off
 if (isset ($_GET["bye"])) {
 	include ("general/logoff.php");

From 830ad6fc90b31d33491ad0a5b779a3233975b2a8 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Fri, 5 May 2017 12:17:25 +0200
Subject: [PATCH 36/63] Revert "Revert "Fixed license failure""

This reverts commit 2b72053992307f9477b26e0ba966461b166f69ce.
---
 pandora_console/index.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 78997fbe56..05ac148870 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -101,11 +101,6 @@ if ($config['metaconsole'] == 1 && $config['enterprise_installed'] == 1) {
 	header ("Location: " . $config['homeurl'] . "enterprise/meta");
 }
 
-/* Enterprise support */
-if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
-	include_once (ENTERPRISE_DIR . "/load_enterprise.php");
-}
-
 if (file_exists (ENTERPRISE_DIR . "/include/functions_login.php")) {
 	include_once (ENTERPRISE_DIR . "/include/functions_login.php");
 }
@@ -587,6 +582,12 @@ else {
 		}
 	}
 }
+
+/* Enterprise support */
+if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
+	include_once (ENTERPRISE_DIR . "/load_enterprise.php");
+}
+
 // Log off
 if (isset ($_GET["bye"])) {
 	include ("general/logoff.php");

From 55196854b045e8b4f47a5ed45b27c5540981d81a Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Fri, 5 May 2017 12:21:58 +0200
Subject: [PATCH 37/63] Revert "Fixed license failure"

This reverts commit 14e7d4b448580c860986163f10e70c6b76275673.
---
 pandora_console/index.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 05ac148870..78997fbe56 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -101,6 +101,11 @@ if ($config['metaconsole'] == 1 && $config['enterprise_installed'] == 1) {
 	header ("Location: " . $config['homeurl'] . "enterprise/meta");
 }
 
+/* Enterprise support */
+if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
+	include_once (ENTERPRISE_DIR . "/load_enterprise.php");
+}
+
 if (file_exists (ENTERPRISE_DIR . "/include/functions_login.php")) {
 	include_once (ENTERPRISE_DIR . "/include/functions_login.php");
 }
@@ -582,12 +587,6 @@ else {
 		}
 	}
 }
-
-/* Enterprise support */
-if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
-	include_once (ENTERPRISE_DIR . "/load_enterprise.php");
-}
-
 // Log off
 if (isset ($_GET["bye"])) {
 	include ("general/logoff.php");

From dba263632b188c1a5ec6a929aea547dc11370c39 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Fri, 5 May 2017 12:26:34 +0200
Subject: [PATCH 38/63] Revert "Revert "Fixed license failure""

This reverts commit 55196854b045e8b4f47a5ed45b27c5540981d81a.
---
 pandora_console/index.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 78997fbe56..05ac148870 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -101,11 +101,6 @@ if ($config['metaconsole'] == 1 && $config['enterprise_installed'] == 1) {
 	header ("Location: " . $config['homeurl'] . "enterprise/meta");
 }
 
-/* Enterprise support */
-if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
-	include_once (ENTERPRISE_DIR . "/load_enterprise.php");
-}
-
 if (file_exists (ENTERPRISE_DIR . "/include/functions_login.php")) {
 	include_once (ENTERPRISE_DIR . "/include/functions_login.php");
 }
@@ -587,6 +582,12 @@ else {
 		}
 	}
 }
+
+/* Enterprise support */
+if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
+	include_once (ENTERPRISE_DIR . "/load_enterprise.php");
+}
+
 // Log off
 if (isset ($_GET["bye"])) {
 	include ("general/logoff.php");

From 658ff78efb2cd61aac258c914d25bb267ec9b575 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 8 May 2017 11:49:54 +0200
Subject: [PATCH 39/63] Added homedir lost reference to functions_html

---
 pandora_console/include/functions_graph.php | 3 +--
 pandora_console/include/graphs/fgraph.php   | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 8582655e82..261ea7ae4b 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -2304,10 +2304,9 @@ function progress_bar($progress, $width, $height, $title = '', $mode = 1, $value
 	
 	require_once("include_graph_dependencies.php");
 	include_graphs_dependencies($config['homedir'].'/');
-	
 	$src = ui_get_full_url(
 		"/include/graphs/fgraph.php?homeurl=../../&graph_type=progressbar" .
-		"&width=".$width."&height=".$height."&progress=".$progress.
+		"&width=".$width."&homedir=".$config['homedir']."&height=".$height."&progress=".$progress.
 		"&mode=" . $mode . "&out_of_lim_str=".$out_of_lim_str .
 		"&title=".$title."&font=".$config['fontpath']."&value_text=". $value_text . 
 		"&colorRGB=". $colorRGB, false, false, false
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index d9443e6105..7e8b6074c2 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -40,6 +40,11 @@ else $graph_type = '';
 ob_start ();
 
 if (!empty($graph_type)) {
+	$homedir = $_GET['homedir'];
+	if ($homedir != null) {
+		$config['homedir'] = $homedir;
+	}
+
 	include_once($homeurl . 'include/functions.php');
 	include_once($homeurl . 'include/functions_html.php');
 	

From 634db708129742463bfe616968edd2478ba085b6 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 8 May 2017 12:11:51 +0200
Subject: [PATCH 40/63] Added second condirmation to user session

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

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 05ac148870..41939787b6 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -453,7 +453,7 @@ if (! isset ($config['id_user'])) {
 			db_logon ($nick_in_db, $_SERVER['REMOTE_ADDR']);
 			$_SESSION['id_usuario'] = $nick_in_db;
 			$config['id_user'] = $nick_in_db;
-			
+			config_prepare_session();
 			if (is_user_admin($config['id_user'])) {
 				// PHP configuration values
 				$PHPupload_max_filesize = config_return_in_bytes(ini_get('upload_max_filesize'));

From e32a3e4a72c121a912cdb8e875b79880510467d8 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 8 May 2017 13:40:12 +0200
Subject: [PATCH 41/63] Make warning a critical limits fields not disabled for
 admin profile users - #824

---
 .../godmode/agentes/module_manager_editor_common.php         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 561266d6df..dbb6db2da0 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -882,6 +882,9 @@ $(document).ready (function () {
 	$('#dynamic_interval_select').change (function() {
 		disabled_status(disabledBecauseInPolicy);
 	});
+	$('#dynamic_interval').change (function() {
+		disabled_status(disabledBecauseInPolicy);
+	});
 
 	disabled_two_tailed(disabledBecauseInPolicy);
 	$('#checkbox-dynamic_two_tailed').change (function() {
@@ -929,7 +932,7 @@ $(document).ready (function () {
 
 //readonly and add class input
 function disabled_status (disabledBecauseInPolicy) {
-	if($('#dynamic_interval_select').val() != 0){
+	if($('#dynamic_interval_select').val() != 0 && $('#dynamic_interval').val() != 0){
 		$('#text-min_warning').prop('readonly', true);
 		$('#text-min_warning').addClass('readonly');
 		$('#text-max_warning').prop('readonly', true);

From dd5087cb53250fd6822140bd008f99085372ad03 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 8 May 2017 17:49:05 +0200
Subject: [PATCH 42/63] Added new help tip icon to snmp console

---
 pandora_console/images/tip_grey.png               | Bin 0 -> 284 bytes
 .../operation/snmpconsole/snmp_view.php           |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 pandora_console/images/tip_grey.png

diff --git a/pandora_console/images/tip_grey.png b/pandora_console/images/tip_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..5257d092bdc853ee006e1d45a67f1295f17218e3
GIT binary patch
literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^d_c^_!N$PA`1xLZAdn+j;u=vBoS#-wo>-L1;Fyx1
zl&avFo0y&&l$w}QS$Hzl2B>JCr;B4q#jT_S2BzxjYGySyjuY%03T!+K0uDU^rvDfI
z;bvfLiJrz8$)?a?ATUXCg;t`F!!NrIHV%b79g@D!>sVP^+Z{eI+%#o$$g<sZsF|JL
z$jDJrx*<ey(j0|d&0iXSFiz2BP-0-}nXp~P;oSkX;~lPsCtR2{-nnxHPnc}SFt?mB
z+@r~6tGuT$^A&*!H)>WKTyc<@>A-@W3_MB`yk#ydaoDEG^tAp#w{@k09}BBI2lLG?
ghdqo>(q}L+e3Q2LQ1iSf6zCHMPgg&ebxsLQ02_#1a{vGU

literal 0
HcmV?d00001

diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 75a90c7abc..3960a857c2 100755
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -678,7 +678,7 @@ if ($traps !== false) {
 				continue;
 			}
 			$data[1] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'" title="'.__('View agent details').'">';
-			$data[1] .= '<strong>'.$agent["nombre"].ui_print_help_tip($trap['source'], true);'</strong></a>';
+			$data[1] .= '<strong>'.$agent["nombre"].ui_print_help_tip($trap['source'], true, "images/tip_grey.png");'</strong></a>';
 		}
 		
 		//OID

From eb1dafe807d24600b47066019167733526113262 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 9 May 2017 12:40:22 +0200
Subject: [PATCH 43/63] Fixed lines in visual console

---
 .../visual_console_builder.editor.js          | 24 ++++++++++++-------
 .../ajax/visual_console_builder.ajax.php      | 12 +++++++++-
 .../javascript/pandora_visual_console.js      |  1 -
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 310286ae69..fbb168648e 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1849,11 +1849,9 @@ function get_image_url(img_src) {
 	});
 }
 
-function set_color_line_status(lines, line, id_data, values) {
+function set_color_line_status(lines, id_data, values) {
 	metaconsole = $("input[name='metaconsole']").val();
 
-
-
 	var parameter = Array();
 	parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
 	parameter.push ({name: "action", value: "get_color_line"});
@@ -1875,7 +1873,6 @@ function set_color_line_status(lines, line, id_data, values) {
 				"node_end": id_data,
 				"color": color };
 
-
 			lines.push(line);
 
 			refresh_lines(lines, 'background', true);
@@ -2250,7 +2247,7 @@ function createItem(type, values, id_data) {
 
 		lines.push(line);
 
-		set_color_line_status(lines, line, id_data, values);
+		set_color_line_status(lines, id_data, values);
 
 		refresh_lines(lines, 'background', true);
 	}
@@ -2446,7 +2443,7 @@ function updateDB_visual(type, idElement , values, event, top, left) {
 			
 			if (typeof(values['parent']) != 'undefined' && values['parent'] > 0 ) {
 				if (!found) {
-					set_color_line_status(lines, line, idElement, values);
+					set_color_line_status(lines, idElement, values);
 				}
 			}
 			
@@ -2465,6 +2462,7 @@ function updateDB_visual(type, idElement , values, event, top, left) {
 			refresh_lines(lines, 'background', true);
 			break;
 	}
+	
 	refresh_lines(lines, 'background', true);
 	draw_user_lines("", 0, 0, 0 , 0, 0, true);
 }
@@ -2601,9 +2599,19 @@ function updateDB(type, idElement , values, event) {
 			url: get_url_ajax(),
 			data: parameter,
 			type: "POST",
-			dataType: 'text',
+			dataType: 'json',
 			success: function (data) {
-				updateDB_visual(type, idElement , values, event, top, left);
+				if (data['correct']) {
+					if (data['new_line']) {
+						var line = {"id": idElement,
+							"node_begin":  values['parent'],
+							"node_end": idElement,
+							"color": '#cccccc' };
+
+						lines.push(line);
+					}
+					updateDB_visual(type, idElement , values, event, top, left);
+				}
 			}
 		});
 	}
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 74d99febd5..2a786200ad 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -616,10 +616,20 @@ switch ($action) {
 					}
 				}
 				
+				$item_in_db = db_get_row_filter ('tlayout_data', array ('id' => $id_element));
+
+				if (($item_in_db['parent_item'] == 0) && ($values['parent_item'] != 0)) {
+					$new_line = 1;
+				}
+
 				$result = db_process_sql_update('tlayout_data', $values,
 					array('id' => $id_element));
 				
-				echo (int)$result;
+				$return_val = array();
+				$return_val['correct'] = (int)$result;
+				$return_val['new_line'] = $new_line;
+
+				echo json_encode($return_val);
 				break;
 		}
 		break;
diff --git a/pandora_console/include/javascript/pandora_visual_console.js b/pandora_console/include/javascript/pandora_visual_console.js
index 2767a8105b..42d7f9aed1 100755
--- a/pandora_console/include/javascript/pandora_visual_console.js
+++ b/pandora_console/include/javascript/pandora_visual_console.js
@@ -17,7 +17,6 @@
  * @param editor Boolean variable to set other css selector in editor (when true).
  */
 function draw_line (line, id_div) {
-	
 	selector = '';
 	
 	//Check if the global var resize_map is defined

From f0ef304c380d90334b4bb7c483f863413ece2a55 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 9 May 2017 13:32:18 +0200
Subject: [PATCH 44/63] The min, max limits for agent modules were exclusives,
 now are inclusives - #770

---
 pandora_agents/win32/modules/pandora_module.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_agents/win32/modules/pandora_module.cc b/pandora_agents/win32/modules/pandora_module.cc
index a1936912f2..1754ab7cb7 100644
--- a/pandora_agents/win32/modules/pandora_module.cc
+++ b/pandora_agents/win32/modules/pandora_module.cc
@@ -368,7 +368,7 @@ Pandora_Module::getDataOutput (Pandora_Data *data) {
 	}
 	
 	if (this->has_limits) {
-		if (value >= this->max || value <= this->min) {
+		if (value > this->max || value < this->min) {
 			pandoraLog ("The returned value was not in the interval on module %s",
 				    this->module_name.c_str ());
 			throw Value_Error ();

From 6f40069aa91af2d7ac9b097a99ce804a15d8e87b Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 9 May 2017 17:29:17 +0200
Subject: [PATCH 45/63] Added a new system to draw lines in visual console when
 element have an image

---
 .../visual_console_builder.editor.js          |  6 ++---
 .../include/functions_visual_map.php          |  2 ++
 .../javascript/pandora_visual_console.js      | 26 ++++++++++++++++---
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index fbb168648e..a828bd4fb4 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1497,13 +1497,11 @@ function set_static_graph_status(idElement, image, status) {
 				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);	
+					$('#'+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);
+					$('#'+idElement+ ' img').css('margin-left', parseInt($('#'+idElement).css('width'))/2 - parseInt($('#'+idElement+ ' img').css('width'))/2);
 				}
-				
-								
 			}
 		});
 
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 6941e435ba..91bf033208 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1182,7 +1182,9 @@ function visual_map_print_item($mode = "read", $layoutData,
 				else if($layoutData['label_position']=='right'){
 					$imgpos = 'float:left';
 				}
+				
 				$varsize = getimagesize($img);
+				
 				if ($width == 0 || $height == 0) {
 					if($varsize[0] > 150 || $varsize[1] > 150){
 						echo html_print_image($img, true,
diff --git a/pandora_console/include/javascript/pandora_visual_console.js b/pandora_console/include/javascript/pandora_visual_console.js
index 42d7f9aed1..e3d99c5205 100755
--- a/pandora_console/include/javascript/pandora_visual_console.js
+++ b/pandora_console/include/javascript/pandora_visual_console.js
@@ -37,17 +37,32 @@ function draw_line (line, id_div) {
 	have_node_begin_img = $('#' + line['node_begin'] + " img").length;
 	have_node_end_img = $('#' + line['node_end'] + " img").length;
 	
+	if (have_node_begin_img) {
+		var img_pos_begin = $('#' + line['node_begin'] + " img").position();
+		var img_margin_left_begin = $('#' + line['node_begin'] + " img").css("margin-left");
+		var img_margin_left_begin_aux = img_margin_left_begin.split("px");
+		img_margin_left_begin = parseFloat(img_margin_left_begin_aux[0]);
+	}
+	if (have_node_end_img) {
+		var img_pos_end = $('#' + line['node_end'] + " img").position();
+		var img_margin_left_end = $('#' + line['node_end'] + " img").css("margin-left");
+		var img_margin_left_end_aux = img_margin_left_end.split("px");
+		img_margin_left_end = parseFloat(img_margin_left_end_aux[0]);
+	}
+
 	if (line['x1']) {
 		x1 = line['x'];
 	}
 	else {
 		if (have_node_begin_img) {
 			width = $('#' + line['node_begin'] + " img").width();
+			x1 = parseInt($('#' + line['node_begin']).css (selector + 'left')) + (width / 2) + img_pos_begin.left + img_margin_left_begin;
 		}
 		else {
 			width = $('#' + line['node_begin']).width();
+			x1 = parseInt($('#' + line['node_begin']).css (selector + 'left')) + (width / 2);
 		}
-		x1 = parseInt($('#' + line['node_begin']).css (selector + 'left')) + (width / 2);
+		
 	}
 	
 	if (line['y1']) {
@@ -56,11 +71,12 @@ function draw_line (line, id_div) {
 	else {
 		if (have_node_begin_img) {
 			height = parseInt($('#' + line['node_begin'] + " img").css('height'));
+			y1 = parseInt($('#' + line['node_begin']).css (selector + 'top')) + (height / 2) + img_pos_begin.top;
 		}
 		else {
 			height = $('#' + line['node_begin']).height();
+			y1 = parseInt($('#' + line['node_begin']).css (selector + 'top')) + (height / 2);
 		}
-		y1 = parseInt($('#' + line['node_begin']).css (selector + 'top')) + (height / 2);
 	}
 	
 	if (line['x2']) {
@@ -69,11 +85,12 @@ function draw_line (line, id_div) {
 	else {
 		if (have_node_end_img) {
 			width = $('#' + line['node_end'] + " img").width();
+			x2 = parseInt($('#' + line['node_end']).css (selector + 'left')) + (width / 2) + img_pos_end.left + img_margin_left_end;
 		}
 		else {
 			width = $('#' + line['node_end']).width();
+			x2 = parseInt($('#' + line['node_end']).css (selector + 'left')) + (width / 2);
 		}
-		x2 = parseInt($('#' + line['node_end']).css (selector + 'left')) + (width / 2);
 	}
 	
 	if (line['y2']) {
@@ -82,11 +99,12 @@ function draw_line (line, id_div) {
 	else {
 		if (have_node_end_img) {
 			height = parseInt($('#' + line['node_end'] + " img").css('height'));
+			y2 = parseInt($('#' + line['node_end']).css (selector + 'top')) + (height / 2) + img_pos_end.top;
 		}
 		else {
 			height = $('#' + line['node_end']).height();
+			y2 = parseInt($('#' + line['node_end']).css (selector + 'top')) + (height / 2);
 		}
-		y2 = parseInt($('#' + line['node_end']).css (selector + 'top')) + (height / 2);
 	}
 	
 	

From 746eab76668fac7466866957e92b98c0d28e76b0 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 10 May 2017 13:18:45 +0200
Subject: [PATCH 46/63] Show package version rather build version in footer
 (ext. fix update manager css) - #813

---
 pandora_console/general/alert_enterprise.php           |  4 ++--
 pandora_console/general/footer.php                     | 10 +++++++++-
 .../godmode/update_manager/update_manager.online.php   |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php
index 3cd1b0b93d..d5be19eebd 100644
--- a/pandora_console/general/alert_enterprise.php
+++ b/pandora_console/general/alert_enterprise.php
@@ -15,7 +15,7 @@ if(!enterprise_installed()){
 	$open=true; 
 }
 
-$tipo = $_GET['message'];
+$tipo = $_POST['message'];
 
 echo "
 <div class='modalheader'>
@@ -185,7 +185,7 @@ echo "
 </div>";
 if($open){
 echo "<div class='modalgobutton gopandora'>
-<span class='modalokbuttontext'>About Enterprise</span>
+<span class='modalgobuttontext'>About Enterprise</span>
 </div>";
 }
 
diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php
index 1570ec825c..64564d300a 100644
--- a/pandora_console/general/footer.php
+++ b/pandora_console/general/footer.php
@@ -32,7 +32,15 @@ if (!$config["MR"]) {
 
 echo '<a class="white_bold footer" target="_blank" href="' . $config["homeurl"] . $license_file. '">';
 
-echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_version, $config["MR"]));
+if($current_package == 0){
+$build_package_version =	$build_version;
+}
+else{
+$build_package_version =	$current_package;
+}
+
+
+echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_package_version, $config["MR"]));
 
 echo '</a><br />';
 echo '<a class="white footer">'. __('Page generated at') . ' '. date('F j, Y h:i a'); //Always use timestamp here
diff --git a/pandora_console/godmode/update_manager/update_manager.online.php b/pandora_console/godmode/update_manager/update_manager.online.php
index 747b6a0ece..ba53409483 100644
--- a/pandora_console/godmode/update_manager/update_manager.online.php
+++ b/pandora_console/godmode/update_manager/update_manager.online.php
@@ -147,7 +147,7 @@ var open = "<?php echo $open;?>";
 if(open){
 	$(document).ready(function() {
 	$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
-	jQuery.get ("ajax.php",
+	jQuery.post ("ajax.php",
 		{
 	"page": "general/alert_enterprise",
 	"message":"infomodal"},

From 6a83598c6437b3c6a96043f043bff5d8b0972827 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Thu, 11 May 2017 15:54:29 +0200
Subject: [PATCH 47/63] Calculate md5 checksums byte by byte, not char by char!

(cherry picked from commit dc4d144de8bcce8cc654515aefa0295ecb5065be)
---
 pandora_server/lib/PandoraFMS/Core.pm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 241243cdc1..f15f09ca3f 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -2681,7 +2681,7 @@ sub pandora_delete_module ($$;$) {
 	
 	my $agent_name = get_agent_name($dbh, $module->{'id_agente'});
 	
-	if ((defined($conf)) && (-e $conf->{incomingdir}.'/conf/'.md5($agent_name).'.conf')) {
+	if ((defined($conf)) && (-e $conf->{incomingdir}.'/conf/'.md5(encode_utf8(safe_output($agent_name))).'.conf')) {
 		enterprise_hook('pandora_delete_module_from_conf', [$conf,$agent_name,$module->{'nombre'}]);
 	}
 	
@@ -2979,12 +2979,11 @@ sub pandora_delete_agent ($$;$) {
 	
 	if (defined $conf) {
 		# Delete the conf files
-		if (-e $conf->{incomingdir}.'/conf/'.md5($agent_name).'.conf') {
-			unlink($conf->{incomingdir}.'/conf/'.md5($agent_name).'.conf');
-		}
-		if (-e $conf->{incomingdir}.'/md5/'.md5($agent_name).'.md5') {
-			unlink($conf->{incomingdir}.'/md5/'.md5($agent_name).'.md5');
-		}
+		my $conf_fname = $conf->{incomingdir}.'/conf/'.md5(encode_utf8(safe_output($agent_name))).'.conf';
+		unlink($conf_fname) if (-f $conf_fname);
+		
+		my $md5_fname = $conf->{incomingdir}.'/md5/'.md5(encode_utf8(safe_output($agent_name))).'.md5';
+		unlink($md5_fname) if (-f $md5_fname);
 	}
 
 	foreach my $module (@modules) {

From 3d0c77709ecbef5d3d583f960b6343a51715a69e Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 12 May 2017 00:01:25 +0200
Subject: [PATCH 48/63] 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 3b89316d0b..64cd77c703 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.702-170511
+Version: 7.0NG.702-170512
 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 3565793d21..b3bfae2b07 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.702-170511"
+pandora_version="7.0NG.702-170512"
 
 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 a4157f023e..8a5e44fa54 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.702';
-use constant AGENT_BUILD => '170511';
+use constant AGENT_BUILD => '170512';
 
 # 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 658587290c..01c5fd2ee7 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.702
-%define release     170511
+%define release     170512
 
 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 70b81bcd5a..4c4e36b9fe 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.702
-%define release     170511
+%define release     170512
 
 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 0f74db892b..a5cc22726b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170511"
+PI_BUILD="170512"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index f4911dcd10..bbd8df0530 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170511}
+{170512}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 054411d96e..4060a98a55 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.702(Build 170511)")
+#define PANDORA_VERSION ("7.0NG.702(Build 170512)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 5d36e56748..056576cdee 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.702(Build 170511))"
+      VALUE "ProductVersion", "(7.0NG.702(Build 170512))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 9b1ca7dfb8..1b1d4c41c8 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.702-170511
+Version: 7.0NG.702-170512
 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 60a50c665f..911c0dfb7c 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.702-170511"
+pandora_version="7.0NG.702-170512"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index c55639c0a0..3f9faa8e6b 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 = 'PC170511';
+$build_version = 'PC170512';
 $pandora_version = 'v7.0NG.702';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 95720a6ac9..ebf78d14dc 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.702';
-$build = '170511';
+$build = '170512';
 			$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 2b9061dacb..0491e5396a 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.702
-%define release     170511
+%define release     170512
 
 # 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 4556c41667..db87ec1173 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.702
-%define release     170511
+%define release     170512
 %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 981f99e4da..ef2875e316 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.702-170511
+Version: 7.0NG.702-170512
 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 16d3a7c47a..1a8fc9f76f 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.702-170511"
+pandora_version="7.0NG.702-170512"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 719456de9f..14b5c26e1a 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.702";
-my $pandora_build = "170511";
+my $pandora_build = "170512";
 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 ebc3fefa88..ac6b0698d6 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.702
-%define release     170511
+%define release     170512
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c35a8cfd38..44984040db 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.702
-%define release     170511
+%define release     170512
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index cc8af1c193..1aa14b18d9 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170511"
+PI_BUILD="170512"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 78c0fff314..7708f455bf 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.702 PS170511";
+my $version = "7.0NG.702 PS170512";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 168a14b6d4..06c67d07f9 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.702 PS170511";
+my $version = "7.0NG.702 PS170512";
 
 # save program name for logging
 my $progname = basename($0);

From ab9930d4f38a4dfc3aa22d6cf939ba4d2377073d Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Fri, 12 May 2017 11:41:45 +0200
Subject: [PATCH 49/63] Fix background color, countdown refresh box, and make
 graphs dynamics - #865

---
 .../visual_console/public_console.php         | 70 ++++++++++++++++++-
 .../operation/visual_console/pure_ajax.php    |  5 ++
 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/pandora_console/operation/visual_console/public_console.php b/pandora_console/operation/visual_console/public_console.php
index 9233615b41..17a70505c9 100755
--- a/pandora_console/operation/visual_console/public_console.php
+++ b/pandora_console/operation/visual_console/public_console.php
@@ -84,7 +84,7 @@ if ($layout) {
 	//~ ob_start();
 	//~ // Render map
 	visual_map_print_visual_map($id_layout, true, true, $width, $height,
-		'../../', true, $graph_javascript, true);
+		'../../', true, true, true);
 	//~ return;
 }
 else {
@@ -92,7 +92,7 @@ else {
 }
 
 // Floating menu - Start
-echo '<div id="vc-controls">';
+echo '<div id="vc-controls" style="z-index:300;">';
 
 echo '<div id="menu_tab">';
 echo '<ul class="mn">';
@@ -191,6 +191,72 @@ $ignored_params['refr'] = '';
 			startCountDown(refr, false);
 		});
 		
+		
+		$('body').css('background-color','<?php echo $layout["background_color"]; ?>');
+		
+		$(".module_graph .menu_graph").css('display','none');
+		
+		$(".parent_graph").each(function(){
+			
+		if($(this).css('background-color') != 'rgb(255, 255, 255)'){
+				$(this).css('color', '#999');				
+				}
+		});			
+
+		$(".overlay").removeClass("overlay").addClass("overlaydisabled");
+		
+		$('.item:not(.icon) img').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');
+			$(this).css('margin-left','');
+			
+			}
+			else{
+				$(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+				$(this).css('margin-top','');
+			}
+			
+		});
+		
+		$('.item > div').each(function(){
+			if($(this).css('float')=='left' || $(this).css('float')=='right'){
+			
+				
+			$(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2-15)+'px');
+			$(this).css('margin-left','');
+			
+			}
+			else{
+				$(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+				$(this).css('margin-top','');
+			}
+			
+		});
+		
+		$('.item > a > div').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-5)+'px');
+			$(this).css('margin-left','');
+			
+			}
+			else{
+				$(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+				$(this).css('margin-top','');
+			}
+			
+		});
+		
+		$(".graph:not([class~='noresizevc'])").each(function(){
+			height = parseInt($(this).css("height")) - 30;
+			$(this).css('height', height);
+		});
+		
 		// Start the map fetch
 		//~ fetchMap();
 	});
diff --git a/pandora_console/operation/visual_console/pure_ajax.php b/pandora_console/operation/visual_console/pure_ajax.php
index c58fe12caf..08b5460067 100644
--- a/pandora_console/operation/visual_console/pure_ajax.php
+++ b/pandora_console/operation/visual_console/pure_ajax.php
@@ -230,6 +230,11 @@ $ignored_params['refr'] = '';
 			}
 			
 		});
+		
+		$(".graph:not([class~='noresizevc'])").each(function(){
+			height = parseInt($(this).css("height")) - 30;
+			$(this).css('height', height);
+		});
 			
 	});
 </script>
\ No newline at end of file

From afff44138c2a1061850bf8490ece9db802af4a64 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 13 May 2017 00:01:16 +0200
Subject: [PATCH 50/63] 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 64cd77c703..2c582a7fdc 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.702-170512
+Version: 7.0NG.702-170513
 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 b3bfae2b07..1345f1186e 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.702-170512"
+pandora_version="7.0NG.702-170513"
 
 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 8a5e44fa54..b0f983dd9f 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.702';
-use constant AGENT_BUILD => '170512';
+use constant AGENT_BUILD => '170513';
 
 # 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 01c5fd2ee7..fda7ab8564 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.702
-%define release     170512
+%define release     170513
 
 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 4c4e36b9fe..015f182845 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.702
-%define release     170512
+%define release     170513
 
 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 a5cc22726b..2e92f0aa8f 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170512"
+PI_BUILD="170513"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index bbd8df0530..6b39c35711 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170512}
+{170513}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 4060a98a55..cc454a90e0 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.702(Build 170512)")
+#define PANDORA_VERSION ("7.0NG.702(Build 170513)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 056576cdee..5f1c72addb 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.702(Build 170512))"
+      VALUE "ProductVersion", "(7.0NG.702(Build 170513))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 1b1d4c41c8..e9a3b76470 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.702-170512
+Version: 7.0NG.702-170513
 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 911c0dfb7c..dec01c5bdc 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.702-170512"
+pandora_version="7.0NG.702-170513"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 3f9faa8e6b..240d733741 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 = 'PC170512';
+$build_version = 'PC170513';
 $pandora_version = 'v7.0NG.702';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index ebf78d14dc..38821d5b2a 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.702';
-$build = '170512';
+$build = '170513';
 			$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 0491e5396a..9b71a918b9 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.702
-%define release     170512
+%define release     170513
 
 # 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 db87ec1173..d44a1a3b6f 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.702
-%define release     170512
+%define release     170513
 %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 ef2875e316..914502d4da 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.702-170512
+Version: 7.0NG.702-170513
 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 1a8fc9f76f..c960b20174 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.702-170512"
+pandora_version="7.0NG.702-170513"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 14b5c26e1a..9e19e87635 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.702";
-my $pandora_build = "170512";
+my $pandora_build = "170513";
 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 ac6b0698d6..12d18dcaf0 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.702
-%define release     170512
+%define release     170513
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 44984040db..078922dbbd 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.702
-%define release     170512
+%define release     170513
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 1aa14b18d9..97636923d2 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170512"
+PI_BUILD="170513"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 7708f455bf..42258cd150 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.702 PS170512";
+my $version = "7.0NG.702 PS170513";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 06c67d07f9..c570c86b18 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.702 PS170512";
+my $version = "7.0NG.702 PS170513";
 
 # save program name for logging
 my $progname = basename($0);

From 31970c521d630947b9c0a7926582a4af69c6d292 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 14 May 2017 00:01:14 +0200
Subject: [PATCH 51/63] 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 2c582a7fdc..a3edf6f09c 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.702-170513
+Version: 7.0NG.702-170514
 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 1345f1186e..0d703bfc6f 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.702-170513"
+pandora_version="7.0NG.702-170514"
 
 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 b0f983dd9f..ace3690eb7 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.702';
-use constant AGENT_BUILD => '170513';
+use constant AGENT_BUILD => '170514';
 
 # 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 fda7ab8564..d21660cdd1 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.702
-%define release     170513
+%define release     170514
 
 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 015f182845..29dfc3fa6d 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.702
-%define release     170513
+%define release     170514
 
 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 2e92f0aa8f..96df0534f6 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170513"
+PI_BUILD="170514"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 6b39c35711..cb8092b01a 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170513}
+{170514}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index cc454a90e0..7ab2fbd981 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.702(Build 170513)")
+#define PANDORA_VERSION ("7.0NG.702(Build 170514)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 5f1c72addb..d70ecadb57 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.702(Build 170513))"
+      VALUE "ProductVersion", "(7.0NG.702(Build 170514))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index e9a3b76470..f73fb6c754 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.702-170513
+Version: 7.0NG.702-170514
 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 dec01c5bdc..e5a4ceb41f 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.702-170513"
+pandora_version="7.0NG.702-170514"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 240d733741..412fa3c6e8 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 = 'PC170513';
+$build_version = 'PC170514';
 $pandora_version = 'v7.0NG.702';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 38821d5b2a..5b4bed1a21 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.702';
-$build = '170513';
+$build = '170514';
 			$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 9b71a918b9..2c77c64735 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.702
-%define release     170513
+%define release     170514
 
 # 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 d44a1a3b6f..5b2130d2bb 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.702
-%define release     170513
+%define release     170514
 %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 914502d4da..3cefabfbd8 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.702-170513
+Version: 7.0NG.702-170514
 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 c960b20174..c77639eef1 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.702-170513"
+pandora_version="7.0NG.702-170514"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 9e19e87635..38acc24673 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.702";
-my $pandora_build = "170513";
+my $pandora_build = "170514";
 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 12d18dcaf0..943fe57213 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.702
-%define release     170513
+%define release     170514
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 078922dbbd..d34d6a2a17 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.702
-%define release     170513
+%define release     170514
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 97636923d2..943a6e27ca 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170513"
+PI_BUILD="170514"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 42258cd150..8350c78b52 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.702 PS170513";
+my $version = "7.0NG.702 PS170514";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index c570c86b18..64fe3869ae 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.702 PS170513";
+my $version = "7.0NG.702 PS170514";
 
 # save program name for logging
 my $progname = basename($0);

From 45239e4cddda34c75d6144af1462f95fba571e78 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 15 May 2017 00:01:14 +0200
Subject: [PATCH 52/63] 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 a3edf6f09c..fad58b479a 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.702-170514
+Version: 7.0NG.702-170515
 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 0d703bfc6f..75321c90ea 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.702-170514"
+pandora_version="7.0NG.702-170515"
 
 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 ace3690eb7..6a55a03bf5 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.702';
-use constant AGENT_BUILD => '170514';
+use constant AGENT_BUILD => '170515';
 
 # 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 d21660cdd1..bfb1ff0994 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.702
-%define release     170514
+%define release     170515
 
 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 29dfc3fa6d..c9c9bb9142 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.702
-%define release     170514
+%define release     170515
 
 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 96df0534f6..6c5bae172e 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170514"
+PI_BUILD="170515"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index cb8092b01a..1e4231b0ce 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170514}
+{170515}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 7ab2fbd981..af02b5d2d4 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.702(Build 170514)")
+#define PANDORA_VERSION ("7.0NG.702(Build 170515)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index d70ecadb57..12525a49d3 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.702(Build 170514))"
+      VALUE "ProductVersion", "(7.0NG.702(Build 170515))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index f73fb6c754..fbd8ad52cf 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.702-170514
+Version: 7.0NG.702-170515
 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 e5a4ceb41f..07ade85baa 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.702-170514"
+pandora_version="7.0NG.702-170515"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 412fa3c6e8..2c827d1feb 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 = 'PC170514';
+$build_version = 'PC170515';
 $pandora_version = 'v7.0NG.702';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 5b4bed1a21..286c57d163 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.702';
-$build = '170514';
+$build = '170515';
 			$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 2c77c64735..48aacdbf73 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.702
-%define release     170514
+%define release     170515
 
 # 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 5b2130d2bb..2cff1f50a7 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.702
-%define release     170514
+%define release     170515
 %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 3cefabfbd8..7e4f7cbf96 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.702-170514
+Version: 7.0NG.702-170515
 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 c77639eef1..71d36af7cc 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.702-170514"
+pandora_version="7.0NG.702-170515"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 38acc24673..1e2a461c3a 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.702";
-my $pandora_build = "170514";
+my $pandora_build = "170515";
 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 943fe57213..f5906fcd28 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.702
-%define release     170514
+%define release     170515
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index d34d6a2a17..5f3623facd 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.702
-%define release     170514
+%define release     170515
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 943a6e27ca..d2979875cd 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170514"
+PI_BUILD="170515"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 8350c78b52..d267d1997c 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.702 PS170514";
+my $version = "7.0NG.702 PS170515";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 64fe3869ae..4739e0355c 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.702 PS170514";
+my $version = "7.0NG.702 PS170515";
 
 # save program name for logging
 my $progname = basename($0);

From 63cc6f52440e20b9cf8dd182ef59770201cc5d23 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 16 May 2017 00:01:15 +0200
Subject: [PATCH 53/63] 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 fad58b479a..7d37902524 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.702-170515
+Version: 7.0NG.702-170516
 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 75321c90ea..8c48449690 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.702-170515"
+pandora_version="7.0NG.702-170516"
 
 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 6a55a03bf5..24b91b956b 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.702';
-use constant AGENT_BUILD => '170515';
+use constant AGENT_BUILD => '170516';
 
 # 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 bfb1ff0994..c8d26b818c 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.702
-%define release     170515
+%define release     170516
 
 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 c9c9bb9142..878be1b729 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.702
-%define release     170515
+%define release     170516
 
 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 6c5bae172e..ea94f6c17d 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170515"
+PI_BUILD="170516"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 1e4231b0ce..13e43787c9 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170515}
+{170516}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index af02b5d2d4..2fe36979c5 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.702(Build 170515)")
+#define PANDORA_VERSION ("7.0NG.702(Build 170516)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 12525a49d3..25ef4a8e39 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.702(Build 170515))"
+      VALUE "ProductVersion", "(7.0NG.702(Build 170516))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index fbd8ad52cf..f56578b35e 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.702-170515
+Version: 7.0NG.702-170516
 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 07ade85baa..89cc3c5f2a 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.702-170515"
+pandora_version="7.0NG.702-170516"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 2c827d1feb..cf7e9ed662 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 = 'PC170515';
+$build_version = 'PC170516';
 $pandora_version = 'v7.0NG.702';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 286c57d163..f4b4d33cf9 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.702';
-$build = '170515';
+$build = '170516';
 			$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 48aacdbf73..84d996768c 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.702
-%define release     170515
+%define release     170516
 
 # 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 2cff1f50a7..13171f6f48 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.702
-%define release     170515
+%define release     170516
 %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 7e4f7cbf96..8af82b7eb9 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.702-170515
+Version: 7.0NG.702-170516
 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 71d36af7cc..6f2d67f278 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.702-170515"
+pandora_version="7.0NG.702-170516"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 1e2a461c3a..0b2377188d 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.702";
-my $pandora_build = "170515";
+my $pandora_build = "170516";
 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 f5906fcd28..d83e7b8405 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.702
-%define release     170515
+%define release     170516
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 5f3623facd..8374a702fc 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.702
-%define release     170515
+%define release     170516
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index d2979875cd..a29e01a376 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170515"
+PI_BUILD="170516"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d267d1997c..92a02fae8e 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.702 PS170515";
+my $version = "7.0NG.702 PS170516";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 4739e0355c..382ec4d96a 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.702 PS170515";
+my $version = "7.0NG.702 PS170516";
 
 # save program name for logging
 my $progname = basename($0);

From 0346b49f1e5ed243885ffad4f4f479a57183b03a Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 16 May 2017 10:42:41 +0200
Subject: [PATCH 54/63] Fixed jquery request

---
 pandora_console/general/alert_enterprise.php  |  2 +-
 .../include/javascript/jquery.pandora.js      | 26 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php
index 3cd1b0b93d..441eeb9595 100644
--- a/pandora_console/general/alert_enterprise.php
+++ b/pandora_console/general/alert_enterprise.php
@@ -15,7 +15,7 @@ if(!enterprise_installed()){
 	$open=true; 
 }
 
-$tipo = $_GET['message'];
+$tipo = $_POST['message'];
 
 echo "
 <div class='modalheader'>
diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js
index 7f0539a1a1..58dc7dec2e 100644
--- a/pandora_console/include/javascript/jquery.pandora.js
+++ b/pandora_console/include/javascript/jquery.pandora.js
@@ -33,7 +33,7 @@
 
 $(document).ready (function () {
 	$("a#show_messages_dialog").click (function () {
-		jQuery.get ("ajax.php",
+		jQuery.post ("ajax.php",
 			{"page": "operation/messages/message_list"},
 			function (data, status) {
 				$("#dialog_messages").hide ()
@@ -60,7 +60,7 @@ $(document).ready (function () {
 
 	$("a.show_systemalert_dialog").click (function () {
 		$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
-		jQuery.get ("ajax.php",
+		jQuery.post ("ajax.php",
 			{"page": "operation/system_alert"},
 				function (data, status) {
 					$("#alert_messages").hide ()
@@ -75,9 +75,11 @@ $(document).ready (function () {
 	
 	$("a.modalpopup").click (function () {
 		$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
-			jQuery.get ("ajax.php",
-			{"page": "general/alert_enterprise",
-			 "message":$(this).attr("id")},
+			jQuery.post ("ajax.php",
+				{
+					"page": "general/alert_enterprise",
+					"message": $(this).attr("id")
+				},
 				function (data, status) {
 					$("#alert_messages").hide ()
 						.empty ()
@@ -93,10 +95,11 @@ $(document).ready (function () {
 
 	$(".publienterprise").click (function () {
 		$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
-		jQuery.get ("ajax.php",
+		jQuery.post ("ajax.php",
 			{
-		"page": "general/alert_enterprise",
-		"message":$(this).attr("id")},
+				"page": "general/alert_enterprise",
+				"message": $(this).attr("id")
+			},
 			function (data, status) {
 				$("#alert_messages").hide ()
 					.empty ()
@@ -112,10 +115,11 @@ $(document).ready (function () {
 	
 	$(".publienterprisehide").click (function () {
 		$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
-		jQuery.get ("ajax.php",
+		jQuery.post ("ajax.php",
 			{
-		"page": "general/alert_enterprise",
-		"message":$(this).attr("id")},
+				"page": "general/alert_enterprise",
+				"message": $(this).attr("id")
+			},
 			function (data, status) {
 				$("#alert_messages").hide ()
 					.empty ()

From 71d868220a6690189f9802eaebd9d5a65bc55ad8 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 16 May 2017 12:36:58 +0200
Subject: [PATCH 55/63] Hide scroll bars when vconsole is in fullscreen mode,
 also in dashboard when there is only one vconsole widget - #865

---
 pandora_console/operation/visual_console/public_console.php | 3 +++
 pandora_console/operation/visual_console/render_view.php    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pandora_console/operation/visual_console/public_console.php b/pandora_console/operation/visual_console/public_console.php
index 17a70505c9..6b77dd4798 100755
--- a/pandora_console/operation/visual_console/public_console.php
+++ b/pandora_console/operation/visual_console/public_console.php
@@ -193,6 +193,9 @@ $ignored_params['refr'] = '';
 		
 		
 		$('body').css('background-color','<?php echo $layout["background_color"]; ?>');
+		$('body').css('margin','0');
+		$('body').css('height','100%');
+		$('body').css('overflow','hidden');
 		
 		$(".module_graph .menu_graph").css('display','none');
 		
diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php
index 8e62969ad4..0d3d2a8c78 100755
--- a/pandora_console/operation/visual_console/render_view.php
+++ b/pandora_console/operation/visual_console/render_view.php
@@ -198,6 +198,9 @@ if ($config['pure']) {
 		/* Avoid the main_pure container 1000px height */
 		body.pure {
 			min-height: 100px;
+			margin: 0px;
+			overflow: hidden;
+			height: 100%;
 			<?php
 			echo "background-color: ".$layout['background_color'].";";
 			?>

From ead35567004710f1cd7f8947d16cc6dbc7a4b1d3 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 17 May 2017 00:01:21 +0200
Subject: [PATCH 56/63] 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 7d37902524..0b012fab6b 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.702-170516
+Version: 7.0NG.702-170517
 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 8c48449690..4ec7c107bd 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.702-170516"
+pandora_version="7.0NG.702-170517"
 
 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 24b91b956b..3ddd417669 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.702';
-use constant AGENT_BUILD => '170516';
+use constant AGENT_BUILD => '170517';
 
 # 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 c8d26b818c..85f383c20a 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.702
-%define release     170516
+%define release     170517
 
 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 878be1b729..490de7eb66 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.702
-%define release     170516
+%define release     170517
 
 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 ea94f6c17d..ea7118df09 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170516"
+PI_BUILD="170517"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 13e43787c9..5105276bca 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170516}
+{170517}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 2fe36979c5..f73b4b92bd 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.702(Build 170516)")
+#define PANDORA_VERSION ("7.0NG.702(Build 170517)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 25ef4a8e39..3b1b499149 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.702(Build 170516))"
+      VALUE "ProductVersion", "(7.0NG.702(Build 170517))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index f56578b35e..6f7d0c0f67 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.702-170516
+Version: 7.0NG.702-170517
 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 89cc3c5f2a..d343447b9e 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.702-170516"
+pandora_version="7.0NG.702-170517"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index cf7e9ed662..ffc9fee066 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 = 'PC170516';
+$build_version = 'PC170517';
 $pandora_version = 'v7.0NG.702';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index f4b4d33cf9..cf8a71b578 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.702';
-$build = '170516';
+$build = '170517';
 			$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 84d996768c..12f869629f 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.702
-%define release     170516
+%define release     170517
 
 # 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 13171f6f48..f5abdf65b5 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.702
-%define release     170516
+%define release     170517
 %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 8af82b7eb9..58a003fd26 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.702-170516
+Version: 7.0NG.702-170517
 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 6f2d67f278..3cd12cad94 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.702-170516"
+pandora_version="7.0NG.702-170517"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 0b2377188d..a802ebde3c 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.702";
-my $pandora_build = "170516";
+my $pandora_build = "170517";
 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 d83e7b8405..b4a7355c3d 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.702
-%define release     170516
+%define release     170517
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 8374a702fc..12e8d25386 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.702
-%define release     170516
+%define release     170517
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index a29e01a376..dddba9ede1 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.702"
-PI_BUILD="170516"
+PI_BUILD="170517"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 92a02fae8e..e118deaed1 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.702 PS170516";
+my $version = "7.0NG.702 PS170517";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 382ec4d96a..b16a33a2aa 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.702 PS170516";
+my $version = "7.0NG.702 PS170517";
 
 # save program name for logging
 my $progname = basename($0);

From c317fa478c48d38b6f812d4d0908f95d809bf0cf Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Wed, 17 May 2017 08:09:00 +0200
Subject: [PATCH 57/63] Add support for auto IP addresses to SNMP modules.

---
 pandora_server/lib/PandoraFMS/NetworkServer.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm
index 39f5bea980..ea433ad9ec 100644
--- a/pandora_server/lib/PandoraFMS/NetworkServer.pm
+++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm
@@ -339,8 +339,8 @@ sub pandora_snmp_get_command ($$$$$$$$$$$) {
 # Makes a call to SNMP modules to get a value,
 ##########################################################################
 
-sub pandora_query_snmp ($$$) {
-	my ($pa_config, $module, $dbh) = @_;
+sub pandora_query_snmp ($$$$) {
+	my ($pa_config, $module, $ip_target, $dbh) = @_;
 
 	my $snmp_version = $module->{"tcp_send"}; # (1, 2, 2c or 3)
 	my $snmp3_privacy_method = $module->{"custom_string_1"}; # DES/AES
@@ -350,7 +350,7 @@ sub pandora_query_snmp ($$$) {
 	my $snmp3_auth_pass = pandora_output_password($pa_config, $module->{"plugin_pass"});
 	my $snmp3_auth_method = $module->{"plugin_parameter"}; #MD5/SHA1
 	my $snmp_community = $module->{"snmp_community"};
-	my $snmp_target = $module->{"ip_target"};
+	my $snmp_target = $ip_target;
 	my $snmp_oid = $module->{"snmp_oid"};
 	my $snmp_port = $module->{"tcp_port"};
 
@@ -493,7 +493,7 @@ sub exec_network_module ($$$$) {
 				($id_tipo_modulo == 16) || 
 				($id_tipo_modulo == 17)) {
 
-			($module_data, $module_result) = pandora_query_snmp ($pa_config, $module, $dbh);
+			($module_data, $module_result) = pandora_query_snmp ($pa_config, $module, $ip_target, $dbh);
 
 		    if ($module_result == 0) { # A correct SNMP Query
 			    # SNMP_DATA_PROC

From 1897ee59a34f9685905ff9acdec5a0a4a8c0fb89 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 17 May 2017 10:34:35 +0200
Subject: [PATCH 58/63] fixed problem with parent agents

---
 pandora_console/godmode/agentes/configurar_agente.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index bc09729e15..c11edc91a3 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -159,8 +159,7 @@ if ($create_agent) {
 	$intervalo = (string) get_parameter_post ("intervalo", SECONDS_5MINUTES);
 	$comentarios = (string) get_parameter_post ("comentarios", '');
 	$modo = (int) get_parameter_post ("modo");
-	$id_parent = (string) get_parameter_post ("id_parent",'');
-	$id_parent = (int) agents_get_agent_id ($id_parent);
+	$id_parent = (int) get_parameter_post ("id_agent_parent");
 	$server_name = (string) get_parameter_post ("server_name");
 	$id_os = (int) get_parameter_post ("id_os");
 	$disabled = (int) get_parameter_post ("disabled");
@@ -690,8 +689,7 @@ if ($update_agent) { // if modified some agent paramenter
 	$id_os = (int) get_parameter_post ("id_os");
 	$disabled = (bool) get_parameter_post ("disabled");
 	$server_name = (string) get_parameter_post ("server_name", "");
-	$parent_name = (string) get_parameter_post ("id_parent");
-	$id_parent = (int) agents_get_agent_id ($parent_name);
+	$id_parent = (int) get_parameter_post ("id_agent_parent");
 	$custom_id = (string) get_parameter_post ("custom_id", "");
 	$cascade_protection = (int) get_parameter_post ("cascade_protection", 0);
 	$cascade_protection_module = (int) get_parameter ("cascade_protection_module", 0);

From 19a12b23efb6142327febe172e354e4cae2353ac Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 17 May 2017 11:37:19 +0200
Subject: [PATCH 59/63] Added white start to snmp traps

---
 pandora_console/images/tip-blanco.png             | Bin 0 -> 235 bytes
 .../operation/snmpconsole/snmp_view.php           |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 pandora_console/images/tip-blanco.png

diff --git a/pandora_console/images/tip-blanco.png b/pandora_console/images/tip-blanco.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e106d4c4833cc6f3242eba6085efdff999ca555
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^d_c^_!N$PA`1xLZAdn+j;u=vBoS#-wo>-L1;Fyx1
zl&avFo0y&&l$w}QS$Hzl2B@gl)5S5Q;#N|E1Ka=q|M&9?IPgd?C^RGl{r>NKpsInv
zX<|alsekMjeNGrLFt(iS`EOt*Y{seZRnCQ(Mc^aHiex(h?FHOyf81HWZ+zLr$Xvo+
z+fdy%@gq|Q8;5~YUI4>Pk5z|7C(JRJA2I(C)BD7K2bNkgcB@SZI4D~F(P0lmhiGFX
iW7iv(6^(obtPB^<%`Ibce|!Y!Fa}RoKbLh*2~7Z{EK?K!

literal 0
HcmV?d00001

diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 3960a857c2..ca78acda55 100755
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -678,7 +678,7 @@ if ($traps !== false) {
 				continue;
 			}
 			$data[1] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'" title="'.__('View agent details').'">';
-			$data[1] .= '<strong>'.$agent["nombre"].ui_print_help_tip($trap['source'], true, "images/tip_grey.png");'</strong></a>';
+			$data[1] .= '<strong>'.$agent["nombre"].ui_print_help_tip($trap['source'], true, "images/tip-blanco.png");'</strong></a>';
 		}
 		
 		//OID

From 24915e47cbb7c4a3f87ebc498660a8f388b76f05 Mon Sep 17 00:00:00 2001
From: artica <git@artica.es>
Date: Wed, 17 May 2017 12:08:40 +0200
Subject: [PATCH 60/63] Updated version and build strings.

---
 pandora_agents/pc/AIX/pandora_agent.conf               | 2 +-
 pandora_agents/pc/FreeBSD/pandora_agent.conf           | 2 +-
 pandora_agents/pc/HP-UX/pandora_agent.conf             | 2 +-
 pandora_agents/pc/Linux/pandora_agent.conf             | 2 +-
 pandora_agents/pc/NT4/pandora_agent.conf               | 2 +-
 pandora_agents/pc/SunOS/pandora_agent.conf             | 2 +-
 pandora_agents/pc/Win32/pandora_agent.conf             | 2 +-
 pandora_agents/shellscript/aix/pandora_agent.conf      | 2 +-
 pandora_agents/shellscript/bsd-ipso/pandora_agent.conf | 2 +-
 pandora_agents/shellscript/hp-ux/pandora_agent.conf    | 2 +-
 pandora_agents/shellscript/linux/pandora_agent.conf    | 2 +-
 pandora_agents/shellscript/mac_osx/pandora_agent.conf  | 2 +-
 pandora_agents/shellscript/openWRT/pandora_agent.conf  | 2 +-
 pandora_agents/shellscript/solaris/pandora_agent.conf  | 2 +-
 pandora_agents/unix/AIX/pandora_agent.conf             | 2 +-
 pandora_agents/unix/DEBIAN/control                     | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_agents/unix/Darwin/pandora_agent.conf          | 2 +-
 pandora_agents/unix/FreeBSD/pandora_agent.conf         | 2 +-
 pandora_agents/unix/HP-UX/pandora_agent.conf           | 2 +-
 pandora_agents/unix/Linux/pandora_agent.conf           | 2 +-
 pandora_agents/unix/NT4/pandora_agent.conf             | 2 +-
 pandora_agents/unix/NetBSD/pandora_agent.conf          | 2 +-
 pandora_agents/unix/SunOS/pandora_agent.conf           | 2 +-
 pandora_agents/unix/pandora_agent                      | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec          | 4 ++--
 pandora_agents/unix/pandora_agent.spec                 | 4 ++--
 pandora_agents/unix/pandora_agent_installer            | 2 +-
 pandora_agents/win32/bin/pandora_agent.conf            | 2 +-
 pandora_agents/win32/installer/pandora.mpi             | 4 ++--
 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            | 4 ++--
 pandora_console/pandora_console.spec                   | 4 ++--
 pandora_console/pandora_console_install                | 2 +-
 pandora_console/pandoradb_data.sql                     | 2 +-
 pandora_server/DEBIAN/control                          | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh              | 2 +-
 pandora_server/conf/pandora_server.conf.new            | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm                | 2 +-
 pandora_server/pandora_server.redhat.spec              | 4 ++--
 pandora_server/pandora_server.spec                     | 4 ++--
 pandora_server/pandora_server_installer                | 2 +-
 pandora_server/util/pandora_db.pl                      | 2 +-
 pandora_server/util/pandora_manage.pl                  | 2 +-
 49 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf
index ad0469b3dd..477d2600a9 100644
--- a/pandora_agents/pc/AIX/pandora_agent.conf
+++ b/pandora_agents/pc/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, AIX version
+# Version 7.0NG.703, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf
index 4204520453..de6843c02b 100644
--- a/pandora_agents/pc/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, FreeBSD Version
+# Version 7.0NG.703, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf
index f0960f0e88..46189c2461 100644
--- a/pandora_agents/pc/HP-UX/pandora_agent.conf
+++ b/pandora_agents/pc/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, HP-UX Version
+# Version 7.0NG.703, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf
index a2c0d2d4f8..f6d2067115 100644
--- a/pandora_agents/pc/Linux/pandora_agent.conf
+++ b/pandora_agents/pc/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, GNU/Linux
+# Version 7.0NG.703, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf
index 975cb5f461..213ba7e160 100644
--- a/pandora_agents/pc/NT4/pandora_agent.conf
+++ b/pandora_agents/pc/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, GNU/Linux
+# Version 7.0NG.703, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf
index 4f0e52daf7..b3359bff68 100644
--- a/pandora_agents/pc/SunOS/pandora_agent.conf
+++ b/pandora_agents/pc/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, Solaris Version
+# Version 7.0NG.703, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf
index b3dc383872..ccf7805593 100644
--- a/pandora_agents/pc/Win32/pandora_agent.conf
+++ b/pandora_agents/pc/Win32/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2010 Artica Soluciones Tecnologicas 
-# Version 7.0NG.702
+# Version 7.0NG.703
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf
index 36d55bd170..a3d4981a96 100644
--- a/pandora_agents/shellscript/aix/pandora_agent.conf
+++ b/pandora_agents/shellscript/aix/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.702, AIX version
+# Version 7.0NG.703, AIX version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
index 8f0cbac3fb..10fbdb58f9 100644
--- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
+++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.702
+# Version 7.0NG.703
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 
diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
index 2e28fccb23..7a14c77ef7 100644
--- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf
+++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.702, HPUX Version
+# Version 7.0NG.703, HPUX Version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index c6e5935841..50bd5d78fd 100644
--- a/pandora_agents/shellscript/linux/pandora_agent.conf
+++ b/pandora_agents/shellscript/linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702
+# Version 7.0NG.703
 # Licensed under GPL license v2,
 # (c) 2003-2010 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
index 4b83ae44e6..9a9fb626a9 100644
--- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf
+++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702
+# Version 7.0NG.703
 # Licensed under GPL license v2,
 # (c) 2003-2009 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf
index c8ecb194c5..6326cd48ac 100644
--- a/pandora_agents/shellscript/openWRT/pandora_agent.conf
+++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702
+# Version 7.0NG.703
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 
diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf
index b865c1cecd..566d07d0e5 100644
--- a/pandora_agents/shellscript/solaris/pandora_agent.conf
+++ b/pandora_agents/shellscript/solaris/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.702, Solaris version
+# Version 7.0NG.703, Solaris version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 213f2dad81..89f3c71d14 100644
--- a/pandora_agents/unix/AIX/pandora_agent.conf
+++ b/pandora_agents/unix/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, AIX version
+# Version 7.0NG.703, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 0b012fab6b..0d9d3d96e6 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.702-170517
+Version: 7.0NG.703
 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 4ec7c107bd..df9e85f195 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.702-170517"
+pandora_version="7.0NG.703"
 
 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/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf
index 99c55032b9..7028f11a9b 100644
--- a/pandora_agents/unix/Darwin/pandora_agent.conf
+++ b/pandora_agents/unix/Darwin/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, GNU/Linux
+# Version 7.0NG.703, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf
index fa5133542e..6e44217cd9 100644
--- a/pandora_agents/unix/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, FreeBSD Version
+# Version 7.0NG.703, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index b5b8b5ac89..231aab8fb7 100644
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, HP-UX Version
+# Version 7.0NG.703, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 2193b79020..443d52b22b 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, GNU/Linux
+# Version 7.0NG.703, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf
index 394324a119..c6bf2175fb 100644
--- a/pandora_agents/unix/NT4/pandora_agent.conf
+++ b/pandora_agents/unix/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, GNU/Linux
+# Version 7.0NG.703, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf
index c95d19f363..9dec043a34 100644
--- a/pandora_agents/unix/NetBSD/pandora_agent.conf
+++ b/pandora_agents/unix/NetBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, NetBSD Version
+# Version 7.0NG.703, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf
index 53f3ac80a7..8a839dd648 100644
--- a/pandora_agents/unix/SunOS/pandora_agent.conf
+++ b/pandora_agents/unix/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.702, Solaris Version
+# Version 7.0NG.703, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 3ddd417669..8e40d40be0 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -40,7 +40,7 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.702';
+use constant AGENT_VERSION => '7.0NG.703';
 use constant AGENT_BUILD => '170517';
 
 # Agent log default file size maximum and instances
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 85f383c20a..905b1437b1 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.702
-%define release     170517
+%define version     7.0NG.703
+%define release     1
 
 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 490de7eb66..76d65892d8 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.702
-%define release     170517
+%define version     7.0NG.703
+%define release     1
 
 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 ea7118df09..5fc9793446 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -9,7 +9,7 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.702"
+PI_VERSION="7.0NG.703"
 PI_BUILD="170517"
 OS_NAME=`uname -s`
 
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 541132de4f..191dffec26 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2014 Artica Soluciones Tecnologicas 
-# Version 7.0NG.702
+# Version 7.0NG.703
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 5105276bca..425474855d 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.702}
+{Pandora FMS Windows Agent v7.0NG.703}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-<%Version%>-Setup<%Ext%>}
+{<%AppName%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index f73b4b92bd..190922cdf7 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.702(Build 170517)")
+#define PANDORA_VERSION ("7.0NG.703(Build 170517)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3b1b499149..75bf082ac9 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.702(Build 170517))"
+      VALUE "ProductVersion", "(7.0NG.703(Build 170517))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 6f7d0c0f67..e0f72b3b6e 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.702-170517
+Version: 7.0NG.703
 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 d343447b9e..40d4ff8e82 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.702-170517"
+pandora_version="7.0NG.703"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index ffc9fee066..c722a570f6 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -23,7 +23,7 @@
  * Pandora build version and version 
  */
 $build_version = 'PC170517';
-$pandora_version = 'v7.0NG.702';
+$pandora_version = 'v7.0NG.703';
 
 // Do not overwrite default timezone set if defined.
 $script_tz = @date_default_timezone_get();
diff --git a/pandora_console/install.php b/pandora_console/install.php
index cf8a71b578..c20ac918f4 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -70,7 +70,7 @@
 	<body>
 		<div style='height: 10px'>
 			<?php
-$version = '7.0NG.702';
+$version = '7.0NG.703';
 $build = '170517';
 			$banner = "v$version Build $build";
 			
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 12f869629f..d4fe4bf9a8 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.702
-%define release     170517
+%define version     7.0NG.703
+%define release     1
 
 # 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 f5abdf65b5..58bbfe428d 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.702
-%define release     170517
+%define version     7.0NG.703
+%define release     1
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandora_console_install b/pandora_console/pandora_console_install
index e9506e122b..4e0ea472ff 100644
--- a/pandora_console/pandora_console_install
+++ b/pandora_console/pandora_console_install
@@ -9,7 +9,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.702"
+PI_VERSION="7.0NG.703"
 FORCE=0
 DESTDIR=""
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index c8b076c982..edd2f6517b 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -112,7 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('MR', 0),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
-('current_package_enterprise', '700'),
+('current_package_enterprise', '703'),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}');
 
 UNLOCK TABLES;
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 58a003fd26..03e7b5695b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.702-170517
+Version: 7.0NG.703
 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 3cd12cad94..33fafc7de2 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.702-170517"
+pandora_version="7.0NG.703"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index a01fe336dd..d0dd7ff3fc 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -1,7 +1,7 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 7.0NG.702
+# Version 7.0NG.703
 # Licensed under GPL license v2,
 # (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index a802ebde3c..7063d4773e 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -42,7 +42,7 @@ our @EXPORT = qw(
 	);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.702";
+my $pandora_version = "7.0NG.703";
 my $pandora_build = "170517";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index b4a7355c3d..fe339c1f1c 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.702
-%define release     170517
+%define version     7.0NG.703
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 12e8d25386..96f0bf6aba 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.702
-%define release     170517
+%define version     7.0NG.703
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index dddba9ede1..a483e97ecd 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -8,7 +8,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.702"
+PI_VERSION="7.0NG.703"
 PI_BUILD="170517"
 
 MODE=$1
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e118deaed1..d8f9bfbb6b 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.702 PS170517";
+my $version = "7.0NG.703 PS170517";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index b16a33a2aa..42969bba2c 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.702 PS170517";
+my $version = "7.0NG.703 PS170517";
 
 # save program name for logging
 my $progname = basename($0);

From 0d91a0ac224ebb0a310523beb6b0e4d12b8308f9 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Wed, 17 May 2017 13:03:16 +0200
Subject: [PATCH 61/63] Add support for per-module alert cascade protection.

---
 pandora_server/lib/PandoraFMS/Core.pm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index f15f09ca3f..2cf45b6f8a 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -4069,17 +4069,29 @@ sub pandora_inhibit_alerts {
 	return 0 if ($agent->{'cascade_protection'} ne '1' || $agent->{'id_parent'} eq '0' || $depth > 1024);
 
 	# Are any of the parent's critical alerts fired?	
-	my $count = get_db_value ($dbh, 'SELECT COUNT(*) FROM tagente_modulo, talert_template_modules, talert_templates
+	my $count = 0;
+	if ($agent->{'cascade_protection_module'} != 0) {
+		$count = get_db_value ($dbh, 'SELECT COUNT(*) FROM tagente_modulo, talert_template_modules, talert_templates
+				WHERE tagente_modulo.id_agente = ?
+				AND tagente_modulo.id_agente_modulo = ?
+				AND tagente_modulo.id_agente_modulo = talert_template_modules.id_agent_module
+				AND tagente_modulo.disabled = 0
+				AND talert_template_modules.id_alert_template = talert_templates.id
+				AND talert_template_modules.times_fired > 0
+				AND talert_templates.priority = 4', $agent->{'id_parent'}, $agent->{'cascade_protection_module'});
+	}
+	else {
+		$count = get_db_value ($dbh, 'SELECT COUNT(*) FROM tagente_modulo, talert_template_modules, talert_templates
 				WHERE tagente_modulo.id_agente = ?
 				AND tagente_modulo.id_agente_modulo = talert_template_modules.id_agent_module
 				AND tagente_modulo.disabled = 0
 				AND talert_template_modules.id_alert_template = talert_templates.id
 				AND talert_template_modules.times_fired > 0
 				AND talert_templates.priority = 4', $agent->{'id_parent'});
-	return 1 if ($count > 0);
-	
-	
+	}
 
+	return 1 if (defined($count) && $count > 0);
+	
 	# Check the parent's parent next
 	$agent = get_db_single_row ($dbh, 'SELECT * FROM tagente WHERE id_agente = ?', $agent->{'id_parent'});
 	return 0 unless defined ($agent);

From 15b65ef3f89ead3b5e26ffed2e0a8b7efa8b53d6 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 18 May 2017 00:01:18 +0200
Subject: [PATCH 62/63] 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     | 4 ++--
 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, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 0d9d3d96e6..3b4a5181aa 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.703
+Version: 7.0NG.703-170518
 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 df9e85f195..a6268e166d 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.703"
+pandora_version="7.0NG.703-170518"
 
 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 bc1f478922..f5a70e0831 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.703';
-use constant AGENT_BUILD => '170517';
+use constant AGENT_BUILD => '170518';
 
 # 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 905b1437b1..bdf0a020a0 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.703
-%define release     1
+%define release     170518
 
 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 76d65892d8..d98a626456 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.703
-%define release     1
+%define release     170518
 
 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 5fc9793446..376293af52 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.703"
-PI_BUILD="170517"
+PI_BUILD="170518"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 425474855d..b7ae735469 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170517}
+{170518}
 
 ViewReadme
 {Yes}
@@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-Setup<%Ext%>}
+{<%AppName%>-<%Version%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 190922cdf7..2a6933665a 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.703(Build 170517)")
+#define PANDORA_VERSION ("7.0NG.703(Build 170518)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 75bf082ac9..400e74379c 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.703(Build 170517))"
+      VALUE "ProductVersion", "(7.0NG.703(Build 170518))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index c69e6e2c63..498ff4ef0d 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.703
+Version: 7.0NG.703-170518
 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 40d4ff8e82..38f9d70839 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.703"
+pandora_version="7.0NG.703-170518"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index c722a570f6..7b79cedde0 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 = 'PC170517';
+$build_version = 'PC170518';
 $pandora_version = 'v7.0NG.703';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index c20ac918f4..c231a1e517 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.703';
-$build = '170517';
+$build = '170518';
 			$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 d4fe4bf9a8..3d671a40d1 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.703
-%define release     1
+%define release     170518
 
 # 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 58bbfe428d..b6ad27cfc9 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.703
-%define release     1
+%define release     170518
 %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 03e7b5695b..15d1a51b54 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.703
+Version: 7.0NG.703-170518
 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 33fafc7de2..aa956b6869 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.703"
+pandora_version="7.0NG.703-170518"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 7063d4773e..66162be6cf 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.703";
-my $pandora_build = "170517";
+my $pandora_build = "170518";
 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 fe339c1f1c..e9ed6bc5d5 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.703
-%define release     1
+%define release     170518
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 96f0bf6aba..2e6d66b133 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.703
-%define release     1
+%define release     170518
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index a483e97ecd..e10dc332b6 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.703"
-PI_BUILD="170517"
+PI_BUILD="170518"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index c335c2e7b3..c75b6fd3dd 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.703 PS170517";
+my $version = "7.0NG.703 PS170518";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 42969bba2c..e2fb62641f 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.703 PS170517";
+my $version = "7.0NG.703 PS170518";
 
 # save program name for logging
 my $progname = basename($0);

From 4b05351df05b867bc77acac6c7474cfa225b4c3f Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 18 May 2017 11:55:44 +0200
Subject: [PATCH 63/63] Fixed async issues in windows brokers

---
 .../win32/modules/pandora_module.cc           |  4 ++
 pandora_agents/win32/modules/pandora_module.h |  3 +-
 .../win32/modules/pandora_module_proc.cc      | 11 ++++
 .../win32/modules/pandora_module_proc.h       |  1 +
 .../win32/modules/pandora_module_service.cc   | 10 ++++
 .../win32/modules/pandora_module_service.h    |  1 +
 .../win32/pandora_windows_service.cc          | 54 +++++++++++++------
 .../win32/pandora_windows_service.h           |  2 +
 8 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/pandora_agents/win32/modules/pandora_module.cc b/pandora_agents/win32/modules/pandora_module.cc
index 1754ab7cb7..296f42f2ea 100644
--- a/pandora_agents/win32/modules/pandora_module.cc
+++ b/pandora_agents/win32/modules/pandora_module.cc
@@ -1789,5 +1789,9 @@ Pandora_Module::getIntensiveMatch () {
 	return this->intensive_match;
 }
 
+bool
+Pandora_Module::getAsync () {
+	return this->async;
+}
 					
 
diff --git a/pandora_agents/win32/modules/pandora_module.h b/pandora_agents/win32/modules/pandora_module.h
index 4303b88eec..b2606d2442 100644
--- a/pandora_agents/win32/modules/pandora_module.h
+++ b/pandora_agents/win32/modules/pandora_module.h
@@ -91,7 +91,7 @@ namespace Pandora_Modules {
 		MODULE_TCPCHECK,       /**< The module checks whether a tcp port is open */
 		MODULE_REGEXP,         /**< The module searches a file for matches of a regular expression */
 		MODULE_PLUGIN,          /**< Plugin */
-		MODULE_PING,            /**< Ping module */
+		MODULE_PING,            /**< Ping module */
 		MODULE_SNMPGET          /**< SNMP get module */
 	} Module_Kind;
 	
@@ -238,6 +238,7 @@ namespace Pandora_Modules {
 		void         setTimeout    (int timeout);
 		int          getTimeout    ();
 		string       getSave ();
+		bool         getAsync ();
 
 		virtual string getXml      ();
 
diff --git a/pandora_agents/win32/modules/pandora_module_proc.cc b/pandora_agents/win32/modules/pandora_module_proc.cc
index 91deab0efb..e8eed1f97d 100644
--- a/pandora_agents/win32/modules/pandora_module_proc.cc
+++ b/pandora_agents/win32/modules/pandora_module_proc.cc
@@ -52,6 +52,17 @@ Pandora_Module_Proc::Pandora_Module_Proc (string name, string process_name)
 	this->retries = 3;
 	this->start_delay = 5000;
 	this->retry_delay = 2000;
+	this->thread = 0;
+}
+/** 
+ * Destroys a Pandora_Module_Service object.
+ */
+Pandora_Module_Proc::~Pandora_Module_Proc () {
+
+	// Close the thread if module is async
+	if (this->thread) {
+		TerminateThread(this->thread, 0);
+	}
 }
 
 string
diff --git a/pandora_agents/win32/modules/pandora_module_proc.h b/pandora_agents/win32/modules/pandora_module_proc.h
index 60615f189a..edab85cb88 100644
--- a/pandora_agents/win32/modules/pandora_module_proc.h
+++ b/pandora_agents/win32/modules/pandora_module_proc.h
@@ -38,6 +38,7 @@ namespace Pandora_Modules {
 		int retry_delay;
 	public:
 		Pandora_Module_Proc    (string name, string process_name);
+		~Pandora_Module_Proc   ();
 		
 		string getProcessName  () const;
 		string getStartCommand () const;
diff --git a/pandora_agents/win32/modules/pandora_module_service.cc b/pandora_agents/win32/modules/pandora_module_service.cc
index bbbe799f9e..bf82120aa8 100644
--- a/pandora_agents/win32/modules/pandora_module_service.cc
+++ b/pandora_agents/win32/modules/pandora_module_service.cc
@@ -49,6 +49,16 @@ Pandora_Module_Service::Pandora_Module_Service (string name, string service_name
 	this->thread = 0;
 	this->watchdog = false;
 }
+/** 
+ * Destroys a Pandora_Module_Service object.
+ */
+Pandora_Module_Service::~Pandora_Module_Service () {
+
+	// Close the thread if module is async
+	if (this->thread) {
+		TerminateThread(this->thread, 0);
+	}
+}
 
 string
 Pandora_Module_Service::getServiceName () const {
diff --git a/pandora_agents/win32/modules/pandora_module_service.h b/pandora_agents/win32/modules/pandora_module_service.h
index 6e82697985..bdec6152ed 100644
--- a/pandora_agents/win32/modules/pandora_module_service.h
+++ b/pandora_agents/win32/modules/pandora_module_service.h
@@ -36,6 +36,7 @@ namespace Pandora_Modules {
 		bool   watchdog;
 	public:
 		Pandora_Module_Service (string name, string service_name);
+		~Pandora_Module_Service ();
 		
 		void   run             ();
 		string getServiceName  () const;
diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index a7c1105975..cad177411a 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -76,6 +76,7 @@ Pandora_Windows_Service::setValues (const char * svc_name,
 	this->service_description   = (char *) svc_description;
 	execution_number            = 0;
 	this->modules               = NULL;
+	this->broker_modules		= NULL;
 	this->conf                  = NULL;
 	this->interval              = 60000;
 	this->timestamp             = 0;
@@ -105,6 +106,10 @@ Pandora_Windows_Service::~Pandora_Windows_Service () {
 	if (this->modules != NULL) {
 		delete this->modules;
 	}
+
+	if (this->broker_modules != NULL) {
+		delete this->broker_modules;
+	}
 	pandoraLog ("Pandora agent stopped");
 }
 
@@ -136,10 +141,10 @@ Pandora_Windows_Service::pandora_init_broker (string file_conf) {
 	
 	this->conf = Pandora::Pandora_Agent_Conf::getInstance ();
 	this->conf->setFile (file_conf);
-	if (this->modules != NULL) {
-		delete this->modules;
+	if (this->broker_modules != NULL) {
+		delete this->broker_modules;
 	}
-	this->modules = new Pandora_Module_List (file_conf);
+	this->broker_modules = new Pandora_Module_List (file_conf);
 	
 	pandoraDebug ("Pandora broker agent started");
 }
@@ -208,9 +213,14 @@ Pandora_Windows_Service::check_broker_agents(string *all_conf){
 
 void
 Pandora_Windows_Service::pandora_init () {
+	pandora_init(true);
+}
+
+void
+Pandora_Windows_Service::pandora_init (bool reload_modules) {
 	string conf_file, interval, debug, disable_logfile, intensive_interval, util_dir, path, env;
 	string udp_server_enabled, udp_server_port, udp_server_addr, udp_server_auth_addr;
-	string agent_name, agent_name_cmd, agent_alias, pandora_agent;
+	string agent_name, agent_name_cmd, agent_alias, agent_alias_cmd, pandora_agent;
 	string proxy_mode, server_ip;
 	string *all_conf;
 	int pos, num;
@@ -224,7 +234,7 @@ Pandora_Windows_Service::pandora_init () {
 	
 	this->conf = Pandora::Pandora_Agent_Conf::getInstance ();
 	this->conf->setFile (all_conf);
-	if (this->modules != NULL) {
+	if (this->modules != NULL && reload_modules) {
 		delete this->modules;
 	}
 
@@ -255,7 +265,9 @@ Pandora_Windows_Service::pandora_init () {
 	this->setSleepTime (this->intensive_interval);
 
 	// Read modules
-	this->modules = new Pandora_Module_List (conf_file);
+	if (reload_modules) {
+		this->modules = new Pandora_Module_List (conf_file);
+	}
 	delete []all_conf;
     
     // Get the agent alias.
@@ -1856,19 +1868,19 @@ Pandora_Windows_Service::pandora_run_broker (string config) {
 
 	server_addr = conf->getValue ("server_ip");
 
-	if (this->modules != NULL) {
-		this->modules->goFirst ();
+	if (this->broker_modules != NULL) {
+		this->broker_modules->goFirst ();
 	
-		while (! this->modules->isLast ()) {
+		while (! this->broker_modules->isLast ()) {
 			Pandora_Module *module;
 		
-			module = this->modules->getCurrentValue ();
+			module = this->broker_modules->getCurrentValue ();
 			
 			/* Check preconditions */
 			if (module->evaluatePreconditions () == 0) {
 				pandoraDebug ("Preconditions not matched for module %s", module->getName ().c_str ());
 				module->setNoOutput ();
-				this->modules->goNext ();
+				this->broker_modules->goNext ();
 				continue;
 			}
 	
@@ -1876,15 +1888,23 @@ Pandora_Windows_Service::pandora_run_broker (string config) {
 			if (module->checkCron (module->getInterval (), atoi (conf->getValue ("interval").c_str())) == 0) {
 				pandoraDebug ("Cron not matched for module %s", module->getName ().c_str ());
 				module->setNoOutput ();
-				this->modules->goNext ();
+				this->broker_modules->goNext ();
 				continue;
 			}
 			
+			/* Check async */
+			if (module->getAsync()) {
+				pandoraDebug ("Forbidden async module %s in broker agents", module->getName ().c_str ());
+				module->setNoOutput ();
+				this->broker_modules->goNext ();
+				continue;
+			}
+
 			pandoraDebug ("Run %s", module->getName ().c_str ());
 			module->run ();
 			if (! module->hasOutput ()) {
 				module->setNoOutput ();
-				this->modules->goNext ();
+				this->broker_modules->goNext ();
 				continue;
 			}
 			
@@ -1897,7 +1917,7 @@ Pandora_Windows_Service::pandora_run_broker (string config) {
 			intensive_match = module->evaluateIntensiveConditions ();
 			if (intensive_match == module->getIntensiveMatch () && module->getTimestamp () + module->getInterval () * this->interval_sec > this->run_time) {
 				module->setNoOutput ();
-				this->modules->goNext ();
+				this->broker_modules->goNext ();
 				continue;
 			}
 			module->setIntensiveMatch (intensive_match);
@@ -1912,7 +1932,7 @@ Pandora_Windows_Service::pandora_run_broker (string config) {
 			/* At least one module has data */
 			data_flag = 1;
 
-			this->modules->goNext ();
+			this->broker_modules->goNext ();
 		}
 	}
 
@@ -1920,7 +1940,7 @@ Pandora_Windows_Service::pandora_run_broker (string config) {
 		
 		// Send the XML
 		if (!server_addr.empty ()) {
-		  this->sendXml (this->modules);
+		  this->sendXml (this->broker_modules);
 		}
 	}
 	
@@ -2059,7 +2079,7 @@ Pandora_Windows_Service::pandora_run (int forced_run) {
 	
 	/* Reload the original configuration */
 	if (num != 0) {
-		pandora_init ();
+		pandora_init (false);
 	}
 
 	/* Reset time reference if necessary */
diff --git a/pandora_agents/win32/pandora_windows_service.h b/pandora_agents/win32/pandora_windows_service.h
index be9a7a4eb3..17f0130884 100644
--- a/pandora_agents/win32/pandora_windows_service.h
+++ b/pandora_agents/win32/pandora_windows_service.h
@@ -42,6 +42,7 @@ namespace Pandora {
 	private:
 		Pandora_Agent_Conf  *conf;
 		Pandora_Module_List *modules;
+		Pandora_Module_List *broker_modules;
 		long                 execution_number;
 		string               agent_name;
 		string               alias;
@@ -98,6 +99,7 @@ namespace Pandora {
 		void           pandora_run  (int forced_run);
 		void           pandora_run  ();
 		void           pandora_init ();
+		void           pandora_init (bool reload_modules);
 		
 		long           interval;
 		long           interval_sec;