Making FLOORPLAN work again

git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2687 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2013-02-11 12:42:05 +00:00
parent a7176d23f7
commit 1609a4cf9c

View File

@@ -465,14 +465,16 @@ FW_answerCall($)
$FW_icons{$icon} =~ m/(.*)\.($ICONEXTENSION)/; $FW_icons{$icon} =~ m/(.*)\.($ICONEXTENSION)/;
return FW_serveSpecial($1, $2, $FW_icondir, $cacheable); return FW_serveSpecial($1, $2, $FW_icondir, $cacheable);
} elsif($arg =~ m,^$FW_ME/(.*/)([^/]*),) { } elsif($arg =~ m,^$FW_ME/(.*)/([^/]*),) {
my ($dir, $file, $ext) = ($1, $2, ""); my ($dir, $file, $ext) = ($1, $2, "");
$dir =~ s/\.\.//g; $dir =~ s/\.\.//g;
if($file =~ m/^(.*)\.([^.]*)$/) { if($file =~ m/^(.*)\.([^.]*)$/) {
$file = $1; $ext = $2; $file = $1; $ext = $2;
} }
return FW_serveSpecial($file, $ext, "$FW_dir/$dir", if(-r "$FW_dir/$dir/$file.$ext") {
return FW_serveSpecial($file, $ext, "$FW_dir/$dir",
($arg =~ m/nocache/) ? 0 : 1); ($arg =~ m/nocache/) ? 0 : 1);
}
} elsif($arg !~ m/^$FW_ME(.*)/) { } elsif($arg !~ m/^$FW_ME(.*)/) {
my $c = $me->{CD}; my $c = $me->{CD};