log.dat: Remove stupid line breaks and update markup of table

Reported-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 41f81e99d9700aaa4a97abb360e585bb94c2d355..4370b1bf324a7324ca3992fd599e0ca7ca598a25 100644 (file)
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -388,17 +388,15 @@ if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; }
 if ($lines != 0) { &oldernewer(); }
 
 print <<END
-<table width='100%' class='tbl'>
-<tr>
-       <th width='10%' align='center' class='boldbase'><b>$Lang::tr{'time'}</b></th>
-       <th width='15%' align='center' class='boldbase'><b>$Lang::tr{'section'}</b></th>
-       <th width='75%'>&nbsp;</th>
-</tr>
+<table class='tbl'>
+       <tr>
+               <th width='10%' align='center'>$Lang::tr{'time'}</th>
+               <th width='15%' align='center'>$Lang::tr{'section'}</th>
+               <th width='75%'>&nbsp;</th>
+       </tr>
 END
 ;
 
-$lines = 0;
-#print '<tt>';
 foreach $_ (@log)
 {
        /^... (..) (..:..:..) [\w\-\.]+ ${section}(.*)$/;
@@ -406,29 +404,24 @@ foreach $_ (@log)
        $day =~ tr / /0/;
        my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
        my $sec = $3;
-       my $data = $4;
-       # correct the cut position, just when section=RED
-       if (($cgiparams{'SECTION'} eq 'red' ) && ($sec =~ /(kernel:)(.*)/)) {
-           $sec = 'kernel';
-           $data = $2.': '.$data;
-       }
-       my $d = substr ($data,0,80);
-       while (length($data)>80){       #very basic breaking of lines...
-           $data = substr ($data,80);  #permit correct display in table cell
-           $d .=  ' ' . substr ($data,0,80);
-       }
-       my $col="";
-
-       if ($lines % 2) {
-               print "<tr>";
-               $col="bgcolor='$color{'color20'}'"; }
-       else {
-               print "<tr>";
-               $col="bgcolor='$color{'color22'}'"; }
-       print "<td $col>$time<td $col>$sec<td $col>" .&Header::cleanhtml ("$d", 'y') . "</td></tr>\n";
-       $lines++;
+       my $data = &Header::cleanhtml($4, 'y');
+
+       print <<END;
+               <tr>
+                       <td align='center'>
+                               $time
+                       </td>
+
+                       <td>
+                               $sec
+                       </td>
+
+                       <td>
+                               $data
+                       </td>
+               </tr>
+END
 }
-#print '</tt>';
 print "</table>";
 
 &oldernewer();