From 470cae8ae91204bb3b4df1bc2254aebbfce1f758 Mon Sep 17 00:00:00 2001 From: phenning <> Date: Sat, 10 Mar 2018 07:01:51 +0000 Subject: [PATCH] 95_Alarm.pm: Neue Version 4.05 git-svn-id: https://svn.fhem.de/fhem/trunk@16368 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/95_Alarm.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/95_Alarm.pm b/fhem/FHEM/95_Alarm.pm index f4f8e8ed6..55db8bdec 100644 --- a/fhem/FHEM/95_Alarm.pm +++ b/fhem/FHEM/95_Alarm.pm @@ -43,7 +43,7 @@ my $alarmlinkname = "Alarms"; # link text my $alarmhiddenroom = "AlarmRoom"; # hidden room my $alarmpublicroom = "Alarm"; # public room my $alarmno = 8; -my $alarmversion = "4.03"; +my $alarmversion = "4.05"; my %alarm_transtable_EN = ( "ok" => "OK", @@ -270,7 +270,6 @@ sub Alarm_transform($){ if( $md==1 ); } - ######################################################################################### # # Alarm_Undef - Implements Undef function @@ -510,11 +509,10 @@ sub Alarm_escape($$){ sub Alarm_save($) { my ($hash) = @_; - my $date = localtime(time); + my $date = TimeNow(); $hash->{DATA}{"savedate"} = $date; - readingsSingleUpdate( $hash, "savedate", $hash->{DATA}{"savedate"}, 1 ); - my $json = JSON->new->utf8; - my $jhash0 = eval{ $json->encode( $hash->{DATA} ) }; + readingsSingleUpdate( $hash, "savedate", $date, 1 ); + my $jhash0 = toJSON($hash->{DATA}); my $error = FileWrite("AlarmFILE",$jhash0); #Log 1,"[Alarm_save] error=$error"; return; @@ -1271,6 +1269,8 @@ sub Alarm_Html($) $al .= $i.","; $at .= $s.","; } + }else{ + $detailstate .= "-"; } $ret .= $s."'"; $ret .= ",'"