From 05752faec037c7900c18ddcd8d0ea0c3307ee0c0 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Sun, 30 Jun 2024 15:54:47 +0300
Subject: [PATCH] Fix to separate drive and CPU temperatures collection #2208

---
 system-status/system-status-lib.pl | 2 +-
 webmin/change_status.cgi           | 1 +
 webmin/edit_status.cgi             | 4 ++++
 webmin/lang/en                     | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/system-status/system-status-lib.pl b/system-status/system-status-lib.pl
index 7214f16e1..04ded90d6 100755
--- a/system-status/system-status-lib.pl
+++ b/system-status/system-status-lib.pl
@@ -74,7 +74,7 @@ if (&foreign_installed("package-updates") && $config{'collect_pkgs'}) {
 	}
 
 # CPU and drive temps
-if (!$config{'collect_notemp'} && defined(&proc::get_current_cpu_data)) {
+if (!$config{'collect_notemp2'} && defined(&proc::get_current_cpu_data)) {
 	my ($cpu, $fans) = &proc::get_current_cpu_data();
 	$info->{'cputemps'} = $cpu if (ref($cpu) && @{$cpu} >= 1);
 	$info->{'cpufans'} = $fans if (ref($fans) && @{$fans} >= 1);
diff --git a/webmin/change_status.cgi b/webmin/change_status.cgi
index 1a04d105a..e00674d15 100755
--- a/webmin/change_status.cgi
+++ b/webmin/change_status.cgi
@@ -18,6 +18,7 @@ else {
 
 # Save collection options
 $system_status::config{'collect_pkgs'} = $in{'pkgs'};
+$system_status::config{'collect_notemp2'} = !$in{'temp2'};
 $system_status::config{'collect_notemp'} = !$in{'temp'};
 $system_status::config{'collect_units'} = $in{'units'};
 
diff --git a/webmin/edit_status.cgi b/webmin/edit_status.cgi
index 646e06fce..48b48871c 100755
--- a/webmin/edit_status.cgi
+++ b/webmin/edit_status.cgi
@@ -19,6 +19,10 @@ print &ui_table_row($text{'status_interval'},
 print &ui_table_row($text{'status_pkgs'},
 	&ui_yesno_radio("pkgs", $system_status::config{'collect_pkgs'}));
 
+# Collect CPU temerature?
+print &ui_table_row($text{'status_temp2'},
+	&ui_yesno_radio("temp2", !$system_status::config{'collect_notemp2'}));
+
 # Collect drive temps?
 print &ui_table_row($text{'status_temp'},
 	&ui_yesno_radio("temp", !$system_status::config{'collect_notemp'}));
diff --git a/webmin/lang/en b/webmin/lang/en
index 16e6aa465..d8d74ccb0 100644
--- a/webmin/lang/en
+++ b/webmin/lang/en
@@ -1061,6 +1061,7 @@ status_interval0=Every
 status_mins=minutes
 status_pkgs=Collect available package updates?
 status_temp=Collect drive temperatures?
+status_temp2=Collect CPU temperatures and fans speed?
 status_units=Units for temperatures
 status_celsius=Celsius
 status_fahrenheit=Fahrenheit