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

removing global attributes from userattr

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1416 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-04-06 07:10:29 +00:00
parent e99ed359f3
commit 61f60bbe49
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/fhem.pl
View File

@ -158,7 +158,7 @@ use vars qw(%addNotifyCB); # Used by event enhancers (e.g. avarage)
use vars qw($reread_active); use vars qw($reread_active);
my $AttrList = "room comment alias"; my $AttrList = "room comment alias eventMap";
my $server; # Server socket my $server; # Server socket
my %comments; # Comments from the include files my %comments; # Comments from the include files
@ -195,7 +195,6 @@ $modules{Global}{AttrList} =
"verbose:1,2,3,4,5 mseclog version nofork logdir holiday2we " . "verbose:1,2,3,4,5 mseclog version nofork logdir holiday2we " .
"autoload_undefined_devices dupTimeout latitude longitude backupdir"; "autoload_undefined_devices dupTimeout latitude longitude backupdir";
$modules{Global}{AttrFn} = "GlobalAttr"; $modules{Global}{AttrFn} = "GlobalAttr";
my $commonAttr = "eventMap";
@ -1615,7 +1614,6 @@ getAllAttr($)
if($modules{$defs{$d}{TYPE}}{AttrList}); if($modules{$defs{$d}{TYPE}}{AttrList});
$list .= " " . $attr{global}{userattr} $list .= " " . $attr{global}{userattr}
if($attr{global}{userattr}); if($attr{global}{userattr});
$list .= " " . $commonAttr;
return $list; return $list;
} }
@ -2582,9 +2580,9 @@ addToAttrList($)
my @al = split(" ", $ua); my @al = split(" ", $ua);
my %hash; my %hash;
foreach my $a (@al) { foreach my $a (@al) {
$hash{$a} = 1; $hash{$a} = 1 if(" $AttrList " !~ m/ $a /); # Cleanse old ones
} }
$hash{$arg} = 1; $hash{$arg} = 1 if(" $AttrList " !~ m/ $arg /);
$attr{global}{userattr} = join(" ", sort keys %hash); $attr{global}{userattr} = join(" ", sort keys %hash);
} }