mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-04 22:19:38 +00:00
Schaltjahr...
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@373 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
242d2889c9
commit
cd08ba87b7
@ -106,7 +106,7 @@ holiday_refresh($$)
|
|||||||
} elsif($a[1] < 0) { # N'th day from the end
|
} elsif($a[1] < 0) { # N'th day from the end
|
||||||
my $d = $fd[3] - ($a[1]+1)*7;
|
my $d = $fd[3] - ($a[1]+1)*7;
|
||||||
my $md = $md[$fd[4]];
|
my $md = $md[$fd[4]];
|
||||||
$md++ if($fd[5]%4 == 0);
|
$md++ if(schaltjahr($fd[5]+1900) && $fd[4] == 1);
|
||||||
next if($d > $md || $d < $md-6);
|
next if($d > $md || $d < $md-6);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -147,4 +147,14 @@ holiday_Get($@)
|
|||||||
return holiday_refresh($hash->{NAME}, $a[1]);
|
return holiday_refresh($hash->{NAME}, $a[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub
|
||||||
|
schaltjahr($)
|
||||||
|
{
|
||||||
|
my($jahr) = @_;
|
||||||
|
return 0 if $jahr % 4; # 2009
|
||||||
|
return 1 unless $jahr % 400; # 2000
|
||||||
|
return 0 unless $jahr % 100; # 2100
|
||||||
|
return 1; # 2012
|
||||||
|
}
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user