From ddabc86b624c83ac8bbd47f5c6258d3457836abf Mon Sep 17 00:00:00 2001 From: StefanStrobel <> Date: Sun, 13 Dec 2020 12:09:03 +0000 Subject: [PATCH] 98_HTTPMOD: Update Utils for new userattr parameter handling in Fhemweb git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@23341 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- lib/FHEM/HTTPMOD/Utils.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/FHEM/HTTPMOD/Utils.pm b/lib/FHEM/HTTPMOD/Utils.pm index b45751bab..75d2e82ad 100644 --- a/lib/FHEM/HTTPMOD/Utils.pm +++ b/lib/FHEM/HTTPMOD/Utils.pm @@ -513,15 +513,11 @@ sub ManageUserAttr { #Log3 $name, 5, "$name: ManageUserAttr compares userattr name $userAttrName with passed attr name $aName"; if ($userAttrName eq $aName) { #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) - if ($userAttrHint && !$listAttrHint) { + $found = 1; + if ($userAttrHint && $userAttrHint ne ($listAttrHint // '')) { $uaHash{$userAttr} = 1; # keep $userAttr with hint if module attr has no 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 { $uaHash{$userAttr} = 1; # keep userattr with different names #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"; } else { 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}; } }