diff --git a/fhem/CHANGED b/fhem/CHANGED index 84e16391f..cf4ededa3 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 88_Timer: fix PERL WARNING: Use of uninitialized value - bugfix: 73_AutoShuttersControl: fix SelfDefense drive up then coming home up at night - feature: 30_HUEBridge, 31_HUEDevice: added deCONZ scenes (by shadowghost) diff --git a/fhem/FHEM/88_Timer.pm b/fhem/FHEM/88_Timer.pm index 091cca11f..9be460144 100644 --- a/fhem/FHEM/88_Timer.pm +++ b/fhem/FHEM/88_Timer.pm @@ -571,7 +571,7 @@ sub Timer_FW_Detail($$$$) { for(my $spalte = 1; $spalte <= $cnt_max; $spalte++) { $style_code1 .= "Padding-bottom:5px; " if ($zeile == $Timers_Count - 1); # letzte Zeile $html.= "".sprintf("%02s", $timer_nr[$zeile])."" if ($spalte == 1); # Spalte Timer-Nummer - if ($spalte >=2 && $spalte <= 7) { ## DropDown-Listen fuer Jahr, Monat, Tag, Stunde, Minute, Sekunde + if ($spalte >=2 && $spalte <= 7) { ## DropDown-Listen fuer Jahr, Monat, Tag, Stunde, Minute, Sekunde my $start = 0; # Stunde, Minute, Sekunde my $stop = 12; # Monat my $step = 1; # Jahr, Monat, Tag, Stunde, Minute @@ -601,7 +601,7 @@ sub Timer_FW_Detail($$$$) { $html.=""; } - if ($spalte == 8) { ## Spalte Geraete + if ($spalte == 8) { ## Spalte Geraete $id ++; my $comment = ""; $comment = AttrVal($select_Value[$spalte-2],"alias","") if (AttrVal($name,"Show_DeviceInfo","") eq "alias"); @@ -609,7 +609,7 @@ sub Timer_FW_Detail($$$$) { $html.= "
$comment"; } - if ($spalte == 9) { ## DropDown-Liste Aktion + if ($spalte == 9) { ## DropDown-Liste Aktion $id ++; $html.= ""; } - if ($spalte > 9 && $spalte < $cnt_max) { ## Spalte Wochentage + aktiv + if ($spalte > 9 && $spalte < $cnt_max) { ## Spalte Wochentage + aktiv $id ++; $html.= "" if ($select_Value[$spalte-2] eq "0"); $html.= "" if ($select_Value[$spalte-2] eq "1"); } - if ($spalte == $cnt_max) { ## Button Speichern + if ($spalte == $cnt_max) { ## Button Speichern $id ++; $html.= " "; # 🖫 💾 } Log3 $name, 5, "$name: attr2html | Timer=".$timer_nr[$zeile]." ".$names[$spalte-1]."=".$select_Value[$spalte-2]." cnt_max=$cnt_max ($spalte)" if ($spalte > 1 && $spalte < $cnt_max); } - $html.= ""; ## Zeilenende + $html.= ""; ## Zeilenende } - $html.= ""; ## Tabellenende + $html.= ""; ## Tabellenende ## Tabellenende + Script $html.= ' @@ -760,8 +760,8 @@ sub FW_pushed_savebutton { } } - return "ERROR: The time is in the past. Please set a time in the future!" if ((time() - fhemTimeLocal($sec, $min, $hour, $mday, $month, $year)) > 0); - return "ERROR: The next switching point is too small!" if ((fhemTimeLocal($sec, $min, $hour, $mday, $month, $year) - time()) < 60); + return "ERROR: The time is in the past. Please set a time in the future!" if ((time() - fhemTimeLocal($sec, $min, $hour, $mday, $month - 1, $year)) > 0); + return "ERROR: The next switching point is too small!" if ((fhemTimeLocal($sec, $min, $hour, $mday, $month - 1, $year) - time()) < 60); readingsDelete($hash,"Timer_".sprintf("%02s", $timer)."_set") if ($selected_buttons[8] ne "DEF" && ReadingsVal($name, "Timer_".sprintf("%02s", $timer)."_set", 0) ne "0");