From 87b48406a138a7ea6a35320be5d8351e35244f61 Mon Sep 17 00:00:00 2001
From: Squidly271 <unraidsquid@gmail.com>
Date: Wed, 9 Apr 2025 15:13:55 -0400
Subject: [PATCH 1/7] Fix: Handle edge cases on dashboard counting disks
 previously exported

---
 emhttp/plugins/dynamix/DashStats.page | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index e1d1e24b2..2746c9ace 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -121,17 +121,25 @@ $names      = [];
 $SMBpublic = $NFSpublic= 0;
 foreach ($sec as $share => $prop) {
   if ( $prop['export'] == "-") continue;
-  if ( $prop['security'] == "public") $SMBpublic++;
-  if ( ($var['shareDisk']??"") == "no"  && $share !=="flash" ) continue;
+  if ( $prop['security'] == "public") {
+    if ( $share == "flash" || (! isset($disks[$share]) || (isset($disks[$share]) && ($var['shareDisk']??"") == "yes" && $share !=="flash") ) )
+     $SMBpublic++;
+  }
+  if ( ($var['shareDisk']??"") !== "yes"  && $share !=="flash" ) continue;
   if ( ! $started && isset($disks[$share]) && $share !=="flash" ) continue;
-  if ( ! isset($shares[$share]) && isset($disks[$share]) ) {$shares[$share]=$disks[$share]; $shares[$share]['diskexport'] = true;}
+  if ( (! isset($shares[$share]) && isset($disks[$share]) && ($var['shareDisk']??"") == "yes" ) || $share == "flash" ) {$shares[$share]=$disks[$share]; $shares[$share]['diskexport'] = true;}
 }
-foreach ($sec_nfs as $share => $prop) {
-  if ( $prop['export'] == "-") continue;
-  if ( $prop['security'] == "public") $NFSpublic++;
-  if ( ($var['shareDisk']??"") == "no"  && $share !=="flash" ) continue;
-  if ( ! $started && isset($disks[$share]) && $share !=="flash" ) continue;
-  if ( ! isset($shares[$share]) && isset($disks[$share]) ) {$shares[$share]=$disks[$share]; $shares[$share]['diskexport'] = true;}
+if ($var['shareNFSEnabled']=='yes') {
+  foreach ($sec_nfs as $share => $prop) {
+    if ( $prop['export'] == "-") continue;
+    if ( $prop['security'] == "public") {
+      if ( $share == "flash" || (! isset($disks[$share]) || (isset($disks[$share]) && ($var['shareDisk']??"") == "yes" && $share !== "flash" ) ) )
+        $NFSpublic++;
+    }
+    if ( ($var['shareDisk']??"") == "no"  && $share !=="flash" ) continue;
+    if ( ! $started && isset($disks[$share]) && $share !=="flash" ) continue;
+    if ( ( ! isset($shares[$share]) && isset($disks[$share]) && ($var['shareDisk']??"") == "yes") || $share == "flash" ) {$shares[$share]=$disks[$share]; $shares[$share]['diskexport'] = true;}
+  }
 }
 
 $passwd = $nopass = 0;

From 78feb2af04f32cd7ca2bf1c3f10d2db603a9e3eb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 10 Apr 2025 16:22:22 +0200
Subject: [PATCH 2/7] file manager: add UD selection

---
 emhttp/plugins/dynamix/Browse.page          | 12 +++----
 emhttp/plugins/dynamix/include/FileTree.php | 36 +++++++++++++--------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/emhttp/plugins/dynamix/Browse.page b/emhttp/plugins/dynamix/Browse.page
index 8b7cd83cb..1d18c2a97 100644
--- a/emhttp/plugins/dynamix/Browse.page
+++ b/emhttp/plugins/dynamix/Browse.page
@@ -360,10 +360,10 @@ function doAction(action, title, id) {
   if (!access.includes(path[0])) return;
   var user   = /^(user0?|rootshare)$/.test(path[1]);
   var root   = '/'+path[0]+(user ? '/'+path[1] : '');
-  var share  = user||!path[2]||(link&&path.length==3) ? '' : path[2]+'/';
+  var share  = user || !path[2] || (link && path.length==3) ? '' : path[2]+'/';
   var ud     = ['disks','remotes'].includes(path[1]); // unassigned devices
-  var match  = ud||user ? '' : '^(?!\\/mnt\\/user0?\\/).*$';
-  var name   = path.pop()||path.pop();
+  var match  = ud || user ? '' : '^(?!\\/mnt\\/(user0?|rootshare)\\/).*$';
+  var name   = path.pop() || path.pop();
   var hdlink = "<?=$var['fuse_directio'] == 1 ? '1' : ''?>";
   dfm.window = $("#dfm_dialogWindow");
   switch (action) {
@@ -625,10 +625,10 @@ function doActions(action, title) {
     if (!access.includes(path[0])) return;
     var user   = /^(user0?|rootshare)$/.test(path[1]);
     var root   = '/'+path[0]+(user ? '/'+path[1] : '');
-    var share  = user||!path[2] ? '' : path[2]+'/';
+    var share  = user || !path[2] ? '' : path[2]+'/';
     var ud     = ['disks','remotes'].includes(path[1]); // unassigned devices
-    var match  = ud||user ? '' : '^(?!.*(user0?|rootshare)).*$';
-    var name   = path.pop()||path.pop();
+    var match  = ud || user ? '' : '^(?!\\/mnt\\/(user0?|rootshare)\\/).*$';
+    var name   = path.pop() || path.pop();
     var hdlink = "<?=$var['fuse_directio'] == 1 ? '1' : ''?>";
     var u      = false;
     var d      = false;
diff --git a/emhttp/plugins/dynamix/include/FileTree.php b/emhttp/plugins/dynamix/include/FileTree.php
index 33e9dab7b..663bd6f1b 100644
--- a/emhttp/plugins/dynamix/include/FileTree.php
+++ b/emhttp/plugins/dynamix/include/FileTree.php
@@ -27,15 +27,15 @@
  */
 
 function path($dir) {
-  return mb_substr($dir,-1)=='/' ? $dir : $dir.'/';
+  return mb_substr($dir,-1) == '/' ? $dir : $dir.'/';
 }
 function is_top($dir) {
   global $root;
-  return mb_strlen($dir)>mb_strlen($root);
+  return mb_strlen($dir) > mb_strlen($root);
 }
 function is_low($dir) {
   global $root;
-  return mb_substr($dir,0,mb_strlen($root))==$root;
+  return mb_substr($dir,0,mb_strlen($root)) == $root;
 }
 
 $root = path(realpath($_POST['root']));
@@ -47,36 +47,46 @@ require_once "$docroot/webGui/include/Secure.php";
 $rootdir  = path(realpath($_POST['dir']));
 $filters  = (array)$_POST['filter'];
 $match    = $_POST['match'];
-$checkbox = $_POST['multiSelect']=='true' ? "<input type='checkbox'>" : "";
+$checkbox = $_POST['multiSelect'] == 'true' ? "<input type='checkbox'>" : "";
 
 /* Excluded folders to not show in the dropdown in the '/mnt/' directory only. */
-$excludedFolders	= ["RecycleBin", "addons", "rootshare", "user0"];
+$excludedFolders = ['RecycleBin', 'addons', 'rootshare'];
+
+$udShares = ['addons','disks','remotes'];
 
 echo "<ul class='jqueryFileTree'>";
-if ($_POST['show_parent']=='true' && is_top($rootdir)) echo "<li class='directory collapsed'>$checkbox<a href='#' rel=\"".htmlspecialchars(dirname($rootdir))."\">..</a></li>";
+if ($_POST['show_parent'] == 'true' && is_top($rootdir)) {
+  echo "<li class='directory collapsed'>$checkbox<a href='#' rel=\"".htmlspecialchars(dirname($rootdir))."\">..</a></li>";
+}
 
 if (is_low($rootdir) && is_dir($rootdir)) {
   $dirs = $files = [];
-  $names = array_filter(scandir($rootdir, SCANDIR_SORT_NONE), function($n) { return $n != '.' && $n != '..'; });
+  $names = array_filter(scandir($rootdir, SCANDIR_SORT_NONE), function($n){return $n != '.' && $n != '..';});
+  if (is_top($rootdir)) {
+    // add unassigned devices top level shares
+    foreach ($udShares as $name) if (is_dir($rootdir.$name) && !in_array($name, $names)) $names[] = $name;
+  }
   natcasesort($names);
   foreach ($names as $name) {
-    if (is_dir($rootdir . $name)) {
+    if (is_dir($rootdir.$name)) {
       $dirs[] = $name;
     } else {
       $files[] = $name;
     }
   }
   foreach ($dirs as $name) {
-    $htmlRel  = htmlspecialchars($rootdir . $name);
-    $htmlName = htmlspecialchars(mb_strlen($name) <= 33 ? $name : mb_substr($name, 0, 30) . '...');
+    $htmlRel  = htmlspecialchars($rootdir.$name);
+    $htmlName = htmlspecialchars(mb_strlen($name) <= 33 ? $name : mb_substr($name, 0, 30).'...');
 
     /* Exclude '.Recycle.Bin' from all directories */
-    if ($name === ".Recycle.Bin") continue;
+    if ($name === '.Recycle.Bin') continue;
 
     /* Exclude folders only when directory is '/mnt/' */
-    if (in_array($name, $excludedFolders) && $rootdir === "/mnt/") continue;
+    if (in_array($name, $excludedFolders) && $rootdir === '/mnt/') continue;
 
-    echo "<li class='directory collapsed'>$checkbox<a href='#' rel=\"$htmlRel/\">$htmlName</a></li>";
+    if (empty($match) || preg_match("/$match/", $rootdir.$name.'/')) {
+      echo "<li class='directory collapsed'>$checkbox<a href='#' rel=\"$htmlRel/\">$htmlName</a></li>";
+    }
   }
   foreach ($files as $name) {
     $htmlRel  = htmlspecialchars($rootdir . $name);

From 8775cdefdb9d9df355734b52c072a019b6b6cc57 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 10 Apr 2025 16:23:01 +0200
Subject: [PATCH 3/7] docker: suppress errors when interface not present

---
 etc/rc.d/rc.docker | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/etc/rc.d/rc.docker b/etc/rc.d/rc.docker
index 635b2373c..f077fe560 100755
--- a/etc/rc.d/rc.docker
+++ b/etc/rc.d/rc.docker
@@ -35,10 +35,14 @@ TMP=/var/tmp/network.tmp
 # run & log functions
 . /etc/rc.d/rc.runlog
 
+carrier(){
+  cat $SYSTEM/$1/carrier 2>/dev/null
+}
+
 # determine active port name
 [[ -e $SYSTEM/bond0 ]] && PORT=bond0 || PORT=eth0
 [[ -e $SYSTEM/br0 ]] && PORT=br0
-[[ $(cat $SYSTEM/$PORT/carrier) == 0 && -e $SYSTEM/wlan0 && $(cat $SYSTEM/wlan0/carrier) == 1 ]] && PORT=wlan0
+[[ $(carrier $PORT) != 1 && -e $SYSTEM/wlan0 && $(carrier wlan0) == 1 ]] && PORT=wlan0
 
 # Set defaults used by the docker daemon
 if [[ -f $DOCKER_CFG ]]; then
@@ -250,7 +254,7 @@ docker_network_start(){
         fi
         X=${NIC//[^0-9]/}
         REF=$(grep -Pom1 "<Network>\K(br|bond|eth|wlan)$X" $XMLFILE)
-        [[ $X == 0 && $(cat $SYSTEM/$NIC/carrier) == 0 ]] && continue
+        [[ $X == 0 && $(carrier $NIC) != 1 ]] && continue
         [[ $X == 0 && $NIC != wlan0 ]] && MAIN=$NIC
         [[ $NIC == wlan0 && -n $MAIN ]] && continue
         if [[ -n $REF && $REF != $NIC ]]; then

From da91923f6853a8f94ecea1a04f289e9b0a7c6705 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 10 Apr 2025 16:24:44 +0200
Subject: [PATCH 4/7] Main: remove warning message from disabled disk

---
 emhttp/plugins/dynamix/nchan/device_list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 90bf1c815..4b291d032 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -183,7 +183,7 @@ function array_offline(&$disk, $pool='') {
   global $var, $disks, $display;
   $disk['power'] ??= (_var($display,'power') && _var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0);
   $echo = []; $warning = '';
-  $status = ['DISK_DSBL','DISK_INVALID','DISK_DSBL_NEW','DISK_WRONG'];
+  $status = ['DISK_INVALID','DISK_DSBL_NEW','DISK_WRONG'];
   $text = "<span class='red-text'><em>"._('All existing data on this device will be OVERWRITTEN when array is Started')."</em></span>";
   if (_var($disk,'type')=='Cache') {
     if (!str_contains(_var($disks[$pool],'state'),'ERROR:')) {

From 6f9d99699d3f74081aa9c91b8587d73295f430d1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 10 Apr 2025 17:04:35 +0200
Subject: [PATCH 5/7] diagnostics:  include folder  /boot/config/firmware

---
 emhttp/plugins/dynamix/scripts/diagnostics | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/scripts/diagnostics b/emhttp/plugins/dynamix/scripts/diagnostics
index 30aafb658..f89c4d38b 100755
--- a/emhttp/plugins/dynamix/scripts/diagnostics
+++ b/emhttp/plugins/dynamix/scripts/diagnostics
@@ -34,7 +34,7 @@ if (is_file('/boot/syslinux/syslinux.cfg')) {
   $bootenv = '/boot/grub';
 }
 
-$folders = ['/boot','/boot/config','/boot/config/plugins',$bootenv,'/var/log','/var/log/plugins','/boot/extra','/var/log/packages','/var/lib/pkgtools/packages','/tmp'];
+$folders = ['/boot','/boot/config','/boot/config/plugins','/boot/config/firmware',$bootenv,'/var/log','/var/log/plugins','/boot/extra','/var/log/packages','/var/lib/pkgtools/packages','/tmp'];
 
 // global variables
 $path  = "/var/local/emhttp";

From 21dba08330233c0ca31ebfee12013d7f6f8ae03b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 10 Apr 2025 18:32:11 +0200
Subject: [PATCH 6/7] Update FileTree.php

---
 emhttp/plugins/dynamix/include/FileTree.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/include/FileTree.php b/emhttp/plugins/dynamix/include/FileTree.php
index 663bd6f1b..5974b716b 100644
--- a/emhttp/plugins/dynamix/include/FileTree.php
+++ b/emhttp/plugins/dynamix/include/FileTree.php
@@ -64,7 +64,7 @@ if (is_low($rootdir) && is_dir($rootdir)) {
   $names = array_filter(scandir($rootdir, SCANDIR_SORT_NONE), function($n){return $n != '.' && $n != '..';});
   if (is_top($rootdir)) {
     // add unassigned devices top level shares
-    foreach ($udShares as $name) if (is_dir($rootdir.$name) && !in_array($name, $names)) $names[] = $name;
+    foreach ($udShares as $name) if (is_dir($rootdir.$name) && !in_array($name, $names)) $names[] = $rootdir.$name;
   }
   natcasesort($names);
   foreach ($names as $name) {

From 81182433f8b4c8bf90d3b01f967ac43089e1b2d6 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 10 Apr 2025 18:33:05 +0200
Subject: [PATCH 7/7] Update FileTree.php

---
 emhttp/plugins/dynamix/include/FileTree.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/include/FileTree.php b/emhttp/plugins/dynamix/include/FileTree.php
index 5974b716b..e9f174362 100644
--- a/emhttp/plugins/dynamix/include/FileTree.php
+++ b/emhttp/plugins/dynamix/include/FileTree.php
@@ -64,7 +64,7 @@ if (is_low($rootdir) && is_dir($rootdir)) {
   $names = array_filter(scandir($rootdir, SCANDIR_SORT_NONE), function($n){return $n != '.' && $n != '..';});
   if (is_top($rootdir)) {
     // add unassigned devices top level shares
-    foreach ($udShares as $name) if (is_dir($rootdir.$name) && !in_array($name, $names)) $names[] = $rootdir.$name;
+    foreach ($udShares as $name) if (is_dir($rootdir.$name) && !in_array($rootdir.$name, $names)) $names[] = $rootdir.$name;
   }
   natcasesort($names);
   foreach ($names as $name) {