From b9d40c4d26a30fbf7ef5cf8269f21a0816ec8acf Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Tue, 12 Jul 2016 21:00:17 +0200
Subject: [PATCH] Suppress non-present disks in disk include/exclude list

---
 plugins/dynamix/ShareEdit.page      | 1 +
 plugins/dynamix/ShareSettings.page  | 5 ++++-
 plugins/dynamix/include/Helpers.php | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page
index 182aecd29..8fcaaaea4 100644
--- a/plugins/dynamix/ShareEdit.page
+++ b/plugins/dynamix/ShareEdit.page
@@ -47,6 +47,7 @@ function globalInclude($name) {
 }
 
 // global shares include/exclude
+$disks = array_filter($disks,'my_disks');
 $myDisks = array_filter(array_diff(array_keys($disks), explode(',',$var['shareUserExclude'])), 'globalInclude');
 ?>
 
diff --git a/plugins/dynamix/ShareSettings.page b/plugins/dynamix/ShareSettings.page
index 10011fefa..1f6b326f1 100644
--- a/plugins/dynamix/ShareSettings.page
+++ b/plugins/dynamix/ShareSettings.page
@@ -16,7 +16,10 @@ Icon="share-settings.png"
  */
 ?>
 
-<? $disabled = $var['fsState']!='Stopped' ? 'disabled' : ''; ?>
+<?
+$disabled = $var['fsState']!='Stopped' ? 'disabled' : '';
+$disks = array_filter($disks,'my_disks');
+?>
 
 <script>
 $(function() {
diff --git a/plugins/dynamix/include/Helpers.php b/plugins/dynamix/include/Helpers.php
index 138562e9d..515f95ace 100644
--- a/plugins/dynamix/include/Helpers.php
+++ b/plugins/dynamix/include/Helpers.php
@@ -55,6 +55,9 @@ function my_temp($value) {
 function my_disk($name) {
   return ucfirst(preg_replace(array('/^(parity|disk|cache)([0-9]+)/','/^parity,cache,disk/'),array('$1 $2','Parity, Cache, Disk '),$name));
 }
+function my_disks($disk) {
+  return strpos($disk['status'],'_NP')===false;
+}
 function my_word($num) {
   $words = array('zero','one','two','three','four','five','six','seven','eight','nine','ten','eleven','twelve','thirteen','fourteen','fifteen','sixteen','seventeen','eighteen','nineteen','twenty');
   return $num<count($words) ? $words[$num] : $num;