From cba7ff4871b5cf9d3a0b4534f4fe880b821248c8 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Tue, 19 Sep 2017 07:56:21 +0200
Subject: [PATCH 1/2] Updated Encryption Settings

---
 plugins/dynamix/EncryptionSettings.page | 77 ++++++++++++-------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/plugins/dynamix/EncryptionSettings.page b/plugins/dynamix/EncryptionSettings.page
index 101ace8e0..c2049299d 100644
--- a/plugins/dynamix/EncryptionSettings.page
+++ b/plugins/dynamix/EncryptionSettings.page
@@ -18,28 +18,36 @@ Tag="key"
 <?
 $keyfile = file_exists($var['luksKeyfile']) ? $var['luksKeyfile']:'';
 $online = $var['fsState']=='Stopped' ? '':'disabled';
+$allwrong = $var['fsState']=='Stopped' && $var['fsNumEncrypted']>0 && $var['fsNumEncrypted']==$var['fsNumWrongKey'];
 ?>
 <script>
 <?if ($keyfile):?>
+function prepareInput(form) {
+  form.luksReformat.disabled = true;
+}
 function toggleApply(checked) {
   $('input[name="#apply"]').prop('disabled',!checked);
 }
 <?else:?>
 var forced = <?=$var['fsNumEncrypted']==0 ? 'true':'false'?>;
-var confirm = forced || <?=$var['luksRestricted']!='yes' ? 'true':'false'?>;
 
-function toggleApply(form) {
-  var disabled = confirm ? form.text.value!=form.copy.value:form.text.value=='';
-  form.apply.disabled = disabled;
-}
 function prepareInput(form) {
-  $.post('/update.htm',{luksRestricted:form.luksRestricted.value,changeDisk:'apply'});
+  if (form.luksReformat.checked) {
+    $.post('/update.htm',{luksRestricted:form.luksRestricted.value,luksReformat:'yes',changeDisk:'apply'});
+  } else {
+    $.post('/update.htm',{luksRestricted:form.luksRestricted.value,changeDisk:'apply'});
+  }
   if (form.text.value || form.file.value) {
     form.input.disabled = true;
     form.local.disabled = true;
     form.copy.disabled = true;
+    form.luksReformat.disabled = true;
   }
 }
+function toggleApply(form) {
+  var disabled = (forced || form.luksReformat.checked) ? form.text.value!=form.copy.value : form.text.value=='';
+  form.apply.disabled = disabled;
+}
 function selectInput(form) {
   if (form.input.value == 'text') {
     form.file.value = '';
@@ -58,10 +66,8 @@ function showPass(checked) {
   $('input[name="text"],input[name="copy"]').attr('type',checked ? 'text':'password');
 }
 function showRetype(form) {
-  if (form.input.value=='file') return;
-  confirm = forced || form.luksRestricted.value!='yes';
-  toggleApply(form);
-  if (confirm) $('#retype').show(); else $('#retype').hide();
+  if (forced || form.luksReformat.checked) $('#retype').show(); else $('#retype').hide();
+  if (form.input.value=='text') form.apply.disabled = true;
 }
 function getFileContent(event,form) {
   var input = event.target;
@@ -70,14 +76,18 @@ function getFileContent(event,form) {
   reader.readAsDataURL(input.files[0]);
 }
 $(function(){
-  if (confirm) $('#retype').show();
+  if (forced) $('#retype').show();
 });
 <?endif;?>
 </script>
-<?if ($keyfile):?>
-<form markdown="1" name="encrypt_settings" method="POST" action="/update.php" target="progressFrame">
+<form markdown="1" name="encrypt_settings" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareInput(this)">
 <input type="hidden" name="#file" value="unused">
 <input type="hidden" name="#include" value="webGui/include/KeyUpload.php">
+<input type="hidden" name="file" value="">
+<?if (!$allwrong):?>
+<input type="hidden" name="luksReformat" type="checkbox">
+<?endif;?>
+<?if ($keyfile):?>
 Encryption key:
 : <?=$keyfile?>
 
@@ -94,36 +104,18 @@ Encryption key:
 
 Delete <input type="checkbox" onchange="toggleApply(this.checked)">
 : <input type="submit" name="#apply" value="Delete" disabled><input type="button" value="Done" class="lock" onclick="done()">
-</form>
-<?if ($var['luksRestricted']=='no' && $online):?>
-<form markdown="1" name="start_settings" method="POST" action="/update.htm" target="progressFrame">
-<input type="hidden" name="luksRestricted" value="yes">
-Reset **RESTRICTED START** to normal operation<input type="checkbox" onchange="this.form.changeDisk.disabled=!this.checked">
-: <input type="submit" name="changeDisk" value="Reset" disabled>
-</form>
-<?endif;?>
 
 <?else:?>
-<form markdown="1" name="encrypt_settings" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareInput(this)">
-<input type="hidden" name="#file" value="unused">
-<input type="hidden" name="#include" value="webGui/include/KeyUpload.php">
-<input type="hidden" name="file" value="">
 Encryption key:
 : Not present
 
 Restricted Start:
-: <select name="luksRestricted" size="1" onchange="showRetype(this.form)"<?=$online?>>
+: <select name="luksRestricted" size="1" <?=$online?>>
   <?=mk_option($var['luksRestricted'], "yes", "Yes")?>
   <?=mk_option($var['luksRestricted'], "no", "No")?>
   </select>
 
-> When set to **Yes** the array cannot Start if the encryption passphrase/keyfile is missing or wrong.
-> This is the normal setting.
->
-> When set to **No** the array may be Started and:
->
-> * If the passphrase/keyfile is **missing**, then encrypted volumes will not be mounted and cannot be formatted.
-> * If the passphrase/keyfile is **different**, then encrypted volumes will appear Unmountable and may be formatted with the new key.
+> When set to **Yes** the array cannot Start if the encryption passphrase/keyfile is *missing*.
 
 Encryption input:
 : <select name="input" size="1" onchange="selectInput(this.form)"<?=$online?>>
@@ -139,11 +131,6 @@ Encryption input:
 Passphrase:
 : <input type="password" name="text" maxlength="512" value=""<?=$online?> onKeyUp="toggleApply(this.form)"><?if (!$online):?><input id="eye" type="checkbox" onchange="showPass(this.checked)">show passphrase<?endif;?>
 
-<div id="retype" markdown="1" style="display:none">
-Retype passphrase:
-: <input type="password" name="copy" maxlength="512" value=""<?=$online?> onKeyUp="toggleApply(this.form)">
-
-</div>
 > Enter a passphrase of up to 512 characters. It is highly advisable to only use the 95 printable characters from the
 > first 128 characters of the [ASCII table](https://en.wikipedia.org/wiki/ASCII), as they will always have the same binary
 > representation. Other characters may have different encoding depending on system configuration and your passphrase will
@@ -154,6 +141,11 @@ Retype passphrase:
 >
 > **Memorize** this passphrase. **IF LOST, ENCRYPTED CONTENT CANNOT BE RECOVERED!**
 
+<div id="retype" markdown="1" style="display:none">
+Retype passphrase:
+: <input type="password" name="copy" maxlength="512" value=""<?=$online?> onKeyUp="toggleApply(this.form)">
+
+</div>
 </div>
 <div id="file" markdown="1" style="display:none">
 Keyfile:
@@ -164,7 +156,14 @@ Keyfile:
 > **Backup** your local keyfile. **IF LOST, ENCRYPTED CONTENT CANNOT BE RECOVERED!**
 
 </div>
+<?if ($allwrong):?>
+&nbsp;
+: <input name="luksReformat" type="checkbox" onchange="showRetype(this.form)" <?=$online?>>permit reformat
+
+> To permit re-Format of encrypted devices, check this box and retype the passphrase.
+
+<?endif;?>
 <input type="button" value="Benchmark" onclick="openBox('/webGui/include/CryptoBenchmark.php','Encryption Benchmarking',600,640)">
 : <input type="submit" name="apply" value="Apply" class="lock"><input type="button" value="Done" onclick="done()"><?if ($online):?>Array must be <span class="strong big">Stopped</span> to change<?endif;?>
-</form>
 <?endif;?>
+</form>

From 979fffa9696e4851eeadbc2dcb6a192e46ee3e52 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Tue, 19 Sep 2017 08:25:22 +0200
Subject: [PATCH 2/2] Updated Encryption Settings

---
 plugins/dynamix/EncryptionSettings.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/EncryptionSettings.page b/plugins/dynamix/EncryptionSettings.page
index c2049299d..5c35de68f 100644
--- a/plugins/dynamix/EncryptionSettings.page
+++ b/plugins/dynamix/EncryptionSettings.page
@@ -18,7 +18,7 @@ Tag="key"
 <?
 $keyfile = file_exists($var['luksKeyfile']) ? $var['luksKeyfile']:'';
 $online = $var['fsState']=='Stopped' ? '':'disabled';
-$allwrong = $var['fsState']=='Stopped' && $var['fsNumEncrypted']>0 && $var['fsNumEncrypted']==$var['fsNumWrongKey'];
+$allwrong = !$online && $var['fsNumEncrypted']>0 && $var['fsNumEncrypted']==$var['fsNumWrongKey'];
 ?>
 <script>
 <?if ($keyfile):?>
@@ -158,7 +158,7 @@ Keyfile:
 </div>
 <?if ($allwrong):?>
 &nbsp;
-: <input name="luksReformat" type="checkbox" onchange="showRetype(this.form)" <?=$online?>>permit reformat
+: <input name="luksReformat" type="checkbox" onchange="showRetype(this.form)">permit reformat
 
 > To permit re-Format of encrypted devices, check this box and retype the passphrase.