From e200431d2703cbbdfa12e08088d787a56abcd457 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 9 Jan 2023 12:25:58 +0100
Subject: [PATCH 1/3] Limit ZFS option to pool devices only

ZFS not available (yet) for the array
---
 plugins/dynamix/DeviceInfo.page | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index f43b0e066..533ffe16d 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -499,11 +499,15 @@ _(File system type)_:
 : <select id="diskFsType" name="diskFsType.<?=$disk['idx']?>" <?=$disabled?>>
   <?=mk_option($disk['fsType'], "auto", _('auto'))?>
   <?=mk_option($disk['fsType'], "xfs", _('xfs'))?>
+  <?if ($disk['type']=='Cache'):?>
   <?=mk_option($disk['fsType'], "zfs", _('zfs'))?>
+  <?endif;?>
   <?=mk_option($disk['fsType'], "btrfs", _('btrfs'))?>
   <?=mk_option($disk['fsType'], "reiserfs", _('reiserfs'))?>
   <?=mk_option($disk['fsType'], "luks:xfs", _('xfs')." - "._('encrypted'))?>
+  <?if ($disk['type']=='Cache'):?>
   <?=mk_option($disk['fsType'], "luks:zfs", _('zfs')." - "._('encrypted'))?>
+  <?endif;?>
   <?=mk_option($disk['fsType'], "luks:btrfs", _('btrfs')." - "._('encrypted'))?>
   <?=mk_option($disk['fsType'], "luks:reiserfs", _('reiserfs')." - "._('encrypted'))?>
   </select>

From 7a8852565241a3f76e8d356b028bd4665df5a1ed Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 10 Jan 2023 09:37:29 +0100
Subject: [PATCH 2/3] Revert "Limit ZFS option to pool devices only"

This reverts commit e200431d2703cbbdfa12e08088d787a56abcd457.
---
 plugins/dynamix/DeviceInfo.page | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index 533ffe16d..f43b0e066 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -499,15 +499,11 @@ _(File system type)_:
 : <select id="diskFsType" name="diskFsType.<?=$disk['idx']?>" <?=$disabled?>>
   <?=mk_option($disk['fsType'], "auto", _('auto'))?>
   <?=mk_option($disk['fsType'], "xfs", _('xfs'))?>
-  <?if ($disk['type']=='Cache'):?>
   <?=mk_option($disk['fsType'], "zfs", _('zfs'))?>
-  <?endif;?>
   <?=mk_option($disk['fsType'], "btrfs", _('btrfs'))?>
   <?=mk_option($disk['fsType'], "reiserfs", _('reiserfs'))?>
   <?=mk_option($disk['fsType'], "luks:xfs", _('xfs')." - "._('encrypted'))?>
-  <?if ($disk['type']=='Cache'):?>
   <?=mk_option($disk['fsType'], "luks:zfs", _('zfs')." - "._('encrypted'))?>
-  <?endif;?>
   <?=mk_option($disk['fsType'], "luks:btrfs", _('btrfs')." - "._('encrypted'))?>
   <?=mk_option($disk['fsType'], "luks:reiserfs", _('reiserfs')." - "._('encrypted'))?>
   </select>

From d7d760e757194824e9246479600abe9dfbdb3a3d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 10 Jan 2023 09:55:25 +0100
Subject: [PATCH 3/3] PHP8 support round 4

---
 plugins/dynamix/include/Wrappers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/Wrappers.php b/plugins/dynamix/include/Wrappers.php
index 64a63e83a..31b5c79f8 100644
--- a/plugins/dynamix/include/Wrappers.php
+++ b/plugins/dynamix/include/Wrappers.php
@@ -85,7 +85,7 @@ function ipaddr($ethX='eth0', $prot=4) {
 }
 // convert strftime to date format
 function my_date($fmt, $time) {
-  $legacy = ['%c' => 'D j M Y h:i:s A T','%A' => 'l','%Y' => 'Y','%B' => 'F','%e' => 'j','%d' => 'd','%m' => 'm','%I' => 'h','%H' => 'H','%M' => 'i','%S' => 's','%p' => 'a','%R' => 'H:i', '%F' => 'Y-m-d'];
+  $legacy = ['%c' => 'D j M Y h:i:s A T','%A' => 'l','%Y' => 'Y','%B' => 'F','%e' => 'j','%d' => 'd','%m' => 'm','%I' => 'h','%H' => 'H','%M' => 'i','%S' => 's','%p' => 'a','%R' => 'H:i', '%F' => 'Y-m-d', '%T' => 'H:i:s'];
   return date(strtr($fmt,$legacy), $time);
 }
 ?>