mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid err msg.

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1041 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2011-10-02 12:34:52 +00:00
parent 58b2ea9bb3
commit 389bcad1fc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webfrontend/pgm2/01_FHEMWEB.pm
View File

@@ -324,14 +324,14 @@ FW_AnswerCall($)
if($arg =~ m,^${FW_ME}/(example.*|.*html)$,) { if($arg =~ m,^${FW_ME}/(example.*|.*html)$,) {
my $f = $1; my $f = $1;
$f =~ s,/,,g; # little bit of security $f =~ s,/,,g; # little bit of security
open(FH, "$FW_dir/$f") || return; open(FH, "$FW_dir/$f") || return 0;
pO join("", <FH>); pO join("", <FH>);
close(FH); close(FH);
$FW_RETTYPE = "text/plain; charset=ISO-8859-1" if($f !~ m/\.*html$/); $FW_RETTYPE = "text/plain; charset=ISO-8859-1" if($f !~ m/\.*html$/);
return 1; return 1;
} elsif($arg =~ m,^$FW_ME/(.*).css,) { } elsif($arg =~ m,^$FW_ME/(.*).css,) {
open(FH, "$FW_dir/$1.css") || return; open(FH, "$FW_dir/$1.css") || return 0;
pO join("", <FH>); pO join("", <FH>);
close(FH); close(FH);
$FW_RETTYPE = "text/css"; $FW_RETTYPE = "text/css";
@@ -345,7 +345,7 @@ FW_AnswerCall($)
FW_ReadIcons(); FW_ReadIcons();
$img = FW_dev2image($img); $img = FW_dev2image($img);
$cachable = 0; $cachable = 0;
return if(!$img || !open(FH, "$FW_dir/$img")); return 0 if(!$img || !open(FH, "$FW_dir/$img"));
} }
binmode (FH); # necessary for Windows binmode (FH); # necessary for Windows
pO join("", <FH>); pO join("", <FH>);
@@ -355,7 +355,7 @@ FW_AnswerCall($)
return $cachable; return $cachable;
} elsif($arg =~ m,^$FW_ME/(.*).js,) { #kpb java include } elsif($arg =~ m,^$FW_ME/(.*).js,) { #kpb java include
open(FH, "$FW_dir/$1.js") || return; open(FH, "$FW_dir/$1.js") || return 0;
pO join("", <FH>); pO join("", <FH>);
close(FH); close(FH);
$FW_RETTYPE = "application/javascript"; $FW_RETTYPE = "application/javascript";