From e69b1e7de4e8d9dc5ae16dbf4ef327187cc7c52f Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 25 Apr 2023 06:48:09 +0200 Subject: [PATCH] Share/Pool size calculation: show and allow percentage values --- plugins/dynamix/DeviceInfo.page | 6 +++--- plugins/dynamix/ShareEdit.page | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page index 624e91dd7..68ba8cfbe 100644 --- a/plugins/dynamix/DeviceInfo.page +++ b/plugins/dynamix/DeviceInfo.page @@ -28,9 +28,9 @@ $mode = ['Disabled','Hourly','Daily','Weekly','Monthly']; $days = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday']; function sanitize(&$val) { - $val = explode('.',str_replace([' ',','],['','.'],$val)); - $last = array_pop($val); - $val = count($val) ? implode($val).".$last" : $last; + $data = explode('.',str_replace([' ',','],['','.'],$val)); + $last = array_pop($data); + $val = count($data) ? implode($data).".$last" : $last; } function presetSpace($val) { global $disk,$display; diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page index a9dc20e4f..e4bc5432a 100644 --- a/plugins/dynamix/ShareEdit.page +++ b/plugins/dynamix/ShareEdit.page @@ -51,9 +51,9 @@ function globalInclude($name) { return substr($name,0,4)=='disk' && (!$var['shareUserInclude'] || in_array($name,explode(',',$var['shareUserInclude']))); } function sanitize(&$val) { - $val = explode('.',str_replace([' ',','],['','.'],$val)); - $last = array_pop($val); - $val = count($val) ? implode($val).".$last" : $last; + $data = explode('.',str_replace([' ',','],['','.'],$val)); + $last = array_pop($data); + $val = count($data) ? implode($data).".$last" : $last; } function presetSpace($val) { global $disks,$shares,$name,$pools,$display;