VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2024-06-30 10:07:08 -07:00
parent 52c3178b92 e3dec2222d
commit 11f2bc20eb
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system-status/system-status-lib.pl
View File

@ -74,7 +74,7 @@ if (&foreign_installed("package-updates") && $config{'collect_pkgs'}) {
} }
# CPU and drive temps # 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(); my ($cpu, $fans) = &proc::get_current_cpu_data();
$info->{'cputemps'} = $cpu if (ref($cpu) && @{$cpu} >= 1); $info->{'cputemps'} = $cpu if (ref($cpu) && @{$cpu} >= 1);
$info->{'cpufans'} = $fans if (ref($fans) && @{$fans} >= 1); $info->{'cpufans'} = $fans if (ref($fans) && @{$fans} >= 1);

1
webmin/change_status.cgi
View File

@ -18,6 +18,7 @@ else {
# Save collection options # Save collection options
$system_status::config{'collect_pkgs'} = $in{'pkgs'}; $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_notemp'} = !$in{'temp'};
$system_status::config{'collect_units'} = $in{'units'}; $system_status::config{'collect_units'} = $in{'units'};

4
webmin/edit_status.cgi
View File

@ -19,6 +19,10 @@ print &ui_table_row($text{'status_interval'},
print &ui_table_row($text{'status_pkgs'}, print &ui_table_row($text{'status_pkgs'},
&ui_yesno_radio("pkgs", $system_status::config{'collect_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? # Collect drive temps?
print &ui_table_row($text{'status_temp'}, print &ui_table_row($text{'status_temp'},
&ui_yesno_radio("temp", !$system_status::config{'collect_notemp'})); &ui_yesno_radio("temp", !$system_status::config{'collect_notemp'}));

1
webmin/lang/en
View File

@ -1061,6 +1061,7 @@ status_interval0=Every
status_mins=minutes status_mins=minutes
status_pkgs=Collect available package updates? status_pkgs=Collect available package updates?
status_temp=Collect drive temperatures? status_temp=Collect drive temperatures?
status_temp2=Collect CPU temperatures and fans speed?
status_units=Units for temperatures status_units=Units for temperatures
status_celsius=Celsius status_celsius=Celsius
status_fahrenheit=Fahrenheit status_fahrenheit=Fahrenheit