FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

01_FHEMWEB.pl: urlEncode another room

Browse Source 
fhem.pl: devspec2array fix for strange rooms


git-svn-id: https://svn.fhem.de/fhem/trunk@10747 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-02-07 07:39:16 +00:00
parent 435cdfaaad
commit e06ec4a439
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/01_FHEMWEB.pm
View File

@ -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/);

2
fhem/fhem.pl
View File

@ -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
}