From 4764fd73f41b5a78a4eb70bcb32fab32a2f4a384 Mon Sep 17 00:00:00 2001
From: Squidly271 <unraidsquid@gmail.com>
Date: Mon, 24 Mar 2025 20:57:11 -0400
Subject: [PATCH] Refactor: Dashboard Share summary incl exported disks and
 only display total and public shares

---
 emhttp/plugins/dynamix/DashStats.page | 35 +++++++++++++++------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 94e9c6966..85f4dee9a 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -118,11 +118,16 @@ $fans       = exec("sensors -uA 2>/dev/null|grep -c 'fan[0-9]_input'");
 $autofan    = is_executable("$docroot/plugins/dynamix.system.autofan/scripts/rc.autofan");
 $group      = _var($var,'shareSMBEnabled')=='yes' | _var($var,'shareNFSEnabled')=='yes';
 $names      = [];
-$cache_only = $encrypted = 0;
-
-foreach ($shares as $share) {
-  if ($share['useCache']=='only') $cache_only++;
-  if ($share['luksStatus']>0) $encrypted++;
+$SMBpublic = $NFSpublic= 0;
+foreach ($sec as $share => $prop) {
+  if ( $prop['export'] == "-") continue;
+  if ( $prop['security'] == "public") $SMBpublic++;
+   if ( ! isset($shares[$share]) && isset($disks[$share]) ) {$shares[$share]=$disks[$share]; $shares[$share]['diskexport'] = true;}
+}
+foreach ($sec_nfs as $share => $prop) {
+  if ( $prop['export'] == "-") continue;
+  if ( $prop['security'] == "public") $NFSpublic++;
+  if ( ! isset($shares[$share]) && isset($disks[$share]) ) {$shares[$share]=$disks[$share]; $shares[$share]['diskexport'] = true;}
 }
 
 $passwd = $nopass = 0;
@@ -457,7 +462,7 @@ echo "</td></tr>";
 </select></span>
 <?endif;?>
 <br><span>
-<?=sprintf(_("Share count: %s with %s cache only and %s encrypted"),count($shares),$cache_only,$encrypted)?>
+<?=sprintf(_("Share count: %s with %s public SMB and %s public NFS"),count($shares),$SMBpublic,$NFSpublic)?>
 </span><br></div>
 <a href='/Shares' title="_(Go to Share settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
@@ -466,9 +471,9 @@ echo "</td></tr>";
 if (_var($var,'shareSMBEnabled')=='yes') {
   $i = 0;
   foreach ($shares as $name => $share) {
-    $list = "<a href=\"/Dashboard/Shares/Share?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
-    if ($share['luksStatus']>0) $list = str_replace('blue-text','green-text',$list);
-    elseif ($share['useCache']=='only') $list = str_replace('blue-text','orange-text',$list);
+    $list = "<a href=\"/Dashboard/Shares/".(isset($share['diskexport']) ? "Disk" : "Share")."?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
+    if ( ($share['luksStatus']??0)>0) $list = str_replace('blue-text','green-text',$list);
+    elseif ( ($share['useCache']??"")=='only') $list = str_replace('blue-text','orange-text',$list);
     $comment = $share['comment'] ?: '-';
     $security = export_settings(_var($var,'shareSMBEnabled'), $sec[$name]);
     $last = $name==array_key_last($shares) ? ' last' : '';
@@ -478,9 +483,9 @@ if (_var($var,'shareSMBEnabled')=='yes') {
 }
 if (_var($var,'shareNFSEnabled')=='yes') {
   foreach ($shares as $name => $share) {
-    $list = "<a href=\"/Dashboard/Shares/Share?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
-    if ($share['luksStatus']>0) $list = str_replace('blue-text','green-text',$list);
-    elseif ($share['useCache']=='only') $list = str_replace('blue-text','orange-text',$list);
+    $list = "<a href=\"/Dashboard/Shares/".(isset($share['diskexport']) ? "Disk" : "Share")."?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
+    if ( ($share['luksStatus']??0)>0) $list = str_replace('blue-text','green-text',$list);
+    elseif ( ($share['useCache']??"")=='only') $list = str_replace('blue-text','orange-text',$list);
     $comment = $share['comment'] ?: '-';
     $security = export_settings(_var($var,'shareNFSEnabled'), $sec_nfs[$name]);
     $last = $name==array_key_last($shares) ? ' last' : '';
@@ -490,9 +495,9 @@ if (_var($var,'shareNFSEnabled')=='yes') {
 }
 if (!$group) {
   foreach ($shares as $name => $share) {
-    $list = "<a href=\"/Dashboard/Shares/Share?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
-    if ($share['luksStatus']>0) $list = str_replace('blue-text','green-text',$list);
-    elseif ($share['useCache']=='only') $list = str_replace('blue-text','orange-text',$list);
+    $list = "<a href=\"/Dashboard/Shares/".(isset($share['diskexport']) ? "Disk" : "Share")."?name=".urlencode($name)."\" class=\"blue-text\" title=\"$name settings\">$name</a>";
+    if ( ($share['luksStatus']??0)>0) $list = str_replace('blue-text','green-text',$list);
+    elseif ( ($share['useCache']??"")=='only') $list = str_replace('blue-text','orange-text',$list);
     $comment = $share['comment'] ?: '-';
     echo "<tr class='share'><td><span class='w26'><i class='icon-folder f14'></i>$list</span><span class='w44'>".htmlspecialchars($comment)."</span><span class='w18'>-</span><span>-</span></td></tr>";
   }