From 83b21080a3a870a27d7dd3528256559753221f2f Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Mon, 30 Oct 2017 08:43:17 +0100
Subject: [PATCH] Minor code updates

---
 plugins/dynamix/include/DiskList.php  | 16 +++++++++++-----
 plugins/dynamix/include/ShareList.php |  5 +++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/plugins/dynamix/include/DiskList.php b/plugins/dynamix/include/DiskList.php
index 2d17919ca..217ae7ecd 100644
--- a/plugins/dynamix/include/DiskList.php
+++ b/plugins/dynamix/include/DiskList.php
@@ -46,11 +46,17 @@ function shareInclude($name) {
   return !$include || substr($name,0,4)!='disk' || strpos("$include,", "$name,")!==false;
 }
 
+function sharesOnly($disk) {
+  return strpos('Data,Cache',$disk['type'])!==false && $disk['exportable']=='yes';
+}
+// filter disk shares
+$disks = array_filter($disks,'sharesOnly');
+
 // Compute all disk shares & check encryption
 $crypto = false;
 foreach ($disks as $name => $disk) {
-  if ($compute=='yes' && $disk['exportable']=='yes') exec("webGui/scripts/disk_size ".escapeshellarg($name)." ssz2");
-  if (strstr('Data,Cache',$disk['type'])) $crypto |= strpos($disk['fsType'],'luks:')!==false;
+  if ($compute=='yes') exec("webGui/scripts/disk_size ".escapeshellarg($name)." ssz2");
+  $crypto |= strpos($disk['fsType'],'luks:')!==false;
 }
 
 // global shares include/exclude
@@ -66,10 +72,10 @@ else
 // Build table
 $row = 0;
 foreach ($disks as $name => $disk) {
-  if (!strstr('Data,Cache',$disk['type']) || $disk['fsColor']=='grey-off' || $disk['exportable']=='no') continue;
+  $color = $disk['fsColor'];
   $row++;
-  $ball = "/webGui/images/{$disk['fsColor']}.png";
-  switch ($disk['fsColor']) {
+  $ball = "/webGui/images/$color.png";
+  switch ($color) {
     case 'green-on':  $help = 'All files protected'; break;
     case 'yellow-on': $help = 'All files unprotected'; break;
   }
diff --git a/plugins/dynamix/include/ShareList.php b/plugins/dynamix/include/ShareList.php
index 466acce01..a8d3eb14e 100644
--- a/plugins/dynamix/include/ShareList.php
+++ b/plugins/dynamix/include/ShareList.php
@@ -74,8 +74,9 @@ else
 $row = 0;
 foreach ($shares as $name => $share) {
   $row++;
-  $ball = "/webGui/images/{$share['color']}.png";
-  switch ($share['color']) {
+  $color = $share['color'];
+  $ball = "/webGui/images/$color.png";
+  switch ($color) {
     case 'green-on':  $help = 'All files protected'; break;
     case 'yellow-on': $help = 'Some or all files unprotected'; break;
   }