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

95_Alarm.pm: Bugfix

Browse Source 
95_YAAHM.pm: Bugfix
95_Babble.pm: Bugfix

git-svn-id: https://svn.fhem.de/fhem/trunk@16002 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
phenning 2018-01-26 17:51:11 +00:00
parent fab447eb8a
commit 3ef5f2823b
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/95_Alarm.pm
View File

@ -43,7 +43,7 @@ my $alarmlinkname = "Alarms"; # link text
my $alarmhiddenroom = "AlarmRoom"; # hidden room my $alarmhiddenroom = "AlarmRoom"; # hidden room
my $alarmpublicroom = "Alarm"; # public room my $alarmpublicroom = "Alarm"; # public room
my $alarmno = 8; my $alarmno = 8;
my $alarmversion = "4.02"; my $alarmversion = "4.03";
my %alarm_transtable_EN = ( my %alarm_transtable_EN = (
"ok" => "OK", "ok" => "OK",
@ -1115,7 +1115,7 @@ sub Alarm_widget($){
#-- no webarg, check direct parameter. TODO: order #-- no webarg, check direct parameter. TODO: order
if( !defined($name) || $name eq "" ){ 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; $name = $1;
$gstate = $2; $gstate = $2;
$dstate = $3; $dstate = $3;

2
fhem/FHEM/95_Babble.pm
View File

@ -42,7 +42,7 @@ use JSON; # imports encode_json, decode_json, to_json and from_json.
my $babblelinkname = "babbles"; # link text my $babblelinkname = "babbles"; # link text
my $babblehiddenroom = "babbleRoom"; # hidden room my $babblehiddenroom = "babbleRoom"; # hidden room
my $babblepublicroom = "babble"; # public room my $babblepublicroom = "babble"; # public room
my $babbleversion = "1.07"; my $babbleversion = "1.08";
my %babble_transtable_EN = ( my %babble_transtable_EN = (
"ok" => "OK", "ok" => "OK",

4
fhem/FHEM/95_YAAHM.pm
View File

@ -47,7 +47,7 @@ my $yaahmname;
my $yaahmlinkname = "Profile"; # link text my $yaahmlinkname = "Profile"; # link text
my $yaahmhiddenroom = "ProfileRoom"; # hidden room my $yaahmhiddenroom = "ProfileRoom"; # hidden room
my $yaahmpublicroom = "Unsorted"; # public room my $yaahmpublicroom = "Unsorted"; # public room
my $yaahmversion = "1.45"; my $yaahmversion = "1.46";
my $firstcall = 1; my $firstcall = 1;
my %yaahm_transtable_EN = ( my %yaahm_transtable_EN = (
@ -1236,6 +1236,8 @@ sub YAAHM_nextWeeklyTime {
return $msg; return $msg;
} }
$time = lc($time);
#-- check value - may be empty #-- check value - may be empty
if( $time eq "" || $time eq "default" ){ if( $time eq "" || $time eq "default" ){
$time = ""; $time = "";

4
fhem/www/pgm2/alarm.js
View File

@ -1,6 +1,6 @@
//######################################################################################## //########################################################################################
// alarm.js // alarm.js
// Version 4.01 // Version 4.03
// See 95_Alarm for licensing // See 95_Alarm for licensing
//######################################################################################## //########################################################################################
//# Prof. Dr. Peter A. Henning //# Prof. Dr. Peter A. Henning
@ -10,7 +10,7 @@
//------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
req.open('GET', document.location, false); req.open('HEAD', document.location.href, false);
req.send(null); req.send(null);
var csrfToken = req.getResponseHeader('X-FHEM-csrfToken'); var csrfToken = req.getResponseHeader('X-FHEM-csrfToken');
if( csrfToken == null ){ if( csrfToken == null ){

4
fhem/www/pgm2/babble.js
View File

@ -1,6 +1,6 @@
//######################################################################################## //########################################################################################
// babble.js // babble.js
// Version 1.06 // Version 1.08
// See 95_Babble for licensing // See 95_Babble for licensing
//######################################################################################## //########################################################################################
//# Prof. Dr. Peter A. Henning //# Prof. Dr. Peter A. Henning
@ -10,7 +10,7 @@
//------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
req.open('GET', document.location, false); req.open('HEAD', document.location.href, false);
req.send(null); req.send(null);
var csrfToken = req.getResponseHeader('X-FHEM-csrfToken'); var csrfToken = req.getResponseHeader('X-FHEM-csrfToken');
if( csrfToken == null ){ if( csrfToken == null ){

2
fhem/www/pgm2/yaahm.js
View File

@ -10,7 +10,7 @@
//------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
req.open('GET', document.location, false); req.open('HEAD', document.location.href, false);
req.send(null); req.send(null);
var csrfToken = req.getResponseHeader('X-FHEM-csrfToken'); var csrfToken = req.getResponseHeader('X-FHEM-csrfToken');
if( csrfToken == null ){ if( csrfToken == null ){