From b372bcabac547f45868b83a5bf564b22354688fa Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Tue, 3 Jul 2018 13:47:34 +0200
Subject: [PATCH 01/79] fixed minor bug: entities in module name

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

diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index db77af000b..edd76e841c 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -148,7 +148,7 @@ $table_simple->colspan[6][1] = 3;
 
 $table_simple->data[0][0] = __('Name');
 $table_simple->data[0][1] = html_print_input_text_extended ('name',
-	io_safe_input(html_entity_decode($name)), 'text-name', '', 45, 100, $disabledBecauseInPolicy, '', $largeClassDisabledBecauseInPolicy, true);
+	io_safe_input(html_entity_decode($name, ENT_QUOTES, "UTF-8")), 'text-name', '', 45, 100, $disabledBecauseInPolicy, '', $largeClassDisabledBecauseInPolicy, true);
 //$table_simple->data[0][1] = html_print_input_text ('name',
 //	io_safe_output($name), '', 45, 100, true, $disabledBecauseInPolicy);
 

From 30b720c291b431a4f9abef31e2ee4b76417083c6 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Thu, 5 Jul 2018 12:41:05 +0200
Subject: [PATCH 02/79] added hidden input to policy modules filters form

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

diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 02698e3326..35acef9efc 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -44,6 +44,7 @@ echo '<table width="100%" cellpadding="2" cellspacing="2" class="databox filters
 echo "<tr><td class='datos' style='width:20%; font-weight: bold;'>";
 echo __('Search') . ' ' .
 	html_print_input_text ('search_string', $search_string, '', 15, 255, true);
+	html_print_input_hidden ('search', 1);
 echo "</td>";
 echo "<td class='datos' style='width:10%'>";
 html_print_submit_button (__('Filter'), 'filter', false, 'class="sub search"');

From 63a47e3acfe3e0b6073d47f51e66b0a58ed8a797 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Thu, 5 Jul 2018 18:48:31 +0200
Subject: [PATCH 03/79] removed watermark from incidents statistics graphs

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

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 0fd12990b9..a917671b5c 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -2967,7 +2967,7 @@ function grafico_incidente_prioridad () {
 		}
 	
 	return pie3d_graph($config['flash_charts'], $data, 320, 200,
-		__('Other'), '', $water_mark,
+		__('Other'), '', '',
 		$config['fontpath'], $config['font_size']);
 }
 
@@ -3008,7 +3008,7 @@ function graph_incidents_status () {
 	}
 	
 	return pie3d_graph($config['flash_charts'], $data, 320, 200,
-		__('Other'), '', $water_mark,
+		__('Other'), '', '',
 		$config['fontpath'], $config['font_size']);
 }
 
@@ -3064,7 +3064,7 @@ function graphic_incident_group () {
 	}
 	
 	return pie3d_graph($config['flash_charts'], $data, 320, 200,
-		__('Other'), '', $water_mark,
+		__('Other'), '', '',
 		$config['fontpath'], $config['font_size']);
 }
 
@@ -3119,7 +3119,7 @@ function graphic_incident_user () {
 	}
 	
 	return pie3d_graph($config['flash_charts'], $data, 320, 200,
-		__('Other'), '', $water_mark,
+		__('Other'), '', '',
 		$config['fontpath'], $config['font_size']);
 }
 
@@ -3173,7 +3173,7 @@ function graphic_incident_source($width = 320, $height = 200) {
 	}
 	
 	return pie3d_graph($config['flash_charts'], $data, $width, $height,
-		__('Other'), '', $water_mark,
+		__('Other'), '', '',
 		$config['fontpath'], $config['font_size']);
 }
 

From d3b39fe1dd2cdea7dbac41396ccc784095dbcb89 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Fri, 6 Jul 2018 11:03:52 +0200
Subject: [PATCH 04/79] fixed visual bug: buttons in message edit bad
 positioned

---
 .../operation/messages/message_edit.php          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pandora_console/operation/messages/message_edit.php b/pandora_console/operation/messages/message_edit.php
index ce1abf91a4..5df20ce9fe 100644
--- a/pandora_console/operation/messages/message_edit.php
+++ b/pandora_console/operation/messages/message_edit.php
@@ -103,22 +103,22 @@ if ($read_message) {
 	//Start the message much like an e-mail reply 
 	$new_msg = "\n\n\nOn ".date ($config["date_format"], $message["timestamp"]).' '.$user_name.' '.__('wrote').":\n\n".$message["mensaje"];
 	
-	echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1&amp;delete_message=1&amp;id='.$message_id.'">';
+	echo '<form id="delete_message" method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1&amp;delete_message=1&amp;id='.$message_id.'">';
 		html_print_table($table);
-		echo "<div style=' text-align: right; width:" . $table->width . "'>";
-			html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
-		echo "</div>";
 	echo "</form>";
 	
-	echo '<form method="post" action="index.php?sec=message_list&sec2=operation/messages/message_edit&amp;new_msg=1&amp;reply=1">';
+	echo '<form id="reply_message" method="post" action="index.php?sec=message_list&sec2=operation/messages/message_edit&amp;new_msg=1&amp;reply=1">';
 		html_print_input_hidden ("dst_user", $message["id_usuario_origen"]);
 		html_print_input_hidden ("subject", $new_subj);
 		html_print_input_hidden ("message", $new_msg);
 		html_print_input_hidden ("orig_user", $message["id_usuario_destino"]);
-		echo "<div style='text-align: right; width:" . $table->width . "'>";
-			html_print_submit_button (__('Reply'), 'reply', false, 'class="sub next"');
-		echo '</div>';
 	echo '</form>';
+
+	echo "<div class= 'action-buttons' style=' width:" . $table->width . "'>";
+	html_print_submit_button(__('Delete'), 'delete_btn', false, 'form="delete_message" class="sub delete"');
+	echo "&nbsp";
+	html_print_submit_button (__('Reply'), 'reply', false, 'form="reply_message" class="sub next"');
+	echo "</div>";
 	
 	return;
 }

From 213a59d26ecd85c4adc8080b0ada8efbe4930768 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Mon, 16 Jul 2018 18:14:18 +0200
Subject: [PATCH 05/79] fixed bug on bulk delete and bulk update module
 operation

---
 .../godmode/massive/massive_edit_modules.php  | 24 ++++++++++++-------
 pandora_console/include/functions_modules.php |  4 ++--
 pandora_console/include/javascript/pandora.js |  2 +-
 .../operation/agentes/ver_agente.php          |  9 ++++---
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index 87fb1b3173..6e8238c254 100755
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -47,17 +47,21 @@ $update = (bool) get_parameter_post ('update');
 if ($update) {
 	$agents_ = '';
 	if ($selection_mode == 'modules') {
+
+		$agents_ = array();
+
 		$force = get_parameter('force_type', false);
 		
 		if ($agents_select == false) {
 			$agents_select = array();
-			$agents_ = array();
 		}
 		
 		foreach ($agents_select as $agent_name) {
 			$agents_[] = agents_get_agent_id($agent_name);
 		}
+
 		$modules_ = $module_name;
+
 	}
 	else if ($selection_mode == 'agents') {
 		$force = get_parameter('force_group', false);
@@ -75,6 +79,7 @@ if ($update) {
 	// If the option to select all of one group or module type is checked
 	if ($force) {
 		if ($force == 'type') {
+
 			$type_condition = '';
 			if ($module_type != 0)
 				$type_condition = "AND tam.id_tipo_modulo = $module_type";
@@ -141,12 +146,11 @@ if ($update) {
 	else {
 		// Standard procedure
 		foreach ($agents_ as $agent_) {
-			
+
 			if ($modules_ == false)
 				$modules_ = array();
 			
 			foreach ($modules_ as $module_) {
-				
 				$result = process_manage_edit ($module_, $agent_, $modules_selection_mode);
 				$count++;
 				$success += (int)$result;
@@ -331,6 +335,7 @@ $table->data['form_modules_2'][2] .= html_print_select (
 		'all' => __('Show all agents')),
 	'agents_selection_mode',
 	'common', false, '', '', true);
+
 $table->data['form_modules_2'][3] = html_print_select (array(), 'agents[]',
 	$agents_select, false, __('None'), 0, true, true, false);
 
@@ -1519,12 +1524,14 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu
 	$update_tags = get_parameter('id_tag', false);
 
 	if (array_search(0, $agents_select) !== false) {
+
 		//Apply at All agents.
 		$modules = db_get_all_rows_filter ('tagente_modulo',
 			$filter_modules,
 			array ('id_agente_modulo'));
 	}
 	else {
+
 		if ($module_name == "0") {
 			//Any module
 			$modules = db_get_all_rows_filter ('tagente_modulo',
@@ -1538,7 +1545,8 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu
 				array ('id_agente_modulo'));
 		}
 	}
-	
+
+
 	if ($modules === false)
 		return false;
 
@@ -1554,16 +1562,16 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu
 		}
 		$modules = $modules_to_delete;
 	}
-	
+
 	foreach ($modules as $module) {
 		
 		$result = modules_update_agent_module(
 			$module['id_agente_modulo'], $values, true, $update_tags);
 
-		if (is_error($result)) {
-			
+
+		if (is_error($result))
 			return false;
-		}
+
 	}
 	
 	return true;
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 59e88d9cdf..c749e03a9b 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -441,9 +441,9 @@ function modules_update_agent_module ($id, $values,
 	}
 	
 	$result = @db_process_sql_update ('tagente_modulo', $values, $where);
-	
+
 	if ($result == false) {
-		if ($result_disable == ERR_GENERIC ){
+		if ($result_disable === ERR_GENERIC ){
 			return ERR_DB;
 		}
 		else{
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index fae6a82072..e1813f7abe 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -529,7 +529,7 @@ function module_changed_by_multiple_modules (event, id_module, selected) {
 			jQuery.each (data, function (i, val) {
 				s = js_html_entity_decode(val);
 				$('#agents')
-					.append ($('<option></option>').html (s).attr ("value", val));
+					.append ($('<option></option>').html (s).attr ("value", i));
 				$('#agents').fadeIn ('normal');
 			});
 			
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 8381bf3aa7..393aa07882 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -207,7 +207,7 @@ if (is_ajax ()) {
 		$groups = users_get_groups ($config["id_user"], "AW", false);
 		$group_id_list = ($groups ? join(",",array_keys($groups)):"0");
 		
-		$sql = 'SELECT DISTINCT(t1.alias) as name
+		$sql = 'SELECT DISTINCT(t1.nombre) as name, t1.alias
 			FROM tagente t1, tagente_modulo t2
 			WHERE t1.id_agente = t2.id_agente
 				AND t1.id_grupo IN (' . $group_id_list .')
@@ -254,10 +254,9 @@ if (is_ajax ()) {
 		if ($nameAgents == false)
 			$nameAgents = array();
 		
-		foreach ($nameAgents as $nameAgent) {
-			$names[] = io_safe_output($nameAgent['name']);
-		}
-		
+		foreach ($nameAgents as $nameAgent)
+			$names[$nameAgent['name']] = io_safe_output($nameAgent['alias']);
+
 		echo json_encode($names);
 		return;
 	}

From 4cbd80a3b410e5d1919982540a61c0d199fe0aec Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Tue, 17 Jul 2018 13:45:38 +0200
Subject: [PATCH 06/79] fixed wrong percentage in meta availability report

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

diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index da4bf3fff5..58b0e98167 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -2432,7 +2432,7 @@ function reporting_html_availability(&$table, $item) {
 				else
 					$table_row[] = '--';
 				
-				$table_row[] = '<span style="font-size: 1.2em; font-weight:bold;">' . sla_truncate($row['SLA'] * 100, $config['graph_precision']). '%</span>';	
+				$table_row[] = '<span style="font-size: 1.2em; font-weight:bold;">' . sla_truncate($row['SLA'], $config['graph_precision']). '%</span>';	
 
 				$table_row2 = array();
 				$table_row2[] = $row['agent'];

From 5258d69e7e6cfe949ed8fbc27649ea51b47bb7e2 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Wed, 18 Jul 2018 17:44:18 +0200
Subject: [PATCH 07/79] fixed bug in meta alert view: agent names not showing
 in table

---
 pandora_console/include/functions_ui.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 633f007784..0e334cb35c 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -823,10 +823,26 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
 		else
 			return array ("", "", "", "", "", "", "");
 	}
-	
-	// Get agent id
-	$id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
-	$agente = db_get_row ('tagente', 'id_agente', $id_agent);
+
+
+	if (defined('METACONSOLE')) {
+
+		$server = db_get_row ('tmetaconsole_setup', 'id', $alert['server_data']['id']);
+
+		if (metaconsole_connect($server) == NOERR) {
+
+			// Get agent data from node
+			$agente = db_get_row ('tagente', 'id_agente', $alert['id_agent']);
+
+			metaconsole_restore_db ();
+		}
+
+	} else {
+		// Get agent id
+		$id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
+		$agente = db_get_row ('tagente', 'id_agente', $id_agent);
+	}
+
 	$template = alerts_get_alert_template ($alert['id_alert_template']);
 	$description = io_safe_output($template['name']);
 	

From 88a9d6db4d6bf86353486d871d4b80132d9e855b Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Wed, 18 Jul 2018 17:49:12 +0200
Subject: [PATCH 08/79] Fixed Windows visual mismatch of the Recon task

---
 pandora_console/operation/servers/recon_view.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pandora_console/operation/servers/recon_view.php b/pandora_console/operation/servers/recon_view.php
index a60a2452d7..7738a42a62 100644
--- a/pandora_console/operation/servers/recon_view.php
+++ b/pandora_console/operation/servers/recon_view.php
@@ -85,6 +85,10 @@ else {
 			$table->head = array ();
 			$table->data = array ();
 			$table->align = array ();
+			$table->headstyle = array ();
+			for ($i=0; $i < 9; $i++) {
+				$table->headstyle[$i] = 'text-align: left;';
+			}
 			
 			$table->head[0] = __('Force');
 			$table->align[0] = "left";

From b5c378d589adec0983af7d45f602556028745ffe Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Thu, 19 Jul 2018 13:55:16 +0200
Subject: [PATCH 09/79] fixed bug in meta alert view: action field (other than
 default) not showing

---
 pandora_console/include/functions_alerts.php | 22 +++++++++++++++-----
 pandora_console/include/functions_ui.php     |  6 +-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 3e3d424227..52f43783b5 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -1305,13 +1305,25 @@ function alerts_delete_alert_agent_module_action ($id_alert_agent_module_action)
  *
  * @return mixed Actions associated or false if something goes wrong.
  */
-function alerts_get_alert_agent_module_actions ($id_alert_agent_module, $fields = false) {
+function alerts_get_alert_agent_module_actions ($id_alert_agent_module, $fields = false, $server_id = -1) {
 	if (empty ($id_alert_agent_module))
 		return false;
-	
-	$actions = db_get_all_rows_filter ('talert_template_module_actions',
-		array ('id_alert_template_module' => $id_alert_agent_module),
-		$fields);
+
+	if (defined('METACONSOLE')) {
+		$server = db_get_row ('tmetaconsole_setup', 'id', $server_id);
+
+		if (metaconsole_connect($server) == NOERR) {
+			$actions = db_get_all_rows_filter ('talert_template_module_actions',
+				array ('id_alert_template_module' => $id_alert_agent_module),
+				$fields);
+
+			metaconsole_restore_db ();
+		}
+	} else {
+		$actions = db_get_all_rows_filter ('talert_template_module_actions',
+			array ('id_alert_template_module' => $id_alert_agent_module),
+			$fields);
+	}
 	
 	if ($actions === false)
 		return array ();
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 633f007784..d3871c4929 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -823,10 +823,6 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
 		else
 			return array ("", "", "", "", "", "", "");
 	}
-	
-	// Get agent id
-	$id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
-	$agente = db_get_row ('tagente', 'id_agente', $id_agent);
 	$template = alerts_get_alert_template ($alert['id_alert_template']);
 	$description = io_safe_output($template['name']);
 	
@@ -917,7 +913,7 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
 		ui_print_truncate_text (io_safe_output($description), 'description', false, true, true, '[&hellip;]', 'font-size: 7.1pt') .
 		$disabledHtmlEnd;
 	
-	$actions = alerts_get_alert_agent_module_actions ($alert['id'], false);
+	$actions = alerts_get_alert_agent_module_actions ($alert['id'], false, $alert['server_data']['id']);
 	
 	if (!empty($actions)) {
 		$actionText = '<div><ul class="action_list">';

From f1938a0fdb501a137018098a6144995f848eadeb Mon Sep 17 00:00:00 2001
From: "manuel.montes" <manuel.montes@support.artica.es>
Date: Mon, 23 Jul 2018 11:52:17 +0200
Subject: [PATCH 10/79] Agent filtering by alias

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

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 680181c380..5a41e079e5 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -7230,10 +7230,11 @@ function otherParameter2Filter($other, $return_as_array = false) {
 	
 	$idAgent = null;
 	if (isset($other['data'][2]) && $other['data'][2] != '') {
-		$idAgent = agents_get_agent_id($other['data'][2]);
+		$idAgents = agents_get_agent_id_by_alias($other['data'][2]);
 		
 		if (!empty($idAgent)) {
-			$filter['id_agente'] = $idAgent;
+
+			$filter[] = "id_agente IN (" . explode(",", $idAgents) .")";
 		}
 		else {
 			$filter['sql'] = "1=0";

From e4b74cffc8546720fa9eba0a7a6a698faab52cf7 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Tue, 24 Jul 2018 13:04:31 +0200
Subject: [PATCH 11/79] fixed bug in modules massive deletion to avoid deletion
 of modules with the same name in distinct agents regardless of their status
 when module status filter has been applied

---
 .../godmode/massive/massive_delete_modules.php            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php
index d1dd485db2..4646dea1a8 100755
--- a/pandora_console/godmode/massive/massive_delete_modules.php
+++ b/pandora_console/godmode/massive/massive_delete_modules.php
@@ -52,6 +52,8 @@ function process_manage_delete ($module_name, $id_agents, $module_status = 'all'
 
 	global $config;
 
+	$status_module = (int) get_parameter ('status_module');
+
 	if (empty ($module_name)) {
 		ui_print_error_message(__('No module selected'));
 		return false;
@@ -212,8 +214,10 @@ function process_manage_delete ($module_name, $id_agents, $module_status = 'all'
 			}
 		}
 		else {
-			$modules = agents_get_modules ($id_agents, 'id_agente_modulo',
-				sprintf('nombre IN ("%s")', implode('","',$module_name)), true);
+			if ($status_module != -1) // If module status filter has been applied
+				$modules = agents_get_modules ($id_agents, 'id_agente_modulo', sprintf('nombre IN ("%s") AND id_agente_modulo IN (SELECT id_agente_modulo FROM tagente_estado where estado = %s OR utimestamp=0 )', implode('","',$module_name), $status_module), true);
+			else
+				$modules = agents_get_modules ($id_agents, 'id_agente_modulo', sprintf('nombre IN ("%s")', implode('","',$module_name)), true);
 		}
 	}
 	

From ad7610d7f143cf828ede6e227e5fd021296eacc7 Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Tue, 24 Jul 2018 15:02:11 +0200
Subject: [PATCH 12/79] Removed html entities in the audit views

---
 pandora_console/godmode/users/configure_user.php |  2 +-
 pandora_console/index.php                        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index df5d1a729f..ac0f6eb7b7 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -252,7 +252,7 @@ if ($create_user) {
 		
 		
 		db_pandora_audit("User management",
-			"Created user ".io_safe_input($id), false, false, $info);
+			"Created user ".io_safe_output($id), false, false, $info);
 		
 		ui_print_result_message ($result,
 			__('Successfully created'),
diff --git a/pandora_console/index.php b/pandora_console/index.php
index d7d7baba3e..4b98179a1b 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -359,7 +359,7 @@ if (! isset ($config['id_user'])) {
 				
 				if ($blocked) {
 					require_once ('general/login_page.php');
-					db_pandora_audit("Password expired", "Password expired: ".$nick, $nick);
+					db_pandora_audit("Password expired", "Password expired: ".io_safe_output($nick), io_safe_output($nick));
 					while (@ob_end_flush ());
 					exit ("</html>");
 				}
@@ -382,7 +382,7 @@ if (! isset ($config['id_user'])) {
 			
 			require_once ('general/login_page.php');
 			db_pandora_audit("Password expired",
-				"Password expired: " . $nick, $nick);
+				"Password expired: " . io_safe_output($nick), $nick);
 			while (@ob_end_flush ());
 			exit ("</html>");
 		}
@@ -537,20 +537,20 @@ if (! isset ($config['id_user'])) {
 			if ((!is_user_admin($nick) || $config['enable_pass_policy_admin']) && file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
 				$blocked = login_check_blocked($nick);
 			}
-			
+			$nick_usable = io_safe_output($nick);
 			if (!$blocked) {
 				if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
 					login_check_failed($nick); //Checks failed attempts
 				}
 				$login_failed = true;
 				require_once ('general/login_page.php');
-				db_pandora_audit("Logon Failed", "Invalid login: ".$nick, $nick);
+				db_pandora_audit("Logon Failed", "Invalid login: ".$nick_usable, $nick_usable);
 				while (@ob_end_flush ());
 				exit ("</html>");
 			}
 			else {
 				require_once ('general/login_page.php');
-				db_pandora_audit("Logon Failed", "Invalid login: ".$nick, $nick);
+				db_pandora_audit("Logon Failed", "Invalid login: ".$nick_usable, $nick_usable);
 				while (@ob_end_flush ());
 				exit ("</html>");
 			}

From 2b11d8cd7cf855c9d0290ea54974b5a0f521d8a9 Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Wed, 25 Jul 2018 13:48:02 +0200
Subject: [PATCH 13/79] Added title in custom reports

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

diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index a9e955a04e..6a36ce90a8 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -2068,9 +2068,9 @@ else {
 	$buttons = null;
 	$buttons = array(
 		'main' => array('active' => true,
-			'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=new&pure=' .$pure.'">' .
-				html_print_image("images/op_reporting.png", true, array ("title" => __('Main data'))) .'</a>'));
-	$textReportName = '';
+			'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure=' .$pure.'">' .
+				html_print_image("images/report_list.png", true, array ("title" => __('Reports list'))) .'</a>'));
+	$textReportName = __('Create Custom Report');
 }
 
 // Page header for metaconsole

From 202f72d1c3c0f6a93918472566eacfb49d64aebe Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Wed, 25 Jul 2018 17:23:13 +0200
Subject: [PATCH 14/79] Fixed fields list in manage events-custom fields

---
 .../operation/events/events.build_table.php   | 139 +++++++++---------
 1 file changed, 71 insertions(+), 68 deletions(-)

diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php
index c92f0dc795..3eb2f74216 100644
--- a/pandora_console/operation/events/events.build_table.php
+++ b/pandora_console/operation/events/events.build_table.php
@@ -135,132 +135,134 @@ else {
 	$table->align[$i] = 'left';
 
 	$i++;
-	if (in_array('server_name', $show_fields)) {
+	foreach ($show_fields as $k_s => $fields) {
+	if ($fields == 'server_name') {
 		$table->head[$i] = __('Server');
 		$table->align[$i] = 'left';
 		$i++;
 	}
-	if (in_array('estado', $show_fields)) {
+	if ($fields == 'estado') {
 		$table->head[$i] = __('Status');
 		$table->align[$i] = 'left';
 		$i++;
 	}
-	if (in_array('id_evento', $show_fields)) {
+	if ($fields == 'id_evento') {
 		$table->head[$i] = __('Event ID');
 		$table->align[$i] = 'left';
 
 		$i++;
 	}
-	if (in_array('evento', $show_fields)) {
+	if ($fields == 'evento') {
 		$table->head[$i] = __('Event Name');
 		$table->align[$i] = 'left';
 		$table->style[$i] = 'min-width: 200px; max-width: 350px; word-break: break-all;';
 		$i++;
 	}
-	if (in_array('id_agente', $show_fields)) {
+	if ($fields == 'id_agente') {
 		$table->head[$i] = __('Agent name');
 		$table->align[$i] = 'left';
 		$table->style[$i] = 'max-width: 350px; word-break: break-all;';
 		$i++;
 	}
-	if (in_array('timestamp', $show_fields)) {
+	if ($fields == 'timestamp') {
 		$table->head[$i] = __('Timestamp');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('id_usuario', $show_fields)) {
+	if ($fields == 'id_usuario') {
 		$table->head[$i] = __('User');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('owner_user', $show_fields)) {
+	if ($fields == 'owner_user') {
 		$table->head[$i] = __('Owner');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('id_grupo', $show_fields)) {
+	if ($fields == 'id_grupo') {
 		$table->head[$i] = __('Group');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('event_type', $show_fields)) {
+	if ($fields == 'event_type') {
 		$table->head[$i] = __('Event type');
 		$table->align[$i] = 'left';
 		
 		$table->style[$i] = 'min-width: 85px;';
 		$i++;
 	}
-	if (in_array('id_agentmodule', $show_fields)) {
+	if ($fields == 'id_agentmodule') {
 		$table->head[$i] = __('Agent Module');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('id_alert_am', $show_fields)) {
+	if ($fields == 'id_alert_am') {
 		$table->head[$i] = __('Alert');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
 
-	if (in_array('criticity', $show_fields)) {
+	if ($fields == 'criticity') {
 		$table->head[$i] = __('Severity');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('user_comment', $show_fields)) {
+	if ($fields == 'user_comment') {
 		$table->head[$i] = __('Comment');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('tags', $show_fields)) {
+	if ($fields == 'tags') {
 		$table->head[$i] = __('Tags');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('source', $show_fields)) {
+	if ($fields == 'source') {
 		$table->head[$i] = __('Source');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('id_extra', $show_fields)) {
+	if ($fields == 'id_extra') {
 		$table->head[$i] = __('Extra ID');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('ack_utimestamp', $show_fields)) {
+	if ($fields == 'ack_utimestamp') {
 		$table->head[$i] = __('ACK Timestamp');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('instructions', $show_fields)) {
+	if ($fields == 'instructions') {
 		$table->head[$i] = __('Instructions');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('data', $show_fields)) {
+	if ($fields == 'data') {
 		$table->head[$i] = __('Data');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
-	if (in_array('module_status', $show_fields)) {
+	if ($fields == 'module_status') {
 		$table->head[$i] = __('Module status');
 		$table->align[$i] = 'left';
 		
 		$i++;
 	}
+	}
 	if ($i != 0 && $allow_action) {
 		$table->head[$i] = __('Action');
 		$table->align[$i] = 'left';
@@ -371,35 +373,6 @@ else {
 		
 		$i++;
 		
-		if (in_array('server_name',$show_fields)) {
-			if ($meta) {
-				if (can_user_access_node ()) {
-					$data[$i] = "<a href='" . $event["server_url"] . "/index.php?sec=estado&sec2=operation/agentes/group_view" . $event['server_url_hash'] . "'>" . $event["server_name"] . "</a>";
-				}
-				else {
-					$data[$i] = $event["server_name"];
-				}
-			}
-			else {
-				$data[$i] = db_get_value('name','tserver');
-			}
-			$table->cellclass[count($table->data)][$i] = $myclass;
-			$i++;
-		}
-		if (in_array('estado',$show_fields)) {
-			$data[$i] = html_print_image ($img_st, true, 
-				array ("class" => "image_status",
-					"title" => $title_st,
-					"id" => 'status_img_'.$event["id_evento"]));
-			$table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3;';
-			$i++;
-		}
-		if (in_array('id_evento',$show_fields)) {
-			$data[$i] = $event["id_evento"];
-			$table->cellclass[count($table->data)][$i] = $myclass;
-			$i++;
-		}
-		
 		switch ($event["criticity"]) {
 			default:
 			case 0:
@@ -424,8 +397,37 @@ else {
 				$img_sev = "images/status_sets/default/severity_major.png";
 				break;
 		}
+		foreach ($show_fields as $k_s => $fields) {
+		if ($fields == 'server_name') {
+			if ($meta) {
+				if (can_user_access_node ()) {
+					$data[$i] = "<a href='" . $event["server_url"] . "/index.php?sec=estado&sec2=operation/agentes/group_view" . $event['server_url_hash'] . "'>" . $event["server_name"] . "</a>";
+				}
+				else {
+					$data[$i] = $event["server_name"];
+				}
+			}
+			else {
+				$data[$i] = db_get_value('name','tserver');
+			}
+			$table->cellclass[count($table->data)][$i] = $myclass;
+			$i++;
+		}
+		if ($fields == 'estado') {
+			$data[$i] = html_print_image ($img_st, true, 
+				array ("class" => "image_status",
+					"title" => $title_st,
+					"id" => 'status_img_'.$event["id_evento"]));
+			$table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3;';
+			$i++;
+		}
+		if ($fields == 'id_evento') {
+			$data[$i] = $event["id_evento"];
+			$table->cellclass[count($table->data)][$i] = $myclass;
+			$i++;
+		}
 		
-		if (in_array('evento', $show_fields)) {
+		if ($fields == 'evento') {
 			// Event description
 			$data[$i] = '<span title="' . strip_tags(io_safe_output($event["evento"])) . '" class="f9">';
 			if($allow_action) {
@@ -440,7 +442,7 @@ else {
 			$i++;
 		}
 		
-		if (in_array('id_agente', $show_fields)) {
+		if ($fields == 'id_agente') {
 			$data[$i] = '<span class="'.$myclass.'">';
 			
 			if ($event["id_agente"] > 0) {
@@ -473,7 +475,7 @@ else {
 			$i++;
 		}
 		
-		if (in_array('timestamp', $show_fields)) {
+		if ($fields == 'timestamp') {
 			//Time
 			$data[$i] = '<span class="'.$myclass.'">';
 			if ($group_rep == 1) {
@@ -487,7 +489,7 @@ else {
 			$i++;
 		}
 		
-		if (in_array('id_usuario',$show_fields)) {
+		if ($fields == 'id_usuario') {
 			$user_name = db_get_value('fullname', 'tusuario', 'id_user', $event['id_usuario']);
 			if(empty($user_name)) {
 				$user_name = $event['id_usuario'];
@@ -497,7 +499,7 @@ else {
 			$i++;
 		}
 		
-		if (in_array('owner_user',$show_fields)) {
+		if ($fields == 'owner_user') {
 			$owner_name = db_get_value('fullname', 'tusuario', 'id_user', $event['owner_user']);
 			if(empty($owner_name)) {
 				$owner_name = $event['owner_user'];
@@ -507,7 +509,7 @@ else {
 			$i++;
 		}
 		
-		if (in_array('id_grupo',$show_fields)) {
+		if ($fields == 'id_grupo') {
 			if ($meta) {
 				$data[$i] = $event['group_name'];
 			}
@@ -523,13 +525,13 @@ else {
 			$i++;
 		}
 		
-		if (in_array('event_type',$show_fields)) {
+		if ($fields == 'event_type') {
 			$data[$i] = events_print_type_description($event["event_type"], true);
 			$table->cellclass[count($table->data)][$i] = $myclass;
 			$i++;
 		}
 		
-		if (in_array('id_agentmodule',$show_fields)) {
+		if ($fields == 'id_agentmodule') {
 			if ($meta) {
 				$module_link = '<a href="'.$event["server_url"].'/index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=' . $event["id_agente"] . $event["server_url_hash"] . '">';
 				if (can_user_access_node ()) {
@@ -548,7 +550,7 @@ else {
 			$i++;
 		}
 		
-		if (in_array('id_alert_am',$show_fields)) {
+		if ($fields == 'id_alert_am') {
 			if($meta) {
 				$data[$i] = $event["alert_template_name"];
 			}
@@ -571,13 +573,13 @@ else {
 			$i++;
 		}
 		
-		if (in_array('criticity',$show_fields)) {
+		if ($fields == 'criticity') {
 			$data[$i] = get_priority_name ($event["criticity"]);
 			$table->cellclass[count($table->data)][$i] = $myclass;
 			$i++;
 		}
 		
-		if (in_array('user_comment',$show_fields)) {
+		if ($fields == 'user_comment') {
 			$safe_event_user_comment = strip_tags(io_safe_output($event["user_comment"]));
 			$line_breaks = array("\r\n", "\n", "\r");
 			$safe_event_user_comment = str_replace($line_breaks, '<br>', $safe_event_user_comment);
@@ -608,25 +610,25 @@ else {
 			$i++;
 		}
 		
-		if (in_array('tags',$show_fields)) {
+		if ($fields == 'tags') {
 			$data[$i] = tags_get_tags_formatted($event['tags']);
 			$table->cellclass[count($table->data)][$i] = $myclass;
 			$i++;
 		}
 		
-		if (in_array('source',$show_fields)) {
+		if ($fields == 'source') {
 			$data[$i] = $event["source"];
 			$table->cellclass[count($table->data)][$i] = $myclass;
 			$i++;
 		}
 		
-		if (in_array('id_extra',$show_fields)) {
+		if ($fields == 'id_extra') {
 			$data[$i] = $event["id_extra"];
 			$table->cellclass[count($table->data)][$i] = $myclass;
 			$i++;
 		}
 		
-		if (in_array('ack_utimestamp',$show_fields)) {
+		if ($fields == 'ack_utimestamp') {
 			if ($event["ack_utimestamp"] == 0) {
 				$data[$i] = '';
 			}
@@ -637,7 +639,7 @@ else {
 			$i++;
 		}
 		
-		if (in_array('instructions',$show_fields)) {
+		if ($fields == 'instructions') {
 			switch($event['event_type']) {
 				case 'going_unknown':
 					if(!empty($event["unknown_instructions"])) {
@@ -675,16 +677,17 @@ else {
 			$table->cellclass[count($table->data)][$i] = $myclass;
 			$i++;
 		}
-		if (in_array('data',$show_fields)) {
+		if ($fields == 'data') {
 			$data[$i] = $event["data"];
 			$table->cellclass[count($table->data)][$i] = $myclass;
 			$i++;
 		}
-		if (in_array('module_status',$show_fields)) {
+		if ($fields == 'module_status') {
 			$data[$i] = modules_get_modules_status ($event["module_status"]);
 			$table->cellclass[count($table->data)][$i] = $myclass;
 			$i++;
 		}
+		}
 		
 		if ($i != 0 && $allow_action) {
 			//Actions

From c70475cd3825558c62a7c648274a033fa3106a44 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Thu, 26 Jul 2018 10:24:45 +0200
Subject: [PATCH 15/79] Added new funcionality to cluster alert configuration:
 update alert

---
 .../godmode/alerts/alert_list.builder.php     |  2 +-
 .../godmode/alerts/alert_list.list.php        | 14 ++++++++--
 pandora_console/godmode/alerts/alert_list.php | 28 +++++++++++++++++--
 pandora_console/include/functions_alerts.php  |  8 ++++--
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/pandora_console/godmode/alerts/alert_list.builder.php b/pandora_console/godmode/alerts/alert_list.builder.php
index 0440ca8350..fc2b3574c4 100644
--- a/pandora_console/godmode/alerts/alert_list.builder.php
+++ b/pandora_console/godmode/alerts/alert_list.builder.php
@@ -218,7 +218,7 @@ $(document).ready (function () {
 					$("#value", $value).append ("<em><?php echo __('Empty') ?></em>");
 				}
 				else {
-					$("#value", $value).append (data);
+					$("#value", $value).append (parseInt(data));
 				}
 				$loading.hide ();
 				$value.show ();
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 0605ab2fed..1737ed1a7d 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -705,18 +705,26 @@ foreach ($simple_alerts as $alert) {
 	if(check_acl_one_of_groups ($config['id_user'], $all_groups, "LW")) {
 		$data[4] .= '&nbsp;&nbsp;<form class="delete_alert_form" action="' . $url . '" method="post" style="display: inline;">';
 		if ($alert['disabled']) {
-			$data[4] .= html_print_image('images/add.disabled.png',
-			true, array('title' => __("Add action")));
+
 		}
 		else {
 			$data[4] .= '<a href="javascript:show_add_action(\'' . $alert['id'] . '\');">';
-			$data[4] .= html_print_image('images/add.png', true, array('title' => __("Add action")));
+
 			$data[4] .= '</a>';
 		}
 		$data[4] .= html_print_input_image ('delete', 'images/cross.png', 1, '', true, array('title' => __('Delete')));
 		$data[4] .= html_print_input_hidden ('delete_alert', 1, true);
 		$data[4] .= html_print_input_hidden ('id_alert', $alert['id'], true);
 		$data[4] .= '</form>';
+
+		$data[4] .= '<form class="view_alert_form" method="post" style="display: inline;">';
+
+		$data[4] .= html_print_input_image ('update', 'images/builder.png', 1, '', true, array('title' => __('Update')));
+		$data[4] .= html_print_input_hidden ('upd_alert', 1, true);
+		$data[4] .= html_print_input_hidden ('id_alert', $alert['id'], true);
+
+		$data[4] .= '</form>';
+		
 	}
 	
 	if(check_acl_one_of_groups ($config['id_user'], $all_groups, "LM")) {
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index a65b925a44..9a6badcc24 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -47,6 +47,7 @@ $add_action = (bool) get_parameter ('add_action');
 $update_action = (bool) get_parameter ('update_action');
 $delete_action = (bool) get_parameter ('delete_action');
 $delete_alert = (bool) get_parameter ('delete_alert');
+$update_alert = (bool) get_parameter ('update_alert'); ////
 $disable_alert = (bool) get_parameter ('disable_alert');
 $enable_alert = (bool) get_parameter ('enable_alert');
 $standbyon_alert = (bool) get_parameter ('standbyon_alert');
@@ -67,10 +68,32 @@ $standby = get_parameter('standby','');
 $pure = get_parameter('pure', 0);
 $messageAction = '';
 
+if ($update_alert) {
+
+	$id_alert_agent_module = (int) get_parameter ('id_alert_update');
+
+	$id_alert_template = (int) get_parameter ('template');
+	$id_agent_module = (int) get_parameter ('id_agent_module');
+
+	$values_upd = array();
+
+	if (!empty($id_alert_template))
+		$values_upd['id_agent_module'] = $id_agent_module;
+
+	if (!empty($id_alert_template))
+		$values_upd['id_alert_template'] = $id_alert_template;
+
+	$id = alerts_update_alert_agent_module ($id_alert_agent_module, $values_upd);
+
+	$messageAction = ui_print_result_message ($id,
+		__('Successfully updated'), __('Could not be updated'), '', true);
+
+}
+
 if ($create_alert) {
 	$id_alert_template = (int) get_parameter ('template');
 	$id_agent_module = (int) get_parameter ('id_agent_module');
-	
+
 	if (db_get_value_sql("SELECT COUNT(id)
 		FROM talert_template_modules
 		WHERE id_agent_module = " . $id_agent_module . "
@@ -81,7 +104,7 @@ if ($create_alert) {
 	}
 	else {
 		$id = alerts_create_alert_agent_module ($id_agent_module, $id_alert_template);
-		
+
 		$alert_template_name = db_get_value ("name",
 			"talert_templates","id", $id_alert_template);
 		$module_name = db_get_value ("nombre",
@@ -116,6 +139,7 @@ if ($create_alert) {
 				$values['module_action_threshold'] =
 					(int)get_parameter ('module_action_threshold');
 				
+
 				alerts_add_alert_agent_module_action ($id, $action_select, $values);
 			}
 		}
diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 3e3d424227..965a7aed41 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -1013,14 +1013,16 @@ function alerts_create_alert_agent_module ($id_agent_module, $id_alert_template,
  * @return mixed Affected rows or false if something goes wrong.
  */
 function alerts_update_alert_agent_module ($id_alert_agent_module, $values) {
-	if (empty ($id_agent_module))
+
+	if (empty ($id_alert_agent_module))
 		return false;
+
 	if (! is_array ($values))
 		return false;
-	
+
 	return (@db_process_sql_update ('talert_template_modules',
 		$values,
-		array ('id' => $id_alert_template))) !== false;
+		array ('id' => $id_alert_agent_module))) !== false;
 }
 
 /**

From 3593d2b762764096fad7f73886f766fd7dee724e Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Thu, 26 Jul 2018 16:49:02 +0200
Subject: [PATCH 16/79] Fixed tags in module bulk operations

---
 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 71d98a8d2e..ddf12ebd23 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -443,7 +443,7 @@ function modules_update_agent_module ($id, $values,
 	$result = @db_process_sql_update ('tagente_modulo', $values, $where);
 	
 	if ($result == false) {
-		if ($result_disable == ERR_GENERIC ){
+		if ($result_disable === ERR_GENERIC ){
 			return ERR_DB;
 		}
 		else{

From 21db360ab856396b16a1a9a3583cda044547a02c Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Thu, 26 Jul 2018 17:44:31 +0200
Subject: [PATCH 17/79] Fixed welcome icone

---
 pandora_console/include/functions_networkmap.php | 4 ----
 pandora_console/include/functions_ui.php         | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index 4e4ad37cee..eff9444824 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -29,10 +29,6 @@ require_once($config['homedir'] . "/include/functions_modules.php");
 require_once($config['homedir'] . "/include/functions_groups.php");
 ui_require_css_file ('cluetip');
 
-/**
- * Definitions
- */
-define('DEFAULT_NETWORKMAP_CENTER_LOGO', 'images/networkmap/bola_pandora_network_maps.png');
 
 // Check if a node descends from a given node
 function networkmap_is_descendant ($node, $ascendant, $parents) {
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 4ba0fde1c5..470a5c6861 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4008,7 +4008,7 @@ function ui_get_logo_to_center_networkmap () {
 	global $config;
 
 	if ((!enterprise_installed()) || empty($config['custom_network_center_logo'])) {
-		return DEFAULT_NETWORKMAP_CENTER_LOGO;
+		return 'images/networkmap/bola_pandora_network_maps.png';
 	}
 
 	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];

From cca29b2f85b7e26e37b566a1a1730e1a33e25548 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Thu, 26 Jul 2018 18:14:43 +0200
Subject: [PATCH 18/79] changed background of meta visual setup logo previews

---
 pandora_console/include/styles/jquery-ui-1.10.0.custom.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
index b2af3fd6e1..2f7b9a2023 100644
--- a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
+++ b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
@@ -817,7 +817,7 @@ body .ui-tooltip {
 }
 .ui-widget-content {
 	border: 1px solid #aaaaaa;
-	background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
+	background: #e8e8e8 url(images/ui-bg_flat_75_e8e8e8_40x100.png) 50% 50% repeat-x;
 	color: #222222;
 }
 .ui-widget-content a {

From f42c705125b8687fd16524dca6d9762ff54f1883 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Tue, 31 Jul 2018 10:59:19 +0200
Subject: [PATCH 19/79] fixed bug: agent field not retrieving value on incident
 creation from event response

---
 pandora_console/operation/incidents/incident_detail.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/operation/incidents/incident_detail.php b/pandora_console/operation/incidents/incident_detail.php
index ebe6c94b90..1ed1d91383 100755
--- a/pandora_console/operation/incidents/incident_detail.php
+++ b/pandora_console/operation/incidents/incident_detail.php
@@ -194,6 +194,7 @@ elseif (isset ($_GET["insert_form"])) {
 		$titulo = ui_print_truncate_text(events_get_description ($event), 'description', false, true, false);
 		$id_grupo = events_get_group ($event);
 		$origen = "Pandora FMS Event";
+		$id_agent = db_get_value("id_agente","tevento","id_evento",$event);
 		unset ($event);
 	}
 	$prioridad = 0;

From 6efa86c4d5dfe207a75cb17c0d08bf9f61f49e1a Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 31 Jul 2018 11:25:08 +0200
Subject: [PATCH 20/79] Fixed type info in module logchannel

---
 .../win32/modules/pandora_module_logchannel.cc | 18 +++++++++---------
 .../win32/modules/pandora_module_logchannel.h  |  7 +++++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pandora_agents/win32/modules/pandora_module_logchannel.cc b/pandora_agents/win32/modules/pandora_module_logchannel.cc
index 2c7c056565..4ec72df63c 100755
--- a/pandora_agents/win32/modules/pandora_module_logchannel.cc
+++ b/pandora_agents/win32/modules/pandora_module_logchannel.cc
@@ -67,16 +67,16 @@ Pandora_Module_Logchannel::Pandora_Module_Logchannel (string name, string source
 
     // Set the type filter 
 	int type_number = -1;
-	if (upper_type.compare("ERROR") == 0) {
-        type_number = EVENTLOG_ERROR_TYPE;
+	if (upper_type.compare("CRITICAL") == 0) {
+        type_number = WINEVENT_LEVEL_CRITICAL;
+    } else if (upper_type.compare("ERROR") == 0) {
+        type_number = WINEVENT_LEVEL_ERROR;
 	} else if (upper_type.compare("WARNING") == 0) {
-        type_number = EVENTLOG_WARNING_TYPE;
-	} else if (upper_type.compare("INFORMATION") == 0) {
-        type_number = EVENTLOG_INFORMATION_TYPE;
-	} else if (upper_type.compare("AUDIT SUCCESS") == 0) {
-        type_number = EVENTLOG_AUDIT_SUCCESS;
-	} else if (upper_type.compare("AUDIT FAILURE") == 0) {
-        type_number = EVENTLOG_AUDIT_FAILURE;
+        type_number = WINEVENT_LEVEL_WARNING;
+	} else if (upper_type.compare("INFO") == 0) {
+        type_number = WINEVENT_LEVEL_INFO;
+	} else if (upper_type.compare("VERBOSE") == 0) {
+        type_number = WINEVENT_LEVEL_VERBOSE;
     }
 	// Append type to log query
 	if (type_number != -1) {
diff --git a/pandora_agents/win32/modules/pandora_module_logchannel.h b/pandora_agents/win32/modules/pandora_module_logchannel.h
index 14617037c6..19cde78b93 100755
--- a/pandora_agents/win32/modules/pandora_module_logchannel.h
+++ b/pandora_agents/win32/modules/pandora_module_logchannel.h
@@ -29,6 +29,13 @@
 // Log event read buffer size
 #define	BUFFER_SIZE 1024
 
+// WINEVENT consts
+#define WINEVENT_LEVEL_CRITICAL 1
+#define WINEVENT_LEVEL_ERROR 2
+#define WINEVENT_LEVEL_WARNING 3
+#define WINEVENT_LEVEL_INFO 4
+#define WINEVENT_LEVEL_VERBOSE 5
+
 // Types for pointers to Wevtapi.dll functions
 typedef EVT_HANDLE WINAPI (*EvtQueryT) (EVT_HANDLE Session, LPCWSTR Path, LPCWSTR Query, DWORD Flags);
 typedef WINBOOL WINAPI (*EvtNextT) (EVT_HANDLE ResultSet, DWORD EventArraySize, EVT_HANDLE* EventArray, DWORD Timeout, DWORD Flags, PDWORD Returned);

From 87296eb472d8cd1a61f5076d1f20067f8346f125 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Wed, 1 Aug 2018 14:35:05 +0200
Subject: [PATCH 21/79] added methods to api (metaconsole and node) to create
 and update operating systems

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

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 76968e1e75..66f2a2e64c 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1390,6 +1390,68 @@ function api_set_new_agent($thrash1, $thrash2, $other, $thrash3) {
 	}
 }
 
+
+function api_set_create_os($thrash1, $thrash2, $other, $thrash3) {
+	global $config;
+
+
+	if (!check_acl($config['id_user'], 0, "AW")) {
+		returnError('forbidden', 'string');
+		return;
+	}
+	
+	if (defined ('METACONSOLE')) {
+		return;
+	}
+
+	$values = array();
+	
+	$values['name'] = $other['data'][0];
+	$values['description'] = $other['data'][1];
+
+	if (($other['data'][2] !== 0) && ($other['data'][2] != '')) {
+		$values['icon_name'] = $other['data'][2];
+	}
+
+
+
+	$resultOrId = false;
+	if ($other['data'][0] != '') {
+		$resultOrId = db_process_sql_insert('tconfig_os', $values);
+	}
+
+}
+
+function api_set_update_os($id_os, $thrash2, $other, $thrash3) {
+	global $config;
+
+	if (defined ('METACONSOLE')) {
+		return;
+	}
+
+	if (!check_acl($config['id_user'], 0, "AW")) {
+		returnError('forbidden', 'string');
+		return;
+	}
+			
+	$values = array();
+	$values['name'] = $other['data'][0];
+	$values['description'] = $other['data'][1];
+		
+	if (($other['data'][2] !== 0) && ($other['data'][2] != '')) {
+		$values['icon_name'] = $other['data'][2];;
+	}
+	$result = false;
+
+
+	if ($other['data'][0] != '') {
+
+		$result = db_process_sql_update('tconfig_os', $values, array('id_os' => $id_os));
+	}
+
+}
+
+
 /**
  *
  * Creates a custom field

From ae47e7c03a61d42b8736cdcac569513ef74a9e8d Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Fri, 3 Aug 2018 14:40:51 +0200
Subject: [PATCH 22/79] added redirection after module deletion on agent
 modules view

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

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index ed52464dc0..0c556e2f51 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1720,6 +1720,9 @@ if ($delete_module) { // DELETE agent module !
 		db_pandora_audit("Agent management",
 			"Deleted module '".$module_data["nombre"]."' for agent ".$agent["alias"]);
 	}
+
+	header("Location: index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente=$id_agente");
+
 }
 
 // MODULE DUPLICATION

From 8e55522e3fc80669c65d2ca3309c60671f399f8c Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Fri, 3 Aug 2018 15:18:03 +0200
Subject: [PATCH 23/79] added alert message on module deletion at agent modules
 view

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

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 0c556e2f51..f41adc8550 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1714,14 +1714,17 @@ if ($delete_module) { // DELETE agent module !
 		ui_print_error_message(__('There was a problem deleting the module'));
 	}
 	else {
-		ui_print_success_message(__('Module deleted succesfully'));
+
+		echo '<script type="text/javascript">
+		location="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente.'";
+		alert("'.__('Module deleted succesfully').'");
+		</script>';
 		
 		$agent = db_get_row ('tagente', 'id_agente', $id_agente);
 		db_pandora_audit("Agent management",
 			"Deleted module '".$module_data["nombre"]."' for agent ".$agent["alias"]);
 	}
 
-	header("Location: index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente=$id_agente");
 
 }
 

From 14c4b8d10a47fe8e06878597398009715355a8a4 Mon Sep 17 00:00:00 2001
From: "manuel.montes" <manuel.montes@support.artica.es>
Date: Mon, 20 Aug 2018 16:39:51 +0200
Subject: [PATCH 24/79] Fixed bug in Fields Selected (Custom Events)

---
 pandora_console/godmode/events/custom_events.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/events/custom_events.php b/pandora_console/godmode/events/custom_events.php
index 9b519fa6dd..c8911c0f44 100644
--- a/pandora_console/godmode/events/custom_events.php
+++ b/pandora_console/godmode/events/custom_events.php
@@ -188,7 +188,7 @@ foreach ($fields_available as $key=>$available) {
 }
 
 $table->data[0][0] =  '<b>' . __('Fields available').'</b>';
-$table->data[1][0] = html_print_select ($fields_available, 'fields_available[]', true, '', '', '', true, true, false, '', false, 'width: 300px');
+$table->data[1][0] = html_print_select ($fields_available, 'fields_available[]', true, '', '', 0, true, true, false, '', false, 'width: 300px');
 $table->data[1][1] =  '<a href="javascript:">' .
 	html_print_image('images/darrowright.png', true,
 	array('id' => 'right', 'title' => __('Add fields to select'))) .
@@ -201,7 +201,7 @@ $table->data[1][1] .= '<br><br><br><br><a href="javascript:">' .
 $table->data[0][1] = '';
 $table->data[0][2] = '<b>' . __('Fields selected') . '</b>';
 $table->data[1][2] =  html_print_select($result_selected,
-	'fields_selected[]', true, '', '', '', true, true, false, '', false, 'width: 300px');
+	'fields_selected[]', true, '', '', 0, true, true, false, '', false, 'width: 300px');
 
 echo '<form id="custom_events" method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=fields&amp;pure='.$config['pure'].'">';
 html_print_table($table);
@@ -223,6 +223,7 @@ $(document).ready (function () {
 				id_field = $(value).attr('value');
 				$("select[name='fields_selected[]']").append($("<option></option>").html(field_name).attr("value", id_field));
 				$("#fields_available").find("option[value='" + id_field + "']").remove();
+				$("#fields_selected").find("option[value='0']").remove();
 			}
 		});
 	});
@@ -234,11 +235,13 @@ $(document).ready (function () {
 					id_field = $(value).attr('value');
 					$("select[name='fields_available[]']").append($("<option></option>").val(id_field).html('<i>' + field_name + '</i>'));
 					$("#fields_selected").find("option[value='" + id_field + "']").remove();
+					$("#fields_available").find("option[value='0']").remove();
 				}
 		});
 	});
 	
 	$("#submit-upd_button").click(function () {
+		$("#fields_selected").find("option[value='0']").remove();
 		$('#fields_selected option').map(function() {
 			$(this).prop('selected', true);
 		});

From 708349bcba63438b278b75100d04d21a213b7823 Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Mon, 20 Aug 2018 16:57:12 +0200
Subject: [PATCH 25/79] Fixed visual error in module agent

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

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index b0999eb638..d59a4149f8 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1936,11 +1936,11 @@ switch ($tab) {
 					resizable: true,
 					draggable: true,
 					modal: true,
-					height: 220,
+					height: 240,
 					width: 600,
 					title: 'Changing the module name of a satellite agent',
 					open: function(){
-							$('#dialog').html('<br><img src="images/icono-warning-triangulo.png" style="float:left;margin-left:25px;"><p style="float:right;font-style:nunito;font-size:11pt;margin-right:50px;"><span style="font-weight:bold;font-size:12pt;">Warning</span> <br>The names of the modules of a satellite should not be <br> altered manually. Unless you are absolutely certain of <br> the process, do not alter these names.</p>');
+							$('#dialog').html('<br><table><tr><td><img src="images/icono-warning-triangulo.png" style="float:left;margin-left:25px;"></td><td><p style="float:right;font-style:nunito;font-size:11pt;margin-right:50px;margin-left:40px;"><span style="font-weight:bold;font-size:12pt;">Warning</span> <br>The names of the modules of a satellite should not be altered manually. Unless you are absolutely certain of the process, do not alter these names.</p></td></tr></table>');
 					},
 					buttons: [{
 							text: "Ok",
@@ -1970,11 +1970,11 @@ switch ($tab) {
 						resizable: true,
 						draggable: true,
 						modal: true,
-						height: 280,
-						width: 670,
+						height: 240,
+						width: 650,
 						title: 'Changing snmp module name',
 						open: function(){
-								$('#dialog').html('<br><img src="images/icono-warning-triangulo.png" style="float:left;margin-left:25px;margin-top:30px;"><p style="float:right;font-style:nunito;font-size:11pt;margin-right:50px;"><span style="font-weight:bold;font-size:12pt;">Warning</span> <br> 					If you change the name of this module, various features <br> associated with this module, such as network maps, <br> interface graphs or other network modules, may  no longer <br>  work. If you are not completely sure of the process, please <br> do not change the name of the module.					</p>');
+								$('#dialog').html('<br><table><tr><td><img src="images/icono-warning-triangulo.png" style="float:left;margin-left:25px;margin-top:30px;"></td><td><p style="float:right;font-style:nunito;font-size:11pt;margin-right:50px;margin-left:40px;"><span style="font-weight:bold;font-size:12pt;">Warning</span> <br> 					If you change the name of this module, various features associated with this module, such as network maps, interface graphs or other network modules, may  no longer work. If you are not completely sure of the process, please do not change the name of the module.					</p></td></tr></table>');
 						},
 						buttons: [{
 					      text: "Ok",

From 2687c9fce61ad8176e1ffc8905d82aa06ca7923f Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Tue, 21 Aug 2018 17:21:28 +0200
Subject: [PATCH 26/79] Fixed error in agents bulk operations with a normal
 status

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

diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 05652d3080..6e2ef2136f 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -908,7 +908,7 @@ function agents_get_group_agents (
 		if (isset($search['status'])) {
 			switch ($search['status']) {
 				case AGENT_STATUS_NORMAL:
-					$filter[] = "normal_count = total_count";
+					$filter[] = "(normal_count = total_count AND notinit_count <> total_count)";
 					break;
 				case AGENT_STATUS_WARNING:
 					$filter[] = "(critical_count = 0 AND warning_count > 0)";

From 89a4e3667f3f2fb2a68a1e28b8492f9cf4c3fcbe Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Thu, 13 Sep 2018 19:08:45 +0200
Subject: [PATCH 27/79] Added styles for new widget system group status

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

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 7ffd0d59a4..bf23091f77 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4675,3 +4675,22 @@ a.up_arrow {
 tr:last-child > td > a.down_arrow, tr:first-child > td > a.up_arrow {
 	visibility: hidden;
 }
+
+.group_modules_status_box>tbody>tr>td{
+	border-bottom: 1px solid #E2E2E2;
+	border-collapse: collapse;
+	border-spacing:0;
+	width: 10%;
+}
+
+.group_modules_status_div{
+	color: #FFF;
+    font-size: 20px;
+    font-weight: bold;
+    border-radius: 1px;
+    width: 100%;
+    height: 100%;
+    text-align: center;
+    display: block;
+    vertical-align: middle;
+}
\ No newline at end of file

From 5f732d035bb2a28b9d8e2c57ab3a27e9934afdb9 Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alejandro.gallardo@artica.es>
Date: Mon, 17 Sep 2018 13:13:10 +0200
Subject: [PATCH 28/79] Now the integer numbers of the Y axis of the realtime
 graphs are shorter

---
 .../realtime_graphs/realtime_graphs.js        | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pandora_console/extensions/realtime_graphs/realtime_graphs.js b/pandora_console/extensions/realtime_graphs/realtime_graphs.js
index 64960cc658..34da7b1704 100644
--- a/pandora_console/extensions/realtime_graphs/realtime_graphs.js
+++ b/pandora_console/extensions/realtime_graphs/realtime_graphs.js
@@ -28,6 +28,11 @@
 				return formattedTime;
 			}
 		},
+		yaxis: {
+			tickFormatter: function (value, axis) {
+				return shortNumber(value);
+			}
+		},
 		series: {
 			lines: {
 				lineWidth: 2,
@@ -158,6 +163,22 @@
 		});
 	}
 
+	function shortNumber (number) {
+		if (Math.round(number) != number) return number;
+		number = Number.parseInt(number);
+		if (Number.isNaN(number)) return number;
+
+		var shorts = ["", "K", "M", "G", "T", "P", "E", "Z", "Y"];
+		var pos = 0;
+
+		while (number >= 1000 || number <= -1000) {
+			pos++;
+			number = number / 1000;
+		}
+
+		return number + " " + shorts[pos];
+	}
+
 	$('#graph').change(function() {
 		$('form#realgraph').submit();
 	});

From 6d28b386d10c2db22eceacf9ab86f41056c17b70 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Mon, 17 Sep 2018 18:56:38 +0200
Subject: [PATCH 29/79] changed styles for system group status widget

---
 pandora_console/include/styles/pandora.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index bf23091f77..08c1e2fd8d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4681,16 +4681,15 @@ tr:last-child > td > a.down_arrow, tr:first-child > td > a.up_arrow {
 	border-collapse: collapse;
 	border-spacing:0;
 	width: 10%;
+	height: 20px;
 }
 
 .group_modules_status_div{
 	color: #FFF;
-    font-size: 20px;
-    font-weight: bold;
-    border-radius: 1px;
     width: 100%;
     height: 100%;
-    text-align: center;
+    text-align: left;
     display: block;
     vertical-align: middle;
+    line-height: 20px;
 }
\ No newline at end of file

From a0a4a7fefb5f5750813785d3eec1b71f65b43377 Mon Sep 17 00:00:00 2001
From: danielmaya <daniel.maya@artica.es>
Date: Thu, 20 Sep 2018 11:21:29 +0200
Subject: [PATCH 30/79] Added check permissions in ldap login

---
 pandora_console/include/auth/mysql.php | 50 ++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index 835a709ba8..ffd618fb65 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -269,6 +269,56 @@ function process_user_login_remote ($login, $pass, $api = false) {
 			else {
 				delete_user_pass_ldap ($login);
 			}
+			
+			$permissions = array();
+			if($config['ldap_advanced_config']){
+				$i = 0;
+				
+				$ldap_adv_perms = json_decode(io_safe_output($config['ldap_adv_perms']), true);
+				foreach ($ldap_adv_perms as $ldap_adv_perm) {
+					$attributes = $ldap_adv_perm['groups_ldap'];
+					
+					foreach ($attributes as $attr) {
+						$attr = explode('=', $attr, 2);
+						foreach ($sr[$attr[0]] as $s_attr) {
+							if(preg_match('/' . $attr[1] . '/', $s_attr)){
+								$permissions[$i]["profile"] = $ldap_adv_perm['profile'];
+								$permissions[$i]["groups"] = $ldap_adv_perm['group'];
+								$permissions[$i]["tags"] = implode(",",$ldap_adv_perm['tags']);
+								$i++;
+							}
+						}
+					}
+				}
+			} else {
+				$permissions[0]["profile"] = $config['default_remote_profile'];
+				$permissions[0]["groups"][] = $config['default_remote_group'];
+				$permissions[0]["tags"] = $config['default_assign_tags'];
+			}
+			if(empty($permissions)) {
+				$config["auth_error"] = __("User not found in database or incorrect password");
+				return false;
+				
+			} else {
+				// check permissions
+				$result = check_permission_ad ($login, $pass, false,
+					$permissions, defined('METACONSOLE'));
+				
+				if ($return === "error_permissions") {
+					$config["auth_error"] =
+						__("Problems with configuration permissions. Please contact with Administrator");
+					return false;
+				}
+				else {
+					if ($return === "permissions_changed") {
+						$config["auth_error"] =
+							__("Your permissions have changed. Please, login again.");
+						return false;
+					}
+				}
+				
+				
+			}
 		}
 
 		return $login;

From 26c08d93097ad0c540f762acfc19735310f9b117 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 20 Sep 2018 15:51:36 +0200
Subject: [PATCH 31/79] refactoriced view module_groups

---
 pandora_console/extensions/module_groups.php  | 485 +++++++++---------
 .../include/class/TreeGroup.class.php         |  20 +-
 pandora_console/include/styles/pandora.css    |  20 +
 3 files changed, 266 insertions(+), 259 deletions(-)

diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index 9a4f66935c..c617d6425e 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -17,103 +17,21 @@
 
 global $config;
 
-if (is_ajax ()) {
-	check_login ();
-	
-	require_once('include/functions_agents.php');
-	
-	$get_info_alert_module_group = (bool)get_parameter('get_info_alert_module_group');
-	$module_group = (int)get_parameter('module_group');
-	$id_agent_group = (int)get_parameter('id_agent_group');
-	
-	$data = false;
-	if ($get_info_alert_module_group) {
-		$agents = agents_get_group_agents($id_agent_group);
-		if (!empty($agents)) { 
-			$alerts = agents_get_alerts_simple(array_keys($agents));
-			foreach ($alerts as $alert) {
-				$module = db_get_row_filter('tagente_modulo', array('id_agente_modulo' => $alert['id_agent_module']));
-				if ($module_group == $module['id_module_group']) {
-					if ($alert["times_fired"] > 0) {
-						$data = true;
-						echo '<strong>' . __('Number fired of alerts').': </strong> ' . $alert["times_fired"] . '<br />';
-						$agent = db_get_row('tagente', 'id_agente', $module['id_agente']);
-						echo '<strong>' . __('Agent').': </strong>';
-						echo io_safe_output($agent['nombre']) . '<br />';
-						echo '<strong>' . __('Module') . ': </strong>';
-						echo io_safe_output($module['nombre']) . '<br />';
-						$template = db_get_row('talert_templates', 'id' , $alert['id_alert_template']);
-						echo '<strong>' . __('Alert template') . ': </strong>';
-						echo io_safe_output($template['name']) . '<br />';
-						
-						// This prevent from templates without predefined actions
-						if (empty($template['id_alert_action']))
-							$template_id_alert_action = "''";
-						else
-							$template_id_alert_action = $template['id_alert_action'];
-						
-						// True if the alert only has the default template action
-						$default_action = false;
-						// Try to get actions for the current alert	
-						$sql = 'SELECT t2.name
-							FROM talert_template_module_actions t1
-								INNER JOIN talert_actions t2
-								INNER JOIN talert_template_modules t3
-								ON t3.id = t1.id_alert_template_module
-								AND t1.id_alert_action = t2.id
-							WHERE (t3.id_alert_template = ' . $template['id'] . ' AND
-								t3.id_agent_module = ' . $module['id_agente_modulo'] . ');';
-						
-						$actions = db_get_all_rows_sql($sql);
-						
-						// If this alert doesn't have actions try to get default action from template
-						if ($actions === false) {
-							$sql = 'SELECT name
-								FROM talert_actions
-								WHERE (id = ' . $template_id_alert_action . ');';
-							
-							$default_action = true;
-							
-							$actions = db_get_all_rows_sql($sql);
-						}
-						
-						if ($actions === false) {
-							$actions = array();
-						}
-						
-						echo '<strong>' . __('Actions') . ': </strong>' . '<br />';
-						echo '<ul style="margin-top: 0px; margin-left: 30px;">';
-						foreach ($actions as $action) {
-							echo '<li style="list-style: disc;">';
-							if ($default_action)
-								echo 'Default:&nbsp;';
-							echo $action['name'] . '</li>';
-						}
-						echo '</ul>';
-						if ($alert != end($alerts)) {
-							echo '<hr />';
-						}
-					}
-				}
-			}
-			if (!$data) {
-				echo '<i>These module/s have no alerts or alert/s are not fired</i>';
-			}
-		}
-		else {
-			echo '<i>No available data</i>';
-		}
-	}
-	else {
-		echo '<i>No available data</i>';
-	}
-}
+check_login ();
 
-/**
- * Translate the array texts using gettext
- */
-function translate(&$item, $key) {
-	$item = __($item);
+if (is_ajax ()) {
+	$get_info_alert_module_group = (bool)get_parameter('get_info_alert_module_group');
+
+	if ($get_info_alert_module_group) {
+		$send_tooltip = json_decode(io_safe_output(get_parameter('send_tooltip')), true);
+		echo "<ul class='tooltip_counters'><h3>" . __('Counters Module') . "</h3>";
+		echo "<li><div style='background-color: " . COL_ALERTFIRED . ";'></div>" . __('Alerts_Fired') . ": " . $send_tooltip['alerts_module_count'] . "</li>";
+		echo "<li><div style='background-color: " . COL_CRITICAL . ";'></div>" . __('Critical') . ": " . $send_tooltip['critical_module_count'] . "</li>";
+		echo "<li><div style='background-color: " . COL_WARNING . ";'></div>" . __('warning') . ": " . $send_tooltip['warning_module_count'] . "</li>";
+		echo "<li><div style='background-color: " . COL_UNKNOWN . ";'></div>" . __('Unknown') . ": " . $send_tooltip['unknown_module_count'] . "</li>";
+		echo "<li><div style='background-color: " . COL_NORMAL . ";'></div>" . __('OK') . ": " . $send_tooltip['normal_module_count'] . "</li>";
+		echo "<li><div style='background-color: " . COL_MAINTENANCE . ";'></div>" . __('Not_init') . ": " . $send_tooltip['notInit_module_count'] . "</li></ul>";
+	}
 }
 
 /**
@@ -121,169 +39,229 @@ function translate(&$item, $key) {
  * execute the code.
  */
 function mainModuleGroups() {
-	global $config; //the useful global var of Pandora Console, it has many data can you use
-	
-	require_once ('include/functions_reporting.php');
-	require_once($config['homedir'] . "/include/functions_agents.php");
-	require_once($config['homedir'] . "/include/functions_users.php");
-	
-	//The big query
-	$sql = "SELECT COUNT(id_agente) AS count, case utimestamp when 0 then 5 else estado end as estado 
-		FROM tagente_estado
-		WHERE id_agente IN
-			(SELECT id_agente
-				FROM tagente ta LEFT JOIN tagent_secondary_group tasg
-					ON ta.id_agente = tasg.id_agent
-				WHERE (ta.id_grupo = %d OR tasg.id_group = %d) AND disabled IS FALSE
-			)
-			AND id_agente_modulo IN
-			(SELECT id_agente_modulo 
-				FROM tagente_modulo 
-				WHERE id_module_group = %d AND disabled IS FALSE AND delete_pending IS FALSE)
-		GROUP BY estado";
+	global $config;
+
+	require_once($config['homedir'] . "/include/class/TreeGroup.class.php");
+	require_once($config['homedir'] . "/include/functions_groupview.php");
+
+	$tree_group =  new TreeGroup("group", "group");
+	$tree_group->setPropagateCounters(false);
+	$tree_group->setDisplayAllGroups(true);
+	$tree_group->setFilter( array(
+		'searchAgent' => '',
+		'statusAgent' => AGENT_STATUS_ALL,
+		'searchModule' => '',
+		'statusModule' => -1,
+		'groupID' => 0,
+		'tagID' => 0,
+		'show_not_init_agents' => 1,
+		'show_not_init_modules' => 1
+	));
+	$info = $tree_group->getArray();
+	$info = groupview_plain_groups($info);
+	$counter = count($info);
+	$offset = get_parameter('offset', 0);
+	$groups_view = $is_not_paginated
+		? $info
+		: array_slice($info, $offset, $config['block_size']);
+	$agents_counters = array_reduce($groups_view, function($carry, $item){
+		$carry[$item['id']] = $item;
+		return $carry;
+	}, array());
+
+	$ids_array = array_keys($agents_counters);
+
+	$ids_group = implode(',', $ids_array);
+
+	$condition_critical = modules_get_state_condition(AGENT_MODULE_STATUS_CRITICAL_ALERT);
+	$condition_warning  = modules_get_state_condition(AGENT_MODULE_STATUS_WARNING_ALERT);
+	$condition_unknown  = modules_get_state_condition(AGENT_MODULE_STATUS_UNKNOWN);
+	$condition_not_init = modules_get_state_condition(AGENT_MODULE_STATUS_NO_DATA);
+	$condition_normal   = modules_get_state_condition(AGENT_MODULE_STATUS_NORMAL);
+
+	$array_for_defect = array();
+	$array_module_group = array();
+	$array_data = array();
+
+	$sql = "SELECT id_mg, `name` FROM tmodule_group";
+	$array_mod= db_get_all_rows_sql($sql);
+
+	foreach ($array_mod as $key => $value) {
+		$array_module_group[$value['id_mg']] = $value['name'];
+	}
+	$array_module_group[0] = 'Nothing';
+	foreach ($agents_counters as $key => $value) {
+		$array_for_defect[$key]['gm'] = $array_module_group;
+		$array_for_defect[$key]['data']['name'] = $value['name'];
+		$array_for_defect[$key]['data']['parent'] = $value['parent'];
+		$array_for_defect[$key]['data']['icon'] = $value['icon'];
+	}
+
+$sql =
+	"SELECT SUM(IF(tae.alert_fired <> 0, 1, 0)) AS alerts_module_count,
+		SUM(IF($condition_warning, 1, 0)) AS warning_module_count,
+		SUM(IF($condition_unknown, 1, 0)) AS unknown_module_count,
+		SUM(IF($condition_not_init, 1, 0)) AS notInit_module_count,
+		SUM(IF($condition_critical, 1, 0)) AS critical_module_count,
+		SUM(IF($condition_normal, 1, 0)) AS normal_module_count,
+		COUNT(tae.id_agente_modulo) AS total_count,
+		tmg.id_mg,
+		tmg.name as n,
+		tg.id_grupo
+	FROM (
+		SELECT tam.id_agente_modulo,
+			tam.id_module_group,
+			ta.id_grupo AS g,
+			tae.estado,
+			SUM(IF(tatm.last_fired <> 0, 1, 0)) AS alert_fired
+			FROM tagente_modulo tam
+			LEFT JOIN talert_template_modules tatm
+				ON tatm.id_agent_module = tam.id_agente_modulo
+			LEFT JOIN tagente_estado tae
+				ON tae.id_agente_modulo = tam.id_agente_modulo
+			INNER JOIN tagente ta
+				ON ta.id_agente = tam.id_agente
+			WHERE ta.disabled = 0
+				AND tam.disabled = 0
+				AND tam.delete_pending = 0
+				AND ta.id_grupo IN ($ids_group)
+			GROUP BY tam.id_agente_modulo
+		UNION ALL
+		SELECT tam.id_agente_modulo,
+			tam.id_module_group,
+			tasg.id_group AS g,
+			tae.estado,
+			SUM(IF(tatm.last_fired <> 0, 1, 0)) AS alert_fired
+			FROM tagente_modulo tam
+			LEFT JOIN talert_template_modules tatm
+				ON tatm.id_agent_module = tam.id_agente_modulo
+			LEFT JOIN tagente_estado tae
+				ON tae.id_agente_modulo = tam.id_agente_modulo
+			INNER JOIN tagente ta
+				ON ta.id_agente = tam.id_agente
+			INNER JOIN tagent_secondary_group tasg
+				ON ta.id_agente = tasg.id_agent
+			WHERE ta.disabled = 0
+				AND tam.disabled = 0
+				AND tam.delete_pending = 0
+				AND tasg.id_group IN ($ids_group)
+			GROUP BY tam.id_agente_modulo, tasg.id_group
+	) AS tae
+	RIGHT JOIN tgrupo tg
+		ON tg.id_grupo = tae.g
+	INNER JOIN (
+		SELECT * FROM tmodule_group
+		UNION ALL
+		SELECT 0 AS 'id_mg', 'Nothing' AS 'name'
+	) AS tmg
+		ON tae.id_module_group = tmg.id_mg
+	GROUP BY tae.g, tmg.id_mg";
+
+	$array_data_prev = db_get_all_rows_sql($sql);
+
+	foreach ($array_data_prev as $key => $value) {
+		$array_data[$value['id_grupo']][$value['id_mg']] = $value;
+	}
 
 	ui_print_page_header (__("Combined table of agent group and module group"), "images/module_group.png", false, "", false, '');
-	
-	ui_print_info_message ( array('no_close'=>true, 'message'=>
-		__("This table shows in columns the modules group and in rows agents group. The cell shows all modules") )
-		);
-	
-	
-	$agentGroups = users_get_groups ($config['id_user'], "AR", false);
-	$modelGroups = users_get_all_model_groups();
-	
-	if (!empty($agentGroups) && !empty($modelGroups)) {
-		array_walk($modelGroups, 'translate'); //Translate all head titles to language is set
-		
-		$table = null;
-		$table->headstyle[] = "width: 20%";
-		foreach ($modelGroups as $i => $n) {
-			$table->headstyle[] = "min-width: 60px;max-width: 5%;text-align:center;";
-			$modelGroups[$i] = ui_print_truncate_text($n, GENERIC_SIZE_TEXT, true, true, true, '&hellip;', 'color:#FFF');
-		}
-		
-		$head = $modelGroups;
-		array_unshift($head, '&nbsp;');
-		
-		//Metaobject use in html_print_table
-		$table->align[0] = 'left'; //Align to left the first column.
-		$table->style[0] = 'color: #ffffff; '.
-			'background-color: #373737; font-weight: bolder; padding-right: 10px; width:20%; ';
-		$table->head = $head;
-		$table->width = '100%';
-		
-		//The content of table
-		$tableData = array();
-		
-		//Create rows and cells
-		foreach ($agentGroups as $idAgentGroup => $name) {
-			$fired = false;
-			$row = array();
-			
-			array_push($row, ui_print_truncate_text($name, GENERIC_SIZE_TEXT, true, true, true, '&hellip;', 'color:#FFF'));
-			
-			foreach ($modelGroups as $idModelGroup => $modelGroup) {
-				$fired = false;
-				$query = sprintf($sql, $idAgentGroup, $idAgentGroup, $idModelGroup);
-				
-				$rowsDB = db_get_all_rows_sql ($query);
-				
-				$agents = agents_get_group_agents($idAgentGroup);
-				
-				if (!empty($agents)) {
-					$alerts = agents_get_alerts_simple(array_keys($agents));
-					
-					foreach ($alerts as $alert) {
-						$module = db_get_row_filter('tagente_modulo', array('id_agente_modulo' => $alert['id_agent_module']));
-						
-						if ($idModelGroup == $module['id_module_group']) {
-							if ($alert["times_fired"] > 0) {
-								$fired = true;
-							}
-						}
-					}
-				}
-				
-				$states = array();
-				if ($rowsDB !== false) {
-					foreach ($rowsDB as $rowDB) {
-						$states[$rowDB['estado']] = $rowDB['count'];
-					}
-				}
-				
-				$count = 0;
-				foreach ($states as $idState => $state) {
-					$count += $state;
-				}
-				
-				$color = 'transparent'; //Defaut color for cell
-				$font_color = '#000000'; //Default font color for cell
-				if ($count == 0) {
-					$color = '#eeeeee'; //Soft grey when the cell for this model group and agent group hasn't modules.
-					$alinkStart = '';
-					$alinkEnd = '';
-				}
-				else {
-					
-					if ($fired) {
-						$color = '#FFA631'; //Orange when the cell for this model group and agent has at least one alert fired.
-					}
-					else if (array_key_exists(1, $states)) {
-						$color = '#FC4444'; //Red when the cell for this model group and agent has at least one module in critical state and the rest in any state.
-						$font_color = '#ffffff';
-					}
-					elseif (array_key_exists(2, $states)) {
-						$color = '#FAD403'; //Yellow when the cell for this model group and agent has at least one in warning state and the rest in green state.
-					}
-					elseif (array_key_exists(3, $states)) {
-						$color = '#B2B2B2 '; //Grey when the cell for this model group and agent has at least one module in unknown state and the rest in any state.
-					}
-					elseif (array_key_exists(0, $states)) {
-						$color = '#80BA27'; //Green when the cell for this model group and agent has OK state all modules.
-					}
-					elseif (array_key_exists(5, $states)) {
-						$color = '#5BB6E5'; // Blue when the cell for this module group and all modules have not init value.
-					}
-					
-					
-					$alinkStart = '<a class="info_cell" rel="ajax.php?page=extensions/module_groups&get_info_alert_module_group=1&module_group=' . 
-									$idModelGroup . '&id_agent_group=' . $idAgentGroup . '"href="index.php?sec=estado&sec2=operation/agentes/status_monitor&status=-1&ag_group=' .
-									$idAgentGroup . '&modulegroup=' . $idModelGroup . '" style="color: ' . $font_color . '; font-size: 18px;";>';
-					$alinkEnd = '</a>';
-				}
-				
-				array_push($row,
-					'<div
-						style="background: ' . $color . ';
-						height: 20px;min-width: 60px;max-width:5%;overflow:hidden;
-						margin-left: auto; margin-right: auto;
-						text-align: center; padding: 5px;padding-bottom:10px;font-size: 18px;line-height:25px;">
-						' . $alinkStart . $count . $alinkEnd . '</div>');
-			}
-			array_push($tableData,$row);
-		}
-		$table->data = $tableData;
-		echo "<div style='width:100%; overflow-x:auto;'>";
-		html_print_table($table);
-		echo "</div>";
-		
-		echo "<div class='legend_basic' style='width: 98.6%'>";
 
-		echo "<table >";
-		echo "<tr><td colspan='2' style='padding-bottom: 10px;'><b>" . __('Legend') . "</b></td></tr>";
-		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_ALERTFIRED . ";'></div></td><td>" . __("Orange cell when the module group and agent have at least one alarm fired.") . "</td></tr>";
-		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_CRITICAL . ";'></div></td><td>" . __("Red cell when the module group and agent have at least one module in critical status and the others in any status") . "</td></tr>";
-		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_WARNING . ";'></div></td><td>" . __("Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status") . "</td></tr>";
-		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_NORMAL . ";'></div></td><td>" . __("Green cell when the module group and agent have all modules in OK status") . "</td></tr>";
-		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_UNKNOWN . ";'></div></td><td>" . __("Grey cell when the module group and agent have at least one in unknown status and the others in green status") . "</td></tr>";
-		echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_MAINTENANCE . ";'></div></td><td>" .__("Blue cell when the module group and agent have all modules in not init status.") . "</td></tr>";
-		echo "</table>";
+	if(count($array_for_defect) > 0){
+		$table = new StdClass();
+		$table->style[0] = 'color: #ffffff; background-color: #373737; font-weight: bolder; padding-right: 10px; min-width: 230px;';
+		$table->width = '100%';
+
+		$head[0] = __('Groups');
+		$headstyle[0] = "width: 20%;  font-weight: bolder;";
+		foreach ($array_module_group as $key => $value) {
+			$headstyle[] = "min-width: 60px;max-width: 5%;text-align:center; color: #ffffff; background-color: #373737; font-weight: bolder;";
+			$head[] = ui_print_truncate_text($value, GENERIC_SIZE_TEXT, true, true, true, '&hellip;', 'color:#FFF');
+		}
+
+		$i = 0;
+		foreach ($array_for_defect as $key => $value) {
+			$deep = groups_get_group_deep($key);
+			$data[$i][0] = $deep . ui_print_truncate_text($value['data']['name'], GENERIC_SIZE_TEXT, true, true, true, '&hellip;', 'color:#FFF');
+			$j = 1;
+			if(isset($array_data[$key])){
+				foreach ($value['gm'] as $k => $v) {
+					if(isset($array_data[$key][$k])){
+						$send_tooltip = json_encode($array_data[$key][$k]);
+						$rel = "ajax.php?page=extensions/module_groups&get_info_alert_module_group=1&send_tooltip=" . $send_tooltip;
+						$url = "index.php?sec=estado&sec2=operation/agentes/status_monitor&status=-1&ag_group=" . $key . "&modulegroup=" . $k;
+
+						if ($array_data[$key][$k]['alerts_module_count'] != 0) {
+							$color = '#FFA631'; //Orange when the cell for this model group and agent has at least one alert fired.
+						}
+						else if ($array_data[$key][$k]['critical_module_count'] != 0) {
+							$color = '#FC4444'; //Red when the cell for this model group and agent has at least one module in critical state and the rest in any state.
+						}
+						elseif ($array_data[$key][$k]['warning_module_count'] != 0) {
+							$color = '#FAD403'; //Yellow when the cell for this model group and agent has at least one in warning state and the rest in green state.
+						}
+						elseif ($array_data[$key][$k]['unknown_module_count'] != 0) {
+							$color = '#B2B2B2 '; //Grey when the cell for this model group and agent has at least one module in unknown state and the rest in any state.
+						}
+						elseif ($array_data[$key][$k]['normal_module_count'] != 0) {
+							$color = '#80BA27'; //Green when the cell for this model group and agent has OK state all modules.
+						}
+						elseif ($array_data[$key][$k]['notInit_module_count'] != 0) {
+							$color = '#5BB6E5'; // Blue when the cell for this module group and all modules have not init value.
+						}
+
+						$data[$i][$j] ="<div style='background:$color; height: 20px;min-width: 60px;max-width:5%;overflow:hidden; margin-left: auto; margin-right: auto; text-align: center; padding: 5px;padding-bottom:10px;font-size: 18px;line-height:25px;'>";
+						$data[$i][$j] .= "<a class='info_cell' rel='$rel' href='$url' style='color:white;font-size: 18px;'>";
+						$data[$i][$j] .= $array_data[$key][$k]['total_count'];
+						$data[$i][$j] .= "</a></div>";
+					}
+					else{
+						$data[$i][$j] ="<div style='background:white; height: 20px;min-width: 60px;max-width:5%;overflow:hidden; margin-left: auto; margin-right: auto; text-align: center; padding: 5px;padding-bottom:10px;font-size: 18px;line-height:25px;'>";
+						$data[$i][$j] .= 0;
+						$data[$i][$j] .= "</div>";
+					}
+					$j++;
+				}
+			}
+			else{
+				foreach ($value['gm'] as $k => $v) {
+					$data[$i][$j] ="<div style='background:white; height: 20px;min-width: 60px;max-width:5%;overflow:hidden; margin-left: auto; margin-right: auto; text-align: center; padding: 5px;padding-bottom:10px;font-size: 18px;line-height:25px;'>";
+					$data[$i][$j] .= 0;
+					$data[$i][$j] .= "</div>";
+					$j++;
+				}
+			}
+			$i++;
+		}
+
+		$table->head = $head;
+		$table->headstyle = $headstyle;
+		$table->data = $data;
+
+		ui_pagination($counter);
+
+		echo "<div style='width:100%; overflow-x:auto;'>";
+			html_print_table($table);
 		echo "</div>";
+
+		ui_pagination($counter);
+
+		echo "<div class='legend_basic' style='width: 98.6%'>";
+			echo "<table >";
+				echo "<tr><td colspan='2' style='padding-bottom: 10px;'><b>" . __('Legend') . "</b></td></tr>";
+				echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_ALERTFIRED . ";'></div></td><td>" . __("Orange cell when the module group and agent have at least one alarm fired.") . "</td></tr>";
+				echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_CRITICAL . ";'></div></td><td>" . __("Red cell when the module group and agent have at least one module in critical status and the others in any status") . "</td></tr>";
+				echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_WARNING . ";'></div></td><td>" . __("Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status") . "</td></tr>";
+				echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_UNKNOWN . ";'></div></td><td>" . __("Grey cell when the module group and agent have at least one in unknown status and the others in green status") . "</td></tr>";
+				echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_NORMAL . ";'></div></td><td>" . __("Green cell when the module group and agent have all modules in OK status") . "</td></tr>";
+				echo "<tr><td class='legend_square_simple'><div style='background-color: " . COL_MAINTENANCE . ";'></div></td><td>" .__("Blue cell when the module group and agent have all modules in not init status.") . "</td></tr>";
+			echo "</table>";
+		echo "</div>";
+
 	}
 	else {
-		echo "<div class='nf'>".__('There are no defined groups or module groups')."</div>";
+		ui_print_info_message ( array('no_close'=>true, 'message'=> __("This table shows in columns the modules group and in rows agents group. The cell shows all modules") ));
+		ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no defined groups or module groups') ));
 	}
-	
+
 	ui_require_css_file('cluetip');
 	ui_require_jquery_file('cluetip');
 	?>
@@ -292,7 +270,8 @@ function mainModuleGroups() {
 			$("a.info_cell").cluetip ({
 				arrows: true,
 				attribute: 'rel',
-				cluetipClass: 'default'
+				cluetipClass: 'default',
+				width: '200px'
 			});
 		});
 	</script>
diff --git a/pandora_console/include/class/TreeGroup.class.php b/pandora_console/include/class/TreeGroup.class.php
index af5542e396..ced6b8d442 100644
--- a/pandora_console/include/class/TreeGroup.class.php
+++ b/pandora_console/include/class/TreeGroup.class.php
@@ -20,6 +20,7 @@ require_once($config['homedir']."/include/class/Tree.class.php");
 class TreeGroup extends Tree {
 
 	protected $propagateCounters = true;
+	protected $displayAllGroups  = false;
 
 	public function  __construct($type, $rootType = '', $id = -1, $rootID = -1, $serverID = false, $childrenMethod = "on_demand", $access = 'AR') {
 
@@ -44,6 +45,10 @@ class TreeGroup extends Tree {
 		$this->propagateCounters = (bool)$value;
 	}
 
+	public function setDisplayAllGroups($value) {
+		$this->displayAllGroups = (bool)$value;
+	}
+
 	protected function getData() {
 		if ($this->id == -1) {
 			$this->getFirstLevel();
@@ -132,12 +137,13 @@ class TreeGroup extends Tree {
 			return !$group['have_parent'];
 		});
 		// Propagate child counters to her parents
+
 		if ($this->propagateCounters) {
 			TreeGroup::processCounters($groups);
 			// Filter groups and eliminates the reference to empty groups
-			$groups = TreeGroup::deleteEmptyGroups($groups);
+			$groups = $this->deleteEmptyGroups($groups);
 		} else {
-			$groups = TreeGroup::deleteEmptyGroupsNotPropagate($groups);
+			$groups = $this->deleteEmptyGroupsNotPropagate($groups);
 		}
 
 		usort($groups, array("Tree", "cmpSortNames"));
@@ -345,7 +351,8 @@ class TreeGroup extends Tree {
 	 *
 	 * @return new_groups A new groups structure without empty groups
 	 */
-	protected static function deleteEmptyGroups ($groups) {
+	protected function deleteEmptyGroups ($groups) {
+		if($this->displayAllGroups) return $groups;
 		$new_groups = array();
 		foreach ($groups as $group) {
 			// If a group is empty, do not add to new_groups.
@@ -354,7 +361,7 @@ class TreeGroup extends Tree {
 			}
 			// Tray to remove the children groups
 			if (!empty($group['children'])) {
-				$children = TreeGroup::deleteEmptyGroups ($group['children']);
+				$children = $this->deleteEmptyGroups ($group['children']);
 				if (empty($children)) unset($group['children']);
 				else $group['children'] = $children;
 			}
@@ -363,12 +370,13 @@ class TreeGroup extends Tree {
 		return $new_groups;
 	}
 
-	protected static function deleteEmptyGroupsNotPropagate ($groups) {
+	protected function deleteEmptyGroupsNotPropagate ($groups) {
+		if($this->displayAllGroups) return $groups;
 		$new_groups = array();
 		foreach ($groups as $group) {
 			// Tray to remove the children groups
 			if (!empty($group['children'])) {
-				$children = TreeGroup::deleteEmptyGroupsNotPropagate ($group['children']);
+				$children = $this->deleteEmptyGroupsNotPropagate ($group['children']);
 				if (empty($children)) {
 					unset($group['children']);
 					// If a group is empty, do not add to new_groups.
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 8cdfa3a9e7..2184bd4a7a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4726,3 +4726,23 @@ a.up_arrow {
 tr:last-child > td > a.down_arrow, tr:first-child > td > a.up_arrow {
 	visibility: hidden;
 }
+
+.tooltip_counters h3{
+	font-size: 12pt;
+	padding-bottom: 10px !important;
+	text-align: center;
+}
+
+.tooltip_counters li{
+	font-size: 8pt;
+	margin: 2px;
+	margin-left: 5px;
+
+}
+.tooltip_counters li div{
+	width: 12px;
+	height: 12px;
+	border-radius: 3px;
+	float: left;
+	margin-right: 5px;
+}
\ No newline at end of file

From a097fdf5e6edad0a2e035eb1d8b8e0cdb95a25cc Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 21 Sep 2018 11:15:15 +0200
Subject: [PATCH 32/79] Added recalculate counters when a status module is
 forced by console

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

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index f8e632dad4..5c26b40cb9 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -2687,8 +2687,14 @@ function get_module_realtime_link_graph ($module) {
  * 			with some user action through the console
  * @param int New status
  * @param int Agent module to force new status
+ * @param int Agent id to force state recalculations
  */
-function force_set_module_status ($status, $id_agent_module) {
+function force_set_module_status ($status, $id_agent_module, $id_agent) {
+	// Force recalculate counters
+	db_process_sql_update('tagente',
+		array('update_module_count' => 1),
+		array('id_agente' => $id_agent)
+	);
 	return db_process_sql_update( 'tagente_estado',
 		array(
 			'estado' => $status,

From ee51114fe88e171a980c195500dd62dbec39446a Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 24 Sep 2018 11:20:47 +0200
Subject: [PATCH 33/79] Added standby mode on unix agent

---
 pandora_agents/unix/AIX/pandora_agent.conf    |  3 +
 pandora_agents/unix/Darwin/pandora_agent.conf |  3 +
 .../unix/FreeBSD/pandora_agent.conf           |  3 +
 pandora_agents/unix/HP-UX/pandora_agent.conf  |  3 +
 pandora_agents/unix/Linux/pandora_agent.conf  |  3 +
 pandora_agents/unix/NT4/pandora_agent.conf    |  9 ++-
 pandora_agents/unix/NetBSD/pandora_agent.conf |  3 +
 pandora_agents/unix/SunOS/pandora_agent.conf  |  3 +
 pandora_agents/unix/pandora_agent             | 69 ++++++++++++-------
 9 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 5f755ae4af..0d640badaa 100644
--- a/pandora_agents/unix/AIX/pandora_agent.conf
+++ b/pandora_agents/unix/AIX/pandora_agent.conf
@@ -87,6 +87,9 @@ transfer_mode tentacle
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
 # remote_config 1
 
+# Default 0, set to 1 to avoid module executions and report to server
+# standby 1
+
 # If set to 1 start Drone Agent's Proxy Mode 
 # proxy_mode 1
 
diff --git a/pandora_agents/unix/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf
index bfe673cf6c..53dd20cf4f 100644
--- a/pandora_agents/unix/Darwin/pandora_agent.conf
+++ b/pandora_agents/unix/Darwin/pandora_agent.conf
@@ -117,6 +117,9 @@ transfer_mode tentacle
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
 #remote_config 1
 
+# Default 0, set to 1 to avoid module executions and report to server
+# standby 1
+
 # If set to 1 start Drone Agent's Proxy Mode 
 # proxy_mode 1
 
diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf
index d829dfe933..3590ee6551 100644
--- a/pandora_agents/unix/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf
@@ -130,6 +130,9 @@ transfer_mode tentacle
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
 remote_config 0
 
+# Default 0, set to 1 to avoid module executions and report to server
+# standby 1
+
 # If set to 1 start Drone Agent's Proxy Mode
 #proxy_mode 1
 
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index 29dc961d62..aa1dcb1592 100644
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@@ -89,6 +89,9 @@ transfer_mode tentacle
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
 # remote_config 1
 
+# Default 0, set to 1 to avoid module executions and report to server
+# standby 1
+
 # If set to 1 start Drone Agent's Proxy Mode 
 # proxy_mode 1
 
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index c97d6b489f..fc55d1d872 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -136,6 +136,9 @@ transfer_mode tentacle
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
 remote_config 0
 
+# Default 0, set to 1 to avoid module executions and report to server
+# standby 1
+
 # If set to 1 start Drone Agent's Proxy Mode 
 # proxy_mode 1
 
diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf
index e493e71850..7a47602abc 100644
--- a/pandora_agents/unix/NT4/pandora_agent.conf
+++ b/pandora_agents/unix/NT4/pandora_agent.conf
@@ -41,9 +41,9 @@ udp_server_auth_address 0.0.0.0
 
 # Group assigned for this agent (descriptive, p.e: Servers)
 #group Servers
-
-# Group password (if defined).
-#group_password
+
+# Group password (if defined).
+#group_password
 
 # Autotime: Enforce to server to ignore timestamp coming from this
 # agent, used when agents has no timer or it's inestable. 1 to enable
@@ -102,6 +102,9 @@ transfer_mode tentacle
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
 remote_config 0
 
+# Default 0, set to 1 to avoid module executions and report to server
+# standby 1
+
 # Number of threads to execute modules in parallel
 #agent_threads 1
 
diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf
index 6954f557e0..42d8c19a25 100644
--- a/pandora_agents/unix/NetBSD/pandora_agent.conf
+++ b/pandora_agents/unix/NetBSD/pandora_agent.conf
@@ -98,6 +98,9 @@ transfer_mode tentacle
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
 #remote_config 1
 
+# Default 0, set to 1 to avoid module executions and report to server
+# standby 1
+
 # If set to 1 start Drone Agent's Proxy Mode
 #proxy_mode 1
 
diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf
index 8fe67c12d0..625bc89848 100644
--- a/pandora_agents/unix/SunOS/pandora_agent.conf
+++ b/pandora_agents/unix/SunOS/pandora_agent.conf
@@ -92,6 +92,9 @@ transfer_mode tentacle
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
 #remote_config 1
 
+# Default 0, set to 1 to avoid module executions and report to server
+# standby 1
+
 # If set to 1 start Drone Agent's Proxy Mode 
 #proxy_mode 1
 
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 1974d5fe75..30944cbec8 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -186,6 +186,7 @@ my %DefaultConf = (
 	'xml_buffer' => 0,
 	'custom_id' => '',
 	'url_address' => '',
+	'standby' => 0,
 );
 my %Conf = %DefaultConf;
 
@@ -1333,6 +1334,41 @@ sub check_collections () {
 	}
 }
 
+################################################################################
+# Sleep function
+################################################################################
+sub sleep_agent {
+	my ($main_agent, $iter_base_time) = @_;
+
+	# Sleep if main agent
+	if ($main_agent != 0) {
+		foreach my $broker_pid (@BrokerPid) {
+			waitpid ($broker_pid, 0);
+		}
+
+		# Cron mode
+		exit (0) if ($Conf{'cron_mode'} == 1);
+
+		$iter_base_time += $Conf{'intensive_interval'};
+		my $now = time();
+
+		my $interval_remain = $iter_base_time - $now;
+
+		if ($interval_remain >= 0) {
+			sleep ($interval_remain);
+		} else {
+			# don't sleep if iteraion took more than "intensive_interval" seconds
+			$iter_base_time = $now; # use current time as base time
+		}
+	}
+	# Finish if broker agent
+	else {
+		exit (0);
+	}
+
+	return $iter_base_time;
+}
+
 ###############################################################################
 # Return the MD5 checksum of the given string as a hex string.
 # Pseudocode from: http://en.wikipedia.org/wiki/MD5#Pseudocode
@@ -2959,6 +2995,12 @@ while (1) {
 		}
 	}
 
+	# Do not report to server if standby mode is enabled
+	if ($Conf{'standby'} eq '1' && $Conf{'debug'} ne '1') {
+		$iter_base_time = sleep_agent($main_agent, $iter_base_time);
+		next;
+	}
+
 	my $address;
 
 	if(defined($Conf{'address'})) {
@@ -3161,31 +3203,8 @@ while (1) {
 		$SIG{'INT'} = \&udp_server_signal;
 	}
 
-	# Sleep if main agent
-	if ($main_agent != 0) {
-		foreach my $broker_pid (@BrokerPid) {
-			waitpid ($broker_pid, 0);
-		}
-		
-		# Cron mode
-		last if ($Conf{'cron_mode'} == 1);
-
-		$iter_base_time += $Conf{'intensive_interval'};
-		my $now = time();
-
-		my $interval_remain = $iter_base_time - $now;
-
-		if ($interval_remain >= 0) {
-			sleep ($interval_remain);
-		} else {
-			# don't sleep if iteraion took more than "intensive_interval" seconds
-			$iter_base_time = $now; # use current time as base time
-		}
-	}
-	# Finish if broker agent
-	else {
-		exit (0);
-	}
+	# Sleep agent function
+	$iter_base_time = sleep_agent($main_agent, $iter_base_time);
 }
 
 __END__

From a0da08e1aae98b5541b54264232d5c247b50771c Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 24 Sep 2018 13:13:12 +0200
Subject: [PATCH 34/79] Added standby mode on windows agent

---
 pandora_agents/win32/bin/pandora_agent.conf     | 5 ++++-
 pandora_agents/win32/pandora_windows_service.cc | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index e8caadc9c3..8cbd66dc0c 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-2017 Artica Soluciones Tecnologicas 
-# Version 7.0NG.727
+# Version 7.0NG.727
 
 # 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
@@ -82,6 +82,9 @@ server_port 41121
 # Debug mode renames XML in the temp folder and continues running
 # debug 1
 
+# Default 0, set to 1 to avoid module executions and report to server
+# standby 1
+
 # XML encoding (ISO-8859-1 by default). Most windows servers experience problems when you set to UTF-8. Other special codepages may be specified here.
 #encoding ISO-8859-1
 
diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index e843cdbc05..275ee60724 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -1869,7 +1869,7 @@ Pandora_Windows_Service::pandora_run_broker (string config) {
 
 	server_addr = conf->getValue ("server_ip");
 
-	if (this->broker_modules != NULL) {
+	if (this->broker_modules != NULL && !(conf->getValue ("standby") == "1" && !getPandoraDebug())) {
 		this->broker_modules->goFirst ();
 	
 		while (! this->broker_modules->isLast ()) {
@@ -1937,7 +1937,7 @@ Pandora_Windows_Service::pandora_run_broker (string config) {
 		}
 	}
 
-	if (data_flag == 1 || this->timestamp + this->interval_sec <= this->run_time) {
+	if ((data_flag == 1 || this->timestamp + this->interval_sec <= this->run_time) && !(conf->getValue ("standby") == "1" && !getPandoraDebug())) {
 		
 		// Send the XML
 		if (!server_addr.empty ()) {
@@ -1997,7 +1997,7 @@ Pandora_Windows_Service::pandora_run (int forced_run) {
 
 	execution_number++;
 
-	if (this->modules != NULL) {
+	if (this->modules != NULL && !(conf->getValue ("standby") == "1" && !getPandoraDebug())) {
 		this->modules->goFirst ();
 	
 		while (! this->modules->isLast ()) {
@@ -2057,7 +2057,7 @@ Pandora_Windows_Service::pandora_run (int forced_run) {
 		}
 	}
 
-	if (forced_run == 1 || data_flag == 1 || this->timestamp + this->interval_sec <= this->run_time) {
+	if ((forced_run == 1 || data_flag == 1 || this->timestamp + this->interval_sec <= this->run_time) && !(conf->getValue ("standby") == "1" && !getPandoraDebug())) {
 				
 		// Send the XML
 		if (!server_addr.empty ()) {

From 9cf578e1f60cdd8e00197aeb0eee44e090822eeb Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 24 Sep 2018 16:54:53 +0200
Subject: [PATCH 35/79] Update configuration files when disabled is modified on
 agents editing

---
 .../godmode/agentes/configurar_agente.php     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index b0999eb638..5094f83d5c 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -760,7 +760,7 @@ if ($update_agent) { // if modified some agent paramenter
 	$quiet = (int) get_parameter("quiet", 0);
 	$cps = (int) get_parameter("cps", 0);
 	
-	$old_interval = db_get_value('intervalo', 'tagente', 'id_agente', $id_agente);
+	$old_values = db_get_row('tagente', 'id_agente', $id_agente);
 	$fields = db_get_all_fields_in_table('tagent_custom_fields');
 	
 	if ($fields === false) $fields = array();
@@ -860,11 +860,21 @@ if ($update_agent) { // if modified some agent paramenter
 			// Update the agent from the metaconsole cache
 			enterprise_include_once('include/functions_agents.php');
 			enterprise_hook ('agent_update_from_cache', array($id_agente, $values,$server_name));
-			
-			if ($old_interval != $intervalo) {
-				enterprise_hook('config_agents_update_config_interval', array($id_agente, $intervalo));
+
+			# Update the configuration files
+			if ($old_values['intervalo'] != $intervalo) {
+				enterprise_hook(
+					'config_agents_update_config_token',
+					array($id_agente, 'interval', $intervalo)
+				);
 			}
-			
+			if ($old_values['disabled'] != $disabled) {
+				enterprise_hook(
+					'config_agents_update_config_token',
+					array($id_agente, 'standby', $disabled ? "1" : "0")
+				);
+			}
+
 			if($tpolicy_group_old){
 				foreach ($tpolicy_group_old as $key => $value) {
 					$tpolicy_agents_old= db_get_sql("SELECT * FROM tpolicy_agents 

From 823b32ac636fc5090f52e74850aa577864c2ceeb Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 24 Sep 2018 17:32:58 +0200
Subject: [PATCH 36/79] Added update standby token in massive operations

---
 .../godmode/massive/massive_edit_agents.php     | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index f543772648..981857783e 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -30,6 +30,7 @@ require_once ('include/functions_modules.php');
 require_once ('include/functions_servers.php');
 require_once ('include/functions_gis.php');
 require_once ('include/functions_users.php');
+enterprise_include_once('include/functions_config_agents.php');
 
 if (is_ajax ()) {
 	$get_n_conf_files = (bool) get_parameter ('get_n_conf_files');
@@ -136,8 +137,11 @@ if ($update_agents) {
 	foreach ($id_agents as $id_agent) {
 		if (!empty($values)) {
 			$group_old = false;
-			if($values['id_grupo']){
-				$group_old = db_get_sql("SELECT id_grupo FROM tagente WHERE id_agente =" .$id_agent);
+			$disabled_old = false;
+			if($values['id_grupo'] || isset($values['disabled'])){
+				$values_old = db_get_row_filter('tagente', array('id_agente' => $id_agent), array('id_grupo', 'disabled'));
+				if ($values_old['id_grupo']) $group_old = $values_old['id_grupo'];
+				if (isset($values['disabled'])) $disabled_old = $values_old['disabled'];
 			}
 			
 			$result = db_process_sql_update ('tagente',
@@ -149,7 +153,14 @@ if ($update_agents) {
 				// Force an update of the agent cache.
 				$result_metaconsole = agent_update_from_cache($id_agent,$values,$server_name);
 			}
-			
+
+			if ($disabled_old !== false && $disabled_old != $values['disabled']) {
+				enterprise_hook(
+					'config_agents_update_config_token',
+					array($id_agent, 'standby', $values['disabled'])
+				);
+			}
+
 			if($group_old || $result){
 				if ($group_old && $group_old != null) {
 					$tpolicy_group_old = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups 

From 87fa7a7125088741f6cab43c46a6385611e26c5f Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 25 Sep 2018 13:42:29 +0200
Subject: [PATCH 37/79] Added --set_disabled_and_standby to CLI

---
 pandora_server/lib/PandoraFMS/Tools.pm |  1 +
 pandora_server/util/pandora_manage.pl  | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 1758d79459..5e5f58c4a8 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -28,6 +28,7 @@ use Socket qw(inet_ntoa inet_aton);
 use Sys::Syslog;
 use Scalar::Util qw(looks_like_number);
 use LWP::UserAgent;
+use threads;
 
 # New in 3.2. Used to sendmail internally, without external scripts
 # use Module::Loaded;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 8314db7273..ccf9294af2 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -136,6 +136,7 @@ sub help_screen{
 	help_screen_line('--delete_cluster_agent', '<id_agent> <id_cluster>', 'Deleting cluster agent');
 	help_screen_line('--delete_cluster_item', '<id_item>', 'Deleting cluster item');
 	help_screen_line('--get_cluster_status', '<id_cluster>', 'Getting cluster status');
+	help_screen_line('--set_disabled_and_standby', '<id_agent> <id_node> <value>', 'Overwrite and disable and standby status');
 	print "\nMODULES:\n\n" unless $param ne '';
 	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> <retries> <requests> <agent_browser_id> <auth_server> <auth_realm> <definition_file>\n\t <proxy_url> <proxy_auth_login> <proxy_auth_password> <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');
@@ -6125,6 +6126,10 @@ sub pandora_manage_main ($$$) {
 			param_check($ltotal, 1, 0);
 			cli_migration_agent();
 		}
+		elsif ($param eq '--set_disabled_and_standby') {
+			param_check($ltotal, 3, 1);
+			cli_set_disabled_and_standby();
+		}
 		else {
 			print_log "[ERROR] Invalid option '$param'.\n\n";
 			$param = '';
@@ -6709,4 +6714,23 @@ sub cli_get_cluster_status() {
 	else{
 		print "\n0\n";
 	}
+}
+
+##############################################################################
+# Set an agent disabled and with standby.
+# Related option: --set_disabled_and_standby
+##############################################################################
+
+sub cli_set_disabled_and_standby() {
+	my ($id, $id_node, $value) = @ARGV[2..4];
+	$id_node = 0 unless defined($id_node);
+	$value = 1 unless defined($value); #Set to disabled by default
+
+	# Call the API.
+	my $result = api_call(
+		$conf, 'set', 'disabled_and_standby', $id, $id_node, $value
+	);
+
+	my $exit_code =  (defined($result) && "$result" eq "1") ? "1" : "0";
+	print "\n$exit_code\n";
 }
\ No newline at end of file

From 2bae8a0c54c943cee6eedb1a214e570af6bbd35f Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Tue, 25 Sep 2018 13:58:19 +0200
Subject: [PATCH 38/79] new parameter has been passed in to check whether or
 not we are at a public console when obtaining url of child console

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

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index b92f17e230..71cf0e6047 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -487,7 +487,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 						else {
 							$url = ui_meta_get_url_console_child(
 								$layoutData['id_metaconsole'],
-								"estado", "operation/agentes/ver_agente&amp;id_agente=" . $layoutData['id_agent']);
+								"estado", "operation/agentes/ver_agente&amp;id_agente=" . $layoutData['id_agent'], null, null, null, $isExternalLink);
 						}
 					}
 					else {
@@ -499,7 +499,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 						else {
 							$url = ui_meta_get_url_console_child(
 								$layoutData['id_metaconsole'],
-								"estado", "operation/agentes/ver_agente&amp;id_agente=" . $layoutData['id_agent']);
+								"estado", "operation/agentes/ver_agente&amp;id_agente=" . $layoutData['id_agent'], null, null, null, $isExternalLink);
 						}
 					}
 				}
@@ -662,7 +662,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 						else {
 							$url = ui_meta_get_url_console_child(
 								$layoutData['id_metaconsole'],
-								"estado", "operation/agentes/ver_agente&amp;id_agente=" . $layoutData['id_agent']);
+								"estado", "operation/agentes/ver_agente&amp;id_agente=" . $layoutData['id_agent'], null, null, null, $isExternalLink);
 						}
 					}
 				break;
@@ -724,7 +724,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 						else {
 							$url = ui_meta_get_url_console_child(
 								$layoutData['id_metaconsole'],
-								"estado", 'operation/agentes/ver_agente&amp;id_agente='.$layoutData['id_agent']);
+								"estado", 'operation/agentes/ver_agente&amp;id_agente='.$layoutData['id_agent'], null, null, null, $isExternalLink);
 						}
 					}
 				}
@@ -779,7 +779,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 							else {
 								$url = ui_meta_get_url_console_child(
 									$layoutData['id_metaconsole'],
-									"estado", 'operation/agentes/ver_agente&amp;id_agente='.$layoutData["id_agent"].'&amp;tab=data');
+									"estado", 'operation/agentes/ver_agente&amp;id_agente='.$layoutData["id_agent"].'&amp;tab=data', null, null, null, $isExternalLink);
 							}
 						}
 					}

From 22b46e41f1ad02872aa95df4e54ca187c54dc851 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 25 Sep 2018 15:59:33 +0200
Subject: [PATCH 39/79] Added standby mode on disabled token of API function
 set update_agent

---
 pandora_console/include/functions_api.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 189cc4203b..350a3089ab 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1175,11 +1175,14 @@ function api_set_update_agent($id_agent, $thrash2, $other, $thrash3) {
 			return;
 		}
 	}
+	$values_old = db_get_row_filter('tagente',
+		array('id_agente' => $id_agent),
+		array('id_grupo', 'disabled')
+	);
+	$tpolicy_group_old = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups
+			WHERE id_group = ".$values_old['id_grupo']);
 	
-	$group_old = db_get_sql("SELECT id_grupo FROM tagente WHERE id_agente =" .$id_agent);
-	$tpolicy_group_old = db_get_all_rows_sql("SELECT id_policy FROM tpolicy_groups 
-			WHERE id_group = ".$group_old);
-	
+
 	$return = db_process_sql_update('tagente', 
 		array('alias' => $alias,
 			'direccion' => $ip,
@@ -1200,8 +1203,16 @@ function api_set_update_agent($id_agent, $thrash2, $other, $thrash3) {
 		// register ip for this agent in 'taddress'
 		agents_add_address ($id_agent, $ip);
 	}
-	
+
 	if($return){
+		// Update config file
+		if (isset($disabled) && $values_old['disabled'] != $disabled) {
+			enterprise_hook(
+				'config_agents_update_config_token',
+				array($id_agent, 'standby', $disabled)
+			);
+		}
+
 		if($tpolicy_group_old){
 			foreach ($tpolicy_group_old as $key => $value) {
 				$tpolicy_agents_old= db_get_sql("SELECT * FROM tpolicy_agents 

From 90bbd31b66640054a2d7f319e80c51ca5ed5a861 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 25 Sep 2018 16:00:37 +0200
Subject: [PATCH 40/79] Added tip to disabled radiobutton in agent edition and
 massive operations

---
 pandora_console/godmode/agentes/agent_manager.php       | 1 +
 pandora_console/godmode/massive/massive_edit_agents.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 0196fb9393..418fe850c0 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -479,6 +479,7 @@ $table->data[3][1] .= __('Autodisable mode') . ' ' .
 // Status (Disabled / Enabled)
 $table->data[4][0] = __('Status');
 $table->data[4][1] = __('Disabled') . ' ' .
+	ui_print_help_tip(__('If the agent has remote configuration activated, it will put it on standby mode too.'), true) . ' ' .
 	html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
 $table->data[4][1] .= __('Enabled') . ' ' .
 	html_print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index 981857783e..c5d33c4f67 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -432,7 +432,9 @@ $table->data[1][1] .= __('Autodisable mode').' '.html_print_radio_button_extende
 // Status (Disabled / Enabled)
 $table->data[2][0] = __('Status');
 $table->data[2][1] = __('No change').' '.html_print_radio_button_extended ("disabled", -1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
-$table->data[2][1] .= __('Disabled').' '.html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
+$table->data[2][1] .= __('Disabled') . ' ' .
+	ui_print_help_tip(__('If the agent has remote configuration activated, it will put it on standby mode too.'), true) . ' ' .
+	html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
 $table->data[2][1] .= __('Active').' '.html_print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
 
 // Remote configuration

From 24de9d9119c147e9cb57303d831f285b6e61f1c3 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Tue, 25 Sep 2018 17:33:29 +0200
Subject: [PATCH 41/79] fixed bug: reporting of custom graphs not showing graph
 when graph name is empty

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

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 4cc8315b0b..8377a889d9 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -6246,6 +6246,11 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
 		else {
 			$content['name'] = __('Simple graph');
 		}
+	} else {
+		if ($type_report == "custom_graph") {
+			$graphs = db_get_all_rows_field_filter ("tgraph", "id_graph", $content['id_gs']);
+			$id_graph = $content['id_gs'];
+		}
 	}
 
 	$return['title'] = $content['name'];

From 24b980dbd723188d9c0e85eb5b7fe1912f3a07df Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 26 Sep 2018 10:44:00 +0200
Subject: [PATCH 42/79] Added dependency IO::Compress::Zip to centos agent

---
 pandora_agents/unix/pandora_agent.redhat.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index fb339ae150..14a0479619 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -24,7 +24,7 @@ Requires(preun):    chkconfig /bin/rm /usr/sbin/userdel
 Requires:           fileutils textutils unzip
 Requires:           util-linux procps grep
 Requires:           /sbin/ip /bin/awk
-Requires:           perl perl(Sys::Syslog)
+Requires:           perl perl(Sys::Syslog) perl(IO::Compress::Zip)
 # Required by plugins
 #Requires:           sh-utils sed passwd net-tools rpm
 AutoReq:            0

From 8fe3e1606fa10a49cc8c4133ab2e377be1973e09 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 26 Sep 2018 10:50:16 +0200
Subject: [PATCH 43/79] Fixed string (avoiding macaronic English)

---
 pandora_console/godmode/agentes/agent_manager.php       | 2 +-
 pandora_console/godmode/massive/massive_edit_agents.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 418fe850c0..4e6be0e725 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -479,7 +479,7 @@ $table->data[3][1] .= __('Autodisable mode') . ' ' .
 // Status (Disabled / Enabled)
 $table->data[4][0] = __('Status');
 $table->data[4][1] = __('Disabled') . ' ' .
-	ui_print_help_tip(__('If the agent has remote configuration activated, it will put it on standby mode too.'), true) . ' ' .
+	ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true) . ' ' .
 	html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
 $table->data[4][1] .= __('Enabled') . ' ' .
 	html_print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index c5d33c4f67..3f78d8c88c 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -433,7 +433,7 @@ $table->data[1][1] .= __('Autodisable mode').' '.html_print_radio_button_extende
 $table->data[2][0] = __('Status');
 $table->data[2][1] = __('No change').' '.html_print_radio_button_extended ("disabled", -1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
 $table->data[2][1] .= __('Disabled') . ' ' .
-	ui_print_help_tip(__('If the agent has remote configuration activated, it will put it on standby mode too.'), true) . ' ' .
+	ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true) . ' ' .
 	html_print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
 $table->data[2][1] .= __('Active').' '.html_print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
 

From 896ba6051b8de0a8a83ad92e259b7cbcd971a67e Mon Sep 17 00:00:00 2001
From: danielmaya <daniel.maya@artica.es>
Date: Wed, 26 Sep 2018 11:00:44 +0200
Subject: [PATCH 44/79] fixed issue with string data in visual map

---
 pandora_console/extras/mr/21.sql              |  5 ++
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |  1 +
 .../visual_console_builder.editor.js          | 47 +++++++++++--------
 .../ajax/visual_console_builder.ajax.php      |  6 +++
 .../include/functions_visual_map.php          | 25 ++++++----
 .../include/functions_visual_map_editor.php   |  9 ++++
 pandora_console/pandoradb.sql                 |  1 +
 7 files changed, 66 insertions(+), 28 deletions(-)
 create mode 100644 pandora_console/extras/mr/21.sql

diff --git a/pandora_console/extras/mr/21.sql b/pandora_console/extras/mr/21.sql
new file mode 100644
index 0000000000..e2144016ce
--- /dev/null
+++ b/pandora_console/extras/mr/21.sql
@@ -0,0 +1,5 @@
+START TRANSACTION;
+
+ALTER TABLE tlayout_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0';
+
+COMMIT;
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 29c5bb4f8b..ea21ccab03 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
@@ -1294,6 +1294,7 @@ ALTER TABLE tlayout_data ADD COLUMN `show_on_top` tinyint(1) NOT NULL default '0
 ALTER TABLE tlayout_data ADD COLUMN `clock_animation` varchar(60) NOT NULL default "analogic_1";
 ALTER TABLE tlayout_data ADD COLUMN `time_format` varchar(60) NOT NULL default "time";
 ALTER TABLE tlayout_data ADD COLUMN `timezone` varchar(60) NOT NULL default "Europe/Madrid";
+ALTER TABLE tlayout_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0';
 
 -- ---------------------------------------------------------------------
 -- Table `tagent_custom_fields`
diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index d32b15e1aa..8d92642f52 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -870,6 +870,7 @@ function readFields() {
 	values['time_format'] = $("select[name=time_format]").val();
 	values['timezone'] = $("select[name=timezone]").val();
 	values['clock_animation'] = $("select[name=clock_animation]").val();
+	values['show_last_value'] = $("select[name=last_value]").val();
 	
 	if (is_metaconsole()) {
 		values['metaconsole'] = 1;
@@ -1380,7 +1381,6 @@ function loadFieldsFromDB(item) {
 		}
 	});
 
-
 	parameter = Array();
 	parameter.push ({name: "page",
 		value: "include/ajax/visual_console_builder.ajax"});
@@ -1459,26 +1459,26 @@ function loadFieldsFromDB(item) {
 					$("select[name=type_graph]").val(val);
 				}
 					
-					if (key == 'label_position') {
-						if($("#hidden-metaconsole").val() == 1){
-							$('#labelposup'+" img").attr('src','../../images/label_up.png');
-							$('#labelposdown'+" img").attr('src','../../images/label_down.png');
-							$('#labelposleft'+" img").attr('src','../../images/label_left.png');
-							$('#labelposright'+" img").attr('src','../../images/label_right.png');
-							$('.labelpos').attr('sel','no');
-							$('#labelpos'+val+" img").attr('src','../../images/label_'+$('#labelpos'+val).attr('id').replace('labelpos','')+'_2.png');
-							$('#labelpos'+val).attr('sel','yes');
-						}
-						else{
-							$('#labelposup'+" img").attr('src','images/label_up.png');
-							$('#labelposdown'+" img").attr('src','images/label_down.png');
-							$('#labelposleft'+" img").attr('src','images/label_left.png');
-							$('#labelposright'+" img").attr('src','images/label_right.png');
-							$('.labelpos').attr('sel','no');
-							$('#labelpos'+val+" img").attr('src','images/label_'+$('#labelpos'+val).attr('id').replace('labelpos','')+'_2.png');
-							$('#labelpos'+val).attr('sel','yes');
-						}
+				if (key == 'label_position') {
+					if($("#hidden-metaconsole").val() == 1){
+						$('#labelposup'+" img").attr('src','../../images/label_up.png');
+						$('#labelposdown'+" img").attr('src','../../images/label_down.png');
+						$('#labelposleft'+" img").attr('src','../../images/label_left.png');
+						$('#labelposright'+" img").attr('src','../../images/label_right.png');
+						$('.labelpos').attr('sel','no');
+						$('#labelpos'+val+" img").attr('src','../../images/label_'+$('#labelpos'+val).attr('id').replace('labelpos','')+'_2.png');
+						$('#labelpos'+val).attr('sel','yes');
 					}
+					else{
+						$('#labelposup'+" img").attr('src','images/label_up.png');
+						$('#labelposdown'+" img").attr('src','images/label_down.png');
+						$('#labelposleft'+" img").attr('src','images/label_left.png');
+						$('#labelposright'+" img").attr('src','images/label_right.png');
+						$('.labelpos').attr('sel','no');
+						$('#labelpos'+val+" img").attr('src','images/label_'+$('#labelpos'+val).attr('id').replace('labelpos','')+'_2.png');
+						$('#labelpos'+val).attr('sel','yes');
+					}
+				}
 					
 				if (key == 'image') {
 					//Load image preview
@@ -1590,6 +1590,10 @@ function loadFieldsFromDB(item) {
 						.css('background-color', val);
 				}
 				
+				if (key == 'show_last_value') {
+					$("select[name=last_value]").val(val);
+				}
+				
 				if (key == 'clock_animation') 
 					$("select[name=clock_animation]").val(val);
 				if (key == 'time_format') 
@@ -1852,6 +1856,9 @@ function hiddenFields(item) {
 
 	$("#percentile_bar_row_2").css('display', 'none');
 	$("#percentile_bar_row_2." + item).css('display', '');
+	
+	$("#show_last_value_row").css('display', 'none');
+	$("#show_last_value_row." + item).css('display', '');
 
 	$("#percentile_item_row_3").css('display', 'none');
 	$("#percentile_item_row_3." + item).css('display', '');
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 98be4f174b..92a77974e7 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -164,6 +164,8 @@ $clock_animation = get_parameter('clock_animation', 'analogic_1');
 $time_format = get_parameter('time_format', 'time');
 $timezone = get_parameter('timezone', 'Europe/Madrid');
 
+$show_last_value = get_parameter('show_last_value', null);
+
 switch ($action) {
 	case 'get_font':
 		$return = array();
@@ -785,6 +787,9 @@ switch ($action) {
 						if ($height !== null) {
 							$values['height'] = $height;
 						}
+						if ($show_last_value !== null) {
+							$values['show_last_value'] = $show_last_value;
+						}
 						break;
 					case 'simple_value':
 						if ($action == 'update') {
@@ -1281,6 +1286,7 @@ switch ($action) {
 				$values['image'] = $image;
 				$values['width'] = $width;
 				$values['height'] = $height;
+				$values['show_last_value'] = $show_last_value;
 				break;
 			case 'group_item':
 				$values['type'] = GROUP_ITEM;
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index b92f17e230..e88383a404 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1775,16 +1775,25 @@ function visual_map_print_item($mode = "read", $layoutData,
 							$value = format_for_graph($value, 2);
 						}
 						
-						if (!empty($unit_text))
-							$value .= " " . $unit_text;
-						
 						// Hide value on boolean modules
-						if (!modules_is_boolean($layoutData['id_agente_modulo'])) {
-							$img_style_title .=
-								" <br>" . __("Last value: ")
-								. remove_right_zeros(number_format($value, $config['graph_precision'])).$unit_text;
+						if ($layoutData['show_last_value'] != 2) {
+							if ((!modules_is_boolean($layoutData['id_agente_modulo'])) || 
+								(modules_is_boolean($layoutData['id_agente_modulo']) && $layoutData['show_last_value'] != 0)){
+								if (is_numeric($value)) {
+									$img_style_title .=
+										" <br>" . __("Last value: ")
+										. remove_right_zeros(number_format($value, $config['graph_precision']));
+								} else {
+									$img_style_title .=
+									" <br>" . __("Last value: ")
+									. $value;
+								}
+							}
 						}
 						
+						if (!empty($unit_text))
+							$img_style_title .= " " . $unit_text;
+						
 						if ($layoutData['id_metaconsole'] != 0) {
 							//Restore db connection
 							metaconsole_restore_db();
@@ -1792,7 +1801,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 					}
 					
 					if(get_parameter('action') == 'edit'){
-					$img_style_title = '';
+						$img_style_title = '';
 					}
 				}
 				
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index a20a8c5e42..8bc8665a9d 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -590,6 +590,15 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				<td align="left" style="">' .
 				html_print_checkbox('show_on_top', 1, '', true) . '</td>';
 			
+			$show_last_value = array('0' => __('Hide last value on boolean modules'), '1' => __('Enabled'), '2' => __('Disabled'));
+			$form_items['show_last_value_row'] = array();
+			$form_items['show_last_value_row']['items'] = array('static_graph');
+			$form_items['show_last_value_row']['html'] = 
+				'<td align="left" style="">' . __('Show last value') . '</td>
+				<td align="left">' .
+				html_print_select($show_last_value, 'last_value', 0, '', '', '', true) .
+				'</td>';
+			
 			$form_items['module_graph_size_row'] = array();
 			$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos');
 			$form_items['module_graph_size_row']['html'] = '<td align="left">' . __('Size') . '</td>
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 655bae59bf..542ef719a9 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1399,6 +1399,7 @@ CREATE TABLE IF NOT EXISTS `tlayout_data` (
 	`clock_animation` varchar(60) NOT NULL default "analogic_1",
 	`time_format` varchar(60) NOT NULL default "time",
 	`timezone` varchar(60) NOT NULL default "Europe/Madrid",
+	`show_last_value` tinyint(1) UNSIGNED NULL default '0',
 	
 	PRIMARY KEY(`id`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;

From bbfec2b7633456720e95f24430f02d1562ddbf85 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 27 Sep 2018 16:21:06 +0200
Subject: [PATCH 45/79] htaccess. Allow connections from localhost to
 pandora_console/attachment

---
 pandora_console/attachment/.htaccess | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/attachment/.htaccess b/pandora_console/attachment/.htaccess
index 815f1e1776..d6a661a7f8 100644
--- a/pandora_console/attachment/.htaccess
+++ b/pandora_console/attachment/.htaccess
@@ -1,2 +1,3 @@
 Order deny,allow
 Deny from All
+Allow from localhost
\ No newline at end of file

From 1a60aee7a61706eac3641e34a6ae8812b43285fd Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 28 Sep 2018 00:01:25 +0200
Subject: [PATCH 46/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 960dd1248c..7f1a5334af 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-180927
+Version: 7.0NG.727-180928
 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 53f00ab6fc..80d1ce6c24 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.727-180927"
+pandora_version="7.0NG.727-180928"
 
 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 02d8dbef17..aecfa7cb17 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '180927';
+use constant AGENT_BUILD => '180928';
 
 # 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 d1a9aff7a2..a868aff576 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.727
-%define release     180927
+%define release     180928
 
 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 6ca9c63f76..71b21a9764 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.727
-%define release     180927
+%define release     180928
 
 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 691f92b58e..203d06f6bf 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="180927"
+PI_BUILD="180928"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index f9b33a9d34..3a20e8c032 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180927}
+{180928}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 4b3f32d9ac..30c25d7544 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.727(Build 180927)")
+#define PANDORA_VERSION ("7.0NG.727(Build 180928)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index fd82225cbf..9746a9a0ac 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.727(Build 180927))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 180928))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 54a24c2f2c..ba6af1b8b3 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-180927
+Version: 7.0NG.727-180928
 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 18673a2151..321405bf55 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.727-180927"
+pandora_version="7.0NG.727-180928"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index d0a1fe004a..4c1f7d9236 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 = 'PC180927';
+$build_version = 'PC180928';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index fe1e2718a3..41b0086e44 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '180927';
+$build = '180928';
 			$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 c73ed15420..01c4edc423 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.727
-%define release     180927
+%define release     180928
 
 # 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 b69742f400..36ea151f5c 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.727
-%define release     180927
+%define release     180928
 %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 b1bb245559..ae36b11db3 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-180927
+Version: 7.0NG.727-180928
 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 4ec04ce2d1..c05efc0fd5 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.727-180927"
+pandora_version="7.0NG.727-180928"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 5c47aaaf74..d948a1fad6 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "180927";
+my $pandora_build = "180928";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 9c02419f5b..4dc7922a56 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "180927";
+my $pandora_build = "180928";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 6931ad5763..39d9b53c44 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.727
-%define release     180927
+%define release     180928
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6faf6b4207..a6980ecec1 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.727
-%define release     180927
+%define release     180928
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 6c24fea069..e622fc06ce 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="180927"
+PI_BUILD="180928"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d8d7f573f1..4c3395d5a9 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS180927";
+my $version = "7.0NG.727 PS180928";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 6be375e60b..edd170ee7f 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS180927";
+my $version = "7.0NG.727 PS180928";
 
 # save program name for logging
 my $progname = basename($0);

From 2606b73e570c63ce540400cb099379ffea2b2214 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 29 Sep 2018 00:01:27 +0200
Subject: [PATCH 47/79] 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/bin/pandora_agent.conf    | 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/lib/PandoraFMS/PluginTools.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 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 7f1a5334af..c4a1ce3acc 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-180928
+Version: 7.0NG.727-180929
 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 80d1ce6c24..2c25c2ec2e 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.727-180928"
+pandora_version="7.0NG.727-180929"
 
 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 21ff101a21..5e086e315f 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '180928';
+use constant AGENT_BUILD => '180929';
 
 # 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 67b14bcb4d..4cdab1f6fe 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.727
-%define release     180928
+%define release     180929
 
 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 71b21a9764..583d5f62a9 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.727
-%define release     180928
+%define release     180929
 
 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 203d06f6bf..5c35a69e68 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="180928"
+PI_BUILD="180929"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 8cbd66dc0c..0901ac5234 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-2017 Artica Soluciones Tecnologicas 
-# Version 7.0NG.727
+# Version 7.0NG.727
 
 # 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 3a20e8c032..b77053b4af 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180928}
+{180929}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 30c25d7544..9a06188f50 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.727(Build 180928)")
+#define PANDORA_VERSION ("7.0NG.727(Build 180929)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 9746a9a0ac..125984a026 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.727(Build 180928))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 180929))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index ba6af1b8b3..ef10894f34 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-180928
+Version: 7.0NG.727-180929
 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 321405bf55..40dbba1695 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.727-180928"
+pandora_version="7.0NG.727-180929"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 4c1f7d9236..30e1b0170b 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 = 'PC180928';
+$build_version = 'PC180929';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 41b0086e44..2ea9639d91 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '180928';
+$build = '180929';
 			$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 01c4edc423..ba498f9470 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.727
-%define release     180928
+%define release     180929
 
 # 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 36ea151f5c..a657d97667 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.727
-%define release     180928
+%define release     180929
 %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 ae36b11db3..b9377f374d 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-180928
+Version: 7.0NG.727-180929
 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 c05efc0fd5..f60c7f938e 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.727-180928"
+pandora_version="7.0NG.727-180929"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d948a1fad6..d0da91efca 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "180928";
+my $pandora_build = "180929";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 4dc7922a56..0461dbe3f5 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "180928";
+my $pandora_build = "180929";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 39d9b53c44..53637e9b05 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.727
-%define release     180928
+%define release     180929
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index a6980ecec1..d05fa92189 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.727
-%define release     180928
+%define release     180929
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index e622fc06ce..8361cdcd99 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="180928"
+PI_BUILD="180929"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 4c3395d5a9..e27a5d3c64 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS180928";
+my $version = "7.0NG.727 PS180929";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 57bb63181d..76824e642c 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS180928";
+my $version = "7.0NG.727 PS180929";
 
 # save program name for logging
 my $progname = basename($0);

From 46373616fa4f929f2fdb1a2679af1a48812f3eb2 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 30 Sep 2018 00:01:22 +0200
Subject: [PATCH 48/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index c4a1ce3acc..0e4d0e2abe 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-180929
+Version: 7.0NG.727-180930
 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 2c25c2ec2e..436f6aa8d9 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.727-180929"
+pandora_version="7.0NG.727-180930"
 
 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 5e086e315f..f6c5faba05 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '180929';
+use constant AGENT_BUILD => '180930';
 
 # 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 4cdab1f6fe..84a5edf731 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.727
-%define release     180929
+%define release     180930
 
 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 583d5f62a9..191c300a55 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.727
-%define release     180929
+%define release     180930
 
 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 5c35a69e68..80503843dc 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="180929"
+PI_BUILD="180930"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index b77053b4af..c45263ca7f 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180929}
+{180930}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 9a06188f50..e15feb1e16 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.727(Build 180929)")
+#define PANDORA_VERSION ("7.0NG.727(Build 180930)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 125984a026..bafae0b46a 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.727(Build 180929))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 180930))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index ef10894f34..b84ec25771 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-180929
+Version: 7.0NG.727-180930
 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 40dbba1695..de3c3687ec 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.727-180929"
+pandora_version="7.0NG.727-180930"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 30e1b0170b..6b2ca4d5cc 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 = 'PC180929';
+$build_version = 'PC180930';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 2ea9639d91..be71742d89 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '180929';
+$build = '180930';
 			$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 ba498f9470..bdb8a6da21 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.727
-%define release     180929
+%define release     180930
 
 # 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 a657d97667..7111fbdd4e 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.727
-%define release     180929
+%define release     180930
 %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 b9377f374d..69f8e5f444 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-180929
+Version: 7.0NG.727-180930
 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 f60c7f938e..2dee9e07d9 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.727-180929"
+pandora_version="7.0NG.727-180930"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d0da91efca..1865178985 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "180929";
+my $pandora_build = "180930";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 0461dbe3f5..dbba1a202d 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "180929";
+my $pandora_build = "180930";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 53637e9b05..4513dd0b7d 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.727
-%define release     180929
+%define release     180930
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index d05fa92189..ba8df5cb19 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.727
-%define release     180929
+%define release     180930
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 8361cdcd99..334047df18 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="180929"
+PI_BUILD="180930"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e27a5d3c64..4b7cbc5f8d 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS180929";
+my $version = "7.0NG.727 PS180930";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 76824e642c..e1693e9539 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS180929";
+my $version = "7.0NG.727 PS180930";
 
 # save program name for logging
 my $progname = basename($0);

From 779f3c6c6012300737bb7c4d96f84abbc77d8793 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 1 Oct 2018 00:01:23 +0200
Subject: [PATCH 49/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 0e4d0e2abe..5b682cd793 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-180930
+Version: 7.0NG.727-181001
 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 436f6aa8d9..0651f8af81 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.727-180930"
+pandora_version="7.0NG.727-181001"
 
 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 f6c5faba05..8f86156cb3 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '180930';
+use constant AGENT_BUILD => '181001';
 
 # 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 84a5edf731..5c1495e65b 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.727
-%define release     180930
+%define release     181001
 
 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 191c300a55..2866f56ab5 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.727
-%define release     180930
+%define release     181001
 
 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 80503843dc..155129ebb1 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="180930"
+PI_BUILD="181001"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index c45263ca7f..68f7962de6 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180930}
+{181001}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e15feb1e16..f327f6eed2 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.727(Build 180930)")
+#define PANDORA_VERSION ("7.0NG.727(Build 181001)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index bafae0b46a..a58170949b 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.727(Build 180930))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 181001))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b84ec25771..3538caa4bf 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-180930
+Version: 7.0NG.727-181001
 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 de3c3687ec..41b517b407 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.727-180930"
+pandora_version="7.0NG.727-181001"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 6b2ca4d5cc..100c12c8fd 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 = 'PC180930';
+$build_version = 'PC181001';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index be71742d89..95d08aa70f 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '180930';
+$build = '181001';
 			$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 bdb8a6da21..df6ce3ea1d 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.727
-%define release     180930
+%define release     181001
 
 # 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 7111fbdd4e..6883589ed0 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.727
-%define release     180930
+%define release     181001
 %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 69f8e5f444..a358046653 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-180930
+Version: 7.0NG.727-181001
 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 2dee9e07d9..169fab70c9 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.727-180930"
+pandora_version="7.0NG.727-181001"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 1865178985..19b3368a92 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "180930";
+my $pandora_build = "181001";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index dbba1a202d..b6b15791e3 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "180930";
+my $pandora_build = "181001";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 4513dd0b7d..ddba22818b 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.727
-%define release     180930
+%define release     181001
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index ba8df5cb19..1d3b5914c1 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.727
-%define release     180930
+%define release     181001
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 334047df18..3e8ac520b7 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="180930"
+PI_BUILD="181001"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 4b7cbc5f8d..c967ab9365 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS180930";
+my $version = "7.0NG.727 PS181001";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index e1693e9539..520a4e377d 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS180930";
+my $version = "7.0NG.727 PS181001";
 
 # save program name for logging
 my $progname = basename($0);

From b5ebd81b19dadbbfce2245d721f0cbfb0f116397 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 1 Oct 2018 15:24:29 +0200
Subject: [PATCH 50/79] fixed error values negative

---
 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 a71cb5eb19..45208c12b8 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -2240,7 +2240,6 @@ function pandoraFlotArea( graph_id, values, legend,
 	}
 
 	function yFormatter(v, axis) {
-		axis.datamin = 0;
 		if (short_data) {
 			var formatted = number_format(v, force_integer, "", short_data);
 		}

From 6b14754137018926074d7c846d9c3f47109145cc Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Mon, 1 Oct 2018 15:30:43 +0200
Subject: [PATCH 51/79] fixed conflict

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

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 4d07f2d9fc..3b85aff5f7 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -823,6 +823,26 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
 		else
 			return array ("", "", "", "", "", "", "");
 	}
+
+
+	if (defined('METACONSOLE')) {
+
+		$server = db_get_row ('tmetaconsole_setup', 'id', $alert['server_data']['id']);
+
+		if (metaconsole_connect($server) == NOERR) {
+
+			// Get agent data from node
+			$agente = db_get_row ('tagente', 'id_agente', $alert['id_agent']);
+
+			metaconsole_restore_db ();
+		}
+
+	} else {
+		// Get agent id
+		$id_agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
+		$agente = db_get_row ('tagente', 'id_agente', $id_agent);
+	}
+
 	$template = alerts_get_alert_template ($alert['id_alert_template']);
 	$description = io_safe_output($template['name']);
 	

From 1d726d59f3876c8e70da369788ad03f0c345f0e8 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Mon, 1 Oct 2018 15:34:36 +0200
Subject: [PATCH 52/79] fixed conflict

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

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 3b85aff5f7..08345e8300 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -824,7 +824,6 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
 			return array ("", "", "", "", "", "", "");
 	}
 
-
 	if (defined('METACONSOLE')) {
 
 		$server = db_get_row ('tmetaconsole_setup', 'id', $alert['server_data']['id']);

From e5e81e55d7892f62b460c5a1ac7b8956ba6cceaa Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Mon, 1 Oct 2018 17:58:29 +0200
Subject: [PATCH 53/79] edited css class ui-widget-content

---
 pandora_console/include/styles/jquery-ui-1.10.0.custom.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
index 2f7b9a2023..b2af3fd6e1 100644
--- a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
+++ b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
@@ -817,7 +817,7 @@ body .ui-tooltip {
 }
 .ui-widget-content {
 	border: 1px solid #aaaaaa;
-	background: #e8e8e8 url(images/ui-bg_flat_75_e8e8e8_40x100.png) 50% 50% repeat-x;
+	background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
 	color: #222222;
 }
 .ui-widget-content a {

From 1c2743797efe76f162920c548e4ecb3a8441eeca Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Mon, 1 Oct 2018 18:16:55 +0200
Subject: [PATCH 54/79] Revert "fixed conflict"

This reverts commit 1d726d59f3876c8e70da369788ad03f0c345f0e8.
---
 pandora_console/include/functions_ui.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 08345e8300..3b85aff5f7 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -824,6 +824,7 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
 			return array ("", "", "", "", "", "", "");
 	}
 
+
 	if (defined('METACONSOLE')) {
 
 		$server = db_get_row ('tmetaconsole_setup', 'id', $alert['server_data']['id']);

From 08a3aabdf274a45e99501061324747522211a475 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 2 Oct 2018 00:01:33 +0200
Subject: [PATCH 55/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 5b682cd793..06c82d22a8 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-181001
+Version: 7.0NG.727-181002
 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 0651f8af81..c06e727b88 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.727-181001"
+pandora_version="7.0NG.727-181002"
 
 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 8f86156cb3..b579355963 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '181001';
+use constant AGENT_BUILD => '181002';
 
 # 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 5c1495e65b..1d196e1b5e 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.727
-%define release     181001
+%define release     181002
 
 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 2866f56ab5..f68169180e 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.727
-%define release     181001
+%define release     181002
 
 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 155129ebb1..d77378f8ae 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181001"
+PI_BUILD="181002"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 68f7962de6..a15f4bb042 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{181001}
+{181002}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index f327f6eed2..cfa1b4eff8 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.727(Build 181001)")
+#define PANDORA_VERSION ("7.0NG.727(Build 181002)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index a58170949b..5e3aec980b 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.727(Build 181001))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 181002))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 3538caa4bf..ab15b92ebf 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-181001
+Version: 7.0NG.727-181002
 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 41b517b407..e2a97636ad 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.727-181001"
+pandora_version="7.0NG.727-181002"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 100c12c8fd..5e7b8565af 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 = 'PC181001';
+$build_version = 'PC181002';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 95d08aa70f..2acb6afd27 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '181001';
+$build = '181002';
 			$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 df6ce3ea1d..463037261c 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.727
-%define release     181001
+%define release     181002
 
 # 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 6883589ed0..839983b460 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.727
-%define release     181001
+%define release     181002
 %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 a358046653..5f2e147488 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-181001
+Version: 7.0NG.727-181002
 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 169fab70c9..9966491834 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.727-181001"
+pandora_version="7.0NG.727-181002"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 19b3368a92..d97c4549d1 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181001";
+my $pandora_build = "181002";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index b6b15791e3..5cacee1914 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181001";
+my $pandora_build = "181002";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index ddba22818b..97daa65c59 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.727
-%define release     181001
+%define release     181002
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 1d3b5914c1..177d6edfd8 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.727
-%define release     181001
+%define release     181002
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3e8ac520b7..7c434627ce 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181001"
+PI_BUILD="181002"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index c967ab9365..1fbfd8e04e 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS181001";
+my $version = "7.0NG.727 PS181002";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 520a4e377d..7e04fce4e0 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS181001";
+my $version = "7.0NG.727 PS181002";
 
 # save program name for logging
 my $progname = basename($0);

From f39788d8ef24505ab5e0955c124578657db713bd Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 3 Oct 2018 00:01:28 +0200
Subject: [PATCH 56/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 06c82d22a8..f52e63023d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-181002
+Version: 7.0NG.727-181003
 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 c06e727b88..22d28bbbec 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.727-181002"
+pandora_version="7.0NG.727-181003"
 
 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 b579355963..2e84d65a8a 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '181002';
+use constant AGENT_BUILD => '181003';
 
 # 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 1d196e1b5e..ae93f2df8d 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.727
-%define release     181002
+%define release     181003
 
 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 f68169180e..fca621b0ff 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.727
-%define release     181002
+%define release     181003
 
 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 d77378f8ae..927a6a6849 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181002"
+PI_BUILD="181003"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index a15f4bb042..eabe6fdd9d 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{181002}
+{181003}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index cfa1b4eff8..12d7f0c164 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.727(Build 181002)")
+#define PANDORA_VERSION ("7.0NG.727(Build 181003)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 5e3aec980b..1e2d5a1fa8 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.727(Build 181002))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 181003))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index ab15b92ebf..b1e1682506 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-181002
+Version: 7.0NG.727-181003
 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 e2a97636ad..a0422af014 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.727-181002"
+pandora_version="7.0NG.727-181003"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 5e7b8565af..811c46ca16 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 = 'PC181002';
+$build_version = 'PC181003';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 2acb6afd27..74f47dda3a 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '181002';
+$build = '181003';
 			$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 463037261c..ca5d6aaa2f 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.727
-%define release     181002
+%define release     181003
 
 # 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 839983b460..5fc2810403 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.727
-%define release     181002
+%define release     181003
 %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 5f2e147488..8da68b71c1 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-181002
+Version: 7.0NG.727-181003
 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 9966491834..566c871557 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.727-181002"
+pandora_version="7.0NG.727-181003"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d97c4549d1..7345922ac6 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181002";
+my $pandora_build = "181003";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 5cacee1914..e0838ce5ab 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181002";
+my $pandora_build = "181003";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 97daa65c59..14d01ab904 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.727
-%define release     181002
+%define release     181003
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 177d6edfd8..108fac7798 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.727
-%define release     181002
+%define release     181003
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7c434627ce..3029af7ac7 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181002"
+PI_BUILD="181003"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1fbfd8e04e..747cce8d49 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS181002";
+my $version = "7.0NG.727 PS181003";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7e04fce4e0..3aff68e75f 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS181002";
+my $version = "7.0NG.727 PS181003";
 
 # save program name for logging
 my $progname = basename($0);

From 7ac581ac1eb213654218de11bf973314c7a6e8fd Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 4 Oct 2018 00:01:27 +0200
Subject: [PATCH 57/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index f52e63023d..02b6d12656 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-181003
+Version: 7.0NG.727-181004
 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 22d28bbbec..ca8f594631 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.727-181003"
+pandora_version="7.0NG.727-181004"
 
 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 2e84d65a8a..43c53e0eb4 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '181003';
+use constant AGENT_BUILD => '181004';
 
 # 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 ae93f2df8d..be65970834 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.727
-%define release     181003
+%define release     181004
 
 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 fca621b0ff..5367b7f790 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.727
-%define release     181003
+%define release     181004
 
 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 927a6a6849..037b75441c 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181003"
+PI_BUILD="181004"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index eabe6fdd9d..dacbde09e2 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{181003}
+{181004}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 12d7f0c164..c9d373194f 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.727(Build 181003)")
+#define PANDORA_VERSION ("7.0NG.727(Build 181004)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 1e2d5a1fa8..b360ab8df8 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.727(Build 181003))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 181004))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b1e1682506..96cfbab704 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-181003
+Version: 7.0NG.727-181004
 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 a0422af014..e9910fa90c 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.727-181003"
+pandora_version="7.0NG.727-181004"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 811c46ca16..9dd4001b2d 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 = 'PC181003';
+$build_version = 'PC181004';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 74f47dda3a..5f76652488 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '181003';
+$build = '181004';
 			$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 ca5d6aaa2f..76de6beeda 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.727
-%define release     181003
+%define release     181004
 
 # 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 5fc2810403..e98bd67739 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.727
-%define release     181003
+%define release     181004
 %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 8da68b71c1..9b30658f78 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-181003
+Version: 7.0NG.727-181004
 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 566c871557..c856577aaf 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.727-181003"
+pandora_version="7.0NG.727-181004"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 7345922ac6..5963671ed3 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181003";
+my $pandora_build = "181004";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index e0838ce5ab..d6d75950f3 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181003";
+my $pandora_build = "181004";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 14d01ab904..6ceaa3aeeb 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.727
-%define release     181003
+%define release     181004
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 108fac7798..dd89b0393c 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.727
-%define release     181003
+%define release     181004
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3029af7ac7..849e1d11ac 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181003"
+PI_BUILD="181004"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 747cce8d49..7fe7539bde 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS181003";
+my $version = "7.0NG.727 PS181004";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 3aff68e75f..b75c3e1497 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS181003";
+my $version = "7.0NG.727 PS181004";
 
 # save program name for logging
 my $progname = basename($0);

From 6a19c2faecd7b24fe879a41295559f9e732a4100 Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Thu, 4 Oct 2018 11:09:03 +0200
Subject: [PATCH 58/79] =?UTF-8?q?A=C3=B1adida=20icono=20service=20map?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pandora_console/images/service_map.png | Bin 0 -> 440 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pandora_console/images/service_map.png

diff --git a/pandora_console/images/service_map.png b/pandora_console/images/service_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1ee8f42cbca6f26d0cbe00fcb7842045e2fd7ff
GIT binary patch
literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq000yK000yS1^@s7`i?D|0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzT1iAfRCwBAV88_!L4>`%eFKm>01!Yp
z)BvT=0|XE<rvZrnBMbaTVmkl?5CdKSQjMVsS%3+vD`A!#Ja~{1s@fkQfEclu4e~}k
zl<Npod;q7BI0FOSPv`*T1STX!2cY7ONNh(Sz5tYe&jJ-F1Y!Y@W+2`GGYF&zh&O^b
z00G26vKz6v734O&0f`MTF;D`q1r^cZh&2VEC8+<%$@D%{JQ0ZZBL%nvl<ffX%tC0O
zgTMozRgOs3I-)0h5SReO1yJ?@sEHu(0U*E_s0|p22vX#9j11suntBn41+WmI<^eRE
zK&jdQDJDJ;n`j+y7z{G3ADV}-C7J`cT(}=w_y8?J(TL`N{V>NNC)xE-Z#h6S=m%(m
z1Gy|8&C3g+^n5h&56F=c0C4~~y%$0aR)8uN0E!zT<%M{t97s(eR2)=N1Q5zpj!;eL
i$>spGY}(I2YXAUR{&xcrUY#WX0000<MNUMnLSTaMFP&Ea

literal 0
HcmV?d00001


From 530017a79d1e774dbd8e7f66409fb15ecb002db6 Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Thu, 4 Oct 2018 17:02:38 +0200
Subject: [PATCH 59/79] Eliminadas entidades html de vista de auditoria

---
 .../godmode/agentes/configurar_agente.php       | 17 +++++++++--------
 .../godmode/massive/massive_add_profiles.php    |  2 +-
 .../godmode/users/configure_user.php            |  6 +++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 3a208e1f7c..793db54308 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -929,8 +929,9 @@ if ($update_agent) { // if modified some agent paramenter
 
 			enterprise_hook ('update_agent', array ($id_agente));
 			ui_print_success_message (__('Successfully updated'));
+			$unsafe_alias = io_safe_output($alias);
 			db_pandora_audit("Agent management",
-				"Updated agent $alias", false, false, $info);
+				"Updated agent $unsafe_alias", false, false, $info);
 
 		}
 	}
@@ -1431,7 +1432,7 @@ if ($update_module) {
 		$edit_module = true;
 		
 		db_pandora_audit("Agent management",
-			"Fail to try update module '$name' for agent " . $agent["alias"]);
+			"Fail to try update module '".io_safe_output($name)."' for agent " . io_safe_output($agent["alias"]));
 	}
 	else {
 		if ($prediction_module == 3) {
@@ -1449,7 +1450,7 @@ if ($update_module) {
 		$agent = db_get_row ('tagente', 'id_agente', $id_agente);
 		
 		db_pandora_audit("Agent management",
-			"Updated module '$name' for agent ".$agent["alias"], false, false, io_json_mb_encode($values));
+			"Updated module '".io_safe_output($name)."' for agent ". io_safe_output($agent["alias"]), false, false, io_json_mb_encode($values));
 	}
 }
 
@@ -1590,7 +1591,7 @@ if ($create_module) {
 		$edit_module = true;
 		$moduletype = $id_module;
 		db_pandora_audit("Agent management",
-			"Fail to try added module '$name' for agent ".$agent["alias"]);
+			"Fail to try added module '".io_safe_output($name)."' for agent ".io_safe_output($agent["alias"]));
 	}
 	else {
 		if ($prediction_module == 3) {
@@ -1608,7 +1609,7 @@ if ($create_module) {
 		
 		$agent = db_get_row ('tagente', 'id_agente', $id_agente);
 		db_pandora_audit("Agent management",
-			"Added module '$name' for agent ".$agent["alias"], false, true, io_json_mb_encode($values));
+			"Added module '".io_safe_output($name)."' for agent ".io_safe_output($agent["alias"]), false, true, io_json_mb_encode($values));
 	}
 }
 
@@ -1731,7 +1732,7 @@ if ($delete_module) { // DELETE agent module !
 		
 		$agent = db_get_row ('tagente', 'id_agente', $id_agente);
 		db_pandora_audit("Agent management",
-			"Deleted module '".$module_data["nombre"]."' for agent ".$agent["alias"]);
+			"Deleted module '".io_safe_output($module_data["nombre"])."' for agent ".io_safe_output($agent["alias"]));
 	}
 
 
@@ -1764,11 +1765,11 @@ if (!empty($duplicate_module)) { // DUPLICATE agent module !
 	
 	if ($result) {
 		db_pandora_audit("Agent management",
-			"Duplicate module '".$id_duplicate_module."' for agent " . $agent["alias"] . " with the new id for clon " . $result);
+			"Duplicate module '".$id_duplicate_module."' for agent " . io_safe_output($agent["alias"]) . " with the new id for clon " . $result);
 	}
 	else {
 		db_pandora_audit("Agent management",
-			"Fail to try duplicate module '".$id_duplicate_module."' for agent " . $agent["alias"]);
+			"Fail to try duplicate module '".$id_duplicate_module."' for agent " . io_safe_output($agent["alias"]));
 	}
 }
 
diff --git a/pandora_console/godmode/massive/massive_add_profiles.php b/pandora_console/godmode/massive/massive_add_profiles.php
index 253992b7f5..559ffa6291 100644
--- a/pandora_console/godmode/massive/massive_add_profiles.php
+++ b/pandora_console/godmode/massive/massive_add_profiles.php
@@ -48,7 +48,7 @@ if ($create_profiles) {
 					// If the profile doesnt exist, we create it
 					if ($profile_data === false) {
 						db_pandora_audit("User management",
-							"Added profile for user ".io_safe_input($user));
+							"Added profile for user ".io_safe_output($user));
 						$return = profile_create_user_profile ($user, $profile, $group);
 						if ($return !== false) {
 							$n_added ++;
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index cd8c981c8e..6bc2e973e4 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -405,7 +405,7 @@ if ($update_user) {
 			}
 			
 			
-			db_pandora_audit("User management", "Updated user ".io_safe_input($id),
+			db_pandora_audit("User management", "Updated user ".io_safe_output($id),
 				false, false, $info);
 			
 			ui_print_result_message ($res1,
@@ -463,7 +463,7 @@ if ($add_profile) {
 	$tags = implode(',', $tags);
 
 	db_pandora_audit("User management",
-		"Added profile for user ".io_safe_input($id2), false, false, 'Profile: ' . $profile2 . ' Group: ' . $group2 . ' Tags: ' . $tags);
+		"Added profile for user ".io_safe_output($id2), false, false, 'Profile: ' . $profile2 . ' Group: ' . $group2 . ' Tags: ' . $tags);
 	$return = profile_create_user_profile($id2, $profile2, $group2, false, $tags, $no_hierarchy);
 	ui_print_result_message ($return,
 		__('Profile added successfully'),
@@ -479,7 +479,7 @@ if ($delete_profile) {
 	$perfil = db_get_row('tperfil', 'id_perfil', $id_perfil);
 	
 	db_pandora_audit("User management",
-		"Deleted profile for user ".io_safe_input($id2), false, false, 'The profile with id ' . $id_perfil . ' in the group ' . $perfilUser['id_grupo']);
+		"Deleted profile for user ".io_safe_output($id2), false, false, 'The profile with id ' . $id_perfil . ' in the group ' . $perfilUser['id_grupo']);
 	
 	$return = profile_delete_user_profile ($id2, $id_up);
 	ui_print_result_message ($return,

From b67eb9ae16884f59d10bfff4c4790e201a59f648 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 4 Oct 2018 17:30:48 +0200
Subject: [PATCH 60/79] PluginTools Added global alerts to parse_arguments

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

diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index d6d75950f3..8399622571 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -1164,6 +1164,10 @@ sub parse_arguments {
 		my $key = trim($args[$i]);
 
 		$key =~  s/^-//;
+		if ($key =~ /^\s*global_alerts/){
+			push (@{$data{global_alerts}}, trim($args[$i+1]));
+			next;
+		}
 		$data{$key} = trim($args[$i+1]);
 	}
 

From ec8d36f8eb6ee9d4832f1d23ba967153df04f3b9 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 5 Oct 2018 00:01:30 +0200
Subject: [PATCH 61/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 02b6d12656..34b85a05ef 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-181004
+Version: 7.0NG.727-181005
 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 ca8f594631..bebd8fe842 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.727-181004"
+pandora_version="7.0NG.727-181005"
 
 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 43c53e0eb4..163c14fadf 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '181004';
+use constant AGENT_BUILD => '181005';
 
 # 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 be65970834..f263212491 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.727
-%define release     181004
+%define release     181005
 
 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 5367b7f790..996a048fca 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.727
-%define release     181004
+%define release     181005
 
 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 037b75441c..de74f66f97 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181004"
+PI_BUILD="181005"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index dacbde09e2..d19b125e48 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{181004}
+{181005}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index c9d373194f..22785c96a8 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.727(Build 181004)")
+#define PANDORA_VERSION ("7.0NG.727(Build 181005)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index b360ab8df8..f724bdf250 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.727(Build 181004))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 181005))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 96cfbab704..34212e1436 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-181004
+Version: 7.0NG.727-181005
 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 e9910fa90c..86eb643ae1 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.727-181004"
+pandora_version="7.0NG.727-181005"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 9dd4001b2d..61b08674e0 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 = 'PC181004';
+$build_version = 'PC181005';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 5f76652488..e572c1930a 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '181004';
+$build = '181005';
 			$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 76de6beeda..c1a001b28a 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.727
-%define release     181004
+%define release     181005
 
 # 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 e98bd67739..68297751eb 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.727
-%define release     181004
+%define release     181005
 %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 9b30658f78..a74ba7cb22 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-181004
+Version: 7.0NG.727-181005
 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 c856577aaf..d91623ac0c 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.727-181004"
+pandora_version="7.0NG.727-181005"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 5963671ed3..08f12a0997 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181004";
+my $pandora_build = "181005";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 8399622571..4f9f0a2ee7 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181004";
+my $pandora_build = "181005";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 6ceaa3aeeb..53eed00785 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.727
-%define release     181004
+%define release     181005
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index dd89b0393c..d7e99c9958 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.727
-%define release     181004
+%define release     181005
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 849e1d11ac..092d556dfa 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181004"
+PI_BUILD="181005"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 7fe7539bde..5ef1c7fbd9 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS181004";
+my $version = "7.0NG.727 PS181005";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index b75c3e1497..389d6f188d 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS181004";
+my $version = "7.0NG.727 PS181005";
 
 # save program name for logging
 my $progname = basename($0);

From a59ecc7ef3b18390343e20f1a234941e317dc636 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 5 Oct 2018 11:55:06 +0200
Subject: [PATCH 62/79] fixed minor error counters alert fired in module_group
 view

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

diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index c617d6425e..b7eca3b3e9 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -117,6 +117,7 @@ $sql =
 			FROM tagente_modulo tam
 			LEFT JOIN talert_template_modules tatm
 				ON tatm.id_agent_module = tam.id_agente_modulo
+				AND tatm.times_fired = 1
 			LEFT JOIN tagente_estado tae
 				ON tae.id_agente_modulo = tam.id_agente_modulo
 			INNER JOIN tagente ta
@@ -135,6 +136,7 @@ $sql =
 			FROM tagente_modulo tam
 			LEFT JOIN talert_template_modules tatm
 				ON tatm.id_agent_module = tam.id_agente_modulo
+				AND tatm.times_fired = 1
 			LEFT JOIN tagente_estado tae
 				ON tae.id_agente_modulo = tam.id_agente_modulo
 			INNER JOIN tagente ta

From c1af14b90e151f2318fba4af2eb478e540c04482 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Fri, 5 Oct 2018 12:25:15 +0200
Subject: [PATCH 63/79] Change tlayou name table to varchar 600 - #2823

---
 pandora_console/extras/mr/21.sql                              | 1 +
 pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 1 +
 pandora_console/pandoradb.sql                                 | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pandora_console/extras/mr/21.sql b/pandora_console/extras/mr/21.sql
index e2144016ce..4a2bbc1b59 100644
--- a/pandora_console/extras/mr/21.sql
+++ b/pandora_console/extras/mr/21.sql
@@ -1,5 +1,6 @@
 START TRANSACTION;
 
 ALTER TABLE tlayout_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0';
+ALTER TABLE tlayout MODIFY `name` varchar(600) NOT NULL;
 
 COMMIT;
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 ea21ccab03..5e78b650b4 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
@@ -1279,6 +1279,7 @@ ALTER TABLE `tservice` ADD COLUMN `evaluate_sla` int(1) NOT NULL default 0;
 -- ---------------------------------------------------------------------
 ALTER TABLE tlayout ADD `background_color` varchar(50) NOT NULL default '#FFF';
 ALTER TABLE tlayout ADD `is_favourite` int(1) NOT NULL DEFAULT 0;
+ALTER TABLE tlayout MODIFY `name` varchar(600) NOT NULL;
 
 UPDATE tlayout SET is_favourite = 1 WHERE name REGEXP '^&#40;' OR name REGEXP '^\\[';
 
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 542ef719a9..dbdd002a8f 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1351,7 +1351,7 @@ CREATE TABLE IF NOT EXISTS `treport_custom_sql` (
 -- ---------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tlayout` (
 	`id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
-	`name` varchar(50)  NOT NULL,
+	`name` varchar(600)  NOT NULL,
 	`id_group` INTEGER UNSIGNED NOT NULL,
 	`background` varchar(200)  NOT NULL,
 	`height` INTEGER UNSIGNED NOT NULL default 0,

From c0dd2bcab6ac7e3bcddb56f5757f24aef31d560b Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Fri, 5 Oct 2018 12:57:25 +0200
Subject: [PATCH 64/79] Add status data to get_all_agents API response - #2881

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

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index e66fb3dcaf..e0785419cf 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1747,6 +1747,10 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType) {
 		$result_agents = $all_agents;
 	}
 	
+	foreach ($result_agents as $key => $value) {
+		$result_agents[$key]['status'] = agents_get_status($agent['id_agente'], true);
+	}
+	
 	if (count($result_agents) > 0 and $result_agents !== false) {
 		$data = array('type' => 'array', 'data' => $result_agents);
 		returnData($returnType, $data, $separator);

From a40057b3ffaee38fea61da827adca362c4b750e7 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 6 Oct 2018 00:01:29 +0200
Subject: [PATCH 65/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 34b85a05ef..5276a3e05e 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-181005
+Version: 7.0NG.727-181006
 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 bebd8fe842..98cdbfaa07 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.727-181005"
+pandora_version="7.0NG.727-181006"
 
 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 163c14fadf..5005a44981 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '181005';
+use constant AGENT_BUILD => '181006';
 
 # 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 f263212491..ab899936a4 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.727
-%define release     181005
+%define release     181006
 
 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 996a048fca..d3df48de4b 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.727
-%define release     181005
+%define release     181006
 
 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 de74f66f97..8ca864216a 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181005"
+PI_BUILD="181006"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index d19b125e48..86046bb2a5 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{181005}
+{181006}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 22785c96a8..0fce0820c0 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.727(Build 181005)")
+#define PANDORA_VERSION ("7.0NG.727(Build 181006)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index f724bdf250..3ac13f977c 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.727(Build 181005))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 181006))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 34212e1436..de0f5b8717 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-181005
+Version: 7.0NG.727-181006
 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 86eb643ae1..33ef18c6f6 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.727-181005"
+pandora_version="7.0NG.727-181006"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 61b08674e0..6c8b780215 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 = 'PC181005';
+$build_version = 'PC181006';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index e572c1930a..d2aa829fe3 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '181005';
+$build = '181006';
 			$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 c1a001b28a..c9820ec45c 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.727
-%define release     181005
+%define release     181006
 
 # 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 68297751eb..603b666ffb 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.727
-%define release     181005
+%define release     181006
 %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 a74ba7cb22..e193c7eaa5 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-181005
+Version: 7.0NG.727-181006
 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 d91623ac0c..da87404391 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.727-181005"
+pandora_version="7.0NG.727-181006"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 08f12a0997..65c5f2345c 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181005";
+my $pandora_build = "181006";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 4f9f0a2ee7..828ae69c22 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181005";
+my $pandora_build = "181006";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 53eed00785..7b687b9fe8 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.727
-%define release     181005
+%define release     181006
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index d7e99c9958..2d562ed9e8 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.727
-%define release     181005
+%define release     181006
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 092d556dfa..fd19f04c20 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181005"
+PI_BUILD="181006"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 5ef1c7fbd9..eb1e1df1a6 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS181005";
+my $version = "7.0NG.727 PS181006";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 389d6f188d..437f595fec 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS181005";
+my $version = "7.0NG.727 PS181006";
 
 # save program name for logging
 my $progname = basename($0);

From 5171ef79b02aea5f09dd26980d9900e41b5ce3fe Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 7 Oct 2018 00:01:23 +0200
Subject: [PATCH 66/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 5276a3e05e..3e60c66756 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-181006
+Version: 7.0NG.727-181007
 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 98cdbfaa07..a8e31ba18a 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.727-181006"
+pandora_version="7.0NG.727-181007"
 
 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 5005a44981..efa7899d1e 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '181006';
+use constant AGENT_BUILD => '181007';
 
 # 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 ab899936a4..ebe793f95d 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.727
-%define release     181006
+%define release     181007
 
 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 d3df48de4b..ec6b47eda9 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.727
-%define release     181006
+%define release     181007
 
 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 8ca864216a..c396d7a8af 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181006"
+PI_BUILD="181007"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 86046bb2a5..e27ac73a2b 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{181006}
+{181007}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 0fce0820c0..74d603b100 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.727(Build 181006)")
+#define PANDORA_VERSION ("7.0NG.727(Build 181007)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3ac13f977c..cc345fdb98 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.727(Build 181006))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 181007))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index de0f5b8717..8c18bc6db4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-181006
+Version: 7.0NG.727-181007
 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 33ef18c6f6..25f705d86a 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.727-181006"
+pandora_version="7.0NG.727-181007"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 6c8b780215..03c2282aaa 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 = 'PC181006';
+$build_version = 'PC181007';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index d2aa829fe3..4cd29fb085 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '181006';
+$build = '181007';
 			$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 c9820ec45c..5410b2241e 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.727
-%define release     181006
+%define release     181007
 
 # 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 603b666ffb..4cfa17aef7 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.727
-%define release     181006
+%define release     181007
 %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 e193c7eaa5..85d9f0c360 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-181006
+Version: 7.0NG.727-181007
 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 da87404391..bb5542a66d 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.727-181006"
+pandora_version="7.0NG.727-181007"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 65c5f2345c..20107af601 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181006";
+my $pandora_build = "181007";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 828ae69c22..c458ee32ff 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181006";
+my $pandora_build = "181007";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 7b687b9fe8..15a3f9c261 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.727
-%define release     181006
+%define release     181007
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 2d562ed9e8..7c0070f050 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.727
-%define release     181006
+%define release     181007
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index fd19f04c20..f155e34671 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181006"
+PI_BUILD="181007"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index eb1e1df1a6..84e8437b6e 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS181006";
+my $version = "7.0NG.727 PS181007";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 437f595fec..eb6653c191 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS181006";
+my $version = "7.0NG.727 PS181007";
 
 # save program name for logging
 my $progname = basename($0);

From 76da7384b66315c7f0387d603e384409c42155fa Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 8 Oct 2018 00:01:23 +0200
Subject: [PATCH 67/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 3e60c66756..e0e2a330ee 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-181007
+Version: 7.0NG.727-181008
 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 a8e31ba18a..4b77ab0491 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.727-181007"
+pandora_version="7.0NG.727-181008"
 
 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 efa7899d1e..c37cd09c99 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '181007';
+use constant AGENT_BUILD => '181008';
 
 # 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 ebe793f95d..948b4b4c5e 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.727
-%define release     181007
+%define release     181008
 
 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 ec6b47eda9..f15b7fcfc7 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.727
-%define release     181007
+%define release     181008
 
 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 c396d7a8af..cd04791a6a 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181007"
+PI_BUILD="181008"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index e27ac73a2b..3f728baf07 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{181007}
+{181008}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 74d603b100..b615863c6a 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.727(Build 181007)")
+#define PANDORA_VERSION ("7.0NG.727(Build 181008)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index cc345fdb98..e3e74fb005 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.727(Build 181007))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 181008))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 8c18bc6db4..684ffcfeac 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-181007
+Version: 7.0NG.727-181008
 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 25f705d86a..b6bbf057cd 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.727-181007"
+pandora_version="7.0NG.727-181008"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 03c2282aaa..26e6646f8e 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 = 'PC181007';
+$build_version = 'PC181008';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 4cd29fb085..3136bf7750 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '181007';
+$build = '181008';
 			$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 5410b2241e..9d2449af95 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.727
-%define release     181007
+%define release     181008
 
 # 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 4cfa17aef7..376dc088e4 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.727
-%define release     181007
+%define release     181008
 %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 85d9f0c360..00920d8616 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-181007
+Version: 7.0NG.727-181008
 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 bb5542a66d..c78af736d8 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.727-181007"
+pandora_version="7.0NG.727-181008"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 20107af601..471a51f137 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181007";
+my $pandora_build = "181008";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index c458ee32ff..affc18bc97 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181007";
+my $pandora_build = "181008";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 15a3f9c261..4c7b239b0f 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.727
-%define release     181007
+%define release     181008
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7c0070f050..384e5cae6e 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.727
-%define release     181007
+%define release     181008
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index f155e34671..130d78a057 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181007"
+PI_BUILD="181008"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 84e8437b6e..d5613dcfda 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS181007";
+my $version = "7.0NG.727 PS181008";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index eb6653c191..ea13849287 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS181007";
+my $version = "7.0NG.727 PS181008";
 
 # save program name for logging
 my $progname = basename($0);

From f7700874a500d553f139a9355dd8c69e934e6780 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 8 Oct 2018 16:45:44 +0200
Subject: [PATCH 68/79] api function api_get_all_agents for meta - #2881

---
 pandora_console/include/functions_api.php | 24 +++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index e0785419cf..dcdadabc24 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1620,10 +1620,6 @@ function api_set_delete_agent($id, $thrash1, $thrast2, $thrash3) {
 function api_get_all_agents($thrash1, $thrash2, $other, $returnType) {
 	global $config;
 
-	if (defined ('METACONSOLE')) {
-		return;
-	}
-
 	// Error if user cannot read agents.
 	if (!check_acl($config['id_user'], 0, "AR")) {
 		returnError('forbidden', $returnType);
@@ -1672,13 +1668,25 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType) {
 	// Initialization of array
 	$result_agents = array();
 	// Filter by state
-	$sql = "SELECT id_agente, alias, direccion, comentarios,
+	
+	if (defined ('METACONSOLE')) {
+		$sql = "SELECT id_agente, alias, direccion, comentarios,
 			tconfig_os.name, url_address, nombre
-		FROM tconfig_os, tagente
+		FROM tconfig_os, tmetaconsole_agent
 		LEFT JOIN tagent_secondary_group
-			ON tagente.id_agente = tagent_secondary_group.id_agent
-		WHERE tagente.id_os = tconfig_os.id_os
+			ON tmetaconsole_agent.id_agente = tagent_secondary_group.id_agent
+		WHERE tmetaconsole_agent.id_os = tconfig_os.id_os
 			AND disabled = 0 $where AND $groups";
+	}
+	else{
+		$sql = "SELECT id_agente, alias, direccion, comentarios,
+				tconfig_os.name, url_address, nombre
+			FROM tconfig_os, tagente
+			LEFT JOIN tagent_secondary_group
+				ON tagente.id_agente = tagent_secondary_group.id_agent
+			WHERE tagente.id_os = tconfig_os.id_os
+				AND disabled = 0 $where AND $groups";
+	}
 
 	$all_agents = db_get_all_rows_sql($sql);
 

From 61a82337c3f7e4db8c333b5f7f61750b80f5d71b Mon Sep 17 00:00:00 2001
From: samucarc <samuel.carcases>
Date: Mon, 8 Oct 2018 17:57:05 +0200
Subject: [PATCH 69/79] Fixed error in agents bulk operations

---
 pandora_console/include/functions_agents.php  | 69 ++++++++++++-------
 .../operation/agentes/ver_agente.php          | 27 ++++++--
 2 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 426a5c2e6b..2bb0959b7e 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -336,32 +336,39 @@ function agents_get_agents ($filter = false, $fields = false,
 	if (isset($filter['status'])) {
 		switch ($filter['status']) {
 			case AGENT_STATUS_NORMAL:
-				$status_sql =
-					"normal_count = total_count 
-						AND notinit_count <> total_count";
+				$status_sql = "(
+					critical_count = 0
+					AND warning_count = 0
+					AND unknown_count = 0 
+					AND normal_count > 0)";
 				break;
 			case AGENT_STATUS_WARNING:
-				$status_sql =
-					"critical_count = 0 AND warning_count > 0";
+				$status_sql = "(
+					critical_count = 0 
+					AND warning_count > 0
+					AND total_count > 0)";
 				break;
 			case AGENT_STATUS_CRITICAL:
-				$status_sql =
-					"critical_count > 0";
+				$status_sql = "critical_count > 0";
 				break;
 			case AGENT_STATUS_UNKNOWN:
-				$status_sql =
-					"critical_count = 0 AND warning_count = 0
-						AND unknown_count > 0";
+				$status_sql = "(
+					critical_count = 0 
+					AND warning_count = 0 
+					AND unknown_count > 0)";
 				break;
 			case AGENT_STATUS_NOT_NORMAL:
-				$status_sql =
-					"(
-						normal_count <> total_count
-						AND
-						(normal_count + notinit_count) <> total_count)";
+				$status_sql = "(
+					critical_count > 0
+					OR warning_count > 0
+					OR unknown_count > 0
+					OR total_count = 0
+					OR total_count = notinit_count)";
 				break;
 			case AGENT_STATUS_NOT_INIT:
-				$status_sql = "notinit_count = total_count";
+				$status_sql = "(
+					total_count = 0
+					OR total_count = notinit_count)";
 				break;
 		}
 		unset($filter['status']);
@@ -915,23 +922,39 @@ function agents_get_group_agents (
 		if (isset($search['status'])) {
 			switch ($search['status']) {
 				case AGENT_STATUS_NORMAL:
-					$filter[] = "(normal_count = total_count AND notinit_count <> total_count)";
+					$filter[] = "(
+						critical_count = 0
+						AND warning_count = 0
+						AND unknown_count = 0 
+						AND normal_count > 0)";
 					break;
 				case AGENT_STATUS_WARNING:
-					$filter[] = "(critical_count = 0 AND warning_count > 0)";
+					$filter[] = "(
+						critical_count = 0 
+						AND warning_count > 0
+						AND total_count > 0)";
 					break;
 				case AGENT_STATUS_CRITICAL:
 					$filter[] = "critical_count > 0";
 					break;
 				case AGENT_STATUS_UNKNOWN:
-					$filter[] = "(critical_count = 0 AND warning_count = 0 AND unknown_count > 0)";
+					$filter[] = "(
+						critical_count = 0 
+						AND warning_count = 0 
+						AND unknown_count > 0)";
 					break;
 				case AGENT_STATUS_NOT_NORMAL:
-					$filter[] = "normal_count <> total_count
-							AND critical_count = 0 AND warning_count = 0";
+					$filter[] = "(
+						critical_count > 0
+						OR warning_count > 0
+						OR unknown_count > 0
+						OR total_count = 0
+						OR total_count = notinit_count)";
 					break;
 				case AGENT_STATUS_NOT_INIT:
-					$filter[] = "notinit_count = total_count";
+					$filter[] = "(
+						total_count = 0
+						OR total_count = notinit_count)";
 					break;
 			}
 			unset($search['status']);
@@ -2762,7 +2785,7 @@ function agents_get_status_clause($state, $show_not_init = true) {
 			)";
 		case AGENT_STATUS_NOT_INIT:
 			return $show_not_init
-				? "(ta.total_count = ta.notinit_count)"
+				? "(ta.total_count = ta.notinit_count OR ta.total_count = 0)"
 				: "1=0";
 		case AGENT_STATUS_NORMAL:
 			return "(
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 49011d540d..444b72fbbe 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -85,22 +85,39 @@ if (is_ajax ()) {
 		
 		switch ($status_agents) {
 			case AGENT_STATUS_NORMAL:
-				$filter[] = "(normal_count = total_count)";
+			$filter[] = "(
+				critical_count = 0
+				AND warning_count = 0
+				AND unknown_count = 0 
+				AND normal_count > 0)";
 				break;
 			case AGENT_STATUS_WARNING:
-				$filter[] = "(critical_count = 0 AND warning_count > 0)";
+			$filter[] = "(
+				critical_count = 0 
+				AND warning_count > 0
+				AND total_count > 0)";
 				break;
 			case AGENT_STATUS_CRITICAL:
 				$filter[] = "(critical_count > 0)";
 				break;
 			case AGENT_STATUS_UNKNOWN:
-				$filter[] = "(critical_count = 0 AND warning_count = 0 AND unknown_count > 0)";
+			$filter[] = "(
+				critical_count = 0 
+				AND warning_count = 0 
+				AND unknown_count > 0)";
 				break;
 			case AGENT_STATUS_NOT_NORMAL:
-				$filter[] = "(normal_count <> total_count)";
+			$filter[] = "(
+				critical_count > 0
+				OR warning_count > 0
+				OR unknown_count > 0
+				OR total_count = 0
+				OR total_count = notinit_count)";
 				break;
 			case AGENT_STATUS_NOT_INIT:
-				$filter[] = "(notinit_count = total_count)";
+			$filter[] = "(
+				total_count = 0
+				OR total_count = notinit_count)";
 				break;
 		}
 		$filter['order'] = "alias ASC";

From 51c4fbece26414cf5a21b38c19e96f41bcda9476 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 9 Oct 2018 00:01:25 +0200
Subject: [PATCH 70/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index e0e2a330ee..7a91515c83 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-181008
+Version: 7.0NG.727-181009
 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 4b77ab0491..7790b2dcd8 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.727-181008"
+pandora_version="7.0NG.727-181009"
 
 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 c37cd09c99..95e8eefa32 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '181008';
+use constant AGENT_BUILD => '181009';
 
 # 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 948b4b4c5e..97718c59fc 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.727
-%define release     181008
+%define release     181009
 
 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 f15b7fcfc7..5f5c810231 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.727
-%define release     181008
+%define release     181009
 
 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 cd04791a6a..b0d91c3c0a 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181008"
+PI_BUILD="181009"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 3f728baf07..35c2dcf697 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{181008}
+{181009}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index b615863c6a..4402410546 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.727(Build 181008)")
+#define PANDORA_VERSION ("7.0NG.727(Build 181009)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index e3e74fb005..bafb4e075a 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.727(Build 181008))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 181009))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 684ffcfeac..950446879c 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-181008
+Version: 7.0NG.727-181009
 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 b6bbf057cd..23ec223ecf 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.727-181008"
+pandora_version="7.0NG.727-181009"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 26e6646f8e..b5504e715e 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 = 'PC181008';
+$build_version = 'PC181009';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 3136bf7750..512ddc50c2 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '181008';
+$build = '181009';
 			$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 9d2449af95..74744ac6d6 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.727
-%define release     181008
+%define release     181009
 
 # 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 376dc088e4..4aa50fcb2e 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.727
-%define release     181008
+%define release     181009
 %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 00920d8616..241ba36d74 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-181008
+Version: 7.0NG.727-181009
 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 c78af736d8..e414b839d5 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.727-181008"
+pandora_version="7.0NG.727-181009"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 471a51f137..130c402c99 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181008";
+my $pandora_build = "181009";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index affc18bc97..2f7cfa358e 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181008";
+my $pandora_build = "181009";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 4c7b239b0f..d0ab27ec2e 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.727
-%define release     181008
+%define release     181009
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 384e5cae6e..c77269064f 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.727
-%define release     181008
+%define release     181009
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 130d78a057..8711598625 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181008"
+PI_BUILD="181009"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d5613dcfda..577cb6a436 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS181008";
+my $version = "7.0NG.727 PS181009";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index ea13849287..37fc2069eb 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS181008";
+my $version = "7.0NG.727 PS181009";
 
 # save program name for logging
 my $progname = basename($0);

From eeba7b93509380d3ca25e0d512d9f26bd840169a Mon Sep 17 00:00:00 2001
From: "tatiana.llorente@artica.es" <tatiana.llorente@artica.es>
Date: Tue, 9 Oct 2018 09:58:28 +0200
Subject: [PATCH 71/79] Added two missing parameters in the url - #2884

---
 pandora_console/operation/events/events.build_table.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php
index dd59514045..6b5b1a033b 100644
--- a/pandora_console/operation/events/events.build_table.php
+++ b/pandora_console/operation/events/events.build_table.php
@@ -40,11 +40,13 @@ $params = array (
 
 	// Events query params
 	"search" => io_safe_input($search),
+	"event_type" => $event_type,
 	"severity" => $severity,
 	"status" => $status,
 	"id_group" => $id_group,
 	"recursion" => $recursion,
 	"refr" => (int)get_parameter("refr", 0),
+	"id_agent" => $id_agent,
 	"id_agent_module" => $id_agent_module,
 	"pagination" => $pagination,
 	"group_rep" => $group_rep,

From fd13e3325949dc7b0bda9ae2724849555e316c94 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 9 Oct 2018 10:51:03 +0200
Subject: [PATCH 72/79] fixed minor error input max-length in plugin network
 component

---
 .../godmode/agentes/module_manager_editor_plugin.php        | 6 +++---
 .../modules/manage_network_components_form_plugin.php       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index e79853b30a..a5085122d0 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -71,7 +71,7 @@ push_table_simple ($data, 'plugin_1');
 $data = array ();
 $data[0] = 'macro_desc';
 $data[0] .= ui_print_help_tip ('macro_help', true);
-$data[1] = html_print_input_text ('macro_name', 'macro_value', '', 100, 255, true);
+$data[1] = html_print_input_text ('macro_name', 'macro_value', '', 100, 1024, true);
 $table_simple->colspan['macro_field'][1] = 3;
 $table_simple->rowstyle['macro_field'] = 'display:none';
 
@@ -93,10 +93,10 @@ if (!empty($macros)) {
 			$m_hide = $m['hide'];
 		
 		if ($m_hide) {
-			$data[1] = html_print_input_password($m['macro'], io_output_password($m['value']), '', 100, 255, true);
+			$data[1] = html_print_input_password($m['macro'], io_output_password($m['value']), '', 100, 1024, true);
 		}
 		else {
-			$data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 255, true,
+			$data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 1024, true,
 				$disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy);
 		}
 		$table_simple->colspan['macro'.$m['macro']][1] = 3;
diff --git a/pandora_console/godmode/modules/manage_network_components_form_plugin.php b/pandora_console/godmode/modules/manage_network_components_form_plugin.php
index a037e578e6..4b10cdaaea 100755
--- a/pandora_console/godmode/modules/manage_network_components_form_plugin.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_plugin.php
@@ -34,7 +34,7 @@ push_table_row ($data, 'plugin_1');
 $data = array ();
 $data[0] = 'macro_desc';
 $data[0] .= ui_print_help_tip ('macro_help', true);
-$data[1] = html_print_input_text ('macro_name', 'macro_value', '', 100, 255, true);
+$data[1] = html_print_input_text ('macro_name', 'macro_value', '', 100, 1024, true);
 $table->colspan['macro_field'][1] = 3;
 $table->rowstyle['macro_field'] = 'display:none';
 
@@ -51,9 +51,9 @@ if (!empty($macros)) {
 			$data[0] .= ui_print_help_tip ($m['help'], true);
 		}
 		if ($m['hide'] == 1) {
-			$data[1] = html_print_input_text($m['macro'], $m['value'], '', 15, 60, true);
+			$data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 1024, true);
 		} else {
-			$data[1] = html_print_input_text($m['macro'], io_output_password($m['value']), '', 15, 60, true);
+			$data[1] = html_print_input_text($m['macro'], io_output_password($m['value']), '', 100, 1024, true);
 		}
 		$table->colspan['macro'.$m['macro']][1] = 3;
 		$table->rowclass['macro'.$m['macro']] = 'macro_field';

From d8dc73f5b763e44c498d5adfa3bfd23b94809018 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Tue, 9 Oct 2018 15:38:44 +0200
Subject: [PATCH 73/79] Add perl-Crypt-Blowfish to the docker image for the
 Satellite Server.

---
 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 1da3accf48..8b0533d25c 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 perl-Test-WWW-Selenium perl-Crypt-ECB perl-Net-OpenSSH
+RUN yum install -y fping perl-Test-WWW-Selenium perl-Crypt-Blowfish perl-Crypt-ECB perl-Net-OpenSSH
 
 RUN ln -s /usr/bin/braa /usr/local/bin/braa
 

From 9b7ae31344eed5a166435ee23af77fc2ec106e06 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 9 Oct 2018 16:09:44 +0200
Subject: [PATCH 74/79] MR change

---
 pandora_console/extras/mr/21.sql | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pandora_console/extras/mr/21.sql b/pandora_console/extras/mr/21.sql
index 4a2bbc1b59..5736ef86fb 100644
--- a/pandora_console/extras/mr/21.sql
+++ b/pandora_console/extras/mr/21.sql
@@ -3,4 +3,11 @@ START TRANSACTION;
 ALTER TABLE tlayout_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0';
 ALTER TABLE tlayout MODIFY `name` varchar(600) NOT NULL;
 
+ALTER TABLE tmetaconsole_setup
+ ADD COLUMN `meta_dbuser` text,
+ ADD COLUMN `meta_dbpass` text,
+ ADD COLUMN `meta_dbhost` text,
+ ADD COLUMN `meta_dbport` text,
+ ADD COLUMN `meta_dbname` text;
+
 COMMIT;

From 20837333290fd3401620dcddc9a2e2eb510220c6 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 9 Oct 2018 16:33:07 +0200
Subject: [PATCH 75/79] Fix id for agent status - #2881

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

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index dcdadabc24..44814b6671 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1756,12 +1756,12 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType) {
 	}
 	
 	foreach ($result_agents as $key => $value) {
-		$result_agents[$key]['status'] = agents_get_status($agent['id_agente'], true);
+		$result_agents[$key]['status'] = agents_get_status($result_agents[$key]['id_agente'], true);
 	}
 	
 	if (count($result_agents) > 0 and $result_agents !== false) {
 		$data = array('type' => 'array', 'data' => $result_agents);
-		returnData($returnType, $data, $separator);
+		return json_encode($data['data']);
 	}
 	else {
 		returnError('error_all_agents', 'No agents retrieved.');

From 3d6451d64b8416b5610b5b309989138cb27a3147 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 9 Oct 2018 20:03:49 +0200
Subject: [PATCH 76/79] Fix returnData - #2881

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

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 44814b6671..b71306456e 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1755,13 +1755,21 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType) {
 		$result_agents = $all_agents;
 	}
 	
+	if (empty($returnType)) {
+		$returnType = "string";
+	}
+	
+	if (empty($separator)) {
+		$separator = ";";
+	}
+	
 	foreach ($result_agents as $key => $value) {
 		$result_agents[$key]['status'] = agents_get_status($result_agents[$key]['id_agente'], true);
 	}
 	
 	if (count($result_agents) > 0 and $result_agents !== false) {
 		$data = array('type' => 'array', 'data' => $result_agents);
-		return json_encode($data['data']);
+		returnData($returnType, $data, $separator);
 	}
 	else {
 		returnError('error_all_agents', 'No agents retrieved.');

From 1694fccd8390c797d38d6376d363e15b59f605ab Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 10 Oct 2018 00:01:47 +0200
Subject: [PATCH 77/79] 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/lib/PandoraFMS/PluginTools.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 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 7a91515c83..2785fcb150 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.727-181009
+Version: 7.0NG.727-181010
 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 7790b2dcd8..33335ae56b 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.727-181009"
+pandora_version="7.0NG.727-181010"
 
 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 95e8eefa32..7cf0c1e9a0 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.727';
-use constant AGENT_BUILD => '181009';
+use constant AGENT_BUILD => '181010';
 
 # 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 97718c59fc..e0f718e4ae 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.727
-%define release     181009
+%define release     181010
 
 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 5f5c810231..0c87f9e690 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.727
-%define release     181009
+%define release     181010
 
 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 b0d91c3c0a..b0ee6ccceb 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181009"
+PI_BUILD="181010"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 35c2dcf697..6ca4584dc3 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{181009}
+{181010}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 4402410546..3caa06fa7a 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.727(Build 181009)")
+#define PANDORA_VERSION ("7.0NG.727(Build 181010)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index bafb4e075a..0d6f00b0cb 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.727(Build 181009))"
+      VALUE "ProductVersion", "(7.0NG.727(Build 181010))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 950446879c..98acd458a4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.727-181009
+Version: 7.0NG.727-181010
 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 23ec223ecf..3ca2b46cf9 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.727-181009"
+pandora_version="7.0NG.727-181010"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index b5504e715e..42ecad8677 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 = 'PC181009';
+$build_version = 'PC181010';
 $pandora_version = 'v7.0NG.727';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 512ddc50c2..f7b85caf96 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.727';
-$build = '181009';
+$build = '181010';
 			$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 74744ac6d6..c64d671840 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.727
-%define release     181009
+%define release     181010
 
 # 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 4aa50fcb2e..380ceae1ec 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.727
-%define release     181009
+%define release     181010
 %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 241ba36d74..7988615950 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.727-181009
+Version: 7.0NG.727-181010
 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 e414b839d5..a61d59c379 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.727-181009"
+pandora_version="7.0NG.727-181010"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 130c402c99..5e82d43b41 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181009";
+my $pandora_build = "181010";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 2f7cfa358e..ec42a784a9 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.727";
-my $pandora_build = "181009";
+my $pandora_build = "181010";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index d0ab27ec2e..487f9b8188 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.727
-%define release     181009
+%define release     181010
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c77269064f..1e9c7505e1 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.727
-%define release     181009
+%define release     181010
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 8711598625..25041f3501 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.727"
-PI_BUILD="181009"
+PI_BUILD="181010"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 577cb6a436..3bb127f476 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.727 PS181009";
+my $version = "7.0NG.727 PS181010";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 37fc2069eb..606a3fcfc1 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.727 PS181009";
+my $version = "7.0NG.727 PS181010";
 
 # save program name for logging
 my $progname = basename($0);

From 42caddeadd9c8ec564d55c37aeb83e2658697fff Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 10 Oct 2018 14:32:43 +0200
Subject: [PATCH 78/79] Modified query to match MR requirements

---
 pandora_console/extras/mr/21.sql | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pandora_console/extras/mr/21.sql b/pandora_console/extras/mr/21.sql
index 5736ef86fb..8283aa56a3 100644
--- a/pandora_console/extras/mr/21.sql
+++ b/pandora_console/extras/mr/21.sql
@@ -3,11 +3,10 @@ START TRANSACTION;
 ALTER TABLE tlayout_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0';
 ALTER TABLE tlayout MODIFY `name` varchar(600) NOT NULL;
 
-ALTER TABLE tmetaconsole_setup
- ADD COLUMN `meta_dbuser` text,
- ADD COLUMN `meta_dbpass` text,
- ADD COLUMN `meta_dbhost` text,
- ADD COLUMN `meta_dbport` text,
- ADD COLUMN `meta_dbname` text;
+ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbuser` text;
+ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbpass` text;
+ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbhost` text;
+ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbport` text;
+ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbname` text;
 
 COMMIT;

From 299868cfd5e618e9d2d108c5dc67a0ba7d93857a Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 10 Oct 2018 14:35:09 +0200
Subject: [PATCH 79/79] meta_db* added to tmetaconsole_setup

---
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    | 19 ++++++++++-------
 pandora_console/pandoradb.sql                 | 21 ++++++++++++-------
 2 files changed, 25 insertions(+), 15 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 5e78b650b4..b6d3d6d580 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
@@ -341,13 +341,18 @@ CREATE TABLE IF NOT EXISTS `ttrap_custom_values` (
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tmetaconsole_setup` (
 	`id` int(10) NOT NULL auto_increment primary key,
-	`server_name` text default '',
-	`server_url` text default '',
-	`dbuser` text default '',
-	`dbpass` text default '',
-	`dbhost` text default '',
-	`dbport` text default '',
-	`dbname` text default '',
+	`server_name` text,
+	`server_url` text,
+	`dbuser` text,
+	`dbpass` text,
+	`dbhost` text,
+	`dbport` text,
+	`dbname` text,
+	`meta_dbuser` text,
+	`meta_dbpass` text,
+	`meta_dbhost` text,
+	`meta_dbport` text,
+	`meta_dbname` text,
 	`auth_token` text default '',
 	`id_group` int(10) unsigned NOT NULL default 0,
 	`api_password` text NOT NULL,
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index dbdd002a8f..86bf5b116d 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -2412,14 +2412,19 @@ CREATE TABLE IF NOT EXISTS `ttrap_custom_values` (
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tmetaconsole_setup` (
 	`id` int(10) NOT NULL auto_increment primary key,
-	`server_name` text default '',
-	`server_url` text default '',
-	`dbuser` text default '',
-	`dbpass` text default '',
-	`dbhost` text default '',
-	`dbport` text default '',
-	`dbname` text default '',
-	`auth_token` text default '',
+	`server_name` text,
+	`server_url` text,
+	`dbuser` text,
+	`dbpass` text,
+	`dbhost` text,
+	`dbport` text,
+	`dbname` text,
+	`meta_dbuser` text,
+	`meta_dbpass` text,
+	`meta_dbhost` text,
+	`meta_dbport` text,
+	`meta_dbname` text,
+	`auth_token` text,
 	`id_group` int(10) unsigned NOT NULL default 0,
 	`api_password` text NOT NULL,
 	`disabled` tinyint(1) unsigned NOT NULL default '0',