From d95a58beb7a7a6d5871fda32c743ae0791616e8b Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 29 Jul 2009 17:19:27 +0000 Subject: [PATCH] 2009-07-29 Miguel de Dios * operation/search_results.php: fix a query for search alerts. And changed the visual result (old it was simple list items) to a detailed table for all elements to search, also added pagination options for results. And make some style in tabs (added images). git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1824 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 + pandora_console/operation/search_results.php | 378 ++++++++++++++++--- 2 files changed, 333 insertions(+), 52 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1baccbcaac..f4e4f52261 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2009-07-29 Miguel de Dios + + * operation/search_results.php: fix a query for search alerts. And changed + the visual result (old it was simple list items) to a detailed table for all + elements to search, also added pagination options for results. And make + some style in tabs (added images). + 2009-07-29 Miguel de Dios * godmode/alerts/alert_list.php: clear and coment some parts of source diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php index 45582b8100..4bfdd98123 100644 --- a/pandora_console/operation/search_results.php +++ b/pandora_console/operation/search_results.php @@ -13,6 +13,10 @@ // GNU General Public License for more details. require ("include/config.php"); +require_once ("include/functions_reporting.php"); + +// Load enterprise extensions +enterprise_include ('operation/reporting/custom_reporting.php'); $searchGraphs = $searchAgents = (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "AR")); $linkEditUser = check_acl ($config['id_user'], 0, "UM"); @@ -37,69 +41,118 @@ if ((!$searchMaps) && ($searchTab == 'maps')) $searchTab = "users"; $agents = false; if ($searchTab == 'agents') { if ($searchAgents) { - $sql = "SELECT id_agente, tagente.nombre + $sql = "SELECT id_agente, tagente.nombre, tagente.id_os, tagente.intervalo, tagente.id_grupo + FROM tagente + INNER JOIN tgrupo + ON tgrupo.id_grupo = tagente.id_grupo + WHERE tagente.nombre LIKE '%" . $stringSearchSQL . "%' OR + tgrupo.nombre LIKE '%" . $stringSearchSQL . "%' + LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); + $agents = process_sql($sql); + + $sql = "SELECT count(id_agente) FROM tagente INNER JOIN tgrupo ON tgrupo.id_grupo = tagente.id_grupo WHERE tagente.nombre LIKE '%" . $stringSearchSQL . "%' OR tgrupo.nombre LIKE '%" . $stringSearchSQL . "%'"; - $agents = process_sql($sql); + $totalAgents = get_db_row_sql($sql); + $totalAgents = $totalAgents[0]; } } $users = false; if ($searchTab == 'users') { - $sql = "SELECT id_user, fullname, firstname, lastname, middlename, email FROM tusuario + $sql = "SELECT id_user, fullname, firstname, lastname, middlename, email, last_connect, is_admin, comments FROM tusuario WHERE fullname LIKE '%" . $stringSearchSQL . "%' OR firstname LIKE '%" . $stringSearchSQL . "%' OR lastname LIKE '%" . $stringSearchSQL . "%' OR middlename LIKE '%" . $stringSearchSQL . "%' OR - email LIKE '%" . $stringSearchSQL . "%'"; + email LIKE '%" . $stringSearchSQL . "%' + LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); $users = process_sql($sql); + + $sql = "SELECT COUNT(id_user) FROM tusuario + WHERE fullname LIKE '%" . $stringSearchSQL . "%' OR + firstname LIKE '%" . $stringSearchSQL . "%' OR + lastname LIKE '%" . $stringSearchSQL . "%' OR + middlename LIKE '%" . $stringSearchSQL . "%' OR + email LIKE '%" . $stringSearchSQL . "%'"; + $totalUsers = get_db_row_sql($sql); + $totalUsers = $totalUsers[0]; } $alerts = false; -if ($searchTab == 'alerts') { - //TODO: NOT IS CORRECT QUERY...TUNE AND CLEAN - $sql = "SELECT * - FROM - (SELECT id, - (SELECT t.nombre - FROM tagente_modulo AS t WHERE t.id_agente_modulo = id_agent_module AND t.nombre LIKE '%" . $stringSearchSQL . "%') AS agent_name , - (SELECT t.name FROM talert_templates AS t WHERE t.id = id_alert_template AND t.name LIKE '%" . $stringSearchSQL . "%') AS template_name, - (SELECT (SELECT t1.name FROM talert_actions AS t1 WHERE t1.id = t2.id_alert_action AND t1.name LIKE '%" . $stringSearchSQL . "%') - FROM talert_template_module_actions AS t2 - WHERE t2.id_alert_template_module = id) AS action_name - FROM talert_template_modules - ) AS t - WHERE t.agent_name IS NOT NULL - OR t.template_name IS NOT NULL - OR t.action_name IS NOT NULL"; +if ($searchTab == 'alerts') { + $sql = "SELECT t1.disabled, t3.id_agente, t3.nombre AS agent_name, t2.nombre AS module_name, t4.name AS template_name, + (SELECT GROUP_CONCAT(t6.name) + FROM talert_template_module_actions AS t5 + INNER JOIN talert_actions AS t6 ON t6.id = t5.id_alert_action + WHERE t5.id_alert_template_module = t1.id) AS actions + FROM talert_template_modules AS t1 + INNER JOIN tagente_modulo AS t2 + ON t1.id_agent_module = t2.id_agente_modulo + INNER JOIN tagente AS t3 + ON t2.id_agente = t3.id_agente + INNER JOIN talert_templates AS t4 + ON t1.id_alert_template = t4.id + LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); $alerts = process_sql($sql); + + $sql = "SELECT COUNT(t1.id) + FROM talert_template_modules AS t1 + INNER JOIN tagente_modulo AS t2 + ON t1.id_agent_module = t2.id_agente_modulo + INNER JOIN tagente AS t3 + ON t2.id_agente = t3.id_agente + INNER JOIN talert_templates AS t4 + ON t1.id_alert_template = t4.id"; + $totalAlerts = get_db_row_sql($sql); + $totalAlerts = $totalAlerts[0]; + } $graphs = false; if ($searchTab == 'graphs') { if ($searchGraphs) { - $sql = "SELECT id_graph, name FROM tgraph WHERE name LIKE '%" . $stringSearchSQL . "%'"; + $sql = "SELECT id_graph, name, description FROM tgraph WHERE name LIKE '%" . $stringSearchSQL . "%' OR description LIKE '%" . $stringSearchSQL . "%' + LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); $graphs = process_sql($sql); + + $sql = "SELECT COUNT(id_graph) FROM tgraph WHERE name LIKE '%" . $stringSearchSQL . "%' OR description LIKE '%" . $stringSearchSQL . "%'"; + $totalGraphs = get_db_row_sql($sql); + $totalGraphs = $totalGraphs[0]; } } $reports = false; if (($config['search_category'] == 'all') || ($config['search_category'] == 'reports')) { - $sql = "SELECT id_report, name FROM treport WHERE name LIKE '%" . $stringSearchSQL . "%'"; + $sql = "SELECT id_report, name, description FROM treport WHERE name LIKE '%" . $stringSearchSQL . "%' + LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); $reports = process_sql($sql); + + $sql = "SELECT COUNT(id_report) FROM treport WHERE name LIKE '%" . $stringSearchSQL . "%'"; + $totalReports = get_db_row_sql($sql); + $totalReports = $totalReports[0]; } $maps = false; if (($config['search_category'] == 'all') || ($config['search_category'] == 'maps')) { if ($searchMaps) { - $sql = "SELECT id, name FROM tlayout WHERE name LIKE '%" . $stringSearchSQL . "%'"; + $sql = "SELECT t1.id, t1.name, t1.id_group, + (SELECT COUNT(*) FROM tlayout_data AS t2 WHERE t2.id_layout = t1.id) AS count + FROM tlayout AS t1 WHERE t1.name LIKE '%" . $stringSearchSQL . "%' + LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); $maps = process_sql($sql); + + $sql = "SELECT COUNT(id) FROM tlayout WHERE name LIKE '%" . $stringSearchSQL . "%'"; + $totalMaps = get_db_row_sql($sql); + $totalMaps = $totalMaps[0]; } } +///////// INI MENU AND TABS ///////////// + echo "