From 231002c56f6acbf9e7166a960ece9752a05239c0 Mon Sep 17 00:00:00 2001
From: Ellert <>
Date: Thu, 10 Jan 2019 18:18:10 +0000
Subject: [PATCH] 98_DOIFtools.pm: fixed line break in DOIFtoolsLog

git-svn-id: https://svn.fhem.de/fhem/trunk@18206 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED              | 1 +
 fhem/FHEM/98_DOIFtools.pm | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 736caf4f8..a85babccd 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # 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.
+  - bugfix:  98_DOIFtools: fixed line break in DOIFtoolsLog
   - feature: 72_FB_CALLMONITOR: support for contact images and download of
                                 all available contact images from FritzBox
                                 phonebooks via TR-064 API.
diff --git a/fhem/FHEM/98_DOIFtools.pm b/fhem/FHEM/98_DOIFtools.pm
index 96dd905d2..a2cb72bb4 100644
--- a/fhem/FHEM/98_DOIFtools.pm
+++ b/fhem/FHEM/98_DOIFtools.pm
@@ -405,8 +405,8 @@ sub DOIFtools_logWrapper($) {
 
     FW_pO "<div id=\"content\">";
     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>";
-    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>";
+    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>&emsp;<a href=\"#listing\">top listing</a></b><br/></pre>".($FW_ss ? "</div>" : "")."</div>";
 
     my $reverseLogs = AttrVal($FW_wname, "reverseLogs", 0);
     if(!$reverseLogs) {
@@ -605,7 +605,9 @@ sub DOIFtools_Notify($$) {
       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 .= "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) {
         $trig =~ s,([\[\" ])$itm([\"\:\] ]),$1<a href="$FW_ME?detail=$itm">$itm</a>$2,g;
       }