diff --git a/fhem/FHEM/95_Alarm.pm b/fhem/FHEM/95_Alarm.pm index f530712d2..f4f8e8ed6 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.02"; +my $alarmversion = "4.03"; my %alarm_transtable_EN = ( "ok" => "OK", @@ -1115,7 +1115,7 @@ sub Alarm_widget($){ #-- no webarg, check direct parameter. TODO: order if( !defined($name) || $name eq "" ){ - if( $arg =~ /^name=(\w*)&gstate=(.+)&dstate=(.+)&size=(\d+x\d+)/ ){ + if( $arg =~ /^name=(\w*)&gstate=(.+)&dstate=(.*)&size=(\d+x\d+)/ ){ $name = $1; $gstate = $2; $dstate = $3; diff --git a/fhem/FHEM/95_Babble.pm b/fhem/FHEM/95_Babble.pm index 0b7282943..04b0789ec 100644 --- a/fhem/FHEM/95_Babble.pm +++ b/fhem/FHEM/95_Babble.pm @@ -42,7 +42,7 @@ use JSON; # imports encode_json, decode_json, to_json and from_json. my $babblelinkname = "babbles"; # link text my $babblehiddenroom = "babbleRoom"; # hidden room my $babblepublicroom = "babble"; # public room -my $babbleversion = "1.07"; +my $babbleversion = "1.08"; my %babble_transtable_EN = ( "ok" => "OK", diff --git a/fhem/FHEM/95_YAAHM.pm b/fhem/FHEM/95_YAAHM.pm index 96fa2621c..ae17b7bac 100644 --- a/fhem/FHEM/95_YAAHM.pm +++ b/fhem/FHEM/95_YAAHM.pm @@ -47,7 +47,7 @@ my $yaahmname; my $yaahmlinkname = "Profile"; # link text my $yaahmhiddenroom = "ProfileRoom"; # hidden room my $yaahmpublicroom = "Unsorted"; # public room -my $yaahmversion = "1.45"; +my $yaahmversion = "1.46"; my $firstcall = 1; my %yaahm_transtable_EN = ( @@ -1236,6 +1236,8 @@ sub YAAHM_nextWeeklyTime { return $msg; } + $time = lc($time); + #-- check value - may be empty if( $time eq "" || $time eq "default" ){ $time = ""; diff --git a/fhem/www/pgm2/alarm.js b/fhem/www/pgm2/alarm.js index 47cdca2f4..1fe7e00de 100644 --- a/fhem/www/pgm2/alarm.js +++ b/fhem/www/pgm2/alarm.js @@ -1,6 +1,6 @@ //######################################################################################## // alarm.js -// Version 4.01 +// Version 4.03 // See 95_Alarm for licensing //######################################################################################## //# Prof. Dr. Peter A. Henning @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------------------------------ var req = new XMLHttpRequest(); -req.open('GET', document.location, false); +req.open('HEAD', document.location.href, false); req.send(null); var csrfToken = req.getResponseHeader('X-FHEM-csrfToken'); if( csrfToken == null ){ diff --git a/fhem/www/pgm2/babble.js b/fhem/www/pgm2/babble.js index 4158b838e..1bfd08f10 100644 --- a/fhem/www/pgm2/babble.js +++ b/fhem/www/pgm2/babble.js @@ -1,6 +1,6 @@ //######################################################################################## // babble.js -// Version 1.06 +// Version 1.08 // See 95_Babble for licensing //######################################################################################## //# Prof. Dr. Peter A. Henning @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------------------------------ var req = new XMLHttpRequest(); -req.open('GET', document.location, false); +req.open('HEAD', document.location.href, false); req.send(null); var csrfToken = req.getResponseHeader('X-FHEM-csrfToken'); if( csrfToken == null ){ diff --git a/fhem/www/pgm2/yaahm.js b/fhem/www/pgm2/yaahm.js index bdc5527f6..259186318 100644 --- a/fhem/www/pgm2/yaahm.js +++ b/fhem/www/pgm2/yaahm.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------------------------------ var req = new XMLHttpRequest(); -req.open('GET', document.location, false); +req.open('HEAD', document.location.href, false); req.send(null); var csrfToken = req.getResponseHeader('X-FHEM-csrfToken'); if( csrfToken == null ){