From 26fc3964216dacd0e641b55686e1e7b85a57369d Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Mon, 26 Aug 2024 14:46:47 +0300
Subject: [PATCH] Fix to print in dashboard only allowed fields

https://forum.virtualmin.com/t/obscuring-account-information/128735?u=ilia
---
 system-status/lang/de      | 2 +-
 system-status/lang/en      | 2 +-
 system-status/lang/ms.auto | 2 +-
 usermin/change_ui.cgi      | 1 +
 usermin/edit_ui.cgi        | 9 +++++++++
 usermin/lang/en            | 6 ++++++
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/system-status/lang/de b/system-status/lang/de
index 84dcbbed3..7cccae78c 100644
--- a/system-status/lang/de
+++ b/system-status/lang/de
@@ -4,7 +4,7 @@ right_os=Betriebssystem
 right_login=Eingeloggt als
 right_from=Eingeloggt von
 right_webmin=Webmin Version
-right_usermin=Usermin Version
+right_usermin=Usermin version
 right_cpu=CPU-Last im Durchschnitt
 right_cpuinfo=Prozessorinformation
 right_cputemps=CPU-Temperatur
diff --git a/system-status/lang/en b/system-status/lang/en
index 91649a6a3..f8804d93d 100644
--- a/system-status/lang/en
+++ b/system-status/lang/en
@@ -4,7 +4,7 @@ right_os=Operating system
 right_login=Logged in as
 right_from=Logged in from
 right_webmin=Webmin version
-right_usermin=Usermin Version
+right_usermin=Usermin version
 right_cpu=CPU load averages
 right_cpuinfo=Processor information
 right_cputemps=CPU temperatures
diff --git a/system-status/lang/ms.auto b/system-status/lang/ms.auto
index f2d3bb259..bf83a4bd7 100644
--- a/system-status/lang/ms.auto
+++ b/system-status/lang/ms.auto
@@ -4,7 +4,7 @@ right_os=Sistem operasi
 right_login=Log masuk sebagai
 right_from=Log masuk dari
 right_webmin=Versi Webmin
-right_usermin=Usermin Version
+right_usermin=Usermin version
 right_cpu=Purata beban CPU
 right_cpuinfo=Maklumat pemproses
 right_cputemps=Suhu CPU
diff --git a/usermin/change_ui.cgi b/usermin/change_ui.cgi
index ccc6e4021..e38751f5a 100755
--- a/usermin/change_ui.cgi
+++ b/usermin/change_ui.cgi
@@ -34,6 +34,7 @@ $uconfig{'showlogin'} = $in{'showlogin'};
 $uconfig{'hostnamemode'} = $in{'hostnamemode'};
 $uconfig{'hostnamedisplay'} = $in{'hostnamedisplay'};
 $uconfig{'notabs'} = $in{'notabs'};
+$uconfig{'ui_show'} = join(" ", split(/\0/, $in{'ui_show'}));
 &write_file($usermin_config, \%uconfig);
 &unlock_file($usermin_config);
 &webmin_log('ui', undef, undef, \%in);
diff --git a/usermin/edit_ui.cgi b/usermin/edit_ui.cgi
index b8145c01e..e869fe93c 100755
--- a/usermin/edit_ui.cgi
+++ b/usermin/edit_ui.cgi
@@ -71,6 +71,15 @@ print &ui_table_row($text{'ui_tabs'},
 	&ui_radio("notabs", $uconfig{'notabs'} ? 1 : 0,
 	  [ [ 0, $text{'yes'} ], [ 1, $text{'no'} ] ]));
 
+my @ui_show = split(/\s+/, $uconfig{'ui_show'} // 'host os ver tver time');
+print &ui_table_row($text{'ui_show'},
+                &ui_select("ui_show", \@ui_show,
+                        [ ['host', $text{'ui_show_host'} ],
+                          ['os', $text{'ui_show_os'} ],
+                          ['ver', $text{'ui_show_ver'} ],
+                          ['tver', $text{'ui_show_tver'} ],
+                          ['time', $text{'ui_show_time'} ] ], 5, 1));
+
 print &ui_table_end();
 print &ui_form_end([ [ "save", $text{'save'} ] ]);
 
diff --git a/usermin/lang/en b/usermin/lang/en
index e3c256d23..7a3edd5f0 100644
--- a/usermin/lang/en
+++ b/usermin/lang/en
@@ -250,6 +250,12 @@ ui_hnm1=Hostname from URL
 ui_hnm2=Domain name from URL
 ui_hnm3=Other name..
 ui_tabs=Categorize modules?
+ui_show=Display in dashboard
+ui_show_host=System hostname
+ui_show_os=Operating system
+ui_show_ver=Usermin version
+ui_show_tver=Theme version
+ui_show_time=Time on system
 
 upgrade_title=Upgrade Usermin
 upgrade_title2=Install Usermin