Skip to content
Permalink
Browse files

Fix to improve display of System Status module

  • Loading branch information...
rostovtsev committed Nov 21, 2018
1 parent a2f0fc4 commit f129aa441e2b902b49f13886003026d1c242043e
Showing with 37 additions and 39 deletions.
  1. +21 −23 authentic-lib.pm
  2. +8 −8 sysinfo.cgi
  3. +1 −1 unauthenticated/css/bundle.min.css
  4. +7 −7 unauthenticated/js/bundle.min.js
@@ -1109,13 +1109,13 @@ sub get_sysinfo_vars
@info = grep {$_->{'id'} eq 'sysinfo'} @info;

# Define used vars
my ($webmin_version_str, $cpu_percent, $mem_percent, $virt_percent,
$disk_percent, $host, $os, $webmin_version,
$virtualmin_version, $cloudmin_version, $authentic_theme_version, $local_time,
$kernel_arch, $cpu_type, $cpu_temperature, $hdd_temperature,
$uptime, $running_proc, $load, $real_memory,
$virtual_memory, $disk_space, $package_message, $csf_title,
$csf_data, $csf_remote_version, $authentic_remote_version);
my ($cpu_percent, $mem_percent, $virt_percent, $disk_percent,
$host, $os, $webmin_version, $virtualmin_version,
$cloudmin_version, $authentic_theme_version, $local_time, $kernel_arch,
$cpu_type, $cpu_temperature, $hdd_temperature, $uptime,
$running_proc, $load, $real_memory, $virtual_memory,
$disk_space, $package_message, $csf_title, $csf_data,
$csf_remote_version, $authentic_remote_version);

if (@info) {
$info_arr = @info[0]->{'raw'};
@@ -1128,8 +1128,6 @@ sub get_sysinfo_vars
return;
}

$webmin_version_str = (defined(@$info_arr[1]) ? @$info_arr[1]->{'webmin_version'} : undef);

# Require memory information
my @m;
if ($info->{'mem'}) {
@@ -1568,13 +1566,13 @@ sub get_sysinfo_vars
}
}

return ($webmin_version_str, $cpu_percent, $mem_percent, $virt_percent,
$disk_percent, $host, $os, $webmin_version,
$virtualmin_version, $cloudmin_version, $authentic_theme_version, $local_time,
$kernel_arch, $cpu_type, $cpu_temperature, $hdd_temperature,
$uptime, $running_proc, $load, $real_memory,
$virtual_memory, $disk_space, $package_message, $csf_title,
$csf_data, $csf_remote_version, $authentic_remote_version);
return ($cpu_percent, $mem_percent, $virt_percent, $disk_percent,
$host, $os, $webmin_version, $virtualmin_version,
$cloudmin_version, $authentic_theme_version, $local_time, $kernel_arch,
$cpu_type, $cpu_temperature, $hdd_temperature, $uptime,
$running_proc, $load, $real_memory, $virtual_memory,
$disk_space, $package_message, $csf_title, $csf_data,
$csf_remote_version, $authentic_remote_version);

}

@@ -3212,13 +3210,13 @@ sub get_xhr_request
}
} elsif ($in{'xhr-info'} eq '1') {
my @info = theme_list_combined_system_info();
our ($webmin_version_str, $cpu_percent, $mem_percent, $virt_percent,
$disk_percent, $host, $os, $webmin_version,
$virtualmin_version, $cloudmin_version, $authentic_theme_version, $local_time,
$kernel_arch, $cpu_type, $cpu_temperature, $hdd_temperature,
$uptime, $running_proc, $load, $real_memory,
$virtual_memory, $disk_space, $package_message, $csf_title,
$csf_data, $csf_remote_version, $authentic_remote_version
our ($cpu_percent, $mem_percent, $virt_percent, $disk_percent,
$host, $os, $webmin_version, $virtualmin_version,
$cloudmin_version, $authentic_theme_version, $local_time, $kernel_arch,
$cpu_type, $cpu_temperature, $hdd_temperature, $uptime,
$running_proc, $load, $real_memory, $virtual_memory,
$disk_space, $package_message, $csf_title, $csf_data,
$csf_remote_version, $authentic_remote_version
) = get_sysinfo_vars(\@info);

my @updated_info = { "data" => 1,
@@ -21,13 +21,13 @@ print '<div class="container-fluid col-lg-10 col-lg-offset-1" data-dcontainer="1

# Get system info to show
my @info = theme_list_combined_system_info();
my ($has_stats, $cpu_percent, $mem_percent, $virt_percent,
$disk_percent, $host, $os, $webmin_version,
$virtualmin_version, $cloudmin_version, $authentic_theme_version, $local_time,
$kernel_arch, $cpu_type, $cpu_temperature, $hdd_temperature,
$uptime, $running_proc, $load, $real_memory,
$virtual_memory, $disk_space, $package_message, $csf_title,
$csf_data, $csf_remote_version, $authentic_remote_version
my ($cpu_percent, $mem_percent, $virt_percent, $disk_percent,
$host, $os, $webmin_version, $virtualmin_version,
$cloudmin_version, $authentic_theme_version, $local_time, $kernel_arch,
$cpu_type, $cpu_temperature, $hdd_temperature, $uptime,
$running_proc, $load, $real_memory, $virtual_memory,
$disk_space, $package_message, $csf_title, $csf_data,
$csf_remote_version, $authentic_remote_version
) = get_sysinfo_vars(\@info);

if ($get_user_level ne '3') {
@@ -179,6 +179,6 @@ if ($get_user_level ne '3') {
}
$commonmods_data .= ui_table_end();
print_panel(1, 'account_functions', $theme_text{'theme_left_mail_account_functions'}, ($commonmods_data));
}
}
print '</div>' . "\n";
footer('stripped');

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit f129aa4

Please sign in to comment.
You can’t perform that action at this time.