diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php index 2ee6a9052..ae00c4daf 100644 --- a/plugins/dynamix/include/DeviceList.php +++ b/plugins/dynamix/include/DeviceList.php @@ -30,6 +30,9 @@ extract(parse_plugin_cfg('dynamix',true)); function model($id) { return substr($id,0,strrpos($id,'_')); } +function truncate($name) { + return strlen($name)<=16 ? $name : substr($name,0,14).'...'; +} // 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); @@ -72,7 +75,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' ? "".$fancyname."" : $fancyname; + $disk['type']=='New' ? "".truncate($fancyname)."" : truncate($fancyname); 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 0c6db3e27..3ffa25fec 100644 --- a/plugins/dynamix/include/DiskList.php +++ b/plugins/dynamix/include/DiskList.php @@ -51,6 +51,10 @@ function shareInclude($name) { function sharesOnly($disk) { return strpos('Data,Cache',$disk['type'])!==false && $disk['exportable']=='yes'; } + +function truncate($name) { + return strlen($name)<=16 ? $name : substr($name,0,14).'...'; +} // filter disk shares $disks = array_filter($disks,'sharesOnly'); @@ -87,7 +91,7 @@ foreach ($disks as $name => $disk) { default: $luks = ""._('Unknown encryption state').""; break; } else $luks = ""; echo "