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

13602-Fix report end time. Fix item Module event report in report templates

This commit is contained in:
Pablo Aragon 2024-04-25 10:21:15 +02:00
parent b30db22736
commit aaedce6d46
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/functions_reporting.php
View File

@ -2736,7 +2736,8 @@ function reporting_event_report_module(
$ttl, $ttl,
$id_server, $id_server,
$metaconsole_dbtable, $metaconsole_dbtable,
$filter_event_filter_exclude $filter_event_filter_exclude,
$content['id_agent_module']
); );
if (empty($data)) { if (empty($data)) {
@ -11728,7 +11729,8 @@ function reporting_get_module_detailed_event(
$ttl=1, $ttl=1,
$id_server=false, $id_server=false,
$metaconsole_dbtable=false, $metaconsole_dbtable=false,
$filter_event_filter_exclude=false $filter_event_filter_exclude=false,
$id_agent=false
) { ) {
global $config; global $config;
@ -11751,7 +11753,7 @@ function reporting_get_module_detailed_event(
foreach ($id_modules as $id_module) { foreach ($id_modules as $id_module) {
$event['data'] = events_get_agent( $event['data'] = events_get_agent(
false, $id_agent,
(int) $period, (int) $period,
(int) $date, (int) $date,
$history, $history,

2
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -53,6 +53,8 @@ $time_start = date('H:i:s', $date_params['date_init']);
$date_init = date('Y/m/d', $date_params['date_init']); $date_init = date('Y/m/d', $date_params['date_init']);
$time_init = date('H:i:s', $date_params['date_init']); $time_init = date('H:i:s', $date_params['date_init']);
$time = $time_end;
$custom_date_end = date('Y/m/d H:i:s', $date_params['date_end']); $custom_date_end = date('Y/m/d H:i:s', $date_params['date_end']);
$period = $date_params['period']; $period = $date_params['period'];