From 1609a4cf9cfa37d51c6540cb8e53d42b0dc4ea53 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Mon, 11 Feb 2013 12:42:05 +0000 Subject: [PATCH] Making FLOORPLAN work again git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2687 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/01_FHEMWEB.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/FHEM/01_FHEMWEB.pm b/FHEM/01_FHEMWEB.pm index 95a0ead12..bfe6efa52 100755 --- a/FHEM/01_FHEMWEB.pm +++ b/FHEM/01_FHEMWEB.pm @@ -465,14 +465,16 @@ FW_answerCall($) $FW_icons{$icon} =~ m/(.*)\.($ICONEXTENSION)/; return FW_serveSpecial($1, $2, $FW_icondir, $cacheable); - } elsif($arg =~ m,^$FW_ME/(.*/)([^/]*),) { + } elsif($arg =~ m,^$FW_ME/(.*)/([^/]*),) { my ($dir, $file, $ext) = ($1, $2, ""); $dir =~ s/\.\.//g; if($file =~ m/^(.*)\.([^.]*)$/) { $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); + } } elsif($arg !~ m/^$FW_ME(.*)/) { my $c = $me->{CD};