From 46b9d6413002b560797bb255533e88d93ef7cd5e Mon Sep 17 00:00:00 2001
From: vgilc <noreply@pandorafms.org>
Date: Tue, 20 May 2014 14:40:43 +0000
Subject: [PATCH] 2014-05-20  Vanessa Gil <vanessa.gil@artica.es>

	* operation/events/events.build_query.php
	  operation/events/events.php
	  operation/events/events_list.php: Added filters
	to event list.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9964 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  7 +++++++
 .../operation/events/events.build_query.php   | 20 +++++++++++++++----
 pandora_console/operation/events/events.php   |  4 ++++
 .../operation/events/events_list.php          | 17 ++++++++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 0ee8cc2bbb..3e9b2edac2 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-20  Vanessa Gil <vanessa.gil@artica.es>
+
+	* operation/events/events.build_query.php
+	  operation/events/events.php
+	  operation/events/events_list.php: Added filters
+	to event list.
+
 2014-05-20  Alejandro Gallardo <alejandro.gallardo@artica.es>
 	
 	* pandora_console/include/styles/pandora.css: Changed
diff --git a/pandora_console/operation/events/events.build_query.php b/pandora_console/operation/events/events.build_query.php
index c3bba51774..14d96cf8df 100755
--- a/pandora_console/operation/events/events.build_query.php
+++ b/pandora_console/operation/events/events.build_query.php
@@ -71,7 +71,7 @@ switch ($status) {
 }
 
 if ($search != "") {
-	$sql_post .= " AND evento LIKE '%" . io_safe_input($search) . "%'";
+	$sql_post .= " AND (evento LIKE '%" . io_safe_input($search) . "%' OR id_evento LIKE '%$search%')";
 }
 
 if ($event_type != "") {
@@ -129,9 +129,21 @@ if ($id_user_ack != "0")
 	$sql_post .= " AND id_usuario = '" . $id_user_ack . "'";
 
 
-if ($event_view_hr > 0) {
-	$unixtime = get_system_time () - ($event_view_hr * SECONDS_1HOUR);
-	$sql_post .= " AND (utimestamp > " . $unixtime . ")";
+if (($date_from == '') && ($date_to == '')) {
+	if ($event_view_hr > 0) {
+		$unixtime = get_system_time () - ($event_view_hr * SECONDS_1HOUR);
+		$sql_post .= " AND (utimestamp > " . $unixtime . ")";
+	}
+} else {
+	if ($date_from != '') {
+		$udate_from = strtotime($date_from." 00:00:00");
+		$sql_post .= " AND (utimestamp >= " . $udate_from . ")";
+		
+	}
+	if ($date_to != '') {
+		$udate_to = strtotime($date_to." 23:59:59");
+		$sql_post .= " AND (utimestamp <= " . $udate_to . ")";
+	}
 }
 
 //Search by tag
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 5fe3c9088a..c5b8d83d80 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -205,6 +205,8 @@ $filter_only_alert = (int) get_parameter('filter_only_alert', -1);
 $filter_id = (int) get_parameter('filter_id', 0);
 $id_name = (string) get_parameter('id_name', '');
 $open_filter = (int) get_parameter('open_filter', 0);
+$date_from = (string)get_parameter('date_from', '');
+$date_to = (string)get_parameter('date_to', '');
 
 $text_agent = (string) get_parameter("text_agent", __("All"));
 
@@ -250,6 +252,8 @@ $params = "search=" . rawurlencode(io_safe_input($search)) .
 	"&amp;history=" . (int)$history .
 	"&amp;section=" . $section .
 	"&amp;open_filter=" . $open_filter .
+	"&amp;date_from=" . $date_from .
+	"&amp;date_to=" . $date_to .
 	"&amp;pure=" . $config["pure"];
 
 if ($meta) {
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 26982f6b55..bfb4c574cf 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -389,6 +389,19 @@ $data[1] .= html_print_select ($lpagination, "pagination", $pagination, '', __('
 $table_advanced->data[] = $data;
 $table_advanced->rowclass[] = '';
 
+$data = array();
+$data[0] = __('Date from') . '<br>';
+
+$user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all(0));
+
+$data[0] .= html_print_input_text ('date_from', $date_from, '', 15, 10, true);
+
+$data[1] = __('Date to') . '<br>';
+$data[1] .= html_print_input_text ('date_to', $date_to, '', 15, 10, true);
+
+$table_advanced->data[] = $data;
+$table_advanced->rowclass[] = '';
+
 $data = array();
 $data[0] = __('User ack.') . '<br>';
 
@@ -573,6 +586,7 @@ html_print_input_hidden('meta', (int)$meta);
 html_print_input_hidden('history', (int)$history);
 
 ui_require_jquery_file('json');
+echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
 ?>
 <script language="javascript" type="text/javascript">
 /*<![CDATA[ */
@@ -586,6 +600,9 @@ var val_none = 0;
 var text_none = "<?php echo __('None'); ?>";
 
 $(document).ready( function() {
+	
+	$("#text-date_from, #text-date_to").datepicker({dateFormat: "<?php echo DATE_FORMAT_JS; ?>"});
+	
 	// If the events are not charged, dont show graphs link
 	if ($('#events_graph').val() == undefined) {
 		$('#events_graph_link').hide();