FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 12:46:03 +00:00
Code Issues Releases Wiki Activity

GUEST ENIGMA2 RESIDENTS PHTV ONKYO_AVR ROOMMATE: improve stability when $FW_wname is not set

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9140 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2015-08-27 12:11:09 +00:00
parent c637b00210
commit 9dd45f5383
6 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/10_RESIDENTS.pm
View File

@ -282,8 +282,10 @@ sub RESIDENTS_Set($@) {
# depending on current FHEMWEB instance's allowedCommands, # depending on current FHEMWEB instance's allowedCommands,
# restrict set commands if there is "set-user" in it # restrict set commands if there is "set-user" in it
my $adminMode = 1; my $adminMode = 1;
my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); my $FWallowedCommands = 0;
$FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 )
if ( defined($FW_wname) );
if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) {
$adminMode = 0; $adminMode = 0;
return "Forbidden command: set " . $a[1] return "Forbidden command: set " . $a[1]

6
fhem/FHEM/20_GUEST.pm
View File

@ -287,8 +287,10 @@ sub GUEST_Set($@) {
# depending on current FHEMWEB instance's allowedCommands, # depending on current FHEMWEB instance's allowedCommands,
# restrict set commands if there is "set-user" in it # restrict set commands if there is "set-user" in it
my $adminMode = 1; my $adminMode = 1;
my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); my $FWallowedCommands = 0;
$FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 )
if ( defined($FW_wname) );
if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) {
$adminMode = 0; $adminMode = 0;
return "Forbidden command: set " . $a[1] return "Forbidden command: set " . $a[1]

6
fhem/FHEM/20_ROOMMATE.pm
View File

@ -292,8 +292,10 @@ sub ROOMMATE_Set($@) {
# depending on current FHEMWEB instance's allowedCommands, # depending on current FHEMWEB instance's allowedCommands,
# restrict set commands if there is "set-user" in it # restrict set commands if there is "set-user" in it
my $adminMode = 1; my $adminMode = 1;
my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); my $FWallowedCommands = 0;
$FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 )
if ( defined($FW_wname) );
if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) {
$adminMode = 0; $adminMode = 0;
return "Forbidden command: set " . $a[1] return "Forbidden command: set " . $a[1]

6
fhem/FHEM/70_ENIGMA2.pm
View File

@ -212,8 +212,10 @@ sub ENIGMA2_Set($@) {
# depending on current FHEMWEB instance's allowedCommands, # depending on current FHEMWEB instance's allowedCommands,
# restrict set commands if there is "set-user" in it # restrict set commands if there is "set-user" in it
my $adminMode = 1; my $adminMode = 1;
my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); my $FWallowedCommands = 0;
$FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 )
if ( defined($FW_wname) );
if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) {
$adminMode = 0; $adminMode = 0;
return "Forbidden command: set " . $a[1] return "Forbidden command: set " . $a[1]

6
fhem/FHEM/70_ONKYO_AVR.pm
View File

@ -609,8 +609,10 @@ sub ONKYO_AVR_Set($@) {
# depending on current FHEMWEB instance's allowedCommands, # depending on current FHEMWEB instance's allowedCommands,
# restrict set commands if there is "set-user" in it # restrict set commands if there is "set-user" in it
my $adminMode = 1; my $adminMode = 1;
my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); my $FWallowedCommands = 0;
$FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 )
if ( defined($FW_wname) );
if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) {
$adminMode = 0; $adminMode = 0;
return "Forbidden command: set " . $a[1] return "Forbidden command: set " . $a[1]

6
fhem/FHEM/70_PHTV.pm
View File

@ -283,8 +283,10 @@ sub PHTV_Set($@) {
# depending on current FHEMWEB instance's allowedCommands, # depending on current FHEMWEB instance's allowedCommands,
# restrict set commands if there is "set-user" in it # restrict set commands if there is "set-user" in it
my $adminMode = 1; my $adminMode = 1;
my $FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 ); my $FWallowedCommands = 0;
$FWallowedCommands = AttrVal( $FW_wname, "allowedCommands", 0 )
if ( defined($FW_wname) );
if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) { if ( $FWallowedCommands && $FWallowedCommands =~ m/\bset-user\b/ ) {
$adminMode = 0; $adminMode = 0;
return "Forbidden command: set " . $a[1] return "Forbidden command: set " . $a[1]