mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing non-root check; set state to disabled, when reconnecting to presenced/collectord and device is disabled

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@2819 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch
2013-02-26 21:57:48 +00:00
parent 1a56a37352
commit fcf84fd1e7
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/73_PRESENCE.pm
View File

@@ -118,7 +118,7 @@ PRESENCE_Define($$)
return $msg;
}
if(-X "/usr/bin/ctlmgr_ctl" and $destination eq "fritzbox" or $destination eq "lan-ping" and not $< == 0)
if(-X "/usr/bin/ctlmgr_ctl" and ($destination eq "fritzbox" or $destination eq "lan-ping") and not $< == 0)
{
my $msg = "FHEM is not running under root (currently ".(getpwuid($<))[0].") This check can only performed with root access to the FritzBox";
@@ -355,8 +355,14 @@ PRESENCE_DoInit($)
my ($hash) = @_;
DevIo_SimpleWrite($hash, $hash->{ADDRESS}."|".$hash->{TIMEOUT}."\n", 0) unless($hash->{helper}{DISABLED});
unless($hash->{helper}{DISABLED})
{
DevIo_SimpleWrite($hash, $hash->{ADDRESS}."|".$hash->{TIMEOUT}."\n", 0);
}
else
{
readingsSingleUpdate($hash, "state", "disabled",1);
}
}