From 327e04e882360a3836027e4e41905c61961ba9c7 Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 25 Apr 2023 09:29:42 +0200 Subject: [PATCH] Share/Pool size calculation: show and allow percentage values --- plugins/dynamix/DeviceInfo.page | 4 ++-- plugins/dynamix/ShareEdit.page | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page index 5a5d2a5d5..84fefc6a1 100644 --- a/plugins/dynamix/DeviceInfo.page +++ b/plugins/dynamix/DeviceInfo.page @@ -43,9 +43,9 @@ function presetSpace($val) { $units = ['KB','MB','GB','TB','PB','EB','ZB','YB']; $base = $val>0 ? floor(log($val,1000)) : 0; $size = round($val/pow(1000,$base),1); - return number_format($size,$size-floor($size)==0?0:1,$dot,$comma).' '._var($units,$base); + return number_format($size,$size-floor($size)?1:0,$dot,$comma).' '._var($units,$base); } else { - return $size>0 ? number_format($size,$size-floor($size)==0?0:1,$dot,$comma).' %' : ''; + return $size>0 ? number_format($size,$size-floor($size)?1:0,$dot,$comma).' %' : ''; } } function fsSize() { diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page index baa5ecfc8..85a3800d7 100644 --- a/plugins/dynamix/ShareEdit.page +++ b/plugins/dynamix/ShareEdit.page @@ -71,9 +71,9 @@ function presetSpace($val) { $units = ['KB','MB','GB','TB','PB','EB','ZB','YB']; $base = $val>0 ? floor(log($val,1000)) : 0; $size = round($val/pow(1000,$base),1); - return number_format($size,$size-floor($size)==0?0:1,$dot,$comma).' '._var($units,$base); + return number_format($size,$size-floor($size)?1:0,$dot,$comma).' '._var($units,$base); } else { - return $size>0 ? number_format($size,$size-floor($size)==0?0:1,$dot,$comma).' %' : ''; + return $size>0 ? number_format($size,$size-floor($size)?1:0,$dot,$comma).' %' : ''; } } function fsSize() {