diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php
index 953beb248..376a0a1b5 100644
--- a/plugins/dynamix/include/DeviceList.php
+++ b/plugins/dynamix/include/DeviceList.php
@@ -72,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,15)."" : truncate($fancyname,15);
+ $disk['type']=='New' ? "".compress($fancyname,15,5)."" : compress($fancyname,15,5);
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 8c8343513..88789037c 100644
--- a/plugins/dynamix/include/DiskList.php
+++ b/plugins/dynamix/include/DiskList.php
@@ -88,7 +88,7 @@ foreach ($disks as $name => $disk) {
default: $luks = ""._('Unknown encryption state').""; break;
} else $luks = "";
echo "
";
- echo "| $help$luks".truncate($name)." | ";
+ echo "$help$luks".compress($name)." | ";
echo "{$disk['comment']} | ";
echo "".disk_share_settings($var['shareSMBEnabled'], $sec[$name])." | ";
echo "".disk_share_settings($var['shareNFSEnabled'], $sec_nfs[$name])." | ";
diff --git a/plugins/dynamix/include/Helpers.php b/plugins/dynamix/include/Helpers.php
index 026057f42..63d5ba309 100644
--- a/plugins/dynamix/include/Helpers.php
+++ b/plugins/dynamix/include/Helpers.php
@@ -188,7 +188,7 @@ 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,$end=6) {
+function compress($name,$size=20,$end=6) {
return strlen($name)<=$size ? $name : substr($name,0,$size-$end-3).'...'.substr($name,-$end);
}
diff --git a/plugins/dynamix/include/ShareList.php b/plugins/dynamix/include/ShareList.php
index b3042e727..bde3e06d7 100644
--- a/plugins/dynamix/include/ShareList.php
+++ b/plugins/dynamix/include/ShareList.php
@@ -90,12 +90,12 @@ foreach ($shares as $name => $share) {
default: $luks = ""._('Unknown encryption state').""; break;
} else $luks = "";
echo "
";
- echo "| $help$luks".truncate($name)." | ";
+ echo "$help$luks".compress($name)." | ";
echo "{$share['comment']} | ";
echo "".user_share_settings($var['shareSMBEnabled'], $sec[$name])." | ";
echo "".user_share_settings($var['shareNFSEnabled'], $sec_nfs[$name])." | ";
$cmd="/webGui/scripts/share_size"."&arg1=".urlencode($name)."&arg2=ssz1&arg3=".urlencode($pools);
- $cache = _(ucfirst($share['useCache'])).($share['useCache']!='no'?' : '.truncate($share['cachePool']):'');
+ $cache = _(ucfirst($share['useCache'])).($share['useCache']!='no'?' : '.compress($share['cachePool']):'');
if (array_key_exists($name, $ssz1)) {
echo "$cache | ";
echo "".my_scale($ssz1[$name]['disk.total']*1024, $unit)." $unit | ";