From 18d6ec57f82b1cc469c46333e50c56d307ff5371 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 21 Mar 2022 20:11:58 +0100
Subject: [PATCH 01/11] Make links in help text standout (red)

---
 plugins/dynamix/styles/default-azure.css | 1 +
 plugins/dynamix/styles/default-black.css | 1 +
 plugins/dynamix/styles/default-gray.css  | 1 +
 plugins/dynamix/styles/default-white.css | 1 +
 4 files changed, 4 insertions(+)

diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css
index c8b0f26ee..b8b335d54 100644
--- a/plugins/dynamix/styles/default-azure.css
+++ b/plugins/dynamix/styles/default-azure.css
@@ -338,6 +338,7 @@ dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
 blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border:1px solid #bce8f1;color:#3a87ad;background-color:#d9edf7;box-sizing:border-box}
 blockquote.ontop{margin-top:0;margin-bottom:46px}
+blockquote a{color:red;}
 label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 label.checkbox input{position:absolute;opacity:0;cursor:pointer}
 span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#d4d2d4;border-radius:100%}
diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css
index e2f65fc24..2146b36a6 100644
--- a/plugins/dynamix/styles/default-black.css
+++ b/plugins/dynamix/styles/default-black.css
@@ -315,6 +315,7 @@ dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
 blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border-top:2px solid #bce8f1;border-bottom:2px solid #bce8f1;color:#3a87ad;background-color:#d9edf7}
 blockquote.ontop{margin-top:-20px;margin-bottom:46px}
+blockquote a{color:red;}
 label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 label.checkbox input{position:absolute;opacity:0;cursor:pointer}
 span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#2b2b2b;border-radius:100%}
diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css
index 49798b342..f00545d02 100644
--- a/plugins/dynamix/styles/default-gray.css
+++ b/plugins/dynamix/styles/default-gray.css
@@ -338,6 +338,7 @@ dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
 blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border:1px solid #bce8f1;color:#3a87ad;background-color:#d9edf7;box-sizing:border-box}
 blockquote.ontop{margin-top:0;margin-bottom:46px}
+blockquote a{color:red;}
 label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 label.checkbox input{position:absolute;opacity:0;cursor:pointer}
 span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#2b2d2b;border-radius:100%}
diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css
index 4e6575294..7ab46ff93 100644
--- a/plugins/dynamix/styles/default-white.css
+++ b/plugins/dynamix/styles/default-white.css
@@ -315,6 +315,7 @@ dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
 blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border-top:2px solid #bce8f1;border-bottom:2px solid #bce8f1;color:#3a87ad;background-color:#d9edf7}
 blockquote.ontop{margin-top:-20px;margin-bottom:46px}
+blockquote a{color:red;}
 label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 label.checkbox input{position:absolute;opacity:0;cursor:pointer}
 span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#e3e3e3;border-radius:100%}

From 6fc7f913c8ea9c8ed2795b27e6ae7c5d48c2b6ea Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 21 Mar 2022 23:12:50 +0100
Subject: [PATCH 02/11] Make links in help text standout

---
 plugins/dynamix/styles/default-azure.css | 3 ++-
 plugins/dynamix/styles/default-black.css | 3 ++-
 plugins/dynamix/styles/default-gray.css  | 3 ++-
 plugins/dynamix/styles/default-white.css | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css
index b8b335d54..862fbca86 100644
--- a/plugins/dynamix/styles/default-azure.css
+++ b/plugins/dynamix/styles/default-azure.css
@@ -338,7 +338,8 @@ dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
 blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border:1px solid #bce8f1;color:#3a87ad;background-color:#d9edf7;box-sizing:border-box}
 blockquote.ontop{margin-top:0;margin-bottom:46px}
-blockquote a{color:red;}
+blockquote a{color:#ff8c2f;font-weight:600}
+blockquote a:hover,blockquote a:focus{color:#f15a2c}
 label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 label.checkbox input{position:absolute;opacity:0;cursor:pointer}
 span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#d4d2d4;border-radius:100%}
diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css
index 2146b36a6..d1748c566 100644
--- a/plugins/dynamix/styles/default-black.css
+++ b/plugins/dynamix/styles/default-black.css
@@ -315,7 +315,8 @@ dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
 blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border-top:2px solid #bce8f1;border-bottom:2px solid #bce8f1;color:#3a87ad;background-color:#d9edf7}
 blockquote.ontop{margin-top:-20px;margin-bottom:46px}
-blockquote a{color:red;}
+blockquote a{color:#ff8c2f;font-weight:600}
+blockquote a:hover,blockquote a:focus{color:#f15a2c}
 label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 label.checkbox input{position:absolute;opacity:0;cursor:pointer}
 span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#2b2b2b;border-radius:100%}
diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css
index f00545d02..95101248b 100644
--- a/plugins/dynamix/styles/default-gray.css
+++ b/plugins/dynamix/styles/default-gray.css
@@ -338,7 +338,8 @@ dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
 blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border:1px solid #bce8f1;color:#3a87ad;background-color:#d9edf7;box-sizing:border-box}
 blockquote.ontop{margin-top:0;margin-bottom:46px}
-blockquote a{color:red;}
+blockquote a{color:#ff8c2f;font-weight:600}
+blockquote a:hover,blockquote a:focus{color:#f15a2c}
 label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 label.checkbox input{position:absolute;opacity:0;cursor:pointer}
 span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#2b2d2b;border-radius:100%}
diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css
index 7ab46ff93..fb471e44e 100644
--- a/plugins/dynamix/styles/default-white.css
+++ b/plugins/dynamix/styles/default-white.css
@@ -315,7 +315,8 @@ dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
 blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border-top:2px solid #bce8f1;border-bottom:2px solid #bce8f1;color:#3a87ad;background-color:#d9edf7}
 blockquote.ontop{margin-top:-20px;margin-bottom:46px}
-blockquote a{color:red;}
+blockquote a{color:#ff8c2f;font-weight:600}
+blockquote a:hover,blockquote a:focus{color:#f15a2c}
 label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 label.checkbox input{position:absolute;opacity:0;cursor:pointer}
 span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#e3e3e3;border-radius:100%}

From 43786719875de1e554458dd0d051674a2d5cb8c8 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 21 Mar 2022 23:18:27 +0100
Subject: [PATCH 03/11] Make links in help text standout

---
 plugins/dynamix/styles/default-azure.css | 2 +-
 plugins/dynamix/styles/default-black.css | 2 +-
 plugins/dynamix/styles/default-gray.css  | 2 +-
 plugins/dynamix/styles/default-white.css | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css
index 862fbca86..ad4d2fa94 100644
--- a/plugins/dynamix/styles/default-azure.css
+++ b/plugins/dynamix/styles/default-azure.css
@@ -336,7 +336,7 @@ dt{clear:left;float:left;width:35%}
 dd{margin-bottom:12px;white-space:nowrap}
 dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
-blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border:1px solid #bce8f1;color:#3a87ad;background-color:#d9edf7;box-sizing:border-box}
+blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border:1px solid #bce8f1;color:#222222;background-color:#d9edf7;box-sizing:border-box}
 blockquote.ontop{margin-top:0;margin-bottom:46px}
 blockquote a{color:#ff8c2f;font-weight:600}
 blockquote a:hover,blockquote a:focus{color:#f15a2c}
diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css
index d1748c566..d6b16f9b7 100644
--- a/plugins/dynamix/styles/default-black.css
+++ b/plugins/dynamix/styles/default-black.css
@@ -313,7 +313,7 @@ dt{clear:left;float:left;width:35%;font-weight:normal}
 dd{margin-bottom:12px;white-space:nowrap}
 dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
-blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border-top:2px solid #bce8f1;border-bottom:2px solid #bce8f1;color:#3a87ad;background-color:#d9edf7}
+blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border-top:2px solid #bce8f1;border-bottom:2px solid #bce8f1;color:#222222;background-color:#d9edf7}
 blockquote.ontop{margin-top:-20px;margin-bottom:46px}
 blockquote a{color:#ff8c2f;font-weight:600}
 blockquote a:hover,blockquote a:focus{color:#f15a2c}
diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css
index 95101248b..b265852be 100644
--- a/plugins/dynamix/styles/default-gray.css
+++ b/plugins/dynamix/styles/default-gray.css
@@ -336,7 +336,7 @@ dt{clear:left;float:left;width:35%}
 dd{margin-bottom:12px;white-space:nowrap}
 dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
-blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border:1px solid #bce8f1;color:#3a87ad;background-color:#d9edf7;box-sizing:border-box}
+blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border:1px solid #bce8f1;color:#222222;background-color:#d9edf7;box-sizing:border-box}
 blockquote.ontop{margin-top:0;margin-bottom:46px}
 blockquote a{color:#ff8c2f;font-weight:600}
 blockquote a:hover,blockquote a:focus{color:#f15a2c}
diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css
index fb471e44e..356aeca90 100644
--- a/plugins/dynamix/styles/default-white.css
+++ b/plugins/dynamix/styles/default-white.css
@@ -313,7 +313,7 @@ dt{clear:left;float:left;width:35%;font-weight:normal}
 dd{margin-bottom:12px;white-space:nowrap}
 dd p{margin:0 0 4px 0}
 dd blockquote{padding-left:0}
-blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border-top:2px solid #bce8f1;border-bottom:2px solid #bce8f1;color:#3a87ad;background-color:#d9edf7}
+blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border-top:2px solid #bce8f1;border-bottom:2px solid #bce8f1;color:#222222;background-color:#d9edf7}
 blockquote.ontop{margin-top:-20px;margin-bottom:46px}
 blockquote a{color:#ff8c2f;font-weight:600}
 blockquote a:hover,blockquote a:focus{color:#f15a2c}

From 60e817ab9f49a0ba25bcda1a1c4cf0d5a160427b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 21 Mar 2022 23:38:53 +0100
Subject: [PATCH 04/11] UpdateDNS to prefer IPv4 first and then IPv6

---
 plugins/dynamix/include/UpdateDNS.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix/include/UpdateDNS.php b/plugins/dynamix/include/UpdateDNS.php
index 244347af0..c851ab76f 100644
--- a/plugins/dynamix/include/UpdateDNS.php
+++ b/plugins/dynamix/include/UpdateDNS.php
@@ -93,7 +93,7 @@ function verbose_output($httpcode, $result) {
   echo (rebindDisabled()) ? "{$icon_ok}Rebind protection is disabled" : "{$icon_warn}Rebind protection is enabled";
   echo " for ".($isLegacyCert ? "unraid.net" : "myunraid.net").PHP_EOL;
   if ($post) {
-    $wanip = trim(@file_get_contents("https://wanip.unraid.net/"));
+    $wanip = trim(@file_get_contents("https://wanip4.unraid.net/") ?: @file_get_contents("https://wanip6.unraid.net/"));
     // check the data
     $certhostname = $nginx['NGINX_CERTNAME'];
     if ($certhostname) {
@@ -331,7 +331,7 @@ if ($isRegistered) {
   }
   if ($remoteaccess == 'yes') {
     // include wanip in the cache file so we can track if it changes
-    $post['_wanip'] = trim(@file_get_contents("https://wanip.unraid.net/"));
+    $post['_wanip'] = trim(@file_get_contents("https://wanip4.unraid.net/") ?: @file_get_contents("https://wanip6.unraid.net/"));
     $post['externalhostname'] = $externalhostname;
     $post['externalport'] = $externalport;
     $post['externalprotocol'] = $externalprotocol;
@@ -345,7 +345,7 @@ if ($post['_wanip'] && ($post['_wanip'] != $nginx['NGINX_WANIP']) && version_com
 // if remoteaccess is currently disabled (perhaps because a wanip was not available when nginx was started)
 //    BUT the system is configured to have it enabled AND a wanip is now available
 //    then reload nginx
-if ($remoteaccess == 'no' && $nginx['NGINX_WANACCESS'] == 'yes' && !empty(trim(@file_get_contents("https://wanip.unraid.net/")))) $reloadNginx = true;
+if ($remoteaccess == 'no' && $nginx['NGINX_WANACCESS'] == 'yes' && !empty(trim(@file_get_contents("https://wanip4.unraid.net/") ?: @file_get_contents("https://wanip6.unraid.net/")))) $reloadNginx = true;
 if ($reloadNginx) {
   exec("/etc/rc.d/rc.nginx reload &>/dev/null");
 }

From a1fd464957795b932a87e12f8aa7186397eff7fd Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 22 Mar 2022 08:20:31 +0100
Subject: [PATCH 05/11] Allow simultaneous log and console windows for
 containers

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

diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php
index 7da3d3145..9d245ff19 100644
--- a/plugins/dynamix/include/DefaultPageLayout.php
+++ b/plugins/dynamix/include/DefaultPageLayout.php
@@ -228,7 +228,7 @@ function openTerminal(tag,name,more) {
   }
   // open terminal window (run in background)
   name = name.replace(/ /g,"_");
-  tty_window = makeWindow(name,Math.max(screen.availHeight*3/5,600),Math.min(Math.max(screen.availWidth/2,900),1600));
+  tty_window = makeWindow(name+(more=='.log'?more:''),Math.max(screen.availHeight*3/5,600),Math.min(Math.max(screen.availWidth/2,900),1600));
   var socket = ['ttyd','syslog'].includes(tag) ? '/webterminal/'+tag+'/' : '/logterminal/'+name+(more=='.log'?more:'')+'/';
   $.get('/webGui/include/OpenTerminal.php',{tag:tag,name:name,more:more},function(){tty_window.location=socket; tty_window.focus();});
 }

From ff73c0f8434824c690e19abeea5371cebceee4f8 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 22 Mar 2022 08:33:51 +0100
Subject: [PATCH 06/11] UpdateDNS to prefer IPv4  only

---
 plugins/dynamix/include/UpdateDNS.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix/include/UpdateDNS.php b/plugins/dynamix/include/UpdateDNS.php
index c851ab76f..e0443f8b3 100644
--- a/plugins/dynamix/include/UpdateDNS.php
+++ b/plugins/dynamix/include/UpdateDNS.php
@@ -93,7 +93,7 @@ function verbose_output($httpcode, $result) {
   echo (rebindDisabled()) ? "{$icon_ok}Rebind protection is disabled" : "{$icon_warn}Rebind protection is enabled";
   echo " for ".($isLegacyCert ? "unraid.net" : "myunraid.net").PHP_EOL;
   if ($post) {
-    $wanip = trim(@file_get_contents("https://wanip4.unraid.net/") ?: @file_get_contents("https://wanip6.unraid.net/"));
+    $wanip = trim(@file_get_contents("https://wanip4.unraid.net/"));
     // check the data
     $certhostname = $nginx['NGINX_CERTNAME'];
     if ($certhostname) {
@@ -331,7 +331,7 @@ if ($isRegistered) {
   }
   if ($remoteaccess == 'yes') {
     // include wanip in the cache file so we can track if it changes
-    $post['_wanip'] = trim(@file_get_contents("https://wanip4.unraid.net/") ?: @file_get_contents("https://wanip6.unraid.net/"));
+    $post['_wanip'] = trim(@file_get_contents("https://wanip4.unraid.net/"));
     $post['externalhostname'] = $externalhostname;
     $post['externalport'] = $externalport;
     $post['externalprotocol'] = $externalprotocol;
@@ -345,7 +345,7 @@ if ($post['_wanip'] && ($post['_wanip'] != $nginx['NGINX_WANIP']) && version_com
 // if remoteaccess is currently disabled (perhaps because a wanip was not available when nginx was started)
 //    BUT the system is configured to have it enabled AND a wanip is now available
 //    then reload nginx
-if ($remoteaccess == 'no' && $nginx['NGINX_WANACCESS'] == 'yes' && !empty(trim(@file_get_contents("https://wanip4.unraid.net/") ?: @file_get_contents("https://wanip6.unraid.net/")))) $reloadNginx = true;
+if ($remoteaccess == 'no' && $nginx['NGINX_WANACCESS'] == 'yes' && !empty(trim(@file_get_contents("https://wanip4.unraid.net/")))) $reloadNginx = true;
 if ($reloadNginx) {
   exec("/etc/rc.d/rc.nginx reload &>/dev/null");
 }

From cee04f0a68a7834f91e05b78ac5e11c05faab26b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:43:12 +0100
Subject: [PATCH 07/11] Fixed: missing samesite attribute in cookies

Removes browser warning that cookies without this attribute will be deprecated
In addition all cookies have a default path = '/' to reference the complete site
---
 .../dynamix.plugin.manager/PluginInstall.page |  6 ++---
 .../javascript/vmmanager.js                   |  4 +--
 plugins/dynamix/ArrayDevices.page             |  6 ++---
 plugins/dynamix/ArrayOperation.page           |  8 +++---
 plugins/dynamix/Browse.page                   |  8 +++---
 plugins/dynamix/DashStats.page                |  6 ++---
 plugins/dynamix/DiskList.page                 |  8 +++---
 plugins/dynamix/HelpButton.page               |  8 +++---
 plugins/dynamix/LanguageButton.page           |  6 ++---
 plugins/dynamix/SecurityNFS.page              |  8 +++---
 plugins/dynamix/Selftest.page                 | 10 +++----
 plugins/dynamix/ShareList.page                |  8 +++---
 plugins/dynamix/include/DefaultPageLayout.php | 26 +++++++++----------
 plugins/dynamix/include/DiskList.php          |  8 +++---
 plugins/dynamix/include/ShareList.php         |  8 +++---
 plugins/dynamix/javascript/dynamix.js         |  4 +--
 16 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/plugins/dynamix.plugin.manager/PluginInstall.page b/plugins/dynamix.plugin.manager/PluginInstall.page
index 284f4d2b3..86d0bccc6 100644
--- a/plugins/dynamix.plugin.manager/PluginInstall.page
+++ b/plugins/dynamix.plugin.manager/PluginInstall.page
@@ -3,8 +3,8 @@ Title="Install Plugin"
 Tag="download"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -22,7 +22,7 @@ function installPlugin(name) {
   if (file) openBox("/plugins/dynamix.plugin.manager/scripts/plugin&arg1=install&arg2="+file,"_(Install Plugin)_",600,900,true,func,plugin);
 }
 function reloadToList() {
-  $.removeCookie('tab',{path:'/'});
+  $.removeCookie('tab');
   window.location.href = '/Plugins';
 };
 </script>
diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js
index f7e9c6033..10b6dfe5a 100644
--- a/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -130,10 +130,10 @@ function toggle_id(itemID){
    var cookie = $.cookie('vmshow')||'';
    if ((document.getElementById(itemID).style.display == 'none')) {
       slideDownRows($('#'+itemID));
-      if (cookie.indexOf(itemID)<0) $.cookie('vmshow',cookie+itemID+',',{path:'/'}); 
+      if (cookie.indexOf(itemID)<0) $.cookie('vmshow',cookie+itemID+','); 
    } else {
       slideUpRows($('#'+itemID));
-      if (cookie.indexOf(itemID)>=0) $.cookie('vmshow',cookie.replace(itemID+',',''),{path:'/'});
+      if (cookie.indexOf(itemID)>=0) $.cookie('vmshow',cookie.replace(itemID+',',''));
    }
    return false;
 }
diff --git a/plugins/dynamix/ArrayDevices.page b/plugins/dynamix/ArrayDevices.page
index aeb3a4dbc..59f1a7beb 100644
--- a/plugins/dynamix/ArrayDevices.page
+++ b/plugins/dynamix/ArrayDevices.page
@@ -3,8 +3,8 @@ Title="Array Devices"
 Tag="database"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -45,7 +45,7 @@ function display_diskio() {
 }
 function toggle_diskio(init) {
   if (!init) {
-    if ($.cookie('diskio')===undefined) $.cookie('diskio','diskio',{path:'/',expires:3650}); else $.removeCookie('diskio',{path:'/'});
+    if ($.cookie('diskio')===undefined) $.cookie('diskio','diskio',{expires:3650}); else $.removeCookie('diskio');
   }
   if ($.cookie('diskio')===undefined) {
     $('i.toggle').removeClass('fa-tachometer').addClass('fa-list');
diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page
index 9af44b10f..0b2e24159 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -186,8 +186,8 @@ function parityWarning(form) {
   swal({title:"_(Proceed to start)_",text:text,html:true,type:'warning',showCancelButton:true,confirmButtonText:"_(Proceed)_",cancelButtonText:"_(Cancel)_"},function(){prepareInput(form);});
 }
 function tab0() {
-  $.removeCookie('one',{path:'/'});
-  $.cookie('tab','tab0',{path:'/'});
+  $.removeCookie('one');
+  $.cookie('tab','tab0');
 }
 function stopArray(form) {
   $(form).append('<input type="hidden" name="cmdStop" value="Stop">');
@@ -260,7 +260,7 @@ mymonitor.on('message', function(state) {
 <?endif;?>
 <?if ($var['shareUser']=='e' && $pool_devices):?>
     $('#mover-button').prop('disabled',false);
-    $('#mover-text').html("<b>_(Move)_</b> _(will immediately invoke the Mover)_.&nbsp;<a href=\"/Main/Settings/Scheduler\"<?if($tabbed):?> onclick=\"$.cookie('one','tab2',{path:'/'})\"<?endif;?>>(_(Schedule)_)</a>");
+    $('#mover-text').html("<b>_(Move)_</b> _(will immediately invoke the Mover)_.&nbsp;<a href=\"/Main/Settings/Scheduler\"<?if($tabbed):?> onclick=\"$.cookie('one','tab2')\"<?endif;?>>(_(Schedule)_)</a>");
 <?endif;?>
     break;
   case '1': // parity running
@@ -419,7 +419,7 @@ function formatWarning(val) {
         <tr><td></td><td><input type="submit" name="cmdCheck" value="_(Clear)_"></td><td>**_(Clear)_** _(will start **Disk-Clear** of new data disk(s))_.</td></tr>
 <?    else:
         if ($action[0]=="check" && count($action)>1):?>
-          <tr><td>_(Parity is valid)_.</td><td><input type="submit" name="cmdCheck" value="_(Check)_"></td><td>**_(Check)_** _(will start **Parity-Check**)_.&nbsp;<a href="/Main/Settings/Scheduler"<?if ($tabbed):?> onclick="$.cookie('one','tab1',{path:'/'})"<?endif;?>>(_(Schedule)_)</a>
+          <tr><td>_(Parity is valid)_.</td><td><input type="submit" name="cmdCheck" value="_(Check)_"></td><td>**_(Check)_** _(will start **Parity-Check**)_.&nbsp;<a href="/Main/Settings/Scheduler"<?if ($tabbed):?> onclick="$.cookie('one','tab1')"<?endif;?>>(_(Schedule)_)</a>
           <br><input type="checkbox" name="optionCorrect" value="correct" checked><small>_(Write corrections to parity)_</small></td></tr>
 <?      elseif ($action[0]=="check"):?>
           <tr><td></td><td><input type="submit" name="cmdCheck" value="_(Check)_"></td><td>**_(Check)_** _(will start **Read-Check** of all array disks)_.</td></tr>
diff --git a/plugins/dynamix/Browse.page b/plugins/dynamix/Browse.page
index 59934e3a9..f93ebf685 100644
--- a/plugins/dynamix/Browse.page
+++ b/plugins/dynamix/Browse.page
@@ -3,8 +3,8 @@ Tag="navicon"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -45,8 +45,8 @@ $(function(){
     table.html(data);
     table.bind('sortEnd',function(e,t){
       var sort = e.target.config.sortList.toString().split(',');
-      $.cookie('col',sort[0],{path:'/'});
-      $.cookie('dir',sort[1],{path:'/'});
+      $.cookie('col',sort[0]);
+      $.cookie('dir',sort[1]);
     });
     $('div.spinner.fixed').hide('slow');
     table.tablesorter({sortList:[[col,dir],[1,0]],sortAppend:[[1,0]],textAttribute:'data'});
diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page
index a32d6b8c9..c5b8dd75b 100644
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -831,17 +831,17 @@ function update900() {
 }
 function attributes(page,disk) {
   var tab = page=='New' ? 'tab2' : 'tab3';
-  $.cookie('one',tab,{path:'/'});
+  $.cookie('one',tab);
   location.replace('/Dashboard/'+page+'?name='+disk);
 }
 function capabilities(page,disk) {
   var tab = page=='New' ? 'tab3' : 'tab4';
-  $.cookie('one',tab,{path:'/'});
+  $.cookie('one',tab);
   location.replace('/Dashboard/'+page+'?name='+disk);
 }
 function identity(page,disk) {
   var tab = page=='New' ? 'tab4' : 'tab5';
-  $.cookie('one',tab,{path:'/'});
+  $.cookie('one',tab);
   location.replace('/Dashboard/'+page+'?name='+disk);
 }
 function acknowledge(id,disk) {
diff --git a/plugins/dynamix/DiskList.page b/plugins/dynamix/DiskList.page
index ba0a06b0f..874d5f77c 100644
--- a/plugins/dynamix/DiskList.page
+++ b/plugins/dynamix/DiskList.page
@@ -4,8 +4,8 @@ Tag="user-circle-o"
 Cond="$var['fsState']!='Stopped' && $var['shareDisk']!='no'"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -18,12 +18,12 @@ Cond="$var['fsState']!='Stopped' && $var['shareDisk']!='no'"
 <script>
 function displayDisks(all) {
   if (all == 'yes') {
-    $.cookie('ssz','ssz',{path:'/'});
+    $.cookie('ssz','ssz');
     $('#disk_list').html("<tr><td colspan='8'><div class='spinner'></div></td></tr>");
     $('div.spinner').html(unraid_logo);
   }
   $.get('/webGui/include/DiskList.php',{compute:all,path:'<?=$path?>',scale:'<?=$display['scale']?>',number:'<?=$display['number']?>',fill:$.cookie('ssz')},function(data){
-    $.removeCookie('ssz',{path:'/'})
+    $.removeCookie('ssz')
     $('#disk_list').html(data);
     $('#compute-disks').prop('disabled',!data || data.indexOf('colspan=')!=-1);
   });
diff --git a/plugins/dynamix/HelpButton.page b/plugins/dynamix/HelpButton.page
index 1a076320a..cc0f2696e 100644
--- a/plugins/dynamix/HelpButton.page
+++ b/plugins/dynamix/HelpButton.page
@@ -4,8 +4,8 @@ Icon="icon-u-help"
 Code="e934"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -19,10 +19,10 @@ Code="e934"
 function HelpButton() {
   if ($('#nav-item.HelpButton').toggleClass('active').hasClass('active')) {
     $('.inline_help').show('slow');
-    $.cookie('help','help',{path:'/'});
+    $.cookie('help','help');
   } else {
     $('.inline_help').hide('slow');
-    $.removeCookie('help',{path:'/'});
+    $.removeCookie('help');
   }
 }
 </script>
\ No newline at end of file
diff --git a/plugins/dynamix/LanguageButton.page b/plugins/dynamix/LanguageButton.page
index a9da275a4..017e5fac9 100644
--- a/plugins/dynamix/LanguageButton.page
+++ b/plugins/dynamix/LanguageButton.page
@@ -4,8 +4,8 @@ Icon="icon-u-switch"
 Code="e982"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -25,7 +25,7 @@ function LanguageButton() {
   var locale = '<?=$locale?>';
   if (locale) {
     switchLanguage('');
-    $.cookie('locale',locale,{path:'/'});
+    $.cookie('locale',locale);
   } else {
     switchLanguage($.cookie('locale'));
     $.removeCookie('locale');
diff --git a/plugins/dynamix/SecurityNFS.page b/plugins/dynamix/SecurityNFS.page
index f88638203..f5ba05846 100644
--- a/plugins/dynamix/SecurityNFS.page
+++ b/plugins/dynamix/SecurityNFS.page
@@ -4,8 +4,8 @@ Tag="linux"
 Cond="(($var['shareNFSEnabled']!='no') && (isset($name)?array_key_exists($name,$sec_nfs):0))"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -90,7 +90,7 @@ $(function() {
     var host = $('input[name="shareHostListNFS"]');
     host.val($.cookie('hostList'));
     setTimeout(function(){host.trigger('change');},100);
-    $.removeCookie('hostList',{path:'/'});
+    $.removeCookie('hostList');
   }
 <?if ($tabbed):?>
 <?$path=='Shares/Share' ? $t=2 : $t=1;?>
@@ -110,7 +110,7 @@ function readNFS() {
     var data = $.parseJSON(json);
     form.shareExportNFS.value = data.export;
     form.shareSecurityNFS.value = data.security;
-    if (data.hostList != '') $.cookie('hostList',data.hostList,{path:'/'});
+    if (data.hostList != '') $.cookie('hostList',data.hostList);
     $(form).find('select').trigger('change');
   });
 }
diff --git a/plugins/dynamix/Selftest.page b/plugins/dynamix/Selftest.page
index 6bfacf33d..3034cab83 100644
--- a/plugins/dynamix/Selftest.page
+++ b/plugins/dynamix/Selftest.page
@@ -85,7 +85,7 @@ function testUpdate(init) {
       $('#short_test').val("_(Start)_");
       $('#long_test').val("_(Start)_");
       if (!init) {
-        $.removeCookie('test.<?=addslashes(htmlspecialchars($dev))?>',{path:'/'});
+        $.removeCookie('test.<?=addslashes(htmlspecialchars($dev))?>');
       }
     }
   });
@@ -104,11 +104,11 @@ function startShortTest() {
   if ($('#short_test').val()=="_(Start)_") {
     $('#short_test').val("_(Stop)_");
     $('#long_test').attr('disabled','disabled');
-    $.cookie('test.<?=addslashes(htmlspecialchars($dev))?>','short',{path:'/',expires:365});
+    $.cookie('test.<?=addslashes(htmlspecialchars($dev))?>','short',{expires:365});
     $.post('/webGui/include/SmartInfo.php',{cmd:'short',port:'<?=addslashes(htmlspecialchars($dev))?>',name:'<?=addslashes(htmlspecialchars($name))?>'},function(){timers.testUpdate = setTimeout(testUpdate,0);});
   } else {
     clearTimeout(timers.testUpdate);
-    $.removeCookie('test.<?=addslashes(htmlspecialchars($dev))?>',{path:'/'});
+    $.removeCookie('test.<?=addslashes(htmlspecialchars($dev))?>);
     $.post('/webGui/include/SmartInfo.php',{cmd:'stop',port:'<?=addslashes(htmlspecialchars($dev))?>',name:'<?=addslashes(htmlspecialchars($name))?>'},function(){setTimeout(testUpdate,0);});
   }
 }
@@ -116,11 +116,11 @@ function startLongTest() {
   if ($('#long_test').val()=="_(Start)_") {
     $('#long_test').val("_(Stop)_");
     $('#short_test').attr('disabled','disabled');
-    $.cookie('test.<?=addslashes(htmlspecialchars($dev))?>','long',{path:'/',expires:365});
+    $.cookie('test.<?=addslashes(htmlspecialchars($dev))?>','long',{expires:365});
     $.post('/webGui/include/SmartInfo.php',{cmd:'long',port:'<?=addslashes(htmlspecialchars($dev))?>',name:'<?=addslashes(htmlspecialchars($name))?>'},function(){timers.testUpdate = setTimeout(testUpdate,0);});
   } else {
     clearTimeout(timers.testUpdate);
-    $.removeCookie('test.<?=addslashes(htmlspecialchars($dev))?>',{path:'/'});
+    $.removeCookie('test.<?=addslashes(htmlspecialchars($dev))?>');
     $.post('/webGui/include/SmartInfo.php',{cmd:'stop',port:'<?=addslashes(htmlspecialchars($dev))?>',name:'<?=addslashes(htmlspecialchars($name))?>'},function(){setTimeout(testUpdate,0);});
   }
 }
diff --git a/plugins/dynamix/ShareList.page b/plugins/dynamix/ShareList.page
index af6fa3c9a..84bcde62e 100644
--- a/plugins/dynamix/ShareList.page
+++ b/plugins/dynamix/ShareList.page
@@ -4,8 +4,8 @@ Tag="user-circle"
 Cond="$var['fsState']!='Stopped' && $var['shareUser']=='e'"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -18,12 +18,12 @@ Cond="$var['fsState']!='Stopped' && $var['shareUser']=='e'"
 <script>
 function displayShares(all) {
   if (all == 'yes') {
-    $.cookie('ssz','ssz',{path:'/'});
+    $.cookie('ssz','ssz');
     $('#shareslist').html("<tr><td colspan='8'><div class='spinner'></div></td></tr>");
     $('div.spinner').html(unraid_logo);
   }
   $.get('/webGui/include/ShareList.php',{compute:all,path:'<?=addslashes(htmlspecialchars($path))?>',scale:'<?=$display['scale']?>',number:'<?=$display['number']?>',raw:'<?=$display['raw']?>',fill:$.cookie('ssz')},function(data){
-    $.removeCookie('ssz',{path:'/'})
+    $.removeCookie('ssz')
     $('#shareslist').html(data);
     $('#compute-shares').prop('disabled',!data || data.indexOf('colspan=')!=-1);
   });
diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php
index 9d245ff19..c77d4d28c 100644
--- a/plugins/dynamix/include/DefaultPageLayout.php
+++ b/plugins/dynamix/include/DefaultPageLayout.php
@@ -157,34 +157,34 @@ function refresh(top) {
     for (var i=0,link; link=document.getElementsByTagName('a')[i]; i++) { link.style.color = "gray"; } //fake disable
     location.reload();
   } else {
-    $.cookie('top',top,{path:'/'});
+    $.cookie('top',top);
     location.reload();
   }
 }
 function initab() {
-  $.removeCookie('one',{path:'/'});
-  $.removeCookie('tab',{path:'/'});
+  $.removeCookie('one');
+  $.removeCookie('tab');
 }
 function settab(tab) {
 <?switch ($myPage['name']):?>
 <?case'Main':?>
-  $.cookie('tab',tab,{path:'/'});
+  $.cookie('tab',tab);
 <?if ($var['fsState']=='Started'):?>
-  $.cookie('one','tab1',{path:'/'});
+  $.cookie('one','tab1');
 <?endif;?>
 <?break;?>
 <?case'Cache':case'Data':case'Flash':case'Parity':?>
-  $.cookie('one',tab,{path:'/'});
+  $.cookie('one',tab);
 <?break;?>
 <?default:?>
-  $.cookie(($.cookie('one')==null?'tab':'one'),tab,{path:'/'});
+  $.cookie(($.cookie('one')==null?'tab':'one'),tab);
 <?endswitch;?>
 }
 function done(key) {
   var url = location.pathname.split('/');
   var path = '/'+url[1];
   if (key) for (var i=2; i<url.length; i++) if (url[i]==key) break; else path += '/'+url[i];
-  $.removeCookie('one',{path:'/'});
+  $.removeCookie('one');
   location.replace(path);
 }
 function chkDelete(form, button) {
@@ -266,7 +266,7 @@ function addBannerWarning(text,warning=true,noDismiss=false) {
 }
 
 function dismissBannerWarning(entry,cookieText) {
-  $.cookie(cookieText,"true",{expires:365,path:'/'});
+  $.cookie(cookieText,"true",{expires:365});
   removeBannerWarning(entry);
 }
 
@@ -318,9 +318,9 @@ function showUpgrade(text,noDismiss=false) {
 function hideUpgrade(set) {
   removeBannerWarning(osUpgradeWarning);
   if (set)
-    $.cookie('os_upgrade','true',{path:'/'});
+    $.cookie('os_upgrade','true');
   else
-    $.removeCookie('os_upgrade',{path:'/'});
+    $.removeCookie('os_upgrade');
 }
 function openUpgrade() {
   hideUpgrade();
@@ -506,7 +506,7 @@ foreach ($pages as $page) {
         if (substr($icon,0,3)!='fa-') $icon = "fa-$icon";
         $icon = "<i class='fa $icon PanelIcon'></i>";
       }
-      echo "<div class=\"Panel\"><a href=\"/$path/{$pg['name']}\" onclick=\"$.cookie('one','tab1',{path:'/'})\"><span>$icon</span><div class=\"PanelText\">"._($title)."</div></a></div>";
+      echo "<div class=\"Panel\"><a href=\"/$path/{$pg['name']}\" onclick=\"$.cookie('one','tab1')\"><span>$icon</span><div class=\"PanelText\">"._($title)."</div></a></div>";
     }
   }
   // create list of nchan scripts to be started
@@ -715,7 +715,7 @@ $(function() {
   });
   var top = ($.cookie('top')||0) - $('.tabs').offset().top - 75;
   if (top>0) {$('html,body').scrollTop(top);}
-  $.removeCookie('top',{path:'/'});
+  $.removeCookie('top');
 <?if ($safemode):?>
   showNotice("<?=_('System running in')?> <b><?=('safe mode')?></b>");
 <?else:?>
diff --git a/plugins/dynamix/include/DiskList.php b/plugins/dynamix/include/DiskList.php
index 9c5547d2b..a9885a2cd 100644
--- a/plugins/dynamix/include/DiskList.php
+++ b/plugins/dynamix/include/DiskList.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -88,7 +88,7 @@ foreach ($disks as $name => $disk) {
    default: $luks = "<a class='info' onclick='return false'><i class='padlock fa fa-lock red-text'></i><span>"._('Unknown encryption state')."</span></a>"; break;
   } else $luks = "";
   echo "<tr>";
-  echo "<td><a class='info nohand' onclick='return false'><i class='fa fa-$orb orb $color-orb'></i><span style='left:18px'>$help</span></a>$luks<a href=\"/$path/Disk?name=$name\" onclick=\"$.cookie('one','tab1',{path:'/'})\">".compress($name)."</a></td>";
+  echo "<td><a class='info nohand' onclick='return false'><i class='fa fa-$orb orb $color-orb'></i><span style='left:18px'>$help</span></a>$luks<a href=\"/$path/Disk?name=$name\" onclick=\"$.cookie('one','tab1')\">".compress($name)."</a></td>";
   echo "<td>{$disk['comment']}</td>";
   echo "<td>".disk_share_settings($var['shareSMBEnabled'], $sec[$name])."</td>";
   echo "<td>".disk_share_settings($var['shareNFSEnabled'], $sec_nfs[$name])."</td>";
@@ -117,7 +117,7 @@ foreach ($disks as $name => $disk) {
     }
   } else {
     echo "<td>$type</td>";
-    echo "<td><a href=\"/update.htm?cmd=$cmd&csrf_token={$var['csrf_token']}\" target=\"progressFrame\" onclick=\"$.cookie('ssz','ssz',{path:'/'});$(this).text('"._('Please wait')."...')\">"._('Compute')."...</a></td>";
+    echo "<td><a href=\"/update.htm?cmd=$cmd&csrf_token={$var['csrf_token']}\" target=\"progressFrame\" onclick=\"$.cookie('ssz','ssz');$(this).text('"._('Please wait')."...')\">"._('Compute')."...</a></td>";
     echo "<td>".my_scale($disk['fsFree']*1024, $unit)." $unit</td>";
     echo "<td><a href=\"/$path/Browse?dir=/mnt/$name\"><i class=\"icon-u-tab\" title=\""._('Browse')." /mnt/$name\"></i></a></td>";
     echo "</tr>";
diff --git a/plugins/dynamix/include/ShareList.php b/plugins/dynamix/include/ShareList.php
index 21c1098a9..f91f2b8fc 100644
--- a/plugins/dynamix/include/ShareList.php
+++ b/plugins/dynamix/include/ShareList.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -91,7 +91,7 @@ foreach ($shares as $name => $share) {
    default: $luks = "<a class='info' onclick='return false'><i class='padlock fa fa-lock red-text'></i><span>"._('Unknown encryption state')."</span></a>"; break;
   } else $luks = "";
   echo "<tr>";
-  echo "<td><a class='info nohand' onclick='return false'><i class='fa fa-$orb orb $color-orb'></i><span style='left:18px'>$help</span></a>$luks<a href=\"/$path/Share?name=".urlencode($name)."\" onclick=\"$.cookie('one','tab1',{path:'/'})\">".compress($name)."</a></td>";
+  echo "<td><a class='info nohand' onclick='return false'><i class='fa fa-$orb orb $color-orb'></i><span style='left:18px'>$help</span></a>$luks<a href=\"/$path/Share?name=".urlencode($name)."\" onclick=\"$.cookie('one','tab1')\">".compress($name)."</a></td>";
   echo "<td>{$share['comment']}</td>";
   echo "<td>".user_share_settings($var['shareSMBEnabled'], $sec[$name])."</td>";
   echo "<td>".user_share_settings($var['shareNFSEnabled'], $sec_nfs[$name])."</td>";
@@ -120,7 +120,7 @@ foreach ($shares as $name => $share) {
     }
   } else {
     echo "<td>$cache</td>";
-    echo "<td><a href=\"/update.htm?cmd=$cmd&csrf_token={$var['csrf_token']}\" target=\"progressFrame\" onclick=\"$.cookie('ssz','ssz',{path:'/'});$(this).text('"._('Please wait')."...')\">"._('Compute')."...</a></td>";
+    echo "<td><a href=\"/update.htm?cmd=$cmd&csrf_token={$var['csrf_token']}\" target=\"progressFrame\" onclick=\"$.cookie('ssz','ssz');$(this).text('"._('Please wait')."...')\">"._('Compute')."...</a></td>";
     echo "<td>".my_scale($share['free']*1024, $unit)." $unit</td>";
     echo "<td><a href=\"/$path/Browse?dir=/mnt/user/".urlencode($name)."\"><i class=\"icon-u-tab\" title=\""._('Browse')." /mnt/user/".urlencode($name)."\"></i></a></td>";
     echo "</tr>";
diff --git a/plugins/dynamix/javascript/dynamix.js b/plugins/dynamix/javascript/dynamix.js
index 064fbebc3..a190400a7 100644
--- a/plugins/dynamix/javascript/dynamix.js
+++ b/plugins/dynamix/javascript/dynamix.js
@@ -47,8 +47,8 @@ Q.find=(function(){var aP=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][
 /* SweetAlert v1.0.0, copyright Tristan Edwards - modified by Bergware - reversed buttons for use in Unraid NOT UPDATED */
 !function(a,b,c){"use strict";!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(d,e,f){var g=function(a){return a&&a.__esModule?a:{default:a}};Object.defineProperty(f,"__esModule",{value:!0});var r,s,t,u,h=d("./modules/handle-dom"),i=d("./modules/utils"),j=d("./modules/handle-swal-dom"),k=d("./modules/handle-click"),l=d("./modules/handle-key"),m=g(l),n=d("./modules/default-params"),o=g(n),p=d("./modules/set-params"),q=g(p);f.default=t=u=function(){function e(a){var b=d;return b[a]===c?o.default[a]:b[a]}var d=arguments[0];if(h.addClass(b.body,"stop-scrolling"),j.resetInput(),d===c)return i.logStr("SweetAlert expects at least 1 attribute!"),!1;var f=i.extend({},o.default);switch(typeof d){case"string":f.title=d,f.text=arguments[1]||"",f.type=arguments[2]||"";break;case"object":if(d.title===c)return i.logStr('Missing "title" argument!'),!1;f.title=d.title;for(var g in o.default)f[g]=e(g);f.confirmButtonText=f.showCancelButton?"Confirm":o.default.confirmButtonText,f.confirmButtonText=e("confirmButtonText"),f.doneFunction=arguments[1]||null;break;default:return i.logStr('Unexpected type of argument! Expected "string" or "object", got '+typeof d),!1}q.default(f),j.fixVerticalPosition(),j.openModal(arguments[1]);for(var l=j.getModal(),n=l.querySelectorAll("button"),p=["onclick","onmouseover","onmouseout","onmousedown","onmouseup","onfocus"],t=function(b){return k.handleButton(b,f,l)},v=0;v<n.length;v++)for(var w=0;w<p.length;w++){var x=p[w];n[v][x]=t}j.getOverlay().onclick=t,r=a.onkeydown;var y=function(b){return m.default(b,f,l)};a.onkeydown=y,a.onfocus=function(){setTimeout(function(){s!==c&&(s.focus(),s=c)},0)},u.enableButtons()},t.setDefaults=u.setDefaults=function(a){if(!a)throw new Error("userParams is required");if("object"!=typeof a)throw new Error("userParams has to be a object");i.extend(o.default,a)},t.close=u.close=function(){var d=j.getModal();h.fadeOut(j.getOverlay(),5),h.fadeOut(d,5),h.removeClass(d,"showSweetAlert"),h.addClass(d,"hideSweetAlert"),h.removeClass(d,"visible");var e=d.querySelector(".sa-icon.sa-success");h.removeClass(e,"animate"),h.removeClass(e.querySelector(".sa-tip"),"animateSuccessTip"),h.removeClass(e.querySelector(".sa-long"),"animateSuccessLong");var f=d.querySelector(".sa-icon.sa-error");h.removeClass(f,"animateErrorIcon"),h.removeClass(f.querySelector(".sa-x-mark"),"animateXMark");var g=d.querySelector(".sa-icon.sa-warning");return h.removeClass(g,"pulseWarning"),h.removeClass(g.querySelector(".sa-body"),"pulseWarningIns"),h.removeClass(g.querySelector(".sa-dot"),"pulseWarningIns"),setTimeout(function(){var a=d.getAttribute("data-custom-class");h.removeClass(d,a)},300),h.removeClass(b.body,"stop-scrolling"),a.onkeydown=r,a.previousActiveElement&&a.previousActiveElement.focus(),s=c,clearTimeout(d.timeout),!0},t.showInputError=u.showInputError=function(a){var b=j.getModal(),c=b.querySelector(".sa-input-error");h.addClass(c,"show");var d=b.querySelector(".sa-error-container");h.addClass(d,"show"),d.querySelector("p").innerHTML=a,setTimeout(function(){t.enableButtons()},1),b.querySelector("input").focus()},t.resetInputError=u.resetInputError=function(a){if(a&&13===a.keyCode)return!1;var b=j.getModal(),c=b.querySelector(".sa-input-error");h.removeClass(c,"show");var d=b.querySelector(".sa-error-container");h.removeClass(d,"show")},t.disableButtons=u.disableButtons=function(a){var b=j.getModal(),c=b.querySelector("button.confirm"),d=b.querySelector("button.cancel");c.disabled=!0,d.disabled=!0},t.enableButtons=u.enableButtons=function(a){var b=j.getModal(),c=b.querySelector("button.confirm"),d=b.querySelector("button.cancel");c.disabled=!1,d.disabled=!1},"undefined"!=typeof a?a.sweetAlert=a.swal=t:i.logStr("SweetAlert is a frontend module!"),e.exports=f.default},{"./modules/default-params":2,"./modules/handle-click":3,"./modules/handle-dom":4,"./modules/handle-key":5,"./modules/handle-swal-dom":6,"./modules/set-params":8,"./modules/utils":9}],2:[function(a,b,c){Object.defineProperty(c,"__esModule",{value:!0});var d={title:"",text:"",type:null,allowOutsideClick:!1,showConfirmButton:!0,showCancelButton:!1,closeOnConfirm:!0,closeOnCancel:!0,confirmButtonText:"OK",confirmButtonColor:"transparent",cancelButtonText:"Cancel",imageUrl:null,imageSize:null,timer:null,customClass:"",html:!1,animation:!0,allowEscapeKey:!0,inputType:"text",inputPlaceholder:"",inputValue:"",showLoaderOnConfirm:!1};c.default=d,b.exports=c.default},{}],3:[function(b,c,d){Object.defineProperty(d,"__esModule",{value:!0});var e=b("./utils"),g=(b("./handle-swal-dom"),b("./handle-dom")),h=function(c,d,f){function s(a){l&&d.confirmButtonColor&&(k.style.backgroundColor=a)}var p,q,r,h=c||a.event,k=h.target||h.srcElement,l=k.className.indexOf("confirm")!==-1,m=k.className.indexOf("sweet-overlay")!==-1,n=g.hasClass(f,"visible"),o=d.doneFunction&&"true"===f.getAttribute("data-has-done-function");switch(l&&d.confirmButtonColor&&(p=d.confirmButtonColor,q=e.colorLuminance(p,-.04),r=e.colorLuminance(p,-.14)),h.type){case"mouseover":s(q);break;case"mouseout":s(p);break;case"mousedown":s(r);break;case"mouseup":s(q);break;case"focus":var t=f.querySelector("button.confirm"),u=f.querySelector("button.cancel");l?u.style.boxShadow="none":t.style.boxShadow="none";break;case"click":var v=f===k,w=g.isDescendant(f,k);if(!v&&!w&&n&&!d.allowOutsideClick)break;l&&o&&n?i(f,d):o&&n||m?j(f,d):g.isDescendant(f,k)&&"BUTTON"===k.tagName&&sweetAlert.close()}},i=function(b,c){var d=!0;g.hasClass(b,"show-input")&&(d=b.querySelector("input").value,d||(d="")),c.doneFunction(d),c.closeOnConfirm&&sweetAlert.close(),c.showLoaderOnConfirm&&sweetAlert.disableButtons()},j=function(b,c){var d=String(c.doneFunction).replace(/\s/g,""),e="function("===d.substring(0,9)&&")"!==d.substring(9,10);e&&c.doneFunction(!1),c.closeOnCancel&&sweetAlert.close()};d.default={handleButton:h,handleConfirm:i,handleCancel:j},c.exports=d.default},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],4:[function(c,d,e){Object.defineProperty(e,"__esModule",{value:!0});var f=function(b,c){return new RegExp(" "+c+" ").test(" "+b.className+" ")},g=function(b,c){f(b,c)||(b.className+=" "+c)},h=function(b,c){var d=" "+b.className.replace(/[\t\r\n]/g," ")+" ";if(f(b,c)){for(;d.indexOf(" "+c+" ")>=0;)d=d.replace(" "+c+" "," ");b.className=d.replace(/^\s+|\s+$/g,"")}},i=function(c){var d=b.createElement("div");return d.appendChild(b.createTextNode(c)),d.innerHTML},j=function(b){b.style.opacity="",b.style.display="block"},k=function(b){if(b&&!b.length)return j(b);for(var c=0;c<b.length;++c)j(b[c])},l=function(b){b.style.opacity="",b.style.display="none"},m=function(b){if(b&&!b.length)return l(b);for(var c=0;c<b.length;++c)l(b[c])},n=function(b,c){for(var d=c.parentNode;null!==d;){if(d===b)return!0;d=d.parentNode}return!1},o=function(b){b.style.left="-9999px",b.style.display="block";var d,c=b.clientHeight;return d="undefined"!=typeof getComputedStyle?parseInt(getComputedStyle(b).getPropertyValue("padding-top"),10):parseInt(b.currentStyle.padding),b.style.left="",b.style.display="none","-"+parseInt((c+d)/2)+"px"},p=function(b,c){if(+b.style.opacity<1){c=c||16,b.style.opacity=0,b.style.display="block";var d=+new Date,e=function(a){function b(){return a.apply(this,arguments)}return b.toString=function(){return a.toString()},b}(function(){b.style.opacity=+b.style.opacity+(new Date-d)/100,d=+new Date,+b.style.opacity<1&&setTimeout(e,c)});e()}b.style.display="block"},q=function(b,c){c=c||16,b.style.opacity=1;var d=+new Date,e=function(a){function b(){return a.apply(this,arguments)}return b.toString=function(){return a.toString()},b}(function(){b.style.opacity=+b.style.opacity-(new Date-d)/100,d=+new Date,+b.style.opacity>0?setTimeout(e,c):b.style.display="none"});e()},r=function(d){if("function"==typeof MouseEvent){var e=new MouseEvent("click",{view:a,bubbles:!1,cancelable:!0});d.dispatchEvent(e)}else if(b.createEvent){var f=b.createEvent("MouseEvents");f.initEvent("click",!1,!1),d.dispatchEvent(f)}else b.createEventObject?d.fireEvent("onclick"):"function"==typeof d.onclick&&d.onclick()},s=function(c){"function"==typeof c.stopPropagation?(c.stopPropagation(),c.preventDefault()):a.event&&a.event.hasOwnProperty("cancelBubble")&&(a.event.cancelBubble=!0)};e.hasClass=f,e.addClass=g,e.removeClass=h,e.escapeHtml=i,e._show=j,e.show=k,e._hide=l,e.hide=m,e.isDescendant=n,e.getTopMargin=o,e.fadeIn=p,e.fadeOut=q,e.fireClick=r,e.stopEventPropagation=s},{}],5:[function(b,d,e){Object.defineProperty(e,"__esModule",{value:!0});var f=b("./handle-dom"),g=b("./handle-swal-dom"),h=function(d,e,h){var i=d||a.event,j=i.keyCode||i.which,k=h.querySelector("button.confirm"),l=h.querySelector("button.cancel"),m=h.querySelectorAll("button[tabindex]");if([9,13,32,27].indexOf(j)!==-1){for(var n=i.target||i.srcElement,o=-1,p=0;p<m.length;p++)if(n===m[p]){o=p;break}9===j?(n=o===-1?k:o===m.length-1?m[0]:m[o+1],f.stopEventPropagation(i),n.focus(),e.confirmButtonColor&&g.setFocusStyle(n,e.confirmButtonColor)):13===j?("INPUT"===n.tagName&&(n=k,k.focus()),n=o===-1?k:c):27===j&&e.allowEscapeKey===!0?(n=l,f.fireClick(n,i)):n=c}};e.default=h,d.exports=e.default},{"./handle-dom":4,"./handle-swal-dom":6}],6:[function(c,d,e){var f=function(a){return a&&a.__esModule?a:{default:a}};Object.defineProperty(e,"__esModule",{value:!0});var g=c("./utils"),h=c("./handle-dom"),i=c("./default-params"),j=f(i),k=c("./injected-html"),l=f(k),m=".sweet-alert",n=".sweet-overlay",o=function(){var c=b.createElement("div");for(c.innerHTML=l.default;c.firstChild;)b.body.appendChild(c.firstChild)},p=function(a){function b(){return a.apply(this,arguments)}return b.toString=function(){return a.toString()},b}(function(){var a=b.querySelector(m);return a||(o(),a=p()),a}),q=function(){var b=p();if(b)return b.querySelector("input")},r=function(){return b.querySelector(n)},s=function(b,c){var d=g.hexToRgb(c);b.style.boxShadow="0 0 2px rgba("+d+", 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)"},t=function(d){var e=p();h.fadeIn(r(),10),h.show(e),h.addClass(e,"showSweetAlert"),h.removeClass(e,"hideSweetAlert"),a.previousActiveElement=b.activeElement;var f=e.querySelector("button.confirm");f.focus(),setTimeout(function(){h.addClass(e,"visible")},500);var g=e.getAttribute("data-timer");if("null"!==g&&""!==g){var i=d;e.timeout=setTimeout(function(){var a=(i||null)&&"true"===e.getAttribute("data-has-done-function");a?i(null):sweetAlert.close()},g)}},u=function(){var b=p(),c=q();h.removeClass(b,"show-input"),c.value=j.default.inputValue,c.setAttribute("type",j.default.inputType),c.setAttribute("placeholder",j.default.inputPlaceholder),v()},v=function(b){if(b&&13===b.keyCode)return!1;var c=p(),d=c.querySelector(".sa-input-error");h.removeClass(d,"show");var e=c.querySelector(".sa-error-container");h.removeClass(e,"show")},w=function(){var b=p();b.style.marginTop=h.getTopMargin(p())};e.sweetAlertInitialize=o,e.getModal=p,e.getOverlay=r,e.getInput=q,e.setFocusStyle=s,e.openModal=t,e.resetInput=u,e.resetInputError=v,e.fixVerticalPosition=w},{"./default-params":2,"./handle-dom":4,"./injected-html":7,"./utils":9}],7:[function(a,b,c){Object.defineProperty(c,"__esModule",{value:!0});var d='<div class="sweet-overlay" tabIndex="-1"></div>\n  <div class="sweet-alert">\n    <div class="sa-icon sa-error">\n      <span class="sa-x-mark">\n        <span class="sa-line sa-left"></span>\n        <span class="sa-line sa-right"></span>\n      </span>\n    </div>\n    <div class="sa-icon sa-warning">\n      <span class="sa-body"></span>\n      <span class="sa-dot"></span>\n    </div>\n    <div class="sa-icon sa-info"></div>\n    <div class="sa-icon sa-success">\n      <span class="sa-line sa-tip"></span>\n      <span class="sa-line sa-long"></span>\n      <div class="sa-placeholder"></div>\n      <div class="sa-fix"></div>\n    </div>\n    <div class="sa-icon sa-custom"></div>\n    <h2>Title</h2>\n    <p>Text</p>\n    <fieldset>\n      <input type="text" tabIndex="3" />\n      <div class="sa-input-error"></div>\n    </fieldset>\n    <div class="sa-error-container">\n      <div class="icon">!</div>\n      <p>Not valid!</p>\n    </div>\n    <div class="sa-button-container">\n      <div class="sa-confirm-button-container">\n        <button class="confirm" tabIndex="1">OK</button>\n        <div class="la-ball-fall">\n          <div></div>\n          <div></div>\n          <div></div>\n        </div>\n      </div>\n      <button class="cancel" tabIndex="2">Cancel</button>\n    </div>\n  </div>';c.default=d,b.exports=c.default},{}],8:[function(a,b,d){Object.defineProperty(d,"__esModule",{value:!0});var e=a("./utils"),f=a("./handle-swal-dom"),g=a("./handle-dom"),h=["error","warning","info","success","input","prompt"],i=function(b){var d=f.getModal(),i=d.querySelector("h2"),j=d.querySelector("p"),k=d.querySelector("button.cancel"),l=d.querySelector("button.confirm");if(i.innerHTML=b.html?b.title:g.escapeHtml(b.title).split("\n").join("<br>"),j.innerHTML=b.html?b.text:g.escapeHtml(b.text||"").split("\n").join("<br>"),b.text&&g.show(j),b.customClass)g.addClass(d,b.customClass),d.setAttribute("data-custom-class",b.customClass);else{var m=d.getAttribute("data-custom-class");g.removeClass(d,m),d.setAttribute("data-custom-class","")}if(g.hide(d.querySelectorAll(".sa-icon")),b.type&&!e.isIE8()){var n=function(){for(var a=!1,e=0;e<h.length;e++)if(b.type===h[e]){a=!0;break}if(!a)return logStr("Unknown alert type: "+b.type),{v:!1};var i=["success","error","warning","info"],j=c;i.indexOf(b.type)!==-1&&(j=d.querySelector(".sa-icon.sa-"+b.type),g.show(j));var k=f.getInput();switch(b.type){case"success":g.addClass(j,"animate"),g.addClass(j.querySelector(".sa-tip"),"animateSuccessTip"),g.addClass(j.querySelector(".sa-long"),"animateSuccessLong");break;case"error":g.addClass(j,"animateErrorIcon"),g.addClass(j.querySelector(".sa-x-mark"),"animateXMark");break;case"warning":g.addClass(j,"pulseWarning"),g.addClass(j.querySelector(".sa-body"),"pulseWarningIns"),g.addClass(j.querySelector(".sa-dot"),"pulseWarningIns");break;case"input":case"prompt":k.setAttribute("type",b.inputType),k.value=b.inputValue,k.setAttribute("placeholder",b.inputPlaceholder),g.addClass(d,"show-input"),setTimeout(function(){k.focus(),k.addEventListener("keyup",swal.resetInputError)},400)}}();if("object"==typeof n)return n.v}if(b.imageUrl){var o=d.querySelector(".sa-icon.sa-custom");o.style.backgroundImage="url("+b.imageUrl+")",g.show(o);var p=80,q=80;if(b.imageSize){var r=b.imageSize.toString().split("x"),s=r[0],t=r[1];s&&t?(p=s,q=t):logStr("Parameter imageSize expects value with format WIDTHxHEIGHT, got "+b.imageSize)}o.setAttribute("style",o.getAttribute("style")+"width:"+p+"px; height:"+q+"px")}d.setAttribute("data-has-cancel-button",b.showCancelButton),b.showCancelButton?k.style.display="inline-block":g.hide(k),d.setAttribute("data-has-confirm-button",b.showConfirmButton),b.showConfirmButton?l.style.display="inline-block":g.hide(l),b.cancelButtonText&&(k.innerHTML=g.escapeHtml(b.cancelButtonText)),b.confirmButtonText&&(l.innerHTML=g.escapeHtml(b.confirmButtonText)),b.confirmButtonColor&&(l.style.backgroundColor=b.confirmButtonColor,l.style.borderLeftColor=b.confirmLoadingButtonColor,l.style.borderRightColor=b.confirmLoadingButtonColor,f.setFocusStyle(l,b.confirmButtonColor)),d.setAttribute("data-allow-outside-click",b.allowOutsideClick);var u=!!b.doneFunction;d.setAttribute("data-has-done-function",u),b.animation?"string"==typeof b.animation?d.setAttribute("data-animation",b.animation):d.setAttribute("data-animation","pop"):d.setAttribute("data-animation","none"),d.setAttribute("data-timer",b.timer)};d.default=i,b.exports=d.default},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],9:[function(b,c,d){Object.defineProperty(d,"__esModule",{value:!0});var e=function(b,c){for(var d in c)c.hasOwnProperty(d)&&(b[d]=c[d]);return b},f=function(b){var c=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(b);return c?parseInt(c[1],16)+", "+parseInt(c[2],16)+", "+parseInt(c[3],16):null},g=function(){return a.attachEvent&&!a.addEventListener},h=function(c){a.console&&a.console.log("SweetAlert: "+c)},i=function(b,c){b=String(b).replace(/[^0-9a-f]/gi,""),b.length<6&&(b=b[0]+b[0]+b[1]+b[1]+b[2]+b[2]),c=c||0;var e,f,d="#";for(f=0;f<3;f++)e=parseInt(b.substr(2*f,2),16),e=Math.round(Math.min(Math.max(0,e+e*c),255)).toString(16),d+=("00"+e).substr(e.length);return d};d.extend=e,d.hexToRgb=f,d.isIE8=g,d.logStr=h,d.colorLuminance=i},{}]},{},[1]),"function"==typeof define&&define.amd?define(function(){return sweetAlert}):"undefined"!=typeof module&&module.exports&&(module.exports=sweetAlert)}(window,document);
 
-/* jQuery Cookie Plugin - v1.4.1, copyright Klaus Hartl NOT UPDATED */
-!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):e(jQuery)}(function(m){var i=/\+/g;function x(e){return v.raw?e:encodeURIComponent(e)}function g(e,n){var o=v.raw?e:function(e){0===e.indexOf('"')&&(e=e.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return e=decodeURIComponent(e.replace(i," ")),v.json?JSON.parse(e):e}catch(e){}}(e);return m.isFunction(n)?n(o):o}var v=m.cookie=function(e,n,o){if(1<arguments.length&&!m.isFunction(n)){if("number"==typeof(o=m.extend({},v.defaults,o)).expires){var i=o.expires,r=o.expires=new Date;r.setMilliseconds(r.getMilliseconds()+864e5*i)}return document.cookie=[x(e),"=",(t=n,x(v.json?JSON.stringify(t):String(t))),o.expires?"; expires="+o.expires.toUTCString():"",o.path?"; path="+o.path:"",o.domain?"; domain="+o.domain:"",o.secure?"; secure":""].join("")}for(var t,c,u=e?void 0:{},s=document.cookie?document.cookie.split("; "):[],a=0,d=s.length;a<d;a++){var p=s[a].split("="),f=(c=p.shift(),v.raw?c:decodeURIComponent(c)),l=p.join("=");if(e===f){u=g(l,n);break}e||void 0===(l=g(l))||(u[f]=l)}return u};v.defaults={},m.removeCookie=function(e,n){return m.cookie(e,"",m.extend({},n,{expires:-1})),!m.cookie(e)}});
+/* jQuery Cookie Plugin - v1.4.1, copyright Klaus Hartl - modified by Bergware - default path='/', added SameSite attribute, default to 'Lax' */
+!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):e(jQuery)}(function(p){var o=/\+/g;function f(e){return m.raw?e:encodeURIComponent(e)}function l(e,n){e=m.raw?e:function(e){0===e.indexOf('"')&&(e=e.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return e=decodeURIComponent(e.replace(o," ")),m.json?JSON.parse(e):e}catch(e){}}(e);return p.isFunction(n)?n(e):e}var m=p.cookie=function(e,n,o){var i,t;if(1<arguments.length&&!p.isFunction(n))return"number"==typeof(o=p.extend({},m.defaults,o)).expires&&(t=o.expires,(i=o.expires=new Date).setMilliseconds(i.getMilliseconds()+864e5*t)),document.cookie=[f(e),"=",(t=n,f(m.json?JSON.stringify(t):String(t))),o.expires?"; expires="+o.expires.toUTCString():"",o.path?"; path="+o.path:"",o.domain?"; domain="+o.domain:"",o.samesite?"; samesite="+o.samesite:"",o.secure?"; secure":""].join("");for(var r=e?void 0:{},s=document.cookie?document.cookie.split("; "):[],c=0,a=s.length;c<a;c++){var u=s[c].split("="),d=(d=u.shift(),m.raw?d:decodeURIComponent(d)),u=u.join("=");if(e===d){r=l(u,n);break}e||void 0===(u=l(u))||(r[d]=u)}return r};m.defaults={path:"/",samesite:"lax"},p.removeCookie=function(e,n){return n=p.extend({},m.defaults,n),p.cookie(e,"",p.extend({},n,{expires:-1})),!p.cookie(e)}});
 
 /* shortcuts - v2.01.B, copyright Binny V A NOT UPDATED */
 shortcut={all_shortcuts:{},add:function(l,p,i){var e={type:"keydown",propagate:!1,disable_in_input:!1,target:document,keycode:!1};if(i)for(var t in e)void 0===i[t]&&(i[t]=e[t]);else i=e;var a=i.target;"string"==typeof i.target&&(a=document.getElementById(i.target));l=l.toLowerCase();function r(e){var t;if(e=e||window.event,!i.disable_in_input||(e.target?t=e.target:e.srcElement&&(t=e.srcElement),3==t.nodeType&&(t=t.parentNode),"INPUT"!=t.tagName&&"TEXTAREA"!=t.tagName)){e.keyCode?code=e.keyCode:e.which&&(code=e.which);var a=String.fromCharCode(code).toLowerCase();188==code&&(a=","),190==code&&(a=".");var r=l.split("+"),n=0,s={"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(",0:")","-":"_","=":"+",";":":","'":'"',",":"<",".":">","/":"?","\\":"|"},o={esc:27,escape:27,tab:9,space:32,return:13,enter:13,backspace:8,scrolllock:145,scroll_lock:145,scroll:145,capslock:20,caps_lock:20,caps:20,numlock:144,num_lock:144,num:144,pause:19,break:19,insert:45,home:36,delete:46,end:35,pageup:33,page_up:33,pu:33,pagedown:34,page_down:34,pd:34,left:37,up:38,right:39,down:40,f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},d={shift:{wanted:!1,pressed:!1},ctrl:{wanted:!1,pressed:!1},alt:{wanted:!1,pressed:!1},meta:{wanted:!1,pressed:!1}};e.ctrlKey&&(d.ctrl.pressed=!0),e.shiftKey&&(d.shift.pressed=!0),e.altKey&&(d.alt.pressed=!0),e.metaKey&&(d.meta.pressed=!0);for(var c=0;k=r[c],c<r.length;c++)"ctrl"==k||"control"==k?(n++,d.ctrl.wanted=!0):"shift"==k?(n++,d.shift.wanted=!0):"alt"==k?(n++,d.alt.wanted=!0):"meta"==k?(n++,d.meta.wanted=!0):1<k.length?o[k]==code&&n++:i.keycode?i.keycode==code&&n++:a==k?n++:s[a]&&e.shiftKey&&(a=s[a])==k&&n++;return n!=r.length||d.ctrl.pressed!=d.ctrl.wanted||d.shift.pressed!=d.shift.wanted||d.alt.pressed!=d.alt.wanted||d.meta.pressed!=d.meta.wanted||(p(e),i.propagate)?void 0:(e.cancelBubble=!0,e.returnValue=!1,e.stopPropagation&&(e.stopPropagation(),e.preventDefault()),!1)}}this.all_shortcuts[l]={callback:r,target:a,event:i.type},a.addEventListener?a.addEventListener(i.type,r,!1):a.attachEvent?a.attachEvent("on"+i.type,r):a["on"+i.type]=r},remove:function(e){e=e.toLowerCase();var t=this.all_shortcuts[e];if(delete this.all_shortcuts[e],t){var a=t.event,r=t.target,n=t.callback;r.detachEvent?r.detachEvent("on"+a,n):r.removeEventListener?r.removeEventListener(a,n,!1):r["on"+a]=!1}}};

From d7e7538e02748ff66fb838fa2eb5b3df9bce5006 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:51:02 +0100
Subject: [PATCH 08/11] Fixed typo

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

diff --git a/plugins/dynamix/Selftest.page b/plugins/dynamix/Selftest.page
index 3034cab83..d41d7be9f 100644
--- a/plugins/dynamix/Selftest.page
+++ b/plugins/dynamix/Selftest.page
@@ -108,7 +108,7 @@ function startShortTest() {
     $.post('/webGui/include/SmartInfo.php',{cmd:'short',port:'<?=addslashes(htmlspecialchars($dev))?>',name:'<?=addslashes(htmlspecialchars($name))?>'},function(){timers.testUpdate = setTimeout(testUpdate,0);});
   } else {
     clearTimeout(timers.testUpdate);
-    $.removeCookie('test.<?=addslashes(htmlspecialchars($dev))?>);
+    $.removeCookie('test.<?=addslashes(htmlspecialchars($dev))?>');
     $.post('/webGui/include/SmartInfo.php',{cmd:'stop',port:'<?=addslashes(htmlspecialchars($dev))?>',name:'<?=addslashes(htmlspecialchars($name))?>'},function(){setTimeout(testUpdate,0);});
   }
 }

From 3f01535f05cee99c49a3574284e83b0da3c65c48 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 22 Mar 2022 20:19:04 +0100
Subject: [PATCH 09/11] WireGuard: user nginx settings and unraid.net api

---
 plugins/dynamix/WG0.page                     | 10 ++++++----
 plugins/dynamix/include/update.wireguard.php |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugins/dynamix/WG0.page b/plugins/dynamix/WG0.page
index 285fe7a6e..710d4e27f 100644
--- a/plugins/dynamix/WG0.page
+++ b/plugins/dynamix/WG0.page
@@ -4,8 +4,8 @@ Tag="icon-vpn"
 Nchan="wg_poller"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -27,6 +27,8 @@ exec("ip -6 addr show scope global|grep -PA2 ': (eth|br|bond)\d+'|awk '/inet6 .+
 exec("ls  --indicator-style=none $etc/wg*.conf*|grep -Po wg[0-9]+",$vtuns);
 exec("docker network ls --filter driver='macvlan' --filter driver='ipvlan' --format='{{.Name}}' 2>/dev/null",$filter);
 
+$nginx = (array)parse_ini_file('state/nginx.ini');
+
 // add subnets defined in Docker custom networks
 if (count($filter)) {
   exec("docker network inspect --format='{{range .IPAM.Config}}{{println .Subnet}}{{end}}' ".implode(' ',$filter),$docker);
@@ -122,7 +124,7 @@ function readConf(&$peer_wg,&$wg,$vtun) {
   foreach ($peer_wg as $i) if ((int)$wg["TYPE:$i"]==7) {$vpn = true; break;}
   return [$conf,$cfg,$file,$vpn];
 }
-$public    = strpos($_SERVER['HTTP_HOST'],'unraid.net')!==false && $remote['wanaccess']=='yes' ? (substr($_SERVER['HTTP_HOST'],0,4)!='www.'?'www.':'').explode(':',$_SERVER['HTTP_HOST'])[0] : '';
+$public    = $nginx['NGINX_WANFQDN'];
 $active    = (array)explode(' ',exec('wg show interfaces'));
 $autostart = (array)explode(' ',@file_get_contents("$etc/autostart"));
 $build     = false;
@@ -1289,7 +1291,7 @@ _(Local tunnel address IPv6)_:
 </div>
 </div>
 _(Local endpoint)_:
-: <span class="input"><input type="text" id="endpoint-wg0" name="Endpoint:0" class="subnet" value="<?=$vpn_wg0?'':$wg0['Endpoint:0']?>" onchange="toLC(this);quickValidate(this);" pattern="<?=$validText?>" title="_(IP address or FQDN)_" placeholder="<?=$vpn_wg0?'(not used)':preg_replace('/^(www\.).+(\.unraid.net)$/','$1<hash>$2',$public)?>">:
+: <span class="input"><input type="text" id="endpoint-wg0" name="Endpoint:0" class="subnet" value="<?=$vpn_wg0?'':$wg0['Endpoint:0']?>" onchange="toLC(this);quickValidate(this);" pattern="<?=$validText?>" title="_(IP address or FQDN)_" placeholder="<?=$vpn_wg0?'(not used)':preg_replace('/^(www\.).+(\.(my)?unraid.net)$/','$1<hash>$2',$public)?>">:
   <input type="number" name="gui:ListenPort:0" class="port" min="1" max="65535" value="<?=$vpn_wg0?'':$wg0['ListenPort:0']?>" onchange="if(quickValidate(this)) {portRemark($(document.wg0),'wg0',this.value)}" placeholder="<?=$vpn_wg0?'':$netport['wg0']?>"></span>
   <span class="remark block" style="display:none">_(Remark)_: _(configure your router with port forwarding of port)_ **<span id="my-port-wg0"><?=$wg0['ListenPort:0']?:$netport['wg0']?></span>/_(UDP)_** _(to)_ **<?=$server?>:<?=$wg0['ListenPort:0']?:$netport['wg0']?>**</span><span class="upnp wg0 block"></span>
   <input type="hidden" name="ListenPort:0" value=""><dl id="endpoint4-wg0" style="display:none"></dl><dl id="endpoint6-wg0" style="display:none"></dl>
diff --git a/plugins/dynamix/include/update.wireguard.php b/plugins/dynamix/include/update.wireguard.php
index ff03109fd..d9ad75d12 100644
--- a/plugins/dynamix/include/update.wireguard.php
+++ b/plugins/dynamix/include/update.wireguard.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2022, Lime Technology
+ * Copyright 2012-2022, 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,
@@ -296,9 +296,9 @@ case 'public':
   $v6 = $_POST['#prot']!='';
   $context = stream_context_create(['https'=>['timeout'=>12]]);
   $int_ipv4 = $v4 ? (preg_match("/^$validIP4$/", $ip) ? $ip : (@dns_get_record($ip, DNS_A)[0]['ip'] ?: '')) : '';
-  $ext_ipv4 = $v4 ? (@file_get_contents('https://api.ipify.org',false,$context) ?: '') : '';
+  $ext_ipv4 = $v4 ? (@file_get_contents('https://wanip4.unraid.net',false,$context) ?: '') : '';
   $int_ipv6 = $v6 ? (preg_match("/^$validIP6$/", $ip) ? $ip : (@dns_get_record($ip, DNS_AAAA)[0]['ipv6'] ?: '')) : '';
-  $ext_ipv6 = $v6 ? (@file_get_contents('https://api6.ipify.org',false,$context) ?: '') : '';
+  $ext_ipv6 = $v6 ? (@file_get_contents('https://wanip6.unraid.net',false,$context) ?: '') : '';
   echo "$int_ipv4;$ext_ipv4;$int_ipv6;$ext_ipv6";
   break;
 case 'addtunnel':

From 72cdef6289dd2d0081a7f3894bf9fde8bc5a0290 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 22 Mar 2022 21:17:49 +0100
Subject: [PATCH 10/11] WireGuard: user nginx settings and unraid.net api

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

diff --git a/plugins/dynamix/WG0.page b/plugins/dynamix/WG0.page
index 710d4e27f..295a7f683 100644
--- a/plugins/dynamix/WG0.page
+++ b/plugins/dynamix/WG0.page
@@ -1291,7 +1291,7 @@ _(Local tunnel address IPv6)_:
 </div>
 </div>
 _(Local endpoint)_:
-: <span class="input"><input type="text" id="endpoint-wg0" name="Endpoint:0" class="subnet" value="<?=$vpn_wg0?'':$wg0['Endpoint:0']?>" onchange="toLC(this);quickValidate(this);" pattern="<?=$validText?>" title="_(IP address or FQDN)_" placeholder="<?=$vpn_wg0?'(not used)':preg_replace('/^(www\.).+(\.(my)?unraid.net)$/','$1<hash>$2',$public)?>">:
+: <span class="input"><input type="text" id="endpoint-wg0" name="Endpoint:0" class="subnet" value="<?=$vpn_wg0?'':$wg0['Endpoint:0']?>" onchange="toLC(this);quickValidate(this);" pattern="<?=$validText?>" title="_(IP address or FQDN)_" placeholder="<?=$vpn_wg0?'(not used)':preg_replace('/^(.+?\.)[0-9a-zA-Z]+(\.(my)?unraid.net)$/','$1<hash>$2',$public)?>">:
   <input type="number" name="gui:ListenPort:0" class="port" min="1" max="65535" value="<?=$vpn_wg0?'':$wg0['ListenPort:0']?>" onchange="if(quickValidate(this)) {portRemark($(document.wg0),'wg0',this.value)}" placeholder="<?=$vpn_wg0?'':$netport['wg0']?>"></span>
   <span class="remark block" style="display:none">_(Remark)_: _(configure your router with port forwarding of port)_ **<span id="my-port-wg0"><?=$wg0['ListenPort:0']?:$netport['wg0']?></span>/_(UDP)_** _(to)_ **<?=$server?>:<?=$wg0['ListenPort:0']?:$netport['wg0']?>**</span><span class="upnp wg0 block"></span>
   <input type="hidden" name="ListenPort:0" value=""><dl id="endpoint4-wg0" style="display:none"></dl><dl id="endpoint6-wg0" style="display:none"></dl>

From 90120593fd45385946ab20970393603432d5866a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:01:37 +0100
Subject: [PATCH 11/11] Parity: shown duration time excluding idle time

---
 plugins/dynamix/nchan/parity_list | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/nchan/parity_list b/plugins/dynamix/nchan/parity_list
index f98ec576b..517e86323 100755
--- a/plugins/dynamix/nchan/parity_list
+++ b/plugins/dynamix/nchan/parity_list
@@ -97,9 +97,9 @@ while (true) {
     if (new_parity_log($timestamp)) {
       $idle = []; while (count($synced)>1) $idle[] = array_pop($synced)-array_pop($synced);
       [$action,$size] = file_exists($resync) ? my_explode(',',file_get_contents($resync)) : [$var['mdResyncAction'],$var['mdResyncSize']];
-      $duration = $var['sbSynced2']-$sbSynced;
+      $duration = $var['sbSynced2']-$sbSynced-array_sum($idle);
       $status   = $var['sbSyncExit'];
-      $speed    = $status==0 ? round($size*1024/($duration-array_sum($idle))) : 0;
+      $speed    = $status==0 ? round($size*1024/$duration) : 0;
       $error    = $var['sbSyncErrs'];
       file_put_contents($log,"$timestamp|$duration|$speed|$status|$error|$action|$size\n",FILE_APPEND);
     }