From 5434d7db8aceab39e01940cb02d34416cdc66d71 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Mon, 27 Jun 2016 21:34:31 +0200
Subject: [PATCH 1/6] Added 'preset current configuration' with New Config
 utility [8]

---
 plugins/dynamix/NewConfig.page | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/dynamix/NewConfig.page b/plugins/dynamix/NewConfig.page
index b0d4a1948..8c2bced29 100644
--- a/plugins/dynamix/NewConfig.page
+++ b/plugins/dynamix/NewConfig.page
@@ -53,8 +53,11 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
 <select name="preset" class="preset" <?=$disabled?>>
 <?=mk_option(1,'Parity|Data|Cache','All')?>
 <?=mk_option(1,'Parity','Parity only')?>
+<?=mk_option(1,'Data','Data only')?>
+<?=mk_option(1,'Cache','Cache only')?>
 <?=mk_option(1,'Parity|Data','Parity + Data')?>
 <?=mk_option(1,'Parity|Cache','Parity + Cache')?>
+<?=mk_option(1,'Data|Cache','Data + Cache')?>
 <?=mk_option(1,'','None')?>
 </select>
 <br>
@@ -70,6 +73,9 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
 
 > + **All** - parity, data and cache disks are populated with the current disk assignment **after** an array reset
 > + **Parity only** - only parity disk(s) are populated, data and cache disks will be unassigned
+> + **Data only** - only data disk(s) are populated, parity and cache disks will be unassigned
+> + **Cache only** - only cache disk(s) are populated, parity and data disks will be unassigned
 > + **Parity + Data** - parity and data disks are populated, cache disks will be unassigned
 > + **Parity + Cache** - parity and cache disks are populated, data disks will be unassigned
+> + **Data + Cache** - data and cache disks are populated, parity disks will be unassigned
 > + **None** - parity, data and cache disks will all be unassigned

From 2b170ef3241cc98f2c934831484126365dc2acdf Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Tue, 28 Jun 2016 16:35:17 +0200
Subject: [PATCH 2/6] Added 'preset current configuration' with New Config
 utility [9]

---
 plugins/dynamix/NewConfig.page | 53 +++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/plugins/dynamix/NewConfig.page b/plugins/dynamix/NewConfig.page
index 8c2bced29..8b1cab976 100644
--- a/plugins/dynamix/NewConfig.page
+++ b/plugins/dynamix/NewConfig.page
@@ -19,11 +19,24 @@ $disabled = $var['fsState']=="Started" || !$superdat ? 'disabled' : '';
 ?>
 <style>
 span.indent{display:inline-block;width:200px;margin-top:11px;}
-select.preset{min-width:auto;padding:0 6px;}
 </style>
 
-<?if (file_exists('/var/tmp/disks.ini')):?>
 <script>
+function prepareNewConfig(form) {
+  // Return preset as single line input
+  var preset = '';
+  for (var i=1,item; item=form.preset.options[i]; i++) {
+    if (item.selected) {
+      if (preset.length) preset += ',';
+      preset += item.value;
+      item.selected = false;
+    }
+  }
+  item = form.preset.options[0];
+  item.value = preset;
+  item.selected = true;
+}
+<?if (file_exists('/var/tmp/disks.ini')):?>
 function assign(id,disk) {
   var pair = {changeDevice:'Apply'};
   pair['slotId.'+id] = disk;
@@ -34,8 +47,14 @@ $disks = parse_ini_file('/var/tmp/disks.ini',true);
 foreach ($disks as $disk) echo "assign('{$disk['idx']}','{$disk['id']}');";
 unlink('/var/tmp/disks.ini');
 ?>
-</script>
 <?endif;?>
+$(function() {
+  $('#s1').dropdownchecklist({emptyText:'None', width:131, firstItemChecksAll: true, explicitClose:'...close'});
+<?if ($disabled):?>
+  $('#s1').dropdownchecklist('disable');
+<?endif;?>
+});
+</script>
 
 This is a utility to reset the array disk configuration so that all disks appear as "New" disks, as
 if it were a fresh new server.
@@ -47,18 +66,15 @@ Use the *'Preset current configuration'* selection to populate the desired disk
 
 **DO NOT USE THIS UTILITY THINKING IT WILL REBUILD A FAILED DRIVE** - it will have the opposite
 effect of making it ***impossible*** to rebuild an existing failed drive - you have been warned!
+
 <hr>
-<form name="newConfig" method="POST" action="/update.htm" target="progressFrame">
+<form name="newConfig" method="POST" action="/update.htm" target="progressFrame" onsubmit="prepareNewConfig(this)">
 <span class="indent">Preset current configuration:</span>
-<select name="preset" class="preset" <?=$disabled?>>
-<?=mk_option(1,'Parity|Data|Cache','All')?>
-<?=mk_option(1,'Parity','Parity only')?>
-<?=mk_option(1,'Data','Data only')?>
-<?=mk_option(1,'Cache','Cache only')?>
-<?=mk_option(1,'Parity|Data','Parity + Data')?>
-<?=mk_option(1,'Parity|Cache','Parity + Cache')?>
-<?=mk_option(1,'Data|Cache','Data + Cache')?>
-<?=mk_option(1,'','None')?>
+<select id="s1" name="preset" size="1" multiple="multiple" style="display:none">
+<option value=''>All</option>
+<?=mk_option_check('Parity','Parity','Parity slots')?>
+<?=mk_option_check('Data','Data','Data slots')?>
+<?=mk_option_check('Cache','Cache','Cache slots')?>
 </select>
 <br>
 <span class="indent"><input type="submit" name="cmdInit" value="Apply" onclick="$.post('/webGui/include/PrepareDisks.php',{preset:preset.value})" disabled><input type="button" value="Done" onclick="done()"></span>
@@ -68,14 +84,3 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
 <input type="checkbox" onClick="cmdInit.disabled=!this.checked"><small>Yes I want to do this</small>
 <?endif;?>
 </form>
-
-> *Preset current configuration*
-
-> + **All** - parity, data and cache disks are populated with the current disk assignment **after** an array reset
-> + **Parity only** - only parity disk(s) are populated, data and cache disks will be unassigned
-> + **Data only** - only data disk(s) are populated, parity and cache disks will be unassigned
-> + **Cache only** - only cache disk(s) are populated, parity and data disks will be unassigned
-> + **Parity + Data** - parity and data disks are populated, cache disks will be unassigned
-> + **Parity + Cache** - parity and cache disks are populated, data disks will be unassigned
-> + **Data + Cache** - data and cache disks are populated, parity disks will be unassigned
-> + **None** - parity, data and cache disks will all be unassigned

From a2464592e61c8b3de4f71d8572f5986489c62839 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Tue, 28 Jun 2016 17:43:50 +0200
Subject: [PATCH 3/6] Added 'preset current configuration' with New Config
 utility [10]

---
 plugins/dynamix/NewConfig.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/NewConfig.page b/plugins/dynamix/NewConfig.page
index 8b1cab976..6889bad02 100644
--- a/plugins/dynamix/NewConfig.page
+++ b/plugins/dynamix/NewConfig.page
@@ -77,7 +77,7 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
 <?=mk_option_check('Cache','Cache','Cache slots')?>
 </select>
 <br>
-<span class="indent"><input type="submit" name="cmdInit" value="Apply" onclick="$.post('/webGui/include/PrepareDisks.php',{preset:preset.value})" disabled><input type="button" value="Done" onclick="done()"></span>
+<span class="indent"><input type="submit" name="cmdInit" value=" Apply " onclick="$.post('/webGui/include/PrepareDisks.php',{preset:preset.value})" disabled><input type="button" value=" Done " onclick="done()"></span>
 <?if ($disabled):?>
 <?=$superdat ? 'Array must be <b>STOPPED</b>' : 'Array has been <b>RESET</b> (please configure)'?>
 <?else:?>

From 59d4975253d86b055487aaae1b813052f05f8f65 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Wed, 29 Jun 2016 07:17:15 +0200
Subject: [PATCH 4/6] Update copyright [9]

---
 update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update.php b/update.php
index 13824825e..04102b292 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?PHP
 /* Copyright 2005-2016, Lime Technology
- * Copyright 2015-2016, Bergware International.
+ * Copyright 2012-2016, 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,

From 3a7e6f51c930d2fe2a1826b3aea2eea0e2227c7f Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Wed, 29 Jun 2016 21:00:48 +0200
Subject: [PATCH 5/6] Added 'preset current configuration' with New Config
 utility [11]

---
 plugins/dynamix/NewConfig.page | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/dynamix/NewConfig.page b/plugins/dynamix/NewConfig.page
index 6889bad02..c2da1a761 100644
--- a/plugins/dynamix/NewConfig.page
+++ b/plugins/dynamix/NewConfig.page
@@ -49,7 +49,7 @@ unlink('/var/tmp/disks.ini');
 ?>
 <?endif;?>
 $(function() {
-  $('#s1').dropdownchecklist({emptyText:'None', width:131, firstItemChecksAll: true, explicitClose:'...close'});
+  $('#s1').dropdownchecklist({emptyText:'None', width:131, firstItemChecksAll:true, explicitClose:'...close'});
 <?if ($disabled):?>
   $('#s1').dropdownchecklist('disable');
 <?endif;?>
@@ -62,7 +62,7 @@ if it were a fresh new server.
 This is useful when you have added or removed multiple drives and wish to rebuild parity based on
 the new configuration.
 
-Use the *'Preset current configuration'* selection to populate the desired disk slots ***after*** the array has been reset. By default all disk slots currently present are populated.
+Use the *'Preset current configuration'* selection to populate the desired disk slots ***after*** the array has been reset. By default **no** disk slots are populated.
 
 **DO NOT USE THIS UTILITY THINKING IT WILL REBUILD A FAILED DRIVE** - it will have the opposite
 effect of making it ***impossible*** to rebuild an existing failed drive - you have been warned!
@@ -72,9 +72,9 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
 <span class="indent">Preset current configuration:</span>
 <select id="s1" name="preset" size="1" multiple="multiple" style="display:none">
 <option value=''>All</option>
-<?=mk_option_check('Parity','Parity','Parity slots')?>
-<?=mk_option_check('Data','Data','Data slots')?>
-<?=mk_option_check('Cache','Cache','Cache slots')?>
+<?=mk_option_check(0,'Parity','Parity slots')?>
+<?=mk_option_check(0,'Data','Data slots')?>
+<?=mk_option_check(0,'Cache','Cache slots')?>
 </select>
 <br>
 <span class="indent"><input type="submit" name="cmdInit" value=" Apply " onclick="$.post('/webGui/include/PrepareDisks.php',{preset:preset.value})" disabled><input type="button" value=" Done " onclick="done()"></span>

From 906953e74e2ff7e0fa8a4b1670d9970afeef23a6 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Wed, 29 Jun 2016 21:28:51 +0200
Subject: [PATCH 6/6] Added 'preset current configuration' with New Config
 utility [12]

---
 plugins/dynamix/NewConfig.page | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/dynamix/NewConfig.page b/plugins/dynamix/NewConfig.page
index c2da1a761..93cd955fa 100644
--- a/plugins/dynamix/NewConfig.page
+++ b/plugins/dynamix/NewConfig.page
@@ -23,7 +23,7 @@ span.indent{display:inline-block;width:200px;margin-top:11px;}
 
 <script>
 function prepareNewConfig(form) {
-  // Return preset as single line input
+  // assemble preset value
   var preset = '';
   for (var i=1,item; item=form.preset.options[i]; i++) {
     if (item.selected) {
@@ -32,9 +32,8 @@ function prepareNewConfig(form) {
       item.selected = false;
     }
   }
-  item = form.preset.options[0];
-  item.value = preset;
-  item.selected = true;
+  // set preset filter to populate slots
+  $.post('/webGui/include/PrepareDisks.php',{preset:preset});
 }
 <?if (file_exists('/var/tmp/disks.ini')):?>
 function assign(id,disk) {
@@ -77,7 +76,7 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
 <?=mk_option_check(0,'Cache','Cache slots')?>
 </select>
 <br>
-<span class="indent"><input type="submit" name="cmdInit" value=" Apply " onclick="$.post('/webGui/include/PrepareDisks.php',{preset:preset.value})" disabled><input type="button" value=" Done " onclick="done()"></span>
+<span class="indent"><input type="submit" name="cmdInit" value=" Apply " disabled><input type="button" value=" Done " onclick="done()"></span>
 <?if ($disabled):?>
 <?=$superdat ? 'Array must be <b>STOPPED</b>' : 'Array has been <b>RESET</b> (please configure)'?>
 <?else:?>