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

Fix secondary groups match while group filtering

This commit is contained in:
fbsanchez 2020-10-05 12:45:26 +02:00
parent b1d218d875
commit cc3189196c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/include/functions_events.php
View File

@ -1063,6 +1063,7 @@ function events_get_all(
} }
} }
$_tmp = '';
foreach ($tags as $id_tag) { foreach ($tags as $id_tag) {
if (!isset($tags_names[$id_tag])) { if (!isset($tags_names[$id_tag])) {
$tags_names[$id_tag] = tags_get_name($id_tag); $tags_names[$id_tag] = tags_get_name($id_tag);
@ -1304,6 +1305,7 @@ function events_get_all(
$tgrupo_join = 'LEFT'; $tgrupo_join = 'LEFT';
$tgrupo_join_filters = []; $tgrupo_join_filters = [];
if (isset($groups) if (isset($groups)
&& (is_array($groups) && (is_array($groups)
|| $groups > 0) || $groups > 0)
@ -1311,17 +1313,21 @@ function events_get_all(
$tgrupo_join = 'INNER'; $tgrupo_join = 'INNER';
if (is_array($groups)) { if (is_array($groups)) {
$tgrupo_join_filters[] = sprintf( $tgrupo_join_filters[] = sprintf(
' AND (tg.id_grupo IN (%s) OR tasg.id_group IN (%s))', ' (te.id_grupo = tg.id_grupo AND tg.id_grupo IN (%s))
OR (te.id_agente = tasg.id_agent AND tasg.id_group IN (%s)))',
join(', ', $groups), join(', ', $groups),
join(', ', $groups) join(', ', $groups)
); );
} else { } else {
$tgrupo_join_filters[] = sprintf( $tgrupo_join_filters[] = sprintf(
' AND (tg.id_grupo = %s OR tasg.id_group = %s)', ' (te.id_grupo = tg.id_grupo AND tg.id_grupo = %s)
OR (te.id_agente = tasg.id_agent AND tasg.id_group = %s)',
$groups, $groups,
$groups $groups
); );
} }
} else {
$tgrupo_join_filters[] = ' te.id_grupo = tg.id_grupo';
} }
$server_join = ''; $server_join = '';
@ -1376,8 +1382,7 @@ function events_get_all(
%s %s
%s %s
%s JOIN tgrupo tg %s JOIN tgrupo tg
ON te.id_grupo = tg.id_grupo ON %s
%s
%s %s
WHERE 1=1 WHERE 1=1
%s %s