diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php index fcb5b312d..953beb248 100644 --- a/plugins/dynamix/include/DeviceList.php +++ b/plugins/dynamix/include/DeviceList.php @@ -30,9 +30,6 @@ extract(parse_plugin_cfg('dynamix',true)); function model($id) { return substr($id,0,strrpos($id,'_')); } -function truncate($name) { - return strlen($name)<=15 ? $name : substr($name,0,6).'...'.substr($name,-6); -} // sort unassigned devices on disk identification if (count($devs)>1) array_multisort(array_column($devs,'sectors'),SORT_DESC,array_map('model',array_column($devs,'id')),SORT_NATURAL|SORT_FLAG_CASE,array_column($devs,'device'),$devs); @@ -75,7 +72,7 @@ function device_info(&$disk,$online) { ($disk['type']=='Data' && $disk['status']!='DISK_NP') || ($disk['type']=='Cache' && $disk['status']!='DISK_NP') || ($disk['name']=='flash') || in_array($disk['name'],$pools) || - $disk['type']=='New' ? "".truncate($fancyname)."" : truncate($fancyname); + $disk['type']=='New' ? "".truncate($fancyname,15)."" : truncate($fancyname,15); if ($crypto) switch ($disk['luksState']) { case 0: if (!vfs_luks($disk['fsType'])) diff --git a/plugins/dynamix/include/DiskList.php b/plugins/dynamix/include/DiskList.php index 12dfb302a..8c8343513 100644 --- a/plugins/dynamix/include/DiskList.php +++ b/plugins/dynamix/include/DiskList.php @@ -52,9 +52,6 @@ function sharesOnly($disk) { return strpos('Data,Cache',$disk['type'])!==false && $disk['exportable']=='yes'; } -function truncate($name) { - return strlen($name)<=20 ? $name : substr($name,0,11).'...'.substr($name,-6); -} // filter disk shares $disks = array_filter($disks,'sharesOnly'); diff --git a/plugins/dynamix/include/Helpers.php b/plugins/dynamix/include/Helpers.php index 0c4941a76..fed8c8404 100644 --- a/plugins/dynamix/include/Helpers.php +++ b/plugins/dynamix/include/Helpers.php @@ -188,6 +188,10 @@ function day_count($time) { function plus($val, $word, $last) { return $val>0 ? (($val || $last) ? ($val.' '.$word.($val!=1?'s':'').($last ?'':', ')) : '') : ''; } +function truncate($name,$size=20) { + return strlen($name)<=$size ? $name : substr($name,0,$size-9).'...'.substr($name,-6); +} + function read_parity_log($epoch, $busy=false) { $log = '/boot/config/parity-checks.log'; if (file_exists($log)) { diff --git a/plugins/dynamix/include/ShareList.php b/plugins/dynamix/include/ShareList.php index 82066b08c..b3042e727 100644 --- a/plugins/dynamix/include/ShareList.php +++ b/plugins/dynamix/include/ShareList.php @@ -57,9 +57,6 @@ function shareInclude($name) { return !$include || substr($name,0,4)!='disk' || strpos("$include,", "$name,")!==false; } -function truncate($name) { - return strlen($name)<=20 ? $name : substr($name,0,11).'...'.substr($name,-6); -} // Compute all user shares & check encryption $crypto = false; foreach ($shares as $name => $share) {