Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

92_FileLog.pm: use FW_addContent (Forum #65182)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13152 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-01-20 09:04:34 +00:00
parent d95a093b3f
commit f78f23c7b2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/92_FileLog.pm
View File

@ -9,6 +9,7 @@ use IO::File;
# This block is only needed when FileLog is loaded bevore FHEMWEB # This block is only needed when FileLog is loaded bevore FHEMWEB
sub FW_pO(@); sub FW_pO(@);
sub FW_pH(@); sub FW_pH(@);
sub FW_addContent(;$);
use vars qw($FW_ME); # webname (default is fhem) use vars qw($FW_ME); # webname (default is fhem)
use vars qw($FW_RET); # Returned data (html) use vars qw($FW_RET); # Returned data (html)
use vars qw($FW_RETTYPE); use vars qw($FW_RETTYPE);
@ -486,7 +487,7 @@ FileLog_logWrapper($)
my $ret = ""; my $ret = "";
if(!$d || !$type || !$file) { if(!$d || !$type || !$file) {
FW_pO '<div id="content">FileLog_logWrapper: bad arguments</div>'; FW_addContent(">FileLog_logWrapper: bad arguments</div");
return 0; return 0;
} }
@ -497,7 +498,7 @@ FileLog_logWrapper($)
if($path =~ m/%/ && $attr{global}{logdir}); if($path =~ m/%/ && $attr{global}{logdir});
$path = AttrVal($d,"archivedir","") . "/$file" if(!-f $path); $path = AttrVal($d,"archivedir","") . "/$file" if(!-f $path);
FW_pO "<div id=\"content\">"; FW_addContent();
FW_pO "<div class=\"tiny\">" if($FW_ss); FW_pO "<div class=\"tiny\">" if($FW_ss);
FW_pO "<pre class=\"log\">"; FW_pO "<pre class=\"log\">";
my $suffix = "</pre>".($FW_ss ? "</div>" : "")."</div>"; my $suffix = "</pre>".($FW_ss ? "</div>" : "")."</div>";
@ -509,7 +510,7 @@ FileLog_logWrapper($)
} }
if(!open(FH, $path)) { if(!open(FH, $path)) {
FW_pO "<div id=\"content\">$path: $!</div></body></html>"; FW_addContent(">$path: $!</div></body></html");
return 0; return 0;
} }
my $cnt = join("", reverse <FH>); my $cnt = join("", reverse <FH>);
@ -522,7 +523,7 @@ FileLog_logWrapper($)
} else { } else {
FileLog_loadSVG(); FileLog_loadSVG();
FW_pO "<script type='text/javascript' src='$FW_ME/pgm2/svg.js'></script>"; FW_pO "<script type='text/javascript' src='$FW_ME/pgm2/svg.js'></script>";
FW_pO "<div id=\"content\">"; FW_addContent();
FW_pO "<br>"; FW_pO "<br>";
if(AttrVal($d,"plotmode",$FW_plotmode) ne "gnuplot") { if(AttrVal($d,"plotmode",$FW_plotmode) ne "gnuplot") {
FW_pO SVG_zoomLink("$cmd;zoom=-1", "Zoom-in", "zoom in"); FW_pO SVG_zoomLink("$cmd;zoom=-1", "Zoom-in", "zoom in");