webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 10:35:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reported-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2024-09-23 14:50:32 +02:00
parent 9682fa9fe7
commit 4ac5aaf635
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
html/cgi-bin/logs.cgi/log.dat
View File

@@ -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="";
my $data = &Header::cleanhtml($4, 'y');
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++;
print <<END;
<tr>
<td align='center'>
$time
</td>
<td>
$sec
</td>
<td>
$data
</td>
</tr>
END
}
#print '</tt>';
print "</table>";
&oldernewer();