tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 09:15:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Secondary groups] Fixed get agents function to works properly with groups view

Browse Source
This commit is contained in:
fermin831 2018-04-09 12:40:52 +02:00
parent 9972252a3f
commit 8da6eca4ab
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_agents.php
View File

@ -375,7 +375,6 @@ function agents_get_agents ($filter = false, $fields = false,
if (empty ($filter['id_grupo'])) { if (empty ($filter['id_grupo'])) {
$all_groups = true; $all_groups = true;
$filter['id_grupo'] = $groups; $filter['id_grupo'] = $groups;
$filter['id_group'] = $groups;
} }
elseif (! is_array ($filter['id_grupo'])) { elseif (! is_array ($filter['id_grupo'])) {
$all_groups = false; $all_groups = false;
@ -384,7 +383,6 @@ function agents_get_agents ($filter = false, $fields = false,
return false; return false;
} }
$filter['id_grupo'] = (array) $filter['id_grupo']; //Make an array $filter['id_grupo'] = (array) $filter['id_grupo']; //Make an array
$filter['id_group'] = (array) $filter['id_grupo']; //Make an array
} }
else { else {
$all_groups = true; $all_groups = true;
@ -398,8 +396,8 @@ function agents_get_agents ($filter = false, $fields = false,
if (count ($filter['id_grupo']) == 0) { if (count ($filter['id_grupo']) == 0) {
return false; return false;
} }
$filter['id_group'] = $filter['id_grupo'];
} }
$filter['id_group'] = $filter['id_grupo'];
if (in_array (0, $filter['id_grupo'])) { if (in_array (0, $filter['id_grupo'])) {
unset ($filter['id_grupo']); unset ($filter['id_grupo']);
@ -438,6 +436,8 @@ function agents_get_agents ($filter = false, $fields = false,
) , 'OR', ''); ) , 'OR', '');
unset($filter['id_group']); unset($filter['id_group']);
unset($filter['id_grupo']); unset($filter['id_grupo']);
unset($filter_nogroup['id_grupo']);
unset($filter_nogroup['id_group']);
} }
// Add the group filter to // Add the group filter to
$where = db_format_array_where_clause_sql ($filter, 'AND', "(" . $where_secondary . ") AND "); $where = db_format_array_where_clause_sql ($filter, 'AND', "(" . $where_secondary . ") AND ");
@ -484,7 +484,6 @@ function agents_get_agents ($filter = false, $fields = false,
$limit_sql = " LIMIT $offset, $limit "; $limit_sql = " LIMIT $offset, $limit ";
} }
$sql = sprintf("%s %s", $sql, $limit_sql); $sql = sprintf("%s %s", $sql, $limit_sql);
if ($return) return $sql; if ($return) return $sql;
else $agents = db_get_all_rows_sql($sql); else $agents = db_get_all_rows_sql($sql);