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

Reading HTMLs directly from the filesystem is working again.

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2888 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2013-03-10 18:49:21 +00:00
parent 38c23d6d55
commit 3ed127c68a
15 changed files with 240 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
FHEM/01_FHEMWEB.pm
View File

@@ -335,6 +335,7 @@ FW_serveSpecial($$$$)
my ($file,$ext,$dir,$cacheable)= @_; my ($file,$ext,$dir,$cacheable)= @_;
$file =~ s,\.\./,,g; # little bit of security $file =~ s,\.\./,,g; # little bit of security
Log 1, "Serve: $dir, $file, $ext";
$file = "$FW_sp$file" if($ext eq "css" && -f "$dir/$FW_sp$file.$ext"); $file = "$FW_sp$file" if($ext eq "css" && -f "$dir/$FW_sp$file.$ext");
$FW_RETTYPE = ext2MIMEType($ext); $FW_RETTYPE = ext2MIMEType($ext);
#Log 1, "Serving $dir/$file.$ext as $FW_RETTYPE, cacheable:$cacheable"; #Log 1, "Serving $dir/$file.$ext as $FW_RETTYPE, cacheable:$cacheable";
@@ -348,6 +349,7 @@ FW_answerCall($)
my ($arg) = @_; my ($arg) = @_;
my $me=$defs{$FW_cname}; # cache, else rereadcfg will delete us my $me=$defs{$FW_cname}; # cache, else rereadcfg will delete us
Log 1, "ANSWER $arg";
$FW_RET = ""; $FW_RET = "";
$FW_RETTYPE = "text/html; charset=$FW_encoding"; $FW_RETTYPE = "text/html; charset=$FW_encoding";
$FW_ME = "/" . AttrVal($FW_wname, "webname", "fhem"); $FW_ME = "/" . AttrVal($FW_wname, "webname", "fhem");
@@ -376,11 +378,13 @@ FW_answerCall($)
} elsif($arg =~ m,^$FW_ME/(.*)/([^/]*)$,) { # the "normal" case } elsif($arg =~ m,^$FW_ME/(.*)/([^/]*)$,) { # the "normal" case
my ($dir, $ofile, $ext) = ($1, $2, ""); my ($dir, $ofile, $ext) = ($1, $2, "");
$dir =~ s/\.\.//g; $dir =~ s/\.\.//g;
$dir =~ s,www/,,g; # Want commandref.html to work from file://...
my $file = $ofile; my $file = $ofile;
if($file =~ m/^(.*)\.([^.]*)$/) { if($file =~ m/^(.*)\.([^.]*)$/) {
$file = $1; $ext = $2; $file = $1; $ext = $2;
} }
Log 1, "GOT $dir";
my $ldir = "$FW_dir/$dir"; my $ldir = "$FW_dir/$dir";
$ldir = "$FW_dir/pgm2" if($dir eq "css" || $dir eq "js"); $ldir = "$FW_dir/pgm2" if($dir eq "css" || $dir eq "js");
$ldir = "$attr{global}{modpath}/docs" if($dir eq "docs"); $ldir = "$attr{global}{modpath}/docs" if($dir eq "docs");
@@ -402,6 +406,7 @@ FW_answerCall($)
return -1; return -1;
} }
Log 1, "Searching for $arg";
$FW_plotmode = AttrVal($FW_wname, "plotmode", "SVG"); $FW_plotmode = AttrVal($FW_wname, "plotmode", "SVG");

4
contrib/commandref_join.pl
View File

@@ -81,6 +81,10 @@ foreach my $lang (@lang) {
} elsif(!$skip) { } elsif(!$skip) {
# here we copy line by line from the module # here we copy line by line from the module
# if($l =~ m/<.?pre>/) {
# print "$lang $mod REMOVING <pre> Formatting\n";
# $l =~ s/<.?pre>//g;
# }
print OUT $l; print OUT $l;
$docCount++; $docCount++;
$hasLink = ($l =~ m/<a name="$mod">/) if(!$hasLink); $hasLink = ($l =~ m/<a name="$mod">/) if(!$hasLink);

56
contrib/survey.pl
View File

@@ -19,6 +19,7 @@ my @hw = qw(
CUL_HM CUL_HM
CUL_HOERMANN CUL_HOERMANN
CUL_IR CUL_IR
CUL_MAX
CUL_RFR CUL_RFR
CUL_TX CUL_TX
CUL_WS CUL_WS
@@ -31,12 +32,24 @@ my @hw = qw(
EMWZ EMWZ
ESA2000 ESA2000
EnOcean EnOcean
FBAHA
FBDECT
FHT FHT
FHT8V FHT8V
FHZ FHZ
FRM
FRM_AD
FRM_I2C
FRM_IN
FRM_OUT
FRM_PWM
FRM_SERVO
FS20 FS20
HMLAN HMLAN
HMS HMS
HTTPSRV
HUEBridge
HUEDevice
IPCAM IPCAM
IPWE IPWE
IT IT
@@ -45,17 +58,31 @@ my @hw = qw(
KS300 KS300
LGTV LGTV
LIRC LIRC
LUXTRONIK2
M232 M232
M232Counter M232Counter
M232Voltage M232Voltage
MAX
MAXLAN
NetIO230B NetIO230B
OREGON OREGON
OWAD
OWCOUNT
OWDevice
OWFS OWFS
OWID
OWLCD
OWMULTI
OWSWITCH
OWServer
OWTEMP OWTEMP
OWTHERM
OWX
POKEYS POKEYS
RFXCOM RFXCOM
RFXMETER RFXMETER
RFXX10REC RFXX10REC
RSS
SCIVT SCIVT
SISPM SISPM
SIS_PMS SIS_PMS
@@ -69,6 +96,7 @@ my @hw = qw(
TRX_WEATHER TRX_WEATHER
TUL TUL
TellStick TellStick
UNIRoll
USBWX USBWX
USF1000 USF1000
VantagePro2 VantagePro2
@@ -76,11 +104,12 @@ my @hw = qw(
WEBIO WEBIO
WEBIO_12DIGITAL WEBIO_12DIGITAL
WEBTHERM WEBTHERM
WOL
WS2000 WS2000
WS300 WS300
WS3600 WS3600
Weather
X10 X10
YAMAHA_AVR
ZWDongle ZWDongle
ZWave ZWave
xxLG7000 xxLG7000
@@ -90,33 +119,42 @@ my @hw = qw(
my @help = qw( my @help = qw(
CULflash CULflash
Calendar Calendar
DbLog
FB_CALLMONITOR
FHEM2FHEM FHEM2FHEM
FileLog FileLog
HTTPSRV HCS
Heating_Control
JsonList JsonList
MSG MSG
MSGFile MSGFile
MSGMail MSGMail
PID PID
PRESENCE
PachLog PachLog
RSS
SUNRISE_EL SUNRISE_EL
Weather SYSSTAT
Twilight Twilight
WOL
XmlList XmlList
at at
autocreate autocreate
average average
backup backup
createlog
dewpoint dewpoint
dummy dummy
fheminfo
holiday holiday
notice
notify notify
sequence sequence
structure structure
telnet telnet
updatefhem update
usb
watchdog watchdog
weblink
); );
@@ -158,11 +196,15 @@ my $title = "Used FHEM Modules & Components";
my $q = new CGI; my $q = new CGI;
print $q->header, print $q->header,
$q->start_html( -title => $title, -style=>{-src=>"style.css"}), "\n"; $q->start_html( -title => $title,
-style => {-src=>"../www/pgm2/style.css"}), "\n";
print '<div id="left">', "\n", print '<div id="left">', "\n",
'<img src="fhem.png" alt="fhem-logo"/>', "\n", '<div id="menuScrollArea">',"\n",
'<div id="logo"></div>',"\n",
'<div id="menu">',"\n",
'<h3>FHEM survey</h3>', "\n", '<h3>FHEM survey</h3>', "\n",
'</div>', "\n",
'</div>', "\n"; '</div>', "\n";
print '<div id="right">',"\n", print '<div id="right">',"\n",

4
docs/HOWTO.html
View File

@@ -4,13 +4,14 @@
<head> <head>
<title>FHEM Howto</title> <title>FHEM Howto</title>
<link rel="stylesheet" type="text/css" href="../css/style.css" /> <link rel="stylesheet" type="text/css" href="../www/pgm2/style.css" />
<meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/> <meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/>
</head> </head>
<body> <body>
<div id="menuScrollArea">
<div id="logo"></div> <div id="logo"></div>
<div id="menu"> <div id="menu">
<h3>FHEM Howto</h3> <h3>FHEM Howto</h3>
@@ -33,6 +34,7 @@
<tr><td><a href="#structure">Structures</a></td></tr> <tr><td><a href="#structure">Structures</a></td></tr>
</table> </table>
</div> </div>
</div>
<div id="right"> <div id="right">

4
docs/HOWTO_DE.html
View File

@@ -1,13 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"><head> <html xmlns="http://www.w3.org/1999/xhtml"><head>
<title>Mit FHEM beginnen</title> <title>Mit FHEM beginnen</title>
<link rel="stylesheet" type="text/css" href="../css/style.css"> <link rel="stylesheet" type="text/css" href="../www/pgm2/style.css" />
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-type" content="text/html; charset=UTF-8">
</head> </head>
<body> <body>
<div id="menuScrollArea">
<div id="logo"></div> <div id="logo"></div>
<div id="menu"> <div id="menu">
<h3>FHEM Howto</h3> <h3>FHEM Howto</h3>
@@ -30,6 +31,7 @@
<tr><td> <tr><td>
</table> </table>
</div> </div>
</div>
<div id="right"> <div id="right">

4
docs/USB.html
View File

@@ -4,17 +4,19 @@
<head> <head>
<title>USB compendium</title> <title>USB compendium</title>
<link rel="stylesheet" type="text/css" href="../css/style.css" /> <link rel="stylesheet" type="text/css" href="../www/pgm2/style.css" />
<meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/> <meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/>
</head> </head>
<body> <body>
<div id="menuScrollArea">
<div id="logo"></div> <div id="logo"></div>
<div id="menu"> <div id="menu">
<h3>USB compendium</h3> <h3>USB compendium</h3>
</div> </div>
</div>
<div id="right"> <div id="right">

5
docs/commandref_frame.html
View File

@@ -5,19 +5,20 @@
<head> <head>
<title>fhem reference</title> <title>fhem reference</title>
<link rel="stylesheet" type="text/css" href="../css/style.css" /> <link rel="stylesheet" type="text/css" href="../www/pgm2/style.css" />
<meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/> <meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/>
<link rel="shortcut icon" href="favicon.ico"/> <link rel="shortcut icon" href="favicon.ico"/>
</head> </head>
<body> <body>
<div id="menuScrollArea">
<div id="logo"></div> <div id="logo"></div>
<div id="menu"> <div id="menu">
<h3>fhem.pl reference</h3> <h3>fhem.pl reference</h3>
Version: <b>EN</b>&nbsp;<a href="commandref_DE.html">DE</a> Version: <b>EN</b>&nbsp;<a href="commandref_DE.html">DE</a>
</div> </div>
</div>
<div id="right"> <div id="right">

2
docs/commandref_frame_DE.html
View File

@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html><head> <html><head>
<title>FHEM reference</title> <title>FHEM reference</title>
<link rel="stylesheet" type="text/css" href="../css/style.css"> <link rel="stylesheet" type="text/css" href="../www/pgm2/style.css" />
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-type" content="text/html; charset=UTF-8">
<link rel="shortcut icon" href="http://fhem.de/favicon.ico"> <link rel="shortcut icon" href="http://fhem.de/favicon.ico">

4
docs/faq.html
View File

@@ -4,17 +4,19 @@
<head> <head>
<title>FHEM FAQ</title> <title>FHEM FAQ</title>
<link rel="stylesheet" type="text/css" href="../css/style.css" /> <link rel="stylesheet" type="text/css" href="../www/pgm2/style.css" />
<meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/> <meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/>
</head> </head>
<body> <body>
<div id="menuScrollArea">
<div id="logo"></div> <div id="logo"></div>
<div id="menu"> <div id="menu">
<h3>FHEM FAQ</h3> <h3>FHEM FAQ</h3>
</div> </div>
</div>
<div id="right"> <div id="right">

10
docs/fhem.html
View File

@@ -4,7 +4,7 @@
<head> <head>
<title>Home of FHEM</title> <title>Home of FHEM</title>
<link rel="stylesheet" type="text/css" href="../css/style.css" /> <link rel="stylesheet" type="text/css" href="../www/pgm2/style.css" />
<meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/> <meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/>
<link rel="shortcut icon" href="favicon.ico"/> <link rel="shortcut icon" href="favicon.ico"/>
</head> </head>
@@ -12,6 +12,7 @@
<body> <body>
<div id="menuScrollArea">
<div id="logo"></div> <div id="logo"></div>
<div id="menu"> <div id="menu">
<table><tr><td> <!-- Playing with the width --> <table><tr><td> <!-- Playing with the width -->
@@ -40,6 +41,7 @@
</table> </table>
</td></tr></table> </td></tr></table>
</div> </div>
</div>
<div id="right"> <div id="right">
@@ -309,11 +311,9 @@
<a href="http://wiki.dungeon.de/all6250_opennas_mit_fhem"> <a href="http://wiki.dungeon.de/all6250_opennas_mit_fhem">
http://wiki.dungeon.de/all6250_opennas_mit_fhem</a></li> http://wiki.dungeon.de/all6250_opennas_mit_fhem</a></li>
<li>Linux driver installation: <li>Linux driver installation:
<a href="http://fhem.de/linux.html"> <a href="linux.html">linux.html</a></li>
http://fhem.de/linux.html</a></li>
<li>Misc USB problems: <li>Misc USB problems:
<a href="http://fhem.de/USB.html"> <a href="USB.html">USB.html</a></li>
http://fhem.de/USB.html</a></li>
<li>Russels Blog for Windows user: <li>Russels Blog for Windows user:
<a href="http://russellallen.info/category/FHEM.aspx"> <a href="http://russellallen.info/category/FHEM.aspx">
http://russellallen.info/category/FHEM.aspx</a> <br> http://russellallen.info/category/FHEM.aspx</a> <br>

4
docs/fritzbox.html
View File

@@ -4,17 +4,19 @@
<head> <head>
<title>fhem on the Fritz!Box</title> <title>fhem on the Fritz!Box</title>
<link rel="stylesheet" type="text/css" href="../css/style.css" /> <link rel="stylesheet" type="text/css" href="../www/pgm2/style.css" />
<meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/> <meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/>
</head> </head>
<body> <body>
<div id="menuScrollArea">
<div id="logo"></div> <div id="logo"></div>
<div id="menu"> <div id="menu">
<h3>Fhem on the Fritz!Box</h3> <h3>Fhem on the Fritz!Box</h3>
</div> </div>
</div>
<div id="right"> <div id="right">

4
docs/linux.html
View File

@@ -4,16 +4,18 @@
<head> <head>
<title>fhem.pl - Hints for GNU/Linux</title> <title>fhem.pl - Hints for GNU/Linux</title>
<link rel="stylesheet" type="text/css" href="../css/style.css" /> <link rel="stylesheet" type="text/css" href="../www/pgm2/style.css" />
<meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/> <meta http-equiv="Content-type" content="text/html;charset=ISO-8859-1"/>
</head> </head>
<body> <body>
<div id="menuScrollArea">
<div id="logo"></div> <div id="logo"></div>
<div id="menu"> <div id="menu">
<h3>fhem.pl - Hints for GNU/Linux</h3> <h3>fhem.pl - Hints for GNU/Linux</h3>
Version: <b>EN</b>&nbsp;<a href="linux_DE.html">DE</a> Version: <b>EN</b>&nbsp;<a href="linux_DE.html">DE</a>
</div> </div>
</div>
<div id="right"> <div id="right">

4
docs/linux_DE.html
View File

@@ -4,17 +4,19 @@
<head> <head>
<title>fhem.pl - Hinweise zu GNU/Linux</title> <title>fhem.pl - Hinweise zu GNU/Linux</title>
<link rel="stylesheet" type="text/css" href="../css/style.css" /> <link rel="stylesheet" type="text/css" href="../www/pgm2/style.css" />
<meta http-equiv="Content-type" content="text/html;charset=UTF-8"/> <meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
</head> </head>
<body> <body>
<div id="menuScrollArea">
<div id="logo"></div> <div id="logo"></div>
<div id="menu"> <div id="menu">
<h3>fhem.pl - Hinweise zu GNU/Linux</h3> <h3>fhem.pl - Hinweise zu GNU/Linux</h3>
Version: <a href="linux.html">EN</a>&nbsp;<b>DE</b> Version: <a href="linux.html">EN</a>&nbsp;<b>DE</b>
</div> </div>
</div>
<div id="right"> <div id="right">

2
www/pgm2/darkstyle.css
View File

@@ -1,5 +1,5 @@
/* Author: Till */ /* Author: Till */
body { background-color: #444444; background-image:url(../icons/darklogo); background-repeat:no-repeat; color: #CCCCCC; font-family:Arial, Helvetica, sans-serif; font-size:13px;} body { background-color: #444444; background-image:url(../images/dark/darklogo.png); background-repeat:no-repeat; color: #CCCCCC; font-family:Arial, Helvetica, sans-serif; font-size:13px;}
#logo { position:absolute; top:10px; left:20px; width:140px; visibility:hidden; } #logo { position:absolute; top:10px; left:20px; width:140px; visibility:hidden; }
#menu { position:absolute; top:170px;left:20px; width:140px; } #menu { position:absolute; top:170px;left:20px; width:140px; }
#hdr { position:absolute; top:10px; left:180px; } #hdr { position:absolute; top:10px; left:180px; }

5
www/pgm2/style.css
View File

@@ -4,7 +4,7 @@ input { font-family:Arial, sans-serif; font-size:16px; }
select { font-family:Arial, sans-serif; font-size:16px; } select { font-family:Arial, sans-serif; font-size:16px; }
#logo { margin-top:10px; margin-left:20px; width:120px; height:132px; #logo { margin-top:10px; margin-left:20px; width:120px; height:132px;
background-image:url(../icons/fhemicon.png); } background-image:url(../images/default/fhemicon.png); }
#menu { margin-top:10px; margin-left:20px; width:140px; } #menu { margin-top:10px; margin-left:20px; width:140px; }
#menuScrollArea { width: 175px; left:0px; top:0px; height:100%; #menuScrollArea { width: 175px; left:0px; top:0px; height:100%;
position:fixed; overflow-x:hidden; overflow-y:auto; } position:fixed; overflow-x:hidden; overflow-y:auto; }
@@ -28,7 +28,8 @@ table { border-radius:8px; }
table#room { border:1px solid gray; width: 100%; background: #D7FFFF; } table#room { border:1px solid gray; width: 100%; background: #D7FFFF; }
table#room tr.sel { background: #A0FFFF; } table#room tr.sel { background: #A0FFFF; }
#right { position:absolute; top:20px; left:180px; bottom:20px; right:10px; } #right { position:absolute; top:20px; left:180px; }
h2,h3,h4 { color:#52865D; line-height:1.3; h2,h3,h4 { color:#52865D; line-height:1.3;
margin-top:1.5em; font-family:Arial,Sans-serif; } margin-top:1.5em; font-family:Arial,Sans-serif; }
div#block { border:1px solid gray; background: #F8F8E0; padding:0.7em; } div#block { border:1px solid gray; background: #F8F8E0; padding:0.7em; }