From 414dddb008aff63aa4c00cbc5583382cca74decc Mon Sep 17 00:00:00 2001
From: dlandon <dlandon@familyoflandon.com>
Date: Sun, 12 May 2024 20:11:31 -0500
Subject: [PATCH] Fix detection of no mountable disks available.

---
 emhttp/plugins/dynamix/ShareList.page        | 17 ++++++++++++++++-
 emhttp/plugins/dynamix/include/DiskList.php  | 16 +++++++++++++++-
 emhttp/plugins/dynamix/include/ShareList.php | 16 +++++++++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix/ShareList.page b/emhttp/plugins/dynamix/ShareList.page
index 8b33a5b4a..6a580a876 100644
--- a/emhttp/plugins/dynamix/ShareList.page
+++ b/emhttp/plugins/dynamix/ShareList.page
@@ -16,8 +16,23 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareUser')=='e'"
  */
 ?>
 <?
+// Function to filter out unwanted disks and check if any valid disks exist.
+function checkDisks($disks) {
+  foreach ($disks as $disk) {
+    // Check the disk type and fsStatus.
+    if (!in_array($disk['name'], ['flash', 'parity', 'parity2']) && $disk['fsStatus'] !== "Unmountable: unsupported or no file system") {
+      // A valid disk is found, return true.
+      return true;
+    }
+  }
+
+  // No valid disks found, return false.
+  return false;
+}
+
 /* Are there any array disks? */
-$nodisks   = empty(parse_ini_file('state/disks.ini',true)) ? "disabled" : "";
+$disks		= parse_ini_file('state/disks.ini',true) ?? [];
+$nodisks	= checkDisks($disks) ? "" : "disabled";
 ?>
 
 <table class="unraid share_status">
diff --git a/emhttp/plugins/dynamix/include/DiskList.php b/emhttp/plugins/dynamix/include/DiskList.php
index eb2b9b683..db0c0b131 100644
--- a/emhttp/plugins/dynamix/include/DiskList.php
+++ b/emhttp/plugins/dynamix/include/DiskList.php
@@ -30,7 +30,7 @@ $sec_nfs = parse_ini_file('state/sec_nfs.ini',true);
 
 // exit when no mountable array disks
 $nodisks = "<tr><td class='empty' colspan='7'><strong>"._('There are no mountable array or pool disks - cannot add shares').".</strong></td></tr>";
-if (!$disks) die($nodisks);
+if (!checkDisks($disks)) die($nodisks);
 
 // No shared disks
 $nodisks = "<tr><td class='empty' colspan='7'><i class='fa fa-folder-open-o icon'></i>"._('There are no exportable disk shares')."</td></tr>";
@@ -38,6 +38,20 @@ $nodisks = "<tr><td class='empty' colspan='7'><i class='fa fa-folder-open-o icon
 // GUI settings
 extract(parse_plugin_cfg('dynamix',true));
 
+// Function to filter out unwanted disks and check if any valid disks exist.
+function checkDisks($disks) {
+  foreach ($disks as $disk) {
+    // Check the disk type and fsStatus.
+    if (!in_array($disk['name'], ['flash', 'parity', 'parity2']) && $disk['fsStatus'] !== "Unmountable: unsupported or no file system") {
+      // A valid disk is found, return true.
+      return true;
+    }
+  }
+
+  // No valid disks found, return false.
+  return false;
+}
+
 // Display export settings
 function disk_share_settings($protocol,$share) {
   if (empty($share)) return;
diff --git a/emhttp/plugins/dynamix/include/ShareList.php b/emhttp/plugins/dynamix/include/ShareList.php
index 577464fcb..098b0061c 100644
--- a/emhttp/plugins/dynamix/include/ShareList.php
+++ b/emhttp/plugins/dynamix/include/ShareList.php
@@ -48,7 +48,7 @@ $sec_nfs = parse_ini_file('state/sec_nfs.ini',true);
 
 // exit when no mountable array disks
 $nodisks = "<tr><td class='empty' colspan='7'><strong>"._('There are no mountable array or pool disks - cannot add shares').".</strong></td></tr>";
-if (!$disks) die($nodisks);
+if (!checkDisks($disks)) die($nodisks);
 
 // exit when no shares
 $noshares = "<tr><td class='empty' colspan='7'><i class='fa fa-folder-open-o icon'></i>"._('There are no exportable user shares')."</td></tr>";
@@ -63,6 +63,20 @@ $pools = implode(',', $pools_check);
 // Natural sorting of share names
 uksort($shares,'strnatcasecmp');
 
+// Function to filter out unwanted disks and check if any valid disks exist.
+function checkDisks($disks) {
+  foreach ($disks as $disk) {
+    // Check the disk type and fsStatus.
+    if (!in_array($disk['name'], ['flash', 'parity', 'parity2']) && $disk['fsStatus'] !== "Unmountable: unsupported or no file system") {
+      // A valid disk is found, return true.
+      return true;
+    }
+  }
+
+  // No valid disks found, return false.
+  return false;
+}
+
 // Display export settings
 function user_share_settings($protocol,$share) {
   if (empty($share)) return;