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

Merge branch 'ent-7411-Error-SQL-en-items-Module-event-report-y-Agent-event-report-metaconsola' into 'develop' 

Fixed errors SQL metaconsole events

See merge request artica/pandorafms!4076
This commit is contained in:
Daniel Rodriguez 2021-04-28 08:44:26 +00:00
parent 5857c0d231 8324655aab
commit e117fd8fd0
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions_events.php
View File

@ -3013,15 +3013,11 @@ function events_get_agent(
) { ) {
global $config; global $config;
if (!is_numeric($date)) { if (is_numeric($date) === false) {
$date = time_w_fixed_tz($date); $date = time_w_fixed_tz($date);
} }
if (is_metaconsole() && $events_group === false) { if (empty($date) === true) {
$id_server = true;
}
if (empty($date)) {
$date = get_system_time(); $date = get_system_time();
} }
@ -3156,7 +3152,7 @@ function events_get_agent(
} }
} }
if (is_metaconsole() && $id_server) { if (is_metaconsole() === true && empty($id_server) === false) {
$sql_where .= ' AND server_id = '.$id_server; $sql_where .= ' AND server_id = '.$id_server;
} }
@ -3173,7 +3169,7 @@ function events_get_agent(
} else { } else {
return events_get_events_no_grouped( return events_get_events_no_grouped(
$sql_where, $sql_where,
(is_metaconsole() === true && $id_server === false) ? true : false, (is_metaconsole() === true && empty($id_server) === false) ? true : false,
$history $history
); );
} }