michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-23 14:50:32 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix to fail-proof time zone detection #1865

Browse Source
This commit is contained in:
iliajie
2023-03-19 19:05:23 +02:00
parent 24dba0f32b
commit 01ea77ebca
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web-lib-funcs.pl
View File

@@ -1996,8 +1996,15 @@ if (!$@) {
my $locale_default = &get_default_system_locale();
my $locale_auto = &parse_accepted_language();
my $locale_name = $opts->{'locale'} || $gconfig{'locale_'.$remote_user} || $locale_auto || $gconfig{'locale'} || &get_default_system_locale();
my $tz = $opts->{'tz'} ||
DateTime::TimeZone->new( name => 'local' )->name(); # Asia/Nicosia
my $tz = $opts->{'tz'};
if (!$tz) {
eval {
$tz = DateTime::TimeZone->new( name => 'local' )->name(); # Asia/Nicosia
};
if ($@) {
$tz = DateTime::TimeZone->new( name => 'UTC' )->name(); # UTC
}
}
my $locale = DateTime::Locale->load($locale_name);
my $locale_format_full_tz = $locale->glibc_date_1_format; # Sat 20 Nov 2286 17:46:39 UTC
my $locale_format_full = $locale->glibc_datetime_format; # Sat 20 Nov 2286 17:46:39