From d62ec19e8dce6c8c3920615c3fbbf82927f4a7f2 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Thu, 15 Jan 2015 18:36:07 +0000 Subject: [PATCH] FHEMWEB: simplify FLOORPLAN handling git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@7580 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index b8a7d0673..48d15797e 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -1513,15 +1513,12 @@ FW_returnFileAsStream($$$$$) } if(!open(FH, $path)) { - my $npath = FW_fileNameToPath($1) if($path =~ m,([^/]*)$,); - if(!open(FH, $npath)) { # Old style fake path - Log3 $FW_wname, 4, "FHEMWEB $FW_wname $path: $!"; - TcpServer_WriteBlocking($FW_chash, - "HTTP/1.1 404 Not Found\r\n". - "Content-Length:0\r\n\r\n"); - FW_closeConn($FW_chash); - return 0; - } + Log3 $FW_wname, 4, "FHEMWEB $FW_wname $path: $!"; + TcpServer_WriteBlocking($FW_chash, + "HTTP/1.1 404 Not Found\r\n". + "Content-Length:0\r\n\r\n"); + FW_closeConn($FW_chash); + return 0; } binmode(FH) if($type !~ m/text/); # necessary for Windows