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

[Secondary Groups] More events fixes

Browse Source
This commit is contained in:
fermin831 2018-03-27 18:07:43 +02:00
parent 4d78b28d17
commit 2839388e9e
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pandora_console/operation/events/events_list.php
View File

@ -739,32 +739,12 @@ echo "</div>";
$event_table = events_get_events_table($meta, $history); $event_table = events_get_events_table($meta, $history);
if ($group_rep == 0) { if ($group_rep == 0) {
switch ($config["dbtype"]) { $sql = "SELECT *, 1 event_rep
case "mysql": FROM $event_table te LEFT JOIN tagent_secondary_group tasg
$sql = "SELECT *, 1 event_rep ON te.id_agente = tasg.id_agent
FROM $event_table te LEFT JOIN tagent_secondary_group tasg WHERE 1=1 " . $sql_post . "
ON te.id_grupo = tasg.id_group ORDER BY utimestamp DESC LIMIT ".$offset.",".$pagination;
WHERE 1=1 " . $sql_post . "
ORDER BY utimestamp DESC LIMIT ".$offset.",".$pagination;
break;
case "postgresql":
$sql = "SELECT *, 1 event_rep
FROM $event_table
WHERE 1=1 " . $sql_post . "
ORDER BY utimestamp DESC LIMIT ".$pagination." OFFSET ".$offset;
break;
case "oracle":
$set = array();
$set['limit'] = $pagination;
$set['offset'] = $offset;
$sql = "SELECT $event_table.*, 1 event_rep
FROM $event_table
WHERE 1=1 " . $sql_post . "
ORDER BY utimestamp DESC";
$sql = oracle_recode_query ($sql, $set);
break;
}
//Extract the events by filter (or not) from db //Extract the events by filter (or not) from db
$result = db_get_all_rows_sql ($sql); $result = db_get_all_rows_sql ($sql);
} }
@ -831,7 +811,7 @@ if ($group_rep == 0) {
$sql = "SELECT COUNT(id_evento) $sql = "SELECT COUNT(id_evento)
FROM $event_table te FROM $event_table te
LEFT JOIN tagent_secondary_group tasg LEFT JOIN tagent_secondary_group tasg
ON te.id_grupo = tasg.id_group ON te.id_agente = tasg.id_agent
WHERE 1=1 $sql_post"; WHERE 1=1 $sql_post";
$total_events = (int) db_get_sql ($sql); $total_events = (int) db_get_sql ($sql);
} }