Multi cache pool support

This commit is contained in:
bergware
2020-04-11 08:12:41 +02:00
parent 80f7f5b191
commit c421de6f39
3 changed files with 3 additions and 4 deletions

View File

@@ -32,8 +32,7 @@ function model($id) {
}
function truncate($name) {
if (strlen($name)<=15) return $name;
[$n1,$n2] = preg_split('/(?<=[a-z_-])(?= ?[0-9]+)/i',$name);
return substr($n1,0,12).'...'.$n2;
return 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);

View File

@@ -53,7 +53,7 @@ function sharesOnly($disk) {
}
function truncate($name) {
return strlen($name)<=20 ? $name : substr($name,0,17).'...';
return strlen($name)<=20 ? $name : substr($name,0,11).'...'.substr($name,-6);
}
// filter disk shares
$disks = array_filter($disks,'sharesOnly');

View File

@@ -58,7 +58,7 @@ function shareInclude($name) {
}
function truncate($name) {
return strlen($name)<=20 ? $name : substr($name,0,17).'...';
return strlen($name)<=20 ? $name : substr($name,0,11).'...'.substr($name,-6);
}
// Compute all user shares & check encryption
$crypto = false;