FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 19:04:20 +00:00
Code Issues Releases Wiki Activity

CTZ.pm: fix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25811 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2022-03-10 21:58:07 +00:00
parent feed2bd1fa
commit d245d0e25f
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/lib/FHEM/Utility/CTZ.pm
View File

@ -34,7 +34,7 @@ use strict;
use warnings; use warnings;
use utf8; use utf8;
# use lib qw(/opt/fhem/FHEM /opt/fhem/lib); # für Syntaxcheck mit: perl -c /opt/fhem/lib/FHEM/Utility/CTZ.pm use lib qw(/opt/fhem/FHEM /opt/fhem/lib); # für Syntaxcheck mit: perl -c /opt/fhem/lib/FHEM/Utility/CTZ.pm
use GPUtils qw( GP_Import GP_Export ); use GPUtils qw( GP_Import GP_Export );
use DateTime; use DateTime;
@ -89,7 +89,10 @@ sub convertTimeZone {
my $writelog = $paref->{writelog} // 0; my $writelog = $paref->{writelog} // 0;
my $ms = q{}; my $ms = q{};
if ($dtstring =~ m/\.(\d+)/xs) { # datetime enthält Millisekunden return "no valid timezone $tzcurrent" if(!checkValidName($tzcurrent));
return "no valid timezone $tzconv" if(!checkValidName($tzconv) );
if ($dtstring =~ m/\.(\d+)/xs) { # datetime enthält Millisekunden
$ms = '.'.$1; $ms = '.'.$1;
} }
@ -112,6 +115,14 @@ sub convertTimeZone {
return ($err, $dtconv.$ms); return ($err, $dtconv.$ms);
} }
sub checkValidName {
my $tz = shift;
my $valid = DateTime::TimeZone->is_valid_name($tz);
return $valid;
}
############################################################################### ###############################################################################
# returns an array reference list of all possible time zone names # returns an array reference list of all possible time zone names
############################################################################### ###############################################################################