Merge branch 'ent-13602-resultado-de-item-event-module-event-report-en-template-no-devuelve-valores-con-regex' into 'develop'

Ent 13602 resultado de item event module event report en template no devuelve valores con regex

See merge request artica/pandorafms!7281
This commit is contained in:
Matias Didier 2024-04-25 16:04:32 +00:00
commit e59abe92c6
2 changed files with 7 additions and 3 deletions

View File

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

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']);
$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']);
$period = $date_params['period'];