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

RESIDENTS: fix lastActivityBy

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14095 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-04-24 10:33:00 +00:00
parent dd7a5ad2ed
commit 4121ebceae
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/RESIDENTStk.pm
View File

@ -1078,11 +1078,12 @@ m/^([a-zA-Z\d._]+(:[A-Za-z\d_\.\-\/]+)?,?)([a-zA-Z\d._]+(:[A-Za-z\d_\.\-\/]+)?,?
sub RESIDENTStk_Notify($$) { sub RESIDENTStk_Notify($$) {
my ( $hash, $dev ) = @_; my ( $hash, $dev ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $TYPE = GetType($name); my $TYPE = GetType($name);
my $prefix = RESIDENTStk_GetPrefixFromType($name); my $prefix = RESIDENTStk_GetPrefixFromType($name);
my $devName = $dev->{NAME}; my $devName = $dev->{NAME};
my $devType = GetType($devName); my $devPrefix = RESIDENTStk_GetPrefixFromType($devName);
my $devType = GetType($devName);
if ( $devName eq "global" ) { if ( $devName eq "global" ) {
my $events = deviceEvents( $dev, 1 ); my $events = deviceEvents( $dev, 1 );
@ -1222,11 +1223,9 @@ m/^((?:DELETE)?ATTR)\s+([A-Za-z\d._]+)\s+([A-Za-z\d_\.\-\/]+)(?:\s+(.*)\s*)?$/
if ( $event !~ /^[a-zA-Z\d._]+:/ || $event =~ /^state:/ ) { if ( $event !~ /^[a-zA-Z\d._]+:/ || $event =~ /^state:/ ) {
# get user realname # get user realname
my $aliasAttr = "group";
$aliasAttr = "alias" if ( $prefix eq "rg_" );
my $realname = my $realname =
AttrVal( $devName, AttrVal( $devName,
AttrVal( $devName, $prefix . "realname", $aliasAttr ), AttrVal( $devName, $devPrefix . "realname", "group" ),
$devName ); $devName );
# update statistics # update statistics