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

Merge branch '866-fixed-free-search-field-in-monitor-detail-view-dev' into 'develop' 

Fixed free search

See merge request !499
This commit is contained in:
vgilc 2017-05-31 17:03:10 +02:00
parent 00e73a8213 63129641eb
commit 956a4a1b20
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/operation/agentes/status_monitor.php
View File

@ -45,7 +45,7 @@ else {
ui_meta_print_header(__('Monitor view'));
}
$ag_freestring = get_parameter ('ag_freestring');
$ag_freestring = (string)get_parameter ('ag_freestring');
$moduletype = (string) get_parameter ('moduletype');
$datatype = (string) get_parameter ('datatype');
$ag_modulename = (string) get_parameter ('ag_modulename');
@ -160,14 +160,12 @@ if ($moduletype != '') {
$sql_conditions .= sprintf (' AND tagente_modulo.id_modulo =' .$moduletype);
}
// Freestring selector
if ($ag_freestring != '') {
$sql_conditions .= sprintf (' AND (tagente.nombre LIKE \'%%%s%%\'
OR tagente.alias LIKE \'%%%s%%\'
OR tagente_modulo.nombre LIKE \'%%%s%%\'
OR tagente_modulo.descripcion LIKE \'%%%s%%\')',
$ag_freestring, $ag_freestring, $ag_freestring);
$sql_conditions .= ' AND (tagente.nombre COLLATE utf8_general_ci LIKE \'%%' . $ag_freestring . '%%\'
OR tagente.alias COLLATE utf8_general_ci LIKE \'%%' . $ag_freestring . '%%\'
OR tagente_modulo.nombre COLLATE utf8_general_ci LIKE \'%%' . $ag_freestring . '%%\'
OR tagente_modulo.descripcion COLLATE utf8_general_ci LIKE \'%%' . $ag_freestring . '%%\')';
}
// Status selector