From 0dea7fb6907f2cb09da492940c40947ad5394bc5 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 29 Mar 2017 12:41:42 +0200
Subject: [PATCH 001/157] Text change warn by thresholds

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

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index df85ab81e8..4daaa7529f 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -745,7 +745,7 @@ if ($list_modules) {
 	$table->head[5] = __('Status') . ' ' .
 		'<a href="' . $url . '&sort_field=status&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_up.png", true, array("style" => $selectStatusUp, "alt" => "up")) . '</a>' .
 		'<a href="' . $url . '&sort_field=status&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_down.png", true, array("style" => $selectStatusDown, "alt" => "down")) . '</a>';
-	$table->head[6] = __('Warn');
+	$table->head[6] = __('Thresholds');
 	$table->head[7] = __('Data');
 	$table->head[8] = __('Graph');
 	$table->head[9] = __('Last contact') . ' ' .

From 976fea2613d74d4f83578ce6893467e29b458422 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 12 Apr 2017 13:44:25 +0200
Subject: [PATCH 002/157] If result param is null not show bad result message
 when delete,disable user - #122

---
 pandora_console/godmode/users/user_list.php | 23 +++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 5db36559e0..559278f421 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -127,7 +127,7 @@ else {
 
 $disable_user = get_parameter ("disable_user", false);
 
-if (isset ($_GET["user_del"])) { //delete user
+if (isset ($_GET["user_del"]) && isset ($_GET["delete_user"])) { //delete user
 	$id_user = get_parameter ("delete_user", 0);
 	// Only allow delete user if is not the actual user
 	if ($id_user != $config['id_user']) {
@@ -197,16 +197,17 @@ elseif ($disable_user !== false) { //disable_user
 	else {
 		$result = false;
 	}
-	
-	if ($disable_user == 1) {
-		ui_print_result_message ($result, 
-			__('Successfully disabled'),
-			__('There was a problem disabling user'));
-	}
-	else {
-		ui_print_result_message ($result, 
-			__('Successfully enabled'),
-			__('There was a problem enabling user'));
+	if($result != null){
+		if ($disable_user == 1) {
+			ui_print_result_message ($result, 
+				__('Successfully disabled'),
+				__('There was a problem disabling user'));
+		}
+		else {
+			ui_print_result_message ($result, 
+				__('Successfully enabled'),
+				__('There was a problem enabling user'));
+		}
 	}
 }
 

From 8eb837803e6021f26826ac7e17a10e2004423e1c Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 17 Apr 2017 10:57:43 +0200
Subject: [PATCH 003/157] Add link to remote config column icons y agent view
 list - #124

---
 pandora_console/operation/agentes/estado_agente.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 1d711398d6..11fa2c26ba 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -587,11 +587,8 @@ foreach ($agents as $agent) {
 	
 	if (enterprise_installed()) {
 		enterprise_include_once('include/functions_config_agents.php');
-		
 		if (enterprise_hook('config_agents_has_remote_configuration',array($agent["id_agente"]))) {
-	
-	$data[9] = html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Remote config')));
-		
+			$data[9] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$agent["id_agente"].'&disk_conf=1">'.html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Remote config'))).'</a>';
 		}
 	}
 	

From 01a50a76af5a3f87e5a6deb181fa9a2b239ada96 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 20 Apr 2017 19:04:22 +0200
Subject: [PATCH 004/157] Change license activation popup color text - #133

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

diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index fea5aca60b..3ea4848003 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -2837,6 +2837,14 @@ div#agent_wizard_subtabs {
 	text-decoration: underline;
 }
 
+#code_license_dialog a:hover {
+	color:red;
+}
+
+#code_license_dialog *{
+	color: #222222;
+}
+
 /* GRAPHS CSS */
 
 .parent_graph {

From 29ac2191b798184ebbe2388f265747f1010fb4fc Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 25 Apr 2017 15:41:01 +0200
Subject: [PATCH 005/157] Disabled modules no longer appear in the search

---
 pandora_console/operation/search_modules.php | 282 ++++++++++---------
 1 file changed, 142 insertions(+), 140 deletions(-)

diff --git a/pandora_console/operation/search_modules.php b/pandora_console/operation/search_modules.php
index dd3785f8dd..0c1962b6d2 100644
--- a/pandora_console/operation/search_modules.php
+++ b/pandora_console/operation/search_modules.php
@@ -73,154 +73,156 @@ else {
 		'nombre', 'web_content_string');
 	
 	foreach ($modules as $module) {
-		$module["datos"] =
-			modules_get_last_value($module['id_agente_modulo']);
-		$module["module_name"] = $module['nombre'];
-		
-		//To search the monitor status
-		$status_sql = sprintf('SELECT estado from tagente_estado where id_agente_modulo =' . $module['id_agente_modulo']);
-		$status_sql = db_process_sql($status_sql);
-		$status_sql = $status_sql[0];
-		//To search the monitor utimestamp
-		$utimestamp_sql = sprintf('SELECT utimestamp from tagente_estado where id_agente_modulo =' . $module['id_agente_modulo']);
-		$utimestamp_sql = db_process_sql($utimestamp_sql);
-		$utimestamp_sql = $utimestamp_sql[0];
-		
-		
-		$agent = db_get_row ('tagente', 'id_agente', $module['id_agente']);
-		$agentCell = '<a title='.$module['agent_name'].' href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $module['id_agente'] . '">' .
-			$agent['alias'] . '</a>';
-		
-		$typeCell = ui_print_moduletype_icon($module["id_tipo_modulo"], true);
-		
-		$intervalCell = modules_get_interval ($module['id_agente_modulo']);
-		
-		if ($utimestamp_sql['utimestamp'] == 0 &&
-			(
-				($module['id_tipo_modulo'] < 21 || $module['id_tipo_modulo'] > 23) &&
-				$module['id_tipo_modulo'] != 100)
-			) {
-			$statusCell = ui_print_status_image(STATUS_MODULE_NO_DATA,
-				__('NOT INIT'), true);
-		}
-		elseif ($status_sql['estado'] == 0) {
-			$statusCell = ui_print_status_image(STATUS_MODULE_OK,
-				__('NORMAL') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
-		}
-		elseif ($status_sql['estado'] == 1) {
-			$statusCell = ui_print_status_image(STATUS_MODULE_CRITICAL,
-				__('CRITICAL') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
-		}
-		elseif ($status_sql['estado'] == 2) {
-			$statusCell = ui_print_status_image(STATUS_MODULE_WARNING,
-				__('WARNING') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
-		}
-		else {
-			$last_status = modules_get_agentmodule_last_status($module['id_agente_modulo']);
-			switch($last_status) {
-				case 0:
-					$statusCell = ui_print_status_image(
-						STATUS_MODULE_OK,
-						__('UNKNOWN') . " - " . __('Last status') .
-						" " . __('NORMAL') .": " . modules_get_last_value($module["id_agente_modulo"]),
-						true);
-					break;
-				case 1:
-					$statusCell = ui_print_status_image(
-						STATUS_MODULE_CRITICAL,
-						__('UNKNOWN') . " - " . __('Last status') .
-						" " . __('CRITICAL') . ": " . modules_get_last_value($module["id_agente_modulo"]),
-						true);
-					break;
-				case 2:
-					$statusCell = ui_print_status_image(
-						STATUS_MODULE_WARNING,
-						__('UNKNOWN') . " - " . __('Last status') .
-						" " . __('WARNING') . ": " . modules_get_last_value($module["id_agente_modulo"]),
-						true);
-					break;
+		if(!$module['disabled']){
+			$module["datos"] =
+				modules_get_last_value($module['id_agente_modulo']);
+			$module["module_name"] = $module['nombre'];
+			
+			//To search the monitor status
+			$status_sql = sprintf('SELECT estado from tagente_estado where id_agente_modulo =' . $module['id_agente_modulo']);
+			$status_sql = db_process_sql($status_sql);
+			$status_sql = $status_sql[0];
+			//To search the monitor utimestamp
+			$utimestamp_sql = sprintf('SELECT utimestamp from tagente_estado where id_agente_modulo =' . $module['id_agente_modulo']);
+			$utimestamp_sql = db_process_sql($utimestamp_sql);
+			$utimestamp_sql = $utimestamp_sql[0];
+			
+			
+			$agent = db_get_row ('tagente', 'id_agente', $module['id_agente']);
+			$agentCell = '<a title='.$module['agent_name'].' href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $module['id_agente'] . '">' .
+				$agent['alias'] . '</a>';
+			
+			$typeCell = ui_print_moduletype_icon($module["id_tipo_modulo"], true);
+			
+			$intervalCell = modules_get_interval ($module['id_agente_modulo']);
+			
+			if ($utimestamp_sql['utimestamp'] == 0 &&
+				(
+					($module['id_tipo_modulo'] < 21 || $module['id_tipo_modulo'] > 23) &&
+					$module['id_tipo_modulo'] != 100)
+				) {
+				$statusCell = ui_print_status_image(STATUS_MODULE_NO_DATA,
+					__('NOT INIT'), true);
+			}
+			elseif ($status_sql['estado'] == 0) {
+				$statusCell = ui_print_status_image(STATUS_MODULE_OK,
+					__('NORMAL') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
+			}
+			elseif ($status_sql['estado'] == 1) {
+				$statusCell = ui_print_status_image(STATUS_MODULE_CRITICAL,
+					__('CRITICAL') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
+			}
+			elseif ($status_sql['estado'] == 2) {
+				$statusCell = ui_print_status_image(STATUS_MODULE_WARNING,
+					__('WARNING') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
+			}
+			else {
+				$last_status = modules_get_agentmodule_last_status($module['id_agente_modulo']);
+				switch($last_status) {
+					case 0:
+						$statusCell = ui_print_status_image(
+							STATUS_MODULE_OK,
+							__('UNKNOWN') . " - " . __('Last status') .
+							" " . __('NORMAL') .": " . modules_get_last_value($module["id_agente_modulo"]),
+							true);
+						break;
+					case 1:
+						$statusCell = ui_print_status_image(
+							STATUS_MODULE_CRITICAL,
+							__('UNKNOWN') . " - " . __('Last status') .
+							" " . __('CRITICAL') . ": " . modules_get_last_value($module["id_agente_modulo"]),
+							true);
+						break;
+					case 2:
+						$statusCell = ui_print_status_image(
+							STATUS_MODULE_WARNING,
+							__('UNKNOWN') . " - " . __('Last status') .
+							" " . __('WARNING') . ": " . modules_get_last_value($module["id_agente_modulo"]),
+							true);
+						break;
+				}
 			}
-		}
-		
-		$graphCell = "";
-		if ($module['history_data'] == 1) {
 			
-			$graph_type = return_graphtype ($module["id_tipo_modulo"]);
+			$graphCell = "";
+			if ($module['history_data'] == 1) {
+				
+				$graph_type = return_graphtype ($module["id_tipo_modulo"]);
+				
+				$name_module_type = modules_get_moduletype_name ($module["id_tipo_modulo"]);
+				$handle = "stat" . $name_module_type . "_" . $module["id_agente_modulo"];
+				$url = 'include/procesos.php?agente=' . $module["id_agente_modulo"];
+				$win_handle = dechex(crc32($module["id_agente_modulo"] . $module["module_name"]));
+				
+				$link ="winopeng('" .
+					"operation/agentes/stat_win.php?" .
+					"type=$graph_type&" .
+					"period=" . SECONDS_1DAY . "&" .
+					"id=" . $module["id_agente_modulo"] . "&" .
+					"label=" . rawurlencode(
+						urlencode(
+							base64_encode($module["module_name"]))) . "&" .
+					"refresh=" . SECONDS_10MINUTES . "', " .
+					"'day_" . $win_handle . "')";
+				
+				$graphCell = '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => 0, "alt" => "")) . '</a>';
+				$graphCell .= "&nbsp;" .
+					"<a href='index.php?" .
+					"sec=estado&amp;" .
+					"sec2=operation/agentes/ver_agente&amp;" .
+					"id_agente=" . $module["id_agente"] . "&amp;" .
+					"tab=data_view&" .
+					"period=" . SECONDS_1DAY . "&amp;" .
+					"id=" . $module["id_agente_modulo"] . "'>" .
+					html_print_image('images/binary.png', true,
+						array("border" => "0", "alt" => "")) . "</a>";
+			}
 			
-			$name_module_type = modules_get_moduletype_name ($module["id_tipo_modulo"]);
-			$handle = "stat" . $name_module_type . "_" . $module["id_agente_modulo"];
-			$url = 'include/procesos.php?agente=' . $module["id_agente_modulo"];
-			$win_handle = dechex(crc32($module["id_agente_modulo"] . $module["module_name"]));
+			if (is_numeric(modules_get_last_value($module["id_agente_modulo"]))) {
+				$dataCell = format_numeric(modules_get_last_value($module["id_agente_modulo"]));
+			}
+			else {
+				$dataCell = ui_print_module_string_value(
+					$module["datos"], $module["id_agente_modulo"],
+					$module["current_interval"]);
+			}
 			
-			$link ="winopeng('" .
-				"operation/agentes/stat_win.php?" .
-				"type=$graph_type&" .
-				"period=" . SECONDS_1DAY . "&" .
-				"id=" . $module["id_agente_modulo"] . "&" .
-				"label=" . rawurlencode(
-					urlencode(
-						base64_encode($module["module_name"]))) . "&" .
-				"refresh=" . SECONDS_10MINUTES . "', " .
-				"'day_" . $win_handle . "')";
+			if ($module['estado'] == 3) {
+				$option = array ("html_attr" => 'class="redb"');
+			}
+			else {
+				$option = array ();
+			}
+			$timestampCell = ui_print_timestamp ($utimestamp_sql["utimestamp"], true, $option);
 			
-			$graphCell = '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => 0, "alt" => "")) . '</a>';
-			$graphCell .= "&nbsp;" .
-				"<a href='index.php?" .
-				"sec=estado&amp;" .
-				"sec2=operation/agentes/ver_agente&amp;" .
-				"id_agente=" . $module["id_agente"] . "&amp;" .
-				"tab=data_view&" .
-				"period=" . SECONDS_1DAY . "&amp;" .
-				"id=" . $module["id_agente_modulo"] . "'>" .
-				html_print_image('images/binary.png', true,
-					array("border" => "0", "alt" => "")) . "</a>";
-		}
-		
-		if (is_numeric(modules_get_last_value($module["id_agente_modulo"]))) {
-			$dataCell = format_numeric(modules_get_last_value($module["id_agente_modulo"]));
-		}
-		else {
-			$dataCell = ui_print_module_string_value(
-				$module["datos"], $module["id_agente_modulo"],
-				$module["current_interval"]);
-		}
-		
-		if ($module['estado'] == 3) {
-			$option = array ("html_attr" => 'class="redb"');
-		}
-		else {
-			$option = array ();
-		}
-		$timestampCell = ui_print_timestamp ($utimestamp_sql["utimestamp"], true, $option);
-		
-		
-		$group_agent = agents_get_agent_group($module['id_agente']);
-		
-		if (check_acl ($config['id_user'], $group_agent, "AW")) {
-			$edit_module = 'aaa';
 			
-			$url_edit = "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente="
-				. $module['id_agente'] . "&tab=module&id_agent_module=" . 
-				$module["id_agente_modulo"] . "&edit_module=1";
+			$group_agent = agents_get_agent_group($module['id_agente']);
 			
-			$edit_module = '<a href="' . $url_edit . '">' .
-				html_print_image("images/config.png", true) . '</a>';
+			if (check_acl ($config['id_user'], $group_agent, "AW")) {
+				$edit_module = 'aaa';
+				
+				$url_edit = "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente="
+					. $module['id_agente'] . "&tab=module&id_agent_module=" . 
+					$module["id_agente_modulo"] . "&edit_module=1";
+				
+				$edit_module = '<a href="' . $url_edit . '">' .
+					html_print_image("images/config.png", true) . '</a>';
+			}
+			else {
+				$edit_module = '';
+			}
+			
+			
+			array_push($table->data, array(
+				$module['module_name'],
+				$agentCell,
+				$typeCell,
+				$intervalCell,
+				$statusCell,
+				$graphCell,
+				$dataCell,
+				$timestampCell,
+				$edit_module));
 		}
-		else {
-			$edit_module = '';
-		}
-		
-		
-		array_push($table->data, array(
-			$module['module_name'],
-			$agentCell,
-			$typeCell,
-			$intervalCell,
-			$statusCell,
-			$graphCell,
-			$dataCell,
-			$timestampCell,
-			$edit_module));
 	}
 	
 	echo "<br />";

From 1bef3ab0de333e8d4d7245e8b413906c7632f734 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Thu, 4 May 2017 15:47:17 +0200
Subject: [PATCH 006/157] Fixed problems with pass when this pass containt
 blank spaces.

---
 pandora_console/mobile/include/user.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index fc72618056..b54059f04c 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -63,7 +63,9 @@ class User {
 			$user = $system->getRequest('user', null);
 			$password = $system->getRequest('password', null);
 			
-			$this->login($user, $password);
+			$nick = $system->safeInput($user);
+			$pass = $system->safeInput($password);
+			$this->login($nick, $pass);
 		}
 		
 		return $this->logged;
@@ -76,6 +78,7 @@ class User {
 			$user = $system->getRequest('user', null);
 			$user = $system->safeInput($user);
 			$password = $system->getRequest('password', null);
+			$password = $system->safeInput($password);
 		}
 		
 		if (!empty($user) && !empty($password)) {

From 09d6991c92090a31c2c8fbb17e8c94a93b4bcb2e Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Thu, 22 Jun 2017 17:00:30 +0200
Subject: [PATCH 007/157] Fixed agent lost in insert data

---
 pandora_console/extensions/insert_data.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index 3e52a9138c..4466be067e 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -167,6 +167,7 @@ function mainInsertData() {
 	$params['use_hidden_input_idagent'] = true;
 	$params['print_hidden_input_idagent'] = true;
 	$params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent';
+	$params['hidden_input_idagent_value'] = $id_agente;
 	
 	$table->data[0][1] = ui_print_agent_autocomplete_input($params);
 	

From b519cd46d34c4e1bd69a00fafce809db3d4fdaa6 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 29 Jun 2017 14:51:43 +0200
Subject: [PATCH 008/157] Added separation width to login fields

---
 pandora_console/general/login_page.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index da03d90f7d..1580ec4019 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -165,18 +165,22 @@ echo '<div class="login_page">';
 			}
 			else {
 				echo '<div class="login_nick">';
-				echo '<div>';
-					html_print_image ("/images/usuario_login.png", false);
-				echo '</div>';
-				html_print_input_text_extended ("nick", '', "nick", '', '', '' , false,
-					'', 'autocomplete="off" placeholder="'.__('User').'"');
+					echo '<div style="width:15%;">';
+						html_print_image ("/images/usuario_login.png", false);
+					echo '</div>';
+					echo '<div style="width:85%;">';
+						html_print_input_text_extended ("nick", '', "nick", '', '', '' , false,
+							'', 'autocomplete="off" placeholder="'.__('User').'"');
+					echo '</div>';
 				echo '</div>';
 				echo '<div class="login_pass">';
-				echo '<div>';
-					html_print_image ("/images/candado_login.png", false);
-				echo '</div>';
-				html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false,
-					'', 'autocomplete="off" placeholder="'.__('Password').'"', false, true);
+					echo '<div style="width:15%;">';
+						html_print_image ("/images/candado_login.png", false);
+					echo '</div>';
+					echo '<div style="width:85%;">';
+						html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false,
+							'', 'autocomplete="off" placeholder="'.__('Password').'"', false, true);
+					echo '</div>';
 				echo '</div>';
 				echo '<div class="login_button">';
 				html_print_submit_button(__("Login"), "login_button", false, 'class="sub next_login"');

From 342db3c4fbcd8ee4dd14c7a0f63c471d8f7d5fef Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 29 Jun 2017 17:33:29 +0200
Subject: [PATCH 009/157] Add column id_server to tgraph_source and fix
 metaconsole automatic_graph report_template - #1071

---
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 588a68da48..4d8634346c 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1370,3 +1370,21 @@ CREATE TABLE IF NOT EXISTS `treset_pass` (
 UPDATE tgis_map_connection SET conection_data = '{"type":"OSM","url":"http://tile.openstreetmap.org/${z}/${x}/${y}.png"}' where id_tmap_connection = 1;
 
 ALTER TABLE tpolicy_modules MODIFY post_process double(24,15) default 0;
+
+-- ---------------------------------------------------------------------
+-- Table `tgraph_source` column 'id_server'
+-- ---------------------------------------------------------------------
+
+START TRANSACTION;
+
+SET @st_oum707 = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'tgraph_source' AND table_schema = DATABASE() AND column_name = 'id_server') > 0,
+    "SELECT 1",
+	"ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default 0"
+));
+
+PREPARE pr_oum707 FROM @st_oum707;
+EXECUTE pr_oum707;
+DEALLOCATE PREPARE pr_oum707;
+
+COMMIT;

From 889045ff040cdd52a3c9e45c9d0860edeb99bc5d Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 10 Jul 2017 09:06:21 +0200
Subject: [PATCH 010/157] Removed event custom field (id)

---
 pandora_console/godmode/events/custom_events.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_console/godmode/events/custom_events.php b/pandora_console/godmode/events/custom_events.php
index 94e834bbf5..572dcc28da 100644
--- a/pandora_console/godmode/events/custom_events.php
+++ b/pandora_console/godmode/events/custom_events.php
@@ -149,7 +149,6 @@ $table->data = array();
 
 $fields_available = array();
 
-$fields_available['id_evento'] = __('Event id');
 $fields_available['evento'] = __('Event name');
 $fields_available['id_agente'] = __('Agent name');
 $fields_available['id_usuario'] = __('User');

From 75b82847b0c8fda7e4aa6f106fbae03ac122a5f0 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 10 Jul 2017 09:34:13 +0200
Subject: [PATCH 011/157] Fixed search field in agents list

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

diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 4fa9725bf9..200e69994a 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -180,8 +180,7 @@ echo "</tr></table>";
 $order_collation = "";
 switch ($config["dbtype"]) {
 	case "mysql":
-		$order_collation = "";
-		//$order_collation = "COLLATE utf8_general_ci";
+		$order_collation = "COLLATE utf8_general_ci";
 		break;
 	case "postgresql":
 	case "oracle":
@@ -275,6 +274,7 @@ switch ($sortField) {
 }
 
 $search_sql = '';
+
 if ($search != "") {
 	$sql = "SELECT DISTINCT taddress_agent.id_agent FROM taddress
 	INNER JOIN taddress_agent ON

From d0bd0b3a3b82a7639e91128c21377a13a84a8783 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 10 Jul 2017 12:46:02 +0200
Subject: [PATCH 012/157] Changed field in sql request

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

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index d7926d2266..f10f7d1a42 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -1722,7 +1722,7 @@ function modules_get_agentmodule_data ($id_agent_module, $period,
 			break;
 		//log4x
 		case 24:
-			$sql = sprintf ("SELECT datos AS data, utimestamp
+			$sql = sprintf ("SELECT stacktrace AS data, utimestamp
 				FROM tagente_datos_log4x
 				WHERE id_agente_modulo = %d
 					AND utimestamp > %d AND utimestamp <= %d

From 1b766f8ce29e6fc8711adb3ea2d9b845cf3cb1ba Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 10 Jul 2017 16:22:41 +0200
Subject: [PATCH 013/157] Fixed events filter from agent events graph

---
 pandora_console/include/functions_graph.php   | 14 ++++++---
 .../include/graphs/flot/pandora.flot.js       | 30 ++++++++++++++-----
 .../include/graphs/functions_flot.php         |  7 +++--
 .../agentes/estado_generalagente.php          |  2 +-
 .../operation/events/events_list.php          |  2 --
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index d3845a51eb..a3ce5ad993 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -3565,7 +3565,7 @@ function graph_custom_sql_graph ($id, $width, $height,
  * @param string homeurl
  * @param bool return or echo the result
  */
-function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $homeurl, $return = false) {
+function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $homeurl, $return = false, $from_agent_view = false) {
 	global $config;
 	global $graphic_type;
 	
@@ -3582,13 +3582,14 @@ function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $ho
 	$data = array ();
 	$legend = array();
 	$full_legend = array();
+	$full_legend_date = array();
 	
 	$cont = 0;
 	for ($i = 0; $i < $interval; $i++) {
 		$bottom = $datelimit + ($periodtime * $i);
 		if (! $graphic_type) {
 			if ($config['flash_charts']) {
-				$name = date('H:i', $bottom);
+				$name = date('H:i:s', $bottom);
 			}
 			else {
 				$name = date('H\h', $bottom);
@@ -3602,6 +3603,11 @@ function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $ho
 		if ($cont == 0 or $cont % 2)
 			$legend[$cont] = $name;
 		
+		if ($from_agent_view) {
+			$full_date = date('Y/m/d', $bottom);
+			$full_legend_date[$cont] = $full_date;
+		}
+
 		$full_legend[$cont] = $name;
 		
 		$top = $datelimit + ($periodtime * ($i + 1));
@@ -3630,12 +3636,12 @@ function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $ho
 		}
 		$cont++;
 	}
-	
+
 	$colors = array(1 => COL_NORMAL, 2 => COL_WARNING, 3 => COL_CRITICAL, 4 => COL_UNKNOWN);
 	
 	// Draw slicebar graph
 	if ($config['flash_charts']) {
-		$out = flot_slicesbar_graph($data, $period, $width, $height, $full_legend, $colors, $config['fontpath'], $config['round_corner'], $homeurl, '', '', false, $id_agent);
+		$out = flot_slicesbar_graph($data, $period, $width, $height, $full_legend, $colors, $config['fontpath'], $config['round_corner'], $homeurl, '', '', false, $id_agent, $full_legend_date);
 	}
 	else {
 		$out = slicesbar_graph($data, $period, $width, $height, $colors, $config['fontpath'], $config['round_corner'], $homeurl);
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 5595b93f5b..8b4ddca948 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -608,13 +608,16 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
 	}
 }
 
-function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumulate_data, intervaltick, water_mark, maxvalue, separator, separator2, graph_javascript, id_agent) {
+function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumulate_data, intervaltick, water_mark, maxvalue, separator, separator2, graph_javascript, id_agent, full_legend) {
 	values = values.split(separator2);
 	labels = labels.split(separator);
 	legend = legend.split(separator);
 	acumulate_data = acumulate_data.split(separator);
 	datacolor = datacolor.split(separator);
-
+	if (full_legend != "") {
+		full_legend = full_legend.split(separator);
+	}
+	console.log(full_legend);
 	// Check possible adapt_keys on classes
 	check_adaptions(graph_id);
 
@@ -692,15 +695,28 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 			var to = legend[item.seriesIndex+1];
 			//current date
 			var dateObj = new Date();
-			var month = dateObj.getUTCMonth() + 1; //months from 1-12
-			var day = dateObj.getUTCDate();
-			var year = dateObj.getUTCFullYear();
-				newdate = year + "/" + month + "/" + day;
 
+			if (full_legend != "") {
+				newdate = full_legend[item.seriesIndex];
+				newdate2 = full_legend[item.seriesIndex+1];
+			}
+			else {
+				var month = dateObj.getUTCMonth() + 1; //months from 1-12
+				var day = dateObj.getUTCDate();
+				var year = dateObj.getUTCFullYear();
+					newdate = year + "/" + month + "/" + day;
+			}
+			
 			if(!to){
 				to= '23:59';
 			}
-			window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&date_to='+newdate+'&time_to='+to+'&status=-1';
+
+			if (full_legend != "") {
+				window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&date_to='+newdate2+'&time_to='+to+'&status=-1';
+			}
+			else {
+				window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&date_to='+newdate+'&time_to='+to+'&status=-1';
+			}
 		}
 	});
 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 22a6de27b0..243412fe08 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -846,7 +846,7 @@ function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $lon
 	return $return;
 }
 
-function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $colors, $fontpath, $round_corner, $homeurl, $watermark = '', $adapt_key = '', $stat_win = false, $id_agent = 0) {
+function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $colors, $fontpath, $round_corner, $homeurl, $watermark = '', $adapt_key = '', $stat_win = false, $id_agent = 0, $full_legend_date = array()) {
 	global $config;
 	
 	include_javascript_dependencies_flot_graph();
@@ -943,6 +943,9 @@ function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $
 	$labels = implode($separator,$labels);
 	$datacolor = implode($separator,$datacolor);
 	$legend = io_safe_output(implode($separator,$legend));
+	if (!empty($full_legend_date)) {
+		$full_legend_date = io_safe_output(implode($separator,$full_legend_date));
+	}
 	$acumulate_data = io_safe_output(implode($separator,$acumulate_data));
 	
 	// Store data series in javascript format
@@ -966,7 +969,7 @@ function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $
 	// Javascript code
 	$return .= "<script type='text/javascript'>";
 	$return .= "//<![CDATA[\n";
-	$return .= "pandoraFlotSlicebar('$graph_id', '$values', '$datacolor', '$labels', '$legend', '$acumulate_data', $intervaltick, false, $max, '$separator', '$separator2', '', $id_agent)";
+	$return .= "pandoraFlotSlicebar('$graph_id', '$values', '$datacolor', '$labels', '$legend', '$acumulate_data', $intervaltick, false, $max, '$separator', '$separator2', '', $id_agent, '$full_legend_date')";
 	$return .= "\n//]]>";
 	$return .= "</script>";
 	
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 9cb2c5d0da..23b5dabed8 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -602,7 +602,7 @@ $data[0][0] .=
 			__('Events (24h)') .
 		'</th></tr>' .
 		'<tr><td style="text-align:center;"><br />' .
-		graph_graphic_agentevents ($id_agente, 450, 15, SECONDS_1DAY, '', true) . 
+		graph_graphic_agentevents ($id_agente, 450, 15, SECONDS_1DAY, '', true, true) . 
 		'<br /></td></tr>' . 
 	'</table>';
 
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index b2ba0a338e..a9574b21bf 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -543,8 +543,6 @@ $table_advanced->rowclass[] = '';
 $data = array();
 $data[0] = __('Date from') . $jump;
 
-//~ $user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all());
-
 $data[0] .= html_print_input_text ('date_from', $date_from, '', 15, 10, true);
 
 $data[1] = __('Date to') . $jump;

From d9e6585234a123389b7175d1eaebd9ceb32239db Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 12 Jul 2017 11:20:19 +0200
Subject: [PATCH 014/157] Change agent / module icons height a width - #1114

---
 pandora_console/extensions/agents_modules.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php
index 2c7a9147b8..cb6fe8cd42 100644
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@@ -528,24 +528,24 @@ function mainAgentsModules() {
 					echo '<a href="javascript:'.$link.'">';
 					switch ($status) {
 						case AGENT_MODULE_STATUS_NORMAL:
-							ui_print_status_image ('module_ok.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+							ui_print_status_image ('module_ok.png', modules_get_last_value($module_id), false);
 							break;
 						case AGENT_MODULE_STATUS_CRITICAL_BAD:
-							ui_print_status_image ('module_critical.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+							ui_print_status_image ('module_critical.png', modules_get_last_value($module_id), false);
 							break;
 						case AGENT_MODULE_STATUS_WARNING:
-							ui_print_status_image ('module_warning.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+							ui_print_status_image ('module_warning.png', modules_get_last_value($module_id), false);
 							break;
 						case AGENT_MODULE_STATUS_UNKNOWN:
-							ui_print_status_image ('module_unknown.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+							ui_print_status_image ('module_unknown.png', modules_get_last_value($module_id), false);
 							break;
 						case AGENT_MODULE_STATUS_NORMAL_ALERT:
 						case AGENT_MODULE_STATUS_WARNING_ALERT:
 						case AGENT_MODULE_STATUS_CRITICAL_ALERT:
-							ui_print_status_image ('module_alertsfired.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+							ui_print_status_image ('module_alertsfired.png', modules_get_last_value($module_id), false);
 							break;
 						case 4:
-							ui_print_status_image ('module_no_data.png', modules_get_last_value($module_id), false, array('width' => '20px', 'height' => '20px'));
+							ui_print_status_image ('module_no_data.png', modules_get_last_value($module_id), false);
 							break;
 					}
 					echo '</a>';

From 9db5669f163c9c43a1f3c0d9544a53d84bd685c2 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 12 Jul 2017 11:51:00 +0200
Subject: [PATCH 015/157] Added item in button palette with default fields

---
 .../visual_console_builder.editor.js          |   7 +++
 .../visual_console_builder.elements.php       |   5 +++
 .../images/auto_sla_graph.disabled.png        | Bin 0 -> 410 bytes
 pandora_console/images/auto_sla_graph.png     | Bin 0 -> 410 bytes
 pandora_console/include/constants.php         |   1 +
 .../include/functions_visual_map.php          |   4 ++
 .../include/functions_visual_map_editor.php   |  41 +++++++++++-------
 pandora_console/include/styles/pandora.css    |   6 +++
 8 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 pandora_console/images/auto_sla_graph.disabled.png
 create mode 100644 pandora_console/images/auto_sla_graph.png

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 4926a215ca..5b7b801f8b 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1346,6 +1346,9 @@ function hiddenFields(item) {
 	$("#process_value_row").css('display', 'none');
 	$("#process_value_row." + item).css('display', '');
 
+	$("#event_max_time_row").css('display', 'none');
+	$("#event_max_time_row." + item).css('display', '');
+
 	$("#background_row_1").css('display', 'none');
 	$("#background_row_1." + item).css('display', '');
 
@@ -3218,6 +3221,10 @@ function click_button_toolbox(id) {
 			toolbuttonActive = creationItem = 'module_graph';
 			toggle_item_palette();
 			break;
+		case 'auto_sla_graph':
+			toolbuttonActive = creationItem = 'auto_sla_graph';
+			toggle_item_palette();
+			break;
 		case 'simple_value':
 			toolbuttonActive = creationItem = 'simple_value';
 			toggle_item_palette();
diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php
index 12b38df2b3..747a293de4 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.elements.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php
@@ -152,6 +152,11 @@ foreach ($layoutDatas as $layoutData) {
 				html_print_image('images/chart_curve.png', true,
 					array('title' => __('Module Graph')));
 			break;
+		case AUTO_SLA_GRAPH:
+			$table->data[$i + 1]['icon'] =
+				html_print_image('images/auto_sla_graph.png', true,
+					array('title' => __('Auto SLA Graph')));
+			break;
 		case SIMPLE_VALUE:
 			$table->data[$i + 1]['icon'] =
 				html_print_image('images/binary.png', true,
diff --git a/pandora_console/images/auto_sla_graph.disabled.png b/pandora_console/images/auto_sla_graph.disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3f0e4fe86d5d2dd73c5d5081c29eb7a48025760
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq000#L000#T1^@s7-Vl`l0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzJV``BRCwBAU_b{qZ{2Rd5CjMy2As;6
zkOct(2wjB(1K9u|fN+}mAK7dWAK3-_VGLx!4LFU#2>=3!5vnQxNaf>EcR^iEwGhKd
zAX@;$M-Bm)JVtl{P51z%51`AjK<N+Y4#wsIMl=QJZvOzZArQs^2q2;nEF{(gDFHm{
z0%2|y09xY+)nowWA3%z;0v0T~&tvlguB3GVT>zUxM{MrJY9i2minx6JpFrp|Voh4a
z#Lj*+CpeNEGXMcb6U2z*#P<ZEoEXpu^jZUQjDrk3fX%-^3-1Fd1*Dv1h^08$PbhVu
zX91Xj2ha_~2AGKO5-3qWfU+HkDJ=;a3JN12l?Y3^P(EIOo{I!<6t@a6gK@|k;4(B2
zDv3=~JrWy~w-4gT8WS*5K3W8UEC|43D5%VuK)1vX02Y{qf?{ctjsO4v07*qoM6N<$
Eg0DG{HUIzs

literal 0
HcmV?d00001

diff --git a/pandora_console/images/auto_sla_graph.png b/pandora_console/images/auto_sla_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e769284000b5e0ec92bc95c3c279b5d36a0c280
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq000#L000#T1^@s7-Vl`l0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzJV``BRCwBAU_b}<_Vx`Jf&c-;fKwS0
zvLHYJp{sCUAR7P#5Kc4yBbyE4BfDTfjDak;0jDuI0YCsTLRAF-seC-@E*v~~un@yY
zAX@;$M-Bm)JVtl{P51z%51`AjK<N+Y4#wsIMl=QJZvOzZArQs^2q2;nEF{(gDFHm{
z0%2|y09xY+)nowWA3%z;0v0T~&tvlguB3GVT>zUxM{MrJY9i2minx6JpFrp|Voh4a
z#Lj*+CpeNEGXMcb6U2z*#P<ZEoEXpu^jZUQjDrk3fX%-^3-1Fd1*Dv1h^08$PbhVu
zX91Xj2ha_~2AGKO5-3qWfU+HkDJ=;a3JN12l?Y3^P(EIOo{I!<6t@a6gK@|k;4(B2
zDv3=~JrWy~w-4gT8WS*5K3W8UEC|43D5%VuK)1vX0H?=ja^P>viU0rr07*qoM6N<$
Eg5m0rhyVZp

literal 0
HcmV?d00001

diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index cee055d867..6284b5c3a7 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -185,6 +185,7 @@ define('AGENT_STATUS_WARNING',		2);
 define('STATIC_GRAPH',		0);
 define('PERCENTILE_BAR',	3);
 define('MODULE_GRAPH',		1);
+define('AUTO_SLA_GRAPH',	14);
 define('SIMPLE_VALUE',		2);
 define('LABEL',				4);
 define('ICON',				5);
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 60125340ff..a92ce3f731 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -2746,6 +2746,10 @@ function visual_map_create_internal_name_item($label = null, $type, $image, $age
 			case MODULE_GRAPH:
 				$text = __('Module graph');
 				break;
+			case 'auto_sla_graph':
+			case AUTO_SLA_GRAPH:
+				$text = __('Auto SLA Graph');
+				break;
 			case 'percentile_bar':
 			case PERCENTILE_BAR:
 				$text = __('Percentile bar');
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 42772adf28..46aa26e287 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -54,6 +54,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				'static_graph' => __('Static Graph'),
 				'percentile_item' => __('Percentile Item'),
 				'module_graph' => __('Graph'),
+				'auto_sla_graph' => __('Auto SLA Graph'),
 				'simple_value' => __('Simple value') . ui_print_help_tip(__("To use 'label'field, you should write
 					a text to replace '(_VALUE_)' and the value of the module will be printed at the end."), true),
 				'label' => __('Label'),
@@ -276,7 +277,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['agent_row'] = array();
 			$form_items['agent_row']['items'] = array('static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'datos');
+				'simple_value', 'datos', 'auto_sla_graph');
 			$form_items['agent_row']['html'] = '<td align="left">' .
 				__('Agent') . '</td>';			
 			$params = array();
@@ -306,28 +307,38 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 					ui_print_agent_autocomplete_input($params) .
 				'</td>';
 			
-			
 			$form_items['module_row'] = array();
 			$form_items['module_row']['items'] = array('static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'datos');
+				'simple_value', 'datos', 'auto_sla_graph');
 			$form_items['module_row']['html'] = '<td align="left">' .
 				__('Module') . '</td>
 				<td align="left">' .
 				html_print_select(array(), 'module', '', '', __('Any'), 0, true) .
 				'</td>';
+
+			$event_times = array(86400 => __('24h'),
+								28800 => __('8h'),
+								7200 => __('2h'),
+								3600 => __('1h'),);
+			$form_items['event_max_time_row'] = array();
+			$form_items['event_max_time_row']['items'] = array('auto_sla_graph');
+			$form_items['event_max_time_row']['html'] = '<td align="left">' .
+				__('Max. Time') . '</td>
+				<td align="left">' .
+				html_print_select($event_times, 'event_max_time_row', '', '', 0, 86400, true, false, false) .
+				'</td>';
 				
-				
-				$form_items['type_graph'] = array();
-				$form_items['type_graph']['items'] = array(
-					'Line',
-					'Area');
-				$form_items['type_graph']['html'] = '<td align="left"><span>' .
-					__('Type of graph') . '</span></td>
-					<td align="left">'. html_print_select (
-						array ('line' => __('Line'), 
-						'area' => __('Area')),
-						'type_graph', '', '', 0, 'area', true, false, false) . '</td>';
+			$form_items['type_graph'] = array();
+			$form_items['type_graph']['items'] = array(
+				'Line',
+				'Area');
+			$form_items['type_graph']['html'] = '<td align="left"><span>' .
+				__('Type of graph') . '</span></td>
+				<td align="left">'. html_print_select (
+					array ('line' => __('Line'), 
+					'area' => __('Area')),
+					'type_graph', '', '', 0, 'area', true, false, false) . '</td>';
 			
 			$own_info = get_user_info($config['id_user']);
 			if (!$own_info['is_admin'] && !check_acl ($config['id_user'], 0, "PM"))
@@ -654,6 +665,7 @@ function visual_map_editor_print_toolbox() {
 		visual_map_print_button_editor('static_graph', __('Static Graph'), 'left', false, 'camera_min', true);
 		visual_map_print_button_editor('percentile_item', __('Percentile Item'), 'left', false, 'percentile_item_min', true);
 		visual_map_print_button_editor('module_graph', __('Module Graph'), 'left', false, 'graph_min', true);
+		visual_map_print_button_editor('auto_sla_graph', __('Auto SLA Graph'), 'left', false, 'auto_sla_graph_min', true);
 		visual_map_print_button_editor('simple_value', __('Simple Value'), 'left', false, 'binary_min', true);
 		visual_map_print_button_editor('label', __('Label'), 'left', false, 'label_min', true);
 		visual_map_print_button_editor('icon', __('Icon'), 'left', false, 'icon_min', true);
@@ -672,7 +684,6 @@ function visual_map_editor_print_toolbox() {
 		
 		$text_autosave = html_print_input_hidden ('auto_save', true, true);
 		visual_map_print_item_toolbox('auto_save', $text_autosave, 'right');
-		//visual_map_print_button_editor('save_visualmap', __('Save'), 'right', true, 'save_min', true);
 		visual_map_print_button_editor('show_grid', __('Show grid'), 'right', true, 'grid_min', true);
 		visual_map_print_button_editor('edit_item', __('Update item'), 'right', true, 'config_min', true);
 		visual_map_print_button_editor('delete_item', __('Delete item'), 'right', true, 'delete_min', true);
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index b07a95f79b..9074f8f4a0 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -778,6 +778,12 @@ input.percentile_item_min {
 input.percentile_item_min[disabled] {
 	background: #fefefe url(../../images/percentile_item.disabled.png) no-repeat center !important;
 }
+input.auto_sla_graph_min {
+	background: #fefefe url(../../images/auto_sla_graph.png) no-repeat center !important;
+}
+input.auto_sla_graph_min[disabled] {
+	background: #fefefe url(../../images/auto_sla_graph.disabled.png) no-repeat center !important;
+}
 input.binary_min {
 	background: #fefefe url(../../images/binary.png) no-repeat center !important;
 }

From 63d07e1416721e94baec3f2c590d4d2e049744a3 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 12 Jul 2017 13:34:20 +0200
Subject: [PATCH 016/157] Added more things to new vc item

---
 .../visual_console_builder.editor.js          | 35 +++++++++-
 .../visual_console_builder.elements.php       |  1 +
 .../ajax/visual_console_builder.ajax.php      | 70 ++++++++++++++++++-
 3 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 5b7b801f8b..fb28c0afb3 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -515,9 +515,10 @@ function readFields() {
 	values['parent'] = $("select[name=parent]").val();
 	values['map_linked'] = $("select[name=map_linked]").val();
 	values['width_percentile'] = $("input[name=width_percentile]").val();
-	values['max_percentile'] = $("input[name=max_percentile]").val();
+	values['max_percentile'] = parseInt($("input[name=max_percentile]").val());
 	values['width_module_graph'] = $("input[name=width_module_graph]").val();
 	values['height_module_graph'] = $("input[name=height_module_graph]").val();
+	values['event_max_time_row'] = $("select[name=event_max_time_row]").val();
 	values['type_percentile'] = $("input[name=type_percentile]:checked").val();
 	values['value_show'] = $("input[name=value_show]:checked").val();
 	values['enable_link'] = $("input[name=enable_link]").is(':checked') ? 1 : 0;
@@ -587,6 +588,16 @@ function create_button_palette_callback() {
 				validate = false;
 			}
 			break;
+		case 'auto_sla_graph':
+			if ((values['agent'] == '')) {
+				alert($("#message_alert_no_agent").html());
+				validate = false;
+			}
+			if ((values['module'] == 0)) {
+				alert($("#message_alert_no_module").html());
+				validate = false;
+			}
+			break;
 		case 'label':
 			if ((values['label'] == '')) {
 				alert($("#message_alert_no_label").html());
@@ -1783,6 +1794,17 @@ function setPercentileBar(id_data, values) {
 	});
 }
 
+function setEventsBar(id_data, values) {
+	metaconsole = $("input[name='metaconsole']").val();
+
+	var url_hack_metaconsole = '';
+	if (is_metaconsole()) {
+		url_hack_metaconsole = '../../';
+	}
+
+	$("#image_" + id_data).attr('src', data);
+}
+
 function setPercentileBubble(id_data, values) {
 	metaconsole = $("input[name='metaconsole']").val();
 
@@ -2094,6 +2116,17 @@ function createItem(type, values, id_data) {
 
 			set_static_graph_status(id_data, values['image']);
 
+			break;
+		case 'auto_sla_graph':
+			var sizeStyle = '';
+			var imageSize = '';
+			item = $('<div id="' + id_data + '" class="item" style="text-align: left; position: absolute; display: inline-block; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+							'<table><tr><td></td></tr><tr><td><span id="text_' + id_data + '" class="text">' + values['label'] + '</span></td></tr><tr><td></td></tr></table>' +
+							'<img class="image" id="image_' + id_data + '" src="images/spinner.gif" />' +
+							'</div>'
+					);
+
+			setEventsBar(id_data, values);
 			break;
 		case 'percentile_bar':
 		case 'percentile_item':
diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php
index 747a293de4..15134a9c1d 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.elements.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php
@@ -470,6 +470,7 @@ foreach ($layoutDatas as $layoutData) {
 	switch ($layoutData['type']) {
 		case LINE_ITEM:
 		case BOX_ITEM:
+		case AUTO_SLA_GRAPH:
 			$table->data[$i + 2][4] = "";
 			break;
 		default:
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 2a786200ad..b096212b26 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -95,6 +95,7 @@ $top = get_parameter('top', null);
 $agent = get_parameter('agent', null);
 $id_module = get_parameter('module', null);
 $period = get_parameter('period', null);
+$event_max_time_row = get_parameter('event_max_time_row', null);
 $width = get_parameter('width', null);
 $height = get_parameter('height', null);
 $parent = get_parameter('parent', null);
@@ -139,7 +140,70 @@ switch ($action) {
 		echo json_encode($return);
 		break;
 	
-	
+	case 'get_module_events':
+		$data = array ();
+		
+		$resolution = $config['graph_res'] * ($event_max_time_row * 2 / 450); // Number of "slices" we want in graph
+		
+		$interval = (int) ($event_max_time_row / $resolution);
+		$date = get_system_time ();
+		$datelimit = $date - $event_max_time_row;
+		$periodtime = floor ($event_max_time_row / $interval);
+		$time = array ();
+		$data = array ();
+		$legend = array();
+		$full_legend = array();
+
+		$cont = 0;
+		for ($i = 0; $i < $interval; $i++) {
+			$bottom = $datelimit + ($periodtime * $i);
+			
+			$name = date('H:i', $bottom);
+			
+			// Show less values in legend
+			if ($cont == 0 or $cont % 2)
+				$legend[$cont] = $name;
+			
+			$full_legend[$cont] = $name;
+			
+			$top = $datelimit + ($periodtime * ($i + 1));
+			$event = db_get_row_filter ('tevento',
+				array ('id_agente' => $id_agent,
+					'id_agentmodule' => $id_module,
+					'utimestamp > '.$bottom,
+					'utimestamp < '.$top), 'criticity, utimestamp');
+			
+			if (!empty($event['utimestamp'])) {
+				$data[$cont]['utimestamp'] = $periodtime;
+				switch ($event['criticity']) {
+					case EVENT_CRIT_WARNING:
+						$data[$cont]['data'] = 2;
+						break;
+					case EVENT_CRIT_CRITICAL:
+						$data[$cont]['data'] = 3;
+						break;
+					default:
+						$data[$cont]['data'] = 1;
+						break;
+				}
+			}
+			else {
+				$data[$cont]['utimestamp'] = $periodtime;
+				$data[$cont]['data'] = 1;
+			}
+			$cont++;
+		}
+
+		$colors = array(1 => COL_NORMAL, 2 => COL_WARNING, 3 => COL_CRITICAL, 4 => COL_UNKNOWN);
+
+		$out = flot_slicesbar_graph($data, $period, 450, 15, $full_legend, $colors, $config['fontpath'], $config['round_corner'], $homeurl, '', '', false, $id_agent);
+		html_debug($out, true);
+		if (!$out) {
+			$out = array();
+		}
+
+		echo json_encode($out);
+		break;
 	
 	case 'get_image_sparse':
 		//Metaconsole db connection
@@ -868,6 +932,10 @@ switch ($action) {
 				}
 				$values['period'] = $period;
 				break;
+			case 'auto_sla_graph':
+				$values['type'] = AUTO_SLA_GRAPH;
+				$values['period'] = $event_max_time_row;
+				break;
 			case 'percentile_item':
 			case 'percentile_bar': 
 				if ($type_percentile == 'percentile') {

From 19caa3ebfbef1176fbe762246f8d78dfcd3417b3 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 13 Jul 2017 12:26:13 +0200
Subject: [PATCH 017/157] Added js image

---
 .../visual_console_builder.editor.js          | 40 +++++++++-
 .../ajax/visual_console_builder.ajax.php      | 76 ++++++-------------
 .../include/functions_visual_map_editor.php   |  6 +-
 3 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index fb28c0afb3..f49ea8e58b 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1795,14 +1795,46 @@ function setPercentileBar(id_data, values) {
 }
 
 function setEventsBar(id_data, values) {
-	metaconsole = $("input[name='metaconsole']").val();
-
 	var url_hack_metaconsole = '';
 	if (is_metaconsole()) {
 		url_hack_metaconsole = '../../';
 	}
 
-	$("#image_" + id_data).attr('src', data);
+	parameter = Array();
+
+	parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
+	parameter.push ({name: "action", value: "get_module_events"});
+	parameter.push ({name: "id_agent", value: values['id_agent']});
+	parameter.push ({name: "id_agent_module", value: values['module']});
+	if (is_metaconsole()) {
+		parameter.push ({name: "id_metaconsole", value: id_metaconsole});
+	}
+	parameter.push ({name: "period", value: values['event_max_time_row']});
+	parameter.push ({name: "id_visual_console", value: id_visual_console});
+	jQuery.ajax({
+		url: get_url_ajax(),
+		data: parameter,
+		type: "POST",
+		dataType: 'json',
+		success: function (data) {
+			console.log(data);
+			if (data['no_data'] == true) {
+				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module_graph.png');
+			}
+			else {
+				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module_graph.png');
+				
+				if($('#text-width').val() == 0 || $('#text-height').val() == 0){
+					$("#" + id_data + " img").css('width', '300px');
+					$("#" + id_data + " img").css('height', '180px');
+				}
+				else{
+					$("#" + id_data + " img").css('width', $('#text-width').val()+'px');
+					$("#" + id_data + " img").css('height', $('#text-height').val()+'px');
+				}
+			}
+		}
+	});
 }
 
 function setPercentileBubble(id_data, values) {
@@ -2123,7 +2155,7 @@ function createItem(type, values, id_data) {
 			item = $('<div id="' + id_data + '" class="item" style="text-align: left; position: absolute; display: inline-block; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
 							'<table><tr><td></td></tr><tr><td><span id="text_' + id_data + '" class="text">' + values['label'] + '</span></td></tr><tr><td></td></tr></table>' +
 							'<img class="image" id="image_' + id_data + '" src="images/spinner.gif" />' +
-							'</div>'
+					'</div>'
 					);
 
 			setEventsBar(id_data, values);
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index b096212b26..33f36b8c7a 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -143,66 +143,36 @@ switch ($action) {
 	case 'get_module_events':
 		$data = array ();
 		
-		$resolution = $config['graph_res'] * ($event_max_time_row * 2 / 450); // Number of "slices" we want in graph
-		
-		$interval = (int) ($event_max_time_row / $resolution);
 		$date = get_system_time ();
 		$datelimit = $date - $event_max_time_row;
-		$periodtime = floor ($event_max_time_row / $interval);
-		$time = array ();
-		$data = array ();
-		$legend = array();
-		$full_legend = array();
 
-		$cont = 0;
-		for ($i = 0; $i < $interval; $i++) {
-			$bottom = $datelimit + ($periodtime * $i);
-			
-			$name = date('H:i', $bottom);
-			
-			// Show less values in legend
-			if ($cont == 0 or $cont % 2)
-				$legend[$cont] = $name;
-			
-			$full_legend[$cont] = $name;
-			
-			$top = $datelimit + ($periodtime * ($i + 1));
-			$event = db_get_row_filter ('tevento',
-				array ('id_agente' => $id_agent,
-					'id_agentmodule' => $id_module,
-					'utimestamp > '.$bottom,
-					'utimestamp < '.$top), 'criticity, utimestamp');
-			
-			if (!empty($event['utimestamp'])) {
-				$data[$cont]['utimestamp'] = $periodtime;
-				switch ($event['criticity']) {
-					case EVENT_CRIT_WARNING:
-						$data[$cont]['data'] = 2;
-						break;
-					case EVENT_CRIT_CRITICAL:
-						$data[$cont]['data'] = 3;
-						break;
-					default:
-						$data[$cont]['data'] = 1;
-						break;
+		$events = db_get_row_filter ('tevento',
+			array ('id_agente' => $id_agent,
+				'id_agentmodule' => $id_module,
+				'utimestamp > ' . $datelimit,
+				'utimestamp < ' . $date), 'criticity, utimestamp');
+		html_debug($events, true);
+
+		$return = array();
+		if (!$events) {
+			$return['no_data'] = true;
+			if (!empty($id_metaconsole)) {
+				$connection = db_get_row_filter ('tmetaconsole_setup',
+					$id_metaconsole);
+				if (metaconsole_load_external_db($connection) != NOERR) {
+					continue;
 				}
 			}
-			else {
-				$data[$cont]['utimestamp'] = $periodtime;
-				$data[$cont]['data'] = 1;
+			$return['url'] = true;
+			if (!empty($id_metaconsole)) {
+				metaconsole_restore_db();
 			}
-			$cont++;
+		}
+		else {
+			$return['no_data'] = false;
 		}
 
-		$colors = array(1 => COL_NORMAL, 2 => COL_WARNING, 3 => COL_CRITICAL, 4 => COL_UNKNOWN);
-
-		$out = flot_slicesbar_graph($data, $period, 450, 15, $full_legend, $colors, $config['fontpath'], $config['round_corner'], $homeurl, '', '', false, $id_agent);
-		html_debug($out, true);
-		if (!$out) {
-			$out = array();
-		}
-
-		echo json_encode($out);
+		echo json_encode($return);
 		break;
 	
 	case 'get_image_sparse':
@@ -935,6 +905,8 @@ switch ($action) {
 			case 'auto_sla_graph':
 				$values['type'] = AUTO_SLA_GRAPH;
 				$values['period'] = $event_max_time_row;
+				$values['width'] = $width;
+				$values['height'] = $height;
 				break;
 			case 'percentile_item':
 			case 'percentile_bar': 
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 46aa26e287..5f8e43f3f6 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -510,7 +510,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items_advance['position_row'] = array();
 			$form_items_advance['position_row']['items'] = array('static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'label', 'icon', 'datos', 'box_item');
+				'simple_value', 'label', 'icon', 'datos', 'box_item',
+				'auto_sla_graph');
 			$form_items_advance['position_row']['html'] = '
 				<td align="left">' . __('Position') . '</td>
 				<td align="left">(' . html_print_input_text('left', '0', '', 3, 5, true) .
@@ -521,7 +522,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items_advance['size_row'] = array();
 			$form_items_advance['size_row']['items'] = array(
 				'group_item', 'background',
-				'static_graph', 'icon datos');
+				'static_graph', 'icon datos',
+				'auto_sla_graph');
 			$form_items_advance['size_row']['html'] = '<td align="left">' .
 				__('Size') .
 				ui_print_help_tip (

From 8f2b4fb78315737c936d706a78ed45daeeb964dc Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 13 Jul 2017 13:25:28 +0200
Subject: [PATCH 018/157] Added more changes to the first version

---
 .../visual_console_builder.editor.js          |  1 -
 .../ajax/visual_console_builder.ajax.php      |  1 -
 pandora_console/include/functions_graph.php   | 19 +++--
 .../include/functions_visual_map.php          | 80 +++++++++++++++++--
 4 files changed, 89 insertions(+), 12 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index f49ea8e58b..889d1d461b 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1817,7 +1817,6 @@ function setEventsBar(id_data, values) {
 		type: "POST",
 		dataType: 'json',
 		success: function (data) {
-			console.log(data);
 			if (data['no_data'] == true) {
 				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module_graph.png');
 			}
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 33f36b8c7a..e7f423732f 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -151,7 +151,6 @@ switch ($action) {
 				'id_agentmodule' => $id_module,
 				'utimestamp > ' . $datelimit,
 				'utimestamp < ' . $date), 'criticity, utimestamp');
-		html_debug($events, true);
 
 		$return = array();
 		if (!$events) {
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index d3845a51eb..ec3b2d7477 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -3565,7 +3565,7 @@ function graph_custom_sql_graph ($id, $width, $height,
  * @param string homeurl
  * @param bool return or echo the result
  */
-function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $homeurl, $return = false) {
+function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $homeurl, $return = false, $id_module = 0) {
 	global $config;
 	global $graphic_type;
 	
@@ -3605,10 +3605,19 @@ function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $ho
 		$full_legend[$cont] = $name;
 		
 		$top = $datelimit + ($periodtime * ($i + 1));
-		$event = db_get_row_filter ('tevento',
-			array ('id_agente' => $id_agent,
-				'utimestamp > '.$bottom,
-				'utimestamp < '.$top), 'criticity, utimestamp');
+		if ($id_module != 0) {
+			$event = db_get_row_filter ('tevento',
+				array ('id_agente' => $id_agent,
+					'utimestamp > '.$bottom,
+					'utimestamp < '.$top), 'criticity, utimestamp');
+		}
+		else {
+			$event = db_get_row_filter ('tevento',
+				array ('id_agente' => $id_agent,
+					'id_agentmodule' => $id_module,
+					'utimestamp > '.$bottom,
+					'utimestamp < '.$top), 'criticity, utimestamp');
+		}
 		
 		if (!empty($event['utimestamp'])) {
 			$data[$cont]['utimestamp'] = $periodtime;
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index a92ce3f731..fd81e15d6d 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -376,6 +376,9 @@ function visual_map_print_item($mode = "read", $layoutData,
 					$link = true;
 				}
 				
+				break;
+			case AUTO_SLA_GRAPH:
+				$link = true;
 				break;
 			default:
 				if (!empty($element_enterprise)) {
@@ -391,7 +394,6 @@ function visual_map_print_item($mode = "read", $layoutData,
 				$is_a_service = false;
 				$is_a_link_to_other_visualconsole = false;
 				
-				
 				if (enterprise_installed()) {
 					$id_service = services_service_from_module
 						($layoutData['id_agente_modulo']);
@@ -404,9 +406,6 @@ function visual_map_print_item($mode = "read", $layoutData,
 					$is_a_link_to_other_visualconsole = true;
 				}
 				
-				
-				
-				
 				if ($is_a_service) {
 					if (empty($layoutData['id_metaconsole'])) {
 						$url = $config['homeurl'] .
@@ -458,6 +457,36 @@ function visual_map_print_item($mode = "read", $layoutData,
 				}
 				
 				
+				break;
+			case AUTO_SLA_GRAPH:
+				$e_period = $layoutData['period'];
+				$date = get_system_time ();
+				$datelimit = $date - $e_period;
+				
+				$time_format = "Y/m/d H:i:s";
+				
+				$timestamp_init = date($time_format, $datelimit);
+				$timestamp_end = date($time_format, $date);
+
+				$timestamp_init_aux = explode(" ", $timestamp_init);
+				$timestamp_end_aux = explode(" ", $timestamp_end);
+
+				$date_from = $timestamp_init_aux[0];
+				$time_from = $timestamp_init_aux[1];
+
+				$date_to = $timestamp_end_aux[0];
+				$time_to = $timestamp_end_aux[1];
+
+				if (empty($layout_data['id_metaconsole'])) {
+					$url = $config['homeurl'] . "index.php?sec=eventos&sec2=operation/events/events&id_agent=" . $layoutData['id_agent'] . 
+						"&module_search_hidden=" . $layoutData['id_agente_modulo'] . "&date_from=" . $date_from . "&time_from=" . $time_from . 
+						"&date_to=" . $date_to . "&time_to=" . $time_to . "&status=-1";
+				}
+				else {
+					$url = "index.php?sec=eventos&sec2=operation/events/events&id_agent=" . $layoutData['id_agent'] . 
+						"&module_search_hidden=" . $layoutData['id_agente_modulo'] . "&date_from=" . $date_from . "&time_from=" . $time_from . 
+						"&date_to=" . $date_to . "&time_to=" . $time_to . "&status=-1";
+				}
 				break;
 			case GROUP_ITEM:
 				$is_a_link_to_other_visualconsole = false;
@@ -1046,13 +1075,51 @@ function visual_map_print_item($mode = "read", $layoutData,
 		case BOX_ITEM:
 			$z_index = 1;
 			break;
+		case AUTO_SLA_GRAPH:
+			if ((get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap')) {
+				if($width == 0 || $height == 0){
+					if ($layoutData['id_metaconsole'] != 0) {
+						$img =  '<img src="../../images/console/signes/module_graph.png" style="width:300px;height:180px;">';
+					}
+					else{
+						$img =  '<img src="images/console/signes/module_graph.png" style="width:300px;height:180px;">';	
+					}
+				}
+				else{
+					if ($layoutData['id_metaconsole'] != 0) {
+						$img =  '<img src="../../images/console/signes/module_graph.png" style="width:'.$width.'px;height:'.	$height.'px;">';
+					}
+					else{
+						$img =  '<img src="images/console/signes/module_graph.png" style="width:'.$width.'px;height:'.	$height.'px;">';
+					}
+				}
+			}
+			else {
+				if ($width == 0 || $height == 0) {
+					$img = graph_graphic_agentevents ($layoutData['id_agent'], 500, 50, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+				}
+				else{
+					$img = graph_graphic_agentevents ($layoutData['id_agent'], $width, $height, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+				}
+			}
+		
+			//Restore db connection
+			if ($layoutData['id_metaconsole'] != 0) {
+				metaconsole_restore_db();
+			}
+
+			$z_index = 2 + 1;
+			break;
 	}
-	
+	html_debug(get_parameter('action'), true);
 	$class = "item ";
 	switch ($type) {
 		case STATIC_GRAPH:
 			$class .= "static_graph";
 			break;
+		case AUTO_SLA_GRAPH:
+			$class .= "auto_sla_graph";
+			break;
 		case GROUP_ITEM:
 			$class .= "group_item";
 			break;
@@ -1386,6 +1453,9 @@ function visual_map_print_item($mode = "read", $layoutData,
 				echo io_safe_output($text);
 			}
 			break;
+		case AUTO_SLA_GRAPH:
+			echo $img;
+			break;
 		case SIMPLE_VALUE:
 		case SIMPLE_VALUE_MAX:
 		case SIMPLE_VALUE_MIN:

From d57508f09e564f83031b4e78e6b0f4abc90ea521 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 13 Jul 2017 16:23:16 +0200
Subject: [PATCH 019/157] Added sla_auto_graph item to vc first version

---
 .../visual_console_builder.editor.js          | 267 ++++++++++--------
 .../ajax/visual_console_builder.ajax.php      |  21 +-
 .../include/functions_visual_map.php          |  81 +++---
 .../include/functions_visual_map_editor.php   |   6 +-
 .../include/graphs/flot/pandora.flot.js       | 108 ++++---
 5 files changed, 277 insertions(+), 206 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 889d1d461b..58c7490618 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -231,14 +231,14 @@ function update_button_palette_callback() {
 			break;
 		case 'box_item':
 		
-		if($('input[name=width_box]').val() == ''){
-		alert('Undefined width');
-		return false;
-		}
-		if($('input[name=height_box]').val() == ''){
-		alert('Undefined height');
-		return false;
-		}
+			if($('input[name=width_box]').val() == ''){
+				alert('Undefined width');
+				return false;
+			}
+			if($('input[name=height_box]').val() == ''){
+				alert('Undefined height');
+				return false;
+			}
 		
 			$("#" + idItem + " div").css('background-color', values['fill_color']);
 			$("#" + idItem + " div").css('border-color', values['border_color']);
@@ -256,55 +256,53 @@ function update_button_palette_callback() {
 		case 'group_item':
 		case 'static_graph':
 		
-		if($('input[name=width]').val() == ''){
-		alert('Undefined width');
-		return false;
-		}
-		if($('input[name=height]').val() == ''){
-		alert('Undefined height');
-		return false;
-		}
-		
-		$("#text_" + idItem).html(values['label']);
-		if ((values['width'] == 0) || (values['height'] == 0)) {
-			if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
-				$("#image_" + idItem).removeAttr('width');
-				$("#image_" + idItem).removeAttr('height');
-				$("#image_" + idItem).attr('width', 70);
-				$("#image_" + idItem).attr('height', 70);
-				$("#image_" + idItem).css('width', '70px');
-				$("#image_" + idItem).css('height', '70px');
+			if($('input[name=width]').val() == ''){
+				alert('Undefined width');
+				return false;
 			}
-			else{
+			if($('input[name=height]').val() == ''){
+				alert('Undefined height');
+				return false;
+			}
+		
+			$("#text_" + idItem).html(values['label']);
+			if ((values['width'] == 0) || (values['height'] == 0)) {
+				if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
+					$("#image_" + idItem).removeAttr('width');
+					$("#image_" + idItem).removeAttr('height');
+					$("#image_" + idItem).attr('width', 70);
+					$("#image_" + idItem).attr('height', 70);
+					$("#image_" + idItem).css('width', '70px');
+					$("#image_" + idItem).css('height', '70px');
+				}
+				else{
+					$("#image_" + idItem).removeAttr('width');
+					$("#image_" + idItem).removeAttr('height');
+					$("#image_" + idItem).attr('width', $('#preview > img')[0].naturalHeight);
+					$("#image_" + idItem).attr('height', $('#preview > img')[0].naturalHeight);
+					$("#image_" + idItem).css('width', $('#preview > img')[0].naturalHeight+'px');
+					$("#image_" + idItem).css('height', $('#preview > img')[0].naturalHeight+'px');	
+				}			
+			}
+			else {
 				$("#image_" + idItem).removeAttr('width');
 				$("#image_" + idItem).removeAttr('height');
-				$("#image_" + idItem).attr('width', $('#preview > img')[0].naturalHeight);
-				$("#image_" + idItem).attr('height', $('#preview > img')[0].naturalHeight);
-				$("#image_" + idItem).css('width', $('#preview > img')[0].naturalHeight+'px');
-				$("#image_" + idItem).css('height', $('#preview > img')[0].naturalHeight+'px');	
-			}			
-		}
-		else {
-			$("#image_" + idItem).removeAttr('width');
-			$("#image_" + idItem).removeAttr('height');
-			$("#image_" + idItem).attr('width', values['width']);
-			$("#image_" + idItem).attr('height', values['height']);
-			$("#image_" + idItem).css('width', values['width'] + 'px');
-			$("#image_" + idItem).css('height', values['height'] + 'px');
-		}
+				$("#image_" + idItem).attr('width', values['width']);
+				$("#image_" + idItem).attr('height', values['height']);
+				$("#image_" + idItem).css('width', values['width'] + 'px');
+				$("#image_" + idItem).css('height', values['height'] + 'px');
+			}
 			break;
 		case 'percentile_bar':
 		case 'percentile_item':
-			
-		if($('input[name=width_percentile]').val() == ''){
-		alert('Undefined width');
-		return false;
-		}
-		if($('input[name=height_percentile]').val() == ''){
-		alert('Undefined height');
-		return false;
-		}
-		
+			if($('input[name=width_percentile]').val() == ''){
+				alert('Undefined width');
+				return false;
+			}
+			if($('input[name=height_percentile]').val() == ''){
+				alert('Undefined height');
+				return false;
+			}
 		
 			$("#text_" + idItem).html(values['label']);
 			$("#image_" + idItem).attr("src", "images/spinner.gif");
@@ -315,50 +313,57 @@ function update_button_palette_callback() {
 				setPercentileBar(idItem, values);
 			}
 			
-			
-
 			break;
 		case 'module_graph':
-		
-		
-		if($('#dir_items').html() == 'horizontal'){
-			if(parseInt($('#text-left').val()) + (parseInt($('input[name=height_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('width'))
-			|| parseInt($('#text-left').val()) + (parseInt($('input[name=width_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('width'))){
-				
-				alert($('#count_items').html()+' joined graph items are wider than background');
-				return false;
-				
+			if($('#dir_items').html() == 'horizontal'){
+				if(parseInt($('#text-left').val()) + (parseInt($('input[name=height_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('width'))
+				|| parseInt($('#text-left').val()) + (parseInt($('input[name=width_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('width'))){
+					
+					alert($('#count_items').html()+' joined graph items are wider than background');
+					return false;
+					
+				}
 			}
-		}
-		
-		if($('#dir_items').html() == 'vertical'){
-			if(parseInt($('#text-top').val()) + (parseInt($('input[name=height_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('height'))){
-				alert($('#count_items').html()+' joined graph items are higher than background');
-				return false;
-				
+			
+			if($('#dir_items').html() == 'vertical'){
+				if(parseInt($('#text-top').val()) + (parseInt($('input[name=height_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('height'))){
+					alert($('#count_items').html()+' joined graph items are higher than background');
+					return false;
+					
+				}
 			}
-		}
-				
-		
-		if($('input[name=width_module_graph]').val() == ''){
-		alert('Undefined width');
-		return false;
-		}
-		if($('input[name=height_module_graph]').val() == ''){
-		alert('Undefined height');
-		return false;
-		}
-		if($('#custom_graph_row').css('display') != 'none' && $("#custom_graph option:selected").html() == 'None'){
+			
+			if($('input[name=width_module_graph]').val() == ''){
+				alert('Undefined width');
+				return false;
+			}
+			if($('input[name=height_module_graph]').val() == ''){
+				alert('Undefined height');
+				return false;
+			}
+			if($('#custom_graph_row').css('display') != 'none' && $("#custom_graph option:selected").html() == 'None'){
 				alert('Undefined graph');
-		return false;
-		}
-		
-		
+				return false;
+			}
 		
 			$("#text_" + idItem).html(values['label']);
 			$("#image_" + idItem).attr("src", "images/spinner.gif");
 			setModuleGraph(idItem);
 			break;
+		case 'auto_sla_graph':
+			if($('input[name=width]').val() == ''){
+				alert('Undefined width');
+				return false;
+			}
+			if($('input[name=height]').val() == ''){
+				alert('Undefined height');
+				return false;
+			}
+			$("#text_" + idItem).html(values['label']);
+			$("#image_" + idItem).attr("src", "images/spinner.gif");
+
+			setEventsBar(idItem, values);
+			break;
 		case 'simple_value':
 			$("#text_" + idItem).html(values['label']);
 			//$("#simplevalue_" + idItem)
@@ -369,42 +374,41 @@ function update_button_palette_callback() {
 			$("#text_" + idItem).html(values['label']);
 			break;
 		case 'icon':
-		
-		if($('input[name=width]').val() == ''){
-		alert('Undefined width');
-		return false;
-		}
-		if($('input[name=height]').val() == ''){
-		alert('Undefined height');
-		return false;
-		}
-		$("#image_" + idItem).attr('src', "images/spinner.gif");
-		if ((values['width'] == 0) || (values['height'] == 0)) {
-			if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
+			if($('input[name=width]').val() == ''){
+			alert('Undefined width');
+			return false;
+			}
+			if($('input[name=height]').val() == ''){
+			alert('Undefined height');
+			return false;
+			}
+			$("#image_" + idItem).attr('src', "images/spinner.gif");
+			if ((values['width'] == 0) || (values['height'] == 0)) {
+				if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
+					$("#image_" + idItem).removeAttr('width');
+					$("#image_" + idItem).removeAttr('height');
+					$("#image_" + idItem).attr('width', 70);
+					$("#image_" + idItem).attr('height', 70);
+					$("#image_" + idItem).css('width', '70px');
+					$("#image_" + idItem).css('height', '70px');
+					}
+				else{
+					$("#image_" + idItem).removeAttr('width');
+					$("#image_" + idItem).removeAttr('height');
+					$("#image_" + idItem).attr('width', $('#preview > img')[0].naturalHeight);
+					$("#image_" + idItem).attr('height', $('#preview > img')[0].naturalHeight);
+					$("#image_" + idItem).css('width', $('#preview > img')[0].naturalHeight+'px');
+					$("#image_" + idItem).css('height', $('#preview > img')[0].naturalHeight+'px');	
+				}		
+			}
+			else {
 				$("#image_" + idItem).removeAttr('width');
 				$("#image_" + idItem).removeAttr('height');
-				$("#image_" + idItem).attr('width', 70);
-				$("#image_" + idItem).attr('height', 70);
-				$("#image_" + idItem).css('width', '70px');
-				$("#image_" + idItem).css('height', '70px');
-				}
-			else{
-				$("#image_" + idItem).removeAttr('width');
-				$("#image_" + idItem).removeAttr('height');
-				$("#image_" + idItem).attr('width', $('#preview > img')[0].naturalHeight);
-				$("#image_" + idItem).attr('height', $('#preview > img')[0].naturalHeight);
-				$("#image_" + idItem).css('width', $('#preview > img')[0].naturalHeight+'px');
-				$("#image_" + idItem).css('height', $('#preview > img')[0].naturalHeight+'px');	
-			}		
-		}
-		else {
-			$("#image_" + idItem).removeAttr('width');
-			$("#image_" + idItem).removeAttr('height');
-			$("#image_" + idItem).attr('width', values['width']);
-			$("#image_" + idItem).attr('height', values['height']);
-			$("#image_" + idItem).css('width', values['width'] + 'px');
-			$("#image_" + idItem).css('height', values['height'] + 'px');	
-		}
+				$("#image_" + idItem).attr('width', values['width']);
+				$("#image_" + idItem).attr('height', values['height']);
+				$("#image_" + idItem).css('width', values['width'] + 'px');
+				$("#image_" + idItem).css('height', values['height'] + 'px');	
+			}
 			var image = values['image'] + ".png";
 			set_image("image", idItem, image);
 			break;
@@ -872,6 +876,7 @@ function toggle_item_palette() {
 		activeToolboxButton('group_item', true);
 		activeToolboxButton('box_item', true);
 		activeToolboxButton('line_item', true);
+		activeToolboxButton('auto_sla_graph', true);
 
 		if (typeof(enterprise_activeToolboxButton) == 'function') {
 			enterprise_activeToolboxButton(true);
@@ -891,6 +896,7 @@ function toggle_item_palette() {
 
 		activeToolboxButton('static_graph', false);
 		activeToolboxButton('module_graph', false);
+		activeToolboxButton('auto_sla_graph', false);
 		activeToolboxButton('simple_value', false);
 		activeToolboxButton('label', false);
 		activeToolboxButton('icon', false);
@@ -1023,6 +1029,8 @@ function loadFieldsFromDB(item) {
 			fill_parent_select(idItem);
 			
 			jQuery.each(data, function(key, val) {
+				if (key == 'event_max_time_row')
+					$("select[name=event_max_time_row]").val(val);
 				if (key == 'background')
 					$("#background_image").val(val);
 				if (key == 'width') $("input[name=width]").val(val);
@@ -2478,13 +2486,13 @@ function updateDB_visual(type, idElement , values, event, top, left) {
 				set_static_graph_status(idElement, values['image']);
 
 			}
+			break;
 		case 'percentile_item':
 		case 'simple_value':
 		case 'label':
 		case 'icon':
 		case 'module_graph':
-
-			
+		case 'auto_sla_graph':
 			if (type == 'simple_value') {
 				setModuleValue(idElement,
 					values.process_simple_value,
@@ -2708,8 +2716,6 @@ function updateDB(type, idElement , values, event) {
 function copyDB(idItem) {
 	metaconsole = $("input[name='metaconsole']").val();
 
-
-
 	parameter = Array();
 	parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
 	parameter.push ({name: "action", value: "copy"});
@@ -2880,6 +2886,15 @@ function eventsItems(drag) {
 				activeToolboxButton('delete_item', true);
 				activeToolboxButton('show_grid', false);
 			}
+			if ($(divParent).hasClass('auto_sla_graph')) {
+				creationItem = null;
+				selectedItem = 'auto_sla_graph';
+				idItem = $(divParent).attr('id');
+				activeToolboxButton('copy_item', true);
+				activeToolboxButton('edit_item', true);
+				activeToolboxButton('delete_item', true);
+				activeToolboxButton('show_grid', false);
+			}
 			if ($(divParent).hasClass('group_item')) {
 				creationItem = null;
 				selectedItem = 'group_item';
@@ -2987,6 +3002,9 @@ function eventsItems(drag) {
 			if ($(event.target).hasClass('static_graph')) {
 				selectedItem = 'static_graph';
 			}
+			if ($(event.target).hasClass('auto_sla_graph')) {
+				selectedItem = 'auto_sla_graph';
+			}
 			if ($(event.target).hasClass('group_item')) {
 				selectedItem = 'group_item';
 			}
@@ -3344,7 +3362,7 @@ function click_button_toolbox(id) {
 				activeToolboxButton('icon', false);
 				activeToolboxButton('service', false);
 				activeToolboxButton('group_item', false);
-
+				activeToolboxButton('auto_sla_graph', false);
 				activeToolboxButton('copy_item', false);
 				activeToolboxButton('edit_item', false);
 				activeToolboxButton('delete_item', false);
@@ -3374,6 +3392,7 @@ function click_button_toolbox(id) {
 				activeToolboxButton('label', true);
 				activeToolboxButton('icon', true);
 				activeToolboxButton('group_item', true);
+				activeToolboxButton('auto_sla_graph', true);
 			}
 			break;
 		case 'save_visualmap':
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index e7f423732f..9738d9150d 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -456,12 +456,14 @@ switch ($action) {
 						$process_simple_value);
 					$values['period'] = $period;
 				}
+				break;
 			case 'percentile_bar':
 			case 'percentile_item':
 			case 'static_graph':
 			case 'module_graph':
 			case 'label':
 			case 'icon':
+			case 'auto_sla_graph':
 			default:
 				if ($type == 'label') {
 					$values['type'] = LABEL;
@@ -536,6 +538,18 @@ switch ($action) {
 						$values['border_color'] = $line_color;
 						break;
 					// -------------------------------------------------
+					case 'auto_sla_graph':
+						$values['type'] = AUTO_SLA_GRAPH;
+						if ($event_max_time_row !== null) {
+							$values['period'] = $event_max_time_row;
+						}
+						if ($width !== null) {
+							$values['width'] = $width;
+						}
+						if ($height !== null) {
+							$values['height'] = $height;
+						}
+						break;
 					case 'box_item':
 						$values['border_width'] = $border_width;
 						$values['border_color'] = $border_color;
@@ -654,7 +668,7 @@ switch ($action) {
 				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));
 				
@@ -691,6 +705,7 @@ switch ($action) {
 			case 'simple_value':
 			case 'label':
 			case 'icon':
+			case 'auto_sla_graph':
 				$elementFields = db_get_row_filter('tlayout_data',
 					array('id' => $id_element));
 				
@@ -742,6 +757,8 @@ switch ($action) {
 				}
 				
 				switch ($type) {
+					case 'auto_sla_graph':
+						$elementFields['event_max_time_row'] = $elementFields['period'];
 					case 'percentile_item':
 					case 'percentile_bar':
 						$elementFields['width_percentile'] = $elementFields['width'];
@@ -1022,8 +1039,6 @@ switch ($action) {
 		echo json_encode($return);
 		break;
 	
-	
-	
 	case 'delete':
 		if (db_process_sql_delete('tlayout_data', array('id' => $id_element, 'id_layout' => $id_visual_console)) === false) {
 			$return['correct'] = 0;
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index fd81e15d6d..8bed46cbcc 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -156,6 +156,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 				$wimg ='70';
 				break;
 			case 3:
+			case 14:
 				if (get_parameter('action') == 'edit') {
 					$himg = '30';
 					$wimg = '150';
@@ -1066,8 +1067,6 @@ function visual_map_print_item($mode = "read", $layoutData,
 				metaconsole_restore_db();
 			}
 
-			//$img = str_replace('>', 'class="image" id="image_' . $id . '" />', $img);
-
 			break;
 		case LABEL:
 			$z_index = 4 + 1;
@@ -1096,10 +1095,30 @@ function visual_map_print_item($mode = "read", $layoutData,
 			}
 			else {
 				if ($width == 0 || $height == 0) {
-					$img = graph_graphic_agentevents ($layoutData['id_agent'], 500, 50, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+					if ($layoutData['label_position']=='left') {
+						$img = '<div style="float:left;height:'.$himg.'px;">' . 
+							$img = graph_graphic_agentevents ($layoutData['id_agent'], 500, 50, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+					}
+					elseif ($layoutData['label_position']=='right') {
+						$img = '<div style="float:right;height:'.$himg.'px;">' . 
+							$img = graph_graphic_agentevents ($layoutData['id_agent'], 500, 50, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+					}
+					else {
+						$img = graph_graphic_agentevents ($layoutData['id_agent'], 500, 50, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+					}
 				}
 				else{
-					$img = graph_graphic_agentevents ($layoutData['id_agent'], $width, $height, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+					if ($layoutData['label_position']=='left') {
+						$img = '<div style="float:left;height:'.$himg.'px;">' . 
+							$img = graph_graphic_agentevents ($layoutData['id_agent'], $width, $height, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+					}
+					elseif ($layoutData['label_position']=='right') {
+						$img = '<div style="float:right;height:'.$himg.'px;">' . 
+							$img = graph_graphic_agentevents ($layoutData['id_agent'], $width, $height, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+					}
+					else {
+						$img = graph_graphic_agentevents ($layoutData['id_agent'], $width, $height, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+					}
 				}
 			}
 		
@@ -1111,7 +1130,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 			$z_index = 2 + 1;
 			break;
 	}
-	html_debug(get_parameter('action'), true);
+	
 	$class = "item ";
 	switch ($type) {
 		case STATIC_GRAPH:
@@ -1454,7 +1473,18 @@ function visual_map_print_item($mode = "read", $layoutData,
 			}
 			break;
 		case AUTO_SLA_GRAPH:
+			if ($layoutData['label_position']=='up') {
+				echo io_safe_output($text);
+			}
+			
 			echo $img;
+			
+			if ($layoutData['label_position']=='down') {
+				echo io_safe_output($text);
+			}
+			elseif($layoutData['label_position']=='left' || $layoutData['label_position']=='right') {
+				echo io_safe_output($text);
+			}
 			break;
 		case SIMPLE_VALUE:
 		case SIMPLE_VALUE_MAX:
@@ -1484,42 +1514,12 @@ function visual_map_print_item($mode = "read", $layoutData,
 					$layoutData['id_agente_modulo'], $period);
 			
 			global $config;
-			
-			if ($type == SIMPLE_VALUE) {
-				//~ $returnValue_value = explode('&nbsp;', $value);
-				
-				//~ if ($returnValue_value[1] != "") {
-					//~ $value = remove_right_zeros(number_format($returnValue_value[0], $config['graph_precision'])) . " " . $returnValue_value[1];
-				//~ }
-				//~ else {
-					//~ $value = remove_right_zeros(number_format($returnValue_value[0], $config['graph_precision']));
-				//~ }
-				
-			}
-			else {
-				// If the value is a string, dont format it
-				if (!is_string($value)) {
-					//~ $value = remove_right_zeros(format_for_graph($value, $config['graph_precision']));
-				}
-			}
-			
-			//$io_safe_output_text = str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
-			
-			
-			
 			if(get_parameter('action') == 'edit'){
-							
-			//echo 'Data value';
-			
-			echo $io_safe_output_text;
-								
-				}
+				echo $io_safe_output_text;
+			}
 			else{
-		
-			echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
-				
-				}
-			
+				echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
+			}
 			
 			//Restore db connection
 			if ($layoutData['id_metaconsole'] != 0) {
@@ -2931,6 +2931,9 @@ function visual_map_type_in_js($type) {
 		case MODULE_GRAPH:
 			return 'module_graph';
 			break;
+		case AUTO_SLA_GRAPH:
+			return 'auto_sla_graph';
+			break;
 		case SIMPLE_VALUE:
 			return 'simple_value';
 			break;
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 5f8e43f3f6..a97055c8f3 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -154,7 +154,6 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				html_print_input_text('height_module_graph', 180, '', 3, 5, true) .
 				'</td>';
 			
-			
 			$form_items['label_row'] = array();
 			$form_items['label_row']['items'] = array('label',
 				'static_graph',
@@ -163,7 +162,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				'module_graph',
 				'simple_value',
 				'datos',
-				'group_item');
+				'group_item',
+				'auto_sla_graph');
 			$form_items['label_row']['html'] =
 				'<td align="left" valign="top" style="">' . __('Label') . '
 				
@@ -540,7 +540,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items_advance['parent_row']['items'] = array(
 				'group_item', 'static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'label', 'icon', 'datos');
+				'simple_value', 'label', 'icon', 'datos', 'auto_sla_graph');
 			$form_items_advance['parent_row']['html'] = '<td align="left">' .
 				__('Parent') . '</td>
 				<td align="left">' .
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 5595b93f5b..7e2950f806 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -635,7 +635,11 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 
 	var stack = 0, bars = true, lines = false, steps = false;
 
-	var options = {
+	var regex = /visual_console/;
+	var match = regex.exec(window.location.href);
+
+	if (match == null) {
+		var options = {
 			series: {
 				stack: stack,
 				shadowSize: 0.1,
@@ -662,51 +666,81 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 				show: false
 				}
 		};
+	}
+	else {
+		var options = {
+			series: {
+				stack: stack,
+				shadowSize: 0.1,
+				color: '#ddd'
+			},
+			grid: {
+				hoverable: false,
+				clickable: false,
+				borderWidth:1,
+				borderColor: '',
+				tickColor: '#fff'
+				},
+			xaxes: [ {
+					tickFormatter: xFormatter,
+					color: '',
+					tickSize: intervaltick,
+					tickLength: 0
+					} ],
+			yaxes: [ {
+					show: false,
+					tickLength: 0
+				}],
+			legend: {
+				show: false
+				}
+		};
+	}
 
 	var plot = $.plot($('#'+graph_id), datas, options );
 
-	// Events
-	$('#'+graph_id).bind('plothover',  function (event, pos, item) {
-		if (item) {
-			var from = legend[item.seriesIndex];
-			var to = legend[item.seriesIndex+1];
+	if (match == null) {
+		// Events
+		$('#'+graph_id).bind('plothover',  function (event, pos, item) {
+			if (item) {
+				var from = legend[item.seriesIndex];
+				var to = legend[item.seriesIndex+1];
 
-			if (to == undefined) {
-				to = '>';
+				if (to == undefined) {
+					to = '>';
+				}
+
+				$('#extra_'+graph_id).text(from+'-'+to);
+				var extra_height = parseInt($('#extra_'+graph_id).css('height').split('px')[0]);
+				var extra_width = parseInt($('#extra_'+graph_id).css('width').split('px')[0]);
+				$('#extra_'+graph_id).css('left',pos.pageX-(extra_width/4)+'px');
+				//$('#extra_'+graph_id).css('top',plot.offset().top-extra_height-5+'px');
+				$('#extra_'+graph_id).show();
 			}
+		});
 
-			$('#extra_'+graph_id).text(from+'-'+to);
-			var extra_height = parseInt($('#extra_'+graph_id).css('height').split('px')[0]);
-			var extra_width = parseInt($('#extra_'+graph_id).css('width').split('px')[0]);
-			$('#extra_'+graph_id).css('left',pos.pageX-(extra_width/4)+'px');
-			//$('#extra_'+graph_id).css('top',plot.offset().top-extra_height-5+'px');
-			$('#extra_'+graph_id).show();
-		}
-	});
+		$('#'+graph_id).bind('plotclick', function(event, pos, item) {
+			if (item) {
+				//from time
+				var from = legend[item.seriesIndex];
+				//to time
+				var to = legend[item.seriesIndex+1];
+				//current date
+				var dateObj = new Date();
+				var month = dateObj.getUTCMonth() + 1; //months from 1-12
+				var day = dateObj.getUTCDate();
+				var year = dateObj.getUTCFullYear();
+					newdate = year + "/" + month + "/" + day;
 
-	$('#'+graph_id).bind('plotclick', function(event, pos, item) {
-		if (item) {
-			//from time
-			var from = legend[item.seriesIndex];
-			//to time
-			var to = legend[item.seriesIndex+1];
-			//current date
-			var dateObj = new Date();
-			var month = dateObj.getUTCMonth() + 1; //months from 1-12
-			var day = dateObj.getUTCDate();
-			var year = dateObj.getUTCFullYear();
-				newdate = year + "/" + month + "/" + day;
-
-			if(!to){
-				to= '23:59';
+				if(!to){
+					to= '23:59';
+				}
+				window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&date_to='+newdate+'&time_to='+to+'&status=-1';
 			}
-			window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&date_to='+newdate+'&time_to='+to+'&status=-1';
-		}
-	});
+		});
 
-
-
-	$('#'+graph_id).bind('mouseout',resetInteractivity);
+		$('#'+graph_id).bind('mouseout',resetInteractivity);
+	}
 
 	// Reset interactivity styles
 	function resetInteractivity() {

From b4c31df636275903e4562aa07801a09b6aaacb26 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 13 Jul 2017 16:57:53 +0200
Subject: [PATCH 020/157] Fixed module events graph in vc

---
 pandora_console/include/functions_graph.php   | 115 ++++++++++++++++--
 .../include/functions_visual_map.php          |  12 +-
 2 files changed, 110 insertions(+), 17 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index ec3b2d7477..aff6ce4c7c 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -3565,7 +3565,7 @@ function graph_custom_sql_graph ($id, $width, $height,
  * @param string homeurl
  * @param bool return or echo the result
  */
-function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $homeurl, $return = false, $id_module = 0) {
+function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $homeurl, $return = false) {
 	global $config;
 	global $graphic_type;
 	
@@ -3605,20 +3605,113 @@ function graph_graphic_agentevents ($id_agent, $width, $height, $period = 0, $ho
 		$full_legend[$cont] = $name;
 		
 		$top = $datelimit + ($periodtime * ($i + 1));
-		if ($id_module != 0) {
-			$event = db_get_row_filter ('tevento',
-				array ('id_agente' => $id_agent,
-					'utimestamp > '.$bottom,
-					'utimestamp < '.$top), 'criticity, utimestamp');
+		$event = db_get_row_filter ('tevento',
+			array ('id_agente' => $id_agent,
+				'utimestamp > '.$bottom,
+				'utimestamp < '.$top), 'criticity, utimestamp');
+		
+		if (!empty($event['utimestamp'])) {
+			$data[$cont]['utimestamp'] = $periodtime;
+			switch ($event['criticity']) {
+				case EVENT_CRIT_WARNING:
+					$data[$cont]['data'] = 2;
+					break;
+				case EVENT_CRIT_CRITICAL:
+					$data[$cont]['data'] = 3;
+					break;
+				default:
+					$data[$cont]['data'] = 1;
+					break;
+			}
 		}
 		else {
-			$event = db_get_row_filter ('tevento',
-				array ('id_agente' => $id_agent,
-					'id_agentmodule' => $id_module,
-					'utimestamp > '.$bottom,
-					'utimestamp < '.$top), 'criticity, utimestamp');
+			$data[$cont]['utimestamp'] = $periodtime;
+			$data[$cont]['data'] = 1;
+		}
+		$cont++;
+	}
+	
+	$colors = array(1 => COL_NORMAL, 2 => COL_WARNING, 3 => COL_CRITICAL, 4 => COL_UNKNOWN);
+	
+	// Draw slicebar graph
+	if ($config['flash_charts']) {
+		$out = flot_slicesbar_graph($data, $period, $width, $height, $full_legend, $colors, $config['fontpath'], $config['round_corner'], $homeurl, '', '', false, $id_agent);
+	}
+	else {
+		$out = slicesbar_graph($data, $period, $width, $height, $colors, $config['fontpath'], $config['round_corner'], $homeurl);
+		
+		// Draw legend
+		$out .=  "<br>";
+		$out .=  "&nbsp;";
+		foreach ($legend as $hour) {
+			$out .=  "<span style='font-size: 6pt'>" . $hour . "</span>";
+			$out .=  "&nbsp;";
+		}
+	}
+	
+	if ($return) {
+		return $out;
+	}
+	else {
+		echo $out;
+	}
+}
+
+/**
+ * Print a static graph with event data of agents
+ * 
+ * @param integer id_agent Agent ID
+ * @param integer width pie graph width
+ * @param integer height pie graph height
+ * @param integer period time period
+ * @param string homeurl
+ * @param bool return or echo the result
+ */
+function graph_graphic_moduleevents ($id_agent, $id_module, $width, $height, $period = 0, $homeurl, $return = false) {
+	global $config;
+	global $graphic_type;
+	
+	$data = array ();
+	
+	$resolution = $config['graph_res'] * ($period * 2 / $width); // Number of "slices" we want in graph
+	$interval = (int) ($period / $resolution);
+	$date = get_system_time ();
+	$datelimit = $date - $period;
+	$periodtime = floor ($period / $interval);
+	$time = array ();
+	$data = array ();
+	$legend = array();
+	$full_legend = array();
+	
+	$cont = 0;
+	for ($i = 0; $i < $interval; $i++) {
+		$bottom = $datelimit + ($periodtime * $i);
+		if (! $graphic_type) {
+			if ($config['flash_charts']) {
+				$name = date('H:i:s', $bottom);
+			}
+			else {
+				$name = date('H\h', $bottom);
+			}
+		}
+		else {
+			$name = $bottom;
 		}
 		
+		// Show less values in legend
+		if ($cont == 0 or $cont % 2)
+			$legend[$cont] = $name;
+		
+		$full_legend[$cont] = $name;
+		
+		$top = $datelimit + ($periodtime * ($i + 1));
+
+		$event = db_get_row_filter ('tevento',
+			array ('id_agente' => $id_agent,
+				'id_agentmodule' => $id_module,
+				'utimestamp > '.$bottom,
+				'utimestamp < '.$top), 'criticity, utimestamp');
+
 		if (!empty($event['utimestamp'])) {
 			$data[$cont]['utimestamp'] = $periodtime;
 			switch ($event['criticity']) {
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 8bed46cbcc..d2ff9a643c 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1097,27 +1097,27 @@ function visual_map_print_item($mode = "read", $layoutData,
 				if ($width == 0 || $height == 0) {
 					if ($layoutData['label_position']=='left') {
 						$img = '<div style="float:left;height:'.$himg.'px;">' . 
-							$img = graph_graphic_agentevents ($layoutData['id_agent'], 500, 50, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+							$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], 500, 50, $layoutData['period'], '', true);
 					}
 					elseif ($layoutData['label_position']=='right') {
 						$img = '<div style="float:right;height:'.$himg.'px;">' . 
-							$img = graph_graphic_agentevents ($layoutData['id_agent'], 500, 50, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+							$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], 500, 50, $layoutData['period'], '', true);
 					}
 					else {
-						$img = graph_graphic_agentevents ($layoutData['id_agent'], 500, 50, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+						$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], 500, 50, $layoutData['period'], '', true);
 					}
 				}
 				else{
 					if ($layoutData['label_position']=='left') {
 						$img = '<div style="float:left;height:'.$himg.'px;">' . 
-							$img = graph_graphic_agentevents ($layoutData['id_agent'], $width, $height, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+							$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], $width, $height, $layoutData['period'], '', true);
 					}
 					elseif ($layoutData['label_position']=='right') {
 						$img = '<div style="float:right;height:'.$himg.'px;">' . 
-							$img = graph_graphic_agentevents ($layoutData['id_agent'], $width, $height, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+							$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], $width, $height, $layoutData['period'], '', true);
 					}
 					else {
-						$img = graph_graphic_agentevents ($layoutData['id_agent'], $width, $height, $layoutData['period'], '', true, $layoutData['id_agente_modulo']);
+						$img = graph_graphic_moduleevents ($layoutData['id_agent'], $layoutData['id_agente_modulo'], $width, $height, $layoutData['period'], '', true);
 					}
 				}
 			}

From bec023dc4d9dacbd4ab60047fef984083554f067 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 18 Jul 2017 11:36:57 +0200
Subject: [PATCH 021/157] Fixed meta event table in cli and api functions

---
 pandora_console/include/functions_api.php |  7 +++---
 pandora_server/util/pandora_manage.pl     | 28 +++++++++++++++++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index ccadee5349..ac71131094 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -9062,8 +9062,9 @@ function api_set_create_event($id, $trash1, $other, $returnType) {
  *   http://127.0.0.1/pandora_console/include/api.php?op=set&op2=add_event_comment&id=event_id&other=string|&other_mode=url_encode_separator_|&apipass=1234&user=admin&pass=pandora
  */
 function api_set_add_event_comment($id, $thrash2, $other, $thrash3) {
+	$meta = false;
 	if (defined ('METACONSOLE')) {
-		return;
+		$meta = true;
 	}
 	
 	if ($other['type'] == 'string') {
@@ -9072,11 +9073,9 @@ function api_set_add_event_comment($id, $thrash2, $other, $thrash3) {
 	}
 	else if ($other['type'] == 'array') {
 		$comment = io_safe_input($other['data'][0]);
-		$meta = $other['data'][1];
 		$history = $other['data'][2];
 		
-		$status = events_comment($id, $comment, 'Added comment', $meta,
-			$history);
+		$status = events_comment($id, $comment, 'Added comment', $meta, $history);
 		if (is_error($status)) {
 			returnError('error_add_event_comment',
 				__('Error adding event comment.'));
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index e5d9202cfb..9401f721c9 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -3212,8 +3212,13 @@ sub cli_get_event_info () {
 	exist_check($event_name,'event',$id_event);
 	
 	$csv_separator = '|' unless defined($csv_separator);
+
+	my $event_table = "tevento";
+	if (is_metaconsole($conf) == 1) {
+		$event_table = "tmetaconsole_event";
+	}
 	
-	my $query = "SELECT * FROM tevento where id_evento=".$id_event;
+	my $query = "SELECT * FROM " . $event_table . " where id_evento=" . $id_event;
 
 	my $header = "Event ID".$csv_separator."Event name".$csv_separator."Agent ID".$csv_separator."User ID".$csv_separator.
 				"Group ID".$csv_separator."Status".$csv_separator."Timestamp".$csv_separator."Event type".$csv_separator.
@@ -4560,7 +4565,12 @@ sub cli_set_event_storm_protection () {
 sub pandora_get_event_name($$) {
 	my ($dbh,$id_event) = @_;
 	
-	my $event_name = get_db_value($dbh, 'SELECT evento FROM tevento WHERE id_evento = ?',$id_event);
+	my $event_table = "tevento";
+	if (is_metaconsole($conf) == 1) {
+		$event_table = "tmetaconsole_event";
+	}
+
+	my $event_name = get_db_value($dbh, 'SELECT evento FROM ' . $event_table . ' WHERE id_evento = ?',$id_event);
 	
 	return defined ($event_name) ? $event_name : -1;
 }
@@ -4571,7 +4581,12 @@ sub pandora_get_event_name($$) {
 sub pandora_update_event_from_hash ($$$$) {
 	my ($parameters, $where_column, $where_value, $dbh) = @_;
 	
-	my $event_id = db_process_update($dbh, 'tevento', $parameters, {$where_column => $where_value});
+	my $event_table = "tevento";
+	if (is_metaconsole($conf) == 1) {
+		$event_table = "tmetaconsole_event";
+	}
+
+	my $event_id = db_process_update($dbh, $event_table, $parameters, {$where_column => $where_value});
 	return $event_id;
 }
 
@@ -4582,7 +4597,12 @@ sub pandora_update_event_from_hash ($$$$) {
 sub pandora_get_event_comment($$) {
 	my ($dbh,$id_event) = @_;
 
-	my $event_name = get_db_value($dbh, 'SELECT user_comment FROM tevento WHERE id_evento = ?',$id_event);
+	my $event_table = "tevento";
+	if (is_metaconsole($conf) == 1) {
+		$event_table = "tmetaconsole_event";
+	}
+
+	my $event_name = get_db_value($dbh, 'SELECT user_comment FROM ' . $event_table . ' WHERE id_evento = ?',$id_event);
 
 	return defined ($event_name) ? $event_name : -1;
 }

From d594b98cc387d91a1bbdc776a456eda9e0d5201b Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 18 Jul 2017 11:48:59 +0200
Subject: [PATCH 022/157] Added recover delimiter

---
 pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 16b67d8e28..33fe856c09 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1313,6 +1313,7 @@ IF @vv1>0 THEN
 END IF;
 END;
 //
+delimiter;
 CALL addcol();
 DROP PROCEDURE addcol;
 

From 329050b02bd66d4570ca38a7b631de27486bb31e Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 18 Jul 2017 12:26:29 +0200
Subject: [PATCH 023/157] Fixed error

---
 .../godmode/reporting/visual_console_builder.editor.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 32a41ee7d2..e1b2a50cf5 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -580,7 +580,7 @@ function readFields() {
 	}
 	values['width'] = $("input[name=width]").val();
 	values['width_data_image'] = $("#data_image_width").val();
-	if(values['width_data_image'] != 0){
+	if(values['width_data_image'] != 0 && values['width_data_image'] != undefined){
 		values['width'] = values['width_data_image'];
 	}
 	values['height'] = $("input[name=height]").val();

From d29aa2c246dcb6d9a53250f1d685dbfe434d9b1d Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 18 Jul 2017 13:07:25 +0200
Subject: [PATCH 024/157] Fixed email column

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

diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index b7994e6a1c..5d038cc6ab 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -539,7 +539,7 @@ switch ($action) {
 			$table->size[3] = '2%';
 			$table->size[4] = '2%';
 			$table->size[5] = '2%';
-			$table->size[6] = '2%';
+			$table->size[6] = '4%';
 			$table->size['csv'] = '5%';
 			
 			$next = 4;

From 1ff3202c43119510828a0f68bdc7a938f33286f2 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 19 Jul 2017 10:36:24 +0200
Subject: [PATCH 025/157] Added the last things to the new vc item (module
 events)

---
 .../reporting/visual_console_builder.editor.js  |  16 ++++++++++++----
 .../images/console/signes/module-events.png     | Bin 0 -> 6040 bytes
 .../include/functions_visual_map.php            |   8 ++++----
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 pandora_console/images/console/signes/module-events.png

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index e1b2a50cf5..104ddb9ddb 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1904,10 +1904,17 @@ function setEventsBar(id_data, values) {
 		dataType: 'json',
 		success: function (data) {
 			if (data['no_data'] == true) {
-				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module_graph.png');
+				if (values['width'] == "0" || values['height'] == "0") {
+					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+				}
+				else {
+					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+					$("#" + id_data + " img").css('width', values['width'] + 'px');
+					$("#" + id_data + " img").css('height', values['height'] + 'px');
+				}
 			}
 			else {
-				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module_graph.png');
+				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
 				
 				if($('#text-width').val() == 0 || $('#text-height').val() == 0){
 					$("#" + id_data + " img").css('width', '300px');
@@ -2241,7 +2248,7 @@ function createItem(type, values, id_data) {
 		case 'auto_sla_graph':
 			var sizeStyle = '';
 			var imageSize = '';
-			item = $('<div id="' + id_data + '" class="item" style="text-align: left; position: absolute; display: inline-block; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+			item = $('<div id="' + id_data + '" class="item auto_sla_graph" style="text-align: left; position: absolute; display: inline-block; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
 							'<table><tr><td></td></tr><tr><td><span id="text_' + id_data + '" class="text">' + values['label'] + '</span></td></tr><tr><td></td></tr></table>' +
 							'<img class="image" id="image_' + id_data + '" src="images/spinner.gif" />' +
 					'</div>'
@@ -2742,7 +2749,8 @@ function updateDB(type, idElement , values, event) {
 			update_user_line(type, idElement, top, left);
 			break;
 		default:
-
+			console.log(values);
+			console.log(idElement);
 			if ((typeof(values['mov_left']) != 'undefined') &&
 				(typeof(values['mov_top']) != 'undefined')) {
 				top = parseInt($("#" + idElement)
diff --git a/pandora_console/images/console/signes/module-events.png b/pandora_console/images/console/signes/module-events.png
new file mode 100644
index 0000000000000000000000000000000000000000..1393364a8418c35fac87bb16783986a65f5f81b2
GIT binary patch
literal 6040
zcmV;J7iZ{+P)<h;3K|Lk000e1NJLTq00E-_003kN1^@s7TnKO40000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU}I!Q!9RCwBAU>Jsg5yp7?_U-@S;2~jQ
zVMZnp<Hd^?|A$jdF%8G$hu2e6&p3kdu#2fUz2z7l1%c1MUNAiUe1T!n<wz895SVk`
z7ex$2gVe$RG8-BE{QCt%Y{Sh$oB>X@rxsm`#1I2{2qymd=L;~MZL%LOpJKQfr^8_m
zMRpX74GN5v*HST32`u1{0mwdF9>eP?WQU@A6kQJ40#Jxc^BUkZH$c4~ML&!UqThVG
z182j;<8+r}^#CsSF~UkeR#sN5AqsN9P%F~$dTL15Q^T@I|McmTAj2pa+yEeehG%2;
z>C>nGIXF0mMFGJ$oLc6?vJp$L0ej=^j^W`USQA7;*aNFLdIJ@`v5Kn^iryGS*Mr^*
zz$Om@7hkRcW0I2`y5kfDY{0Y#mkLTdi<GVix>^t)W{!<)Hi{aMIIJ;?430dW%AhYE
zLcE8N8<NPtOQjjbL9it0tXPiK98jyBP-7E0P+*QkR)ejLiK``!x0D05h+#1?EDD98
z=9!UKY!5X6%sLN-U0V(y0DD%9n=lXrtr$5?uqYx$rb=a@^x*?E@B+$^SL6-6fre*5
zL76`wH^e<rs9d-qOr$ZJ%N@QLk~rvA6t-_~Z}-+`c4po0zZBe%BuU<O1#8P~Nqr>G
zb1#abJ<AY=p-WKBBnX1@{D(b9X;hg6d?Pt-6KzXfwQ|NYKnB*0pqGKQKru^QiK7O)
zivQBTGTP-mitFX;ynrNx9i*XkmAqUBW2$Y;Zw5EsYV-VQ9&~71=Zmf>f#-{tvA0~$
zK2Qvy*~yb+n;_~+JcsLUdsK8<IL2`V419-s%$4?~9kmg{d)So;q0RgDgR#$`u7iz~
zYXK<Z8VOP3WrB3RF>z}AXyo*6pMJLf#)8rTIA5ku3I;8=L!G8Np)w>~Zm>;^HhTOb
z*b*6yssZq=v<U!$)3aEOwIqXdwsYP8a(Z;97H^|zjHg#Vm!BS;&#FHC8s1HetWQ}i
zWvr2o`8imEf44bi`-V9=P6{5sN|K!XUXm^(aB@;}#(|Qi>DKpsw=;h%S(ZJ<aXiKK
zy8!H5OG?B*5RDs!z<`2_S?VIeJ9q$3A$SpCJc)V<PvA;#5QN#yE|84`1i`#OL8Yd;
z(`l0V#CptPCf)hf>#lC<RgHZNhEd&JQ4|l&BK2%0ISiC#SvBtNqC?W0GBxJ3vx|;6
z7<PlkyRD3*BY}}*BpJp)RDe|m5iN#yfFyDF$}K4J%=>(9UfU=&Klb+Zn5?V!EfI{)
zN5ma^5I?SoY+4(?4sdgM*Gck}!rb-wZSwQ`t=^CKCDGFLEH1&12DubCCnd>Ou%qcl
zADfr0SqY5^1VQWrVO%`JcjQ%u2!5`6N>Q(`4fi6FpefNcwZ2l+^a+02?@87qjCcYx
zoj#xs46gw)G6b;2>9YMTwHpH3Lq)Z*0a-u9sN61l-#BoC;|2PvHbDZtfP7)-{K#F{
z1$@s*ZPX4|<{DVqb?{EE{t|GJINw#2If}a@Bcni4E5!6cR*){vmTl6A&t;AU-!sZK
zD5gjW2uWY(YgEWgCvQOmJj8a<Tks(Sp$|xvnK39D#cT?l36S7v9UL+eW1$t%x)3Ub
z6YfQM^<*0d%!DDNf)s6J`SJ#+4GS^NILgkUHd)A_U5}1|XuflE^~Xj=b79)^@N<Xc
zID`&>=m4wbI82X*lczk-SJCdy2(qw{!ALTa3`WwwLe<&b&E=mP<^+<@J9&3SQLNK6
zy)yIc7j<1HS(crcC5{Mx0<d?+xNXEh6tw_BDFg!owvgZ|Cy0^*<N|JU0^h)w$&Gvf
z`vNIaq+1wB8UZR4{$h;DXh_a3R+JR~2dl8G<*vw?;q01!$R9!`pcwWrMJ*PKkMsGQ
zJw=!*q*UQ>IJisnXO8o%mdoWUlW{`w^nL%F9O{ewe)PB@IS`$QkP2PbeNL0kW7d(R
zObQ{S$|~zfgplFTkqDW9rjO%li_y6Bh;T-#P*WSwi3n$;03}7pSSPaO@p45N_2;~$
z+gcdn0cn-4C>ohvOULBCulILo(V$7F2?A}URgJgoJ^Eej68h-1m)g{0pszbOhC|x6
z*DeJ}JxVrn(W#vUh8EEX*1(`ZI0I#nHD2jN7?Tx%N?G2Lf#C0WL9BD{$lSc+aL!u0
zr@{*qQA*beK@Td>A|Tp+kRa)aeufB!&_2eoc1%uhlN*Z`<Ip6v%c;Di`mAUYAxF36
zhoi<LMz2AnLwgu_FIvmzMUj@9St6;aMhkvRm4HtHzAw(HUs3FF`dF#kjegKFO-LZ6
zZ**<%NShiQE1Q*0DTtP!f;M4aSM5lV!Ng}it-p;fGc6HEPvdY-C=hE!(QiMjndA@X
zV;!($^V%sQzEl<v!}oN`V}h*In*Wg;-U`>R>K>`IsqT~y8<6uNHPCsnC(RWguSI!s
zyzK6Gg17VBkig-kS%~O11)T~6qOqx6<T&Xweb1ZQZ!X%VXA7_qIO$N0cr;TGXPPSI
zJNs(X=r$S=aN`I^isr>|9vC!?0-cK4>uX9e7U?}yl#qf2rF%I^7k;PcsS6yyplwYT
zF%U#_v<U;W=gJu++V@fu`w#(b{rdCr&wF>b+mJy=+DD%~{rvux&f$CHf>5qaRCJQM
zHzj96MlmLk*`STF*rsd;=S1Jgy>cm~AIj09)l-+&N5{yHBbWHdTV|6MWm#ID>%Aj=
z4X2ta8<3g}XPJ@UL_=!3wWg&}(}Dh<ac%BM-v3t!xptbbwWAXeIuap-jzq|*@TBIi
zUDt76dO`~9_xqd8W;4sqNZ5?5@B4?{ZpYpt!~vW3X(u9t5JE18zXGs#{;Y8vVHnp*
zA(9G<fC2%d!oqMQRdA6iMbZVA{si_nvA~r-fNK}7jmyMEFb4O5G%;HwM~Xm5MBsvi
zbUK0WIo~5jqj&z??%dv<^!$i$q}$t_otgK~ytg-x{u4q7A%s|Ig4Kqqsvh-vz31E8
z+v+88;~9^~YopO<(C_#6vy4ce9SLEB{l1TnkMB*4>EcUfpBM)8hYUyvn^|V|iyMHh
zeDJ!nvvWsXB}Cki5Nu2%n!IqZ$S>{*ab4Kl+`JQtMBk}<gh;cov9T6R=Y$aRAtMq(
zMkIucNC+8`5HcbmL~UBzQVY9g`ic%N*a*Gk7PCTJyGWGUI#vcGWJC#E84sVX?wBe>
zr_#9?b+>_~UJ^Etx5T^r<6;K;{_v+sw0wD?s}xgV!?ExGeSPU~Xv0^Z{}9~BALr#>
z<yIR)ue0qbM-$SHO1;;*7lQq*k!I(#!9OOqJv<H@;#-^OvtRgnti7RYV83ph1LvA<
z);}3rZ0cWXlhIa;D5gzAL8v<9XeFW3W5<Q$458?NA8T*%|4;um&q-AUq^7=579w%1
z9ii8A#l7l^kcIBW?<2GieQ8Z}_OUxD=WRFswa(3cp`*=duM5;V+$;$HkEI2ER!W8?
z<~dSw94Rnx=on03D+)k+CpK|uK)$h1Yn5KiQjhbsR9QU10O5VU3`-l-oft7)SV+S_
zswSlS#6G^CDdiag+Pg9RDS$S*?W8uACDG}s0lMvgQ;*GyPOgbUMTHVtuPjK!Iwh1Y
zzL+V)LBq(8Hh2%CWUihL2AB5)?_EM2t_$R9O*IuGgLrkxK0|s=2jM&JlI!qRjL0e~
zAcB<K_};n(*BJK$>m|M?<o(<ziIgQbGE!zUrntUpz|mO!z~A|LT_}V`$;*;!?cXxT
zuG2;on!uC@L>R|}t0QQOw21@Y4=^K06JzB-<Sb?hQ@=Xm&rQh{DE5JBpZ`ABF+G@h
zZa?Dl_Xh#b?w`}@6MsEK=hqabeTZ=W+GwS!b2$y4hVjV{s#|ry0EDz!QHg2l%|e4;
zI;|;zRTaxwm#~oHSGagDskLk9b-z6^5jaYB!ueTi&^jO`M|8tHq{y?ie(JOl{W{A_
zbJB$-I<G7+5T;V0GIcJ)S&lxB68bXNLUnU}IGZnbFFP^+p7A@J39EFB^s#aC+mp%)
za4r-CFyTwAnW<uqHZy9%ur2-F&Ki+hO~K^){l9l+xK34Na&l@I4h9y*29}#kq(}4S
z{J6(uQP;!nOeS0Ey)Xz&Zbp2LV@b7feBOs>#ER>uh1ShzFMe=N%oCRFORURVT@%48
zSdaIV@CfvV7+6Mv+>{`;Za|v(vBL8(yDgkt^Q0uB1?B4{2~D`t%7~l~nC$ap0J-yo
z=giHLI#*cm7ys~7r8<hy;?*n<Pd$&v^-}25^`8e%lR3YS`@yYy{gg*$`dMl%uqfDP
zOy!!cIV~_BIF>&ypu$PVc>C7ZtC7xKUBJFBlEa&+z}+X)NsLa)@s3z8aWRb)0+W9K
zvu~%7?A@QwF4kC~+<Y3r{<>U+BG!9Yr0}ohR=h%nZ&faDZGLg3kYXM8O-2-T?<IDA
z_Sr=$msoSwZ4c6W^i$m@F*v5|Q}i_*BgeH=aiMi1N=>w;9?V@M<$y&epG@H6ATBXA
zbgP6Mt3KiHh&ag0{cGVGvHq~WMuKbkliWHk*NCipv7S(vhq~?gm_k2_etjmF(72Z3
z(l)|XRlV8W-Ti)%Mnvxrd(326z(cW=z34JEujPI?D;5Ky{cx7Tl^R!UC%m_}*IP;?
zqSx)30kK_eea6$~wQf3C&o+HVvonPSR?SMMaY8JUR*eWnh1mCggpd&>_-C>PX!2Bo
z5I5e46orJ0NC+V#5<*5Kgp5cC8IceoVnlD%B|@Y*KR>sPsNe4&oSmJihlEIQdU`qt
zrgOvLaG)*{BFxFj2?EZ3(1`Hj;o+frN(ciyy?u0abkF@;FLZEKRR`<q>yNj#w$yXt
z#xov|*G8k!z>Ppc2qA<J;#%-QfcDNOG^!(x<4?PPv}{5`Y!#)DSXpgLO@-D=Jw!az
z3I&UW;-OlhJ$Y$Qo`i}gPd$0kL$wDHDiI1+4-yaY(iUPYt#+|SS}NKa5|U-(1`|5p
zZ6?mnzPE4Yy|=rQ-R}pN#AM%}o%#Ld`}_T7-h}@MA%qY@2q9!uoP!I60yeD~60aUM
zB_V_m!2|KSmCxs`_FuIUqb2bfPNh=)YuB#zGMNmUoe)Au4drs#E0s##;^HDi=}4G3
z8Hv%72#w@&xt?q`%T^|Y5Mm`v#bR+<e7ieHltP~t$KvjEIz86c*GC~Dgb-p4v;!KF
zN~OkxrhH+Y8Ht02R<B+?(%ak1)+B@w5}T>1DU|MZ=owO2W^|a3yAnbONs1*+*{}aR
zOpN+PTE*5Qgb>nDxWh0Zgb<1mA%qY@F(QNzLNOwQ5JD(Mgb+enPFpUOo0uN;uG~8w
z`S|P$Iq#G07b;%~A%swjA~F8>QsiU1vKzcZZ(g8f5JE^3X}dDr?EE9|@7Y_Cj$QZS
z777s|giws)bN9)$NXKpJddvIx^)s{xLI`OAZC9onfBc>GF#|ojynS0vHuXMF|GeAx
z=li#QT@gkb$_qvB?AQmf&WCgS^zfVz^Q)EbO+ZO==f=a{w!Xba@5lLneE5xZTWwpn
zS6t&g<90!2eEIh;tA2L$?GfYa*&MIG7x#!Zj|$EeC9~hT@l)>|(HBvO+Ar#7)#qt3
z-}>2(?_=9B{1W~d<~Lyk`GH@1+s+y5HlX)K)b<TRx5X!=d*0|@r>*P;KDDR+7{#bj
zz#&WrQdc|W2jS4RPJDghROIWykl{#v?S`@?99TN#%u)$-w*08_e|*KY@xpuI@HUG+
zAZFc}4ZioJ-VX#4FL_V4*ICKn^O}6tuI&26t{K!Xe)pyZbnqqFPv}30lTDDP+cD0k
z3Q>?CnqXruQWT>EhCzK(?>xGQnD#k1|I5K;e^mQ#vuHPYj(>$eJ(;^#^*#i5%#0eE
z71=FZh!agFiSESLADl84NMwQ#VZU=liHJ?b8TSbhgK$Uzv320rL`D_X{z2DqrSBTe
zu2+sGG9cPu(l36%Zq#4}c6oR5s!`^Q_o;S_0oB9~<7A<Jf~5vQu)8Ge44=PV8|c}d
zX`dq-QUxY%R^DpbX3ofV;etzp8KTfV1IMZ}fyr<|k?HyJU?9$6646TM*M$hjn~ESD
z7jtZb>p!X~d)Q{DCfCuO4EGK(C2q0r)sr>ZPMAGZ0x&Hr($CYZEEH7<H7kLg=_OlN
zkO7))mPj#bFg6PpWT!#A@Je#<i~{Zfk&{}IFmd85e;lvMXiVpB{IbYOnZ@FGHHy<q
z3XKp6^ck+D3sS55j?@n5dVmsEM%I6iKv69LHgj;7b6x7d4*x_p?wYOn`NPHEK3}mu
z(Kcl|n}rKfgp8u{H_munhS^43keQqv8?AEEpqe{Mc``-Eeaei+G&`(~ss<z9_eSBk
zYKcWZcT#Nb-Bpzd%4@Ckh_D`}QMt_mjW95%nM}9`m1HqU!VaY!)GOENWoC$wO~t}w
zL4#@eN*%=UezlC9^gL2h!hdM{1@Gdo&jm=9vE{fhAbe)<<pV7d_m0er8j;-~Q$U2&
zEFqG{qlyol)K6sL*y_Ac5_RG@#`;o|4856sLE@nYQGS^|O6z)X(d<>N^?)eqzJ=hx
zrSdR*0^<~d5xq)*_Qp7YYzd-`7uws^%&9FhBXj^#d#v_CwjjSorIpc-zA6dEgN#59
z#Cm-_sglOS+40DqIqE~ku3pC_T49Sx%%^rO&4a48s%QH8mR)$iZNQOaMi`V;VX*)9
z_QB;r9N7|9sJSGZ0Oe7&L<)a_aH@WT;1(~uPcQRPj1o#$!v<tT2VvzSoWq3&Ur}<K
zn0mfUeON?ea%Tv&Y-3x}&_z!zkK7U2R+Mx3EgTu>dAA|$qDRqk={a!|l;!SE-CVXa
zwOoe*QT4~DbC%5tb|FaW7=q7&Wz{Y}C=cJ*wDtM?xH@*A{o$uB`A<je+6@B=6Cy+j
zE*X|u9zd3dfmnCoIOREY^`5+j?W!S&<*;^)-voACa2>y3A}BKTb1+qS!?-(nE%baO
znw^dQdAcUB(96@VqOTr>&tQILB|P(15hl%!8#T8}F{;DF^v%$yC+Pt+iEK~3CkT<g
zj604K$j_~w1JM)e%3(Ee`9LEaQGd=MDM7E)yG0a@Yv83ij$DFUucV_7g1BES`lweg
zN0tZCQ|IH*KJTx9fznlUp+Wm2qo~(cE`y*|7f#qrE2!A&q}h%suzj_HfqubsfJ>x0
z!6EJhJhS8CmKeI>-xm?RKL2IAj5|z_V9;u9-*h#V1P>_Uxe(jAE8FX!lw&Hwa;d!f
zz^uBHgHf3&f_+FqH;q=qvRl(^HOc4ZO#8)jm6|>es@gLGuCQGe>S5Z}NzT3De)Uys
zt*ZF^@3(e4u(&cE(Q#s=J`vt1<7^}!iu*i&`(V|;pR|CgPl%(vP^MDnto+0W+l>sa
zKhTgBZs?bc5F9KwR~K(Y5nJhWaNO~KE(O|ybW&`Sf`OBN%PLv)-5I1Exi*Pz9DpsY
zV)NUMr&&M{@qA_2qbg`;_>}8QyjRuxWuZ_Q>F(|xN~hB+)(PZXi|bJVA%t`Sb8~ZE
zsZ=_V&*#7DsLV($%ODDKZElDVLP(p7k$f1Ie@2`TLMTS9%ZetiIr(rGA%u_)5+nTK
zH*O(A2qEs%*3TJHhzKEsVnhfbgiwqKA%swj2qA<JiV-1%koFLx2MY@eY$ZYnAuSc7
zbJ)6p5JCt^f~QZP;>%?#G0NxjHx?HcPt45BumuSrgv0_`0!<OxQnRz`Dw7iw3I%L$
zJ(kPmylghh7A1rbVobSQ_KL;gwD@+npAZ>~ktRyR>2$h(&6+h{CX-<+6G8~7VSawT
zvP1W?XU`x$M}kBsk{AVu(~x-eu;~dQgb0uU-3SvOLI@#*5JCtcgb+fAbNmPNGN@O(
S=e8680000<MNUMnLSTYr_<-*K

literal 0
HcmV?d00001

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 5f86f577ce..3dd229ff17 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1078,18 +1078,18 @@ function visual_map_print_item($mode = "read", $layoutData,
 			if ((get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap')) {
 				if($width == 0 || $height == 0){
 					if ($layoutData['id_metaconsole'] != 0) {
-						$img =  '<img src="../../images/console/signes/module_graph.png" style="width:300px;height:180px;">';
+						$img =  '<img src="../../images/console/signes/module-events.png">';
 					}
 					else{
-						$img =  '<img src="images/console/signes/module_graph.png" style="width:300px;height:180px;">';	
+						$img =  '<img src="images/console/signes/module-events.png">';	
 					}
 				}
 				else{
 					if ($layoutData['id_metaconsole'] != 0) {
-						$img =  '<img src="../../images/console/signes/module_graph.png" style="width:'.$width.'px;height:'.	$height.'px;">';
+						$img =  '<img src="../../images/console/signes/module-events.png" style="width:'.$width.'px;height:'.	$height.'px;">';
 					}
 					else{
-						$img =  '<img src="images/console/signes/module_graph.png" style="width:'.$width.'px;height:'.	$height.'px;">';
+						$img =  '<img src="images/console/signes/module-events.png" style="width:'.$width.'px;height:'.	$height.'px;">';
 					}
 				}
 			}

From 06eadbaf81fa286a4136630e12c9747d4cae685d Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 19 Jul 2017 10:52:01 +0200
Subject: [PATCH 026/157] Fixed urlencode in event popup

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

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 01610e5338..fe34c2ebdb 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2115,7 +2115,7 @@ function events_page_details ($event, $server = "") {
 					"type" => $graph_type,
 					"period" => SECONDS_1DAY,
 					"id" => $module["id_agente_modulo"],
-					"label" => rawurlencode(urlencode(base64_encode($module["nombre"]))),
+					"label" => base64_encode($module["nombre"]),
 					"refresh" => SECONDS_10MINUTES
 				);
 			

From 278330e8f6cee8c59acde1e8d52c325f81f84bc9 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 19 Jul 2017 11:37:17 +0200
Subject: [PATCH 027/157] Added some fixes to reset pass feature

---
 .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql      | 10 ++++++++++
 pandora_console/index.php                              |  9 ++++++++-
 pandora_console/pandoradb.sql                          | 10 ++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 16b67d8e28..b216b01d3c 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1337,6 +1337,16 @@ CREATE TABLE IF NOT EXISTS `tcontainer` (
 
 INSERT INTO `tcontainer` SET `name` = 'Default graph container';
 
+-- ----------------------------------------------------------------------
+-- Table `treset_pass_history`
+-- ----------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `treset_pass_history` (
+	`id` int(10) unsigned NOT NULL auto_increment,
+	`id_user` varchar(60) NOT NULL,
+	`reset_moment` date default NULL,
+	PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 -- ---------------------------------------------------------------------
 -- Table `tcontainer_item`
 -- ---------------------------------------------------------------------
diff --git a/pandora_console/index.php b/pandora_console/index.php
index ff0e86cb8c..5a32eaa670 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -584,6 +584,13 @@ if (! isset ($config['id_user'])) {
 				$res = update_user_password ($id_user, $pass1);
 				if ($res) {
 					$correct_reset_pass_process = __('Password changed successfully');
+
+					$values = array();
+					$values['id_user'] = $id_user;
+					$reset_pass_moment = new DateTime('now');
+					$reset_pass_moment = $reset_pass_moment->format("Y-m-d H:i:s");
+					$values['reset_moment'] = $reset_pass_moment;
+					db_process_sql_insert('treset_pass_history', $values);
 				}
 				else {
 					$process_error_message = __('Failed to change password');
@@ -641,7 +648,7 @@ if (! isset ($config['id_user'])) {
 
 								if (!$check_user) {
 									$reset = false;
-									$error = __('User doesn\'t exist in database');
+									$error = __('Error in reset password request');
 									$show_error = true;
 								}
 								else {
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 9733792280..91362e2d59 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1143,6 +1143,16 @@ CREATE TABLE IF NOT EXISTS `tuser_double_auth` (
 	FOREIGN KEY (`id_user`) REFERENCES tusuario(`id_user`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+-- ----------------------------------------------------------------------
+-- Table `treset_pass_history`
+-- ----------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `treset_pass_history` (
+	`id` int(10) unsigned NOT NULL auto_increment,
+	`id_user` varchar(60) NOT NULL,
+	`reset_moment` datetime not null default 0,
+	PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 -- ----------------------------------------------------------------------
 -- Table `tnews`
 -- ----------------------------------------------------------------------

From 5fd6c039171ffa399f9de02262e16144d69d9e80 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 19 Jul 2017 12:32:45 +0200
Subject: [PATCH 028/157] Change agent name by alias in gis map

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

diff --git a/pandora_console/operation/gis_maps/ajax.php b/pandora_console/operation/gis_maps/ajax.php
index deed8688a4..634fb17ef5 100644
--- a/pandora_console/operation/gis_maps/ajax.php
+++ b/pandora_console/operation/gis_maps/ajax.php
@@ -246,7 +246,7 @@ switch ($opt) {
 		$row = array();
 		$row[] = __('Agent');
 		$row[] = '<a style="font-weight: bolder;" href="?sec=estado&sec2=operation/agentes/ver_agente&id_agente='
-			. $agent['id_agente'] . '">'.$agent['nombre'].'</a>';
+			. $agent['id_agente'] . '">'.$agent['alias'].'</a>';
 		$table->data[] = $row;
 
 		// Position

From f060a2cdd88edcf4050f539afaa455a9e8eb3761 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 19 Jul 2017 16:12:09 +0200
Subject: [PATCH 029/157] Extended number of characters allowed

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

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 6051ea743e..57c28a5ecd 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -3220,11 +3220,11 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta =
 			}
 			else {
 				if ($meta) {
-					$name = mb_substr (io_safe_output($row['agent_name']), 0, 14)." (".$row["count"].")";
+					$name = mb_substr (io_safe_output($row['agent_name']), 0, 25)." (".$row["count"].")";
 				}
 				else {
 					$alias = agents_get_alias($row["id_agente"]);
-					$name = mb_substr($alias, 0, 14)." #".$row["id_agente"]." (".$row["count"].")";
+					$name = mb_substr($alias, 0, 25)." #".$row["id_agente"]." (".$row["count"].")";
 				}
 				$data[$name] = $row["count"];
 			}

From 31a8995176b11f0285537354f2b408d6d03b9e53 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 19 Jul 2017 19:02:20 +0200
Subject: [PATCH 030/157] Fix restore element width when press double click
 over data image simple_value - #412

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

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 4a0fa19d2e..36bcefa215 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -576,8 +576,10 @@ function readFields() {
 	}
 	values['width'] = $("input[name=width]").val();
 	values['width_data_image'] = $("#data_image_width").val();
-	if(values['width_data_image'] != 0){
-		values['width'] = values['width_data_image'];
+	if(selectedItem == 'simple_value' || creationItem == 'simple_value'){
+		if(values['width_data_image'] != 0){
+			values['width'] = values['width_data_image'];
+		}
 	}
 	values['height'] = $("input[name=height]").val();
 	values['parent'] = $("select[name=parent]").val();
@@ -2989,7 +2991,7 @@ function eventsItems(drag) {
 		}
 		
 		if(selectedItem == 'simple_value'){
-			
+			$('#data_image_width').val(event.currentTarget.clientWidth);			
 			var found = $('#'+idItem).find("img");
 					
 			if(found.length > 0){
@@ -3344,6 +3346,7 @@ function click_button_toolbox(id) {
 			$("#period_row." + id).css('display', 'none');
 			break;
 		case 'label':
+			$("#data_image_width").val(100);
 			toolbuttonActive = creationItem = 'label';
 			toggle_item_palette();
 			break;
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index e2e01a21d6..2ba31b6a48 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -314,7 +314,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['module_row']['html'] = '<td align="left">' .
 				__('Module') . '</td>
 				<td align="left">' .
-				html_print_select(array(), 'module', '', '', __('Any'), 0, true). '<div id="data_image_container" style="display:none;"><span id="data_image_check_label" style="margin-left:20px;">'.__("Data image").': </span><span id="data_image_check">Off</span><span id="data_image_width_label"> - Width: </span><input style="margin-left:5px;width:40px;" type="number" id="data_image_width" value="100"></input></div>
+				html_print_select(array(), 'module', '', '', __('Any'), 0, true). '<div id="data_image_container" style="display:none;"><span id="data_image_check_label" style="margin-left:20px;">'.__("Data image").': </span><span id="data_image_check">Off</span><span id="data_image_width_label"> - Width: </span><input style="margin-left:5px;width:40px;" type="number" min="0" id="data_image_width" value="100"></input></div>
 				</td>';
 				
 				

From 728fb7cc69c6b76a6029500731d71a711fb5fdea Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 20 Jul 2017 00:01:18 +0200
Subject: [PATCH 031/157] 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 a9440597f9..ee77385f12 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.707-170719
+Version: 7.0NG.707-170720
 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 c1b7ad8443..12b8d9f099 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.707-170719"
+pandora_version="7.0NG.707-170720"
 
 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 7ee0158f7e..3f6a337845 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.707';
-use constant AGENT_BUILD => '170719';
+use constant AGENT_BUILD => '170720';
 
 # 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 8eb9e5145a..05acf65e4e 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.707
-%define release     170719
+%define release     170720
 
 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 fb9dadd473..5aeecfe8ee 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.707
-%define release     170719
+%define release     170720
 
 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 a1caa62232..f0add54ad3 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170719"
+PI_BUILD="170720"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 5b2dae76b6..eeb545f50c 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170719}
+{170720}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 7faaccda0e..3917358edf 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.707(Build 170719)")
+#define PANDORA_VERSION ("7.0NG.707(Build 170720)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 4c73bd9315..fd59c0ec06 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.707(Build 170719))"
+      VALUE "ProductVersion", "(7.0NG.707(Build 170720))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 3302bc09ff..543ada6c0d 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.707-170719
+Version: 7.0NG.707-170720
 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 022d244e77..08feaacb9f 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.707-170719"
+pandora_version="7.0NG.707-170720"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 9d3dd26af2..3e2860feaa 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 = 'PC170719';
+$build_version = 'PC170720';
 $pandora_version = 'v7.0NG.707';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 8ea65412df..d0afdb4dfd 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.707';
-$build = '170719';
+$build = '170720';
 			$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 716a9c2f7a..f215eabc6a 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.707
-%define release     170719
+%define release     170720
 
 # 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 6d6148c181..1f6d3d85cd 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.707
-%define release     170719
+%define release     170720
 %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 71f0c42cf1..709d7604be 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.707-170719
+Version: 7.0NG.707-170720
 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 098ddd37b7..7b51f42784 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.707-170719"
+pandora_version="7.0NG.707-170720"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 1f641b2424..255712a4b2 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.707";
-my $pandora_build = "170719";
+my $pandora_build = "170720";
 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 93cd058884..7b83893c65 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.707
-%define release     170719
+%define release     170720
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index cb19a34b4f..0b83ffafbc 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.707
-%define release     170719
+%define release     170720
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 01d3f41d04..ea2f16e853 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170719"
+PI_BUILD="170720"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1bac01f60d..938a33e89b 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.707 PS170719";
+my $version = "7.0NG.707 PS170720";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 5efa7724c2..89f50c7f3f 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.707 PS170719";
+my $version = "7.0NG.707 PS170720";
 
 # save program name for logging
 my $progname = basename($0);

From 66d9dd9d2790f4f731b9893aa73db39f5c644853 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 20 Jul 2017 13:36:16 +0200
Subject: [PATCH 032/157] fixed errors entities in mail

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

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index c804ddc22c..27e1608eac 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1228,7 +1228,7 @@ if ($update_module) {
 		'min_ff_event_critical' => $ff_event_critical,
 		'each_ff' => $each_ff,
 		'ff_timeout' => $ff_timeout,
-		'unit' => $unit,
+		'unit' => io_safe_output($unit),
 		'macros' => $macros,
 		'quiet' => $quiet_module,
 		'critical_instructions' => $critical_instructions,
@@ -1388,7 +1388,7 @@ if ($create_module) {
 		'min_ff_event_critical' => $ff_event_critical,
 		'each_ff' => $each_ff,
 		'ff_timeout' => $ff_timeout,
-		'unit' => $unit,
+		'unit' => io_safe_output($unit),
 		'macros' => $macros,
 		'quiet' => $quiet_module,
 		'critical_instructions' => $critical_instructions,

From f88f375ea35a2eb4fbbccf87cdc072e39bb7572d Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 20 Jul 2017 15:14:20 +0200
Subject: [PATCH 033/157] Filter agents by server automatico module graph and
 fix bug - #1088

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

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index ffde723fe7..36debe9a70 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -128,26 +128,6 @@ function reporting_make_reporting_data($report = null, $id_report,
 			$content['period'] = $period;
 		}
 		
-		if(defined('METACONSOLE')){
-			if (is_array($content['id_agent'])) {
-				$new_array = array();
-				foreach ($content['id_agent'] as $key => $value) {
-				 $meta_id = explode("|",$value);
-				 array_push($new_array,$meta_id[1]);
-				}
-			 $content['id_agent'] = $new_array;
-			}
-			else {
-				$meta_id = explode("|",$content['id_agent']);
-				if ($meta_id[1] != null) {
-					$content['id_agent'] = array();
-					$content['id_agent'] = $meta_id[1];
-				}
-			}
-			
-		 
-	 }
-	 	
 		$content['style'] = json_decode(io_safe_output($content['style']), true);
 		if(isset($content['style']['name_label'])){
 			//Add macros name
@@ -166,19 +146,17 @@ function reporting_make_reporting_data($report = null, $id_report,
 					continue;
 				}
 			}
+			
+			
+			if(sizeof($content['id_agent']) != 1){
+				$content['style']['name_label'] = str_replace("_agent_",sizeof($content['id_agent']).__(' agents'),$content['style']['name_label']);
+			}
 
+			if(sizeof($content['id_agent_module']) != 1){
+			 	$content['style']['name_label'] = str_replace("_module_",sizeof($content['id_agent_module']).__(' modules'),$content['style']['name_label']);
+			}
 
-
-				if(sizeof($content['id_agent']) != 1){
-					$content['style']['name_label'] = str_replace("_agent_",sizeof($content['id_agent']).__(' agents'),$content['style']['name_label']);
-				}
-
-				 if(sizeof($content['id_agent_module']) != 1){
-					 $content['style']['name_label'] = str_replace("_module_",sizeof($content['id_agent_module']).__(' modules'),$content['style']['name_label']);
-				 }
-				
-				 $content['name'] = reporting_label_macro($items_label, $content['style']['name_label']);
-
+			$content['name'] = reporting_label_macro($items_label, $content['style']['name_label']);
 
 			if ($metaconsole_on) {
 				//Restore db connection
@@ -5811,12 +5789,17 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 	
 	require_once ($config["homedir"] . '/include/functions_graph.php');
 	
-	if ($config['metaconsole']) {
-		$id_meta = metaconsole_get_id_server($content["server_name"]);
-		
-		
-		$server = metaconsole_get_connection_by_id ($id_meta);
-		metaconsole_connect($server);
+	if ($type_report == 'automatic_graph') {
+		// Do none
+	}
+	else {
+		if ($config['metaconsole']) {
+			$id_meta = metaconsole_get_id_server($content["server_name"]);
+			
+			
+			$server = metaconsole_get_connection_by_id ($id_meta);
+			metaconsole_connect($server);
+		}
 	}
 	
 	$graph = db_get_row ("tgraph", "id_graph", $content['id_gs']);
@@ -5869,8 +5852,7 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 						'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
 						'id_agent_module'=>$graph_item['id_agent_module']);
 			}
-			
-			$label = reporting_label_macro($item, $content['style']['label']);
+
 			$labels[$graph_item['id_agent_module']] = $label;
 		}
 	}
@@ -5889,13 +5871,6 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 			$height = 50;
 		}
 	}
-	if (defined('METACONSOLE')) {
-		$modules_new = array();
-		foreach ($modules as $mod) {
-			$modules_new[] = $mod['module'];
-		}
-		$modules = $modules_new;
-	}
 	
 	switch ($type) {
 		case 'dinamic':
@@ -10292,6 +10267,7 @@ function reporting_get_agentmodule_sla_working_timestamp ($period, $date_end, $w
 }
 
 function reporting_label_macro ($item, $label) {
+	
 	switch ($item['type']) {
 		case 'event_report_agent':
 		case 'alert_report_agent':
@@ -10317,7 +10293,6 @@ function reporting_label_macro ($item, $label) {
 				$label = str_replace("_address_", $agent_name, $label);
 			}
 			break;
-    		case 'automatic_graph':
 		case 'simple_graph':
 		case 'module_histogram_graph':
 		case 'custom_graph':
@@ -10337,6 +10312,7 @@ function reporting_label_macro ($item, $label) {
 		case 'TTO':
 		case 'MTBF':
 		case 'MTTR':
+		case 'automatic_graph':
 			if (preg_match("/_agent_/", $label)) {
 				$agent_name = agents_get_alias($item['id_agent']);
 				$label = str_replace("_agent_", $agent_name, $label);

From 9cc461ec8b1f31ee247c4bdec87485dd8c99fd51 Mon Sep 17 00:00:00 2001
From: Enrique Camargo <enrique.camargo@artica.es>
Date: Thu, 20 Jul 2017 15:23:46 +0200
Subject: [PATCH 034/157] Update functions_reporting.php

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

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 36debe9a70..1a87280c15 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -5852,7 +5852,7 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 						'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
 						'id_agent_module'=>$graph_item['id_agent_module']);
 			}
-
+            $label = reporting_label_macro($item, $content['style']['label']);
 			$labels[$graph_item['id_agent_module']] = $label;
 		}
 	}

From ef007f8a6f0411bb7504237438b4ee6e14562cea Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 20 Jul 2017 15:53:43 +0200
Subject: [PATCH 035/157] Fix labels - #1088

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

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 1a87280c15..f64bb7d0ed 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -5852,7 +5852,7 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 						'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
 						'id_agent_module'=>$graph_item['id_agent_module']);
 			}
-            $label = reporting_label_macro($item, $content['style']['label']);
+			
 			$labels[$graph_item['id_agent_module']] = $label;
 		}
 	}

From 1d35620ea65ba91edd3a61b3dff673ceaf2e273c Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 21 Jul 2017 00:01:16 +0200
Subject: [PATCH 036/157] 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 ee77385f12..123ec79e09 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.707-170720
+Version: 7.0NG.707-170721
 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 12b8d9f099..3befeff580 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.707-170720"
+pandora_version="7.0NG.707-170721"
 
 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 3f6a337845..c76059472b 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.707';
-use constant AGENT_BUILD => '170720';
+use constant AGENT_BUILD => '170721';
 
 # 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 05acf65e4e..043e84ec75 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.707
-%define release     170720
+%define release     170721
 
 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 5aeecfe8ee..11a7a0149b 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.707
-%define release     170720
+%define release     170721
 
 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 f0add54ad3..9bef9306e7 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170720"
+PI_BUILD="170721"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index eeb545f50c..c5033366b2 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170720}
+{170721}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 3917358edf..31882ee8bd 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.707(Build 170720)")
+#define PANDORA_VERSION ("7.0NG.707(Build 170721)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index fd59c0ec06..de7879e15a 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.707(Build 170720))"
+      VALUE "ProductVersion", "(7.0NG.707(Build 170721))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 543ada6c0d..4a3cbd1d33 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.707-170720
+Version: 7.0NG.707-170721
 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 08feaacb9f..ac27655143 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.707-170720"
+pandora_version="7.0NG.707-170721"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 3e2860feaa..904642948f 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 = 'PC170720';
+$build_version = 'PC170721';
 $pandora_version = 'v7.0NG.707';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index d0afdb4dfd..eaefe271c8 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.707';
-$build = '170720';
+$build = '170721';
 			$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 f215eabc6a..ab5acb7bec 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.707
-%define release     170720
+%define release     170721
 
 # 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 1f6d3d85cd..6f0c12085f 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.707
-%define release     170720
+%define release     170721
 %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 709d7604be..923ab9e578 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.707-170720
+Version: 7.0NG.707-170721
 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 7b51f42784..6deefb27e0 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.707-170720"
+pandora_version="7.0NG.707-170721"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 255712a4b2..3089e81a3c 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.707";
-my $pandora_build = "170720";
+my $pandora_build = "170721";
 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 7b83893c65..a0d5b27d16 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.707
-%define release     170720
+%define release     170721
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 0b83ffafbc..3d66ee9934 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.707
-%define release     170720
+%define release     170721
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index ea2f16e853..7a557221b4 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170720"
+PI_BUILD="170721"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 938a33e89b..21f33d5258 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.707 PS170720";
+my $version = "7.0NG.707 PS170721";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 89f50c7f3f..c47b5405d4 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.707 PS170720";
+my $version = "7.0NG.707 PS170721";
 
 # save program name for logging
 my $progname = basename($0);

From b4765a0a9a3615bc9c5b4dcf510ce66f22ad8319 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Fri, 21 Jul 2017 12:19:56 +0200
Subject: [PATCH 037/157] Expand layer

---
 pandora_console/operation/gis_maps/render_view.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php
index 07e08582ec..36e20bf709 100644
--- a/pandora_console/operation/gis_maps/render_view.php
+++ b/pandora_console/operation/gis_maps/render_view.php
@@ -242,6 +242,7 @@ if ($config["pure"] != 0) {
 				
 				var new_height = $(document).height();
 				$("#map").css("height", new_height - 60);
+				$("svg[id*=OpenLayers]").css("height", new_height - 60);		
 				
 			});
 		</script>

From aa5d18ff3fa9a22deecf46132bee95356e31600d Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 21 Jul 2017 14:45:23 +0200
Subject: [PATCH 038/157] fixed errors in agent buffered always

---
 pandora_agents/unix/pandora_agent | 129 ++++++++++++++++++++++++------
 1 file changed, 103 insertions(+), 26 deletions(-)

diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index c76059472b..b1d4e9ef1d 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -906,14 +906,13 @@ sub fix_directory ($) {
 ################################################################################
 # Sends a file to the server.
 ################################################################################
-#sub send_file ($;$) {
+#sub send_file ($;$$$) {
 sub send_file {
-	my ($file, $secondary) = @_;
+	my ($file, $secondary, $rc_primary, $flag_always) = @_;
 	my $output;
-
 	my $pid = fork();
 	return 1 unless defined $pid;
-	
+
 	if ($pid == 0) {
 		# execute the transfer program by child process.
 		eval {
@@ -942,14 +941,14 @@ sub send_file {
 		};
 
 		if ($@) {
-			log_message ('error', "Error sending file '$file': File transfer command is not responding.");
+			log_message ('error', "Error sending file '$file' to '" . $Conf{'server_ip'} . ":" . $Conf{'server_port'}. "': File transfer command is not responding.");
 			exit 1;
 		}
 
 		# Get the errorlevel
 		my $rc = $? >> 8;
 		if ($rc != 0) {
-			log_message ('error', "Error sending file '$file': $output");
+			log_message ('error', "Error sending file '$file' to '" . $Conf{'server_ip'} . ":" . $Conf{'server_port'}. "': $output");
 		}
 		exit $rc;
 	}
@@ -958,39 +957,104 @@ sub send_file {
 	waitpid ($pid, 0);
 	my $rc = $? >> 8;
 
-	return $rc unless (defined ($secondary));
+	if( ($Conf{'secondary_mode'} eq 'always') && ( !defined($flag_always) ) ){
+		# Send the file to the secondary server
+		return $rc unless ($Conf{'secondary_mode'} eq 'always');
+		
+		if(defined ($secondary)){
+			if( ($rc != 0 && ($file =~ /\.data/))  ){
+				$rc_primary = 1;
+			}
+			swap_servers ();
+			$rc = send_file ($file, undef, $rc_primary);
+			swap_servers ();
 
-	# Send the file to the secondary server
-	return $rc unless ($Conf{'secondary_mode'} eq 'always' || ($Conf{'secondary_mode'} eq 'on_error' && $rc != 0));
-	
-	swap_servers ();
-	$rc = send_file ($file);
-	swap_servers ();
-	return $rc;
+			return $rc;
+		}
+		else{
+			my $rc_secondary = 0;
+			if( ($rc != 0) && ($file =~ /\.data/)){				
+				$rc_secondary = 1;
+			}
+
+			if (  $rc_secondary == 1 && defined($rc_primary) ){
+				return 1;
+			}
+			
+			if ( $rc_secondary == 1 ){
+				if (! -d "$Conf{'temporal'}/secondary"){
+					mkdir "$Conf{'temporal'}/secondary";
+				}
+				eval {
+					copy("$file", "$Conf{'temporal'}/secondary/");
+				};
+				if ($@) {
+					# We shouldn't reach this point...
+					die ("Cannot write on $Conf{'temporal'}/secondary/");
+				}
+				return 0;
+			}
+			
+			if ( defined($rc_primary) ){
+				if (! -d "$Conf{'temporal'}/primary"){
+					mkdir "$Conf{'temporal'}/primary";
+				}
+				eval {
+					copy("$file", "$Conf{'temporal'}/primary/");
+				};
+				if ($@) {
+					# We shouldn't reach this point...
+					die ("Cannot write on $Conf{'temporal'}/primary/");
+				}
+				return 0;
+			}
+
+			if ( $rc_secondary == 0 && !defined($rc_primary) ){
+				return 0;
+			}
+		}
+	}
+	elsif ( ($Conf{'secondary_mode'} eq 'always') && defined($flag_always) ){
+		return $rc;
+	}
+	else{
+		return $rc unless (defined ($secondary));
+
+		# Send the file to the secondary server
+		return $rc unless ($Conf{'secondary_mode'} eq 'always' || ($Conf{'secondary_mode'} eq 'on_error' && $rc != 0));
+		
+		swap_servers ();
+		$rc = send_file ($file);
+		swap_servers ();
+		return $rc;
+	}
 }
 
 ################################################################################
 # Send buffered XML files.
 ################################################################################
-sub send_buffered_xml_files () {
-
+sub send_buffered_xml_files ($;$) {
+	my ($temporal_file, $flag_always) = @_;
 	# Read XML files from the temporal directory
-	opendir(TEMPORAL, $Conf{'temporal'}) or return;
-	while (my $xml_file = readdir(TEMPORAL)) { 
-	
+	opendir(TEMPORAL, $temporal_file) or return;
+	if (defined($flag_always) && ($flag_always == 2)){
+		swap_servers ();
+	}
+	while (my $xml_file = readdir(TEMPORAL)) {
 		# Skip non data files and symlinks
-		next if ($xml_file !~ m/^$Conf{'agent_name'}\.[0-9]+\.data$/ || -l "$Conf{'temporal'}/$xml_file");
-
-		my $rc = send_file ("$Conf{'temporal'}/$xml_file", 1);
-		
+		next if ($xml_file !~ m/^$Conf{'agent_name'}\.[0-9]+\.data$/ || -l "$temporal_file/$xml_file");
+		my $rc = send_file ("$temporal_file/$xml_file", 1, undef, $flag_always); 
 		if ($rc == 0) {	
 			if ($Conf{'debug'} eq '1') {
-				rename "$Conf{'temporal'}/$xml_file", "$Conf{'temporal'}/$xml_file". "sent";
+				rename "$temporal_file/$xml_file", "$temporal_file/$xml_file". "sent";
 			} else {
-				unlink ("$Conf{'temporal'}/$xml_file");	
+				unlink ("$temporal_file/$xml_file");	
 			}
 		}
 	}
+	if (defined($flag_always) && ($flag_always == 2)){
+		swap_servers ();
+	}
 }
 
 ################################################################################
@@ -2769,7 +2833,20 @@ while (1) {
 		
 		# Send buffered XML data files
 		if ($Conf{'xml_buffer'} == 1) {
-			send_buffered_xml_files ();
+			if($Conf{'secondary_mode'} eq 'always'){
+				$Conf{'__temporal_primary'}   = "$Conf{'temporal'}/primary";
+				$Conf{'__temporal_secondary'} = "$Conf{'temporal'}/secondary";
+				if (-d "$Conf{'__temporal_primary'}"){				
+					send_buffered_xml_files ($Conf{'__temporal_primary'}, 1);
+				}				
+				if (-d "$Conf{'__temporal_secondary'}"){
+					send_buffered_xml_files ($Conf{'__temporal_secondary'}, 2);
+				}
+				send_buffered_xml_files ($Conf{'temporal'});
+			}
+			else{
+				send_buffered_xml_files ($Conf{'temporal'});	
+			}
 		}
 	}
 	

From 75a9a41a0ba55acbe0ec5d1522ec45cf2b3fc68e Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Fri, 21 Jul 2017 14:57:03 +0200
Subject: [PATCH 039/157] Add report info option in metaconsole 7 open - #1085

---
 pandora_console/include/functions_config.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 6a60622462..0317a34141 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1653,6 +1653,10 @@ function config_process_config () {
 		config_update_value ('command_snapshot', 1);
 	}
 	
+	if (!isset($config['custom_report_info'])) {
+		config_update_value ('custom_report_info', 1);
+	}
+	
 	// Juanma (06/05/2014) New feature: Custom front page for reports  
 	if (!isset($config['custom_report_front'])) {
 		config_update_value ('custom_report_front', 0);

From b5caec31b54476cf716217e97663171070d24bb5 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 22 Jul 2017 00:01:45 +0200
Subject: [PATCH 040/157] 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 123ec79e09..228e08f9f6 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.707-170721
+Version: 7.0NG.707-170722
 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 3befeff580..5bc91cdabc 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.707-170721"
+pandora_version="7.0NG.707-170722"
 
 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 c76059472b..2b9c3f8101 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.707';
-use constant AGENT_BUILD => '170721';
+use constant AGENT_BUILD => '170722';
 
 # 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 043e84ec75..7a3dd6cdac 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.707
-%define release     170721
+%define release     170722
 
 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 11a7a0149b..5e47bc0296 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.707
-%define release     170721
+%define release     170722
 
 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 9bef9306e7..3b92912317 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170721"
+PI_BUILD="170722"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index c5033366b2..af4ba043ae 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170721}
+{170722}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 31882ee8bd..8d9d916d8f 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.707(Build 170721)")
+#define PANDORA_VERSION ("7.0NG.707(Build 170722)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index de7879e15a..838ef13ee4 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.707(Build 170721))"
+      VALUE "ProductVersion", "(7.0NG.707(Build 170722))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 4a3cbd1d33..94f4bb586d 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.707-170721
+Version: 7.0NG.707-170722
 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 ac27655143..6a5fdfc3c7 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.707-170721"
+pandora_version="7.0NG.707-170722"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 904642948f..f57859c3c1 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 = 'PC170721';
+$build_version = 'PC170722';
 $pandora_version = 'v7.0NG.707';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index eaefe271c8..3ddf6ef5cf 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.707';
-$build = '170721';
+$build = '170722';
 			$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 ab5acb7bec..7c2e9e5da2 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.707
-%define release     170721
+%define release     170722
 
 # 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 6f0c12085f..d066c83336 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.707
-%define release     170721
+%define release     170722
 %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 923ab9e578..25c85c057d 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.707-170721
+Version: 7.0NG.707-170722
 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 6deefb27e0..dbacf147ea 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.707-170721"
+pandora_version="7.0NG.707-170722"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 3089e81a3c..4d124d5adb 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.707";
-my $pandora_build = "170721";
+my $pandora_build = "170722";
 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 a0d5b27d16..cb02e891e3 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.707
-%define release     170721
+%define release     170722
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 3d66ee9934..c791e0fe35 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.707
-%define release     170721
+%define release     170722
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7a557221b4..420346829a 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170721"
+PI_BUILD="170722"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 21f33d5258..13195d690a 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.707 PS170721";
+my $version = "7.0NG.707 PS170722";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index c47b5405d4..5f0912a1f7 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.707 PS170721";
+my $version = "7.0NG.707 PS170722";
 
 # save program name for logging
 my $progname = basename($0);

From c51cf9774f23fddeffde3b5a9abe9c0a106a1eb3 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 23 Jul 2017 00:01:13 +0200
Subject: [PATCH 041/157] 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 228e08f9f6..c0d98e312c 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.707-170722
+Version: 7.0NG.707-170723
 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 5bc91cdabc..98eb76dafd 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.707-170722"
+pandora_version="7.0NG.707-170723"
 
 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 2b9c3f8101..29d0ab8503 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.707';
-use constant AGENT_BUILD => '170722';
+use constant AGENT_BUILD => '170723';
 
 # 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 7a3dd6cdac..a789b59e78 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.707
-%define release     170722
+%define release     170723
 
 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 5e47bc0296..4d193fb159 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.707
-%define release     170722
+%define release     170723
 
 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 3b92912317..39915431d0 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170722"
+PI_BUILD="170723"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index af4ba043ae..163ca61d7c 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170722}
+{170723}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 8d9d916d8f..438bf49b45 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.707(Build 170722)")
+#define PANDORA_VERSION ("7.0NG.707(Build 170723)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 838ef13ee4..dfe7b6fff5 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.707(Build 170722))"
+      VALUE "ProductVersion", "(7.0NG.707(Build 170723))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 94f4bb586d..1eebfca7d3 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.707-170722
+Version: 7.0NG.707-170723
 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 6a5fdfc3c7..b1aff17ed8 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.707-170722"
+pandora_version="7.0NG.707-170723"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index f57859c3c1..305848d865 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 = 'PC170722';
+$build_version = 'PC170723';
 $pandora_version = 'v7.0NG.707';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 3ddf6ef5cf..ca33a0a71a 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.707';
-$build = '170722';
+$build = '170723';
 			$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 7c2e9e5da2..f3562b3aab 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.707
-%define release     170722
+%define release     170723
 
 # 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 d066c83336..c6a0e4b95a 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.707
-%define release     170722
+%define release     170723
 %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 25c85c057d..23c1852d67 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.707-170722
+Version: 7.0NG.707-170723
 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 dbacf147ea..e129b1b803 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.707-170722"
+pandora_version="7.0NG.707-170723"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 4d124d5adb..fea65c20b9 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.707";
-my $pandora_build = "170722";
+my $pandora_build = "170723";
 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 cb02e891e3..09367bd55c 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.707
-%define release     170722
+%define release     170723
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c791e0fe35..b58650be04 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.707
-%define release     170722
+%define release     170723
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 420346829a..02f7ffff60 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170722"
+PI_BUILD="170723"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 13195d690a..d7a351e335 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.707 PS170722";
+my $version = "7.0NG.707 PS170723";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 5f0912a1f7..01f4083ea1 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.707 PS170722";
+my $version = "7.0NG.707 PS170723";
 
 # save program name for logging
 my $progname = basename($0);

From f3d6d7262efb3369c980de2ac6f550e32838554a Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 24 Jul 2017 00:01:17 +0200
Subject: [PATCH 042/157] 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 c0d98e312c..fb0020c623 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.707-170723
+Version: 7.0NG.707-170724
 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 98eb76dafd..61ef71f330 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.707-170723"
+pandora_version="7.0NG.707-170724"
 
 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 29d0ab8503..e6dee72481 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.707';
-use constant AGENT_BUILD => '170723';
+use constant AGENT_BUILD => '170724';
 
 # 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 a789b59e78..2cfb6500c6 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.707
-%define release     170723
+%define release     170724
 
 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 4d193fb159..966039b6de 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.707
-%define release     170723
+%define release     170724
 
 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 39915431d0..71a9468513 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170723"
+PI_BUILD="170724"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 163ca61d7c..bcf9f04587 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170723}
+{170724}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 438bf49b45..e5c5c6831c 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.707(Build 170723)")
+#define PANDORA_VERSION ("7.0NG.707(Build 170724)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index dfe7b6fff5..df7354adc7 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.707(Build 170723))"
+      VALUE "ProductVersion", "(7.0NG.707(Build 170724))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 1eebfca7d3..95d67a3259 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.707-170723
+Version: 7.0NG.707-170724
 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 b1aff17ed8..f4846cae5a 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.707-170723"
+pandora_version="7.0NG.707-170724"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 305848d865..e0201f7871 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 = 'PC170723';
+$build_version = 'PC170724';
 $pandora_version = 'v7.0NG.707';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index ca33a0a71a..8c486ed8c1 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.707';
-$build = '170723';
+$build = '170724';
 			$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 f3562b3aab..61393289fb 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.707
-%define release     170723
+%define release     170724
 
 # 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 c6a0e4b95a..ef837620e7 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.707
-%define release     170723
+%define release     170724
 %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 23c1852d67..14d6f03fef 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.707-170723
+Version: 7.0NG.707-170724
 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 e129b1b803..5973fb62a7 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.707-170723"
+pandora_version="7.0NG.707-170724"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index fea65c20b9..473e490437 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.707";
-my $pandora_build = "170723";
+my $pandora_build = "170724";
 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 09367bd55c..9ca2b325b3 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.707
-%define release     170723
+%define release     170724
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index b58650be04..4268b42e1c 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.707
-%define release     170723
+%define release     170724
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 02f7ffff60..2d86685458 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170723"
+PI_BUILD="170724"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d7a351e335..5b4992a2e8 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.707 PS170723";
+my $version = "7.0NG.707 PS170724";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 01f4083ea1..c1be58350f 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.707 PS170723";
+my $version = "7.0NG.707 PS170724";
 
 # save program name for logging
 my $progname = basename($0);

From 741cc052689f7d557353b16acb0e2d96b7b3f8fa Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 24 Jul 2017 10:53:04 +0200
Subject: [PATCH 043/157] fixed errors in graph container

---
 .../godmode/reporting/create_container.php    |  17 ++++++++++---
 .../godmode/reporting/graph_container.php     |   2 +-
 pandora_console/images/image_problem_area.png | Bin 0 -> 21148 bytes
 pandora_console/include/ajax/graph.ajax.php   |  24 ++++++++++--------
 pandora_console/include/styles/pandora.css    |  21 +++++++++++++++
 5 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 pandora_console/images/image_problem_area.png

diff --git a/pandora_console/godmode/reporting/create_container.php b/pandora_console/godmode/reporting/create_container.php
index fed5a6242a..9be93af597 100644
--- a/pandora_console/godmode/reporting/create_container.php
+++ b/pandora_console/godmode/reporting/create_container.php
@@ -41,7 +41,7 @@ if (is_ajax()){
         $id_agent = get_parameter('id_agent');
         $id_agent_module = get_parameter('id_agent_module');
         $time_lapse = get_parameter('time_lapse');
-        $only_avg = (int) get_parameter('only_avg');
+        $only_avg = (bool) get_parameter('only_avg');
         
         $values = array(
             'id_container' => $id_container2,
@@ -76,6 +76,7 @@ if (is_ajax()){
         $agent_alias = get_parameter('agent_alias','');
 		$module_name = get_parameter('module_name','');
 		$tag = get_parameter('tag',0);
+        $only_avg = (bool) get_parameter('only_avg');
 
 		$values = array(
     		'id_container' => $id_container2,
@@ -85,8 +86,8 @@ if (is_ajax()){
         	'id_module_group' => $module_group,
 			'agent' => $agent_alias,
 			'module' => $module_name,
-        	'id_tag' => $tag);
-		
+        	'id_tag' => $tag,
+            'only_average' => $only_avg);
 		$id_item = db_process_sql_insert('tcontainer_item', $values);
 		return;
 	}
@@ -433,7 +434,13 @@ if($edit_container){
     	$tag, '', __('Any'), 0, true, false, false);
     $table->data[] = $data;
     $table->rowclass[] = '';
-
+    
+    $data = array();
+    $data[0] =  __('Only average');
+    $data[1] = html_print_checkbox('only_avg', 1, false,true);
+    $table->data[] = $data;
+    $table->rowclass[] = '';
+     
     $data = array();
     $data[0] = "";
     $data[1] = "<input style='float:right;' type=submit name='add_dynamic' class='sub add' value='".__('Add item')."'>";
@@ -592,6 +599,7 @@ echo html_print_input_hidden('id_agent', 0);
 			var group = $("#container_id_group1").val();
 			var module_group = $("#combo_modulegroup").val();
 			var tag = $("#tag").val();
+            var only_avg = $("#checkbox-only_avg1").prop("checked");
 	        var id_container = <?php echo $id_container; ?>;
             jQuery.post ("ajax.php",
     			{"page" : "godmode/reporting/create_container",
@@ -603,6 +611,7 @@ echo html_print_input_hidden('id_agent', 0);
 				"module_name" : module_name,
 				"tag" : tag,
             	"id_container" : id_container,
+                "only_avg" : only_avg,
     			},
             	function (data, status) {
                 	var url = location.href.replace('&update_container=1', "");
diff --git a/pandora_console/godmode/reporting/graph_container.php b/pandora_console/godmode/reporting/graph_container.php
index beef4167d2..6c4903fbb8 100644
--- a/pandora_console/godmode/reporting/graph_container.php
+++ b/pandora_console/godmode/reporting/graph_container.php
@@ -94,7 +94,7 @@ echo "</div>";
 				},
 			success: function(data) {
 				$("#div_"+hash).remove(); 
-				$("#tgl_div_"+hash).prepend("<div id='div_"+hash+"' style='width: 100%;padding-left: 63px; padding-top: 7px;'>"+data+"</div>");
+				$("#tgl_div_"+hash).prepend("<div id='div_"+hash+"' class='graph_conteiner_inside' style='width: 99%;padding-left: 63px; padding-top: 7px;'>"+data+"</div>");
 				
 				if($('div[class *= graph]').length == 0  && $('div[class *= bullet]').length == 0 && $('div[id *= gauge_]').length == 0){
 					$("#div_"+hash).remove();
diff --git a/pandora_console/images/image_problem_area.png b/pandora_console/images/image_problem_area.png
new file mode 100644
index 0000000000000000000000000000000000000000..d89324cf816c44eb9d2402253f8637baa9835faa
GIT binary patch
literal 21148
zcmd42Wmr_*7dJdA0!oQUm%uGu14v3Us7UwF;S5M4(xs%*N)267Lo<}5w8GFiq=XET
z(hbiU|IhRN{rLI;uWQaed#}BE{nk34G}WJz+^4$_0)a?gzEIKzf$qRTpxcUs_`oj~
zodiR`f3)u)hVOKo;qN>x-@-uhubr)6k6$`k+Q777man~Cf5M)DK-w}dmE?83X13;y
z;~B6i9LIR)AdkEcPU%W<4<3WMh%G+R-IEgCx~FW2I1*yWbm_7!?`g&4IQdC@k-7Ce
zOD^?q^lsPQz>Kfu%hq42c-EfT^WUfMRD>raefdDH!Akv~66inDX#8Qh`0~QxpKlcA
z^%9-o`Y`>g0CL)B#VIb~5~-V`=G_B0EkN-9r+<P~{3Z>R<Cs<_4G`$Ni$gupbXR1?
z_H&OrAP^xu>U$^=b&N-=Um=Qd`|?ccm=O0X@gkYn<ykk)q-`<?^xmQ;?w!K4n3VaT
z(`g|gOkhSB1bU1BKU-W}U2H|kG?Rls570$A9DY|2Y`^}kt?=UqAker?n(6oRXVvwn
z=Ze(z`y4id>1S0fcR`>D9Wa|;n+9ip8^OQ#X3iBx1&IHaJ)a7fx(xya(Ngkg-@B+g
zKEoZNm81T{hvmZ0_c9<!NRjRqDEn<{psEvRWZaQmojXU5nR=Fl+uBoKfCOZYmFTzD
zc$&T-B)}Wp7u^oG%LHf`C#r=Gx?A1X&?(7VY9J7&Mz@0y$tY7>7WLEHw?LrwD7*|o
z_qv1MX_RvlBU>XbFF+tU!Mtp4Y`DL#zu|xXZu;@)_|&}OFMsV20qFgG+iS2y4zI%a
zEcEOfEbXjQ7`PfL`4;GLbOdJgR9!8Hw<z@%NbVjtoWjDNX?pglY!vP?aR5a^mzC=z
zYglaL!s^8g_70A<?31%AS$uEP6vIhj&tn+4&Na#VYJhV9%G4eqlhoAIU>Y)Kuj}lm
z${mI>r6J6lknICtdqL}9^%oKM^>eZxB~}yKEd5>TtR;}g5l@fRq*5d@=Y5-2^ksXo
z?FQAhJ6)A0Ra%ve+U(@O-PvIo!pSopWsQ13)k$}7-{=++u!YA6wK^hdem`lR>5pvO
zFfFjJNl0~w@?$_QS~$62y0~k8xrI~|W(735*lw=;Uoz5OWC$J(lv?;+1{08ZVB?Rz
z2u_v$We~&3mWDbM2_yeu#RQd&6~m_;_M8mY`?uBW^^okgANT8eW0OvUMNd91#oUXQ
zYu){UQ#Mhq9NsX}fTkag5&W!-6SXwQhQpYnrNn>Fj&p_diZIFw_1!y_y#WU!bzV;Y
zes7(meixAQ!_lgB`ts6msW&1g3Vd0WowwP^`|rXIlp6tv22qTS)v2|@#ig@-78&kJ
zh8rOn)YU=TdwECx3KX$JF9|)!`-tD*;dr#A09~r>z;}#Y)F2L4wavQeIIn#5kH7Sb
zKLOHZJ+=&CWK4RfkiIlXAx<LnWYqj7;zlB?UCost-z<$IG^sjSi6on3E+68!VN~(g
zuZ+6{_O0vqOu!Bg#|UUi+0Ynwjjfy2dnC_a#sMahPT*`j)Fihq-z$c<;+0)2Uj)j@
zdT|7y`E8Sr&Y<Q3Z_~Qi8AJagjUSg`{<k=^y2Jj%le$^~-YSwCF`SZu+DjdCiL7%9
zXzvlpbG$NXFq$C#-xlFVXNIA4@GT6gaP;`}N{RCoVUYP0Zlm_7x>L&$dIlLkuXPQf
zFtwh)KZ9B;{AF+^8C@qsw(0PBwyUzEac1QtUh`?B=5a0?2_P=zcuHi_6Vc@&RpP8D
z%Y?iB&oBG{s)Xr^DfF$(pgG_7563j77660mvP_VD*L4eoP@2Wda!Q1+P_^oc5KnMU
z^3r=<>*<!LXGl(b<hZ`R*tJO(Fz5F{xh*7tK-QbJgC1_3S<YQkfT7JjK(q6NKz>Nf
zVp{8%ng?TM?V~hB(dtnxrDbKXw$pBb>Wh=z3vxV=oPgM5u#to8rUO>ea+|T;!7s=#
zq{7*w&bc(avTEm&nvpz~QEIXX`)+%tc5AzS@i-43^gfprk+JC@yX_#$bb_3jzKbHU
z+#0HW-U;GRKyzL68MF#j1812udx4w$FY1{2K%fNjiJG<z2Z3no7xa-9b*=dNAyv*A
z+BCDAGb_)>V%Y&DSOR#@y}v^ECgc6Fb$co8hb`M<+p7{n7)6tutM1Q$-IIWdks)xH
za8IQ&2vjsIg~{WdA)7IS*uw;8AN(+L;fG^BQE+HalF%b<K@X$la#;W`t;?%`d6ls(
zFgqjiRj*z3@r9$B9iXdLIQDZc`$CC$Y|9AYn{Gc?<NSNQkG)6!S_cHQJ{>y2%HDj#
zIiztu1*q=OwSr&?e?rUf+5VM75H`;7_fL*2bPR*UC=z?Q*UN0<+`JbSOaS^W*gS@5
zow#R<#X}v+dDI;I4#&{&-!=`kjlHR@@GrZlb;Nlsiyvki4vUWae|wbiQR<wLERo=M
zuAF++gkoR@!AAPE&G!QX1F*5Nv1n4bBV9*>7BS4k)bwcO7RVy#nct~klkbVs$q)|@
z&wLx%S?9TDHNL?R9VL1a`vsD?mF7;6I^X2!NpI7YHEZa88}#1w0rSjr&B$So&B-#$
zkXl>febaV_O-(8y#hW4&W7&CY-u=3onsG-iW=lW@wgrY}T(@VU>BSna?%5eR{iz*1
z4p*a_nf_=|xA1EvTyMcfxBYl`adCb|aux6o?4}_o!Z%aprX}a)fYzX<@KDclcqRGu
zC-G$!4BzoY$pOhjRCrN3MEqjFIY8%V{}p(5EB_NIJVTR8ubLX!P(hRHwLZ+END15z
z4UzM`xjHE!wq+x;VY>(4RFi2nhj3B=PESs*<ol}(m*cWez|T2b&Qh~e{c{><mdNfz
z5-1+%{ZC3o25YaC-~GwPjDyPLXfr<gJ}XkF?$4TUfUPU&4lD#*Y;(_S$Nra2@)VJn
zp+hCV<r#qWBsK;dhiIa~kV+lq#)%{S%7Ql-iqWL9k7JbbP)!6_vd%?S8nXfQ<FhOx
zkq>)_mdxRuSqhXrItC~6h6w;JikOufzT0}?ggF|r%0RhUlLJe((lP{ORlYgu_U5Wk
zO$Y%FIM>S78m~r4(Kw`W(qi%+Y-E*9QjkACq*|v?-JLoLVABgqJrvChV!igr#UpPJ
z+tAXZNoBbe4*2>GgeLG@mnCWX9I&r1GZm~6YKs*Y5>6F+t>);5Gs{FUfI}1e>7Qu^
z%^F;mI*8n5+Kj@43I=&1GY$dWQ^P_)plqs<;=SeWNUrTeYtEHFfU9WM={-O;Th&<-
zS}$qpv$g}5IiyTPt)FK;=E6qtB4Dv$f>fyn1tS0p1$n_(-o`c#@ut>ChQGNP`=-6W
z*r1-9(hz;hcqj!durSQkvF?zx0e{^yoG_&;DMwK5=szTSj-%~+CFBFA<@kcOzG8Au
zUl7J8`HO-n&8w(gfccz!RYToGoA#n&Jcu%}OU?wkmF_HY*Nzk*b&FD6{nB*?Pt+ek
zA`#tq4GJW(q>PdY+tXE@{~nKLO8aUT7-X34R*ghi)S2;JczmASnyD?3ss|*Oea|XF
zuOqI9nw|nJY4+p3e*eQ)p}?-SA2pMPZ*r@VP|EgF&06#Wz@=n=vJ$tB+9?qxn|O$x
zlmavHeNiB>1jtL}zW?&BKPo;lCdq%Uni3_;vp+yU#-vJHe-B{FBQ5YNTRiPXyCeqm
zq|OpXzRkQAXGX!e6kuJ=j0P&mlX_pTA5Z|%kC`+h3T^N6aT$c0Zo9)T0)0Lp!JPSz
zrR{QWI2g)75+Kbpe8@IhU`GoA4O4-q8~|_hL(R<4e8t<VotJ0&Q1Rd9X(0@59@D@E
zmQkODh}eOY?fqvS@gd&-$ZU84GMd0ljE5H#MrwdKqfAtLxoHLmN%;_z{+0RpPo6&l
zsLK!XUR(E(jmg17ITN2pgG0do7T0KXxb&bp@5ArNYQ7T!k^<Wjnn6RsDZjE~!1}NE
zY@`1GQ94`8V|T%Hb#`cy2`za)I$0NtyF|G~xrAhtg{aH<7%LDd5#KGS*hq$`{G)Q)
zw_XJS_Yr(^e=RM~odA{hRN55~Lc6LU@ZPjZJM8;?Pk1RGVqkDk(g#o#Lqu8{&;Ir+
z$Znvosm5H#DDYbYA~TbJfBU&T5gZ~J*~RJrY_O91#tpsU1v~~t>wE6KX)*;EFKC22
z>%9eFE{_qw4gUQhgad2-{lPs1V)g%B@&ChR_X@Uyjtxys2V~CI*`$IxsHmtK&9Q51
z)y2hJQb5EO%u^L?diy(qQT~ZMpMue~yNAc5`Yj-HdT(iDX13#GP+_)xElu{u_he`L
z8n|aWF->)o=dMRRp`Dhrv55(qltDcE3qFo7c@GrfY}wsO1|wE?fQ|1cKW5&iaib?=
zdd8W33pB3O<d<Dhl-qK#(}WQSJbRTPe+x)ivhUs6juu;3*9X`R97_HP2;E!zzxy#W
zGpUTX|84t_M1kM5@vG1O4tdl`pXUSLbNfe16(O8_nAi~y#HrqN38sp?WACia%fM*K
zbz@XWGfJaK52PDOK=i|$;iN>4w%X?U(Oua|XiJ{$w9t&X@@0%APef60s1w@Y7F0qF
zV;x;x!BX$mHN})5a*^yzdSNw1=zGA^VBub3_Gd+m;x3P+y!T)KzQx@EE%k;E(&ChZ
z*uu^ZnY5u#oHqUd$J9G?4+eAJ0=bO^{v$#ga95QII95&k4(^7xmw0F94Yu=QWvU6E
z{(F}@On9<tTmcV7Xp7UT?;uu$p7d96SDZ4C!~lEYzgzwB*=Xkk;L3c#W84xsW+Eb@
z`7*n++v6SoJ3l+-8=Sr~<>??U4a|-$LQH_CRR8aRfP^$>{d-+{{&z_^GC-DPN7roW
z(D!rzMIfJ#kV0x|YJ2}E+Z=)PTL2&A$N;l?mTubOGckw{Z1`U5F6x2(|64Cg-bo8+
zP}sg9;F;G3(mW(_VtQ5{(_P>jDomt#2iV~|VKB6{C&dLHXD0N-_M9s{F2~2S&c^>c
z@+}I5QVc{-OiVca#*qme;oiwGh=^Q@BL8=V_gh+?Jz5`K;J55>Ecg*7JLHgOxcI-d
z7R%8{t2*#M`aa+;Z1Fa_+A68Z@9eD@plQH~Y>yP_l9Q9S32`se<QuM_Z;#`6t(vY?
z)4!-v>PY2y7%Kelp{sbLWi(axziX2BQD;*D=eHAEbS<IjY;dm#T8TL?Jo?{{<5vDC
z9)t2}@_!Fh$kDuVB%qp~HKw4bJepDQr%x04`1xmOMO28tnL?pIo#q=St}bfrr$nz>
z&(6+vM5U$YrDLtrQc|k!+ybtA9EwxD*KTfZ9?An3XDufSJnqaK8kuMyACj%c9&Dk8
zCaIR$Lj3=>6U?jZ=(9Lz?lD-)ZqL>W_-+&zru*SUb?}==lgQ>MA_f7w^E@OOn-v)F
zdI;MdOi+tAS-;>@V$4#aGH2l6+<FGD_n}(iRdCdu#7Uiwad5v6O6>SGg%x4i_^y~<
zXoi2V-ivQ9b>oqx5ED-w+w&MeA^8f=2n3IL<>pDL1<Xoo8buuT=7ut)l3UI<N@~Na
z2ReT7R5Xv0gy6UyO^Pcb>e%RZj;73=e;>r;gp&6uGxD;{^&HT62;$*nVOTR<4{}F!
z&s7piI6kDTX209l{B~+>gAK>(TR5f<P<8HY*!E}{aN1i<$6k3}UwSVQ1FzbaH^fm5
zrt&C2@R)J{MF8&5V}cfo^tKVvDZQXH*6AMZ7A1}x=!6<`$ARKioBS+Tp(~|lte0I@
zeN|=#@wyUZ{8UjfwLg{_=B78U&yO~<_*6|rb-T9(Od8^(Pv+dzxdG8<r~IQLvBL2f
z5P;~K#BY|uQkzU~cBz2N)1=K9$YYX1jjZz5IUCPZdsc1_tA+{Prr<MQiGoK6lIP@d
z^@*~7x{tx2Y?>_HhP$(^_tqN*iggNAWIY`ZaZ*<f7j`^ME8!|zXB$tT?VtfFZ;GC&
zM}XY7^oO+}*)^c20567ZNAmYJCQ3Y%?sPwBWygyU8e$=X!La?1qf%AzNV3Pe130Tu
zj#Q8C@9zgzLGtYqKCmLyU`Ql+0n*Ou;Sw)h*jJz3mXmZ%oSvXsu8wCh8yiT*5y3pO
z*;3WbYXp6gq+eA`w#_s@?nJMVVsHoT0EL>IG9|Zmi7I(!?uFIFa)6E$uk!Da+%eoP
zD-hv0n#mXb`yPKG5Vkl=fh305<QZC_Fowxm(%GfX@Ng!PTYzN3xamG1ob|KT1rb8c
z&VV)c*KAhg86`z}Tok(vq}Jfw0>v6y&~a}4Y7f2>=xn;gjx+*qRjLCXrQiIzy1UT+
zp}lv8Y+&o(ZL3xTyvT8+u~xm)yh@{~ZXYt!xDMkBhFz!SL;*AjTDF%ukzcZY?WUqm
z(+jI@s6dRp+nNRwwBVDM=5|{2HCGj-cIWoHlTgfY);5Yn{W4qwhtWC#WWER2S5^+s
zza<~GQmdXu622inwkm1b2N&nsQBh{)9`xjX=r(q4nP7YftsfV?>J+!J5?`q_rv@Df
z_7c<Z0EUanQ4FuH2skR4w?l7jIsCbZicp{LWarS+ZDvi+Z}8e%)(l(C$4B^I9FxG9
z3-nu-6^U_jo7tXks+W3R>LAx2E}|VPE>paeyQBQLa|a}$x^g*#TM~v}L$mMk>-&e*
ziyyc(<47n&yx5{2st&8Sh9I-Q*56nW&%$X`PUK(&xNEQL6U9$cDr-k!MY>J$gDRl3
zPkcA~Dw#h;;4V(Q>?552g^Bf;)a2?L82oc%pPqht+NPZfjk0nS#<>KQhzKa!UWJ@U
z!#-6rRtTthk9_-l%y8a4N>dlDJ!L&c_*F(j`bgLF6}g@;2_NnyBlaL@UtCWSf_Bs}
zt0*-e2){X7fc@9s!Rf&ayZZ}kJQTuB`N%30BRuph{@rX5yr;4UnE?H-u@9@&yJ9H9
zh_mjfB1C@Oh}hREnW|=aJC`D%2l=`?Ggj&5^f=-bz+b_zTN}TB|K7qy&O7#BW(dF9
zab>V}9&JvA?_X*M+x7{X{p0MaeR@6shsjjAyxq_oW5+{TmX_(Sfwcj#0SfGBHEq&2
zEMcEE!Bb2AV&WFKTW}4L=p8jag=3OtNztIvQE8Fktb?QD0BNawO6>r$8i<!)XCY5F
zfml~7Q$J32SLFJi2jx+K_RYY_`&iSp%q^H;?uBUUwxdboTImWyrpNADjzF0PxRa4w
z#g&c@g{9eh@FP0d1TWH~IMVF73(|gMQz&N_fDr%Zbuij=ACx9k!+XxVhMRyAE_!QE
zhr5_X0m`U{YFGs1F8rr%<gimy8Mo)2_LOLeugu6-oKN~8c~7~UxAxx8?nr7LSur#J
zqlr}&6ADSw+koJR|Kt7-LjQpfcQ#v`P$z9aesOPi$6B#le~=~4eB|r_JgPW#zQuQH
zutX~)Pv};0R6K_U`=Y4A#n}P&RXB<eM!v5NsYRc|aLY@+;t4w*Y>FXk2Uv#_Qm{$k
zsPVpy{8z~;q1EiX(zwW|X{b98A^OtL%&cxD>_J?n_gc#5XC4@DC-T0*45=v+!>U2d
z<6M>FKAwtqSY#qOWt*13B+2*5g6-Sy%K)#!N=d3n8_uSnj7HHNH@6as0{(VKzqRjU
zC8aUm4NWR77Sr?H^XmM_$)yB2A5dy6iWDTmojU`VV9u@qm_Cyx$w2gRepouqs9{|Y
zC9B~iBR`vJri5G1y*tA$fWtm~kQl{k74y#@ihX@Af}Gsds<Ky{JtKq-NuQ*%;5hUB
z^<C6s1j$el-G>mG(dku}q;R3gmv?|br|El211oGV2oui1MJ5_42z4sFft9AavPUZn
z#a^2eE9h~&1^wSc0j^G3+Hx&|ymhbX5Wz=kFPFUymFR%i0K1jbh3{dJnTjE~McE`$
zG?0nEXV|P=(I>aEGiv$?EO@(?hpI%Uvx&r}XunuRV)rMFohK$qW!FA;uOyfr(gCXQ
z9{fO2I&yFinHO)hK=@yWW}oBcecLmI5rcA*pXH`a`WrHA@4H)Ny#88vTG{~y0y;GT
zy$K@ZQ6u6dFR&sta$w=MC7=9Xs-kbn=R`ewc=*l}@!DaM4G6LCBf4&PdG0RE@89Iz
z$%a!1w(iFz61+I*01P0zV3^YQ(%akn+r{qLq7E-F@4Gf-!^mN(z^sgnZ6{o!D!9k$
z_1ie*@5C-xG{FB^4a6d{q6+Fv1Y};pRn$v7YvHSwrCjZQfj~Fk=1lyCD)}z3v4w-u
zgZ|FxjSah%U~30&&3<fkS3xQ+{g*FM0!6w|d?@{6=@6$$3ji6Ig%)4gG}OOTJNj_s
zIkS5`JF!lwHrl`6+*pJ}!sVBo*w^A*Tvj-Y7=AcWMabt^9z()yhC_CmBIlJU`KXW+
zOXN6;KH~#HV5>mf_jilK#&Ma0&lz0wY9t(UJaG|weHDCC*F11@IUt;M<qe;GS0{31
z+psh`KKMK^%jm~ip~t&6{j>7}ZX?|xJP}+9X+--2F4@j=dkX#B0QF~++2h7+GFXEd
zZooXZel2m+s1<_B|C53F@F(A)>Yz5FlKo%mDkwrOV?}75!V;-*c^<v>$#ZcXzq<H$
znqnY{*kn@Etkg;10Vjh~+8`;K7ak5j_G}w;4$K|D{sd<M6Yz<;4de3RBGsC>SZ}>z
zHEAoa<;#kI&)cU*6*Bax(~q<)eFKktJc+dAFGgcHP>QIFFA7Gw<ZR8#FMy&a?&#m^
zoE*$`H1c^xgceePdpB^m3^~z=K0~Av#1STOf$2-j3a!b@;N!N3DCzA1Ans1xl<eEp
zk4w?G66z84M3v{FfBoOe?&9CZm~w-ga*7{j&Q~(iG^4EP{%?BQx4s`*EnRv28O`6B
zL(wb{;ylKkPxqlC+!*n@)dOAWHPaqWfvgw%bIFZ~HS&<(VCMUD6T)slw-8TwT3hCl
ze=UK8JB)Yd`l5|-R_?e#Dr>I)I!h|K+I->4ed#?_w0yu>zd5`&hH;bB6<3V~4}G#z
z52<G5`)f^#=_m=DY6xReBeksxT=ZIr-Wl$h2H~`sht97{vq`?&$2#(6$C(@I>0oku
zreeo*u(j?W<pVamTXUpHm2RfN+v_ff)2hi-ZWa<8%bLTx_Idke?}j@;nw>86@^Esf
z`eyjvn~|Wv2jCho(q@H8DS~vCS15rB^tcEyVssYQC@&DC_Y<E2sA?<BhOQ$sI8cQ)
zCnS#)tQK&HbM?1x5>gL9k3U4vQjqsq@m047-0Uh~0J!hiv%hWKDOh(Xf(Zah@r2nq
z6CgUV`GGfL8QT>c)$PxryTFEKt*$Ih=YQe(y>|gEjJkIpru8H(LG;x96A;{`BX^>M
z8L|wc&T&z61q8Y;*c(+v3<JLgE2MBk-B}Tk;5dY@D5~rvHpceH!-D~|#2pY#R0ORx
zbzkP`5xoLb&B}H~!};o&@!6``;_lN@a*%}!H#|y@Gm@PdoE3GhG_jSKb`$4seX<LC
zr9<Q&o8}a~A`n(#*6dYPcd^(Oc!RxuCM}%-R7xK8DJdz+yJ-ey-cO97(3h=Of5r-%
z?C*+R(M)i~oVg828=ME=!kN=kSv`huaV9{&D0l)s--iwC+b&>+2=3cBw_SO7?61Cz
z)QksEI{UP12_^AJq7xw9g5mO%l}yhRO{xXo-4+#~mv)2p`TO|dS1_5%{PVeMj7^r~
zW%w;QU)sJGD~eEFE8c{sV(E~(WywHU`pGaPb>w3f8Ln*dSn3Gf`kidPqYvo|%Rwp?
z*(o%vXca}ch;FzLJVuPDj9{GOb^;Wj2c1yeX9DJ}4&hq6XVc$YV#wUAPJaPG^f{d^
zviV~L>o2uN<Z+JmEkd|zdP5xZYyS6|lbJ45EEl*$pGJ{9v4GIFqV3w}kIKskZf=op
zLI=4&8gE_gu~fnac_>wZ{-f3E!IzNgJt7;er(?yREh8*ru!9-&wlCf#B1=nkX?fYT
zCiM9AgmEjo3Om69#mR<+4kwE@#!@98mUvr_ALh*Z35Rh7sS!Ie=>IN`dHjSp;UZ&n
z^#btqwqI#BCU@f<BcInxr9;*|EIWsX0Ay07{uQ$>BMGZW#tVuz4J4Bf&5797ecs22
zcFpd)7l}LuK3SC+f_106*UFssl{AB=s6?>~Gv05NmXE^72N!%c%Z!5Z$wX3Jc{iHP
z0b^AD7#S0wI7fAJW$wuX7r}Y7_^XYD-=n?s8~1J82QbJyh4{^rcFMN0a+SRM?3x5b
zs$+!U5LfSSo+}?sE3QqCyDAndQAVstI02lh-sHWc0yG3=-5Y~}Qfz#~W^VG6&hxA)
z<#PrN0?8rI_DAZ?OzE4;gG2!;6PqVbI^>$Kfoi;?UfS=}#glwTD7O=)k}nnGMqAv=
z8PGaD@maXS!swD7Xr=PFepuLz|3&zkD8oXz>C(JDFy$(;J1}X$A#Gv5L+bWfM@LXb
zw=>kl<Z^51?5+#Yx{!tOP`O$%E|ogiPV+vS;M%!KvB~7}Ya(>x`cNM6ew@c|s(9zV
z^<0|;zV1&=Wo3S&q7%AN(b_9{kIO@WYDNyv87Q9{Hr^K_uzTHzJwb>mjznGp(E7VO
z6Ft9@SQX3?vF3^P$&L`up7!7qL4|$J$sczBmk%j@LrFw-^7h^0O@`V~1+3}j@aIn5
z_Ps*Kv@R1=30XbUwaAMx>S^BW3~ArGciqdQ`LD|EtI=VJ;fBnorxy2s`_gOiZF=w3
z{#CAX>zx?72Kuc2fdT)eNl4mYYkv&w9PW(LxDh|S&C-ptQ)46orPtl<t`fRdT$rhX
zJTFewYm2o)!22F(_1*?{BLdeK8Fa?dbeyj4-0aq0OLN0t-Ru`TEVa!S`b<6qplgHV
z9w50Kd<@YY=+hlU0@XuE6RxA3_Lg|1iv6XE9$4XRUzKJ%9-eTILfewPhQL)b{a~HY
zi8(*q_qtF3nOUoZe!5xvw+2ZIQ<~s)AA|xs4L(;XPFJG&SXN|-&ay)#Sd+6z3}z+Z
zb0OhC>$K#kB#CdUA!$41#(nW3#VB=0f5;=iIyPg*g}hI9plA#=B$MVhD|Eo1!y^Lr
z;}4Qk5vRbf)33>;>1C0{?~P@yxY`4}FJ1m3WEieU<D0UJhbqccV@|Jiqvs7uLDIT^
z3VU2!hUwSM*5(mOyZZLyV1m3d^{N_7Q(|!&@L;ewJ4{a)b1<$;sd`lU4LH=e?^({}
zvZQ;tW*@{GBd95=8dH+chwZUophPFIR7v&&@0E@3b~M@6Zn*-u>p7~hsgvPNraTfJ
z$Nh9Q#BhrD2}3tSZSIikiq!yp_$Vbgk>kOciz%GOI>m)Kwj}5tA-qPV6gsh~^Jm-+
z<9t<pHA*qR0Tm(4v82|xqdRb3=19=OU!#-uzN;|;l2|r;cwQf{Z1ZMBQ+%*bpT9rM
z7w3QS^v+FPdK+PSpY+d1v}KVtGaF+46}vYD<KDNW17rRh6y}jk0M{y@p!PT8g4uTZ
zPUa4iTWs#)c{ryRr6!n`VfNEwsKxxuTKR~VDnF*X_)QoPzc*<Itw^nO4Osq2w^<@A
zMzZyk^e9s=B??1?^-`bbzBLpvJh^XCY@b?;<6zl?wi+K(2LmXduZb?&<K|ENyxLJI
zEx+u#bXKp4ur>}LJG0Rx=c4>#rbwj|CahnDKP&!1f~qB`@;*B-MRVL<nk+xb$HRk!
zYe}OxkJek-e57#!4MzP_P?d`^H9)V5W*MQqJw`5A_IA32JE^fXJ&qV)p$ww?K~M2^
z=O0^2N|a%O<XTp7X7uE5b@5phT?3s|@OQzlrKX}kLIdn*5UVloN7PX34?5)6KIiKT
z>NNV^2Bv(TCL9@wd$~HDW(g_x_N>np`G`uUz8}_yqy-TB<YYa>XZQcG!XCOhj=cj=
zI&Lx9FBk@PVxN@kFR>wBjIM=s(!R+^xId6RAkAdHqDoW5kw7{+m#3;oWuJNr;0-a{
z{hbvrcLh!(-7CY;F3QNH8Crp``U%RQ2$NrhAs-Sd#YwdlG(UTsawC9Y7{gCQn*}7+
zbE+Z0NQ+ckRj)jK?g_KW?%B<VWSgT;#x60|M%}cX_bAsFbySTczEk|6YFpdP?X$I|
zI2%Bs{<*2)Zou-Dvh?Dax?tpcs!oRD#R&qjYJw~ohj)U;hK4jMg4uM%iWUU-;O+*t
z`+{*o>0sD`aaz9U4Cli-?QmgrySo&ey@?!bBycxjvGB?0s$qKT79S66A+wF=&BC+7
z^G?jb)*p<2qS<RU!~{87+i2`LClB3YZKwG9zXA_$&+_KKrR^0z*7-avvi@LdAafCb
z8dgYfO3#Mao*S8igyba#h}^}v+Szzqa4^H|#h4@!?srk)Vs*rD7H&;9w?-QwL(W%a
zx`)OHNp~=|VW4u2q5F0(P<m#5w9cqTxG{7dV28-I&+ftH$isxRO9Br1sXRmiTar@*
zq({m!yO+nuS9)eLR$a*G6H{hUfj8H!w@Uu7=l@Yk0m<-kMaJC;q8+D0`@DJE?T}ZL
zxqUsx(Ub-$E}=d^_oY97V6|hg@vKCCjXYo1cBY1G<||2WuG$dA12p2Vg{V}^=#Mj4
zi_(O{VivQObO~F!bTb!1>zq~G{i-M+<H4+E&d+>wuzgycE`IF*0iLiCIXV;ZZKQ81
z!C=VhI%Nau?)1!r3jKnr{m+2dqH3e#y9KGYt1lLZrwWFJ1{rVVu}&x5P3Oq}=O>;a
zAkTY5`>FFYC6HVYN`0Ac$$tD`%<}Tdgn_wQt0D7OdBs_7<`t9TH^vZ`hd3=#COWjc
z967e2vMNL62cGHH`zT9X(Y-gUNhwo+zQeq7tbQ<29Y91{2v~>RO5=CejoXWPq(2>{
z0)ZSAJXR6EfIiHq@-Fi};+>Rb10$qO_}yi|-c}hEKysL`i){iRiDOgrw`dlQ<DcRl
zcn+JDa-Fod+N0p%DJgr6wm+!z7tW%kNu7cSvWz%l+Pf}`X&Pw~tA!Fj+Qu$A(^%8<
zh&YlatemIz)CS$t_2YX(t(j~_8MFRFynIcn-Qjq3aBH%y)k<q4$f=ai21r~(hd9_D
zH&hUOMO5fOG$Xh%KwOwTxzOfeEL6`x9@Z9$h<?J#{IGY39Ot$W@kq(as@U@Gs^UEV
zAa^|nv{PDAaMYz_7}4&EP5K;d4Qj{^?p(LrRVHW!U5!7he)&)@WOJ(Gq!|%S^s6XN
zZyqLiyZ<ruPp-t6hD91yXnulvq&I@`b#z@_x<GMn<D$z1>$3P)ykoEHAX*^#B2?nJ
zvb|ruGCsI<tRbT-O~0zJA76Izd5w9+M)$xeH)ym%Iw0Uyrgn}5kmv9XodJ#dP-kk&
z9@l$tuEbHVZN0GS%hQ7NroGGFVt^$>48nF}_Uo8IMgtDGEZXnSC#NHH?)X)=W>1-I
zvWDI*?BSoWJO0iaGcb3&obk%3f~Rfgp{WVTH*KMvI$d*J2|1tlF8RbsfU4i>EO)#L
znn0Jz+_x{NsY|R^@>WKNe@EDzW==fh!+7oY4J1{;LdDYopiHI%(zuK3%a0qh#88nH
zPP#sAZV`84YhK^Q;>5Osj}hj5!|jq`;3R3P743Gs4a*o>w!H<}%%2O5`$P4oiyEkI
z|6OPQ(ZRX?HR=k-vm2tO3b>ANiShMKc}w2ap?F0mL?_OcbpKC_M*0KI_#zR=<H#i&
zh)9`2{Nl-GMVr~F2Uvq&0nV7%Z26+>bOIa&PBu{1>F{mNlwT7Eq75-m=Ibm!$=csH
z0e)pe0%c?YVtcN#19i@`l7!OWK%QB!r*Hqw;<wYKq#S|UD}(dKo`}ecjEsvy3Ee7A
z_nL{et3We%NjZ{S6_3l)y$-#2A<9(AP7RrKa6ZdR-GP}IFV_5J>fYv^zZAVvFxp@*
zX`F!Nv*a4y+Gu#bB8_Tc`bI%m?;f<ItTVe~^E~#({rK{8=+@C@KZd|_M@mUk!6dHt
zu3Jrs2FXjc(&1GrLQ@q%d;90##|IIe>q@k}tWOZNEjZI2_5r2{uH34CF{a(EvnkBw
zVK_!u!%teu$05+;qTT42jCrAN;hVdFv8iwuIX-3L*P<9ba0RD(OQ|IwIG{U+hr^V-
zUSNyznIbJiRsle9#a*vuk`aI!@3BT@7@lj1N*%4o|0=#XLDgayG36=6TlC?_uLE8F
z#&0n@m%b~ptv4uJyh{)H8xgroNDK6mcLK_gKNXoQv~TN}MzhPDpz<j2maDXpKIHf_
zRA}w6gf+b}%a3Gtw1eI@^S2WN_)wR}K<m^!*v<2LtEAc1^D~wxl+G;5=7jHEeNpDs
zMo-3$fo(2O1G;0~CiY+1`JAIf_q-pM=%58&dGl3~g#k4{U%*Fys50?9J-jl~`m+$V
zy_1uZ?GX6(ug-9?c=JWUj%R=fG-k2vDAT{!-=<J`P3G5Sfmw}h?$kf?nzGiN!05dr
z`~G>ARLdBVjpiMb()zN8s6@hN?%{29JG+)*r5}e!50Tosf_klhi|a|t$N(_3IyE)3
zN-v)!zvIKfgS6e)+Uu-_9>HE&FFWwXmB1FjdjAS3YR4~O66$Jd-a5EmtS&8@eV}Sy
zz~*ADE;C$E$70`$*zIyY|7?fKl);*5rh(Wk9aDD{`_+<E<2Ha}APD1y62NPpA@Q-M
zsNKo8HyS|vo9}@kRz?ql#0YR8TB47hIJ+gMbx3u*?~Pvl9cx+Pdgnx+Qa^;X!@N^W
zMx4jhf>)?Hr6CSGNw65TQ6E0W)NaL3?4^r6vIKOeXE3s}+7)3PQWJRTmH+f&`}<)o
zFd;z**US%~9-W0V!!b1YsDYU!vYIxh#Xfz{?eZ<})lP;R47G<%+eQfL#>@ZPL?^>t
zTnjdsj{j@n8q;h0eyN^~r_K|kfnVia;Yf->4*<#|b9*L;`VSbq0Ai=5r6r58nc2eO
zP2IMaxPC>gfz;)Pg(x1LM18bqJegaR1=T!5nh4qzd%VD6YM_kUTd4)fpkqCrQe`f6
zDequRzmWR+A`|hm)zwzxn1Fy<>ejaUaje)*l%HBncX64NP>&yE^M9v3K=<Up0zMB$
z`Y%TDc!mY~71RYfA*^+WbKm^nJhV%!F#3041!CBoN)0;J<@o1(ihgSyqmCHLCMiJo
zCFdsoMD2)vsj@V>%HVmA8TMb(_(>2HVfRL`B#-eLKoz6C9O=U)JkmnnDHzRnG9(xH
zWN~oAae&y9ZpaZZb|*##Z`!dTlSy@+*o4mPm26Ef_a|0piMrne<eAwJyZL!6DtP*0
zCtIB4O6(CUA5yxtZ!zQUEwh~K({EAd(xz9DzvFQ_0$Lrz7yTyQc=2iH|JnHlel7Qu
zl9XV}xbSp+*<SC=$MF2ypl#GVzXeUZLqCPfv89cDFJx=U^rr6kX&+p981(g{Aq8KU
z#C2@j#p`1N4L*1iyyTv03pZS?D2dXa)Y$*QEl?#TrLb~<mQ;(Em~qR@R*s!sO(%0#
zU6QU56Z6_>3B6~dxz01`CV@1J==?gMGys6&112t;QWz7y*bxy$=wV0$v&B~XR6GLT
zXq3e4_E^SLm>chi5_1Wm_lD8enKx|>4eM%nIBg4UXjtGzK>9BM)ZwQcYK<I1Bh`4i
zKdb<q?H25%Svb8gpH6IXyD;<QpLsmb;7elts1Nl1B@jatiQv+*EQSt~>FLdk*OiKx
zt!?8n*-0=OJgIoW9B^WByvRJeSXSWpBn%7ytO~$r5qo9?ZRa<`tc-1pXxqz9+Ps5h
zfHejC9;fl^#TinKv-+J3B-VH!FQx9N91P&sCONE#ZMGcL2w@}MuDUr6aAIzF+Rt!_
zYfRv=?s2rh&L4g&MiSXvt4W@O+A=j6kQ_Iqa2Oq$-@LW?_svj%r9{)o=E&1l8hvc{
zOX^Mr>x*A`9MvhlV=v{IKo)aF2(XCO)%sHrNBC~W=h8P+6IJY?)$3^Sduz<kQvAw+
zSuJ{Czm4x7?qCMe#Og_HE_Pm@$WBX-Yl=p&Gq*UH`-&f9+dC(|ZN)#G5b7EGH>hxe
z8&v4QcJGD|kcl$)F)<IL(dg-yd=hZiQokbnAX+~1%@m+V17KtW!I%%f9gaFfx5jGE
zBfqIRhPU~<U#7*(wX_sEzc2Ks9#J!J7mNUT0G*m087LI`=PYLoPF+!jtIuWuAW$hJ
zc3SpKCeqEe1k{x1C)*t`+v4kaVxO`?+w1VeGDKm*5`5g9jUB8E4hTTwS`_mJkQgXK
zg;&6tgxQfBpU<_f|E2a&7Ba?oA~vg0_P{#YLirWrGcQ5klX*|Et2RfStasSd3Dc+j
zvrA%C2g~DE6IC+TT714<f#q0%0m5C8F<c6;L4C@ZA?ePI8|*2*I0X>GYGBOcU0VVE
z__Ktr<Fz#B0FMP`89#B{*hLQ#so#C=bJ+pjvA6ya9occY-1ee&4Vd2O=QnFMJoSDC
zOcErTeN;Y`2)w?0F^Db8)YwX!9^!ctHi_-!x$$Slx~DI?W*TVeMP@;`J{$u;<N&Tm
zHX0iUfZ}`=FrQDoF<8y+&BaqQn(-828__G;__w5M*Qc>J(*n<dneo1+?XogQnJiu;
zoUDAe)Uo|fL49Wy-9bc(9j)UdY71AEI_)ur;fC)~eEfB|x#E^zPHu7~zJZR!-&|c&
z&9n9W_hetPzUT&*Yz8NbQ!fX9oMxTwkuYQb)#IoW1l7Gko)71!T9hr@C~pKP3I+$>
zX9C7+sTcRSHsFnVs6wZS(VV@XX8_U-yQ#xmV6RW{Q3NL*$E8W#np4x+T+7Qm9ix2@
z()N{#KJnc)@~d7bu#Cx@Ha9lCeE!1s`V5=Vb;slvS<}NzgDAHDx+F3m=2{=BnYl7~
z2yzR5m1=WLIdR_*>@n*sSh@NlDe|yADk;*!<7i`|tOV}6`<kqL$OZ@(+`j0#n$AVh
zo&i~Xr=8u4NGiHL76oj_A6%Jot=o)zPZb+@e)z|U^2arIz@Cb;7RxKzK`2a4%5%qL
zv=Tkur;$z#3)aH8P}d6_WUBjLnq8<0+T(BU(|&5Uo9w4BZ`K;Hc5KSRr8V}Gob*#3
zXD3d(+n7&UwNV8hHELF@s_wC{@jnLUM~2I6MZ5!B_WO9E@52sdE3DK<I2AF<d(W27
z9+fHNhox1w+m(>Z21nqF=QXsD$=(H88Muir<IHq7vT8<+M0%pk`c8Ae$LnvWIojJ>
zyO*-X%{QUesqxDQVXhyhYwTVTV<IASbxsV7rQFrua@reFWO>OzhVpICzvON`Lsegt
zZ-vuv9rW|UfEd3!Jbn*$#ouE?wy=R;^Jv6-kLSY7&IE{<0q@J_XiKaa6=`IzUT-ps
z?e#0v60_vh)67hNbzx7a6-&q$jj^4PNR&*kQmsVh3Z+Xv=amiP>eUz{YbQRBKtkIl
z*WJv|Ik^%b`3@c%1sTsah(7pAH5m(plQLH4JrFW_G`P=_q>!R1+IM2LVdMb|f?_N`
z!m<=Mwxd+u5DduDd|Q8Z+(Yl|aP>!?_|4^V^wxEt5#9QAF5~scyg<EA7J9BVqiknp
z{@j{guUbm1b@(JX)V-gkK5p-nwOo&sKGKCsv0>Q;TckU2UzXXd7L!}=t(T+f{vq(;
zht@vL<I~{=ZtAQdDTwk)T5H?E$*zWx1}_sE%+_3Q_cx&z*Y47|#dL)g)dlPCT3RM9
z1Q>2bXxv=od)0xEu1qhRU-&HDEHQP^Ix|cf_=PvnuM+#9hw$|zpY=G>ZkLG~x+mYM
zPjYV=Y(+B;%!lZm?=4I8hE8%y=KkjU({D1|%i2^`f!|WpPyIWlfM`!olZR=ogeHg@
zYts7Q9BxW-;Qrg{!$$Qj_Dr{m6CHk;uP^Sw_bwyCBE)x*_v?!<IDYSmUHq~}oxnCO
zXo32ef?A~Q^0z>}Ll$%9>1Z#euN%Who$2%nm;WHF1$(!yGrBYFlYaNM7~G*r#R3>O
zk3X~Q*-wox{DdW5TLb(t+WZ@$5k$SGuiF;ys+iC~9)IHFH_Hq9Y-IUkc5JFj<NT8a
zbj`-UZ^mKosw(Rs@^Ctke6)|L>E#2g3Z^`h++vwwm-_XxcsDqP@3s<#+jOpVYR33%
zDC`jzi5#-j51aTam%04wGlGNunN9{_Iu`!Hi^N0gr9a<RrW(y<J!jXO8?b@&X_}M%
z)^*K1D>K22{!_e>Dk)*iQAU_EBiAY);A^oCdA8fiya6U~8coU^A&A}YCjmWV4=o}?
zmZrn=7)CMp<b8d_;HWF#<1I`F*3K_*t{lBb`=73ICGBKf7ji8*Uj`rmPnah4w0&kb
zd^7J1E+)&|cYIyqFtz37Z#T0R0VOsyxh~SEAHYD{IBC8SK81yKK?FJ7Mrdz6;WmSH
zK+#8Z1w{d0cThzMdVKtScWcVJtGFo^4g^h)J0pd9;c+K#R3Mz@wmvk>D!P=18>!}D
z7Wl^357)(NaDjLy9kt$k>Pv8)tY6o;TR5<Z=x(kyBYH{Zlb+)QQ@~Avao@Y`E&i&E
z_4mPKn0HQ=kEJ2jB;i?hcPm48bCc_{-W5b535>oIn&L9-eCn{_1BY;H>WPZIB=O<u
zR9FdSKKPC&{Nf??Ca%GG;SY?7MG_3U^T4f}1oUT5W^(UXw|T>~xP(JKYw_rueIm*L
zpcDOLljYoE^j#MbBbuaYqJv33{%h+~6JmGWCod}gCP;JC-?u5gm190pVICaEJ&2X0
zTIFwKhxWPAyj%PlHakAcf*5(|IwJE!uzt~RNp^@yb(>+)!lMm<1ylV?%eRoL(+cx_
zB9%qfFU(RNlT$CMnQQR!bA}%=tSrl}T}9`DRpONpFXyo%*##SY)(e;HPrn}$rEu+L
zvC4C#4vZfy&?wn;tGhfzXV=Ihxw9Oy2KaZcDw@oD_XjY!5m3D9fB_l&vapWIAccsc
zqzS!G5&@T9`;Orf>0mtys-DdMV03y364aZGivjILgBD2wQ-Xaf3FoKWy+8%U%D;?V
z^C63Dl0|X&dM*YECoMT_T-(_zK-(Z+*%C5<Zv&cz=yK44J&pW^in;^ZC6C<wQ_b@U
zV}a&c$@cAJyAB_8Myb8J_JVp_%v8K2opszn)u5Zl@P#_9a=K&}MLV%*3xfIU%dUnn
zl%qXaFKa?5@NMA{2}Y0?#$UbBI{dQb#xgXcx-*ycQI>3=jPLJ6gGR^USwUh{8MDmS
zovFs~w8DkJwll+GHGce*6}_5s!__-U^4OI8=3WwO2WFrJX6p)OPD~2O$lrJISUqq1
zSr=F>Nmb!rphUl05L(^hdm@?gCTbj?s&n0min<KfxEzJp_gU3K^xSXuOjg|2DxRA2
z!%lYQYe}ig6!7}Ehk_-8-lRY>HWyA{GIJlNChWaGdF?=WLdhG?2mE>7W}TfGulh6O
zluT{*QRkH(7#3uXNy^-Zt6GRh_CedqRaa;RXPEj}<GK|_hyQ~awN90xt%-RM-F4b~
z1kYXDue=Z+{Xd7-p1SGG{7Swj-T4+cyeHr^j(IlWzGmALC9{L>d{C<`XT%g$B9gV8
zH;nb<emK_!a=l}=c#|s$8cq(x{XQQ4_(y|qCovSC`#bZksdYA4IF(=iC++Ynh#XDW
z_%DjAOER`+Js0Nyz@;dmP9Ljh_UU7!GYQFtL~pqJ=M1{)755_}B&&PQA2VjVNAt<#
zeG&S1FQk=K5*K~HW}v}&dP@#*L|241y9}qhjpoJrx<5mN*e5EvMb*q7p8*3}Y~FK4
z4oZ})Yeg-W`~CAQp^imnz}_d~-Vm|hb2BO<J(Au48Xe^mDva|!w(jDQM+3QU>n^*f
zjjw!c=(V3-9L8^Bwl_6SObb;x^ZxXi{1Cg!bvI<mNBijNee#BqkLLDU<2}t_Dv_WL
zoA}Cg<cjZY%H=lg^Yn!Ct&^kQR<4?QoewF5I)@*{49qIjxg=G%dH7EmY}Y)TWZL@S
zWGW3H!m<XKst;Ob!?E^)^l;Bk8uiJ9Z%<s87?!p=LWvTG{L^X<{1^uJ5>!U?+Y4<y
z`=et`^}2a~D~4MRP$~ga5_jLrPj)v>-h=OM-%!tU8_lZ5p0cv7#m_gMcW=elUXN+z
z{S4Q{k7waOSI?4}FN$pQ%cv3MtyA+yn%Fk33-(0EGA<Rp0L^bm5W59HN50P;T227~
znnXHDqwQYb7Iovnpv;1IwO)nm?99vyCb1wxVpE3KGSH85RE~RR9QJII9)i5COJ{R#
zLr=NWA?|G4Hdk~I@B%a4S6w$TB4r3tFU?)PG}lfPeFh6kvB1w?-ApGDGLsGy4QM#M
zC_`qdRm{<zTgxE7kchqmE9_NS_p)1MRELI!DlBHrl+(>n4Gv~X&o(4sDq7ExE~4$)
zYX;H)5T_9ES+fR8$Rj!AfVvNWXToi&z&KDiN?w3?e*-r*Q8~FTw*H`mANWM8;tK>7
zi#(AM%v{zvAha2hxp2rs+KkkWq@#W&XoG#4&y-ctF6BFn1Y%|3Dx72NZS$qpJ%&Gc
z#DH%p27uyj?&N|ku6quZcF>FRufMUbYuMKp4#sR;%`mft@h!BpcxJ~$ej~IF9^4CN
z=b~T;t9tKtE#4X6sP|Dlde3dCtbSp`LzMw8{AHkP<@s;kFk^i#GwVdGJi{)s#MhPo
z>(-6sT}<Q99w7(hq<w`FWtKrFhJq$?GwVy(8gw^fUR+B?%7kmysDxYK*M7o(r1kTY
z`P-6`D{4dxOSD1Kb&1na>8D$c8v*|9yhy8)U0%Rz@RI7X^xtv09FDyrcGNBCm_4+Z
z4B2ou(FB@U)5};F;sH9Ca7>Z7uK%1BV?B4t!##!)QaC`2u5s8?JgFnsi1ZcLsEBmm
zSOF2!)w-6($I2EwqdPJ&#!UO#Gpi+tT40(tDg!~JTa)O<G`!%mAKOHtkSfwuwSoUw
zizRX?LQM8j+vDUo^MfK(=A9O&wf57N)L{`VsHEGP>hbfy!{_s)F?t56_>`2-*moHO
z#zbYw-UM$vEi6F;5wz3YZY4h9SK9v7VWCxzVPCjt4;kk4zqiAr-sHo%@-K+p=G=E>
zVZJ*ieICzFy}nk!;J?-D8tpy*TzEG~CeNE=^lX1D_n7mBJs0F(rufZnK%p&Qq$5=|
zaV=cxRs{@ko2#>#nQz@pXYJLl8)-q*mY2thv0h`r(9d?7A^8X!Ly<?_+en0Y9k}@s
zt$vEEN8d%R!&q!?XHHonJ3^ji?+$MA`K_n88d{cKR~Kz{4RsK<_pFxgr$&XUYeveF
z8K*=*b$glSW>e;k&FF0Ts(T?vVEzKQjZKDXRP;Df%|sCLv{fCZpk!=h(0hPZG-{Py
zQIO_WTImocv)3!$Z=JD<Q}50rt}2ezS#|IBrZWEg0FlK5nG}e085Izu0>~n$PB^G5
zW*!6@3^utwRQ3*#7m>_$z=V0IQx@=DPvi#XawB{`P81kA>hzBH2q>O2pV1MIg1GZa
z@)dl1OhsA!(l&T#71JVBcAJqpo}OcEDrY^Yj$VLtwz)tvfIK5`Ijf#K5SU8mPRXO9
z{uVE?g+$v&Uzyr89SQZK);A;MbYEYaG12tb{R}j@l;PWNT-np13q+U$JhE3h;#hm(
z4@~*ZM`p>V20z=mMrZCM3FtDi@ZFv<!ERDy4A))7Pvo?f6IxZRO$SeW+nGw}o9=l)
z@AkuL%=NRY-rDjL{_=f0jd*^e-t8dXAb3b{v#Y{8174joI`{A&T6n1O!Kl59szD3=
zwa)O|c3$om5c(1m;QNT-0Q#>gdWToE7e%&u;2W1az=Youq+C_vJ=<>pDpofX;95HW
z6E6ELabUhFNzK{(Cwzy`2BlNqq*tMfs&|HYRx8f4Guo4RzRr4<z7tY0C@?p{(MVY(
zpXPZO?`iz#2O=bLGFLJE?Z}JVa*HI-2de%zF$a4QNhjE$tgIiFpNd&c^56MJ&5qZy
zo8o1TlQC;|Sk193_><$l%((RK9!g_%JkSZCGSoE^ymM=N&s<VRs%bVO<%l^>YU;+C
ztG@ugV>3p!1J}vu#nd^L9h{Ug3(&dy?Z_-HLi=SjS**VZ7+IH<<t}${^QUeUX?AlQ
z!OVsPm4rj530#+C&^aHx>92v04aL2QLXO5oFZXUKF&=QO1n86`b1}<2GJRfJ#Hxop
zO#!bTyf}Mb5OD^pijCCW5V=c%&YpZvWjrEb8yvAQX;jD7kN+o6%dH|Bp-5%PYgRAU
z^It@5k#-Q2NgZ&{#(xezaVyv<h7iI!H)4_q#@w)j?wwFxZfUfj>Dq0dhq8Vz7zb%~
zqrGBvTjD%6eEFGYQgdHCR{6He%EEqhWN>9t_r;))mT?o&9`>HfZFpIy!<B@0Pf;w1
z{G)mz^0jKUm%vwjzh%}6RrgI-*Cms84HGLYZjV^Ad;WHamNtnNyE$uz&nHQ9h*6v*
z8}ac7`!x(A)jwa9yD{0$)lVJ;(MILl_R_cEwVqE@c(m2E#2YkcuB*^ia44kQWm)>X
z(i_XMD7u#Om6XEw^0s(~+Q!|@9`&%i2NNh<JClBN!>RJK(Gg-*-5oZ#Ctjx)ifYIb
zDm(3Oj%mE3Meg2W;BL*p944edb|%<sm@OG5-V-YCVE<&2iaw0cd?Zw;)hL))l$yD@
zD?NFf==w6ZR#h+8K{1j>eHss}#1mw<71{8yJWnCfC_jDGThNuks^QJXgT~9w@UcRT
z<ohs~OxH)O`LUmhsY}zMKUJA__p?gwq`>K|0CKd2RaabFv|`r(Y34k`n#$4uj0gfM
zGcpVkiJ$}pqy|M`MQIufMTQo7=!gOWQkCYQ0zwd#B8o^y2+{%s=^$;43}sYWkSqiU
zCCC60N(k;3XZFWFJNxYZ-26+PbH97PbI-ZY%{kxuejaP22wvMzo6FiS=|$VMSHcT*
zFr{_|KdtMhjZu=I=~a8B98&_|?Y<(;famtm#7)d$g7dbm)~oAjpSC(L?d?rmQCzi)
zr%Vev#F@LJ_@{n#Hk~qZAj^$>aPC`kAlD*TdHQ!0d=ngZxhO{Sb?#rO(hCT{m#6w{
zP>c6}EE__FbqsFZ<eC+=bd%dH$$hq|$y(yPny`Px1S?11G6;vY!>1HEe^8{#2o*X<
zw##f*l*RAOf3RoM%CXL{FxKVxtf%G_UH|EWR6m7@op_CCm6v|SEg3a!i8L%`UmV@O
zW3=d0l!5+HwZ#dmsfKO>&h{WJdCi)<c>~s#i%+A^Y_}bgyLwY6w1GnF{7MNql*rdo
zIN;5U)HyjJyzx3#fl>>9hP7Phm()fqB5fS1^ak%fOnoP+J;sPSPBpe*lo1Guw8K&6
zcRvtUP_);R{=E{-hm9M{7exrggrHPw-}*W95A<-66*GSeK^MF}j?7ZRC0>3Ib)ZV`
zE+Nb#TQa)O@FphPQ20Sths;D^pgexhK;8aYiRjZ@mf~2-L0pU^^MaOf-R>n^(LCb(
zOwp}v*SRQ)?Y&3lZUav!bAc*a0d72w6I1hRs*O_tJVfd5oxFaFxaJ>HGQTrcqbpsD
z@v3yqIYsa|Sv9%nhLzhR-cq4%E*%YFGDBwEYjUwwZl}pp7J+CTQ*a0{SA4jJ=g7;x
z{;YFD<(Y)NSB&Zld+Bl?S6eSOye#I=voJ3r*t~Ii{3Hs{4@bQ>9104l5-g=;+WY)(
z@6%Sv&km|FUQUcNJ`|ZHglH|Djy5SNMd7ha{<<Cb5|8a2T()*I7t~v4uvkl}M4a<Q
z98ZF@U<sZsys+)kY(D(6&nVN(_S_)3ur4oXvKVF6UV$9wBd1-#x?ja_X^{yz2Cfl@
zpg<ojH1U3^A)NwPLi7)PD35kte_@%`t`5h&B6vmSC52LP(J#6DSB=Juy&r#1O`sv@
z>u7Ep9->B2Tj{!LzH=(o_~~an!3|P2%xie(U>=9Uo7=0z#nY@_t4ri6W=8oi!VoMP
zFk~sO_y!l9s|LBdk|{M6Q+q<YR7#fb#Pav~jXpS}twls<sE=I~%(RHkE^J5<aG!o6
z0Q`Ur**VXsmcLit!vuoX^Go?jB1OyZ?0OvLH!=h?^ryxl&(M!DRAotSPeyzgbuv;}
z%+=-Vq#$wvMViaD75d#YI^W_9L#fOvpC{wgB;CE~v-NX25K?n5Xc%sz2ppXrVs=Wm
zGgSSgFSfRq#x|YaCX}XiEM49xf6I3S@={b&I_tZ<yNyPw3&}`68M91i$9B~Yc7#jV
z#AF}q$|W;r1MgLJd5cuV+}t|2HkWu34&r~o{9bVaB{7$64~`Ppr}`6!hTY#kfoSOb
zKY(c1vHR9Shj(CLfbk8AE&L5QnC!*o(6!QxZ(!)Zw)`Ih{&ll3_Yoz8gQutG@bWTI
ze1`}i&(*@50_X{Nkfk>+bs~d+y;pq>$k-oe{dV#HJ%bk4r=&e2F4wNfK_OGQR2DD1
zZY^-KL0;hCUr?~k051sQ1TZCk_5dgEe<uIe*ZOaL^ncV$RWhxlv~;8rayZFT8N7?#
z32qk(d~F$e9S$-CpJo$Vw5I=bw<hLu2ryFpz}!psdsg#S=DhWBbL$v~13UFv<E))9
zcZOTu_WGU&k%Jv*M#@u1lf}Asm8M<g;%EfoqolZf2E@A~)MnJj>H^<!;=pm)c>3IT
z?qwgpfU|~6>{xbWr)GkH`+a4Inq?A4A}f#dH~FG%BX1*5Ho|YWNqm)qrV=ipZ@ha1
zHxmv;ZdK&M?WnS8-9Df#jzuHae@0o`c!+V#1F~u&-Kz9xk?tOma7j4UJAl@ipht~_
zb;og@%ATDaX>XB%jr$;IfvlCsrr#XR%ediFVtm6x=mE_f@L|mBS+_djwT;4GeQ;zZ
zp{QZ(&A<yH5Ig1W!4so#!?0B|v4c+{H)LVt<hS1w5UZBH2%6`y`6ns6-7)VS8)O0L
z=JJTAZcVFWe3qZMNt79)S;fyB5YWMWuu^#U&2NeCPP^Yg+xqO>=*gls6N#n)9bhK_
zSSZJ|wcwC);Ic_k&=-n<7F}<uu7(;xF@Z@aCeJ+#mDq7(j54y;^<hV*DK<+Wwif21
zP7(*W#}vCQ<|)b9Tcd522idQuMZwATQ+--Q%1;+JaUzM0jZrMwFXvFn_Dx~KCZOIB
zI~sS97gNp1KhIOSieuk<VQ5(Jo*yQVM_fC8xsf0d8H!mmTNl7c?c)f-Zkxp85CXZI
za>c0@`@08<-L(;K;vr1o2c%EKBU9B)TuQG~=)E-&<5xc|Zp(^BfaRtKqB$M`TahYT
zcE&E{BT@g(@U586JjnzBj*=`Zd8P%?k;6kR*{n6UR)GcowgV3GH_~MfNT+@WW8?8T
zKiTX(F6+87YYo`dm0?_)=N7gf*&bFIFRHv7czvA({mH~&VjMm7BV5vZmvI?eR0Ray
zn>QKT=u=`mP8cQC;eH1b8*U+N<5oWfv|ZYoL5#E$(4U2;VQ)jBq6@RvY3sUuuXkud
z8OxX$WiNKtuq8hFFpM5S0k=!J+(@DBfk8DEmh3I{{3<_0H<!#bOGS`#hRiAZI^hJt
zu<|0>MBP}<NT&4k_FjS7F>*mc!E;b-=r{>=>Z^%uC0&+f`F-m3r=Ww*gD$2Jv}ng_
z5}-C%K@Y}lOP2EyoGL;=h|H;YiB!SU>%uRxjzp_UuWlx0tj9ZSp#sN2{N>0EbxmU;
zN5N0jw%g5#QZ6wAr#8q?21Sd<TsX%)MXBiT<IKhrDgi3o))QgG(ONilo0Ha}lSMai
z_3e#I8Djo0h5VS6nQS1cp=mC{%`)fhh0oQiqsPrD(d^qG+lsCJb(>VFm{OZr_(B}^
zL@5<6F(+W!NDsljZv9zNgI&ba$!w=j;t1#+ct-%F7a-r^Bx9|sAyQmihG`ymzJhNm
zI6chV(KXx4wbkp)bMb|+`_~g3ltUf3A!kGE;ra;nt)PwNDZ=MvJ7%Hcc7jP`fp_j`
z_Pn6(HYv`R!%DTR^AUH;yVlM$t(TZIle}{yxaY?e_Gd?AlUbjdBO^HyqKtUBnN^lN
z6+_NS)*Vgi-Kpy!K|*rdFdm8)H&H#ld(2m5Umx_hVvyYN<_NPmnj!~-R~S+Xg1BD7
zxiMzAMUwQw)@2RN^fS+bN#<SbuHQR3LZqEGUMnjrJs~hBZWl&(aBN7Y<Xn(}l<{D_
zVNIi3Y|67Boq-s&^BS6(_%0}mwWuDN2Jgn~?5tN%5EdB$qs*$RGI7qbTg2Ah9wZyv
zcDm^-U3Ql6FHMy8@XC@Rz7pZSrld2#98LZRdFY48gsKKC*_mbjomrq&(Q}!lOMf@p
z!*qet60V1Z>GIDGlHZWj7;jf=uV^#8E@W83@ZmzmhSvar<=K|>X`tYYC+8OQb!pE3
z{K`UVkyP!iT&B)<|2ETmhak99_Wj~)Pkb`6K3P*8SXRbY<>Q_x=W!t;1~e#-dICw!
z*E|n<hND9j@-RBA%GE5mCVY+6;ZxCa+iteg4~@=&IjiqMDG;Mq9fF&<!Mt)G%}iP!
z5pY%SoW19b9F!tS=7md{T>=T88d=^&Tf7UcCe-Sclodo;IZ7%kiTtPmPlabw89mIA
zTl+NCmD+yftsK);j2a#stjS+(AyqXU*aeoHRgD_SyX;%+c}*h+E*LQX>63NsYctnQ
Yt_ATO=lgZ@<vGnRVJ@F5)pLyc2b*d3p8x;=

literal 0
HcmV?d00001

diff --git a/pandora_console/include/ajax/graph.ajax.php b/pandora_console/include/ajax/graph.ajax.php
index 4b0e4d582a..1b537f8a48 100644
--- a/pandora_console/include/ajax/graph.ajax.php
+++ b/pandora_console/include/ajax/graph.ajax.php
@@ -162,12 +162,12 @@ if ($get_graphs){
 							tagente_modulo WHERE id_agente_modulo = ". $value['id_agent_module']);
 						$sql_alias = db_get_all_rows_sql("SELECT alias from tagente 
 							WHERE id_agente = ". $sql_modulo[0]['id_agente']);
-						$table .= "<div style='width: 800px'><h4>AGENT " .$sql_alias[0]['alias']." MODULE ".$sql_modulo[0]['nombre']."</h4><hr></div>";
+						$table .= "<div style='width: 90%'><h4>AGENT " .$sql_alias[0]['alias']." MODULE ".$sql_modulo[0]['nombre']."</h4><hr></div>";
 						$table .= grafico_modulo_sparse(
 							$value['id_agent_module'],
 							$value['time_lapse'],
 							0,
-							800,
+							1000,
 							300,
 							'',
 							'',
@@ -225,11 +225,11 @@ if ($get_graphs){
 						} else {
 							$height = 300;
 						}
-						$table .= "<div style='width: 800px'><h4>CUSTOM GRAPH ".$graph[0]['name']."</h4><hr></div>";
+						$table .= "<div style='width: 90%'><h4>".$graph[0]['name']."</h4><hr></div>";
 						$table .= graphic_combined_module($modules,
 							$weights,
 							$value['time_lapse'],
-							800,
+							1000,
 							$height,
 							'',
 							'',
@@ -259,8 +259,10 @@ if ($get_graphs){
 					}
 					break;
 				case 'dynamic_graph':
-					$alias = " AND alias like '%".io_safe_output($value['agent'])."%'";
-					
+					if($value['agent'] != ''){
+						$alias = " AND alias REGEXP '".$value['agent']."'";
+					}
+
 					if($value['id_group'] === '0'){
 						$id_group = "";
 					} else {
@@ -281,8 +283,10 @@ if ($get_graphs){
 						$id_tag = " AND ttag_module.id_tag = ".$value['id_tag'];
 					}
 					
-					$module_name = " AND nombre like '%".io_safe_output($value['module'])."%'";
-					
+					if($value['module'] != ''){
+						$module_name = " AND nombre REGEXP '".$value['module']."'";
+					}
+
 					$id_agent_module = db_get_all_rows_sql("SELECT tagente_modulo.id_agente_modulo FROM tagente_modulo 
 						". $tag . "WHERE  1=1" . $id_module_group  . $module_name .
 						" AND id_agente IN (SELECT id_agente FROM tagente WHERE 1=1" .$alias.$id_group.")" 
@@ -296,13 +300,13 @@ if ($get_graphs){
 							$sql_alias2 = db_get_all_rows_sql("SELECT alias from tagente 
 								WHERE id_agente = ". $sql_modulo2[0]['id_agente']);
 								
-							$table .= "<div style='width: 800px'><h4>AGENT " .$sql_alias2[0]['alias']." MODULE ".$sql_modulo2[0]['nombre']."</h4><hr></div>";
+							$table .= "<div style='width: 90%'><h4>AGENT " .$sql_alias2[0]['alias']." MODULE ".$sql_modulo2[0]['nombre']."</h4><hr></div>";
 							
 							$table .= grafico_modulo_sparse(
 								$value2['id_agente_modulo'],
 								$value['time_lapse'],
 								0,
-								800,
+								1000,
 								300,
 								'',
 								'',
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 9ee675f508..bb9b009d4a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4159,4 +4159,25 @@ div#footer_help{
 /*view-agents lastest events for this agent*/
 #div_all_events_24h{
 	padding: 4px;
+}
+
+/*styles graph conteiner*/
+.graph_conteiner_inside > .parent_graph{
+	width: 100% !important;
+}
+
+.graph_conteiner_inside > .parent_graph > .menu_graph{
+	left: 90% !important;
+}
+
+.graph_conteiner_inside > .parent_graph > .noresizevc{
+	width: 90% !important;	
+}
+
+.graph_conteiner_inside > div > .nodata_container > .nodata_text {
+	display: none;
+}
+
+.graph_conteiner_inside > div > .nodata_container{
+	background-size: 120px 80px !important;	
 }
\ No newline at end of file

From 17229cbcd784cc9e443b83e9df6f297326bb4c9b Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Mon, 24 Jul 2017 11:09:20 +0200
Subject: [PATCH 044/157] Add a script to count .data files by agent.

---
 pandora_server/util/pandora_xml_count.README | 17 ++++++
 pandora_server/util/pandora_xml_count.pl     | 55 ++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 pandora_server/util/pandora_xml_count.README
 create mode 100755 pandora_server/util/pandora_xml_count.pl

diff --git a/pandora_server/util/pandora_xml_count.README b/pandora_server/util/pandora_xml_count.README
new file mode 100644
index 0000000000..88a2021952
--- /dev/null
+++ b/pandora_server/util/pandora_xml_count.README
@@ -0,0 +1,17 @@
+Pandora FMS XML count tool
+==========================
+
+This is a small diagnosis tool that counts XML data files in Pandora FMS's spool directory by agent.
+
+Usage example
+-------------
+
+$ perl ./pandora_xml_count.pl /var/spool/pandora_data_in
+Number of .data files           Agent name
+---------------------           ----------
+1                               Agent80
+1                               Agent25
+42                              Agent22
+...                             ...
+41122                           Agent21
+
diff --git a/pandora_server/util/pandora_xml_count.pl b/pandora_server/util/pandora_xml_count.pl
new file mode 100755
index 0000000000..cd81843c96
--- /dev/null
+++ b/pandora_server/util/pandora_xml_count.pl
@@ -0,0 +1,55 @@
+#!/usr/bin/perl
+################################################################################
+# Pandora XML count tool.
+################################################################################
+# Copyright (c) 2017 Artica Soluciones Tecnologicas S.L.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation;  version 2
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+################################################################################
+use strict;
+use warnings;
+
+# Check command line arguments.
+if (!defined($ARGV[0])) {
+	die("Usage: $0 <path to Pandora FMS's spool directory>\n\n");
+}
+my $spool_dir = $ARGV[0];
+
+# Open Pandora's spool directory.
+opendir(my $dh, $spool_dir) || die("Error opening directory $spool_dir: $!\n\n");
+
+# Count files by agent.
+my %totals;
+while (my $file = readdir($dh)) {
+	
+	# Skip . and ..
+	next if ($file eq '.') or ($file eq '..');
+
+	# Skip files unknown to the Data Server.
+	next if ($file !~  /^(.*)[\._]\d+\.data$/);
+
+	# Update the totals.
+	my $agent = $1;
+	if (!defined($totals{$agent})) {
+		$totals{$agent} = 1;
+	} else {
+		$totals{$agent} += 1;
+	}
+}
+closedir($dh);
+
+# Print the totals.
+print "Number of .data files\t\tAgent name\n";
+print "---------------------\t\t----------\n";
+foreach my $agent (sort { $totals{$a} <=> $totals{$b}} keys(%totals)) {	
+	print "$totals{$agent}\t\t\t\t$agent\n";
+}

From 4dfbdca423fe4066e1c6e9ffca9713f9d8d29479 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 24 Jul 2017 15:53:31 +0200
Subject: [PATCH 045/157] add new field table view agents for type of agent

---
 .../godmode/agentes/modificar_agente.php      |  9 ++++
 pandora_console/include/functions_ui.php      | 22 ++++++++
 .../operation/agentes/estado_agente.php       | 50 +++++++++++--------
 3 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 4fa9725bf9..712abb5dbb 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -488,6 +488,7 @@ if ($agents !== false) {
 		'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=os&sort=up&disabled=$disabled">' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp)) . '</a>' .
 		'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=os&sort=down&disabled=$disabled">' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown)) . '</a>';
 	echo "</th>";
+	echo "<th>".__('Type'). "</th>";
 	echo "<th>".__('Group'). ' ' .
 			'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=group&sort=up&disabled=$disabled">' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp)) . '</a>' .
 			'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=group&sort=down&disabled=$disabled">' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown)) . '</a>';
@@ -606,6 +607,14 @@ if ($agents !== false) {
 		echo "<td class='$tdcolor' align='left' valign='middle'>";
 		ui_print_os_icon ($agent["id_os"], false);
 		echo "</td>";
+		
+		// Type agent (Networt, Software or Satellite)
+		echo "<td class='$tdcolor' align='left' valign='middle'>";
+		echo ui_print_type_agent_icon ($agent["id_os"], $agent['ultimo_contacto_remoto'], 
+								$agent['ultimo_contacto'], $agent['remote'], $agent['agent_version']);
+		echo "</td>";		
+
+
 		// Group icon and name
 		echo "<td class='$tdcolor' align='left' valign='middle'>" . ui_print_group_icon ($id_grupo, true)."</td>";
 		// Description
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 5aa917b5d4..46a9556e4b 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -660,6 +660,28 @@ function ui_print_os_icon ($id_os, $name = true, $return = false,
 	return $output;
 }
 
+function ui_print_type_agent_icon ( $id_os = false, $remote_contact = false, $contact = false, 
+						$return = false, $remote = 0, $version = ""){
+
+	if($id_os == 19){
+		//Satellite
+		$options['title'] = __('Satellite');
+		$output = html_print_image("images/op_satellite.png", true, $options, false, false, false, true);
+	}
+	else if ($remote_contact == $contact && $remote == 0 && $version == ""){
+		//Network
+		$options['title'] = __('Network');
+		$output = html_print_image("images/network.png", true, $options, false, false, false, true);
+	}
+	else{
+		//Software
+		$options['title'] = __('Software');
+		$output = html_print_image("images/data.png", true, $options, false, false, false, true);
+	}
+
+	return $output;
+}
+
 /**
  * Prints an agent name with the correct link
  * 
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 64a9f65097..c58c72bdd2 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -466,7 +466,10 @@ else {
 			'unknown_count',
 			'notinit_count',
 			'total_count',
-			'fired_count'),
+			'fired_count',
+			'ultimo_contacto_remoto',
+			'remote',
+			'agent_version'),
 		$access,
 		$order);
 }
@@ -498,11 +501,11 @@ $table->head[1] = __('Description'). ' ' .
 
 $table->size[1] = "16%";
 
-$table->head[9] = __('Remote'). ' ' .
+$table->head[10] = __('Remote'). ' ' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=remote&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectRemoteUp, "alt" => "up"))  . '</a>' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=remote&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectRemoteDown, "alt" => "down")) . '</a>';
 
-$table->size[9] = "9%";
+$table->size[10] = "9%";
 
 $table->head[2] = __('OS'). ' ' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=os&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp, "alt" => "up"))  . '</a>' .
@@ -517,21 +520,24 @@ $table->size[3] = "10%";
 $table->head[4] = __('Group'). ' ' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=group&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp, "alt" => "up")) . '</a>' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=group&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown, "alt" => "down")) . '</a>';
-$table->size[4] = "15%";
+$table->size[4] = "8%";
 
-$table->head[5] = __('Modules');
-$table->size[5] = "10%";
+$table->head[5] = __('Type');
+$table->size[5] = "8%";
 
-$table->head[6] = __('Status');
-$table->size[6] = "4%";
+$table->head[6] = __('Modules');
+$table->size[6] = "10%";
 
-$table->head[7] = __('Alerts');
+$table->head[7] = __('Status');
 $table->size[7] = "4%";
 
-$table->head[8] = __('Last contact'). ' ' .
+$table->head[8] = __('Alerts');
+$table->size[8] = "4%";
+
+$table->head[9] = __('Last contact'). ' ' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=last_contact&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
 	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=last_contact&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
-$table->size[8] = "15%";
+$table->size[9] = "15%";
 
 $table->align = array ();
 
@@ -542,9 +548,9 @@ $table->align[5] = "left";
 $table->align[6] = "left";
 $table->align[7] = "left";
 $table->align[8] = "left";
+$table->align[9] = "left";
 
 $table->style = array();
-//$table->style[0] = 'width: 15%';
 
 $table->data = array ();
 
@@ -584,14 +590,14 @@ foreach ($agents as $agent) {
 	
 	$data[1] = ui_print_truncate_text($agent["description"], 'description', false, true, true, '[&hellip;]', 'font-size: 6.5pt');
 	
-	$data[9] = "";
+	$data[10] = "";
 	
 	if (enterprise_installed()) {
 		enterprise_include_once('include/functions_config_agents.php');
 		
 		if (enterprise_hook('config_agents_has_remote_configuration',array($agent["id_agente"]))) {
 	
-	$data[9] = html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Remote config')));
+	$data[10] = html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Remote config')));
 		
 		}
 	}
@@ -602,14 +608,18 @@ foreach ($agents as $agent) {
 	
 	$data[4] = ui_print_group_icon ($agent["id_grupo"], true);
 	$agent['not_init_count'] = $agent['notinit_count'];
-	$data[5] = reporting_tiny_stats($agent, true, 'modules', ':', $strict_user);
+
+	$data[5] = ui_print_type_agent_icon ($agent["id_os"], $agent['ultimo_contacto_remoto'], 
+											$agent['ultimo_contacto'], $agent['remote'], 
+											$agent['agent_version']);
+
+	$data[6] = reporting_tiny_stats($agent, true, 'modules', ':', $strict_user);
+
+	$data[7] = $status_img;
 	
+	$data[8] = $alert_img;
 	
-	$data[6] = $status_img;
-	
-	$data[7] = $alert_img;
-	
-	$data[8] = agents_get_interval_status ($agent);
+	$data[9] = agents_get_interval_status ($agent);
 	
 	// This old code was returning "never" on agents without modules, BAD !!
 	// And does not print outdated agents in red. WRONG !!!!

From 9ddb47741f90b986022420bbdfd4714c4e70ee4d Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 24 Jul 2017 16:34:22 +0200
Subject: [PATCH 046/157] Added new events bar to meta

---
 .../include/functions_reporting_html.php      | 131 ++++++++++++++++++
 .../include/graphs/flot/pandora.flot.js       |  13 +-
 .../include/graphs/functions_flot.php         |   4 +-
 3 files changed, 143 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 49e651e5ef..b6c520b4b3 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -3780,6 +3780,7 @@ function reporting_get_event_histogram ($events, $text_header_event = false) {
 				);
 		}
 	}
+	
 	$table = new stdClass();
 	if (!$text_header_event) {
 		$table->width = '100%';
@@ -3839,6 +3840,136 @@ function reporting_get_event_histogram ($events, $text_header_event = false) {
 	return $event_graph;
 }
 
+function reporting_get_event_histogram_meta ($width) {
+	global $config;
+	if (!defined("METACONSOLE")) {
+		include_once ($config['homedir'] .'/include/graphs/functions_gd.php');
+	}
+	else {
+		include_once ('../../include/graphs/functions_gd.php');
+	}
+
+	$period = SECONDS_1HOUR;
+
+	if (!$text_header_event) {
+		$text_header_event = __('Events info (1hr.)');
+	}
+
+	$ttl = 1;
+	$urlImage = ui_get_full_url(false, true, false, false);
+	
+	$data = array ();
+	
+	$resolution = $config['graph_res'] * ($period * 2 / $width); // Number of "slices" we want in graph
+
+	$interval = (int) ($period / $resolution);
+	$date = get_system_time ();
+	$datelimit = $date - $period;
+	$periodtime = floor ($period / $interval);
+	$time = array ();
+	$data = array ();
+	$legend = array();
+	$full_legend = array();
+	$full_legend_date = array();
+
+	$colors = array(
+		EVENT_CRIT_MAINTENANCE => COL_MAINTENANCE,
+		EVENT_CRIT_INFORMATIONAL => COL_INFORMATIONAL,
+		EVENT_CRIT_NORMAL => COL_NORMAL,
+		EVENT_CRIT_MINOR => COL_MINOR,
+		EVENT_CRIT_WARNING => COL_WARNING,
+		EVENT_CRIT_MAJOR => COL_MAJOR,
+		EVENT_CRIT_CRITICAL => COL_CRITICAL
+	);
+
+	$cont = 0;
+	for ($i = 0; $i < $interval; $i++) {
+		$bottom = $datelimit + ($periodtime * $i);
+		if (! $graphic_type) {
+			if ($config['flash_charts']) {
+				$name = date('H:i:s', $bottom);
+			}
+			else {
+				$name = date('H\h', $bottom);
+			}
+		}
+		else {
+			$name = $bottom;
+		}
+		
+		// Show less values in legend
+		if ($cont == 0 or $cont % 2)
+			$legend[$cont] = $name;
+		
+		if ($from_agent_view) {
+			$full_date = date('Y/m/d', $bottom);
+			$full_legend_date[$cont] = $full_date;
+		}
+
+		$full_legend[$cont] = $name;
+		
+		$top = $datelimit + ($periodtime * ($i + 1));
+		$event = db_get_row_filter ('tmetaconsole_event',
+			array (
+				'utimestamp > '.$bottom,
+				'utimestamp < '.$top), 
+				'criticity, utimestamp');
+		
+		if (!empty($event['utimestamp'])) {
+			$data[$cont]['utimestamp'] = $periodtime;
+			switch ($event['criticity']) {
+				case EVENT_CRIT_WARNING:
+					$data[$cont]['data'] = 2;
+					break;
+				case EVENT_CRIT_CRITICAL:
+					$data[$cont]['data'] = 3;
+					break;
+				default:
+					$data[$cont]['data'] = 1;
+					break;
+			}
+		}
+		else {
+			$data[$cont]['utimestamp'] = $periodtime;
+			$data[$cont]['data'] = 1;
+		}
+		$cont++;
+	}
+	
+	$table = new stdClass();
+
+	$table->width = '100%';
+
+	$table->data = array ();
+	$table->size = array ();
+	$table->head = array ();
+	$table->title = '<span>' . $text_header_event . '</span>';
+	$table->data[0][0] = "" ;
+	
+	if (!empty($data)) {
+		$slicebar = flot_slicesbar_graph($data, $period, "100%", 30, $full_legend, $colors, $config['fontpath'], $config['round_corner'], $url, '', '', false, 0, $full_legend_date);
+		
+		$table->data[0][0] = $slicebar;
+	}
+	else {
+		$table->data[0][0] = __('No events');
+	}
+	
+	if (!$text_header_event) {
+		$event_graph = '<fieldset class="databox tactical_set">
+					<legend>' .
+						$text_header_event .
+					'</legend>' .
+					html_print_table($table, true) . '</fieldset>';
+	}
+	else {
+		$table->class = 'noclass';
+		$event_graph = html_print_table($table, true);
+	}
+	
+	return $event_graph;
+}
+
 function reporting_html_planned_downtimes_table ($planned_downtimes) {
 	global $config;
 	
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 8b4ddca948..699b15819b 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -614,10 +614,10 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 	legend = legend.split(separator);
 	acumulate_data = acumulate_data.split(separator);
 	datacolor = datacolor.split(separator);
-	if (full_legend != "") {
+	if (full_legend != false) {
 		full_legend = full_legend.split(separator);
 	}
-	console.log(full_legend);
+	
 	// Check possible adapt_keys on classes
 	check_adaptions(graph_id);
 
@@ -706,13 +706,18 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 				var year = dateObj.getUTCFullYear();
 					newdate = year + "/" + month + "/" + day;
 			}
-			
+
 			if(!to){
 				to= '23:59';
 			}
 
 			if (full_legend != "") {
-				window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&date_to='+newdate2+'&time_to='+to+'&status=-1';
+				if (newdate2 == undefined) {
+					window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&status=-1';
+				}
+				else {
+					window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&date_to='+newdate2+'&time_to='+to+'&status=-1';
+				}
 			}
 			else {
 				window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&date_to='+newdate+'&time_to='+to+'&status=-1';
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 243412fe08..48b9db9652 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -932,7 +932,6 @@ function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $
 			$acumulate += $value;
 			$c++;
 			
-			//$return .= "<div id='value_".$i."_$graph_id' class='values_$graph_id' style='color: #000; position:absolute;'>$value</div>";
 			if ($value > $max) {
 				$max = $value;
 			}
@@ -946,6 +945,9 @@ function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $
 	if (!empty($full_legend_date)) {
 		$full_legend_date = io_safe_output(implode($separator,$full_legend_date));
 	}
+	else {
+		$full_legend_date = false;
+	}
 	$acumulate_data = io_safe_output(implode($separator,$acumulate_data));
 	
 	// Store data series in javascript format

From daa952649b57f7d131401e8990b9037264c0ec43 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 25 Jul 2017 00:01:13 +0200
Subject: [PATCH 047/157] 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 fb0020c623..0ef62da8cc 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.707-170724
+Version: 7.0NG.707-170725
 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 61ef71f330..75a11dd118 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.707-170724"
+pandora_version="7.0NG.707-170725"
 
 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 a9279f6b03..7b881cbf68 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.707';
-use constant AGENT_BUILD => '170724';
+use constant AGENT_BUILD => '170725';
 
 # 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 2cfb6500c6..655a846f24 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.707
-%define release     170724
+%define release     170725
 
 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 966039b6de..1fa02b416d 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.707
-%define release     170724
+%define release     170725
 
 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 71a9468513..342e0bb164 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170724"
+PI_BUILD="170725"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index bcf9f04587..f6d33f77c3 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170724}
+{170725}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e5c5c6831c..362f601657 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.707(Build 170724)")
+#define PANDORA_VERSION ("7.0NG.707(Build 170725)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index df7354adc7..c788baf296 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.707(Build 170724))"
+      VALUE "ProductVersion", "(7.0NG.707(Build 170725))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 95d67a3259..4193d5bea3 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.707-170724
+Version: 7.0NG.707-170725
 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 f4846cae5a..d66a601242 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.707-170724"
+pandora_version="7.0NG.707-170725"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index e0201f7871..27e9275145 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 = 'PC170724';
+$build_version = 'PC170725';
 $pandora_version = 'v7.0NG.707';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 8c486ed8c1..7913c50ce4 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.707';
-$build = '170724';
+$build = '170725';
 			$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 61393289fb..a5e74e4072 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.707
-%define release     170724
+%define release     170725
 
 # 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 ef837620e7..4be5bf7592 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.707
-%define release     170724
+%define release     170725
 %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 14d6f03fef..bdb7a40524 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.707-170724
+Version: 7.0NG.707-170725
 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 5973fb62a7..2aa05b036d 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.707-170724"
+pandora_version="7.0NG.707-170725"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 473e490437..e5ab25ecd0 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.707";
-my $pandora_build = "170724";
+my $pandora_build = "170725";
 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 9ca2b325b3..b5bef30aa5 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.707
-%define release     170724
+%define release     170725
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 4268b42e1c..1cc587223d 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.707
-%define release     170724
+%define release     170725
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 2d86685458..d755b8c03b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170724"
+PI_BUILD="170725"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 5b4992a2e8..db91483556 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.707 PS170724";
+my $version = "7.0NG.707 PS170725";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index c1be58350f..1925cc0e36 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.707 PS170724";
+my $version = "7.0NG.707 PS170725";
 
 # save program name for logging
 my $progname = basename($0);

From 836cc384e93ec8dd966d09497e59c523f34712c9 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 25 Jul 2017 08:36:21 +0200
Subject: [PATCH 048/157] Added good colours to meta tactical events bar

---
 .../include/functions_reporting_html.php      | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index b6c520b4b3..690a55d630 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -3918,11 +3918,32 @@ function reporting_get_event_histogram_meta ($width) {
 		if (!empty($event['utimestamp'])) {
 			$data[$cont]['utimestamp'] = $periodtime;
 			switch ($event['criticity']) {
-				case EVENT_CRIT_WARNING:
-					$data[$cont]['data'] = 2;
+				case 0:
+					$data[$cont]['data'] = EVENT_CRIT_MAINTENANCE;
 					break;
-				case EVENT_CRIT_CRITICAL:
-					$data[$cont]['data'] = 3;
+				case 1:
+					$data[$cont]['data'] = EVENT_CRIT_INFORMATIONAL;
+					break;
+				case 2:
+					$data[$cont]['data'] = EVENT_CRIT_NORMAL;
+					break;
+				case 3:
+					$data[$cont]['data'] = EVENT_CRIT_WARNING;
+					break;
+				case 4:
+					$data[$cont]['data'] = EVENT_CRIT_CRITICAL;
+					break;
+				case 5:
+					$data[$cont]['data'] = EVENT_CRIT_MINOR;
+					break;
+				case 6:
+					$data[$cont]['data'] = EVENT_CRIT_MAJOR;
+					break;
+				case 20:
+					$data[$cont]['data'] = EVENT_CRIT_NOT_NORMAL;
+					break;
+				case 34:
+					$data[$cont]['data'] = EVENT_CRIT_WARNING_OR_CRITICAL;
 					break;
 				default:
 					$data[$cont]['data'] = 1;

From 6b30accd110b3d29c47a5884638257ffc10392c4 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 25 Jul 2017 15:38:28 +0200
Subject: [PATCH 049/157] Added new function to redirect with dbclick when
 fictinal have a map link

---
 .../functions_pandora_networkmap.js           | 107 ++++++++++++++++--
 1 file changed, 95 insertions(+), 12 deletions(-)

diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index 86ab6bd914..3202b355b4 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -307,7 +307,12 @@ function change_shape(id_db_node) {
 										})
 									.on("click", selected_node)
 									.on("dblclick", function(d) {
-											edit_node(d, true);
+											if (d.type == undefined) {
+												move_to_networkmap(d);
+											}
+											else {
+												edit_node(d, true);
+											}
 										})
 									.on("contextmenu", function(d) { show_menu("node", d);});
 									
@@ -342,7 +347,12 @@ function change_shape(id_db_node) {
 										})
 									.on("click", selected_node)
 									.on("dblclick", function(d) {
-											edit_node(d, true);
+											if (d.type == undefined) {
+												move_to_networkmap(d);
+											}
+											else {
+												edit_node(d, true);
+											}
 										})
 									.on("contextmenu", function(d) { show_menu("node", d);});
 								
@@ -365,7 +375,12 @@ function change_shape(id_db_node) {
 											})
 										.on("click", selected_node)
 										.on("dblclick", function(d) {
-												edit_node(d, true);
+												if (d.type == undefined) {
+													move_to_networkmap(d);
+												}
+												else {
+													edit_node(d, true);
+												}
 											})
 										.on("contextmenu", function(d) { show_menu("node", d);});
 										
@@ -400,7 +415,12 @@ function change_shape(id_db_node) {
 										})
 									.on("click", selected_node)
 									.on("dblclick", function(d) {
-											edit_node(d, true);
+											if (d.type == undefined) {
+												move_to_networkmap(d);
+											}
+											else {
+												edit_node(d, true);
+											}
 										})
 									.on("contextmenu", function(d) { show_menu("node", d);});
 								
@@ -425,7 +445,12 @@ function change_shape(id_db_node) {
 											})
 										.on("click", selected_node)
 										.on("dblclick", function(d) {
-												edit_node(d, true);
+												if (d.type == undefined) {
+													move_to_networkmap(d);
+												}
+												else {
+													edit_node(d, true);
+												}
 											})
 										.on("contextmenu", function(d) { show_menu("node", d);});
 										
@@ -460,7 +485,12 @@ function change_shape(id_db_node) {
 										})
 									.on("click", selected_node)
 									.on("dblclick", function(d) {
-											edit_node(d, true);
+											if (d.type == undefined) {
+												move_to_networkmap(d);
+											}
+											else {
+												edit_node(d, true);
+											}
 										})
 									.on("contextmenu", function(d) { show_menu("node", d);});	
 							}
@@ -3154,7 +3184,12 @@ function draw_elements_graph() {
 				})
 			.on("click", selected_node)
 			.on("dblclick", function(d) {
-					edit_node(d, true);
+					if (d.type == undefined) {
+						move_to_networkmap(d);
+					}
+					else {
+						edit_node(d, true);
+					}
 				})
 			.on("contextmenu", function(d) { show_menu("node", d);});
 	
@@ -3188,7 +3223,12 @@ function draw_elements_graph() {
 			})
 		.on("click", selected_node)
 		.on("dblclick", function(d) {
-				edit_node(d, true);
+				if (d.type == undefined) {
+					move_to_networkmap(d);
+				}
+				else {
+					edit_node(d, true);
+				}
 			})
 		.on("contextmenu", function(d) { show_menu("node", d);});
 	
@@ -3216,7 +3256,12 @@ function draw_elements_graph() {
 				})
 			.on("click", selected_node)
 			.on("dblclick", function(d) {
-					edit_node(d, true);
+					if (d.type == undefined) {
+						move_to_networkmap(d);
+					}
+					else {
+						edit_node(d, true);
+					}
 				})
 			.on("contextmenu", function(d) { show_menu("node", d);});
 			
@@ -3254,7 +3299,12 @@ function draw_elements_graph() {
 			})
 		.on("click", selected_node)
 		.on("dblclick", function(d) {
-				edit_node(d, true);
+				if (d.type == undefined) {
+					move_to_networkmap(d);
+				}
+				else {
+					edit_node(d, true);
+				}
 			})
 		.on("contextmenu", function(d) { show_menu("node", d);});
 	
@@ -3284,7 +3334,12 @@ function draw_elements_graph() {
 				})
 			.on("click", selected_node)
 			.on("dblclick", function(d) {
-					edit_node(d, true);
+					if (d.type == undefined) {
+						move_to_networkmap(d);
+					}
+					else {
+						edit_node(d, true);
+					}
 				})
 			.on("contextmenu", function(d) { show_menu("node", d);});
 			
@@ -3322,7 +3377,12 @@ function draw_elements_graph() {
 			})
 		.on("click", selected_node)
 		.on("dblclick", function(d) {
-				edit_node(d, true);
+				if (d.type == undefined) {
+					move_to_networkmap(d);
+				}
+				else {
+					edit_node(d, true);
+				}
 			})
 		.on("contextmenu", function(d) { show_menu("node", d);});
 	
@@ -3353,6 +3413,29 @@ function draw_elements_graph() {
 	node.exit().remove();
 }
 
+function move_to_networkmap (node) {
+	var params = [];
+	params.push("get_networkmap_from_fictional=1");
+	params.push("id=" + node.id_db);
+	params.push("id_map=" + node.map_id);
+	params.push("page=enterprise/operation/agentes/pandora_networkmap.view");
+
+	jQuery.ajax ({
+		data: params.join ("&"),
+		dataType: 'json',
+		type: 'POST',
+		url: action="ajax.php",
+		success: function (data) {
+			if (data['correct']) {
+				window.location="index.php?sec=network&sec2=operation/agentes/pandora_networkmap&tab=view&id_networkmap=" + data['id_networkmap'];
+			}
+			else {
+				edit_node(node, true);
+			}
+		}
+	});
+}
+
 function choose_group_for_show_agents() {
 	if (enterprise_installed) {
 		group = $("#group_for_show_agents option:selected").val();

From 729503f50904c336ef1e794eb7db6c52d500a594 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 26 Jul 2017 00:01:13 +0200
Subject: [PATCH 050/157] 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 0ef62da8cc..a9d191b4b0 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.707-170725
+Version: 7.0NG.707-170726
 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 75a11dd118..9191bd6cbd 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.707-170725"
+pandora_version="7.0NG.707-170726"
 
 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 7b881cbf68..a63e5ee721 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.707';
-use constant AGENT_BUILD => '170725';
+use constant AGENT_BUILD => '170726';
 
 # 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 655a846f24..3ecd4f1759 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.707
-%define release     170725
+%define release     170726
 
 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 1fa02b416d..74878238d1 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.707
-%define release     170725
+%define release     170726
 
 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 342e0bb164..4d4fb5135e 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170725"
+PI_BUILD="170726"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index f6d33f77c3..621801b9e0 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170725}
+{170726}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 362f601657..aa4fb9248f 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.707(Build 170725)")
+#define PANDORA_VERSION ("7.0NG.707(Build 170726)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index c788baf296..e721133a63 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.707(Build 170725))"
+      VALUE "ProductVersion", "(7.0NG.707(Build 170726))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 4193d5bea3..11614027b4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.707-170725
+Version: 7.0NG.707-170726
 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 d66a601242..8212430c33 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.707-170725"
+pandora_version="7.0NG.707-170726"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 27e9275145..e1fb00ef3c 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 = 'PC170725';
+$build_version = 'PC170726';
 $pandora_version = 'v7.0NG.707';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 7913c50ce4..8cb44c20ca 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.707';
-$build = '170725';
+$build = '170726';
 			$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 a5e74e4072..1a7ee27829 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.707
-%define release     170725
+%define release     170726
 
 # 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 4be5bf7592..5156d3afe4 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.707
-%define release     170725
+%define release     170726
 %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 bdb7a40524..d0deaa1e55 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.707-170725
+Version: 7.0NG.707-170726
 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 2aa05b036d..c14b548d8d 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.707-170725"
+pandora_version="7.0NG.707-170726"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index e5ab25ecd0..33a82066ad 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.707";
-my $pandora_build = "170725";
+my $pandora_build = "170726";
 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 b5bef30aa5..bcf7fa749a 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.707
-%define release     170725
+%define release     170726
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 1cc587223d..6b0420c795 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.707
-%define release     170725
+%define release     170726
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index d755b8c03b..c507238942 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.707"
-PI_BUILD="170725"
+PI_BUILD="170726"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index db91483556..13b415ea19 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.707 PS170725";
+my $version = "7.0NG.707 PS170726";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 1925cc0e36..a8ee1f77c4 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.707 PS170725";
+my $version = "7.0NG.707 PS170726";
 
 # save program name for logging
 my $progname = basename($0);

From 82b6904289d3fbbb5f63f395ac515ec9fb2e4b01 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 26 Jul 2017 13:36:42 +0200
Subject: [PATCH 051/157] Changed some lines in configurar_agente

---
 .../godmode/agentes/configurar_agente.php          | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index c804ddc22c..65ea6aa5aa 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1010,14 +1010,26 @@ if ($update_module || $create_module) {
 				$new_configuration_data .= "$line\n";
 			}
 		}
+
+		$values_macros = array();
+		$values_macros['macros'] = base64_encode(json_encode($macros));
+
+		$macros_for_data = enterprise_hook(
+		'config_agents_get_macros_data_conf', array($values_macros));
+	
+		if ($macros_for_data != '') {
+			$_new_configuration_data = str_replace('module_end',
+				$macros_for_data . "module_end", $_new_configuration_data);
+		}
 		
+		/*
 		$macros_for_data = enterprise_hook('config_agents_get_macros_data_conf', array($_POST));
 		
 		if ($macros_for_data !== ENTERPRISE_NOT_HOOK && $macros_for_data != '') {
 			// Add macros to configuration file
 			$new_configuration_data = str_replace('module_end', $macros_for_data."module_end", $new_configuration_data);
 		}
-		
+		*/
 		$configuration_data = $new_configuration_data;
 	}
 	

From 240b6e017fe39e2eb71cfbdf66879b6e946709ec Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 26 Jul 2017 13:50:55 +0200
Subject: [PATCH 052/157] Adapt historical_db checkbox for sql reports to sql
 templates - #1157

---
 pandora_console/godmode/reporting/reporting_builder.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index b7994e6a1c..ac6d35d4b4 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1124,8 +1124,8 @@ switch ($action) {
 							$values['treport_custom_sql_id'] = get_parameter('id_custom');
 							if ($values['treport_custom_sql_id'] == 0) {
 								$values['external_source'] = get_parameter('sql');
-								$values['historical_db'] = get_parameter('historical_db_check');
 							}
+							$values['historical_db'] = get_parameter('historical_db_check');
 						}
 						else if ($values['type'] == 'url') {
 							$values['external_source'] = get_parameter('url');
@@ -1214,7 +1214,6 @@ switch ($action) {
 									break;
 							}
 							
-							
 							$resultOperationDB = db_process_sql_update(
 								'treport_content',
 								$values,
@@ -1446,8 +1445,8 @@ switch ($action) {
 							$values['treport_custom_sql_id'] = get_parameter('id_custom');
 							if ($values['treport_custom_sql_id'] == 0) {
 								$values['external_source'] = get_parameter('sql');
-								$values['historical_db'] = get_parameter('historical_db_check');
 							}
+							$values['historical_db'] = get_parameter('historical_db_check');
 						}
 						elseif ($values['type'] == 'url') {
 							$values['external_source'] = get_parameter('url');

From a9d76e2748c97d61828fe4610abe1434ca3ac5f4 Mon Sep 17 00:00:00 2001
From: artica <git@artica.es>
Date: Wed, 26 Jul 2017 17:03:41 +0200
Subject: [PATCH 053/157] 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_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 +-
 48 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf
index 6e804303b3..4ec24dd4fc 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.707, AIX version
+# Version 7.0NG.708, 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 7f5e8e320c..5b84348657 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.707, FreeBSD Version
+# Version 7.0NG.708, 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 141f1c7b3f..67368fc92d 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.707, HP-UX Version
+# Version 7.0NG.708, 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 0189912d1c..67cedc9d0a 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.707, GNU/Linux
+# Version 7.0NG.708, 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 29781cd47c..1922741fd4 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.707, GNU/Linux
+# Version 7.0NG.708, 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 93f2908530..b9314d2a5a 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.707, Solaris Version
+# Version 7.0NG.708, 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 c1730d6535..90d17489d0 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.707
+# Version 7.0NG.708
 
 # 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 c9a852fa1a..d624a8d66d 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.707, AIX version
+# Version 7.0NG.708, 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 f50992595d..9edc972282 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.707
+# Version 7.0NG.708
 # 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 cd941056fc..f77b766dab 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.707, HPUX Version
+# Version 7.0NG.708, HPUX Version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index bd946df430..d37678b502 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.707
+# Version 7.0NG.708
 # 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 0300f7c8b3..da67ed5470 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.707
+# Version 7.0NG.708
 # 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 ba26d1e65f..d8a9d19ee3 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.707
+# Version 7.0NG.708
 # 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 4a933c21f1..1b4a021236 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.707, Solaris version
+# Version 7.0NG.708, Solaris version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index cda9f409ab..dfdc519a04 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.707, AIX version
+# Version 7.0NG.708, 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 a9d191b4b0..6555b3726d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.707-170726
+Version: 7.0NG.708
 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 9191bd6cbd..fc3b8de892 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.707-170726"
+pandora_version="7.0NG.708"
 
 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 79eadf34b3..81ce878b4e 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.707, GNU/Linux
+# Version 7.0NG.708, 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 776e68ae8d..535a637421 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.707, FreeBSD Version
+# Version 7.0NG.708, 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 547d7e2256..962d1a4047 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.707, HP-UX Version
+# Version 7.0NG.708, 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 8d9893c24a..efaa9ac0bc 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.707, GNU/Linux
+# Version 7.0NG.708, 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 d2feeff65c..8a153581e2 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.707, GNU/Linux
+# Version 7.0NG.708, 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 706400f417..8cb4f47058 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.707, NetBSD Version
+# Version 7.0NG.708, 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 882f6cadd5..290d3614a3 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.707, Solaris Version
+# Version 7.0NG.708, 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 a63e5ee721..456095be18 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.707';
+use constant AGENT_VERSION => '7.0NG.708';
 use constant AGENT_BUILD => '170726';
 
 # 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 3ecd4f1759..068c82fd66 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.707
-%define release     170726
+%define version     7.0NG.708
+%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 74878238d1..63778598df 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.707
-%define release     170726
+%define version     7.0NG.708
+%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 4d4fb5135e..b8a6c0b2b6 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.707"
+PI_VERSION="7.0NG.708"
 PI_BUILD="170726"
 OS_NAME=`uname -s`
 
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index c2db09fe55..288e42e3a7 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.707
+# Version 7.0NG.708
 
 # 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 621801b9e0..decb965545 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.707}
+{Pandora FMS Windows Agent v7.0NG.708}
 
 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 aa4fb9248f..5f9d259ed8 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.707(Build 170726)")
+#define PANDORA_VERSION ("7.0NG.708(Build 170726)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index e721133a63..4a0cc9d02e 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.707(Build 170726))"
+      VALUE "ProductVersion", "(7.0NG.708(Build 170726))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 11614027b4..09abf76925 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.707-170726
+Version: 7.0NG.708
 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 8212430c33..9f216ce00f 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.707-170726"
+pandora_version="7.0NG.708"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index e1fb00ef3c..38cd0d625d 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 = 'PC170726';
-$pandora_version = 'v7.0NG.707';
+$pandora_version = 'v7.0NG.708';
 
 // 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 8cb44c20ca..5831f65b77 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -70,7 +70,7 @@
 	<body>
 		<div style='height: 10px'>
 			<?php
-$version = '7.0NG.707';
+$version = '7.0NG.708';
 $build = '170726';
 			$banner = "v$version Build $build";
 			
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 1a7ee27829..f82040965d 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.707
-%define release     170726
+%define version     7.0NG.708
+%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 5156d3afe4..7dc9d61fad 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.707
-%define release     170726
+%define version     7.0NG.708
+%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 5f2746bdd6..39fa2a39de 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.707"
+PI_VERSION="7.0NG.708"
 FORCE=0
 DESTDIR=""
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index d0deaa1e55..3cc6499b98 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.707-170726
+Version: 7.0NG.708
 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 c14b548d8d..dc005584d2 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.707-170726"
+pandora_version="7.0NG.708"
 
 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 3f5f7d1cd0..6d2e757f1a 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.707
+# Version 7.0NG.708
 # 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 33a82066ad..28bf69a685 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.707";
+my $pandora_version = "7.0NG.708";
 my $pandora_build = "170726";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index bcf7fa749a..e6156f0fcc 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.707
-%define release     170726
+%define version     7.0NG.708
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6b0420c795..496bc01f53 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.707
-%define release     170726
+%define version     7.0NG.708
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index c507238942..1c523b5dcc 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.707"
+PI_VERSION="7.0NG.708"
 PI_BUILD="170726"
 
 MODE=$1
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 13b415ea19..687fb7623f 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.707 PS170726";
+my $version = "7.0NG.708 PS170726";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a8ee1f77c4..81a605de37 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.707 PS170726";
+my $version = "7.0NG.708 PS170726";
 
 # save program name for logging
 my $progname = basename($0);

From 9d6bd697a76fd12f9a275a3c48026f4ec4695b42 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 27 Jul 2017 00:01:13 +0200
Subject: [PATCH 054/157] 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 6555b3726d..bd9484cf9f 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.708
+Version: 7.0NG.708-170727
 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 fc3b8de892..7197bb9312 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.708"
+pandora_version="7.0NG.708-170727"
 
 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 456095be18..514e0fa3a7 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.708';
-use constant AGENT_BUILD => '170726';
+use constant AGENT_BUILD => '170727';
 
 # 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 068c82fd66..1bf6e651c7 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.708
-%define release     1
+%define release     170727
 
 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 63778598df..7f6e7803a3 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.708
-%define release     1
+%define release     170727
 
 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 b8a6c0b2b6..c8688e8bd2 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170726"
+PI_BUILD="170727"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index decb965545..ac3083f21a 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170726}
+{170727}
 
 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 5f9d259ed8..912d524bcf 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.708(Build 170726)")
+#define PANDORA_VERSION ("7.0NG.708(Build 170727)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 4a0cc9d02e..4d405b037c 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.708(Build 170726))"
+      VALUE "ProductVersion", "(7.0NG.708(Build 170727))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 09abf76925..a621d22cda 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.708
+Version: 7.0NG.708-170727
 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 9f216ce00f..dc51bdeaba 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.708"
+pandora_version="7.0NG.708-170727"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 38cd0d625d..cc8f6a4de8 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 = 'PC170726';
+$build_version = 'PC170727';
 $pandora_version = 'v7.0NG.708';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 5831f65b77..a9871fe99b 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.708';
-$build = '170726';
+$build = '170727';
 			$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 f82040965d..30ff69b5c4 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.708
-%define release     1
+%define release     170727
 
 # 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 7dc9d61fad..30fd2af107 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.708
-%define release     1
+%define release     170727
 %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 3cc6499b98..f7256c5fa4 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.708
+Version: 7.0NG.708-170727
 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 dc005584d2..93893a07b5 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.708"
+pandora_version="7.0NG.708-170727"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 28bf69a685..aeb74c7c69 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.708";
-my $pandora_build = "170726";
+my $pandora_build = "170727";
 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 e6156f0fcc..3eb6ad95e4 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.708
-%define release     1
+%define release     170727
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 496bc01f53..c7d44e353a 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.708
-%define release     1
+%define release     170727
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 1c523b5dcc..7733d0a70f 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170726"
+PI_BUILD="170727"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 687fb7623f..d000a443e0 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.708 PS170726";
+my $version = "7.0NG.708 PS170727";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 81a605de37..64ab6e1348 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.708 PS170726";
+my $version = "7.0NG.708 PS170727";
 
 # save program name for logging
 my $progname = basename($0);

From 8252362879ca3569ca654fba53240f1b73d9e2c2 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 27 Jul 2017 09:33:52 +0200
Subject: [PATCH 055/157] fixed query in server

---
 pandora_server/bin/pandora_server | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 4d12de8adb..709b6c7b04 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -607,13 +607,7 @@ sub main() {
 				$server->update();
 			}
 	
-			# Update fallen servers 
-			my @servers_db = get_db_rows ($DBH, "SELECT id_server, server_keepalive FROM tserver");
-			for (@servers_db) {
-				my %server_db = %$_;
-				my $expected_update = strftime ("%Y-%m-%d %H:%M:%S", localtime(time() - $server_db{'server_keepalive'} * 2));
-				db_do ($DBH, "UPDATE tserver SET status = 0 WHERE keepalive < ? AND id_server = ?", $expected_update, $server_db{'id_server'});
-			}
+			db_do ($DBH, "UPDATE tserver SET status = 0 WHERE now()-keepalive > 2*server_keepalive");
 
 			# Set the master server
 			pandora_set_master(\%Config, $DBH);

From 39f4b48d84a92dac9a7cb6b6726cefe1cc9d2180 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 27 Jul 2017 11:08:19 +0200
Subject: [PATCH 056/157] Added some changes about update modules from local
 component with macros

---
 .../godmode/agentes/configurar_agente.php      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 65ea6aa5aa..777d5facdc 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1000,7 +1000,7 @@ if ($update_module || $create_module) {
 		
 		$macros = io_json_mb_encode($macros);
 		
-		$conf_array = explode("\n",$configuration_data);
+		$conf_array = explode("\n", io_safe_output($configuration_data));
 		foreach ($conf_array as $line) {
 			if (preg_match("/^module_name\s*(.*)/", $line, $match)) {
 				$new_configuration_data .= "module_name $name\n";
@@ -1010,16 +1010,15 @@ if ($update_module || $create_module) {
 				$new_configuration_data .= "$line\n";
 			}
 		}
-
+		
 		$values_macros = array();
-		$values_macros['macros'] = base64_encode(json_encode($macros));
-
+		$values_macros['macros'] = base64_encode($macros);
+		
 		$macros_for_data = enterprise_hook(
 		'config_agents_get_macros_data_conf', array($values_macros));
-	
+
 		if ($macros_for_data != '') {
-			$_new_configuration_data = str_replace('module_end',
-				$macros_for_data . "module_end", $_new_configuration_data);
+			$new_configuration_data = str_replace('module_end', $macros_for_data . "module_end", $new_configuration_data);
 		}
 		
 		/*
@@ -1030,7 +1029,10 @@ if ($update_module || $create_module) {
 			$new_configuration_data = str_replace('module_end', $macros_for_data."module_end", $new_configuration_data);
 		}
 		*/
-		$configuration_data = $new_configuration_data;
+		$configuration_data = str_replace('\\', "&#92;",
+			io_safe_input($new_configuration_data));;
+
+		html_debug($configuration_data, true);
 	}
 	
 	// Services are an enterprise feature, 

From 02ce575d9ffc7c1558d4d6d6aac9d3b364e656e7 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 27 Jul 2017 12:39:38 +0200
Subject: [PATCH 057/157] Added a last fix

---
 pandora_console/godmode/agentes/configurar_agente.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 777d5facdc..9f5e0b3226 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1001,9 +1001,10 @@ if ($update_module || $create_module) {
 		$macros = io_json_mb_encode($macros);
 		
 		$conf_array = explode("\n", io_safe_output($configuration_data));
+		
 		foreach ($conf_array as $line) {
 			if (preg_match("/^module_name\s*(.*)/", $line, $match)) {
-				$new_configuration_data .= "module_name $name\n";
+				$new_configuration_data .= "module_name " . io_safe_output($name) . "\n";
 			}
 			// We delete from conf all the module macros starting with _field
 			else if(!preg_match("/^module_macro_field.*/", $line, $match)) {

From 55c70098ba401dfd1d08614af05b58188ed77f84 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 28 Jul 2017 00:01:13 +0200
Subject: [PATCH 058/157] 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 bd9484cf9f..34b9a6c8c6 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.708-170727
+Version: 7.0NG.708-170728
 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 7197bb9312..3c966af5cf 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.708-170727"
+pandora_version="7.0NG.708-170728"
 
 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 514e0fa3a7..ab53784cf9 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.708';
-use constant AGENT_BUILD => '170727';
+use constant AGENT_BUILD => '170728';
 
 # 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 1bf6e651c7..3dba4fdd04 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.708
-%define release     170727
+%define release     170728
 
 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 7f6e7803a3..2eeae4c183 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.708
-%define release     170727
+%define release     170728
 
 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 c8688e8bd2..2aa06d73ec 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170727"
+PI_BUILD="170728"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ac3083f21a..7791ee6337 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170727}
+{170728}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 912d524bcf..bc5b0fbfee 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.708(Build 170727)")
+#define PANDORA_VERSION ("7.0NG.708(Build 170728)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 4d405b037c..0ed14aaa07 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.708(Build 170727))"
+      VALUE "ProductVersion", "(7.0NG.708(Build 170728))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index a621d22cda..80dd9486d9 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.708-170727
+Version: 7.0NG.708-170728
 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 dc51bdeaba..d5b24dfee2 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.708-170727"
+pandora_version="7.0NG.708-170728"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index cc8f6a4de8..fb9580d3d6 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 = 'PC170727';
+$build_version = 'PC170728';
 $pandora_version = 'v7.0NG.708';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index a9871fe99b..172f12af8e 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.708';
-$build = '170727';
+$build = '170728';
 			$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 30ff69b5c4..63320b0ab5 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.708
-%define release     170727
+%define release     170728
 
 # 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 30fd2af107..03a5c23754 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.708
-%define release     170727
+%define release     170728
 %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 f7256c5fa4..9645ed17ca 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.708-170727
+Version: 7.0NG.708-170728
 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 93893a07b5..f92422d948 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.708-170727"
+pandora_version="7.0NG.708-170728"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index aeb74c7c69..73efa0d513 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.708";
-my $pandora_build = "170727";
+my $pandora_build = "170728";
 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 3eb6ad95e4..0233afe93c 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.708
-%define release     170727
+%define release     170728
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c7d44e353a..5e7d97b8b1 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.708
-%define release     170727
+%define release     170728
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7733d0a70f..e8029caecb 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170727"
+PI_BUILD="170728"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d000a443e0..9b1eadf84f 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.708 PS170727";
+my $version = "7.0NG.708 PS170728";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 64ab6e1348..a9a8c08ba9 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.708 PS170727";
+my $version = "7.0NG.708 PS170728";
 
 # save program name for logging
 my $progname = basename($0);

From 179325447ff26e6ec141f3bad21555436f5ecec7 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 28 Jul 2017 12:46:17 +0200
Subject: [PATCH 059/157] Revert "Use session and not exec sql if already
 exists acl perms in session - #1017"

This reverts commit 78bb583824ebe779b263852493d1e2a4144235b0.
---
 pandora_console/include/functions.php | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 1ef37e74bc..b4e25c9eac 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1796,26 +1796,6 @@ function check_acl($id_user, $id_group, $access, $onlyOneGroup = false) {
 		$id_group = (int) $id_group;
 	}
 	
-	if($_SESSION['check_acl'] != null){
-		if (empty ($_SESSION['check_acl']))
-			return 0;
-		
-		$result = 0;
-		$acl_column = get_acl_column($access);
-		foreach ($_SESSION['check_acl'] as $row) {
-			// For each profile for this pair of group and user do...
-			if (isset($row[$acl_column])) {
-				$result += $row[$acl_column];
-			}
-		}
-		
-		if ($result >= 1) {
-			return 1;
-		}
-		
-		return 0;
-	}
-	
 	$parents_id = array($id_group);
 	if ($id_group != 0 && $onlyOneGroup !== true) {
 		$group = db_get_row_filter('tgrupo', array('id_grupo' => $id_group));
@@ -1864,13 +1844,8 @@ function check_acl($id_user, $id_group, $access, $onlyOneGroup = false) {
 				OR tusuario_perfil.id_grupo = 0)", $id_user, implode(', ', $parents_id));
 	}
 	
-	
-	
-	
 	$rowdup = db_get_all_rows_sql ($query);
 	
-	$_SESSION['check_acl'] = $rowdup;
-	
 	if (empty ($rowdup))
 		return 0;
 	

From cc40fcccc29a43cb14ce80d53948dd8b60dcefdd Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 29 Jul 2017 00:01:14 +0200
Subject: [PATCH 060/157] 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 34b9a6c8c6..f9166bc5f6 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.708-170728
+Version: 7.0NG.708-170729
 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 3c966af5cf..9d0a40d5c8 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.708-170728"
+pandora_version="7.0NG.708-170729"
 
 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 ab53784cf9..24f2003357 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.708';
-use constant AGENT_BUILD => '170728';
+use constant AGENT_BUILD => '170729';
 
 # 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 3dba4fdd04..e146c9ee65 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.708
-%define release     170728
+%define release     170729
 
 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 2eeae4c183..4efc1a8d37 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.708
-%define release     170728
+%define release     170729
 
 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 2aa06d73ec..136375b57b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170728"
+PI_BUILD="170729"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 7791ee6337..fa8342d95c 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170728}
+{170729}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index bc5b0fbfee..0cbe9082d2 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.708(Build 170728)")
+#define PANDORA_VERSION ("7.0NG.708(Build 170729)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 0ed14aaa07..fafed8bb33 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.708(Build 170728))"
+      VALUE "ProductVersion", "(7.0NG.708(Build 170729))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 80dd9486d9..eac81ea28d 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.708-170728
+Version: 7.0NG.708-170729
 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 d5b24dfee2..089eefa56c 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.708-170728"
+pandora_version="7.0NG.708-170729"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index fb9580d3d6..25e260839f 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 = 'PC170728';
+$build_version = 'PC170729';
 $pandora_version = 'v7.0NG.708';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 172f12af8e..e46cf19599 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.708';
-$build = '170728';
+$build = '170729';
 			$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 63320b0ab5..4a1c101d2d 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.708
-%define release     170728
+%define release     170729
 
 # 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 03a5c23754..9ac601362f 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.708
-%define release     170728
+%define release     170729
 %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 9645ed17ca..7c4f91c1c0 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.708-170728
+Version: 7.0NG.708-170729
 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 f92422d948..a2941c1f58 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.708-170728"
+pandora_version="7.0NG.708-170729"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 73efa0d513..b6a762ea65 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.708";
-my $pandora_build = "170728";
+my $pandora_build = "170729";
 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 0233afe93c..c6d189bc0e 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.708
-%define release     170728
+%define release     170729
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 5e7d97b8b1..d1a91aeb81 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.708
-%define release     170728
+%define release     170729
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index e8029caecb..4d4275e3ee 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170728"
+PI_BUILD="170729"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 9b1eadf84f..259a59b2de 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.708 PS170728";
+my $version = "7.0NG.708 PS170729";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a9a8c08ba9..46bc3e37b9 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.708 PS170728";
+my $version = "7.0NG.708 PS170729";
 
 # save program name for logging
 my $progname = basename($0);

From 50c4419ef715449de94271da1ee638abf223d75e Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 30 Jul 2017 00:01:13 +0200
Subject: [PATCH 061/157] 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 f9166bc5f6..68dbe54253 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.708-170729
+Version: 7.0NG.708-170730
 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 9d0a40d5c8..80f2028fc9 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.708-170729"
+pandora_version="7.0NG.708-170730"
 
 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 24f2003357..259ef73bb6 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.708';
-use constant AGENT_BUILD => '170729';
+use constant AGENT_BUILD => '170730';
 
 # 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 e146c9ee65..943d59dc47 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.708
-%define release     170729
+%define release     170730
 
 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 4efc1a8d37..2992ab2451 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.708
-%define release     170729
+%define release     170730
 
 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 136375b57b..28efe3b8db 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170729"
+PI_BUILD="170730"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index fa8342d95c..d2b6f760b1 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170729}
+{170730}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 0cbe9082d2..50b7c855da 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.708(Build 170729)")
+#define PANDORA_VERSION ("7.0NG.708(Build 170730)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index fafed8bb33..189d198757 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.708(Build 170729))"
+      VALUE "ProductVersion", "(7.0NG.708(Build 170730))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index eac81ea28d..f45a8d8e73 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.708-170729
+Version: 7.0NG.708-170730
 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 089eefa56c..3a626ec472 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.708-170729"
+pandora_version="7.0NG.708-170730"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 25e260839f..4bb5bab509 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 = 'PC170729';
+$build_version = 'PC170730';
 $pandora_version = 'v7.0NG.708';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index e46cf19599..72ed078e2b 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.708';
-$build = '170729';
+$build = '170730';
 			$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 4a1c101d2d..41bcf9dbe7 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.708
-%define release     170729
+%define release     170730
 
 # 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 9ac601362f..7c1eb28718 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.708
-%define release     170729
+%define release     170730
 %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 7c4f91c1c0..59c83cfff6 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.708-170729
+Version: 7.0NG.708-170730
 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 a2941c1f58..c23ce41ba4 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.708-170729"
+pandora_version="7.0NG.708-170730"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index b6a762ea65..ff9a115e96 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.708";
-my $pandora_build = "170729";
+my $pandora_build = "170730";
 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 c6d189bc0e..5b1c901f92 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.708
-%define release     170729
+%define release     170730
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index d1a91aeb81..37b2db73ca 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.708
-%define release     170729
+%define release     170730
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 4d4275e3ee..d32ab1a1f1 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170729"
+PI_BUILD="170730"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 259a59b2de..e98860e472 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.708 PS170729";
+my $version = "7.0NG.708 PS170730";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 46bc3e37b9..19b76d046d 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.708 PS170729";
+my $version = "7.0NG.708 PS170730";
 
 # save program name for logging
 my $progname = basename($0);

From 6a4a199c96c3984f2f653540a342611fbacb4296 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 31 Jul 2017 00:01:13 +0200
Subject: [PATCH 062/157] 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 68dbe54253..434367f3b6 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.708-170730
+Version: 7.0NG.708-170731
 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 80f2028fc9..2a67fd2711 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.708-170730"
+pandora_version="7.0NG.708-170731"
 
 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 259ef73bb6..8bcc90f5e3 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.708';
-use constant AGENT_BUILD => '170730';
+use constant AGENT_BUILD => '170731';
 
 # 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 943d59dc47..48f6dde6eb 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.708
-%define release     170730
+%define release     170731
 
 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 2992ab2451..d8597e913e 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.708
-%define release     170730
+%define release     170731
 
 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 28efe3b8db..4e4d22a7b3 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170730"
+PI_BUILD="170731"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index d2b6f760b1..d6214005d5 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170730}
+{170731}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 50b7c855da..d40c5948ee 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.708(Build 170730)")
+#define PANDORA_VERSION ("7.0NG.708(Build 170731)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 189d198757..a9ca9803f9 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.708(Build 170730))"
+      VALUE "ProductVersion", "(7.0NG.708(Build 170731))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index f45a8d8e73..02e8d51d28 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.708-170730
+Version: 7.0NG.708-170731
 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 3a626ec472..a621e33e70 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.708-170730"
+pandora_version="7.0NG.708-170731"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 4bb5bab509..6dc707a26b 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 = 'PC170730';
+$build_version = 'PC170731';
 $pandora_version = 'v7.0NG.708';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 72ed078e2b..cf90ea8dc3 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.708';
-$build = '170730';
+$build = '170731';
 			$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 41bcf9dbe7..80a357f97b 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.708
-%define release     170730
+%define release     170731
 
 # 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 7c1eb28718..1509ac1a73 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.708
-%define release     170730
+%define release     170731
 %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 59c83cfff6..7030e5035f 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.708-170730
+Version: 7.0NG.708-170731
 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 c23ce41ba4..43c5f0ad76 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.708-170730"
+pandora_version="7.0NG.708-170731"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index ff9a115e96..21a03fa7bb 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.708";
-my $pandora_build = "170730";
+my $pandora_build = "170731";
 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 5b1c901f92..29b8f6e869 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.708
-%define release     170730
+%define release     170731
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 37b2db73ca..6f137aba80 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.708
-%define release     170730
+%define release     170731
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index d32ab1a1f1..b02011cec7 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170730"
+PI_BUILD="170731"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e98860e472..bd44f97c1b 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.708 PS170730";
+my $version = "7.0NG.708 PS170731";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 19b76d046d..385686ad55 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.708 PS170730";
+my $version = "7.0NG.708 PS170731";
 
 # save program name for logging
 my $progname = basename($0);

From 4ce9a96b749799ec4b4cb84e3d61ffde6b737517 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 31 Jul 2017 12:50:50 +0200
Subject: [PATCH 063/157] Fixed last timestamp in interface charts

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

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index f834faf483..fa24976438 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1092,25 +1092,25 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 	
 	// Set the title and time format
 	if ($temp_range <= SECONDS_1DAY) {
-		$time_format = 'd.m.Y H:i:s';
+		$time_format = 'Y M d H:i:s';
 	}
 	elseif ($temp_range < SECONDS_15DAYS) {
-		$time_format = 'M d';
+		$time_format = 'Y M d';
 		$time_format_2 = 'H:i';
 		if ($projection != false) {
 			$time_format_2 = 'H\h';
 		}
 	}
 	elseif ($temp_range <= SECONDS_1MONTH) {
-		$time_format = 'M d';
+		$time_format = 'Y M d';
 		$time_format_2 = 'H\h';
 	}
 	elseif ($temp_range <= SECONDS_1MONTH) {
-		$time_format = 'M d';
+		$time_format = 'Y M d';
 		$time_format_2 = 'H\h';
-	} 
+	}
 	elseif ($period < SECONDS_6MONTHS) {
-		$time_format = 'M d';
+		$time_format = 'Y M d';
 		$time_format_2 = 'H\h';
 	}
 	else {
@@ -1382,7 +1382,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 		
 		// Calculate chart data
 		$last_known = $previous_data;
-		for ($l = 0; $l < $resolution; $l++) {
+
+		for ($l = 0; $l <= $resolution; $l++) {
 			$countAvg ++;
 			
 			$timestamp = $datelimit + ($interval * $l);
@@ -1398,6 +1399,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 			// Read data that falls in the current interval
 			$interval_min = $last_known;
 			$interval_max = $last_known;
+			
 			while (isset ($data[$j]) && $data[$j]['utimestamp'] >= $timestamp && $data[$j]['utimestamp'] < ($timestamp + $interval)) {
 				if ($data[$j]['datos'] > $interval_max) {
 					$interval_max = $data[$j]['datos'];

From d298ba4d40c7b83b7303aeba58166f5a82f5f7ab Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 31 Jul 2017 14:55:38 +0200
Subject: [PATCH 064/157] Center texts

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

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 3dd229ff17..1869e8cb39 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -110,13 +110,11 @@ function visual_map_print_item($mode = "read", $layoutData,
 	$border_color = $layoutData['border_color'];
 	$fill_color = $layoutData['fill_color'];
 	$label_position = $layoutData['label_position'];
-		
+
 	$sizeStyle = '';
 	$borderStyle = '';
 	$imageSize = '';
-	
-	
-	
+
 	if (!empty($proportion)) {
 		$top = $top * $proportion['proportion_height'];
 		$left = $left * $proportion['proportion_width'];
@@ -202,7 +200,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 		$text = '<table style="float:right;height:'.$himg.'px;"><tr><td></td></tr><tr><td><span style="" id="text_' . $id . '" class="text">' . $label .'</span></td></tr><tr><td></td></tr></table>';
 	}
 	else {
-		$text = '<table style="width:'.$wimg.'px;"><tr><td></td></tr><tr><td><span style="" id="text_' . $id . '" class="text">' . $label .'</span></td></tr><tr><td></td></tr></table>';
+		$text = '<table style="text-align:center ;width:'.$wimg.'px;"><tr><td></td></tr><tr><td><span style="" id="text_' . $id . '" class="text">' . $label .'</span></td></tr><tr><td></td></tr></table>';
 	}
 	
 	

From 7e508a4137742cd1ab02a04ef9780857beef749f Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 1 Aug 2017 00:01:14 +0200
Subject: [PATCH 065/157] 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 434367f3b6..554958e8fd 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.708-170731
+Version: 7.0NG.708-170801
 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 2a67fd2711..bfa29742e9 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.708-170731"
+pandora_version="7.0NG.708-170801"
 
 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 8bcc90f5e3..c3c4299d11 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.708';
-use constant AGENT_BUILD => '170731';
+use constant AGENT_BUILD => '170801';
 
 # 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 48f6dde6eb..ef73ff7c4d 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.708
-%define release     170731
+%define release     170801
 
 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 d8597e913e..ee64e007d3 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.708
-%define release     170731
+%define release     170801
 
 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 4e4d22a7b3..f23a1b182b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170731"
+PI_BUILD="170801"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index d6214005d5..3d83d2b987 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170731}
+{170801}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index d40c5948ee..1b72993838 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.708(Build 170731)")
+#define PANDORA_VERSION ("7.0NG.708(Build 170801)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index a9ca9803f9..a9ca9c87d4 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.708(Build 170731))"
+      VALUE "ProductVersion", "(7.0NG.708(Build 170801))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 02e8d51d28..97e7ffa1cd 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.708-170731
+Version: 7.0NG.708-170801
 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 a621e33e70..d445a41099 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.708-170731"
+pandora_version="7.0NG.708-170801"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 6dc707a26b..508b99818b 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 = 'PC170731';
+$build_version = 'PC170801';
 $pandora_version = 'v7.0NG.708';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index cf90ea8dc3..0fa2b96fbe 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.708';
-$build = '170731';
+$build = '170801';
 			$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 80a357f97b..7a7f8ab596 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.708
-%define release     170731
+%define release     170801
 
 # 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 1509ac1a73..ec559093ac 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.708
-%define release     170731
+%define release     170801
 %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 7030e5035f..f1617ceacb 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.708-170731
+Version: 7.0NG.708-170801
 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 43c5f0ad76..bb82b57b14 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.708-170731"
+pandora_version="7.0NG.708-170801"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 21a03fa7bb..0241bc8926 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.708";
-my $pandora_build = "170731";
+my $pandora_build = "170801";
 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 29b8f6e869..98704ac696 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.708
-%define release     170731
+%define release     170801
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6f137aba80..6735a26283 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.708
-%define release     170731
+%define release     170801
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index b02011cec7..2314027c9d 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170731"
+PI_BUILD="170801"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index bd44f97c1b..ace01108c1 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.708 PS170731";
+my $version = "7.0NG.708 PS170801";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 385686ad55..290426154c 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.708 PS170731";
+my $version = "7.0NG.708 PS170801";
 
 # save program name for logging
 my $progname = basename($0);

From dd5cb8088c82fa27c8fa3f96e63e5eff4f20e62e Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 1 Aug 2017 10:39:02 +0200
Subject: [PATCH 066/157] added service functions in the API

---
 pandora_console/include/functions_api.php | 251 ++++++++++++++++++++++
 1 file changed, 251 insertions(+)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 55828d1d94..bba8cb1cc3 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -9556,6 +9556,257 @@ function api_set_create_special_day($thrash1, $thrash2, $other, $thrash3) {
 	}
 }
 
+/**
+ * Create a service and return service id.
+ *
+ * @param $thrash1 Don't use.
+ * @param $thrash2 Don't use.
+ * @param array $other it's array, $other as param is <description>;<id_group>;<critical>; 
+ * <warning>;<id_agent>;<sla_interval>;<sla_limit>;<id_warning_module_template_alert>;
+ * <id_critical_module_template_alert>;<id_critical_module_sla_template_alert>;	
+ * in this order and separator char (after text ; ) and separator 
+ * (pass in param othermode as othermode=url_encode_separator_<separator>)
+ * @param $thrash3 Don't use
+ *
+ * example:
+ * http://127.0.0.1/pandora_console/include/api.php?op=set&op2=create_service&return_type=json
+ * &other=test1%7CDescripcion de prueba%7C12%7C1%7C0.5%7C1&other_mode=url_encode_separator_%7C&apipass=1234&user=admin&pass=pandora
+ */
+function api_set_create_service($thrash1, $thrash2, $other, $thrash3) {
+	
+	$name = $other['data'][0];
+	$description = $other['data'][1];
+	$id_group = $other['data'][2];
+	$critical = $other['data'][3];
+	$warning = $other['data'][4];
+	$mode = 0;
+	$id_agent = $other['data'][5];
+	$sla_interval = $other['data'][6];
+	$sla_limit = $other['data'][7];
+	$id_warning_module_template = $other['data'][8];
+	$id_critical_module_template = $other['data'][9];
+	$id_unknown_module_template = 0;
+	$id_critical_module_sla = $other['data'][10];
+	
+	if(empty($name)){
+		returnError('error_create_service', __('Error in creation service. No name'));
+		return;
+	}
+	if(empty($id_group)){
+		// By default applications
+		$id_group = 12;
+	}
+	if(empty($critical)){
+		$critical = 1;
+	}
+	if(empty($warning)){
+		$warning = 0.5;
+	}
+	if(empty($id_agent)){
+		returnError('error_create_service', __('Error in creation service. No agent id'));
+		return;
+	}
+	if(empty($sla_interval)){
+		// By default one month
+		$sla_interval = 2592000;
+	}
+	if(empty($sla_limit)){
+		$sla_limit = 95;
+	}
+	if(empty($id_warning_module_template)){
+		$id_warning_module_template = 0;
+	}
+	if(empty($id_critical_module_template)){
+		$id_critical_module_template = 0;
+	}
+	if(empty($id_critical_module_sla)){
+		$id_critical_module_sla = 0;
+	}
+	
+	$result = services_create_service ($name, $description, $id_group,
+		$critical, $warning, SECONDS_5MINUTES, $mode, $id_agent, $sla_interval, $sla_limit,
+		$id_warning_module_template, $id_critical_module_template,
+		$id_unknown_module_template, $id_critical_module_sla);
+		
+	if($result){
+		returnData('string', array('type' => 'string', 'data' => $result));
+	} else {
+		returnError('error_create_service', __('Error in creation service'));
+	}
+}
+
+/**
+ * Update a service.
+ *
+ * @param $thrash1 service id.
+ * @param $thrash2 Don't use.
+ * @param array $other it's array, $other as param is <name>;<description>;<id_group>;<critical>; 
+ * <warning>;<id_agent>;<sla_interval>;<sla_limit>;<id_warning_module_template_alert>;
+ * <id_critical_module_template_alert>;<id_critical_module_sla_template_alert>;	
+ * in this order and separator char (after text ; ) and separator 
+ * (pass in param othermode as othermode=url_encode_separator_<separator>)
+ * @param $thrash3 Don't use
+ *
+ * example:
+ * http://172.17.0.1/pandora_console/include/api.php?op=set&op2=update_service&return_type=json
+ * &id=4&other=test2%7CDescripcion%7C%7C%7C0.6%7C&other_mode=url_encode_separator_%7C&apipass=1234&user=admin&pass=pandora
+ *
+ */
+function api_set_update_service($thrash1, $thrash2, $other, $thrash3) {
+	
+	$id_service = $thrash1;
+	if(empty($id_service)){
+		returnError('error_update_service', __('Error in update service. No service id'));
+		return;
+	}
+	
+	$service = db_get_row('tservice',
+		'id', $id_service);
+	
+	$name = $other['data'][0];
+	if(empty($name)){
+		$name = $service['name'];
+	}
+	$description = $other['data'][1];
+	if(empty($description)){
+		$description = $service['description'];
+	}
+	$id_group = $other['data'][2];
+	if(empty($id_group)){
+		$id_group = $service['id_group'];
+	}
+	$critical = $other['data'][3];
+	if(empty($critical)){
+		$critical = $service['critical'];
+	}
+	$warning = $other['data'][4];
+	if(empty($warning)){
+		$warning = $service['warning'];
+	}
+	
+	$mode = 0;
+	
+	$id_agent = $other['data'][5];
+	if(empty($id_agent)){
+		$id_agent = $service['id_agent_module'];
+	}
+	$sla_interval = $other['data'][6];
+	if(empty($sla_interval)){
+		$sla_interval = $service['sla_interval'];
+	}
+	$sla_limit = $other['data'][7];
+	if(empty($sla_limit)){
+		$sla_limit = $service['sla_limit'];
+	}
+	$id_warning_module_template = $other['data'][8];
+	if(empty($id_warning_module_template)){
+		$id_warning_module_template = $service['id_template_alert_warning'];
+	}
+	$id_critical_module_template = $other['data'][9];
+	if(empty($id_critical_module_template)){
+		$id_critical_module_template = $service['id_template_alert_critical'];
+	}
+	
+	$id_unknown_module_template = 0;
+	
+	$id_critical_module_sla = $other['data'][10];
+	if(empty($id_critical_module_sla)){
+		$id_critical_module_sla = $service['id_template_alert_critical_sla'];
+	}
+	
+	$result = services_update_service ($id_service, $name,$description, $id_group, $critical, $warning,
+		SECONDS_5MINUTES, $mode, $id_agent,$sla_interval, $sla_limit,$id_warning_module_template,
+		$id_critical_module_template,$id_unknown_module_template,$id_critical_module_sla);
+	
+	
+	if($result){
+		returnData('string', array('type' => 'string', 'data' => $result));
+	} else {
+		returnError('error_update_service', __('Error in update service'));
+	}
+	
+}
+
+/**
+ * Add elements to service.
+ *
+ * @param $thrash1 service id.
+ * @param $thrash2 Don't use.
+ * @param array $other it's a json, $other as param is <description>;<id_group>;<critical>; 
+ * <warning>;<id_agent>;<sla_interval>;<sla_limit>;<id_warning_module_template_alert>;
+ * <id_critical_module_template_alert>;<id_critical_module_sla_template_alert>;	
+ * in this order and separator char (after text ; ) and separator 
+ * (pass in param othermode as othermode=url_encode_separator_<separator>)
+ * @param $thrash3 Don't use
+ *
+ * example:
+ * http://172.17.0.1/pandora_console/include/api.php?op=set&op2=add_element_service&return_type=json&id=1
+ * &other=W3sidHlwZSI6ImFnZW50IiwiaWQiOjIsImRlc2NyaXB0aW9uIjoiamlqaWppIiwid2VpZ2h0X2NyaXRpY2FsIjowLCJ3ZWlnaHRfd2FybmluZyI6MCwid2VpZ2h0X3Vua25vd24iOjAsIndlaWdodF9vayI6MH0seyJ0eXBlIjoibW9kdWxlIiwiaWQiOjEsImRlc2NyaXB0aW9uIjoiSG9sYSBxdWUgdGFsIiwid2VpZ2h0X2NyaXRpY2FsIjowLCJ3ZWlnaHRfd2FybmluZyI6MCwid2VpZ2h0X3Vua25vd24iOjAsIndlaWdodF9vayI6MH0seyJ0eXBlIjoic2VydmljZSIsImlkIjozLCJkZXNjcmlwdGlvbiI6ImplamVqZWplIiwid2VpZ2h0X2NyaXRpY2FsIjowLCJ3ZWlnaHRfd2FybmluZyI6MCwid2VpZ2h0X3Vua25vd24iOjAsIndlaWdodF9vayI6MH1d
+ * &other_mode=url_encode_separator_%7C&apipass=1234&user=admin&pass=pandora
+ *
+ */
+function api_set_add_element_service($thrash1, $thrash2, $other, $thrash3) {
+	
+	$id = $thrash1;
+	
+	if(empty($id)){
+		returnError('error_add_service_element', __('Error adding elements to service. No service id'));
+		return;
+	}
+	
+	$array_json = json_decode(base64_decode(io_safe_output($other['data'][0])), true);
+	if(!empty($array_json)){
+		$results = false;
+		foreach ($array_json as $key => $element) {
+			if($element['id'] == 0){
+				continue;
+			}
+			switch ($element['type']) {
+				case 'agent':
+					$id_agente_modulo = 0;
+					$id_service_child = 0;
+					$agent_id = $element['id'];
+					break;
+				
+				case 'module':
+					$agent_id = 0;
+					$id_service_child = 0;
+					$id_agente_modulo = $element['id'];
+					break;
+					
+				case 'service':
+					$agent_id = 0;
+					$id_agente_modulo = 0;
+					$id_service_child = $element['id'];
+					break;
+			}
+			
+			$values = array(
+				'id_agente_modulo' => $id_agente_modulo,
+				'description' => $element['description'],
+				'id_service' => $id,
+				'weight_critical' => $element['weight_critical'],
+				'weight_warning' => $element['weight_warning'],
+				'weight_unknown' => $element['weight_unknown'],
+				'weight_ok' => $element['weight_ok'],
+				'id_agent' => $agent_id,
+				'id_service_child' => $id_service_child,
+				'id_server_meta' => 0);
+			
+			$result = db_process_sql_insert('tservice_element',$values);
+			if($result && !$results){
+				$results = $result;
+			}
+		}
+	}
+		
+	if($results){
+		returnData('string', array('type' => 'string', 'data' => 1));
+	} else {
+		returnError('error_add_service_element', __('Error adding elements to service'));
+	}
+	
+}
 /**
  * Update a special day. And return a message with the result of the operation.
  *

From c363a2e0859ff9a6b85c12761aba0ba4a4d66cdc Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 2 Aug 2017 00:01:14 +0200
Subject: [PATCH 067/157] 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 554958e8fd..bd80aaaf37 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.708-170801
+Version: 7.0NG.708-170802
 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 bfa29742e9..cf24cc22c3 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.708-170801"
+pandora_version="7.0NG.708-170802"
 
 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 c3c4299d11..8f74943345 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.708';
-use constant AGENT_BUILD => '170801';
+use constant AGENT_BUILD => '170802';
 
 # 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 ef73ff7c4d..3c3540dda4 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.708
-%define release     170801
+%define release     170802
 
 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 ee64e007d3..20c2dd5f2d 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.708
-%define release     170801
+%define release     170802
 
 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 f23a1b182b..b8d24050cd 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170801"
+PI_BUILD="170802"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 3d83d2b987..4020d83223 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170801}
+{170802}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 1b72993838..03a3a57fcf 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.708(Build 170801)")
+#define PANDORA_VERSION ("7.0NG.708(Build 170802)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index a9ca9c87d4..baef56c360 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.708(Build 170801))"
+      VALUE "ProductVersion", "(7.0NG.708(Build 170802))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 97e7ffa1cd..fab0a96f79 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.708-170801
+Version: 7.0NG.708-170802
 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 d445a41099..c539466823 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.708-170801"
+pandora_version="7.0NG.708-170802"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 508b99818b..22e767639d 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 = 'PC170801';
+$build_version = 'PC170802';
 $pandora_version = 'v7.0NG.708';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 0fa2b96fbe..9308a75d27 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.708';
-$build = '170801';
+$build = '170802';
 			$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 7a7f8ab596..8a1f2b9b17 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.708
-%define release     170801
+%define release     170802
 
 # 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 ec559093ac..336a45028d 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.708
-%define release     170801
+%define release     170802
 %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 f1617ceacb..bf38e9d2f5 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.708-170801
+Version: 7.0NG.708-170802
 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 bb82b57b14..0527682ecc 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.708-170801"
+pandora_version="7.0NG.708-170802"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 0241bc8926..90908b2614 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.708";
-my $pandora_build = "170801";
+my $pandora_build = "170802";
 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 98704ac696..8869036a6f 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.708
-%define release     170801
+%define release     170802
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6735a26283..197e8088d8 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.708
-%define release     170801
+%define release     170802
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 2314027c9d..7dbdefb4c0 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.708"
-PI_BUILD="170801"
+PI_BUILD="170802"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index ace01108c1..1a6cf58c28 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.708 PS170801";
+my $version = "7.0NG.708 PS170802";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 290426154c..2138af4071 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.708 PS170801";
+my $version = "7.0NG.708 PS170802";
 
 # save program name for logging
 my $progname = basename($0);

From 76c951183cb1f6f5e90bc2932f87667acdbb7a22 Mon Sep 17 00:00:00 2001
From: Hirofumi Kosaka <kosaka@rworks.jp>
Date: Wed, 2 Aug 2017 15:41:44 +0900
Subject: [PATCH 068/157] [bug fix] deleting a module had caused unextected
 alert deletion. #156

---
 pandora_console/godmode/agentes/configurar_agente.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 5305588aa7..613cf8ef29 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1527,7 +1527,8 @@ if ($delete_module) { // DELETE agent module !
 	if ($result === false)
 		$error++;
 	
-	if (alerts_delete_alert_agent_module($id_borrar_modulo) === false)
+	if (alerts_delete_alert_agent_module(false, 
+			array('id_agente_module' => $id_borrar_modulo)) === false)
 		$error++;
 	
 	$result = db_process_delete_temp('ttag_module', 'id_agente_modulo',

From 408efec325e7407e14e085915030c5effa7663e5 Mon Sep 17 00:00:00 2001
From: artica <git@artica.es>
Date: Wed, 2 Aug 2017 10:12:45 +0200
Subject: [PATCH 069/157] 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 4ec24dd4fc..77d34249b3 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.708, AIX version
+# Version 7.0NG.709, 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 5b84348657..f33e609eeb 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.708, FreeBSD Version
+# Version 7.0NG.709, 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 67368fc92d..e17adcc4c3 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.708, HP-UX Version
+# Version 7.0NG.709, 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 67cedc9d0a..a5ba94c7ee 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.708, GNU/Linux
+# Version 7.0NG.709, 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 1922741fd4..77e78b23f2 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.708, GNU/Linux
+# Version 7.0NG.709, 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 b9314d2a5a..8ee5d38f40 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.708, Solaris Version
+# Version 7.0NG.709, 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 90d17489d0..2ebef28d78 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.708
+# Version 7.0NG.709
 
 # 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 d624a8d66d..987de91b06 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.708, AIX version
+# Version 7.0NG.709, 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 9edc972282..712756d13c 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.708
+# Version 7.0NG.709
 # 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 f77b766dab..7113ea627b 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.708, HPUX Version
+# Version 7.0NG.709, HPUX Version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index d37678b502..b35313bcc4 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.708
+# Version 7.0NG.709
 # 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 da67ed5470..609632ea33 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.708
+# Version 7.0NG.709
 # 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 d8a9d19ee3..00abe55972 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.708
+# Version 7.0NG.709
 # 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 1b4a021236..abbb8bd535 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.708, Solaris version
+# Version 7.0NG.709, Solaris version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index dfdc519a04..914716f866 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.708, AIX version
+# Version 7.0NG.709, 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 bd80aaaf37..22a9e6e40d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.708-170802
+Version: 7.0NG.709
 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 cf24cc22c3..6ed7ccd692 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.708-170802"
+pandora_version="7.0NG.709"
 
 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 81ce878b4e..a1d986c5c3 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.708, GNU/Linux
+# Version 7.0NG.709, 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 535a637421..bbfe88e1fa 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.708, FreeBSD Version
+# Version 7.0NG.709, 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 962d1a4047..50ccf8fe55 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.708, HP-UX Version
+# Version 7.0NG.709, 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 efaa9ac0bc..af2bd05ab3 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.708, GNU/Linux
+# Version 7.0NG.709, 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 8a153581e2..4b97428ffe 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.708, GNU/Linux
+# Version 7.0NG.709, 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 8cb4f47058..63bddc1d66 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.708, NetBSD Version
+# Version 7.0NG.709, 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 290d3614a3..24902ea131 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.708, Solaris Version
+# Version 7.0NG.709, 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 8f74943345..ae6591c102 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.708';
+use constant AGENT_VERSION => '7.0NG.709';
 use constant AGENT_BUILD => '170802';
 
 # 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 3c3540dda4..c5fe50025b 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.708
-%define release     170802
+%define version     7.0NG.709
+%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 20c2dd5f2d..f210593a2f 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.708
-%define release     170802
+%define version     7.0NG.709
+%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 b8d24050cd..728a6f1468 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.708"
+PI_VERSION="7.0NG.709"
 PI_BUILD="170802"
 OS_NAME=`uname -s`
 
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 288e42e3a7..ca2b3526f4 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.708
+# Version 7.0NG.709
 
 # 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 4020d83223..585366329c 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.708}
+{Pandora FMS Windows Agent v7.0NG.709}
 
 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 03a3a57fcf..53af786a6b 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.708(Build 170802)")
+#define PANDORA_VERSION ("7.0NG.709(Build 170802)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index baef56c360..d880ee6440 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.708(Build 170802))"
+      VALUE "ProductVersion", "(7.0NG.709(Build 170802))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index fab0a96f79..c9fed88159 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.708-170802
+Version: 7.0NG.709
 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 c539466823..ef38b9072c 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.708-170802"
+pandora_version="7.0NG.709"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 22e767639d..90d044ea7b 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 = 'PC170802';
-$pandora_version = 'v7.0NG.708';
+$pandora_version = 'v7.0NG.709';
 
 // 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 9308a75d27..01a2fd2050 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -70,7 +70,7 @@
 	<body>
 		<div style='height: 10px'>
 			<?php
-$version = '7.0NG.708';
+$version = '7.0NG.709';
 $build = '170802';
 			$banner = "v$version Build $build";
 			
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 8a1f2b9b17..116607b01a 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.708
-%define release     170802
+%define version     7.0NG.709
+%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 336a45028d..d9942c0ee4 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.708
-%define release     170802
+%define version     7.0NG.709
+%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 39fa2a39de..07d8861f92 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.708"
+PI_VERSION="7.0NG.709"
 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 3afdd8a8e7..c36186aff9 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -112,7 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('MR', 4),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
-('current_package_enterprise', '708'),
+('current_package_enterprise', '709'),
 ('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 bf38e9d2f5..05106f33c6 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.708-170802
+Version: 7.0NG.709
 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 0527682ecc..1f280b70f9 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.708-170802"
+pandora_version="7.0NG.709"
 
 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 6d2e757f1a..1ffe5739f0 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.708
+# Version 7.0NG.709
 # 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 90908b2614..50d482fc62 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.708";
+my $pandora_version = "7.0NG.709";
 my $pandora_build = "170802";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 8869036a6f..18cc7dee85 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.708
-%define release     170802
+%define version     7.0NG.709
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 197e8088d8..a21503f9fc 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.708
-%define release     170802
+%define version     7.0NG.709
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7dbdefb4c0..cf89b458e0 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.708"
+PI_VERSION="7.0NG.709"
 PI_BUILD="170802"
 
 MODE=$1
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1a6cf58c28..005be0ba91 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.708 PS170802";
+my $version = "7.0NG.709 PS170802";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 2138af4071..78f8e7b6b0 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.708 PS170802";
+my $version = "7.0NG.709 PS170802";
 
 # save program name for logging
 my $progname = basename($0);

From 6e45b3cd9e4ac794116c5b5de18a2044e606eda2 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 2 Aug 2017 11:48:37 +0200
Subject: [PATCH 070/157] add threshold graph send for mail

---
 pandora_console/include/functions_api.php     |  58 ++--
 .../include/graphs/functions_pchart.php       | 278 ++++++++++++++++--
 pandora_server/lib/PandoraFMS/Core.pm         |  14 +-
 3 files changed, 292 insertions(+), 58 deletions(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index bba8cb1cc3..5ecac3a944 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -9941,7 +9941,14 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
 		$other['data'][0]
 		:
 		SECONDS_1HOUR; // 1 hour by default
-	
+
+	$graph_threshold =
+		(!empty($other) && isset($other['data'][2]))
+		?
+		$other['data'][2]
+		:
+		0;
+
 	if (is_nan($graph_seconds) || $graph_seconds <= 0) {
 		// returnError('error_module_graph', __(''));
 		return;
@@ -9952,41 +9959,44 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
 		$id_module, $graph_seconds, false, 600, 300, '',
 		'', false, false, true, time(), '', 0, 0, true, true,
 		ui_get_full_url(false) . '/', 1, false, '', false, true,
-		true, 'white', null, false, false, $config['type_module_charts']);
+		true, 'white', null, false, false, $config['type_module_charts'], 
+		false, false);
 		
-       $graph_image_file_encoded = false;
+        $graph_image_file_encoded = false;
         if (preg_match("/<img src='(.+)'./", $graph_html, $matches)) {
                 $file_url = $matches[1];
 
-                if (preg_match("/\?(.+)&(.+)&(.+)&(.+)/", $file_url,$parameters)) {
-                        array_shift ($parameters);
-                        foreach ($parameters as $parameter){
-                                $value = explode ("=",$parameter);
+            if (preg_match("/\?(.+)&(.+)&(.+)&(.+)/", $file_url,$parameters)) {
+                    array_shift ($parameters);
+                foreach ($parameters as $parameter){
+                        $value = explode ("=",$parameter);
 
-                                if (strcmp($value[0], "static_graph") == 0){
-                                        $static_graph = $value[1];
-                                }
-                                elseif (strcmp($value[0], "graph_type") == 0){
-                                        $graph_type = $value[1];
-                                }
-                                elseif (strcmp($value[0], "ttl") == 0){
-                                        $ttl = $value[1];
-                                }
-                                elseif (strcmp($value[0], "id_graph") == 0){
-                                        $id_graph = $value[1];
-                                }
-                        }
+                    if (strcmp($value[0], "static_graph") == 0){
+                            $static_graph = $value[1];
+                    }
+                    elseif (strcmp($value[0], "graph_type") == 0){
+                            $graph_type = $value[1];
+                    }
+                    elseif (strcmp($value[0], "ttl") == 0){
+                            $ttl = $value[1];
+                    }
+                    elseif (strcmp($value[0], "id_graph") == 0){
+                            $id_graph = $value[1];
+                    }
                 }
+            }
         }
 
         // Check values are OK
         if ( (isset ($graph_type))
         && (isset ($ttl))
         && (isset ($id_graph))) {
-                        $_GET["ttl"] = $ttl;
-                        $_GET["id_graph"] = $id_graph;
-                        $_GET["graph_type"] = $graph_type;
-                        $_GET["static_graph"] = $static_graph;
+            $_GET["ttl"]             = $ttl;
+            $_GET["id_graph"]        = $id_graph;
+            $_GET["graph_type"]      = $graph_type;
+            $_GET["static_graph"]    = $static_graph;
+            $_GET["graph_threshold"] = $graph_threshold;
+            $_GET["id_module"]       = $id_module;
         }
 
         ob_start();
diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php
index bff1b328b0..4cf13ff7ce 100644
--- a/pandora_console/include/graphs/functions_pchart.php
+++ b/pandora_console/include/graphs/functions_pchart.php
@@ -54,6 +54,11 @@ $graph_type = get_parameter('graph_type', '');
 
 $id_graph = get_parameter('id_graph', false);
 
+$graph_threshold = get_parameter('graph_threshold', false);
+
+$id_module = get_parameter('id_module');
+
+
 if (!$id_graph) {
 	exit;
 }
@@ -383,7 +388,7 @@ switch ($graph_type) {
 		pch_vertical_graph($graph_type, $data_keys, $data_values, $width,
 			$height, $rgb_color, $xaxisname, $yaxisname, false, $legend,
 			$font, $antialiasing, $water_mark, $font_size,
-			$backgroundColor, $unit, $series_type);
+			$backgroundColor, $unit, $series_type, $graph_threshold, $id_module);
 		break;
 	case 'threshold':
 		pch_threshold_graph($graph_type, $data_keys, $data_values, $width,
@@ -769,7 +774,8 @@ function pch_bar_graph ($graph_type, $index, $data, $width, $height, $font,
 function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 	$rgb_color = false, $xaxisname = "", $yaxisname = "", $show_values = false,
 	$legend = array(), $font, $antialiasing, $water_mark = '', $font_size,
-	$backgroundColor = 'white', $unit = '', $series_type = array()) {
+	$backgroundColor = 'white', $unit = '', $series_type = array(), 
+	$graph_threshold = false, $id_module) {
 	
 	global $config;
 	
@@ -975,8 +981,7 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		($height - $margin_bottom));
 	
 	/*Get minimun value to draw axis properly*/
-	$min_data = min(min($data));
-	
+	$min_data = min($data['min']);
 	$ManualScale = array();
 	$mode = SCALE_MODE_START0;
 	if ($min_data < 0) {
@@ -988,32 +993,244 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		$mode = SCALE_MODE_MANUAL;
 	}
 	
-	/* Draw the scale */
-	$scaleSettings = array(
-		"GridR" => 200,
-		"GridG" => 200,
-		"GridB" => 200,
-		"GridAlpha" => 30,
-		"DrawSubTicks" => true,
-		"CycleBackground" => true,
-		"BackgroundAlpha1" => 35,
-		"BackgroundAlpha2" => 35,
-		"Mode" => $mode,
-		"ManualScale" => $ManualScale,
-		"LabelRotation" => 40, 
-		"XMargin" => 0, 
-		"MinDivHeight" => 15,
-		"TicksFontSize" => $font_size - 1);
-	
-	$scaleSettings['AxisR'] = '200';
-	$scaleSettings['AxisG'] = '200';
-	$scaleSettings['AxisB'] = '200';
-	$scaleSettings['TickR'] = '200';
-	$scaleSettings['TickG'] = '200';
-	$scaleSettings['TickB'] = '200';
-	
-	$myPicture->drawScale($scaleSettings);
-	
+	if($graph_threshold){
+		$sql_treshold = 'select min_critical, max_critical, min_warning, max_warning, critical_inverse, warning_inverse from tagente_modulo where id_agente_modulo =' . $id_module;
+		$treshold_position = db_get_all_rows_sql($sql_treshold);
+
+		//min, max and inverse critical and warning
+		$p_min_crit = $treshold_position[0]['min_critical'];
+		$p_max_crit = $treshold_position[0]['max_critical'];
+		$p_inv_crit = $treshold_position[0]['critical_inverse'];
+		$p_min_warn = $treshold_position[0]['min_warning'];
+		$p_max_warn = $treshold_position[0]['max_warning'];
+		$p_inv_warn = $treshold_position[0]['warning_inverse'];
+
+		//interval warning
+		$print_rectangle_warning = 1;
+		if($p_min_warn == "0.00" && $p_max_warn == "0.00" && $p_inv_warn == 0){
+			$print_rectangle_warning = 0;
+		}
+		if($print_rectangle_warning){
+			if($p_inv_warn){
+				if($p_max_warn == 0){
+					$p_max_warn = $p_min_warn;
+					$p_min_warn = "none";
+				}
+				else{
+					$p_max_warn_inv = $p_min_warn;
+					$p_min_warn_inv = $min_data + 2;
+
+					$p_min_warn = $p_max_warn;
+					if($p_max_warn > $max_data){
+						$p_max_warn = $p_max_warn + 21;	
+					}
+					else{
+						$p_max_warn = $max_data + 21;	
+					}
+				}
+			}
+			else{
+				if($p_max_warn == 0){
+					if($max_data > $p_min_warn){
+						$p_max_warn = $max_data + 21;
+					}
+					else{
+						$p_max_warn = $p_min_warn + 21;	
+					}
+				}
+			}
+		}
+
+		//interval critical
+		$print_rectangle_critical = 1;
+		if($p_min_crit == "0.00" && $p_max_crit == "0.00" && $p_inv_crit == 0){
+			$print_rectangle_critical = 0;
+		}
+
+		if($print_rectangle_critical){
+			if($p_inv_crit){
+				if($p_max_crit == 0){
+					$p_max_crit = $p_min_crit;
+					$p_min_crit = "none";
+				}
+				else{
+					$p_max_crit_inv = $p_min_crit;
+					$p_min_crit_inv = $min_data + 2;
+
+					$p_min_crit = $p_max_crit;
+					if($p_inv_warn){
+						if($p_max_crit < $p_max_warn){
+							$p_max_crit = $p_max_warn;	
+						}
+					}
+					else{
+						if($p_max_crit > $max_data){
+							$p_max_crit = $p_max_crit + 21;	
+						}
+						else{
+							$p_max_crit = $max_data + 21;	
+						}
+					}
+				}
+			}
+			else{
+				if($p_max_crit == 0){ 
+					if($p_max_warn > $p_min_crit){
+						$p_max_crit = $p_max_warn;
+					}
+					else{
+						if($max_data > $p_min_crit){
+							$p_max_crit = $max_data + 21;
+						}
+						else{
+							$p_max_crit = $p_min_crit + 21;	
+						}
+					} 
+				}
+			}
+		}
+
+		//Check size scale
+		//Which of the thresholds is higher?
+		if($p_max_crit > $p_max_warn){
+			$check_scale = $p_max_crit; 
+		}
+		else{
+			$check_scale = $p_max_warn;	
+		}
+
+		if($p_min_crit < $p_min_warn){
+			$check_scale_min = $p_min_crit; 
+		}
+		else{
+			$check_scale_min = $p_min_warn;	
+		}
+
+		//Is the threshold higher than our maximum?
+		if($max_data > $check_scale){
+			$check_scale = $max_data;	 
+		}
+		
+		if($min_data < $check_scale_min){
+			$check_scale_min = $min_data;
+		}
+
+		$ManualScale = array( 0 => array("Min" => $check_scale_min, "Max" => $check_scale) );
+		$mode = SCALE_MODE_MANUAL;
+
+		/* Draw the scale */
+		$scaleSettings = array(
+			"GridR" => 200,
+			"GridG" => 200,
+			"GridB" => 200,
+			"GridAlpha" => 30,
+			"DrawSubTicks" => true,
+			"CycleBackground" => true,
+			"BackgroundAlpha1" => 35,
+			"BackgroundAlpha2" => 35,
+			"Mode" => $mode,
+			"ManualScale" => $ManualScale,
+			"LabelRotation" => 40, 
+			"XMargin" => 0, 
+			"MinDivHeight" => 15,
+			"TicksFontSize" => $font_size - 1);
+		
+		$scaleSettings['AxisR'] = '200';
+		$scaleSettings['AxisG'] = '200';
+		$scaleSettings['AxisB'] = '200';
+		$scaleSettings['TickR'] = '200';
+		$scaleSettings['TickG'] = '200';
+		$scaleSettings['TickB'] = '200';
+		
+		$myPicture->drawScale($scaleSettings);
+
+
+		//values
+		$scale_max   = $myPicture->DataSet->Data["Axis"][0]["ScaleMax"];
+		$scale_min   = $myPicture->DataSet->Data["Axis"][0]["ScaleMin"];
+
+		$position_y1 = $myPicture->GraphAreaY1;
+		$position_y2 = $myPicture->GraphAreaY2;
+
+		$position1   = $myPicture->GraphAreaX1;
+		$position3   = $myPicture->GraphAreaX2;
+
+		$cte = ($position_y2 - $position_y1) / ($scale_max - $scale_min);
+		
+		//warning
+		if($print_rectangle_warning){
+			$RectangleSettings = array("R"=>255,"G"=>255,"B"=>000,"Dash"=>TRUE,"DashR"=>170,"DashG"=>220,"DashB"=>190);
+			if($p_min_warn == "none"){
+				$p_min_warn = $scale_min;
+			}
+
+			$position2 = ($scale_max - $p_min_warn)*$cte + $position_y1;	
+			$position4 = ($scale_max - $p_max_warn)*$cte + $position_y1;
+
+			$myPicture->drawFilledRectangle($position1, floor($position2), 
+											$position3, floor($position4),
+											$RectangleSettings);
+			if($p_inv_warn){
+				$position2 = ($scale_max - $p_min_warn_inv)*$cte + $position_y1;	
+				$position4 = ($scale_max - $p_max_warn_inv)*$cte + $position_y1;
+				$myPicture->drawFilledRectangle($position1, floor($position2), 
+												$position3, floor($position4),
+												$RectangleSettings);
+			}
+		}
+
+		//critical
+		if($print_rectangle_critical){
+			$RectangleSettings = array("R"=>248,"G"=>000,"B"=>000,"Dash"=>TRUE,"DashR"=>170,"DashG"=>220,"DashB"=>190);
+
+			if($p_min_crit == "none"){
+				$p_min_crit = $scale_min;
+			}
+
+			$position2 = ($scale_max - $p_min_crit)*$cte + $position_y1;	
+			$position4 = ($scale_max - $p_max_crit)*$cte + $position_y1;
+			$myPicture->drawFilledRectangle($position1, $position2, 
+											$position3, $position4,
+											$RectangleSettings);
+
+			if($p_inv_crit){
+				$position2 = ($scale_max - $p_min_crit_inv)*$cte + $position_y1;	
+				$position4 = ($scale_max - $p_max_crit_inv)*$cte + $position_y1;
+				$myPicture->drawFilledRectangle($position1, $position2, 
+												$position3, $position4,
+												$RectangleSettings);
+			}
+		}
+
+	}
+	else{
+		/* Draw the scale */
+		$scaleSettings = array(
+			"GridR" => 200,
+			"GridG" => 200,
+			"GridB" => 200,
+			"GridAlpha" => 30,
+			"DrawSubTicks" => true,
+			"CycleBackground" => true,
+			"BackgroundAlpha1" => 35,
+			"BackgroundAlpha2" => 35,
+			"Mode" => $mode,
+			"ManualScale" => $ManualScale,
+			"LabelRotation" => 40, 
+			"XMargin" => 0, 
+			"MinDivHeight" => 15,
+			"TicksFontSize" => $font_size - 1);
+		
+		$scaleSettings['AxisR'] = '200';
+		$scaleSettings['AxisG'] = '200';
+		$scaleSettings['AxisB'] = '200';
+		$scaleSettings['TickR'] = '200';
+		$scaleSettings['TickG'] = '200';
+		$scaleSettings['TickB'] = '200';
+		
+		$myPicture->drawScale($scaleSettings);
+	}
+
 	/* Turn on shadow computing */ 
 	//$myPicture->setShadow(TRUE,array("X"=>0,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
 	
@@ -1087,7 +1304,6 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		}
 	}
 	
-	
 	/* Render the picture */
 	$myPicture->stroke(); 
 }
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 7acb66ecd8..8fc091e8ae 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1094,9 +1094,10 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		# Message
 		$field3 = subst_alert_macros ($field3, \%macros, $pa_config, $dbh, $agent, $module);
 		
-		# Check for _module_graph_Xh_ macros
+		# Check for _module_graph_Xh_ macros and _module_graphth_Xh_ 
 		my $module_graph_list = {};
 		my $macro_regexp = "_modulegraph_(\\d+)h_";
+		my $macro_regexp2 = "_modulegraphth_(\\d+)h_";
 		
 		# API connection
 		my $ua = new LWP::UserAgent;
@@ -1112,8 +1113,14 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		
 		my $subst_func = sub {
 			my $hours = shift;
+			my $threshold = shift;
 			my $period = $hours * 3600; # Hours to seconds
-			$params->{"other"} = $period . '%7C0';
+			if($threshold == 0){
+				$params->{"other"} = $period . '%7C0%7C0';
+			}
+			else{
+				$params->{"other"} = $period . '%7C0%7C1';
+			}
 			$params->{"other_mode"} = 'url_encode_separator_%7C';
 			my $cid = 'module_graph_' . $hours . 'h';
 			
@@ -1135,7 +1142,8 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		eval {
 			no warnings;
 			local $SIG{__DIE__};
-			$field3 =~ s/$macro_regexp/$subst_func->($1)/ige;
+			$field3 =~ s/$macro_regexp/$subst_func->($1, 0)/ige;
+			$field3 =~ s/$macro_regexp2/$subst_func->($1, 1)/ige;
 		};
 		
 		# Default content type

From 14422413a394b20203d66e031be9308be8f7aa01 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 2 Aug 2017 12:00:26 +0200
Subject: [PATCH 071/157] add helps in pandora macromodulegraphth

---
 pandora_console/include/help/en/help_alert_config.php | 1 +
 pandora_console/include/help/en/help_alert_macros.php | 1 +
 pandora_console/include/help/es/help_alert_config.php | 3 ++-
 pandora_console/include/help/es/help_alert_macros.php | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/help/en/help_alert_config.php b/pandora_console/include/help/en/help_alert_config.php
index 6fcd868841..a0262a6c5f 100644
--- a/pandora_console/include/help/en/help_alert_config.php
+++ b/pandora_console/include/help/en/help_alert_config.php
@@ -64,6 +64,7 @@ Apart from the defined module macros, the following macros are also available:
 <li>_groupother_ : Other information about the group. Configured when the group is created.</li>
 <li>_email_tag_ : Emails associated to the module tags.</li>
 <li>_modulegraph_nh_: (Only for alerts that use the command eMail) Returns an image of a module graph with a period of n hours (eg. _modulegraph_24h_). A correct setup of the connection between the server and the console's api is required. This setup is done into the server's configuration file.</li>
+<li>_modulegraphth_<i>n</i>h_:Same operation as the previous macro only with the critical and warning thresholds of the module provided they are defined.</li>
 <li>_homeurl_ : It is a link of the public URL this must be configured in the general options of the setup.</li>
 </ul>
 <p>
diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php
index 43a0738f94..b96476a59d 100644
--- a/pandora_console/include/help/en/help_alert_macros.php
+++ b/pandora_console/include/help/en/help_alert_macros.php
@@ -67,6 +67,7 @@ Besides the defined module macros, the following macros are available:
 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.
 This setup is done on the server's configuration file.</li>
+<li>_modulegraphth_<i>n</i>h_:Same operation as the previous macro only with the critical and warning thresholds of the module provided they are defined.</li>
 </ul>
 
 <p>
diff --git a/pandora_console/include/help/es/help_alert_config.php b/pandora_console/include/help/es/help_alert_config.php
index 1353021b9e..001d21e2f2 100644
--- a/pandora_console/include/help/es/help_alert_config.php
+++ b/pandora_console/include/help/es/help_alert_config.php
@@ -65,7 +65,8 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
 <li>_groupcontact_ : Información de contacto del grupo.	Se configura al crear el grupo.</li>
 <li>_groupother_ : Otra información sobre el grupo. Se configura al crear el grupo.</li>
 <li>_email_tag_ : Emails asociados a los tags de módulos.</li>
-<li>_modulegraph_nh_: (Sólo para alertas que usen el comando eMail) Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de n horas (eg. _modulegraph_24h_). Requiere de una configuración correcta de la conexión del servidor a la consola vía api, la cual se realiza en el fichero de configuración del servidor.</li>
+<li>_modulegraph_<i>n</i>h_: (Sólo para alertas que usen el comando eMail) Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de n horas (eg. _modulegraph_24h_). Requiere de una configuración correcta de la conexión del servidor a la consola vía api, la cual se realiza en el fichero de configuración del servidor.</li>
+<li>_modulegraphth_<i>n</i>h_:mismo funcionamiento que la macro anterior solo que con los umbrales critical y warning del modulo siempre que estos esten definidos</li>
 <li>_homeurl_ : Es un link de la URL pública esta debe de estar configurada en las opciones generales del setup.</li>
 </ul>
 <p>
diff --git a/pandora_console/include/help/es/help_alert_macros.php b/pandora_console/include/help/es/help_alert_macros.php
index bbffe76b03..2f1519bd8d 100644
--- a/pandora_console/include/help/es/help_alert_macros.php
+++ b/pandora_console/include/help/es/help_alert_macros.php
@@ -67,6 +67,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
 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,
 la cual se realiza en el fichero de configuración del servidor.</li>
+<li>_modulegraphth_<i>n</i>h_:mismo funcionamiento que la macro anterior solo que con los umbrales critical y warning del modulo siempre que estos esten definidos</li>
 </ul>
 
 <p>

From 89b0ec2584e1cb33ce0496172ff49acc59e077e5 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 2 Aug 2017 16:46:50 +0200
Subject: [PATCH 072/157] fixed errors in graphs value negative

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

diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 78510da704..85cb1df342 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -839,11 +839,16 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 
 	// Prepared to turn series with a checkbox
 	// var showed = new Array();
-
+	var min_check = 0;
 	for (i = 0; i < values.length; i++) {
 		var serie = values[i].split(separator);
 		var aux = new Array();
 		$.each(serie, function(i, v) {
+			if(v < 0){
+				if(min_check > parseFloat(v)){
+					min_check = v;
+				}
+			}
 			aux.push([i, v]);
 		});
 
@@ -927,7 +932,9 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 		// Prepared to turn series with a checkbox
 		// showed[i] = true;
 	}
-
+	if(min_check != 0){
+		min_check = min_check -5;
+	}
 	// If threshold and up are the same, that critical or warning is disabled
 	if (yellow_threshold == yellow_up) yellow_inverse = false;
 	if (red_threshold == red_up) red_inverse = false;
@@ -1490,6 +1497,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				position: 'left',
 				font: font,
 				reserveSpace: true,
+				min: min_check
 			}],
 			legend: {
 				position: 'se',

From 5860d29e37868ff0f90bd9cdb634fb16b92945eb Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 3 Aug 2017 00:01:15 +0200
Subject: [PATCH 073/157] 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 22a9e6e40d..ea9b820631 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.709
+Version: 7.0NG.709-170803
 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 6ed7ccd692..d0c34e56f7 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.709"
+pandora_version="7.0NG.709-170803"
 
 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 ae6591c102..bc986608f1 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.709';
-use constant AGENT_BUILD => '170802';
+use constant AGENT_BUILD => '170803';
 
 # 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 c5fe50025b..adb545c275 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.709
-%define release     1
+%define release     170803
 
 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 f210593a2f..8972b700ce 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.709
-%define release     1
+%define release     170803
 
 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 728a6f1468..e88801b733 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170802"
+PI_BUILD="170803"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 585366329c..26b6ac8468 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170802}
+{170803}
 
 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 53af786a6b..e839d47c22 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.709(Build 170802)")
+#define PANDORA_VERSION ("7.0NG.709(Build 170803)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index d880ee6440..8862317076 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.709(Build 170802))"
+      VALUE "ProductVersion", "(7.0NG.709(Build 170803))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index c9fed88159..fda743aac4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.709
+Version: 7.0NG.709-170803
 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 ef38b9072c..97bb223fc3 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.709"
+pandora_version="7.0NG.709-170803"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 90d044ea7b..60bf0cb9e0 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 = 'PC170802';
+$build_version = 'PC170803';
 $pandora_version = 'v7.0NG.709';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 01a2fd2050..d31cd7727d 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.709';
-$build = '170802';
+$build = '170803';
 			$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 116607b01a..38a00fa6b6 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.709
-%define release     1
+%define release     170803
 
 # 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 d9942c0ee4..4cd3b31283 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.709
-%define release     1
+%define release     170803
 %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 05106f33c6..2245b91b58 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.709
+Version: 7.0NG.709-170803
 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 1f280b70f9..7a9d678035 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.709"
+pandora_version="7.0NG.709-170803"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 50d482fc62..9c97212779 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.709";
-my $pandora_build = "170802";
+my $pandora_build = "170803";
 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 18cc7dee85..4e55cdbc32 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.709
-%define release     1
+%define release     170803
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index a21503f9fc..2c2c44ee57 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.709
-%define release     1
+%define release     170803
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index cf89b458e0..1fb273205e 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170802"
+PI_BUILD="170803"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 005be0ba91..a52a6f5a3d 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.709 PS170802";
+my $version = "7.0NG.709 PS170803";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 78f8e7b6b0..80332a637f 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.709 PS170802";
+my $version = "7.0NG.709 PS170803";
 
 # save program name for logging
 my $progname = basename($0);

From 20fc24b99e443f5eafca786b379fa2155981078f Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 3 Aug 2017 11:32:43 +0200
Subject: [PATCH 074/157] allow UNION sql reports

---
 pandora_console/include/functions.php           | 2 +-
 pandora_console/include/functions_reporting.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index b4e25c9eac..9528fe64fb 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1701,7 +1701,7 @@ function check_sql ($sql) {
 	
 	//Check that it not delete_ as "delete_pending" (this is a common field in pandora tables).
 	
-	if (preg_match("/\*|delete[^_]|drop|alter|modify|union|password|pass|insert|update/i", $sql)) {
+	if (preg_match("/\*|delete[^_]|drop|alter|modify|password|pass|insert|update/i", $sql)) {
 		return "";
 	}
 	return $sql;
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index f64bb7d0ed..604a9f6730 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -3980,7 +3980,7 @@ function reporting_sql($report, $content) {
 	}
 	else {
 		$return['correct'] = 0;
-		$return['error'] = __('Illegal query: Due security restrictions, there are some tokens or words you cannot use: *, delete, drop, alter, modify, union, password, pass, insert or update.');
+		$return['error'] = __('Illegal query: Due security restrictions, there are some tokens or words you cannot use: *, delete, drop, alter, modify, password, pass, insert or update.');
 	}
 	
 	if ($config['metaconsole']) {

From cccbc8ff5b7eb0e9fbef91647e8beb5a402a43f2 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 3 Aug 2017 11:49:56 +0200
Subject: [PATCH 075/157] Added new macro

---
 pandora_server/lib/PandoraFMS/Core.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 7acb66ecd8..d7bc387fa6 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1010,7 +1010,8 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 				_modulestatus_ => undef,
 				_moduletags_ => undef,
 				'_moduledata_\S+_' => undef,
-				_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', 
+				_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '',
+				_id_module_ => (defined ($module)) ? $module->{'id_agente_modulo'} : '',
 				_id_group_ => (defined ($group)) ? $group->{'id_grupo'} : '',
 				_id_alert_ => (defined ($alert->{'id_template_module'})) ? $alert->{'id_template_module'} : '',
 				_interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '',

From 362ab94781df99db658b82b8f4ae7c05b799769e Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Thu, 3 Aug 2017 12:41:47 +0200
Subject: [PATCH 076/157] Added label in automatic graph

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

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index f64bb7d0ed..0959cebe38 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -5789,17 +5789,10 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 	
 	require_once ($config["homedir"] . '/include/functions_graph.php');
 	
-	if ($type_report == 'automatic_graph') {
-		// Do none
-	}
-	else {
-		if ($config['metaconsole']) {
-			$id_meta = metaconsole_get_id_server($content["server_name"]);
-			
-			
-			$server = metaconsole_get_connection_by_id ($id_meta);
-			metaconsole_connect($server);
-		}
+	if ($config['metaconsole'] && $type_report != 'automatic_graph') {
+		$id_meta = metaconsole_get_id_server($content["server_name"]);	
+		$server = metaconsole_get_connection_by_id ($id_meta);
+		metaconsole_connect($server);
 	}
 	
 	$graph = db_get_row ("tgraph", "id_graph", $content['id_gs']);
@@ -5853,6 +5846,22 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 						'id_agent_module'=>$graph_item['id_agent_module']);
 			}
 			
+			if($type_report == 'automatic_graph'){
+				$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+				if (!empty($label)) {
+					if ($config['metaconsole']) {
+						$id_meta = metaconsole_get_id_server($content["server_name"]);
+						$server = metaconsole_get_connection_by_id ($id_meta);
+						metaconsole_connect($server);
+					}
+					$label = reporting_label_macro($content, $label);
+					
+					if ($config['metaconsole']) {
+						metaconsole_restore_db();
+					}
+				}
+			} 
+			
 			$labels[$graph_item['id_agent_module']] = $label;
 		}
 	}
@@ -5909,15 +5918,11 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 			break;
 	}
 	
-	if ($type_report == 'automatic_graph') {
-		// Do none
-	}
-	else {
-		if ($config['metaconsole']) {
-			metaconsole_restore_db();
-		}
+	if ($config['metaconsole'] && $type_report != 'automatic_graph') {
+		metaconsole_restore_db();
 	}
 	
+	
 	return reporting_check_structure_content($return);
 }
 

From ea06ba213bb387060143b37c27bc64b4c3f88ee7 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 3 Aug 2017 13:05:57 +0200
Subject: [PATCH 077/157] Added registration method to reset pass

---
 .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql |  3 ++-
 pandora_console/include/functions.php             | 10 ++++++++++
 pandora_console/index.php                         | 15 +++++++++------
 pandora_console/pandoradb.sql                     |  3 ++-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index a629abc0ad..f37c3244ae 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1357,7 +1357,8 @@ INSERT INTO `tcontainer` SET `name` = 'Default graph container';
 CREATE TABLE IF NOT EXISTS `treset_pass_history` (
 	`id` int(10) unsigned NOT NULL auto_increment,
 	`id_user` varchar(60) NOT NULL,
-	`reset_moment` date default NULL,
+	`reset_moment` datetime NOT NULL,
+	`success` tinyint(1) NOT NULL,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index b4e25c9eac..b8ece40c98 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2754,4 +2754,14 @@ function remove_right_zeros ($value) {
 	}
 }
 
+function register_pass_change_try ($id_user, $success) {
+	$values = array();
+	$values['id_user'] = $id_user;
+	$reset_pass_moment = new DateTime('now');
+	$reset_pass_moment = $reset_pass_moment->format("Y-m-d H:i:s");
+	$values['reset_moment'] = $reset_pass_moment;
+	$values['success'] = $success;
+	db_process_sql_insert('treset_pass_history', $values);
+}
+
 ?>
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 5a32eaa670..683490f646 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -585,18 +585,17 @@ if (! isset ($config['id_user'])) {
 				if ($res) {
 					$correct_reset_pass_process = __('Password changed successfully');
 
-					$values = array();
-					$values['id_user'] = $id_user;
-					$reset_pass_moment = new DateTime('now');
-					$reset_pass_moment = $reset_pass_moment->format("Y-m-d H:i:s");
-					$values['reset_moment'] = $reset_pass_moment;
-					db_process_sql_insert('treset_pass_history', $values);
+					register_pass_change_try($id_user, 1);
 				}
 				else {
+					register_pass_change_try($id_user, 0);
+
 					$process_error_message = __('Failed to change password');
 				}
 			}
 			else {
+				register_pass_change_try($id_user, 0);
+
 				$process_error_message = __('Passwords must be the same');
 			}
 			require_once ('general/login_page.php');
@@ -612,6 +611,7 @@ if (! isset ($config['id_user'])) {
 
 				if ($db_reset_pass_entry) {
 					if (($db_reset_pass_entry + SECONDS_2HOUR) < time()) {
+						register_pass_change_try($id_user, 0);
 						$process_error_message = __('Too much time since password change request');
 						delete_reset_pass_entry($id_user);
 						require_once ('general/login_page.php');
@@ -622,6 +622,7 @@ if (! isset ($config['id_user'])) {
 					}
 				}
 				else {
+					register_pass_change_try($id_user, 0);
 					$process_error_message = __('This user has not requested a password change');
 					require_once ('general/login_page.php');
 				}
@@ -648,6 +649,7 @@ if (! isset ($config['id_user'])) {
 
 								if (!$check_user) {
 									$reset = false;
+									register_pass_change_try($user_reset_pass, 0);
 									$error = __('Error in reset password request');
 									$show_error = true;
 								}
@@ -656,6 +658,7 @@ if (! isset ($config['id_user'])) {
 
 									if (!$check_mail) {
 										$reset = false;
+										register_pass_change_try($user_reset_pass, 0);
 										$error = __('This user doesn\'t have a valid email address');
 										$show_error = true;
 									}
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 0cb01cf9b5..75b93af530 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1149,7 +1149,8 @@ CREATE TABLE IF NOT EXISTS `tuser_double_auth` (
 CREATE TABLE IF NOT EXISTS `treset_pass_history` (
 	`id` int(10) unsigned NOT NULL auto_increment,
 	`id_user` varchar(60) NOT NULL,
-	`reset_moment` datetime not null default 0,
+	`reset_moment` datetime NOT NULL,
+	`success` tinyint(1) NOT NULL,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

From fb9f1872872290a15f208de83424d5e51960e1fc Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 3 Aug 2017 13:09:41 +0200
Subject: [PATCH 078/157] fixed error exportation csv in custom graphs

---
 .../include/graphs/flot/jquery.flot.exportdata.pandora.js  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
index bb7c5d56dd..e8bb747901 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
@@ -88,7 +88,10 @@
 						else if (typeof labels[index] !== 'undefined')
 							date = labels[index];
 
-						result.data.push([date, value,dataObject.label]);
+						var clean_label = dataObject.label;
+						clean_label = clean_label.replace( new RegExp("<.*?>", "g"), "");
+						clean_label = clean_label.replace( new RegExp(";", "g"), "");
+						result.data.push([date, value, clean_label]);
 					});
 				}
 				/* [
@@ -139,7 +142,7 @@
 
 			try {
 				var elements = [];
-				var custom_graph = $('input:hidden[name=custom_graph]').value;
+				var custom_graph = $('#hidden-custom_graph').val();
 
 				if (custom_graph) {
 					dataObject = retrieveDataOject(dataObjects);

From 0932004781cac5e49c934a4a9cdff8a568bd00e0 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Thu, 3 Aug 2017 13:13:34 +0200
Subject: [PATCH 079/157] Fixed label in automatic graph in node

---
 .../include/functions_reporting.php           | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index f64bb7d0ed..ceb28ad19a 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -5789,17 +5789,10 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 	
 	require_once ($config["homedir"] . '/include/functions_graph.php');
 	
-	if ($type_report == 'automatic_graph') {
-		// Do none
-	}
-	else {
-		if ($config['metaconsole']) {
-			$id_meta = metaconsole_get_id_server($content["server_name"]);
-			
-			
-			$server = metaconsole_get_connection_by_id ($id_meta);
-			metaconsole_connect($server);
-		}
+	if ($config['metaconsole'] && $type_report != 'automatic_graph') {
+		$id_meta = metaconsole_get_id_server($content["server_name"]);	
+		$server = metaconsole_get_connection_by_id ($id_meta);
+		metaconsole_connect($server);
 	}
 	
 	$graph = db_get_row ("tgraph", "id_graph", $content['id_gs']);
@@ -5853,6 +5846,26 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 						'id_agent_module'=>$graph_item['id_agent_module']);
 			}
 			
+			if($type_report == 'automatic_graph'){
+				$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+				
+				if (!empty($label)) {
+					if ($config['metaconsole']) {
+						$id_meta = metaconsole_get_id_server($content["server_name"]);
+						$server = metaconsole_get_connection_by_id ($id_meta);
+						metaconsole_connect($server);
+					}
+					$label = reporting_label_macro($content, $label);
+					
+					if ($config['metaconsole']) {
+						metaconsole_restore_db();
+					}
+				}
+			} else {
+				$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+				$label = reporting_label_macro($content, $label);
+			}
+			
 			$labels[$graph_item['id_agent_module']] = $label;
 		}
 	}
@@ -5909,13 +5922,8 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 			break;
 	}
 	
-	if ($type_report == 'automatic_graph') {
-		// Do none
-	}
-	else {
-		if ($config['metaconsole']) {
-			metaconsole_restore_db();
-		}
+	if ($config['metaconsole'] && $type_report != 'automatic_graph') {
+		metaconsole_restore_db();
 	}
 	
 	return reporting_check_structure_content($return);

From df4b66fbd58babbdde3b3d036abe1a7168651d8b Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 3 Aug 2017 13:51:56 +0200
Subject: [PATCH 080/157] fixed error cli version snmp

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

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 7acb66ecd8..5c993d2bba 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -2759,7 +2759,7 @@ sub pandora_create_module_from_hash ($$$) {
 
 	# Encrypt SNMP v3 passwords.
 	if ($parameters->{'id_tipo_modulo'} >= 15 && $parameters->{'id_tipo_modulo'} <= 18 &&
-		$parameters->{'tcp_send'} == 3) {
+		$parameters->{'tcp_send'} eq '3') {
 		$parameters->{'custom_string_2'} = pandora_input_password($pa_config, $parameters->{'custom_string_2'});
 	}
 

From 88411aedf51e4e4b1c3af21058065b1f17f0a8d0 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 3 Aug 2017 15:07:49 +0200
Subject: [PATCH 081/157] fixed minor error

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

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 80332a637f..078ce63eb5 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -129,7 +129,7 @@ sub help_screen{
 	help_screen_line('--create_data_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t  <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t  <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>]", 'Add data server module to agent');
 	help_screen_line('--create_web_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t  <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t  <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent');
 	help_screen_line('--create_network_module', "<module_name> <module_type> <agent_name> <module_address> \n\t  [<module_port> <description> <module_group> <min> <max> <post_process> <interval> \n\t  <warning_min> <warning_max> <critical_min> <critical_max> <history_data> <ff_threshold>\n\t  <warning_str> <critical_str> <unknown_events> <each_ff>\n\t  <ff_threshold_normal> <ff_threshold_warning> <ff_threshold_critical> <timeout> <retries>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>\n\t <warning_inverse> <critical_inverse>]", 'Add not snmp network module to agent');
-	help_screen_line('--create_snmp_module', "<module_name> <module_type> <agent_name> <module_address> <module_port>\n\t  <version> [<community> <oid> <description> <module_group> <min> <max> <post_process> <interval>\n\t   <warning_min> <warning_max> <critical_min> <critical_max> <history_data> \n\t  <snmp3_priv_method> <snmp3_priv_pass> <snmp3_sec_level> <snmp3_auth_method> \n\t  <snmp3_auth_user> <snmp3_priv_pass> <ff_threshold> <warning_str> \n\t  <critical_str> <unknown_events> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <timeout> <retries>
+	help_screen_line('--create_snmp_module', "<module_name> <module_type> <agent_name> <module_address> <module_port>\n\t  <version> [<community> <oid> <description> <module_group> <min> <max> <post_process> <interval>\n\t   <warning_min> <warning_max> <critical_min> <critical_max> <history_data> \n\t  <snmp3_priv_method> <snmp3_priv_pass> <snmp3_sec_level> <snmp3_auth_method> \n\t  <snmp3_auth_user> <snmp3_auth_pass> <ff_threshold> <warning_str> \n\t  <critical_str> <unknown_events> <each_ff> <ff_threshold_normal>\n\t  <ff_threshold_warning> <ff_threshold_critical> <timeout> <retries>
 	\n\t <critical_instructions> <warning_instructions> <unknown_instructions>\n\t <warning_inverse> <critical_inverse>]", 'Add snmp network module to agent');
 	help_screen_line('--create_plugin_module', "<module_name> <module_type> <agent_name> <module_address> \n\t  <module_port> <plugin_name> <user> <password> <parameters> [<description> \n\t  <module_group> <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> \n\t  <critical_max> <history_data> <ff_threshold> <warning_str> <critical_str>\n\t  <unknown_events> <each_ff> <ff_threshold_normal> <ff_threshold_warning>\n\t  <ff_threshold_critical> <timeout> \n\t <critical_instructions> <warning_instructions> <unknown_instructions>\n\t <warning_inverse> <critical_inverse>]", 'Add plug-in module to agent');
     help_screen_line('--create_module_group', '<module_group_name>');

From c4171ac2487626eda5796ba63fe5cafbb2982567 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 3 Aug 2017 17:09:27 +0200
Subject: [PATCH 082/157] fixed errors metaconsole reports serialize data

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

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index f64bb7d0ed..bf3b38540d 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2447,7 +2447,14 @@ function reporting_database_serialized($report, $content) {
 	$return['agent_name'] = $agent_name;
 	$return['module_name'] = $module_name;
 	
-	
+	if ($config['metaconsole']) {
+		$id_meta = metaconsole_get_id_server($content["server_name"]);
+		
+		
+		$server = metaconsole_get_connection_by_id ($id_meta);
+		metaconsole_connect($server);
+	}
+
 	$datelimit = $report["datetime"] - $content['period'];
 	$search_in_history_db = db_search_in_history_db($datelimit);
 	
@@ -2523,6 +2530,10 @@ function reporting_database_serialized($report, $content) {
 			$data[] = $row;
 		}
 	}
+
+	if ($config['metaconsole']) {
+		metaconsole_restore_db();
+	}
 	
 	$return["data"] = $data;
 	

From 2d8697eaebfb485a04c315146f9efe2c2a91408f Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 4 Aug 2017 00:01:14 +0200
Subject: [PATCH 083/157] 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 ea9b820631..60b5ed7e5d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.709-170803
+Version: 7.0NG.709-170804
 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 d0c34e56f7..b616068ff8 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.709-170803"
+pandora_version="7.0NG.709-170804"
 
 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 bc986608f1..0d4d061826 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.709';
-use constant AGENT_BUILD => '170803';
+use constant AGENT_BUILD => '170804';
 
 # 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 adb545c275..056b36ff57 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.709
-%define release     170803
+%define release     170804
 
 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 8972b700ce..a3519d272f 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.709
-%define release     170803
+%define release     170804
 
 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 e88801b733..d85ec7ebd7 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170803"
+PI_BUILD="170804"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 26b6ac8468..654aefe4ba 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170803}
+{170804}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e839d47c22..d8b78303f3 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.709(Build 170803)")
+#define PANDORA_VERSION ("7.0NG.709(Build 170804)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 8862317076..fde791982e 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.709(Build 170803))"
+      VALUE "ProductVersion", "(7.0NG.709(Build 170804))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index fda743aac4..78317ad279 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.709-170803
+Version: 7.0NG.709-170804
 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 97bb223fc3..9f48a68abc 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.709-170803"
+pandora_version="7.0NG.709-170804"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 60bf0cb9e0..970ecda668 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 = 'PC170803';
+$build_version = 'PC170804';
 $pandora_version = 'v7.0NG.709';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index d31cd7727d..1654528ce3 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.709';
-$build = '170803';
+$build = '170804';
 			$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 38a00fa6b6..5ed25d51e3 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.709
-%define release     170803
+%define release     170804
 
 # 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 4cd3b31283..3408d8ab7f 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.709
-%define release     170803
+%define release     170804
 %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 2245b91b58..f980429464 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.709-170803
+Version: 7.0NG.709-170804
 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 7a9d678035..57189cafb5 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.709-170803"
+pandora_version="7.0NG.709-170804"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 9c97212779..67e03fb141 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.709";
-my $pandora_build = "170803";
+my $pandora_build = "170804";
 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 4e55cdbc32..c06bbeb1be 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.709
-%define release     170803
+%define release     170804
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 2c2c44ee57..6f9cea283e 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.709
-%define release     170803
+%define release     170804
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 1fb273205e..5dd610c59b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170803"
+PI_BUILD="170804"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index a52a6f5a3d..d7234045ad 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.709 PS170803";
+my $version = "7.0NG.709 PS170804";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 80332a637f..40dbb6cc43 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.709 PS170803";
+my $version = "7.0NG.709 PS170804";
 
 # save program name for logging
 my $progname = basename($0);

From e875ce9b4eb9b2b82eef4b44e9c3920b035dd0ca Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 4 Aug 2017 14:07:27 +0200
Subject: [PATCH 084/157] fixed errors in update manager open

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

diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 607b108e42..2849cc5c9c 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -624,8 +624,8 @@ function update_manager_extract_package() {
 
 	$extracted = false;
 
-	// Phar and exception working fine in 5.5.0 or higher
-	if (PHP_VERSION_ID >= 50505) {
+	// Phar and exception working fine in 5.6.0 or higher
+	if (PHP_VERSION_ID >= 50600) {
 		$phar = new PharData($path_package);
 		try {
 			$result = $phar->extractTo($config['attachment_store'] . "/downloads/",null, true);

From c826d0951ec82de9f32e9d4e4d5882742c8715de Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 5 Aug 2017 00:01:13 +0200
Subject: [PATCH 085/157] 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 60b5ed7e5d..31ff788cf7 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.709-170804
+Version: 7.0NG.709-170805
 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 b616068ff8..965739b923 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.709-170804"
+pandora_version="7.0NG.709-170805"
 
 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 0d4d061826..dfa803f177 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.709';
-use constant AGENT_BUILD => '170804';
+use constant AGENT_BUILD => '170805';
 
 # 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 056b36ff57..b2d0f8c7a6 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.709
-%define release     170804
+%define release     170805
 
 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 a3519d272f..98f40beee8 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.709
-%define release     170804
+%define release     170805
 
 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 d85ec7ebd7..feed1c3eae 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170804"
+PI_BUILD="170805"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 654aefe4ba..5fc8b837f5 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170804}
+{170805}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index d8b78303f3..2c2434609c 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.709(Build 170804)")
+#define PANDORA_VERSION ("7.0NG.709(Build 170805)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index fde791982e..0065a9e2b8 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.709(Build 170804))"
+      VALUE "ProductVersion", "(7.0NG.709(Build 170805))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 78317ad279..7ff75cee6e 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.709-170804
+Version: 7.0NG.709-170805
 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 9f48a68abc..d139b38407 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.709-170804"
+pandora_version="7.0NG.709-170805"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 970ecda668..c1f9847619 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 = 'PC170804';
+$build_version = 'PC170805';
 $pandora_version = 'v7.0NG.709';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 1654528ce3..fea5c38921 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.709';
-$build = '170804';
+$build = '170805';
 			$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 5ed25d51e3..7863f5429c 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.709
-%define release     170804
+%define release     170805
 
 # 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 3408d8ab7f..8e0fe235de 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.709
-%define release     170804
+%define release     170805
 %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 f980429464..b37147d0b7 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.709-170804
+Version: 7.0NG.709-170805
 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 57189cafb5..7a8de6c1f7 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.709-170804"
+pandora_version="7.0NG.709-170805"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 67e03fb141..e163ad5750 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.709";
-my $pandora_build = "170804";
+my $pandora_build = "170805";
 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 c06bbeb1be..cb29fb52d4 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.709
-%define release     170804
+%define release     170805
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6f9cea283e..b49951173e 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.709
-%define release     170804
+%define release     170805
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 5dd610c59b..ec53516658 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170804"
+PI_BUILD="170805"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d7234045ad..70b6606e35 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.709 PS170804";
+my $version = "7.0NG.709 PS170805";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 40dbb6cc43..81fd2eb236 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.709 PS170804";
+my $version = "7.0NG.709 PS170805";
 
 # save program name for logging
 my $progname = basename($0);

From 5a0da66b3d1758f97380abd4d9dfc47117e6dfed Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 6 Aug 2017 00:01:13 +0200
Subject: [PATCH 086/157] 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 31ff788cf7..4f1e203c6d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.709-170805
+Version: 7.0NG.709-170806
 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 965739b923..ce0adb682f 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.709-170805"
+pandora_version="7.0NG.709-170806"
 
 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 dfa803f177..be3ab44678 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.709';
-use constant AGENT_BUILD => '170805';
+use constant AGENT_BUILD => '170806';
 
 # 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 b2d0f8c7a6..f0594cb403 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.709
-%define release     170805
+%define release     170806
 
 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 98f40beee8..9fa015168c 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.709
-%define release     170805
+%define release     170806
 
 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 feed1c3eae..5d097afc08 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170805"
+PI_BUILD="170806"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 5fc8b837f5..ee1a30a4c8 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170805}
+{170806}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 2c2434609c..cbb5eb9ca7 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.709(Build 170805)")
+#define PANDORA_VERSION ("7.0NG.709(Build 170806)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 0065a9e2b8..ac1e942b56 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.709(Build 170805))"
+      VALUE "ProductVersion", "(7.0NG.709(Build 170806))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 7ff75cee6e..b89e2689bd 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.709-170805
+Version: 7.0NG.709-170806
 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 d139b38407..ec0d8dfe56 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.709-170805"
+pandora_version="7.0NG.709-170806"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index c1f9847619..fffafe2443 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 = 'PC170805';
+$build_version = 'PC170806';
 $pandora_version = 'v7.0NG.709';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index fea5c38921..398e0105cb 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.709';
-$build = '170805';
+$build = '170806';
 			$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 7863f5429c..80952486fe 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.709
-%define release     170805
+%define release     170806
 
 # 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 8e0fe235de..8afd232322 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.709
-%define release     170805
+%define release     170806
 %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 b37147d0b7..5485c6282f 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.709-170805
+Version: 7.0NG.709-170806
 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 7a8de6c1f7..fd84ec41d7 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.709-170805"
+pandora_version="7.0NG.709-170806"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index e163ad5750..2d607a6033 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.709";
-my $pandora_build = "170805";
+my $pandora_build = "170806";
 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 cb29fb52d4..e5b69c7674 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.709
-%define release     170805
+%define release     170806
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index b49951173e..d018078f02 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.709
-%define release     170805
+%define release     170806
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index ec53516658..5ba36e05f2 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170805"
+PI_BUILD="170806"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 70b6606e35..eb3ccc4d32 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.709 PS170805";
+my $version = "7.0NG.709 PS170806";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 81fd2eb236..a98aaa8b83 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.709 PS170805";
+my $version = "7.0NG.709 PS170806";
 
 # save program name for logging
 my $progname = basename($0);

From 5164624dcad97bd3f6b93ff46adfdf310ba11aa1 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 7 Aug 2017 00:01:14 +0200
Subject: [PATCH 087/157] 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 4f1e203c6d..1600284bcf 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.709-170806
+Version: 7.0NG.709-170807
 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 ce0adb682f..8802a4d681 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.709-170806"
+pandora_version="7.0NG.709-170807"
 
 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 be3ab44678..62a49f81bf 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.709';
-use constant AGENT_BUILD => '170806';
+use constant AGENT_BUILD => '170807';
 
 # 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 f0594cb403..8760f149f9 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.709
-%define release     170806
+%define release     170807
 
 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 9fa015168c..bf3ff34e59 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.709
-%define release     170806
+%define release     170807
 
 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 5d097afc08..b04e47f701 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170806"
+PI_BUILD="170807"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ee1a30a4c8..2ccdc610f1 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170806}
+{170807}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index cbb5eb9ca7..1630d61ac6 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.709(Build 170806)")
+#define PANDORA_VERSION ("7.0NG.709(Build 170807)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index ac1e942b56..fc46ee253c 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.709(Build 170806))"
+      VALUE "ProductVersion", "(7.0NG.709(Build 170807))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b89e2689bd..d8f8fdb5d0 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.709-170806
+Version: 7.0NG.709-170807
 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 ec0d8dfe56..3beab55d45 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.709-170806"
+pandora_version="7.0NG.709-170807"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index fffafe2443..072114f230 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 = 'PC170806';
+$build_version = 'PC170807';
 $pandora_version = 'v7.0NG.709';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 398e0105cb..8415462224 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.709';
-$build = '170806';
+$build = '170807';
 			$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 80952486fe..8fec317430 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.709
-%define release     170806
+%define release     170807
 
 # 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 8afd232322..72e6d3cd70 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.709
-%define release     170806
+%define release     170807
 %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 5485c6282f..16074bf3e8 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.709-170806
+Version: 7.0NG.709-170807
 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 fd84ec41d7..d807c23db9 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.709-170806"
+pandora_version="7.0NG.709-170807"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 2d607a6033..ec13596e6a 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.709";
-my $pandora_build = "170806";
+my $pandora_build = "170807";
 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 e5b69c7674..bbc5cb410a 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.709
-%define release     170806
+%define release     170807
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index d018078f02..2e0c19b451 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.709
-%define release     170806
+%define release     170807
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 5ba36e05f2..7bd7534251 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170806"
+PI_BUILD="170807"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index eb3ccc4d32..0f109b13fe 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.709 PS170806";
+my $version = "7.0NG.709 PS170807";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a98aaa8b83..05930b4ff5 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.709 PS170806";
+my $version = "7.0NG.709 PS170807";
 
 # save program name for logging
 my $progname = basename($0);

From 160ad7e86603f36a27f635eedc2d99bbef77003d Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 7 Aug 2017 09:21:26 +0200
Subject: [PATCH 088/157] Fixed Connection failure in ldap

---
 pandora_console/include/auth/mysql.php | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index a7e710dcb2..91c783d10b 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -645,15 +645,26 @@ function ldap_process_user_login ($login, $password) {
 		}
 	}
 	
-	$ldap_login_attr  = isset($config["ldap_login_attr"]) ? io_safe_output($config["ldap_login_attr"]) . "=" : '';
-	$ldap_base_dn  = isset($config["ldap_base_dn"]) ? "," . io_safe_output($config["ldap_base_dn"]) : '';
+	$ldap_login_attr  = !empty($config["ldap_login_attr"]) ? io_safe_output($config["ldap_login_attr"]) . "=" : '';
+	$ldap_base_dn  = !empty($config["ldap_base_dn"]) ? "," . io_safe_output($config["ldap_base_dn"]) : '';
 	
-	if (strlen($password) == 0 || 
+	if(!empty($ldap_base_dn)){
+		if (strlen($password) == 0 || 
+		!@ldap_bind($ds, $ldap_login_attr.io_safe_output($login).$ldap_base_dn, $password) ) {
+			html_debug("entra1",true);
+			$config["auth_error"] = 'User not found in database or incorrect password';
+			@ldap_close ($ds);
+			
+			return false;
+		}
+	} else {
+		if (strlen($password) == 0 || 
 		!@ldap_bind($ds, io_safe_output($login), $password) ) {
-		$config["auth_error"] = 'User not found in database or incorrect password';
-		@ldap_close ($ds);
-		
-		return false;
+			$config["auth_error"] = 'User not found in database or incorrect password';
+			@ldap_close ($ds);
+			
+			return false;
+		}
 	}
 	
 	@ldap_close ($ds);

From 5df61b95b9836c37c8fb642b26a5886db5fa0aa2 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 7 Aug 2017 11:30:49 +0200
Subject: [PATCH 089/157] Fixed issue in public console

---
 pandora_console/operation/gis_maps/public_console.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pandora_console/operation/gis_maps/public_console.php b/pandora_console/operation/gis_maps/public_console.php
index 01a3af722a..68c94f9c60 100755
--- a/pandora_console/operation/gis_maps/public_console.php
+++ b/pandora_console/operation/gis_maps/public_console.php
@@ -58,7 +58,7 @@ $confMap = gis_get_map_conf($idMap);
 
 // Default open map (used to overwrite unlicensed google map view)
 $confMapDefault = get_good_con();
-$confMapUrlDefault = json_decode($confMapDefault['conection_data'], true)['url'];
+$confMapUrlDefault = json_decode($confMapDefault['conection_data'], true);
 
 $num_baselayer=0;
 // Initialy there is no Gmap base layer.
@@ -77,7 +77,7 @@ if ($confMap !== false) {
 			case 'Gmap':
 				if (!isset($decodeJSON['gmap_key']) || empty($decodeJSON['gmap_key'])) {
 					// If there is not gmap_key, show the default view
-					$baselayers[$num_baselayer]['url'] = $confMapUrlDefault;
+					$baselayers[$num_baselayer]['url'] = $confMapUrlDefault['url'];
 					$baselayers[$num_baselayer]['typeBaseLayer'] = 'OSM';
 				} else {
 					$baselayers[$num_baselayer]['gmap_type'] = $decodeJSON['gmap_type'];
@@ -207,6 +207,7 @@ if ($layers != false) {
 		
 		var new_height = $(document).height();
 		$("#map").css("height", new_height - 60);
+		$("svg[id*=OpenLayers]").css("height", new_height - 60);
 		
 	});
 </script>
\ No newline at end of file

From 97392c4568c668b9ca7484b3034958893c4136ac Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 7 Aug 2017 13:10:02 +0200
Subject: [PATCH 090/157] Fixed issue to search agent modules in cascade
 protection

---
 pandora_console/godmode/agentes/agent_manager.php       | 4 ++--
 pandora_console/godmode/massive/massive_edit_agents.php | 4 ++--
 pandora_console/include/ajax/module.php                 | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 7042b0d15b..2db2e53e93 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -580,11 +580,11 @@ ui_require_jquery_file('bgiframe');
 		});
 
 		$("#text-id_parent").on("autocompletechange", function () {
-			agent_name = $("#text-id_parent").val();
+			agent_id=$("#hidden-id_parent").val();
 			
 			var params = {};
 			params["get_agent_modules_json_by_name"] = 1;
-			params["agent_name"] = agent_name;
+			params["id_agent"] = agent_id;
 			params["page"] = "include/ajax/module";
 			
 			jQuery.ajax ({
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index 802dc67e6b..cab81fd1c4 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -558,11 +558,11 @@ $(document).ready (function () {
 	});
 
 	$("#text-id_parent").on("autocompletechange", function () {
-		agent_name = $("#text-id_parent").val();
+		agent_id = $("#hidden-id_parent").val();
 		
 		var params = {};
 		params["get_agent_modules_json_by_name"] = 1;
-		params["agent_name"] = agent_name;
+		params["id_agent"] = agent_id;
 		params["page"] = "include/ajax/module";
 		
 		jQuery.ajax ({
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index d18a8ec97d..ccc4b53e2b 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -38,9 +38,7 @@ $get_agent_modules_json_by_name = (bool) get_parameter('get_agent_modules_json_b
 
 
 if ($get_agent_modules_json_by_name) {
-	$agent_name = get_parameter('agent_name');
-
-	$agent_id = agents_get_agent_id($agent_name);
+	$agent_id = get_parameter('id_agent');
 
 	$agent_modules = db_get_all_rows_sql("SELECT id_agente_modulo as id_module, nombre as name FROM tagente_modulo
 											WHERE id_agente = " . $agent_id);

From 590bfbfe84917ff0807838f3216db8d21115799b Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 7 Aug 2017 13:57:04 +0200
Subject: [PATCH 091/157] mr-5 add queries

---
 pandora_console/extras/mr/5.sql                  | 15 +++++++++++++++
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql       | 16 +++++-----------
 pandora_console/pandoradb.sql                    |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 pandora_console/extras/mr/5.sql

diff --git a/pandora_console/extras/mr/5.sql b/pandora_console/extras/mr/5.sql
new file mode 100644
index 0000000000..afce7e0442
--- /dev/null
+++ b/pandora_console/extras/mr/5.sql
@@ -0,0 +1,15 @@
+START TRANSACTION;
+
+SET @st_oum707 = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'tgraph_source' AND table_schema = DATABASE() AND column_name = 'id_server') > 0,
+    "SELECT 1",
+    "ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default 0"
+));
+
+PREPARE pr_oum707 FROM @st_oum707;
+EXECUTE pr_oum707;
+DEALLOCATE PREPARE pr_oum707;
+
+ALTER TABLE tserver_export_data MODIFY `module_name` varchar(600) BINARY NOT NULL default '';
+
+COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index f37c3244ae..b3174434db 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1408,16 +1408,10 @@ ALTER TABLE tserver_export MODIFY `name` varchar(600) BINARY NOT NULL default ''
 -- Table `tgraph_source` column 'id_server'
 -- ---------------------------------------------------------------------
 
-START TRANSACTION;
+ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default 0;
 
-SET @st_oum707 = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'tgraph_source' AND table_schema = DATABASE() AND column_name = 'id_server') > 0,
-    "SELECT 1",
-	"ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default 0"
-));
+-- ---------------------------------------------------------------------
+-- Table `tserver_export_data`
+-- ---------------------------------------------------------------------
 
-PREPARE pr_oum707 FROM @st_oum707;
-EXECUTE pr_oum707;
-DEALLOCATE PREPARE pr_oum707;
-
-COMMIT;
\ No newline at end of file
+ALTER TABLE tserver_export_data MODIFY `module_name` varchar(600) BINARY NOT NULL default '';
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 75b93af530..2166167065 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1418,7 +1418,7 @@ CREATE TABLE IF NOT EXISTS `tserver_export_data` (
 	`id` int(20) unsigned NOT NULL auto_increment,
 	`id_export_server` int(10) unsigned default NULL,
 	`agent_name` varchar(100) NOT NULL default '',
-	`module_name` varchar(100) NOT NULL default '',
+	`module_name` varchar(600) NOT NULL default '',
 	`module_type` varchar(100) NOT NULL default '',
 	`data` varchar(255) default NULL, 
 	`timestamp` datetime NOT NULL default '1970-01-01 00:00:00',

From 6a2d3a7011e365421aa4df2cde397c43283ec521 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 7 Aug 2017 17:02:56 +0200
Subject: [PATCH 092/157] fixed minor error

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

diff --git a/pandora_console/godmode/reporting/create_container.php b/pandora_console/godmode/reporting/create_container.php
index 9be93af597..b77588f589 100644
--- a/pandora_console/godmode/reporting/create_container.php
+++ b/pandora_console/godmode/reporting/create_container.php
@@ -76,7 +76,7 @@ if (is_ajax()){
         $agent_alias = get_parameter('agent_alias','');
 		$module_name = get_parameter('module_name','');
 		$tag = get_parameter('tag',0);
-        $only_avg = (bool) get_parameter('only_avg');
+        $only_avg_dyn = get_parameter('only_avg',0);
 
 		$values = array(
     		'id_container' => $id_container2,
@@ -87,7 +87,7 @@ if (is_ajax()){
 			'agent' => $agent_alias,
 			'module' => $module_name,
         	'id_tag' => $tag,
-            'only_average' => $only_avg);
+            'only_average' => $only_avg_dyn);
 		$id_item = db_process_sql_insert('tcontainer_item', $values);
 		return;
 	}

From d5cff431281835115add2030760b9ac5c6eb5afb Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 8 Aug 2017 00:01:14 +0200
Subject: [PATCH 093/157] 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 1600284bcf..15d41ba7f2 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.709-170807
+Version: 7.0NG.709-170808
 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 8802a4d681..43e962649f 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.709-170807"
+pandora_version="7.0NG.709-170808"
 
 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 62a49f81bf..a2c8d82e9f 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.709';
-use constant AGENT_BUILD => '170807';
+use constant AGENT_BUILD => '170808';
 
 # 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 8760f149f9..71e7f1dde8 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.709
-%define release     170807
+%define release     170808
 
 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 bf3ff34e59..6d475e5168 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.709
-%define release     170807
+%define release     170808
 
 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 b04e47f701..5371bbf3cd 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170807"
+PI_BUILD="170808"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 2ccdc610f1..1c3a63d517 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170807}
+{170808}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 1630d61ac6..965e91c17d 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.709(Build 170807)")
+#define PANDORA_VERSION ("7.0NG.709(Build 170808)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index fc46ee253c..d29a75bf6a 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.709(Build 170807))"
+      VALUE "ProductVersion", "(7.0NG.709(Build 170808))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index d8f8fdb5d0..2c5e635415 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.709-170807
+Version: 7.0NG.709-170808
 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 3beab55d45..56417e3ede 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.709-170807"
+pandora_version="7.0NG.709-170808"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 072114f230..713444d48b 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 = 'PC170807';
+$build_version = 'PC170808';
 $pandora_version = 'v7.0NG.709';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 8415462224..101163c446 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.709';
-$build = '170807';
+$build = '170808';
 			$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 8fec317430..530da49c5f 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.709
-%define release     170807
+%define release     170808
 
 # 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 72e6d3cd70..9c0bb2605c 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.709
-%define release     170807
+%define release     170808
 %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 16074bf3e8..3443b45153 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.709-170807
+Version: 7.0NG.709-170808
 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 d807c23db9..894776889f 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.709-170807"
+pandora_version="7.0NG.709-170808"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index ec13596e6a..592e7838b7 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.709";
-my $pandora_build = "170807";
+my $pandora_build = "170808";
 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 bbc5cb410a..034cfec5d6 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.709
-%define release     170807
+%define release     170808
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 2e0c19b451..d7e1935916 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.709
-%define release     170807
+%define release     170808
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7bd7534251..c67d2beb0f 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170807"
+PI_BUILD="170808"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 0f109b13fe..e75eb5ce0e 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.709 PS170807";
+my $version = "7.0NG.709 PS170808";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 05930b4ff5..fe57962efb 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.709 PS170807";
+my $version = "7.0NG.709 PS170808";
 
 # save program name for logging
 my $progname = basename($0);

From 3ef3679f10dca14cefc8485329bcb31c81f9dd93 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 8 Aug 2017 10:38:30 +0200
Subject: [PATCH 094/157] Fixed issue with cascade_protection_module

---
 pandora_console/extras/mr/6.sql                              | 5 +++++
 .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql            | 2 +-
 pandora_console/godmode/agentes/configurar_agente.php        | 2 +-
 pandora_console/pandoradb.sql                                | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 pandora_console/extras/mr/6.sql

diff --git a/pandora_console/extras/mr/6.sql b/pandora_console/extras/mr/6.sql
new file mode 100644
index 0000000000..aeb94260bf
--- /dev/null
+++ b/pandora_console/extras/mr/6.sql
@@ -0,0 +1,5 @@
+START TRANSACTION;
+
+ALTER TABLE tagente MODIFY COLUMN `cascade_protection_module` int(10) unsigned NOT NULL default '0';
+
+COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index b3174434db..6a7783bcfa 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1215,7 +1215,7 @@ ALTER TABLE tnetwork_component ADD COLUMN `dynamic_two_tailed` tinyint(1) unsign
 -- ---------------------------------------------------------------------
 ALTER TABLE tagente ADD `transactional_agent` tinyint(1) NOT NULL default 0;
 ALTER TABLE tagente ADD `remote` tinyint(1) NOT NULL default 0;
-ALTER TABLE tagente ADD `cascade_protection_module` int(10) unsigned default '0';
+ALTER TABLE tagente ADD COLUMN `cascade_protection_module` int(10) unsigned NOT NULL default '0';
 ALTER TABLE tagente ADD COLUMN (alias varchar(600) not null default '');
 ALTER TABLE tagente ADD `alias_as_name` int(2) unsigned default '0';
 
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 613cf8ef29..dd5986a2c4 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -789,7 +789,7 @@ if ($update_agent) { // if modified some agent paramenter
 				WHERE id_group = ".$group_old);
 		
 		$result = db_process_sql_update ('tagente', $values, array ('id_agente' => $id_agente));
-		if ($result === false) {
+		if ($result == false) {
 			ui_print_error_message(
 				__('There was a problem updating the agent'));
 		}
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 2166167065..7167c79281 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -67,7 +67,7 @@ CREATE TABLE IF NOT EXISTS `tagente` (
 	`custom_id` varchar(255) default '',
 	`server_name` varchar(100) default '',
 	`cascade_protection` tinyint(2) NOT NULL default '0',
-	`cascade_protection_module` tinyint(2) NOT NULL default '0',
+	`cascade_protection_module` int(10) unsigned NOT NULL default '0',
 	`timezone_offset` TINYINT(2) NULL DEFAULT '0' COMMENT 'nuber of hours of diference with the server timezone' ,
 	`icon_path` VARCHAR(127) NULL DEFAULT NULL COMMENT 'path in the server to the image of the icon representing the agent' ,
 	`update_gis_data` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'set it to one to update the position data (altitude, longitude, latitude) when getting information from the agent or to 0 to keep the last value and do not update it' ,

From 4cbd0051373c65e37102fddc4326d3b672bb0640 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 8 Aug 2017 12:07:28 +0200
Subject: [PATCH 095/157] fixed error in graph container

---
 .../godmode/reporting/create_container.php    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/reporting/create_container.php b/pandora_console/godmode/reporting/create_container.php
index b77588f589..1ff4ed3aa1 100644
--- a/pandora_console/godmode/reporting/create_container.php
+++ b/pandora_console/godmode/reporting/create_container.php
@@ -41,8 +41,13 @@ if (is_ajax()){
         $id_agent = get_parameter('id_agent');
         $id_agent_module = get_parameter('id_agent_module');
         $time_lapse = get_parameter('time_lapse');
-        $only_avg = (bool) get_parameter('only_avg');
-        
+        $only_avg = get_parameter('only_avg');
+        if($only_avg != 'false'){
+            $only_avg = 1;
+        }
+        else{
+            $only_avg = 0;   
+        }
         $values = array(
             'id_container' => $id_container2,
             'type' => "simple_graph",
@@ -76,8 +81,13 @@ if (is_ajax()){
         $agent_alias = get_parameter('agent_alias','');
 		$module_name = get_parameter('module_name','');
 		$tag = get_parameter('tag',0);
-        $only_avg_dyn = get_parameter('only_avg',0);
-
+        $only_avg = get_parameter('only_avg');
+        if($only_avg != 'false'){
+            $only_avg = 1;
+        }
+        else{
+            $only_avg = 0;   
+        }
 		$values = array(
     		'id_container' => $id_container2,
         	'type' => "dynamic_graph",
@@ -87,7 +97,7 @@ if (is_ajax()){
 			'agent' => $agent_alias,
 			'module' => $module_name,
         	'id_tag' => $tag,
-            'only_average' => $only_avg_dyn);
+            'only_average' => $only_avg);
 		$id_item = db_process_sql_insert('tcontainer_item', $values);
 		return;
 	}
@@ -437,7 +447,7 @@ if($edit_container){
     
     $data = array();
     $data[0] =  __('Only average');
-    $data[1] = html_print_checkbox('only_avg', 1, false,true);
+    $data[1] = html_print_checkbox('only_avg_2', 1, false,true);
     $table->data[] = $data;
     $table->rowclass[] = '';
      
@@ -599,7 +609,7 @@ echo html_print_input_hidden('id_agent', 0);
 			var group = $("#container_id_group1").val();
 			var module_group = $("#combo_modulegroup").val();
 			var tag = $("#tag").val();
-            var only_avg = $("#checkbox-only_avg1").prop("checked");
+            var only_avg = $("#checkbox-only_avg_2").prop("checked");
 	        var id_container = <?php echo $id_container; ?>;
             jQuery.post ("ajax.php",
     			{"page" : "godmode/reporting/create_container",

From 032995fc83b2f943bd04ca69ea32dd29b065526d Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 8 Aug 2017 14:59:30 +0200
Subject: [PATCH 096/157] Disabled select for not admins

---
 pandora_console/operation/agentes/stat_win.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 5199f58506..7e76b2fabc 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -531,4 +531,14 @@ ui_include_time_picker(true);
 	$(window).resize(function() {
 		$("#field_list").css('height', ($(window).height() - 160) + 'px');
 	});
+	
+	<?php
+	// If the user is not an admin, not allowed to change the time range
+	if (!users_is_admin()) {
+	?>
+		$("#period_select").attr('disabled', 'disabled');
+		
+	<?php
+	}
+	?>
 </script>

From f96032eeaa5da058d6b2f6d558597c15bf28e68e Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 9 Aug 2017 00:01:15 +0200
Subject: [PATCH 097/157] 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 15d41ba7f2..8c06d4c68c 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.709-170808
+Version: 7.0NG.709-170809
 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 43e962649f..6cec456223 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.709-170808"
+pandora_version="7.0NG.709-170809"
 
 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 a2c8d82e9f..9ecda1d16d 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.709';
-use constant AGENT_BUILD => '170808';
+use constant AGENT_BUILD => '170809';
 
 # 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 71e7f1dde8..b1dca5a181 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.709
-%define release     170808
+%define release     170809
 
 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 6d475e5168..29ca24cc08 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.709
-%define release     170808
+%define release     170809
 
 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 5371bbf3cd..9bc0d6c4ba 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170808"
+PI_BUILD="170809"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 1c3a63d517..b3aa936cb0 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170808}
+{170809}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 965e91c17d..e9ee752438 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.709(Build 170808)")
+#define PANDORA_VERSION ("7.0NG.709(Build 170809)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index d29a75bf6a..732e897082 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.709(Build 170808))"
+      VALUE "ProductVersion", "(7.0NG.709(Build 170809))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 2c5e635415..4ffbd96f74 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.709-170808
+Version: 7.0NG.709-170809
 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 56417e3ede..05b9d583d7 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.709-170808"
+pandora_version="7.0NG.709-170809"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 713444d48b..a5e16e3ff6 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 = 'PC170808';
+$build_version = 'PC170809';
 $pandora_version = 'v7.0NG.709';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 101163c446..b9549887a7 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.709';
-$build = '170808';
+$build = '170809';
 			$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 530da49c5f..5f49fe6122 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.709
-%define release     170808
+%define release     170809
 
 # 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 9c0bb2605c..bef926d4fa 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.709
-%define release     170808
+%define release     170809
 %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 3443b45153..11398c049b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.709-170808
+Version: 7.0NG.709-170809
 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 894776889f..0f183155f5 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.709-170808"
+pandora_version="7.0NG.709-170809"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 592e7838b7..d896f50d90 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.709";
-my $pandora_build = "170808";
+my $pandora_build = "170809";
 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 034cfec5d6..1a7f81f5d8 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.709
-%define release     170808
+%define release     170809
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index d7e1935916..687ed87317 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.709
-%define release     170808
+%define release     170809
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index c67d2beb0f..bb62d65e4d 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170808"
+PI_BUILD="170809"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e75eb5ce0e..f1ab743f38 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.709 PS170808";
+my $version = "7.0NG.709 PS170809";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index fe57962efb..b7dc19e4ae 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.709 PS170808";
+my $version = "7.0NG.709 PS170809";
 
 # save program name for logging
 my $progname = basename($0);

From e250e0eeae71335d7f080c4b7d694c0018b824ff Mon Sep 17 00:00:00 2001
From: vgilc <vanessa.gil@artica.es>
Date: Wed, 9 Aug 2017 09:27:06 +0200
Subject: [PATCH 098/157] =?UTF-8?q?Revert=20"Merge=20branch=20'1196-Time-r?=
 =?UTF-8?q?ange-en-gr=C3=A1ficas-de-m=C3=B3dulo-dev'=20into=20'develop'"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts merge request !722
---
 pandora_console/operation/agentes/stat_win.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 7e76b2fabc..5199f58506 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -531,14 +531,4 @@ ui_include_time_picker(true);
 	$(window).resize(function() {
 		$("#field_list").css('height', ($(window).height() - 160) + 'px');
 	});
-	
-	<?php
-	// If the user is not an admin, not allowed to change the time range
-	if (!users_is_admin()) {
-	?>
-		$("#period_select").attr('disabled', 'disabled');
-		
-	<?php
-	}
-	?>
 </script>

From be0a91ed2c30dcebca1632d2702df37f6dfb6c44 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 9 Aug 2017 10:35:57 +0200
Subject: [PATCH 099/157] fixed minor error sql delete module

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

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 613cf8ef29..c5ee3b6c88 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1528,7 +1528,7 @@ if ($delete_module) { // DELETE agent module !
 		$error++;
 	
 	if (alerts_delete_alert_agent_module(false, 
-			array('id_agente_module' => $id_borrar_modulo)) === false)
+			array('id_agent_module' => $id_borrar_modulo)) === false)
 		$error++;
 	
 	$result = db_process_delete_temp('ttag_module', 'id_agente_modulo',

From 2bcc01c9ba2ce13e86917d24e4d71163e41b5f3f Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 9 Aug 2017 11:33:12 +0200
Subject: [PATCH 100/157] Fixed time range with user no admin

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

diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php
index 5dce55b101..8d676b4340 100644
--- a/pandora_console/operation/agentes/interface_traffic_graph_win.php
+++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php
@@ -139,7 +139,10 @@ $interface_traffic_modules = array(
 		}
 		
 		// Get input parameters
-		$period = (int) get_parameter('period', SECONDS_1HOUR);
+		$period = get_parameter ("period");
+		if ($period == "") {
+			$period = get_parameter ("period_select", SECONDS_1DAY);
+		}
 		$width = (int) get_parameter("width", 555);
 		$height = (int) get_parameter("height", 245);
 		$start_date = (string) get_parameter("start_date", date("Y-m-d"));

From bbe63a30ec7fdc01ee38ddbf6cfc6e7b3ff48901 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 10 Aug 2017 00:01:15 +0200
Subject: [PATCH 101/157] 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 8c06d4c68c..5f9c101616 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.709-170809
+Version: 7.0NG.709-170810
 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 6cec456223..1c6b787d4d 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.709-170809"
+pandora_version="7.0NG.709-170810"
 
 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 9ecda1d16d..c16468b92e 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.709';
-use constant AGENT_BUILD => '170809';
+use constant AGENT_BUILD => '170810';
 
 # 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 b1dca5a181..a778ccc059 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.709
-%define release     170809
+%define release     170810
 
 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 29ca24cc08..2b281df13a 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.709
-%define release     170809
+%define release     170810
 
 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 9bc0d6c4ba..f1b8644da7 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170809"
+PI_BUILD="170810"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index b3aa936cb0..f2bb362264 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170809}
+{170810}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e9ee752438..8708179d46 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.709(Build 170809)")
+#define PANDORA_VERSION ("7.0NG.709(Build 170810)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 732e897082..16b6a3f779 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.709(Build 170809))"
+      VALUE "ProductVersion", "(7.0NG.709(Build 170810))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 4ffbd96f74..6cce8d6b78 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.709-170809
+Version: 7.0NG.709-170810
 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 05b9d583d7..558d712f0f 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.709-170809"
+pandora_version="7.0NG.709-170810"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a5e16e3ff6..04205964f6 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 = 'PC170809';
+$build_version = 'PC170810';
 $pandora_version = 'v7.0NG.709';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b9549887a7..9342f42eb5 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.709';
-$build = '170809';
+$build = '170810';
 			$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 5f49fe6122..4e81f047f1 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.709
-%define release     170809
+%define release     170810
 
 # 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 bef926d4fa..028007fa45 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.709
-%define release     170809
+%define release     170810
 %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 11398c049b..fa9da78954 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.709-170809
+Version: 7.0NG.709-170810
 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 0f183155f5..b80cf947b8 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.709-170809"
+pandora_version="7.0NG.709-170810"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d896f50d90..25cbf9b6c3 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.709";
-my $pandora_build = "170809";
+my $pandora_build = "170810";
 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 1a7f81f5d8..384f0b81af 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.709
-%define release     170809
+%define release     170810
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 687ed87317..dd35d77efd 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.709
-%define release     170809
+%define release     170810
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index bb62d65e4d..686c6476ff 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.709"
-PI_BUILD="170809"
+PI_BUILD="170810"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index f1ab743f38..11a1c80dbe 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.709 PS170809";
+my $version = "7.0NG.709 PS170810";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index b7dc19e4ae..20a6a93824 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.709 PS170809";
+my $version = "7.0NG.709 PS170810";
 
 # save program name for logging
 my $progname = basename($0);

From 8309e4fffb6f26fbfa00782bf0e2ea3502d2f4d5 Mon Sep 17 00:00:00 2001
From: artica <git@artica.es>
Date: Thu, 10 Aug 2017 10:37:06 +0200
Subject: [PATCH 102/157] 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 77d34249b3..de9e79aa1d 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.709, AIX version
+# Version 7.0NG.710, 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 f33e609eeb..ee89a53dbb 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.709, FreeBSD Version
+# Version 7.0NG.710, 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 e17adcc4c3..5f5de4fa76 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.709, HP-UX Version
+# Version 7.0NG.710, 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 a5ba94c7ee..5093e1effa 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.709, GNU/Linux
+# Version 7.0NG.710, 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 77e78b23f2..3afa73c7b0 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.709, GNU/Linux
+# Version 7.0NG.710, 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 8ee5d38f40..ef6d1fdef8 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.709, Solaris Version
+# Version 7.0NG.710, 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 2ebef28d78..fa941aa97b 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.709
+# Version 7.0NG.710
 
 # 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 987de91b06..07e7ad3da0 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.709, AIX version
+# Version 7.0NG.710, 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 712756d13c..63f463a932 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.709
+# Version 7.0NG.710
 # 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 7113ea627b..20951ab529 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.709, HPUX Version
+# Version 7.0NG.710, HPUX Version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index b35313bcc4..3a2d4a3e4b 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.709
+# Version 7.0NG.710
 # 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 609632ea33..88b68a7a25 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.709
+# Version 7.0NG.710
 # 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 00abe55972..54ece23c85 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.709
+# Version 7.0NG.710
 # 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 abbb8bd535..70cd00c95f 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.709, Solaris version
+# Version 7.0NG.710, Solaris version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 914716f866..5c0c53125b 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.709, AIX version
+# Version 7.0NG.710, 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 5f9c101616..902bb45aa6 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.709-170810
+Version: 7.0NG.710
 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 1c6b787d4d..b0cbcc9f56 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.709-170810"
+pandora_version="7.0NG.710"
 
 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 a1d986c5c3..be6d94e65a 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.709, GNU/Linux
+# Version 7.0NG.710, 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 bbfe88e1fa..6862ed1ee6 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.709, FreeBSD Version
+# Version 7.0NG.710, 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 50ccf8fe55..57c45b4df6 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.709, HP-UX Version
+# Version 7.0NG.710, 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 af2bd05ab3..842a51aad7 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.709, GNU/Linux
+# Version 7.0NG.710, 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 4b97428ffe..b8c11f135e 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.709, GNU/Linux
+# Version 7.0NG.710, 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 63bddc1d66..6c8eb8b422 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.709, NetBSD Version
+# Version 7.0NG.710, 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 24902ea131..5a4f581471 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.709, Solaris Version
+# Version 7.0NG.710, 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 c16468b92e..459b91d04f 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.709';
+use constant AGENT_VERSION => '7.0NG.710';
 use constant AGENT_BUILD => '170810';
 
 # 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 a778ccc059..5028e2ef7d 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.709
-%define release     170810
+%define version     7.0NG.710
+%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 2b281df13a..c072a4ecef 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.709
-%define release     170810
+%define version     7.0NG.710
+%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 f1b8644da7..faafc5642d 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.709"
+PI_VERSION="7.0NG.710"
 PI_BUILD="170810"
 OS_NAME=`uname -s`
 
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index ca2b3526f4..ea387c7f6b 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.709
+# Version 7.0NG.710
 
 # 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 f2bb362264..96786e4f32 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.709}
+{Pandora FMS Windows Agent v7.0NG.710}
 
 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 8708179d46..74a349e35a 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.709(Build 170810)")
+#define PANDORA_VERSION ("7.0NG.710(Build 170810)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 16b6a3f779..acbd8469c6 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.709(Build 170810))"
+      VALUE "ProductVersion", "(7.0NG.710(Build 170810))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 6cce8d6b78..5302798b19 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.709-170810
+Version: 7.0NG.710
 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 558d712f0f..38b0546630 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.709-170810"
+pandora_version="7.0NG.710"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 04205964f6..38c24ddd10 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 = 'PC170810';
-$pandora_version = 'v7.0NG.709';
+$pandora_version = 'v7.0NG.710';
 
 // 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 9342f42eb5..470f146d80 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -70,7 +70,7 @@
 	<body>
 		<div style='height: 10px'>
 			<?php
-$version = '7.0NG.709';
+$version = '7.0NG.710';
 $build = '170810';
 			$banner = "v$version Build $build";
 			
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 4e81f047f1..9727f79783 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.709
-%define release     170810
+%define version     7.0NG.710
+%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 028007fa45..858cd1163d 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.709
-%define release     170810
+%define version     7.0NG.710
+%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 07d8861f92..e97eeaea5d 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.709"
+PI_VERSION="7.0NG.710"
 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 c36186aff9..cb8ef110dc 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -112,7 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('MR', 4),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
-('current_package_enterprise', '709'),
+('current_package_enterprise', '710'),
 ('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 fa9da78954..65563a64b6 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.709-170810
+Version: 7.0NG.710
 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 b80cf947b8..17cf55238c 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.709-170810"
+pandora_version="7.0NG.710"
 
 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 1ffe5739f0..fc80bf8d54 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.709
+# Version 7.0NG.710
 # 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 25cbf9b6c3..c2253c7a35 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.709";
+my $pandora_version = "7.0NG.710";
 my $pandora_build = "170810";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 384f0b81af..d3c543c7d3 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.709
-%define release     170810
+%define version     7.0NG.710
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index dd35d77efd..5cefc620a6 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.709
-%define release     170810
+%define version     7.0NG.710
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 686c6476ff..1dc6ef03b7 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.709"
+PI_VERSION="7.0NG.710"
 PI_BUILD="170810"
 
 MODE=$1
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 11a1c80dbe..cf31c6d55a 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.709 PS170810";
+my $version = "7.0NG.710 PS170810";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 20a6a93824..c040e86b9f 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.709 PS170810";
+my $version = "7.0NG.710 PS170810";
 
 # save program name for logging
 my $progname = basename($0);

From e1d4a81034c200b6119eb6f6b1b09d05afcbbadf Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Thu, 10 Aug 2017 15:45:53 +0200
Subject: [PATCH 103/157] Fixed issue with simple value

---
 pandora_console/include/ajax/visual_console_builder.ajax.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 580a089b4e..6f2bae0b40 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -457,7 +457,6 @@ switch ($action) {
 					$values['period'] = $period;
 					$values['width'] = $width;
 				}
-				break;
 			case 'percentile_bar':
 			case 'percentile_item':
 			case 'static_graph':

From 0915e46e4c7592d99a0183b35bedfcd7ba39d73b Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 10 Aug 2017 17:45:00 +0200
Subject: [PATCH 104/157] fixed errors in visual console on simple value

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

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 1869e8cb39..e88c1ffe02 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1538,7 +1538,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 			if(get_parameter('action') == 'edit'){
 								//html_debug($layoutData);
 				//echo 'Data value';
-				if(strip_tags($io_safe_output_text) != '_VALUE_'){
+				if( (strip_tags($io_safe_output_text) != '_VALUE_') || (strip_tags($io_safe_output_text) != '(_VALUE_)') ){
 					echo $io_safe_output_text;
 				}
 				else{

From 941341585e167c634b5d76984afd8f6ddfc92ac5 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 11 Aug 2017 00:01:13 +0200
Subject: [PATCH 105/157] 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 902bb45aa6..e12de89272 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.710
+Version: 7.0NG.710-170811
 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 b0cbcc9f56..42a1f4e3ae 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.710"
+pandora_version="7.0NG.710-170811"
 
 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 459b91d04f..e545115c26 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.710';
-use constant AGENT_BUILD => '170810';
+use constant AGENT_BUILD => '170811';
 
 # 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 5028e2ef7d..251303a761 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.710
-%define release     1
+%define release     170811
 
 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 c072a4ecef..891ecc8522 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.710
-%define release     1
+%define release     170811
 
 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 faafc5642d..dd7aa395e6 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170810"
+PI_BUILD="170811"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 96786e4f32..fdc8ac959e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170810}
+{170811}
 
 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 74a349e35a..92b35794bf 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.710(Build 170810)")
+#define PANDORA_VERSION ("7.0NG.710(Build 170811)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index acbd8469c6..703bbe6867 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.710(Build 170810))"
+      VALUE "ProductVersion", "(7.0NG.710(Build 170811))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 5302798b19..72f215144b 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.710
+Version: 7.0NG.710-170811
 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 38b0546630..7e3f1bc402 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.710"
+pandora_version="7.0NG.710-170811"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 38c24ddd10..9a6d07402d 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 = 'PC170810';
+$build_version = 'PC170811';
 $pandora_version = 'v7.0NG.710';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 470f146d80..fd83bc4054 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.710';
-$build = '170810';
+$build = '170811';
 			$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 9727f79783..0f6d78bcc4 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.710
-%define release     1
+%define release     170811
 
 # 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 858cd1163d..b86a3a44c9 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.710
-%define release     1
+%define release     170811
 %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 65563a64b6..bc5d632274 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.710
+Version: 7.0NG.710-170811
 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 17cf55238c..fbcb4e79d4 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.710"
+pandora_version="7.0NG.710-170811"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index c2253c7a35..a35a3ed41b 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.710";
-my $pandora_build = "170810";
+my $pandora_build = "170811";
 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 d3c543c7d3..6469c09797 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.710
-%define release     1
+%define release     170811
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 5cefc620a6..efa350265a 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.710
-%define release     1
+%define release     170811
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 1dc6ef03b7..c325069958 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170810"
+PI_BUILD="170811"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index cf31c6d55a..d4b82a9b4d 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.710 PS170810";
+my $version = "7.0NG.710 PS170811";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index c040e86b9f..b4a0f45e17 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.710 PS170810";
+my $version = "7.0NG.710 PS170811";
 
 # save program name for logging
 my $progname = basename($0);

From 33ccab173ec9d97bca4f23bd4aeba76caa3f6f45 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 11 Aug 2017 09:13:26 +0200
Subject: [PATCH 106/157] fixed errors visual console

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

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index ee2c23c5de..00d86be5a1 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -412,7 +412,9 @@ function update_button_palette_callback() {
 					return;
 			}
 			$("#" + idItem).html(values['label']);
-			if(values['label'].replace( /<.*?>/g, '' ) == '_VALUE_'){
+			if( (values['label'].replace( /<.*?>/g, '' ) != '_VALUE_') 
+				&& (values['label'].replace( /<.*?>/g, '' ) != '(_VALUE_)') ){
+
 				$("#text_" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">');
 				$("#" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">');
 			}
@@ -2751,8 +2753,6 @@ function updateDB(type, idElement , values, event) {
 			update_user_line(type, idElement, top, left);
 			break;
 		default:
-			console.log(values);
-			console.log(idElement);
 			if ((typeof(values['mov_left']) != 'undefined') &&
 				(typeof(values['mov_top']) != 'undefined')) {
 				top = parseInt($("#" + idElement)
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index e88c1ffe02..3ea05cc8b1 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1547,7 +1547,10 @@ function visual_map_print_item($mode = "read", $layoutData,
 								
 				}
 			else{
-				if(strip_tags($io_safe_output_text) != '_VALUE_'){
+				if(strip_tags($io_safe_output_text) == '_VALUE_'){
+					echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
+				}
+				elseif(strip_tags($io_safe_output_text) == '(_VALUE_)'){
 					echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
 				}
 				else{

From 9760a7b7fe2bd5c76907ac86631b0a7ee2894ea3 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Fri, 11 Aug 2017 11:10:35 +0200
Subject: [PATCH 107/157] Add perl-Test-WWW-Selenium to the testing Docker
 image.

(cherry picked from commit f6c3922bba23b290b71ff742eb13807563ad3fd6)
---
 tests/enterprise_base/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/enterprise_base/Dockerfile b/tests/enterprise_base/Dockerfile
index c4bd6406e0..c99b835c19 100644
--- a/tests/enterprise_base/Dockerfile
+++ b/tests/enterprise_base/Dockerfile
@@ -2,7 +2,7 @@ FROM pandorafms/pandorafms-base
 MAINTAINER Pandora FMS Team <info@pandorafms.com>
 
 # Pandora FMS Server dependencies
-RUN yum install -y fping
+RUN yum install -y fping perl-Test-WWW-Selenium
 
 RUN ln -s /usr/bin/braa /usr/local/bin/braa
 

From 5973ec75455fc3989d125dc76086765e85deb330 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Fri, 11 Aug 2017 11:48:25 +0200
Subject: [PATCH 108/157] fixed errors in visual console on simple value 2

---
 .../reporting/visual_console_builder.editor.js       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 00d86be5a1..3cea48be21 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -405,12 +405,12 @@ function update_button_palette_callback() {
 			break;
 		case 'simple_value':
 		//checkpoint
-			if(($('#text-label_ifr').contents().find('#tinymce p').html() == '_VALUE_' || 
-			$('#text-label_ifr').contents().find('#tinymce').html() == '_VALUE_') 
-			&& $('#data_image_check').html() != 'On'){
-					alert('_VALUE_ exactly value is only enable for data image. Please change label text or select a data image module.');
-					return;
-			}
+			// if(($('#text-label_ifr').contents().find('#tinymce p').html() == '_VALUE_' || 
+			// $('#text-label_ifr').contents().find('#tinymce').html() == '_VALUE_') 
+			// && $('#data_image_check').html() != 'On'){
+			// 		alert('_VALUE_ exactly value is only enable for data image. Please change label text or select a data image module.');
+			// 		return;
+			// }
 			$("#" + idItem).html(values['label']);
 			if( (values['label'].replace( /<.*?>/g, '' ) != '_VALUE_') 
 				&& (values['label'].replace( /<.*?>/g, '' ) != '(_VALUE_)') ){

From bc022aba2b2c203890b17db9e3d37ddec9dc01fd Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 12 Aug 2017 00:01:13 +0200
Subject: [PATCH 109/157] 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 e12de89272..8cdcbaf013 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.710-170811
+Version: 7.0NG.710-170812
 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 42a1f4e3ae..cc69f188a1 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.710-170811"
+pandora_version="7.0NG.710-170812"
 
 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 e545115c26..01ae1677db 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.710';
-use constant AGENT_BUILD => '170811';
+use constant AGENT_BUILD => '170812';
 
 # 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 251303a761..0609402ba2 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.710
-%define release     170811
+%define release     170812
 
 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 891ecc8522..4b6b6bbb7c 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.710
-%define release     170811
+%define release     170812
 
 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 dd7aa395e6..58f5b57347 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170811"
+PI_BUILD="170812"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index fdc8ac959e..c51ffbb968 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170811}
+{170812}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 92b35794bf..3c72052baf 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.710(Build 170811)")
+#define PANDORA_VERSION ("7.0NG.710(Build 170812)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 703bbe6867..bd59ca7433 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.710(Build 170811))"
+      VALUE "ProductVersion", "(7.0NG.710(Build 170812))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 72f215144b..2b16b31616 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.710-170811
+Version: 7.0NG.710-170812
 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 7e3f1bc402..32b2b62b97 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.710-170811"
+pandora_version="7.0NG.710-170812"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 9a6d07402d..f58f4c33be 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 = 'PC170811';
+$build_version = 'PC170812';
 $pandora_version = 'v7.0NG.710';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index fd83bc4054..9fee2f83e1 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.710';
-$build = '170811';
+$build = '170812';
 			$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 0f6d78bcc4..3ba6eacc37 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.710
-%define release     170811
+%define release     170812
 
 # 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 b86a3a44c9..e8da1721c1 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.710
-%define release     170811
+%define release     170812
 %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 bc5d632274..a46197cc07 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.710-170811
+Version: 7.0NG.710-170812
 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 fbcb4e79d4..e6fc6f6adc 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.710-170811"
+pandora_version="7.0NG.710-170812"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index a35a3ed41b..292b9d9eeb 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.710";
-my $pandora_build = "170811";
+my $pandora_build = "170812";
 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 6469c09797..39e7edffa5 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.710
-%define release     170811
+%define release     170812
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index efa350265a..186cb523c7 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.710
-%define release     170811
+%define release     170812
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index c325069958..6b22603f0c 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170811"
+PI_BUILD="170812"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d4b82a9b4d..35a0d47e3d 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.710 PS170811";
+my $version = "7.0NG.710 PS170812";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index b4a0f45e17..fcce27337e 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.710 PS170811";
+my $version = "7.0NG.710 PS170812";
 
 # save program name for logging
 my $progname = basename($0);

From cc7b00bb3918bf3396562ddc18425b90465c22cb Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 13 Aug 2017 00:01:12 +0200
Subject: [PATCH 110/157] 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 8cdcbaf013..1e6912e9af 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.710-170812
+Version: 7.0NG.710-170813
 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 cc69f188a1..a79d69ee92 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.710-170812"
+pandora_version="7.0NG.710-170813"
 
 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 01ae1677db..1d343901ec 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.710';
-use constant AGENT_BUILD => '170812';
+use constant AGENT_BUILD => '170813';
 
 # 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 0609402ba2..719c204c34 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.710
-%define release     170812
+%define release     170813
 
 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 4b6b6bbb7c..8e64e6936d 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.710
-%define release     170812
+%define release     170813
 
 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 58f5b57347..5565101120 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170812"
+PI_BUILD="170813"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index c51ffbb968..079b7c75f4 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170812}
+{170813}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 3c72052baf..0b20eaa41c 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.710(Build 170812)")
+#define PANDORA_VERSION ("7.0NG.710(Build 170813)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index bd59ca7433..005daadacf 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.710(Build 170812))"
+      VALUE "ProductVersion", "(7.0NG.710(Build 170813))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 2b16b31616..a094ff261b 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.710-170812
+Version: 7.0NG.710-170813
 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 32b2b62b97..0b345d45d2 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.710-170812"
+pandora_version="7.0NG.710-170813"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index f58f4c33be..6278049eae 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 = 'PC170812';
+$build_version = 'PC170813';
 $pandora_version = 'v7.0NG.710';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 9fee2f83e1..111f837ed5 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.710';
-$build = '170812';
+$build = '170813';
 			$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 3ba6eacc37..45dd0549b8 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.710
-%define release     170812
+%define release     170813
 
 # 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 e8da1721c1..25131de074 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.710
-%define release     170812
+%define release     170813
 %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 a46197cc07..b1f3ab5d75 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.710-170812
+Version: 7.0NG.710-170813
 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 e6fc6f6adc..ec79690404 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.710-170812"
+pandora_version="7.0NG.710-170813"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 292b9d9eeb..1bf6498e60 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.710";
-my $pandora_build = "170812";
+my $pandora_build = "170813";
 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 39e7edffa5..5e2d6dede7 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.710
-%define release     170812
+%define release     170813
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 186cb523c7..09cf8b22f0 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.710
-%define release     170812
+%define release     170813
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 6b22603f0c..814d1c0b06 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170812"
+PI_BUILD="170813"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 35a0d47e3d..415399e744 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.710 PS170812";
+my $version = "7.0NG.710 PS170813";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index fcce27337e..bed509a331 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.710 PS170812";
+my $version = "7.0NG.710 PS170813";
 
 # save program name for logging
 my $progname = basename($0);

From 8462e9d3d55e8fead7d54bf24eaf671af0f9f645 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 14 Aug 2017 00:01:13 +0200
Subject: [PATCH 111/157] 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 1e6912e9af..d237ebbb86 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.710-170813
+Version: 7.0NG.710-170814
 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 a79d69ee92..cd388a7756 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.710-170813"
+pandora_version="7.0NG.710-170814"
 
 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 1d343901ec..bfbf06947a 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.710';
-use constant AGENT_BUILD => '170813';
+use constant AGENT_BUILD => '170814';
 
 # 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 719c204c34..960499bd88 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.710
-%define release     170813
+%define release     170814
 
 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 8e64e6936d..df40ac3401 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.710
-%define release     170813
+%define release     170814
 
 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 5565101120..912685dd4a 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170813"
+PI_BUILD="170814"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 079b7c75f4..4b2ee2bfe6 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170813}
+{170814}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 0b20eaa41c..f317542ecd 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.710(Build 170813)")
+#define PANDORA_VERSION ("7.0NG.710(Build 170814)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 005daadacf..be3cd5af52 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.710(Build 170813))"
+      VALUE "ProductVersion", "(7.0NG.710(Build 170814))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index a094ff261b..0c8325ffc5 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.710-170813
+Version: 7.0NG.710-170814
 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 0b345d45d2..3f318005a9 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.710-170813"
+pandora_version="7.0NG.710-170814"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 6278049eae..f9ec6e8fb4 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 = 'PC170813';
+$build_version = 'PC170814';
 $pandora_version = 'v7.0NG.710';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 111f837ed5..b239c780e7 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.710';
-$build = '170813';
+$build = '170814';
 			$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 45dd0549b8..4236f0d381 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.710
-%define release     170813
+%define release     170814
 
 # 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 25131de074..c4eb4a36cb 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.710
-%define release     170813
+%define release     170814
 %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 b1f3ab5d75..ea0d2596a1 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.710-170813
+Version: 7.0NG.710-170814
 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 ec79690404..bf4241b538 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.710-170813"
+pandora_version="7.0NG.710-170814"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 1bf6498e60..2b80e5f155 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.710";
-my $pandora_build = "170813";
+my $pandora_build = "170814";
 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 5e2d6dede7..1ce73e732b 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.710
-%define release     170813
+%define release     170814
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 09cf8b22f0..296fbdeca5 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.710
-%define release     170813
+%define release     170814
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 814d1c0b06..9dc6434141 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170813"
+PI_BUILD="170814"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 415399e744..008591b268 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.710 PS170813";
+my $version = "7.0NG.710 PS170814";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index bed509a331..d100737097 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.710 PS170813";
+my $version = "7.0NG.710 PS170814";
 
 # save program name for logging
 my $progname = basename($0);

From c3d1d7e397cade70abde524ab19ba6be0910fee0 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 14 Aug 2017 12:36:49 +0200
Subject: [PATCH 112/157] Xaxisname deleted from xaxes

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

diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 78510da704..ee108f10b8 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1476,7 +1476,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 			xaxes: [{
 				axisLabelFontSizePixels: font_size,
 				axisLabelUseCanvas: false,
-				axisLabel: xaxisname,
 				tickFormatter: xFormatter,
 				labelHeight: 50,
 				color: '',

From 2f8e8703b7c2ea898a510e231111d6576a9efeb3 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 14 Aug 2017 14:53:56 +0200
Subject: [PATCH 113/157] Fixed

---
 .../include/functions_visual_map.php          | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 3ea05cc8b1..8fa2492fc3 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1531,32 +1531,22 @@ function visual_map_print_item($mode = "read", $layoutData,
 				}
 			}
 			
-			//$io_safe_output_text = str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
-			
-			
-			
 			if(get_parameter('action') == 'edit'){
-								//html_debug($layoutData);
-				//echo 'Data value';
-				if( (strip_tags($io_safe_output_text) != '_VALUE_') || (strip_tags($io_safe_output_text) != '(_VALUE_)') ){
+				if( (strip_tags($io_safe_output_text) != '_VALUE_') || (strip_tags($io_safe_output_text) != '(_VALUE_)') ) {
 					echo $io_safe_output_text;
 				}
-				else{
+				else {
 					echo "<img style='width:".$layoutData['width']."px;' src='images/console/signes/data_image.png'>";
 				}
-								
+			} else {
+				if(strrpos(strip_tags($io_safe_output_text),'(_VALUE_)') !== false || (strip_tags($io_safe_output_text) == '(_VALUE_)')) {
+					echo str_replace(array("(_VALUE_)","(_value_)"), $value, $io_safe_output_text);
 				}
-			else{
-				if(strip_tags($io_safe_output_text) == '_VALUE_'){
+				elseif(strrpos(strip_tags($io_safe_output_text),'_VALUE_') !== false || (strip_tags($io_safe_output_text) == '_VALUE_')) {
 					echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
-				}
-				elseif(strip_tags($io_safe_output_text) == '(_VALUE_)'){
-					echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
-				}
-				else{
+				} else {
 					echo str_replace('>', ' style="width:'.$layoutData['width'].'px">',$value);
 				}
-				
 			}
 			
 			//Restore db connection

From a12f0de8b73207cb87a441d49f5c41475026a9c6 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 15 Aug 2017 00:01:13 +0200
Subject: [PATCH 114/157] 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 d237ebbb86..7bc2ea8fe5 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.710-170814
+Version: 7.0NG.710-170815
 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 cd388a7756..69936124c2 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.710-170814"
+pandora_version="7.0NG.710-170815"
 
 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 bfbf06947a..b1bf1dc9ec 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.710';
-use constant AGENT_BUILD => '170814';
+use constant AGENT_BUILD => '170815';
 
 # 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 960499bd88..531ed811bf 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.710
-%define release     170814
+%define release     170815
 
 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 df40ac3401..adf92a6fd2 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.710
-%define release     170814
+%define release     170815
 
 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 912685dd4a..3792da9b81 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170814"
+PI_BUILD="170815"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 4b2ee2bfe6..1e4cde523b 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170814}
+{170815}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index f317542ecd..1cd29a7a7b 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.710(Build 170814)")
+#define PANDORA_VERSION ("7.0NG.710(Build 170815)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index be3cd5af52..539861b144 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.710(Build 170814))"
+      VALUE "ProductVersion", "(7.0NG.710(Build 170815))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 0c8325ffc5..241ca8a788 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.710-170814
+Version: 7.0NG.710-170815
 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 3f318005a9..3e1bf2e1ab 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.710-170814"
+pandora_version="7.0NG.710-170815"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index f9ec6e8fb4..825e785e94 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 = 'PC170814';
+$build_version = 'PC170815';
 $pandora_version = 'v7.0NG.710';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b239c780e7..30f1e0ba24 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.710';
-$build = '170814';
+$build = '170815';
 			$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 4236f0d381..e5c16ffc8d 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.710
-%define release     170814
+%define release     170815
 
 # 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 c4eb4a36cb..6c19ec2ca6 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.710
-%define release     170814
+%define release     170815
 %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 ea0d2596a1..50aabb24b9 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.710-170814
+Version: 7.0NG.710-170815
 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 bf4241b538..ccaf354210 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.710-170814"
+pandora_version="7.0NG.710-170815"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 2b80e5f155..4666b241d8 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.710";
-my $pandora_build = "170814";
+my $pandora_build = "170815";
 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 1ce73e732b..13cc72b57d 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.710
-%define release     170814
+%define release     170815
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 296fbdeca5..f02c0ce98f 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.710
-%define release     170814
+%define release     170815
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 9dc6434141..ea87bd3730 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170814"
+PI_BUILD="170815"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 008591b268..8e179edf07 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.710 PS170814";
+my $version = "7.0NG.710 PS170815";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 34515d29bd..b6f4cc0384 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.710 PS170814";
+my $version = "7.0NG.710 PS170815";
 
 # save program name for logging
 my $progname = basename($0);

From b0f3a737a9d3128c321ba5cd7e9e58d4e024fa07 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 16 Aug 2017 00:01:15 +0200
Subject: [PATCH 115/157] 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 7bc2ea8fe5..9aa3c81c5c 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.710-170815
+Version: 7.0NG.710-170816
 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 69936124c2..74b4f8c06f 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.710-170815"
+pandora_version="7.0NG.710-170816"
 
 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 b1bf1dc9ec..e3d4c20811 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.710';
-use constant AGENT_BUILD => '170815';
+use constant AGENT_BUILD => '170816';
 
 # 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 531ed811bf..60535b98da 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.710
-%define release     170815
+%define release     170816
 
 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 adf92a6fd2..9e7f3945a7 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.710
-%define release     170815
+%define release     170816
 
 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 3792da9b81..d086362b4a 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170815"
+PI_BUILD="170816"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 1e4cde523b..46676655c9 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170815}
+{170816}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 1cd29a7a7b..e97638ef3a 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.710(Build 170815)")
+#define PANDORA_VERSION ("7.0NG.710(Build 170816)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 539861b144..9c35dd9120 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.710(Build 170815))"
+      VALUE "ProductVersion", "(7.0NG.710(Build 170816))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 241ca8a788..697371d76e 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.710-170815
+Version: 7.0NG.710-170816
 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 3e1bf2e1ab..a88382467d 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.710-170815"
+pandora_version="7.0NG.710-170816"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 825e785e94..0dd2e494d3 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 = 'PC170815';
+$build_version = 'PC170816';
 $pandora_version = 'v7.0NG.710';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 30f1e0ba24..46f20bdf5e 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.710';
-$build = '170815';
+$build = '170816';
 			$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 e5c16ffc8d..a6ebab2a6e 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.710
-%define release     170815
+%define release     170816
 
 # 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 6c19ec2ca6..f8736d9ba6 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.710
-%define release     170815
+%define release     170816
 %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 50aabb24b9..c33bbdd8d6 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.710-170815
+Version: 7.0NG.710-170816
 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 ccaf354210..4506cb695f 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.710-170815"
+pandora_version="7.0NG.710-170816"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 4666b241d8..0f1aadcad0 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.710";
-my $pandora_build = "170815";
+my $pandora_build = "170816";
 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 13cc72b57d..9ed941111e 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.710
-%define release     170815
+%define release     170816
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index f02c0ce98f..6ab9dafbb5 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.710
-%define release     170815
+%define release     170816
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index ea87bd3730..2ea1ebd1b9 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.710"
-PI_BUILD="170815"
+PI_BUILD="170816"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 8e179edf07..16a8a784a6 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.710 PS170815";
+my $version = "7.0NG.710 PS170816";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index b6f4cc0384..dc1a3b4f63 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.710 PS170815";
+my $version = "7.0NG.710 PS170816";
 
 # save program name for logging
 my $progname = basename($0);

From 571c74d55866c8cb67da6e414ec165dce8d81b0d Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 16 Aug 2017 10:16:04 +0200
Subject: [PATCH 116/157] fixed error export csv custom graph

---
 .../include/graphs/flot/jquery.flot.exportdata.pandora.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
index e8bb747901..20a2aa844f 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
@@ -34,9 +34,9 @@
 				}
 				if (dataObjects.length > 1) {
 					dataObjects.forEach(function (element) {
-						if (/^Avg.:/i.test(element.label))
+						if (/Avg.:/i.test(element.label))
 							result = element;
-						if (/^Percentil/i.test(element.label))
+						if (/Percentil/i.test(element.label))
 							result = element;
 					});
 

From 2963f18ed39c823dbdbaff83d0f4da21f9295b97 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 16 Aug 2017 12:05:17 +0200
Subject: [PATCH 117/157] Added text line in label help

---
 pandora_console/include/help/en/help_reports_label_field.php | 1 +
 pandora_console/include/help/es/help_reports_label_field.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pandora_console/include/help/en/help_reports_label_field.php b/pandora_console/include/help/en/help_reports_label_field.php
index b9a553af85..2d080be027 100755
--- a/pandora_console/include/help/en/help_reports_label_field.php
+++ b/pandora_console/include/help/en/help_reports_label_field.php
@@ -8,6 +8,7 @@
 
 The following macros are also available: <br />
 	<ul>
+	Only if you select one graph for each agent.<br />
     <li><b>_agent_ </b>: Name of the agent that you selected in report item.<li />
 	<li><b>_agentdescription_ </b>: Description of the agent that you selected in report item.<li />
     <li><b>_agentgroup_ </b>: Agent group name.<li />
diff --git a/pandora_console/include/help/es/help_reports_label_field.php b/pandora_console/include/help/es/help_reports_label_field.php
index e1f32dc8ed..c086392cfd 100755
--- a/pandora_console/include/help/es/help_reports_label_field.php
+++ b/pandora_console/include/help/es/help_reports_label_field.php
@@ -8,6 +8,7 @@
 
 Lista de las macros admitidas en este campo: <br />
 	<ul>
+	Solamente si seleccionas una gráfica por cada agente.<br />
     <li><b>_agent_ </b>: Nombre del agente que ha seleccionado en el elemento del informe.<li />
 	<li><b>_agentdescription_ </b>: Descripción del agente que ha seleccionado en el elemento del informe.<li />
     <li><b>_agentgroup_ </b>: Grupo del agente que ha seleccionado en el elemento del informe<li />

From f7ea07d559e424e58ab495881d3cca3429d86121 Mon Sep 17 00:00:00 2001
From: artica <git@artica.es>
Date: Wed, 16 Aug 2017 13:09:03 +0200
Subject: [PATCH 118/157] 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 de9e79aa1d..9a9ee70cc1 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.710, AIX version
+# Version 7.0NG.711, 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 ee89a53dbb..c8dfd8ec7c 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.710, FreeBSD Version
+# Version 7.0NG.711, 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 5f5de4fa76..4f5c2af550 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.710, HP-UX Version
+# Version 7.0NG.711, 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 5093e1effa..5eacb171ef 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.710, GNU/Linux
+# Version 7.0NG.711, 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 3afa73c7b0..67ab32afae 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.710, GNU/Linux
+# Version 7.0NG.711, 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 ef6d1fdef8..4eadf2a000 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.710, Solaris Version
+# Version 7.0NG.711, 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 fa941aa97b..44cff9478d 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.710
+# Version 7.0NG.711
 
 # 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 07e7ad3da0..c3f543ca85 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.710, AIX version
+# Version 7.0NG.711, 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 63f463a932..09735b38c4 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.710
+# Version 7.0NG.711
 # 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 20951ab529..f2bae011fb 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.710, HPUX Version
+# Version 7.0NG.711, HPUX Version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index 3a2d4a3e4b..fb96e7e51f 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.710
+# Version 7.0NG.711
 # 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 88b68a7a25..26d15d9caa 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.710
+# Version 7.0NG.711
 # 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 54ece23c85..2aca85fb6d 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.710
+# Version 7.0NG.711
 # 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 70cd00c95f..6e0bed9043 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.710, Solaris version
+# Version 7.0NG.711, Solaris version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 5c0c53125b..61992db4e7 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.710, AIX version
+# Version 7.0NG.711, 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 9aa3c81c5c..58fe272a6e 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.710-170816
+Version: 7.0NG.711
 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 74b4f8c06f..a3737e509c 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.710-170816"
+pandora_version="7.0NG.711"
 
 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 be6d94e65a..81cf4fcbf2 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.710, GNU/Linux
+# Version 7.0NG.711, 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 6862ed1ee6..ad5aeac980 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.710, FreeBSD Version
+# Version 7.0NG.711, 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 57c45b4df6..58510d7c44 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.710, HP-UX Version
+# Version 7.0NG.711, 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 842a51aad7..7700b94902 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.710, GNU/Linux
+# Version 7.0NG.711, 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 b8c11f135e..f6c0d44e14 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.710, GNU/Linux
+# Version 7.0NG.711, 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 6c8eb8b422..06b26ab115 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.710, NetBSD Version
+# Version 7.0NG.711, 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 5a4f581471..bb05f91af7 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.710, Solaris Version
+# Version 7.0NG.711, 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 e3d4c20811..bb932a463f 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.710';
+use constant AGENT_VERSION => '7.0NG.711';
 use constant AGENT_BUILD => '170816';
 
 # 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 60535b98da..9e1f93addc 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.710
-%define release     170816
+%define version     7.0NG.711
+%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 9e7f3945a7..f6c3bd95f8 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.710
-%define release     170816
+%define version     7.0NG.711
+%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 d086362b4a..10dace3264 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.710"
+PI_VERSION="7.0NG.711"
 PI_BUILD="170816"
 OS_NAME=`uname -s`
 
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index ea387c7f6b..0ebc8309ae 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.710
+# Version 7.0NG.711
 
 # 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 46676655c9..aa36f48797 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.710}
+{Pandora FMS Windows Agent v7.0NG.711}
 
 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 e97638ef3a..fd21f88974 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.710(Build 170816)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170816)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 9c35dd9120..c683f6a7de 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.710(Build 170816))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170816))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 697371d76e..0bd02f9287 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.710-170816
+Version: 7.0NG.711
 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 a88382467d..d61012a8ed 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.710-170816"
+pandora_version="7.0NG.711"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 0dd2e494d3..fbfcf8994c 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 = 'PC170816';
-$pandora_version = 'v7.0NG.710';
+$pandora_version = 'v7.0NG.711';
 
 // 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 46f20bdf5e..01558fc781 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -70,7 +70,7 @@
 	<body>
 		<div style='height: 10px'>
 			<?php
-$version = '7.0NG.710';
+$version = '7.0NG.711';
 $build = '170816';
 			$banner = "v$version Build $build";
 			
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index a6ebab2a6e..c5d7830764 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.710
-%define release     170816
+%define version     7.0NG.711
+%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 f8736d9ba6..04325641ae 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.710
-%define release     170816
+%define version     7.0NG.711
+%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 e97eeaea5d..18ea0f935a 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.710"
+PI_VERSION="7.0NG.711"
 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 cb8ef110dc..7e0f84dee6 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -112,7 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('MR', 4),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
-('current_package_enterprise', '710'),
+('current_package_enterprise', '711'),
 ('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 c33bbdd8d6..841de90372 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.710-170816
+Version: 7.0NG.711
 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 4506cb695f..6946b5101f 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.710-170816"
+pandora_version="7.0NG.711"
 
 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 fc80bf8d54..b71a5a3304 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.710
+# Version 7.0NG.711
 # 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 0f1aadcad0..c4774fc1e8 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.710";
+my $pandora_version = "7.0NG.711";
 my $pandora_build = "170816";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 9ed941111e..413f2b6967 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.710
-%define release     170816
+%define version     7.0NG.711
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6ab9dafbb5..d4c5a3d7d6 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.710
-%define release     170816
+%define version     7.0NG.711
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 2ea1ebd1b9..1beaefa90f 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.710"
+PI_VERSION="7.0NG.711"
 PI_BUILD="170816"
 
 MODE=$1
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 16a8a784a6..a8e9a2b4ce 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.710 PS170816";
+my $version = "7.0NG.711 PS170816";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index dc1a3b4f63..d9d86a737b 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.710 PS170816";
+my $version = "7.0NG.711 PS170816";
 
 # save program name for logging
 my $progname = basename($0);

From 104a1a83b4388395b34228c9eb3c66db9bbbb93c Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 16 Aug 2017 16:30:44 +0200
Subject: [PATCH 119/157] fixed minor error

---
 .../include/graphs/flot/jquery.flot.exportdata.pandora.js    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
index 20a2aa844f..18592b05c3 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
@@ -34,10 +34,7 @@
 				}
 				if (dataObjects.length > 1) {
 					dataObjects.forEach(function (element) {
-						if (/Avg.:/i.test(element.label))
-							result = element;
-						if (/Percentil/i.test(element.label))
-							result = element;
+						result = element;
 					});
 
 					// If the avg set is missing, retrieve the first set

From 059dec7cc943039e2b1a97c06bfbe76a1d3b8f37 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 16 Aug 2017 17:04:21 +0200
Subject: [PATCH 120/157] Fixed delimiter

---
 pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 3ca2979826..30f99507de 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1327,7 +1327,7 @@ IF @vv1>0 THEN
 END IF;
 END;
 //
-delimiter;
+delimiter ;
 CALL addcol();
 DROP PROCEDURE addcol;
 

From f7ecefcc60a07e83678c137fbad4ddf00807da5a Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 17 Aug 2017 00:01:13 +0200
Subject: [PATCH 121/157] 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 58fe272a6e..6502ba1d54 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711
+Version: 7.0NG.711-170817
 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 a3737e509c..9645f9b645 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.711"
+pandora_version="7.0NG.711-170817"
 
 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 bb932a463f..6c890e566e 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.711';
-use constant AGENT_BUILD => '170816';
+use constant AGENT_BUILD => '170817';
 
 # 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 9e1f93addc..a4e34ab9b2 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.711
-%define release     1
+%define release     170817
 
 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 f6c3bd95f8..664202826d 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.711
-%define release     1
+%define release     170817
 
 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 10dace3264..843d816e3c 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170816"
+PI_BUILD="170817"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index aa36f48797..9e17e82e0d 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170816}
+{170817}
 
 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 fd21f88974..6b862c126b 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.711(Build 170816)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170817)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index c683f6a7de..956152c880 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.711(Build 170816))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170817))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 0bd02f9287..45c21f7c8e 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711
+Version: 7.0NG.711-170817
 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 d61012a8ed..e8d641ad3f 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.711"
+pandora_version="7.0NG.711-170817"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index fbfcf8994c..547dd1f8d4 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 = 'PC170816';
+$build_version = 'PC170817';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 01558fc781..e63383f7ad 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170816';
+$build = '170817';
 			$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 c5d7830764..9f3954a830 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.711
-%define release     1
+%define release     170817
 
 # 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 04325641ae..fcbd9b8b1e 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.711
-%define release     1
+%define release     170817
 %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 841de90372..8a873829bc 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711
+Version: 7.0NG.711-170817
 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 6946b5101f..d0c4f23add 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.711"
+pandora_version="7.0NG.711-170817"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index c4774fc1e8..7ca8e5d86c 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.711";
-my $pandora_build = "170816";
+my $pandora_build = "170817";
 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 413f2b6967..bee46f476a 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.711
-%define release     1
+%define release     170817
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index d4c5a3d7d6..a5acaf49ba 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.711
-%define release     1
+%define release     170817
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 1beaefa90f..fc0f0a38da 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170816"
+PI_BUILD="170817"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index a8e9a2b4ce..55702271b7 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.711 PS170816";
+my $version = "7.0NG.711 PS170817";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index d9d86a737b..d0255f26f2 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.711 PS170816";
+my $version = "7.0NG.711 PS170817";
 
 # save program name for logging
 my $progname = basename($0);

From 3ce15d58149c039b9f7fc6174824a57d3ec7ebaa Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 18 Aug 2017 00:01:12 +0200
Subject: [PATCH 122/157] 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 6502ba1d54..3d62555666 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170817
+Version: 7.0NG.711-170818
 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 9645f9b645..398ff7cf6f 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.711-170817"
+pandora_version="7.0NG.711-170818"
 
 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 6c890e566e..f257068959 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.711';
-use constant AGENT_BUILD => '170817';
+use constant AGENT_BUILD => '170818';
 
 # 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 a4e34ab9b2..b006382b4e 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.711
-%define release     170817
+%define release     170818
 
 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 664202826d..54b6cc1a8a 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.711
-%define release     170817
+%define release     170818
 
 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 843d816e3c..a5ab3a9e56 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170817"
+PI_BUILD="170818"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 9e17e82e0d..c395e8ec83 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170817}
+{170818}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 6b862c126b..fd3fc40e89 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.711(Build 170817)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170818)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 956152c880..01d3edd4b9 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.711(Build 170817))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170818))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 45c21f7c8e..d3d9263c86 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170817
+Version: 7.0NG.711-170818
 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 e8d641ad3f..c30452e58c 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.711-170817"
+pandora_version="7.0NG.711-170818"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 547dd1f8d4..1ded96febb 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 = 'PC170817';
+$build_version = 'PC170818';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index e63383f7ad..9fae77ce93 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170817';
+$build = '170818';
 			$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 9f3954a830..796fcce672 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.711
-%define release     170817
+%define release     170818
 
 # 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 fcbd9b8b1e..e167bf2f5a 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.711
-%define release     170817
+%define release     170818
 %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 8a873829bc..dd4d800ad9 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170817
+Version: 7.0NG.711-170818
 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 d0c4f23add..bf9fd3c9c5 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.711-170817"
+pandora_version="7.0NG.711-170818"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 7ca8e5d86c..766c2321b9 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.711";
-my $pandora_build = "170817";
+my $pandora_build = "170818";
 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 bee46f476a..b82c72ef95 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.711
-%define release     170817
+%define release     170818
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index a5acaf49ba..599315e1c8 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.711
-%define release     170817
+%define release     170818
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index fc0f0a38da..fd0ce6ce99 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170817"
+PI_BUILD="170818"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 55702271b7..02b9df5df8 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.711 PS170817";
+my $version = "7.0NG.711 PS170818";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index d0255f26f2..c9a4dad4e9 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.711 PS170817";
+my $version = "7.0NG.711 PS170818";
 
 # save program name for logging
 my $progname = basename($0);

From 19f1c3610e2665d091de2a1a70e259bea99b322b Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 19 Aug 2017 00:01:13 +0200
Subject: [PATCH 123/157] 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 3d62555666..58264f8eb2 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170818
+Version: 7.0NG.711-170819
 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 398ff7cf6f..729153616e 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.711-170818"
+pandora_version="7.0NG.711-170819"
 
 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 f257068959..f6c932c96e 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.711';
-use constant AGENT_BUILD => '170818';
+use constant AGENT_BUILD => '170819';
 
 # 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 b006382b4e..55e3af5c01 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.711
-%define release     170818
+%define release     170819
 
 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 54b6cc1a8a..8e1978b2c2 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.711
-%define release     170818
+%define release     170819
 
 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 a5ab3a9e56..72a45503a6 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170818"
+PI_BUILD="170819"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index c395e8ec83..9c0477016f 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170818}
+{170819}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index fd3fc40e89..c65e014a1f 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.711(Build 170818)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170819)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 01d3edd4b9..365053490e 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.711(Build 170818))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170819))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index d3d9263c86..7059ef00ff 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170818
+Version: 7.0NG.711-170819
 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 c30452e58c..0773da30de 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.711-170818"
+pandora_version="7.0NG.711-170819"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 1ded96febb..3ec3569eb3 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 = 'PC170818';
+$build_version = 'PC170819';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 9fae77ce93..70406e0187 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170818';
+$build = '170819';
 			$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 796fcce672..2f4a9c22c3 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.711
-%define release     170818
+%define release     170819
 
 # 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 e167bf2f5a..0a323a29e4 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.711
-%define release     170818
+%define release     170819
 %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 dd4d800ad9..0a3849b9cb 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170818
+Version: 7.0NG.711-170819
 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 bf9fd3c9c5..19ef378642 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.711-170818"
+pandora_version="7.0NG.711-170819"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 766c2321b9..bce184631b 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.711";
-my $pandora_build = "170818";
+my $pandora_build = "170819";
 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 b82c72ef95..1fef76020a 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.711
-%define release     170818
+%define release     170819
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 599315e1c8..f91dc5aacc 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.711
-%define release     170818
+%define release     170819
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index fd0ce6ce99..37bd2d6848 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170818"
+PI_BUILD="170819"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 02b9df5df8..891b981d35 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.711 PS170818";
+my $version = "7.0NG.711 PS170819";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7630550bb1..fca670c9c8 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.711 PS170818";
+my $version = "7.0NG.711 PS170819";
 
 # save program name for logging
 my $progname = basename($0);

From f3e5c32c09bfe0b3cddeb03d3bf3c27d4a81c633 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 20 Aug 2017 00:01:11 +0200
Subject: [PATCH 124/157] 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 58264f8eb2..a1629569c8 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170819
+Version: 7.0NG.711-170820
 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 729153616e..fb44db6901 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.711-170819"
+pandora_version="7.0NG.711-170820"
 
 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 f6c932c96e..57888d0e93 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.711';
-use constant AGENT_BUILD => '170819';
+use constant AGENT_BUILD => '170820';
 
 # 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 55e3af5c01..6311c1fe83 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.711
-%define release     170819
+%define release     170820
 
 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 8e1978b2c2..53a4279ce7 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.711
-%define release     170819
+%define release     170820
 
 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 72a45503a6..c50d9e8245 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170819"
+PI_BUILD="170820"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 9c0477016f..ce1124fa6b 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170819}
+{170820}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index c65e014a1f..09e13ba3cb 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.711(Build 170819)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170820)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 365053490e..a69cb8202f 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.711(Build 170819))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170820))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 7059ef00ff..8fdf170543 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170819
+Version: 7.0NG.711-170820
 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 0773da30de..cb6c8f2ed1 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.711-170819"
+pandora_version="7.0NG.711-170820"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 3ec3569eb3..e76e16ef71 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 = 'PC170819';
+$build_version = 'PC170820';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 70406e0187..4388c24e0e 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170819';
+$build = '170820';
 			$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 2f4a9c22c3..834f12b4c3 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.711
-%define release     170819
+%define release     170820
 
 # 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 0a323a29e4..e0439a96bf 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.711
-%define release     170819
+%define release     170820
 %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 0a3849b9cb..246a0644a4 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170819
+Version: 7.0NG.711-170820
 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 19ef378642..c4ab864cf5 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.711-170819"
+pandora_version="7.0NG.711-170820"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index bce184631b..6c450d6f46 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.711";
-my $pandora_build = "170819";
+my $pandora_build = "170820";
 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 1fef76020a..0c16dac26d 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.711
-%define release     170819
+%define release     170820
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index f91dc5aacc..0e23a3a398 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.711
-%define release     170819
+%define release     170820
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 37bd2d6848..83afb051f5 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170819"
+PI_BUILD="170820"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 891b981d35..18c5e56cde 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.711 PS170819";
+my $version = "7.0NG.711 PS170820";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index fca670c9c8..7a841033f1 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.711 PS170819";
+my $version = "7.0NG.711 PS170820";
 
 # save program name for logging
 my $progname = basename($0);

From c1545fc802fe965f1ab4bdca92497ff5bd3338c8 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 21 Aug 2017 00:01:11 +0200
Subject: [PATCH 125/157] 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 a1629569c8..2657785bad 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170820
+Version: 7.0NG.711-170821
 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 fb44db6901..a515053623 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.711-170820"
+pandora_version="7.0NG.711-170821"
 
 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 57888d0e93..74170578ba 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.711';
-use constant AGENT_BUILD => '170820';
+use constant AGENT_BUILD => '170821';
 
 # 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 6311c1fe83..37de856575 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.711
-%define release     170820
+%define release     170821
 
 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 53a4279ce7..71ca40d266 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.711
-%define release     170820
+%define release     170821
 
 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 c50d9e8245..1c91204448 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170820"
+PI_BUILD="170821"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ce1124fa6b..ba31a6067c 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170820}
+{170821}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 09e13ba3cb..a375877a9a 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.711(Build 170820)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170821)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index a69cb8202f..f999eb4c29 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.711(Build 170820))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170821))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 8fdf170543..c139bb0021 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170820
+Version: 7.0NG.711-170821
 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 cb6c8f2ed1..a8513d8e84 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.711-170820"
+pandora_version="7.0NG.711-170821"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index e76e16ef71..70dabd557a 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 = 'PC170820';
+$build_version = 'PC170821';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 4388c24e0e..06da74fcd0 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170820';
+$build = '170821';
 			$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 834f12b4c3..51e271d9d8 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.711
-%define release     170820
+%define release     170821
 
 # 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 e0439a96bf..12365c83b4 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.711
-%define release     170820
+%define release     170821
 %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 246a0644a4..dbcde3d435 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170820
+Version: 7.0NG.711-170821
 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 c4ab864cf5..5b7f968443 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.711-170820"
+pandora_version="7.0NG.711-170821"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 6c450d6f46..a7bf4a82c1 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.711";
-my $pandora_build = "170820";
+my $pandora_build = "170821";
 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 0c16dac26d..f0f3f12991 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.711
-%define release     170820
+%define release     170821
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 0e23a3a398..2d9a4e633d 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.711
-%define release     170820
+%define release     170821
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 83afb051f5..0ebe662d32 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170820"
+PI_BUILD="170821"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 18c5e56cde..af2ee0ae7d 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.711 PS170820";
+my $version = "7.0NG.711 PS170821";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7a841033f1..93ec1fc18e 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.711 PS170820";
+my $version = "7.0NG.711 PS170821";
 
 # save program name for logging
 my $progname = basename($0);

From 60757b0ad609cfd1964ae723e2ec538000cf14ae Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 22 Aug 2017 00:01:13 +0200
Subject: [PATCH 126/157] 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 2657785bad..276b53722d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170821
+Version: 7.0NG.711-170822
 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 a515053623..0d1313a528 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.711-170821"
+pandora_version="7.0NG.711-170822"
 
 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 74170578ba..efa207b706 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.711';
-use constant AGENT_BUILD => '170821';
+use constant AGENT_BUILD => '170822';
 
 # 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 37de856575..dd8c167378 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.711
-%define release     170821
+%define release     170822
 
 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 71ca40d266..cf6884da99 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.711
-%define release     170821
+%define release     170822
 
 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 1c91204448..d9c418c9f9 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170821"
+PI_BUILD="170822"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ba31a6067c..e5174226fd 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170821}
+{170822}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index a375877a9a..c70e82255d 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.711(Build 170821)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170822)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index f999eb4c29..22b4190737 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.711(Build 170821))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170822))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index c139bb0021..9e192e3df3 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170821
+Version: 7.0NG.711-170822
 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 a8513d8e84..53befa0460 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.711-170821"
+pandora_version="7.0NG.711-170822"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 70dabd557a..4b837e19bf 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 = 'PC170821';
+$build_version = 'PC170822';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 06da74fcd0..661203e9a2 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170821';
+$build = '170822';
 			$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 51e271d9d8..ffe2a7ad0f 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.711
-%define release     170821
+%define release     170822
 
 # 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 12365c83b4..62050ef1e3 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.711
-%define release     170821
+%define release     170822
 %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 dbcde3d435..e2003bd70d 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170821
+Version: 7.0NG.711-170822
 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 5b7f968443..a92e765b10 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.711-170821"
+pandora_version="7.0NG.711-170822"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index a7bf4a82c1..371ede002f 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.711";
-my $pandora_build = "170821";
+my $pandora_build = "170822";
 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 f0f3f12991..fbec95a127 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.711
-%define release     170821
+%define release     170822
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 2d9a4e633d..c18387950a 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.711
-%define release     170821
+%define release     170822
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 0ebe662d32..5647c6bd97 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170821"
+PI_BUILD="170822"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index af2ee0ae7d..1e443912a6 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.711 PS170821";
+my $version = "7.0NG.711 PS170822";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 93ec1fc18e..a79b780770 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.711 PS170821";
+my $version = "7.0NG.711 PS170822";
 
 # save program name for logging
 my $progname = basename($0);

From 7b208f6209b53ca1d9c62b8f426ee098181d0d51 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 22 Aug 2017 09:24:16 +0200
Subject: [PATCH 127/157] Added code to separate networkmap manage and
 networkmap view

---
 pandora_console/general/header.php | 79 ++++++++++++++++++++----------
 1 file changed, 53 insertions(+), 26 deletions(-)

diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index b5b3479dd9..46e95a7026 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -193,32 +193,51 @@ config_check();
 				
 				$select = db_process_sql("SELECT autorefresh_white_list FROM tusuario WHERE id_user = '" . $config['id_user'] . "'");
 				$autorefresh_list = json_decode($select[0]['autorefresh_white_list']);
+				
 				if ($autorefresh_list !== null && array_search($_GET['sec2'], $autorefresh_list) !== false) {
-					$autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot', "alt" => 'lightning', 'title' => __('Configure autorefresh')));
-					
-					if ($_GET['refr']) {
-						$autorefresh_txt .= ' (<span id="refrcounter">'.date ("i:s", $config["refr"]).'</span>)';
+					$do_refresh = true;
+					if ($_GET['sec2'] == 'operation/agentes/pandora_networkmap') {
+						if ((!isset($_GET['tab'])) || ($_GET['tab'] != 'view')) {
+							$do_refresh = false;
+						}
 					}
+
+					if ($do_refresh) {
+						$autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot', "alt" => 'lightning', 'title' => __('Configure autorefresh')));
 					
-					$ignored_params['refr'] = '';
-					$values = get_refresh_time_array();
-					$autorefresh_additional = '<span id="combo_refr" style="display: none;">';
-					$autorefresh_additional .= html_print_select ($values, 'ref', '', '', __('Select'), '0', true, false, false);
-					$autorefresh_additional .= '</span>';
-					unset ($values);
-					
-					$autorefresh_link_open_img =
-						'<a class="white autorefresh" href="' . ui_get_url_refresh ($ignored_params) . '">';
-					
-					if ($_GET['refr']) {
-						$autorefresh_link_open_txt =
-							'<a class="white autorefresh autorefresh_txt" href="' . ui_get_url_refresh ($ignored_params) . '">';
+						if ($_GET['refr']) {
+							$autorefresh_txt .= ' (<span id="refrcounter">'.date ("i:s", $config["refr"]).'</span>)';
+						}
+						
+						$ignored_params['refr'] = '';
+						$values = get_refresh_time_array();
+						$autorefresh_additional = '<span id="combo_refr" style="display: none;">';
+						$autorefresh_additional .= html_print_select ($values, 'ref', '', '', __('Select'), '0', true, false, false);
+						$autorefresh_additional .= '</span>';
+						unset ($values);
+						
+						$autorefresh_link_open_img =
+							'<a class="white autorefresh" href="' . ui_get_url_refresh ($ignored_params) . '">';
+						
+						if ($_GET['refr']) {
+							$autorefresh_link_open_txt =
+								'<a class="white autorefresh autorefresh_txt" href="' . ui_get_url_refresh ($ignored_params) . '">';
+						}
+						else {
+							$autorefresh_link_open_txt = '<a>';
+						}
+						
+						$autorefresh_link_close = '</a>';
 					}
 					else {
-						$autorefresh_link_open_txt = '<a>';
-					}
+						$autorefresh_img = html_print_image("images/header_refresh_disabled.png", true, array("class" => 'bot autorefresh_disabled', "alt" => 'lightning', 'title' => __('Disabled autorefresh')));
 					
-					$autorefresh_link_close = '</a>';
+						$ignored_params['refr'] = false;
+						
+						$autorefresh_link_open_img = '';
+						$autorefresh_link_open_txt = '';
+						$autorefresh_link_close = '';
+					}
 				}
 				else {
 					$autorefresh_img = html_print_image("images/header_refresh_disabled.png", true, array("class" => 'bot autorefresh_disabled', "alt" => 'lightning', 'title' => __('Disabled autorefresh')));
@@ -357,17 +376,25 @@ config_check();
 	$(document).ready (function () {
 		<?php
 		if (($autorefresh_list !== null) && (array_search($_GET['sec2'], $autorefresh_list) !== false) && (!isset($_GET["refr"]))) {
+			$do_refresh = true;
+			if ($_GET['sec2'] == 'operation/agentes/pandora_networkmap') {
+				if ((!isset($_GET['tab'])) || ($_GET['tab'] != 'view')) {
+					$do_refresh = false;
+				}
+			}
+
+			if ($do_refresh) {
 		?>
-			$("a.autorefresh_txt").toggle ();
-			$("#combo_refr").toggle ();
-			$("#combo_refr").css('padding-right', '9px');
-			href = $("a.autorefresh").attr ("href");
-			$(document).attr ("location", href + "30");
+				$("a.autorefresh_txt").toggle ();
+				$("#combo_refr").toggle ();
+				$("#combo_refr").css('padding-right', '9px');
+				href = $("a.autorefresh").attr ("href");
+				$(document).attr ("location", href + "30");
 		<?php
+			}
 		}
 		?>
 
-
 		if (fixed_header) {
 			$('div#head').addClass('fixed_header');
 			$('div#page')

From 031a70cc51f3789e73cf4a5094303519c2cce8e3 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 22 Aug 2017 10:43:22 +0200
Subject: [PATCH 128/157] Add instructions,user and force_create_agent
 parameters to CLI event_creator - #309

---
 pandora_console/include/functions_events.php |  2 ++
 pandora_server/util/pandora_manage.pl        | 31 +++++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index fe34c2ebdb..5acd48e5df 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2350,6 +2350,8 @@ function events_page_general ($event) {
 	}
 	$table_general->data[] = $data;
 	
+	$event["owner_user"] = $event["id_usuario"];
+	
 	$data = array();
 	$data[0] = __('Owner');
 	if (empty($event["owner_user"])) {
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a79b780770..5857e8eca8 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -173,11 +173,11 @@ sub help_screen{
 	help_screen_line('--enable_eacl', '', 'Enable enterprise ACL system');
 	help_screen_line('--disable_double_auth', '<user_name>', 'Disable the double authentication for the specified user');
 	print "\nEVENTS:\n\n" unless $param ne '';
-	help_screen_line('--create_event', "<event> <event_type> <group_name> [<agent_name> <module_name>\n\t   <event_status> <severity> <template_name> <user_name> <comment> \n\t  <source> <id_extra> <tags> <custom_data_json>]", 'Add event');
-    help_screen_line('--validate_event', "<agent_name> <module_name> <datetime_min> <datetime_max>\n\t   <user_name> <criticity> <template_name>", 'Validate events');
-    help_screen_line('--validate_event_id', '<event_id>', 'Validate event given a event id');
-    help_screen_line('--get_event_info', '<event_id>[<csv_separator>]', 'Show info about a event given a event id');
-    help_screen_line('--add_event_comment', '<event_id> <user_name> <comment>', 'Add event\'s comment');
+	help_screen_line('--create_event', "<event> <event_type> <group_name> [<agent_name> <module_name>\n\t   <event_status> <severity> <template_name> <user_name> <comment> \n\t  <source> <id_extra> <tags> <critical_instructions> <warning_instructions> <unknown_instructions> \n\t <custom_data_json> <force_create_agent>]", 'Add event');
+  help_screen_line('--validate_event', "<agent_name> <module_name> <datetime_min> <datetime_max>\n\t   <user_name> <criticity> <template_name>", 'Validate events');
+  help_screen_line('--validate_event_id', '<event_id>', 'Validate event given a event id');
+  help_screen_line('--get_event_info', '<event_id>[<csv_separator>]', 'Show info about a event given a event id');
+  help_screen_line('--add_event_comment', '<event_id> <user_name> <comment>', 'Add event\'s comment');
 	print "\nINCIDENTS:\n\n" unless $param ne '';
 	help_screen_line('--create_incident', "<title> <description> <origin> <status> <priority 0 for Informative, \n\t  1 for Low, 2 for Medium, 3 for Serious, 4 for Very serious or 5 for Maintenance>\n\t   <group> [<owner>]", 'Create incidents');
 	print "\nPOLICIES:\n\n" unless $param ne '';
@@ -3063,14 +3063,14 @@ sub cli_delete_profile() {
 ##############################################################################
 
 sub cli_create_event() {
-	my ($event,$event_type,$group_name,$agent_name,$module_name,$event_status,$severity,$template_name, $user_name, $comment, $source, $id_extra, $tags, $custom_data) = @ARGV[2..15];
+	my ($event,$event_type,$group_name,$agent_name,$module_name,$event_status,$severity,$template_name, $user_name, $comment, $source, $id_extra, $tags, $custom_data,$force_create_agent,$c_instructions,$w_instructions,$u_instructions) = @ARGV[2..19];
 
 	$event_status = 0 unless defined($event_status);
 	$severity = 0 unless defined($severity);
 
 	my $id_user;
 	
-	if (!defined($user_name)) {
+	if (!defined($user_name) || $user_name eq '') {
 		$id_user = 0;
 	}
 	else {
@@ -3095,7 +3095,18 @@ sub cli_create_event() {
 	}
 	else {
 		$id_agent = get_agent_id($dbh,$agent_name);
-		exist_check($id_agent,'agent',$agent_name);
+		# exist_check($id_agent,'agent',$agent_name);
+		if($id_agent == -1){
+			if($force_create_agent == 1){
+				pandora_create_agent ($conf, '', $agent_name, '', '', '', '', 'Created by cli_create_event', '', $dbh);
+				print_log "[INFO] Adding agent '$agent_name' \n\n";
+				$id_agent = get_agent_id($dbh,$agent_name);
+			}
+			else{
+				exist_check($id_agent,'agent',$agent_name);
+			}
+		}
+
 	}
 	
 	my $id_agentmodule;
@@ -3129,7 +3140,7 @@ sub cli_create_event() {
 	$custom_data = encode_base64 ($custom_data);
 
 	pandora_event ($conf, $event, $id_group, $id_agent, $severity,
-		$id_alert_agent_module, $id_agentmodule, $event_type, $event_status, $dbh, $source, $user_name, $comment, $id_extra, $tags, '', '', '', $custom_data);
+		$id_alert_agent_module, $id_agentmodule, $event_type, $event_status, $dbh, $source, $user_name, $comment, $id_extra, $tags, $c_instructions, $w_instructions, $u_instructions, $custom_data);
 }
 
 ##############################################################################
@@ -4880,7 +4891,7 @@ sub pandora_manage_main ($$$) {
 			cli_delete_profile();
 		}
 		elsif ($param eq '--create_event') {
-			param_check($ltotal, 14, 11);
+			param_check($ltotal, 18, 15);
 			cli_create_event();
 		}		
 		elsif ($param eq '--validate_event') {

From dcd5fd2e5e8e87d353a21e7e4b16134465262df0 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 23 Aug 2017 00:01:14 +0200
Subject: [PATCH 129/157] 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 276b53722d..d4d3151f99 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170822
+Version: 7.0NG.711-170823
 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 0d1313a528..d785430754 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.711-170822"
+pandora_version="7.0NG.711-170823"
 
 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 efa207b706..a57443672e 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.711';
-use constant AGENT_BUILD => '170822';
+use constant AGENT_BUILD => '170823';
 
 # 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 dd8c167378..f733d706cf 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.711
-%define release     170822
+%define release     170823
 
 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 cf6884da99..f9f71ffac6 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.711
-%define release     170822
+%define release     170823
 
 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 d9c418c9f9..21aeffc0a8 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170822"
+PI_BUILD="170823"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index e5174226fd..0cb6b3cc3f 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170822}
+{170823}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index c70e82255d..677649bb26 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.711(Build 170822)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170823)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 22b4190737..93ee93d0b4 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.711(Build 170822))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170823))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 9e192e3df3..6e10ecc58b 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170822
+Version: 7.0NG.711-170823
 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 53befa0460..46a2ed365c 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.711-170822"
+pandora_version="7.0NG.711-170823"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 4b837e19bf..84abfa04d9 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 = 'PC170822';
+$build_version = 'PC170823';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 661203e9a2..4f473babc0 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170822';
+$build = '170823';
 			$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 ffe2a7ad0f..0649d1ab83 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.711
-%define release     170822
+%define release     170823
 
 # 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 62050ef1e3..877e2f89d6 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.711
-%define release     170822
+%define release     170823
 %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 e2003bd70d..ae6a439ae8 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170822
+Version: 7.0NG.711-170823
 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 a92e765b10..814d9a65bd 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.711-170822"
+pandora_version="7.0NG.711-170823"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 371ede002f..369b9b7094 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.711";
-my $pandora_build = "170822";
+my $pandora_build = "170823";
 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 fbec95a127..0492a6a07c 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.711
-%define release     170822
+%define release     170823
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c18387950a..8d30b8a6b8 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.711
-%define release     170822
+%define release     170823
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 5647c6bd97..3d64defd22 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170822"
+PI_BUILD="170823"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1e443912a6..4e57f745f1 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.711 PS170822";
+my $version = "7.0NG.711 PS170823";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a79b780770..a63417c3cf 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.711 PS170822";
+my $version = "7.0NG.711 PS170823";
 
 # save program name for logging
 my $progname = basename($0);

From 3291526195559174980cadd549a41ef9d8d2a7bb Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 23 Aug 2017 12:41:36 +0200
Subject: [PATCH 130/157] Added new fields to server table

---
 .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql            | 5 +++++
 pandora_console/pandoradb.sql                                | 1 +
 2 files changed, 6 insertions(+)

diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index d00cc19065..2d32d99d18 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1416,3 +1416,8 @@ ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default
 -- ---------------------------------------------------------------------
 
 ALTER TABLE tserver_export_data MODIFY `module_name` varchar(600) BINARY NOT NULL default '';
+
+-- ---------------------------------------------------------------------
+-- Table `tserver`
+-- ---------------------------------------------------------------------
+ALTER TABLE tserver ADD COLUMN exec_proxy tinyint(1) UNSIGNED NOT NULL default 0;
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 7167c79281..4734bec7bf 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -976,6 +976,7 @@ CREATE TABLE IF NOT EXISTS `tserver` (
 	`my_modules` int(11) NOT NULL default 0,
 	`server_keepalive` int(11) NOT NULL default 0,
 	`stat_utimestamp` bigint(20) NOT NULL default '0',
+	`exec_proxy` tinyint(1) UNSIGNED NOT NULL default 0,
 	PRIMARY KEY  (`id_server`),
 	KEY `name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From dce27f3ac2c87c252d9ecf8492377822a32bbbcf Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 23 Aug 2017 15:01:09 +0200
Subject: [PATCH 131/157] Added new items to satellite editor view

---
 .../godmode/servers/modificar_server.php      | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index 721b1597c6..ea0a9e5de7 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -33,21 +33,36 @@ if (isset($_GET["server"])) {
 	$id_server= get_parameter_get ("server");
 	// Headers
 	ui_print_page_header (__('Update Server'), "images/gm_servers.png", false, "servers", true);
-	$sql = sprintf("SELECT name, ip_address, description FROM tserver WHERE id_server = %d",$id_server);
+	$sql = sprintf("SELECT name, ip_address, description, server_type, exec_proxy FROM tserver WHERE id_server = %d",$id_server);
 	$row = db_get_row_sql ($sql);
 	echo '<form name="servers" method="POST" action="index.php?sec=gservers&sec2=godmode/servers/modificar_server&update=1">';
 	html_print_input_hidden ("server",$id_server);
+
+	$server_type = __('Standard');
+	if ($row["server_type"] == 13) {
+		$server_type = __('Satellite');
+	}
+	$exec_server_enable = __("No");
+	if ($row["exec_proxy"] == 1) {
+		$exec_server_enable = __('Yes');
+	}
 	
 	$table->cellpadding=4;
 	$table->cellspacing=4;
 	$table->width='100%';
 	$table->class="databox filters";
 	
-	$table->data[] = array (__('Name'),$row["name"]);
-	$table->data[] = array (__('IP Address'),html_print_input_text ('address',$row["ip_address"],'',50,0,true));
-	$table->data[] = array (__('Description'),html_print_input_text ('description',$row["description"],'',50,0,true));
-	html_print_table ($table);
+	$table->data[] = array (__('Name'), $row["name"]);
+	$table->data[] = array (__('IP Address'), html_print_input_text ('address',$row["ip_address"],'',50,0,true));
+	$table->data[] = array (__('Description'), html_print_input_text ('description',$row["description"],'',50,0,true));
 	
+	if (enterprise_installed()) {
+		$table->data[] = array (__('Type'), $server_type);
+		$table->data[] = array (__('Exec Server Enable'), $exec_server_enable);
+		$table->data[] = array (__('Check Exec Server'), '<a id="check_exec_server">' . html_print_image ("images/dot_red.disabled.png", true) . '</a>');
+	}
+	
+	html_print_table ($table);
 	
 	echo '<div class="action-buttons" style="width: 100%">';
 	echo '<input type="submit" class="sub upd" value="'.__('Update').'">';
@@ -141,3 +156,36 @@ else {
 	require($config['homedir'] . '/godmode/servers/servers.build_table.php');
 }
 ?>
+
+<script language="javascript" type="text/javascript">
+
+$(document).ready (function () {
+	$("#check_exec_server img").on("click", function () {
+		$("#check_exec_server img").attr("src", "images/spinner.gif");
+
+		check_process("<?php echo $id_server;?>");
+	});
+});
+
+function check_process (id_server) {
+	var parameters = {};
+	parameters['page'] = 'enterprise/include/ajax/servers.ajax';
+	parameters['check_exec_server'] = 1;
+	parameters['id_server'] = id_server;
+	
+	jQuery.post(
+		"ajax.php",
+		parameters,
+		function (data) {
+			if (data) {
+				$("#check_exec_server img").attr("src", "images/dot_green.png");
+			}
+			else {
+				$("#check_exec_server img").attr("src", "images/dot_red.png");
+			}
+		},
+		"json"
+	);
+}
+
+</script>

From 1bf7d8278a0c7621227cba861aca3431ea5493fa Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 24 Aug 2017 00:01:14 +0200
Subject: [PATCH 132/157] 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 d4d3151f99..cfe488c91c 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170823
+Version: 7.0NG.711-170824
 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 d785430754..28d4fee2d2 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.711-170823"
+pandora_version="7.0NG.711-170824"
 
 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 a57443672e..1bf52d0728 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.711';
-use constant AGENT_BUILD => '170823';
+use constant AGENT_BUILD => '170824';
 
 # 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 f733d706cf..4860e6ecab 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.711
-%define release     170823
+%define release     170824
 
 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 f9f71ffac6..36429c5637 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.711
-%define release     170823
+%define release     170824
 
 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 21aeffc0a8..1766423b45 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170823"
+PI_BUILD="170824"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 0cb6b3cc3f..e1f6b04b87 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170823}
+{170824}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 677649bb26..eb711a6d41 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.711(Build 170823)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170824)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 93ee93d0b4..f2079b0f4a 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.711(Build 170823))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170824))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 6e10ecc58b..e0d09fa2a8 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170823
+Version: 7.0NG.711-170824
 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 46a2ed365c..fab543708b 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.711-170823"
+pandora_version="7.0NG.711-170824"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 84abfa04d9..b51e00e882 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 = 'PC170823';
+$build_version = 'PC170824';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 4f473babc0..72f5bd412d 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170823';
+$build = '170824';
 			$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 0649d1ab83..1a062e8de1 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.711
-%define release     170823
+%define release     170824
 
 # 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 877e2f89d6..39a22730a5 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.711
-%define release     170823
+%define release     170824
 %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 ae6a439ae8..95c17156e3 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170823
+Version: 7.0NG.711-170824
 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 814d9a65bd..aa2b173217 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.711-170823"
+pandora_version="7.0NG.711-170824"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 369b9b7094..850a51b12f 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.711";
-my $pandora_build = "170823";
+my $pandora_build = "170824";
 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 0492a6a07c..b9470ba344 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.711
-%define release     170823
+%define release     170824
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 8d30b8a6b8..581fad6ddb 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.711
-%define release     170823
+%define release     170824
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3d64defd22..cb191d0f4f 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170823"
+PI_BUILD="170824"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 4e57f745f1..796cc39feb 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.711 PS170823";
+my $version = "7.0NG.711 PS170824";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a63417c3cf..09bb36e92f 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.711 PS170823";
+my $version = "7.0NG.711 PS170824";
 
 # save program name for logging
 my $progname = basename($0);

From 2521727ee10584c3e9ef886d9da8eb4bfa30be5a Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 24 Aug 2017 11:05:10 +0200
Subject: [PATCH 133/157] Added ssh check connection

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

diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index ea0a9e5de7..a3d9821373 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -59,7 +59,7 @@ if (isset($_GET["server"])) {
 	if (enterprise_installed()) {
 		$table->data[] = array (__('Type'), $server_type);
 		$table->data[] = array (__('Exec Server Enable'), $exec_server_enable);
-		$table->data[] = array (__('Check Exec Server'), '<a id="check_exec_server">' . html_print_image ("images/dot_red.disabled.png", true) . '</a>');
+		$table->data[] = array (__('Check Exec Server'), '<a id="check_exec_server">' . html_print_image ("images/dot_red.disabled.png", true) . '</a>' . '<div id="check_error_message"></div>');
 	}
 	
 	html_print_table ($table);
@@ -177,11 +177,13 @@ function check_process (id_server) {
 		"ajax.php",
 		parameters,
 		function (data) {
-			if (data) {
+			if (data['correct']) {
 				$("#check_exec_server img").attr("src", "images/dot_green.png");
 			}
 			else {
 				$("#check_exec_server img").attr("src", "images/dot_red.png");
+				$("#check_error_message").empty();
+				$("#check_error_message").append("<span>" + data['message'] + "</span>");
 			}
 		},
 		"json"

From f021bedb5c98162acda3e651c7543f5f16c642bd Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 24 Aug 2017 12:34:06 +0200
Subject: [PATCH 134/157] Added proxy servers to events response form

---
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |  5 ++++
 .../godmode/events/event_responses.editor.php | 23 +++++++++++++++++--
 .../godmode/events/event_responses.php        | 22 ++++++++++++++++++
 pandora_console/pandoradb.sql                 |  1 +
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 2d32d99d18..18e473af34 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1421,3 +1421,8 @@ ALTER TABLE tserver_export_data MODIFY `module_name` varchar(600) BINARY NOT NUL
 -- Table `tserver`
 -- ---------------------------------------------------------------------
 ALTER TABLE tserver ADD COLUMN exec_proxy tinyint(1) UNSIGNED NOT NULL default 0;
+
+-- ---------------------------------------------------------------------
+-- Table `tevent_response`
+-- ---------------------------------------------------------------------
+ALTER TABLE tevent_response ADD COLUMN server_to_exec int(10) unsigned NOT NULL DEFAULT 0;
diff --git a/pandora_console/godmode/events/event_responses.editor.php b/pandora_console/godmode/events/event_responses.editor.php
index f2ad561a39..124338d7ee 100644
--- a/pandora_console/godmode/events/event_responses.editor.php
+++ b/pandora_console/godmode/events/event_responses.editor.php
@@ -53,6 +53,7 @@ else {
 	$event_response['modal_width'] = 0;
 	$event_response['modal_height'] = 0;
 	$event_response['params'] = '';
+	$event_response['server_to_exec'] = '';
 }
 
 $table = new stdClass();
@@ -117,11 +118,25 @@ $data[3] = html_print_select($types,'type',$event_response['type'],'','','',true
 $table->data[3] = $data;
 
 $data = array();
-$table->colspan[4][1] = 3;
 $data[0] = '<span id="command_label" class="labels">'.__('Command').'</span><span id="url_label" style="display:none;" class="labels">'.__('URL').'</span>'.ui_print_help_icon ("response_macros", true);
 $data[1] = html_print_input_text('target', $event_response['target'],
 	'', 100, 255, true);
-$types = array('url' => __('URL'), 'command' => __('Command'));
+
+$servers_to_exec = array();
+$servers_to_exec[0] = __('Local console');
+
+if (enterprise_installed()) {
+	enterprise_include_once ('include/functions_satellite.php');
+	
+	$rows = get_proxy_servers();
+	foreach ($rows as $row) {
+		$servers_to_exec[$row['id_server']] = $row['name'];
+	}
+}
+
+$data[2] = '<div id="server_to_exec_label" style="display:none;" class="labels">' . __('Server to execute command') . '</div>';
+$data[3] = '<div id="server_to_exec_value" style="display:none;">' . html_print_select($servers_to_exec, 'server_to_exec', $event_response['server_to_exec'], '', '', '', true) . '</div>';
+
 $table->data[4] = $data;
 
 if ($event_response_id == 0) {
@@ -158,9 +173,13 @@ $('#type').change(function() {
 			$('#new_window option[value="0"]')
 				.prop('selected', true);
 			$('#new_window').attr('disabled','disabled');
+			$('#server_to_exec_label').css('display','');
+			$('#server_to_exec_value').css('display','');
 			break;
 		case 'url':
 			$('#new_window').removeAttr('disabled');
+			$('#server_to_exec_label').css('display','none');
+			$('#server_to_exec_value').css('display','none');
 			break;
 	}
 });
diff --git a/pandora_console/godmode/events/event_responses.php b/pandora_console/godmode/events/event_responses.php
index 53d5058a8b..638774ab56 100644
--- a/pandora_console/godmode/events/event_responses.php
+++ b/pandora_console/godmode/events/event_responses.php
@@ -40,6 +40,17 @@ switch($action) {
 		$values['modal_height'] = get_parameter('modal_height');
 		$values['new_window'] = get_parameter('new_window');
 		$values['params'] = get_parameter('params');
+		if (enterprise_installed()) {
+			if ($values['type'] == 'command') {
+				$values['server_to_exec'] = get_parameter('server_to_exec');
+			}
+			else {
+				$values['server_to_exec'] = 0;
+			}
+		}
+		else {
+				$values['server_to_exec'] = 0;			
+		}
 		
 		if($values['new_window'] == 1) {
 			$values['modal_width'] = 0;
@@ -67,6 +78,17 @@ switch($action) {
 		$values['modal_height'] = get_parameter('modal_height');
 		$values['new_window'] = get_parameter('new_window');
 		$values['params'] = get_parameter('params');
+		if (enterprise_installed()) {
+			if ($values['type'] == 'command') {
+				$values['server_to_exec'] = get_parameter('server_to_exec');
+			}
+			else {
+				$values['server_to_exec'] = 0;
+			}
+		}
+		else {
+				$values['server_to_exec'] = 0;			
+		}
 		
 		if($values['new_window'] == 1) {
 			$values['modal_width'] = 0;
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 4734bec7bf..ce3dc212e2 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1845,6 +1845,7 @@ CREATE TABLE IF NOT EXISTS `tevent_response` (
 	`modal_height` INTEGER  NOT NULL DEFAULT 0,
 	`new_window` TINYINT(4)  NOT NULL DEFAULT 0,
 	`params` TEXT  NOT NULL,
+	`server_to_exec` int(10) unsigned NOT NULL DEFAULT 0,
 	PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

From c64d0bb0826dcc18105cecf30c9e07b70d57ed91 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 24 Aug 2017 12:50:55 +0200
Subject: [PATCH 135/157] Add _data_ _time_ macros for visual console - #1233

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

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 8fa2492fc3..dcb4123113 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -2645,6 +2645,8 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
 				'proportion_width' => $proportion_width);
 		}
 		
+		$layout_data['label'] = visual_map_macro($layout_data['label']);
+		
 		switch ($layout_data['type']) {
 			case LINE_ITEM:
 				visual_map_print_user_lines($layout_data, $proportion);
@@ -3008,4 +3010,10 @@ function visual_map_type_in_js($type) {
 	}
 }
 
+function visual_map_macro($label){
+	$label = str_replace('_date_',strftime("%x"),$label);
+	$label = str_replace('_time_',strftime("%T"),$label);
+	return $label;
+}
+
 ?>

From ffed7359bc2933ed418b7b40dc53ceecb8a8630c Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 24 Aug 2017 13:25:03 +0200
Subject: [PATCH 136/157] Added execution in server proxy to event response
 commands

---
 pandora_console/include/ajax/events.php       | 82 ++++++++++++++++---
 .../include/javascript/pandora_events.js      |  5 +-
 2 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index e2aa878f1b..452a9c4d43 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -122,19 +122,75 @@ if ($perform_event_response) {
 	global $config;
 	
 	$command = get_parameter('target','');
-	
-	switch (PHP_OS) {
-		case "FreeBSD":
-			$timeout_bin = '/usr/local/bin/gtimeout';
-			break;
-		case "NetBSD":
-			$timeout_bin = '/usr/pkg/bin/gtimeout';
-			break;
-		default:
-			$timeout_bin = '/usr/bin/timeout';
-			break;
+	$response_id = get_parameter ('response_id');
+
+	$event_response = db_get_row('tevent_response','id',$response_id);
+
+	if (enterprise_installed()) {
+		if ($event_response['server_to_exec'] != 0) {
+			enterprise_include_once ('include/functions_satellite.php');
+			
+			$connection = connect_to_proxy_server('192.168.70.165');
+			
+			switch (PHP_OS) {
+				case "FreeBSD":
+					$timeout_bin = '/usr/local/bin/gtimeout';
+					break;
+				case "NetBSD":
+					$timeout_bin = '/usr/pkg/bin/gtimeout';
+					break;
+				default:
+					$timeout_bin = '/usr/bin/timeout';
+					break;
+			}
+
+			$stream = ssh2_exec($connection, "whoami");
+    
+			stream_set_blocking($stream, true);
+			$stream_out = ssh2_fetch_stream($stream, SSH2_STREAM_STDIO);
+
+			$exec_val = stream_get_contents($stream_out);
+
+
+
+			$stream = ssh2_exec($connection, $timeout_bin . ' 9 ' . io_safe_output($command) . ' 2>&1');
+			
+			stream_set_blocking($stream, true);
+			$stream_out = ssh2_fetch_stream($stream, SSH2_STREAM_STDIO);
+
+			$exec_val = stream_get_contents($stream_out);
+			
+			echo $exec_val;
+		}
+		else {
+			switch (PHP_OS) {
+				case "FreeBSD":
+					$timeout_bin = '/usr/local/bin/gtimeout';
+					break;
+				case "NetBSD":
+					$timeout_bin = '/usr/pkg/bin/gtimeout';
+					break;
+				default:
+					$timeout_bin = '/usr/bin/timeout';
+					break;
+			}
+			echo system($timeout_bin . ' 9 '.io_safe_output($command).' 2>&1');
+		}
+	}
+	else {
+		switch (PHP_OS) {
+			case "FreeBSD":
+				$timeout_bin = '/usr/local/bin/gtimeout';
+				break;
+			case "NetBSD":
+				$timeout_bin = '/usr/pkg/bin/gtimeout';
+				break;
+			default:
+				$timeout_bin = '/usr/bin/timeout';
+				break;
+		}
+		echo system($timeout_bin . ' 9 '.io_safe_output($command).' 2>&1');
 	}
-	echo system($timeout_bin . ' 9 '.io_safe_output($command).' 2>&1');
 	
 	return;
 }
@@ -162,7 +218,7 @@ if ($dialogue_event_response) {
 			echo "<br><div id='response_out' style='text-align:left'></div>";
 			
 			echo "<br><div id='re_exec_command' style='display:none;'>";
-			html_print_button(__('Execute again'),'btn_str',false,'perform_response(\''.$command.'\');', "class='sub next'");
+			html_print_button(__('Execute again'),'btn_str',false,'perform_response(\''.$command.'\', ' . $response_id . ');', "class='sub next'");
 			echo "</div>";
 			break;
 		case 'url':
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 80c6affeb5..bd9b6cfcb6 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -177,7 +177,7 @@ function show_response_dialog(event_id, response_id, response) {
 					draggable: true,
 					modal: false,
 					open: function(event, ui) {
-						perform_response(response['target']);
+						perform_response(response['target'], response_id);
 					},
 					width: response['modal_width'], 
 					height: response['modal_height']
@@ -336,7 +336,7 @@ function get_response_target(event_id, response_id, server_id) {
 }
 
 // Perform a response and put the output into a div
-function perform_response(target) {
+function perform_response(target, response_id) {
 	var ajax_file = $('#hidden-ajax_file').val();
 	
 	$('#re_exec_command').hide();
@@ -351,6 +351,7 @@ function perform_response(target) {
 	params.push("page=include/ajax/events");
 	params.push("perform_event_response=1");
 	params.push("target="+target);
+	params.push("response_id="+response_id)
 	
 	jQuery.ajax ({
 		data: params.join ("&"),

From 45f33f9748ba17c874d3c4418bb1087a319210bb Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 24 Aug 2017 15:40:03 +0200
Subject: [PATCH 137/157] fixed errors in helps macros

---
 pandora_console/include/help/en/help_alert_config.php | 3 +++
 pandora_console/include/help/es/help_alert_config.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pandora_console/include/help/en/help_alert_config.php b/pandora_console/include/help/en/help_alert_config.php
index a0262a6c5f..06e2f53656 100644
--- a/pandora_console/include/help/en/help_alert_config.php
+++ b/pandora_console/include/help/en/help_alert_config.php
@@ -63,6 +63,9 @@ Apart from the defined module macros, the following macros are also available:
 <li>_groupcontact_ : Group contact information.	Configured when the group is created.</li>
 <li>_groupother_ : Other information about the group. Configured when the group is created.</li>
 <li>_email_tag_ : Emails associated to the module 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_nh_: (Only for alerts that use the command eMail) Returns an image of a module graph with a period of n hours (eg. _modulegraph_24h_). A correct setup of the connection between the server and the console's api is required. This setup is done into the server's configuration file.</li>
 <li>_modulegraphth_<i>n</i>h_:Same operation as the previous macro only with the critical and warning thresholds of the module provided they are defined.</li>
 <li>_homeurl_ : It is a link of the public URL this must be configured in the general options of the setup.</li>
diff --git a/pandora_console/include/help/es/help_alert_config.php b/pandora_console/include/help/es/help_alert_config.php
index 001d21e2f2..fc4e705062 100644
--- a/pandora_console/include/help/es/help_alert_config.php
+++ b/pandora_console/include/help/es/help_alert_config.php
@@ -65,6 +65,9 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
 <li>_groupcontact_ : Información de contacto del grupo.	Se configura al crear el grupo.</li>
 <li>_groupother_ : Otra información sobre el grupo. Se configura al crear el grupo.</li>
 <li>_email_tag_ : Emails asociados 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_: (Sólo para alertas que usen el comando eMail) Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de n horas (eg. _modulegraph_24h_). Requiere de una configuración correcta de la conexión del servidor a la consola vía api, la cual se realiza en el fichero de configuración del servidor.</li>
 <li>_modulegraphth_<i>n</i>h_:mismo funcionamiento que la macro anterior solo que con los umbrales critical y warning del modulo siempre que estos esten definidos</li>
 <li>_homeurl_ : Es un link de la URL pública esta debe de estar configurada en las opciones generales del setup.</li>

From 8b718371f93157df990f8d9d165c001e1d76d7da Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 24 Aug 2017 16:09:04 +0200
Subject: [PATCH 138/157] Fix agent view qr mobile code - #1229

---
 pandora_console/godmode/agentes/agent_manager.php |  2 +-
 pandora_console/mobile/include/user.class.php     |  2 +-
 pandora_console/mobile/index.php                  | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 2db2e53e93..bf334c25f3 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -232,7 +232,7 @@ if(!$new_agent){
 	if ($id_agente) {
 		$table->data[2][2] =
 			"<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"" .
-				ui_get_full_url('index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $id_agente) . "\" );'></a>";
+				ui_get_full_url('mobile/index.php?page=agent&id=' . $id_agente) . "\" );'></a>";
 	}
 	else {
 		$table->data[2][2] = __("Only it is show when<br />the agent is saved.");
diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index b54059f04c..7488e95b5d 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -239,7 +239,7 @@ class User {
 		$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
 			$logo_image . '</div>');
 		$ui->contentAddHtml('<div id="login_container">');
-		$ui->beginForm();
+		$ui->beginForm('');
 		$ui->formAddHtml(html_print_input_hidden('action', 'login', true));
 		$options = array(
 			'name' => 'user',
diff --git a/pandora_console/mobile/index.php b/pandora_console/mobile/index.php
index e252d2c796..8fd2f0da32 100644
--- a/pandora_console/mobile/index.php
+++ b/pandora_console/mobile/index.php
@@ -191,6 +191,11 @@ switch ($action) {
 					$l10n = new gettext_reader (new CachedFileReader('../include/languages/'.$user_language.'.mo'));
 					$l10n->load_tables();
 				}
+				
+				if($_GET['page'] != ''){
+					header('refresh:0; url=http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+				}
+				
 				if (class_exists("HomeEnterprise"))
 					$home = new HomeEnterprise();
 				else
@@ -211,6 +216,11 @@ switch ($action) {
 					$l10n = new gettext_reader (new CachedFileReader('../include/languages/'.$user_language.'.mo'));
 					$l10n->load_tables();
 				}
+				
+				if($_GET['page'] != ''){
+					header('refresh:0; url=http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+				}
+				
 				if (class_exists("HomeEnterprise"))
 					$home = new HomeEnterprise();
 				else

From 88834d6ea1e8d378928624c3450b9ed34800eb39 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 24 Aug 2017 16:26:58 +0200
Subject: [PATCH 139/157] Added a first version of snmp browser with a proxy
 server

---
 pandora_console/include/ajax/events.php       | 43 +++-------
 .../include/functions_snmp_browser.php        | 86 ++++++++++++++-----
 .../javascript/pandora_snmp_browser.js        |  2 +
 .../operation/snmpconsole/snmp_browser.php    |  4 +-
 4 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 452a9c4d43..14bf0c85a8 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -127,40 +127,21 @@ if ($perform_event_response) {
 	$event_response = db_get_row('tevent_response','id',$response_id);
 
 	if (enterprise_installed()) {
-		if ($event_response['server_to_exec'] != 0) {
-			enterprise_include_once ('include/functions_satellite.php');
-			
-			$connection = connect_to_proxy_server('192.168.70.165');
-			
-			switch (PHP_OS) {
-				case "FreeBSD":
-					$timeout_bin = '/usr/local/bin/gtimeout';
-					break;
-				case "NetBSD":
-					$timeout_bin = '/usr/pkg/bin/gtimeout';
-					break;
-				default:
-					$timeout_bin = '/usr/bin/timeout';
-					break;
+		if ($event_response['server_to_exec'] != 0 && $event_response['type'] == 'command') {
+			$commandExclusions = array ('vi', 'vim', 'nano');
+
+    		if (in_array(strtolower($command),$commandExclusions)) {
+				echo "Only stdin/stdout commands are supported";
 			}
-
-			$stream = ssh2_exec($connection, "whoami");
-    
-			stream_set_blocking($stream, true);
-			$stream_out = ssh2_fetch_stream($stream, SSH2_STREAM_STDIO);
-
-			$exec_val = stream_get_contents($stream_out);
-
-
-
-			$stream = ssh2_exec($connection, $timeout_bin . ' 9 ' . io_safe_output($command) . ' 2>&1');
+			else {
+				enterprise_include_once ('include/functions_satellite.php');
 			
-			stream_set_blocking($stream, true);
-			$stream_out = ssh2_fetch_stream($stream, SSH2_STREAM_STDIO);
+				$connection = connect_to_proxy_server('192.168.70.165');
 
-			$exec_val = stream_get_contents($stream_out);
-			
-			echo $exec_val;
+				$exec_val = proxy_execute_command($connection, io_safe_output($command));
+				
+				echo $exec_val;
+			}
 		}
 		else {
 			switch (PHP_OS) {
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index 7318e871cf..df434c8545 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -138,7 +138,7 @@ function snmp_browser_print_tree ($tree, $id = 0, $depth = 0, $last = 0, $last_a
  *
  * @return array The SNMP tree.
  */
-function snmp_browser_get_tree ($target_ip, $community, $starting_oid = '.', $version = '2c', $snmp3_auth_user = '', $snmp3_security_level = '', $snmp3_auth_method = '', $snmp3_auth_pass = '', $snmp3_privacy_method = '', $snmp3_privacy_pass = '') {
+function snmp_browser_get_tree ($target_ip, $community, $starting_oid = '.', $version = '2c', $snmp3_auth_user = '', $snmp3_security_level = '', $snmp3_auth_method = '', $snmp3_auth_pass = '', $snmp3_privacy_method = '', $snmp3_privacy_pass = '', $server_to_exec = 0) {
 	global $config;
 	
 	if ($target_ip == '') {
@@ -174,26 +174,58 @@ function snmp_browser_get_tree ($target_ip, $community, $starting_oid = '.', $ve
 			break;
 	}
 
-	$oid_tree = array('__LEAVES__' => array());
-	if ($version == "3") {
-		switch ($snmp3_security_level) {
-			case "authPriv":
-				exec ($snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' -x ' . escapeshellarg($snmp3_privacy_method) . ' -X ' . escapeshellarg($snmp3_privacy_pass) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
-				break;
-			case "authNoPriv":
-				exec ($snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
-				break;
-			case "noAuthNoPriv":
-				exec ($snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -l ' . escapeshellarg($snmp3_security_level) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
-				break;
+	if ($server_to_exec != 0) {
+		$sql = sprintf("SELECT exec_proxy: FROM tserver WHERE id_server = %d", $server_to_exec);
+		$server = db_get_row_sql($sql);
+
+		if ($server) {
+			if (enterprise_installed()) {
+				enterprise_include_once ('include/functions_satellite.php');
+
+				$oid_tree = array('__LEAVES__' => array());
+				if ($version == "3") {
+					switch ($snmp3_security_level) {
+						case "authPriv":
+							$command = $snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' -x ' . escapeshellarg($snmp3_privacy_method) . ' -X ' . escapeshellarg($snmp3_privacy_pass) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir;
+							break;
+						case "authNoPriv":
+							$command = $snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir;
+							break;
+						case "noAuthNoPriv":
+							$command = $snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -l ' . escapeshellarg($snmp3_security_level) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir;
+							break;
+					}
+				}
+				else {
+					$command = $snmpwalk_bin . ' -m ALL -M +' . escapeshellarg($config['homedir'] . '/attachment/mibs') . ' -Cc -c ' . escapeshellarg($community) . ' -v ' . escapeshellarg($version) . ' ' . escapeshellarg($target_ip) . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir;
+				}
+				
+				$connection = connect_to_proxy_server('192.168.70.165');
+
+				$output = proxy_execute_command($connection, io_safe_output($command));
+			}
+		}
+		else {
+			$oid_tree = array('__LEAVES__' => array());
+			if ($version == "3") {
+				switch ($snmp3_security_level) {
+					case "authPriv":
+						exec ($snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' -x ' . escapeshellarg($snmp3_privacy_method) . ' -X ' . escapeshellarg($snmp3_privacy_pass) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
+						break;
+					case "authNoPriv":
+						exec ($snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
+						break;
+					case "noAuthNoPriv":
+						exec ($snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -l ' . escapeshellarg($snmp3_security_level) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
+						break;
+				}
+			}
+			else {
+				exec ($snmpwalk_bin . ' -m ALL -M +' . escapeshellarg($config['homedir'] . '/attachment/mibs') . ' -Cc -c ' . escapeshellarg($community) . ' -v ' . escapeshellarg($version) . ' ' . escapeshellarg($target_ip) . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
+			}
 		}
 	}
-	else {
-		exec ($snmpwalk_bin . ' -m ALL -M +' . escapeshellarg($config['homedir'] . '/attachment/mibs') . ' -Cc -c ' . escapeshellarg($community) . ' -v ' . escapeshellarg($version) . ' ' . escapeshellarg($target_ip) . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
-	}
-	//if ($rc != 0) {
-	//	return __('No data');
-	//}
+	
 	foreach ($output as $line) {
 		
 		// Separate the OID from the value
@@ -518,7 +550,21 @@ function snmp_browser_print_container ($return = false, $width = '100%', $height
 			'3' => 'v. 3'),
 		'snmp_browser_version', '', 'checkSNMPVersion();', '', '', true, false, false, '');
 	
-	$table->data[0][4] = html_print_button(__('Browse'), 'browse', false, 'snmpBrowse()', 'class="sub search" style="margin-top:0px;"', true);
+	$servers_to_exec = array();
+	$servers_to_exec[0] = __('Local console');
+
+	if (enterprise_installed()) {
+		enterprise_include_once ('include/functions_satellite.php');
+		
+		$rows = get_proxy_servers();
+		foreach ($rows as $row) {
+			$servers_to_exec[$row['id_server']] = $row['name'];
+		}
+	}
+	$table->data[0][4] = '<strong>' . __('Server to execute') . '</strong> &nbsp;&nbsp;';
+	$table->data[0][4] .= html_print_select($servers_to_exec, 'server_to_exec', '', '', '', '', true);
+
+	$table->data[0][5] = html_print_button(__('Browse'), 'browse', false, 'snmpBrowse()', 'class="sub search" style="margin-top:0px;"', true);
 	
 	// SNMP v3 options
 	$table3 = new stdClass();
diff --git a/pandora_console/include/javascript/pandora_snmp_browser.js b/pandora_console/include/javascript/pandora_snmp_browser.js
index 3b9067729c..12f2f62296 100644
--- a/pandora_console/include/javascript/pandora_snmp_browser.js
+++ b/pandora_console/include/javascript/pandora_snmp_browser.js
@@ -19,6 +19,7 @@ function snmpBrowse () {
 	var community = $('#text-community').val();
 	var starting_oid = $('#text-starting_oid').val();
 	var snmp_version = $('#snmp_browser_version').val();
+	var server_to_exec = $('#server_to_exec').val();
 	var snmp3_auth_user = $('#text-snmp3_browser_auth_user').val();
 	var snmp3_security_level = $('#snmp3_browser_security_level').val();
 	var snmp3_auth_method = $('#snmp3_browser_auth_method').val();
@@ -33,6 +34,7 @@ function snmpBrowse () {
 		"community=" + community,
 		"starting_oid=" + starting_oid,
 		"snmp_browser_version=" + snmp_version,
+		"server_to_exec=" + server_to_exec,
 		"snmp3_browser_auth_user=" + snmp3_auth_user,
 		"snmp3_browser_security_level=" + snmp3_security_level,
 		"snmp3_browser_auth_method=" + snmp3_auth_method,
diff --git a/pandora_console/operation/snmpconsole/snmp_browser.php b/pandora_console/operation/snmpconsole/snmp_browser.php
index 191c0caab9..0a8204208e 100644
--- a/pandora_console/operation/snmpconsole/snmp_browser.php
+++ b/pandora_console/operation/snmpconsole/snmp_browser.php
@@ -27,6 +27,7 @@ if (is_ajax()) {
 	$target_ip = (string) get_parameter ("target_ip", '');
 	$community = (string) get_parameter ("community", '');
 	$snmp_version = (string) get_parameter ("snmp_browser_version", '');
+	$server_to_exec = (int) get_parameter ("server_to_exec", 0);
 	$snmp3_auth_user = get_parameter('snmp3_browser_auth_user');
 	$snmp3_security_level = get_parameter('snmp3_browser_security_level');
 	$snmp3_auth_method = get_parameter('snmp3_browser_auth_method');
@@ -41,7 +42,8 @@ if (is_ajax()) {
 		$snmp_tree = snmp_browser_get_tree(
 			$target_ip, $community, $starting_oid, $snmp_version,
 			$snmp3_auth_user, $snmp3_security_level, $snmp3_auth_method,
-			$snmp3_auth_pass, $snmp3_privacy_method, $snmp3_privacy_pass);
+			$snmp3_auth_pass, $snmp3_privacy_method, $snmp3_privacy_pass,
+			$server_to_exec);
 		if (! is_array ($snmp_tree)) {
 			echo $snmp_tree;
 		}

From 8f373edf84523c671f493c25e79ff4aa6f5d1288 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 25 Aug 2017 00:01:13 +0200
Subject: [PATCH 140/157] 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 cfe488c91c..28d8f4cb58 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170824
+Version: 7.0NG.711-170825
 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 28d4fee2d2..6acaabcb18 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.711-170824"
+pandora_version="7.0NG.711-170825"
 
 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 1bf52d0728..e3f03bef43 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.711';
-use constant AGENT_BUILD => '170824';
+use constant AGENT_BUILD => '170825';
 
 # 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 4860e6ecab..ee5ec16599 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.711
-%define release     170824
+%define release     170825
 
 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 36429c5637..976812d86a 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.711
-%define release     170824
+%define release     170825
 
 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 1766423b45..f5ff5b094e 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170824"
+PI_BUILD="170825"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index e1f6b04b87..44277ef3aa 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170824}
+{170825}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index eb711a6d41..f52cf5d35c 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.711(Build 170824)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170825)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index f2079b0f4a..897ea6ac99 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.711(Build 170824))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170825))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index e0d09fa2a8..0c2c2717e1 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170824
+Version: 7.0NG.711-170825
 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 fab543708b..1e0e315dac 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.711-170824"
+pandora_version="7.0NG.711-170825"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index b51e00e882..515c46a256 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 = 'PC170824';
+$build_version = 'PC170825';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 72f5bd412d..e275396772 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170824';
+$build = '170825';
 			$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 1a062e8de1..8ecc12fbec 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.711
-%define release     170824
+%define release     170825
 
 # 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 39a22730a5..870db315ca 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.711
-%define release     170824
+%define release     170825
 %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 95c17156e3..0af67a3503 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170824
+Version: 7.0NG.711-170825
 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 aa2b173217..efb090dc72 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.711-170824"
+pandora_version="7.0NG.711-170825"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 850a51b12f..5eb160006f 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.711";
-my $pandora_build = "170824";
+my $pandora_build = "170825";
 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 b9470ba344..52a2e01766 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.711
-%define release     170824
+%define release     170825
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 581fad6ddb..a15bc790fe 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.711
-%define release     170824
+%define release     170825
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index cb191d0f4f..b547e5977d 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170824"
+PI_BUILD="170825"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 796cc39feb..e0f95030ef 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.711 PS170824";
+my $version = "7.0NG.711 PS170825";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 09bb36e92f..7d6c8d1a9a 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.711 PS170824";
+my $version = "7.0NG.711 PS170825";
 
 # save program name for logging
 my $progname = basename($0);

From b907a6592148f339dd82e2d7761baf985a2aa9d1 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 26 Aug 2017 00:01:37 +0200
Subject: [PATCH 141/157] 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 28d8f4cb58..7ff459709d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170825
+Version: 7.0NG.711-170826
 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 6acaabcb18..f6cb7c4702 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.711-170825"
+pandora_version="7.0NG.711-170826"
 
 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 e3f03bef43..94d502fa33 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.711';
-use constant AGENT_BUILD => '170825';
+use constant AGENT_BUILD => '170826';
 
 # 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 ee5ec16599..9c27263253 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.711
-%define release     170825
+%define release     170826
 
 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 976812d86a..39e893b4c2 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.711
-%define release     170825
+%define release     170826
 
 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 f5ff5b094e..cd29460290 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170825"
+PI_BUILD="170826"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 44277ef3aa..eccf4b6992 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170825}
+{170826}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index f52cf5d35c..dac86ed444 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.711(Build 170825)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170826)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 897ea6ac99..4d4470a581 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.711(Build 170825))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170826))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 0c2c2717e1..13dd281dc7 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170825
+Version: 7.0NG.711-170826
 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 1e0e315dac..7e2b264b5d 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.711-170825"
+pandora_version="7.0NG.711-170826"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 515c46a256..41221f709e 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 = 'PC170825';
+$build_version = 'PC170826';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index e275396772..0b9df7f0b6 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170825';
+$build = '170826';
 			$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 8ecc12fbec..7b896151fb 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.711
-%define release     170825
+%define release     170826
 
 # 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 870db315ca..90bbbc4299 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.711
-%define release     170825
+%define release     170826
 %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 0af67a3503..cdc47e1724 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170825
+Version: 7.0NG.711-170826
 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 efb090dc72..ac6e9cc7d0 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.711-170825"
+pandora_version="7.0NG.711-170826"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 5eb160006f..0130f38924 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.711";
-my $pandora_build = "170825";
+my $pandora_build = "170826";
 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 52a2e01766..d570ffe597 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.711
-%define release     170825
+%define release     170826
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index a15bc790fe..514f1a1259 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.711
-%define release     170825
+%define release     170826
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index b547e5977d..56d03bed85 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170825"
+PI_BUILD="170826"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e0f95030ef..65ebf59116 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.711 PS170825";
+my $version = "7.0NG.711 PS170826";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7d6c8d1a9a..07e1d76f44 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.711 PS170825";
+my $version = "7.0NG.711 PS170826";
 
 # save program name for logging
 my $progname = basename($0);

From ed72e8c34213f54c127ce9f098ef3c072505789d Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 27 Aug 2017 00:01:12 +0200
Subject: [PATCH 142/157] 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 7ff459709d..6b4c669078 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170826
+Version: 7.0NG.711-170827
 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 f6cb7c4702..c52094d795 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.711-170826"
+pandora_version="7.0NG.711-170827"
 
 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 94d502fa33..e4085a633b 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.711';
-use constant AGENT_BUILD => '170826';
+use constant AGENT_BUILD => '170827';
 
 # 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 9c27263253..2917398a66 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.711
-%define release     170826
+%define release     170827
 
 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 39e893b4c2..7ff9f449fc 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.711
-%define release     170826
+%define release     170827
 
 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 cd29460290..24b10ba316 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170826"
+PI_BUILD="170827"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index eccf4b6992..4d805bd886 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170826}
+{170827}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index dac86ed444..2b3ffc4596 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.711(Build 170826)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170827)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 4d4470a581..f6537b5bd6 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.711(Build 170826))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170827))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 13dd281dc7..e0a509790a 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170826
+Version: 7.0NG.711-170827
 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 7e2b264b5d..1887bc1209 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.711-170826"
+pandora_version="7.0NG.711-170827"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 41221f709e..babdb7ffc9 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 = 'PC170826';
+$build_version = 'PC170827';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 0b9df7f0b6..bd12c9345f 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170826';
+$build = '170827';
 			$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 7b896151fb..ca213c61b1 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.711
-%define release     170826
+%define release     170827
 
 # 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 90bbbc4299..5c3bbf211d 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.711
-%define release     170826
+%define release     170827
 %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 cdc47e1724..83be5a9fa1 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170826
+Version: 7.0NG.711-170827
 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 ac6e9cc7d0..984bccc92f 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.711-170826"
+pandora_version="7.0NG.711-170827"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 0130f38924..b51865ef53 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.711";
-my $pandora_build = "170826";
+my $pandora_build = "170827";
 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 d570ffe597..0c619899cc 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.711
-%define release     170826
+%define release     170827
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 514f1a1259..bb2ce64b9c 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.711
-%define release     170826
+%define release     170827
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 56d03bed85..a8f8332458 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170826"
+PI_BUILD="170827"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 65ebf59116..85eb54483f 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.711 PS170826";
+my $version = "7.0NG.711 PS170827";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 07e1d76f44..12f9931bb0 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.711 PS170826";
+my $version = "7.0NG.711 PS170827";
 
 # save program name for logging
 my $progname = basename($0);

From ab48fabc0bdf8337bd02c61547da1110e4f0425d Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 28 Aug 2017 00:01:12 +0200
Subject: [PATCH 143/157] 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 6b4c669078..16d618e1f1 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170827
+Version: 7.0NG.711-170828
 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 c52094d795..2f364599c0 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.711-170827"
+pandora_version="7.0NG.711-170828"
 
 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 e4085a633b..b6f3f6e101 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.711';
-use constant AGENT_BUILD => '170827';
+use constant AGENT_BUILD => '170828';
 
 # 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 2917398a66..0a5a28281e 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.711
-%define release     170827
+%define release     170828
 
 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 7ff9f449fc..2b5c55e764 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.711
-%define release     170827
+%define release     170828
 
 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 24b10ba316..1e929a8def 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170827"
+PI_BUILD="170828"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 4d805bd886..3a82c79b75 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170827}
+{170828}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 2b3ffc4596..92d8ac4f87 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.711(Build 170827)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170828)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index f6537b5bd6..26e781abe7 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.711(Build 170827))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170828))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index e0a509790a..08e3382906 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170827
+Version: 7.0NG.711-170828
 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 1887bc1209..9900ce0677 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.711-170827"
+pandora_version="7.0NG.711-170828"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index babdb7ffc9..c34515cdd3 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 = 'PC170827';
+$build_version = 'PC170828';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index bd12c9345f..97425a62a4 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170827';
+$build = '170828';
 			$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 ca213c61b1..514f0bc0ff 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.711
-%define release     170827
+%define release     170828
 
 # 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 5c3bbf211d..04a7ecf30b 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.711
-%define release     170827
+%define release     170828
 %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 83be5a9fa1..45c44b97d1 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170827
+Version: 7.0NG.711-170828
 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 984bccc92f..856fb2916e 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.711-170827"
+pandora_version="7.0NG.711-170828"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index b51865ef53..771cbc8ccd 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.711";
-my $pandora_build = "170827";
+my $pandora_build = "170828";
 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 0c619899cc..5192ff9704 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.711
-%define release     170827
+%define release     170828
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index bb2ce64b9c..754e3ed0c9 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.711
-%define release     170827
+%define release     170828
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index a8f8332458..550102e1b0 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170827"
+PI_BUILD="170828"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 85eb54483f..6a2f97bf08 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.711 PS170827";
+my $version = "7.0NG.711 PS170828";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 12f9931bb0..f13c4da7d3 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.711 PS170827";
+my $version = "7.0NG.711 PS170828";
 
 # save program name for logging
 my $progname = basename($0);

From 6b4dfe9885904fadd7ef03870420035735057600 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 28 Aug 2017 10:02:46 +0200
Subject: [PATCH 144/157] Added remote server to snmp browser

---
 pandora_console/include/ajax/events.php       | 22 ++++--
 .../include/functions_snmp_browser.php        | 68 +++++++++++--------
 2 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 14bf0c85a8..20cd0c4a80 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -130,15 +130,29 @@ if ($perform_event_response) {
 		if ($event_response['server_to_exec'] != 0 && $event_response['type'] == 'command') {
 			$commandExclusions = array ('vi', 'vim', 'nano');
 
+			$server_data = db_get_row('tserver','id_server', $event_response['server_to_exec']);
+
     		if (in_array(strtolower($command),$commandExclusions)) {
 				echo "Only stdin/stdout commands are supported";
 			}
 			else {
-				enterprise_include_once ('include/functions_satellite.php');
-			
-				$connection = connect_to_proxy_server('192.168.70.165');
+				$return_val = array();
+				$return_val['correct'] = false;
 
-				$exec_val = proxy_execute_command($connection, io_safe_output($command));
+				$exec_val = system("ssh root@" . $server_data['ip_address'] . " '" . $command . " 2>&1'", $ret_val);
+
+				if ($ret_val != 0) {
+					$return_val['message'] = "Conection error";
+				}
+				else {
+					if ($exec_val == "root") {
+						$return_val['correct'] = true;
+					}
+					else {
+						$return_val['message'] = "User must be pandora_exec_proxy";
+					}
+				}
+				ob_clean();
 				
 				echo $exec_val;
 			}
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index df434c8545..9da6d75881 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -173,37 +173,32 @@ function snmp_browser_get_tree ($target_ip, $community, $starting_oid = '.', $ve
 			$error_redir_dir = '/dev/null';
 			break;
 	}
-
+	
 	if ($server_to_exec != 0) {
-		$sql = sprintf("SELECT exec_proxy: FROM tserver WHERE id_server = %d", $server_to_exec);
-		$server = db_get_row_sql($sql);
+		$sql = sprintf("SELECT ip_address FROM tserver WHERE id_server = %d", $server_to_exec);
+		$server_data = db_get_row_sql($sql);
 
-		if ($server) {
-			if (enterprise_installed()) {
-				enterprise_include_once ('include/functions_satellite.php');
+		if (enterprise_installed()) {
+			enterprise_include_once ('include/functions_satellite.php');
 
-				$oid_tree = array('__LEAVES__' => array());
-				if ($version == "3") {
-					switch ($snmp3_security_level) {
-						case "authPriv":
-							$command = $snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' -x ' . escapeshellarg($snmp3_privacy_method) . ' -X ' . escapeshellarg($snmp3_privacy_pass) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir;
-							break;
-						case "authNoPriv":
-							$command = $snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir;
-							break;
-						case "noAuthNoPriv":
-							$command = $snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -l ' . escapeshellarg($snmp3_security_level) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir;
-							break;
-					}
+			$oid_tree = array('__LEAVES__' => array());
+			if ($version == "3") {
+				switch ($snmp3_security_level) {
+					case "authPriv":
+						$command = $snmpwalk_bin . " -m ALL -v 3 -u " . escapeshellarg($snmp3_auth_user) . " -A " . escapeshellarg($snmp3_auth_pass) . " -l " . escapeshellarg($snmp3_security_level) . " -a " . escapeshellarg($snmp3_auth_method) . " -x " . escapeshellarg($snmp3_privacy_method) . " -X " . escapeshellarg($snmp3_privacy_pass) . " " . escapeshellarg($target_ip)  . " " . escapeshellarg($starting_oid) . " 2> " . $error_redir_dir;
+						break;
+					case "authNoPriv":
+						$command = $snmpwalk_bin . " -m ALL -v 3 -u " . escapeshellarg($snmp3_auth_user) . " -A " . escapeshellarg($snmp3_auth_pass) . " -l " . escapeshellarg($snmp3_security_level) . " -a " . escapeshellarg($snmp3_auth_method) . " " . escapeshellarg($target_ip)  . " " . escapeshellarg($starting_oid) . " 2> " . $error_redir_dir;
+						break;
+					case "noAuthNoPriv":
+						$command = $snmpwalk_bin . " -m ALL -v 3 -u " . escapeshellarg($snmp3_auth_user) . " -l " . escapeshellarg($snmp3_security_level) . " " . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . " 2> " . $error_redir_dir;
+						break;
 				}
-				else {
-					$command = $snmpwalk_bin . ' -m ALL -M +' . escapeshellarg($config['homedir'] . '/attachment/mibs') . ' -Cc -c ' . escapeshellarg($community) . ' -v ' . escapeshellarg($version) . ' ' . escapeshellarg($target_ip) . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir;
-				}
-				
-				$connection = connect_to_proxy_server('192.168.70.165');
-
-				$output = proxy_execute_command($connection, io_safe_output($command));
 			}
+			else {
+				$command = $snmpwalk_bin . " -m ALL -M +" . escapeshellarg($config['homedir'] . "/attachment/mibs") . " -Cc -c " . escapeshellarg($community) . " -v " . escapeshellarg($version) . " " . escapeshellarg($target_ip) . " " . escapeshellarg($starting_oid) . " 2> " . $error_redir_dir;
+			}
+			exec("ssh root@" . $server_data['ip_address'] . " \"" . $command . "\"", $output, $rc);
 		}
 		else {
 			$oid_tree = array('__LEAVES__' => array());
@@ -225,7 +220,26 @@ function snmp_browser_get_tree ($target_ip, $community, $starting_oid = '.', $ve
 			}
 		}
 	}
-	
+	else {
+		$oid_tree = array('__LEAVES__' => array());
+		if ($version == "3") {
+			switch ($snmp3_security_level) {
+				case "authPriv":
+					exec ($snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' -x ' . escapeshellarg($snmp3_privacy_method) . ' -X ' . escapeshellarg($snmp3_privacy_pass) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
+					break;
+				case "authNoPriv":
+					exec ($snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
+					break;
+				case "noAuthNoPriv":
+					exec ($snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -l ' . escapeshellarg($snmp3_security_level) . ' ' . escapeshellarg($target_ip)  . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
+					break;
+			}
+		}
+		else {
+			exec ($snmpwalk_bin . ' -m ALL -M +' . escapeshellarg($config['homedir'] . '/attachment/mibs') . ' -Cc -c ' . escapeshellarg($community) . ' -v ' . escapeshellarg($version) . ' ' . escapeshellarg($target_ip) . ' ' . escapeshellarg($starting_oid) . ' 2> ' . $error_redir_dir, $output, $rc);
+		}
+	}
+html_debug($output, true);
 	foreach ($output as $line) {
 		
 		// Separate the OID from the value

From bab1f14a31f9f762993e176f65e591c2491591f7 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 28 Aug 2017 12:44:51 +0200
Subject: [PATCH 145/157] Added remote command execute to agent wizard

---
 .../agentes/agent_wizard.snmp_explorer.php    | 26 +++++++--
 .../agent_wizard.snmp_interfaces_explorer.php | 23 ++++++--
 .../agentes/agent_wizard.wmi_explorer.php     | 53 +++++++++++++++++--
 pandora_console/include/ajax/events.php       |  2 +-
 pandora_console/include/functions.php         | 15 +++++-
 5 files changed, 106 insertions(+), 13 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php b/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php
index 0c129642ff..14c026e2d2 100644
--- a/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php
+++ b/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php
@@ -34,6 +34,7 @@ $ip_target = (string) get_parameter ('ip_target', $ipAgent);
 $use_agent = get_parameter ('use_agent');
 $snmp_community = (string) get_parameter ('snmp_community', 'public');
 $snmp_version = get_parameter('snmp_version', '1');
+$server_to_exec = get_parameter('server_to_exec', 0);
 $snmp3_auth_user = get_parameter('snmp3_auth_user');
 $snmp3_security_level = get_parameter('snmp3_security_level');
 $snmp3_auth_method = get_parameter('snmp3_auth_method');
@@ -87,7 +88,8 @@ if ($snmpwalk) {
 	// OID Used is for DISKS
 	$snmpis = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user,
 		$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
-		$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.25.2.3.1.3", $tcp_port);
+		$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.25.2.3.1.3", $tcp_port,
+		$server_to_exec);
 	
 	if (empty($snmpis)) {
 		$fail = true;
@@ -120,7 +122,8 @@ if ($snmpwalk) {
 		// OID Used is for PROCESSES
 		$snmpis = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user,
 			$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
-			$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.25.4.2.1.2", $tcp_port);
+			$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.25.4.2.1.2", $tcp_port,
+			$server_to_exec);
 		
 		if ($snmpis === false) {
 			$snmpis = array();
@@ -158,7 +161,8 @@ if ($snmpwalk) {
 		// OID Used is for SENSOR TEMPERATURES
 		$snmpis = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user,
 			$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
-			$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.4.1.2021.13.16.2.1", $tcp_port);
+			$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.4.1.2021.13.16.2.1", $tcp_port,
+			$server_to_exec);
 		
 		if ($snmpis === false) {
 			$snmpis = array();
@@ -196,7 +200,8 @@ if ($snmpwalk) {
 		// OID Used is for DEVICES
 		$snmpis = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user,
 			$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
-			$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.4.1.2021.13.15.1.1", $tcp_port);
+			$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.4.1.2021.13.15.1.1", $tcp_port,
+			$server_to_exec);
 		
 		if ($snmpis === false) {
 			$snmpis = array();
@@ -706,6 +711,19 @@ $table->data[0][3] = html_print_input_text ('tcp_port', $tcp_port, '', 5, 20, tr
 $table->data[1][0] = '<b>' . __('Use agent ip') . '</b>';
 $table->data[1][1] = html_print_checkbox ('use_agent', 1, $use_agent, true);
 
+$servers_to_exec = array();
+$servers_to_exec[0] = __('Local console');
+if (enterprise_installed()) {
+	enterprise_include_once ('include/functions_satellite.php');
+	
+	$rows = get_proxy_servers();
+	foreach ($rows as $row) {
+		$servers_to_exec[$row['id_server']] = $row['name'];
+	}
+}
+$table->data[1][2] = '<b>' . __('Server to execute command') . '</b>';
+$table->data[1][3] = html_print_select ($servers_to_exec, 'server_to_exec', $server_to_exec, '', '', '', true);
+
 $snmp_versions['1'] = 'v. 1';
 $snmp_versions['2'] = 'v. 2';
 $snmp_versions['2c'] = 'v. 2c';
diff --git a/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php b/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
index 23e10227eb..80c5a3a84f 100644
--- a/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
+++ b/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
@@ -30,6 +30,7 @@ check_login ();
 $ip_target = (string) get_parameter ('ip_target', $ipAgent);
 $use_agent = get_parameter ('use_agent');
 $snmp_community = (string) get_parameter ('snmp_community', 'public');
+$server_to_exec = get_parameter('server_to_exec', 0);
 $snmp_version = get_parameter('snmp_version', '1');
 $snmp3_auth_user = get_parameter('snmp3_auth_user');
 $snmp3_security_level = get_parameter('snmp3_security_level');
@@ -53,16 +54,19 @@ if ($snmpwalk) {
 	// OID Used is for SNMP MIB-2 Interfaces
 	$snmpis = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user,
 		$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
-		$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.2", $tcp_port);
+		$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.2", $tcp_port,
+		$server_to_exec);
 	// ifXTable is also used
 	$ifxitems = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user,
 		$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
-		$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.31.1.1", $tcp_port);
+		$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.31.1.1", $tcp_port,
+		$server_to_exec);
 
 	// Get the interfaces IPV4/IPV6
 	$snmp_int_ip = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user,
 		$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
-		$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.4.34.1.3", $tcp_port);
+		$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.4.34.1.3", $tcp_port,
+		$server_to_exec);
 
 	// Build a [<interface id>] => [<interface ip>] array
 	if (!empty($snmp_int_ip)) {
@@ -345,6 +349,19 @@ $table->data[0][3] = html_print_input_text ('tcp_port', $tcp_port, '', 5, 20, tr
 $table->data[1][0] = '<b>' . __('Use agent ip') . '</b>';
 $table->data[1][1] = html_print_checkbox ('use_agent', 1, $use_agent, true);
 
+$servers_to_exec = array();
+$servers_to_exec[0] = __('Local console');
+if (enterprise_installed()) {
+	enterprise_include_once ('include/functions_satellite.php');
+	
+	$rows = get_proxy_servers();
+	foreach ($rows as $row) {
+		$servers_to_exec[$row['id_server']] = $row['name'];
+	}
+}
+$table->data[1][2] = '<b>' . __('Server to execute command') . '</b>';
+$table->data[1][3] = html_print_select ($servers_to_exec, 'server_to_exec', $server_to_exec, '', '', '', true);
+
 $snmp_versions['1'] = 'v. 1';
 $snmp_versions['2'] = 'v. 2';
 $snmp_versions['2c'] = 'v. 2c';
diff --git a/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php b/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
index 5a5ee589ef..99fb1e5c54 100644
--- a/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
+++ b/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
@@ -29,6 +29,7 @@ $ip_target = (string) get_parameter ('ip_target', $ipAgent); // Host
 $plugin_user = (string) get_parameter ('plugin_user', 'Administrator'); // Username
 $plugin_pass = io_safe_output(get_parameter('plugin_pass', '')); // Password
 $tcp_send = (string) get_parameter ('tcp_send'); // Namespace
+$server_to_exec = get_parameter('server_to_exec', true);
 
 //See if id_agente is set (either POST or GET, otherwise -1
 $id_agent = $idAgent;
@@ -53,7 +54,18 @@ if ($wmiexplore) {
 	$wmi_processes = $wmi_command . ' "select Name from Win32_Process"';
 	$processes_name_field = 1;
 	
-	exec($wmi_processes, $output);
+	if (enterprise_installed()) {
+		if ($server_to_exec != 0) {
+			$server_data = db_get_row('tserver','id_server', $server_to_exec);
+			exec("ssh root@" . $server_data['ip_address'] . " '" . $wmi_processes . "'", $output, $rc);
+		}
+		else {
+			exec($wmi_processes, $output);
+		}
+	}
+	else {
+		exec($wmi_processes, $output);
+	}
 	
 	$fail = false;
 	if (preg_match('/^Failed/', $output[0])) {
@@ -79,7 +91,18 @@ if ($wmiexplore) {
 		$services_name_field = 0;
 		$services_check_field = 1;
 		
-		exec($wmi_services, $output);
+		if (enterprise_installed()) {
+			if ($server_to_exec != 0) {
+				$server_data = db_get_row('tserver','id_server', $server_to_exec);
+				exec("ssh root@" . $server_data['ip_address'] . " '" . $wmi_services . "'", $output, $rc);
+			}
+			else {
+				exec($wmi_services, $output);
+			}
+		}
+		else {
+			exec($wmi_services, $output);
+		}
 		
 		foreach ($output as $index => $row) {
 			// First and second rows are Class and column names, ignore it
@@ -98,7 +121,18 @@ if ($wmiexplore) {
 		$wmi_disks = $wmi_command . ' "Select DeviceID from Win32_LogicalDisk"';
 		$disks_name_field = 0;
 		
-		exec($wmi_disks, $output);
+		if (enterprise_installed()) {
+			if ($server_to_exec != 0) {
+				$server_data = db_get_row('tserver','id_server', $server_to_exec);
+				exec("ssh root@" . $server_data['ip_address'] . " '" . $wmi_disks . "'", $output, $rc);
+			}
+			else {
+				exec($wmi_disks, $output);
+			}
+		}
+		else {
+			exec($wmi_disks, $output);
+		}
 		
 		foreach ($output as $index => $row) {
 			// First and second rows are Class and column names, ignore it
@@ -267,6 +301,19 @@ $table->data[1][3] = html_print_input_password ('plugin_pass', $plugin_pass, '',
 $table->data[1][3] .= '<div id="spinner_modules" style="float: left; display: none;">' . html_print_image("images/spinner.gif", true) . '</div>';
 html_print_input_hidden('wmiexplore', 1);
 
+$servers_to_exec = array();
+$servers_to_exec[0] = __('Local console');
+if (enterprise_installed()) {
+	enterprise_include_once ('include/functions_satellite.php');
+	
+	$rows = get_proxy_servers();
+	foreach ($rows as $row) {
+		$servers_to_exec[$row['id_server']] = $row['name'];
+	}
+}
+$table->data[2][0] = '<b>' . __('Server to execute command') . '</b>';
+$table->data[2][1] = html_print_select ($servers_to_exec, 'server_to_exec', $server_to_exec, '', '', '', true);
+
 html_print_table($table);
 
 echo "<div style='text-align:right; width:".$table->width."'>";
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 20cd0c4a80..d29289ecb3 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -139,7 +139,7 @@ if ($perform_event_response) {
 				$return_val = array();
 				$return_val['correct'] = false;
 
-				$exec_val = system("ssh root@" . $server_data['ip_address'] . " '" . $command . " 2>&1'", $ret_val);
+				$exec_val = system("ssh root@" . $server_data['ip_address'] . " \"" . $command . " 2>&1\"", $ret_val);
 
 				if ($ret_val != 0) {
 					$return_val['message'] = "Conection error";
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 06081117f4..3472b0f567 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1506,7 +1506,7 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '',
 	$snmp3_auth_user = '', $snmp3_security_level = '',
 	$snmp3_auth_method = '', $snmp3_auth_pass = '',
 	$snmp3_privacy_method = '', $snmp3_privacy_pass = '',
-	$quick_print = 0, $base_oid = "", $snmp_port = '') {
+	$quick_print = 0, $base_oid = "", $snmp_port = '', $server_to_exec = 0) {
 	
 	global $config;
 	
@@ -1598,7 +1598,18 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '',
 			break;
 	}
 	
-	exec($command_str, $output, $rc);
+	if (enterprise_installed()) {
+		if ($server_to_exec != 0) {
+			$server_data = db_get_row('tserver','id_server', $server_to_exec);
+			exec("ssh root@" . $server_data['ip_address'] . " \"" . $command_str . "\"", $output, $rc);
+		}
+		else {
+			exec($command_str, $output, $rc);
+		}
+	}
+	else {
+		exec($command_str, $output, $rc);
+	}
 	
 	// Parse the output of snmpwalk
 	$snmpwalk = array();

From fc0db16d5e060c31b4d8b2138da733b63cc5d9a7 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 28 Aug 2017 15:47:16 +0200
Subject: [PATCH 146/157] Fixed "any" filter with selects unknown and not init
 modules in massive delete operation

---
 .../massive/massive_delete_modules.php        | 24 +++++++++++++++----
 .../godmode/massive/massive_edit_modules.php  | 22 +++++++++++++----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php
index ceb55af00a..8d3260df3d 100755
--- a/pandora_console/godmode/massive/massive_delete_modules.php
+++ b/pandora_console/godmode/massive/massive_delete_modules.php
@@ -48,7 +48,7 @@ if (is_ajax ()) {
 	return;
 }
 
-function process_manage_delete ($module_name, $id_agents) {
+function process_manage_delete ($module_name, $id_agents, $module_status = 'all') {
 
 	global $config;
 
@@ -217,6 +217,20 @@ function process_manage_delete ($module_name, $id_agents) {
 		}
 	}
 	
+	if (($module_status == 'unknown') && ($module_name[0] == "0") && (is_array($module_name)) && (count($module_name) == 1)) {
+		$modules_to_delete = array();
+		foreach ($modules as $mod_id) {
+			$mod_status = (int)db_get_value_filter ('estado', 'tagente_estado', array('id_agente_modulo' => $mod_id));
+
+			// Unknown, not init and no data modules
+			if ($mod_status == 3 || $mod_status == 4 || $mod_status == 5) {
+				$modules_to_delete[$mod_id] = $mod_id;
+			}
+		}
+
+		$modules = $modules_to_delete;
+	}
+	
 	$count_deleted_modules = count($modules);
 	if ($config['dbtype'] == "oracle") {
 		$success = db_process_sql(sprintf("DELETE FROM tagente_modulo WHERE id_agente_modulo IN (%s)", implode(",", $modules)));
@@ -251,6 +265,7 @@ $agents_id = get_parameter('id_agents');
 $modules_select = get_parameter('module');
 $selection_mode = get_parameter('selection_mode', 'modules');
 $recursion = get_parameter('recursion');
+$modules_selection_mode = get_parameter('modules_selection_mode');
 
 if ($delete) {
 	switch ($selection_mode) {
@@ -299,7 +314,7 @@ if ($delete) {
 					$module_name = array();
 				}
 				foreach ($module_name as $mod_name) {
-					$result = process_manage_delete ($mod_name['nombre'], $id_agent['id_agente']);
+					$result = process_manage_delete ($mod_name['nombre'], $id_agent['id_agente'], $modules_selection_mode);
 					$count ++;
 					$success += (int)$result;
 				}
@@ -319,7 +334,7 @@ if ($delete) {
 					$module_name = array();
 				}
 				else {
-					$result = process_manage_delete (array(0 => 0), $id_agent);
+					$result = process_manage_delete (array(0 => 0), $id_agent, $modules_selection_mode);
 				}
 				$success += (int)$result;
 			}
@@ -330,7 +345,8 @@ if ($delete) {
 	}
 	
 	if (!$force) {
-		$result = process_manage_delete ($modules_, $agents_);
+		$result = false;
+		$result = process_manage_delete ($modules_, $agents_, $modules_selection_mode);
 	}
 	
 	if ($result) {
diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index f26c1a0c0a..7e2db21c3c 100755
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -40,6 +40,7 @@ $agents_id = get_parameter('id_agents');
 $modules_select = get_parameter('module');
 $selection_mode = get_parameter('selection_mode', 'modules');
 $recursion = get_parameter('recursion');
+$modules_selection_mode = get_parameter('modules_selection_mode');
 
 $update = (bool) get_parameter_post ('update');
 
@@ -105,7 +106,7 @@ if ($update) {
 					$module_name = array();
 				
 				foreach ($module_name as $mod_name) {
-					$result = process_manage_edit($mod_name['nombre'], $id_agent);
+					$result = process_manage_edit($mod_name['nombre'], $id_agent, $modules_selection_mode);
 					$count++;
 					$success += (int)$result;
 				}
@@ -127,7 +128,7 @@ if ($update) {
 					$module_name = array();
 				
 				foreach($module_name as $mod_name) {
-					$result = process_manage_edit($mod_name['nombre'], $id_agent);
+					$result = process_manage_edit($mod_name['nombre'], $id_agent, $modules_selection_mode);
 					$count++;
 					$success += (int)$result;
 				}
@@ -146,7 +147,7 @@ if ($update) {
 			
 			foreach ($modules_ as $module_) {
 				
-				$result = process_manage_edit ($module_, $agent_);
+				$result = process_manage_edit ($module_, $agent_, $modules_selection_mode);
 				$count++;
 				$success += (int)$result;
 				
@@ -1112,7 +1113,7 @@ function disabled_status () {
 /* ]]> */
 </script>
 <?php
-function process_manage_edit ($module_name, $agents_select = null) {
+function process_manage_edit ($module_name, $agents_select = null, $module_status = 'all') {
 	
 	if (is_int ($module_name) && $module_name < 0) {
 		ui_print_error_message(__('No modules selected'));
@@ -1230,6 +1231,19 @@ function process_manage_edit ($module_name, $agents_select = null) {
 	
 	if ($modules === false)
 		return false;
+
+	if (($module_status == 'unknown') && ($module_name == "0")) {
+		$modules_to_delete = array();
+		foreach ($modules as $mod_id) {
+			$mod_status = (int)db_get_value_filter ('estado', 'tagente_estado', array('id_agente_modulo' => $mod_id));
+
+			// Unknown, not init and no data modules
+			if ($mod_status == 3 || $mod_status == 4 || $mod_status == 5) {
+				$modules_to_delete[$mod_id] = $mod_id;
+			}
+		}
+		$modules = $modules_to_delete;
+	}
 	
 	foreach ($modules as $module) {
 		$result = modules_update_agent_module(

From 0e7b00f26e555007bedce6f8073fc53046ccfd34 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 28 Aug 2017 16:38:30 +0200
Subject: [PATCH 147/157] Added correct user and fixed db error

---
 .../godmode/agentes/agent_wizard.wmi_explorer.php           | 6 +++---
 pandora_console/include/ajax/events.php                     | 2 +-
 pandora_console/include/functions.php                       | 2 +-
 pandora_console/include/functions_snmp_browser.php          | 2 +-
 pandora_console/pandoradb_data.sql                          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php b/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
index 99fb1e5c54..abdcbbecaa 100644
--- a/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
+++ b/pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php
@@ -57,7 +57,7 @@ if ($wmiexplore) {
 	if (enterprise_installed()) {
 		if ($server_to_exec != 0) {
 			$server_data = db_get_row('tserver','id_server', $server_to_exec);
-			exec("ssh root@" . $server_data['ip_address'] . " '" . $wmi_processes . "'", $output, $rc);
+			exec("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " '" . $wmi_processes . "'", $output, $rc);
 		}
 		else {
 			exec($wmi_processes, $output);
@@ -94,7 +94,7 @@ if ($wmiexplore) {
 		if (enterprise_installed()) {
 			if ($server_to_exec != 0) {
 				$server_data = db_get_row('tserver','id_server', $server_to_exec);
-				exec("ssh root@" . $server_data['ip_address'] . " '" . $wmi_services . "'", $output, $rc);
+				exec("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " '" . $wmi_services . "'", $output, $rc);
 			}
 			else {
 				exec($wmi_services, $output);
@@ -124,7 +124,7 @@ if ($wmiexplore) {
 		if (enterprise_installed()) {
 			if ($server_to_exec != 0) {
 				$server_data = db_get_row('tserver','id_server', $server_to_exec);
-				exec("ssh root@" . $server_data['ip_address'] . " '" . $wmi_disks . "'", $output, $rc);
+				exec("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " '" . $wmi_disks . "'", $output, $rc);
 			}
 			else {
 				exec($wmi_disks, $output);
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index d29289ecb3..4f28012b2b 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -139,7 +139,7 @@ if ($perform_event_response) {
 				$return_val = array();
 				$return_val['correct'] = false;
 
-				$exec_val = system("ssh root@" . $server_data['ip_address'] . " \"" . $command . " 2>&1\"", $ret_val);
+				$exec_val = system("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $command . " 2>&1\"", $ret_val);
 
 				if ($ret_val != 0) {
 					$return_val['message'] = "Conection error";
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 3472b0f567..057d6b4561 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1601,7 +1601,7 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '',
 	if (enterprise_installed()) {
 		if ($server_to_exec != 0) {
 			$server_data = db_get_row('tserver','id_server', $server_to_exec);
-			exec("ssh root@" . $server_data['ip_address'] . " \"" . $command_str . "\"", $output, $rc);
+			exec("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $command_str . "\"", $output, $rc);
 		}
 		else {
 			exec($command_str, $output, $rc);
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index 9da6d75881..417cd135fa 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -198,7 +198,7 @@ function snmp_browser_get_tree ($target_ip, $community, $starting_oid = '.', $ve
 			else {
 				$command = $snmpwalk_bin . " -m ALL -M +" . escapeshellarg($config['homedir'] . "/attachment/mibs") . " -Cc -c " . escapeshellarg($community) . " -v " . escapeshellarg($version) . " " . escapeshellarg($target_ip) . " " . escapeshellarg($starting_oid) . " 2> " . $error_redir_dir;
 			}
-			exec("ssh root@" . $server_data['ip_address'] . " \"" . $command . "\"", $output, $rc);
+			exec("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $command . "\"", $output, $rc);
 		}
 		else {
 			$oid_tree = array('__LEAVES__' => array());
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 7e0f84dee6..8047512f4d 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -1148,7 +1148,7 @@ INSERT INTO `tagent_custom_fields` VALUES (1,'Serial&#x20;Number',0,0),(2,'Depar
 
 INSERT INTO `ttag` VALUES (1,'network','Network&#x20;equipment','http://artica.es','',''),(2,'critical','Critical&#x20;modules','','',''),(3,'dmz','DMZ&#x20;Network&#x20;Zone','','',''),(4,'performance','Performance&#x20;anda&#x20;capacity&#x20;modules','','',''),(5,'configuration','','','','');
 
-INSERT INTO `tevent_response` VALUES (1,'Ping&#x20;to&#x20;host','Ping&#x20;to&#x20;the&#x20;agent&#x20;host','ping&#x20;-c&#x20;5&#x20;_agent_address_','command',0,620,500,0,''),(2,'SSH&#x20;to&#x20;host','Connect&#x20;via&#x20;SSH&#x20;to&#x20;the&#x20;agent','http://localhost:8022/anyterm.html?param=_User_@_agent_address_','url',0,800,450,0,'User'),(3,'Create&#x20;incident&#x20;from&#x20;event','Create&#x20;a&#x20;incident&#x20;from&#x20;the&#x20;event&#x20;with&#x20;the&#x20;standard&#x20;incidents&#x20;system&#x20;of&#x20;Pandora&#x20;FMS','index.php?sec=workspace&amp;sec2=operation/incidents/incident_detail&amp;insert_form&amp;from_event=_event_id_','url',0,0,0,1,''),(4,'Create&#x20;Integria&#x20;IMS&#x20;incident&#x20;from&#x20;event','Create&#x20;a&#x20;incident&#x20;from&#x20;the&#x20;event&#x20;with&#x20;integria&#x20;incidents&#x20;system&#x20;of&#x20;Pandora&#x20;FMS.&#x20;&#x0d;&#x0a;&#x0d;&#x0a;Is&#x20;necessary&#x20;to&#x20;enable&#x20;and&#x20;configure&#x20;the&#x20;Integria&#x20;incidents&#x20;in&#x20;Pandora&#x20;FMS&#x20;setup.','index.php?sec=workspace&amp;sec2=operation/integria_incidents/incident&amp;tab=editor&amp;from_event=_event_id_','url',0,0,0,1,''),(5,'Restart&#x20;agent','Restart&#x20;the&#x20;agent&#x20;with&#x20;using&#x20;UDP&#x20;protocol.&#x0d;&#x0a;&#x0d;&#x0a;To&#x20;use&#x20;this&#x20;response&#x20;is&#x20;necessary&#x20;to&#x20;have&#x20;installed&#x20;Pandora&#x20;FMS&#x20;server&#x20;and&#x20;console&#x20;in&#x20;the&#x20;same&#x20;machine.','/usr/share/pandora_server/util/udp_client.pl&#x20;_agent_address_&#x20;41122&#x20;&quot;REFRESH&#x20;AGENT&quot;','command',0,620,500,0,''),(6,'Ping&#x20;to&#x20;module&#x20;agent&#x20;host','Ping&#x20;to&#x20;the&#x20;module&#x20;agent&#x20;host','ping&#x20;-c&#x20;5&#x20;_module_address_','command',0,620,500,0,'');
+INSERT INTO `tevent_response` VALUES (1,'Ping&#x20;to&#x20;host','Ping&#x20;to&#x20;the&#x20;agent&#x20;host','ping&#x20;-c&#x20;5&#x20;_agent_address_','command',0,620,500,0,'',0),(2,'SSH&#x20;to&#x20;host','Connect&#x20;via&#x20;SSH&#x20;to&#x20;the&#x20;agent','http://localhost:8022/anyterm.html?param=_User_@_agent_address_','url',0,800,450,0,'User',0),(3,'Create&#x20;incident&#x20;from&#x20;event','Create&#x20;a&#x20;incident&#x20;from&#x20;the&#x20;event&#x20;with&#x20;the&#x20;standard&#x20;incidents&#x20;system&#x20;of&#x20;Pandora&#x20;FMS','index.php?sec=workspace&amp;sec2=operation/incidents/incident_detail&amp;insert_form&amp;from_event=_event_id_','url',0,0,0,1,'',0),(4,'Create&#x20;Integria&#x20;IMS&#x20;incident&#x20;from&#x20;event','Create&#x20;a&#x20;incident&#x20;from&#x20;the&#x20;event&#x20;with&#x20;integria&#x20;incidents&#x20;system&#x20;of&#x20;Pandora&#x20;FMS.&#x20;&#x0d;&#x0a;&#x0d;&#x0a;Is&#x20;necessary&#x20;to&#x20;enable&#x20;and&#x20;configure&#x20;the&#x20;Integria&#x20;incidents&#x20;in&#x20;Pandora&#x20;FMS&#x20;setup.','index.php?sec=workspace&amp;sec2=operation/integria_incidents/incident&amp;tab=editor&amp;from_event=_event_id_','url',0,0,0,1,'',0),(5,'Restart&#x20;agent','Restart&#x20;the&#x20;agent&#x20;with&#x20;using&#x20;UDP&#x20;protocol.&#x0d;&#x0a;&#x0d;&#x0a;To&#x20;use&#x20;this&#x20;response&#x20;is&#x20;necessary&#x20;to&#x20;have&#x20;installed&#x20;Pandora&#x20;FMS&#x20;server&#x20;and&#x20;console&#x20;in&#x20;the&#x20;same&#x20;machine.','/usr/share/pandora_server/util/udp_client.pl&#x20;_agent_address_&#x20;41122&#x20;&quot;REFRESH&#x20;AGENT&quot;','command',0,620,500,0,'',0),(6,'Ping&#x20;to&#x20;module&#x20;agent&#x20;host','Ping&#x20;to&#x20;the&#x20;module&#x20;agent&#x20;host','ping&#x20;-c&#x20;5&#x20;_module_address_','command',0,620,500,0,'',0);
 
 INSERT INTO `tupdate_settings` VALUES  ('current_update', '412'), ('customer_key', 'PANDORA-FREE'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''), ('dbport', ''), ('proxy', ''), ('proxy_port', ''), ('proxy_user', ''), ('proxy_pass', '');
 

From 8616015f38858c594ba748399a3127fe694aca1e Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 29 Aug 2017 00:01:14 +0200
Subject: [PATCH 148/157] 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 16d618e1f1..13b6ca76a8 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170828
+Version: 7.0NG.711-170829
 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 2f364599c0..a0bf56f1e8 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.711-170828"
+pandora_version="7.0NG.711-170829"
 
 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 b6f3f6e101..e08d9ef485 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.711';
-use constant AGENT_BUILD => '170828';
+use constant AGENT_BUILD => '170829';
 
 # 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 0a5a28281e..eb6ffbd601 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.711
-%define release     170828
+%define release     170829
 
 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 2b5c55e764..839ca880d6 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.711
-%define release     170828
+%define release     170829
 
 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 1e929a8def..04ab46038c 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170828"
+PI_BUILD="170829"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 3a82c79b75..8ca96ffd03 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170828}
+{170829}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 92d8ac4f87..5a96cbd2ba 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.711(Build 170828)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170829)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 26e781abe7..39a0a0ef2f 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.711(Build 170828))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170829))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 08e3382906..80a0ace482 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170828
+Version: 7.0NG.711-170829
 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 9900ce0677..389f2d6b93 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.711-170828"
+pandora_version="7.0NG.711-170829"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index c34515cdd3..718ad34c4d 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 = 'PC170828';
+$build_version = 'PC170829';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 97425a62a4..efd6279c8d 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170828';
+$build = '170829';
 			$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 514f0bc0ff..a07d1ed645 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.711
-%define release     170828
+%define release     170829
 
 # 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 04a7ecf30b..3381653775 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.711
-%define release     170828
+%define release     170829
 %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 45c44b97d1..0bc3be0d67 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170828
+Version: 7.0NG.711-170829
 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 856fb2916e..a557534023 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.711-170828"
+pandora_version="7.0NG.711-170829"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 771cbc8ccd..c9e1dc0d02 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.711";
-my $pandora_build = "170828";
+my $pandora_build = "170829";
 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 5192ff9704..153234c3e6 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.711
-%define release     170828
+%define release     170829
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 754e3ed0c9..663d5da4f1 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.711
-%define release     170828
+%define release     170829
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 550102e1b0..5a46c3d0d4 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170828"
+PI_BUILD="170829"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 6a2f97bf08..7256a1441d 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.711 PS170828";
+my $version = "7.0NG.711 PS170829";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a63c78c44c..b8bf77cb33 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.711 PS170828";
+my $version = "7.0NG.711 PS170829";
 
 # save program name for logging
 my $progname = basename($0);

From 487711d567c6cf89fab1bc53251b6a8b5cecf116 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 29 Aug 2017 09:28:05 +0200
Subject: [PATCH 149/157] fixed errors in simple graphs value negative

---
 pandora_console/include/graphs/flot/pandora.flot.js | 13 +++++++++++++
 pandora_console/include/graphs/functions_pchart.php |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 03a1bb696d..6d220c079c 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1667,6 +1667,15 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
 				how_bigger = "K";
 				y = y / 1000;
 			}
+			else if(y < -1000000) {
+				how_bigger = "M";
+				y = y / 1000000;
+			}
+			else if (y < -1000) {
+				console.log('entra por negativo');
+				how_bigger = "K";
+				y = y / 1000;	
+			}
 
 			if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) {
 				$('#timestamp_'+graph_id).show();
@@ -2090,6 +2099,10 @@ function number_format(number, force_integer, unit) {
 			pos++; //Position in array starting with 0
 			number = number / 1000;
 		}
+		else if (number <= -1000) {
+			pos++;
+			number = number / 1000;
+		}
 		else {
 			break;
 		}
diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php
index 4cf13ff7ce..6a80a0af9b 100644
--- a/pandora_console/include/graphs/functions_pchart.php
+++ b/pandora_console/include/graphs/functions_pchart.php
@@ -981,7 +981,8 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		($height - $margin_bottom));
 	
 	/*Get minimun value to draw axis properly*/
-	$min_data = min($data['min']);
+	
+	$min_data = min(min($data));
 	$ManualScale = array();
 	$mode = SCALE_MODE_START0;
 	if ($min_data < 0) {
@@ -992,6 +993,10 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
 		$ManualScale = array(0 => array("Min" => $min_data, "Max" => 0));
 		$mode = SCALE_MODE_MANUAL;
 	}
+	else if ($max_data >= 0 && $min_data <= 0){
+		$ManualScale = array(0 => array("Min" => $min_data, "Max" => $max_data));
+		$mode = SCALE_MODE_MANUAL;	
+	}
 	
 	if($graph_threshold){
 		$sql_treshold = 'select min_critical, max_critical, min_warning, max_warning, critical_inverse, warning_inverse from tagente_modulo where id_agente_modulo =' . $id_module;

From 8daa66d6ee743733271e70bd8946507373c00b5c Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 29 Aug 2017 11:14:42 +0200
Subject: [PATCH 150/157] Added option to set exec proxy in server

---
 pandora_console/godmode/servers/modificar_server.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index a3d9821373..e412acbb9c 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -58,8 +58,12 @@ if (isset($_GET["server"])) {
 	
 	if (enterprise_installed()) {
 		$table->data[] = array (__('Type'), $server_type);
-		$table->data[] = array (__('Exec Server Enable'), $exec_server_enable);
-		$table->data[] = array (__('Check Exec Server'), '<a id="check_exec_server">' . html_print_image ("images/dot_red.disabled.png", true) . '</a>' . '<div id="check_error_message"></div>');
+		if ($row["server_type"] == 13) {
+			$table->data[] = array (__('Exec Server'), html_print_checkbox ("exec_proxy", 1, $row["exec_proxy"], true));
+			if ($row["exec_proxy"]) {
+				$table->data[] = array (__('Check Exec Server'), '<a id="check_exec_server">' . html_print_image ("images/dot_red.disabled.png", true) . '</a>' . '<div id="check_error_message"></div>');
+			}
+		}
 	}
 	
 	html_print_table ($table);
@@ -120,8 +124,9 @@ else {
 		$address = get_parameter_post ("address");
 		$description = get_parameter_post ("description");
 		$id_server = get_parameter_post ("server");
+		$exec_proxy = get_parameter_post ("exec_proxy");
 		
-		$values = array('ip_address' => $address, 'description' => $description);
+		$values = array('ip_address' => $address, 'description' => $description, 'exec_proxy' => $exec_proxy);
 		$result = db_process_sql_update('tserver', $values, array('id_server' => $id_server));
 		if ($result !== false) {
 			ui_print_success_message(__('Server updated successfully'));

From 32ad745c62f85718e5c711771fd75d2c399388a9 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 29 Aug 2017 11:32:25 +0200
Subject: [PATCH 151/157] Added filter when id groups comes empty

---
 .../godmode/massive/massive_edit_agents.php   | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index cab81fd1c4..c18987a3ab 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -147,10 +147,15 @@ if ($update_agents) {
 			$result = db_process_sql_update ('tagente',
 				$values,
 				array ('id_agente' => $id_agent));
-				
+			
 			if($group_old || $result){
-				$tpolicy_group_old = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups 
-					WHERE id_group = ".$group_old);
+				if ($group_old && $group_old != null) {
+					$tpolicy_group_old = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups 
+						WHERE id_group = ".$group_old);
+				}
+				else {
+					$tpolicy_group_old = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups");
+				}
 					
 				if($tpolicy_group_old){
 					foreach ($tpolicy_group_old as $key => $value) {
@@ -164,9 +169,13 @@ if ($update_agents) {
 						}
 					}
 				}
-				
-				$tpolicy_group_new = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups 
-					WHERE id_group = ".$values['id_grupo']);
+				if ($values['id_grupo'] && $values['id_grupo'] != null) {
+					$tpolicy_group_new = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups 
+						WHERE id_group = ".$values['id_grupo']);
+				}
+				else {
+					$tpolicy_group_new = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups");
+				}
 						
 				if($tpolicy_group_new){
 					foreach ($tpolicy_group_new as $key => $value) {

From 63fb4881767b2f34c84b75b566a4dec8d5f807eb Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 29 Aug 2017 11:52:34 +0200
Subject: [PATCH 152/157] Clean code

---
 pandora_console/include/ajax/events.php | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 4f28012b2b..09e9642893 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -136,22 +136,9 @@ if ($perform_event_response) {
 				echo "Only stdin/stdout commands are supported";
 			}
 			else {
-				$return_val = array();
-				$return_val['correct'] = false;
+html_debug("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $command . " 2>&1\"", true);
+				$exec_val = system("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . io_safe_output($command) . " 2>&1\"", $ret_val);
 
-				$exec_val = system("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $command . " 2>&1\"", $ret_val);
-
-				if ($ret_val != 0) {
-					$return_val['message'] = "Conection error";
-				}
-				else {
-					if ($exec_val == "root") {
-						$return_val['correct'] = true;
-					}
-					else {
-						$return_val['message'] = "User must be pandora_exec_proxy";
-					}
-				}
 				ob_clean();
 				
 				echo $exec_val;

From 29cecf2e29bc350e2a75aee0719d368637bb63d3 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Tue, 29 Aug 2017 13:54:44 +0200
Subject: [PATCH 153/157] Remove nested queries to prevent deadlocks with the
 Data Server.

Ref pandora_enterprise#1248.
---
 pandora_server/lib/PandoraFMS/Core.pm | 29 ++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 5bd389a46b..59f737c3ff 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -5051,15 +5051,26 @@ sub pandora_set_event_storm_protection ($) {
 ##########################################################################
 sub pandora_update_agent_module_count ($$$) {
 	my ($pa_config, $dbh, $agent_id) = @_;
-	
-	db_do ($dbh, 'UPDATE tagente SET update_module_count=0,
-	normal_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=0),
-	critical_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=1),
-	warning_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=2),
-	unknown_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=3),
-	notinit_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=4),
-	total_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id .
-	') WHERE id_agente = ' . $agent_id);
+	my $total = 0;
+	my $counts = {
+		'0' => 0,
+		'1' => 0,
+		'2' => 0,
+		'3' => 0,
+		'4' => 0,
+	}; # Module counts by status.
+
+	# Retrieve and hash module status counts.
+	my @rows = get_db_rows ($dbh, 'SELECT estado, COUNT(*) AS total FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=?GROUP BY estado', $agent_id);
+	foreach my $row (@rows) {
+		$counts->{$row->{'estado'}} = $row->{'total'};
+		$total += $row->{'total'};
+	}
+
+	# Update the agent.
+	db_do ($dbh, 'UPDATE tagente
+		SET update_module_count=0, normal_count=?, critical_count=?, warning_count=?, unknown_count=?, notinit_count=?, total_count=?
+		WHERE id_agente = ?', $counts->{'0'}, $counts->{'1'}, $counts->{'2'}, $counts->{'3'}, $counts->{'4'}, $total, $agent_id);
 
 	# Sync the agent cache every time the module count is updated.
 	enterprise_hook('update_agent_cache', [$pa_config, $dbh, $agent_id]) if ($pa_config->{'node_metaconsole'} == 1);

From 976581e983d1dd23122b66d0e57e62896e2e7f2e Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 29 Aug 2017 15:54:12 +0200
Subject: [PATCH 154/157] Adjust timeout in events response commands

---
 pandora_console/include/ajax/events.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 09e9642893..cad5efae1a 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -136,12 +136,19 @@ if ($perform_event_response) {
 				echo "Only stdin/stdout commands are supported";
 			}
 			else {
-html_debug("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $command . " 2>&1\"", true);
-				$exec_val = system("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . io_safe_output($command) . " 2>&1\"", $ret_val);
+				switch (PHP_OS) {
+					case "FreeBSD":
+						$timeout_bin = '/usr/local/bin/gtimeout';
+						break;
+					case "NetBSD":
+						$timeout_bin = '/usr/pkg/bin/gtimeout';
+						break;
+					default:
+						$timeout_bin = '/usr/bin/timeout';
+						break;
+				}
 
-				ob_clean();
-				
-				echo $exec_val;
+				echo system("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $timeout_bin . " 90 " . io_safe_output($command) . " 2>&1\"", $ret_val);
 			}
 		}
 		else {
@@ -156,7 +163,7 @@ html_debug("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $com
 					$timeout_bin = '/usr/bin/timeout';
 					break;
 			}
-			echo system($timeout_bin . ' 9 '.io_safe_output($command).' 2>&1');
+			echo system($timeout_bin . ' 90 '.io_safe_output($command).' 2>&1');
 		}
 	}
 	else {
@@ -171,7 +178,7 @@ html_debug("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $com
 				$timeout_bin = '/usr/bin/timeout';
 				break;
 		}
-		echo system($timeout_bin . ' 9 '.io_safe_output($command).' 2>&1');
+		echo system($timeout_bin . ' 90 '.io_safe_output($command).' 2>&1');
 	}
 	
 	return;

From 0594a7bcbc18b6fc997ed3ae1b37397864b635d8 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 30 Aug 2017 00:01:13 +0200
Subject: [PATCH 155/157] 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 13b6ca76a8..33108219d1 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170829
+Version: 7.0NG.711-170830
 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 a0bf56f1e8..af57d7783f 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.711-170829"
+pandora_version="7.0NG.711-170830"
 
 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 e08d9ef485..1425e637c4 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.711';
-use constant AGENT_BUILD => '170829';
+use constant AGENT_BUILD => '170830';
 
 # 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 eb6ffbd601..20b52bf9a2 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.711
-%define release     170829
+%define release     170830
 
 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 839ca880d6..b215a6c8ed 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.711
-%define release     170829
+%define release     170830
 
 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 04ab46038c..c1ba43b68a 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170829"
+PI_BUILD="170830"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 8ca96ffd03..10ed59da35 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170829}
+{170830}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 5a96cbd2ba..661ee36f96 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.711(Build 170829)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170830)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 39a0a0ef2f..cdd2ad3fac 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.711(Build 170829))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170830))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 80a0ace482..94ebd17744 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170829
+Version: 7.0NG.711-170830
 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 389f2d6b93..290101bd51 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.711-170829"
+pandora_version="7.0NG.711-170830"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 718ad34c4d..d27f7c0899 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 = 'PC170829';
+$build_version = 'PC170830';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index efd6279c8d..71aa0bd163 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170829';
+$build = '170830';
 			$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 a07d1ed645..6d57a93943 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.711
-%define release     170829
+%define release     170830
 
 # 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 3381653775..ec2fd8b7c1 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.711
-%define release     170829
+%define release     170830
 %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 0bc3be0d67..a04eb999ed 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170829
+Version: 7.0NG.711-170830
 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 a557534023..0b05f952b6 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.711-170829"
+pandora_version="7.0NG.711-170830"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index c9e1dc0d02..463976763f 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.711";
-my $pandora_build = "170829";
+my $pandora_build = "170830";
 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 153234c3e6..472b0cbee3 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.711
-%define release     170829
+%define release     170830
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 663d5da4f1..9282d20469 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.711
-%define release     170829
+%define release     170830
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 5a46c3d0d4..4d9d588ea5 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170829"
+PI_BUILD="170830"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 7256a1441d..ee7769a2b7 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.711 PS170829";
+my $version = "7.0NG.711 PS170830";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index b8bf77cb33..e5c03aa71d 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.711 PS170829";
+my $version = "7.0NG.711 PS170830";
 
 # save program name for logging
 my $progname = basename($0);

From 68aa0f91ac2f68db8afeb2bb33ed0268bd13c8cd Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 30 Aug 2017 17:30:36 +0200
Subject: [PATCH 156/157] Fix agent view remote config column order - #124

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

diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index a302be9814..dcee95e529 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -595,7 +595,7 @@ foreach ($agents as $agent) {
 	if (enterprise_installed()) {
 		enterprise_include_once('include/functions_config_agents.php');
 		if (enterprise_hook('config_agents_has_remote_configuration',array($agent["id_agente"]))) {
-			$data[9] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$agent["id_agente"].'&disk_conf=1">'.html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Remote config'))).'</a>';
+			$data[10] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$agent["id_agente"].'&disk_conf=1">'.html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Remote config'))).'</a>';
 		}
 	}
 	

From e45face2fce00193798fdbb53fa466225f24557a Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 31 Aug 2017 00:01:15 +0200
Subject: [PATCH 157/157] 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 33108219d1..ddf2f2958c 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.711-170830
+Version: 7.0NG.711-170831
 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 af57d7783f..d68221cc09 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.711-170830"
+pandora_version="7.0NG.711-170831"
 
 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 1425e637c4..44cdd4cf15 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.711';
-use constant AGENT_BUILD => '170830';
+use constant AGENT_BUILD => '170831';
 
 # 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 20b52bf9a2..a5dd9c74c8 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.711
-%define release     170830
+%define release     170831
 
 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 b215a6c8ed..e85885c090 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.711
-%define release     170830
+%define release     170831
 
 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 c1ba43b68a..e09be3c3ee 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170830"
+PI_BUILD="170831"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 10ed59da35..327c54e068 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170830}
+{170831}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 661ee36f96..69d01c1305 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.711(Build 170830)")
+#define PANDORA_VERSION ("7.0NG.711(Build 170831)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index cdd2ad3fac..0a1b5bc32a 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.711(Build 170830))"
+      VALUE "ProductVersion", "(7.0NG.711(Build 170831))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 94ebd17744..4c002ad0f3 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.711-170830
+Version: 7.0NG.711-170831
 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 290101bd51..6de79e711f 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.711-170830"
+pandora_version="7.0NG.711-170831"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index d27f7c0899..f76ddfffee 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 = 'PC170830';
+$build_version = 'PC170831';
 $pandora_version = 'v7.0NG.711';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 71aa0bd163..22f79c24c4 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.711';
-$build = '170830';
+$build = '170831';
 			$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 6d57a93943..d849d25e84 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.711
-%define release     170830
+%define release     170831
 
 # 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 ec2fd8b7c1..80515a14b3 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.711
-%define release     170830
+%define release     170831
 %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 a04eb999ed..d4c8d33a64 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.711-170830
+Version: 7.0NG.711-170831
 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 0b05f952b6..3d45a6ddad 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.711-170830"
+pandora_version="7.0NG.711-170831"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 463976763f..78c003c165 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.711";
-my $pandora_build = "170830";
+my $pandora_build = "170831";
 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 472b0cbee3..5dcfab796b 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.711
-%define release     170830
+%define release     170831
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 9282d20469..45e234fc17 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.711
-%define release     170830
+%define release     170831
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 4d9d588ea5..af83f6df69 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.711"
-PI_BUILD="170830"
+PI_BUILD="170831"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index ee7769a2b7..924bb85dbe 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.711 PS170830";
+my $version = "7.0NG.711 PS170831";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index e5c03aa71d..b47f55459b 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.711 PS170830";
+my $version = "7.0NG.711 PS170831";
 
 # save program name for logging
 my $progname = basename($0);