diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php index 101fbdc7b6..e4a6b9a746 100644 --- a/core/user_settings/user_dashboard.php +++ b/core/user_settings/user_dashboard.php @@ -925,10 +925,10 @@ $tmp = preg_replace('!\s+!', ' ', $tmp[1]); // multiple > single space $tmp = explode(' ', $tmp); foreach ($tmp as $stat) { - if (substr_count($stat, '%') > 0) { $percent = rtrim($stat,'%'); break; } + if (substr_count($stat, '%') > 0) { $percent_disk_usage = rtrim($stat,'%'); break; } } - if ($percent != '') { - $hud[$n]['html'] .= "".$percent."
".$text['label-disk_usage']." (%)
\n"; + if ($percent_disk_usage != '') { + $hud[$n]['html'] .= "".$percent_disk_usage."
".$text['label-disk_usage']." (%)
\n"; } } @@ -1004,11 +1004,11 @@ //memory usage (for available memory, use "free | awk 'FNR == 3 {print $4/($3+$4)*100}'" instead) if (stristr(PHP_OS, 'Linux')) { - $percent = round(shell_exec("free | awk 'FNR == 3 {print $3/($3+$4)*100}'"), 1).'%'; - if ($percent != '') { + $percent_memory = round(shell_exec("free | awk 'FNR == 3 {print $3/($3+$4)*100}'"), 1); + if ($percent_memory != '') { $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-memory_usage']."\n"; - $hud[$n]['html'] .= "".$percent."\n"; + $hud[$n]['html'] .= "".$percent_memory."%\n"; $hud[$n]['html'] .= "\n"; $c = ($c) ? 0 : 1; } @@ -1017,10 +1017,10 @@ //disk usage if (stristr(PHP_OS, 'Linux')) { //calculated above - if ($percent != '') { + if ($percent_disk_usage != '') { $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-disk_usage']."\n"; - $hud[$n]['html'] .= "".$percent."%\n"; + $hud[$n]['html'] .= "".$percent_disk_usage."%\n"; $hud[$n]['html'] .= "\n"; $c = ($c) ? 0 : 1; } @@ -1032,11 +1032,11 @@ $tmp = explode("\n", $tmp); $tmp = preg_replace('!\s+!', ' ', $tmp[1]); // multiple > single space $tmp = explode(' ', trim($tmp)); - $cpu = $tmp[0]; - if ($cpu != '') { + $percent_cpu = $tmp[0]; + if ($percent_cpu != '') { $hud[$n]['html'] .= "\n"; $hud[$n]['html'] .= "".$text['label-processor_usage']."\n"; - $hud[$n]['html'] .= "".$cpu."%\n"; + $hud[$n]['html'] .= "".$percent_cpu."%\n"; $hud[$n]['html'] .= "\n"; $c = ($c) ? 0 : 1; }