From 06e42de207d8c19eb0afd25af2b1344be307d456 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 2 Oct 2023 12:39:40 +0200 Subject: [PATCH] #11391 Fixed date --- .../include/class/ConsoleSupervisor.php | 4 ++-- pandora_console/include/functions_html.php | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index a434a30e7f..8aea7fae2d 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -2103,8 +2103,8 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.EXT.ELASTICSEARCH', - 'title' => __('Log collector cannot connect to ElasticSearch'), - 'message' => __('ElasticSearch is not available using current configuration.'), + 'title' => __('Log collector cannot connect to OpenSearch'), + 'message' => __('OpenSearch is not available using current configuration.'), 'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup§ion=log', ] ); diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index f0368cf79e..e249c90031 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -7269,7 +7269,9 @@ function html_print_select_date_range( $date_end='', $time_end='', $date_text=SECONDS_1DAY, - $class='w100p' + $class='w100p', + $date_format='Y/m/d', + $time_format='H:i:s' ) { global $config; @@ -7291,21 +7293,21 @@ function html_print_select_date_range( } if ($date_end === '') { - $date_end = date('Y/m/d'); + $date_end = date($date_format); } if ($date_init === '') { - $date_init = date('Y/m/d', strtotime($date_end.' -1 days')); + $date_init = date($date_format, strtotime($date_end.' -1 days')); } - $date_init = date('Y/m/d', strtotime($date_init)); + $date_init = date($date_format, strtotime($date_init)); if ($time_init === '') { - $time_init = date('H:i:s'); + $time_init = date($time_format); } if ($time_end === '') { - $time_end = date('H:i:s'); + $time_end = date($time_format); } $fields[SECONDS_1DAY] = __('Last 24hr');