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

Small fixes, preparing for the 5.1 release

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@930 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2011-07-07 07:02:50 +00:00
parent a09033d915
commit add4715a96
11 changed files with 230 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webfrontend/pgm2/01_FHEMWEB.pm
View File

@@ -310,13 +310,16 @@ FW_AnswerCall($)
$FW_tp = AttrVal($FW_wname, "touchpad", $FW_ss);
# Lets go:
if($arg =~ m,^${FW_ME}/(.*html)$, || $arg =~ m,^${FW_ME}/(example.*)$,) {
Log 1, "ARG: $arg";
if($arg =~ m,^${FW_ME}/(example.*|.*html)$,) {
my $f = $1;
Log 1, "GOT: $f";
$f =~ s,/,,g; # little bit of security
open(FH, "$FW_dir/$f") || return;
pO join("", <FH>);
close(FH);
$FW_RETTYPE = "text/plain; charset=ISO-8859-1" if($f !~ m/\.*html$/);
Log 1, "RT: $FW_RETTYPE";
return 1;
} elsif($arg =~ m,^$FW_ME/(.*).css,) {
@@ -434,7 +437,7 @@ FW_AnswerCall($)
FW_roomOverview($cmd);
FW_style($cmd,undef) if($cmd =~ m/^style /);
FW_doDetail($FW_detail) if($FW_detail);
FW_doDetail($FW_detail) if($FW_detail);
FW_showRoom() if($FW_room && !$FW_detail);
FW_logWrapper($cmd) if($cmd =~ /^logwrapper/);
FW_showArchive($cmd) if($cmd =~ m/^showarchive/);
@@ -1442,8 +1445,9 @@ FW_style($$)
my @fl;
push(@fl, "fhem.cfg");
push(@fl, "");
push(@fl, FW_fileList("$FW_dir/.*.sh"));
push(@fl, FW_fileList("$FW_dir/.*Util.*"));
push(@fl, FW_fileList("$FW_dir/.*.css"));
push(@fl, "");
push(@fl, FW_fileList("$FW_dir/.*.js"));
push(@fl, "");
push(@fl, FW_fileList("$FW_dir/.*.gplot"));
@@ -1479,7 +1483,7 @@ FW_style($$)
my $row = 0;
foreach my $file (@fl) {
pO "<tr class=\"" . ($row?"odd":"even") . "\">";
pH $file, $file, 1;
pO "<td><a href=\"$FW_ME/$file\">$file</a></td>";
pO "</tr>";
$row = ($row+1)%2;
}