From 654944b603bc46eed205a0db630fd0b674a2883a Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 20 Jul 2010 12:23:01 +0000 Subject: [PATCH] 2010-07-20 Miguel de Dios * operation/search_results.php: added icons for order columns in the user list and agent list. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3040 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 + pandora_console/operation/search_results.php | 258 +++++++++++++++++-- 2 files changed, 236 insertions(+), 27 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 7a38e4f8ea..51b769070a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2010-07-20 Miguel de Dios + + * operation/search_results.php: added icons for order columns in the user + list and agent list. + 2010-07-20 Miguel de Dios * godmode/setup/gis_step_2.php: fixed when the spanish translation have a diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php index fd6b315298..b0853e0574 100644 --- a/pandora_console/operation/search_results.php +++ b/pandora_console/operation/search_results.php @@ -34,10 +34,208 @@ else $searchTab = $config['search_category']; //INI SECURITY ACL if ((!$searchAgents) && ($searchTab == 'agents')) $searchTab = "users"; -if ((!$searchGraphs) && ($searchTab == 'graphs')) $searchTab = "users"; +if ((!$searchGraphs) && ($searchTab == 'graphs')) $searchTab = "users"; if ((!$searchMaps) && ($searchTab == 'maps')) $searchTab = "users"; //END SECURITY ACL +$offset = get_parameter ('offset',0); +$order = null; + +$sortField = get_parameter('sort_field'); +$sort = get_parameter('sort', 'none'); +$selected = 'border: 1px solid black;'; +switch ($searchTab) { + case 'agents': + $selectNameUp = ''; + $selectNameDown = ''; + $selectOsUp = ''; + $selectOsDown = ''; + $selectIntervalUp = ''; + $selectIntervalDown = ''; + $selectGroupUp = ''; + $selectGroupDown = ''; + $selectLastContactUp = ''; + $selectLastContactDown = ''; + + switch ($sortField) { + case 'name': + switch ($sort) { + case 'up': + $selectNameUp = $selected; + $order = array('field' => 'nombre', 'order' => 'ASC'); + break; + case 'down': + $selectNameDown = $selected; + $order = array('field' => 'nombre', 'order' => 'DESC'); + break; + } + break; + case 'os': + switch ($sort) { + case 'up': + $selectOsUp = $selected; + $order = array('field' => 'id_os', 'order' => 'ASC'); + break; + case 'down': + $selectOsDown = $selected; + $order = array('field' => 'id_os', 'order' => 'DESC'); + break; + } + break; + case 'interval': + switch ($sort) { + case 'up': + $selectIntervalUp = $selected; + $order = array('field' => 'intervalo', 'order' => 'ASC'); + break; + case 'down': + $selectIntervalDown = $selected; + $order = array('field' => 'intervalo', 'order' => 'DESC'); + break; + } + break; + case 'group': + switch ($sort) { + case 'up': + $selectGroupUp = $selected; + $order = array('field' => 'id_grupo', 'order' => 'ASC'); + break; + case 'down': + $selectGroupDown = $selected; + $order = array('field' => 'id_grupo', 'order' => 'DESC'); + break; + } + break; + case 'last_contact': + switch ($sort) { + case 'up': + $selectLastContactUp = $selected; + $order = array('field' => 'ultimo_contacto', 'order' => 'ASC'); + break; + case 'down': + $selectLastContactDown = $selected; + $order = array('field' => 'ultimo_contacto', 'order' => 'DESC'); + break; + } + break; + default: + $selectNameUp = $selected; + $selectNameDown = ''; + $selectOsUp = ''; + $selectOsDown = ''; + $selectIntervalUp = ''; + $selectIntervalDown = ''; + $selectGroupUp = ''; + $selectGroupDown = ''; + $selectLastContactUp = ''; + $selectLastContactDown = ''; + $order = array('field' => 'nombre', 'order' => 'ASC'); + break; + } + break; + case 'users': + $selectUserIDUp = ''; + $selectUserIDDown = ''; + $selectNameUp = ''; + $selectNameDown = ''; + $selectEmailUp = ''; + $selectEmailDown = ''; + $selectLastContactUp = ''; + $selectLastContactDown = ''; + $selectProfileUp = ''; + $selectProfileDown = ''; + + switch ($sortField) { + case 'id_user': + switch ($sort) { + case 'up': + $selectUserIDUp = $selected; + $order = array('field' => 'id_user', 'order' => 'ASC'); + break; + case 'down': + $selectUserIDDown = $selected; + $order = array('field' => 'id_user', 'order' => 'DESC'); + break; + } + break; + case 'name': + switch ($sort) { + case 'up': + $selectNameUp = $selected; + $order = array('field' => 'fullname', 'order' => 'ASC'); + break; + case 'down': + $selectNameDown = $selected; + $order = array('field' => 'fullname', 'order' => 'DESC'); + break; + } + break; + case 'email': + switch ($sort) { + case 'up': + $selectLastContactUp = $selected; + $order = array('field' => 'email', 'order' => 'ASC'); + break; + case 'down': + $selectEmailDown = $selected; + $order = array('field' => 'email', 'order' => 'DESC'); + break; + } + break; + case 'last_contact': + switch ($sort) { + case 'up': + $selectLastContactUp = $selected; + $order = array('field' => 'last_connect', 'order' => 'ASC'); + break; + case 'down': + $selectLastContactDown = $selected; + $order = array('field' => 'last_connect', 'order' => 'DESC'); + break; + } + break; + case 'last_contact': + switch ($sort) { + case 'up': + $selectLastContactUp = $selected; + $order = array('field' => 'last_connect', 'order' => 'ASC'); + break; + case 'down': + $selectLastContactDown = $selected; + $order = array('field' => 'last_connect', 'order' => 'DESC'); + break; + } + break; + case 'profile': + switch ($sort) { + case 'up': + $selectProfileUp = $selected; + $order = array('field' => 'is_admin', 'order' => 'ASC'); + break; + case 'down': + $selectProfileDown = $selected; + $order = array('field' => 'is_admin', 'order' => 'DESC'); + break; + } + break; + default: + $selectUserIDUp = ''; + $selectUserIDDown = ''; + $selectNameUp = ''; + $selectNameDown = ''; + $selectEmailUp = ''; + $selectEmailDown = ''; + $selectLastContactUp = ''; + $selectLastContactDown = ''; + $selectProfileUp = ''; + $selectProfileDown = ''; + + $order = array('field' => 'id_user', 'order' => 'ASC'); + break; + } + break; +} + $agents = false; if ($searchTab == 'agents') { if ($searchAgents) { @@ -47,6 +245,7 @@ if ($searchTab == 'agents') { ON tgrupo.id_grupo = tagente.id_grupo WHERE tagente.nombre COLLATE utf8_general_ci LIKE '%" . $stringSearchSQL . "%' OR tgrupo.nombre LIKE '%" . $stringSearchSQL . "%' + ORDER BY " . $order['field'] . " " . $order['order'] . " LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); $agents = process_sql($sql); @@ -70,6 +269,7 @@ if ($searchTab == 'users') { lastname LIKE '%" . $stringSearchSQL . "%' OR middlename LIKE '%" . $stringSearchSQL . "%' OR email LIKE '%" . $stringSearchSQL . "%' + ORDER BY " . $order['field'] . " " . $order['order'] . " LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); $users = process_sql($sql); @@ -157,22 +357,6 @@ if (($config['search_category'] == 'all') || ($config['search_category'] == 'map $img_style = array ("class" => "top", "width" => 16); -/* -echo '