From a6209c15ca731a19d73922911635ca70668d7924 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 5 Apr 2017 17:44:24 +0200
Subject: [PATCH 01/15] Added event filter field to user in creation and
 edition

---
 pandora_console/godmode/users/configure_user.php | 13 ++++++++++++-
 pandora_console/pandoradb.sql                    |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 73b1f5ede0..d64a67e278 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -158,6 +158,7 @@ if ($create_user) {
 	$values['comments'] = (string) get_parameter ('comments');
 	$values['is_admin'] = (int) get_parameter ('is_admin', 0);
 	$values['language'] = get_parameter ('language', 'default');
+	$values['default_event_filter'] = (int) get_parameter('default_event_filter');
 	if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
 		$values['id_skin'] = (int) get_parameter ('skin', 0);
 	}
@@ -266,6 +267,7 @@ if ($update_user) {
 	$values['comments'] = (string) get_parameter ('comments');
 	$values['is_admin'] = get_parameter ('is_admin', 0 );
 	$values['language'] = (string) get_parameter ('language');
+	$values['default_event_filter'] = (int) get_parameter('default_event_filter');
 	if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
 		$values['id_skin'] = get_parameter ('skin', 0);
 	}
@@ -547,7 +549,16 @@ $table->data[14][1] = html_print_checkbox('strict_acl', 1, $user_info["strict_ac
 $table->data[15][0] = __('Session Time');
 $table->data[15][0] .= ui_print_help_tip(__('This is defined in minutes, If you wish a permanent session should putting -1 in this field.'), true);
 $table->data[15][1] = html_print_input_text ('session_time', $user_info["session_time"], '', 5, 5, true);
-	
+
+$event_filter_data = db_get_all_rows_sql('SELECT id_name, id_filter FROM tevent_filter');
+$event_filter = array();
+$event_filter[0] = __('None');
+foreach ($event_filter_data as $filter) {
+	$event_filter[$filter['id_filter']] = $filter['id_name'];
+}
+$table->data[16][0] = __('Default event filter');
+$table->data[16][1] = html_print_select ($event_filter, 'default_event_filter', $user_info["default_event_filter"], '','', __('None'), true, false, false);
+
 if($meta) {
 	enterprise_include('include/functions_metaconsole.php');
 	$data = array();
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 2a1bded331..698ad2e8cf 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1075,6 +1075,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
 	`strict_acl` tinyint(1) unsigned NOT NULL DEFAULT 0,
 	`id_filter`  int(10) unsigned NULL default NULL,
 	`session_time` int(10) signed NOT NULL default 0,
+	`default_event_filter` int(10) unsigned NOT NULL default 0,
 	CONSTRAINT `fk_filter_id` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter (`id_filter`) ON DELETE SET NULL,
 	UNIQUE KEY `id_user` (`id_user`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From 5185105c0323251d4437798b03ab1be35c7bc74c Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 6 Apr 2017 11:45:22 +0200
Subject: [PATCH 02/15] Added default filter elements to filter table and
 filter tags.

---
 .../operation/events/events_list.php          | 78 ++++++++++++++++++-
 1 file changed, 76 insertions(+), 2 deletions(-)

diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 703a76c14f..2608b45601 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -259,6 +259,82 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
 	echo '</div>';
 }
 
+/* -------------------------------------------------------------------------- */
+/* ------------------------ DEFAULT USER FILTER ----------------------------- */
+$user = $config['id_user'];
+$user_filter = db_get_value_filter('default_event_filter', 'tusuario', array('id_user' => $user));
+if ($user_filter != 0 && empty($id_name)) {
+	$user_default_filter = db_get_all_rows_filter('tevent_filter', array('id_filter' => $user_filter));
+	$user_default_filter = $user_default_filter[0];
+
+	// FORM
+	$id_name = $user_default_filter['id_name'];
+	$id_group = $user_default_filter['id_group'];
+	$event_type = $user_default_filter['event_type'];
+	$severity = $user_default_filter['severity'];
+	$status = $user_default_filter['status'];
+	$event_view_hr = $user_default_filter['event_view_hr'];
+	$group_rep = $user_default_filter['group_rep'];
+	$search = $user_default_filter['search'];
+	$id_user_ack = $user_default_filter['id_user_ack'];
+	$id_agent_module = $user_default_filter['id_agent_module'];
+	$id_agent = $user_default_filter['id_agent'];
+	$text_agent = $user_default_filter['text_agent'];
+	$filter_only_alert = $user_default_filter['filter_only_alert'];
+	$pagination = $user_default_filter['pagination'];
+	$date_from = $user_default_filter['date_from'];
+	$date_to = $user_default_filter['date_to'];
+	$tag_with = $user_default_filter['tag_with'];
+	$tag_without = $user_default_filter['tag_without'];
+	if ($tag_with != "[]") {
+		$tag_with_clean = io_safe_output($tag_with);
+		$tag_with = json_decode($tag_with_clean, true);
+	}
+	if ($tag_without != "[]") {
+		$tag_without_clear = io_safe_output($tag_without);
+		$tag_without = json_decode($tag_without_clear, true);
+	}
+
+	// TAGS
+	$filter_resume['severity'] = $user_default_filter['severity'];
+	$filter_resume['status'] = $user_default_filter['status'];
+	$filter_resume['groups'] = $user_default_filter['id_group'];
+	if ($user_default_filter['id_agent'] != 0) {
+		$filter_resume['agent'] = $user_default_filter['id_agent'];
+	}
+	if ($user_default_filter['id_agent_module'] != 0) {
+		$filter_resume['module'] = $user_default_filter['id_agent_module'];
+	}
+	if ($user_default_filter['event_type'] != "") {
+		$filter_resume['event_type'] = $user_default_filter['event_type'];
+	}
+	if ($user_default_filter['search'] != "") {
+		$filter_resume['free_search'] = $user_default_filter['search'];
+	}
+	if ($user_default_filter['date_from'] != "0000-00-00") {
+		$filter_resume['time_from'] = $user_default_filter['date_from'];
+	}
+	if ($user_default_filter['date_to'] != "0000-00-00") {
+		$filter_resume['time_to'] = $user_default_filter['date_to'];
+	}
+	if ($user_default_filter['tag_with'] != "[]") {
+		$tag_with_clean_tag = io_safe_output($user_default_filter['tag_with']);
+		$filter_resume['tag_inc'] = json_decode($tag_with_clean_tag, true);
+	}
+	if ($user_default_filter['tag_without'] != "[]") {
+		$tag_without_clean_tag = io_safe_output($user_default_filter['tag_without']);
+		$filter_resume['tag_no_inc'] = json_decode($tag_without_clean_tag, true);
+	}
+	if ($user_default_filter['filter_only_alert'] != -1) {
+		$filter_resume['alerts'] = $user_default_filter['filter_only_alert'];
+	}
+	$filter_resume['hours_max'] = $user_default_filter['event_view_hr'];
+	if ($user_default_filter['id_user_ack'] != 0) {
+		$filter_resume['user_ack'] = $user_default_filter['id_user_ack'];
+	}
+}
+/* -------------------------------------------------------------------------- */
+
 // Load filter div for dialog
 echo '<div id="load_filter_layer" style="display: none">';
 $table->id = 'load_filter_form';
@@ -392,7 +468,6 @@ else {
 	$events_filter .= html_print_input_hidden('open_filter', 'false', true);
 }
 
-
 //----------------------------------------------------------------------
 //- INI ADVANCE FILTER -------------------------------------------------
 $table_advanced = new stdClass();
@@ -534,7 +609,6 @@ if (defined('METACONSOLE'))
 $table_advanced->rowclass[] = '';
 //- END ADVANCE FILTER -------------------------------------------------
 
-
 $table = new stdClass();
 $table->id = 'events_filter_form';
 $table->width = '100%';

From dc654b0f3eaa87b583ac5b38c40a2d31a128218c Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 6 Apr 2017 13:00:30 +0200
Subject: [PATCH 03/15] Added "none" filter and fixed tags update error

---
 .../operation/events/events_list.php          | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 2608b45601..5b588fc03f 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -126,7 +126,7 @@ if (is_ajax()) {
 		$values['id_group_filter'] = get_parameter('id_group_filter');
 		$values['date_from'] = get_parameter('date_from');
 		$values['date_to'] = get_parameter('date_to');
-
+html_debug($values, true);
 		$result = db_process_sql_update('tevent_filter',
 			$values, array('id_filter' => $id));
 		
@@ -263,7 +263,8 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
 /* ------------------------ DEFAULT USER FILTER ----------------------------- */
 $user = $config['id_user'];
 $user_filter = db_get_value_filter('default_event_filter', 'tusuario', array('id_user' => $user));
-if ($user_filter != 0 && empty($id_name)) {
+$update_from_filter_table = (bool)get_parameter('update_from_filter_table', false);
+if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
 	$user_default_filter = db_get_all_rows_filter('tevent_filter', array('id_filter' => $user_filter));
 	$user_default_filter = $user_default_filter[0];
 
@@ -693,6 +694,11 @@ $table->rowstyle[count($table->data)] = 'text-align:right;';
 $table->data[] = $data;
 $table->rowclass[] = '';
 
+$data = array();
+$data[0] = html_print_input_hidden('update_from_filter_table', 1, true);
+$table->data[] = $data;
+$table->rowclass[] = '';
+
 $events_filter .= html_print_table($table, true);
 
 unset($table);
@@ -956,7 +962,32 @@ var text_none = "<?php echo __('None'); ?>";
 var group_agents_id = false;
 
 $(document).ready( function() {
+	id_select_destiny = "#tag_with_temp";
+	id_hidden = "#hidden-tag_with";
+
+	value_store = [];
 	
+	jQuery.each($(id_select_destiny + " option"), function(key, element) {
+		val = $(element).val();
+		
+		value_store.push(val);
+	});
+	
+	$(id_hidden).val(Base64.encode(jQuery.toJSON(value_store)));
+	
+	id_select_destiny2 = "#tag_without_temp";
+	id_hidden2 = "#hidden-tag_without";
+	
+	value_store2 = [];
+	
+	jQuery.each($(id_select_destiny2 + " option"), function(key, element) {
+		val = $(element).val();
+		
+		value_store2.push(val);
+	});
+	
+	$(id_hidden2).val(Base64.encode(jQuery.toJSON(value_store2)));
+
 	$("#text-date_from, #text-date_to").datepicker({dateFormat: "<?php echo DATE_FORMAT_JS; ?>"});
 	
 	// If the events are not charged, dont show graphs link
@@ -1053,6 +1084,9 @@ $(document).ready( function() {
 			$("#row_name").css('visibility', 'hidden');
 			$("#submit-update_filter").css('visibility', 'hidden');
 			$("#id_group").val(0);
+			$("#text-date_from").val('');
+			$("#text-date_to").val('');
+			$("#pagination").val(20);
 			
 			clear_tags_inputs();
 			

From e576f6d3e8997fc5a9129705d8fb6cfd192ca337 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 6 Apr 2017 13:20:34 +0200
Subject: [PATCH 04/15] Added some tags fixes to event filter

---
 .../operation/events/events_list.php          | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 5b588fc03f..60117ddc43 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -126,7 +126,13 @@ if (is_ajax()) {
 		$values['id_group_filter'] = get_parameter('id_group_filter');
 		$values['date_from'] = get_parameter('date_from');
 		$values['date_to'] = get_parameter('date_to');
-html_debug($values, true);
+		if (io_safe_output($values['tag_with']) == "[\"0\"]") {
+			$values['tag_with'] = "[]";
+		}
+		if (io_safe_output($values['tag_without']) == "[\"0\"]") {
+			$values['tag_without'] = "[]";
+		}
+
 		$result = db_process_sql_update('tevent_filter',
 			$values, array('id_filter' => $id));
 		
@@ -318,11 +324,11 @@ if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
 	if ($user_default_filter['date_to'] != "0000-00-00") {
 		$filter_resume['time_to'] = $user_default_filter['date_to'];
 	}
-	if ($user_default_filter['tag_with'] != "[]") {
+	if (io_safe_output($user_default_filter['tag_with']) != "[]") {
 		$tag_with_clean_tag = io_safe_output($user_default_filter['tag_with']);
 		$filter_resume['tag_inc'] = json_decode($tag_with_clean_tag, true);
 	}
-	if ($user_default_filter['tag_without'] != "[]") {
+	if (io_safe_output($user_default_filter['tag_without']) != "[]") {
 		$tag_without_clean_tag = io_safe_output($user_default_filter['tag_without']);
 		$filter_resume['tag_no_inc'] = json_decode($tag_without_clean_tag, true);
 	}
@@ -370,14 +376,14 @@ $tags_select_without = array();
 $tag_with_temp = array();
 $tag_without_temp = array();
 foreach ($tags as $id_tag => $tag) {
-	if (array_search($id_tag, $tag_with) === false) {
+	if ((array_search($id_tag, $tag_with) === false) || (array_search($id_tag, $tag_with) === null)) {
 		$tags_select_with[$id_tag] = ui_print_truncate_text ($tag, 50, true);
 	}
 	else {
 		$tag_with_temp[$id_tag] = ui_print_truncate_text ($tag, 50, true);
 	}
 	
-	if (array_search($id_tag, $tag_without) === false) {
+	if ((array_search($id_tag, $tag_without) === false) || (array_search($id_tag, $tag_without) === null)) {
 		$tags_select_without[$id_tag] = ui_print_truncate_text ($tag, 50, true);
 	}
 	else {
@@ -1087,11 +1093,15 @@ $(document).ready( function() {
 			$("#text-date_from").val('');
 			$("#text-date_to").val('');
 			$("#pagination").val(20);
+			$("#update_from_filter_table").val(1);
 			
 			clear_tags_inputs();
 			
 			// Update the view of filter load with no loaded filters message
 			$('#filter_loaded_span').html($('#not_filter_loaded_text').html());
+
+			// Update the view with the loaded filter
+			$('#submit-update').trigger('click');
 		}
 		// If filter selected then load filter
 		else {

From 22813cc41226158e5032b80c1de05d40bb407e0c Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 6 Apr 2017 14:03:49 +0200
Subject: [PATCH 05/15] Added changes to events query vars

---
 .../operation/events/events_list.php          | 180 ++++++++++--------
 1 file changed, 101 insertions(+), 79 deletions(-)

diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 60117ddc43..b83b4f42da 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -163,6 +163,107 @@ if ($id_agent == 0 && !empty($text_agent)) {
 	$id_agent = -1;
 }
 
+$id_name = get_parameter('id_name', '');
+
+/* -------------------------------------------------------------------------- */
+/* ------------------------ DEFAULT USER FILTER ----------------------------- */
+$user = $config['id_user'];
+$user_filter = db_get_value_filter('default_event_filter', 'tusuario', array('id_user' => $user));
+$update_from_filter_table = (bool)get_parameter('update_from_filter_table', false);
+
+if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
+	$user_default_filter = db_get_all_rows_filter('tevent_filter', array('id_filter' => $user_filter));
+	$user_default_filter = $user_default_filter[0];
+
+	// FORM
+	$id_name = $user_default_filter['id_name'];
+	$id_group = $user_default_filter['id_group'];
+	if ($user_default_filter['event_type'] != "") {
+		$event_type = $user_default_filter['event_type'];
+	}
+	
+	$severity = $user_default_filter['severity'];
+	$status = $user_default_filter['status'];
+	$event_view_hr = $user_default_filter['event_view_hr'];
+	$group_rep = $user_default_filter['group_rep'];
+	if ($user_default_filter['search'] != "") {
+		$search = $user_default_filter['search'];
+	}
+	if ($user_default_filter['id_user_ack'] != 0) {
+		$id_user_ack = $user_default_filter['id_user_ack'];
+	}
+	if ($user_default_filter['id_agent_module'] != 0) {
+		$id_agent_module = $user_default_filter['id_agent_module'];
+	}
+	if ($user_default_filter['id_agent'] != 0) {
+		$id_agent = $user_default_filter['id_agent'];
+	}
+	if ($user_default_filter['text_agent'] != "") {
+		$text_agent = $user_default_filter['text_agent'];
+	}
+	if ($user_default_filter['filter_only_alert'] != -1) {
+		$filter_only_alert = $user_default_filter['filter_only_alert'];
+	}
+	if ($user_default_filter['pagination'] != 20) {
+		$pagination = $user_default_filter['pagination'];
+	}
+	if ($user_default_filter['date_from'] != "0000-00-00") {
+		$date_from = $user_default_filter['date_from'];
+	}
+	if ($user_default_filter['date_to'] != "0000-00-00") {
+		$date_to = $user_default_filter['date_to'];
+	}
+	if ($user_default_filter['tag_with'] != "[]") {
+		$tag_with = $user_default_filter['tag_with'];
+		$tag_with_clean = io_safe_output($tag_with);
+		$tag_with = json_decode($tag_with_clean, true);
+	}
+	if ($user_default_filter['tag_without'] != "[]") {
+		$tag_without = $user_default_filter['tag_without'];
+		$tag_without_clear = io_safe_output($tag_without);
+		$tag_without = json_decode($tag_without_clear, true);
+	}
+
+	// TAGS
+	$filter_resume['severity'] = $user_default_filter['severity'];
+	$filter_resume['status'] = $user_default_filter['status'];
+	$filter_resume['groups'] = $user_default_filter['id_group'];
+	if ($user_default_filter['id_agent'] != 0) {
+		$filter_resume['agent'] = $user_default_filter['id_agent'];
+	}
+	if ($user_default_filter['id_agent_module'] != 0) {
+		$filter_resume['module'] = $user_default_filter['id_agent_module'];
+	}
+	if ($user_default_filter['event_type'] != "") {
+		$filter_resume['event_type'] = $user_default_filter['event_type'];
+	}
+	if ($user_default_filter['search'] != "") {
+		$filter_resume['free_search'] = $user_default_filter['search'];
+	}
+	if ($user_default_filter['date_from'] != "0000-00-00") {
+		$filter_resume['time_from'] = $user_default_filter['date_from'];
+	}
+	if ($user_default_filter['date_to'] != "0000-00-00") {
+		$filter_resume['time_to'] = $user_default_filter['date_to'];
+	}
+	if (io_safe_output($user_default_filter['tag_with']) != "[]") {
+		$tag_with_clean_tag = io_safe_output($user_default_filter['tag_with']);
+		$filter_resume['tag_inc'] = json_decode($tag_with_clean_tag, true);
+	}
+	if (io_safe_output($user_default_filter['tag_without']) != "[]") {
+		$tag_without_clean_tag = io_safe_output($user_default_filter['tag_without']);
+		$filter_resume['tag_no_inc'] = json_decode($tag_without_clean_tag, true);
+	}
+	if ($user_default_filter['filter_only_alert'] != -1) {
+		$filter_resume['alerts'] = $user_default_filter['filter_only_alert'];
+	}
+	$filter_resume['hours_max'] = $user_default_filter['event_view_hr'];
+	if ($user_default_filter['id_user_ack'] != 0) {
+		$filter_resume['user_ack'] = $user_default_filter['id_user_ack'];
+	}
+}
+/* -------------------------------------------------------------------------- */
+
 /////////////////////////////////////////////
 // Build the condition of the events query
 
@@ -176,8 +277,6 @@ require('events.build_query.php');
 // Now $sql_post have all the where condition
 /////////////////////////////////////////////
 
-$id_name = get_parameter('id_name', '');
-
 // Trick to catch if any filter button has been pushed (don't collapse filter)
 // or the filter was open before click or autorefresh is in use (collapse filter)
 $update_pressed = get_parameter_post('update', '');
@@ -265,83 +364,6 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
 	echo '</div>';
 }
 
-/* -------------------------------------------------------------------------- */
-/* ------------------------ DEFAULT USER FILTER ----------------------------- */
-$user = $config['id_user'];
-$user_filter = db_get_value_filter('default_event_filter', 'tusuario', array('id_user' => $user));
-$update_from_filter_table = (bool)get_parameter('update_from_filter_table', false);
-if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
-	$user_default_filter = db_get_all_rows_filter('tevent_filter', array('id_filter' => $user_filter));
-	$user_default_filter = $user_default_filter[0];
-
-	// FORM
-	$id_name = $user_default_filter['id_name'];
-	$id_group = $user_default_filter['id_group'];
-	$event_type = $user_default_filter['event_type'];
-	$severity = $user_default_filter['severity'];
-	$status = $user_default_filter['status'];
-	$event_view_hr = $user_default_filter['event_view_hr'];
-	$group_rep = $user_default_filter['group_rep'];
-	$search = $user_default_filter['search'];
-	$id_user_ack = $user_default_filter['id_user_ack'];
-	$id_agent_module = $user_default_filter['id_agent_module'];
-	$id_agent = $user_default_filter['id_agent'];
-	$text_agent = $user_default_filter['text_agent'];
-	$filter_only_alert = $user_default_filter['filter_only_alert'];
-	$pagination = $user_default_filter['pagination'];
-	$date_from = $user_default_filter['date_from'];
-	$date_to = $user_default_filter['date_to'];
-	$tag_with = $user_default_filter['tag_with'];
-	$tag_without = $user_default_filter['tag_without'];
-	if ($tag_with != "[]") {
-		$tag_with_clean = io_safe_output($tag_with);
-		$tag_with = json_decode($tag_with_clean, true);
-	}
-	if ($tag_without != "[]") {
-		$tag_without_clear = io_safe_output($tag_without);
-		$tag_without = json_decode($tag_without_clear, true);
-	}
-
-	// TAGS
-	$filter_resume['severity'] = $user_default_filter['severity'];
-	$filter_resume['status'] = $user_default_filter['status'];
-	$filter_resume['groups'] = $user_default_filter['id_group'];
-	if ($user_default_filter['id_agent'] != 0) {
-		$filter_resume['agent'] = $user_default_filter['id_agent'];
-	}
-	if ($user_default_filter['id_agent_module'] != 0) {
-		$filter_resume['module'] = $user_default_filter['id_agent_module'];
-	}
-	if ($user_default_filter['event_type'] != "") {
-		$filter_resume['event_type'] = $user_default_filter['event_type'];
-	}
-	if ($user_default_filter['search'] != "") {
-		$filter_resume['free_search'] = $user_default_filter['search'];
-	}
-	if ($user_default_filter['date_from'] != "0000-00-00") {
-		$filter_resume['time_from'] = $user_default_filter['date_from'];
-	}
-	if ($user_default_filter['date_to'] != "0000-00-00") {
-		$filter_resume['time_to'] = $user_default_filter['date_to'];
-	}
-	if (io_safe_output($user_default_filter['tag_with']) != "[]") {
-		$tag_with_clean_tag = io_safe_output($user_default_filter['tag_with']);
-		$filter_resume['tag_inc'] = json_decode($tag_with_clean_tag, true);
-	}
-	if (io_safe_output($user_default_filter['tag_without']) != "[]") {
-		$tag_without_clean_tag = io_safe_output($user_default_filter['tag_without']);
-		$filter_resume['tag_no_inc'] = json_decode($tag_without_clean_tag, true);
-	}
-	if ($user_default_filter['filter_only_alert'] != -1) {
-		$filter_resume['alerts'] = $user_default_filter['filter_only_alert'];
-	}
-	$filter_resume['hours_max'] = $user_default_filter['event_view_hr'];
-	if ($user_default_filter['id_user_ack'] != 0) {
-		$filter_resume['user_ack'] = $user_default_filter['id_user_ack'];
-	}
-}
-/* -------------------------------------------------------------------------- */
-
 // Load filter div for dialog
 echo '<div id="load_filter_layer" style="display: none">';
 $table->id = 'load_filter_form';

From 8065ca21a56deb77ff6acf9493d9c46a2df9e857 Mon Sep 17 00:00:00 2001
From: vanessa gil <vanessa.gil@artica.es>
Date: Wed, 5 Apr 2017 17:47:27 +0200
Subject: [PATCH 06/15] removed file.

---
 pandora_console/extras/mr/1.sql | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 pandora_console/extras/mr/1.sql

diff --git a/pandora_console/extras/mr/1.sql b/pandora_console/extras/mr/1.sql
deleted file mode 100644
index 15a00d1bf5..0000000000
--- a/pandora_console/extras/mr/1.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-START TRANSACTION;
-
-CREATE TABLE IF NOT EXISTS `ttable_test3` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`field1` varchar(60) NOT NULL default '',
-	`field2` int(10) unsigned NOT NULL default '0',
-	PRIMARY KEY  (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
-ALTER TABLE `tusuario` ADD COLUMN `test_nuevo3` tinyint(1) NOT NULL DEFAULT 0;
-
-COMMIT;

From ea6deaea04b72d1478641d8b6b2d70ee56057450 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 6 Apr 2017 00:01:16 +0200
Subject: [PATCH 07/15] Auto-updated build strings.

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

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 24b955589a..134681e05f 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG-170405
+Version: 7.0NG-170406
 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 47258cef18..1372e360f4 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-170405"
+pandora_version="7.0NG-170406"
 
 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 8bf88914e9..381456533d 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG';
-use constant AGENT_BUILD => '170405';
+use constant AGENT_BUILD => '170406';
 
 # 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 57af102f1f..4c54fdcfaa 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
-%define release     170405
+%define release     170406
 
 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 ee6fdae3eb..e7e987f309 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
-%define release     170405
+%define release     170406
 
 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 309f2a99d0..95e6a28f6e 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG"
-PI_BUILD="170405"
+PI_BUILD="170406"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index cac7150d13..e46a05c775 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{170405}
+{170406}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 04850421fe..5cb9efdf00 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(Build 170405)")
+#define PANDORA_VERSION ("7.0NG(Build 170406)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index dabace2b57..9a263af26f 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(Build 170405))"
+      VALUE "ProductVersion", "(7.0NG(Build 170406))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 4d787262f9..3ad5299371 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG-170405
+Version: 7.0NG-170406
 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 3e93e64a07..c0ee1ea570 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-170405"
+pandora_version="7.0NG-170406"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index c5b5c42e27..a966fd1ec9 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 = 'PC170405';
+$build_version = 'PC170406';
 $pandora_version = 'v7.0NG';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 033dc4e727..f8b3576349 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG';
-$build = '170405';
+$build = '170406';
 			$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 5a496dc364..cc36f769ef 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
-%define release     170405
+%define release     170406
 
 # 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 59c7d7c402..8dd0fd69a4 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
-%define release     170405
+%define release     170406
 %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 7cbe350154..440aa91a2e 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG-170405
+Version: 7.0NG-170406
 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 823565cca7..c63664113d 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-170405"
+pandora_version="7.0NG-170406"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 7d28f04241..51a5a9c806 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG";
-my $pandora_build = "170405";
+my $pandora_build = "170406";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 365b2859f6..2c83c1ac4f 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
-%define release     170405
+%define release     170406
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 011c07bc01..f96a6a935d 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
-%define release     170405
+%define release     170406
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 73c24b0a58..e172e34587 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG"
-PI_BUILD="170405"
+PI_BUILD="170406"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index c4919e8b19..33fe4fd936 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG PS170405";
+my $version = "7.0NG PS170406";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 415e311298..6748716a76 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG PS170405";
+my $version = "7.0NG PS170406";
 
 # save program name for logging
 my $progname = basename($0);

From 301f3578736df036cb5766c2ef23b787640c2115 Mon Sep 17 00:00:00 2001
From: vanessa gil <vanessa.gil@artica.es>
Date: Thu, 6 Apr 2017 14:13:19 +0200
Subject: [PATCH 08/15] new file.

---
 pandora_console/extras/mr/1.sql | 36 +++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pandora_console/extras/mr/1.sql

diff --git a/pandora_console/extras/mr/1.sql b/pandora_console/extras/mr/1.sql
new file mode 100644
index 0000000000..f8ed806345
--- /dev/null
+++ b/pandora_console/extras/mr/1.sql
@@ -0,0 +1,36 @@
+-- Pandora FMS - the Flexible Monitoring System
+-- ============================================
+-- Copyright (c) 2005-2011 Artica Soluciones Tecnológicas, http://www.artica.es
+-- Please see http://pandora.sourceforge.net for full contribution list
+
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation for version 2.
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-- PLEASE NO NOT USE MULTILINE COMMENTS 
+-- Because Pandora Installer don't understand them
+-- and fails creating database !!!
+
+-- Priority : 0 - Maintance (grey)
+-- Priority : 1 - Low (green)
+-- Priority : 2 - Normal (blue)
+-- Priority : 3 - Warning (yellow)
+-- Priority : 4 - Critical (red)
+
+-- ---------------------------------------------------------------------
+-- Table `tnueva`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tnueva` (
+	`id_a` int(10) unsigned NOT NULL auto_increment,
+	`ip` varchar(60) NOT NULL default '',
+	`ip_pack` int(10) unsigned NOT NULL default '0',
+	PRIMARY KEY  (`id_a`),
+	KEY `ip` (`ip`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;

From db08e242d0d894b52dea637d650bcd9f7989e6a3 Mon Sep 17 00:00:00 2001
From: vanessa gil <vanessa.gil@artica.es>
Date: Thu, 6 Apr 2017 15:43:02 +0200
Subject: [PATCH 09/15] new file.

---
 pandora_console/extras/mr/1.sql | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/pandora_console/extras/mr/1.sql b/pandora_console/extras/mr/1.sql
index f8ed806345..827b9b3ffc 100644
--- a/pandora_console/extras/mr/1.sql
+++ b/pandora_console/extras/mr/1.sql
@@ -1,36 +1,9 @@
--- Pandora FMS - the Flexible Monitoring System
--- ============================================
--- Copyright (c) 2005-2011 Artica Soluciones Tecnológicas, http://www.artica.es
--- Please see http://pandora.sourceforge.net for full contribution list
-
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation for version 2.
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
--- PLEASE NO NOT USE MULTILINE COMMENTS 
--- Because Pandora Installer don't understand them
--- and fails creating database !!!
-
--- Priority : 0 - Maintance (grey)
--- Priority : 1 - Low (green)
--- Priority : 2 - Normal (blue)
--- Priority : 3 - Warning (yellow)
--- Priority : 4 - Critical (red)
-
--- ---------------------------------------------------------------------
--- Table `tnueva`
--- ---------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `tnueva` (
+START TRANSACTION;
+CREATE TABLE IF NOT EXISTS `tnueva2` (
 	`id_a` int(10) unsigned NOT NULL auto_increment,
 	`ip` varchar(60) NOT NULL default '',
 	`ip_pack` int(10) unsigned NOT NULL default '0',
 	PRIMARY KEY  (`id_a`),
 	KEY `ip` (`ip`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+COMMIT;

From f05d687fb3c16ab4181e6e54e9b0107cb0c422e2 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 10 Apr 2017 09:53:32 +0200
Subject: [PATCH 10/15] Added some modifications to implements a default filter
 by user in event section

---
 .../operation/events/events_list.php          | 51 +++----------------
 1 file changed, 6 insertions(+), 45 deletions(-)

diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index b83b4f42da..8c9d4a50af 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -197,9 +197,7 @@ if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
 	}
 	if ($user_default_filter['id_agent'] != 0) {
 		$id_agent = $user_default_filter['id_agent'];
-	}
-	if ($user_default_filter['text_agent'] != "") {
-		$text_agent = $user_default_filter['text_agent'];
+		$text_agent = agents_get_alias($id_agent);
 	}
 	if ($user_default_filter['filter_only_alert'] != -1) {
 		$filter_only_alert = $user_default_filter['filter_only_alert'];
@@ -213,54 +211,16 @@ if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
 	if ($user_default_filter['date_to'] != "0000-00-00") {
 		$date_to = $user_default_filter['date_to'];
 	}
-	if ($user_default_filter['tag_with'] != "[]") {
+	if (io_safe_output($user_default_filter['tag_with']) != "[]" && io_safe_output($user_default_filter['tag_with']) != "[\"0\"]") {
 		$tag_with = $user_default_filter['tag_with'];
 		$tag_with_clean = io_safe_output($tag_with);
 		$tag_with = json_decode($tag_with_clean, true);
 	}
-	if ($user_default_filter['tag_without'] != "[]") {
+	if (io_safe_output($user_default_filter['tag_without']) != "[]" && io_safe_output($user_default_filter['tag_without']) != "[\"0\"]") {
 		$tag_without = $user_default_filter['tag_without'];
 		$tag_without_clear = io_safe_output($tag_without);
 		$tag_without = json_decode($tag_without_clear, true);
 	}
-
-	// TAGS
-	$filter_resume['severity'] = $user_default_filter['severity'];
-	$filter_resume['status'] = $user_default_filter['status'];
-	$filter_resume['groups'] = $user_default_filter['id_group'];
-	if ($user_default_filter['id_agent'] != 0) {
-		$filter_resume['agent'] = $user_default_filter['id_agent'];
-	}
-	if ($user_default_filter['id_agent_module'] != 0) {
-		$filter_resume['module'] = $user_default_filter['id_agent_module'];
-	}
-	if ($user_default_filter['event_type'] != "") {
-		$filter_resume['event_type'] = $user_default_filter['event_type'];
-	}
-	if ($user_default_filter['search'] != "") {
-		$filter_resume['free_search'] = $user_default_filter['search'];
-	}
-	if ($user_default_filter['date_from'] != "0000-00-00") {
-		$filter_resume['time_from'] = $user_default_filter['date_from'];
-	}
-	if ($user_default_filter['date_to'] != "0000-00-00") {
-		$filter_resume['time_to'] = $user_default_filter['date_to'];
-	}
-	if (io_safe_output($user_default_filter['tag_with']) != "[]") {
-		$tag_with_clean_tag = io_safe_output($user_default_filter['tag_with']);
-		$filter_resume['tag_inc'] = json_decode($tag_with_clean_tag, true);
-	}
-	if (io_safe_output($user_default_filter['tag_without']) != "[]") {
-		$tag_without_clean_tag = io_safe_output($user_default_filter['tag_without']);
-		$filter_resume['tag_no_inc'] = json_decode($tag_without_clean_tag, true);
-	}
-	if ($user_default_filter['filter_only_alert'] != -1) {
-		$filter_resume['alerts'] = $user_default_filter['filter_only_alert'];
-	}
-	$filter_resume['hours_max'] = $user_default_filter['event_view_hr'];
-	if ($user_default_filter['id_user_ack'] != 0) {
-		$filter_resume['user_ack'] = $user_default_filter['id_user_ack'];
-	}
 }
 /* -------------------------------------------------------------------------- */
 
@@ -272,8 +232,8 @@ $sql_post = "";
 $id_user = $config['id_user'];
 
 $filter_resume = array();
-require('events.build_query.php');
 
+require('events.build_query.php');
 // Now $sql_post have all the where condition
 /////////////////////////////////////////////
 
@@ -1101,7 +1061,7 @@ $(document).ready( function() {
 			$("#severity").val(-1);
 			$("#status").val(3);
 			$("#text-search").val('');
-			$('input:hidden[name=id_agent]').val();
+			$('input:hidden[name=id_agent]').val("");
 			$('input:hidden[name=module_search_hidden]').val();
 			$("#pagination").val(25);
 			$("#text-event_view_hr").val(8);
@@ -1116,6 +1076,7 @@ $(document).ready( function() {
 			$("#text-date_to").val('');
 			$("#pagination").val(20);
 			$("#update_from_filter_table").val(1);
+			$("#text_id_agent").val("");
 			
 			clear_tags_inputs();
 			

From 97abef62c4ea3c517e6b214579d29cc9aeefd573 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 18 Apr 2017 11:39:46 +0200
Subject: [PATCH 11/15] Added db field to mr

---
 pandora_console/extras/mr/1.sql    | 5 +++++
 pandora_console/pandoradb_data.sql | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 pandora_console/extras/mr/1.sql

diff --git a/pandora_console/extras/mr/1.sql b/pandora_console/extras/mr/1.sql
new file mode 100644
index 0000000000..cc730b7fcd
--- /dev/null
+++ b/pandora_console/extras/mr/1.sql
@@ -0,0 +1,5 @@
+START TRANSACTION
+
+ALTER TABLE tusuario add default_event_filter int(10) unsigned NOT NULL DEFAULT 0;
+
+COMMIT
\ No newline at end of file
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index c8b076c982..85bdeec9d6 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -109,7 +109,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('custom_report_front_logo', 'images/pandora_logo_white.jpg'),
 ('custom_report_front_header', ''),
 ('custom_report_front_footer', ''),
-('MR', 0),
+('MR', 1),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
 ('current_package_enterprise', '700'),

From 29ad608ddb8822e64d62bf63887d4f9b58603335 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 18 Apr 2017 11:41:51 +0200
Subject: [PATCH 12/15] Added ; to query transaction

---
 pandora_console/extras/mr/1.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/extras/mr/1.sql b/pandora_console/extras/mr/1.sql
index cc730b7fcd..595e48e2c0 100644
--- a/pandora_console/extras/mr/1.sql
+++ b/pandora_console/extras/mr/1.sql
@@ -1,5 +1,5 @@
-START TRANSACTION
+START TRANSACTION;
 
 ALTER TABLE tusuario add default_event_filter int(10) unsigned NOT NULL DEFAULT 0;
 
-COMMIT
\ No newline at end of file
+COMMIT;
\ No newline at end of file

From 82530c9b597762e846fe5fd363829d134b43346b Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 16:18:37 +0200
Subject: [PATCH 13/15] Added external query to mr

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

diff --git a/pandora_console/extras/mr/1.sql b/pandora_console/extras/mr/1.sql
index 595e48e2c0..36af47faf2 100644
--- a/pandora_console/extras/mr/1.sql
+++ b/pandora_console/extras/mr/1.sql
@@ -2,4 +2,12 @@ START TRANSACTION;
 
 ALTER TABLE tusuario add default_event_filter int(10) unsigned NOT NULL DEFAULT 0;
 
+CREATE TABLE IF NOT EXISTS `treset_pass` (
+    `id` bigint(10) unsigned NOT NULL auto_increment,
+    `id_user` varchar(100) NOT NULL default '',
+    `cod_hash` varchar(100) NOT NULL default '',
+    `reset_time` int(10) unsigned NOT NULL default 0,
+    PRIMARY KEY (`id`) 
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 COMMIT;
\ No newline at end of file

From de650b9ef2ed6751f9043e2f1556c6092d5006c0 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 25 Apr 2017 16:26:45 +0200
Subject: [PATCH 14/15] Added change to mr (enriquecd)

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

diff --git a/pandora_console/extras/mr/1.sql b/pandora_console/extras/mr/1.sql
index 36af47faf2..547827a54e 100644
--- a/pandora_console/extras/mr/1.sql
+++ b/pandora_console/extras/mr/1.sql
@@ -10,4 +10,6 @@ CREATE TABLE IF NOT EXISTS `treset_pass` (
     PRIMARY KEY (`id`) 
 )ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+UPDATE tgis_map_connection SET conection_data = '{"type":"OSM","url":"http://tile.openstreetmap.org/${z}/${x}/${y}.png"}' where id_tmap_connection = 1;
+
 COMMIT;
\ No newline at end of file

From 2e3f6ad700ce42fe7bf6ede2a62db4034cff8cb1 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 10 May 2017 15:21:42 +0200
Subject: [PATCH 15/15] Added change to mr

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

diff --git a/pandora_console/extras/mr/1.sql b/pandora_console/extras/mr/1.sql
index 547827a54e..f8bfa5337b 100644
--- a/pandora_console/extras/mr/1.sql
+++ b/pandora_console/extras/mr/1.sql
@@ -12,4 +12,6 @@ CREATE TABLE IF NOT EXISTS `treset_pass` (
 
 UPDATE tgis_map_connection SET conection_data = '{"type":"OSM","url":"http://tile.openstreetmap.org/${z}/${x}/${y}.png"}' where id_tmap_connection = 1;
 
+ALTER TABLE tpolicy_modules MODIFY post_process double(24,15) default 0;
+
 COMMIT;
\ No newline at end of file