tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

#11391 Fixed date

Browse Source
This commit is contained in:
Daniel Maya 2023-10-02 12:39:40 +02:00
parent 528c5a726a
commit 06e42de207
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/class/ConsoleSupervisor.php
View File

@ -2103,8 +2103,8 @@ class ConsoleSupervisor
$this->notify( $this->notify(
[ [
'type' => 'NOTIF.EXT.ELASTICSEARCH', 'type' => 'NOTIF.EXT.ELASTICSEARCH',
'title' => __('Log collector cannot connect to ElasticSearch'), 'title' => __('Log collector cannot connect to OpenSearch'),
'message' => __('ElasticSearch is not available using current configuration.'), 'message' => __('OpenSearch is not available using current configuration.'),
'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=log', 'url' => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=log',
] ]
); );

14
pandora_console/include/functions_html.php
View File

@ -7269,7 +7269,9 @@ function html_print_select_date_range(
$date_end='', $date_end='',
$time_end='', $time_end='',
$date_text=SECONDS_1DAY, $date_text=SECONDS_1DAY,
$class='w100p' $class='w100p',
$date_format='Y/m/d',
$time_format='H:i:s'
) { ) {
global $config; global $config;
@ -7291,21 +7293,21 @@ function html_print_select_date_range(
} }
if ($date_end === '') { if ($date_end === '') {
$date_end = date('Y/m/d'); $date_end = date($date_format);
} }
if ($date_init === '') { 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 === '') { if ($time_init === '') {
$time_init = date('H:i:s'); $time_init = date($time_format);
} }
if ($time_end === '') { if ($time_end === '') {
$time_end = date('H:i:s'); $time_end = date($time_format);
} }
$fields[SECONDS_1DAY] = __('Last 24hr'); $fields[SECONDS_1DAY] = __('Last 24hr');