From cd3f45b3dc6f8bde8c4a07414c5ab66365eaaf86 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 29 Oct 2017 18:37:12 +0100
Subject: [PATCH] All encryption settings on Main page

---
 plugins/dynamix/ArrayOperation.page | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page
index 2bf40c48f..8ac582a6a 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -16,6 +16,7 @@ Tag="snowflake-o"
 ?>
 <?
 $forced  = $var['fsEncryption']=='no';
+$crypto  = $var['fsEncryption']=='yes';
 $wrong   = $var['fsEncryption']=='wrong';
 $missing = $var['fsEncryption']=='missing';
 $check   = $var['luksRestricted']=='yes';
@@ -334,8 +335,8 @@ $(function(){
         <td><strong>Start</strong> will bring the array on-line.</td></tr>
 <?    endif;
       maintenance_mode();
-      if (($keyfile && $wrong) || $missing || $encrypt):?>
-      <tr><td></td><td class="gap">Encryption status:</td><td><span class="red-text"><?=$wrong?'Wrong key':($missing?'Missing key':'Enter new key')?></span></td></tr>
+      if (($keyfile && $wrong) || $missing || $encrypt || (!$keyfile && $crypto)):?>
+      <tr><td></td><td class="gap">Encryption status:</td><td><span class="red-text"><?=$wrong?'Wrong key':(($missing||$crypto)?'Missing key':'Enter new key')?></span></td></tr>
       <tr><td></td><td class="gap">Encryption input:</td><td><select name="input" size="1" onchange="selectInput(this.form)"><?=mk_option(1,"text","Passphrase")?><?=mk_option(1,"file","Keyfile")?></select></td></tr>
       <tr id="text"><td></td><td class="gap">Passphrase:</td><td><input type="password" name="text" maxlength="512" value="" onkeyup="toggleStart(this.form)"><input type="checkbox" onchange="showPass(this.checked)">show passphrase</td></tr>
       <tr id="copy" style="display:none"><td></td><td class="gap">Retype passphrase:</td><td><input type="password" name="copy" maxlength="512" value="" onkeyup="toggleStart(this.form)"></td></tr>