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

FHEMWEB: fixing floorplan issues

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7574 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-14 23:20:07 +00:00
parent d02a4c244e
commit d74e7ab2d8
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/01_FHEMWEB.pm
View File

@ -507,8 +507,8 @@ FW_answerCall($)
my ($dir1, $dirN, $ofile) = ($1, $2, $3) my ($dir1, $dirN, $ofile) = ($1, $2, $3)
if($arg =~ m,^$FW_ME/([^/]*)(.*/)([^/]*)$,); if($arg =~ m,^$FW_ME/([^/]*)(.*/)([^/]*)$,);
if($dir1 && $dir1 eq "icons") { if($arg =~ m,^$FW_ME/icons/(.*)$,) {
my ($icon,$cacheable) = (urlDecode($ofile), 1); my ($icon,$cacheable) = (urlDecode($1), 1);
my $iconPath = FW_iconPath($icon); my $iconPath = FW_iconPath($icon);
# if we do not have the icon, we convert the device state to the icon name # if we do not have the icon, we convert the device state to the icon name
@ -1464,7 +1464,7 @@ FW_fileList($)
my @ret; my @ret;
return @ret if(!opendir(DH, $dir)); return @ret if(!opendir(DH, $dir));
while(my $f = readdir(DH)) { while(my $f = readdir(DH)) {
next if($f !~ m,^$re$,); next if($f !~ m,^$re$, || $f eq "99_Utils.pm");
push(@ret, $f); push(@ret, $f);
} }
closedir(DH); closedir(DH);
@ -1512,6 +1512,8 @@ FW_returnFileAsStream($$$$$)
} }
if(!open(FH, $path)) { 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: $!"; Log3 $FW_wname, 4, "FHEMWEB $FW_wname $path: $!";
TcpServer_WriteBlocking($FW_chash, TcpServer_WriteBlocking($FW_chash,
"HTTP/1.1 404 Not Found\r\n". "HTTP/1.1 404 Not Found\r\n".
@ -1519,6 +1521,7 @@ FW_returnFileAsStream($$$$$)
FW_closeConn($FW_chash); FW_closeConn($FW_chash);
return 0; return 0;
} }
}
binmode(FH) if($type !~ m/text/); # necessary for Windows binmode(FH) if($type !~ m/text/); # necessary for Windows
$etag = defined($etag) ? "ETag: \"$etag\"\r\n" : ""; $etag = defined($etag) ? "ETag: \"$etag\"\r\n" : "";
@ -1687,7 +1690,7 @@ FW_style($$)
if(!configDBUsed()); if(!configDBUsed());
FW_displayFileList("Own modules and helper files", FW_displayFileList("Own modules and helper files",
FW_fileList("$MW_dir/^(.*sh|[0-9][0-9].*Util.*pm|.*cfg|.*holiday". FW_fileList("$MW_dir/^(.*sh|[0-9][0-9].*Util.*pm|.*cfg|.*holiday".
"|.*layout)\$")); "|myUtilsTemplate.pm|.*layout)\$"));
FW_displayFileList("gplot files", FW_displayFileList("gplot files",
FW_fileList("$FW_gplotdir/^.*gplot\$")); FW_fileList("$FW_gplotdir/^.*gplot\$"));
FW_displayFileList("styles", FW_displayFileList("styles",