tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added alias search to general search and case no case sensitive search to agent details search field

This commit is contained in:
Arturo Gonzalez 2017-05-12 10:30:45 +02:00
parent 31bc5e08a1
commit 540aa60764
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/operation/agentes/estado_agente.php
View File

@ -367,7 +367,8 @@ if ($search != "") {
if($id != ''){
$aux = $id[0]['id_agent'];
$search_sql = " AND ( nombre " . $order_collation . "
LIKE '%$search%' OR tagente.id_agente = $aux";
COLLATE utf8_general_ci LIKE '%$search%' OR alias ".$order_collation." COLLATE utf8_general_ci LIKE '%$search%'
OR tagente.id_agente = $aux";
if(count($id)>=2){
for ($i = 1; $i < count($id); $i++){
$aux = $id[$i]['id_agent'];
@ -377,7 +378,7 @@ if ($search != "") {
$search_sql .= ")";
}else{
$search_sql = " AND ( nombre " . $order_collation . "
LIKE '%$search%' OR alias ".$order_collation." LIKE '%$search%') ";
COLLATE utf8_general_ci LIKE '%$search%' OR alias ".$order_collation." COLLATE utf8_general_ci LIKE '%$search%') ";
}
}
@ -428,9 +429,8 @@ if ($strict_user) {
$total_agents = tags_get_all_user_agents (false, $config['id_user'], $acltags, $count_filter, $fields, false, $strict_user, true);
$total_agents = count($total_agents);
$agents = tags_get_all_user_agents (false, $config['id_user'], $acltags, $filter, $fields, false, $strict_user, true);
}
else {
$total_agents = agents_get_agents(array (

3
pandora_console/operation/search_agents.getdata.php
View File

@ -125,6 +125,7 @@ if ($searchAgents) {
$aux = $id[0]['id_agent'];
$search_sql = " t1.nombre COLLATE utf8_general_ci LIKE '%%cd " . $stringSearchSQL . "%%' OR
t2.nombre COLLATE utf8_general_ci LIKE '%%" . $stringSearchSQL . "%%' OR
t1.alias COLLATE utf8_general_ci LIKE '%%" . $stringSearchSQL . "%%' OR
t1.id_agente = $aux";
if (count($id) >= 2) {
@ -180,7 +181,7 @@ if ($searchAgents) {
$query = $select . $sql;
$query .= $limit;
$agents = db_process_sql($query);
if (empty($agents))
$agents = array();