From b66cb3bd493b2a8967d0b2e2e7ab30565a4fd65d Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 25 Apr 2023 09:16:41 +0200 Subject: [PATCH] Share/Pool size calculation: show and allow percentage values --- plugins/dynamix/DeviceInfo.page | 2 +- plugins/dynamix/ShareEdit.page | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page index a23683122..f03d81ed2 100644 --- a/plugins/dynamix/DeviceInfo.page +++ b/plugins/dynamix/DeviceInfo.page @@ -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; diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page index 9753e4376..484244ec6 100644 --- a/plugins/dynamix/ShareEdit.page +++ b/plugins/dynamix/ShareEdit.page @@ -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;