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

minor bugfixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2243 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ulimaass 2012-12-01 14:13:23 +00:00
parent 51e90c2cfb
commit dbfcc9cbea
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/95_FLOORPLAN.pm
View File

@ -213,13 +213,11 @@ FP_CGI(){
$FP_arrange_default = undef; $FP_arrange_default = undef;
$FP_arrange_selected = undef; $FP_arrange_selected = undef;
my $dev = undef; my $dev = undef;
my @devs = devspec2array("*"); foreach my $fp (keys %defs) {
foreach my $fp (@devs) {
if (AttrVal($fp, "fp_default", undef)) { # use floorplan with attr fp_default if (AttrVal($fp, "fp_default", undef)) { # use floorplan with attr fp_default
$FP_name = $fp; $FP_name = $fp;
$FW_subdir = "/floorplan/$fp"; $FW_subdir = "/floorplan/$fp";
$FP_arrange = AttrVal($fp, "fp_arrange", undef); $FP_arrange = AttrVal($fp, "fp_arrange", undef);
} }
} }
} }
@ -448,12 +446,12 @@ FP_show(){
if ($fp_image) { if ($fp_image) {
my $state = ReadingsVal($d, "state", undef); my $state = ReadingsVal($d, "state", undef);
$fp_image =~ s/\{state\}/$state/; # replace {state} by actual device-status $fp_image =~ s/\{state\}/$state/; # replace {state} by actual device-status
#$txt =~ s/\<img\ src\=\"(.*)\"/\<img\ src\=\"\/fhem\/icons\/$fp_image\"/; # replace icon-link in html - deactivated by Boris $txt =~ s/\<img\ src\=\"(.*)\"/\<img\ src\=\"\/fhem\/icons\/$fp_image\"/; # replace icon-link in html
} }
if ($fp_fpimage) { if ($fp_fpimage) {
my $state = ReadingsVal($d, "state", undef); my $state = ReadingsVal($d, "state", undef);
$fp_fpimage =~ s/\{state\}/$state/; # replace {state} by actual device-status $fp_fpimage =~ s/\{state\}/$state/; # replace {state} by actual device-status
#$txt =~ s/\<img\ src\=\"(.*)\"/\<img\ src\=\"\/fhem\/icons\/$fp_fpimage\"/; # replace icon-link in html - deactivated by Boris $txt =~ s/\<img\ src\=\"(.*)\"/\<img\ src\=\"\/fhem\/icons\/$fp_fpimage\"/; # replace icon-link in html
} }
FW_pO "<td colspan=\"$cols\">$txt"; FW_pO "<td colspan=\"$cols\">$txt";
FW_pO "</td></tr>"; FW_pO "</td></tr>";