From 9ed1d59a7d6874ba81fe2991e8028a31a5658a12 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 17 Sep 2017 18:20:48 +0200
Subject: [PATCH 1/3] ArrayOperation code optimization

Make use of new variables
---
 plugins/dynamix/ArrayOperation.page | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page
index ebf25aa0e..c86ebc506 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -153,15 +153,11 @@ toggle_diskio(true);
 <?  if ($var['fsNumUnmountable']>0 && !file_exists($hide)):?>
       <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; else $yesno = 'no';
-      }
+<?    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'].")";
 ?>    </td>
-<?    if ($verify):?>
-      <td><input type="button" id="cmdFormat" value="Format" disabled onclick="verify(this.form,'<?=$yesno?>')"><input type="hidden" name="unmountable_mask" value="<?=$var['fsUnmountableMask']?>"></td>
+<?    if ($var['fsNumWrongKey']>0):?>
+      <td><input type="button" id="cmdFormat" value="Format" disabled onclick="verify(this.form,'<?=$var['fsNumWrongKey']==$var['fsNumEncrypted']?'yes':'no'?>')"><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 f498d5ef5bdba02773acc7797c21bc33ce2d2bab Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 17 Sep 2017 18:33:34 +0200
Subject: [PATCH 2/3] ArrayOperation code optimization

---
 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 c86ebc506..4102d7083 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -157,10 +157,11 @@ toggle_diskio(true);
       echo "<br><span class='blue-text'>".my_disk($disk['name'])."</span> &bullet; ".my_id($disk['id'])." (".$disk['device'].")";
 ?>    </td>
 <?    if ($var['fsNumWrongKey']>0):?>
-      <td><input type="button" id="cmdFormat" value="Format" disabled onclick="verify(this.form,'<?=$var['fsNumWrongKey']==$var['fsNumEncrypted']?'yes':'no'?>')"><input type="hidden" name="unmountable_mask" value="<?=$var['fsUnmountableMask']?>"></td>
+      <td><input type="button" id="cmdFormat" value="Format" disabled onclick="verify(this.form,'<?=$var['fsNumWrongKey']==$var['fsNumEncrypted']?'yes':'no'?>')">
 <?    else:?>
-      <td><input type="submit" id="cmdFormat" name="cmdFormat" value="Format" disabled><input type="hidden" name="unmountable_mask" value="<?=$var['fsUnmountableMask']?>"></td>
+      <td><input type="submit" id="cmdFormat" name="cmdFormat" value="Format" disabled>
 <?    endif;?>
+      <input type="hidden" name="unmountable_mask" value="<?=$var['fsUnmountableMask']?>"></td>
       <td><strong>Format</strong> will create a file system in all <strong>Unmountable</strong> disks, discarding all data currently on those disks.<br>
       <input type="checkbox" name="confirmFormat" value="OFF" onClick="$('#cmdFormat').prop('disabled',!arrayOps.confirmFormat.checked)"><small>Yes I want to do this</small></td>
       </tr>

From d1975d56c712c0845269b2fd4e381476e20fdc70 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 17 Sep 2017 18:37:42 +0200
Subject: [PATCH 3/3] ArrayOperation code optimization

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

diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page
index 4102d7083..630213ae7 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -154,7 +154,7 @@ toggle_diskio(true);
       <tr>
       <td><strong>Unmountable disk<?=$var['fsNumUnmountable']==1?'':'s'?> present:</strong><br>
 <?    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'].")";
+      echo "<span class='blue-text'>".my_disk($disk['name'])."</span> &bullet; ".my_id($disk['id'])." (".$disk['device'].")<br>";
 ?>    </td>
 <?    if ($var['fsNumWrongKey']>0):?>
       <td><input type="button" id="cmdFormat" value="Format" disabled onclick="verify(this.form,'<?=$var['fsNumWrongKey']==$var['fsNumEncrypted']?'yes':'no'?>')">