From c421de6f393c55c85d9b6d1563ade691eecbfc0e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 11 Apr 2020 08:12:41 +0200
Subject: [PATCH] Multi cache pool support

---
 plugins/dynamix/include/DeviceList.php | 3 +--
 plugins/dynamix/include/DiskList.php   | 2 +-
 plugins/dynamix/include/ShareList.php  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php
index a78facaea..5549251ee 100644
--- a/plugins/dynamix/include/DeviceList.php
+++ b/plugins/dynamix/include/DeviceList.php
@@ -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);
diff --git a/plugins/dynamix/include/DiskList.php b/plugins/dynamix/include/DiskList.php
index a8aece857..12dfb302a 100644
--- a/plugins/dynamix/include/DiskList.php
+++ b/plugins/dynamix/include/DiskList.php
@@ -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');
diff --git a/plugins/dynamix/include/ShareList.php b/plugins/dynamix/include/ShareList.php
index f22e6c0cd..82066b08c 100644
--- a/plugins/dynamix/include/ShareList.php
+++ b/plugins/dynamix/include/ShareList.php
@@ -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;