[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4ac5aaf635dbf095b0bb98b8c786133d952e3d19

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3225 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  4ac5aaf635dbf095b0bb98b8c786133d952e3d19 (commit)
      from  9682fa9fe769ea84a032400b2855e7ef4a975696 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4ac5aaf635dbf095b0bb98b8c786133d952e3d19
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Sep 23 14:50:32 2024 +0200

    log.dat: Remove stupid line breaks and update markup of table
    
    Reported-by: Stephen Cuka <stephen(a)firemypi.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/logs.cgi/log.dat | 53 +++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 41f81e99d..4370b1bf3 100644
--- 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();


hooks/post-receive
--
IPFire 2.x development tree