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

Merge branch 'ent-9140-POST-Usuarios-LDAP-no-ven-comentarios-de-eventos-agrupados' into 'develop'

Browse Source 
Ent 9140 post usuarios ldap no ven comentarios de eventos agrupados

See merge request artica/pandorafms!4993
This commit is contained in:
Diego Muñoz-Reja 2022-07-19 13:07:45 +00:00
commit 288e6f3a53
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pandora_console/include/ajax/events.php
View File

@ -97,29 +97,27 @@ if ($get_comments === true) {
$eventsGrouped = []; $eventsGrouped = [];
// Consider if the event is grouped. // Consider if the event is grouped.
$whereGrouped = '1=1'; $whereGrouped = '1=1';
if (isset($event['event_rep']) === true && $event['event_rep'] > 0) { // Default grouped message filtering (evento and estado).
// Default grouped message filtering (evento and estado). $whereGrouped = sprintf(
$whereGrouped = sprintf( '`evento` = "%s" AND `estado` = "%s" AND `event_type` = "%s" ',
'`evento` = "%s" AND `estado` = "%s" AND `event_type` = "%s" ', $event['evento'],
$event['evento'], $event['estado'],
$event['estado'], $event['event_type']
$event['event_type'] );
// If id_agente is reported, filter the messages by them as well.
if ((int) $event['id_agente'] > 0) {
$whereGrouped .= sprintf(
' AND `id_agente` = %d',
(int) $event['id_agente']
); );
}
// If id_agente is reported, filter the messages by them as well. if ((int) $event['id_agentmodule'] > 0) {
if ((int) $event['id_agente'] > 0) { $whereGrouped .= sprintf(
$whereGrouped .= sprintf( ' AND `id_agentmodule` = %d',
' AND `id_agente` = %d', (int) $event['id_agentmodule']
(int) $event['id_agente'] );
);
}
if ((int) $event['id_agentmodule'] > 0) {
$whereGrouped .= sprintf(
' AND `id_agentmodule` = %d',
(int) $event['id_agentmodule']
);
}
} }
try { try {