From 9dd45f538333686ba604fbb00ca09cb4474ff3f7 Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Thu, 27 Aug 2015 12:11:09 +0000 Subject: [PATCH] GUEST ENIGMA2 RESIDENTS PHTV ONKYO_AVR ROOMMATE: improve stability when $FW_wname is not set git-svn-id: https://svn.fhem.de/fhem/trunk@9140 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_RESIDENTS.pm | 6 ++++-- fhem/FHEM/20_GUEST.pm | 6 ++++-- fhem/FHEM/20_ROOMMATE.pm | 6 ++++-- fhem/FHEM/70_ENIGMA2.pm | 6 ++++-- fhem/FHEM/70_ONKYO_AVR.pm | 6 ++++-- fhem/FHEM/70_PHTV.pm | 6 ++++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/fhem/FHEM/10_RESIDENTS.pm b/fhem/FHEM/10_RESIDENTS.pm index 4eb22749b..7371be72b 100644 --- a/fhem/FHEM/10_RESIDENTS.pm +++ b/fhem/FHEM/10_RESIDENTS.pm @@ -282,8 +282,10 @@ sub RESIDENTS_Set($@) { # depending on current FHEMWEB instance's allowedCommands, # restrict set commands if there is "set-user" in it - my $adminMode = 1; - my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); + my $adminMode = 1; + my $FWallowedCommands = 0; + $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ) + if ( defined($FW_wname) ); if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { $adminMode = 0; return "Forbidden command: set " . $a[1] diff --git a/fhem/FHEM/20_GUEST.pm b/fhem/FHEM/20_GUEST.pm index 74f1905fb..04ccb9ff7 100644 --- a/fhem/FHEM/20_GUEST.pm +++ b/fhem/FHEM/20_GUEST.pm @@ -287,8 +287,10 @@ sub GUEST_Set($@) { # depending on current FHEMWEB instance's allowedCommands, # restrict set commands if there is "set-user" in it - my $adminMode = 1; - my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); + my $adminMode = 1; + my $FWallowedCommands = 0; + $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ) + if ( defined($FW_wname) ); if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { $adminMode = 0; return "Forbidden command: set " . $a[1] diff --git a/fhem/FHEM/20_ROOMMATE.pm b/fhem/FHEM/20_ROOMMATE.pm index 227679fa3..405da5b90 100644 --- a/fhem/FHEM/20_ROOMMATE.pm +++ b/fhem/FHEM/20_ROOMMATE.pm @@ -292,8 +292,10 @@ sub ROOMMATE_Set($@) { # depending on current FHEMWEB instance's allowedCommands, # restrict set commands if there is "set-user" in it - my $adminMode = 1; - my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); + my $adminMode = 1; + my $FWallowedCommands = 0; + $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ) + if ( defined($FW_wname) ); if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { $adminMode = 0; return "Forbidden command: set " . $a[1] diff --git a/fhem/FHEM/70_ENIGMA2.pm b/fhem/FHEM/70_ENIGMA2.pm index 88452a919..e6b172cac 100644 --- a/fhem/FHEM/70_ENIGMA2.pm +++ b/fhem/FHEM/70_ENIGMA2.pm @@ -212,8 +212,10 @@ sub ENIGMA2_Set($@) { # depending on current FHEMWEB instance's allowedCommands, # restrict set commands if there is "set-user" in it - my $adminMode = 1; - my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); + my $adminMode = 1; + my $FWallowedCommands = 0; + $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ) + if ( defined($FW_wname) ); if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { $adminMode = 0; return "Forbidden command: set " . $a[1] diff --git a/fhem/FHEM/70_ONKYO_AVR.pm b/fhem/FHEM/70_ONKYO_AVR.pm index fcbc0f0ba..70ab4e1be 100755 --- a/fhem/FHEM/70_ONKYO_AVR.pm +++ b/fhem/FHEM/70_ONKYO_AVR.pm @@ -609,8 +609,10 @@ sub ONKYO_AVR_Set($@) { # depending on current FHEMWEB instance's allowedCommands, # restrict set commands if there is "set-user" in it - my $adminMode = 1; - my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); + my $adminMode = 1; + my $FWallowedCommands = 0; + $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ) + if ( defined($FW_wname) ); if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { $adminMode = 0; return "Forbidden command: set " . $a[1] diff --git a/fhem/FHEM/70_PHTV.pm b/fhem/FHEM/70_PHTV.pm index df9a49a64..99bf916b5 100644 --- a/fhem/FHEM/70_PHTV.pm +++ b/fhem/FHEM/70_PHTV.pm @@ -283,8 +283,10 @@ sub PHTV_Set($@) { # depending on current FHEMWEB instance's allowedCommands, # restrict set commands if there is "set-user" in it - my $adminMode = 1; - my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); + my $adminMode = 1; + my $FWallowedCommands = 0; + $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ) + if ( defined($FW_wname) ); if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { $adminMode = 0; return "Forbidden command: set " . $a[1]