Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

57_CALVIEW.pm: from now we use fhemTimeLocal instead of timelocal

Browse Source 
-fixed problem with year check if yobfield is empty



git-svn-id: https://svn.fhem.de/fhem/trunk@13295 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
chris1284 2017-01-31 16:25:09 +00:00
parent 779cd88341
commit 1119cfdf46
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/57_CALVIEW.pm
View File

@ -110,7 +110,7 @@ sub CALVIEW_GetUpdate($){
if( defined($item->[5]) && length($item->[5]) > 0){ $item->[5] =~ s/\\,/,/g; } if( defined($item->[5]) && length($item->[5]) > 0){ $item->[5] =~ s/\\,/,/g; }
my $isostarttime = $Y."-".$M."-".$D."T".$tempstart[1]; my $isostarttime = $Y."-".$M."-".$D."T".$tempstart[1];
my $isoendtime = $eY."-".$eM."-".$eD."T".$tempend[1]; my $isoendtime = $eY."-".$eM."-".$eD."T".$tempend[1];
my $eventDate = timelocal(0,0,0,$D,$M-1,$Y); my $eventDate = fhemTimeLocal(0,0,0,$D,$M-1,$Y-1900);
my $daysleft = floor(($eventDate - time) / 60 / 60 / 24 + 1); my $daysleft = floor(($eventDate - time) / 60 / 60 / 24 + 1);
push @termineNew,{ push @termineNew,{
bdate => $tempstart[0], bdate => $tempstart[0],
@ -156,9 +156,9 @@ sub CALVIEW_GetUpdate($){
#alter berechnen wenn attribut gesetzt ist. alter wird aus "jahr des termins" - "geburtsjahr aus location oder description" errechnet #alter berechnen wenn attribut gesetzt ist. alter wird aus "jahr des termins" - "geburtsjahr aus location oder description" errechnet
if($isbday == 1 ){ if($isbday == 1 ){
@termyear = split(/\./,$termin->{bdate}); @termyear = split(/\./,$termin->{bdate});
if($yobfield eq "_location" && length($termin->{location}) > 0 && $termin->{location}=~ /^\d+$/ ) { $age = $termyear[2] - ($termin->{location});} if($yobfield eq "_location" && defined($termin->{location}) && length($termin->{location}) > 0 && $termin->{location}=~ /^\d+$/ ) { $age = $termyear[2] - ($termin->{location});}
elsif($yobfield eq "_description" && length($termin->{description}) > 0 && $termin->{description}=~ /^\d+$/) { $age = $termyear[2] - ($termin->{description});} elsif($yobfield eq "_description" && defined($termin->{description})&& length($termin->{description}) > 0 && $termin->{description}=~ /^\d+$/) { $age = $termyear[2] - ($termin->{description});}
elsif($yobfield eq "_summary" && length($termin->{summary}) > 0 ) {my ($byear) = $termin->{summary} =~ /(\d\d\d\d)/ ; $age = $termyear[2] - $byear;} elsif($yobfield eq "_summary" && defined($termin->{summary}) && length($termin->{summary}) > 0 ) {my ($byear) = $termin->{summary} =~ /(\d\d\d\d)/ ; $age = $termyear[2] - $byear;}
else {$age = " "} else {$age = " "}
} }