From 90a4282d4a6bfa8f8298430337521324d060bee9 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Tue, 17 Feb 2015 17:06:12 +0100
Subject: [PATCH] Added server in the advance filter in the metaconsole events

---
 .../operation/events/events.build_query.php   |  5 +++-
 .../operation/events/events.build_table.php   |  1 +
 pandora_console/operation/events/events.php   |  1 +
 .../operation/events/events_list.php          | 26 ++++++++++++++++---
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/pandora_console/operation/events/events.build_query.php b/pandora_console/operation/events/events.build_query.php
index 0c88c4a1c6..662e85e82c 100755
--- a/pandora_console/operation/events/events.build_query.php
+++ b/pandora_console/operation/events/events.build_query.php
@@ -226,6 +226,9 @@ if ($meta) {
 		$sql_post .= ' AND server_id IN (' .
 			implode(',',$enabled_nodes_id) . ')';
 	}
+	
+	if ($server_id) {
+		$sql_post .= " AND server_id = " . $server_id;
+	}
 }
-
 ?>
diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php
index 83b3521bad..993e2da8b0 100644
--- a/pandora_console/operation/events/events.build_table.php
+++ b/pandora_console/operation/events/events.build_table.php
@@ -16,6 +16,7 @@
 if(!isset($table->width)) {
 	$table->width = '100%';
 }
+
 $table->id = "eventtable";
 $table->cellpadding = 4;
 $table->cellspacing = 4;
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index bd79987ecf..68ef2e4fdd 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -206,6 +206,7 @@ $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', '');
+$server_id = (int)get_parameter('server_id', 0);
 
 $text_agent = (string) get_parameter("text_agent", __("All"));
 $id_agent = get_parameter('id_agent', 0);
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 6b8828ddba..6785db3240 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -344,6 +344,11 @@ else {
 	$events_filter .= html_print_input_hidden('open_filter', 'false', true);
 }
 
+
+
+
+//----------------------------------------------------------------------
+//- INI ADVANCE FILTER -------------------------------------------------
 $table_advanced->id = 'events_filter_form_advanced';
 $table_advanced->width = '98%';
 $table_advanced->cellspacing = 4;
@@ -389,7 +394,10 @@ if (!$meta) {
 		$text_module, false, true, '', array(), true);
 }
 else {
-	$data[1] .= '';
+	$data[1] = __('Server') . '<br>';
+	$data[1] .= html_print_select_from_sql(
+		'SELECT id, server_name FROM tmetaconsole_setup',
+		'server_id', $server_id, 'script', __('All'), '0', true);
 }
 
 $table_advanced->data[] = $data;
@@ -436,6 +444,11 @@ $data[1] = '<fieldset class="databox" style="width: 310px;">' .
 	'</fieldset>';
 $table_advanced->data[] = $data;
 $table_advanced->rowclass[] = '';
+//- END ADVANCE FILTER -------------------------------------------------
+
+
+
+
 
 $table->id = 'events_filter_form';
 $table->width = '100%';
@@ -483,7 +496,8 @@ $table->data[] = $data;
 $table->rowclass[] = '';
 
 $data = array();
-$data[0] = ui_toggle(html_print_table($table_advanced, true), __('Advanced options'), '', true, true);
+$data[0] = ui_toggle(html_print_table($table_advanced, true),
+	__('Advanced options'), '', true, true);
 $table->colspan[count($table->data)][0] = 3;
 $table->cellstyle[count($table->data)][0] = 'padding-top: 15px;';
 $table->data[] = $data;
@@ -503,10 +517,14 @@ if (check_acl ($config["id_user"], 0, "EW")) {
 }
 $data[0] .= '<a href="javascript:" onclick="show_load_filter_dialog();">' . html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . '</a><br>';
 if (empty($id_name)) {
-	$data[0] .= '[<span id="filter_loaded_span" style="font-weight: normal">' . __('No filter loaded') . '</span>]';
+	$data[0] .= '[<span id="filter_loaded_span" style="font-weight: normal">' .
+		__('No filter loaded') .
+		'</span>]';
 }
 else {
-	$data[0] .= '[<span id="filter_loaded_span" style="font-weight: normal">' . __('Filter loaded') . ': ' . $id_name . '</span>]';
+	$data[0] .= '[<span id="filter_loaded_span" style="font-weight: normal">' .
+		__('Filter loaded') . ': ' . $id_name .
+		'</span>]';
 }
 $data[0] .= '</div>';