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

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

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' ? "<a href=\"".htmlspecialchars("$path/$type?name=$name")."\">".$fancyname."</a>" : $fancyname;
+           $disk['type']=='New' ? "<a href=\"".htmlspecialchars("$path/$type?name=$name")."\">".truncate($fancyname)."</a>" : 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 = "<a class='info' onclick='return false'><i class='padlock fa fa-lock red-text'></i><span>"._('Unknown encryption state')."</span></a>"; break;
   } else $luks = "";
   echo "<tr>";
-  echo "<td><a class='info nohand' onclick='return false'><i class='fa fa-$orb orb $color-orb'></i><span style='left:18px'>$help</span></a>$luks<a href='$path/Disk?name=$name' onclick=\"$.cookie('one','tab1',{path:'/'})\">$name</a></td>";
+  echo "<td><a class='info nohand' onclick='return false'><i class='fa fa-$orb orb $color-orb'></i><span style='left:18px'>$help</span></a>$luks<a href='$path/Disk?name=$name' onclick=\"$.cookie('one','tab1',{path:'/'})\">".truncate($name)."</a></td>";
   echo "<td>{$disk['comment']}</td>";
   echo "<td>".disk_share_settings($var['shareSMBEnabled'], $sec[$name])."</td>";
   echo "<td>".disk_share_settings($var['shareNFSEnabled'], $sec_nfs[$name])."</td>";
diff --git a/plugins/dynamix/include/ShareList.php b/plugins/dynamix/include/ShareList.php
index 818a09a89..d7b3df8bb 100644
--- a/plugins/dynamix/include/ShareList.php
+++ b/plugins/dynamix/include/ShareList.php
@@ -57,10 +57,9 @@ function shareInclude($name) {
   return !$include || substr($name,0,4)!='disk' || strpos("$include,", "$name,")!==false;
 }
 
-function cachePool($name) {
+function truncate($name) {
   return strlen($name)<=16 ? $name : substr($name,0,14).'...';
 }
-
 // Compute all user shares & check encryption
 $crypto = false;
 foreach ($shares as $name => $share) {
@@ -99,7 +98,7 @@ foreach ($shares as $name => $share) {
   echo "<td>".user_share_settings($var['shareSMBEnabled'], $sec[$name])."</td>";
   echo "<td>".user_share_settings($var['shareNFSEnabled'], $sec_nfs[$name])."</td>";
   $cmd="/webGui/scripts/share_size"."&arg1=".urlencode($name)."&arg2=ssz1&arg3=".urlencode($pools);
-  $cache = _(ucfirst($share['useCache'])).($share['useCache']!='no'?' : '.cachePool($share['cachePool']):'');
+  $cache = _(ucfirst($share['useCache'])).($share['useCache']!='no'?' : '.truncate($share['cachePool']):'');
   if (array_key_exists($name, $ssz1)) {
     echo "<td>$cache</td>";
     echo "<td>".my_scale($ssz1[$name]['disk.total']*1024, $unit)." $unit</td>";