01_FHEMWEB.pl: urlEncode another room

fhem.pl: devspec2array fix for strange rooms


git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@10747 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/FHEM/01_FHEMWEB.pm

@@ -2715,7 +2715,7 @@ FW_devState($$@)
       } else {
         $room =~ s/,.*//;
       }
-      $link .= "&room=$room";
+      $link .= "&room=".urlEncode($room);
     }
     $txt = "<a href=\"$FW_ME$FW_subdir?$link$rf$FW_CSRF\">$txt</a>"
        if($link !~ m/ noFhemwebLink\b/);

fhem/fhem.pl

@@ -1099,7 +1099,7 @@ devspec2array($;$)
     my @res;
     foreach my $dName (split(":FILTER=", $l)) {
       my ($n,$op,$re) = ("NAME","=",$dName);
-      if($dName =~ m/^([^!<>]*)(=|!=|<=|>=|<|>)(.*)$/) {
+      if($dName =~ m/^(.*?)(=|!=|<=|>=|<|>)(.*)$/) {
         ($n,$op,$re) = ($1,$2,$3);
         $isAttr = 1;    # Compatibility: return "" instead of $name
       }