From cd08ba87b7d312da946d952d282d9f647e1528a1 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Mon, 18 May 2009 12:53:41 +0000 Subject: [PATCH] Schaltjahr... git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@373 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/95_holiday.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/FHEM/95_holiday.pm b/FHEM/95_holiday.pm index 6cee47331..d459dbacd 100755 --- a/FHEM/95_holiday.pm +++ b/FHEM/95_holiday.pm @@ -106,7 +106,7 @@ holiday_refresh($$) } elsif($a[1] < 0) { # N'th day from the end my $d = $fd[3] - ($a[1]+1)*7; 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); } @@ -147,4 +147,14 @@ holiday_Get($@) 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;