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

qa event viewer latest fixes

This commit is contained in:
fbsanchez 2019-06-20 21:33:38 +02:00
parent 526ebdebd9
commit 7a425e7e96
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/functions_events.php
View File

@ -794,21 +794,19 @@ function events_get_all(
); );
} else { } else {
$children = groups_get_children($groups); $children = groups_get_children($groups);
$_groups = []; $_groups = [ $groups ];
if (!empty($children)) { if (!empty($children)) {
foreach ($children as $child) { foreach ($children as $child) {
$_groups[] = (int) $child['id_grupo']; $_groups[] = (int) $child['id_grupo'];
} }
$groups = $_groups;
} else {
$groups = [ $groups ];
} }
$groups = $_groups;
$sql_filters[] = sprintf( $sql_filters[] = sprintf(
' AND (te.id_grupo IN (%s) OR tasg.id_group IN (%s)', ' AND (te.id_grupo IN (%s) OR tasg.id_group IN (%s))',
join(',', array_keys($groups)), join(',', $groups),
join(',', array_keys($groups)) join(',', $groups)
); );
} }
} }
@ -1185,8 +1183,8 @@ function events_get_all(
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))', ' AND (tg.id_grupo IN (%s) OR tasg.id_group IN (%s))',
join(', ', array_keys($groups)), join(', ', $groups),
join(', ', array_keys($groups)) join(', ', $groups)
); );
} else { } else {
$tgrupo_join_filters[] = sprintf( $tgrupo_join_filters[] = sprintf(