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

98_DOIFtools.pm: fixed line break in DOIFtoolsLog

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18206 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Ellert 2019-01-10 18:18:10 +00:00
parent 7591f98757
commit 231002c56f
2 changed files with 6 additions and 3 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.
- bugfix: 98_DOIFtools: fixed line break in DOIFtoolsLog
- feature: 72_FB_CALLMONITOR: support for contact images and download of - feature: 72_FB_CALLMONITOR: support for contact images and download of
all available contact images from FritzBox all available contact images from FritzBox
phonebooks via TR-064 API. phonebooks via TR-064 API.

8
fhem/FHEM/98_DOIFtools.pm
View File

@ -405,8 +405,8 @@ sub DOIFtools_logWrapper($) {
FW_pO "<div id=\"content\">"; FW_pO "<div id=\"content\">";
FW_pO "<div class=\"tiny\">" if($FW_ss); FW_pO "<div class=\"tiny\">" if($FW_ss);
FW_pO "<pre class=\"log\"><b>jump to: <a name='top'></a><a href=\"#end_of_file\">the end</a> <a href=\"#listing\">top listing</a></b><br>"; FW_pO "<pre class=\"log\"><b>jump to: <a name='top'></a><a href=\"#end_of_file\">the end</a>&emsp;<a href=\"#listing\">top listing</a></b><br>";
my $suffix = "<br/><b>jump to: <a name='end_of_file'></a><a href='#top'>the top</a> <a href=\"#listing\">top listing</a></b><br/></pre>".($FW_ss ? "</div>" : "")."</div>"; my $suffix = "<br/><b>jump to: <a name='end_of_file'></a><a href='#top'>the top</a>&emsp;<a href=\"#listing\">top listing</a></b><br/></pre>".($FW_ss ? "</div>" : "")."</div>";
my $reverseLogs = AttrVal($FW_wname, "reverseLogs", 0); my $reverseLogs = AttrVal($FW_wname, "reverseLogs", 0);
if(!$reverseLogs) { if(!$reverseLogs) {
@ -605,7 +605,9 @@ sub DOIFtools_Notify($$) {
my $next = $hash->{helper}{counter}{0} + 1; my $next = $hash->{helper}{counter}{0} + 1;
$trig .= $prev ? "<b>jump to: <a href=\"#list$prev\">prev</a>&nbsp;&nbsp;<a href=\"#list$next\">next</a> Listing</b><br>" : "<b>jump to: prev&nbsp;&nbsp;<a href=\"#list$next\">next</a> Listing</b><br>"; $trig .= $prev ? "<b>jump to: <a href=\"#list$prev\">prev</a>&nbsp;&nbsp;<a href=\"#list$next\">next</a> Listing</b><br>" : "<b>jump to: prev&nbsp;&nbsp;<a href=\"#list$next\">next</a> Listing</b><br>";
$trig .= "DOIF-Version: ".ReadingsVal($pn,"DOIF_version","n/a")."<br>"; $trig .= "DOIF-Version: ".ReadingsVal($pn,"DOIF_version","n/a")."<br>";
$trig .= CommandList(undef,$sn); my $trigtmp = CommandList(undef,$sn);
$trigtmp =~ s/\n|\r/<br>/g;
$trig .= $trigtmp;
foreach my $itm (keys %defs) { foreach my $itm (keys %defs) {
$trig =~ s,([\[\" ])$itm([\"\:\] ]),$1<a href="$FW_ME?detail=$itm">$itm</a>$2,g; $trig =~ s,([\[\" ])$itm([\"\:\] ]),$1<a href="$FW_ME?detail=$itm">$itm</a>$2,g;
} }