Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_HTTPMOD: Update Utils for new userattr parameter handling in Fhemweb

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@23341 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
StefanStrobel 2020-12-13 12:09:03 +00:00
parent 67a63b200b
commit ddabc86b62
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/FHEM/HTTPMOD/Utils.pm
View File

@ -513,15 +513,11 @@ sub ManageUserAttr {
#Log3 $name, 5, "$name: ManageUserAttr compares userattr name $userAttrName with passed attr name $aName"; #Log3 $name, 5, "$name: ManageUserAttr compares userattr name $userAttrName with passed attr name $aName";
if ($userAttrName eq $aName) { if ($userAttrName eq $aName) {
#Log3 $name, 5, "$name: ManageUserAttr compares hints from userattr $userAttrHint with hint from list $listAttrHint"; #Log3 $name, 5, "$name: ManageUserAttr compares hints from userattr $userAttrHint with hint from list $listAttrHint";
next UALOOP if (!$userAttrHint && !$listAttrHint); # no hints -> no need for userattr to sepcify a regex attr (new) $found = 1;
if ($userAttrHint && !$listAttrHint) { if ($userAttrHint && $userAttrHint ne ($listAttrHint // '')) {
$uaHash{$userAttr} = 1; # keep $userAttr with hint if module attr has no hint $uaHash{$userAttr} = 1; # keep $userAttr with hint if module attr has no hint
#Log3 $name, 5, "$name: ManageUserAttr keeps userattr $userAttr with different hint"; #Log3 $name, 5, "$name: ManageUserAttr keeps userattr $userAttr with different hint";
} else {
$uaHash{$aName . $listAttrHint} = 1; # replace userAttr with attr from module list
#Log3 $name, 5, "$name: ManageUserAttr uses $aName$listAttrHint with hint from module attr list";
} }
$found = 1;
} else { } else {
$uaHash{$userAttr} = 1; # keep userattr with different names $uaHash{$userAttr} = 1; # keep userattr with different names
#Log3 $name, 5, "$name: ManageUserAttr keeps other existing userattr $userAttr"; #Log3 $name, 5, "$name: ManageUserAttr keeps other existing userattr $userAttr";
@ -537,7 +533,7 @@ sub ManageUserAttr {
Log3 $name, 5, "$name: ManageUserAttr updated userattr list to $aString"; Log3 $name, 5, "$name: ManageUserAttr updated userattr list to $aString";
} else { } else {
if ($attr{$name}{userattr}) { if ($attr{$name}{userattr}) {
Log3 $name, 3, "$name: ManageUserAttr removed unnecessary userattr list"; Log3 $name, 3, "$name: ManageUserAttr removed useless userattr list";
delete $attr{$name}{userattr}; delete $attr{$name}{userattr};
} }
} }