FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

01_FHEMWEB.pm: accept readings enclosed in <html> as HTML (Forum #58320)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12232 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-10-01 18:04:08 +00:00
parent 343c541b24
commit 2ab58e7383
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- feature: 01_FHEMWEB/Reading: accept Readings in <html> (Forum #58320)
- bugfix: 95_Dashboard: fixes an issue causing devices with interal attribute - bugfix: 95_Dashboard: fixes an issue causing devices with interal attribute
group to not appear in the dashboard. group to not appear in the dashboard.
- bugfix: 93_DbRep: include day before and next in calculation if Timestamp - bugfix: 93_DbRep: include day before and next in calculation if Timestamp

7
fhem/FHEM/01_FHEMWEB.pm
View File

@ -1080,7 +1080,12 @@ FW_makeTable($$$@)
if(ref($val)) { #handle readings if(ref($val)) { #handle readings
my ($v, $t) = ($val->{VAL}, $val->{TIME}); my ($v, $t) = ($val->{VAL}, $val->{TIME});
$v = FW_htmlEscape($v); if($v =~ m,^<html>(.*)</html>$,) {
$v = $1;
} else {
$v = FW_htmlEscape($v);
}
if($FW_ss) { if($FW_ss) {
$t = ($t ? "<br><div class=\"tiny\">$t</div>" : ""); $t = ($t ? "<br><div class=\"tiny\">$t</div>" : "");
FW_pO "<td><div class=\"dval\">$v$t</div></td>"; FW_pO "<td><div class=\"dval\">$v$t</div></td>";