Share/Pool size calculation: show and allow percentage values

This commit is contained in:
bergware
2023-04-25 09:16:41 +02:00
parent 5f75651877
commit b66cb3bd49
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -36,10 +36,10 @@ function presetSpace($val) {
global $disk,$display;
if (!$val or strcasecmp($val,'NaN')==0) return;
sanitize($val);
$units = ['KB','MB','GB','TB','PB','EB','ZB','YB'];
$size = _var($disk,'fsSize',0);
$size = $size>0 ? round(100*$val/$size,1) : 0;
if ($size < 1) {
$units = ['KB','MB','GB','TB','PB','EB','ZB','YB'];
$base = $val>0 ? floor(log($val,1000)) : 0;
$size = round($val/pow(1000,$base),1);
$d = $size-floor($size)==0 ? 0 : 1;
+1 -1
View File
@@ -59,7 +59,6 @@ function presetSpace($val) {
global $disks,$shares,$name,$pools,$display;
if (!$val or strcasecmp($val,'NaN')==0) return;
sanitize($val);
$units = ['KB','MB','GB','TB','PB','EB','ZB','YB'];
$small = [];
foreach (data_filter($disks) as $disk) $small[] = _var($disk,'fsSize');
$fsSize[""] = min(array_filter($small));
@@ -68,6 +67,7 @@ function presetSpace($val) {
$size = _var($fsSize,$pool,0);
$size = $size>0 ? round(100*$val/$size,1) : 0;
if ($size < 1) {
$units = ['KB','MB','GB','TB','PB','EB','ZB','YB'];
$base = $val>0 ? floor(log($val,1000)) : 0;
$size = round($val/pow(1000,$base),1);
$d = $size-floor($size)==0 ? 0 : 1;