mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-07 19:04:20 +00:00
CTZ.pm: fix
git-svn-id: https://svn.fhem.de/fhem/trunk@25811 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
feed2bd1fa
commit
d245d0e25f
@ -34,7 +34,7 @@ use strict;
|
||||
use warnings;
|
||||
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 DateTime;
|
||||
@ -89,7 +89,10 @@ sub convertTimeZone {
|
||||
my $writelog = $paref->{writelog} // 0;
|
||||
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;
|
||||
}
|
||||
|
||||
@ -112,6 +115,14 @@ sub convertTimeZone {
|
||||
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
|
||||
###############################################################################
|
||||
|
Loading…
x
Reference in New Issue
Block a user