From 282cfc41cae481cc792dab3f521253cb48b97aec Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 29 Jun 2024 19:29:20 +0100
Subject: [PATCH] VM Remove subpools, Disable Favorites.

---
 emhttp/languages/en_US/helptext.txt                   |  3 +++
 .../dynamix.vm.manager/templates/Custom.form.php      |  3 +++
 emhttp/plugins/dynamix/DisplaySettings.page           |  8 ++++++++
 emhttp/plugins/dynamix/Settings.page                  | 11 +++++++++--
 emhttp/plugins/dynamix/Tools.page                     | 11 +++++++++--
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/emhttp/languages/en_US/helptext.txt b/emhttp/languages/en_US/helptext.txt
index 7c04a7569..2354af89d 100644
--- a/emhttp/languages/en_US/helptext.txt
+++ b/emhttp/languages/en_US/helptext.txt
@@ -1606,6 +1606,9 @@ Image will be scaled to 1920x90 pixels. The maximum image file upload size is 51
 :display_temperature_unit_help:
 Selects the temperature unit for the disk temperature thresholds. Changing the unit will adjust the existing value in the disk temperature thresholds as appropriate.
 
+:display_favorites_disabled_help:
+Sets favorites adding to disabled. Stops heart icon showing. favorties tab and pre-saved options will still continue to function.
+
 Make sure any newly entered values represent the selected temperature unit.
 :end
 
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 18d6434b1..f8a470cc4 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -404,6 +404,7 @@
 
 			// Available cache pools
 			foreach ($pools as $pool) {
+				if (isSubpool($pool)) continue;
 				$strLabel = $pool.' - '.my_scale($disks[$pool]['fsFree']*1024, $strUnit).' '.$strUnit.' '._('free');
 				echo mk_option($default_storage, $pool, $strLabel);
 			}
@@ -790,6 +791,7 @@
 
 								// Available cache pools
 								foreach ($pools as $pool) {
+									if (isSubpool($pool)) continue;
 									$strLabel = $pool.' - '.my_scale($disks[$pool]['fsFree']*1024, $strUnit).' '.$strUnit.' '._('free');
 									echo mk_option($default_option, $pool, $strLabel);
 								}
@@ -945,6 +947,7 @@
 
 								// Available cache pools
 								foreach ($pools as $pool) {
+									if (isSubpool($pool)) continue;
 									$strLabel = $pool.' - '.my_scale($disks[$pool]['fsFree']*1024, $strUnit).' '.$strUnit.' '._('free');
 									echo mk_option($default_option, $pool, $strLabel);
 								}
diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index b26699a59..6e712f065 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -315,6 +315,14 @@ _(Show banner background color fade)_:
   </select>
 </div>
 
+_(Favorites disabled)_:
+: <select name="favorites">
+  <?=mk_option($display['favorites'], "no",_('No'))?>
+  <?=mk_option($display['favorites'], "yes",_('Yes'))?>
+  </select>
+
+:display_favorites_disabled_help:
+
 <input type="submit" name="#default" value="_(Default)_" onclick="filename='reset'">
 : <input type="submit" name="#apply" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
 </form>
diff --git a/emhttp/plugins/dynamix/Settings.page b/emhttp/plugins/dynamix/Settings.page
index a446ef392..b714c52b8 100644
--- a/emhttp/plugins/dynamix/Settings.page
+++ b/emhttp/plugins/dynamix/Settings.page
@@ -3,6 +3,13 @@ Type="xmenu"
 Tabs="false"
 Code="e924"
 ---
+<?PHP 
+if (!isset($display['favorites'])) {
+  $favorites = true;
+} else {
+  $favorites = $display['favorites'] == "no" ? true : false;
+}
+?>
 <script>
 function addPage(page) {
   $.post('/webGui/include/MyFavorites.php',{action:'add',page:page},function(){
@@ -13,8 +20,8 @@ function addPage(page) {
 $(function(){
   $('div.Panel').each(function(){
     var page = $(this).find('a').prop('href').split('/').pop();
-    $(this).find('span').append('<i class="fa fa-heart favo" title="_(Add to favorites)_" onclick="addPage(&quot;'+page+'&quot;);return false"></i>');
-    $(this).hover(function(){$(this).find('i.favo').show();},function(){$(this).find('i.favo').hide();});
+    if (<?=$favorites?>) $(this).find('span').append('<i class="fa fa-heart favo" title="_(Add to favorites)_" onclick="addPage(&quot;'+page+'&quot;);return false"></i>');
+    if (<?=$favorites?>) $(this).hover(function(){$(this).find('i.favo').show();},function(){$(this).find('i.favo').hide();});
   });
 });
 </script>
diff --git a/emhttp/plugins/dynamix/Tools.page b/emhttp/plugins/dynamix/Tools.page
index a10bb917f..7f0dcbcf5 100644
--- a/emhttp/plugins/dynamix/Tools.page
+++ b/emhttp/plugins/dynamix/Tools.page
@@ -3,6 +3,13 @@ Type="xmenu"
 Tabs="false"
 Code="e909"
 ---
+<?PHP 
+if (!isset($display['favorites'])) {
+  $favorites = true;
+} else {
+  $favorites = $display['favorites'] == "no" ? true : false;
+}
+?>
 <script>
 function addPage(page) {
   $.post('/webGui/include/MyFavorites.php',{action:'add',page:page},function(){
@@ -13,8 +20,8 @@ function addPage(page) {
 $(function(){
   $('div.Panel').each(function(){
     var page = $(this).find('a').prop('href').split('/').pop();
-    $(this).find('span').append('<i class="fa fa-heart favo" title="_(Add to favorites)_" onclick="addPage(&quot;'+page+'&quot;);return false"></i>');
-    $(this).hover(function(){$(this).find('i.favo').show();},function(){$(this).find('i.favo').hide();});
+    if (<?=$favorites?>) {$(this).find('span').append('<i class="fa fa-heart favo" title="_(Add to favorites)_" onclick="addPage(&quot;'+page+'&quot;);return false"></i>');}
+    if (<?=$favorites?>) { $(this).hover(function(){$(this).find('i.favo').show();},function(){$(this).find('i.favo').hide();});}
   });
 });
 </script>