From 65995e294185a8a67129e06699e0bf40652a54fb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 11 Apr 2025 17:58:00 +0200
Subject: [PATCH 1/2] File manager: add UD shares to top level user shares

---
 emhttp/plugins/dynamix/include/FileTree.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/FileTree.php b/emhttp/plugins/dynamix/include/FileTree.php
index e9f174362..377b6657f 100644
--- a/emhttp/plugins/dynamix/include/FileTree.php
+++ b/emhttp/plugins/dynamix/include/FileTree.php
@@ -45,14 +45,15 @@ $docroot = '/usr/local/emhttp';
 require_once "$docroot/webGui/include/Secure.php";
 
 $rootdir  = path(realpath($_POST['dir']));
+$topdir   = '/mnt/';
+$userdir  = '/mnt/user/';
 $filters  = (array)$_POST['filter'];
 $match    = $_POST['match'];
 $checkbox = $_POST['multiSelect'] == 'true' ? "<input type='checkbox'>" : "";
 
 /* Excluded folders to not show in the dropdown in the '/mnt/' directory only. */
 $excludedFolders = ['RecycleBin', 'addons', 'rootshare'];
-
-$udShares = ['addons','disks','remotes'];
+$udShares = ['disks','remotes'];
 
 echo "<ul class='jqueryFileTree'>";
 if ($_POST['show_parent'] == 'true' && is_top($rootdir)) {
@@ -62,10 +63,6 @@ if ($_POST['show_parent'] == 'true' && is_top($rootdir)) {
 if (is_low($rootdir) && is_dir($rootdir)) {
   $dirs = $files = [];
   $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($rootdir.$name, $names)) $names[] = $rootdir.$name;
-  }
   natcasesort($names);
   foreach ($names as $name) {
     if (is_dir($rootdir.$name)) {
@@ -82,12 +79,18 @@ if (is_low($rootdir) && is_dir($rootdir)) {
     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 === $topdir) continue;
 
     if (empty($match) || preg_match("/$match/", $rootdir.$name.'/')) {
       echo "<li class='directory collapsed'>$checkbox<a href='#' rel=\"$htmlRel/\">$htmlName</a></li>";
     }
   }
+  if ($rootdir === $userdir) {
+    // add unassigned devices top level shares
+    foreach ($udShares as $name) if (is_dir($topdir.$name)) {
+      echo "<li class='directory collapsed'>$checkbox<a href='#' rel=\"{$topdir}{$name}/\">$name</a></li>";
+    }
+  }
   foreach ($files as $name) {
     $htmlRel  = htmlspecialchars($rootdir . $name);
     $htmlName = htmlspecialchars($name);

From b727b10c2fcab2c889ac281fe96a22e646b813f3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 11 Apr 2025 18:24:44 +0200
Subject: [PATCH 2/2] SMB: fix area width too wide

---
 emhttp/plugins/dynamix/SMBExtras.page       | 2 +-
 emhttp/plugins/dynamix/sheets/SMBExtras.css | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 emhttp/plugins/dynamix/sheets/SMBExtras.css

diff --git a/emhttp/plugins/dynamix/SMBExtras.page b/emhttp/plugins/dynamix/SMBExtras.page
index 2676f890d..ffeeaefc9 100644
--- a/emhttp/plugins/dynamix/SMBExtras.page
+++ b/emhttp/plugins/dynamix/SMBExtras.page
@@ -33,7 +33,7 @@ $(function(){
 <input type="hidden" name="#include" value="/webGui/include/update.file.php">
 <input type="hidden" name="#file" value="<?=$file;?>">
 _(Samba extra configuration)_:
-: <textarea spellcheck="false" cols="80" rows="<?=substr_count($text,"\n")+1?>" maxlength="2048" name="text" style="resize:none;font-family:bitstream;width:65.5%" <?if ($var['fsState']=="Started"):?>disabled<?endif;?>><?=htmlspecialchars($text)?></textarea>
+: <textarea spellcheck="false" cols="80" rows="<?=substr_count($text,"\n")+1?>" maxlength="2048" name="text" <?if ($var['fsState']=="Started"):?>disabled<?endif;?>><?=htmlspecialchars($text)?></textarea>
 
 &nbsp;
 : <input type="submit" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()"><?if ($var['fsState']=="Started"):?>*_(Array must be **Stopped** to change)_*<?endif;?>
diff --git a/emhttp/plugins/dynamix/sheets/SMBExtras.css b/emhttp/plugins/dynamix/sheets/SMBExtras.css
new file mode 100644
index 000000000..58fc35623
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/SMBExtras.css
@@ -0,0 +1,5 @@
+textarea {
+    resize: none;
+    font-family: bitstream;
+    width: 63%;
+}