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

Fixed agent filter on agents/module view to see secondary groups

This commit is contained in:
fermin831 2018-10-11 15:45:11 +02:00
parent c8121d7df3
commit c74e4a3d6a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pandora_console/operation/agentes/ver_agente.php
View File

@ -68,14 +68,18 @@ if (is_ajax ()) {
} }
} }
else { else {
$groups_orig = users_get_groups(false, $privilege); $groups_orig = users_get_groups(false, $privilege, false);
$groups = array_keys($groups_orig); $groups = array_keys($groups_orig);
} }
// Build filter // Build filter
$filter = array(); $filter = array();
$filter['id_grupo'] = $groups; // Group filter (primary and secondary)
$filter[] = "(" .db_format_array_where_clause_sql(
array('id_grupo' => $groups, 'id_group' => $groups),
'OR'
) . ")";
if (!empty($id_os)) if (!empty($id_os))
$filter['id_os'] = $id_os; $filter['id_os'] = $id_os;
if (!empty($agent_name)) if (!empty($agent_name))
@ -158,12 +162,17 @@ if (is_ajax ()) {
} }
} }
$filter['group'] = 'id_agente';
// Build fields // Build fields
$fields = array('id_agente', 'alias'); $fields = array('id_agente', 'alias');
// Perform search // Perform search
$agents = db_get_all_rows_filter('tagente', $filter, $fields); $agents = db_get_all_rows_filter(
'tagente LEFT JOIN tagent_secondary_group ON id_agente=id_agent',
$filter,
$fields
);
if (empty($agents)) $agents = array(); if (empty($agents)) $agents = array();
foreach ($agents as $k => $v) { foreach ($agents as $k => $v) {