From b294db6ee05a3200a6a82f8ea7dc70fecbb5ad63 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Apr 2020 23:22:02 +0200
Subject: [PATCH] Multi cache pool support

---
 plugins/dynamix/CacheSettings.page | 68 ------------------------------
 plugins/dynamix/DeviceInfo.page    | 35 ++++++++++++---
 2 files changed, 30 insertions(+), 73 deletions(-)
 delete mode 100644 plugins/dynamix/CacheSettings.page

diff --git a/plugins/dynamix/CacheSettings.page b/plugins/dynamix/CacheSettings.page
deleted file mode 100644
index 8e06d2d7f..000000000
--- a/plugins/dynamix/CacheSettings.page
+++ /dev/null
@@ -1,68 +0,0 @@
-Menu="ShareSettings:2"
-Title="Cache Settings"
-Tag="upload"
-Cond="$pool_devices"
----
-<?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- */
-?>
-<? $disabled = $var['fsState']!='Stopped' ? 'disabled' : ''; ?>
-
-<script>
-function check_cache_settings() {
-  var form = document.cache_settings;
-  var enabled = (form.shareCacheEnabled.value == "no");
-  form.shareCacheFloor.disabled = enabled;
-}
-<?if ($var['fsState']=='Stopped'):?>
-$(check_cache_settings);
-<?endif;?>
-</script>
-
-<form markdown="1" name="cache_settings" method="POST" action="/update.htm" target="progressFrame">
-_(Use cache device)_:
-: <select name="shareCacheEnabled" onchange="check_cache_settings()" <?=$disabled?>>
-  <?=mk_option($var['shareCacheEnabled'], "yes", _('Yes'))?>
-  <?=mk_option($var['shareCacheEnabled'], "no", _('No'))?>
-  </select>
-
-:help
-> If set to 'Yes' then User Shares can possibly make use of the Cache Disk. You still need to enable
-> use of the Cache Disk on individual user shares.
-:end
-
-_(Min. free space)_:
-: <input type="text" name="shareCacheFloor" maxlength="16" value="<?=$var['shareCacheFloor']?>" class="narrow" disabled>
-
-:help
-> This represents a "floor" of the amount of free space remaining on the cache disk.  If the free
-> space becomes less than this value, then new files written to user shares with cache enabled will go to
-> the array and not the cache disk.
->
-> Enter a numeric value with one of these suffixes:
->
-> **KB** = 1,000<br>
-> **MB** = 1,000,000<br>
-> **GB** = 1,000,000,000<br>
-> **TB** = 1,000,000,000,000
->
-> If no suffix, a count of 1024-byte blocks is assumed.<br>
->
-> Examples:
->
-> **2GB** => 2,000,000,000 bytes<br>
-> **2000000** => 2,048,000,000 bytes
-:end
-
-&nbsp;
-: <input type="submit" name="changeShare" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()"><?if ($disabled):?>*_(Array must be **Stopped** to change)_*<?endif;?>
-</form>
diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index c1c0ff150..14d7c17c6 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -337,6 +337,14 @@ _(Name)_:
 : <?=my_lang(my_disk($name),3)?>
 
 <?endif;?>
+_(Comments)_:
+: <input type="text" name="diskComment.<?=$disk['idx']?>" maxlength="256" value="<?=htmlspecialchars($disk['comment'])?>">
+
+:help12
+> This text will appear under the *Comments* column for the share in Windows Explorer.
+> Enter anything you like, up to 256 characters.
+:end
+
 _(Partition size)_:
 : <?=my_number($disk['sizeSb'])?> KB (K=1024)
 
@@ -421,14 +429,31 @@ _(File system type)_:
 : <?=_(str_replace('luks:','',$disk['fsType'])).(strpos($disk['fsType'],'luks:')!==false ? ' - '._('encrypted') : '')?>&nbsp;
 
 <?endif;?>
-_(Comments)_:
-: <input type="text" name="diskComment.<?=$disk['idx']?>" maxlength="256" value="<?=htmlspecialchars($disk['comment'])?>">
+<?if (in_array($name,$pools)):?>
+_(Minimum free space)_:
+: <input type="text" name="diskFloor.<?=$disk['idx']?>" maxlength="16" value="<?=$disk['diskFloor']?>" class="narrow" <?=$disabled?> placeholder="0">
 
-:help12
-> This text will appear under the *Comments* column for the share in Windows Explorer.
-> Enter anything you like, up to 256 characters.
+:help41
+> This represents a "floor" of the amount of free space remaining on the cache disk.  If the free
+> space becomes less than this value, then new files written to user shares with cache enabled will go to
+> the array and not the cache disk.
+>
+> Enter a numeric value with one of these suffixes:
+>
+> **KB** = 1,000<br>
+> **MB** = 1,000,000<br>
+> **GB** = 1,000,000,000<br>
+> **TB** = 1,000,000,000,000
+>
+> If no suffix, a count of 1024-byte blocks is assumed.<br>
+>
+> Examples:
+>
+> **2GB** => 2,000,000,000 bytes<br>
+> **2000000** => 2,048,000,000 bytes
 :end
 
+<?endif;?>
 _(Warning disk utilization threshold)_ (%):
 : <input type="number" min="0" max="100" name="<?=htmlspecialchars($name)?>_warning" class="narrow" value="<?=strlen($disk['warning'])?$disk['warning']:''?>" placeholder="<?=$display['warning']?>">