mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-21 01:46:08 +00:00
90_at.pm: fix strange mktime bug (Forum #52074)
git-svn-id: https://svn.fhem.de/fhem/trunk@11273 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
3c77967b8f
commit
e395ea797b
@ -70,7 +70,7 @@ at_Define($$)
|
|||||||
|
|
||||||
} elsif($tspec =~ m/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)$/) {
|
} elsif($tspec =~ m/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)$/) {
|
||||||
my ($y,$m,$d,$h,$m2,$s) = ($1,$2,$3,$4,$5,$6);
|
my ($y,$m,$d,$h,$m2,$s) = ($1,$2,$3,$4,$5,$6);
|
||||||
$abstime = mktime($s,$m2,$h,$d,$m-1,$y-1900);
|
$abstime = mktime($s,$m2,$h,$d,$m-1,$y-1900, 0,0,-1);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
($err, $hr, $min, $sec, $fn) = GetTimeSpec($tspec);
|
($err, $hr, $min, $sec, $fn) = GetTimeSpec($tspec);
|
||||||
@ -105,7 +105,8 @@ at_Define($$)
|
|||||||
} else {
|
} else {
|
||||||
my @lt = localtime($ot);
|
my @lt = localtime($ot);
|
||||||
($lt[2], $lt[1], $lt[0]) = ($hr+0, $min+0, $sec+0);
|
($lt[2], $lt[1], $lt[0]) = ($hr+0, $min+0, $sec+0);
|
||||||
$nt = mktime(@lt[0..6]);
|
$lt[8] = -1; # Forum #52074
|
||||||
|
$nt = mktime(@lt);
|
||||||
$nt += at_SecondsTillTomorrow($nt) if($ot >= $nt); # Do it tomorrow...
|
$nt += at_SecondsTillTomorrow($nt) if($ot >= $nt); # Do it tomorrow...
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user