From d8a74cd2750a207c7794aeaac06bd809996abf68 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Mon, 27 Oct 2025 17:53:20 +0200 Subject: [PATCH] Fix to keep print consistent for single line messages too --- webminlog/lang/en | 34 +++++++++++++++++++++++----------- webminlog/view.cgi | 12 ++++++++---- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/webminlog/lang/en b/webminlog/lang/en index 382461052..bf5836f49 100644 --- a/webminlog/lang/en +++ b/webminlog/lang/en @@ -89,18 +89,30 @@ view_host=Source Webmin server view_sid=Session ID view_time=Date and time view_nofiles=No config file changes were logged for this action -view_type_create=Created file $1 -view_type_modify=Changed file $1 -view_type_delete=Deleted file $1 +view_type_createdesc=Created file +view_type_create=$1 +view_type_modifydesc=Modified file +view_type_modify=$1 +view_type_deletedesc=Deleted file +view_type_delete=$1 +view_type_execdesc=Executed command view_type_exec=Executed command -view_type_sql=Executed SQL statement in database $1 -view_type_kill=Sent signal $1 to PID $2 -view_type_symlink=Created symlink $1 -> $2 -view_type_unsymlink=Deleted symlink $1 -> $2 -view_type_resymlink=Modified symlink $1 -> $2 -view_type_mkdir=Created directory $1 -view_type_rmdir=Removed directory $1 -view_type_rename=Renamed $1 to $2 +view_type_sqldesc=Executed SQL statement in database +view_type_sql=$1 +view_type_killdesc=Sent signal to process +view_type_kill=$1 to PID $2 +view_type_symlinkdesc=Created symlink +view_type_symlink=$1  ↣  $2 +view_type_unsymlinkdesc=Deleted symlink +view_type_unsymlink=$1  ↮  $2 +view_type_resymlinkdesc=Modified symlink +view_type_resymlink=$1  ↬  $2 +view_type_mkdirdesc=Created directory +view_type_mkdir=$1 +view_type_rmdirdesc=Removed directory +view_type_rmdir=$1 +view_type_renamedesc=Renamed target +view_type_rename=$1 to $2 view_ecannot=You are not allowed to view this log entry view_rollback2=Roll Back Selected Files view_return=action details diff --git a/webminlog/view.cgi b/webminlog/view.cgi index f3a92b3ee..afe29c093 100755 --- a/webminlog/view.cgi +++ b/webminlog/view.cgi @@ -131,10 +131,14 @@ foreach my $d (&list_diffs($act)) { if ($t =~ /\$2/ || !$d->{'diff'}) { # Diff is just a single line message $fhtml .= &ui_hidden_table_start($cbox. - &text("view_type_".$d->{'type'}, - "$d->{'object'}", - "".&html_escape($d->{'diff'}).""), - "width=100% data-nodata=1", 2, "diff$i", 0); + $text{"view_type_".$d->{'type'}."desc"}, + "width=100%", 2, "diff$i", 1); + $fhtml .= &ui_table_row(undef, + &ui_tag('pre', + &text("view_type_".$d->{'type'}, + "$d->{'object'}", + "".&html_escape($d->{'diff'})."") + , {'data-text' => 1}), 2); } else { # Show multi-line diff