From 60c081c7b1297580cb56cc020832feb8b7ea770a Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Tue, 12 Sep 2017 20:05:21 +0200
Subject: [PATCH 1/4] Hide Format button when wrong encryption key is ignored

---
 plugins/dynamix/ArrayOperation.page          | 18 +++++++++++------
 plugins/dynamix/include/HideFormatButton.php | 21 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 plugins/dynamix/include/HideFormatButton.php

diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page
index 874b2427c..9db3bf855 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -15,6 +15,8 @@ Tag="snowflake-o"
  */
 ?>
 <?
+$hide = '/var/tmp/hide_format_button.tmp';
+
 function maintenance_mode() {
   echo "<tr>";
   echo "<td></td>";
@@ -40,9 +42,13 @@ var ask2 = <?=$confirm['down'] ? 'true' : 'false'?>;
 var ctrl = "<span class='status'><a style='cursor:pointer' class='tooltip_diskio' title='Toggle reads/writes display' onclick='toggle_diskio();return false'><i class='toggle fa'></i></a></span>";
 
 function verify(form) {
-  swal({title:'Found wrong encryption key',text:'Format unmountable disk(s) and ERASE ALL data?',type:'warning',showCancelButton:true},function(){
-    $(form).append('<input type="hidden" name="cmdFormat" value="Format">');
-    form.submit();
+  swal({title:'Found wrong encryption key',text:'Format unmountable disk(s) and erase all data?',type:'warning',confirmButtonText:'Format',cancelButtonText:'Ignore',showCancelButton:true},function(p){
+    if (p) {
+      $(form).append('<input type="hidden" name="cmdFormat" value="Format">');
+      form.submit();
+    } else {
+      $.post('/webGui/include/HideFormatButton.php',{hide:'yes'},function(){refresh();});
+    }
   });
 }
 function tab0() {
@@ -80,9 +86,9 @@ function parity_warning(form) {
 function stop_array(form) {
   $(form).append('<input type="hidden" name="cmdStop" value="Stop">');
   if (ask1) {
-    swal({title:'Proceed?',text:'This will stop the array',type:'warning',showCancelButton:true},function(p){if (p) form.submit(); else $('input[name="cmdStop"]').remove();});
+    swal({title:'Proceed?',text:'This will stop the array',type:'warning',showCancelButton:true},function(p){if (p) $.post('/webGui/include/HideFormatButton.php',{hide:'no'},function(){form.submit();}); else $('input[name="cmdStop"]').remove();});
   } else {
-    form.submit();
+    $.post('/webGui/include/HideFormatButton.php',{hide:'no'},function(){form.submit();});
   }
 }
 function stop_parity(form,text) {
@@ -144,7 +150,7 @@ toggle_diskio(true);
     <td><input type="button" value="Stop" onclick="stop_array(this.form)"<?if ($parity||$mover):?> disabled<?endif;?>></td>
     <td><strong>Stop</strong> will take the array off-line.<?=$parity?"<br>$parity":($mover?"<br>$mover":"")?></td>
     </tr>
-<?  if ($var['fsNumUnmountable']>0):?>
+<?  if ($var['fsNumUnmountable']>0 && !file_exists($hide)):?>
       <tr>
       <td><strong>Unmountable disk<?=$var['fsNumUnmountable']==1?'':'s'?> present:</strong><br>
 <?    $verify = false;
diff --git a/plugins/dynamix/include/HideFormatButton.php b/plugins/dynamix/include/HideFormatButton.php
new file mode 100644
index 000000000..2d9d78e02
--- /dev/null
+++ b/plugins/dynamix/include/HideFormatButton.php
@@ -0,0 +1,21 @@
+<?PHP
+/* Copyright 2005-2017, Lime Technology
+ * Copyright 2012-2017, 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.
+ */
+?>
+<?
+$hide = '/var/tmp/hide_format_button.tmp';
+$flag = file_exists($hide);
+
+switch ($_POST['hide']) {
+  case 'yes': if (!$flag) touch($hide); break;
+  case 'no' : if ($flag) unlink($hide); break;
+}
+?>

From 29bf35211f12b885d7aad53bed276b407f64fe6f Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Tue, 12 Sep 2017 20:24:37 +0200
Subject: [PATCH 2/4] Hide Format button when wrong encryption key is ignored

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

diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page
index 9db3bf855..70cfb480d 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -41,13 +41,13 @@ var ask1 = <?=$confirm['stop'] ? 'true' : 'false'?>;
 var ask2 = <?=$confirm['down'] ? 'true' : 'false'?>;
 var ctrl = "<span class='status'><a style='cursor:pointer' class='tooltip_diskio' title='Toggle reads/writes display' onclick='toggle_diskio();return false'><i class='toggle fa'></i></a></span>";
 
-function verify(form) {
+function verify(form,hide) {
   swal({title:'Found wrong encryption key',text:'Format unmountable disk(s) and erase all data?',type:'warning',confirmButtonText:'Format',cancelButtonText:'Ignore',showCancelButton:true},function(p){
     if (p) {
       $(form).append('<input type="hidden" name="cmdFormat" value="Format">');
       form.submit();
     } else {
-      $.post('/webGui/include/HideFormatButton.php',{hide:'yes'},function(){refresh();});
+      $.post('/webGui/include/HideFormatButton.php',{hide:hide},function(){refresh();});
     }
   });
 }
@@ -154,13 +154,14 @@ toggle_diskio(true);
       <tr>
       <td><strong>Unmountable disk<?=$var['fsNumUnmountable']==1?'':'s'?> present:</strong><br>
 <?    $verify = false;
+      $yesno = 'yes';
       foreach ($disks as $disk) if (strpos($disk['fsStatus'],'Unmountable')!==false) {
         echo "<br><span class='blue-text'>".my_disk($disk['name'])."</span> &bullet; ".my_id($disk['id'])." (".$disk['device'].")";
-        if (strpos($disk['fsStatus'],'Wrong')!==false) $verify = true;
+        if (strpos($disk['fsStatus'],'Wrong')!==false) $verify = true; else $yesno = 'no';
       }
 ?>    </td>
 <?    if ($verify):?>
-      <td><input type="button" id="cmdFormat" value="Format" disabled onclick="verify(this.form)"><input type="hidden" name="unmountable_mask" value="<?=$var['fsUnmountableMask']?>"></td>
+      <td><input type="button" id="cmdFormat" value="Format" disabled onclick="verify(this.form,'<?=$yesno?>')"><input type="hidden" name="unmountable_mask" value="<?=$var['fsUnmountableMask']?>"></td>
 <?    else:?>
       <td><input type="submit" id="cmdFormat" name="cmdFormat" value="Format" disabled><input type="hidden" name="unmountable_mask" value="<?=$var['fsUnmountableMask']?>"></td>
 <?    endif;?>

From 918dcc94d6711cb07396107dadce60bb3bb16d1e Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Wed, 13 Sep 2017 14:21:20 +0200
Subject: [PATCH 3/4] Fixed regression error in DeviceInfo

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

diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index 52661d0c3..ff161c55f 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -215,7 +215,7 @@ btrfs filesystem show:
 : <?echo "<pre>".shell_exec("/sbin/btrfs filesystem show {$disk['uuid']}")."</pre>";?>
 
 <?endif;?>
-<?if (strpos($disk['fsType'],"btrfs")):?>
+<?if (strpos($disk['fsType'],"btrfs")!==false):?>
 <div id="title" class="nocontrol"><span class="left"><i class="title fa fa-balance-scale"></i>Balance Status</span></div>
 <form markdown="1" method="POST" action="/update.php" target="progressFrame">
 <?if ($disk['fsStatus']=="Mounted"):?>
@@ -266,7 +266,7 @@ btrfs balance status:
 <?endif;?>
 </form>
 <?endif;?>
-<?if (strpos($disk['fsType'],"btrfs")):?>
+<?if (strpos($disk['fsType'],"btrfs")!==false):?>
 <div id="title" class="nocontrol"><span class="left"><i class="title fa fa-paint-brush"></i>Scrub Status</span></div>
 <form markdown="1" method="POST" action="/update.php" target="progressFrame">
 <?if ($disk['fsStatus']=="Mounted"):?>
@@ -308,7 +308,7 @@ btrfs scrub status:
 <?endif;?>
 </form>
 <?endif?>
-<?if (strpos($disk['fsType'],"btrfs")):?>
+<?if (strpos($disk['fsType'],"btrfs")!==false):?>
 <div id="title" class="nocontrol"><span class="left"><i class="title fa fa-shield"></i>Check Filesystem Status</span></div>
 <form markdown="1" method="POST" action="/update.php" target="progressFrame">
 <?if ($var['fsState']=="Started" && $var['startMode']=='Maintenance'):?>
@@ -356,7 +356,7 @@ btrfs check status:
 <?endif;?>
 </form>
 <?endif;?>
-<?if (strpos($disk['fsType'],"reiserfs")):?>
+<?if (strpos($disk['fsType'],"reiserfs")!==false):?>
 <div id="title" class="nocontrol"><span class="left"><i class="title fa fa-shield"></i>Check Filesystem Status</span></div>
 <form markdown="1" method="POST" action="/update.php" target="progressFrame">
 <?if ($var['fsState']=="Started" && $var['startMode']=='Maintenance'):?>
@@ -405,7 +405,7 @@ reiserfsck status:
 <?endif;?>
 </form>
 <?endif;?>
-<?if (strpos($disk['fsType'],"xfs")):?>
+<?if (strpos($disk['fsType'],"xfs")!==false):?>
 <div id="title" class="nocontrol"><span class="left"><i class="title fa fa-shield"></i>Check Filesystem Status</span></div>
 <form markdown="1" method="POST" action="/update.php" target="progressFrame">
 <?if ($var['fsState']=="Started" && $var['startMode']=='Maintenance'):?>

From 7d3714be38a0806580b609d45fc227fed76571e3 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Wed, 13 Sep 2017 18:06:29 +0200
Subject: [PATCH 4/4] Fixed regression error in DeviceInfo

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

diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index ff161c55f..fa43b70f4 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -261,7 +261,7 @@ btrfs balance status:
 <?else:?>
 
 &nbsp;
-: <input type="submit" value="Balance" disabled>**Balance** is only available when array is Started.
+: <input type="submit" value="Balance" disabled><?=!preg_match('/^cache\d+$/',$disk['name']) ? "<b>Balance</b> is only available when array is Started." : "See Cache Settings."?>
 
 <?endif;?>
 </form>
@@ -303,7 +303,7 @@ btrfs scrub status:
 <?else:?>
 
 &nbsp;
-: <input type="submit" value="Scrub" disabled>**Scrub** is only available when array is Started.
+: <input type="submit" value="Scrub" disabled><?=!preg_match('/^cache\d+$/',$disk['name']) ? "<b>Scrub</b> is only available when array is Started." : "See Cache Settings."?>
 
 <?endif;?>
 </form>
@@ -351,7 +351,7 @@ btrfs check status:
 <?else:?>
 
 &nbsp;
-: <input type="submit" value="Check" disabled>**Check** is only available when array is Started in **Maintenance** mode.
+: <input type="submit" value="Check" disabled><?=!preg_match('/^cache\d+$/',$disk['name']) ? "<b>Check</b> is only available when array is Started in <b>Maintenance</b> mode." : "See Cache Settings."?>
 
 <?endif;?>
 </form>