From a948173f155ea161cfb330d3e4ac46618f841e6e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 12 Oct 2023 10:28:54 +0200
Subject: [PATCH 001/266] rc.inet1: add "status" command

---
 etc/rc.d/rc.inet1 | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/etc/rc.d/rc.inet1 b/etc/rc.d/rc.inet1
index c9ec02a2e..66df9647a 100755
--- a/etc/rc.d/rc.inet1
+++ b/etc/rc.d/rc.inet1
@@ -634,6 +634,12 @@ stop(){
   lo_down
 }
 
+status(){
+  echo "INTERFACE        STATE          INFORMATION"
+  echo "========================================================================"
+  [[ $1 == ip ]] && ip -brief addr || ip -brief link
+}
+
 ##########################
 # STATIC ROUTE FUNCTIONS #
 ##########################
@@ -721,6 +727,9 @@ restart)
   route_down $INTERFACE $ROUTE $METRIC
   ;;
   # default is to bring up the entire network
+status)
+  status $2
+  ;;
 *)
   start
 esac
@@ -739,3 +748,5 @@ exit 0
 # rc.inet1 10.0.0.1_default_add       add default route to gateway 10.0.0.1 with metric 1
 # rc.inet1 eth0_10.0.0.0/24_1_del     delete specific route & metric from interface eth0
 # rc.inet1 10.0.0.1_default_del       delete default route from gateway 10.0.0.1
+# rc.inet1 status                     show link status
+# rc.inet1 status ip                  show ip status

From 20e29bcf7593e26a94e1d311fa9fa973c4647f36 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 12 Oct 2023 10:32:27 +0200
Subject: [PATCH 002/266] rc.inet1: add "status" command

---
 etc/rc.d/rc.inet1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/rc.d/rc.inet1 b/etc/rc.d/rc.inet1
index 66df9647a..b2e2d4bf6 100755
--- a/etc/rc.d/rc.inet1
+++ b/etc/rc.d/rc.inet1
@@ -62,8 +62,9 @@
 # - added error logging to syslog
 # - replace logging for generic add-in module
 
-# Adapted by Bergware for use in Unraid OS - August 2023
+# Adapted by Bergware for use in Unraid OS - October 2023
 # - added interface carrier check when polling for DHCP server
+# - added "status" command
 
 # Bergware - modified for Unraid OS, October 2023
 

From 5543f8c2e9ce70fb44490bcf62f4494ab2f37f28 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 12 Oct 2023 10:40:49 +0200
Subject: [PATCH 003/266] rc.inet1: minor code update

---
 etc/rc.d/rc.inet1 | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/etc/rc.d/rc.inet1 b/etc/rc.d/rc.inet1
index b2e2d4bf6..344bb135c 100755
--- a/etc/rc.d/rc.inet1
+++ b/etc/rc.d/rc.inet1
@@ -63,7 +63,7 @@
 # - replace logging for generic add-in module
 
 # Adapted by Bergware for use in Unraid OS - October 2023
-# - added interface carrier check when polling for DHCP server
+# - added interface carrier check before assigning IP address (DHCP or static)
 # - added "status" command
 
 # Bergware - modified for Unraid OS, October 2023
@@ -370,11 +370,8 @@ ipaddr_up(){
     fi
   elif [[ $DHCP == no ]]; then
     # bring up interface using static IP address
-    if carrier_up $IFACE; then
-      log "interface $IFACE is UP, setting static $IP address"
-    else
-      log "interface $IFACE is DOWN, setting static $IP address"
-    fi
+    if carrier_up $IFACE; then STATE="UP"; else STATE="DOWN"; fi
+    log "interface $IFACE is $STATE, setting static $IP address"
     ipv6_addr 0 1
     if [[ $IP != ipv6 ]]; then
       [[ $j -eq 0 ]] && ADDR=${IPADDR[$i]} || ADDR=${IPADDR[$i,$j]}

From ab914472f056186056e56d758decef3bd7b81c77 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 12 Oct 2023 10:55:11 +0200
Subject: [PATCH 004/266] rc.inet1: minor code update

---
 etc/rc.d/rc.inet1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/rc.d/rc.inet1 b/etc/rc.d/rc.inet1
index 344bb135c..fe73721a1 100755
--- a/etc/rc.d/rc.inet1
+++ b/etc/rc.d/rc.inet1
@@ -632,6 +632,7 @@ stop(){
   lo_down
 }
 
+# function to show network status
 status(){
   echo "INTERFACE        STATE          INFORMATION"
   echo "========================================================================"

From 454d8196349a405aac77782ea41ec846fc546cd3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 12 Oct 2023 17:42:29 +0200
Subject: [PATCH 005/266] dashboard: display separate tiles without borders

---
 emhttp/plugins/dynamix/DashStats.page         | 87 +++++++------------
 .../plugins/dynamix/styles/default-azure.css  | 16 ++--
 .../plugins/dynamix/styles/default-black.css  | 14 +--
 .../plugins/dynamix/styles/default-gray.css   | 18 ++--
 .../plugins/dynamix/styles/default-white.css  | 14 +--
 5 files changed, 65 insertions(+), 84 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 046f7fc3d..a3f856317 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -700,6 +700,27 @@ function hideShow() {
 !-->
 </div>
 
+<div id="dialogWindow"></div>
+<div markdown="1" id="templateClone" class="template">
+<table>
+<tr><td>_(VM Being Cloned)_:</td><td><span id="VMBeingCloned"></span></td></tr>
+<tr><td>_(New VM)_:</td><td><input type="text" id="target" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
+<tr><td>_(Overwrite)_:</td><td><input type="checkbox" id="Overwrite" value="" ></td></tr>
+<tr hidden><td>_(Start Cloned VM)_:</td><td><input type="checkbox" id="Start" value="" ></td></tr>
+<tr hidden><td>_(Edit VM after clone)_:</td><td><input type="checkbox" id="Edit" value="" ></td></tr>
+<tr><td>_(Check Free Space)_:</td><td><input type="checkbox" id="Free" value="" ></td></tr>
+</table>
+</div>
+
+<div id="dialogWindow2"></div>
+<div markdown="1" id="templatesnapshotcreate" class="template">
+<table id="snapshot">
+<tr><td>_(VM Name)_:</td><td><label id="VMName"></label></td></tr>
+<tr><td>_(Snapshot Name)_:</td><td><input type="text" id="targetsnap" autocomplete="off" spellcheck="false" value="--generate" onclick="this.select()">_(Check free space)_:<input type="checkbox" id="targetsnapfspc" checked></td></tr>
+<tr><td>_(Description)_:</td><td><input type="text" id="targetsnapdesc" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
+</table>
+</div>
+
 <script>
 Number.prototype.pad = function(size){var s=String(this);while(s.length<(size||2)){s='0'+s;}return s;}
 Array.prototype.tail = function(t){return this.slice(-t).map(function(o){return o.y;}).join(';');}
@@ -707,7 +728,7 @@ String.prototype.build = function(){return this.replace(/\n(<!--!|!-->)\n/g,'');
 String.prototype.md5 = function() {
   // Original copyright (c) Paul Johnston & Greg Holt.
   var hc = '0123456789abcdef';
-  function rh(n){var j,s='';for(j=0;j<=3;j++) s+=hc.charAt((n>>(j*8+4))&0x0F)+hc.charAt((n>>(j*8))&0x0F);return s;}
+  function rh(n){var j,s='';for (j=0;j<=3;j++) s+=hc.charAt((n>>(j*8+4))&0x0F)+hc.charAt((n>>(j*8))&0x0F);return s;}
   function ad(x,y){var l=(x&0xFFFF)+(y&0xFFFF);var m=(x>>16)+(y>>16)+(l>>16);return (m<<16)|(l&0xFFFF);}
   function rl(n,c){return (n<<c)|(n>>>(32-c));}
   function cm(q,a,b,x,s,t){return ad(rl(ad(ad(a,q),ad(x,t)),s),b);}
@@ -716,12 +737,12 @@ String.prototype.md5 = function() {
   function hh(a,b,c,d,x,s,t){return cm(b^c^d,a,b,x,s,t);}
   function ii(a,b,c,d,x,s,t){return cm(c^(b|(~d)),a,b,x,s,t);}
   function sb(x) {
-    var i;var nblk=((x.length+8)>>6)+1;var blks=new Array(nblk*16);for(i=0;i<nblk*16;i++) blks[i]=0;
-    for(i=0;i<x.length;i++) blks[i>>2]|=x.charCodeAt(i)<<((i%4)*8);
+    var i;var nblk=((x.length+8)>>6)+1;var blks=new Array(nblk*16);for (i=0;i<nblk*16;i++) blks[i]=0;
+    for (i=0;i<x.length;i++) blks[i>>2]|=x.charCodeAt(i)<<((i%4)*8);
     blks[i>>2]|=0x80<<((i%4)*8);blks[nblk*16-2]=x.length*8;return blks;
   }
   var i,x=sb(''+this),a=1732584193,b=-271733879,c=-1732584194,d=271733878,olda,oldb,oldc,oldd;
-  for(i=0;i<x.length;i+=16) {olda=a;oldb=b;oldc=c;oldd=d;
+  for (i=0;i<x.length;i+=16) {olda=a;oldb=b;oldc=c;oldd=d;
     a=ff(a,b,c,d,x[i+ 0], 7, -680876936);d=ff(d,a,b,c,x[i+ 1],12, -389564586);c=ff(c,d,a,b,x[i+ 2],17,  606105819);
     b=ff(b,c,d,a,x[i+ 3],22,-1044525330);a=ff(a,b,c,d,x[i+ 4], 7, -176418897);d=ff(d,a,b,c,x[i+ 5],12, 1200080426);
     c=ff(c,d,a,b,x[i+ 6],17,-1473231341);b=ff(b,c,d,a,x[i+ 7],22,  -45705983);a=ff(a,b,c,d,x[i+ 8], 7, 1770035416);
@@ -782,6 +803,7 @@ var netline = $.cookie('netline')||30;
 var update2 = true;
 var box     = null;
 var startup = true;
+var stopgap = '<thead class="stopgap"><tr><td class="stopgap"></td></tr></thead>';
 
 var options_cpu = {
   series:[{name:'load', data:cpu.slice()}],
@@ -1216,6 +1238,7 @@ function sortTables() {
       }
     }
   });
+  $('table.dashboard tbody').before(stopgap);
 }
 function addProperties() {
   $('div.frame tbody.system').addClass('sortable').attr('sort','_system_information_'.md5());
@@ -1357,6 +1380,7 @@ function contentMgmt() {
 }
 
 var sortableHelper = function(e,ui){
+  ui.prev().remove();
   ui.find('tr:first').children().each(function(){$(this).width($(this).width());});
   return ui;
 };
@@ -1372,7 +1396,7 @@ function LockButton() {
     $('tbody.sortable').css({'cursor':'move'});
     $('div.nav-item.LockButton span').text("_(Lock sortable items)_");
     $('#db-box1,#db-box2,#db-box3').sortable({connectWith:'#db-box1,#db-box2,#db-box3'});
-    $('table.dashboard').sortable({helper:sortableHelper,items:'.sortable',cursor:'grab',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true,
+    $('table.dashboard').sortable({helper:sortableHelper,items:'.sortable',cursor:'grab',opacity:0.6,placeholder:'dashboard-sortable',zIndex:9999,forceHelperSize:true,forcePlaceholderSize:true,
     receive:function(e,ui){
       var table = ui.sender, index = [];
       var tile = table.parent();
@@ -1382,6 +1406,7 @@ function LockButton() {
     },
     stop:function(e,ui){
       var table = ui.item.parent(), index = [];
+      if (ui.item.prev().html().search('stopgap')>0) ui.item.after(stopgap); else ui.item.before(stopgap);
       table.find('tbody').each(function(){index.push($(this).attr('sort'));});
       $.cookie(table.prop('id'),index.join(';'),{expires:3650});
     }});
@@ -1612,55 +1637,3 @@ function VMClone(uuid, name){
   dialogStyle();
 }
 </script>
-
-<div id="dialogWindow"></div>
-<div markdown="1" id="templateClone" class="template">
-<html <?=$display['rtl']?>lang="<?=strtok($locale,'_')?:'en'?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=1600">
-<meta name="robots" content="noindex, nofollow">
-<meta name="referrer" content="same-origin">
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
-</head>
-<body>
-<br>
-<table>
-<tr><td>_(VM Being Cloned)_:</td>
-<td><span id="VMBeingCloned"></span></td></tr>
-
-<tr><td>_(New VM)_:</td>
-<td><input type="text" id="target" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
-
-<tr><td>_(Overwrite)_:</td>
-<td><input type="checkbox" id="Overwrite" value="" ></td></tr>
-
-<tr hidden><td>_(Start Cloned VM)_:</td>
-<td><input type="checkbox" id="Start" value="" ></td></tr>
-
-<tr hidden><td>_(Edit VM after clone)_:</td>
-<td><input type="checkbox" id="Edit" value="" ></td></tr>
-
-<tr><td>_(Check Free Space)_:</td>
-<td><input type="checkbox" id="Free" value="" ></td></tr>
-</table>
-</body>
-</html>
-</div>
-
-<div id="dialogWindow2"></div>
-<div markdown="1" id="templatesnapshotcreate" class="template">
-<table id='snapshot'>
-<br><br>
-<tr><td> _(VM Name)_:</td><td>
-<label id="VMName"></label></td></tr>
-<tr><td>_(Snapshot Name)_:</td><td>
-<input type="text" id="targetsnap" autocomplete="off" spellcheck="false" value="--generate" onclick="this.select()">
-_(Check free space)_:
-<input type="checkbox" id="targetsnapfspc" checked></td></tr>
-<tr><td>_(Description  )_:</td><td>
-<input type="text" id="targetsnapdesc" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
-</table>
-</div>
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index cedca49eb..a0d51ddd0 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -154,14 +154,15 @@ table.share_status tbody tr.warn{color:#e68a00}
 table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0}
 table.share_status.table{margin-top:36px}
 table.share_status.table tr>td{width:50%}
-table.share_status.dashboard{margin:0;border:1px solid #606e7f}
-table.share_status.dashboard tbody{border:1px solid #606e7f}
-table.share_status.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
-table.share_status.dashboard tr:last-child>td{padding-bottom:20px}
-table.share_status.dashboard tr.last>td{padding-bottom:20px}
+table.share_status.dashboard{margin:0;border:none;background-color:#D7DBDD}
+table.share_status.dashboard tbody{border:none}
+table.share_status.dashboard tr:first-child td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
+table.share_status.dashboard tr:last-child td{padding-bottom:20px}
+table.share_status.dashboard tr.last td{padding-bottom:20px}
 table.share_status.dashboard tr.header td{padding-bottom:10px;color:#9794a0}
 table.share_status.dashboard tr{border:none}
-table.share_status.dashboard td{line-height:normal;padding:3px 10px}
+table.share_status.dashboard td{line-height:normal;padding:3px 10px;border:none!important}
+table.share_status.dashboard td.stopgap{height:10px!important;line-height:10px!important;padding:0!important;background-color:#e4e2e4}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
@@ -171,6 +172,7 @@ table.share_status.dashboard td span.load{display:inline-block;width:38px;text-a
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
 table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;background-color:rgba(0,0,0,0.1);padding:2px}
 table.share_status.dashboard .usage-disk.sys{height:auto}
+.dashboard-sortable{background-color:#e4e2e4}
 tr.alert{color:#f0000c;background-color:#ff9e9e}
 tr.warn{color:#e68a00;background-color:#feefb3}
 tr.past{color:#d63301;background-color:#ffddd1}
@@ -197,7 +199,7 @@ span.small{font-size:1.1rem}
 span.score{font-size:1.1rem;color:#ffffff;position:absolute}
 span#dropbox{background:none;line-height:6rem;margin-right:20px}
 span.outer{margin-bottom:20px;margin-right:0}
-span.outer.solid{background-color:#e4e2e4}
+span.outer.solid{background-color:#D7DBDD}
 span.hand{cursor:pointer}
 span.outer.started>img,span.outer.started>i.img{opacity:1.0}
 span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index 5f680bdbe..eafa6e203 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -154,14 +154,15 @@ table.share_status tbody tr.warn{color:#e68a00}
 table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0}
 table.share_status.table{margin-top:36px}
 table.share_status.table tr>td{width:50%}
-table.share_status.dashboard{margin:0;border:1px solid #2b2b2b}
-table.share_status.dashboard tbody{border:1px solid #2b2b2b}
-table.share_status.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
+table.share_status.dashboard{margin:0;border:none;background-color:#262626}
+table.share_status.dashboard tbody{border:none}
+table.share_status.dashboard tr:first-child td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
 table.share_status.dashboard tr:nth-child(even){background-color:transparent}
-table.share_status.dashboard tr:last-child>td{padding-bottom:20px}
-table.share_status.dashboard tr.last>td{padding-bottom:20px}
+table.share_status.dashboard tr:last-child td{padding-bottom:20px}
+table.share_status.dashboard tr.last td{padding-bottom:20px}
 table.share_status.dashboard tr.header td{padding-bottom:10px}
 table.share_status.dashboard td{padding:3px 10px}
+table.share_status.dashboard td.stopgap{height:10px!important;line-height:10px!important;padding:0!important;background-color:#1c1b1b}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
@@ -170,6 +171,7 @@ table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
 table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;background-color:rgba(255,255,255,0.1);padding:2px}
+.dashboard-sortable{background-color:#1c1b1b}
 [name=arrayOps]{margin-top:12px}
 span.error{color:#f0000c;background-color:#ff9e9e;display:block;width:100%}
 span.warn{color:#e68a00;background-color:#feefb3;display:block;width:100%}
@@ -190,7 +192,7 @@ span.strong{font-weight:bold}
 span.big{font-size:1.4rem}
 span.small{font-size:1.2rem}
 span.outer{margin-bottom:20px;margin-right:0}
-span.outer.solid{background-color:#191818}
+span.outer.solid{background-color:#262626}
 span.hand{cursor:pointer}
 span.outer.started>img,span.outer.started>i.img{opacity:1.0}
 span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index 7483f0b05..3beb543df 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -154,14 +154,15 @@ table.share_status tbody tr.warn{color:#e68a00}
 table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0}
 table.share_status.table{margin-top:36px}
 table.share_status.table tr>td{width:50%}
-table.share_status.dashboard{margin:0;border:1px solid #606e7f}
-table.share_status.dashboard tbody{border:1px solid #606e7f}
-table.share_status.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
-table.share_status.dashboard tr:last-child>td{padding-bottom:20px}
-table.share_status.dashboard tr.last>td{padding-bottom:20px}
-table.share_status.dashboard tr{border:none}
+table.share_status.dashboard{margin:0;border:none;background-color:#212F3D}
+table.share_status.dashboard tbody{border:none}
+table.share_status.dashboard tr:first-child td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
+table.share_status.dashboard tr:last-child td{padding-bottom:20px}
+table.share_status.dashboard tr.last td{padding-bottom:20px}
 table.share_status.dashboard tr.header td{padding-bottom:10px;color:#82857e}
-table.share_status.dashboard td{line-height:normal;padding:3px 10px}
+table.share_status.dashboard tr{border:none}
+table.share_status.dashboard td{line-height:normal;padding:3px 10px;border:none!important}
+table.share_status.dashboard td.stopgap{height:10px!important;line-height:10px!important;padding:0!important;background-color:#1b1d1b}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
@@ -171,6 +172,7 @@ table.share_status.dashboard td span.load{display:inline-block;width:38px;text-a
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
 table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;background-color:rgba(255,255,255,0.1);padding:2px}
 table.share_status.dashboard .usage-disk.sys{height:auto}
+.dashboard-sortable{background-color:#1b1d1b}
 tr.alert{color:#f0000c;background-color:#ff9e9e}
 tr.warn{color:#e68a00;background-color:#feefb3}
 tr.past{color:#d63301;background-color:#ffddd1}
@@ -196,7 +198,7 @@ span.big{font-size:1.4rem}
 span.small{font-size:1.1rem}
 span#dropbox{background:none;line-height:6rem;margin-right:20px}
 span.outer{margin-bottom:20px;margin-right:0}
-span.outer.solid{background-color:#1b1d1b}
+span.outer.solid{background-color:#212F3D}
 span.hand{cursor:pointer}
 span.outer.started>img,span.outer.started>i.img{opacity:1.0}
 span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index c9d12bf21..62ccaaabb 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -154,14 +154,15 @@ table.share_status tbody tr.warn{color:#e68a00}
 table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0}
 table.share_status.table{margin-top:36px}
 table.share_status.table tr>td{width:50%}
-table.share_status.dashboard{margin:0;border:1px solid #e3e3e3}
-table.share_status.dashboard tbody{border:1px solid #e3e3e3}
-table.share_status.dashboard tr:first-child>td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
+table.share_status.dashboard{margin:0;border:none;background-color:#F7F9F9}
+table.share_status.dashboard tbody{border:none}
+table.share_status.dashboard tr:first-child td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
 table.share_status.dashboard tr:nth-child(even){background-color:transparent}
-table.share_status.dashboard tr:last-child>td{padding-bottom:20px}
-table.share_status.dashboard tr.last>td{padding-bottom:20px}
+table.share_status.dashboard tr:last-child td{padding-bottom:20px}
+table.share_status.dashboard tr.last td{padding-bottom:20px}
 table.share_status.dashboard tr.header td{padding-bottom:10px}
 table.share_status.dashboard td{padding:3px 10px}
+table.share_status.dashboard td.stopgap{height:10px!important;line-height:10px!important;padding:0!important;background-color:#f2f2f2}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
@@ -170,6 +171,7 @@ table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
 table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;background-color:rgba(0,0,0,0.1);padding:2px}
+.dashboard-sortable{background-color:#f2f2f2}
 [name=arrayOps]{margin-top:12px}
 span.error{color:#f0000c;background-color:#ff9e9e;display:block;width:100%}
 span.warn{color:#e68a00;background-color:#feefb3;display:block;width:100%}
@@ -190,7 +192,7 @@ span.strong{font-weight:bold}
 span.big{font-size:1.4rem}
 span.small{font-size:1.2rem}
 span.outer{margin-bottom:20px;margin-right:0}
-span.outer.solid{background-color:#f5f5f5}
+span.outer.solid{background-color:#F7F9F9}
 span.hand{cursor:pointer}
 span.outer.started>img,span.outer.started>i.img{opacity:1.0}
 span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}

From 4068b85470a5c4d611196a126040d3e73248aa80 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 12 Oct 2023 18:12:10 +0200
Subject: [PATCH 006/266] dashboard: display separate tiles without borders

---
 emhttp/plugins/dynamix/DashStats.page | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index a3f856317..aa31e3eae 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -678,9 +678,11 @@ function hideShow() {
     var id = tbody.parent().prop('id');
     if ($(this).prop('checked')) {
       tbody.show();
+      tbody.prev().show();
       count[id]++;
     } else {
       tbody.hide();
+      tbody.prev().hide();
       inactive.push(sort[n]);
     }
     n++;
@@ -1271,6 +1273,7 @@ function showContent() {
       var id = tbody.parent().prop('id');
       count[id]--;
       tbody.hide();
+      tbody.prev().hide();
     }
   }
   var hidden = $.cookie('hidden_content');
@@ -1332,6 +1335,7 @@ function dismiss(button) {
   var tile = table.parent();
   var inactive = $.cookie('inactive_content');
   tbody.hide();
+  tbody.prev().hide();
   if (table.find('tbody:visible').length>0) tile.show(); else tile.hide();
   inactive = inactive==null ? [] : inactive.split(';');
   inactive.push(tbody.attr('sort'));
@@ -1400,7 +1404,14 @@ function LockButton() {
     receive:function(e,ui){
       var table = ui.sender, index = [];
       var tile = table.parent();
-      if (table.find('tbody:visible').length > 0) tile.show(); else tile.hide();
+      var gap = ui.item.prev();
+      if (table.find('tbody:visible').length > 0) {
+        tile.show();
+        gap.show();
+      } else {
+        tile.hide();
+        gap.hide();
+      }
       table.find('tbody').each(function(){index.push($(this).attr('sort'));});
       $.cookie(table.prop('id'),index.join(';'),{expires:3650});
     },

From 093d754b74df29102d188566eae94413366e294e Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Thu, 12 Oct 2023 20:27:37 +0100
Subject: [PATCH 007/266] Create VM autostart disable option

---
 emhttp/languages/en_US/helptext.txt               | 4 ++++
 emhttp/plugins/dynamix.vm.manager/VMSettings.page | 8 ++++++++
 sbin/qemu                                         | 6 +++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/emhttp/languages/en_US/helptext.txt b/emhttp/languages/en_US/helptext.txt
index 5d437b799..1689681ed 100644
--- a/emhttp/languages/en_US/helptext.txt
+++ b/emhttp/languages/en_US/helptext.txt
@@ -1581,6 +1581,10 @@ Make sure any newly entered values represent the selected temperature unit.
 Stopping the VM Manager will first attempt to shutdown all running VMs. After 60 seconds, any remaining VM instances will be terminated.
 :end
 
+:vms_disable_help:
+Stop VMs from Autostarting when VM Manager starts.
+:end
+
 :vms_libvirt_volume_help:
 This is the libvirt volume.
 :end
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index b7ca08f24..1693a06fe 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -99,6 +99,14 @@ _(Enable VMs)_:
 
 :vms_enable_help:
 
+_(Disable Autostart VMs)_:
+: <select id="DISABLE" name="DISABLE">
+  <?= mk_option(htmlspecialchars($domain_cfg['DISABLE']), 'no', _('No'))?>
+  <?= mk_option(htmlspecialchars($domain_cfg['DISABLE']), 'yes', _('Yes'))?>
+  </select>
+
+:vms_disable_help:
+
 <?if ($hardware):?>
 <div class="advanced" markdown="1">
 <?if ($libvirt_up):?>
diff --git a/sbin/qemu b/sbin/qemu
index 16d959464..467394cda 100755
--- a/sbin/qemu
+++ b/sbin/qemu
@@ -1,3 +1,7 @@
 #!/bin/bash
-
+source /boot/config/domain.cfg
+if [ $DISABLE == "yes" ]
+    then 
+    exit ;
+fi 
 eval exec /usr/bin/qemu-system-x86_64 $(/usr/local/emhttp/plugins/dynamix.vm.manager/scripts/qemu.php "$@")
\ No newline at end of file

From 90a2ced901c0bf8fd19468d4396b5f8ce2811230 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 12 Oct 2023 23:20:06 +0200
Subject: [PATCH 008/266] Improve Dashboard tiles when hidden

---
 emhttp/plugins/dynamix/DashStats.page | 45 +++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index aa31e3eae..ee8522523 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -183,6 +183,9 @@ div.leftside{float:left;width:66%}
 div.rightside{float:right;margin:0;text-align:center}
 div[id$=chart]{margin:-12px 8px -24px -18px}
 div.template,div#dialogWindow,input#upload{display:none}
+span.head_info{display:inline-block;width:240px}
+span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms{display:none;margin-left:0}
+span.head_bar{display:inline-block;width:200px}
 span.green,span.red,span.orange{padding-left:0}
 span.ctrl{float:right;margin-top:0;margin-right:10px}
 span.ctrl span{font-size:2rem!important}
@@ -287,7 +290,9 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 </tbody>
 
 <tbody title="_(Processor Information)_" data="toggleCPU(true)">
-<tr><td><i class='icon-cpu f32'></i><div class='section'>_(Processor)_<br><span id='cpu-temp'></span><br></div>
+<tr><td><i class='icon-cpu f32'></i><div class='section'>_(Processor)_<br>
+<span class="head_info"><span id='cpu-temp'></span></span>
+<span id="head_cpu">_(Load)_:<span class="head_bar"><span class='cpu load'>0%</span><div class='usage-disk sys'><span id='_cpu_'></span><span></span></div></span></span><br></div>
 <a href='/Dashboard/Settings/CPUset' title="_(Go to CPU pinning settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
 <tr><td><?=$cpumodel?></td></tr>
@@ -315,7 +320,9 @@ foreach ($cpus as $pair) {
 </tbody>
 
 <tbody title="_(Memory Utilization)_">
-<tr><td><i class='icon-ram f32'></i><div class='section'>_(System)_<br><span><i class='ups fa fa-line-chart'></i>_(Memory)_: <?="$memory_installed $unit $memory_type $ecc"?></span><br></div>
+<tr><td><i class='icon-ram f32'></i><div class='section'>_(System)_<br>
+<span class="head_info"><span><i class='ups fa fa-line-chart'></i>_(Memory)_: <?="$memory_installed $unit $memory_type $ecc"?></span></span>
+<span id="head_ram">_(RAM)_:<span class="head_bar"><span class='sys0 load fixed'>0%</span><div class='usage-disk sys'><span id='_sys0_'></span><span></span></div></span></span><br></div>
 <a href='/Dashboard/Tools/Processes' title="_(View Running Processes)_"><i class='fa fa-fw fa-info-circle control'></i></a>
 </td></tr>
 <tr><td><span class='w36'><i class='ups fa fa-compress'></i>_(Usable size)_: <?=my_scale($total,$unit,1,null,1024)." $unit"?></span><i class='ups fa fa-expand'></i>_(Maximum size)_: <?="$memory_maximum $unit"?><?=$low?'*':''?></td></tr>
@@ -393,7 +400,8 @@ foreach ($ports as $port) {
 <?if ($apcupsd):?>
 <tbody title="_(Power Status)_">
 <tr><td><i class='icon-ups f32'></i><div class='section'>_(Power)_<br>
-<span><i class='ups fa fa-bar-chart'></i>_(UPS Model)_: </span><span id='ups_model'></span><br></div>
+<span class="head_info"><span><i class='ups fa fa-bar-chart'></i>_(UPS Model)_: </span><span id='ups_model'></span></span>
+<span id="head_ups"><span style="padding-right:12px">_(UPS Load)_:</span><span id='_ups_loadpct_'></span></span><br></div>
 <a href='/Dashboard/Settings/UPSsettings' title="_(Go to UPS settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
 <tr><td><span class='w36'><i class='ups fa fa-fw fa-plug'></i>_(UPS status)_:</span><span id='ups_status'></span></td></tr>
@@ -449,7 +457,8 @@ echo "</td></tr>";
 <?if ($dockerd && ($display['dashapps']=='icons' || $display['dashapps']=='docker')):?>
 <tbody id='docker_view' title="_(Docker Containers)_" data="noApps()">
 <tr><td><i class='icon-docker f32'></i><div class='section'>_(Docker Containers)_<br>
-<span class='apps'><input type='checkbox' id='apps'></span><br></div>
+<span id="tile_apps"><span class='apps'><input type='checkbox' id='apps'></span></span>
+<span id="head_apps"></span><br></div>
 <a href='/Dashboard/Settings/DockerSettings' title="_(Go to Docker settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
 </tbody>
@@ -457,7 +466,8 @@ echo "</td></tr>";
 <?if ($libvirtd && ($display['dashapps']=='icons' || $display['dashapps']=='vms')):?>
 <tbody id='vm_view' title="_(Virtual Machines)_" data="noVMs()">
 <tr><td><i class='icon-virtualization f32'></i><div class='section'>_(Virtual Machines)_<br>
-<span class='vms'><input type='checkbox' id='vms'></span><br></div>
+<span id="tile_vms"><span class='vms'><input type='checkbox' id='vms'></span></span>
+<span id="head_vms"></span><br></div>
 <a href='/Dashboard/Settings/VMSettings' title="_(Go to VM settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
 </tbody>
@@ -778,9 +788,19 @@ jQuery.prototype.hideMe = function() {
 jQuery.prototype.mixedView = function(s) {
   if (s==0) {
     this.find('tr:gt(0)').hide();
+    this.find('span[id^="head_"]').show();
+    this.find('span[id^="tile_"]').hide();
+    this.find('span#_cpu_').prop('id','cpu');
+    this.find('span#_sys0_').prop('id','sys0');
+    this.find('span#_ups_loadpct_').prop('id','ups_loadpct');
     return;
   }
   this.find('tr:gt(0)').show();
+  this.find('span#cpu:first').prop('id','_cpu_');
+  this.find('span#sys0:first').prop('id','_sys0_');
+  this.find('span#ups_loadpct:first').prop('id','_ups_loadpct_');
+  this.find('span[id^="head_"]').hide();
+  this.find('span[id^="tile_"]').show();
   if (this.attr('data')) {
     setTimeout(this.attr('data'));
   }
@@ -998,6 +1018,14 @@ function loadlist(init) {
     $('#docker_view').append(data[0]).hideMe();
     $('#vm_view tr.updated').remove();
     $('#vm_view').append(data[1]).hideMe();
+    var started_apps = $('#docker_view').find('span.outer.apps.started').length;
+    var stopped_apps = $('#docker_view').find('span.outer.apps.stopped').length;
+    var paused_apps  = $('#docker_view').find('span.outer.apps.paused').length;
+    var started_vms  = $('#vm_view').find('span.outer.vms.started').length;
+    var stopped_vms  = $('#vm_view').find('span.outer.vms.stopped').length;
+    var paused_vms   = $('#vm_view').find('span.outer.vms.paused').length;
+    $('#head_apps').html("_(Containers)_ -- _(Started)_: "+started_apps+", _(Stopped)_: "+stopped_apps+", _(Paused)_: "+paused_apps);
+    $('#head_vms').html("_(VMs)_ -- _(Started)_: "+started_vms+", _(Stopped)_: "+stopped_vms+", _(Paused)_: "+paused_vms);
     if ($.cookie('my_apps')!=null) $('span.apps.stopped').hide(0,noApps());
     if ($.cookie('my_vms')!=null) $('span.vms.stopped').hide(0,noVMs());
   });
@@ -1253,7 +1281,7 @@ function addProperties() {
     $(this).find('td:first').prepend("<i class='fa fa-fw fa-close control tile' onclick='dismiss($(this))' title=\"_(Close Tile)_\"></i>");
   });
   $('div.frame tr').attr('title','');
-  $('tr#var0').hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:0},function(val){$('.sys0').text(val);})});
+  $('tr#var0').hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:0},function(val){$('.sys0').not('.fixed').text(val);})});
 <?if ($zfs):?>
   $('tr#var1').show().hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:1},function(val){$('.sys1').text(val);})});
 <?endif;?>
@@ -1283,6 +1311,11 @@ function showContent() {
       var tbody = $('div.frame tbody[sort="'+md5+'"]');
       tbody.find('.openclose').removeClass('fa-chevron-up fa-chevron-down').addClass('fa-chevron-down');
       tbody.find('tr:gt(0)').hide();
+      tbody.find('span[id^="head_"]').show();
+      tbody.find('span[id^="tile_"]').hide();
+      tbody.find('span#_cpu_').prop('id','cpu');
+      tbody.find('span#_sys0_').prop('id','sys0');
+      tbody.find('span#_ups_loadpct_').prop('id','ups_loadpct');
     }
   }
   if (count['db-box1']>0) $('div#tile1').show();

From 9b0fbf1256a787598281c4b75f660c09c3efe9bc Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 12 Oct 2023 23:42:43 +0200
Subject: [PATCH 009/266] Improve Dashboard tiles when hidden

---
 emhttp/plugins/dynamix/DashStats.page | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index ee8522523..bdccdd516 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -183,7 +183,7 @@ div.leftside{float:left;width:66%}
 div.rightside{float:right;margin:0;text-align:center}
 div[id$=chart]{margin:-12px 8px -24px -18px}
 div.template,div#dialogWindow,input#upload{display:none}
-span.head_info{display:inline-block;width:240px}
+span.head_info{width:240px;display:inline-block}
 span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms{display:none;margin-left:0}
 span.head_bar{display:inline-block;width:200px}
 span.green,span.red,span.orange{padding-left:0}
@@ -334,14 +334,13 @@ foreach ($cpus as $pair) {
 </tbody>
 
 <tbody title="_(Interface Information)_" class="mixed">
-<tr><td><i class='icon-ethernet f32'></i><div class='section'>_(Interface)_<br>
-<span><span class='dense'><i class='ups fa fa-angle-double-down'></i>_(Inbound)_: <span id='inbound'>---</span></span><span class='dense'><i class='ups fa fa-angle-double-up'></i>_(Outbound)_: <span id='outbound'>---</span></span>
-<i class='ups fa fa-angle-right'></i><select name="port_select" onchange="portSelect(this.value)">
+<tr><td><i class='icon-ethernet f32'></i><div class='section'>_(Interface)_
+<span style="padding-left:20px"><i class='ups fa fa-angle-right'></i><select name="port_select" onchange="portSelect(this.value)">
 <?foreach ($ports as $port):?>
 <?=mk_option("",$port,_($port))?>
 <?endforeach;?>
-</select></span>
-<br></div>
+</select></span><br>
+<span class='head_info'><i class='ups fa fa-angle-double-down'></i>_(Inbound)_: <span id='inbound'>---</span></span><span><i class='ups fa fa-angle-double-up'></i>_(Outbound)_: <span id='outbound'>---</span></span><br></div>
 <a href='/Dashboard/Settings/NetworkSettings' title="_(Go to network settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
 <tr><td><span class='w26'><select name="enter_view" onchange="changeView(this.value)">
@@ -383,7 +382,7 @@ foreach ($ports as $port) {
 
 <?if ($wireguard):?>
 <tbody title="_(VPN Connections)_">
-<tr><td><i class='icon-vpn f32'></i><div class='section'>_(VPN)_<br><span><span class='dense'><i class='ups fa fa-play-circle'></i>_(Active tunnels)_: <span id='vpn-active'><?=$up?></span></span><i class='ups fa fa-pause-circle'></i>_(Inactive tunnels)_: <span id='vpn-inactive'><?=$down?></span></span><br></div>
+<tr><td><i class='icon-vpn f32'></i><div class='section'>_(VPN)_<br><span><span class='head_info'><i class='ups fa fa-play-circle'></i>_(Active tunnels)_: <span id='vpn-active'><?=$up?></span></span><i class='ups fa fa-pause-circle'></i>_(Inactive tunnels)_: <span id='vpn-inactive'><?=$down?></span></span><br></div>
 <a href='/Settings/VPNmanager' title="_(Go to VPN settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
 <?foreach ($conf as $wg):?>

From 3463bf852127c5047c0a4bf4c16164ebf2928148 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 00:07:52 +0200
Subject: [PATCH 010/266] Improve Dashboard tiles when hidden 90a2ced9

---
 emhttp/plugins/dynamix/DashStats.page | 1 -
 1 file changed, 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index bdccdd516..307177254 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -201,7 +201,6 @@ span.wg1{font-size:1.1rem;text-indent:24px}
 span.wg2{font-size:1.1rem}
 span[id^=cpu],span[id^=sys]{width:0}
 span[class^="fa "]{font-size:1.6rem;margin-right:18px}
-span.load{font-size:85%}
 span.fan{width:36%;display:inline-block}
 span.w18{width:18%;display:inline-block;float:left}
 span.w26{width:26%;display:inline-block;float:left}

From 93b1f0d91571a6b06712091924f76ff7ed4feaf5 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 10:07:20 +0200
Subject: [PATCH 011/266] Dashboard: fix font-size in processor and system bars

---
 emhttp/plugins/dynamix/DashStats.page | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 307177254..cc6320484 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -201,6 +201,7 @@ span.wg1{font-size:1.1rem;text-indent:24px}
 span.wg2{font-size:1.1rem}
 span[id^=cpu],span[id^=sys]{width:0}
 span[class^="fa "]{font-size:1.6rem;margin-right:18px}
+span.load.resize{font-size:1.1rem}
 span.fan{width:36%;display:inline-block}
 span.w18{width:18%;display:inline-block;float:left}
 span.w26{width:26%;display:inline-block;float:left}
@@ -295,7 +296,7 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 <a href='/Dashboard/Settings/CPUset' title="_(Go to CPU pinning settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
 <tr><td><?=$cpumodel?></td></tr>
-<tr><td><span class='w26'>_(Overall Load)_:</span><span class='w72'><span class='cpu load'>0%</span><div class='usage-disk sys'><span id='cpu'></span><span></span></div></span></td></tr>
+<tr><td><span class='w26'>_(Overall Load)_:</span><span class='w72'><span class='cpu load resize'>0%</span><div class='usage-disk sys'><span id='cpu'></span><span></span></div></span></td></tr>
 <tr id='cpu_main'><td><a onclick='toggleCPU()' title="_(Click to toggle details)_" class='cpu_close'>_(Show details)_</a><span id='chart-toggle'>
 <span><select id='cpuline' class='auto' title="_(Select time frame)_" onchange='changeCPUline(this.value)'>
 <?=mk_option("","10", _("10 s"));?>
@@ -309,9 +310,9 @@ foreach ($cpus as $pair) {
   [$cpu1, $cpu2] = my_preg_split('/[,-]/',$pair);
   echo "<tr class='cpu_open'>";
   if ($cpu2)
-    echo "<td><span class='w26'>CPU $cpu1 - HT $cpu2</span><span class='dashboard w36'><span class='cpu$cpu1 load'>0%</span><div class='usage-disk sys'><span id='cpu$cpu1'></span><span></span></div></span><span class='dashboard w36'><span class='cpu$cpu2 load'>0%</span><div class='usage-disk sys'><span id='cpu$cpu2'></span><span></span></div></span></td>";
+    echo "<td><span class='w26'>CPU $cpu1 - HT $cpu2</span><span class='dashboard w36'><span class='cpu$cpu1 load resize'>0%</span><div class='usage-disk sys'><span id='cpu$cpu1'></span><span></span></div></span><span class='dashboard w36'><span class='cpu$cpu2 load resize'>0%</span><div class='usage-disk sys'><span id='cpu$cpu2'></span><span></span></div></span></td>";
   else
-    echo "<td><span class='w26'>CPU $cpu1</span><span class='w72'><span class='cpu$cpu1 load'>0%</span><div class='usage-disk sys'><span id='cpu$cpu1'></span><span></span></div></span></td>";
+    echo "<td><span class='w26'>CPU $cpu1</span><span class='w72'><span class='cpu$cpu1 load resize'>0%</span><div class='usage-disk sys'><span id='cpu$cpu1'></span><span></span></div></span></td>";
   echo "</tr>";
 }
 ?>
@@ -321,15 +322,15 @@ foreach ($cpus as $pair) {
 <tbody title="_(Memory Utilization)_">
 <tr><td><i class='icon-ram f32'></i><div class='section'>_(System)_<br>
 <span class="head_info"><span><i class='ups fa fa-line-chart'></i>_(Memory)_: <?="$memory_installed $unit $memory_type $ecc"?></span></span>
-<span id="head_ram">_(RAM)_:<span class="head_bar"><span class='sys0 load fixed'>0%</span><div class='usage-disk sys'><span id='_sys0_'></span><span></span></div></span></span><br></div>
+<span id="head_ram">_(RAM)_:<span class="head_bar"><span class='sys0 load head'>0%</span><div class='usage-disk sys'><span id='_sys0_'></span><span></span></div></span></span><br></div>
 <a href='/Dashboard/Tools/Processes' title="_(View Running Processes)_"><i class='fa fa-fw fa-info-circle control'></i></a>
 </td></tr>
 <tr><td><span class='w36'><i class='ups fa fa-compress'></i>_(Usable size)_: <?=my_scale($total,$unit,1,null,1024)." $unit"?></span><i class='ups fa fa-expand'></i>_(Maximum size)_: <?="$memory_maximum $unit"?><?=$low?'*':''?></td></tr>
-<tr id='var0'><td><span class='w26'><i class='ups fa fa-fw fa-microchip'></i>_(RAM)_</span><span class='w72'><span class='sys0 load'>0%</span><div class='usage-disk sys'><span id='sys0'></span><span></span></div></span></td></tr>
-<tr id='var1'><td><span class='w26'><i class='ups fa fa-fw fa-shield'></i>_(ZFS)_</span><span class='w72'><span class='sys1 load'>0%</span><div class='usage-disk sys'><span id='sys1'></span><span></span></div></span></td></tr>
-<tr id='var2'><td><span class='w26'><i class='ups fa fa-fw fa-suitcase'></i>_(Flash)_</span><span class='w72'><span class='sys2 load'>0%</span><div class='usage-disk sys'><span id='sys2'></span><span></span></div></span></td></tr>
-<tr id='var3'><td><span class='w26'><i class='ups fa fa-fw fa-file-text'></i>_(Log)_</span><span class='w72'><span class='sys3 load'>0%</span><div class='usage-disk sys'><span id='sys3'></span><span></span></div></span></td></tr>
-<tr id='var4'><td><span class='w26'><i class='ups fa fa-fw fa-docker'></i>_(Docker)_</span><span class='w72'><span class='sys4 load'>0%</span><div class='usage-disk sys'><span id='sys4'></span><span></span></div></span></td></tr>
+<tr id='var0'><td><span class='w26'><i class='ups fa fa-fw fa-microchip'></i>_(RAM)_</span><span class='w72'><span class='sys0 load resize'>0%</span><div class='usage-disk sys'><span id='sys0'></span><span></span></div></span></td></tr>
+<tr id='var1'><td><span class='w26'><i class='ups fa fa-fw fa-shield'></i>_(ZFS)_</span><span class='w72'><span class='sys1 load resize'>0%</span><div class='usage-disk sys'><span id='sys1'></span><span></span></div></span></td></tr>
+<tr id='var2'><td><span class='w26'><i class='ups fa fa-fw fa-suitcase'></i>_(Flash)_</span><span class='w72'><span class='sys2 load resize'>0%</span><div class='usage-disk sys'><span id='sys2'></span><span></span></div></span></td></tr>
+<tr id='var3'><td><span class='w26'><i class='ups fa fa-fw fa-file-text'></i>_(Log)_</span><span class='w72'><span class='sys3 load resize'>0%</span><div class='usage-disk sys'><span id='sys3'></span><span></span></div></span></td></tr>
+<tr id='var4'><td><span class='w26'><i class='ups fa fa-fw fa-docker'></i>_(Docker)_</span><span class='w72'><span class='sys4 load resize'>0%</span><div class='usage-disk sys'><span id='sys4'></span><span></span></div></span></td></tr>
 </tbody>
 
 <tbody title="_(Interface Information)_" class="mixed">
@@ -1279,7 +1280,7 @@ function addProperties() {
     $(this).find('td:first').prepend("<i class='fa fa-fw fa-close control tile' onclick='dismiss($(this))' title=\"_(Close Tile)_\"></i>");
   });
   $('div.frame tr').attr('title','');
-  $('tr#var0').hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:0},function(val){$('.sys0').not('.fixed').text(val);})});
+  $('tr#var0').hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:0},function(val){$('.sys0').not('.head').text(val);})});
 <?if ($zfs):?>
   $('tr#var1').show().hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:1},function(val){$('.sys1').text(val);})});
 <?endif;?>

From 5e2dc9da2f37bf1d286755e4136396664cb4b8a3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 10:39:34 +0200
Subject: [PATCH 012/266] Dashboard: more enhancements

---
 emhttp/plugins/dynamix/DashStats.page | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index cc6320484..5ff62e272 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -186,6 +186,7 @@ div.template,div#dialogWindow,input#upload{display:none}
 span.head_info{width:240px;display:inline-block}
 span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms{display:none;margin-left:0}
 span.head_bar{display:inline-block;width:200px}
+span.head_gap{padding-left:20px}
 span.green,span.red,span.orange{padding-left:0}
 span.ctrl{float:right;margin-top:0;margin-right:10px}
 span.ctrl span{font-size:2rem!important}
@@ -209,7 +210,7 @@ span.w36{width:36%;display:inline-block;float:left}
 span.w44{width:44%;display:inline-block;float:left}
 span.w72{width:72%;display:inline-block;float:left}
 select#cpuline,select#netline{border:none;padding:0 12px 0 0}
-select[name=enter_share]{margin-top:0}
+select[name=enter_share],select[name=enter_user]{margin-top:0;float:none}
 img#mycase{width:auto;max-width:128px;height:auto;max-height:128px}
 i.heat{margin-left:8px}
 i.ups{margin-right:8px;font-size:1.4rem!important}
@@ -335,7 +336,7 @@ foreach ($cpus as $pair) {
 
 <tbody title="_(Interface Information)_" class="mixed">
 <tr><td><i class='icon-ethernet f32'></i><div class='section'>_(Interface)_
-<span style="padding-left:20px"><i class='ups fa fa-angle-right'></i><select name="port_select" onchange="portSelect(this.value)">
+<span class="head_gap"><i class='ups fa fa-angle-double-right'></i><select name="port_select" onchange="portSelect(this.value)">
 <?foreach ($ports as $port):?>
 <?=mk_option("",$port,_($port))?>
 <?endforeach;?>
@@ -398,9 +399,9 @@ foreach ($ports as $port) {
 
 <?if ($apcupsd):?>
 <tbody title="_(Power Status)_">
-<tr><td><i class='icon-ups f32'></i><div class='section'>_(Power)_<br>
+<tr><td><i class='icon-ups f32'></i><div class='section'>_(Power)_<span class='head_gap' id='_ups_status_'></span><br>
 <span class="head_info"><span><i class='ups fa fa-bar-chart'></i>_(UPS Model)_: </span><span id='ups_model'></span></span>
-<span id="head_ups"><span style="padding-right:12px">_(UPS Load)_:</span><span id='_ups_loadpct_'></span></span><br></div>
+<span id="head_ups"><span style="padding-right:12px">_(UPS Load)_:</span><span id='_ups_loadpct_'></span></span></span><br></div>
 <a href='/Dashboard/Settings/UPSsettings' title="_(Go to UPS settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
 <tr><td><span class='w36'><i class='ups fa fa-fw fa-plug'></i>_(UPS status)_:</span><span id='ups_status'></span></td></tr>
@@ -476,14 +477,14 @@ echo "</td></tr>";
 <tbody title="_(Shares Information)_"<?if ($group):?> class="mixed"<?endif;?>>
 <tr><td><i class='icon-folder f32'></i><div class='section'>_(Shares)_
 <?if ($group):?>
-<select name="enter_share" onchange="changeMode(this.value)">
+<span class="head_gap"><i class='ups fa fa-angle-double-right'></i><select name="enter_share" onchange="changeMode(this.value)">
 <?if (_var($var,'shareSMBEnabled')=='yes'):?>
 <?=mk_option("", "0", "SMB")?>
 <?endif;?>
 <?if (_var($var,'shareNFSEnabled')=='yes'):?>
 <?=mk_option("", "2", "NFS")?>
 <?endif;?>
-</select>
+</select></span>
 <?endif;?>
 <br><span>
 <?=sprintf(_("Share count: %s with %s cache only and %s encrypted"),count($shares),$cache_only,$encrypted)?>
@@ -534,14 +535,14 @@ if (!$group) {
 <tbody title="_(Users Information)_"<?if ($group):?> class="mixed"<?endif;?>>
 <tr><td><i class='icon-users f32'></i><div class='section'>_(Users)_
 <?if ($group):?>
-<select name="enter_user" class="unused">
+<span class="head_gap"><i class='ups fa fa-angle-double-right unused'></i><select name="enter_user" class="unused">
 <?if (_var($var,'shareSMBEnabled')=='yes'):?>
 <?=mk_option("", "0", "SMB")?>
 <?endif;?>
 <?if (_var($var,'shareNFSEnabled')=='yes'):?>
 <?=mk_option("", "2", "NFS")?>
 <?endif;?>
-</select>
+</select></span>
 <?endif;?>
 <br><span>
 <?=sprintf(_("User count: %s with %s unprotected"),count($users),$nopass)?>
@@ -792,12 +793,14 @@ jQuery.prototype.mixedView = function(s) {
     this.find('span#_cpu_').prop('id','cpu');
     this.find('span#_sys0_').prop('id','sys0');
     this.find('span#_ups_loadpct_').prop('id','ups_loadpct');
+    this.find('span#_ups_status_').prop('id','ups_status');
     return;
   }
   this.find('tr:gt(0)').show();
   this.find('span#cpu:first').prop('id','_cpu_');
   this.find('span#sys0:first').prop('id','_sys0_');
   this.find('span#ups_loadpct:first').prop('id','_ups_loadpct_');
+  this.find('span#ups_status:first').prop('id','_ups_status_');
   this.find('span[id^="head_"]').hide();
   this.find('span[id^="tile_"]').show();
   if (this.attr('data')) {
@@ -1315,6 +1318,7 @@ function showContent() {
       tbody.find('span#_cpu_').prop('id','cpu');
       tbody.find('span#_sys0_').prop('id','sys0');
       tbody.find('span#_ups_loadpct_').prop('id','ups_loadpct');
+      tbody.find('span#_ups_status_').prop('id','ups_status');
     }
   }
   if (count['db-box1']>0) $('div#tile1').show();

From 84b265cbe451adb6b68ce688300bef75a40540eb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 10:43:35 +0200
Subject: [PATCH 013/266] Dashboard: more enhancements

---
 emhttp/plugins/dynamix/DashStats.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 5ff62e272..7bf662916 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -186,7 +186,7 @@ div.template,div#dialogWindow,input#upload{display:none}
 span.head_info{width:240px;display:inline-block}
 span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms{display:none;margin-left:0}
 span.head_bar{display:inline-block;width:200px}
-span.head_gap{padding-left:20px}
+span.head_gap{padding-left:14px}
 span.green,span.red,span.orange{padding-left:0}
 span.ctrl{float:right;margin-top:0;margin-right:10px}
 span.ctrl span{font-size:2rem!important}
@@ -401,7 +401,7 @@ foreach ($ports as $port) {
 <tbody title="_(Power Status)_">
 <tr><td><i class='icon-ups f32'></i><div class='section'>_(Power)_<span class='head_gap' id='_ups_status_'></span><br>
 <span class="head_info"><span><i class='ups fa fa-bar-chart'></i>_(UPS Model)_: </span><span id='ups_model'></span></span>
-<span id="head_ups"><span style="padding-right:12px">_(UPS Load)_:</span><span id='_ups_loadpct_'></span></span></span><br></div>
+<span id="head_ups"><span>_(Load)_:</span><span class="head_gap" id='_ups_loadpct_'></span></span></span><br></div>
 <a href='/Dashboard/Settings/UPSsettings' title="_(Go to UPS settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
 <tr><td><span class='w36'><i class='ups fa fa-fw fa-plug'></i>_(UPS status)_:</span><span id='ups_status'></span></td></tr>

From 83cb6424488cd02f8ae1cde146f551794e3eee34 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 10:52:02 +0200
Subject: [PATCH 014/266] Dashboard: more enhancements

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

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 7bf662916..2f28692d8 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -184,7 +184,7 @@ div.rightside{float:right;margin:0;text-align:center}
 div[id$=chart]{margin:-12px 8px -24px -18px}
 div.template,div#dialogWindow,input#upload{display:none}
 span.head_info{width:240px;display:inline-block}
-span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms{display:none;margin-left:0}
+span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_{display:none;margin-left:0}
 span.head_bar{display:inline-block;width:200px}
 span.head_gap{padding-left:14px}
 span.green,span.red,span.orange{padding-left:0}

From 53626274335aa6b5252872986bc26eaa36492e62 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 11:26:27 +0200
Subject: [PATCH 015/266] Dashboard: reintroduce borders around tiles

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

diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index a0d51ddd0..5ba9452b6 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -154,8 +154,8 @@ table.share_status tbody tr.warn{color:#e68a00}
 table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0}
 table.share_status.table{margin-top:36px}
 table.share_status.table tr>td{width:50%}
-table.share_status.dashboard{margin:0;border:none;background-color:#D7DBDD}
-table.share_status.dashboard tbody{border:none}
+table.share_status.dashboard{margin:0;border:none;background-color:#d7dbdd}
+table.share_status.dashboard tbody{border:1px solid #cacfd2}
 table.share_status.dashboard tr:first-child td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
 table.share_status.dashboard tr:last-child td{padding-bottom:20px}
 table.share_status.dashboard tr.last td{padding-bottom:20px}
@@ -199,7 +199,7 @@ span.small{font-size:1.1rem}
 span.score{font-size:1.1rem;color:#ffffff;position:absolute}
 span#dropbox{background:none;line-height:6rem;margin-right:20px}
 span.outer{margin-bottom:20px;margin-right:0}
-span.outer.solid{background-color:#D7DBDD}
+span.outer.solid{background-color:#d7dbdd}
 span.hand{cursor:pointer}
 span.outer.started>img,span.outer.started>i.img{opacity:1.0}
 span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index eafa6e203..3bfcc5a86 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -155,7 +155,7 @@ table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:cen
 table.share_status.table{margin-top:36px}
 table.share_status.table tr>td{width:50%}
 table.share_status.dashboard{margin:0;border:none;background-color:#262626}
-table.share_status.dashboard tbody{border:none}
+table.share_status.dashboard tbody{border:1px solid #333333}
 table.share_status.dashboard tr:first-child td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
 table.share_status.dashboard tr:nth-child(even){background-color:transparent}
 table.share_status.dashboard tr:last-child td{padding-bottom:20px}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index 3beb543df..8ba06e5f1 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -154,8 +154,8 @@ table.share_status tbody tr.warn{color:#e68a00}
 table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0}
 table.share_status.table{margin-top:36px}
 table.share_status.table tr>td{width:50%}
-table.share_status.dashboard{margin:0;border:none;background-color:#212F3D}
-table.share_status.dashboard tbody{border:none}
+table.share_status.dashboard{margin:0;border:none;background-color:#212f3d}
+table.share_status.dashboard tbody{border:1px solid #566573}
 table.share_status.dashboard tr:first-child td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
 table.share_status.dashboard tr:last-child td{padding-bottom:20px}
 table.share_status.dashboard tr.last td{padding-bottom:20px}
@@ -198,7 +198,7 @@ span.big{font-size:1.4rem}
 span.small{font-size:1.1rem}
 span#dropbox{background:none;line-height:6rem;margin-right:20px}
 span.outer{margin-bottom:20px;margin-right:0}
-span.outer.solid{background-color:#212F3D}
+span.outer.solid{background-color:#212f3d}
 span.hand{cursor:pointer}
 span.outer.started>img,span.outer.started>i.img{opacity:1.0}
 span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index 62ccaaabb..65ee3afbc 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -155,7 +155,7 @@ table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:cen
 table.share_status.table{margin-top:36px}
 table.share_status.table tr>td{width:50%}
 table.share_status.dashboard{margin:0;border:none;background-color:#F7F9F9}
-table.share_status.dashboard tbody{border:none}
+table.share_status.dashboard tbody{border:1px solid #dfdfdf}
 table.share_status.dashboard tr:first-child td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
 table.share_status.dashboard tr:nth-child(even){background-color:transparent}
 table.share_status.dashboard tr:last-child td{padding-bottom:20px}

From 7ee1d71d13c318dbd150b2ebb904563237726011 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 12:06:02 +0200
Subject: [PATCH 016/266] Dashboard: more enhancements

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

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 2f28692d8..d92a95f05 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -185,7 +185,7 @@ div[id$=chart]{margin:-12px 8px -24px -18px}
 div.template,div#dialogWindow,input#upload{display:none}
 span.head_info{width:240px;display:inline-block}
 span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_{display:none;margin-left:0}
-span.head_bar{display:inline-block;width:200px}
+span.head_bar{display:inline-block;width:180px}
 span.head_gap{padding-left:14px}
 span.green,span.red,span.orange{padding-left:0}
 span.ctrl{float:right;margin-top:0;margin-right:10px}
diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index 5ba9452b6..d99702203 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;background-color:rgba(0,0,0,0.1);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#d7dbdd;background-color:rgba(0,0,0,0.4);padding:2px}
 table.share_status.dashboard .usage-disk.sys{height:auto}
 .dashboard-sortable{background-color:#e4e2e4}
 tr.alert{color:#f0000c;background-color:#ff9e9e}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index 3bfcc5a86..c60db1175 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;background-color:rgba(255,255,255,0.1);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#262626;background-color:rgba(255,255,255,0.4);padding:2px}
 .dashboard-sortable{background-color:#1c1b1b}
 [name=arrayOps]{margin-top:12px}
 span.error{color:#f0000c;background-color:#ff9e9e;display:block;width:100%}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index 8ba06e5f1..3e0b20cc1 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;background-color:rgba(255,255,255,0.1);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#212f3d;background-color:rgba(255,255,255,0.4);padding:2px}
 table.share_status.dashboard .usage-disk.sys{height:auto}
 .dashboard-sortable{background-color:#1b1d1b}
 tr.alert{color:#f0000c;background-color:#ff9e9e}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index 65ee3afbc..fe0c3fe3b 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -154,7 +154,7 @@ table.share_status tbody tr.warn{color:#e68a00}
 table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0}
 table.share_status.table{margin-top:36px}
 table.share_status.table tr>td{width:50%}
-table.share_status.dashboard{margin:0;border:none;background-color:#F7F9F9}
+table.share_status.dashboard{margin:0;border:none;background-color:#f7f9f9}
 table.share_status.dashboard tbody{border:1px solid #dfdfdf}
 table.share_status.dashboard tr:first-child td{height:3.6rem;padding-top:12px;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:none;vertical-align:top}
 table.share_status.dashboard tr:nth-child(even){background-color:transparent}
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;background-color:rgba(0,0,0,0.1);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#f7f9f9;background-color:rgba(0,0,0,0.4);padding:2px}
 .dashboard-sortable{background-color:#f2f2f2}
 [name=arrayOps]{margin-top:12px}
 span.error{color:#f0000c;background-color:#ff9e9e;display:block;width:100%}

From 540215bc5db3f242ede756f1101afcf265651cc9 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 12:13:17 +0200
Subject: [PATCH 017/266] Dashboard: more enhancements

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

diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index d99702203..82c3e49d5 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#d7dbdd;background-color:rgba(0,0,0,0.4);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#d7dbdd;background-color:rgba(0,0,0,0.3);padding:2px}
 table.share_status.dashboard .usage-disk.sys{height:auto}
 .dashboard-sortable{background-color:#e4e2e4}
 tr.alert{color:#f0000c;background-color:#ff9e9e}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index c60db1175..7b2060aee 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#262626;background-color:rgba(255,255,255,0.4);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#262626;background-color:rgba(255,255,255,0.3);padding:2px}
 .dashboard-sortable{background-color:#1c1b1b}
 [name=arrayOps]{margin-top:12px}
 span.error{color:#f0000c;background-color:#ff9e9e;display:block;width:100%}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index 3e0b20cc1..39eb3a0b5 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#212f3d;background-color:rgba(255,255,255,0.4);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#212f3d;background-color:rgba(255,255,255,0.3);padding:2px}
 table.share_status.dashboard .usage-disk.sys{height:auto}
 .dashboard-sortable{background-color:#1b1d1b}
 tr.alert{color:#f0000c;background-color:#ff9e9e}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index fe0c3fe3b..3acee9070 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#f7f9f9;background-color:rgba(0,0,0,0.4);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#f7f9f9;background-color:rgba(0,0,0,0.3);padding:2px}
 .dashboard-sortable{background-color:#f2f2f2}
 [name=arrayOps]{margin-top:12px}
 span.error{color:#f0000c;background-color:#ff9e9e;display:block;width:100%}

From 946a32fd9665ee09bca691acb2b2abb416ce72b5 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 12:24:00 +0200
Subject: [PATCH 018/266] Dashboard: more enhancements

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

diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index 82c3e49d5..dcb2b8d58 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#d7dbdd;background-color:rgba(0,0,0,0.3);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#d7dbdd;background-color:rgba(0,0,0,0.3);padding:2px;border-radius:5px}
 table.share_status.dashboard .usage-disk.sys{height:auto}
 .dashboard-sortable{background-color:#e4e2e4}
 tr.alert{color:#f0000c;background-color:#ff9e9e}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index 7b2060aee..48e7e5108 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#262626;background-color:rgba(255,255,255,0.3);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#262626;background-color:rgba(255,255,255,0.3);padding:2px;border-radius:5px}
 .dashboard-sortable{background-color:#1c1b1b}
 [name=arrayOps]{margin-top:12px}
 span.error{color:#f0000c;background-color:#ff9e9e;display:block;width:100%}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index 39eb3a0b5..df3e88596 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#212f3d;background-color:rgba(255,255,255,0.3);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#212f3d;background-color:rgba(255,255,255,0.3);padding:2px;border-radius:5px}
 table.share_status.dashboard .usage-disk.sys{height:auto}
 .dashboard-sortable{background-color:#1b1d1b}
 tr.alert{color:#f0000c;background-color:#ff9e9e}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index 3acee9070..a906442fc 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -170,7 +170,7 @@ table.share_status.dashboard td span.info{float:right;margin-right:20px;font-siz
 table.share_status.dashboard td span.info.title{font-weight:bold}
 table.share_status.dashboard td span.load{display:inline-block;width:38px;text-align:right}
 table.share_status.dashboard td span.finish{float:right;margin-right:24px}
-table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#f7f9f9;background-color:rgba(0,0,0,0.3);padding:2px}
+table.share_status.dashboard i.control{float:right;font-size:1.4rem!important;margin:0 3px 0 0;cursor:pointer;color:#f7f9f9;background-color:rgba(0,0,0,0.3);padding:2px;border-radius:5px}
 .dashboard-sortable{background-color:#f2f2f2}
 [name=arrayOps]{margin-top:12px}
 span.error{color:#f0000c;background-color:#ff9e9e;display:block;width:100%}

From debcacc1ba269d6a8a5ff92bd4cf1c3a1081ab0d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 12:33:33 +0200
Subject: [PATCH 019/266] Dashboard: more enhancements

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

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index d92a95f05..9f51656b4 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -183,7 +183,7 @@ div.leftside{float:left;width:66%}
 div.rightside{float:right;margin:0;text-align:center}
 div[id$=chart]{margin:-12px 8px -24px -18px}
 div.template,div#dialogWindow,input#upload{display:none}
-span.head_info{width:240px;display:inline-block}
+span.head_info{width:250px;display:inline-block}
 span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_{display:none;margin-left:0}
 span.head_bar{display:inline-block;width:180px}
 span.head_gap{padding-left:14px}

From e0ec6c1164dae739a2af4097324f0cf225e5e7b2 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 15:26:50 +0200
Subject: [PATCH 020/266] Dashboard: add current time display

---
 emhttp/plugins/dynamix/DashStats.page |  8 +++++
 emhttp/plugins/dynamix/nchan/update_3 | 45 ++++++++++++++++++++++++---
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 9f51656b4..30c0c994b 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -236,6 +236,9 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 .switch-button-background{margin-left:0;margin-top:4px}
 .switch-button-label{margin-top:3px}
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+#current_time{font-size:4rem;margin-left:5px}
+#current_date{font-size:1.3rem;margin-left:15px}
+span.ampm{font-size:2rem}
 </style>
 <script src="<?autov('/webGui/javascript/jquery.apexcharts.js')?>"></script>
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
@@ -262,6 +265,7 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 </td></tr>
 <tr><td>
 <div class='leftside'>
+<span id="current_time"></span><br><span id="current_date"></span><br><br>
 <span class='header'><i class='indent fa fa-file-text-o'></i>_(Model)_</span><br><i class='indent'></i><?=_var($var,'SYS_MODEL')?:'---'?><br><br>
 <span class='header'><i class='indent fa fa-id-badge'></i>_(Registration)_</span><br><i class='indent'></i>Unraid OS <b><em><?=_var($var,'regTy')?></em></b><br><br>
 <span class='header'><i class='indent fa fa-clock-o'></i>_(Uptime)_</span><br><i class='indent'></i><span class='uptime'></span>
@@ -1562,6 +1566,10 @@ dashboard.on('message',function(msg,meta) {
     $.each(part[1].split('\0'),function(k,v) {$('#main'+k).html(v);});
     $.each(part[2].split('\0'),function(k,v) {$('#port'+k).html(v);});
     $.each(part[3].split('\0'),function(k,v) {$('#link'+k).html(v);});
+    // current date and time
+    var timedate = part[4].split('\n');
+    $('#current_time').html(timedate[0]);
+    $('#current_date').html(timedate[1]);
     break;
   case 4:
     // wireguard tunnels
diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index c0bddc07e..948a26f3f 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -19,10 +19,30 @@ $data    = [];
 
 require_once "$docroot/webGui/include/Helpers.php";
 require_once "$docroot/webGui/include/publish.php";
+extract(parse_plugin_cfg('dynamix',true));
 
-// satisfy translations (not used)
-if (!function_exists('_')) {
-  function _($text) {return $text;}
+// add translations
+$_SERVER['REQUEST_URI'] = 'dashboard/main';
+$login_locale = _var($display,'locale');
+require_once "$docroot/webGui/include/Translations.php";
+
+function update_translation($locale) {
+  global $docroot,$language;
+  $language = [];
+  if ($locale) {
+    $text = "$docroot/languages/$locale/translations.txt";
+    if (file_exists($text)) {
+      $store = "$docroot/languages/$locale/translations.dot";
+      if (!file_exists($store)) file_put_contents($store,serialize(parse_lang_file($text)));
+      $language = unserialize(file_get_contents($store));
+    }
+    $text = "$docroot/languages/$locale/dashboard.txt";
+    if (file_exists($text)) {
+      $store = "$docroot/languages/$locale/dashboard.dot";
+      if (!file_exists($store)) file_put_contents($store,serialize(parse_lang_file($text)));
+      $language = array_merge($language,unserialize(file_get_contents($store)));
+    }
+  }
 }
 function ports() {
   global $net;
@@ -42,6 +62,12 @@ foreach (ports() as $port) {
 }
 // loop
 while (true) {
+  // check for language changes
+  extract(parse_plugin_cfg('dynamix',true));
+  if (_var($display,'locale') != $locale_init) {
+    $locale_init = _var($display,'locale');
+    update_translation($locale_init);
+  }
   $echo = $mode = $rxtx = $stat = [];
   $ts = $time - $time0;
   foreach (ports() as $port) {
@@ -89,8 +115,17 @@ while (true) {
     $tx_fifo   = port_get_contents("$net/$port/statistics/tx_fifo_errors");
     $stat[] = "Errors: {$rx_errors}<br>Drops: {$rx_drops}<br>Overruns: {$rx_fifo}\0Errors: {$tx_errors}<br>Drops: {$tx_drops}<br>Overruns: {$tx_fifo}";
   }
-
-  publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat));
+  // current date and time
+  $now = time();
+  if (_var($display,'time')=='%R') {
+    // 24 hour format
+    $clock = date('H:i',$now); $ampm = '';
+  } else {
+    // 12 hour format wih am/pm
+    $clock = date('h:i',$now); $ampm = '<span class="ampm">'.date('a',$now).'</span>';
+  }
+  $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0);
+  publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$timedate);
   $time0 = $time;
   sleep(1);
   $time = microtime(true);

From 64d161d09d0de9b33148f153b230c08fc76f9fcb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 15:33:22 +0200
Subject: [PATCH 021/266] Dashboard: more enhancements

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

diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index dcb2b8d58..ec6dbc23a 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -162,7 +162,7 @@ table.share_status.dashboard tr.last td{padding-bottom:20px}
 table.share_status.dashboard tr.header td{padding-bottom:10px;color:#9794a0}
 table.share_status.dashboard tr{border:none}
 table.share_status.dashboard td{line-height:normal;padding:3px 10px;border:none!important}
-table.share_status.dashboard td.stopgap{height:10px!important;line-height:10px!important;padding:0!important;background-color:#e4e2e4}
+table.share_status.dashboard td.stopgap{height:20px!important;line-height:20px!important;padding:0!important;background-color:#e4e2e4}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index 48e7e5108..5f2b87035 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -162,7 +162,7 @@ table.share_status.dashboard tr:last-child td{padding-bottom:20px}
 table.share_status.dashboard tr.last td{padding-bottom:20px}
 table.share_status.dashboard tr.header td{padding-bottom:10px}
 table.share_status.dashboard td{padding:3px 10px}
-table.share_status.dashboard td.stopgap{height:10px!important;line-height:10px!important;padding:0!important;background-color:#1c1b1b}
+table.share_status.dashboard td.stopgap{height:20px!important;line-height:20px!important;padding:0!important;background-color:#1c1b1b}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index df3e88596..099a70081 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -162,7 +162,7 @@ table.share_status.dashboard tr.last td{padding-bottom:20px}
 table.share_status.dashboard tr.header td{padding-bottom:10px;color:#82857e}
 table.share_status.dashboard tr{border:none}
 table.share_status.dashboard td{line-height:normal;padding:3px 10px;border:none!important}
-table.share_status.dashboard td.stopgap{height:10px!important;line-height:10px!important;padding:0!important;background-color:#1b1d1b}
+table.share_status.dashboard td.stopgap{height:20px!important;line-height:20px!important;padding:0!important;background-color:#1b1d1b}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index a906442fc..7759a9311 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -162,7 +162,7 @@ table.share_status.dashboard tr:last-child td{padding-bottom:20px}
 table.share_status.dashboard tr.last td{padding-bottom:20px}
 table.share_status.dashboard tr.header td{padding-bottom:10px}
 table.share_status.dashboard td{padding:3px 10px}
-table.share_status.dashboard td.stopgap{height:10px!important;line-height:10px!important;padding:0!important;background-color:#f2f2f2}
+table.share_status.dashboard td.stopgap{height:20px!important;line-height:20px!important;padding:0!important;background-color:#f2f2f2}
 table.share_status.dashboard td.vpn{font-size:1.1rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px}
 table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0;white-space:normal}

From a6d66e0a6506e1477c0afc9364fcd56da41a703e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 16:15:07 +0200
Subject: [PATCH 022/266] Dashboard: more enhancements

---
 emhttp/plugins/dynamix/DashStats.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 30c0c994b..35afb0afe 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -236,8 +236,8 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 .switch-button-background{margin-left:0;margin-top:4px}
 .switch-button-label{margin-top:3px}
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
-#current_time{font-size:4rem;margin-left:5px}
-#current_date{font-size:1.3rem;margin-left:15px}
+#current_time{font-size:4rem;margin-left:8px}
+#current_date{font-size:1.3rem;margin-left:18px}
 span.ampm{font-size:2rem}
 </style>
 <script src="<?autov('/webGui/javascript/jquery.apexcharts.js')?>"></script>

From 5bd4280e83e87ac4218aadde030c7d0420c56fd9 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 17:49:13 +0200
Subject: [PATCH 023/266] Prepare for automatic style sheet loading per page

This feature will be used in future development of the GUI
It allows pages to have their own style sheet settings stored in a related .css file
---
 emhttp/plugins/dynamix/include/DefaultPageLayout.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index fe0277879..e983ad8ca 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -738,6 +738,10 @@ foreach ($pages as $page) {
   // create list of nchan scripts to be started
   if (isset($page['Nchan'])) nchan_merge($page['root'], $page['Nchan']);
   annotate($page['file']);
+  // include page specific stylesheet (if existing)
+  $css = "/{$page['root']}/styles/".strtolower($page['name']).".css";
+  if (is_file($docroot.$css)) echo '<link type="text/css" rel="stylesheet" href="',autov($css),'">',"\n";
+  // create page content
   empty($page['Markdown']) || $page['Markdown']=='true' ? eval('?>'.Markdown(parse_text($page['text']))) : eval('?>'.parse_text($page['text']));
   if ($close) echo "</div></div>";
 }

From 48e8c5bb7383f896c97848135014451d7809963e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 17:59:06 +0200
Subject: [PATCH 024/266] Prepare for automatic style sheet loading per page

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

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index e983ad8ca..594e5f490 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -739,7 +739,7 @@ foreach ($pages as $page) {
   if (isset($page['Nchan'])) nchan_merge($page['root'], $page['Nchan']);
   annotate($page['file']);
   // include page specific stylesheet (if existing)
-  $css = "/{$page['root']}/styles/".strtolower($page['name']).".css";
+  $css = "/{$page['root']}/pages/".strtolower($page['name']).".css";
   if (is_file($docroot.$css)) echo '<link type="text/css" rel="stylesheet" href="',autov($css),'">',"\n";
   // create page content
   empty($page['Markdown']) || $page['Markdown']=='true' ? eval('?>'.Markdown(parse_text($page['text']))) : eval('?>'.parse_text($page['text']));

From 2ddceae4a3a9b07e278136ab132a655085ce70db Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 18:08:58 +0200
Subject: [PATCH 025/266] Prepare for automatic style sheet loading per page

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

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 594e5f490..0cdd4f4c3 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -739,7 +739,7 @@ foreach ($pages as $page) {
   if (isset($page['Nchan'])) nchan_merge($page['root'], $page['Nchan']);
   annotate($page['file']);
   // include page specific stylesheet (if existing)
-  $css = "/{$page['root']}/pages/".strtolower($page['name']).".css";
+  $css = "/{$page['root']}/pages/{$page['name']}.css";
   if (is_file($docroot.$css)) echo '<link type="text/css" rel="stylesheet" href="',autov($css),'">',"\n";
   // create page content
   empty($page['Markdown']) || $page['Markdown']=='true' ? eval('?>'.Markdown(parse_text($page['text']))) : eval('?>'.parse_text($page['text']));

From a162a40a46cc421869c8f52e235016c0d77fda86 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 18:47:02 +0200
Subject: [PATCH 026/266] rc.S.cont: fix regression error in timezone setting

---
 etc/rc.d/rc.S.cont | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/rc.d/rc.S.cont b/etc/rc.d/rc.S.cont
index b4ff449ff..46e3ddb9e 100755
--- a/etc/rc.d/rc.S.cont
+++ b/etc/rc.d/rc.S.cont
@@ -201,7 +201,7 @@ fi
 # LimeTech - restore hostname from ident.cfg file on flash and ensure hostname is
 # defined as localhost alias in /etc/hosts (this lets wins name resolution work)
 NAME="Tower"
-TIMEZONE="America/Los_Angeles"
+timeZone="America/Los_Angeles"
 if [[ -r /boot/config/ident.cfg ]]; then
   . <(/usr/bin/fromdos </boot/config/ident.cfg)
   NAME=${NAME//[^a-zA-Z\-\.0-9]/\-}
@@ -212,10 +212,10 @@ fi
 /bin/echo "54.149.176.35  keys.lime-technology.com" >>/etc/hosts
 
 # LimeTech - restore the configured timezone
-if [[ $TIMEZONE == custom ]]; then
+if [[ $timeZone == custom ]]; then
   /bin/ln -sf /boot/config/timezone /etc/localtime
 else
-  /bin/ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime
+  /bin/ln -sf /usr/share/zoneinfo/$timeZone /etc/localtime
 fi
 
 # LimeTech - restore password files stored on flash

From d06d2cb476efb77decebfdb36d41369a6b8ac555 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 18:51:22 +0200
Subject: [PATCH 027/266] Dashboard: Remove leading zero in time display

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

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 948a26f3f..2f09b8bc0 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -119,10 +119,10 @@ while (true) {
   $now = time();
   if (_var($display,'time')=='%R') {
     // 24 hour format
-    $clock = date('H:i',$now); $ampm = '';
+    $clock = date('G:i',$now); $ampm = '';
   } else {
     // 12 hour format wih am/pm
-    $clock = date('h:i',$now); $ampm = '<span class="ampm">'.date('a',$now).'</span>';
+    $clock = date('g:i',$now); $ampm = '<span class="ampm">'.date('a',$now).'</span>';
   }
   $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$timedate);

From c7216f18b2b4eee63e1d01a3ac8567fa646f8838 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 19:26:13 +0200
Subject: [PATCH 028/266] Dashboard: show time in header when collapsed

---
 emhttp/plugins/dynamix/DashStats.page | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 35afb0afe..fabe85ee4 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -183,8 +183,9 @@ div.leftside{float:left;width:66%}
 div.rightside{float:right;margin:0;text-align:center}
 div[id$=chart]{margin:-12px 8px -24px -18px}
 div.template,div#dialogWindow,input#upload{display:none}
+span.head_time{font-size:2rem!important;padding-left:80px}
 span.head_info{width:250px;display:inline-block}
-span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_{display:none;margin-left:0}
+span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_,#_current_time_{display:none;margin-left:0}
 span.head_bar{display:inline-block;width:180px}
 span.head_gap{padding-left:14px}
 span.green,span.red,span.orange{padding-left:0}
@@ -250,7 +251,7 @@ span.ampm{font-size:2rem}
 <div class='tile' id='tile1'>
 <table id='db-box1' class='share_status dashboard'>
 <tbody class='system'>
-<tr><td><i class='icon-performance f32'></i><div class='section'><?=_var($var,'NAME')?><br>
+<tr><td><i class='icon-performance f32'></i><div class='section'><?=_var($var,'NAME')?><span id="_current_time_" class="head_time"></span><br>
 <span><?=_var($var,'COMMENT')?></span><br></div>
 <a href='/Dashboard/Settings/Identification'><i class='fa fa-fw fa-cog control' title="_(Go to identification settings)_"></i></a><i class='fa fa-fw fa-wrench control tile' onclick='contentMgmt()' title="_(Tile Management)_"></i>
 <span class='ctrl'>
@@ -798,6 +799,7 @@ jQuery.prototype.mixedView = function(s) {
     this.find('span#_sys0_').prop('id','sys0');
     this.find('span#_ups_loadpct_').prop('id','ups_loadpct');
     this.find('span#_ups_status_').prop('id','ups_status');
+    this.find('span#_current_time_').prop('id','current_time');
     return;
   }
   this.find('tr:gt(0)').show();
@@ -805,6 +807,7 @@ jQuery.prototype.mixedView = function(s) {
   this.find('span#sys0:first').prop('id','_sys0_');
   this.find('span#ups_loadpct:first').prop('id','_ups_loadpct_');
   this.find('span#ups_status:first').prop('id','_ups_status_');
+  this.find('span#current_time:first').prop('id','_current_time_');
   this.find('span[id^="head_"]').hide();
   this.find('span[id^="tile_"]').show();
   if (this.attr('data')) {
@@ -1323,6 +1326,7 @@ function showContent() {
       tbody.find('span#_sys0_').prop('id','sys0');
       tbody.find('span#_ups_loadpct_').prop('id','ups_loadpct');
       tbody.find('span#_ups_status_').prop('id','ups_status');
+      tbody.find('span#_current_time_').prop('id','current_time');
     }
   }
   if (count['db-box1']>0) $('div#tile1').show();

From 0716ed2fe41dcb1da262dbee81e9651e10611ef0 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 13 Oct 2023 19:29:40 +0200
Subject: [PATCH 029/266] Revert "Dashboard: show time in header when
 collapsed"

This reverts commit c7216f18b2b4eee63e1d01a3ac8567fa646f8838.
---
 emhttp/plugins/dynamix/DashStats.page | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index fabe85ee4..35afb0afe 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -183,9 +183,8 @@ div.leftside{float:left;width:66%}
 div.rightside{float:right;margin:0;text-align:center}
 div[id$=chart]{margin:-12px 8px -24px -18px}
 div.template,div#dialogWindow,input#upload{display:none}
-span.head_time{font-size:2rem!important;padding-left:80px}
 span.head_info{width:250px;display:inline-block}
-span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_,#_current_time_{display:none;margin-left:0}
+span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_{display:none;margin-left:0}
 span.head_bar{display:inline-block;width:180px}
 span.head_gap{padding-left:14px}
 span.green,span.red,span.orange{padding-left:0}
@@ -251,7 +250,7 @@ span.ampm{font-size:2rem}
 <div class='tile' id='tile1'>
 <table id='db-box1' class='share_status dashboard'>
 <tbody class='system'>
-<tr><td><i class='icon-performance f32'></i><div class='section'><?=_var($var,'NAME')?><span id="_current_time_" class="head_time"></span><br>
+<tr><td><i class='icon-performance f32'></i><div class='section'><?=_var($var,'NAME')?><br>
 <span><?=_var($var,'COMMENT')?></span><br></div>
 <a href='/Dashboard/Settings/Identification'><i class='fa fa-fw fa-cog control' title="_(Go to identification settings)_"></i></a><i class='fa fa-fw fa-wrench control tile' onclick='contentMgmt()' title="_(Tile Management)_"></i>
 <span class='ctrl'>
@@ -799,7 +798,6 @@ jQuery.prototype.mixedView = function(s) {
     this.find('span#_sys0_').prop('id','sys0');
     this.find('span#_ups_loadpct_').prop('id','ups_loadpct');
     this.find('span#_ups_status_').prop('id','ups_status');
-    this.find('span#_current_time_').prop('id','current_time');
     return;
   }
   this.find('tr:gt(0)').show();
@@ -807,7 +805,6 @@ jQuery.prototype.mixedView = function(s) {
   this.find('span#sys0:first').prop('id','_sys0_');
   this.find('span#ups_loadpct:first').prop('id','_ups_loadpct_');
   this.find('span#ups_status:first').prop('id','_ups_status_');
-  this.find('span#current_time:first').prop('id','_current_time_');
   this.find('span[id^="head_"]').hide();
   this.find('span[id^="tile_"]').show();
   if (this.attr('data')) {
@@ -1326,7 +1323,6 @@ function showContent() {
       tbody.find('span#_sys0_').prop('id','sys0');
       tbody.find('span#_ups_loadpct_').prop('id','ups_loadpct');
       tbody.find('span#_ups_status_').prop('id','ups_status');
-      tbody.find('span#_current_time_').prop('id','current_time');
     }
   }
   if (count['db-box1']>0) $('div#tile1').show();

From 68a367bea7f57f19ac6db5c5e96348bfa4badeef Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 01:39:26 +0200
Subject: [PATCH 030/266] libvirt_helpers: fix PHP8 error

---
 emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 9575152c6..610f164f0 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -779,7 +779,7 @@ private static $encoding = 'UTF-8';
 					$boolBlacklisted = true;
 				}
 
-				$overrideCheck = "${arrMatch['typeid']}:${arrMatch['productid']}" ;
+				$overrideCheck = "{$arrMatch['typeid']}:{$arrMatch['productid']}" ;
 				if (in_array($overrideCheck,$arrWhiteListOverride) ) $boolBlacklisted = false;
 
 				$strClass = 'other';

From 21189acdb01c42174aaa58501f95feee56095227 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 01:42:46 +0200
Subject: [PATCH 031/266] Prepare for automatic style sheet loading per page

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

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 0cdd4f4c3..812c53311 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -738,9 +738,12 @@ foreach ($pages as $page) {
   // create list of nchan scripts to be started
   if (isset($page['Nchan'])) nchan_merge($page['root'], $page['Nchan']);
   annotate($page['file']);
-  // include page specific stylesheet (if existing)
-  $css = "/{$page['root']}/pages/{$page['name']}.css";
-  if (is_file($docroot.$css)) echo '<link type="text/css" rel="stylesheet" href="',autov($css),'">',"\n";
+  // include page specific stylesheets (if existing)
+  $css = "/{$page['root']}/sheets/{$page['name']}";
+  $css_stock = "$css.css";
+  $css_theme = "$css-$theme.css";
+  if (is_file($docroot.$css_stock)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_stock),'">',"\n";
+  if (is_file($docroot.$css_theme)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_theme),'">',"\n";
   // create page content
   empty($page['Markdown']) || $page['Markdown']=='true' ? eval('?>'.Markdown(parse_text($page['text']))) : eval('?>'.parse_text($page['text']));
   if ($close) echo "</div></div>";

From 90ad79e8466f9d0e71bb435118586844d221487d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 01:59:13 +0200
Subject: [PATCH 032/266] Browse: remove legacy check

---
 emhttp/plugins/dynamix/Browse.page | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/emhttp/plugins/dynamix/Browse.page b/emhttp/plugins/dynamix/Browse.page
index f5b0510cb..dfc3399ff 100644
--- a/emhttp/plugins/dynamix/Browse.page
+++ b/emhttp/plugins/dynamix/Browse.page
@@ -31,7 +31,6 @@ $dir     = htmlspecialchars(str_replace('\\','\\\\',$dir));
 $lock    = $root=='mnt' ? ($main ?: '---') : ($root=='boot' ? _('flash') : '---');
 $isshare = $root=='mnt' && (!$main || !$next || ($main=='rootshare' && !$rest));
 $editor  = '/boot/config/editor.cfg';
-$newos   = version_compare(parse_ini_file('/etc/unraid-version')['version'],'6.11.9','>');
 
 if (!file_exists($editor)) file_put_contents($editor,implode("\n",['','txt','js','php','page','plg','xml','old','bak','log','css']));
 ?>
@@ -50,13 +49,8 @@ tr.ace_optionsMenuEntry td input[type=number]::-webkit-inner-spin-button{-webkit
 tr.ace_optionsMenuEntry td input[type=number]{-moz-appearance:auto;margin:0}
 
 .loc{text-align:left!important;padding-left:0!important}
-<?if ($newos):?>
 .title{letter-spacing:1px}
 .title span.left{text-transform:none}
-<?else:?>
-#title{letter-spacing:1px}
-#title span.left{text-transform:none}
-<?endif;?>
 table.tablesorter.indexer{margin-top:0}
 table.tablesorter.indexer thead th:nth-child(1){width:12px;text-align:left;padding-left:11px}
 table.tablesorter.indexer thead th:nth-child(2){width:3%!important}

From 5ac608b43f60257ff4c35d5e9fc8ba5ab926008b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 10:14:25 +0200
Subject: [PATCH 033/266] rc scripts: insert short delay before checking
 running status

---
 etc/rc.d/rc.acpid         | 1 +
 etc/rc.d/rc.apcupsd       | 1 +
 etc/rc.d/rc.atd           | 1 +
 etc/rc.d/rc.avahidaemon   | 1 +
 etc/rc.d/rc.avahidnsconfd | 1 +
 etc/rc.d/rc.crond         | 1 +
 etc/rc.d/rc.dnsmasq       | 1 +
 etc/rc.d/rc.docker        | 1 +
 etc/rc.d/rc.elogind       | 1 +
 etc/rc.d/rc.inetd         | 1 +
 etc/rc.d/rc.mcelog        | 1 +
 etc/rc.d/rc.messagebus    | 1 +
 etc/rc.d/rc.nfsd          | 1 +
 etc/rc.d/rc.nginx         | 1 +
 etc/rc.d/rc.ntpd          | 1 +
 etc/rc.d/rc.rpc           | 1 +
 etc/rc.d/rc.rsyslogd      | 1 +
 etc/rc.d/rc.samba         | 1 +
 etc/rc.d/rc.sshd          | 1 +
 etc/rc.d/rc.wsdd2         | 1 +
 20 files changed, 20 insertions(+)

diff --git a/etc/rc.d/rc.acpid b/etc/rc.d/rc.acpid
index ae6316a14..bbc6f334f 100755
--- a/etc/rc.d/rc.acpid
+++ b/etc/rc.d/rc.acpid
@@ -13,6 +13,7 @@ DAEMON="ACPI power management daemon"
 . /etc/rc.d/rc.runlog
 
 acpid_running(){
+  sleep 0.1
   ps axc | grep -q ' acpid'
 }
 
diff --git a/etc/rc.d/rc.apcupsd b/etc/rc.d/rc.apcupsd
index 41cb3aead..60556310a 100755
--- a/etc/rc.d/rc.apcupsd
+++ b/etc/rc.d/rc.apcupsd
@@ -19,6 +19,7 @@ LOCK="/var/lock/apcupsd"
 . /etc/rc.d/rc.runlog
 
 apcupsd_running(){
+  sleep 0.1
   [[ -f $APCPID ]]
 }
 
diff --git a/etc/rc.d/rc.atd b/etc/rc.d/rc.atd
index c24fb5507..3ac3cf011 100755
--- a/etc/rc.d/rc.atd
+++ b/etc/rc.d/rc.atd
@@ -19,6 +19,7 @@ if [[ -r /etc/default/atd ]]; then
 fi
 
 atd_running(){
+  sleep 0.1
   pgrep --ns $$ --euid daemon -f "^$CROND" &>/dev/null
 }
 
diff --git a/etc/rc.d/rc.avahidaemon b/etc/rc.d/rc.avahidaemon
index 561996c07..e0a9e60aa 100755
--- a/etc/rc.d/rc.avahidaemon
+++ b/etc/rc.d/rc.avahidaemon
@@ -50,6 +50,7 @@ disable(){
 }
 
 avahid_running(){
+  sleep 0.1
   $AVAHI -c
   [[ $? == 0 ]]
 }
diff --git a/etc/rc.d/rc.avahidnsconfd b/etc/rc.d/rc.avahidnsconfd
index 88e186476..317e62c56 100755
--- a/etc/rc.d/rc.avahidnsconfd
+++ b/etc/rc.d/rc.avahidnsconfd
@@ -29,6 +29,7 @@ AVAHI="/usr/sbin/avahi-dnsconfd"
 . /etc/rc.d/rc.runlog
 
 avahidns_running(){
+  sleep 0.1
   $AVAHI -c
   [[ $? == 0 ]]
 }
diff --git a/etc/rc.d/rc.crond b/etc/rc.d/rc.crond
index 4dcf6c933..c816487b4 100755
--- a/etc/rc.d/rc.crond
+++ b/etc/rc.d/rc.crond
@@ -18,6 +18,7 @@ CROND="/usr/sbin/crond"
 [[ -r $CONF ]] && . $CONF
 
 crond_running(){
+  sleep 0.1
   pgrep --ns $$ --euid root -f "^$CROND" &>/dev/null
 }
 
diff --git a/etc/rc.d/rc.dnsmasq b/etc/rc.d/rc.dnsmasq
index f19bb3fed..1274cd831 100755
--- a/etc/rc.d/rc.dnsmasq
+++ b/etc/rc.d/rc.dnsmasq
@@ -14,6 +14,7 @@ PIDFILE="/var/run/dnsmasq.pid"
 . /etc/rc.d/rc.runlog
 
 dnsmasq_running(){
+  sleep 0.1
   pgrep -l -F $PIDFILE 2>/dev/null | grep -q dnsmasq
 }
 
diff --git a/etc/rc.d/rc.docker b/etc/rc.d/rc.docker
index 2fc237952..3f0a8dfe9 100755
--- a/etc/rc.d/rc.docker
+++ b/etc/rc.d/rc.docker
@@ -101,6 +101,7 @@ docker_pid(){
 
 # Verify if docker daemon running
 docker_running(){
+  sleep 0.1
   [[ -S /var/run/docker.sock ]] || return 1
   [[ $(docker info 2>&1) =~ "Cannot connect to the Docker daemon" ]] && return 1 || return 0
 }
diff --git a/etc/rc.d/rc.elogind b/etc/rc.d/rc.elogind
index e05a8b564..146eb6d6d 100755
--- a/etc/rc.d/rc.elogind
+++ b/etc/rc.d/rc.elogind
@@ -28,6 +28,7 @@ PIDFILE="/run/elogind.pid"
 . /etc/rc.d/rc.runlog
 
 elogind_running(){
+  sleep 0.1
   pgrep -l -F $PIDFILE 2>/dev/null | grep -q elogind
 }
 
diff --git a/etc/rc.d/rc.inetd b/etc/rc.d/rc.inetd
index b78780837..765d58b0a 100755
--- a/etc/rc.d/rc.inetd
+++ b/etc/rc.d/rc.inetd
@@ -13,6 +13,7 @@ DAEMON="Internet daemon"
 . /etc/rc.d/rc.runlog
 
 inetd_running(){
+  sleep 0.1
   ps axc | grep -q ' inetd'
 }
 
diff --git a/etc/rc.d/rc.mcelog b/etc/rc.d/rc.mcelog
index 5d6494307..4d3b173bb 100755
--- a/etc/rc.d/rc.mcelog
+++ b/etc/rc.d/rc.mcelog
@@ -39,6 +39,7 @@ TRIGGER="/sys/devices/system/machinecheck/machinecheck0/trigger"
 
 
 mcelog_running(){
+  sleep 0.1
   ps axc | grep -q ' mcelog'
 }
 
diff --git a/etc/rc.d/rc.messagebus b/etc/rc.d/rc.messagebus
index 438f93112..8a0187ed6 100755
--- a/etc/rc.d/rc.messagebus
+++ b/etc/rc.d/rc.messagebus
@@ -23,6 +23,7 @@ PIDFILE="/var/run/dbus/dbus.pid"
 . /etc/rc.d/rc.runlog
 
 dbus_running(){
+  sleep 0.1
   ps -u messagebus -c | grep -wq dbus-daemon
 }
 
diff --git a/etc/rc.d/rc.nfsd b/etc/rc.d/rc.nfsd
index 01b592970..e14c68fb9 100755
--- a/etc/rc.d/rc.nfsd
+++ b/etc/rc.d/rc.nfsd
@@ -37,6 +37,7 @@ fi
 [[ -r $RPC ]] && . $RPC
 
 nfsd_running(){
+  sleep 0.1
   ps axc | grep -q rpc.mountd
 }
 
diff --git a/etc/rc.d/rc.nginx b/etc/rc.d/rc.nginx
index 410bbea37..07ebdd264 100755
--- a/etc/rc.d/rc.nginx
+++ b/etc/rc.d/rc.nginx
@@ -590,6 +590,7 @@ unraid_api_control(){
 }
 
 nginx_running(){
+  sleep 0.1
   [[ -s $PID && -n "$(cat $PID)" && -d "/proc/$(cat $PID)" ]] && return 0 || return 1
 }
 
diff --git a/etc/rc.d/rc.ntpd b/etc/rc.d/rc.ntpd
index 865311be5..86ae79ff9 100755
--- a/etc/rc.d/rc.ntpd
+++ b/etc/rc.d/rc.ntpd
@@ -21,6 +21,7 @@ IDENT="/boot/config/ident.cfg"
 . /etc/rc.d/rc.library.source
 
 ntpd_running(){
+  sleep 0.1
   [[ $(pgrep -cf $NTPD) -gt 0 ]]
 }
 
diff --git a/etc/rc.d/rc.rpc b/etc/rc.d/rc.rpc
index fa10f9635..825e9aa85 100755
--- a/etc/rc.d/rc.rpc
+++ b/etc/rc.d/rc.rpc
@@ -31,6 +31,7 @@ if check && [[ -n $BIND ]]; then
 fi
 
 rpc_running(){
+  sleep 0.1
   ps axc | grep -q rpc.statd
 }
 
diff --git a/etc/rc.d/rc.rsyslogd b/etc/rc.d/rc.rsyslogd
index 976b5c7f7..7fc994948 100755
--- a/etc/rc.d/rc.rsyslogd
+++ b/etc/rc.d/rc.rsyslogd
@@ -28,6 +28,7 @@ create_xconsole(){
 }
 
 rsyslogd_running(){
+  sleep 0.1
   ps axc | grep -q ' rsyslogd'
 }
 
diff --git a/etc/rc.d/rc.samba b/etc/rc.d/rc.samba
index 7c9d931d9..0ecff247d 100755
--- a/etc/rc.d/rc.samba
+++ b/etc/rc.d/rc.samba
@@ -33,6 +33,7 @@ PRIVATE="/var/lib/samba/private"
 [[ $USE_NETBIOS == yes ]] && DENY6=1
 
 samba_running(){
+  sleep 0.1
   [[ $(pgrep -cf $SMBD) -gt 0 ]]
 }
 
diff --git a/etc/rc.d/rc.sshd b/etc/rc.d/rc.sshd
index 8d22af2b9..36961c19c 100755
--- a/etc/rc.d/rc.sshd
+++ b/etc/rc.d/rc.sshd
@@ -22,6 +22,7 @@ SSH_ETC="/etc/ssh"
 . /etc/rc.d/rc.library.source
 
 sshd_running(){
+  sleep 0.1
   [[ $(pgrep -cf $SSHD) -gt 0 ]]
 }
 
diff --git a/etc/rc.d/rc.wsdd2 b/etc/rc.d/rc.wsdd2
index 2599e75ee..eedaf81c0 100755
--- a/etc/rc.d/rc.wsdd2
+++ b/etc/rc.d/rc.wsdd2
@@ -28,6 +28,7 @@ DAEMON="WSDD daemon"
 # fi
 
 wsdd2_running(){
+  sleep 0.1
   ps axc | grep -q ' wsdd2'
 }
 

From e3cbf2309d42eaf95dcdf6a85bbf2bb851f2dd04 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 14 Oct 2023 11:31:12 +0100
Subject: [PATCH 034/266] PHP and Code tidy fixes

---
 emhttp/languages/en_US/helptext.txt           |  2 +-
 .../dynamix.vm.manager/VMSettings.page        |  2 +-
 .../include/libvirt_helpers.php               | 33 +++++++++----------
 .../dynamix.vm.manager/scripts/VMAjaxCall.php |  2 +-
 .../dynamix.vm.manager/scripts/VMClone.php    |  2 +-
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/emhttp/languages/en_US/helptext.txt b/emhttp/languages/en_US/helptext.txt
index 1689681ed..d5f7082a4 100644
--- a/emhttp/languages/en_US/helptext.txt
+++ b/emhttp/languages/en_US/helptext.txt
@@ -1582,7 +1582,7 @@ Stopping the VM Manager will first attempt to shutdown all running VMs. After 60
 :end
 
 :vms_disable_help:
-Stop VMs from Autostarting when VM Manager starts.
+Stop VMs from Autostarting\Starting when VM Manager starts or open is run from the gui to start, error message will be seen.
 :end
 
 :vms_libvirt_volume_help:
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 1693a06fe..04f393221 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -99,7 +99,7 @@ _(Enable VMs)_:
 
 :vms_enable_help:
 
-_(Disable Autostart VMs)_:
+_(Disable Autostart/Start option for VMs)_:
 : <select id="DISABLE" name="DISABLE">
   <?= mk_option(htmlspecialchars($domain_cfg['DISABLE']), 'no', _('No'))?>
   <?= mk_option(htmlspecialchars($domain_cfg['DISABLE']), 'yes', _('Yes'))?>
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 9575152c6..7acceeeb9 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -779,7 +779,7 @@ private static $encoding = 'UTF-8';
 					$boolBlacklisted = true;
 				}
 
-				$overrideCheck = "${arrMatch['typeid']}:${arrMatch['productid']}" ;
+				$overrideCheck = "{$arrMatch['typeid']}:{$arrMatch['productid']}" ;
 				if (in_array($overrideCheck,$arrWhiteListOverride) ) $boolBlacklisted = false;
 
 				$strClass = 'other';
@@ -1515,11 +1515,9 @@ private static $encoding = 'UTF-8';
 		foreach($disks as $disk)   {
 			$file = $disk["file"] ;
 			$pathinfo =  pathinfo($file) ;
-			$filenew = $pathinfo["dirname"].'/'.$pathinfo["filename"].'.'.$name.'qcow2' ;
 			$capacity = $capacity + $disk["capacity"] ;
 		}
-		$dirpath = $pathinfo["dirname"] ;
-
+	
 		#Check free space.
 		write("addLog\0".htmlspecialchars("Checking for free space"));
 		$dirfree = disk_free_space($pathinfo["dirname"]) ;
@@ -1578,12 +1576,11 @@ private static $encoding = 'UTF-8';
 			$sourcerealdisk = trim(shell_exec("getfattr --absolute-names --only-values -n system.LOCATION ".escapeshellarg($source)." 2>/dev/null"));	
             $reptgt = str_replace('/mnt/user/', "/mnt/$sourcerealdisk/", $target);
             $repsrc = str_replace('/mnt/user/', "/mnt/$sourcerealdisk/", $source);
-            #var_dump($repsrc,$reptgt) ;
         
 			$cmdstr = "cp --reflink=always '$repsrc' '$reptgt'" ;
         	if ($reflink == true) { $refcmd = $cmdstr ; } else {$refcmd = false; }
 			$cmdstr = "rsync -ahPIXS  --out-format=%f --info=flist0,misc0,stats0,name1,progress2 '$source' '$target'" ;
-			$error = execCommand_nchan($cmdstr,$path,$refcmd) ;
+			$error = execCommand_nchan_clone($cmdstr,$target,$refcmd) ;
 			if (!$error) { write("addLog\0".htmlspecialchars("Image copied failed."));  return( false) ; }
 		}
 
@@ -1637,7 +1634,7 @@ private static $encoding = 'UTF-8';
 	  $disks =$lv->get_disk_stats($vm) ;
 		  foreach($disks as $disk)   {
 			  $file = $disk["file"] ;
-			  $output = "" ;
+			  $output = array() ;
 			  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 			  foreach($output as $key => $line) {
 				  $line=str_replace("image: ","",$line) ;
@@ -1673,7 +1670,7 @@ private static $encoding = 'UTF-8';
 		  $disks =$lv->get_disk_stats($vm) ;
 		  foreach($disks as $disk)   {
 			  $file = $disk["file"] ;
-			  $output = "" ;
+			  $output = array() ;
 			  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 			  foreach($output as $key => $line) {
 				  $line=str_replace("image: ","",$line) ;
@@ -1693,7 +1690,7 @@ private static $encoding = 'UTF-8';
   
 		  $value = json_encode($snaps,JSON_PRETTY_PRINT) ;
 		  $res = $lv->get_domain_by_name($vm);
-		  if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_create_snapshot($lv->domain_get_uuid($vm),$name) ;
+		  #if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_create_snapshot($lv->domain_get_uuid($vm),$name) ;
 
 
 		  #Remove any NVRAMs that are no longer valid.
@@ -1907,11 +1904,12 @@ private static $encoding = 'UTF-8';
 	  global $lv ;
 	  $snapslist= getvmsnapshots($vm) ;
 	  $data = "<br><br>Images and metadata to remove if tickbox checked.<br>" ;
-
+      $capacity = 0 ;
+	  $diskspec = "" ;
 	  $disks =$lv->get_disk_stats($vm) ;
 	  foreach($disks as $disk)   {
 		  $file = $disk["file"] ;
-		  $output = "" ;
+		  $output = array() ;
 		  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 		  foreach($output as $key => $line) {
 			  $line=str_replace("image: ","",$line) ;
@@ -1922,8 +1920,8 @@ private static $encoding = 'UTF-8';
 		  $reversed = array_reverse($output) ;
 		  $snaps[$vm][$rev] = $reversed ;
 		  $pathinfo =  pathinfo($file) ;
-		  $filenew = $pathinfo["dirname"].'/'.$pathinfo["filename"].'.'.$name.'qcow2' ;
-		  $diskspec .= " --diskspec ".$disk["device"].",snapshot=external,file=".$filenew ;
+		  #$filenew = $pathinfo["dirname"].'/'.$pathinfo["filename"].'.'.$name.'qcow2' ;
+		  #$diskspec .= " --diskspec ".$disk["device"].",snapshot=external,file=".$filenew ;
 		  $capacity = $capacity + $disk["capacity"] ;
 	  }
 
@@ -1970,7 +1968,7 @@ private static $encoding = 'UTF-8';
 	  $disks =$lv->get_disk_stats($vm) ;
 	  foreach($disks as $disk)   {
 		  $file = $disk["file"] ;
-		  $output = "" ;
+		  $output = array() ;
 		  exec("qemu-img info --backing-chain -U $file  | grep image:",$output) ;
 		  foreach($output as $key => $line) {
 			  $line=str_replace("image: ","",$line) ;
@@ -2096,7 +2094,7 @@ OPTIONS
 
 		  $error = execCommand_nchan($cmdstr,$path) ;
 		  if (!$error) { 
-			  $arrResponse =  ['error' => substr($output[0],6) ] ;
+			  $arrResponse =  ['error' => "Process Failed"] ;
 			  return($arrResponse) ;
 		  } else {
 			  $arrResponse = ['success' => true] ;
@@ -2146,7 +2144,7 @@ OPTIONS
   $disks =$lv->get_disk_stats($vm) ;
   foreach($disks as $disk)   {
 	  $file = $disk["file"] ;
-	  $output = "" ;
+	  $output = array() ;
 	  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 	  foreach($output as $key => $line) {
 		  $line=str_replace("image: ","",$line) ;
@@ -2186,7 +2184,7 @@ OPTIONS
   $error = execCommand_nchan($cmdstr,$path) ;
   
   if (!$error)  { 
-	  $arrResponse =  ['error' => substr($output[0],6) ] ;
+	  $arrResponse =  ['error' => "Process Failed" ] ;
 	  return($arrResponse) ;
   } else {
 	  # Remove nvram snapshot
@@ -2196,6 +2194,7 @@ OPTIONS
 	  }
 
   refresh_snapshots_database($vm) ;
+  $ret = $ret = delete_snapshots_database("$vm","$snap") ; 
   if($ret)
 	  $data = ["error" => "Unable to remove snap metadata $snap"] ;
   else
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
index 59b846f4d..f11df0a8c 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
@@ -40,7 +40,7 @@ function execCommand_nchan($command,$idx) {
 	[$cmd,$args] = explode(' ',$command,2);
 	write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Command execution')."</legend>".basename($cmd).' '.str_replace(" -","<br>&nbsp;&nbsp;-",htmlspecialchars($args))."<br><span id='wait-$waitID'>"._('Please wait')." </span><p class='logLine'></p></fieldset>","show_Wait\0$waitID");
 	write("addLog\0<br>") ;
-	write("addToID\0$idx\0 $action") ;
+	#write("addToID\0$idx\0 $action") ;
 	$proc = popen("$command 2>&1",'r');
 	while ($out = fgets($proc)) {
 		$out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out);
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
index 89e36bc6c..2c33227f7 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
@@ -36,7 +36,7 @@ function write(...$messages){
 	}
 	curl_close($com);
   }
-  function execCommand_nchan($command,$idx,$refcmd=false) {
+  function execCommand_nchan_clone($command,$idx,$refcmd=false) {
 	$waitID = mt_rand();
 	if ($refcmd) {
 		[$cmd,$args] = explode(' ',$refcmd,2);

From f9167b929f8c2d03f5b79376d33ac655d424195e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 13:54:13 +0200
Subject: [PATCH 035/266] snaphots: several updates for Dashboard and VMs page

---
 .../dynamix.vm.manager/VMMachines.page        | 446 +++++++-----------
 emhttp/plugins/dynamix/DashStats.page         | 220 ++++-----
 2 files changed, 268 insertions(+), 398 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index f34aebf5b..dc0a63ab8 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -122,26 +122,19 @@ div.four label:nth-child(4n+4){float:none;clear:both}
 div.four label.cpu1{width:32%}
 div.four label.cpu2{width:26%}
 div.template,div#dialogWindow,input#upload{display:none}
-div.template,div#dialogWindow2,input#upload{display:none}
 table.domdisk thead tr th:nth-child(1){width:56%!important}
 table.domdisk thead tr th:nth-child(n+2){width:8%!important}
 table.domdisk thead tr th:nth-child(1){padding-left:72px}
 table.domdisk tbody tr td:nth-child(1){padding-left:72px}
 table.domdisk tbody tr:nth-child(even){background-color:transparent!important}
 table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
+table.snapshot{margin-top:0}
 i.mover{margin-right:8px;display:none}
 #resetsort{margin-left:12px;display:inline-block;width:32px}
 .fileTree{background:<?=$bgcolor?>;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
 .dropdown-menu{z-index:10001}
 </style>
-<table id="kvm_table" class="tablesorter four shift">
-<thead><tr><th class="th1"><a id="resetsort" class="nohand" onclick="resetSorting()" title="Reset sorting"><i class="fa fa-th-list"></i></a>_(Name)_</th><th class="th2">_(Description)_</th><th>_(CPUs)_</th><th>_(Memory)_</th><th>_(vDisks / vCDs)_</th><th>_(Graphics)_</th><th class="th3">_(Autostart)_</th></tr></thead>
-<tbody id="kvm_list"><tr><td colspan='8'></td></tr></tbody>
-</table>
-<input type="button" onclick="addVM()" id="btnAddVM" value="_(Add VM)_" style="display:none">
-<input type="button" onclick="startAll()" value="_(Start All)_" style="display:none">
-<input type="button" onclick="stopAll()" value="_(Stop All)_" style="display:none">
 
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script src="<?autov('/plugins/dynamix.vm.manager/javascript/dynamix.vm.manager.js')?>"></script>
@@ -166,37 +159,38 @@ function changemedia(uuid,dev,bus,file) {
   if (file === "--select") getisoimage(uuid,dev,bus,file);
   if (file === "--eject") ajaxVMDispatch({action:"change-media", uuid:uuid , cdrom:"" , dev:dev , bus:bus , file:file}, "loadlist");
 }
+function dialogStyle() {
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
+}
 function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
-  var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
+  var root = "<?=$domain_cfg["MEDIADIR"]?>";
+  var match = ".iso";
   var box = $("#dialogWindow");
   box.html($("#templateISOboth").html());
-
-  box.find('#target').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).attr('value', file).fileTreeAttach(null,null,function(path){
-      var bits = path.substr(1).split('/');
-      var auto = bits.length>3 ? '' : share;
-      box.find('#target').val(path+auto).change();
-    });
-      box.find('#target2').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).attr('value', file2).fileTreeAttach(null,null,function(path){
-      var bits = path.substr(1).split('/');
-      var auto = bits.length>3 ? '' : share;
-      box.find('#target2').val(path+auto).change();
-    });
-    var height = 100;
-
+  box.find('#target').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).attr('value',file).fileTreeAttach(null,null,function(path){
+    var bits = path.substr(1).split('/');
+    var auto = bits.length>3 ? '' : share;
+    box.find('#target').val(path+auto).change();
+  });
+  box.find('#target2').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).attr('value',file2).fileTreeAttach(null,null,function(path){
+    var bits = path.substr(1).split('/');
+    var auto = bits.length>3 ? '' : share;
+    box.find('#target2').val(path+auto).change();
+  });
   box.dialog({
-    title: "Select ISOs for CDROMs",
-    resizable: false,
+    title: "_(Select ISOs for CDROMs)_",
+    height: 600,
     width: 600,
-    height: 300,
+    resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
       "_(Update)_": function(){
         var target = box.find('#target');
         if (target.length) {
-          target = target.val();  
+          target = target.val();
         } else target = '';
         var target2 = box.find('#target2');
         if (target2.length) {
@@ -204,7 +198,7 @@ function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
         } else target2 = '';
         box.find('#target').prop('disabled',true);
         box.find('#target2').prop('disabled',true);
-        ajaxVMDispatch({action:"change-media-both", uuid:uuid , cdrom:"" , dev:dev , bus:bus , file:target, dev2:dev2 , bus2:bus2 , file2:target2}, "loadlist");
+        ajaxVMDispatch({action:"change-media-both", uuid:uuid, cdrom:"", dev:dev, bus:bus, file:target, dev2:dev2, bus2:bus2, file2:target2}, "loadlist");
         box.dialog('close');
       },
       "_(Cancel)_": function(){
@@ -215,25 +209,21 @@ function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
   dialogStyle();
 }
 function getisoimage(uuid,dev,bus,file){
-  var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
+  var root = "<?=$domain_cfg["MEDIADIR"]?>";
+  var match = ".iso";
   var box = $("#dialogWindow");
   box.html($("#templateISO").html());
-
   box.find('#target').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).fileTreeAttach(null,null,function(path){
-      var bits = path.substr(1).split('/');
-      var auto = bits.length>3 ? '' : share;
-      box.find('#target').val(path+auto).change();
-    });
-    var height = 100;
+    var bits = path.substr(1).split('/');
+    var auto = bits.length>3 ? '' : share;
+    box.find('#target').val(path+auto).change();
+  });
   box.dialog({
-    title: "Select ISO",
-    resizable: false,
+    title: "_(Select ISO)_",
+    height: 600,
     width: 600,
-    height: 300,
+    resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
       "_(Insert)_": function(){
         var target = box.find('#target');
@@ -242,7 +232,7 @@ function getisoimage(uuid,dev,bus,file){
           if (!target ) {errorTarget(); return;}
         } else target = '';
         box.find('#target').prop('disabled',true);
-        ajaxVMDispatch({action:"change-media", uuid:uuid , cdrom:"" , dev:dev , bus:bus , file:target}, "loadlist");
+        ajaxVMDispatch({action:"change-media", uuid:uuid, cdrom:"", dev:dev, bus:bus, file:target}, "loadlist");
         box.dialog('close');
       },
       "_(Cancel)_": function(){
@@ -253,44 +243,32 @@ function getisoimage(uuid,dev,bus,file){
   dialogStyle();
 }
 function VMClone(uuid, name){
-
-  //var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
   var box = $("#dialogWindow");
-  var height = 200;
   box.html($("#templateClone").html());
-  box.find('#VMBeingCloned').html(name).change() ;
-  box.find('#target').val(name + "_clone") ;
-  document.getElementById("Free").checked = true ;
-  document.getElementById("Overwrite").checked = true ;
-  var Cancel = _("Cancel") ;
+  box.find('#VMBeingCloned').html(name).change();
+  box.find('#target').val(name + "_clone");
+  document.getElementById("Free").checked = true;
+  document.getElementById("Overwrite").checked = true;
   box.dialog({
-    title: "VM Clone",
-    resizable: false,
+    title: "_(VM Clone)_",
+    height: 300,
     width: 600,
-    height: 500,
+    resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
-      "_(Clone)_" : function(){
+      "_(Clone)_": function(){
         var target = box.find('#target');
         if (target.length) {
           target = target.val();
-          //if (!target ) {errorTarget(); return;}
+          //if (!target) {errorTarget(); return;}
         } else target = '';
-
-        var clone = box.find("#target").prop('value') ;
-        x = box.find('#Start').prop('checked') ;
-        if (x) start = 'yes' ; else start = 'no' ;
-        x = box.find('#Edit').prop('checked') ;
-        if (x) edit = 'yes' ; else edit = 'no' ;
-        x = box.find('#Overwrite').prop('checked') ;
-        if (x) overwrite = 'yes' ; else overwrite = 'no' ;
-        x = box.find('#Free').prop('checked') ;
-        if (x) free = 'yes' ; else free = 'no' ;
-        scripturl =  "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone" , name:name ,clone:clone, overwrite:overwrite , edit:edit, start,start, free:free})) ;
-        openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist") ;
+        var clone = box.find("#target").prop('value');
+        var start = box.find('#Start').prop('checked') ? 'yes' : 'no';
+        var edit = box.find('#Edit').prop('checked') ? 'yes' : 'no';
+        var overwrite = box.find('#Overwrite').prop('checked') ? 'yes' : 'no';
+        var free = box.find('#Free').prop('checked') ? 'yes' : 'no';
+        scripturl =  "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone", name:name, clone:clone, overwrite:overwrite, edit:edit, start:start, free:free}));
+        openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist");
         box.dialog('close');
       },
       "_(Cancel)_": function(){
@@ -300,44 +278,30 @@ function VMClone(uuid, name){
   });
   dialogStyle();
 }
-
-
 function selectsnapshot(uuid, name ,snaps, opt, getlist,state){
- 
-  var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
-  var box = $("#dialogWindow2");
+  var box = $("#dialogWindow");
   box.html($("#templatesnapshot"+opt).html());
-  var height = 200;
-  const Capopt = opt.charAt(0).toUpperCase() + opt.slice(1) ;
-  var optiontext = Capopt + " Snapshot" ;
-  box.find('#VMName').html(name) ;
-  box.find('#targetsnap').val(snaps) ;
-  box.find('#targetsnapl').html(snaps) ;
+  const capopt = opt.charAt(0).toUpperCase() + opt.slice(1);
+  var optiontext = capopt + " _(Snapshot)_";
+  box.find('#VMName').html(name);
+  box.find('#targetsnap').val(snaps);
+  box.find('#targetsnapl').html(snaps);
   if (getlist) {
-    var only = 1 ;
-    if (opt == "remove") only = 0;
-    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-images", uuid:uuid , snapshotname:snaps, only:only}, function(data) {
-    if (data.html) {
-    box.find('#targetsnapimages').html(data.html) ; 
-    } 
+    var only = (opt == "remove") ? 0 : 1;
+    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-images", uuid:uuid, snapshotname:snaps, only:only}, function(data) {
+      if (data.html) box.find('#targetsnapimages').html(data.html);
     },'json');
   }
-
- document.getElementById("targetsnaprmv").checked = true ;
- document.getElementById("targetsnaprmvmeta").checked = true ;
- document.getElementById("targetsnapkeep").checked = true ;
- document.getElementById("targetsnapfspc").checked = true ;
- 
+  document.getElementById("targetsnaprmv").checked = true;
+  document.getElementById("targetsnaprmvmeta").checked = true;
+  document.getElementById("targetsnapkeep").checked = true;
+  document.getElementById("targetsnapfspc").checked = true;
   box.dialog({
-    title: "_("+optiontext+ ")_",
-    resizable: false,
+    title: optiontext,
+    height: 300,
     width: 600,
-    height: 500,
+    resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
-    
     buttons: {
       "_(Proceed)_": function(){
         var target = box.find('#targetsnap');
@@ -345,26 +309,22 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist,state){
           target = target.val();
           if (!target ) {errorTarget(); return;}
         } else target = '';
-        var remove  = 'yes' 
-        var keep  = 'yes' 
-        var removemeta  = 'yes' 
+        var remove = 'yes'
+        var keep = 'yes'
+        var removemeta = 'yes'
         var free = 'yes'
         var desc = ''
         box.find('#targetsnap').prop('disabled',true);
         if (opt == "revert") {
-          var x = box.find('#targetsnaprmv').prop('checked') ;
-          if (x) remove = 'yes' ; else remove = 'no' ;
-           x = box.find('#targetsnaprmvmeta').prop('checked') ;
-          if (x) removemeta = 'yes' ; else removemeta = 'no' ;
-           x = box.find('#targetsnapkeep').prop('checked') ;
-          if (x) keep = 'yes' ; else keep = 'no' ;
+          remove = box.find('#targetsnaprmv').prop('checked') ? 'yes' : 'no';
+          removemeta = box.find('#targetsnaprmvmeta').prop('checked') ? 'yes' : 'no';
+          keep = box.find('#targetsnapkeep').prop('checked') ? 'yes' : 'no';
         }
-          if (opt == "create") {
-          var x = box.find('#targetsnapfspc').prop('checked') ;
-          if (x) free = 'yes' ; else free = 'no' ;
-          var desc = box.find("#targetsnapdesc").prop('value') ;
+        if (opt == "create") {
+          free = box.find('#targetsnapfspc').prop('checked') ? 'yes' : 'no';
+          desc = box.find("#targetsnapdesc").prop('value');
         }
-        ajaxVMDispatch({action:"snap-" + opt +'-external', uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} , "loadlist");
+        ajaxVMDispatch({action:"snap-" + opt +'-external', uuid:uuid, snapshotname:target, remove:remove, free:free, removemeta:removemeta, keep:keep, desc:desc}, "loadlist");
         box.dialog('close');
       },
       "_(Cancel)_": function(){
@@ -374,86 +334,72 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist,state){
   });
   dialogStyle();
 }
-
-function selectblock(uuid, name ,snaps, opt, getlist,state){
- 
-  var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
-  var box = $("#dialogWindow2");
+function selectblock(uuid, name, snaps, opt, getlist, state){
+  var box = $("#dialogWindow");
   box.html($("#templateblock").html());
-  var height = 200;
-  const Capopt = opt.charAt(0).toUpperCase() + opt.slice(1) ;
-  var optiontext = Capopt + " Block Devices" ;
-  box.find('#VMName').html(name) ;
-  box.find('#targetsnap').val(snaps) ;
-  box.find('#targetsnapl').html(snaps) ;
-
-  getlist =  true ;
+  const capopt = opt.charAt(0).toUpperCase() + opt.slice(1);
+  var optiontext = capopt + " _(Block Devices)_";
+  box.find('#VMName').html(name);
+  box.find('#targetsnap').val(snaps);
+  box.find('#targetsnapl').html(snaps);
+  getlist = true;
   if (getlist) {
-    var only = 1 ;
+    var only = 1;
     if (opt == "remove") only = 0;
-    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-list", uuid:uuid }, function(data) {
-    if (data.html) {    
-    var targetbase = document.getElementById("targetblockbase")  ;
-    htmlstrbase = "<select class='targetblockbase' name='targetblockbase' id='targetblockbase'><option value='--base'>--base</option>" + data.html + "</select>"
-    htmlstrtop = "<select class='targetblocktop' name='targetblocktop' id='targetblocktop'><option value='--top'>--top</option>" + data.html + "</select>"
-    $("select.targetblockbase").replaceWith(htmlstrbase) ;
-    $("select.targetblocktop").replaceWith(htmlstrtop) ;
-    } 
+    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-list", uuid:uuid}, function(data){
+      if (data.html) {
+        var targetbase = document.getElementById("targetblockbase");
+        htmlstrbase = "<select class='targetblockbase' name='targetblockbase' id='targetblockbase'><option value='--base'>--base</option>" + data.html + "</select>"
+        htmlstrtop = "<select class='targetblocktop' name='targetblocktop' id='targetblocktop'><option value='--top'>--top</option>" + data.html + "</select>"
+        $("select.targetblockbase").replaceWith(htmlstrbase);
+        $("select.targetblocktop").replaceWith(htmlstrtop);
+      }
     },'json');
   }
-
- document.getElementById("targetsnaprmv").checked = true ;
- document.getElementById("targetsnaprmvmeta").checked = true ;
- document.getElementById("targetsnapkeep").checked = true ;
- document.getElementById("targetsnapfspc").checked = true ;
- if (opt== "pull") {
-  $('.toprow').hide(); 
-  $('.targetpivotrow').hide();
-  $('.targetdeleterow').hide();
- } else {
-  $('.toprow').show();
-  $('.targetpivotrow').show();
-  $('.targetdeleterow').show();
- }
-
+  document.getElementById("targetsnaprmv").checked = true;
+  document.getElementById("targetsnaprmvmeta").checked = true;
+  document.getElementById("targetsnapkeep").checked = true;
+  document.getElementById("targetsnapfspc").checked = true;
+  if (opt == "pull") {
+    $('.toprow').hide();
+    $('.targetpivotrow').hide();
+    $('.targetdeleterow').hide();
+  } else {
+    $('.toprow').show();
+    $('.targetpivotrow').show();
+    $('.targetdeleterow').show();
+  }
   box.dialog({
-    title: "_("+optiontext+ ")_",
-    resizable: false,
+    title: optiontext,
     width: 600,
     height: 500,
+    resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
-      _("Action")_: function(){
+      "_(Action)_": function(){
         var target = box.find('#targetsnap');
         if (target.length) {
           target = target.val();
           if (!target ) {errorTarget(); return;}
         } else target = '';
-        var remove  = 'yes' 
-        var keep  = 'yes' 
-        var removemeta  = 'yes' 
+        var remove = 'yes'
+        var keep = 'yes'
+        var removemeta = 'yes'
         var free = 'yes'
         var delete_file = 'yes'
         var pivot = 'yes'
         var desc = ''
         box.find('#targetsnap').prop('disabled',true);
           if (opt == "create") {
-          var x = box.find('#targetsnapfspc').prop('checked') ;
-          if (x) free = 'yes' ; else free = 'no' ;
-          var desc = box.find("#targetsnapdesc").prop('value') ;
+          free = box.find('#targetsnapfspc').prop('checked') ? 'yes' : 'no';
+          var desc = box.find("#targetsnapdesc").prop('value');
         }
-        var targetbase = box.find("#targetblockbase").prop('value') ;
-        var targettop = box.find("#targetblocktop").prop('value') ;
-
-        x = box.find('#targetpivot').prop('checked') ;
-        if (x) pivot = 'yes' ; else pivot = 'no' ;
-        x = box.find('#targetdelete').prop('checked') ;
-        if (x) delete_file = 'yes' ; else delete_file = 'no' ;
-        Ajaxurl =  "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:opt , name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, targetpivot:pivot ,removemeta:removemeta ,targetdelete:delete_file})) ;
-        openVMAction((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ;
+        var targetbase = box.find("#targetblockbase").prop('value');
+        var targettop = box.find("#targetblocktop").prop('value');
+        pivot = box.find('#targetpivot').prop('checked') ? 'yes' : 'no';
+        delete_file = box.find('#targetdelete').prop('checked') ? 'yes' : 'no';
+        Ajaxurl =  "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:opt, name:name, targetbase:targetbase, targettop:targettop, snapshotname:target, remove:remove, targetpivot:pivot, removemeta:removemeta, targetdelete:delete_file}));
+        openVMAction((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist");
         box.dialog('close');
       },
       "_(Cancel)_": function(){
@@ -463,13 +409,6 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){
   });
   dialogStyle();
 }
-
-function dialogStyle() {
-  $('.ui-dialog-titlebar-close').css({'background':'transparent','border':'none','font-size':'1.8rem','margin-top':'-14px','margin-right':'-18px'}).html('<i class="fa fa-times"></i>').prop('title');
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
-}
 var sortableHelper = function(e,ui){
   var child = ui.next();
   if (child.is(':visible')) child.addClass('unhide').hide();
@@ -561,7 +500,17 @@ $(function() {
 });
 </script>
 
+<table id="kvm_table" class="tablesorter four shift">
+<thead><tr><th class="th1"><a id="resetsort" class="nohand" onclick="resetSorting()" title="Reset sorting"><i class="fa fa-th-list"></i></a>_(Name)_</th><th class="th2">_(Description)_</th><th>_(CPUs)_</th><th>_(Memory)_</th><th>_(vDisks / vCDs)_</th><th>_(Graphics)_</th><th class="th3">_(Autostart)_</th></tr></thead>
+<tbody id="kvm_list"><tr><td colspan='8'></td></tr></tbody>
+</table>
+
+<input type="button" onclick="addVM()" id="btnAddVM" value="_(Add VM)_" style="display:none">
+<input type="button" onclick="startAll()" value="_(Start All)_" style="display:none">
+<input type="button" onclick="stopAll()" value="_(Stop All)_" style="display:none">
+
 <div id="dialogWindow"></div>
+
 <div markdown="1" id="templateISO" class="template">
 _(ISO Image)_:
 : <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
@@ -569,115 +518,54 @@ _(ISO Image)_:
 
 <div markdown="1" id="templateISOboth" class="template">
 _(CD1 ISO Image)_:
-: <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop=""><br>
+: <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
+
 _(CD2 ISO Image)_:
 : <input type="text" id="target2" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
 </div>
 
-<div id="dialogWindow2"></div>
-<div markdown="1" id="templatesnapshotcreate" class="template">
-<table id='snapshot'>
+<div id="templatesnapshotcreate" class="template">
+<table id='snapshot' class='snapshot'>
+<tr><td>_(VM Name)_:</td><td><label id="VMName"></label></td></tr>
+<tr><td>_(Snapshot Name)_:</td><td><input type="text" id="targetsnap" autocomplete="off" spellcheck="false" value="--generate" onclick="this.select()">_(Check free space)_: <input type="checkbox" id="targetsnapfspc" checked></td></tr>
+<tr><td>_(Description  )_:</td><td><input type="text" id="targetsnapdesc" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
+</table>
+</div>
+
+<div id="templatesnapshotrevert" class="template">
+_(VM Name)_: <label id="VMName"></label><br>
+_(Snapshot Name)_: <input type="text" id="targetsnap" hidden><label id="targetsnapl"></label><br>
+_(Remove Images)_: <input type="checkbox" id="targetsnaprmv" checked><br>
+_(Remove Meta)_:<input type="checkbox" id="targetsnaprmvmeta" checked> <input type="checkbox" id="targetsnapkeep" hidden><label id="targetsnapimages"></label><br>
+</div>
+
+<div id="templatesnapshotremove" class="template" post>
+!! _(Warning removing Snapshots can break the chain)_ !!
 <br><br>
-<tr><td> _(VM Name)_:</td><td>
-<label id="VMName"></label></td></tr>
-<tr><td>_(Snapshot Name)_:</td><td>
-<input type="text" id="targetsnap" autocomplete="off" spellcheck="false" value="--generate" onclick="this.select()">
-_(Check free space)_:
-<input type="checkbox" id="targetsnapfspc" checked></td></tr>
-<tr><td>_(Description  )_:</td><td>
-<input type="text" id="targetsnapdesc" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
-</table>
+_(VM Name)_: <label id="VMName"></label><br>
+_(Snapshot Name)_: <input type="text" id="targetsnap" hidden><label id="targetsnapl"></label><br><label id="targetsnapimages"></label><br>
 </div>
 
-<div markdown="1" id="templatesnapshotrevert" class="template">
-_(VM Name)_:
- <label id="VMName"></label>
-<br>
-_(Snapshot Name)_:
-  <input type="text" id="targetsnap" hidden>
- <label id="targetsnapl"></label><br>
-_(Remove Images)_:
-<input type="checkbox" id="targetsnaprmv" checked >
-_(Remove Meta)_:
-<input type="checkbox" id="targetsnaprmvmeta" checked>
-<!--_(Keep snapshot)_:-->
-<input type="checkbox" id="targetsnapkeep" hidden><br>
-
-<label id="targetsnapimages"></label><br>
-
-<div markdown="1" id="templatesnapshotremove" class="template" post>
-_(!! Warning removing Snapshots can break the chain !!)_<br><br>
-
-_(VM Name)_:
- <label id="VMName"></label>
-<br>
-_(Snapshot Name)_:
-  <input type="text" id="targetsnap" hidden>
- <label id="targetsnapl"></label><br>
-
-<label id="targetsnapimages"></label><br>
-
-<div markdown="1" id="templateblock" class="template">
-_(VM Name)_:
- <label id="VMName"></label>
-<br>
-_(Snapshot Name)_:
-  <input type="text" id="targetsnap" hidden>
- <label id="targetsnapl"></label><br>
-<br><br><br><br>
-<table id='block'>
-<tr><td>_(Base Image)_:</td><td>
-<select class="targetblockbase" s>
-</select></td></tr>
-<tr name="toprow" class="toprow" ><td>_(Top Image  )_:</td><td>
-<select class="targetblocktop" name="targetblocktop" id="targetblocktop">
-</select></td><td>
-<tr name="targetpivotrow" class="targetpivotrow" ><td>_(Pivot)_:</td><td>
-<input type="checkbox" id="targetpivot" checked></td></tr>
-<tr name="targetdeleterow" class="targetdeleterow" ><td>_(Delete)_:</td><td>
-<input type="checkbox" id="targetdelete" checked></td></tr>
+<div id="templateblock" class="template">
+_(VM Name)_: <label id="VMName"></label><br>
+_(Snapshot Name)_: <input type="text" id="targetsnap" hidden><label id="targetsnapl"></label><br><br>
+<table id='block' class='snapshot'>
+<tr><td>_(Base Image)_:</td><td><select class="targetblockbase"></select></td></tr>
+<tr name="toprow" class="toprow" ><td>_(Top Image  )_:</td><td><select class="targetblocktop" name="targetblocktop" id="targetblocktop"></select></td><td></tr>
+<tr name="targetpivotrow" class="targetpivotrow" ><td>_(Pivot)_:</td><td><input type="checkbox" id="targetpivot" checked></td></tr>
+<tr name="targetdeleterow" class="targetdeleterow" ><td>_(Delete)_:</td><td><input type="checkbox" id="targetdelete" checked></td></tr>
 </table>
 <input type="checkbox" id="targetsnapkeep" hidden><br>
 <label id="targetsnapimages"></label><br>
 </div>
 
-<div id="dialogWindow"></div>
-<div markdown="1" id="templateClone" class="template">
-<html <?=$display['rtl']?>lang="<?=strtok($locale,'_')?:'en'?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=1600">
-<meta name="robots" content="noindex, nofollow">
-<meta name="referrer" content="same-origin">
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
-</head>
-<body>
-<br>
-<table>
-<tr><td>_(VM Being Cloned)_:</td>
-<td><span id="VMBeingCloned"></span></td></tr>
-
-<tr><td>_(New VM)_:</td>
-<td><input type="text" id="target" autocomplete="off" spellcheck="false" value="" onclick="this.select()" ></td></tr>
-
-<tr><td>_(Overwrite)_:</td>
-<td><input type="checkbox" id="Overwrite" value="" ></td></tr>
-
-<tr hidden><td>_(Start Cloned VM)_:</td>
-<td><input type="checkbox" id="Start" value="" ></td></tr>
-
-<tr hidden><td>_(Edit VM after clone)_:</td>
-<td><input type="checkbox" id="Edit" value="" ></td></tr>
-
-<tr><td>_(Check Free Space)_:</td>
-<td><input type="checkbox" id="Free" value="" ></td></tr>
-
+<div id="templateClone" class="template">
+<table class='snapshot'>
+<tr><td>_(VM Being Cloned)_:</td><td><span id="VMBeingCloned"></span></td></tr>
+<tr><td>_(New VM)_:</td><td><input type="text" id="target" autocomplete="off" spellcheck="false" value="" onclick="this.select()" ></td></tr>
+<tr><td>_(Overwrite)_:</td><td><input type="checkbox" id="Overwrite" value="" ></td></tr>
+<tr hidden><td>_(Start Cloned VM)_:</td><td><input type="checkbox" id="Start" value="" ></td></tr>
+<tr hidden><td>_(Edit VM after clone)_:</td><td><input type="checkbox" id="Edit" value="" ></td></tr>
+<tr><td>_(Check Free Space)_:</td><td><input type="checkbox" id="Free" value="" ></td></tr>
 </table>
-</body>
-</html>
 </div>
-</div>
-
-</div>
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 35afb0afe..82604dce3 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -52,10 +52,9 @@ function customTiles($column) {
 // adjust the text color in log window
 $fgcolor = in_array($theme,['white','azure']) ? '#1c1c1c' : '#f2f2f2';
 exec("sed -ri 's/^\.logLine\{color:#......;/.logLine{color:$fgcolor;/' $docroot/plugins/dynamix.docker.manager/log.htm >/dev/null &");
-
 exec("/etc/rc.d/rc.docker status >/dev/null",$dummy,$dockerd);
 exec("/etc/rc.d/rc.libvirt status >/dev/null",$dummy,$libvirtd);
-$domain_cfg = parse_ini_file("/boot/config/domain.cfg");
+
 $dockerd = $dockerd==0;
 $libvirtd = $libvirtd==0;
 $apcupsd = file_exists('/var/run/apcupsd.pid');
@@ -239,6 +238,7 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 #current_time{font-size:4rem;margin-left:8px}
 #current_date{font-size:1.3rem;margin-left:18px}
 span.ampm{font-size:2rem}
+table.snapshot{margin-top:0}
 </style>
 <script src="<?autov('/webGui/javascript/jquery.apexcharts.js')?>"></script>
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
@@ -666,6 +666,7 @@ if (!$group) {
 <input type='hidden' name='csrf_token' value='<?=_var($var,'csrf_token')?>'>
 <input type='hidden' name='cmd' value=''>
 </form>
+
 <div id="iframe-popup"></div>
 
 <div id="templateContentMgmt" class="template">
@@ -716,9 +717,8 @@ function hideShow() {
 !-->
 </div>
 
-<div id="dialogWindow"></div>
-<div markdown="1" id="templateClone" class="template">
-<table>
+<div id="templateClone" class="template">
+<table class="snapshot">
 <tr><td>_(VM Being Cloned)_:</td><td><span id="VMBeingCloned"></span></td></tr>
 <tr><td>_(New VM)_:</td><td><input type="text" id="target" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
 <tr><td>_(Overwrite)_:</td><td><input type="checkbox" id="Overwrite" value="" ></td></tr>
@@ -728,9 +728,8 @@ function hideShow() {
 </table>
 </div>
 
-<div id="dialogWindow2"></div>
-<div markdown="1" id="templatesnapshotcreate" class="template">
-<table id="snapshot">
+<div id="templatesnapshotcreate" class="template">
+<table id="snapshot" class="snapshot">
 <tr><td>_(VM Name)_:</td><td><label id="VMName"></label></td></tr>
 <tr><td>_(Snapshot Name)_:</td><td><input type="text" id="targetsnap" autocomplete="off" spellcheck="false" value="--generate" onclick="this.select()">_(Check free space)_:<input type="checkbox" id="targetsnapfspc" checked></td></tr>
 <tr><td>_(Description)_:</td><td><input type="text" id="targetsnapdesc" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
@@ -866,63 +865,6 @@ var netchart = new ApexCharts(document.querySelector('#netchart'), options_net);
 if ($.cookie('port_select')!=null && !ports.includes($.cookie('port_select'))) $.removeCookie('port_select');
 var port_select = $.cookie('port_select')||ports[0];
 
-function selectsnapshot(uuid, name ,snaps, opt, getlist){
-  var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
-  var box = $("#dialogWindow2");
-  box.html($("#templatesnapshot"+opt).html());
-  var height = 200;
-  const Capopt = opt.charAt(0).toUpperCase() + opt.slice(1);
-  var optiontext = Capopt + " Snapshot";
-  box.find('#VMName').html(name);
-  box.find('#targetsnap').val(snaps);
-  box.find('#targetsnapl').html(snaps);
-  if (getlist) {
-    var only = (opt == "remove") ? 0 : 1;
-    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-images", uuid:uuid, snapshotname:snaps, only:only}, function(data){if (data.html) box.find('#targetsnapimages').html(data.html);},'json');
-  }
- document.getElementById("targetsnapfspc").checked = true;
-  box.dialog({
-    title: "_("+optiontext+ ")_",
-    resizable: false,
-    width: 600,
-    height: 500,
-    modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
-    buttons: {
-      "_(Proceed)_": function(){
-        var target = box.find('#targetsnap');
-        if (target.length) {
-          target = target.val();
-          if (!target) {errorTarget(); return;}
-        } else target = '';
-        var remove = 'yes';
-        var removemeta = 'yes';
-        var keep = 'yes';
-        var free = 'yes';
-        var desc = '';
-        box.find('#targetsnap').prop('disabled',true);
-        if (opt == "revert") {
-          remove = box.find('#targetsnaprmv').prop('checked') ? 'yes' : 'no';
-          removemeta = box.find('#targetsnaprmvmeta').prop('checked') ? 'yes' : 'no';
-          keep = box.find('#targetsnapkeep').prop('checked') ? 'yes' : 'no';
-        }
-        if (opt == "create") {
-          free = box.find('#targetsnapfspc').prop('checked') ? 'yes' : 'no';
-          desc = box.find("#targetsnapdesc").prop('value');
-        }
-        ajaxVMDispatch({action:"snap-" + opt +'-external', uuid:uuid, snapshotname:target, remove:remove, free:free, desc:desc}, "loadlist");
-        box.dialog('close');
-      },
-      "_(Cancel)_": function(){
-        box.dialog('close');
-      }
-    }
-  });
-  dialogStyle();
-}
-
 function initCharts(clear) {
   $.post('/webGui/include/InitCharts.php',{cmd:'get'},function(data) {
     data = JSON.parse(data);
@@ -1381,6 +1323,12 @@ function dismiss(button) {
   inactive.push(tbody.attr('sort'));
   $.cookie('inactive_content',inactive.join(';'),{expires:3650});
 }
+function dialogStyle() {
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
+}
 function contentMgmt() {
   box = $("#iframe-popup");
   box.html($("#templateContentMgmt").html().build());
@@ -1390,8 +1338,6 @@ function contentMgmt() {
     width: 900,
     resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
       "_(Reset)_": function(){
         $.removeCookie('db-box1');
@@ -1417,10 +1363,94 @@ function contentMgmt() {
       }
     }
   });
-  $('.ui-dialog-titlebar-close').css({'display':'none'});
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
+  dialogStyle();
+}
+function VMClone(uuid, name){
+  box = $("#iframe-popup");
+  box.html($("#templateClone").html());
+  box.find('#VMBeingCloned').html(name).change();
+  box.find('#target').val(name + "_clone");
+  document.getElementById("Free").checked = true;
+  document.getElementById("Overwrite").checked = true;
+  box.dialog({
+    title: "_(VM Clone)_",
+    height: 300,
+    width: 600,
+    resizable: false,
+    modal: true,
+    buttons: {
+      "_(Clone)_": function(){
+        var target = box.find('#target');
+        if (target.length) {
+          target = target.val();
+          //if (!target) {errorTarget(); return;}
+        } else target = '';
+        var clone = box.find("#target").prop('value');
+        var start = box.find('#Start').prop('checked') ? 'yes' : 'no';
+        var edit = box.find('#Edit').prop('checked') ? 'yes' : 'no';
+        var overwrite = box.find('#Overwrite').prop('checked') ? 'yes' : 'no';
+        var free = box.find('#Free').prop('checked') ? 'yes' : 'no';
+        var scripturl = "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone", name:name, clone:clone, overwrite:overwrite, edit:edit, start:start, free:free}));
+        openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist");
+        box.dialog('close');
+      },
+      "_(Cancel)_": function(){
+        box.dialog('close');
+      }
+    }
+  });
+  dialogStyle();
+}
+function selectsnapshot(uuid, name ,snaps, opt, getlist){
+  box = $("#iframe-popup");
+  box.html($("#templatesnapshot"+opt).html());
+  const capopt = opt.charAt(0).toUpperCase() + opt.slice(1);
+  var optiontext = capopt + " _(Snapshot)_";
+  box.find('#VMName').html(name);
+  box.find('#targetsnap').val(snaps);
+  box.find('#targetsnapl').html(snaps);
+  if (getlist) {
+    var only = (opt == "remove") ? 0 : 1;
+    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-images", uuid:uuid, snapshotname:snaps, only:only}, function(data){if (data.html) box.find('#targetsnapimages').html(data.html);},'json');
+  }
+  document.getElementById("targetsnapfspc").checked = true;
+  box.dialog({
+    title: optiontext,
+    height: 300,
+    width: 600,
+    resizable: false,
+    modal: true,
+    buttons: {
+      "_(Proceed)_": function(){
+        var target = box.find('#targetsnap');
+        if (target.length) {
+          target = target.val();
+          if (!target) {errorTarget(); return;}
+        } else target = '';
+        var remove = 'yes';
+        var removemeta = 'yes';
+        var keep = 'yes';
+        var free = 'yes';
+        var desc = '';
+        box.find('#targetsnap').prop('disabled',true);
+        if (opt == "revert") {
+          remove = box.find('#targetsnaprmv').prop('checked') ? 'yes' : 'no';
+          removemeta = box.find('#targetsnaprmvmeta').prop('checked') ? 'yes' : 'no';
+          keep = box.find('#targetsnapkeep').prop('checked') ? 'yes' : 'no';
+        }
+        if (opt == "create") {
+          free = box.find('#targetsnapfspc').prop('checked') ? 'yes' : 'no';
+          desc = box.find("#targetsnapdesc").prop('value');
+        }
+        ajaxVMDispatch({action:"snap-" + opt +'-external', uuid:uuid, snapshotname:target, remove:remove, free:free, desc:desc}, "loadlist");
+        box.dialog('close');
+      },
+      "_(Cancel)_": function(){
+        box.dialog('close');
+      }
+    }
+  });
+  dialogStyle();
 }
 
 var sortableHelper = function(e,ui){
@@ -1643,52 +1673,4 @@ $(function() {
     $.post('/webGui/include/InitCharts.php',{cmd:'set',data:JSON.stringify(data)});
   });
 });
-  function dialogStyle() {
-  $('.ui-dialog-titlebar-close').css({'background':'transparent','border':'none','font-size':'1.8rem','margin-top':'-14px','margin-right':'-18px'}).html('<i class="fa fa-times"></i>').prop('title');
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
-}
-function VMClone(uuid, name){
-  //var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
-  var box = $("#dialogWindow");
-  var height = 200;
-  box.html($("#templateClone").html());
-  box.find('#VMBeingCloned').html(name).change() ;
-  box.find('#target').val(name + "_clone") ;
-  document.getElementById("Free").checked = true ;
-  document.getElementById("Overwrite").checked = true ;
-  var Cancel = _("Cancel") ;
-  box.dialog({
-    title: "VM Clone",
-    resizable: false,
-    width: 600,
-    height: 500,
-    modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
-    buttons: {
-      "_(Clone)_": function(){
-        var target = box.find('#target');
-        if (target.length) {
-          target = target.val();
-          //if (!target ) {errorTarget(); return;}
-        } else target = '';
-        var clone = box.find("#target").prop('value');
-        var start = box.find('#Start').prop('checked') ? 'yes' : 'no';
-        var edit = box.find('#Edit').prop('checked') ? 'yes' : 'no';
-        var overwrite = box.find('#Overwrite').prop('checked') ? 'yes' : 'no';
-        var free = box.find('#Free').prop('checked') ? 'yes' : 'no';
-        var scripturl = "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone", name:name, clone:clone, overwrite:overwrite, edit:edit, start:start, free:free}));
-        openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist");
-        box.dialog('close');
-      },
-      "_(Cancel)_": function(){
-        box.dialog('close');
-      }
-    }
-  });
-  dialogStyle();
-}
 </script>

From aef7b4c0121270f4d936245230db8446c16ca8be Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 14:02:22 +0200
Subject: [PATCH 036/266] VMs: add missing space in text

---
 emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
index 8885e269d..570b5b85a 100644
--- a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -137,12 +137,12 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
     }});
     if (vmrcprotocol == "VNC" || vmrcprotocol == "SPICE") { 
       if (console == "web" || console == "both")  {
-        opts.push({text:_("Start with console")+ "(" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
+        opts.push({text:_("Start with console")+ " (" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
           e.preventDefault();
           ajaxVMDispatchconsole({action:"domain-start-console", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;  
         }});}
       if (console == "remote" || console == "both")  {
-        opts.push({text:_("Start with remote-viewer")+ "(" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
+        opts.push({text:_("Start with remote-viewer")+ " (" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
           e.preventDefault();
           ajaxVMDispatchconsoleRV({action:"domain-start-consoleRV", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;  
         }});

From 378eb9916c291f227268aef6fafbf56ff35a11cc Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 14:18:56 +0200
Subject: [PATCH 037/266] Make dialog boxes consistent

---
 emhttp/plugins/dynamix.docker.manager/javascript/docker.js | 2 --
 emhttp/plugins/dynamix/CacheDevices.page                   | 4 ----
 emhttp/plugins/dynamix/DeviceInfo.page                     | 2 --
 emhttp/plugins/dynamix/PHPsettings.page                    | 2 --
 4 files changed, 10 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/javascript/docker.js b/emhttp/plugins/dynamix.docker.manager/javascript/docker.js
index 39f5fd31f..680118fd7 100644
--- a/emhttp/plugins/dynamix.docker.manager/javascript/docker.js
+++ b/emhttp/plugins/dynamix.docker.manager/javascript/docker.js
@@ -66,8 +66,6 @@ function popupWithIframe(title, cmd, reload, func) {
     height: Math.max(window.innerHeight*3/5,600),
     resizable:true,
     modal:true,
-    show:{effect:'fade', duration:250},
-    hide:{effect:'fade', duration:250},
     open:function(ev, ui) {
       $('#myIframe').attr('src', cmd);
     },
diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index c74d8c9b8..7a1787114 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -69,8 +69,6 @@ function addPoolPopup() {
     resizable: false,
     width: 600,
     modal: true,
-    show : {effect:'fade', duration:250},
-    hide : {effect:'fade', duration:250},
     buttons: {
     "_(Add)_": function() {
         if (validate($(this).find('input[name="poolName"]').val())) {
@@ -122,8 +120,6 @@ function addSubpoolPopup(poolname,currentsubpools) {
     resizable: false,
     width: 600,
     modal: true,
-    show : {effect:'fade', duration:250},
-    hide : {effect:'fade', duration:250},
     buttons: {
     "_(Add)_": function() {
         subpool=$(this).find('select[name="subpool"]').val();
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index f6484e61f..96dd50042 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -489,8 +489,6 @@ function renamePoolPopup() {
     resizable: false,
     width: 600,
     modal: true,
-    show : {effect:'fade', duration:250},
-    hide : {effect:'fade', duration:250},
     buttons: {
     "_(Rename)_": function() {
         if (validate($(this).find('input[name="poolName"]').val())) {
diff --git a/emhttp/plugins/dynamix/PHPsettings.page b/emhttp/plugins/dynamix/PHPsettings.page
index b905ca87d..c0472df78 100644
--- a/emhttp/plugins/dynamix/PHPsettings.page
+++ b/emhttp/plugins/dynamix/PHPsettings.page
@@ -137,8 +137,6 @@ function PHPinfo() {
     height: Math.min(window.innerHeight-80,800),
     width: Math.min(window.innerWidth,1200),
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
       "_(Done)_": function(){
         box.dialog('close');

From a2818218c6285f7d77ff25582b7d67a68c4fa04e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 14:21:18 +0200
Subject: [PATCH 038/266] Make dialog boxes consistent

---
 .../plugins/dynamix.docker.manager/include/CreateDocker.php   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index 4651b2951..06ac7afaa 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -406,8 +406,6 @@ function addConfigPopup() {
     resizable: false,
     width: 800,
     modal: true,
-    show : {effect: 'fade' , duration: 250},
-    hide : {effect: 'fade' , duration: 250},
     buttons: {
     "_(Add)_": function() {
         $(this).dialog("close");
@@ -480,8 +478,6 @@ function editConfigPopup(num,disabled) {
     resizable: false,
     width: 800,
     modal: true,
-    show: {effect:'fade', duration: 250},
-    hide: {effect:'fade', duration: 250},
     buttons: {
     "_(Save)_": function() {
         $(this).dialog("close");

From 2f82d097b630d40791415ba249c39021d591ffef Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 14:41:17 +0200
Subject: [PATCH 039/266] Make dialog boxes consistent

---
 .../include/CreateDocker.php                   | 18 ++++++++----------
 emhttp/plugins/dynamix/CacheDevices.page       | 12 ++++--------
 emhttp/plugins/dynamix/DeviceInfo.page         | 11 ++++-------
 emhttp/plugins/dynamix/PHPsettings.page        |  3 ++-
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index 06ac7afaa..dbcdc66c4 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -437,11 +437,10 @@ function addConfigPopup() {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
-  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
-  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
-  $(".ui-button-text").css({'padding':'0px 5px'});
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
 }
 
 function editConfigPopup(num,disabled) {
@@ -518,11 +517,10 @@ function editConfigPopup(num,disabled) {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
-  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
-  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
-  $(".ui-button-text").css({'padding':'0px 5px'});
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
   $('.desc_readmore').readmore({maxHeight:10});
 }
 
diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 7a1787114..3423a5526 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -30,7 +30,6 @@ function isSubpool($name) {
   $subpool = ($tildaPosition!==false) ? substr($name, $tildaPosition+1) : false;
   return ($subpool!==false && in_array($subpool, $subpools)) ? $subpool : false;
 }
-$bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
@@ -85,7 +84,6 @@ function addPoolPopup() {
   $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
   $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
   $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
-  $(".ui-widget-content").css({'background':'<?=$bgcolor?>'});
   $(".ui-button-text").css({'padding':'0px 5px'});
 }
 function removeOption(inputString,value) {
@@ -132,12 +130,10 @@ function addSubpoolPopup(poolname,currentsubpools) {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
-  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
-  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
-  $(".ui-widget-content").css({'background':'<?=$bgcolor?>'});
-  $(".ui-button-text").css({'padding':'0px 5px'});
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
 }
 
 <?if (_var($var,'fsState')=="Started"):?>
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 96dd50042..5bdfe624a 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -23,7 +23,6 @@ $disk       = &$disks[$name] ?? [];
 $dev        = _var($disk,'device');
 $disk['id'] = _var($disk,'id');
 $events     = explode('|',$disk['smEvents'] ?? $var['smEvents'] ?? $numbers);
-$bgcolor    = in_array($display['theme'],['white','azure']) ? '#f2f2f2' : '#1c1c1c';
 $mode       = ['Disabled','Hourly','Daily','Weekly','Monthly'];
 $days       = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
 
@@ -501,12 +500,10 @@ function renamePoolPopup() {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
-  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
-  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
-  $(".ui-widget-content").css({'background':'<?=$bgcolor?>'});
-  $(".ui-button-text").css({'padding':'0px 5px'});
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
 }
 function deletePool() {
   $.cookie('deletepool','deletepool');
diff --git a/emhttp/plugins/dynamix/PHPsettings.page b/emhttp/plugins/dynamix/PHPsettings.page
index c0472df78..cc87f9c02 100644
--- a/emhttp/plugins/dynamix/PHPsettings.page
+++ b/emhttp/plugins/dynamix/PHPsettings.page
@@ -145,7 +145,8 @@ function PHPinfo() {
   });
   $('.ui-dialog-titlebar-close').css({'display':'none'});
   $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-button-text').css({'padding':'0 5px'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
 }
 function preset(form) {
   // reset to default settings

From 4e4d5426e03e35ccb121e35815e62decc42f419f Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 15:15:24 +0200
Subject: [PATCH 040/266] rc.libvirt: fix snapshot folder and link creation

---
 etc/rc.d/rc.libvirt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/rc.d/rc.libvirt b/etc/rc.d/rc.libvirt
index afa2e7217..41236c822 100755
--- a/etc/rc.d/rc.libvirt
+++ b/etc/rc.d/rc.libvirt
@@ -216,9 +216,9 @@ libvirtd_start(){
   # ensure tpm-states path exists
   mkdir -p /etc/libvirt/qemu/swtpm/tpm-states
   # setup snapshot persistance.
-  mkdir -p /etc/libvirt/qemu/snapshot/
-  rm -r /var/lib/libvirt/qemu/snapshot/*
-  ln -fs /etc/libvirt/qemu/snapshot/ /var/lib/libvirt/qemu/
+  mkdir -p /etc/libvirt/qemu/snapshot
+  rm -rf /var/lib/libvirt/qemu/snapshot
+  ln -sf /etc/libvirt/qemu/snapshot /var/lib/libvirt/qemu/snapshot
   # create directory for pid file
   mkdir -p $(dirname $LIBVIRTD_PIDFILE)
 

From b8d932d0500dd120bce4603af67d774ea18d195b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 15:46:38 +0200
Subject: [PATCH 041/266] Prepare for automatic style sheet loading per page

---
 emhttp/plugins/dynamix/include/DefaultPageLayout.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 812c53311..cf3c4418b 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -680,6 +680,12 @@ if ($themes2) echo "</div>";
 echo "</div></div>";
 foreach ($buttons as $button) {
   annotate($button['file']);
+  // include page specific stylesheets (if existing)
+  $css = "/{$button['root']}/sheets/{$button['name']}";
+  $css_stock = "$css.css";
+  $css_theme = "$css-$theme.css";
+  if (is_file($docroot.$css_stock)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_stock),'">',"\n";
+  if (is_file($docroot.$css_theme)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_theme),'">',"\n";
   eval('?>'.parse_text($button['text']));
 }
 unset($buttons,$button);

From 287468005a1422eeb199dda7307b862d88a90c1c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 15:49:06 +0200
Subject: [PATCH 042/266] Prepare for automatic style sheet loading per page

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

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index cf3c4418b..d36fcc2bb 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -686,6 +686,7 @@ foreach ($buttons as $button) {
   $css_theme = "$css-$theme.css";
   if (is_file($docroot.$css_stock)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_stock),'">',"\n";
   if (is_file($docroot.$css_theme)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_theme),'">',"\n";
+  // create page content
   eval('?>'.parse_text($button['text']));
 }
 unset($buttons,$button);

From 202cb8c2224a3cea995ab05d167f6be6d9c0e725 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 19:02:35 +0200
Subject: [PATCH 043/266] Move inline styling in page files to dedicated css
 files

Instead of styling defined inside a page file, these settings are now kept in a dedicated css file. This has several advantages:

- It comes much easier to maintain styling, all css files are easy to find and update
- Browser can cache css files, which may improve page loading time
- Separate theme css files exist, no more need to make selection by coding

- This PR is a 1-to-1 move of existing inline styling to css files
- In future more optimization can be made by consolidating css files
---
 .../plugins/dynamix.apcupsd/UPSsettings.page  | 11 +--
 .../dynamix.apcupsd/sheets/UPSsettings.css    |  4 +
 .../dynamix.docker.manager/AddContainer.page  |  4 +-
 .../DockerContainers.page                     | 15 +---
 .../DockerSettings.page                       | 25 ------
 .../UpdateContainer.page                      |  4 +-
 .../include/CreateDocker.php                  | 14 +---
 .../sheets/AddContainer-azure.css             |  1 +
 .../sheets/AddContainer-black.css             |  1 +
 .../sheets/AddContainer-gray.css              |  1 +
 .../sheets/AddContainer-white.css             |  1 +
 .../sheets/AddContainer.css                   |  9 +++
 .../sheets/DockerContainers.css               | 12 +++
 .../sheets/DockerSettings-azure.css           |  2 +
 .../sheets/DockerSettings-black.css           |  2 +
 .../sheets/DockerSettings-gray.css            |  2 +
 .../sheets/DockerSettings-white.css           |  2 +
 .../sheets/DockerSettings.css                 | 17 +++++
 .../sheets/UpdateContainer-azure.css          |  1 +
 .../sheets/UpdateContainer-black.css          |  1 +
 .../sheets/UpdateContainer-gray.css           |  1 +
 .../sheets/UpdateContainer-white.css          |  1 +
 .../sheets/UpdateContainer.css                |  9 +++
 .../styles/style-azure.css                    | 76 ++++---------------
 .../styles/style-black.css                    | 76 ++++---------------
 .../styles/style-gray.css                     | 76 ++++---------------
 .../styles/style-white.css                    | 76 ++++---------------
 .../dynamix.my.servers/Registration.page      |  7 --
 .../sheets/Registration.css                   |  4 +
 .../dynamix.plugin.manager/PluginHelpers.page |  8 --
 .../dynamix.plugin.manager/Plugins.page       |  8 +-
 .../dynamix.plugin.manager/Update.page        | 19 +----
 .../sheets/PluginHelpers.css                  |  5 ++
 .../dynamix.plugin.manager/sheets/Plugins.css |  2 +
 .../sheets/Update-black.css                   |  1 +
 .../sheets/Update-white.css                   |  1 +
 .../dynamix.plugin.manager/sheets/Update.css  |  9 +++
 emhttp/plugins/dynamix.vm.manager/AddVM.page  |  4 +-
 .../plugins/dynamix.vm.manager/UpdateVM.page  |  4 +-
 .../dynamix.vm.manager/VMMachines.page        | 23 ------
 .../dynamix.vm.manager/VMSettings.page        | 15 ----
 .../dynamix.vm.manager/VMTemplates.page       | 10 +--
 .../dynamix.vm.manager/include/VMedit.php     | 49 ------------
 .../dynamix.vm.manager/scripts/VMAjaxCall.php |  1 -
 .../dynamix.vm.manager/sheets/AddVM-azure.css |  4 +
 .../dynamix.vm.manager/sheets/AddVM-black.css |  4 +
 .../dynamix.vm.manager/sheets/AddVM-gray.css  |  4 +
 .../dynamix.vm.manager/sheets/AddVM-white.css |  4 +
 .../dynamix.vm.manager/sheets/AddVM.css       | 42 ++++++++++
 .../sheets/UpdateVM-azure.css                 |  4 +
 .../sheets/UpdateVM-black.css                 |  4 +
 .../sheets/UpdateVM-gray.css                  |  4 +
 .../sheets/UpdateVM-white.css                 |  4 +
 .../dynamix.vm.manager/sheets/UpdateVM.css    | 42 ++++++++++
 .../sheets/VMMachines-azure.css               |  1 +
 .../sheets/VMMachines-black.css               |  1 +
 .../sheets/VMMachines-gray.css                |  1 +
 .../sheets/VMMachines-white.css               |  1 +
 .../dynamix.vm.manager/sheets/VMMachines.css  | 20 +++++
 .../sheets/VMSettings-azure.css               |  1 +
 .../sheets/VMSettings-black.css               |  1 +
 .../sheets/VMSettings-gray.css                |  1 +
 .../sheets/VMSettings-white.css               |  1 +
 .../dynamix.vm.manager/sheets/VMSettings.css  | 12 +++
 .../dynamix.vm.manager/sheets/VMTemplates.css |  4 +
 emhttp/plugins/dynamix.vm.manager/spice.html  | 51 ++-----------
 emhttp/plugins/dynamix/Apps.page              |  8 +-
 emhttp/plugins/dynamix/ArrayOperation.page    |  7 --
 emhttp/plugins/dynamix/Browse.page            | 34 ---------
 emhttp/plugins/dynamix/CPUvms.page            | 12 +--
 emhttp/plugins/dynamix/CacheDevices.page      |  4 +-
 emhttp/plugins/dynamix/DashStats.page         | 69 +----------------
 emhttp/plugins/dynamix/DeviceIdentify.page    |  4 -
 emhttp/plugins/dynamix/DeviceInfo.page        |  9 +--
 emhttp/plugins/dynamix/Diagnostics.page       | 15 +---
 emhttp/plugins/dynamix/Disk.page              | 21 +----
 emhttp/plugins/dynamix/DiskList.page          |  5 --
 emhttp/plugins/dynamix/DiskSettings.page      |  4 -
 emhttp/plugins/dynamix/DisplaySettings.page   |  6 --
 emhttp/plugins/dynamix/Eth0.page              | 14 ----
 emhttp/plugins/dynamix/Flash.page             | 17 +----
 emhttp/plugins/dynamix/InstallKey.page        |  6 +-
 emhttp/plugins/dynamix/Language.page          |  7 --
 emhttp/plugins/dynamix/ManagementAccess.page  |  4 -
 emhttp/plugins/dynamix/NetworkExtra.page      |  7 --
 emhttp/plugins/dynamix/NetworkRules.page      |  6 --
 emhttp/plugins/dynamix/NewConfig.page         |  8 +-
 emhttp/plugins/dynamix/NewPerms.page          |  6 --
 emhttp/plugins/dynamix/Notifications.page     |  9 +--
 .../plugins/dynamix/NotificationsArchive.page |  6 --
 emhttp/plugins/dynamix/PHPsettings.page       |  6 --
 emhttp/plugins/dynamix/RoutingTable.page      |  6 --
 emhttp/plugins/dynamix/Share.page             | 18 +----
 emhttp/plugins/dynamix/ShareEdit.page         | 12 ---
 emhttp/plugins/dynamix/ShareList.page         |  8 --
 emhttp/plugins/dynamix/SysDevs.page           | 10 +--
 emhttp/plugins/dynamix/SysDrivers.page        | 12 ---
 emhttp/plugins/dynamix/Syslinux.page          | 27 +------
 emhttp/plugins/dynamix/Syslog.page            |  3 -
 emhttp/plugins/dynamix/SyslogSettings.page    |  3 -
 emhttp/plugins/dynamix/UserAdd.page           | 19 +----
 emhttp/plugins/dynamix/UserEdit.page          | 19 +----
 emhttp/plugins/dynamix/UserList.page          |  7 --
 emhttp/plugins/dynamix/WG0.page               | 34 +--------
 emhttp/plugins/dynamix/include/Templates.php  | 42 ----------
 emhttp/plugins/dynamix/sheets/Apps.css        |  1 +
 .../plugins/dynamix/sheets/ArrayOperation.css |  5 ++
 .../plugins/dynamix/sheets/Browse-azure.css   |  2 +
 .../plugins/dynamix/sheets/Browse-black.css   |  4 +
 emhttp/plugins/dynamix/sheets/Browse-gray.css |  2 +
 .../plugins/dynamix/sheets/Browse-white.css   |  2 +
 emhttp/plugins/dynamix/sheets/Browse.css      | 26 +++++++
 .../dynamix/sheets/BrowseButton-azure.css     |  7 ++
 .../dynamix/sheets/BrowseButton-black.css     |  7 ++
 .../dynamix/sheets/BrowseButton-gray.css      |  7 ++
 .../dynamix/sheets/BrowseButton-white.css     |  7 ++
 .../plugins/dynamix/sheets/BrowseButton.css   | 25 ++++++
 emhttp/plugins/dynamix/sheets/CPUvms.css      |  6 ++
 .../plugins/dynamix/sheets/CacheDevices.css   |  1 +
 .../dynamix/sheets/DashStats-azure.css        |  1 +
 .../dynamix/sheets/DashStats-black.css        |  1 +
 .../plugins/dynamix/sheets/DashStats-gray.css |  1 +
 .../dynamix/sheets/DashStats-white.css        |  1 +
 emhttp/plugins/dynamix/sheets/DashStats.css   | 64 ++++++++++++++++
 .../plugins/dynamix/sheets/DeviceIdentify.css |  2 +
 emhttp/plugins/dynamix/sheets/DeviceInfo.css  |  6 ++
 emhttp/plugins/dynamix/sheets/Diagnostics.css |  9 +++
 emhttp/plugins/dynamix/sheets/Disk-azure.css  |  2 +
 emhttp/plugins/dynamix/sheets/Disk-black.css  |  2 +
 emhttp/plugins/dynamix/sheets/Disk-gray.css   |  2 +
 emhttp/plugins/dynamix/sheets/Disk-white.css  |  2 +
 emhttp/plugins/dynamix/sheets/Disk.css        |  4 +
 emhttp/plugins/dynamix/sheets/DiskList.css    |  2 +
 .../plugins/dynamix/sheets/DiskSettings.css   |  1 +
 .../dynamix/sheets/DisplaySettings.css        |  3 +
 emhttp/plugins/dynamix/sheets/Eth0.css        | 12 +++
 emhttp/plugins/dynamix/sheets/Flash-azure.css |  2 +
 emhttp/plugins/dynamix/sheets/Flash-black.css |  2 +
 emhttp/plugins/dynamix/sheets/Flash-gray.css  |  2 +
 emhttp/plugins/dynamix/sheets/Flash-white.css |  2 +
 emhttp/plugins/dynamix/sheets/Flash.css       |  4 +
 emhttp/plugins/dynamix/sheets/InstallKey.css  |  1 +
 .../plugins/dynamix/sheets/Language-azure.css |  1 +
 .../plugins/dynamix/sheets/Language-black.css |  1 +
 .../plugins/dynamix/sheets/Language-gray.css  |  1 +
 .../plugins/dynamix/sheets/Language-white.css |  1 +
 emhttp/plugins/dynamix/sheets/Language.css    |  4 +
 .../dynamix/sheets/ManagementAccess.css       |  1 +
 .../dynamix/sheets/NetworkExtra-black.css     |  1 +
 .../dynamix/sheets/NetworkExtra-white.css     |  1 +
 .../plugins/dynamix/sheets/NetworkExtra.css   |  1 +
 .../dynamix/sheets/NetworkRules-black.css     |  1 +
 .../dynamix/sheets/NetworkRules-white.css     |  1 +
 .../plugins/dynamix/sheets/NetworkRules.css   |  1 +
 emhttp/plugins/dynamix/sheets/NewConfig.css   |  1 +
 emhttp/plugins/dynamix/sheets/NewPerms.css    |  3 +
 .../plugins/dynamix/sheets/Notifications.css  |  3 +
 .../dynamix/sheets/NotificationsArchive.css   |  3 +
 emhttp/plugins/dynamix/sheets/PHPsettings.css |  4 +
 .../dynamix/sheets/RoutingTable-black.css     |  1 +
 .../dynamix/sheets/RoutingTable-white.css     |  1 +
 .../plugins/dynamix/sheets/RoutingTable.css   |  1 +
 emhttp/plugins/dynamix/sheets/Share-azure.css |  2 +
 emhttp/plugins/dynamix/sheets/Share-black.css |  2 +
 emhttp/plugins/dynamix/sheets/Share-gray.css  |  2 +
 emhttp/plugins/dynamix/sheets/Share-white.css |  2 +
 emhttp/plugins/dynamix/sheets/Share.css       |  5 ++
 .../dynamix/sheets/ShareEdit-black.css        |  1 +
 .../dynamix/sheets/ShareEdit-white.css        |  1 +
 emhttp/plugins/dynamix/sheets/ShareEdit.css   |  6 ++
 emhttp/plugins/dynamix/sheets/ShareList.css   |  5 ++
 emhttp/plugins/dynamix/sheets/SysDevs.css     |  4 +
 emhttp/plugins/dynamix/sheets/SysDrivers.css  |  9 +++
 .../plugins/dynamix/sheets/Syslinux-azure.css |  2 +
 .../plugins/dynamix/sheets/Syslinux-black.css |  2 +
 .../plugins/dynamix/sheets/Syslinux-gray.css  |  2 +
 .../plugins/dynamix/sheets/Syslinux-white.css |  2 +
 emhttp/plugins/dynamix/sheets/Syslinux.css    |  3 +
 emhttp/plugins/dynamix/sheets/Syslog.css      |  1 +
 .../plugins/dynamix/sheets/SyslogSettings.css |  1 +
 .../plugins/dynamix/sheets/UserAdd-azure.css  |  1 +
 .../plugins/dynamix/sheets/UserAdd-black.css  |  1 +
 .../plugins/dynamix/sheets/UserAdd-gray.css   |  1 +
 .../plugins/dynamix/sheets/UserAdd-white.css  |  1 +
 emhttp/plugins/dynamix/sheets/UserAdd.css     |  3 +
 .../plugins/dynamix/sheets/UserEdit-azure.css |  1 +
 .../plugins/dynamix/sheets/UserEdit-black.css |  1 +
 .../plugins/dynamix/sheets/UserEdit-gray.css  |  1 +
 .../plugins/dynamix/sheets/UserEdit-white.css |  1 +
 emhttp/plugins/dynamix/sheets/UserEdit.css    |  3 +
 .../plugins/dynamix/sheets/UserList-black.css |  1 +
 .../plugins/dynamix/sheets/UserList-white.css |  1 +
 emhttp/plugins/dynamix/sheets/UserList.css    |  1 +
 emhttp/plugins/dynamix/sheets/WG0-azure.css   |  2 +
 emhttp/plugins/dynamix/sheets/WG0-black.css   |  2 +
 emhttp/plugins/dynamix/sheets/WG0-gray.css    |  2 +
 emhttp/plugins/dynamix/sheets/WG0-white.css   |  2 +
 emhttp/plugins/dynamix/sheets/WG0.css         | 29 +++++++
 198 files changed, 729 insertions(+), 978 deletions(-)
 create mode 100644 emhttp/plugins/dynamix.apcupsd/sheets/UPSsettings.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-azure.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-black.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-gray.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-white.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/DockerContainers.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-azure.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-black.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-gray.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-white.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-azure.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-black.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-gray.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-white.css
 create mode 100644 emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
 create mode 100644 emhttp/plugins/dynamix.my.servers/sheets/Registration.css
 create mode 100644 emhttp/plugins/dynamix.plugin.manager/sheets/PluginHelpers.css
 create mode 100644 emhttp/plugins/dynamix.plugin.manager/sheets/Plugins.css
 create mode 100644 emhttp/plugins/dynamix.plugin.manager/sheets/Update-black.css
 create mode 100644 emhttp/plugins/dynamix.plugin.manager/sheets/Update-white.css
 create mode 100644 emhttp/plugins/dynamix.plugin.manager/sheets/Update.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/AddVM-azure.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/AddVM-black.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/AddVM-gray.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/AddVM-white.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-azure.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-black.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-gray.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-white.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-azure.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-black.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-gray.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-white.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-azure.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-black.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-gray.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-white.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMSettings.css
 create mode 100644 emhttp/plugins/dynamix.vm.manager/sheets/VMTemplates.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Apps.css
 create mode 100644 emhttp/plugins/dynamix/sheets/ArrayOperation.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Browse-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Browse-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Browse-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Browse-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Browse.css
 create mode 100644 emhttp/plugins/dynamix/sheets/BrowseButton-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/BrowseButton-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/BrowseButton-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/BrowseButton-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/BrowseButton.css
 create mode 100644 emhttp/plugins/dynamix/sheets/CPUvms.css
 create mode 100644 emhttp/plugins/dynamix/sheets/CacheDevices.css
 create mode 100644 emhttp/plugins/dynamix/sheets/DashStats-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/DashStats-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/DashStats-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/DashStats-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/DashStats.css
 create mode 100644 emhttp/plugins/dynamix/sheets/DeviceIdentify.css
 create mode 100644 emhttp/plugins/dynamix/sheets/DeviceInfo.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Diagnostics.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Disk-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Disk-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Disk-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Disk-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Disk.css
 create mode 100644 emhttp/plugins/dynamix/sheets/DiskList.css
 create mode 100644 emhttp/plugins/dynamix/sheets/DiskSettings.css
 create mode 100644 emhttp/plugins/dynamix/sheets/DisplaySettings.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Eth0.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Flash-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Flash-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Flash-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Flash-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Flash.css
 create mode 100644 emhttp/plugins/dynamix/sheets/InstallKey.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Language-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Language-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Language-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Language-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Language.css
 create mode 100644 emhttp/plugins/dynamix/sheets/ManagementAccess.css
 create mode 100644 emhttp/plugins/dynamix/sheets/NetworkExtra-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/NetworkExtra-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/NetworkExtra.css
 create mode 100644 emhttp/plugins/dynamix/sheets/NetworkRules-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/NetworkRules-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/NetworkRules.css
 create mode 100644 emhttp/plugins/dynamix/sheets/NewConfig.css
 create mode 100644 emhttp/plugins/dynamix/sheets/NewPerms.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Notifications.css
 create mode 100644 emhttp/plugins/dynamix/sheets/NotificationsArchive.css
 create mode 100644 emhttp/plugins/dynamix/sheets/PHPsettings.css
 create mode 100644 emhttp/plugins/dynamix/sheets/RoutingTable-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/RoutingTable-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/RoutingTable.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Share-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Share-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Share-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Share-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Share.css
 create mode 100644 emhttp/plugins/dynamix/sheets/ShareEdit-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/ShareEdit-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/ShareEdit.css
 create mode 100644 emhttp/plugins/dynamix/sheets/ShareList.css
 create mode 100644 emhttp/plugins/dynamix/sheets/SysDevs.css
 create mode 100644 emhttp/plugins/dynamix/sheets/SysDrivers.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Syslinux-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Syslinux-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Syslinux-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Syslinux-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Syslinux.css
 create mode 100644 emhttp/plugins/dynamix/sheets/Syslog.css
 create mode 100644 emhttp/plugins/dynamix/sheets/SyslogSettings.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserAdd-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserAdd-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserAdd-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserAdd-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserAdd.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserEdit-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserEdit-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserEdit-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserEdit-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserEdit.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserList-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserList-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/UserList.css
 create mode 100644 emhttp/plugins/dynamix/sheets/WG0-azure.css
 create mode 100644 emhttp/plugins/dynamix/sheets/WG0-black.css
 create mode 100644 emhttp/plugins/dynamix/sheets/WG0-gray.css
 create mode 100644 emhttp/plugins/dynamix/sheets/WG0-white.css
 create mode 100644 emhttp/plugins/dynamix/sheets/WG0.css

diff --git a/emhttp/plugins/dynamix.apcupsd/UPSsettings.page b/emhttp/plugins/dynamix.apcupsd/UPSsettings.page
index 973a5e297..cdde2cf31 100644
--- a/emhttp/plugins/dynamix.apcupsd/UPSsettings.page
+++ b/emhttp/plugins/dynamix.apcupsd/UPSsettings.page
@@ -5,8 +5,8 @@ Icon="icon-ups"
 Tag="battery-3"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015, Dan Landon.
  *
  * This program is free software; you can redistribute it and/or
@@ -22,13 +22,6 @@ Tag="battery-3"
 $sName = "dynamix.apcupsd";
 $cfg = parse_plugin_cfg($sName);
 ?>
-
-<style>
-table.ups thead tr th{width:16.6%;padding-left:10px}
-table.ups tbody tr td{padding-left:10px;font-weight:bold}
-tr.ups{height:3rem;line-height:3rem}
-i.ups{margin-right:8px}
-</style>
 <script>
 function toggleCustomCable(form) {
   var readonly = form.UPSCABLE.value != 'custom';
diff --git a/emhttp/plugins/dynamix.apcupsd/sheets/UPSsettings.css b/emhttp/plugins/dynamix.apcupsd/sheets/UPSsettings.css
new file mode 100644
index 000000000..d8b1dbb96
--- /dev/null
+++ b/emhttp/plugins/dynamix.apcupsd/sheets/UPSsettings.css
@@ -0,0 +1,4 @@
+table.ups thead tr th{width:16.6%;padding-left:10px}
+table.ups tbody tr td{padding-left:10px;font-weight:bold}
+tr.ups{height:3rem;line-height:3rem}
+i.ups{margin-right:8px}
diff --git a/emhttp/plugins/dynamix.docker.manager/AddContainer.page b/emhttp/plugins/dynamix.docker.manager/AddContainer.page
index 7562c3376..9afe0734d 100644
--- a/emhttp/plugins/dynamix.docker.manager/AddContainer.page
+++ b/emhttp/plugins/dynamix.docker.manager/AddContainer.page
@@ -3,9 +3,9 @@ Cond="(pgrep('dockerd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, 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,
diff --git a/emhttp/plugins/dynamix.docker.manager/DockerContainers.page b/emhttp/plugins/dynamix.docker.manager/DockerContainers.page
index 42e9faab3..516c198d0 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerContainers.page
@@ -29,20 +29,7 @@ $cpus    = cpu_list();
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.ui.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
-<style>
-.basic{display:block}
-.advanced{display:none;white-space:nowrap}
-.log{cursor:zoom-in}
-.exec{cursor:pointer}
-table#docker_containers{text-align:left}
-th.five{width:5%}
-th.nine{width:9%}
-th.load{width:140px}
-input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;background-color:transparent}
-table tbody td{line-height:normal}
-i.mover{margin-right:8px;display:none}
-#resetsort{margin-left:12px;display:inline-block;width:32px}
-</style>
+
 <table id="docker_containers" class="tablesorter shift">
 <thead><tr><th><a id="resetsort" class="nohand" onclick="resetSorting()" title="_(Reset sorting)_"><i class="fa fa-th-list"></i></a>_(Application)_</th><th>_(Version)_</th><th>_(Network)_</th><th>_(Port Mappings)_ <small>(_(App to Host)_)</small></th><th>_(Volume Mappings)_ <small>(_(App to Host)_)</small></th><th class="load advanced">_(CPU & Memory load)_</th><th class="nine">_(Autostart)_</th><th class="five">_(Uptime)_</th></tr></thead>
 <tbody id="docker_list"><tr><td colspan='8'></td></tr></tbody>
diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
index 9ec4e396d..d7983e98f 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
@@ -106,31 +106,6 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-.errortext{color:#EF3D47;display:none;margin-left:20px}
-.fileTree{background:<?=$bgcolor?>;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
-.basic{display:inline-block}
-.advanced{display:none}
-select.mask{min-width:0;margin:0 10px 0 4px}
-select.net{min-width:0;margin:0 4px 0 2px}
-select option.hide{display:none}
-input.ip4{width:100px;margin:0 4px 0 1px}
-input.ip6{width:140px;margin:0 4px}
-input.gw4{width:100px;margin:0 4px 0 1px}
-input.gw6{width:160px;margin:0 4px}
-input.pool6{width:40px;margin:0 4px 0 1px}
-span.net{margin-left:4px;margin-right:2px}
-span.ip4{display:inline-block;width:260px}
-span.ip6{display:inline-block;width:310px}
-span.gw4{display:inline-block;width:200px}
-span.gw6{display:inline-block;width:270px}
-span.nonexist{margin-left:20px}
-<?if (strstr('white,azure',$display['theme'])):?>
-span.disabled{color:#B0B0B0}
-<?else:?>
-span.disabled{color:#404040}
-<?endif;?>
-</style>
 <span class="status vhshift"><input type="checkbox" class="advancedview"></span>
 
 <form markdown="1" id="settingsForm" name="settingsForm" method="POST" action="/update.php" target="progressFrame" onsubmit="return prepareDocker(this)">
diff --git a/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page b/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page
index 764db4758..502df4806 100644
--- a/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page
+++ b/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page
@@ -3,9 +3,9 @@ Cond="(pgrep('dockerd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, 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,
diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index dbcdc66c4..bd96ee61b 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2015-2023, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -277,18 +277,6 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.filetree.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
 
-<style>
-.noshow,.advanced{display:none}
-.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:<?=$bgcolor?>}
-.required:after{content:" *";color:#E80000}
-span.boxed{display:inline-block;line-height:normal;white-space:normal;width:56%}
-span.cpu,label.checkbox{display:inline-block;width:32px}
-span.ct{display:inline-block;width:230px}
-span.net{display:inline-block;width:120px}
-span.ip{display:inline-block;width:160px}
-dl,dt,dd{line-height:normal!important}
-</style>
-
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script src="<?autov('/webGui/javascript/jquery.filetree.js')?>" charset="utf-8"></script>
 <script src="<?autov('/plugins/dynamix.vm.manager/javascript/dynamix.vm.manager.js')?>"></script>
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-azure.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-azure.css
new file mode 100644
index 000000000..87419de0b
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-azure.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-black.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-black.css
new file mode 100644
index 000000000..5bfde958d
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-black.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-gray.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-gray.css
new file mode 100644
index 000000000..5bfde958d
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-gray.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-white.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-white.css
new file mode 100644
index 000000000..87419de0b
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-white.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
new file mode 100644
index 000000000..5e3a5b5f0
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
@@ -0,0 +1,9 @@
+.noshow,.advanced{display:none}
+.required:after{content:" *";color:#E80000}
+span.boxed{display:inline-block;line-height:normal;white-space:normal;width:56%}
+span.cpu,label.checkbox{display:inline-block;width:32px}
+span.ct{display:inline-block;width:230px}
+span.net{display:inline-block;width:120px}
+span.ip{display:inline-block;width:160px}
+dl,dt,dd{line-height:normal!important}
+
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerContainers.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerContainers.css
new file mode 100644
index 000000000..f57f754f0
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerContainers.css
@@ -0,0 +1,12 @@
+.basic{display:block}
+.advanced{display:none;white-space:nowrap}
+.log{cursor:zoom-in}
+.exec{cursor:pointer}
+table#docker_containers{text-align:left}
+th.five{width:5%}
+th.nine{width:9%}
+th.load{width:140px}
+input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;background-color:transparent}
+table tbody td{line-height:normal}
+i.mover{margin-right:8px;display:none}
+#resetsort{margin-left:12px;display:inline-block;width:32px}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-azure.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-azure.css
new file mode 100644
index 000000000..d60555212
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-azure.css
@@ -0,0 +1,2 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#B0B0B0}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-black.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-black.css
new file mode 100644
index 000000000..97dd4a600
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-black.css
@@ -0,0 +1,2 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#404040}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-gray.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-gray.css
new file mode 100644
index 000000000..97dd4a600
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-gray.css
@@ -0,0 +1,2 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#404040}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-white.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-white.css
new file mode 100644
index 000000000..d60555212
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-white.css
@@ -0,0 +1,2 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#B0B0B0}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings.css
new file mode 100644
index 000000000..b4db05070
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings.css
@@ -0,0 +1,17 @@
+.errortext{color:#EF3D47;display:none;margin-left:20px}
+.basic{display:inline-block}
+.advanced{display:none}
+select.mask{min-width:0;margin:0 10px 0 4px}
+select.net{min-width:0;margin:0 4px 0 2px}
+select option.hide{display:none}
+input.ip4{width:100px;margin:0 4px 0 1px}
+input.ip6{width:140px;margin:0 4px}
+input.gw4{width:100px;margin:0 4px 0 1px}
+input.gw6{width:160px;margin:0 4px}
+input.pool6{width:40px;margin:0 4px 0 1px}
+span.net{margin-left:4px;margin-right:2px}
+span.ip4{display:inline-block;width:260px}
+span.ip6{display:inline-block;width:310px}
+span.gw4{display:inline-block;width:200px}
+span.gw6{display:inline-block;width:270px}
+span.nonexist{margin-left:20px}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-azure.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-azure.css
new file mode 100644
index 000000000..87419de0b
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-azure.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-black.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-black.css
new file mode 100644
index 000000000..5bfde958d
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-black.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-gray.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-gray.css
new file mode 100644
index 000000000..5bfde958d
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-gray.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-white.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-white.css
new file mode 100644
index 000000000..87419de0b
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-white.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
new file mode 100644
index 000000000..5e3a5b5f0
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
@@ -0,0 +1,9 @@
+.noshow,.advanced{display:none}
+.required:after{content:" *";color:#E80000}
+span.boxed{display:inline-block;line-height:normal;white-space:normal;width:56%}
+span.cpu,label.checkbox{display:inline-block;width:32px}
+span.ct{display:inline-block;width:230px}
+span.net{display:inline-block;width:120px}
+span.ip{display:inline-block;width:160px}
+dl,dt,dd{line-height:normal!important}
+
diff --git a/emhttp/plugins/dynamix.docker.manager/styles/style-azure.css b/emhttp/plugins/dynamix.docker.manager/styles/style-azure.css
index af78778ad..260009398 100644
--- a/emhttp/plugins/dynamix.docker.manager/styles/style-azure.css
+++ b/emhttp/plugins/dynamix.docker.manager/styles/style-azure.css
@@ -1,62 +1,14 @@
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
-  font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
-  color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
-}
-.ui-dropdownchecklist .ui-state-default{
-  background:#f2f2f2;
-  border:none;
-  box-shadow:none;
-  outline:none;
-  cursor:pointer;
-  height:2.2rem;
-  line-height:2.2rem;
-}
-.ui-dropdownchecklist-group{
-  font-weight:normal;
-  font-style:italic;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector{
-  border:1px solid #1c1c1c;
-  display:inline-block;
-  cursor:pointer;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector-wrapper{
-  vertical-align:middle;
-  font-size:0;
-}
-.ui-widget-header{
-  border:none;
-  background:#e3e3e3;
-  color:#1c1c1c;
-  font-weight:bold;
-}
-.ui-widget-content{
-  border:1px solid #1c1c1c;
-  background:#f2f2f2;
-  color:#1c1c1c;
-
-.ui-state-active{
-  background:#e8e8e8;
-}
-.ui-dropdownchecklist-dropcontainer{
-  background:#f2f2f2;
-  border:1px solid #1c1c1c;
-}
-.ui-state-disabled{
-  color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5;
-}
-.ui-dropdownchecklist-indent{
-  padding-left:7px;
-}
-.ui-dropdownchecklist-text{
-  color:#1c1c1c;
-  font-size:1.3rem;
-}
-.ui-dropdownchecklist .ui-widget-content .ui-state-default{
-  background:#f2f2f2;
-  border:0px;
-}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#f2f2f2;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #1c1c1c;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#e3e3e3;color:#1c1c1c;font-weight:bold}
+.ui-widget-content{border:1px solid #1c1c1c;background:#f2f2f2;color:#1c1c1c}
+.ui-state-active{background:#e8e8e8}
+.ui-dropdownchecklist-dropcontainer{background:#f2f2f2;border:1px solid #1c1c1c}
+.ui-state-disabled{color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#1c1c1c;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#f2f2f2;border:0px}
diff --git a/emhttp/plugins/dynamix.docker.manager/styles/style-black.css b/emhttp/plugins/dynamix.docker.manager/styles/style-black.css
index 4757973a7..064aa4307 100644
--- a/emhttp/plugins/dynamix.docker.manager/styles/style-black.css
+++ b/emhttp/plugins/dynamix.docker.manager/styles/style-black.css
@@ -1,62 +1,14 @@
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
-  font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
-  color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
-}
-.ui-dropdownchecklist .ui-state-default{
-  background:#1c1c1c;
-  border:none;
-  box-shadow:none;
-  outline:none;
-  cursor:pointer;
-  height:2.2rem;
-  line-height:2.2rem;
-}
-.ui-dropdownchecklist-group{
-  font-weight:normal;
-  font-style:italic;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector{
-  border:1px solid #e5e5e5;
-  display:inline-block;
-  cursor:pointer;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector-wrapper{
-  vertical-align:middle;
-  font-size:0;
-}
-.ui-widget-header{
-  border:none;
-  background:#2b2b2b;
-  color:#f2f2f2;
-  font-weight:bold;
-}
-.ui-widget-content{
-  border:1px solid #e5e5e5;
-  background:#1c1c1c;
-  color:#f2f2f2;
-
-.ui-state-active{
-  background:#262626;
-}
-.ui-dropdownchecklist-dropcontainer{
-  background:#1c1c1c;
-  border:1px solid #e5e5e5;
-}
-.ui-state-disabled{
-  color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5;
-}
-.ui-dropdownchecklist-indent{
-  padding-left:7px;
-}
-.ui-dropdownchecklist-text{
-  color:#f2f2f2;
-  font-size:1.3rem;
-}
-.ui-dropdownchecklist .ui-widget-content .ui-state-default{
-  background:#1c1c1c;
-  border:0px;
-}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#1c1c1c;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #e5e5e5;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#2b2b2b;color:#f2f2f2;font-weight:bold}
+.ui-widget-content{border:1px solid #e5e5e5;background:#1c1c1c;color:#f2f2f2}
+.ui-state-active{background:#262626}
+.ui-dropdownchecklist-dropcontainer{background:#1c1c1c;border:1px solid #e5e5e5}
+.ui-state-disabled{color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#f2f2f2;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#1c1c1c;border:0px}
diff --git a/emhttp/plugins/dynamix.docker.manager/styles/style-gray.css b/emhttp/plugins/dynamix.docker.manager/styles/style-gray.css
index 4757973a7..064aa4307 100644
--- a/emhttp/plugins/dynamix.docker.manager/styles/style-gray.css
+++ b/emhttp/plugins/dynamix.docker.manager/styles/style-gray.css
@@ -1,62 +1,14 @@
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
-  font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
-  color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
-}
-.ui-dropdownchecklist .ui-state-default{
-  background:#1c1c1c;
-  border:none;
-  box-shadow:none;
-  outline:none;
-  cursor:pointer;
-  height:2.2rem;
-  line-height:2.2rem;
-}
-.ui-dropdownchecklist-group{
-  font-weight:normal;
-  font-style:italic;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector{
-  border:1px solid #e5e5e5;
-  display:inline-block;
-  cursor:pointer;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector-wrapper{
-  vertical-align:middle;
-  font-size:0;
-}
-.ui-widget-header{
-  border:none;
-  background:#2b2b2b;
-  color:#f2f2f2;
-  font-weight:bold;
-}
-.ui-widget-content{
-  border:1px solid #e5e5e5;
-  background:#1c1c1c;
-  color:#f2f2f2;
-
-.ui-state-active{
-  background:#262626;
-}
-.ui-dropdownchecklist-dropcontainer{
-  background:#1c1c1c;
-  border:1px solid #e5e5e5;
-}
-.ui-state-disabled{
-  color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5;
-}
-.ui-dropdownchecklist-indent{
-  padding-left:7px;
-}
-.ui-dropdownchecklist-text{
-  color:#f2f2f2;
-  font-size:1.3rem;
-}
-.ui-dropdownchecklist .ui-widget-content .ui-state-default{
-  background:#1c1c1c;
-  border:0px;
-}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#1c1c1c;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #e5e5e5;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#2b2b2b;color:#f2f2f2;font-weight:bold}
+.ui-widget-content{border:1px solid #e5e5e5;background:#1c1c1c;color:#f2f2f2}
+.ui-state-active{background:#262626}
+.ui-dropdownchecklist-dropcontainer{background:#1c1c1c;border:1px solid #e5e5e5}
+.ui-state-disabled{color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#f2f2f2;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#1c1c1c;border:0px}
diff --git a/emhttp/plugins/dynamix.docker.manager/styles/style-white.css b/emhttp/plugins/dynamix.docker.manager/styles/style-white.css
index af78778ad..260009398 100644
--- a/emhttp/plugins/dynamix.docker.manager/styles/style-white.css
+++ b/emhttp/plugins/dynamix.docker.manager/styles/style-white.css
@@ -1,62 +1,14 @@
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
-  font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
-  color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
-}
-.ui-dropdownchecklist .ui-state-default{
-  background:#f2f2f2;
-  border:none;
-  box-shadow:none;
-  outline:none;
-  cursor:pointer;
-  height:2.2rem;
-  line-height:2.2rem;
-}
-.ui-dropdownchecklist-group{
-  font-weight:normal;
-  font-style:italic;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector{
-  border:1px solid #1c1c1c;
-  display:inline-block;
-  cursor:pointer;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector-wrapper{
-  vertical-align:middle;
-  font-size:0;
-}
-.ui-widget-header{
-  border:none;
-  background:#e3e3e3;
-  color:#1c1c1c;
-  font-weight:bold;
-}
-.ui-widget-content{
-  border:1px solid #1c1c1c;
-  background:#f2f2f2;
-  color:#1c1c1c;
-
-.ui-state-active{
-  background:#e8e8e8;
-}
-.ui-dropdownchecklist-dropcontainer{
-  background:#f2f2f2;
-  border:1px solid #1c1c1c;
-}
-.ui-state-disabled{
-  color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5;
-}
-.ui-dropdownchecklist-indent{
-  padding-left:7px;
-}
-.ui-dropdownchecklist-text{
-  color:#1c1c1c;
-  font-size:1.3rem;
-}
-.ui-dropdownchecklist .ui-widget-content .ui-state-default{
-  background:#f2f2f2;
-  border:0px;
-}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#f2f2f2;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #1c1c1c;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#e3e3e3;color:#1c1c1c;font-weight:bold}
+.ui-widget-content{border:1px solid #1c1c1c;background:#f2f2f2;color:#1c1c1c}
+.ui-state-active{background:#e8e8e8}
+.ui-dropdownchecklist-dropcontainer{background:#f2f2f2;border:1px solid #1c1c1c}
+.ui-state-disabled{color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#1c1c1c;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#f2f2f2;border:0px}
diff --git a/emhttp/plugins/dynamix.my.servers/Registration.page b/emhttp/plugins/dynamix.my.servers/Registration.page
index fa79d9bc9..04bb0b400 100644
--- a/emhttp/plugins/dynamix.my.servers/Registration.page
+++ b/emhttp/plugins/dynamix.my.servers/Registration.page
@@ -26,13 +26,6 @@ function my_time_now($time) {
 $regGen = (int)$var['regGen'] ?? 0;
 $trialExtensionEligible = $regGen === 0 || $regGen === 1;
 ?>
-<style>
-span.thanks{padding-left:12px;color:#6FA239;font-weight:bold;}
-span.thanks.red{color:#F0000C;}
-div.device{padding:0 12px;font-weight:normal;font-style:italic;}
-div.remark{padding:0 12px;text-align:justify;}
-</style>
-
 <?if ( (strstr($var['regTy'], "unregistered")) or ($var['regTy']=="Trial") or (strstr($var['regTy'], "no connection")) or (strstr($var['regTy'], "withdrawn")) or (strstr($var['regTy'], "expired")) ):?>
 
 <span class="thanks">_(Thank you for trying Unraid OS)_!</span>
diff --git a/emhttp/plugins/dynamix.my.servers/sheets/Registration.css b/emhttp/plugins/dynamix.my.servers/sheets/Registration.css
new file mode 100644
index 000000000..2e70df6ad
--- /dev/null
+++ b/emhttp/plugins/dynamix.my.servers/sheets/Registration.css
@@ -0,0 +1,4 @@
+span.thanks{padding-left:12px;color:#6FA239;font-weight:bold;}
+span.thanks.red{color:#F0000C;}
+div.device{padding:0 12px;font-weight:normal;font-style:italic;}
+div.remark{padding:0 12px;text-align:justify;}
diff --git a/emhttp/plugins/dynamix.plugin.manager/PluginHelpers.page b/emhttp/plugins/dynamix.plugin.manager/PluginHelpers.page
index 26af81523..551e1a89d 100644
--- a/emhttp/plugins/dynamix.plugin.manager/PluginHelpers.page
+++ b/emhttp/plugins/dynamix.plugin.manager/PluginHelpers.page
@@ -13,14 +13,6 @@ Link='nav-user'
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-/* Additional CSS for when user supplies element */
-.ca_element_notice{padding-right:20px;width:100%;height:40px;line-height:40px;color:#e68a00;background:#feefb3;border-bottom:#e68a00 1px solid;text-align:center;font-size:1.4rem;z-index:900;}
-a.ca_PluginUpdateInstall{cursor:pointer;}
-span.ca_PluginUpdateDismiss{float:right;margin-right:20px;cursor:pointer;}
-span.bannerInfo {cursor:pointer;text-decoration:none;margin:0 12px 0 6px;}
-span.bannerInfo::before {content:"\f05a";font-family:fontAwesome;color:#e68a00;}
-</style>
 <script>
 const ca_args = {};
 
diff --git a/emhttp/plugins/dynamix.plugin.manager/Plugins.page b/emhttp/plugins/dynamix.plugin.manager/Plugins.page
index 450922e61..a86f501e9 100644
--- a/emhttp/plugins/dynamix.plugin.manager/Plugins.page
+++ b/emhttp/plugins/dynamix.plugin.manager/Plugins.page
@@ -6,8 +6,8 @@ Tabs="true"
 Code="e944"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,10 +25,6 @@ if (!exec("pgrep -f $docroot/plugins/dynamix.plugin.manager/scripts/plugin")) {
 $check = $notify['version'] ? 0 : 1;
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
-<style>
-#plugin_tree{width:33%;height:200px;overflow-y:scroll}
-table tbody td{line-height:normal}
-</style>
 
 <script src="<?autov('/webGui/javascript/jquery.filetree.js')?>" charset="utf-8"></script>
 <script>
diff --git a/emhttp/plugins/dynamix.plugin.manager/Update.page b/emhttp/plugins/dynamix.plugin.manager/Update.page
index d4ba5ef5f..c92cc9192 100644
--- a/emhttp/plugins/dynamix.plugin.manager/Update.page
+++ b/emhttp/plugins/dynamix.plugin.manager/Update.page
@@ -4,8 +4,8 @@ Icon="icon-update"
 Tag="upload"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -35,21 +35,6 @@ if (file_exists($changes)) {
 }
 $reboot = preg_match("/^\*\*(REBOOT REQUIRED|DOWNGRADE)/",@file_get_contents("$docroot/plugins/unRAIDServer/README.md",false,null,0,20));
 ?>
-<style>
-ul,li{margin:0;padding-top:0;padding-bottom:0}
-pre.pre{margin:30px 0}
-pre>p{margin:0;padding:0}
-pre#swaltext{height:600px!important}
-@media (max-width:960px){pre#swaltext{height:400px!important}}
-@media (max-width:960px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
-@media (max-height:768px){pre#swaltext{height:400px!important}}
-@media (max-height:768px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
-input[value="_(Install)_"],input[value="_(Update)_"],input[value="_(Restore)_"]{margin:0}
-<?if ($themes1):?>
-span.vhshift{margin-top:13px!important}
-<?endif;?>
-</style>
-
 <script>
 var diagnosticsFile = "";
 var nchan_diagnostics = new NchanSubscriber('/sub/diagnostics',{subscriber:'websocket'});
diff --git a/emhttp/plugins/dynamix.plugin.manager/sheets/PluginHelpers.css b/emhttp/plugins/dynamix.plugin.manager/sheets/PluginHelpers.css
new file mode 100644
index 000000000..17e5f1e0d
--- /dev/null
+++ b/emhttp/plugins/dynamix.plugin.manager/sheets/PluginHelpers.css
@@ -0,0 +1,5 @@
+.ca_element_notice{padding-right:20px;width:100%;height:40px;line-height:40px;color:#e68a00;background:#feefb3;border-bottom:#e68a00 1px solid;text-align:center;font-size:1.4rem;z-index:900}
+a.ca_PluginUpdateInstall{cursor:pointer}
+span.ca_PluginUpdateDismiss{float:right;margin-right:20px;cursor:pointer}
+span.bannerInfo {cursor:pointer;text-decoration:none;margin:0 12px 0 6px}
+span.bannerInfo::before {content:"\f05a";font-family:fontAwesome;color:#e68a00}
diff --git a/emhttp/plugins/dynamix.plugin.manager/sheets/Plugins.css b/emhttp/plugins/dynamix.plugin.manager/sheets/Plugins.css
new file mode 100644
index 000000000..dc21dfb02
--- /dev/null
+++ b/emhttp/plugins/dynamix.plugin.manager/sheets/Plugins.css
@@ -0,0 +1,2 @@
+#plugin_tree{width:33%;height:200px;overflow-y:scroll}
+table tbody td{line-height:normal}
diff --git a/emhttp/plugins/dynamix.plugin.manager/sheets/Update-black.css b/emhttp/plugins/dynamix.plugin.manager/sheets/Update-black.css
new file mode 100644
index 000000000..35e27e237
--- /dev/null
+++ b/emhttp/plugins/dynamix.plugin.manager/sheets/Update-black.css
@@ -0,0 +1 @@
+span.vhshift{margin-top:13px!important}
diff --git a/emhttp/plugins/dynamix.plugin.manager/sheets/Update-white.css b/emhttp/plugins/dynamix.plugin.manager/sheets/Update-white.css
new file mode 100644
index 000000000..35e27e237
--- /dev/null
+++ b/emhttp/plugins/dynamix.plugin.manager/sheets/Update-white.css
@@ -0,0 +1 @@
+span.vhshift{margin-top:13px!important}
diff --git a/emhttp/plugins/dynamix.plugin.manager/sheets/Update.css b/emhttp/plugins/dynamix.plugin.manager/sheets/Update.css
new file mode 100644
index 000000000..b1f500365
--- /dev/null
+++ b/emhttp/plugins/dynamix.plugin.manager/sheets/Update.css
@@ -0,0 +1,9 @@
+ul,li{margin:0;padding-top:0;padding-bottom:0}
+pre.pre{margin:30px 0}
+pre>p{margin:0;padding:0}
+pre#swaltext{height:600px!important}
+@media (max-width:960px){pre#swaltext{height:400px!important}}
+@media (max-width:960px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
+@media (max-height:768px){pre#swaltext{height:400px!important}}
+@media (max-height:768px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
+input[value="_(Install)_"],input[value="_(Update)_"],input[value="_(Restore)_"]{margin:0}
diff --git a/emhttp/plugins/dynamix.vm.manager/AddVM.page b/emhttp/plugins/dynamix.vm.manager/AddVM.page
index d27477c0f..7db9d73fd 100644
--- a/emhttp/plugins/dynamix.vm.manager/AddVM.page
+++ b/emhttp/plugins/dynamix.vm.manager/AddVM.page
@@ -4,9 +4,9 @@ Cond="(pgrep('libvirtd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, 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,
diff --git a/emhttp/plugins/dynamix.vm.manager/UpdateVM.page b/emhttp/plugins/dynamix.vm.manager/UpdateVM.page
index c00207fd3..1e4d5d745 100644
--- a/emhttp/plugins/dynamix.vm.manager/UpdateVM.page
+++ b/emhttp/plugins/dynamix.vm.manager/UpdateVM.page
@@ -4,9 +4,9 @@ Cond="(pgrep('libvirtd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, 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,
diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index dc0a63ab8..3fd0266f1 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -112,29 +112,6 @@ if (empty($vms)) {
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.filetree.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
-<style>
-th.th1{width:25%}
-th.th2{width:15%}
-th.th3{width:80px}
-div.four{font-size:1.1rem;width:260px}
-div.four label{float:left;display:table-cell;width:25%}
-div.four label:nth-child(4n+4){float:none;clear:both}
-div.four label.cpu1{width:32%}
-div.four label.cpu2{width:26%}
-div.template,div#dialogWindow,input#upload{display:none}
-table.domdisk thead tr th:nth-child(1){width:56%!important}
-table.domdisk thead tr th:nth-child(n+2){width:8%!important}
-table.domdisk thead tr th:nth-child(1){padding-left:72px}
-table.domdisk tbody tr td:nth-child(1){padding-left:72px}
-table.domdisk tbody tr:nth-child(even){background-color:transparent!important}
-table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
-table.snapshot{margin-top:0}
-i.mover{margin-right:8px;display:none}
-#resetsort{margin-left:12px;display:inline-block;width:32px}
-.fileTree{background:<?=$bgcolor?>;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
-.dropdown-menu{z-index:10001}
-</style>
 
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script src="<?autov('/plugins/dynamix.vm.manager/javascript/dynamix.vm.manager.js')?>"></script>
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 1693a06fe..f299d2185 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -61,21 +61,6 @@ $libvirt_log       = file_exists("/var/log/libvirt/libvirtd.log");
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-body{-webkit-overflow-scrolling:touch}
-.errortext{color:#EF3D47;display:none}
-.fileTree{background:<?=$bgcolor?>;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
-.basic{display:block}
-.advanced{display:none}
-#winvirtio{display:none}
-#download_status{margin-left:5px;color:#777;display:none}
-#download_button{cursor:pointer;margin-left:-2px;color:#08C;display:none;transform:translate(0px,2px)}
-#download_button.fa-spin{cursor:default;color:#777}
-#download_button span{font-family:clear-sans}
-#download_button.fa-spin span{font-family:clear-sans;display:none}
-#remove_button{cursor:pointer;margin-left:-2px;color:#EF3D47;display:none;transform:translate(0px,2px)}
-#remove_button span{font-family:clear-sans}
-</style>
 
 <?if ($hardware):?>
 <span class="status vhshift"><input type="checkbox" class="advancedview"></span>
diff --git a/emhttp/plugins/dynamix.vm.manager/VMTemplates.page b/emhttp/plugins/dynamix.vm.manager/VMTemplates.page
index 460fc0341..96b2d3819 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMTemplates.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMTemplates.page
@@ -4,8 +4,8 @@ Cond="(pgrep('libvirtd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2015-2023, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -15,12 +15,6 @@ Markdown="false"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style type="text/css">
-.vmheader{padding:10px;font-size:1.4rem;text-align:left;color:#888}
-.vmtemplate{display:inline-block;width:80px;height:90px;margin-bottom:15px;margin-left:10px;text-align:center;vertical-align:top}
-.vmtemplate img{width:48px;height:48px}
-.vmtemplate p{text-align:center;margin-top:8px;line-height:12px}
-</style>
 <?
 	$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMedit.php b/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
index 3adbda9be..fbf2a5d8b 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
@@ -88,55 +88,6 @@ if (isset($_GET['uuid'])) {
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
 
-<style>
-body{-webkit-overflow-scrolling:touch}
-.fileTree{background:<?=$bgcolor?>;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
-#vmform table{margin-top:0}
-#vmform div.title + table{margin-top:0}
-#vmform table tr{vertical-align:top;line-height:40px}
-#vmform table tr td:nth-child(odd){width:300px;text-align:right;padding-right:10px}
-#vmform table tr td:nth-child(even){width:110px}
-#vmform table tr td:first-child{padding-right:30px}
-#vmform table tr td:last-child{width:inherit}
-#vmform .multiple{position:relative}
-#vmform .sectionbutton{position:absolute;left:2px;cursor:pointer;opacity:0.4;font-size:1.4rem;line-height:17px;z-index:10;transition-property:opacity,left;transition-duration:0.1s;transition-timing-function:linear}
-#vmform .sectionbutton.remove{top:0;opacity:0.3}
-#vmform .sectionbutton.add{bottom:0}
-#vmform .sectionbutton:hover{opacity:1.0}
-#vmform .sectiontab{position:absolute;top:2px;bottom:2px;left:0;width:6px;border-radius:3px;background-color:#DDDDDD;transition-property:background,width;transition-duration:0.1s;transition-timing-function:linear}
-#vmform .multiple:hover .sectionbutton{opacity:0.7;left:4px}
-#vmform .multiple:hover .sectionbutton.remove{opacity:0.6}
-#vmform .multiple:hover .sectiontab{background-color:#CCCCCC;width:8px}
-#vmform table.multiple{margin:10px 0;background:<?=$bgcolor?>;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
-#vmform table.multiple:hover{background-position:0 0;}
-#vmform table.multiple td{padding:5px 0}
-span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
-.basic{display:none}
-.advanced{/*Empty placeholder*/}
-.switch-button-label.off{color:inherit}
-#template_img{cursor:pointer}
-#template_img:hover{opacity:0.5}
-#template_img:hover i{opacity:1.0}
-.template_img_chooser_inner{display:inline-block;width:80px;margin-bottom:15px;margin-right:10px;text-align:center;}
-.template_img_chooser_inner img{width:48px;height:48px}
-.template_img_chooser_inner p{text-align:center;line-height:8px;}
-#template_img_chooser{width:560px;height:300px;overflow-y:scroll;position:relative}
-#template_img_chooser div:hover{background-color:#eee;cursor:pointer;}
-#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:<?=$bgcolor?>;z-index:10}
-#form_content{display:none}
-#vmform .four{overflow:hidden}
-#vmform .four label{float:left;display:table-cell;width:15%;}
-#vmform .four label:nth-child(4n+4){}
-#vmform .four label.cpu1{width:28%;height:16px;line-height:16px}
-#vmform .four label.cpu2{width:3%;height:16px;line-height:16px}
-#vmform .mac_generate{cursor:pointer;margin-left:-5px;color:#08C;font-size:1.3rem;transform:translate(0px, 2px)}
-#vmform .disk{display:none}
-#vmform .disk_preview{display:inline-block;color:#BBB;transform:translate(0px, 1px)}
-span#dropbox{border:1px solid <?=$border?>;background:<?=$bgcolor?>;padding:28px 12px;line-height:72px;margin-right:16px;}
-i.fa-plus-circle,i.fa-minus-circle{margin-left:8px}
-input[type=checkbox]{margin-left:0}
-</style>
-
 <span class="status advancedview_panel" style="margin-top:<?=$top?>px"><input type="checkbox" class="advancedview"></span>
 <div class="domain">
 	<form id="vmform" method="POST">
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
index 59b846f4d..87cd3664d 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
@@ -98,5 +98,4 @@ switch ($action) {
 #execCommand_nchan("ls /") ;
 write("stop_Wait\0$waitID") ;
 write('_DONE_','');
-
 ?>
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-azure.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-azure.css
new file mode 100644
index 000000000..26d225a46
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-azure.css
@@ -0,0 +1,4 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#f2f2f2;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#f2f2f2;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#f2f2f2;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-black.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-black.css
new file mode 100644
index 000000000..63cf210e4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-black.css
@@ -0,0 +1,4 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#1c1c1c;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#1c1c1c;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#1c1c1c;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-gray.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-gray.css
new file mode 100644
index 000000000..63cf210e4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-gray.css
@@ -0,0 +1,4 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#1c1c1c;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#1c1c1c;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#1c1c1c;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-white.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-white.css
new file mode 100644
index 000000000..26d225a46
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-white.css
@@ -0,0 +1,4 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#f2f2f2;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#f2f2f2;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#f2f2f2;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
new file mode 100644
index 000000000..a2c0ae2b4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
@@ -0,0 +1,42 @@
+body{-webkit-overflow-scrolling:touch}
+#vmform table{margin-top:0}
+#vmform div.title + table{margin-top:0}
+#vmform table tr{vertical-align:top;line-height:40px}
+#vmform table tr td:nth-child(odd){width:300px;text-align:right;padding-right:10px}
+#vmform table tr td:nth-child(even){width:110px}
+#vmform table tr td:first-child{padding-right:30px}
+#vmform table tr td:last-child{width:inherit}
+#vmform .multiple{position:relative}
+#vmform .sectionbutton{position:absolute;left:2px;cursor:pointer;opacity:0.4;font-size:1.4rem;line-height:17px;z-index:10;transition-property:opacity,left;transition-duration:0.1s;transition-timing-function:linear}
+#vmform .sectionbutton.remove{top:0;opacity:0.3}
+#vmform .sectionbutton.add{bottom:0}
+#vmform .sectionbutton:hover{opacity:1.0}
+#vmform .sectiontab{position:absolute;top:2px;bottom:2px;left:0;width:6px;border-radius:3px;background-color:#DDDDDD;transition-property:background,width;transition-duration:0.1s;transition-timing-function:linear}
+#vmform .multiple:hover .sectionbutton{opacity:0.7;left:4px}
+#vmform .multiple:hover .sectionbutton.remove{opacity:0.6}
+#vmform .multiple:hover .sectiontab{background-color:#CCCCCC;width:8px}
+#vmform table.multiple:hover{background-position:0 0;}
+#vmform table.multiple td{padding:5px 0}
+span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
+.basic{display:none}
+.advanced{/*Empty placeholder*/}
+.switch-button-label.off{color:inherit}
+#template_img{cursor:pointer}
+#template_img:hover{opacity:0.5}
+#template_img:hover i{opacity:1.0}
+.template_img_chooser_inner{display:inline-block;width:80px;margin-bottom:15px;margin-right:10px;text-align:center;}
+.template_img_chooser_inner img{width:48px;height:48px}
+.template_img_chooser_inner p{text-align:center;line-height:8px;}
+#template_img_chooser{width:560px;height:300px;overflow-y:scroll;position:relative}
+#template_img_chooser div:hover{background-color:#eee;cursor:pointer;}
+#form_content{display:none}
+#vmform .four{overflow:hidden}
+#vmform .four label{float:left;display:table-cell;width:15%;}
+#vmform .four label:nth-child(4n+4){}
+#vmform .four label.cpu1{width:28%;height:16px;line-height:16px}
+#vmform .four label.cpu2{width:3%;height:16px;line-height:16px}
+#vmform .mac_generate{cursor:pointer;margin-left:-5px;color:#08C;font-size:1.3rem;transform:translate(0px, 2px)}
+#vmform .disk{display:none}
+#vmform .disk_preview{display:inline-block;color:#BBB;transform:translate(0px, 1px)}
+i.fa-plus-circle,i.fa-minus-circle{margin-left:8px}
+input[type=checkbox]{margin-left:0}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-azure.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-azure.css
new file mode 100644
index 000000000..26d225a46
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-azure.css
@@ -0,0 +1,4 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#f2f2f2;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#f2f2f2;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#f2f2f2;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-black.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-black.css
new file mode 100644
index 000000000..63cf210e4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-black.css
@@ -0,0 +1,4 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#1c1c1c;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#1c1c1c;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#1c1c1c;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-gray.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-gray.css
new file mode 100644
index 000000000..63cf210e4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-gray.css
@@ -0,0 +1,4 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#1c1c1c;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#1c1c1c;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#1c1c1c;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-white.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-white.css
new file mode 100644
index 000000000..26d225a46
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-white.css
@@ -0,0 +1,4 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#f2f2f2;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#f2f2f2;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#f2f2f2;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
new file mode 100644
index 000000000..a2c0ae2b4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
@@ -0,0 +1,42 @@
+body{-webkit-overflow-scrolling:touch}
+#vmform table{margin-top:0}
+#vmform div.title + table{margin-top:0}
+#vmform table tr{vertical-align:top;line-height:40px}
+#vmform table tr td:nth-child(odd){width:300px;text-align:right;padding-right:10px}
+#vmform table tr td:nth-child(even){width:110px}
+#vmform table tr td:first-child{padding-right:30px}
+#vmform table tr td:last-child{width:inherit}
+#vmform .multiple{position:relative}
+#vmform .sectionbutton{position:absolute;left:2px;cursor:pointer;opacity:0.4;font-size:1.4rem;line-height:17px;z-index:10;transition-property:opacity,left;transition-duration:0.1s;transition-timing-function:linear}
+#vmform .sectionbutton.remove{top:0;opacity:0.3}
+#vmform .sectionbutton.add{bottom:0}
+#vmform .sectionbutton:hover{opacity:1.0}
+#vmform .sectiontab{position:absolute;top:2px;bottom:2px;left:0;width:6px;border-radius:3px;background-color:#DDDDDD;transition-property:background,width;transition-duration:0.1s;transition-timing-function:linear}
+#vmform .multiple:hover .sectionbutton{opacity:0.7;left:4px}
+#vmform .multiple:hover .sectionbutton.remove{opacity:0.6}
+#vmform .multiple:hover .sectiontab{background-color:#CCCCCC;width:8px}
+#vmform table.multiple:hover{background-position:0 0;}
+#vmform table.multiple td{padding:5px 0}
+span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
+.basic{display:none}
+.advanced{/*Empty placeholder*/}
+.switch-button-label.off{color:inherit}
+#template_img{cursor:pointer}
+#template_img:hover{opacity:0.5}
+#template_img:hover i{opacity:1.0}
+.template_img_chooser_inner{display:inline-block;width:80px;margin-bottom:15px;margin-right:10px;text-align:center;}
+.template_img_chooser_inner img{width:48px;height:48px}
+.template_img_chooser_inner p{text-align:center;line-height:8px;}
+#template_img_chooser{width:560px;height:300px;overflow-y:scroll;position:relative}
+#template_img_chooser div:hover{background-color:#eee;cursor:pointer;}
+#form_content{display:none}
+#vmform .four{overflow:hidden}
+#vmform .four label{float:left;display:table-cell;width:15%;}
+#vmform .four label:nth-child(4n+4){}
+#vmform .four label.cpu1{width:28%;height:16px;line-height:16px}
+#vmform .four label.cpu2{width:3%;height:16px;line-height:16px}
+#vmform .mac_generate{cursor:pointer;margin-left:-5px;color:#08C;font-size:1.3rem;transform:translate(0px, 2px)}
+#vmform .disk{display:none}
+#vmform .disk_preview{display:inline-block;color:#BBB;transform:translate(0px, 1px)}
+i.fa-plus-circle,i.fa-minus-circle{margin-left:8px}
+input[type=checkbox]{margin-left:0}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-azure.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-azure.css
new file mode 100644
index 000000000..817ebfe24
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-azure.css
@@ -0,0 +1 @@
+.fileTree{background:#f2f2f2;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-black.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-black.css
new file mode 100644
index 000000000..4c8c88609
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-black.css
@@ -0,0 +1 @@
+.fileTree{background:#1c1c1c;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-gray.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-gray.css
new file mode 100644
index 000000000..4c8c88609
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-gray.css
@@ -0,0 +1 @@
+.fileTree{background:#1c1c1c;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-white.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-white.css
new file mode 100644
index 000000000..817ebfe24
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-white.css
@@ -0,0 +1 @@
+.fileTree{background:#f2f2f2;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
new file mode 100644
index 000000000..4ef919df5
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
@@ -0,0 +1,20 @@
+th.th1{width:25%}
+th.th2{width:15%}
+th.th3{width:80px}
+div.four{font-size:1.1rem;width:260px}
+div.four label{float:left;display:table-cell;width:25%}
+div.four label:nth-child(4n+4){float:none;clear:both}
+div.four label.cpu1{width:32%}
+div.four label.cpu2{width:26%}
+div.template,div#dialogWindow,input#upload{display:none}
+table.domdisk thead tr th:nth-child(1){width:56%!important}
+table.domdisk thead tr th:nth-child(n+2){width:8%!important}
+table.domdisk thead tr th:nth-child(1){padding-left:72px}
+table.domdisk tbody tr td:nth-child(1){padding-left:72px}
+table.domdisk tbody tr:nth-child(even){background-color:transparent!important}
+table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
+table.snapshot{margin-top:0}
+i.mover{margin-right:8px;display:none}
+#resetsort{margin-left:12px;display:inline-block;width:32px}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.dropdown-menu{z-index:10001}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-azure.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-azure.css
new file mode 100644
index 000000000..35ac63d60
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-azure.css
@@ -0,0 +1 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-black.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-black.css
new file mode 100644
index 000000000..3f9d4d283
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-black.css
@@ -0,0 +1 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-gray.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-gray.css
new file mode 100644
index 000000000..3f9d4d283
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-gray.css
@@ -0,0 +1 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-white.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-white.css
new file mode 100644
index 000000000..35ac63d60
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-white.css
@@ -0,0 +1 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings.css
new file mode 100644
index 000000000..8e877a4f6
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings.css
@@ -0,0 +1,12 @@
+body{-webkit-overflow-scrolling:touch}
+.errortext{color:#EF3D47;display:none}
+.basic{display:block}
+.advanced{display:none}
+#winvirtio{display:none}
+#download_status{margin-left:5px;color:#777;display:none}
+#download_button{cursor:pointer;margin-left:-2px;color:#08C;display:none;transform:translate(0px,2px)}
+#download_button.fa-spin{cursor:default;color:#777}
+#download_button span{font-family:clear-sans}
+#download_button.fa-spin span{font-family:clear-sans;display:none}
+#remove_button{cursor:pointer;margin-left:-2px;color:#EF3D47;display:none;transform:translate(0px,2px)}
+#remove_button span{font-family:clear-sans}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMTemplates.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMTemplates.css
new file mode 100644
index 000000000..02918f1c1
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMTemplates.css
@@ -0,0 +1,4 @@
+.vmheader{padding:10px;font-size:1.4rem;text-align:left;color:#888}
+.vmtemplate{display:inline-block;width:80px;height:90px;margin-bottom:15px;margin-left:10px;text-align:center;vertical-align:top}
+.vmtemplate img{width:48px;height:48px}
+.vmtemplate p{text-align:center;margin-top:8px;line-height:12px}
diff --git a/emhttp/plugins/dynamix.vm.manager/spice.html b/emhttp/plugins/dynamix.vm.manager/spice.html
index 78d5adeec..0c9684419 100644
--- a/emhttp/plugins/dynamix.vm.manager/spice.html
+++ b/emhttp/plugins/dynamix.vm.manager/spice.html
@@ -22,13 +22,9 @@
    --------------------------------------------------
    S.Fairweather added addition functions to allow being called from external source and form for password.
 -->
-
-
-
 <!doctype html>
 <html>
     <head>
-
         <title>Spice Javascript client</title>
         <base href="spice/">
         <link rel="stylesheet" type="text/css" href="./spice.css" />
@@ -55,7 +51,6 @@
             .form-container input[type=text]:focus, .form-container input[type=password]:focus {background-color: #ddd;outline: none; }
             .form-container .btn:hover, .open-button:hover { opacity: 1;  }
         </style>
-
         <script type="module" crossorigin="anonymous">
             import * as SpiceHtml5 from './src/main.js';
             window.connect = connect;
@@ -63,13 +58,11 @@
             var sc;
             const queryString = window.location.search;
             const urlParams = new URLSearchParams(queryString);
-
             var auto = urlParams.get('autoconnect') ;
             var host = urlParams.get("host") ;
             var port = urlParams.get("port") ;
             var vmname = urlParams.get("vmname") ;
             var password = urlParams.get("password") ;
-            
             if (vmname == null) {
                 vmname = host ;
             } else {
@@ -79,47 +72,36 @@
             document.getElementById("port").value = port;
             document.getElementById("password").value = password;
             document.getElementById('hostname').innerHTML = (vmname) ;
-
             if (auto === 'true' || auto == '1') {
             auto = true;
             connect();
             }
-
             function spice_error(e)
             {
                 disconnect();
                 if (e !== undefined && e.message === "Permission denied.") {
-                    document.getElementById("passwordForm").style.display = "block";  
-                } 
+                    document.getElementById("passwordForm").style.display = "block";
+                }
             }
-
-
             function connect()
             {
                 var host, port, password, scheme = "ws://", uri;
                 if (window.location.protocol == 'https:') {
                     scheme = "wss://";
                 }
-
                 host = document.getElementById("host").value;
                 port = document.getElementById("port").value;
                 password = document.getElementById("password").value;
-
-
                 if ((!host) || (!port)) {
                     console.log("must set host and port");
                     return;
                 }
-
                 if (sc) {
                     sc.stop();
                 }
-
                 uri = scheme + host + port;
-
                 document.getElementById('connectButton').innerHTML = "Stop Connection";
                 document.getElementById('connectButton').onclick = disconnect;
-
                 try
                 {
                     sc = new SpiceHtml5.SpiceMainConn({uri: uri, screen_id: "spice-screen", dump_id: "debug-div",
@@ -130,9 +112,7 @@
                     alert(e.toString());
                     disconnect();
                 }
-
             }
-
             function disconnect()
             {
                 console.log(">> disconnect");
@@ -152,14 +132,11 @@
                 }
                 console.log("<< disconnect");
             }
-
             function agent_connected(sc)
             {
                 window.addEventListener('resize', SpiceHtml5.handle_resize);
                 window.spice_connection = this;
-
                 SpiceHtml5.resize_helper(this);
-
                 if (window.File && window.FileReader && window.FileList && window.Blob)
                 {
                     var spice_xfer_area = document.createElement("div");
@@ -173,20 +150,15 @@
                     console.log("File API is not supported");
                 }
             }
-
             document.getElementById('connectButton').onclick = connect();
             document.getElementById('sendCtrlAltDel').addEventListener('click', function(){ SpiceHtml5.sendCtrlAltDel(sc); });
         </script>
-
     </head>
-
     <body>
-
         <div id="login">
             <button onclick="open_nav()">&#9776; SPICE</button>
-            <p id="hostname">Host Console</p>          
+            <p id="hostname">Host Console</p>
         </div>
-
          <div id="Sidenav" class="SidenavClosed" style="width: 0;">
             <p class="closebtn" onclick="close_nav()">&#10006;</p>
             <label for="host">Host:</label> <input type='text' id='host' value='localhost'> <!-- localhost --><br>
@@ -196,34 +168,26 @@
             <button id="sendCtrlAltDel">Send Ctrl-Alt-Delete</button>
             <button id="debugLogs">Toggle Debug Logs</button>
             <div id="message-div" class="spice-message" style="display: none;"></div>
-
             <div id="debug-div">
             <!-- If DUMPXXX is turned on, dumped images will go here -->
             </div>
         </div>
-
         <div id="spice-area">
             <div id="spice-screen" class="spice-screen"></div>
         </div>
-
         <div class="form-popup" id="passwordForm">
             <form action="/action_page.php" class="form-container">
               <h3>Spice requires a password.</h3>
-
               <input type="password" autocomplete="off" placeholder="Enter Password" id="psw" name="psw" required>
-          
               <button type="button" class="btn cancel" onclick="connectpsw()">Connect</button>
             </form>
           </div>
-
-           
         <script>
             function connectpsw() {
-                document.getElementById("password").value = document.getElementById("psw").value;   
-                document.getElementById("passwordForm").style.display = "none"; 
-                connect() ;   
+                document.getElementById("password").value = document.getElementById("psw").value;
+                document.getElementById("passwordForm").style.display = "none";
+                connect() ;
             }
-            
             function show_debug_Logs() {
                 var content = document.getElementById('message-div')
                 if (content.style.display === 'block') {
@@ -232,16 +196,13 @@
                     content.style.display = 'block';
                 }
             }
-
             function open_nav() {
                 document.getElementById('Sidenav').className = 'SidenavOpen';
             }
-
             function close_nav() {
                 document.getElementById('Sidenav').className = 'SidenavClosed';
             }
             document.getElementById('debugLogs').addEventListener('click', function() { show_debug_Logs(); });
-            
         </script>
     </body>
 </html>
diff --git a/emhttp/plugins/dynamix/Apps.page b/emhttp/plugins/dynamix/Apps.page
index e816baebf..50826bfad 100644
--- a/emhttp/plugins/dynamix/Apps.page
+++ b/emhttp/plugins/dynamix/Apps.page
@@ -3,8 +3,8 @@ Name="Apps"
 Code="e942"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -14,10 +14,6 @@ Code="e942"
  * all copies or substantial portions of the Software.
 */
 ?>
-<style>
-div.notice{margin:150px 0 20px 0}
-</style>
-
 <script>
 function installPlugin(file) {
   openPlugin("plugin install "+file,"_(Install Plugin)_","","refresh");
diff --git a/emhttp/plugins/dynamix/ArrayOperation.page b/emhttp/plugins/dynamix/ArrayOperation.page
index 30d796a3f..09771ec57 100644
--- a/emhttp/plugins/dynamix/ArrayOperation.page
+++ b/emhttp/plugins/dynamix/ArrayOperation.page
@@ -81,13 +81,6 @@ function print_error($error) {
   return sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
 }
 ?>
-<style>
-tr#copy,tr#file{display:none}
-td.gap{padding-left:26px!important}
-td.wrap{white-space:normal!important}
-span#pass{display:none;margin-left:20px}
-input[type=checkbox]{margin-left:0}
-</style>
 <script>
 var ctrl = '<span class="status <?=$tabbed?"":"vhshift"?>"><a style="cursor:pointer" class="tooltip_diskio" title="_(Toggle reads/writes display)_" onclick="toggle_diskio();return false"><i class="toggle fa"></i></a></span>';
 
diff --git a/emhttp/plugins/dynamix/Browse.page b/emhttp/plugins/dynamix/Browse.page
index dfc3399ff..93fdae25d 100644
--- a/emhttp/plugins/dynamix/Browse.page
+++ b/emhttp/plugins/dynamix/Browse.page
@@ -37,40 +37,6 @@ if (!file_exists($editor)) file_put_contents($editor,implode("\n",['','txt','js'
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.filetree.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.switchbutton.css")?>">
 
-<style>
-div#ace_settingsmenu,table#controls,table#more-controls{margin-top:0;background-color:#f2f2f2}
-tr.ace_optionsMenuEntry td{padding:4px;color:#1c1b1b}
-tr.ace_optionsMenuEntry td select option{color:#1c1b1b;background-color:#e8e8e8}
-<?if ($theme=='black'):?>
-tr.ace_optionsMenuEntry td select{color:#1c1b1b;border-bottom:1px solid #1c1b1b;background-image:linear-gradient(66.6deg,transparent 60%,#1c1b1b 40%),linear-gradient(113.4deg, #1c1b1b 40%,transparent 60%)}
-tr.ace_optionsMenuEntry td input[type=number]{color:#1c1b1b}
-<?endif;?>
-tr.ace_optionsMenuEntry td input[type=number]::-webkit-inner-spin-button{-webkit-appearance:auto;cursor:pointer}
-tr.ace_optionsMenuEntry td input[type=number]{-moz-appearance:auto;margin:0}
-
-.loc{text-align:left!important;padding-left:0!important}
-.title{letter-spacing:1px}
-.title span.left{text-transform:none}
-table.tablesorter.indexer{margin-top:0}
-table.tablesorter.indexer thead th:nth-child(1){width:12px;text-align:left;padding-left:11px}
-table.tablesorter.indexer thead th:nth-child(2){width:3%!important}
-table.tablesorter.indexer thead th:nth-child(3){width:auto!important}
-table.tablesorter.indexer thead th:nth-child(n+4){width:10%!important}
-table.tablesorter.indexer thead th:nth-child(9){width:3%!important}
-table.tablesorter.indexer tbody tr:hover td{background-color:<?=$dfm['hover']?>}
-table.tablesorter.indexer thead th{text-align:left}
-table.tablesorter.indexer tbody td{text-align:left}
-table.tablesorter.indexer thead th:last-child{text-align:right}
-table.tablesorter.indexer tbody td:last-child{text-align:right}
-i[id^="row_"],i[id^="check_"]{cursor:pointer;font-size:1.8rem;color:gray}
-td[id^="name_"]{cursor:pointer}
-i.fa-home{font-size:2rem}
-i.fa-chevron-right{font-size:1.2rem;margin:0 8px}
-div.autoheight{width:100%;overflow-y:auto;margin-top:<?=$themes1?'-30px':'0'?>}
-div#buttons{display:none}
-.dropdown-menu{z-index:10001}
-</style>
-
 <script src="<?autov("/webGui/javascript/jquery.filetree.js")?>"></script>
 <script src="<?autov("/webGui/javascript/jquery.switchbutton.js")?>"></script>
 <script>
diff --git a/emhttp/plugins/dynamix/CPUvms.page b/emhttp/plugins/dynamix/CPUvms.page
index 854382295..2edd7a867 100644
--- a/emhttp/plugins/dynamix/CPUvms.page
+++ b/emhttp/plugins/dynamix/CPUvms.page
@@ -3,8 +3,8 @@ Title="CPU Pinning VM"
 Tag="icon-cpu"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -41,14 +41,6 @@ function create() {
   echo "<th>$label</th>".implode(array_map(function($t){return "<th>$t</th>";},$text));
 }
 ?>
-<style>
-table.tablesorter tr>th+th{text-align:right;vertical-align:top}
-table.tablesorter tr>td+td+td{vertical-align:top}
-table.tablesorter tr>th+th+th,table.tablesorter tr>td+td{text-align:center}
-table.tablesorter th:first-child,table.tablesorter td:first-child{width:180px;text-align:left}
-input.flat{margin:0}
-input.lock{margin:0}
-</style>
 <script>
 String.prototype.strip = function(){return this.replace(/ |\(|\)|\[|\]/g,'');}
 String.prototype.encode = function(){return this.replace(/\./g,'%2e');}
diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 3423a5526..df44dbf80 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -33,9 +33,7 @@ function isSubpool($name) {
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
-<style>
-table.divider{margin-top:20px}
-</style>
+
 <script>
 function validate(poolname) {
   var valid = /^[a-z]([a-z0-9~._-]*[a-z_-])*$/;
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 82604dce3..e15285b2c 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -172,74 +172,7 @@ switch ($display['theme']) {
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.ui.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
-<style>
-div.frame{padding-top:14px;padding-bottom:160px}
-div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(<?=$themes1?'610px':'580px'?>,1fr));column-gap:20px}
-div.tile,i.tile{display:none}
-div#iframe-popup{display:none;-webkit-overflow-scrolling:touch}
-div.last{padding-bottom:12px}
-div.leftside{float:left;width:66%}
-div.rightside{float:right;margin:0;text-align:center}
-div[id$=chart]{margin:-12px 8px -24px -18px}
-div.template,div#dialogWindow,input#upload{display:none}
-span.head_info{width:250px;display:inline-block}
-span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_{display:none;margin-left:0}
-span.head_bar{display:inline-block;width:180px}
-span.head_gap{padding-left:14px}
-span.green,span.red,span.orange{padding-left:0}
-span.ctrl{float:right;margin-top:0;margin-right:10px}
-span.ctrl span{font-size:2rem!important}
-span.outer{float:left}
-span.inner{width:143px}
-span.rx{width:80px;display:inline-block}
-span.busy,i.inactive{opacity:0.5}
-span.dense{width:180px;display:inline-block}
-span#ups_model{margin-right:30px}
-span#chart-toggle{float:right}
-span.header,tr.header{font-size:1.1rem!important;text-transform:uppercase;letter-spacing:1px}
-span.wg1{font-size:1.1rem;text-indent:24px}
-span.wg2{font-size:1.1rem}
-span[id^=cpu],span[id^=sys]{width:0}
-span[class^="fa "]{font-size:1.6rem;margin-right:18px}
-span.load.resize{font-size:1.1rem}
-span.fan{width:36%;display:inline-block}
-span.w18{width:18%;display:inline-block;float:left}
-span.w26{width:26%;display:inline-block;float:left}
-span.w36{width:36%;display:inline-block;float:left}
-span.w44{width:44%;display:inline-block;float:left}
-span.w72{width:72%;display:inline-block;float:left}
-select#cpuline,select#netline{border:none;padding:0 12px 0 0}
-select[name=enter_share],select[name=enter_user]{margin-top:0;float:none}
-img#mycase{width:auto;max-width:128px;height:auto;max-height:128px}
-i.heat{margin-left:8px}
-i.ups{margin-right:8px;font-size:1.4rem!important}
-i.vpn{font-size:1.4rem!important;cursor:pointer}
-i.indent{display:inline-block;width:18px}
-i.f32{font-size:32px!important}
-i.f14{font-size:1.4rem!important}
-i.fa.orb{margin-left:0}
-i.fa-wrench.tile{color:#0099ff!important;background-color:rgba(0,153,255,0.1)!important}
-i[class^="icon-"]{font-size:1.6rem;margin-right:8px}
-i[class^="icon-u-"]{font-size:inherit}
-i#mycase[class^="case-"]{font-size:128px}
-i#mycase[class^="fa "]{font-size:96px}
-a.cpu_close,span.hand{cursor:pointer;z-index:1001}
-tr#var0,tr#var1,tr#var2,tr#var3,tr#var4{cursor:alias}
-tr#var1,tr#var4,tr#cpu_chart,.cpu_open{display:none}
-td.none{text-align:center;padding-top:12px}
-input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
-.share1,.share3,.user1,.user3,.view1,.view2,.view3,.view4,.unused{display:none}
-.port_view,.control,#apps,#vms{z-index:10000}
-.flat{height:0;lineheight:0}
-.wrap{white-space:normal}
-.switch-button-background{margin-left:0;margin-top:4px}
-.switch-button-label{margin-top:3px}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
-#current_time{font-size:4rem;margin-left:8px}
-#current_date{font-size:1.3rem;margin-left:18px}
-span.ampm{font-size:2rem}
-table.snapshot{margin-top:0}
-</style>
+
 <script src="<?autov('/webGui/javascript/jquery.apexcharts.js')?>"></script>
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script src="<?autov('/plugins/dynamix.docker.manager/javascript/docker.js')?>"></script>
diff --git a/emhttp/plugins/dynamix/DeviceIdentify.page b/emhttp/plugins/dynamix/DeviceIdentify.page
index e5d632b15..3374e6422 100644
--- a/emhttp/plugins/dynamix/DeviceIdentify.page
+++ b/emhttp/plugins/dynamix/DeviceIdentify.page
@@ -15,10 +15,6 @@ Cond="strpos(_var($disks[$name],'status'),'_NP')===false"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-input[type=date]{border:none;margin-left:-2px;padding-left:0;background:transparent;box-shadow:none}
-select.noframe{border:none;margin-left:0;padding-left:0;background:transparent;box-shadow:none}
-</style>
 <script>
 function disklog(disk,key,value) {
   $.post('/webGui/include/DiskLog.php',{disk:disk,key:key,value:value});
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 5bdfe624a..f3f90437c 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -106,14 +106,7 @@ $text = isPool($name) ? _('This will ERASE content of ALL devices in the pool')
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
-<style>
-input.option{display:none;width:40px}
-select.option,#autosize{display:none}
-span#devtext{display:none;font-weight:bold}
-span#helptext{display:none;font-style:italic}
-span.code{display:inline-block;width:186px}
-i.fa-info.i{margin-right:10px}
-</style>
+
 <script>
 if ($.cookie('deletepool')) {
   $.removeCookie('deletepool');
diff --git a/emhttp/plugins/dynamix/Diagnostics.page b/emhttp/plugins/dynamix/Diagnostics.page
index 24e1a3675..e6aa70ea4 100644
--- a/emhttp/plugins/dynamix/Diagnostics.page
+++ b/emhttp/plugins/dynamix/Diagnostics.page
@@ -4,8 +4,8 @@ Icon="icon-diagnostics"
 Tag="tv"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,17 +18,6 @@ Tag="tv"
 <?
 $zip = htmlspecialchars(str_replace(' ','_',strtolower($var['NAME'])));
 ?>
-<style>
-ul,li{margin:0;padding-top:0;padding-bottom:0}
-pre.pre{margin:30px 0}
-pre>p{margin:0;padding:0}
-pre#swaltext{height:600px!important}
-@media (max-width:960px){pre#swaltext{height:400px!important}}
-@media (max-width:960px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
-@media (max-height:768px){pre#swaltext{height:400px!important}}
-@media (max-height:768px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
-</style>
-
 <script>
 var diagnosticsFile = "";
 var nchan_diagnostics = new NchanSubscriber('/sub/diagnostics',{subscriber:'websocket'});
diff --git a/emhttp/plugins/dynamix/Disk.page b/emhttp/plugins/dynamix/Disk.page
index fb4ec39a0..4656110c7 100644
--- a/emhttp/plugins/dynamix/Disk.page
+++ b/emhttp/plugins/dynamix/Disk.page
@@ -1,8 +1,8 @@
 Type="xmenu"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -31,20 +31,9 @@ $end  = count($refs)-1;
 $prev = urlencode($i>0 ? $refs[$i-1] : $refs[$end]);
 $next = urlencode($i<$end ? $refs[$i+1] : $refs[0]);
 ?>
-<style>
-div.clone1{position:absolute;right:0;margin-top:0}
-div.clone2{position:absolute;right:0;margin-top:48px}
-<?if ($themes1):?>
-span.wrap{display:inline-block;width:128px}
-select.clone{min-width:123px;margin-right:0}
-<?else:?>
-span.wrap{display:inline-block;width:150px}
-select.clone{min-width:145px;margin-right:0}
-<?endif;?>
-input.clone{margin-left:8px;margin-right:0}
-span.clone,i.clone{margin-right:4px}
-</style>
 <script>
+var ctrl = "<span class='ctrl2 status <?=$tabbed?'vhshift':'vshift'?>'><a href='/Shares/Disk?name=<?=$prev?>' title='previous disk share'><button type='button' style='margin-right:4px'><i class='fa fa-chevron-left fa-fw'></i></button></a><a href='/Shares/Disk?name=<?=$next?>' title='next disk share'><button type='button'><i class='fa fa-chevron-right fa-fw'></i></button></a></span>";
+
 function toggleButton(button,id) {
   var disabled = true;
   switch (id) {
@@ -58,8 +47,6 @@ function toggleButton(button,id) {
   $('input#'+button).prop('disabled',disabled);
 }
 
-var ctrl = "<span class='ctrl2 status <?=$tabbed?'vhshift':'vshift'?>'><a href='/Shares/Disk?name=<?=$prev?>' title='previous disk share'><button type='button' style='margin-right:4px'><i class='fa fa-chevron-left fa-fw'></i></button></a><a href='/Shares/Disk?name=<?=$next?>' title='next disk share'><button type='button'><i class='fa fa-chevron-right fa-fw'></i></button></a></span>";
-
 $(function() {
 <?if ($tabbed):?>
   $('.tabs').append(ctrl);
diff --git a/emhttp/plugins/dynamix/DiskList.page b/emhttp/plugins/dynamix/DiskList.page
index 9c32bbdd4..a6fdadabc 100644
--- a/emhttp/plugins/dynamix/DiskList.page
+++ b/emhttp/plugins/dynamix/DiskList.page
@@ -15,11 +15,6 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareDisk')!='no'"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-table.share_status thead tr td:first-child{width:15%}
-table.share_status thead tr td:nth-child(n+3){width:10%}
-</style>
-
 <table class="share_status">
 <thead><tr><td>_(Name)_</td><td>_(Comment)_</td><td>_(SMB)_</td><td>_(NFS)_</td><td>_(Type)_</td><td>_(Size)_</td><td>_(Free)_</td></tr></thead>
 <tbody id="disk_list"></tbody>
diff --git a/emhttp/plugins/dynamix/DiskSettings.page b/emhttp/plugins/dynamix/DiskSettings.page
index 31aa59506..fc6e161c5 100644
--- a/emhttp/plugins/dynamix/DiskSettings.page
+++ b/emhttp/plugins/dynamix/DiskSettings.page
@@ -29,10 +29,6 @@ function displayTemp($temp) {
   return (is_numeric($temp) && _var($display,'unit')=='F') ? round(9/5*$temp)+32 : $temp;
 }
 ?>
-<style>
-span.code{display:inline-block;width:186px}
-</style>
-
 <script>
 function base64(str) {
   return window.btoa(unescape(encodeURIComponent(str)));
diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 3844607bb..0e7a3eef8 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -22,12 +22,6 @@ $plugins = '/var/log/plugins';
 
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
 ?>
-<style>
-span#dropbox{margin-right:20px;}
-i.top{position:relative;padding-left:4px;cursor:pointer;}
-select.fixed{max-width:166px}
-</style>
-
 <script src="<?autov('/webGui/javascript/jquery.filedrop.js')?>"></script>
 <script>
 var path = '/boot/config/plugins/dynamix';
diff --git a/emhttp/plugins/dynamix/Eth0.page b/emhttp/plugins/dynamix/Eth0.page
index ed54cfc88..1d614fec2 100644
--- a/emhttp/plugins/dynamix/Eth0.page
+++ b/emhttp/plugins/dynamix/Eth0.page
@@ -71,20 +71,6 @@ $vlan_eth0 = $sort_eth0 = [];
 if (isset($eth0)) foreach (vlanID($eth0) as $key => $val) {$vlan_eth0[] = index($key); $sort_eth0[] = (int)$val;}
 array_multisort($sort_eth0,$vlan_eth0);
 ?>
-<style>
-span.red{color:#E68A00}
-span.blue{color:#00529B}
-span.green{color:#4F8A10}
-span.vshift{margin-top:0!important}
-input.gap{margin-right:6px}
-input.form{font-size:1rem;padding:5px 10px;margin-left:10px}
-div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
-div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
-div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
-div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
-select.slim{min-width:47px;margin-left:4px}
-input.slim{width:32px;margin-left:8px}
-</style>
 <script>
 <?if ($build):?>
 refresh(); // automatically include new ethernet ports
diff --git a/emhttp/plugins/dynamix/Flash.page b/emhttp/plugins/dynamix/Flash.page
index 84671cdcf..b57b8e8d6 100644
--- a/emhttp/plugins/dynamix/Flash.page
+++ b/emhttp/plugins/dynamix/Flash.page
@@ -1,8 +1,8 @@
 Type="xmenu"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,19 +18,6 @@ function clone_list($disk) {
   return strpos($disk['status'],'_NP')===false && ($disk['type']=='Data' || in_array($disk['name'],$pools));
 }
 ?>
-<style>
-div.clone1{position:absolute;right:0;margin-top:0}
-div.clone2{position:absolute;right:0;margin-top:48px}
-<?if ($themes1):?>
-span.wrap{display:inline-block;width:128px}
-select.clone{min-width:123px;margin-right:0}
-<?else:?>
-span.wrap{display:inline-block;width:150px}
-select.clone{min-width:145px;margin-right:0}
-<?endif;?>
-input.clone{margin-left:8px;margin-right:0}
-span.clone,i.clone{margin-right:4px}
-</style>
 <script>
 function toggleButton(button,id) {
   var disabled = true;
diff --git a/emhttp/plugins/dynamix/InstallKey.page b/emhttp/plugins/dynamix/InstallKey.page
index 62a3d6d01..bffe832f0 100644
--- a/emhttp/plugins/dynamix/InstallKey.page
+++ b/emhttp/plugins/dynamix/InstallKey.page
@@ -4,7 +4,7 @@ Tag="flag"
 Cond="($var['regTy']!='Pro')"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
+/* Copyright 2005-2023, Lime Technology
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -14,10 +14,6 @@ Cond="($var['regTy']!='Pro')"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-span.info{margin-left:12px}
-</style>
-
 <script>
 function installKey(file) {
   file = file.trim();
diff --git a/emhttp/plugins/dynamix/Language.page b/emhttp/plugins/dynamix/Language.page
index 5877613c3..5c86deae4 100644
--- a/emhttp/plugins/dynamix/Language.page
+++ b/emhttp/plugins/dynamix/Language.page
@@ -28,13 +28,6 @@ $tail = '&quot;)"></i>';
 foreach (glob("$plugins/lang-*.xml",GLOB_NOSORT) as $xml_file) $installed[] = language('LanguageLocal',$xml_file).$head.str_replace('lang-','',basename($xml_file,'.xml')).$tail;
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-select.wide{min-width:<?=$themes2?'314':'300'?>px}
-div.notice{margin-top:70px;margin-bottom:30px}
-div#selectlang{margin-top:20px}
-label.button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:1.8px;text-transform:uppercase;min-width:86px;margin:0;padding:8px;text-align:center;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:none;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
-label.button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
-</style>
 
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script>
diff --git a/emhttp/plugins/dynamix/ManagementAccess.page b/emhttp/plugins/dynamix/ManagementAccess.page
index 5fbf01ab4..9836b3824 100644
--- a/emhttp/plugins/dynamix/ManagementAccess.page
+++ b/emhttp/plugins/dynamix/ManagementAccess.page
@@ -190,10 +190,6 @@ foreach ($output as $line) {
 }
 sort($portsInUse,SORT_NUMERIC);
 ?>
-<style>
-span.warning{margin-left:20px}
-</style>
-
 <script>
 function provisionHandler(event, form) { // provisions and renewals require being Signed In to Unraid.net
   if (event.submitter.value === 'Delete') return true; // always allow deletes
diff --git a/emhttp/plugins/dynamix/NetworkExtra.page b/emhttp/plugins/dynamix/NetworkExtra.page
index b898ac218..b821b0350 100644
--- a/emhttp/plugins/dynamix/NetworkExtra.page
+++ b/emhttp/plugins/dynamix/NetworkExtra.page
@@ -26,13 +26,6 @@ if (file_exists($cfg)) {
   $exclude_interfaces = "";
 }
 ?>
-<style>
-span[id^="info-"]{margin-left:20px}
-<?if ($themes1):?>
-span.status.vhshift{margin-right:-10px!important}
-<?endif;?>
-</style>
-
 <script>
 function prepareText(form) {
   var mgmt = ['br0','bond0','eth0'];
diff --git a/emhttp/plugins/dynamix/NetworkRules.page b/emhttp/plugins/dynamix/NetworkRules.page
index cb94f97f7..5c7de7021 100644
--- a/emhttp/plugins/dynamix/NetworkRules.page
+++ b/emhttp/plugins/dynamix/NetworkRules.page
@@ -34,12 +34,6 @@ foreach ($rules as $rule) {
 }
 ksort($link,SORT_NATURAL);
 ?>
-<style>
-span[id^="info-"]{margin-left:20px}
-<?if ($themes1):?>
-span.status.vhshift{margin-right:-10px!important}
-<?endif;?>
-</style>
 <script>
 var info = {};
 <?foreach ($link as $eth => $val):?>
diff --git a/emhttp/plugins/dynamix/NewConfig.page b/emhttp/plugins/dynamix/NewConfig.page
index 96b6c4ac5..e4d3651ef 100644
--- a/emhttp/plugins/dynamix/NewConfig.page
+++ b/emhttp/plugins/dynamix/NewConfig.page
@@ -4,8 +4,8 @@ Icon="icon-config"
 Tag="cog"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -26,10 +26,6 @@ if ($newarray) {
   foreach ($pools as $pool) @unlink("/var/tmp/$pool.log.tmp");
 }
 ?>
-<style>
-span.indent{display:inline-block;width:240px;margin-top:30px}
-</style>
-
 <script>
 function prepareNewConfig(form) {
   for (var i=1,item; item=form.preset.options[i]; i++) {
diff --git a/emhttp/plugins/dynamix/NewPerms.page b/emhttp/plugins/dynamix/NewPerms.page
index 9d5715413..c43a6ebc6 100644
--- a/emhttp/plugins/dynamix/NewPerms.page
+++ b/emhttp/plugins/dynamix/NewPerms.page
@@ -22,12 +22,6 @@ function data_disks($disk) {
   return (_var($disk,'type')=="Data" || (_var($disk,'type')=="Cache" && in_array(_var($disk,'name'),$pools))) && _var($disk,'status')=='DISK_OK';
 }
 ?>
-<style>
-span.block{display:inline-block;width:300px;margin:24px 0}
-pre.pre{margin:30px 0;padding:20px}
-pre>p{margin:0;padding:0}
-</style>
-
 <script>
 function selection(select,remove) {
   if (remove) {
diff --git a/emhttp/plugins/dynamix/Notifications.page b/emhttp/plugins/dynamix/Notifications.page
index af06f6506..22e485de7 100644
--- a/emhttp/plugins/dynamix/Notifications.page
+++ b/emhttp/plugins/dynamix/Notifications.page
@@ -5,8 +5,8 @@ Icon="icon-notifications"
 Tag="phone-square"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2012, Andrew Hamer-Adams, http://www.pixeleyes.co.nz.
  *
  * This program is free software; you can redistribute it and/or
@@ -21,11 +21,6 @@ Tag="phone-square"
 $events = explode('|', $notify['events'] ?? '');
 $disabled = $notify['system'] ? '' : 'disabled';
 ?>
-<style>
-select.a{min-width:220px}
-input.a{width:220px}
-span.a{display:inline-block;width:220px;font-style:italic}
-</style>
 <script>
 function prepareNotify(form) {
   form.entity.value = form.normal1.checked | form.warning1.checked | form.alert1.checked;
diff --git a/emhttp/plugins/dynamix/NotificationsArchive.page b/emhttp/plugins/dynamix/NotificationsArchive.page
index 1809c97e9..94575b4d7 100644
--- a/emhttp/plugins/dynamix/NotificationsArchive.page
+++ b/emhttp/plugins/dynamix/NotificationsArchive.page
@@ -20,12 +20,6 @@ Tag="archive"
 $files = count(glob("{$notify['path']}/archive/*.notify", GLOB_NOSORT));
 $filters = mk_option(0,'',_('No filter')).mk_option(0,'alert',_('Alerts')).mk_option(0,'warning',_('Warnings')).mk_option(0,'normal',_('Notices'));
 ?>
-<style>
-select.filter{margin:0}
-span.right{margin-top:-6px;font-size:1.3rem!important;padding:0!important}
-i.red-text{font-size:1.6rem}
-</style>
-
 <script>
 var rows = [];
 var filter = "<?=unscript(_var($_GET,'filter'))?>";
diff --git a/emhttp/plugins/dynamix/PHPsettings.page b/emhttp/plugins/dynamix/PHPsettings.page
index cc87f9c02..35a91330a 100644
--- a/emhttp/plugins/dynamix/PHPsettings.page
+++ b/emhttp/plugins/dynamix/PHPsettings.page
@@ -24,12 +24,6 @@ if (!file_exists($log)) touch($log);
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
 
-<style>
-div#templateWindow,div#dialogWindow{display:none}
-span.dim{opacity:0.2}
-#screenlog{margin-left:0}
-</style>
-
 <div markdown="1" style="width:43%;margin-bottom:40px;padding:5px 15px;border:solid 1px">
 :php_settings_plug:
 This utility is used for development purposes only and allows Plugin Authors to verify their PHP code by enabling different levels of PHP error reporting.
diff --git a/emhttp/plugins/dynamix/RoutingTable.page b/emhttp/plugins/dynamix/RoutingTable.page
index a52aa5c0e..dcee292fd 100644
--- a/emhttp/plugins/dynamix/RoutingTable.page
+++ b/emhttp/plugins/dynamix/RoutingTable.page
@@ -29,12 +29,6 @@ foreach ($other as $port) {
   }
 }
 ?>
-<style>
-input.fixed{width:200px;}
-<?if ($themes1):?>
-span.status.vhshift{margin-right:-10px!important}
-<?endif;?>
-</style>
 <script>
 function deleteRoute(gateway,route,metric) {
   swal({title:"Delete route?",text:route+" by gateway "+gateway,type:"warning",html:true,showCancelButton:true,confirmButtonText:"_(Proceed)_",cancelButtonText:"_(Cancel)_"},function(){
diff --git a/emhttp/plugins/dynamix/Share.page b/emhttp/plugins/dynamix/Share.page
index f76f4b6e9..d75cdc6cf 100644
--- a/emhttp/plugins/dynamix/Share.page
+++ b/emhttp/plugins/dynamix/Share.page
@@ -1,8 +1,8 @@
 Type="xmenu"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -38,20 +38,6 @@ if ($name) {
   $tabbed = false;
 }
 ?>
-<style>
-div.clone1{position:absolute;right:10px;margin-top:0}
-div.clone2{position:absolute;right:10px;margin-top:48px}
-span.input{display:inline-block;width:330px}
-<?if ($themes1):?>
-span.wrap{display:inline-block;width:128px}
-select.clone{min-width:123px;max-width:123px;margin-right:0}
-<?else:?>
-span.wrap{display:inline-block;width:150px}
-select.clone{min-width:145px;max-width:145px;margin-right:0}
-<?endif;?>
-input.clone{margin-left:8px;margin-right:0}
-span.clone{margin-right:4px}
-</style>
 <script>
 function toggleButton(button,id) {
   var disabled = true;
diff --git a/emhttp/plugins/dynamix/ShareEdit.page b/emhttp/plugins/dynamix/ShareEdit.page
index 9c26abb99..e5f42f49e 100644
--- a/emhttp/plugins/dynamix/ShareEdit.page
+++ b/emhttp/plugins/dynamix/ShareEdit.page
@@ -98,18 +98,6 @@ function direction() {
 // global shares include/exclude
 $myDisks = array_filter(array_diff(array_keys(array_filter($disks,'my_disks')), explode(',',$var['shareUserExclude'])), 'globalInclude');
 ?>
-<style>
-div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
-div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
-div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
-div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
-#s1,#s2,#s3,#s4,#s5,#autosize,.empty,.full2,#zfs-name{display:none}
-i.fa-info.i{margin-right:10px}
-<?if ($themes1):?>
-form[name=share_edit]{margin-top:-20px}
-<?endif;?>
-</style>
-
 :share_edit_global1_help:
 <?if ($name):?>
 :share_edit_global2_help:
diff --git a/emhttp/plugins/dynamix/ShareList.page b/emhttp/plugins/dynamix/ShareList.page
index b22d0512d..de4970ce5 100644
--- a/emhttp/plugins/dynamix/ShareList.page
+++ b/emhttp/plugins/dynamix/ShareList.page
@@ -15,14 +15,6 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareUser')=='e'"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-table.share_status thead tr td:first-child{width:15%}
-table.share_status thead tr td:nth-child(n+3){width:9%!important}
-table.share_status thead tr td:nth-child(5){width:13%!important}
-td.empty{text-align:center;padding-top:12px}
-i.fa-fw{margin-right:2px}
-</style>
-
 <table class="share_status">
 <thead><tr><td>_(Name)_</td><td>_(Comment)_</td><td>_(SMB)_</td><td>_(NFS)_</td><td>_(Storage)_</td><td>_(Size)_</td><td>_(Free)_</td></tr></thead>
 <tbody id="shareslist"></tbody>
diff --git a/emhttp/plugins/dynamix/SysDevs.page b/emhttp/plugins/dynamix/SysDevs.page
index 650c6eb70..7101f00ca 100644
--- a/emhttp/plugins/dynamix/SysDevs.page
+++ b/emhttp/plugins/dynamix/SysDevs.page
@@ -4,8 +4,8 @@ Icon="icon-hardware"
 Tag="server"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -15,12 +15,6 @@ Tag="server"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-table.pre{margin-top:0;background:transparent}
-table.pre td:first-child{width:144px}
-table tr td{padding:0 0 3px 0;margin:0}
-table tr td.thin{line-height:8px;height:8px}
-</style>
 <script>
 $(function(){
   $('#t1').load('/webGui/include/SysDevs.php',{table:'t1'});
diff --git a/emhttp/plugins/dynamix/SysDrivers.page b/emhttp/plugins/dynamix/SysDrivers.page
index 1cdba485b..f08de6f77 100644
--- a/emhttp/plugins/dynamix/SysDrivers.page
+++ b/emhttp/plugins/dynamix/SysDrivers.page
@@ -15,18 +15,6 @@ Tag="server"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-table.t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
-table.t1 tr td{padding:0 0 3px 0;margin:0}
-table.t1 tr td.thin{line-height:8px;height:8px}
-table.t1 tr>td{width:1%;text-align:centre;white-space: nowrap}
-table.t1 tr>td+td{width:1%;white-space:nowrap}
-table.t1 tr>td+td+td{width:auto;text-align:left}
-table.t1 tr>td+td+td+td{text-align:left}
-table.t1 tr>td+td+td+td+td{text-align:left}
-.t1.tablesorter .filtered{display:none}
-</style>
-
 <script type="text/javascript" src="/webGui/javascript/jquery.tablesorter.widgets.js"></script>
 <script type="text/javascript">
 
diff --git a/emhttp/plugins/dynamix/Syslinux.page b/emhttp/plugins/dynamix/Syslinux.page
index bf088843e..e01948918 100644
--- a/emhttp/plugins/dynamix/Syslinux.page
+++ b/emhttp/plugins/dynamix/Syslinux.page
@@ -3,8 +3,8 @@ Title="Syslinux Configuration"
 Tag="edit"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -31,28 +31,7 @@ $menu    = 'menu default';
 $mark    = 'label ';
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-div.basic{display:block}
-div.advanced{display:none}
-textarea.raw{resize:none;font-family:bitstream;width:65.5%}
-<?
-switch (strtok($display['theme'],'-')) {
-case 'gray':
-case 'azure':
-  echo "span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #606E7F;border-bottom:none}\n";
-  echo "textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border-top:none}\n";
-  break;
-case 'white':
-  echo "span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #1c1c1c;border-bottom:none}\n";
-  echo "textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border:1px solid #1c1b1b;border-top:none}\n";
-  break;
-case 'black':
-  echo "span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #f2f2f2;border-bottom:none}\n";
-  echo "textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border:1px solid #f2f2f2;border-top:none}\n";
-  break;
-}
-?>
-</style>
+
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script>
 const title = '<?=$title?>';
diff --git a/emhttp/plugins/dynamix/Syslog.page b/emhttp/plugins/dynamix/Syslog.page
index 3f4a19493..5ae4abec2 100644
--- a/emhttp/plugins/dynamix/Syslog.page
+++ b/emhttp/plugins/dynamix/Syslog.page
@@ -42,9 +42,6 @@ if (count($logs)) {
 }
 $select = implode($select);
 ?>
-<style>
-input#max{border:none;width:60px;margin:0;padding:0}
-</style>
 <script>
 var logfile = "<?=$log?>";
 
diff --git a/emhttp/plugins/dynamix/SyslogSettings.page b/emhttp/plugins/dynamix/SyslogSettings.page
index 314328b4b..22db32271 100644
--- a/emhttp/plugins/dynamix/SyslogSettings.page
+++ b/emhttp/plugins/dynamix/SyslogSettings.page
@@ -35,9 +35,6 @@ foreach ($output as $line) {
   if (!in_array($port,$portsInUse) && (!$bind || in_array(plain($ip),$list))) $portsInUse[] = $port;
 }
 ?>
-<style>
-span.span{display:inline-block;width:224px}
-</style>
 <script>
 function localFolder(local,time) {
   if (local) $('#local_folder').show(time); else $('#local_folder').hide(time);
diff --git a/emhttp/plugins/dynamix/UserAdd.page b/emhttp/plugins/dynamix/UserAdd.page
index d3a957f19..e32f64c22 100644
--- a/emhttp/plugins/dynamix/UserAdd.page
+++ b/emhttp/plugins/dynamix/UserAdd.page
@@ -3,8 +3,8 @@ Title="Add User"
 Tag="user"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,21 +19,6 @@ $void = "<img src='/webGui/images/user.png' width='48' height='48' onclick='$(&q
 $icon = "<i class='fa fa-trash top' title='"._('Restore default image')."' onclick='restore()'></i>";
 $zxcvbn = file_exists('/boot/config/plugins/dynamix/zxcvbn.js');
 ?>
-<style>
-<?if ($display['theme']=='gray'):?>
-span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#121510;padding:28px 12px;line-height:72px;margin-right:16px}
-<?elseif ($display['theme']=='azure'):?>
-span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#EDEAEF;padding:28px 12px;line-height:72px;margin-right:16px}
-<?elseif ($display['theme']=='black'):?>
-span#dropbox{border:1px solid #f2f2f2;border-radius:5px;background:#262626;padding:28px 12px;line-height:72px;margin-right:16px}
-<?else:?>
-span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;padding:28px 12px;line-height:72px;margin-right:16px}
-<?endif;?>
-i.top{position:absolute;padding-top:4px;cursor:pointer}
-i#showPass.checked{opacity:0.5}
-.usage-disk.sys{display:inline-block;width:10rem;top:<?=$themes2?'1.2':'.2'?>rem;margin-left:12px;border-radius:4px}
-</style>
-
 <script src="<?autov('/webGui/javascript/jquery.filedrop.js')?>"></script>
 <?if ($zxcvbn):?>
 <script src="<?autov('/boot/config/plugins/dynamix/zxcvbn.js')?>" async></script>
diff --git a/emhttp/plugins/dynamix/UserEdit.page b/emhttp/plugins/dynamix/UserEdit.page
index e14b7e2d8..4a4f937c2 100644
--- a/emhttp/plugins/dynamix/UserEdit.page
+++ b/emhttp/plugins/dynamix/UserEdit.page
@@ -3,8 +3,8 @@ Title="Edit User"
 Tag="user"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -28,21 +28,6 @@ $zxcvbn = file_exists('/boot/config/plugins/dynamix/zxcvbn.js');
 $file   = "/boot/config/ssh/root/authorized_keys";
 $text   = preg_replace(["/\r\n/","/\r/"],"\n", @file_get_contents($file) ?: '');
 ?>
-<style>
-<?if ($display['theme']=='gray'):?>
-span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#121510;padding:28px 12px;line-height:72px;margin-right:16px}
-<?elseif ($display['theme']=='azure'):?>
-span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#EDEAEF;padding:28px 12px;line-height:72px;margin-right:16px}
-<?elseif ($display['theme']=='black'):?>
-span#dropbox{border:1px solid #f2f2f2;border-radius:5px;background:#262626;padding:28px 12px;line-height:72px;margin-right:16px}
-<?else:?>
-span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;padding:28px 12px;line-height:72px;margin-right:16px}
-<?endif;?>
-i.top{position:absolute;padding-top:4px;cursor:pointer}
-i#showPass.checked{opacity:0.5}
-.usage-disk.sys{display:inline-block;width:10rem;top:<?=$themes2?'1.2':'.2'?>rem;margin-left:12px;border-radius:4px}
-</style>
-
 <script src="<?autov('/webGui/javascript/jquery.filedrop.js')?>"></script>
 <?if ($zxcvbn):?>
 <script src="<?autov('/boot/config/plugins/dynamix/zxcvbn.js')?>" async></script>
diff --git a/emhttp/plugins/dynamix/UserList.page b/emhttp/plugins/dynamix/UserList.page
index c80219759..c81cfdc46 100644
--- a/emhttp/plugins/dynamix/UserList.page
+++ b/emhttp/plugins/dynamix/UserList.page
@@ -19,13 +19,6 @@ $submenu = !empty($display['users']) && substr($display['users'],0,5)!='Tasks';
 if ($submenu) $path = './Users';
 ksort($users);
 ?>
-<style>
-a.info span{top:66px;left:42px}
-<?if ($themes1):?>
-div#title{margin-top:-30px!important}
-<?endif;?>
-</style>
-
 <div id="title" class="title"><span class="left"><i class="fa fa-bell title"></i>_(Management Access)_</span></div>
 <?$img = "/boot/config/plugins/dynamix/users/root.png"?>
 <div class="user-list" style="text-align:center"><a class="<?=(!empty($users['root']['desc']) ? 'info' : '')?>" href="<?=$path?>/UserEdit?name=root"><img src="<?=(file_exists($img) ? autov($img) : '/webGui/images/user.png')?>" class="picture" border="0" width="48" height="48"><br>root<span><?=htmlspecialchars($users['root']['desc'])?></span></a></div>
diff --git a/emhttp/plugins/dynamix/WG0.page b/emhttp/plugins/dynamix/WG0.page
index 36317690d..03e04fa0d 100644
--- a/emhttp/plugins/dynamix/WG0.page
+++ b/emhttp/plugins/dynamix/WG0.page
@@ -211,39 +211,7 @@ foreach ($vtuns as $wgX) {
 }
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-dt{width:22%}
-span.even{float:right;display:inline-block;width:150px;margin-top:3px}
-span.even.wide{width:200px}
-span.pin{float:right;margin:-40px 12px 0 0;clear:both;display:inline-block;width:400px;text-align:right}
-span[class^=rx]{margin-right:40px}
-span.hshift{margin-right:<?=$themes1?'-7':'11'?>px!important}
-span.vshift{margin-top:-2px!important}
-span.label{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;margin-left:<?=$themes1?'-12':'-4'?>px}
-span.input{display:inline-block;width:420px}
-span.access-type{display:inline-block;width:35%;white-space:normal}
-@media(max-width:1920px){span.access-type{width:20%}}
-span.block{display:inline-block;width:48%;white-space:normal}
-div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
-div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
-div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
-div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
-div.title{margin-bottom:10px!important}
-div[id^=block-wg]{margin-bottom:30px}
-div.preset{margin:8px 0;float:right}
-input.wide{width:360px}
-input.subnet{width:150px;margin-right:4px}
-input.mask{width:30px}
-input.port{width:50px}
-input.form,button.form{font-size:1rem;min-width:0;padding:5px 8px;margin:0}
-input.ok{color:#f2f2f2;background:#4f8a10}
-input.nok{color:#f2f2f2;background:#f0000c}
-select.subnet{min-width:150px}
-i.fa-fw{margin-left:5px}
-i.key-off{opacity:0.3;cursor:default!important}
-input:user-invalid {border-bottom-color:#E22828;}
-input:-moz-ui-invalid {border-bottom-color:#E22828;}
-</style>
+
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script>
 <?if ($build):?>
diff --git a/emhttp/plugins/dynamix/include/Templates.php b/emhttp/plugins/dynamix/include/Templates.php
index 5e2abdfaa..cb9f930b9 100644
--- a/emhttp/plugins/dynamix/include/Templates.php
+++ b/emhttp/plugins/dynamix/include/Templates.php
@@ -10,51 +10,9 @@
  * all copies or substantial portions of the Software.
  */
 ?>
-<?
-$dfm['hover']   = in_array($theme,['white','azure']) ? 'rgba(0,0,0,0.1)' : 'rgba(255,255,255,0.1)';
-$dfm['bgcolor'] = in_array($theme,['white','azure']) ? '#f2f2f2' : '#1c1c1c';
-$dfm['fgcolor'] = in_array($theme,['white','azure']) ? '#1c1c1c' : '#f2f2f2';
-$dfm['incolor'] = $theme!='gray' ? $dfm['bgcolor'] : '#121510';
-?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
 
-<style>
-#countdown{float:left;margin-left:100px}
-#user-notice{float:left}
-div.dfm_info{position:absolute;bottom:4px;width:74%;margin-left:23%}
-div.dfm_template{display:none}
-div#dfm_dialogWindow{overflow-x:hidden}
-div#dfm_dialogWindow dt{width:23%}
-div#dfm_joblist{text-align:left;margin-top:20px;margin-left:56px}
-span.dfm_filter{position:relative;margin-left:<?=$themes1?'12':'0'?>px;top:-<?=$themes1?'2':'8'?>px}
-span.dfm_filter i{position:absolute;left:10px;top:<?=$themes1?'4':'8'?>px;font-size:1.4rem}
-span.dfm_loc{display:inline-block}
-span.dfm_text{display:inline-block;width:75%;white-space:normal}
-span.dfm_device{display:inline-block;float:left}
-span.dfm_percent{display:inline-block;width:40px}
-span.dfm_speed{display:inline-block;margin-left:10px;width:140px}
-input.dfm_filter{border:none;width:100px;background-color:<?=$dfm['incolor']?>;margin:-8px 0 0 0;padding-left:30px}
-input.dfm_filter:focus{background-color:<?=$dfm['incolor']?>}
-input#dfm_sparse,input#dfm_exist{margin-left:0}
-input#dfm_target{color:<?=$dfm['fgcolor']?>;width:500px}
-input#dfm_target+.fileTree{background:<?=$dfm['bgcolor']?>;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
-select.dfm{margin:0 40px 0 10px}
-select#dfm_source{min-width:none;max-width:none;border:none;background-image:none;width:660px;cursor:default}
-select#dfm_source option{background-color:transparent}
-i.dfm{margin-right:8px}
-i.dfm_filter{margin-top:-<?=$themes1?'2':'4'?>px}
-i.job{cursor:pointer;font-size:1.8rem;vertical-align:middle}
-.ui-dfm .ui-dialog-titlebar-close{background:transparent;border:none;font-size:1.8rem!important;margin-top:-14px!important;margin-right:-18px!important}
-.ui-dfm .ui-dialog-titlebar-close:hover{background:transparent;color:#ff8c2f}
-.ui-dfm .ui-dialog-title{text-align:center;width:100%;font-size:1.8rem}
-.ui-dfm .ui-dialog-content{padding-top:15px;vertical-align:bottom}
-.ui-dfm .ui-button-text{padding:0px 5px}
-.ui-dfm .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled],
-.ui-dfm .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]:hover
-{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
-</style>
-
 <div class="dfm_template">
 <div id="dfm_dialogWindow"></div>
 <input type="file" id="dfm_upload" value="" onchange="startUpload(this.files)" multiple>
diff --git a/emhttp/plugins/dynamix/sheets/Apps.css b/emhttp/plugins/dynamix/sheets/Apps.css
new file mode 100644
index 000000000..a634a683c
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Apps.css
@@ -0,0 +1 @@
+div.notice{margin:150px 0 20px 0}
diff --git a/emhttp/plugins/dynamix/sheets/ArrayOperation.css b/emhttp/plugins/dynamix/sheets/ArrayOperation.css
new file mode 100644
index 000000000..938141281
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ArrayOperation.css
@@ -0,0 +1,5 @@
+tr#copy,tr#file{display:none}
+td.gap{padding-left:26px!important}
+td.wrap{white-space:normal!important}
+span#pass{display:none;margin-left:20px}
+input[type=checkbox]{margin-left:0}
diff --git a/emhttp/plugins/dynamix/sheets/Browse-azure.css b/emhttp/plugins/dynamix/sheets/Browse-azure.css
new file mode 100644
index 000000000..1c2163f85
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Browse-azure.css
@@ -0,0 +1,2 @@
+div.autoheight{width:100%;overflow-y:auto;margin-top:0}
+table.tablesorter.indexer tbody tr:hover td{background-color:rgba(0,0,0,0.1)}
diff --git a/emhttp/plugins/dynamix/sheets/Browse-black.css b/emhttp/plugins/dynamix/sheets/Browse-black.css
new file mode 100644
index 000000000..8e73bd4d7
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Browse-black.css
@@ -0,0 +1,4 @@
+tr.ace_optionsMenuEntry td select{color:#1c1b1b;border-bottom:1px solid #1c1b1b;background-image:linear-gradient(66.6deg,transparent 60%,#1c1b1b 40%),linear-gradient(113.4deg, #1c1b1b 40%,transparent 60%)}
+tr.ace_optionsMenuEntry td input[type=number]{color:#1c1b1b}
+div.autoheight{width:100%;overflow-y:auto;margin-top:-30px}
+table.tablesorter.indexer tbody tr:hover td{background-color:rgba(255,255,255,0.1)}
diff --git a/emhttp/plugins/dynamix/sheets/Browse-gray.css b/emhttp/plugins/dynamix/sheets/Browse-gray.css
new file mode 100644
index 000000000..febf7ba94
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Browse-gray.css
@@ -0,0 +1,2 @@
+div.autoheight{width:100%;overflow-y:auto;margin-top:0}
+table.tablesorter.indexer tbody tr:hover td{background-color:rgba(255,255,255,0.1)}
diff --git a/emhttp/plugins/dynamix/sheets/Browse-white.css b/emhttp/plugins/dynamix/sheets/Browse-white.css
new file mode 100644
index 000000000..9c6bf20b6
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Browse-white.css
@@ -0,0 +1,2 @@
+div.autoheight{width:100%;overflow-y:auto;margin-top:-30px}
+table.tablesorter.indexer tbody tr:hover td{background-color:rgba(0,0,0,0.1)}
diff --git a/emhttp/plugins/dynamix/sheets/Browse.css b/emhttp/plugins/dynamix/sheets/Browse.css
new file mode 100644
index 000000000..6143a0b62
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Browse.css
@@ -0,0 +1,26 @@
+div#ace_settingsmenu,table#controls,table#more-controls{margin-top:0;background-color:#f2f2f2}
+tr.ace_optionsMenuEntry td{padding:4px;color:#1c1b1b}
+tr.ace_optionsMenuEntry td select option{color:#1c1b1b;background-color:#e8e8e8}
+tr.ace_optionsMenuEntry td input[type=number]::-webkit-inner-spin-button{-webkit-appearance:auto;cursor:pointer}
+tr.ace_optionsMenuEntry td input[type=number]{-moz-appearance:auto;margin:0}
+.title{letter-spacing:1px}
+.title span.left{text-transform:none}
+.loc{text-align:left!important;padding-left:0!important}
+table.tablesorter.indexer{margin-top:0}
+table.tablesorter.indexer thead th:nth-child(1){width:12px;text-align:left;padding-left:11px}
+table.tablesorter.indexer thead th:nth-child(2){width:3%!important}
+table.tablesorter.indexer thead th:nth-child(3){width:auto!important}
+table.tablesorter.indexer thead th:nth-child(n+4){width:10%!important}
+table.tablesorter.indexer thead th:nth-child(9){width:3%!important}
+table.tablesorter.indexer tbody tr:hover td{background-color:<?=$dfm['hover']?>}
+table.tablesorter.indexer thead th{text-align:left}
+table.tablesorter.indexer tbody td{text-align:left}
+table.tablesorter.indexer thead th:last-child{text-align:right}
+table.tablesorter.indexer tbody td:last-child{text-align:right}
+i[id^="row_"],i[id^="check_"]{cursor:pointer;font-size:1.8rem;color:gray}
+td[id^="name_"]{cursor:pointer}
+i.fa-home{font-size:2rem}
+i.fa-chevron-right{font-size:1.2rem;margin:0 8px}
+div.autoheight{width:100%;overflow-y:auto;margin-top:<?=$themes1?'-30px':'0'?>}
+div#buttons{display:none}
+.dropdown-menu{z-index:10001}
diff --git a/emhttp/plugins/dynamix/sheets/BrowseButton-azure.css b/emhttp/plugins/dynamix/sheets/BrowseButton-azure.css
new file mode 100644
index 000000000..e1447bb24
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/BrowseButton-azure.css
@@ -0,0 +1,7 @@
+span.dfm_filter{position:relative;margin-left:0;top:-8px}
+span.dfm_filter i{position:absolute;left:10px;top:8px;font-size:1.4rem}
+input.dfm_filter{border:none;width:100px;background-color:#f2f2f2;margin:-8px 0 0 0;padding-left:30px}
+input.dfm_filter:focus{background-color:#f2f2f2}
+input#dfm_target{color:#1c1c1c;width:500px}
+input#dfm_target+.fileTree{background:#f2f2f2;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+i.dfm_filter{margin-top:-4px}
diff --git a/emhttp/plugins/dynamix/sheets/BrowseButton-black.css b/emhttp/plugins/dynamix/sheets/BrowseButton-black.css
new file mode 100644
index 000000000..523a6c9c3
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/BrowseButton-black.css
@@ -0,0 +1,7 @@
+span.dfm_filter{position:relative;margin-left:12px;top:-2px}
+span.dfm_filter i{position:absolute;left:10px;top:4px;font-size:1.4rem}
+input.dfm_filter{border:none;width:100px;background-color:#1c1c1c;margin:-8px 0 0 0;padding-left:30px}
+input.dfm_filter:focus{background-color:#1c1c1c}
+input#dfm_target{color:#f2f2f2;width:500px}
+input#dfm_target+.fileTree{background:#1c1c1c;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+i.dfm_filter{margin-top:-2px}
diff --git a/emhttp/plugins/dynamix/sheets/BrowseButton-gray.css b/emhttp/plugins/dynamix/sheets/BrowseButton-gray.css
new file mode 100644
index 000000000..db8173b7a
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/BrowseButton-gray.css
@@ -0,0 +1,7 @@
+span.dfm_filter{position:relative;margin-left:0;top:-8px}
+span.dfm_filter i{position:absolute;left:10px;top:8px;font-size:1.4rem}
+input.dfm_filter{border:none;width:100px;background-color:#121510;margin:-8px 0 0 0;padding-left:30px}
+input.dfm_filter:focus{background-color:#121510}
+input#dfm_target{color:#f2f2f2;width:500px}
+input#dfm_target+.fileTree{background:<#1c1c1c;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+i.dfm_filter{margin-top:-4px}
diff --git a/emhttp/plugins/dynamix/sheets/BrowseButton-white.css b/emhttp/plugins/dynamix/sheets/BrowseButton-white.css
new file mode 100644
index 000000000..028a259fd
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/BrowseButton-white.css
@@ -0,0 +1,7 @@
+span.dfm_filter{position:relative;margin-left:12px;top:-2px}
+span.dfm_filter i{position:absolute;left:10px;top:4px;font-size:1.4rem}
+input.dfm_filter{border:none;width:100px;background-color:#f2f2f2;margin:-8px 0 0 0;padding-left:30px}
+input.dfm_filter:focus{background-color:#f2f2f2}
+input#dfm_target{color:#1c1c1c;width:500px}
+input#dfm_target+.fileTree{background:#f2f2f2;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+i.dfm_filter{margin-top:-2px}
diff --git a/emhttp/plugins/dynamix/sheets/BrowseButton.css b/emhttp/plugins/dynamix/sheets/BrowseButton.css
new file mode 100644
index 000000000..deacdf437
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/BrowseButton.css
@@ -0,0 +1,25 @@
+#countdown{float:left;margin-left:100px}
+#user-notice{float:left}
+div.dfm_info{position:absolute;bottom:4px;width:74%;margin-left:23%}
+div.dfm_template{display:none}
+div#dfm_dialogWindow{overflow-x:hidden}
+div#dfm_dialogWindow dt{width:23%}
+div#dfm_joblist{text-align:left;margin-top:20px;margin-left:56px}
+span.dfm_loc{display:inline-block}
+span.dfm_text{display:inline-block;width:75%;white-space:normal}
+span.dfm_device{display:inline-block;float:left}
+span.dfm_percent{display:inline-block;width:40px}
+span.dfm_speed{display:inline-block;margin-left:10px;width:140px}
+input#dfm_sparse,input#dfm_exist{margin-left:0}
+select.dfm{margin:0 40px 0 10px}
+select#dfm_source{min-width:none;max-width:none;border:none;background-image:none;width:660px;cursor:default}
+select#dfm_source option{background-color:transparent}
+i.dfm{margin-right:8px}
+i.job{cursor:pointer;font-size:1.8rem;vertical-align:middle}
+.ui-dfm .ui-dialog-titlebar-close{background:transparent;border:none;font-size:1.8rem!important;margin-top:-14px!important;margin-right:-18px!important}
+.ui-dfm .ui-dialog-titlebar-close:hover{background:transparent;color:#ff8c2f}
+.ui-dfm .ui-dialog-title{text-align:center;width:100%;font-size:1.8rem}
+.ui-dfm .ui-dialog-content{padding-top:15px;vertical-align:bottom}
+.ui-dfm .ui-button-text{padding:0px 5px}
+.ui-dfm .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled],
+.ui-dfm .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]:hover{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
diff --git a/emhttp/plugins/dynamix/sheets/CPUvms.css b/emhttp/plugins/dynamix/sheets/CPUvms.css
new file mode 100644
index 000000000..bbb3cdabf
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/CPUvms.css
@@ -0,0 +1,6 @@
+table.tablesorter tr>th+th{text-align:right;vertical-align:top}
+table.tablesorter tr>td+td+td{vertical-align:top}
+table.tablesorter tr>th+th+th,table.tablesorter tr>td+td{text-align:center}
+table.tablesorter th:first-child,table.tablesorter td:first-child{width:180px;text-align:left}
+input.flat{margin:0}
+input.lock{margin:0}
diff --git a/emhttp/plugins/dynamix/sheets/CacheDevices.css b/emhttp/plugins/dynamix/sheets/CacheDevices.css
new file mode 100644
index 000000000..018084e3c
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/CacheDevices.css
@@ -0,0 +1 @@
+table.divider{margin-top:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats-azure.css b/emhttp/plugins/dynamix/sheets/DashStats-azure.css
new file mode 100644
index 000000000..df98991be
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DashStats-azure.css
@@ -0,0 +1 @@
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(580px,1fr));column-gap:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats-black.css b/emhttp/plugins/dynamix/sheets/DashStats-black.css
new file mode 100644
index 000000000..9d50b19d9
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DashStats-black.css
@@ -0,0 +1 @@
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(610px,1fr));column-gap:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats-gray.css b/emhttp/plugins/dynamix/sheets/DashStats-gray.css
new file mode 100644
index 000000000..df98991be
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DashStats-gray.css
@@ -0,0 +1 @@
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(580px,1fr));column-gap:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats-white.css b/emhttp/plugins/dynamix/sheets/DashStats-white.css
new file mode 100644
index 000000000..9d50b19d9
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DashStats-white.css
@@ -0,0 +1 @@
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(610px,1fr));column-gap:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats.css b/emhttp/plugins/dynamix/sheets/DashStats.css
new file mode 100644
index 000000000..aa136a8a3
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DashStats.css
@@ -0,0 +1,64 @@
+div.frame{padding-top:14px;padding-bottom:160px}
+div.tile,i.tile{display:none}
+div#iframe-popup{display:none;-webkit-overflow-scrolling:touch}
+div.last{padding-bottom:12px}
+div.leftside{float:left;width:66%}
+div.rightside{float:right;margin:0;text-align:center}
+div[id$=chart]{margin:-12px 8px -24px -18px}
+div.template,div#dialogWindow,input#upload{display:none}
+span.head_info{width:250px;display:inline-block}
+span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_{display:none;margin-left:0}
+span.head_bar{display:inline-block;width:180px}
+span.head_gap{padding-left:14px}
+span.green,span.red,span.orange{padding-left:0}
+span.ctrl{float:right;margin-top:0;margin-right:10px}
+span.ctrl span{font-size:2rem!important}
+span.outer{float:left}
+span.inner{width:143px}
+span.rx{width:80px;display:inline-block}
+span.busy,i.inactive{opacity:0.5}
+span.dense{width:180px;display:inline-block}
+span#ups_model{margin-right:30px}
+span#chart-toggle{float:right}
+span.header,tr.header{font-size:1.1rem!important;text-transform:uppercase;letter-spacing:1px}
+span.wg1{font-size:1.1rem;text-indent:24px}
+span.wg2{font-size:1.1rem}
+span[id^=cpu],span[id^=sys]{width:0}
+span[class^="fa "]{font-size:1.6rem;margin-right:18px}
+span.load.resize{font-size:1.1rem}
+span.fan{width:36%;display:inline-block}
+span.w18{width:18%;display:inline-block;float:left}
+span.w26{width:26%;display:inline-block;float:left}
+span.w36{width:36%;display:inline-block;float:left}
+span.w44{width:44%;display:inline-block;float:left}
+span.w72{width:72%;display:inline-block;float:left}
+select#cpuline,select#netline{border:none;padding:0 12px 0 0}
+select[name=enter_share],select[name=enter_user]{margin-top:0;float:none}
+img#mycase{width:auto;max-width:128px;height:auto;max-height:128px}
+i.heat{margin-left:8px}
+i.ups{margin-right:8px;font-size:1.4rem!important}
+i.vpn{font-size:1.4rem!important;cursor:pointer}
+i.indent{display:inline-block;width:18px}
+i.f32{font-size:32px!important}
+i.f14{font-size:1.4rem!important}
+i.fa.orb{margin-left:0}
+i.fa-wrench.tile{color:#0099ff!important;background-color:rgba(0,153,255,0.1)!important}
+i[class^="icon-"]{font-size:1.6rem;margin-right:8px}
+i[class^="icon-u-"]{font-size:inherit}
+i#mycase[class^="case-"]{font-size:128px}
+i#mycase[class^="fa "]{font-size:96px}
+a.cpu_close,span.hand{cursor:pointer;z-index:1001}
+tr#var0,tr#var1,tr#var2,tr#var3,tr#var4{cursor:alias}
+tr#var1,tr#var4,tr#cpu_chart,.cpu_open{display:none}
+td.none{text-align:center;padding-top:12px}
+input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
+.share1,.share3,.user1,.user3,.view1,.view2,.view3,.view4,.unused{display:none}
+.port_view,.control,#apps,#vms{z-index:10000}
+.flat{height:0;lineheight:0}
+.wrap{white-space:normal}
+.switch-button-background{margin-left:0;margin-top:4px}
+.switch-button-label{margin-top:3px}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+#current_time{font-size:4rem;margin-left:8px}
+#current_date{font-size:1.3rem;margin-left:18px}
+span.ampm{font-size:2rem}
diff --git a/emhttp/plugins/dynamix/sheets/DeviceIdentify.css b/emhttp/plugins/dynamix/sheets/DeviceIdentify.css
new file mode 100644
index 000000000..461fd98a0
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DeviceIdentify.css
@@ -0,0 +1,2 @@
+input[type=date]{border:none;margin-left:-2px;padding-left:0;background:transparent;box-shadow:none}
+select.noframe{border:none;margin-left:0;padding-left:0;background:transparent;box-shadow:none}
diff --git a/emhttp/plugins/dynamix/sheets/DeviceInfo.css b/emhttp/plugins/dynamix/sheets/DeviceInfo.css
new file mode 100644
index 000000000..0e2842600
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DeviceInfo.css
@@ -0,0 +1,6 @@
+input.option{display:none;width:40px}
+select.option,#autosize{display:none}
+span#devtext{display:none;font-weight:bold}
+span#helptext{display:none;font-style:italic}
+span.code{display:inline-block;width:186px}
+i.fa-info.i{margin-right:10px}
diff --git a/emhttp/plugins/dynamix/sheets/Diagnostics.css b/emhttp/plugins/dynamix/sheets/Diagnostics.css
new file mode 100644
index 000000000..430502e32
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Diagnostics.css
@@ -0,0 +1,9 @@
+ul,li{margin:0;padding-top:0;padding-bottom:0}
+pre.pre{margin:30px 0}
+pre>p{margin:0;padding:0}
+pre#swaltext{height:600px!important}
+@media (max-width:960px){pre#swaltext{height:400px!important}}
+@media (max-width:960px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
+@media (max-height:768px){pre#swaltext{height:400px!important}}
+@media (max-height:768px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
+
diff --git a/emhttp/plugins/dynamix/sheets/Disk-azure.css b/emhttp/plugins/dynamix/sheets/Disk-azure.css
new file mode 100644
index 000000000..80004df10
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Disk-azure.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Disk-black.css b/emhttp/plugins/dynamix/sheets/Disk-black.css
new file mode 100644
index 000000000..f9ca1ef79
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Disk-black.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Disk-gray.css b/emhttp/plugins/dynamix/sheets/Disk-gray.css
new file mode 100644
index 000000000..80004df10
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Disk-gray.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Disk-white.css b/emhttp/plugins/dynamix/sheets/Disk-white.css
new file mode 100644
index 000000000..f9ca1ef79
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Disk-white.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Disk.css b/emhttp/plugins/dynamix/sheets/Disk.css
new file mode 100644
index 000000000..5815d053a
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Disk.css
@@ -0,0 +1,4 @@
+div.clone1{position:absolute;right:0;margin-top:0}
+div.clone2{position:absolute;right:0;margin-top:48px}
+input.clone{margin-left:8px;margin-right:0}
+span.clone,i.clone{margin-right:4px}
diff --git a/emhttp/plugins/dynamix/sheets/DiskList.css b/emhttp/plugins/dynamix/sheets/DiskList.css
new file mode 100644
index 000000000..ff1a48f90
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DiskList.css
@@ -0,0 +1,2 @@
+table.share_status thead tr td:first-child{width:15%}
+table.share_status thead tr td:nth-child(n+3){width:10%}
diff --git a/emhttp/plugins/dynamix/sheets/DiskSettings.css b/emhttp/plugins/dynamix/sheets/DiskSettings.css
new file mode 100644
index 000000000..ae8354cc0
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DiskSettings.css
@@ -0,0 +1 @@
+span.code{display:inline-block;width:186px}
diff --git a/emhttp/plugins/dynamix/sheets/DisplaySettings.css b/emhttp/plugins/dynamix/sheets/DisplaySettings.css
new file mode 100644
index 000000000..c253fa4c9
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DisplaySettings.css
@@ -0,0 +1,3 @@
+span#dropbox{margin-right:20px;}
+i.top{position:relative;padding-left:4px;cursor:pointer;}
+select.fixed{max-width:166px}
diff --git a/emhttp/plugins/dynamix/sheets/Eth0.css b/emhttp/plugins/dynamix/sheets/Eth0.css
new file mode 100644
index 000000000..6ddcb7136
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Eth0.css
@@ -0,0 +1,12 @@
+span.red{color:#E68A00}
+span.blue{color:#00529B}
+span.green{color:#4F8A10}
+span.vshift{margin-top:0!important}
+input.gap{margin-right:6px}
+input.form{font-size:1rem;padding:5px 10px;margin-left:10px}
+div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
+div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
+div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
+div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
+select.slim{min-width:47px;margin-left:4px}
+input.slim{width:32px;margin-left:8px}
diff --git a/emhttp/plugins/dynamix/sheets/Flash-azure.css b/emhttp/plugins/dynamix/sheets/Flash-azure.css
new file mode 100644
index 000000000..80004df10
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Flash-azure.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Flash-black.css b/emhttp/plugins/dynamix/sheets/Flash-black.css
new file mode 100644
index 000000000..f9ca1ef79
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Flash-black.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Flash-gray.css b/emhttp/plugins/dynamix/sheets/Flash-gray.css
new file mode 100644
index 000000000..80004df10
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Flash-gray.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Flash-white.css b/emhttp/plugins/dynamix/sheets/Flash-white.css
new file mode 100644
index 000000000..f9ca1ef79
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Flash-white.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Flash.css b/emhttp/plugins/dynamix/sheets/Flash.css
new file mode 100644
index 000000000..5815d053a
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Flash.css
@@ -0,0 +1,4 @@
+div.clone1{position:absolute;right:0;margin-top:0}
+div.clone2{position:absolute;right:0;margin-top:48px}
+input.clone{margin-left:8px;margin-right:0}
+span.clone,i.clone{margin-right:4px}
diff --git a/emhttp/plugins/dynamix/sheets/InstallKey.css b/emhttp/plugins/dynamix/sheets/InstallKey.css
new file mode 100644
index 000000000..02ca70db2
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/InstallKey.css
@@ -0,0 +1 @@
+span.info{margin-left:12px}
diff --git a/emhttp/plugins/dynamix/sheets/Language-azure.css b/emhttp/plugins/dynamix/sheets/Language-azure.css
new file mode 100644
index 000000000..d2b290e8f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Language-azure.css
@@ -0,0 +1 @@
+select.wide{min-width:314px}
diff --git a/emhttp/plugins/dynamix/sheets/Language-black.css b/emhttp/plugins/dynamix/sheets/Language-black.css
new file mode 100644
index 000000000..383809988
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Language-black.css
@@ -0,0 +1 @@
+select.wide{min-width:300px}
diff --git a/emhttp/plugins/dynamix/sheets/Language-gray.css b/emhttp/plugins/dynamix/sheets/Language-gray.css
new file mode 100644
index 000000000..d2b290e8f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Language-gray.css
@@ -0,0 +1 @@
+select.wide{min-width:314px}
diff --git a/emhttp/plugins/dynamix/sheets/Language-white.css b/emhttp/plugins/dynamix/sheets/Language-white.css
new file mode 100644
index 000000000..383809988
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Language-white.css
@@ -0,0 +1 @@
+select.wide{min-width:300px}
diff --git a/emhttp/plugins/dynamix/sheets/Language.css b/emhttp/plugins/dynamix/sheets/Language.css
new file mode 100644
index 000000000..04aa828e7
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Language.css
@@ -0,0 +1,4 @@
+div.notice{margin-top:70px;margin-bottom:30px}
+div#selectlang{margin-top:20px}
+label.button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:1.8px;text-transform:uppercase;min-width:86px;margin:0;padding:8px;text-align:center;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:none;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+label.button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
diff --git a/emhttp/plugins/dynamix/sheets/ManagementAccess.css b/emhttp/plugins/dynamix/sheets/ManagementAccess.css
new file mode 100644
index 000000000..9f3854a18
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ManagementAccess.css
@@ -0,0 +1 @@
+span.warning{margin-left:20px}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkExtra-black.css b/emhttp/plugins/dynamix/sheets/NetworkExtra-black.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkExtra-black.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkExtra-white.css b/emhttp/plugins/dynamix/sheets/NetworkExtra-white.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkExtra-white.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkExtra.css b/emhttp/plugins/dynamix/sheets/NetworkExtra.css
new file mode 100644
index 000000000..b4e4b3999
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkExtra.css
@@ -0,0 +1 @@
+span[id^="info-"]{margin-left:20px}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkRules-black.css b/emhttp/plugins/dynamix/sheets/NetworkRules-black.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkRules-black.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkRules-white.css b/emhttp/plugins/dynamix/sheets/NetworkRules-white.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkRules-white.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkRules.css b/emhttp/plugins/dynamix/sheets/NetworkRules.css
new file mode 100644
index 000000000..b4e4b3999
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkRules.css
@@ -0,0 +1 @@
+span[id^="info-"]{margin-left:20px}
diff --git a/emhttp/plugins/dynamix/sheets/NewConfig.css b/emhttp/plugins/dynamix/sheets/NewConfig.css
new file mode 100644
index 000000000..64980eedb
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NewConfig.css
@@ -0,0 +1 @@
+span.indent{display:inline-block;width:240px;margin-top:30px}
diff --git a/emhttp/plugins/dynamix/sheets/NewPerms.css b/emhttp/plugins/dynamix/sheets/NewPerms.css
new file mode 100644
index 000000000..068231dea
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NewPerms.css
@@ -0,0 +1,3 @@
+span.block{display:inline-block;width:300px;margin:24px 0}
+pre.pre{margin:30px 0;padding:20px}
+pre>p{margin:0;padding:0}
diff --git a/emhttp/plugins/dynamix/sheets/Notifications.css b/emhttp/plugins/dynamix/sheets/Notifications.css
new file mode 100644
index 000000000..c1e624014
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Notifications.css
@@ -0,0 +1,3 @@
+select.a{min-width:220px}
+input.a{width:220px}
+span.a{display:inline-block;width:220px;font-style:italic}
diff --git a/emhttp/plugins/dynamix/sheets/NotificationsArchive.css b/emhttp/plugins/dynamix/sheets/NotificationsArchive.css
new file mode 100644
index 000000000..5ccbb2024
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NotificationsArchive.css
@@ -0,0 +1,3 @@
+select.filter{margin:0}
+span.right{margin-top:-6px;font-size:1.3rem!important;padding:0!important}
+i.red-text{font-size:1.6rem}
diff --git a/emhttp/plugins/dynamix/sheets/PHPsettings.css b/emhttp/plugins/dynamix/sheets/PHPsettings.css
new file mode 100644
index 000000000..5107f389f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/PHPsettings.css
@@ -0,0 +1,4 @@
+div#templateWindow,div#dialogWindow{display:none}
+span.dim{opacity:0.2}
+#screenlog{margin-left:0}
+
diff --git a/emhttp/plugins/dynamix/sheets/RoutingTable-black.css b/emhttp/plugins/dynamix/sheets/RoutingTable-black.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/RoutingTable-black.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/RoutingTable-white.css b/emhttp/plugins/dynamix/sheets/RoutingTable-white.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/RoutingTable-white.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/RoutingTable.css b/emhttp/plugins/dynamix/sheets/RoutingTable.css
new file mode 100644
index 000000000..18130a5cf
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/RoutingTable.css
@@ -0,0 +1 @@
+input.fixed{width:200px;}
diff --git a/emhttp/plugins/dynamix/sheets/Share-azure.css b/emhttp/plugins/dynamix/sheets/Share-azure.css
new file mode 100644
index 000000000..3294cd53a
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Share-azure.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;max-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Share-black.css b/emhttp/plugins/dynamix/sheets/Share-black.css
new file mode 100644
index 000000000..15b1305c5
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Share-black.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;max-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Share-gray.css b/emhttp/plugins/dynamix/sheets/Share-gray.css
new file mode 100644
index 000000000..3294cd53a
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Share-gray.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;max-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Share-white.css b/emhttp/plugins/dynamix/sheets/Share-white.css
new file mode 100644
index 000000000..15b1305c5
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Share-white.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;max-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Share.css b/emhttp/plugins/dynamix/sheets/Share.css
new file mode 100644
index 000000000..9aa9f3146
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Share.css
@@ -0,0 +1,5 @@
+div.clone1{position:absolute;right:10px;margin-top:0}
+div.clone2{position:absolute;right:10px;margin-top:48px}
+span.input{display:inline-block;width:330px}
+input.clone{margin-left:8px;margin-right:0}
+span.clone{margin-right:4px}
diff --git a/emhttp/plugins/dynamix/sheets/ShareEdit-black.css b/emhttp/plugins/dynamix/sheets/ShareEdit-black.css
new file mode 100644
index 000000000..319505151
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ShareEdit-black.css
@@ -0,0 +1 @@
+form[name=share_edit]{margin-top:-20px}
diff --git a/emhttp/plugins/dynamix/sheets/ShareEdit-white.css b/emhttp/plugins/dynamix/sheets/ShareEdit-white.css
new file mode 100644
index 000000000..319505151
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ShareEdit-white.css
@@ -0,0 +1 @@
+form[name=share_edit]{margin-top:-20px}
diff --git a/emhttp/plugins/dynamix/sheets/ShareEdit.css b/emhttp/plugins/dynamix/sheets/ShareEdit.css
new file mode 100644
index 000000000..3509ac2e4
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ShareEdit.css
@@ -0,0 +1,6 @@
+div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
+div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
+div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
+div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
+#s1,#s2,#s3,#s4,#s5,#autosize,.empty,.full2,#zfs-name{display:none}
+i.fa-info.i{margin-right:10px}
diff --git a/emhttp/plugins/dynamix/sheets/ShareList.css b/emhttp/plugins/dynamix/sheets/ShareList.css
new file mode 100644
index 000000000..2fe2a4b43
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ShareList.css
@@ -0,0 +1,5 @@
+table.share_status thead tr td:first-child{width:15%}
+table.share_status thead tr td:nth-child(n+3){width:9%!important}
+table.share_status thead tr td:nth-child(5){width:13%!important}
+td.empty{text-align:center;padding-top:12px}
+i.fa-fw{margin-right:2px}
diff --git a/emhttp/plugins/dynamix/sheets/SysDevs.css b/emhttp/plugins/dynamix/sheets/SysDevs.css
new file mode 100644
index 000000000..9d6489e2b
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/SysDevs.css
@@ -0,0 +1,4 @@
+table.pre{margin-top:0;background:transparent}
+table.pre td:first-child{width:144px}
+table tr td{padding:0 0 3px 0;margin:0}
+table tr td.thin{line-height:8px;height:8px}
diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
new file mode 100644
index 000000000..835aff61e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -0,0 +1,9 @@
+table.t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
+table.t1 tr td{padding:0 0 3px 0;margin:0}
+table.t1 tr td.thin{line-height:8px;height:8px}
+table.t1 tr>td{width:1%;text-align:centre;white-space: nowrap}
+table.t1 tr>td+td{width:1%;white-space:nowrap}
+table.t1 tr>td+td+td{width:auto;text-align:left}
+table.t1 tr>td+td+td+td{text-align:left}
+table.t1 tr>td+td+td+td+td{text-align:left}
+.t1.tablesorter .filtered{display:none}
diff --git a/emhttp/plugins/dynamix/sheets/Syslinux-azure.css b/emhttp/plugins/dynamix/sheets/Syslinux-azure.css
new file mode 100644
index 000000000..fbf4033b6
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslinux-azure.css
@@ -0,0 +1,2 @@
+span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #606E7F;border-bottom:none}
+textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border-top:none}
diff --git a/emhttp/plugins/dynamix/sheets/Syslinux-black.css b/emhttp/plugins/dynamix/sheets/Syslinux-black.css
new file mode 100644
index 000000000..1ea7870dc
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslinux-black.css
@@ -0,0 +1,2 @@
+span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #f2f2f2;border-bottom:none}
+textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border:1px solid #f2f2f2;border-top:none}
diff --git a/emhttp/plugins/dynamix/sheets/Syslinux-gray.css b/emhttp/plugins/dynamix/sheets/Syslinux-gray.css
new file mode 100644
index 000000000..fbf4033b6
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslinux-gray.css
@@ -0,0 +1,2 @@
+span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #606E7F;border-bottom:none}
+textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border-top:none}
diff --git a/emhttp/plugins/dynamix/sheets/Syslinux-white.css b/emhttp/plugins/dynamix/sheets/Syslinux-white.css
new file mode 100644
index 000000000..a25a77b27
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslinux-white.css
@@ -0,0 +1,2 @@
+span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #1c1c1c;border-bottom:none}
+textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border:1px solid #1c1b1b;border-top:none}
diff --git a/emhttp/plugins/dynamix/sheets/Syslinux.css b/emhttp/plugins/dynamix/sheets/Syslinux.css
new file mode 100644
index 000000000..105f9ee66
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslinux.css
@@ -0,0 +1,3 @@
+div.basic{display:block}
+div.advanced{display:none}
+textarea.raw{resize:none;font-family:bitstream;width:65.5%}
diff --git a/emhttp/plugins/dynamix/sheets/Syslog.css b/emhttp/plugins/dynamix/sheets/Syslog.css
new file mode 100644
index 000000000..744120e1f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslog.css
@@ -0,0 +1 @@
+input#max{border:none;width:60px;margin:0;padding:0}
diff --git a/emhttp/plugins/dynamix/sheets/SyslogSettings.css b/emhttp/plugins/dynamix/sheets/SyslogSettings.css
new file mode 100644
index 000000000..ce9ef4cbf
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/SyslogSettings.css
@@ -0,0 +1 @@
+span.span{display:inline-block;width:224px}
diff --git a/emhttp/plugins/dynamix/sheets/UserAdd-azure.css b/emhttp/plugins/dynamix/sheets/UserAdd-azure.css
new file mode 100644
index 000000000..927e648fe
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserAdd-azure.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#EDEAEF;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserAdd-black.css b/emhttp/plugins/dynamix/sheets/UserAdd-black.css
new file mode 100644
index 000000000..0a94f7329
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserAdd-black.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #f2f2f2;border-radius:5px;background:#262626;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserAdd-gray.css b/emhttp/plugins/dynamix/sheets/UserAdd-gray.css
new file mode 100644
index 000000000..e6795581e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserAdd-gray.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#121510;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserAdd-white.css b/emhttp/plugins/dynamix/sheets/UserAdd-white.css
new file mode 100644
index 000000000..ecc903eb7
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserAdd-white.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserAdd.css b/emhttp/plugins/dynamix/sheets/UserAdd.css
new file mode 100644
index 000000000..3c82b6cd2
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserAdd.css
@@ -0,0 +1,3 @@
+i.top{position:absolute;padding-top:4px;cursor:pointer}
+i#showPass.checked{opacity:0.5}
+.usage-disk.sys{display:inline-block;width:10rem;top:<?=$themes2?'1.2':'.2'?>rem;margin-left:12px;border-radius:4px}
diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-azure.css b/emhttp/plugins/dynamix/sheets/UserEdit-azure.css
new file mode 100644
index 000000000..927e648fe
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserEdit-azure.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#EDEAEF;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-black.css b/emhttp/plugins/dynamix/sheets/UserEdit-black.css
new file mode 100644
index 000000000..0a94f7329
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserEdit-black.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #f2f2f2;border-radius:5px;background:#262626;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-gray.css b/emhttp/plugins/dynamix/sheets/UserEdit-gray.css
new file mode 100644
index 000000000..e6795581e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserEdit-gray.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#121510;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-white.css b/emhttp/plugins/dynamix/sheets/UserEdit-white.css
new file mode 100644
index 000000000..ecc903eb7
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserEdit-white.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserEdit.css b/emhttp/plugins/dynamix/sheets/UserEdit.css
new file mode 100644
index 000000000..3c82b6cd2
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserEdit.css
@@ -0,0 +1,3 @@
+i.top{position:absolute;padding-top:4px;cursor:pointer}
+i#showPass.checked{opacity:0.5}
+.usage-disk.sys{display:inline-block;width:10rem;top:<?=$themes2?'1.2':'.2'?>rem;margin-left:12px;border-radius:4px}
diff --git a/emhttp/plugins/dynamix/sheets/UserList-black.css b/emhttp/plugins/dynamix/sheets/UserList-black.css
new file mode 100644
index 000000000..d1db27757
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserList-black.css
@@ -0,0 +1 @@
+div#title{margin-top:-30px!important}
diff --git a/emhttp/plugins/dynamix/sheets/UserList-white.css b/emhttp/plugins/dynamix/sheets/UserList-white.css
new file mode 100644
index 000000000..d1db27757
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserList-white.css
@@ -0,0 +1 @@
+div#title{margin-top:-30px!important}
diff --git a/emhttp/plugins/dynamix/sheets/UserList.css b/emhttp/plugins/dynamix/sheets/UserList.css
new file mode 100644
index 000000000..d5736521b
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserList.css
@@ -0,0 +1 @@
+a.info span{top:66px;left:42px}
diff --git a/emhttp/plugins/dynamix/sheets/WG0-azure.css b/emhttp/plugins/dynamix/sheets/WG0-azure.css
new file mode 100644
index 000000000..26090881e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/WG0-azure.css
@@ -0,0 +1,2 @@
+span.hshift{margin-right:11px!important}
+span.label{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;margin-left:-4px}
diff --git a/emhttp/plugins/dynamix/sheets/WG0-black.css b/emhttp/plugins/dynamix/sheets/WG0-black.css
new file mode 100644
index 000000000..ad6d3590f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/WG0-black.css
@@ -0,0 +1,2 @@
+span.hshift{margin-right:-7px!important}
+span.label{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;margin-left:-12px}
diff --git a/emhttp/plugins/dynamix/sheets/WG0-gray.css b/emhttp/plugins/dynamix/sheets/WG0-gray.css
new file mode 100644
index 000000000..26090881e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/WG0-gray.css
@@ -0,0 +1,2 @@
+span.hshift{margin-right:11px!important}
+span.label{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;margin-left:-4px}
diff --git a/emhttp/plugins/dynamix/sheets/WG0-white.css b/emhttp/plugins/dynamix/sheets/WG0-white.css
new file mode 100644
index 000000000..ad6d3590f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/WG0-white.css
@@ -0,0 +1,2 @@
+span.hshift{margin-right:-7px!important}
+span.label{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;margin-left:-12px}
diff --git a/emhttp/plugins/dynamix/sheets/WG0.css b/emhttp/plugins/dynamix/sheets/WG0.css
new file mode 100644
index 000000000..2d5bb5253
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/WG0.css
@@ -0,0 +1,29 @@
+dt{width:22%}
+span.even{float:right;display:inline-block;width:150px;margin-top:3px}
+span.even.wide{width:200px}
+span.pin{float:right;margin:-40px 12px 0 0;clear:both;display:inline-block;width:400px;text-align:right}
+span[class^=rx]{margin-right:40px}
+span.vshift{margin-top:-2px!important}
+span.input{display:inline-block;width:420px}
+span.access-type{display:inline-block;width:35%;white-space:normal}
+@media(max-width:1920px){span.access-type{width:20%}}
+span.block{display:inline-block;width:48%;white-space:normal}
+div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
+div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
+div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
+div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
+div.title{margin-bottom:10px!important}
+div[id^=block-wg]{margin-bottom:30px}
+div.preset{margin:8px 0;float:right}
+input.wide{width:360px}
+input.subnet{width:150px;margin-right:4px}
+input.mask{width:30px}
+input.port{width:50px}
+input.form,button.form{font-size:1rem;min-width:0;padding:5px 8px;margin:0}
+input.ok{color:#f2f2f2;background:#4f8a10}
+input.nok{color:#f2f2f2;background:#f0000c}
+select.subnet{min-width:150px}
+i.fa-fw{margin-left:5px}
+i.key-off{opacity:0.3;cursor:default!important}
+input:user-invalid {border-bottom-color:#E22828;}
+input:-moz-ui-invalid {border-bottom-color:#E22828;}

From ecde59212405cb4f62ccaa6d98ace265e01df324 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 20:09:04 +0200
Subject: [PATCH 044/266] snaphots: several updates for Dashboard and VMs page

---
 emhttp/plugins/dynamix/sheets/DashStats.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emhttp/plugins/dynamix/sheets/DashStats.css b/emhttp/plugins/dynamix/sheets/DashStats.css
index aa136a8a3..6730b227e 100644
--- a/emhttp/plugins/dynamix/sheets/DashStats.css
+++ b/emhttp/plugins/dynamix/sheets/DashStats.css
@@ -62,3 +62,4 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 #current_time{font-size:4rem;margin-left:8px}
 #current_date{font-size:1.3rem;margin-left:18px}
 span.ampm{font-size:2rem}
+table.snapshot{margin-top:0}

From 46148e7fb6b71f9d2bad9ba1e1120b51e5b0656e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 20:16:30 +0200
Subject: [PATCH 045/266] default-black.css: fix typo

---
 emhttp/plugins/dynamix/styles/default-black.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index 5f2b87035..4f4296855 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -1,6 +1,6 @@
 html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#f2f2f2;background-color:#1c1b1b;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
-@media (max-width:1280px){#templsate{min-width:1260px;max-width:1260px;margin:0}}
+@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
 @media (min-width:1281px){#template{min-width:1260px;margin:0 10px}}
 @media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}

From 65c8f4790e25cfa32c108d3ba0bdf42bfdb7c92c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 20:32:32 +0200
Subject: [PATCH 046/266] default-azure.css: remove unused entry

---
 emhttp/plugins/dynamix/styles/default-azure.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index ec6dbc23a..71b9576c2 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -196,7 +196,6 @@ span.ucfirst{text-transform:capitalize}
 span.strong{font-weight:bold}
 span.big{font-size:1.4rem}
 span.small{font-size:1.1rem}
-span.score{font-size:1.1rem;color:#ffffff;position:absolute}
 span#dropbox{background:none;line-height:6rem;margin-right:20px}
 span.outer{margin-bottom:20px;margin-right:0}
 span.outer.solid{background-color:#d7dbdd}

From 7715e09befb5831a75ff77fb4b08996ae2b9402b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 20:42:15 +0200
Subject: [PATCH 047/266] styling min width

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

diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index 71b9576c2..b79049e5f 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -2,7 +2,7 @@ html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#606e7f;background-color:#e4e2e4;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
 @media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
 @media (min-width:1281px){#template{min-width:1260px;margin:0}}
-@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
+@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:left}
 p.centered{text-align:left}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index 4f4296855..7e2a1ebee 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -2,7 +2,7 @@ html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#f2f2f2;background-color:#1c1b1b;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
 @media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
 @media (min-width:1281px){#template{min-width:1260px;margin:0 10px}}
-@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
+@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:justify}
 p.centered{text-align:left}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index 099a70081..3c058ea18 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -2,7 +2,7 @@ html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#606e7f;background-color:#1b1d1b;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
 @media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
 @media (min-width:1281px){#template{min-width:1260px;margin:0}}
-@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
+@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:left}
 p.centered{text-align:left}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index 7759a9311..68d210d2e 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -2,7 +2,7 @@ html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#1c1b1b;background-color:#f2f2f2;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
 @media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
 @media (min-width:1281px){#template{min-width:1260px;margin:0 10px}}
-@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
+@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:justify}
 p.centered{text-align:left}

From 58a4fb601a72c78ee35908c13477da80548cadd6 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 22:46:39 +0200
Subject: [PATCH 048/266] rc.S: use absolute path

---
 etc/rc.d/rc.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/rc.d/rc.S b/etc/rc.d/rc.S
index daf7382ff..62936e999 100755
--- a/etc/rc.d/rc.S
+++ b/etc/rc.d/rc.S
@@ -61,7 +61,7 @@ fi
 # provided to override which device is mounted for /boot (default: UNRAID)
 UNRAIDLABEL="UNRAID"
 UNRAIDROOT=
-set -- $(cat /proc/cmdline)
+set -- $(/bin/cat /proc/cmdline)
 for x in "$@"; do
   case "$x" in
   unraidlabel=*)

From 416f8c4cebc29a9124ab957e77bd7a23b1b3a895 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 14 Oct 2023 23:37:53 +0200
Subject: [PATCH 049/266] Fix PHP8 errors

---
 emhttp/plugins/dynamix/include/DiskList.php | 2 +-
 emhttp/plugins/dynamix/nchan/update_3       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/include/DiskList.php b/emhttp/plugins/dynamix/include/DiskList.php
index f8bd58e40..7c78e0998 100644
--- a/emhttp/plugins/dynamix/include/DiskList.php
+++ b/emhttp/plugins/dynamix/include/DiskList.php
@@ -88,7 +88,7 @@ foreach ($disks as $name => $disk) {
   } else $luks = "";
   echo "<tr><td><a class='view' href=\"/$path/Browse?dir=/mnt/$name\"><i class=\"icon-u-tab\" title=\"",_('Browse')," /mnt/$name\"></i></a>";
   echo "<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>"._var($disk,'comment')."</td>";
   echo "<td>",disk_share_settings(_var($var,'shareSMBEnabled'), $sec[$name]),"</td>";
   echo "<td>",disk_share_settings(_var($var,'shareNFSEnabled'), $sec_nfs[$name]),"</td>";
   $cmd="/webGui/scripts/disk_size&arg1=$name&arg2=ssz2";
diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 2f09b8bc0..62ffd5373 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -26,6 +26,9 @@ $_SERVER['REQUEST_URI'] = 'dashboard/main';
 $login_locale = _var($display,'locale');
 require_once "$docroot/webGui/include/Translations.php";
 
+// remember current language
+$locale_init = $locale;
+
 function update_translation($locale) {
   global $docroot,$language;
   $language = [];

From 83d02ea7ff9b9c2470225c82760d4b527a8bca3e Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 14 Oct 2023 23:46:31 +0100
Subject: [PATCH 050/266] Initial commit of multifunction support

Need to remove option for virtual gpus.
---
 .../dynamix.vm.manager/include/libvirt.php    | 38 +++++++++++++++++--
 .../include/libvirt_helpers.php               |  7 ++--
 .../templates/Custom.form.php                 | 26 +++++++++++++
 3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index 484f5e011..c3e63faad 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -732,6 +732,7 @@
 
 			$pcidevs='';
 			$gpudevs_used=[];
+			$multidevices = $multi = [] ; #Load?
 			$vmrc='';
 			$channelscopypaste = '';
 			if (!empty($gpus)) {
@@ -834,6 +835,27 @@
 						$strRomFile = "<rom file='".$gpu['rom']."'/>";
 					}
 
+					if ($gpu['multi'] == "on"){
+							# This is a new Multifunction device/VM allocate from range 0x90
+							$multibus = array_key_last($multi) ;
+							file_put_contents("/tmp/mbus", $multibus) ;
+							if ($multibus == NULL) $multi_bus = "0x90" ; 
+							else 
+								{
+									$multi_bus = hexdec($multibus) + 1 ;   
+									$multi_bus = "0x".dechex($multi_bus) ;
+								}
+							$multi[$multi_bus] = $multi_bus ;
+							$strSpecialAddress = "<address type='pci' domain='0x0000' bus='".$multi_bus."' slot='0x".$gpu_slot."' function='0x".$gpu_function."' multifunction='on' />" ;
+						} else {
+							$multi_bus = $gpu['guestbus'] ;
+							$strSpecialAddress = "<address type='pci' domain='0x0000' bus='".$multi_bus."' slot='0x".$gpu_slot."' function='0x".$gpu_function."' multifunction='on' />" ;
+						}
+						$multidevices[$gpu_bus] = $multi_bus ;
+					}
+
+					
+
 					$pcidevs .= "<hostdev mode='subsystem' type='pci' managed='yes'".$strXVGA.">
 									<driver name='vfio'/>
 									<source>
@@ -846,8 +868,9 @@
 					$gpudevs_used[] = $gpu['id'];
 				}
 			}
-
+			file_put_contents("/tmp/bus", $multi) ;
 			$audiodevs_used=[];
+			$strSpecialAddressAudio = "" ;
 			if (!empty($audios)) {
 				foreach ($audios as $i => $audio) {
 					// Skip duplicate audio devices
@@ -856,12 +879,16 @@
 					}
 
 					[$audio_bus, $audio_slot, $audio_function] = my_explode(":", str_replace('.', ':', $audio['id']), 3);
+					if ($audio_function != 0) {
+						if (isset($multidevices[$audio_bus]))	$strSpecialAddressAudio = "<address type='pci' domain='0x0000' bus='".$multidevices[$audio_bus]."' slot='0x".$audio_slot."' function='0x".$audio_function."' />" ;
+					}
 
 					$pcidevs .= "<hostdev mode='subsystem' type='pci' managed='yes'>
 									<driver name='vfio'/>
 									<source>
 										<address domain='0x0000' bus='0x".$audio_bus."' slot='0x".$audio_slot."' function='0x".$audio_function."'/>
 									</source>
+									$strSpecialAddressAudio
 								</hostdev>";
 
 					$audiodevs_used[] = $audio['id'];
@@ -2235,7 +2262,11 @@
 					$boot =$xpath->query('boot/@order', $objNode)->Item(0)->value;
 					$devid = str_replace('0x', '', 'pci_'.$dom.'_'.$bus.'_'.$slot.'_'.$func);
 					$tmp2 = $this->get_node_device_information($devid);
-
+					$guest["multi"] = $xpath->query('address/@multifunction', $objNode)->Item(0)->value ? "on" : "off" ;
+					$guest["dom"]  = $xpath->query('address/@domain', $objNode)->Item(0)->value;
+					$guest["bus"]  = $xpath->query('address/@bus', $objNode)->Item(0)->value;
+					$guest["slot"] = $xpath->query('address/@slot', $objNode)->Item(0)->value;
+					$guest["func"] = $xpath->query('address/@function', $objNode)->Item(0)->value;
 					$devs[] = [
 						'domain' => $dom,
 						'bus' => $bus,
@@ -2247,7 +2278,8 @@
 						'product' => $tmp2['product_name'],
 						'product_id' => $tmp2['product_id'],
 						'boot' => $boot,
-						'rom' => $rom
+						'rom' => $rom,
+						'guest' => $guest
 					];
 				}
 			}
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 9575152c6..4274958fc 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1166,25 +1166,26 @@ private static $encoding = 'UTF-8';
 				'wsport' => $lv->domain_get_ws_port($res),
 				'autoport' => $autoport,
 				'copypaste' => $getcopypaste,
+				'guest' => ['multi' => 'off' ],
 			];
 		}
 
 		foreach ($arrHostDevs as $arrHostDev) {
 			$arrFoundGPUDevices = array_filter($arrValidGPUDevices, function($arrDev) use ($arrHostDev) {return ($arrDev['id'] == $arrHostDev['id']);});
 			if (!empty($arrFoundGPUDevices)) {
-				$arrGPUDevices[] = ['id' => $arrHostDev['id'], 'rom' => $arrHostDev['rom']];
+				$arrGPUDevices[] = ['id' => $arrHostDev['id'], 'rom' => $arrHostDev['rom'], 'guest' => $arrHostDev['guest']];
 				continue;
 			}
 
 			$arrFoundAudioDevices = array_filter($arrValidAudioDevices, function($arrDev) use ($arrHostDev) {return ($arrDev['id'] == $arrHostDev['id']);});
 			if (!empty($arrFoundAudioDevices)) {
-				$arrAudioDevices[] = ['id' => $arrHostDev['id']];
+				$arrAudioDevices[] = ['id' => $arrHostDev['id'], 'guest' => $arrHostDev['guest']];
 				continue;
 			}
 
 			$arrFoundOtherDevices = array_filter($arrValidOtherDevices, function($arrDev) use ($arrHostDev) {return ($arrDev['id'] == $arrHostDev['id']);});
 			if (!empty($arrFoundOtherDevices)) {
-				$arrOtherDevices[] = ['id' => $arrHostDev['id'],'boot' => $arrHostDev['boot']];
+				$arrOtherDevices[] = ['id' => $arrHostDev['id'],'boot' => $arrHostDev['boot'], 'guest' => $arrHostDev['guest']];
 				continue;
 			}
 		}
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index d5fa2369a..12a072cb5 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -985,6 +985,19 @@
 						}
 					?>
 					</select>
+					<?			
+					#$multifunction =  "hidden" ;
+					if ($arrGPU['id'] != 'virtual') $multifunction = "" ;
+					?>
+					<span id="GPUMulti" name="gpu[<?=$i?>][multi]"  <?=$multifunction?>>_(Multifunction)_:</span>
+								
+					<select name="gpu[<?=$i?>][multi]" class="narrow" title="_(define Multifunctiion Support)_" <?=$multifunction?> >
+					<?
+						echo mk_option($arrGPU['guest']['multi'], 'off', 'Off');
+						echo mk_option($arrGPU['guest']['multi'], 'on', 'On');
+					?>
+					</select>
+					<input type="hidden" name="gpu[<?=$i?>][guestbus]" id="gpuguest" value="<?=htmlspecialchars($arrGPU['guest']["bus"])?>">
 				</td>
 			</tr>
 
@@ -1122,6 +1135,19 @@
 						}
 					?>
 					</select>
+					<?			
+					#$multifunction =  "hidden" ;
+					if ($arrGPU['id'] != 'virtual') $multifunction = "" ;
+					?>
+					<span id="GPUMulti" name="gpu[{{INDEX}}][multi]"  <?=$multifunction?>>_(Multifunction)_:</span>
+								
+					<select name="gpu[{{INDEX}}][multi]" class="narrow" title="_(define Multifunctiion Support)_" <?=$multifunction?> >
+					<?
+						echo mk_option($arrGPU['guest']['multi'], 'off', 'Off');
+						echo mk_option($arrGPU['guest']['multi'], 'on', 'On');
+					?>
+					</select>
+					<input type="hidden" name="gpu[{{INDEX}}][guestbus]" id="gpuguest" value="">
 				</td>
 			</tr>
 			<tr class="advanced romfile">

From b4bd84cd03ff1ba69aecd31229f3b825d1518d21 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 14 Oct 2023 23:48:43 +0100
Subject: [PATCH 051/266] Update libvirt.php

---
 emhttp/plugins/dynamix.vm.manager/include/libvirt.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index c3e63faad..a0b5007c8 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -836,6 +836,7 @@
 					}
 
 					if ($gpu['multi'] == "on"){
+						if ($gpu['guestbus'] == "") {
 							# This is a new Multifunction device/VM allocate from range 0x90
 							$multibus = array_key_last($multi) ;
 							file_put_contents("/tmp/mbus", $multibus) ;

From 801c33a8323d75475a50443e74905191823e4335 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 10:17:39 +0200
Subject: [PATCH 052/266] Wireguard: fix LAN access when vhost interface is
 used

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

diff --git a/emhttp/plugins/dynamix/WG0.page b/emhttp/plugins/dynamix/WG0.page
index 03e04fa0d..1fa4c61b5 100644
--- a/emhttp/plugins/dynamix/WG0.page
+++ b/emhttp/plugins/dynamix/WG0.page
@@ -138,21 +138,22 @@ $server    = ipaddr($ethX);
 $dnsserver = _var($$ethX,'DNS_SERVER1');
 
 $link      = iflink($ethX);
+$vhost     = str_replace(['eth','br','bond'],'vhost',$link);
 $postUp0   = "$script add $link WireGuard-<wg> $server <port> <port> udp";
 $postUp1   = "logger -t wireguard -- 'Tunnel WireGuard-<wg> started';$services";
-$postUp2   = "iptables -t nat -A POSTROUTING -s <source> -o $link -j MASQUERADE";
+$postUp2   = "iptables -t nat -A POSTROUTING -s <source> -o $link -j MASQUERADE;iptables -t nat -A POSTROUTING -s <source> -o $vhost -j MASQUERADE";
 $postUp3   = "iptables -N WIREGUARD_DROP_<WG>;iptables -A WIREGUARD -o $link -j WIREGUARD_DROP_<WG>";
 $postUpX   = "iptables -A WIREGUARD_DROP_<WG> -s <source> -d <target> -j DROP";
 $postUpZ   = "iptables -A WIREGUARD_DROP_<WG> -s <source> -j ACCEPT;iptables -A WIREGUARD_DROP_<WG> -j RETURN";
-$postUp26  = "ip6tables -t nat -A POSTROUTING -s <source> -o $link -j MASQUERADE";
+$postUp26  = "ip6tables -t nat -A POSTROUTING -s <source> -o $link -j MASQUERADE;ip6tables -t nat -A POSTROUTING -s <source> -o $vhost -j MASQUERADE";
 $postUp36  = "ip6tables -N WIREGUARD_DROP_<WG>;ip6tables -A WIREGUARD -o $link -j WIREGUARD_DROP_<WG>";
 $postUpX6  = "ip6tables -A WIREGUARD_DROP_<WG> -s <source> -d <target> -j DROP";
 $postUpZ6  = "ip6tables -A WIREGUARD_DROP_<WG> -s <source> -j ACCEPT;ip6tables -A WIREGUARD_DROP_<WG> -j RETURN";
 $postDown0 = "$script del $link <port> udp";
 $postDown1 = "logger -t wireguard -- 'Tunnel WireGuard-<wg> stopped';$services";
-$postDown2 = "iptables -t nat -D POSTROUTING -s <source> -o $link -j MASQUERADE";
+$postDown2 = "iptables -t nat -D POSTROUTING -s <source> -o $link -j MASQUERADE;iptables -t nat -D POSTROUTING -s <source> -o $vhost -j MASQUERADE";
 $postDown3 = "iptables -F WIREGUARD_DROP_<WG>;iptables -D WIREGUARD -o $link -j WIREGUARD_DROP_<WG>;iptables -X WIREGUARD_DROP_<WG>";
-$postDown26= "ip6tables -t nat -D POSTROUTING -s <source> -o $link -j MASQUERADE";
+$postDown26= "ip6tables -t nat -D POSTROUTING -s <source> -o $link -j MASQUERADE;ip6tables -t nat -D POSTROUTING -s <source> -o $vhost -j MASQUERADE";
 $postDown36= "ip6tables -F WIREGUARD_DROP_<WG>;ip6tables -D WIREGUARD -o $link -j WIREGUARD_DROP_<WG>;ip6tables -X WIREGUARD_DROP_<WG>";
 
 $tld       = @file_get_contents("$docroot/webGui/include/tld.key")?:'';

From 069f52744500a8f6b3b32d9bba1bd63c9ba01682 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 10:33:34 +0200
Subject: [PATCH 053/266] Wireguard: fix LAN access when vhost interface is
 used

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

diff --git a/emhttp/plugins/dynamix/WG0.page b/emhttp/plugins/dynamix/WG0.page
index 1fa4c61b5..27513b2fe 100644
--- a/emhttp/plugins/dynamix/WG0.page
+++ b/emhttp/plugins/dynamix/WG0.page
@@ -221,7 +221,7 @@ refresh();
 Number.prototype.long2ip = function(){return [this>>>24,this>>>16&255,this>>>8&255,this&255].join('.');}
 String.prototype.ip2long = function(){var ip=this.split('.');return (ip[0]<<24)+(ip[1]<<16)+(ip[2]<<8)+(ip[3]*1);}
 String.prototype.desc    = function(){return this.substr(this.lastIndexOf('/'));}
-String.prototype.patch   = function(s,t){return t?this.replace(/<source>/,s).replace(/<target>/,t):this.replace(/<source>/,s);}
+String.prototype.patch   = function(s,t){return t?this.replace(/<source>/g,s).replace(/<target>/,t):this.replace(/<source>/g,s);}
 Array.prototype.bind     = function(w){return (this.join(';')).replace(/<WG>/g,w).replace(/,/g,';');}
 
 var xml = $.cookie('upnp')||'<?=@file_get_contents('/var/tmp/upnp')?>';

From 7cd7c4b897885b2a1c9c11bd4d83cf5e1c8e0e1c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 12:11:24 +0200
Subject: [PATCH 054/266] Dashboard: show time in header of collapsed tile

---
 emhttp/plugins/dynamix/DashStats.page       | 24 ++++++++++-----------
 emhttp/plugins/dynamix/sheets/DashStats.css |  6 ++++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index e15285b2c..c29f07971 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -184,7 +184,7 @@ switch ($display['theme']) {
 <table id='db-box1' class='share_status dashboard'>
 <tbody class='system'>
 <tr><td><i class='icon-performance f32'></i><div class='section'><?=_var($var,'NAME')?><br>
-<span><?=_var($var,'COMMENT')?></span><br></div>
+<span><?=_var($var,'COMMENT')?></span><span id="_current_time_" class="head_time"></span><br></div>
 <a href='/Dashboard/Settings/Identification'><i class='fa fa-fw fa-cog control' title="_(Go to identification settings)_"></i></a><i class='fa fa-fw fa-wrench control tile' onclick='contentMgmt()' title="_(Tile Management)_"></i>
 <span class='ctrl'>
 <?if ($parity||$mover||$btrfs):?>
@@ -726,19 +726,13 @@ jQuery.prototype.mixedView = function(s) {
     this.find('tr:gt(0)').hide();
     this.find('span[id^="head_"]').show();
     this.find('span[id^="tile_"]').hide();
-    this.find('span#_cpu_').prop('id','cpu');
-    this.find('span#_sys0_').prop('id','sys0');
-    this.find('span#_ups_loadpct_').prop('id','ups_loadpct');
-    this.find('span#_ups_status_').prop('id','ups_status');
+    changeSpan(this,0)
     return;
   }
   this.find('tr:gt(0)').show();
-  this.find('span#cpu:first').prop('id','_cpu_');
-  this.find('span#sys0:first').prop('id','_sys0_');
-  this.find('span#ups_loadpct:first').prop('id','_ups_loadpct_');
-  this.find('span#ups_status:first').prop('id','_ups_status_');
   this.find('span[id^="head_"]').hide();
   this.find('span[id^="tile_"]').show();
+  changeSpan(this,1)
   if (this.attr('data')) {
     setTimeout(this.attr('data'));
   }
@@ -943,6 +937,13 @@ function changeMode(item) {
 <?endif;?>
   $('select[name="enter_user"]').val(item);
 }
+function changeSpan(span,dir) {
+  const spans = ['cpu','sys0','ups_loadpct','ups_status','current_time'];
+  switch (dir) {
+    case 0: for (var i=0,id; id=spans[i]; i++) span.find('span#_'+id+'_').prop('id',id); break;
+    case 1: for (var i=0,id; id=spans[i]; i++) span.find('span#'+id+':first').prop('id','_'+id+'_'); break;
+  }
+}
 function changeView(item) {
   if (item==0) $.removeCookie('enter_view'); else $.cookie('enter_view',item,{expires:3650});
   if (item==0) $('.view1').show(); else $('.view1').hide();
@@ -1194,10 +1195,7 @@ function showContent() {
       tbody.find('tr:gt(0)').hide();
       tbody.find('span[id^="head_"]').show();
       tbody.find('span[id^="tile_"]').hide();
-      tbody.find('span#_cpu_').prop('id','cpu');
-      tbody.find('span#_sys0_').prop('id','sys0');
-      tbody.find('span#_ups_loadpct_').prop('id','ups_loadpct');
-      tbody.find('span#_ups_status_').prop('id','ups_status');
+      changeSpan(tbody,0);
     }
   }
   if (count['db-box1']>0) $('div#tile1').show();
diff --git a/emhttp/plugins/dynamix/sheets/DashStats.css b/emhttp/plugins/dynamix/sheets/DashStats.css
index 6730b227e..0981e75ae 100644
--- a/emhttp/plugins/dynamix/sheets/DashStats.css
+++ b/emhttp/plugins/dynamix/sheets/DashStats.css
@@ -7,9 +7,12 @@ div.rightside{float:right;margin:0;text-align:center}
 div[id$=chart]{margin:-12px 8px -24px -18px}
 div.template,div#dialogWindow,input#upload{display:none}
 span.head_info{width:250px;display:inline-block}
-span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_{display:none;margin-left:0}
+span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_,#_current_time_{display:none;margin-left:0}
 span.head_bar{display:inline-block;width:180px}
 span.head_gap{padding-left:14px}
+span.head_time{padding-left:40px;font-size:inherit!important;font-weight:bold!important}
+span.head_time span.ampm{font-size:inherit!important;font-weight:bold!important}
+span.ampm{font-size:3rem}
 span.green,span.red,span.orange{padding-left:0}
 span.ctrl{float:right;margin-top:0;margin-right:10px}
 span.ctrl span{font-size:2rem!important}
@@ -61,5 +64,4 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
 #current_time{font-size:4rem;margin-left:8px}
 #current_date{font-size:1.3rem;margin-left:18px}
-span.ampm{font-size:2rem}
 table.snapshot{margin-top:0}

From 43465bfd35f50c6469d7984dc498f96e02d355f9 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 15 Oct 2023 11:16:20 +0100
Subject: [PATCH 055/266] Disable input if Virtual.

Add Support for OtherPCI Devices
---
 .../dynamix.vm.manager/include/libvirt.php      | 17 ++++++++++++++---
 .../templates/Custom.form.php                   | 17 ++++++++++-------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index a0b5007c8..ed8f1d77e 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -733,6 +733,11 @@
 			$pcidevs='';
 			$gpudevs_used=[];
 			$multidevices = $multi = [] ; #Load?
+			foreach ($gpus as $i => $gpu) {
+				 if ($gpu['guestbus'] != "") $multi[$gpu['guestbus']] = $gpu['guestbus'] ;
+				 #$multi[$gpu['guestbus']] = $gpu['guestbus'] ;
+			}
+			ksort($multi) ;
 			$vmrc='';
 			$channelscopypaste = '';
 			if (!empty($gpus)) {
@@ -838,8 +843,7 @@
 					if ($gpu['multi'] == "on"){
 						if ($gpu['guestbus'] == "") {
 							# This is a new Multifunction device/VM allocate from range 0x90
-							$multibus = array_key_last($multi) ;
-							file_put_contents("/tmp/mbus", $multibus) ;
+							$multibus = array_key_last($multi) ;						
 							if ($multibus == NULL) $multi_bus = "0x90" ; 
 							else 
 								{
@@ -897,6 +901,7 @@
 			}
 
 			$pcidevs_used=[];
+			$strSpecialAddressOther = "" ;
 			if (!empty($pcis)) {
 				foreach ($pcis as $i => $pci_id) {
 					// Skip duplicate other pci devices
@@ -905,12 +910,18 @@
 					}
 					if ($vmclone) [$pci_bus, $pci_slot, $pci_function] = my_explode(":", str_replace('.', ':', $pci_id['id']), 3);
 					else [$pci_bus, $pci_slot, $pci_function] = my_explode(":", str_replace('.', ':', $pci_id), 3);
+					
+					if ($pci_function != 0) {
+						if (isset($multidevices[$pci_bus]))	$strSpecialAddressOther = "<address type='pci' domain='0x0000' bus='".$multidevices[$pci_bus]."' slot='0x".$pci_slot."' function='0x".$pci_function."' />" ;
+					}
 
 					$pcidevs .= "<hostdev mode='subsystem' type='pci' managed='yes'>
 									<driver name='vfio'/>
 									<source>
 										<address domain='0x0000' bus='0x" . $pci_bus . "' slot='0x" . $pci_slot . "' function='0x" . $pci_function . "'/>
-									</source>" ;
+									</source>
+									$strSpecialAddressOther " ;
+
 					if (!empty($pciboot[$pci_id]) && !$vmclone) {
 						$pcidevs .= "<boot order='".$pciboot[$pci_id]."'/>" ;
 					}
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 12a072cb5..53881ce21 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -986,18 +986,17 @@
 					?>
 					</select>
 					<?			
-					#$multifunction =  "hidden" ;
-					if ($arrGPU['id'] != 'virtual') $multifunction = "" ;
+					if ($arrGPU['id'] != 'virtual') $multifunction = "" ; else $multifunction =  " disabled " ;
 					?>
-					<span id="GPUMulti" name="gpu[<?=$i?>][multi]"  <?=$multifunction?>>_(Multifunction)_:</span>
+					<span id="GPUMulti<?=$i?>" name="gpu[<?=$i?>][multi]" class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced gpumultiline<?=$i?>"   >_(Multifunction)_:</span>
 								
-					<select name="gpu[<?=$i?>][multi]" class="narrow" title="_(define Multifunctiion Support)_" <?=$multifunction?> >
+					<select id="GPUMultiSel<?=$i?>" name="gpu[<?=$i?>][multi]" class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced narrow gpumultiselect<?=$i?>" title="_(define Multifunctiion Support)_" <?=$multifunction?> >
 					<?
 						echo mk_option($arrGPU['guest']['multi'], 'off', 'Off');
 						echo mk_option($arrGPU['guest']['multi'], 'on', 'On');
 					?>
 					</select>
-					<input type="hidden" name="gpu[<?=$i?>][guestbus]" id="gpuguest" value="<?=htmlspecialchars($arrGPU['guest']["bus"])?>">
+					<input type="hidden" name="gpu[<?=$i?>][guestbus]" id="gpuguest<?=$i?>" value="<?=htmlspecialchars($arrGPU['guest']["bus"])?>">
 				</td>
 			</tr>
 
@@ -1143,8 +1142,8 @@
 								
 					<select name="gpu[{{INDEX}}][multi]" class="narrow" title="_(define Multifunctiion Support)_" <?=$multifunction?> >
 					<?
-						echo mk_option($arrGPU['guest']['multi'], 'off', 'Off');
-						echo mk_option($arrGPU['guest']['multi'], 'on', 'On');
+						echo mk_option("off", 'off', 'Off');
+						echo mk_option("off", 'on', 'On');
 					?>
 					</select>
 					<input type="hidden" name="gpu[{{INDEX}}][guestbus]" id="gpuguest" value="">
@@ -1851,9 +1850,13 @@ $(function() {
 			if (myvalue == 'virtual') {
 				$vnc_sections.filter('.wasadvanced').removeClass('wasadvanced').addClass('advanced');
 				slideDownRows($vnc_sections.not(isVMAdvancedMode() ? '.basic' : '.advanced'));
+				var MultiSel = document.getElementById("GPUMultiSel0") ;
+				MultiSel.disabled = true ;
 			} else {
 				slideUpRows($vnc_sections);
 				$vnc_sections.filter('.advanced').removeClass('advanced').addClass('wasadvanced');
+				var MultiSel = document.getElementById("GPUMultiSel0") ;
+				MultiSel.disabled = false ;
 			}
 		}
 

From 536d990ee1d0f25e484a5cc02156e2d5f7b8686d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 12:18:16 +0200
Subject: [PATCH 056/266] Dashboard: show time in header of collapsed tile

---
 emhttp/plugins/dynamix/sheets/DashStats.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/sheets/DashStats.css b/emhttp/plugins/dynamix/sheets/DashStats.css
index 0981e75ae..aa216a082 100644
--- a/emhttp/plugins/dynamix/sheets/DashStats.css
+++ b/emhttp/plugins/dynamix/sheets/DashStats.css
@@ -11,7 +11,7 @@ span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_,#_curre
 span.head_bar{display:inline-block;width:180px}
 span.head_gap{padding-left:14px}
 span.head_time{padding-left:40px;font-size:inherit!important;font-weight:bold!important}
-span.head_time span.ampm{font-size:inherit!important;font-weight:bold!important}
+span.head_time .ampm{font-size:inherit!important;font-weight:bold!important;text-transform:uppercase!important}
 span.ampm{font-size:3rem}
 span.green,span.red,span.orange{padding-left:0}
 span.ctrl{float:right;margin-top:0;margin-right:10px}

From fec05e98bf1dc12d473f73dbc6fb82faee2ace09 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 14:52:56 +0200
Subject: [PATCH 057/266] Dashboard: minor icon update

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

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index c29f07971..0acbd7691 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -266,7 +266,7 @@ foreach ($cpus as $pair) {
 <tr><td><span class='w36'><i class='ups fa fa-compress'></i>_(Usable size)_: <?=my_scale($total,$unit,1,null,1024)." $unit"?></span><i class='ups fa fa-expand'></i>_(Maximum size)_: <?="$memory_maximum $unit"?><?=$low?'*':''?></td></tr>
 <tr id='var0'><td><span class='w26'><i class='ups fa fa-fw fa-microchip'></i>_(RAM)_</span><span class='w72'><span class='sys0 load resize'>0%</span><div class='usage-disk sys'><span id='sys0'></span><span></span></div></span></td></tr>
 <tr id='var1'><td><span class='w26'><i class='ups fa fa-fw fa-shield'></i>_(ZFS)_</span><span class='w72'><span class='sys1 load resize'>0%</span><div class='usage-disk sys'><span id='sys1'></span><span></span></div></span></td></tr>
-<tr id='var2'><td><span class='w26'><i class='ups fa fa-fw fa-suitcase'></i>_(Flash)_</span><span class='w72'><span class='sys2 load resize'>0%</span><div class='usage-disk sys'><span id='sys2'></span><span></span></div></span></td></tr>
+<tr id='var2'><td><span class='w26'><i class='ups fa fa-fw fa-pencil-square'></i>_(Flash)_</span><span class='w72'><span class='sys2 load resize'>0%</span><div class='usage-disk sys'><span id='sys2'></span><span></span></div></span></td></tr>
 <tr id='var3'><td><span class='w26'><i class='ups fa fa-fw fa-file-text'></i>_(Log)_</span><span class='w72'><span class='sys3 load resize'>0%</span><div class='usage-disk sys'><span id='sys3'></span><span></span></div></span></td></tr>
 <tr id='var4'><td><span class='w26'><i class='ups fa fa-fw fa-docker'></i>_(Docker)_</span><span class='w72'><span class='sys4 load resize'>0%</span><div class='usage-disk sys'><span id='sys4'></span><span></span></div></span></td></tr>
 </tbody>

From 3e1801faa0a84748601268b28b82b188102cd143 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 15:18:09 +0200
Subject: [PATCH 058/266] Docker: minor style update

---
 .../plugins/dynamix.docker.manager/include/CreateDocker.php   | 2 +-
 emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css | 4 ++--
 .../plugins/dynamix.docker.manager/sheets/UpdateContainer.css | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index bd96ee61b..79f67266f 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -991,7 +991,7 @@ _(Password Mask)_:
 <input type="hidden" name="confRequired[]" value="{7}">
 <input type="hidden" name="confMask[]" value="{8}">
 <span class="{11}">{0}:</span>
-: <span class="boxed"><input type="text" name="confValue[]" default="{2}" value="{9}" autocomplete="off" spellcheck="false" {11}>{10}<br><span class='orange-text'>{12}: {1}</span><br><span class="orange-text">{4}</span><br>
+: <span class="boxed"><input type="text" class="setting_input" name="confValue[]" default="{2}" value="{9}" autocomplete="off" spellcheck="false" {11}>{10}<br><span class='orange-text'>{12}: {1}</span><br><span class="orange-text">{4}</span><br></span>
 </div>
 
 <div markdown="1" id="templateAllocations" style="display:none">
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
index 5e3a5b5f0..800fac404 100644
--- a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
@@ -1,9 +1,9 @@
 .noshow,.advanced{display:none}
 .required:after{content:" *";color:#E80000}
-span.boxed{display:inline-block;line-height:normal;white-space:normal;width:56%}
+span.boxed{display:inline-block;line-height:normal;white-space:normal;width:auto}
 span.cpu,label.checkbox{display:inline-block;width:32px}
 span.ct{display:inline-block;width:230px}
 span.net{display:inline-block;width:120px}
 span.ip{display:inline-block;width:160px}
 dl,dt,dd{line-height:normal!important}
-
+input.setting_input{margin-right:50px}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
index 5e3a5b5f0..800fac404 100644
--- a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
@@ -1,9 +1,9 @@
 .noshow,.advanced{display:none}
 .required:after{content:" *";color:#E80000}
-span.boxed{display:inline-block;line-height:normal;white-space:normal;width:56%}
+span.boxed{display:inline-block;line-height:normal;white-space:normal;width:auto}
 span.cpu,label.checkbox{display:inline-block;width:32px}
 span.ct{display:inline-block;width:230px}
 span.net{display:inline-block;width:120px}
 span.ip{display:inline-block;width:160px}
 dl,dt,dd{line-height:normal!important}
-
+input.setting_input{margin-right:50px}

From 5a5b7f127b505010bb02da864e5228bed53dee44 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 15:24:12 +0200
Subject: [PATCH 059/266] Docker: minor style update

---
 emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css   | 2 +-
 .../plugins/dynamix.docker.manager/sheets/UpdateContainer.css   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
index 800fac404..e6518eb71 100644
--- a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
@@ -1,6 +1,6 @@
 .noshow,.advanced{display:none}
 .required:after{content:" *";color:#E80000}
-span.boxed{display:inline-block;line-height:normal;white-space:normal;width:auto}
+span.boxed{display:inline-block;line-height:normal;white-space:normal;width:60%}
 span.cpu,label.checkbox{display:inline-block;width:32px}
 span.ct{display:inline-block;width:230px}
 span.net{display:inline-block;width:120px}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
index 800fac404..e6518eb71 100644
--- a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
@@ -1,6 +1,6 @@
 .noshow,.advanced{display:none}
 .required:after{content:" *";color:#E80000}
-span.boxed{display:inline-block;line-height:normal;white-space:normal;width:auto}
+span.boxed{display:inline-block;line-height:normal;white-space:normal;width:60%}
 span.cpu,label.checkbox{display:inline-block;width:32px}
 span.ct{display:inline-block;width:230px}
 span.net{display:inline-block;width:120px}

From a47cea481f8b33c7dfcc942c76cd0c525328e474 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 15:37:50 +0200
Subject: [PATCH 060/266] SysDrivers: icon update

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

diff --git a/emhttp/plugins/dynamix/SysDrivers.page b/emhttp/plugins/dynamix/SysDrivers.page
index f08de6f77..fe401b664 100644
--- a/emhttp/plugins/dynamix/SysDrivers.page
+++ b/emhttp/plugins/dynamix/SysDrivers.page
@@ -1,6 +1,6 @@
 Menu="UNRAID-OS"
 Title="System Drivers"
-Icon="fa-sitemap"
+Icon="icon-packages"
 Tag="server"
 ---
 <?PHP

From ab661ccc06c5de4d25d8330b54fd0933da60bbb8 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 15:47:08 +0200
Subject: [PATCH 061/266] VM manager: minor icon update

---
 emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
index 570b5b85a..97cb83ea2 100644
--- a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -108,7 +108,7 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
     }});
     opts.push({divider:true});
    
-    opts.push({text:_("Create Snapshot"), icon:"fa-clone", action:function(e) {
+    opts.push({text:_("Create Snapshot"), icon:"fa-copy", action:function(e) {
       e.preventDefault();
       selectsnapshot(uuid , name, "--generate" , "create",false,state) ;
     }}); 
@@ -163,7 +163,7 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
     }});
 
     opts.push({divider:true});
-    opts.push({text:_("Create Snapshot"), icon:"fa-clone", action:function(e) {
+    opts.push({text:_("Create Snapshot"), icon:"fa-copy", action:function(e) {
       e.preventDefault();
       selectsnapshot(uuid , name, "--generate" , "create",false,state) ;
     }});

From ef26fb3f57b227d16e676f273aab835e9ada411d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 15:50:53 +0200
Subject: [PATCH 062/266] Revert "VM manager: minor icon update"

This reverts commit ab661ccc06c5de4d25d8330b54fd0933da60bbb8.
---
 emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
index 97cb83ea2..570b5b85a 100644
--- a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -108,7 +108,7 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
     }});
     opts.push({divider:true});
    
-    opts.push({text:_("Create Snapshot"), icon:"fa-copy", action:function(e) {
+    opts.push({text:_("Create Snapshot"), icon:"fa-clone", action:function(e) {
       e.preventDefault();
       selectsnapshot(uuid , name, "--generate" , "create",false,state) ;
     }}); 
@@ -163,7 +163,7 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
     }});
 
     opts.push({divider:true});
-    opts.push({text:_("Create Snapshot"), icon:"fa-copy", action:function(e) {
+    opts.push({text:_("Create Snapshot"), icon:"fa-clone", action:function(e) {
       e.preventDefault();
       selectsnapshot(uuid , name, "--generate" , "create",false,state) ;
     }});

From b2fcdf1d32069cc76d95f3d39025e9733844a965 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 16:05:57 +0200
Subject: [PATCH 063/266] VM menu: add space in text

---
 emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
index 570b5b85a..588cc6d11 100644
--- a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -69,14 +69,14 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
   if (x!=-1) path = path.substring(0,x);
   if (vmrcurl !== "" && state == "running")  {
     if (console == "web" || console == "both") {
-      var vmrctext=_("VM Console") + "(" + vmrcprotocol + ")" ;
+      var vmrctext=_("VM Console") + " (" + vmrcprotocol + ")" ;
       opts.push({text:vmrctext, icon:"fa-desktop", action:function(e) {
         e.preventDefault();
         window.open(vmrcurl, '_blank', 'scrollbars=yes,resizable=yes');
       }});
     }
     if (console == "remote" || console == "both") {
-      opts.push({text:_("VM remote-viewer")+ "(" + vmrcprotocol + ")" , icon:"fa-desktop", action:function(e) {
+      opts.push({text:_("VM remote-viewer")+ " (" + vmrcprotocol + ")" , icon:"fa-desktop", action:function(e) {
         e.preventDefault();
         ajaxVMDispatchconsoleRV({action:"domain-consoleRV", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;  
       }});

From 5d6cbbd3a6f533d30db3775f8633e18c7b5ba4dd Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 16:22:30 +0200
Subject: [PATCH 064/266] Dialog window: adjust height

---
 emhttp/plugins/dynamix.vm.manager/VMMachines.page | 6 +++---
 emhttp/plugins/dynamix/DashStats.page             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index 3fd0266f1..5dc2dcf45 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -228,7 +228,7 @@ function VMClone(uuid, name){
   document.getElementById("Overwrite").checked = true;
   box.dialog({
     title: "_(VM Clone)_",
-    height: 300,
+    height: 330,
     width: 600,
     resizable: false,
     modal: true,
@@ -275,7 +275,7 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist,state){
   document.getElementById("targetsnapfspc").checked = true;
   box.dialog({
     title: optiontext,
-    height: 300,
+    height: 330,
     width: 600,
     resizable: false,
     modal: true,
@@ -348,8 +348,8 @@ function selectblock(uuid, name, snaps, opt, getlist, state){
   }
   box.dialog({
     title: optiontext,
+    height: 330,
     width: 600,
-    height: 500,
     resizable: false,
     modal: true,
     buttons: {
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 0acbd7691..3a2272686 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -1265,7 +1265,7 @@ function contentMgmt() {
   box.html($("#templateContentMgmt").html().build());
   box.dialog({
     title: "_(Tile Management)_",
-    height: 350,
+    height: 330,
     width: 900,
     resizable: false,
     modal: true,
@@ -1305,7 +1305,7 @@ function VMClone(uuid, name){
   document.getElementById("Overwrite").checked = true;
   box.dialog({
     title: "_(VM Clone)_",
-    height: 300,
+    height: 330,
     width: 600,
     resizable: false,
     modal: true,
@@ -1347,7 +1347,7 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist){
   document.getElementById("targetsnapfspc").checked = true;
   box.dialog({
     title: optiontext,
-    height: 300,
+    height: 330,
     width: 600,
     resizable: false,
     modal: true,

From 903a630fd07431bf0caa0725176a7f0332cf2e1f Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 16:27:55 +0200
Subject: [PATCH 065/266] VM snapshot: updated remove dialog

---
 emhttp/plugins/dynamix.vm.manager/VMMachines.page | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index 5dc2dcf45..8afc0cd2c 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -517,10 +517,10 @@ _(Remove Meta)_:<input type="checkbox" id="targetsnaprmvmeta" checked> <input ty
 </div>
 
 <div id="templatesnapshotremove" class="template" post>
-!! _(Warning removing Snapshots can break the chain)_ !!
-<br><br>
+<h2>!! _(Warning removing Snapshots can break the chain)_ !!</h2>
+
 _(VM Name)_: <label id="VMName"></label><br>
-_(Snapshot Name)_: <input type="text" id="targetsnap" hidden><label id="targetsnapl"></label><br><label id="targetsnapimages"></label><br>
+_(Snapshot Name)_: <input type="text" id="targetsnap" hidden><label id="targetsnapl"></label><label id="targetsnapimages"></label>
 </div>
 
 <div id="templateblock" class="template">

From 9d788f010ff6750c4ce5b9b7a1bc3f9323ccf2f1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 16:29:07 +0200
Subject: [PATCH 066/266] VM snapshot: updated remove dialog

---
 emhttp/plugins/dynamix.vm.manager/VMMachines.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index 8afc0cd2c..97e739b0d 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -517,7 +517,7 @@ _(Remove Meta)_:<input type="checkbox" id="targetsnaprmvmeta" checked> <input ty
 </div>
 
 <div id="templatesnapshotremove" class="template" post>
-<h2>!! _(Warning removing Snapshots can break the chain)_ !!</h2>
+<h3>!! _(Warning removing Snapshots can break the chain)_ !!</h3>
 
 _(VM Name)_: <label id="VMName"></label><br>
 _(Snapshot Name)_: <input type="text" id="targetsnap" hidden><label id="targetsnapl"></label><label id="targetsnapimages"></label>

From 646314051b1d469ba3d298d58df6fa383780a7dd Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 15 Oct 2023 16:34:35 +0200
Subject: [PATCH 067/266] Minor code cleanup

---
 emhttp/plugins/dynamix.vm.manager/VMMachines.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index 97e739b0d..4aab01721 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -516,7 +516,7 @@ _(Remove Images)_: <input type="checkbox" id="targetsnaprmv" checked><br>
 _(Remove Meta)_:<input type="checkbox" id="targetsnaprmvmeta" checked> <input type="checkbox" id="targetsnapkeep" hidden><label id="targetsnapimages"></label><br>
 </div>
 
-<div id="templatesnapshotremove" class="template" post>
+<div id="templatesnapshotremove" class="template">
 <h3>!! _(Warning removing Snapshots can break the chain)_ !!</h3>
 
 _(VM Name)_: <label id="VMName"></label><br>

From 9f65dedda99e343a2cdd47d2b2c52d778602ad33 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 16 Oct 2023 11:04:30 +0200
Subject: [PATCH 068/266] rc.scripts: prevent service binding on '0' addresses

---
 etc/rc.d/rc.library.source | 12 ++++++------
 etc/rc.d/rc.ntpd           |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/etc/rc.d/rc.library.source b/etc/rc.d/rc.library.source
index baaa0f1ea..ecba636a4 100644
--- a/etc/rc.d/rc.library.source
+++ b/etc/rc.d/rc.library.source
@@ -199,10 +199,10 @@ check(){
     [[ ${NET:0:2} == wg && $(grep -Pom1 '^TYPE:1="\K[^"]+' $WIREGUARD/$NET.cfg) == 8 ]] && continue
     NET1=$(sub ${NET[1]})
     if [[ "avahi show" =~ "$CALLER" ]]; then
-      [[ -n $NET && -n $NET1 && -z $(good $NET $NET1) ]] && BIND+=($NET)
-      [[ -n $NET1 ]] && IPV4=yes NETS+=($NET1)
+      [[ -n $NET && -n $NET1 && $NET != '0' && $NET1 != '0' && -z $(good $NET $NET1) ]] && BIND+=($NET)
+      [[ -n $NET1 && $NET1 != '0' ]] && IPV4=yes NETS+=($NET1)
     else
-      [[ -n $NET1 && -z $(good $NET1) ]] && IPV4=yes BIND+=($NET1)
+      [[ -n $NET1 && $NET1 != '0' && -z $(good $NET1) ]] && IPV4=yes BIND+=($NET1)
     fi
   done <<< $(ip -br -4 addr show scope global | awk '/^(br|bond|eth|wg)[0-9]+(\.[0-9]+)?/ {print $1,$3}' | sort)
   # active IPV6 interfaces (including wireguard)
@@ -215,10 +215,10 @@ check(){
     [[ ${NET:0:2} == wg && $(grep -Pom1 '^TYPE:1="\K[^"]+' $WIREGUARD/$NET.cfg) == 8 ]] && continue
     NET1=$(sub $(main ${NET[@]}))
     if [[ "avahi show" =~ "$CALLER" ]]; then
-      [[ -n $NET && -n $NET1 && -z $(good $NET $NET1) ]] && BIND+=($NET)
-      [[ -n $NET1 ]] && IPV6=yes NETS+=($NET1)
+      [[ -n $NET && -n $NET1 && $NET != '0' && $NET1 != '0' && -z $(good $NET $NET1) ]] && BIND+=($NET)
+      [[ -n $NET1 && $NET1 != '0' ]] && IPV6=yes NETS+=($NET1)
     else
-      [[ -z $DENY6 && -n $NET1 && -z $(good $NET1) ]] && IPV6=yes BIND+=($NET1)
+      [[ -z $DENY6 && -n $NET1 && $NET1 != '0' && -z $(good $NET1) ]] && IPV6=yes BIND+=($NET1)
     fi
   done <<< $(ip -br -6 addr show scope global | awk '/^(br|bond|eth|wg)[0-9]+(\.[0-9]+)?/{$2="";print}' | sort)
   # add loopback interface
diff --git a/etc/rc.d/rc.ntpd b/etc/rc.d/rc.ntpd
index 86ae79ff9..3ab5d51cc 100755
--- a/etc/rc.d/rc.ntpd
+++ b/etc/rc.d/rc.ntpd
@@ -34,8 +34,8 @@ ntpd_build(){
     [[ $IPV4 == no ]] && echo "interface ignore ipv4" >>$CONF
     [[ $IPV6 == no ]] && echo "interface ignore ipv6" >>$CONF
     # add listen interfaces
-    for net in $BIND; do
-      echo "interface listen $net # $(show $net)" >>$CONF
+    for NET in $BIND; do
+      echo "interface listen $NET # $(show $NET)" >>$CONF
     done
   fi
   # add configured NTP servers

From 855da15b23ca76254c48d61397058049c5c0cf96 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 16 Oct 2023 12:15:16 +0200
Subject: [PATCH 069/266] Fix typos

---
 emhttp/plugins/dynamix/include/update.crypto.php     | 2 +-
 emhttp/plugins/dynamix/include/update.encryption.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/update.crypto.php b/emhttp/plugins/dynamix/include/update.crypto.php
index dcb25945a..6f4501016 100644
--- a/emhttp/plugins/dynamix/include/update.crypto.php
+++ b/emhttp/plugins/dynamix/include/update.crypto.php
@@ -23,7 +23,7 @@ if ($index < count($tests)) {
   $test = $tests[$index];
   [$name,$size] = my_explode(':',$test);
   if (!$size) {
-    $default = ($test==_var($_GET,'hash']));
+    $default = ($test==_var($_GET,'hash'));
     if ($index>0) $test .= '|tail -1';
     if ($default) echo "<b>";
     echo preg_replace(['/^(# Tests.*\n)/','/\n$/'],["$1\n",""],shell_exec("/usr/sbin/cryptsetup benchmark -h $test"));
diff --git a/emhttp/plugins/dynamix/include/update.encryption.php b/emhttp/plugins/dynamix/include/update.encryption.php
index 982e74662..77c21632f 100644
--- a/emhttp/plugins/dynamix/include/update.encryption.php
+++ b/emhttp/plugins/dynamix/include/update.encryption.php
@@ -50,7 +50,7 @@ function removeKey($key,$disk) {
 }
 function diskname($name) {
   global $disks;
-  foreach ($disks as $disk) if (strncmp($name,$disk['device'],strlen(disk['device']))==0) return $disk['name'];
+  foreach ($disks as $disk) if (strncmp($name,$disk['device'],strlen($disk['device']))==0) return $disk['name'];
   return $name;
 }
 function reply($text,$type) {

From dab8b99c9c2ff026908870a6512fc0fc59dbe750 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 16 Oct 2023 12:18:57 +0200
Subject: [PATCH 070/266] minor syntax update

---
 emhttp/plugins/dynamix.vm.manager/VMSettings.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 890e8ad0f..7f59ac5a9 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -51,7 +51,7 @@ function detect(&$syslinux, $key) {
   return $value;
 }
 $syslinux          = file('/boot/syslinux/syslinux.cfg',FILE_IGNORE_NEW_LINES+FILE_SKIP_EMPTY_LINES);
-$arrValidNetworks   = getValidNetworks();
+$arrValidNetworks  = getValidNetworks();
 $pcie_acs_override = detect($syslinux, 'pcie_acs_override');
 $vfio_allow_unsafe = detect($syslinux, 'allow_unsafe_interrupts');
 $bgcolor           = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';

From 45815068835016c8d34e586c4196d60a6d80b226 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 16 Oct 2023 12:30:24 +0200
Subject: [PATCH 071/266] wireguard update: add explanation about parsing

---
 emhttp/plugins/dynamix/include/update.wireguard.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/emhttp/plugins/dynamix/include/update.wireguard.php b/emhttp/plugins/dynamix/include/update.wireguard.php
index 6a1e2b8d5..892f9bbb8 100644
--- a/emhttp/plugins/dynamix/include/update.wireguard.php
+++ b/emhttp/plugins/dynamix/include/update.wireguard.php
@@ -226,6 +226,8 @@ function createIPs($list) {
   return implode(', ',array_map('host',array_filter(array_map('trim',explode(',',$list)))));
 }
 function parseInput($vtun,&$input,&$x) {
+  // assign values to parameters, be aware that certain parameters are assigned by parseInput itself
+  // this is based on the sequence of processing
   global $conf,$user,$var,$default4,$default6,$vpn,$tunip;
   $section = 0; $addPeer = false;
   foreach ($input as $key => $value) {

From bde58c02984610779a3fa49046663a6db7772452 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Mon, 16 Oct 2023 13:24:54 +0100
Subject: [PATCH 072/266] Revise processing

---
 .../dynamix.vm.manager/include/libvirt.php    | 35 +++++--------------
 .../templates/Custom.form.php                 | 11 ++----
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index ed8f1d77e..0cb19f8f1 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -268,6 +268,7 @@
 
 
 		function config_to_xml($config,$vmclone = false) {
+			file_put_contents("/tmp/vmconfig", $config) ;
 			$domain = $config['domain'];
 			$media = $config['media'];
 			$nics = $config['nic'];
@@ -732,12 +733,7 @@
 
 			$pcidevs='';
 			$gpudevs_used=[];
-			$multidevices = $multi = [] ; #Load?
-			foreach ($gpus as $i => $gpu) {
-				 if ($gpu['guestbus'] != "") $multi[$gpu['guestbus']] = $gpu['guestbus'] ;
-				 #$multi[$gpu['guestbus']] = $gpu['guestbus'] ;
-			}
-			ksort($multi) ;
+			$multidevices = [] ; #Load?
 			$vmrc='';
 			$channelscopypaste = '';
 			if (!empty($gpus)) {
@@ -841,22 +837,8 @@
 					}
 
 					if ($gpu['multi'] == "on"){
-						if ($gpu['guestbus'] == "") {
-							# This is a new Multifunction device/VM allocate from range 0x90
-							$multibus = array_key_last($multi) ;						
-							if ($multibus == NULL) $multi_bus = "0x90" ; 
-							else 
-								{
-									$multi_bus = hexdec($multibus) + 1 ;   
-									$multi_bus = "0x".dechex($multi_bus) ;
-								}
-							$multi[$multi_bus] = $multi_bus ;
-							$strSpecialAddress = "<address type='pci' domain='0x0000' bus='".$multi_bus."' slot='0x".$gpu_slot."' function='0x".$gpu_function."' multifunction='on' />" ;
-						} else {
-							$multi_bus = $gpu['guestbus'] ;
-							$strSpecialAddress = "<address type='pci' domain='0x0000' bus='".$multi_bus."' slot='0x".$gpu_slot."' function='0x".$gpu_function."' multifunction='on' />" ;
-						}
-						$multidevices[$gpu_bus] = $multi_bus ;
+						$strSpecialAddress = "<address type='pci' domain='0x0000' bus='0x20' slot='0x$gpu_bus' function='0x".$gpu_function."' multifunction='on' />" ;
+						$multidevices[$gpu_bus] = "0x$gpu_bus" ;
 					}
 
 					
@@ -873,7 +855,8 @@
 					$gpudevs_used[] = $gpu['id'];
 				}
 			}
-			file_put_contents("/tmp/bus", $multi) ;
+			#file_put_contents("/tmp/pcidevs" , $pcidevs) ;
+			#file_put_contents("/tmp/bus", $multidevices) ;
 			$audiodevs_used=[];
 			$strSpecialAddressAudio = "" ;
 			if (!empty($audios)) {
@@ -885,7 +868,7 @@
 
 					[$audio_bus, $audio_slot, $audio_function] = my_explode(":", str_replace('.', ':', $audio['id']), 3);
 					if ($audio_function != 0) {
-						if (isset($multidevices[$audio_bus]))	$strSpecialAddressAudio = "<address type='pci' domain='0x0000' bus='".$multidevices[$audio_bus]."' slot='0x".$audio_slot."' function='0x".$audio_function."' />" ;
+						if (isset($multidevices[$audio_bus]))	$strSpecialAddressAudio = "<address type='pci' domain='0x0000' bus='0x20'	 slot='".$multidevices[$audio_bus]."'  function='0x".$audio_function."' />" ;
 					}
 
 					$pcidevs .= "<hostdev mode='subsystem' type='pci' managed='yes'>
@@ -919,8 +902,7 @@
 									<driver name='vfio'/>
 									<source>
 										<address domain='0x0000' bus='0x" . $pci_bus . "' slot='0x" . $pci_slot . "' function='0x" . $pci_function . "'/>
-									</source>
-									$strSpecialAddressOther " ;
+									</source>" ;
 
 					if (!empty($pciboot[$pci_id]) && !$vmclone) {
 						$pcidevs .= "<boot order='".$pciboot[$pci_id]."'/>" ;
@@ -933,6 +915,7 @@
 					if ($vmclone) $pcidevs_used[] = $pci_id['d']; else $pcidevs_used[] = $pci_id ;
 				}
 			}
+			#file_put_contents("/tmp/vmdetail", $pcidevs) ;
 
 			$memballoon = "<memballoon model='none'/>";
 			if (empty( array_filter(array_merge($gpudevs_used, $audiodevs_used, $pcidevs_used), function($k){ return strpos($k,'#remove')===false && $k!='virtual' ; }) )) {
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 53881ce21..939d352ed 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -996,7 +996,6 @@
 						echo mk_option($arrGPU['guest']['multi'], 'on', 'On');
 					?>
 					</select>
-					<input type="hidden" name="gpu[<?=$i?>][guestbus]" id="gpuguest<?=$i?>" value="<?=htmlspecialchars($arrGPU['guest']["bus"])?>">
 				</td>
 			</tr>
 
@@ -1134,19 +1133,13 @@
 						}
 					?>
 					</select>
-					<?			
-					#$multifunction =  "hidden" ;
-					if ($arrGPU['id'] != 'virtual') $multifunction = "" ;
-					?>
-					<span id="GPUMulti" name="gpu[{{INDEX}}][multi]"  <?=$multifunction?>>_(Multifunction)_:</span>
-								
-					<select name="gpu[{{INDEX}}][multi]" class="narrow" title="_(define Multifunctiion Support)_" <?=$multifunction?> >
+					<span id="GPUMulti" name="gpu[{{INDEX}}][multi]"  >_(Multifunction)_:</span>
+					<select name="gpu[{{INDEX}}][multi]" class="narrow" title="_(define Multifunctiion Support)_" >
 					<?
 						echo mk_option("off", 'off', 'Off');
 						echo mk_option("off", 'on', 'On');
 					?>
 					</select>
-					<input type="hidden" name="gpu[{{INDEX}}][guestbus]" id="gpuguest" value="">
 				</td>
 			</tr>
 			<tr class="advanced romfile">

From 1d031aa2628bfde607642bb1ffc0216d49b428d3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 16 Oct 2023 17:53:51 +0200
Subject: [PATCH 073/266] wireguard update: add explanation about parsing

---
 emhttp/plugins/dynamix/include/update.wireguard.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emhttp/plugins/dynamix/include/update.wireguard.php b/emhttp/plugins/dynamix/include/update.wireguard.php
index 892f9bbb8..e8db69300 100644
--- a/emhttp/plugins/dynamix/include/update.wireguard.php
+++ b/emhttp/plugins/dynamix/include/update.wireguard.php
@@ -229,6 +229,7 @@ function parseInput($vtun,&$input,&$x) {
   // assign values to parameters, be aware that certain parameters are assigned by parseInput itself
   // this is based on the sequence of processing
   global $conf,$user,$var,$default4,$default6,$vpn,$tunip;
+  $tunnel = $protocol = null; // satisfy code checkers
   $section = 0; $addPeer = false;
   foreach ($input as $key => $value) {
     if ($key[0]=='#') continue;

From 0f455a69a5ef40b69ebd0673a5a9ec9a305950db Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:14:34 +0200
Subject: [PATCH 074/266] DockerClient: remove unnecessary assignment

---
 .../plugins/dynamix.docker.manager/include/DockerClient.php  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
index 8279f31c4..8fc260c18 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
@@ -353,7 +353,6 @@ class DockerTemplates {
 		if (!$imgUrl) $imgUrl = $tmpIconUrl;
 		if (!$imgUrl || trim($imgUrl) == "/plugins/dynamix.docker.manager/images/question.png") return '';
 
-		$imageName = $contName ?: $name;
 		$iconRAM = sprintf('%s/%s-%s.png', $dockerManPaths['images-ram'], $contName, 'icon');
 		$icon    = sprintf('%s/%s-%s.png', $dockerManPaths['images'], $contName, 'icon');
 
@@ -367,8 +366,8 @@ class DockerTemplates {
 		if (!is_file($icon) && is_file($iconRAM)) {
 			@copy($iconRAM,$icon);
 		}
-		if ( !is_file($iconRAM) ) {
-			exec("logger -t webGUI -- \"$imageName: Could not download icon $imgUrl\"");
+		if (!is_file($iconRAM)) {
+			exec("logger -t webGUI -- \"$contName: Could not download icon $imgUrl\"");
 		}
 
 		return (is_file($iconRAM)) ? str_replace($docroot, '', $iconRAM) : '';

From b3cd2b53dc47b392b1c5f02786dfe698619eaeb5 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:18:35 +0200
Subject: [PATCH 075/266] DockerContainers: remove redundant brackets

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

diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
index 7692b4d95..0dc11bb93 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
@@ -108,7 +108,7 @@ foreach ($containers as $ct) {
   }
   echo "<span class='outer'><span id='$id' $menu class='hand'>$image</span><span class='inner'><span class='appname $update'>$appname</span><br><i id='load-$id' class='fa fa-$shape $status $color'></i><span class='state'>"._($status)."</span></span></span>";
   echo "<div class='advanced' style='margin-top:8px'>"._('Container ID').": $id<br>";
-  if ($ct['BaseImage']) echo "<i class='fa fa-cubes' style='margin-right:5px'></i>".htmlspecialchars(${ct['BaseImage']})."<br>";
+  if ($ct['BaseImage']) echo "<i class='fa fa-cubes' style='margin-right:5px'></i>".htmlspecialchars($ct['BaseImage'])."<br>";
   echo _('By').": ";
   $registry = $info['registry'];
   [$author,$version] = my_explode(':',$ct['Image']);

From ddf80158a9e256fb5d84ca6a62b431a7c1e911ab Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:27:54 +0200
Subject: [PATCH 076/266] VMsettings: fix typo

---
 emhttp/plugins/dynamix.vm.manager/VMSettings.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 7f59ac5a9..b71e605bd 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -226,7 +226,7 @@ _(VFIO allow unsafe interrupts)_:
 _(btrfs filesystem show)_:
 : <?="<pre id='btrfs-scrub'>".shell_exec("btrfs filesystem show /etc/libvirt")."</pre>"?>
 
-<form markdown="1" method="POST" action="/update.php" target="progressFrame"  onsubmit="prepareFS(this,'btrfs-scrub-vm','/etc/libvirt'>">
+<form markdown="1" method="POST" action="/update.php" target="progressFrame"  onsubmit="prepareFS(this,'btrfs-scrub-vm','/etc/libvirt')>">
 <?exec("$docroot/webGui/scripts/btrfs_scrub status /etc/libvirt", $scrub_status, $retval);?>
 _(btrfs scrub status)_:
 : <?="<pre>".implode("\n", $scrub_status)."</pre>"?>

From 5adacfba9821b7ddb551785f74c79ba4c13f0af7 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 16 Oct 2023 19:11:13 +0200
Subject: [PATCH 077/266] white theme: minor style fix

---
 emhttp/plugins/dynamix/styles/default-white.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index 68d210d2e..0f9dff443 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -101,7 +101,7 @@ div.title.shift{margin-top:-30px}
 .usage-disk>span:first-child{position:absolute;left:0;margin:0!important;height:1.8rem;background-color:#a8a8a8}
 .usage-disk>span:last-child{position:relative;padding-right:4px;z-index:1}
 .usage-disk.sys{height:12px;margin:-15px 20px 0 44px}
-.usage-disk.sys>span:first-child{height:12px;padding:0}
+.usage-disk.sys>span{height:12px;padding:0}
 .usage-disk.sys.none{background-color:transparent}
 .usage-disk.mm{height:3px;margin:5px 20px 0 0}
 .usage-disk.mm>span:first-child{height:3px}

From 8fc34e3f4aadd0a5df123accad4808b82a34d92b Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Mon, 16 Oct 2023 20:42:36 +0100
Subject: [PATCH 078/266] Add PCI Other multifunction support.

---
 emhttp/plugins/dynamix.vm.manager/include/libvirt.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index 0cb19f8f1..cebfe945f 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -268,7 +268,6 @@
 
 
 		function config_to_xml($config,$vmclone = false) {
-			file_put_contents("/tmp/vmconfig", $config) ;
 			$domain = $config['domain'];
 			$media = $config['media'];
 			$nics = $config['nic'];
@@ -855,8 +854,6 @@
 					$gpudevs_used[] = $gpu['id'];
 				}
 			}
-			#file_put_contents("/tmp/pcidevs" , $pcidevs) ;
-			#file_put_contents("/tmp/bus", $multidevices) ;
 			$audiodevs_used=[];
 			$strSpecialAddressAudio = "" ;
 			if (!empty($audios)) {
@@ -868,7 +865,7 @@
 
 					[$audio_bus, $audio_slot, $audio_function] = my_explode(":", str_replace('.', ':', $audio['id']), 3);
 					if ($audio_function != 0) {
-						if (isset($multidevices[$audio_bus]))	$strSpecialAddressAudio = "<address type='pci' domain='0x0000' bus='0x20'	 slot='".$multidevices[$audio_bus]."'  function='0x".$audio_function."' />" ;
+						if (isset($multidevices[$audio_bus]))	$strSpecialAddressAudio = "<address type='pci' domain='0x0000' bus='0x20' slot='0x$audio_bus'  function='0x".$audio_function."' />" ;
 					}
 
 					$pcidevs .= "<hostdev mode='subsystem' type='pci' managed='yes'>
@@ -895,14 +892,15 @@
 					else [$pci_bus, $pci_slot, $pci_function] = my_explode(":", str_replace('.', ':', $pci_id), 3);
 					
 					if ($pci_function != 0) {
-						if (isset($multidevices[$pci_bus]))	$strSpecialAddressOther = "<address type='pci' domain='0x0000' bus='".$multidevices[$pci_bus]."' slot='0x".$pci_slot."' function='0x".$pci_function."' />" ;
+						if (isset($multidevices[$pci_bus]))	$strSpecialAddressOther = "<address type='pci' domain='0x0000' bus='0x20' slot='0x$pci_bus' function='0x".$pci_function."' />" ;
 					}
 
 					$pcidevs .= "<hostdev mode='subsystem' type='pci' managed='yes'>
 									<driver name='vfio'/>
 									<source>
 										<address domain='0x0000' bus='0x" . $pci_bus . "' slot='0x" . $pci_slot . "' function='0x" . $pci_function . "'/>
-									</source>" ;
+									</source>
+									$strSpecialAddressOther " ;
 
 					if (!empty($pciboot[$pci_id]) && !$vmclone) {
 						$pcidevs .= "<boot order='".$pciboot[$pci_id]."'/>" ;
@@ -915,7 +913,6 @@
 					if ($vmclone) $pcidevs_used[] = $pci_id['d']; else $pcidevs_used[] = $pci_id ;
 				}
 			}
-			#file_put_contents("/tmp/vmdetail", $pcidevs) ;
 
 			$memballoon = "<memballoon model='none'/>";
 			if (empty( array_filter(array_merge($gpudevs_used, $audiodevs_used, $pcidevs_used), function($k){ return strpos($k,'#remove')===false && $k!='virtual' ; }) )) {

From b2db430510e8074e5b7e2ab7d87e31d13d19697c Mon Sep 17 00:00:00 2001
From: ljm42 <larry_meaney@iname.com>
Date: Mon, 16 Oct 2023 15:22:45 -0700
Subject: [PATCH 079/266] Add libvirt-php to intelephense.stubs

... in the VS Code workspace settings file. Prevents Intelephense from complaining about libvirt functions
---
 .vscode/settings.json | 77 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index efd806383..67841e005 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,5 +4,80 @@
     },
     "prettier.tabWidth": 4,
     "editor.tabSize": 4,
-    "editor.indentSize": "tabSize"
+    "editor.indentSize": "tabSize",
+    "intelephense.stubs": [
+        "apache",
+        "bcmath",
+        "bz2",
+        "calendar",
+        "com_dotnet",
+        "Core",
+        "ctype",
+        "curl",
+        "date",
+        "dba",
+        "dom",
+        "enchant",
+        "exif",
+        "FFI",
+        "fileinfo",
+        "filter",
+        "fpm",
+        "ftp",
+        "gd",
+        "gettext",
+        "gmp",
+        "hash",
+        "iconv",
+        "imap",
+        "intl",
+        "json",
+        "ldap",
+        "libxml",
+        "mbstring",
+        "meta",
+        "mysqli",
+        "oci8",
+        "odbc",
+        "openssl",
+        "pcntl",
+        "pcre",
+        "PDO",
+        "pdo_ibm",
+        "pdo_mysql",
+        "pdo_pgsql",
+        "pdo_sqlite",
+        "pgsql",
+        "Phar",
+        "posix",
+        "pspell",
+        "random",
+        "readline",
+        "Reflection",
+        "session",
+        "shmop",
+        "SimpleXML",
+        "snmp",
+        "soap",
+        "sockets",
+        "sodium",
+        "SPL",
+        "sqlite3",
+        "standard",
+        "superglobals",
+        "sysvmsg",
+        "sysvsem",
+        "sysvshm",
+        "tidy",
+        "tokenizer",
+        "xml",
+        "xmlreader",
+        "xmlrpc",
+        "xmlwriter",
+        "xsl",
+        "Zend OPcache",
+        "zip",
+        "zlib",
+        "libvirt-php"
+    ]
 }

From cd190843ab49774213fb3580869ba92e1eff1962 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 17 Oct 2023 09:51:28 +0200
Subject: [PATCH 080/266] container_size: rename $unit to $units

---
 .../dynamix.docker.manager/scripts/container_size    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/scripts/container_size b/emhttp/plugins/dynamix.docker.manager/scripts/container_size
index 5e2f60a28..ee43b699b 100755
--- a/emhttp/plugins/dynamix.docker.manager/scripts/container_size
+++ b/emhttp/plugins/dynamix.docker.manager/scripts/container_size
@@ -22,7 +22,7 @@ $_SERVER['REQUEST_URI'] = 'docker';
 $login_locale = _var($display,'locale');
 require_once "$docroot/webGui/include/Translations.php";
 
-$unit = ['B','kB','MB','GB','TB','PB','EB','ZB','YB'];
+$units = ['B','kB','MB','GB','TB','PB','EB','ZB','YB'];
 $list = [];
 
 function write(...$messages){
@@ -40,13 +40,13 @@ function write(...$messages){
   curl_close($com);
 }
 function autoscale($value) {
-  global $unit;
-  $size = count($unit);
+  global $units;
+  $size = count($units);
   $base = $value ? floor(log($value, 1000)) : 0;
   if ($base>=$size) $base = $size-1;
   $value /= pow(1000, $base);
   $decimals = $base ? ($value>=100 ? 0 : ($value>=10 ? 1 : (round($value*100)%100===0 ? 0 : 2))) : 0;
-  return number_format($value, $decimals, '.', $value>9999 ? ',' : '').' '.$unit[$base];
+  return number_format($value, $decimals, '.', $value>9999 ? ',' : '').' '.$units[$base];
 }
 function align($text, $w=25) {
   return $text.str_repeat('&nbsp;',$w-min(strlen($text),$w-1));
@@ -55,9 +55,9 @@ function gap($text) {
   return preg_replace('/([kMGTPEZY]?B)$/'," $1",$text);
 }
 function byteval($data) {
-  global $unit;
+  global $units;
   [$value,$base] = explode(' ',gap($data));
-  return $value*pow(1000,array_search($base,$unit));
+  return $value*pow(1000,array_search($base,$units));
 }
 
 exec("docker ps -sa --format='{{.Names}}|{{.Size}}'",$container);

From a6278fb67149ef6434333ea4b71826020dfb3231 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 17 Oct 2023 09:51:47 +0200
Subject: [PATCH 081/266] device_list: fix missing parameter

---
 emhttp/plugins/dynamix/nchan/device_list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index dbc5732a6..d290b8a56 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -461,7 +461,7 @@ while (true) {
       $echo[$n] .= "<tr class='tr_last'><td>"._('Slots')."</td><td colspan='8'>".cache_slots($off,$pool,_var($cache[$pool],'devicesSb'),_var($cache[$pool],'slots',0))."</td><td></td></tr>";
       $zfsPool = strstr(_var($cache[$pool],'fsType'),'zfs') && !isSubpool($pool);
       if ($zfsPool) {
-        $current_subpools = array_filter($pools, function ($element) {
+        $current_subpools = array_filter($pools, function ($element) use ($pool) {
           return strpos($element, "$pool~")!==false;
         });
         if (count($current_subpools) < count($subpools)) {

From ca7e1efdfe1418d8443e235a4143023c1cc0baed Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 17 Oct 2023 09:52:08 +0200
Subject: [PATCH 082/266] Dashboard: add hyperlink to clock

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

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 3a2272686..fbf242663 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -198,7 +198,7 @@ switch ($display['theme']) {
 </td></tr>
 <tr><td>
 <div class='leftside'>
-<span id="current_time"></span><br><span id="current_date"></span><br><br>
+<a href="/Settings/DateTime" class="hand none" title="_(Go to date and time settings)_"><span id="current_time"></span></a><br><span id="current_date"></span><br><br>
 <span class='header'><i class='indent fa fa-file-text-o'></i>_(Model)_</span><br><i class='indent'></i><?=_var($var,'SYS_MODEL')?:'---'?><br><br>
 <span class='header'><i class='indent fa fa-id-badge'></i>_(Registration)_</span><br><i class='indent'></i>Unraid OS <b><em><?=_var($var,'regTy')?></em></b><br><br>
 <span class='header'><i class='indent fa fa-clock-o'></i>_(Uptime)_</span><br><i class='indent'></i><span class='uptime'></span>

From 72f977f19b4b2bf9036fc772b9f7538d51f07af7 Mon Sep 17 00:00:00 2001
From: Christoph Hummer <christophhummer@gmail.com>
Date: Tue, 17 Oct 2023 11:23:28 +0200
Subject: [PATCH 083/266] Add ntfy.sh to notification agents

---
 .../dynamix/include/NotificationAgents.xml    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/emhttp/plugins/dynamix/include/NotificationAgents.xml b/emhttp/plugins/dynamix/include/NotificationAgents.xml
index fb288126b..3de746551 100644
--- a/emhttp/plugins/dynamix/include/NotificationAgents.xml
+++ b/emhttp/plugins/dynamix/include/NotificationAgents.xml
@@ -287,6 +287,47 @@ done
       ]]>
     </Script>
   </Agent>
+  <Agent>
+    <Name>ntfy.sh</Name>
+    <Variables>
+      <Variable Help="The full server base URL including protocol and port. eg: https://ntfy.sh" Desc="Full Server Base URL" Default="FULL NTFY.SH URL">SERVER_URL</Variable>
+      <Variable Help="The ntfy.sh Token to use." Desc="ntfy.sh Token" Default="YOUR NTFY.SH TOKEN">NTFY_TOKEN</Variable>
+      <Variable Help="The ntfy.sh Topic to use." Desc="ntfy.sh Topic" Default="Unraid">TOPIC</Variable>
+      <Variable Help="Specify the fields which are included in the title of the notification." Desc="Notification Title" Default="$SUBJECT">TITLE</Variable>
+      <Variable Help="Specify the fields which are included in the message body of the notification." Desc="Notification Message" Default="$DESCRIPTION">MESSAGE</Variable>
+    </Variables>
+    <Script>
+      <![CDATA[
+      #!/bin/bash
+      ############
+      {0}
+      ############
+      MESSAGE=$(echo -e "$MESSAGE")
+      case "$IMPORTANCE" in
+      'normal' )
+      PRIORITY="default"
+      ;;
+      'warning' )
+      PRIORITY="high"
+      ;;
+      'alert' )
+      PRIORITY="urgent"
+      ;;
+      esac
+
+      # Remove any trailing slash
+      SERVER_URL=${SERVER_URL%/}
+
+      curl \
+        -H "Priority: $PRIORITY" \
+        -H "Icon: https://raw.githubusercontent.com/unraid/webgui/master/emhttp/plugins/dynamix.vm.manager/templates/images/unraid.png" \
+        -H "Authorization: Bearer $NTFY_TOKEN" \
+        -H "Title: $TITLE" \
+        -d "$MESSAGE" \
+        $SERVER_URL/$TOPIC
+      ]]>
+    </Script>
+  </Agent>
   <Agent>
     <Name>Prowl</Name>
     <Variables>

From de9bf3d30823b8d7354c3c52733c87be050566aa Mon Sep 17 00:00:00 2001
From: Christoph Hummer <christophhummer@gmail.com>
Date: Tue, 17 Oct 2023 11:24:19 +0200
Subject: [PATCH 084/266] Add ntfy.sh icon

---
 emhttp/plugins/dynamix/icons/ntfy.sh.png | Bin 0 -> 534 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 emhttp/plugins/dynamix/icons/ntfy.sh.png

diff --git a/emhttp/plugins/dynamix/icons/ntfy.sh.png b/emhttp/plugins/dynamix/icons/ntfy.sh.png
new file mode 100644
index 0000000000000000000000000000000000000000..717f36b6280aa7fcd1dd862e7fd78ed71bfe534a
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0005aNkl<ZIE|%~y=zoa5XFCU_dUX{7>HOXQP60yh!8aqLqs%KS=dR62!dcL
zv9q%9PYEc-LeeZ20So^CEi^HpCPEg)56EWSHD<FPW{<^v@4js3;xuz-xO46~b7$Z`
z%>X1F2F3u_M{U{6mXUN((zg1vZnxW&^uQ#|fB#jRxnG)RSHhgbIfvz3ayHDlET8zB
zr_Xcw=*gcEkgxpSV!gV7%Q?*D0)Y2Eb}3+T=gU?Npb$yI49q#E&rBfT`G+NTlbmOe
zu`u&F%m8p^J}~EKblTjVyvn2LJ4}rfJp)S%ElBXO@1z4{fOE#;>N{>P%u%jw@^I=p
zS4N6G+IyH_0l+gbM;yhB9XUqv;30N8ZK};iZ&51AG6_)_2<NzUZjzbN2^QB@c(U?}
zdb`Q+;1CB2`vQy2)((|c!-J#%X1-DHH-0c%dd%1DdZ2!zc$RA?PKD`N__WN^wWW-K
zB&7^qe=8^7mkTdGTYbZe&mV(?dZ(4i03tI>80;OEEUq*gRNKt}oX$cajsgBeKs-2*
zXLkG&7lw~BlrN+!625BB+JO1f{&+w@$t1l6MkQ6v>?N@N4~wMa-W-zdNg9{b&n5=@
Y3w6N5Y5qmTjQ{`u07*qoM6N<$f`+f~;Q#;t

literal 0
HcmV?d00001


From 688927fd5342c176fcbcb0054496d8ec962d33eb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:05:04 +0200
Subject: [PATCH 085/266] Dashboard: add timezone indicator

---
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 62ffd5373..edc823ad5 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -127,7 +127,7 @@ while (true) {
     // 12 hour format wih am/pm
     $clock = date('g:i',$now); $ampm = '<span class="ampm">'.date('a',$now).'</span>';
   }
-  $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0);
+  $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0).', '.date('T',$now);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$timedate);
   $time0 = $time;
   sleep(1);

From 75c1c8a7a0d58d62c63bf931575df83b4a276cec Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 17 Oct 2023 14:55:03 +0200
Subject: [PATCH 086/266] Display: reset dashboard tiles when switching
 language

---
 emhttp/plugins/dynamix/DisplaySettings.page | 13 +++++++++++--
 emhttp/plugins/dynamix/LanguageButton.page  |  8 ++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 0e7a3eef8..a60288de3 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -26,6 +26,7 @@ require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php"
 <script>
 var path = '/boot/config/plugins/dynamix';
 var filename = '';
+var locale = "<?=$locale?>";
 
 function restore() {
   // restore original image and activate APPLY button
@@ -33,13 +34,21 @@ function restore() {
   $('select[name="banner"]').trigger('change');
   filename = 'reset';
 }
-function upload() {
+function upload(lang) {
   // save or delete upload when APPLY is pressed
   if (filename=='reset') {
     $.post("/webGui/include/FileUpload.php",{cmd:'delete',path:path,filename:'banner.png'});
   } else if (filename) {
     $.post("/webGui/include/FileUpload.php",{cmd:'save',path:path,filename:filename,output:'banner.png'});
   }
+  // reset dashboard tiles when switching language
+  if (lang != locale) {
+    $.removeCookie('db-box1');
+    $.removeCookie('db-box2');
+    $.removeCookie('db-box3');
+    $.removeCookie('inactive_content');
+    $.removeCookie('hidden_content');
+  }
 }
 function presetTime(form) {
   var system = form.date.selectedIndex==0;
@@ -119,7 +128,7 @@ $(function() {
 
 :display_settings_help:
 
-<form markdown="1" name="display_settings" method="POST" action="/update.php" target="progressFrame" onsubmit="upload()">
+<form markdown="1" name="display_settings" method="POST" action="/update.php" target="progressFrame" onsubmit="upload(this.locale.value)">
 <input type="hidden" name="#file" value="dynamix/dynamix.cfg">
 <input type="hidden" name="#section" value="display">
 <input type="hidden" name="rtl" value="<?=$display['rtl']?>">
diff --git a/emhttp/plugins/dynamix/LanguageButton.page b/emhttp/plugins/dynamix/LanguageButton.page
index 0c5ca9c75..c2cb3f1d8 100644
--- a/emhttp/plugins/dynamix/LanguageButton.page
+++ b/emhttp/plugins/dynamix/LanguageButton.page
@@ -30,6 +30,14 @@ function LanguageButton() {
     switchLanguage($.cookie('locale'));
     $.removeCookie('locale');
   }
+  // reset dashboard tiles when switching language
+  if (locale != ($.cookie('locale')||'')) {
+    $.removeCookie('db-box1');
+    $.removeCookie('db-box2');
+    $.removeCookie('db-box3');
+    $.removeCookie('inactive_content');
+    $.removeCookie('hidden_content');
+  }
 }
 
 function switchLanguage(lang) {

From b2afe183fed8fbea0ee6610f18bf3a5125ee7a7c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 17 Oct 2023 15:03:50 +0200
Subject: [PATCH 087/266] Display: reset dashboard tiles when switching
 language

---
 emhttp/plugins/dynamix/LanguageButton.page | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/emhttp/plugins/dynamix/LanguageButton.page b/emhttp/plugins/dynamix/LanguageButton.page
index c2cb3f1d8..76f1b41b7 100644
--- a/emhttp/plugins/dynamix/LanguageButton.page
+++ b/emhttp/plugins/dynamix/LanguageButton.page
@@ -23,13 +23,6 @@ $(function(){$('.nav-item.LanguageButton').hide();});
 
 function LanguageButton() {
   var locale = '<?=$locale?>';
-  if (locale) {
-    switchLanguage('');
-    $.cookie('locale',locale);
-  } else {
-    switchLanguage($.cookie('locale'));
-    $.removeCookie('locale');
-  }
   // reset dashboard tiles when switching language
   if (locale != ($.cookie('locale')||'')) {
     $.removeCookie('db-box1');
@@ -38,6 +31,13 @@ function LanguageButton() {
     $.removeCookie('inactive_content');
     $.removeCookie('hidden_content');
   }
+  if (locale) {
+    switchLanguage('');
+    $.cookie('locale',locale);
+  } else {
+    switchLanguage($.cookie('locale'));
+    $.removeCookie('locale');
+  }
 }
 
 function switchLanguage(lang) {

From a30cac68227ca4b38f332fc4a55eb88a7b158712 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 17 Oct 2023 15:09:18 +0200
Subject: [PATCH 088/266] Display: reset dashboard tiles when switching
 language

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

diff --git a/emhttp/plugins/dynamix/LanguageButton.page b/emhttp/plugins/dynamix/LanguageButton.page
index 76f1b41b7..d22b9b686 100644
--- a/emhttp/plugins/dynamix/LanguageButton.page
+++ b/emhttp/plugins/dynamix/LanguageButton.page
@@ -32,11 +32,12 @@ function LanguageButton() {
     $.removeCookie('hidden_content');
   }
   if (locale) {
-    switchLanguage('');
     $.cookie('locale',locale);
+    switchLanguage('');
   } else {
-    switchLanguage($.cookie('locale'));
+    locale = $.cookie('locale');
     $.removeCookie('locale');
+    switchLanguage(locale);
   }
 }
 

From e33ec1466ecd7b06f19d7d7d6e02a82dd6e0c5d6 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Tue, 17 Oct 2023 17:16:20 +0100
Subject: [PATCH 089/266] SystemDrivers add version

Add version to module

Module (Version)
---
 emhttp/plugins/dynamix/include/SysDrivers.php        | 4 +++-
 emhttp/plugins/dynamix/include/SysDriversHelpers.php | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/SysDrivers.php b/emhttp/plugins/dynamix/include/SysDrivers.php
index 47ac13566..2b6ee2fa0 100644
--- a/emhttp/plugins/dynamix/include/SysDrivers.php
+++ b/emhttp/plugins/dynamix/include/SysDrivers.php
@@ -79,7 +79,9 @@ switch ($_POST['table']) {
                         $supporthtml = "<span id='link$modname'><a href='$supporturl' target='_blank'><i title='"._("Support page $pluginname")."' class='fa fa-phone-square'></i></a></span>" ;
                     } 
             }  
-            $html .= "<td>$modname$supporthtml</td>" ;
+            if (isset($module["version"])) $version = "(".$module["version"].")" ; else $version = "" ;
+        
+            $html .= "<td>$modname $version$supporthtml</td>" ;
             $html .= "<td>{$module['description']}</td><td id=\"status$modname\">{$module['state']}</td><td>{$module['type']}</td>";
     
             $text = "" ;
diff --git a/emhttp/plugins/dynamix/include/SysDriversHelpers.php b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
index b85f01cf4..382e5791f 100644
--- a/emhttp/plugins/dynamix/include/SysDriversHelpers.php
+++ b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
@@ -52,6 +52,9 @@ function getmodules($line) {
         case "file":
             $file = trim(str_replace("file:","",$outline)) ;
             break ;
+        case "version":
+            $version = trim(str_replace("version:","",$data[1])) ;
+            break ;
         case "alias":
         case "author":
         case "firmware":
@@ -103,7 +106,8 @@ $dir = str_replace("/lib/modules/$kernel/kernel/", "" ,$dir) ;
 if ($desc != null) $description = substr($desc , 0 ,60) ; else  $description = null ;
 $arrModules[$modname] = [
             'modname' => $modname,
-            'dependacy' => $depends, 
+            'dependacy' => $depends,
+            'version' => $version, 
             'parms' => $parms,
             'file' =>  $file,
             'modprobe' => $modprobe,

From 2d21f674ff4c7e9c11311f984d0e506e81475085 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 18 Oct 2023 23:02:50 +0100
Subject: [PATCH 090/266] Show all graphics cards

Add IP addresses to title on name.
---
 .../dynamix.vm.manager/include/VMMachines.php | 67 ++++++++++---------
 .../dynamix.vm.manager/sheets/VMMachines.css  |  1 +
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
index 27e19341c..dd79aa85b 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
@@ -80,12 +80,13 @@ foreach ($vms as $vm) {
     $vmrcprotocol = $lv->domain_get_vmrc_protocol($res);
     $vmrcurl = autov('/plugins/dynamix.vm.manager/'.$vmrcprotocol.'.html',true).'&autoconnect=true&host='._var($_SERVER,'HTTP_HOST');
     if ($vmrcprotocol == "spice") $vmrcurl .= '&vmname='. urlencode($vm) .'&port=/wsproxy/'.$vmrcport.'/'; else $vmrcurl .= '&port=&path=/wsproxy/'.$wsport.'/';
-    $graphics = strtoupper($vmrcprotocol).":".$vmrcport;
+    $graphics = strtoupper($vmrcprotocol).":".$vmrcport."\n";
   } elseif ($vmrcport == -1 || $autoport) {
     $vmrcprotocol = $lv->domain_get_vmrc_protocol($res);
     if ($autoport == "yes") $auto = "auto"; else $auto="manual";
-    $graphics = strtoupper($vmrcprotocol).':'._($auto);
-  } elseif (!empty($arrConfig['gpu'])) {
+    $graphics = strtoupper($vmrcprotocol).':'._($auto)."\n";
+  } 
+  if (!empty($arrConfig['gpu'])) {
     $arrValidGPUDevices = getValidGPUDevices();
     foreach ($arrConfig['gpu'] as $arrGPU) {
       foreach ($arrValidGPUDevices as $arrDev) {
@@ -145,15 +146,44 @@ foreach ($vms as $vm) {
       if ($cdfile2 != "") $cdromcount++ ;
     }
   }
+
+  $ipliststr = $iptitlestr = "" ;
+  $gastate = getgastate($res);
+  if ($gastate == "connected") {
+  $ip  = $lv->domain_interface_addresses($res, 1);
+    if ($ip != false) {
+      $duplicates = []; // hide duplicate interface names
+      foreach ($ip as $arrIP) {
+        $ipname = $arrIP["name"];
+        if (preg_match('/^(lo|Loopback)/',$ipname)) continue; // omit loopback interface
+        $iphdwadr = $arrIP["hwaddr"] == "" ?  _("N/A") : $arrIP["hwaddr"];
+        $iplist = $arrIP["addrs"];
+        foreach ($iplist as $arraddr) {
+          $ipaddrval = $arraddr["addr"];
+          if (preg_match('/^f[c-f]/',$ipaddrval)) continue; // omit ipv6 private addresses
+          $iptype = $arraddr["type"] ? "ipv6" : "ipv4";
+          $ipprefix = $arraddr["prefix"];
+          $ipnamemac = "$ipname ($iphdwadr)";
+          if (!in_array($ipnamemac,$duplicates)) $duplicates[] = $ipnamemac; else $ipnamemac = "";
+          $ipliststr .= "<tr><td>$ipnamemac</td><td></td><td></td><td>$iptype</td><td>$ipaddrval</td><td>$ipprefix</td></tr>";
+          $iptitlestr .= "$ipaddrval $ipprefix\n" ;
+        }
+      }
+    }
+  } else {
+  if ($gastate == "disconnected") { $ipliststr .= "<tr><td>"._('Guest agent not installed')."</td><td></td><td></td><td></td></tr>"; $iptitlestr = _('Requires guest agent installed') ; }
+  else { $ipliststr =  "<tr><td>"._('Guest not running')."</td><td></td><td></td><td></td><td></td></tr>"; $iptitlestr = _('Requires guest running') ;  }
+  }
+
   $changemedia = "getisoimageboth(\"{$uuid}\",\"hda\",\"{$cdbus}\",\"{$cdfile}\",\"hdb\",\"{$cdbus2}\",\"{$cdfile2}\")";
   $cdstr = $cdromcount." / 2<a class='hand' title='$title' href='#'  onclick='$changemedia'> <i class='fa fa-bullseye' ></i></a>";
   echo "<tr parent-id='$i' class='sortable'><td class='vm-name' style='width:220px;padding:8px'><i class='fa fa-arrows-v mover orange-text'></i>";
-  echo "<span class='outer'><span id='vm-$uuid' $menu class='hand'>$image</span><span class='inner'><a href='#' onclick='return toggle_id(\"name-$i\")' title='click for more VM info'>$vm</a><br><i class='fa fa-$shape $status $color'></i><span class='state'>"._($status)." $snapshotstcount</span></span></span></td>";
+  echo "<span class='outer'><span id='vm-$uuid' $menu class='hand'>$image</span><span class='inner'><a href='#' onclick='return toggle_id(\"name-$i\")' title='click for more VM info\nIP(s) inuse\n$iptitlestr'>$vm</a><br><i class='fa fa-$shape $status $color'></i><span class='state'>"._($status)." $snapshotstcount</span></span></span></td>";
   echo "<td>$desc</td>";
   echo "<td><a class='vcpu-$uuid' style='cursor:pointer'>$vcpu</a></td>";
   echo "<td>$mem</td>";
   echo "<td title='$diskdesc'><span class='state' >$disks&nbsp;&nbsp;&nbsp;&nbsp;$cdstr<br>$snapshotstr</span></td>";
-  echo "<td>$graphics</td>";
+  echo "<td><span class='vmgraphics'>$graphics</td>";
   echo "<td><input class='autostart' type='checkbox' name='auto_{$vm}' title=\""._('Toggle VM autostart')."\" uuid='$uuid' $autostart></td></tr>";
 
   /* Disk device information */
@@ -217,32 +247,7 @@ foreach ($vms as $vm) {
   /* Display VM  IP Addresses "execute":"guest-network-get-interfaces" --pretty */
   echo "<thead class='child'><tr><th><i class='fa fa-sitemap'></i> <b>"._('Interfaces')."</b></th><th></th><th></th><th>"._('Type')."</th><th>"._('IP Address')."</th><th>"._('Prefix')."</th></tr></thead>";
   echo "<tbody class='child'>";
-  $gastate = getgastate($res);
-  if ($gastate == "connected") {
-    $ip  = $lv->domain_interface_addresses($res, 1);
-    if ($ip != false) {
-      $duplicates = []; // hide duplicate interface names
-      foreach ($ip as $arrIP) {
-        $ipname = $arrIP["name"];
-        if (preg_match('/^(lo|Loopback)/',$ipname)) continue; // omit loopback interface
-        $iphdwadr = $arrIP["hwaddr"] == "" ?  _("N/A") : $arrIP["hwaddr"];
-        $iplist = $arrIP["addrs"];
-        foreach ($iplist as $arraddr) {
-          $ipaddrval = $arraddr["addr"];
-          if (preg_match('/^f[c-f]/',$ipaddrval)) continue; // omit ipv6 private addresses
-          $iptype = $arraddr["type"] ? "ipv6" : "ipv4";
-          $ipprefix = $arraddr["prefix"];
-          $ipnamemac = "$ipname ($iphdwadr)";
-          if (!in_array($ipnamemac,$duplicates)) $duplicates[] = $ipnamemac; else $ipnamemac = "";
-          echo "<tr><td>$ipnamemac</td><td></td><td></td><td>$iptype</td><td>$ipaddrval</td><td>$ipprefix</td></tr>";
-        }
-      }
-    }
-  }
-  else {
-    if ($gastate == "disconnected") echo "<tr><td>"._('Guest agent not installed')."</td><td></td><td></td><td></td></tr>";
-    else echo "<tr><td>"._('Guest not running')."</td><td></td><td></td><td></td><td></td></tr>";
-  }
+  echo $ipliststr ;
   echo "</tbody>";
   /* Display VM  Snapshots */
   if ($snapshots != null) {
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
index 4ef919df5..0abb29c13 100644
--- a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
@@ -18,3 +18,4 @@ i.mover{margin-right:8px;display:none}
 #resetsort{margin-left:12px;display:inline-block;width:32px}
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
 .dropdown-menu{z-index:10001}
+span.vmgraphics{font-size:1.1rem;text-align: left}

From da23a245a2c54fa15534890ebe6af1bed7f55a40 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Thu, 19 Oct 2023 16:49:43 +0200
Subject: [PATCH 091/266] clean up visibility cookies left in malformed state

---
 emhttp/plugins/dynamix/DashStats.page | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index fbf242663..99d299954 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -745,6 +745,28 @@ jQuery.prototype.mixedView = function(s) {
     });
   }
 }
+function sanitizeMultiCookie(cookieName, delimiter, removeDuplicates = false) {
+  // Some browser states leave multi-value cookies with nulls, empties or duplicates.
+  // This function cleans up any such cookies so that they do not break functionality.
+  try {
+    var uncleanCookie = $.cookie(cookieName);
+    if (uncleanCookie) {
+      uncleanCookie = uncleanCookie.split(delimiter);
+      var cleanCookie = uncleanCookie.filter(n => n);
+      if (removeDuplicates) { cleanCookie = [...new Set(cleanCookie)]; }
+      if (JSON.stringify(uncleanCookie) !== JSON.stringify(cleanCookie)) {
+        $.cookie(cookieName,cleanCookie.join(delimiter),{expires:3650});
+        return true;
+      } else {
+        return false;
+      }
+    } else {
+      return false;
+    }
+  } catch (ex) {
+    return false;
+  }
+}
 
 var ports   = [<?=implode(',',array_map('escapestring',$ports))?>];
 var cpu     = [];
@@ -1175,6 +1197,7 @@ function addProperties() {
 }
 function showContent() {
   var count = {'db-box1':$('table#db-box1 tbody').length, 'db-box2':$('table#db-box2 tbody').length, 'db-box3':$('table#db-box3 tbody').length}
+  sanitizeMultiCookie('inactive_content', ';', true);
   var inactive = $.cookie('inactive_content');
   if (inactive) {
     inactive = inactive.split(';');
@@ -1186,6 +1209,7 @@ function showContent() {
       tbody.prev().hide();
     }
   }
+  sanitizeMultiCookie('hidden_content', ';', true);
   var hidden = $.cookie('hidden_content');
   if (hidden) {
     hidden = hidden.split(';');

From daf339339825226e79354a2a779f3251cf2e085e Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Thu, 19 Oct 2023 21:00:34 +0100
Subject: [PATCH 092/266] Additional VM Manager Changes

---
 .../dynamix.vm.manager/VMMachines.page        |  2 +-
 .../dynamix.vm.manager/include/VMMachines.php | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index 4aab01721..6d846724f 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -478,7 +478,7 @@ $(function() {
 </script>
 
 <table id="kvm_table" class="tablesorter four shift">
-<thead><tr><th class="th1"><a id="resetsort" class="nohand" onclick="resetSorting()" title="Reset sorting"><i class="fa fa-th-list"></i></a>_(Name)_</th><th class="th2">_(Description)_</th><th>_(CPUs)_</th><th>_(Memory)_</th><th>_(vDisks / vCDs)_</th><th>_(Graphics)_</th><th class="th3">_(Autostart)_</th></tr></thead>
+<thead><tr><th class="th1"><a id="resetsort" class="nohand" onclick="resetSorting()" title="Reset sorting"><i class="fa fa-th-list"></i></a>_(Name)_</th><th class="th2">_(Description)_</th><th>_(CPUs)_</th><th>_(Memory)_</th><th>_(vDisks / vCDs)_</th><th>_(Graphics)_</th><th>_(IP Address)_</th><th class="th3">_(Autostart)_</th></tr></thead>
 <tbody id="kvm_list"><tr><td colspan='8'></td></tr></tbody>
 </table>
 
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
index dd79aa85b..6ff87184c 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
@@ -75,16 +75,19 @@ foreach ($vms as $vm) {
   $autoport = $lv->domain_get_vmrc_autoport($res);
   $vmrcurl = '';
   $graphics = '';
+  $virtual = false ;
   if ($vmrcport > 0) {
     $wsport = $lv->domain_get_ws_port($res);
     $vmrcprotocol = $lv->domain_get_vmrc_protocol($res);
     $vmrcurl = autov('/plugins/dynamix.vm.manager/'.$vmrcprotocol.'.html',true).'&autoconnect=true&host='._var($_SERVER,'HTTP_HOST');
     if ($vmrcprotocol == "spice") $vmrcurl .= '&vmname='. urlencode($vm) .'&port=/wsproxy/'.$vmrcport.'/'; else $vmrcurl .= '&port=&path=/wsproxy/'.$wsport.'/';
     $graphics = strtoupper($vmrcprotocol).":".$vmrcport."\n";
+    $virtual = true ;
   } elseif ($vmrcport == -1 || $autoport) {
     $vmrcprotocol = $lv->domain_get_vmrc_protocol($res);
     if ($autoport == "yes") $auto = "auto"; else $auto="manual";
     $graphics = strtoupper($vmrcprotocol).':'._($auto)."\n";
+    $virtual = true ;
   } 
   if (!empty($arrConfig['gpu'])) {
     $arrValidGPUDevices = getValidGPUDevices();
@@ -93,10 +96,10 @@ foreach ($vms as $vm) {
         if ($arrGPU['id'] == $arrDev['id']) {
           if (count(array_filter($arrValidGPUDevices, function($v) use ($arrDev) { return $v['name'] == $arrDev['name']; })) > 1) {
             $graphics .= $arrDev['name'].' ('.$arrDev['id'].')'."\n";
-            $vmrcprotocol = "VGA";
+            if (!$virtual) $vmrcprotocol = "VGA";
           } else {
             $graphics .= $arrDev['name']."\n";
-            $vmrcprotocol = "VGA";
+            if (!$virtual) $vmrcprotocol = "VGA";
           }
         }
       }
@@ -147,7 +150,7 @@ foreach ($vms as $vm) {
     }
   }
 
-  $ipliststr = $iptitlestr = "" ;
+  $ipliststr = $iptablestr = "" ;
   $gastate = getgastate($res);
   if ($gastate == "connected") {
   $ip  = $lv->domain_interface_addresses($res, 1);
@@ -166,24 +169,26 @@ foreach ($vms as $vm) {
           $ipnamemac = "$ipname ($iphdwadr)";
           if (!in_array($ipnamemac,$duplicates)) $duplicates[] = $ipnamemac; else $ipnamemac = "";
           $ipliststr .= "<tr><td>$ipnamemac</td><td></td><td></td><td>$iptype</td><td>$ipaddrval</td><td>$ipprefix</td></tr>";
-          $iptitlestr .= "$ipaddrval $ipprefix\n" ;
+          $iptablestr .= "$ipaddrval/$ipprefix\n" ;
         }
       }
     }
   } else {
-  if ($gastate == "disconnected") { $ipliststr .= "<tr><td>"._('Guest agent not installed')."</td><td></td><td></td><td></td></tr>"; $iptitlestr = _('Requires guest agent installed') ; }
-  else { $ipliststr =  "<tr><td>"._('Guest not running')."</td><td></td><td></td><td></td><td></td></tr>"; $iptitlestr = _('Requires guest running') ;  }
+  if ($gastate == "disconnected") { $ipliststr .= "<tr><td>"._('Guest agent not installed')."</td><td></td><td></td><td></td></tr>"; $iptablestr = _('Requires guest agent installed') ; }
+  else { $ipliststr =  "<tr><td>"._('Guest not running')."</td><td></td><td></td><td></td><td></td></tr>"; $iptablestr = _('Requires guest running') ;  }
   }
+  $iptablestr = str_replace("\n", "<br>", trim($iptablestr));
 
   $changemedia = "getisoimageboth(\"{$uuid}\",\"hda\",\"{$cdbus}\",\"{$cdfile}\",\"hdb\",\"{$cdbus2}\",\"{$cdfile2}\")";
   $cdstr = $cdromcount." / 2<a class='hand' title='$title' href='#'  onclick='$changemedia'> <i class='fa fa-bullseye' ></i></a>";
   echo "<tr parent-id='$i' class='sortable'><td class='vm-name' style='width:220px;padding:8px'><i class='fa fa-arrows-v mover orange-text'></i>";
-  echo "<span class='outer'><span id='vm-$uuid' $menu class='hand'>$image</span><span class='inner'><a href='#' onclick='return toggle_id(\"name-$i\")' title='click for more VM info\nIP(s) inuse\n$iptitlestr'>$vm</a><br><i class='fa fa-$shape $status $color'></i><span class='state'>"._($status)." $snapshotstcount</span></span></span></td>";
+  echo "<span class='outer'><span id='vm-$uuid' $menu class='hand'>$image</span><span class='inner'><a href='#' onclick='return toggle_id(\"name-$i\")' title='click for more VM info'>$vm</a><br><i class='fa fa-$shape $status $color'></i><span class='state'>"._($status)." $snapshotstcount</span></span></span></td>";
   echo "<td>$desc</td>";
   echo "<td><a class='vcpu-$uuid' style='cursor:pointer'>$vcpu</a></td>";
   echo "<td>$mem</td>";
   echo "<td title='$diskdesc'><span class='state' >$disks&nbsp;&nbsp;&nbsp;&nbsp;$cdstr<br>$snapshotstr</span></td>";
   echo "<td><span class='vmgraphics'>$graphics</td>";
+  echo "<td><span class='vmgraphics'>$iptablestr</td>";
   echo "<td><input class='autostart' type='checkbox' name='auto_{$vm}' title=\""._('Toggle VM autostart')."\" uuid='$uuid' $autostart></td></tr>";
 
   /* Disk device information */

From 7b181bd71a731e1b0ee526fef29eb971b5bb410f Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Fri, 20 Oct 2023 18:31:07 +0100
Subject: [PATCH 093/266] Add cpumigrate field

---
 emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 337dd1480..2b12163ec 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1276,6 +1276,7 @@ private static $encoding = 'UTF-8';
 				'maxmem' => $lv->domain_get_memory($res),
 				'password' => '', //TODO?
 				'cpumode' => $lv->domain_get_cpu_type($res),
+				'cpumigrate' => $lv->domain_get_cpu_migrate($res),
 				'vcpus' => $dom['nrVirtCpu'],
 				'vcpu' => $lv->domain_get_vcpu_pins($res),
 				'hyperv' => ($lv->domain_get_feature($res, 'hyperv') ? 1 : 0),

From b04b5d3519af27e41174e33f38b46dda07736cf5 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 21 Oct 2023 10:54:15 +0100
Subject: [PATCH 094/266] Add option to set cpu migration

Support is only on host passthrough not custom.
---
 .../dynamix.vm.manager/include/libvirt.php    | 16 ++++++-
 .../templates/Custom.form.php                 | 42 +++++++++++++++----
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index cebfe945f..c28486269 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -369,6 +369,7 @@
 			$cpumode = '';
 			$cpucache = '';
 			$cpufeatures = '';
+			$cpumigrate = '';
 			if (!empty($domain['cpumode']) && $domain['cpumode'] == 'host-passthrough') {
 				$cpumode .= "mode='host-passthrough'";
 				$cpucache = "<cache mode='passthrough'/>";
@@ -389,9 +390,11 @@
 					$intCores = $vcpus / $intCPUThreadsPerCore;
 					$intThreads = $intCPUThreadsPerCore;
 				}
+
+				if (!empty($domain['cpumigrate'])) $cpumigrate = " migratable='".$domain['cpumigrate']."'" ;
 			}
 
-			$cpustr = "<cpu $cpumode>
+			$cpustr = "<cpu $cpumode $cpumigrate>
 							<topology sockets='1' cores='{$intCores}' threads='{$intThreads}'/>
 							$cpucache
 							$cpufeatures
@@ -2096,6 +2099,17 @@
 			return $var;
 		}
 
+		function domain_get_cpu_migrate($domain) {
+			$tmp = $this->get_xpath($domain, '//domain/cpu/@migratable', false);
+			if (!$tmp)
+				return 'no';
+
+			$var = $tmp[0];
+			unset($tmp);
+
+			return $var;
+		}
+
 		function domain_get_vcpu($domain) {
 			$tmp = $this->get_xpath($domain, '//domain/vcpu', false);
 			$var = $tmp[0];
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 939d352ed..f09ef6f65 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -53,6 +53,7 @@
 			'maxmem' => 1024 * 1024,
 			'password' => '',
 			'cpumode' => 'host-passthrough',
+			'cpumigrate' => 'on',
 			'vcpus' => 1,
 			'vcpu' => [0],
 			'hyperv' => 1,
@@ -312,13 +313,26 @@
 		</blockquote>
 	</div>
 
+	<?
+				$migratehidden =  "disabled hidden" ;
+				if ($arrConfig['domain']['cpumode'] == 'host-passthrough') $migratehidden = "" ;
+	?>
+
 	<table>
 		<tr class="advanced">
-			<td>_(CPU Mode)_:</td>
+			<td><span class="advanced">_(CPU)_ </span>_(Mode)_:</td>
 			<td>
-				<select name="domain[cpumode]" title="_(define type of cpu presented to this vm)_">
+				<select id="cpu" name="domain[cpumode]" class="cpu" title="_(define type of cpu presented to this vm)_">
 				<?mk_dropdown_options(['host-passthrough' => _('Host Passthrough').' (' . $strCPUModel . ')', 'custom' => _('Emulated').' ('._('QEMU64').')'], $arrConfig['domain']['cpumode']);?>
 				</select>
+				<span class="advanced" id="domain_cpumigrate_text"<?=$migratehidden?>>_(Migratable)_:</span>
+
+				<select name="domain[cpumigrate]" id="domain_cpumigrate"  <?=$migratehidden?> class="narrow" title="_(define if migratable)_">
+				<?
+				echo mk_option($arrConfig['domain']['cpumigrate'], 'on', 'On');
+				echo mk_option($arrConfig['domain']['cpumigrate'], 'off', 'Off') ;
+				?>
+				</select>
 			</td>
 		</tr>
 	</table>
@@ -380,10 +394,8 @@
 					}
 				?>
 				</select>
-			</td>
-
-			<td class="advanced">_(Max)_ _(Memory)_:</td>
-			<td class="advanced">
+	
+			<span class="advanced">_(Max)_ _(Memory)_:</span>		
 				<select name="domain[maxmem]" id="domain_maxmem" class="narrow" title="_(define the maximum amount of memory)_">
 				<?
 					echo mk_option($arrConfig['domain']['maxmem'], 128 * 1024, '128 MB');
@@ -396,7 +408,6 @@
 				?>
 				</select>
 			</td>
-			<td></td>
 		</tr>
 	</table>
 	<div class="basic">
@@ -1833,6 +1844,23 @@ $(function() {
 		}
 	});
 
+	$("#vmform").on("change", ".cpu", function changeCPUEvent() {
+		var myvalue = $(this).val();
+		var mylabel = $(this).children('option:selected').text();
+		var cpumigrate = document.getElementById("domain_cpumigrate_text") ;
+		var cpumigrate_text = document.getElementById("domain_cpumigrate") ;
+		if (myvalue == "custom") {
+			document.getElementById("domain_cpumigrate_text").style.visibility="hidden";
+			document.getElementById("domain_cpumigrate").style.visibility="hidden";
+		} else {
+			document.getElementById("domain_cpumigrate_text").style.display="inline";
+			document.getElementById("domain_cpumigrate_text").style.visibility="visible";
+			document.getElementById("domain_cpumigrate").style.display="inline";
+			document.getElementById("domain_cpumigrate").style.visibility="visible";
+		}
+
+	}) ;
+
 	$("#vmform").on("change", ".gpu", function changeGPUEvent() {
 		var myvalue = $(this).val();
 		var mylabel = $(this).children('option:selected').text();

From f86df19b7d2a3fd3f01e50d297a83bed3ce10a29 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 21 Oct 2023 11:55:58 +0100
Subject: [PATCH 095/266] Add migratable help text.

---
 emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index f09ef6f65..51bed7531 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -347,6 +347,10 @@
 				<b>Emulated</b><br>
 				If you are having difficulties with Host Passthrough mode, you can try the emulated mode which doesn't expose the guest to host-based CPU features.  This may impact the performance of your VM.
 			</p>
+			<p>
+				<b>Migratable</b><br>
+				Migratable attribute may be used to explicitly request such features to be removed from (on) or kept in (off) the virtual CPU. Off will not remove any host features when using Host Passthrough. Not support on emulated.
+			</p>
 		</blockquote>
 	</div>
 

From 1ba8f32464488a42f2d477a4a60a6c3d0f185ebe Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 21 Oct 2023 14:58:40 +0100
Subject: [PATCH 096/266] Add hypeclock for windows machines

---
 emhttp/plugins/dynamix.vm.manager/include/libvirt.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index c28486269..66e0fc777 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -442,10 +442,13 @@
 					break;
 			}
 
+			if ($os_type == "windows") $hypervclock = "<timer name='hypervclock' present='yes'/>" else $hypervclock = "" ;
+
 			$clock = "<clock offset='" . $domain['clock'] . "'>
 						<timer name='rtc' tickpolicy='catchup'/>
 						<timer name='pit' tickpolicy='delay'/>
 						<timer name='hpet' present='no'/>
+						$hypervclock
 					</clock>";
 
 			$hyperv = '';

From c9b8d1326183f02ab57489b673f96b469232cb02 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 21 Oct 2023 15:58:09 +0100
Subject: [PATCH 097/266] Update libvirt.php

---
 emhttp/plugins/dynamix.vm.manager/include/libvirt.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index 66e0fc777..1f61a5735 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -442,7 +442,7 @@
 					break;
 			}
 
-			if ($os_type == "windows") $hypervclock = "<timer name='hypervclock' present='yes'/>" else $hypervclock = "" ;
+			if ($os_type == "windows") $hypervclock = "<timer name='hypervclock' present='yes'/>" ; else $hypervclock = "" ;
 
 			$clock = "<clock offset='" . $domain['clock'] . "'>
 						<timer name='rtc' tickpolicy='catchup'/>

From 594ff1d642e73d72dcec94667def644a8c057765 Mon Sep 17 00:00:00 2001
From: ljm42 <larry_meaney@iname.com>
Date: Mon, 23 Oct 2023 16:42:06 -0700
Subject: [PATCH 098/266] nginx: use the new http2 directive

---
 etc/rc.d/rc.nginx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/etc/rc.d/rc.nginx b/etc/rc.d/rc.nginx
index 07ebdd264..b00debce8 100755
--- a/etc/rc.d/rc.nginx
+++ b/etc/rc.d/rc.nginx
@@ -176,7 +176,8 @@ build_servers(){
 	# ex: https://tower.local
 	#
 	server {
-	$(listen $PORTSSL ssl http2 default_server)
+	$(listen $PORTSSL ssl default_server)
+	    http2 on;
 	    # Ok to use concatenated pem files; nginx will do the right thing.
 	    ssl_certificate         $SELFCERTPATH;
 	    ssl_certificate_key     $SELFCERTPATH;
@@ -220,7 +221,8 @@ build_servers(){
 	# Return 404 (Not Found) as default ssl action, using self-signed cert
 	#
 	server {
-	$(listen $PORTSSL ssl http2 default_server)
+	$(listen $PORTSSL ssl default_server)
+	    http2 on;
 	    # Ok to use concatenated pem files; nginx will do the right thing.
 	    ssl_certificate         $SELFCERTPATH;
 	    ssl_certificate_key     $SELFCERTPATH;
@@ -240,7 +242,8 @@ build_servers(){
 	# Return 404 (Not Found) as default ssl action
 	#
 	server {
-	$(listen $PORTSSL ssl http2 default_server)
+	$(listen $PORTSSL ssl default_server)
+	    http2 on;
 	    # Ok to use concatenated pem files; nginx will do the right thing.
 	    ssl_certificate         $SELFCERTPATH;
 	    ssl_certificate_key     $SELFCERTPATH;
@@ -261,7 +264,8 @@ build_servers(){
 	# ex: https://hash.unraid.net
 	#
 	server {
-	$(listen $PORTSSL ssl http2)
+	$(listen $PORTSSL ssl)
+	    http2 on;
 	    server_name ${SERVER_NAMES[@]};
 	    # Ok to use concatenated pem files; nginx will do the right thing.
 	    ssl_certificate         $CERTPATH;

From d008f5a5f04d67fab74620d734f403cf3e3758ff Mon Sep 17 00:00:00 2001
From: Christoph Hummer <christophhummer@gmail.com>
Date: Tue, 24 Oct 2023 11:54:52 +0200
Subject: [PATCH 099/266] Just for the looks

- only add space if version number from module is found
---
 emhttp/plugins/dynamix/include/SysDrivers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/SysDrivers.php b/emhttp/plugins/dynamix/include/SysDrivers.php
index 2b6ee2fa0..f6ad7cf34 100644
--- a/emhttp/plugins/dynamix/include/SysDrivers.php
+++ b/emhttp/plugins/dynamix/include/SysDrivers.php
@@ -79,9 +79,9 @@ switch ($_POST['table']) {
                         $supporthtml = "<span id='link$modname'><a href='$supporturl' target='_blank'><i title='"._("Support page $pluginname")."' class='fa fa-phone-square'></i></a></span>" ;
                     } 
             }  
-            if (isset($module["version"])) $version = "(".$module["version"].")" ; else $version = "" ;
+            if (isset($module["version"])) $version = " (".$module["version"].")" ; else $version = "" ;
         
-            $html .= "<td>$modname $version$supporthtml</td>" ;
+            $html .= "<td>$modname$version$supporthtml</td>" ;
             $html .= "<td>{$module['description']}</td><td id=\"status$modname\">{$module['state']}</td><td>{$module['type']}</td>";
     
             $text = "" ;

From 25ccb39fa0a1aa5ebfb6836a24f3f3e9528a1dd9 Mon Sep 17 00:00:00 2001
From: Tom Mortensen <tomm@lime-technology.com>
Date: Tue, 24 Oct 2023 11:08:20 -0700
Subject: [PATCH 100/266] Fix comment in rc.nginx:   php-fpm socket name is
 php-fpm, not php5-fpm Removed a couple files no longer needed:   wrap_get.php
   wrap_post.php

---
 etc/rc.d/rc.nginx |  2 +-
 src/wrap_get.php  | 17 -----------------
 src/wrap_post.php | 18 ------------------
 3 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 src/wrap_get.php
 delete mode 100644 src/wrap_post.php

diff --git a/etc/rc.d/rc.nginx b/etc/rc.d/rc.nginx
index b00debce8..465523c94 100755
--- a/etc/rc.d/rc.nginx
+++ b/etc/rc.d/rc.nginx
@@ -381,7 +381,7 @@ build_locations(){
 	    add_header Cache-Control no-cache;
 	}
 	#
-	# pass PHP scripts to FastCGI server listening on unix:/var/run/php5-fpm.sock
+	# pass PHP scripts to FastCGI server listening on unix:/var/run/php-fpm.sock
 	#
 	location ~ \.php$ {
 	    include fastcgi_params;
diff --git a/src/wrap_get.php b/src/wrap_get.php
deleted file mode 100644
index baa8e0c14..000000000
--- a/src/wrap_get.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-// wrapper script to fill in $_GET and $_POST
-// for GET when emhttp renders <fname.php> it invokes php-cli like this:
-// cd /usr/local/emhttp ; /usr/bin/php ../sbin/wrap_get.php <fname.php> <querystring>
-//                                     argv[0]               argv[1]     argv[2]
-// A similar thing happens when a webGui "page" is rendered.  In this case, any fname that begins
-// with a capital letter and has no extension is assumed to be a Page.  For example, for GET, when emhttp
-// renfers <Main/Disk> it invokes php-cli like this:
-// cd /usr/local/emhttp ; /usr/bin/php ../sbin/wrap_get.php webGui/template.php <querystring>
-//                                     argv[0]               argv[1]                     argv[2]
-// Included in <querystring> is "path=Main/Disk&prev=Main" where "prev" is the previous page rendered.
-// Note: we place 'wrap_get.php' outside webGui root so user can't invoke directly (or else OOM crash!)
-  $_SERVER['REQUEST_METHOD'] = "GET";
-  $_SERVER['DOCUMENT_ROOT'] = "/usr/local/emhttp";
-  parse_str($argv[2], $_GET);
-  include($argv[1]);
-?>
diff --git a/src/wrap_post.php b/src/wrap_post.php
deleted file mode 100644
index b83dc474f..000000000
--- a/src/wrap_post.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-// wrapper script to fill in $_GET and $_POST
-// for POST when emhttp renders <fname.php> it invokes php-cli like this:
-// cd /usr/local/emhttp ; /usr/bin/php ../sbin/wrap_post.php <fname.php> <querystring> <postdata>
-//                                     argv[0]               argv[1]     argv[2]       argv[3]
-// A similar thing happens when a webGui "page" is rendered.  In this case, any fname that begins
-// with a capital letter and has no extension is assumed to be a Page.  For example, for POST, when emhttp
-// renfers <Main/Disk> it invokes php-cli like this:
-// cd /usr/local/emhttp ; /usr/bin/php ../sbin/wrap_post.php webGui/template.php <querystring> <postdata>
-//                                     argv[0]               argv[1]                     argv[2]       argv[3]
-// Included in <querystring> is "path=Main/Disk&prev=Main" where "prev" is the previous page rendered.
-// Note: we place 'wrap_post.php' outside webGui root so user can't invoke directly (or else OOM crash!)
-  $_SERVER['REQUEST_METHOD'] = "POST";
-  $_SERVER['DOCUMENT_ROOT'] = "/usr/local/emhttp";
-  parse_str($argv[2], $_GET);
-  parse_str($argv[3], $_POST);
-  include($argv[1]);
-?>

From 42e2ee6e393aad928891979b4f4dd91a8ed3f932 Mon Sep 17 00:00:00 2001
From: ljm42 <larry_meaney@iname.com>
Date: Tue, 24 Oct 2023 17:17:10 -0700
Subject: [PATCH 101/266] remove support for legacy unraid.net certs

---
 emhttp/plugins/dynamix/ManagementAccess.page  | 34 ++++++-------------
 .../plugins/dynamix/include/ProvisionCert.php |  6 ++--
 etc/rc.d/rc.nginx                             | 17 +++-------
 3 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/emhttp/plugins/dynamix/ManagementAccess.page b/emhttp/plugins/dynamix/ManagementAccess.page
index 9836b3824..264315805 100644
--- a/emhttp/plugins/dynamix/ManagementAccess.page
+++ b/emhttp/plugins/dynamix/ManagementAccess.page
@@ -56,7 +56,7 @@ $nginx       = @parse_ini_file('/var/local/emhttp/nginx.ini') ?: [];
 $addr        = _var($nginx,'NGINX_LANIP') ?: _var($nginx,'NGINX_LANIP6');
 $keyfile     = empty(_var($var,'regFILE')) ? false : @file_get_contents(_var($var,'regFILE'));
 $cert2Issuer = '';
-$isLEcert    = false;
+$isWildcardCert = false;
 if ($keyfile !== false) $keyfile = base64_encode($keyfile);
 
 // self-signed or user-provided cert
@@ -82,25 +82,18 @@ if ($cert2Present) {
   $cert2Subject = exec("/usr/bin/openssl x509 -in $cert2File -noout -subject -nameopt multiline 2>/dev/null|sed -n 's/ *commonName *= //p'");
   $cert2Issuer  = exec("/usr/bin/openssl x509 -in $cert2File -noout -text | sed -n -e 's/^.*Issuer: //p'");
   $cert2Expires = exec("/usr/bin/openssl x509 -in $cert2File -noout -text | sed -n -e 's/^.*Not After : //p'");
-  $isLegacyCert = preg_match('/.*\.unraid\.net$/', $cert2Subject);
   $isWildcardCert = preg_match('/.*\.myunraid\.net$/', $cert2Subject);
-  $isLEcert = $isLegacyCert || $isWildcardCert;
   $subject2URL = $cert2Subject;
   if ($isWildcardCert) {
-    if (!$addr)
-      // if eth0 doesn't have an IP address, then show noip.hash.myunraid.net as a placeholder url
-      $subject2URL = str_replace("*", 'noip', $subject2URL);
-    elseif (strpos($addr, ":") === false)
-      $subject2URL = str_replace("*", str_replace(".", "-", $addr), $subject2URL);
-    else
-      $subject2URL = str_replace("*", str_replace(":", "-", $addr), $subject2URL);
-  }
-  if ($isLEcert) {
     exec("openssl x509 -checkend 2592000 -noout -in $cert2File 2>/dev/null", $arrout, $retval_expired);
     if (!$addr) {
+      // if eth0 doesn't have an IP address, then show noip.hash.myunraid.net as a placeholder url
+      $subject2URL = str_replace("*", 'noip', $subject2URL);
       $dnsValid = false;
       $dnsRebindingProtection = false;
     } elseif (strpos($addr, ":") === false) {
+      // eth0 is IPv4
+      $subject2URL = str_replace("*", str_replace(".", "-", $addr), $subject2URL);
       $rebindtest_ip = exec("host -4 -t A rebindtest4.myunraid.net 2>/dev/null|awk '{print \$4}'");
       $dnsRebindingProtection = ($rebindtest_ip != "192.168.42.42");
       if (!$dnsRebindingProtection) {
@@ -108,6 +101,8 @@ if ($cert2Present) {
         $dnsValid = $cert_ip==$addr;
       }
     } else {
+      // eth0 is IPv6
+      $subject2URL = str_replace("*", str_replace(":", "-", $addr), $subject2URL);
       $rebindtest_ip = exec("host -6 -t AAAA rebindtest6.myunraid.net 2>/dev/null|awk '{print \$4}'");
       // more: restore this after TTL expires
       // $dnsRebindingProtection = ($rebindtest_ip != "fd42::42");
@@ -166,14 +161,12 @@ case 'auto': // aka strict
 }
 
 $cert_time_format   = $display['date'].($display['date']!='%c' ? ', '.str_replace(['%M','%R'],['%M:%S','%R:%S'],$display['time']):'');
-$provisionlabel     = $isLEcert ? _('Renew') : _('Provision');
-$disabled_provision = $keyfile===false || ($isLEcert && $retval_expired===0) || !$addr ? 'disabled' : '';
+$provisionlabel     = $isWildcardCert ? _('Renew') : _('Provision');
+$disabled_provision = $keyfile===false || ($isWildcardCert && $retval_expired===0) || !$addr ? 'disabled' : '';
 $disabled_provision_msg = !$addr ? _('Ensure the primary network card eth0 has an IP address.') : '';
-$disabled_upgrade   = !$addr ? 'disabled' : '';
-$disabled_updatedns = $keyfile!==false && $isLEcert ? '' : 'disabled';
+$disabled_updatedns = $keyfile!==false && $isWildcardCert ? '' : 'disabled';
 $disabled_delete    = $cert2Present && $var['USE_SSL']!='auto' ? '' : 'disabled';
-$disabled_auto      = $isLEcert && !$dnsRebindingProtection && $dnsValid ? '' : 'disabled';
-$upgradelabel       = _('Upgrade Cert');
+$disabled_auto      = $isWildcardCert && !$dnsRebindingProtection && $dnsValid ? '' : 'disabled';
 
 // Get ports in use
 $portsInUse = [];
@@ -440,11 +433,6 @@ _(CA-signed certificate file)_:
 &nbsp;
 : <button type="submit" name="changePorts" value="Provision" <?=$disabled_provision?>><?=$provisionlabel?></button><button type="submit" name="changePorts" value="Delete" <?=$disabled_delete?> >_(Delete)_</button><!-- <button type="button" onclick="updateDNS(this)" <?=$disabled_updatedns?>>_(Update DNS)_</button> --><?=$disabled_provision_msg?>
 
-<?if ($cert2Present && $isLegacyCert):?>
-&nbsp;
-: <button type="submit" name="changePorts" value="Upgrade" <?=$disabled_upgrade?>><?=$upgradelabel?></button>
-<?endif;?>
-
 :mgmt_certificate_expiration_help:
 
 </form>
diff --git a/emhttp/plugins/dynamix/include/ProvisionCert.php b/emhttp/plugins/dynamix/include/ProvisionCert.php
index bd85e06ae..475544901 100644
--- a/emhttp/plugins/dynamix/include/ProvisionCert.php
+++ b/emhttp/plugins/dynamix/include/ProvisionCert.php
@@ -46,9 +46,8 @@ $certPresent = file_exists($certPath);
 if ($certPresent) {
   // renew existing cert
   $certSubject = exec("/usr/bin/openssl x509 -subject -noout -in ".escapeshellarg($certPath));
-  $isLegacyCert = preg_match('/.*\.unraid\.net$/', $certSubject);
   $isWildcardCert = preg_match('/.*\.myunraid\.net$/', $certSubject);
-  if ($isLegacyCert || $isWildcardCert) {    
+  if ($isWildcardCert) {    
     exec("/usr/bin/openssl x509 -checkend 2592000 -noout -in ".escapeshellarg($certPath), $arrout, $retval_expired);
     if ($retval_expired === 0) {
       // not within 30 days of cert expire date
@@ -59,7 +58,6 @@ if ($certPresent) {
     response_complete(406, '{"error":"'._('Cannot renew a custom cert at').' '.$certPath.'"}');
   }
 }
-$endpoint = ($certPresent && $isLegacyCert) ? "provisioncert" : "provisionwildcard";
 
 $keyfile = empty($var['regFILE']) ? false : @file_get_contents($var['regFILE']);
 if ($keyfile === false) {
@@ -67,7 +65,7 @@ if ($keyfile === false) {
 }
 $keyfile = @base64_encode($keyfile);
 
-$ch = curl_init("https://keys.lime-technology.com/account/ssl/$endpoint");
+$ch = curl_init("https://keys.lime-technology.com/account/ssl/provisionwildcard");
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 curl_setopt($ch, CURLOPT_POST, 1);
 curl_setopt($ch, CURLOPT_POSTFIELDS, [
diff --git a/etc/rc.d/rc.nginx b/etc/rc.d/rc.nginx
index 465523c94..c54748843 100755
--- a/etc/rc.d/rc.nginx
+++ b/etc/rc.d/rc.nginx
@@ -12,9 +12,7 @@
 # LANNAME                     'tower'
 # LANMDNS               'tower.local'
 # LANFQDN  'lan-ip.hash.myunraid.net'  (wildcard cert)
-# LANFQDN           'hash.unraid.net'  (legacy cert)
 # WANFQDN  'wan-ip.hash.myunraid.net'  (wildcard cert)
-# WANFQDN       'www.hash.unraid.net'  (legacy)
 # WG0FQDN  'wg0-ip.hash.myunraid.net'  (wildcard cert)
 
 DAEMON="Nginx server daemon"
@@ -44,6 +42,10 @@ SERVER_NAMES=()
 [[ $PORTSSL != 443 ]] && PORTSSL_URL=":$PORTSSL"
 [[ $PORT != 80 ]] && PORT_URL=":$PORT"
 
+# delete legacy unraid.net certificate
+TMPCERTNAME=$(openssl x509 -noout -subject -nameopt multiline -in $CERTPATH | sed -n 's/ *commonName *= //p')
+[[ $TMPCERTNAME == *\.unraid\.net ]] && rm $CERTPATH
+
 # if USE_SSL="auto" and no uploaded cert, treat like USE_SSL="no"
 [[ $USE_SSL == auto && ! -f $CERTPATH ]] && USE_SSL=no
 
@@ -261,7 +263,6 @@ build_servers(){
 	#
 	# Port settings for https using CA-signed cert
 	# ex: https://lan-ip.hash.myunraid.net
-	# ex: https://hash.unraid.net
 	#
 	server {
 	$(listen $PORTSSL ssl)
@@ -501,15 +502,7 @@ build_ssl(){
       WANIP=$(curl https://wanip4.unraid.net/ 2>/dev/null)
       WANIP6=$(curl https://wanip6.unraid.net/ 2>/dev/null)
     fi
-    if [[ $CERTNAME == *\.unraid\.net ]]; then
-      # legacy LE certificate (only supports IPv4)
-      LANFQDN=$CERTNAME
-      SERVER_NAMES+=($LANFQDN)
-      if [[ -n $WANACCESS && -n $WANIP ]]; then
-        WANFQDN="www.$CERTNAME"
-        SERVER_NAMES+=($WANFQDN)
-      fi
-    elif [[ $CERTNAME == *\.myunraid\.net ]]; then
+    if [[ $CERTNAME == *\.myunraid\.net ]]; then
       # wildcard LE certificate
       [[ -n $LANIP ]] && LANFQDN=$(fqdn $LANIP) SERVER_NAMES+=($LANFQDN)
       [[ -n $LANIP6 ]] && LANFQDN6=$(fqdn $LANIP6) SERVER_NAMES+=($LANFQDN6)

From 4f5b94f83bd63760de7cd1be92819cb2ce8e5aa3 Mon Sep 17 00:00:00 2001
From: ljm42 <larry_meaney@iname.com>
Date: Tue, 24 Oct 2023 17:24:53 -0700
Subject: [PATCH 102/266] remove support for legacy unraid.net certs

---
 etc/rc.d/rc.nginx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/etc/rc.d/rc.nginx b/etc/rc.d/rc.nginx
index c54748843..9562e13ca 100755
--- a/etc/rc.d/rc.nginx
+++ b/etc/rc.d/rc.nginx
@@ -43,8 +43,10 @@ SERVER_NAMES=()
 [[ $PORT != 80 ]] && PORT_URL=":$PORT"
 
 # delete legacy unraid.net certificate
-TMPCERTNAME=$(openssl x509 -noout -subject -nameopt multiline -in $CERTPATH | sed -n 's/ *commonName *= //p')
-[[ $TMPCERTNAME == *\.unraid\.net ]] && rm $CERTPATH
+if [[ -f $CERTPATH ]]; then
+  TMPCERTNAME=$(openssl x509 -noout -subject -nameopt multiline -in $CERTPATH | sed -n 's/ *commonName *= //p')
+  [[ $TMPCERTNAME == *\.unraid\.net ]] && rm $CERTPATH
+fi
 
 # if USE_SSL="auto" and no uploaded cert, treat like USE_SSL="no"
 [[ $USE_SSL == auto && ! -f $CERTPATH ]] && USE_SSL=no

From 6ca0a396866d5c975b84dd2cb7e35ccb417ead38 Mon Sep 17 00:00:00 2001
From: ljm42 <larry_meaney@iname.com>
Date: Tue, 24 Oct 2023 17:56:01 -0700
Subject: [PATCH 103/266] remove legacy unraid.net settings migration

---
 .../dynamix.my.servers/scripts/cfgMigration   | 91 -------------------
 sbin/upgrade                                  |  7 --
 2 files changed, 98 deletions(-)
 delete mode 100755 emhttp/plugins/dynamix.my.servers/scripts/cfgMigration

diff --git a/emhttp/plugins/dynamix.my.servers/scripts/cfgMigration b/emhttp/plugins/dynamix.my.servers/scripts/cfgMigration
deleted file mode 100755
index 92f1a8e3f..000000000
--- a/emhttp/plugins/dynamix.my.servers/scripts/cfgMigration
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/php
-<?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, 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.
- */
-function update($url, $payload) {
-  $ch = curl_init($url);
-  curl_setopt($ch,CURLOPT_POST, true);
-  curl_setopt($ch,CURLOPT_POSTFIELDS, $payload);
-  curl_setopt($ch,CURLOPT_RETURNTRANSFER, true); 
-  $result = curl_exec($ch);
-  curl_close($ch);
-}
-
-$dyn_cfg = '/boot/config/plugins/dynamix/dynamix.cfg';
-$mys_cfg = '/boot/config/plugins/dynamix.my.servers/myservers.cfg';
-
-if (file_exists($dyn_cfg) && !file_exists($mys_cfg)) {
-  $orig = @parse_ini_file($dyn_cfg,true);
-  $var = @(array)parse_ini_file('/usr/local/emhttp/state/var.ini',true);
-  $url = "http://localhost:".$var['PORT']."/update.php";
-
-  // write [remote] section to myservers.cfg
-  if(!empty($orig['remote'])) {
-    $fields_mys_remote = [
-      'csrf_token' => $var['csrf_token'],
-      '#file'      => $mys_cfg,
-      '#section'   => 'remote'
-    ];
-    foreach($orig['remote'] as $key => $value) {
-      $fields_mys_remote[$key] = $value;
-    }
-    update($url, http_build_query($fields_mys_remote));
-  }
-  /*
-  // write [wizard] section to myservers.cfg
-  if(!empty($orig['wizard'])) {
-    $fields_mys_wizard = [
-      'csrf_token' => $var['csrf_token'],
-      '#file'      => $mys_cfg,
-      '#section'   => 'wizard'
-    ];
-    foreach($orig['wizard'] as $key => $value) {
-      $fields_mys_wizard[$key] = $value;
-    }
-    update($url, http_build_query($fields_mys_wizard));
-  }
-  */
-  // remove [remote] section from dynamix.cfg
-  if(!empty($orig['remote'])) {
-    $fields_dyn_remote = [
-      'csrf_token' => $var['csrf_token'],
-      '#file'      => $dyn_cfg,
-      '#section'   => 'remote',
-      '#cleanup'   => 'true'
-    ];
-    foreach($orig['remote'] as $key => $value) {
-      $fields_dyn_remote[$key] = '';
-    }
-    update($url, http_build_query($fields_dyn_remote));
-  }
-  // remove [wizard] section from dynamix.cfg
-  if(!empty($orig['wizard'])) {
-    $fields_dyn_wizard = [
-      'csrf_token' => $var['csrf_token'],
-      '#file'      => $dyn_cfg,
-      '#section'   => 'wizard',
-      '#cleanup'   => 'true'
-    ];
-    foreach($orig['wizard'] as $key => $value) {
-      $fields_dyn_wizard[$key] = '';
-    }
-    update($url, http_build_query($fields_dyn_wizard));
-  }
-  // remove [remote] and [wizard] section headings from dyn_cfg file
-  $oldtext = file_get_contents($dyn_cfg); 
-  $newtext = preg_replace ('/\[(remote|wizard)\]\n/', '', $oldtext);
-  if (strcmp($oldtext, $newtext) !== 0) {
-    file_put_contents($dyn_cfg, $newtext);
-  }
-}
-if (!file_exists($mys_cfg)) touch($mys_cfg);
-
-?>
diff --git a/sbin/upgrade b/sbin/upgrade
index b22c109e7..d84d52a49 100755
--- a/sbin/upgrade
+++ b/sbin/upgrade
@@ -28,13 +28,6 @@ fi
 # remove previous auto-populated docker template descriptions
 /usr/local/emhttp/plugins/dynamix.docker.manager/scripts/fixDescriptions
 
-# migrate settings from early unraid.net users
-CFG_OLD=/boot/config/plugins/Unraid.net
-CFG_NEW=/boot/config/plugins/dynamix.my.servers
-[[ -d "$CFG_OLD" ]] && [[ ! -d "$CFG_NEW" ]] && mv "$CFG_OLD" "$CFG_NEW"
-mkdir -p "$CFG_NEW"
-/usr/local/emhttp/plugins/dynamix.my.servers/scripts/cfgMigration
-
 # stating with 6.10 'USE_SSL="auto"' without a LE cert is invalid
 [[ ! -f /boot/config/ssl/certs/certificate_bundle.pem ]] && sed -i s/USE_SSL=\"auto\"/USE_SSL=\"no\"/ /boot/config/ident.cfg
 

From 8d43fc8aa55a9083dee23228d73104781390e04c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 09:24:16 +0200
Subject: [PATCH 104/266] Cache Devices: make style consistent

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

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index df44dbf80..0fad46851 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -32,7 +32,7 @@ function isSubpool($name) {
 }
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
-<link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
+<link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
 
 <script>
 function validate(poolname) {
@@ -78,9 +78,8 @@ function addPoolPopup() {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
   $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
-  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
   $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
   $(".ui-button-text").css({'padding':'0px 5px'});
 }

From 6d20bdc430bc22a5bea9809c11c2223a58b69fae Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 18:50:51 +0200
Subject: [PATCH 105/266] Make dialog window appearance more consistent

---
 .../include/CreateDocker.php                  | 21 ++++++++++---------
 .../javascript/docker.js                      | 18 ++++++++--------
 .../dynamix.vm.manager/VMMachines.page        |  5 -----
 emhttp/plugins/dynamix/Browse.page            |  8 +++----
 emhttp/plugins/dynamix/BrowseButton.page      |  4 ++--
 emhttp/plugins/dynamix/CacheDevices.page      | 20 +++++++++---------
 emhttp/plugins/dynamix/DashStats.page         |  9 --------
 emhttp/plugins/dynamix/DeviceInfo.page        | 15 +++++++------
 emhttp/plugins/dynamix/PHPsettings.page       | 13 +++++++-----
 9 files changed, 53 insertions(+), 60 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index 79f67266f..5ac8830c9 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -374,6 +374,13 @@ function getVal(el, name) {
   }
 }
 
+function dialogStyle() {
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
+}
+
 function addConfigPopup() {
   var title = "_(Add Configuration)_";
   var popup = $("#dialogAddConfig");
@@ -391,8 +398,8 @@ function addConfigPopup() {
   // Start Dialog section
   popup.dialog({
     title: title,
+    width: 900,
     resizable: false,
-    width: 800,
     modal: true,
     buttons: {
     "_(Add)_": function() {
@@ -425,10 +432,7 @@ function addConfigPopup() {
       }
     }
   });
-  $('.ui-dialog-titlebar-close').css({'display':'none'});
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
+  dialogStyle();
 }
 
 function editConfigPopup(num,disabled) {
@@ -462,8 +466,8 @@ function editConfigPopup(num,disabled) {
   popup.find(".switch-button-background").css("margin-top", "6px");
   popup.dialog({
     title: title,
+    width: 900,
     resizable: false,
-    width: 800,
     modal: true,
     buttons: {
     "_(Save)_": function() {
@@ -505,10 +509,7 @@ function editConfigPopup(num,disabled) {
       }
     }
   });
-  $('.ui-dialog-titlebar-close').css({'display':'none'});
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
+  dialogStyle();
   $('.desc_readmore').readmore({maxHeight:10});
 }
 
diff --git a/emhttp/plugins/dynamix.docker.manager/javascript/docker.js b/emhttp/plugins/dynamix.docker.manager/javascript/docker.js
index 680118fd7..a1a3a0d20 100644
--- a/emhttp/plugins/dynamix.docker.manager/javascript/docker.js
+++ b/emhttp/plugins/dynamix.docker.manager/javascript/docker.js
@@ -61,15 +61,15 @@ function popupWithIframe(title, cmd, reload, func) {
   $('#iframe-popup').dialog({
     autoOpen:true,
     title:title,
+    height: 600,
+    width: 900,
     draggable:true,
-    width: Math.min(Math.max(window.innerWidth/2,900),1600),
-    height: Math.max(window.innerHeight*3/5,600),
     resizable:true,
     modal:true,
-    open:function(ev, ui) {
+    open:function(ev, ui){
       $('#myIframe').attr('src', cmd);
     },
-    close:function(event, ui) {
+    close:function(event, ui){
       if (reload && !$('#myIframe').contents().find('#canvas').length) {
         if (func) setTimeout(func+'()',0); else location = window.location.href;
       } else {
@@ -77,13 +77,13 @@ function popupWithIframe(title, cmd, reload, func) {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $('.ui-dialog .ui-dialog-titlebar-close').text('X').prop('title',_('Close'));
-  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
-  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
 }
 function execUpContainer(container) {
-  var title = _('Updating the container')+': '+container;
+  var title = _('Updating the container TEST')+': '+container;
   var cmd = '/plugins/dynamix.docker.manager/include/CreateDocker.php?updateContainer=true&ct[]='+encodeURIComponent(container);
   popupWithIframe(title, cmd, true, 'loadlist');
 }
diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index 6d846724f..2d87a3839 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -159,7 +159,6 @@ function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
   });
   box.dialog({
     title: "_(Select ISOs for CDROMs)_",
-    height: 600,
     width: 600,
     resizable: false,
     modal: true,
@@ -197,7 +196,6 @@ function getisoimage(uuid,dev,bus,file){
   });
   box.dialog({
     title: "_(Select ISO)_",
-    height: 600,
     width: 600,
     resizable: false,
     modal: true,
@@ -228,7 +226,6 @@ function VMClone(uuid, name){
   document.getElementById("Overwrite").checked = true;
   box.dialog({
     title: "_(VM Clone)_",
-    height: 330,
     width: 600,
     resizable: false,
     modal: true,
@@ -275,7 +272,6 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist,state){
   document.getElementById("targetsnapfspc").checked = true;
   box.dialog({
     title: optiontext,
-    height: 330,
     width: 600,
     resizable: false,
     modal: true,
@@ -348,7 +344,6 @@ function selectblock(uuid, name, snaps, opt, getlist, state){
   }
   box.dialog({
     title: optiontext,
-    height: 330,
     width: 600,
     resizable: false,
     modal: true,
diff --git a/emhttp/plugins/dynamix/Browse.page b/emhttp/plugins/dynamix/Browse.page
index 93fdae25d..c2b6fdb5e 100644
--- a/emhttp/plugins/dynamix/Browse.page
+++ b/emhttp/plugins/dynamix/Browse.page
@@ -449,9 +449,9 @@ function doAction(action,title,id) {
     dialogClass: 'ui-dfm',
     autoOpen: true,
     title: title,
-    resizable: false,
-    width: 900,
     height: dfm.height,
+    width: 900,
+    resizable: false,
     modal: true,
     buttons: {
       "_(Start)_": function(){
@@ -728,9 +728,9 @@ function doActions(action,title) {
     dialogClass: 'ui-dfm',
     autoOpen: true,
     title: title,
-    resizable: false,
-    width: 900,
     height: dfm.height,
+    width: 900,
+    resizable: false,
     modal: true,
     buttons: {
       "_(Start)_": function(){
diff --git a/emhttp/plugins/dynamix/BrowseButton.page b/emhttp/plugins/dynamix/BrowseButton.page
index fa87cbe68..d193921b6 100644
--- a/emhttp/plugins/dynamix/BrowseButton.page
+++ b/emhttp/plugins/dynamix/BrowseButton.page
@@ -248,9 +248,9 @@ function dfm_makeDialog(open) {
     dialogClass: 'ui-dfm',
     autoOpen: open||dfm.dialog,
     title: dfm_read.title,
-    resizable: false,
-    width: 900,
     height: dfm.height,
+    width: 900,
+    resizable: false,
     modal: true,
     buttons: {
       "_(Start)_": function(){
diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 0fad46851..67978da2d 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -56,6 +56,12 @@ function validate(poolname) {
   }
   return true;
 }
+function dialogStyle() {
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
+}
 function addPoolPopup() {
   var popup = $('#dialogAddPool');
   // Load popup with the template info
@@ -63,8 +69,8 @@ function addPoolPopup() {
   // Start Dialog section
   popup.dialog({
     title: "_(Add Pool)_",
-    resizable: false,
     width: 600,
+    resizable: false,
     modal: true,
     buttons: {
     "_(Add)_": function() {
@@ -78,10 +84,7 @@ function addPoolPopup() {
       }
     }
   });
-  $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
-  $(".ui-button-text").css({'padding':'0px 5px'});
+  dialogStyle();
 }
 function removeOption(inputString,value) {
   // Define a regular expression to match <option>...</option> substrings
@@ -112,8 +115,8 @@ function addSubpoolPopup(poolname,currentsubpools) {
   // Start Dialog section
   popup.dialog({
     title: "_(Add ZFS Subpool)_",
-    resizable: false,
     width: 600,
+    resizable: false,
     modal: true,
     buttons: {
     "_(Add)_": function() {
@@ -127,10 +130,7 @@ function addSubpoolPopup(poolname,currentsubpools) {
       }
     }
   });
-  $('.ui-dialog-titlebar-close').css({'display':'none'});
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
+  dialogStyle();
 }
 
 <?if (_var($var,'fsState')=="Started"):?>
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 99d299954..4eb411ee9 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -1278,18 +1278,11 @@ function dismiss(button) {
   inactive.push(tbody.attr('sort'));
   $.cookie('inactive_content',inactive.join(';'),{expires:3650});
 }
-function dialogStyle() {
-  $('.ui-dialog-titlebar-close').css({'display':'none'});
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
-}
 function contentMgmt() {
   box = $("#iframe-popup");
   box.html($("#templateContentMgmt").html().build());
   box.dialog({
     title: "_(Tile Management)_",
-    height: 330,
     width: 900,
     resizable: false,
     modal: true,
@@ -1329,7 +1322,6 @@ function VMClone(uuid, name){
   document.getElementById("Overwrite").checked = true;
   box.dialog({
     title: "_(VM Clone)_",
-    height: 330,
     width: 600,
     resizable: false,
     modal: true,
@@ -1371,7 +1363,6 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist){
   document.getElementById("targetsnapfspc").checked = true;
   box.dialog({
     title: optiontext,
-    height: 330,
     width: 600,
     resizable: false,
     modal: true,
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index f3f90437c..179e1fad1 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -105,7 +105,7 @@ $next = $i<$end ? $sheets[$i+1] : $sheets[0];
 $text = isPool($name) ? _('This will ERASE content of ALL devices in the pool') : _('This will ERASE ALL device content');
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
-<link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
+<link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
 
 <script>
 if ($.cookie('deletepool')) {
@@ -471,6 +471,12 @@ function validate(poolname) {
   }
   return true;
 }
+function dialogStyle() {
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
+}
 function renamePoolPopup() {
   var popup = $('#dialogRenamePool');
   // Load popup with the template info
@@ -478,8 +484,8 @@ function renamePoolPopup() {
   // Start Dialog section
   popup.dialog({
     title: "_(Rename Pool)_",
-    resizable: false,
     width: 600,
+    resizable: false,
     modal: true,
     buttons: {
     "_(Rename)_": function() {
@@ -493,10 +499,7 @@ function renamePoolPopup() {
       }
     }
   });
-  $('.ui-dialog-titlebar-close').css({'display':'none'});
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
+  dialogStyle();
 }
 function deletePool() {
   $.cookie('deletepool','deletepool');
diff --git a/emhttp/plugins/dynamix/PHPsettings.page b/emhttp/plugins/dynamix/PHPsettings.page
index 35a91330a..8ae9664fc 100644
--- a/emhttp/plugins/dynamix/PHPsettings.page
+++ b/emhttp/plugins/dynamix/PHPsettings.page
@@ -122,14 +122,20 @@ function logSize() {
     setTimeout(logSize,3000);
   });
 }
+function dialogStyle() {
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
+}
 function PHPinfo() {
   box = $("#dialogWindow");
   box.html($("#templateWindow").html().build());
   box.dialog({
     title: "_(PHP Information)_",
-    resizable: false,
     height: Math.min(window.innerHeight-80,800),
     width: Math.min(window.innerWidth,1200),
+    resizable: false,
     modal: true,
     buttons: {
       "_(Done)_": function(){
@@ -137,10 +143,7 @@ function PHPinfo() {
       }
     }
   });
-  $('.ui-dialog-titlebar-close').css({'display':'none'});
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
+  dialogStyle();
 }
 function preset(form) {
   // reset to default settings

From de504d626f3c8646bf0b928c978c86d6b8b163bb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 18:54:41 +0200
Subject: [PATCH 106/266] Make dialog window appearance more consistent

---
 emhttp/plugins/dynamix/DashStats.page | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 4eb411ee9..7a7ccaa6b 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -1278,6 +1278,12 @@ function dismiss(button) {
   inactive.push(tbody.attr('sort'));
   $.cookie('inactive_content',inactive.join(';'),{expires:3650});
 }
+function dialogStyle() {
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
+}
 function contentMgmt() {
   box = $("#iframe-popup");
   box.html($("#templateContentMgmt").html().build());

From 341df0375f06088d3f1b65bf6c9396867b8bb4b1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 19:19:10 +0200
Subject: [PATCH 107/266] Cache devices: fix GUI when initially no pools are
 defined

---
 emhttp/plugins/dynamix/CacheDevices.page | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 67978da2d..7317521d4 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -1,7 +1,7 @@
 Menu="Main:2"
 Title="Pool Devices"
 Tag="bullseye"
-Cond="($pool_devices || $var['fsState']=='Stopped')"
+Cond="$var['fsState']=='Stopped'"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology
@@ -175,6 +175,7 @@ _(Slots)_:
 
 <div id="dialogAddSubpool" style="display:none"></div>
 <div id="templatePopupSubpool" style="display:none">
+
 <form markdown="1" method="POST" action="/update.htm" target="progressFrame">
 <input type="hidden" name="changeSlots" value="apply">
 <input type="hidden" name="poolName" value="">

From cb27feffd63fc607785aef9db1901eb71e4cb0bc Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 19:23:01 +0200
Subject: [PATCH 108/266] VM machines: fix ISOs dialog

---
 emhttp/plugins/dynamix.vm.manager/VMMachines.page | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index 2d87a3839..178eb984b 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -486,6 +486,7 @@ $(function() {
 <div markdown="1" id="templateISO" class="template">
 _(ISO Image)_:
 : <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
+
 </div>
 
 <div markdown="1" id="templateISOboth" class="template">
@@ -494,6 +495,7 @@ _(CD1 ISO Image)_:
 
 _(CD2 ISO Image)_:
 : <input type="text" id="target2" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
+
 </div>
 
 <div id="templatesnapshotcreate" class="template">

From 698071fa003056db0c4625363986b9fd4e208b22 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 19:32:09 +0200
Subject: [PATCH 109/266] Revert "Cache devices: fix GUI when initially no
 pools are defined"

This reverts commit 341df0375f06088d3f1b65bf6c9396867b8bb4b1.
---
 emhttp/plugins/dynamix/CacheDevices.page | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 7317521d4..67978da2d 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -1,7 +1,7 @@
 Menu="Main:2"
 Title="Pool Devices"
 Tag="bullseye"
-Cond="$var['fsState']=='Stopped'"
+Cond="($pool_devices || $var['fsState']=='Stopped')"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology
@@ -175,7 +175,6 @@ _(Slots)_:
 
 <div id="dialogAddSubpool" style="display:none"></div>
 <div id="templatePopupSubpool" style="display:none">
-
 <form markdown="1" method="POST" action="/update.htm" target="progressFrame">
 <input type="hidden" name="changeSlots" value="apply">
 <input type="hidden" name="poolName" value="">

From 9e618169831905d65c98630f87b42cb15a0523d3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 21:00:43 +0200
Subject: [PATCH 110/266] Cached devices: fix templates

---
 emhttp/plugins/dynamix/CacheDevices.page      | 27 ++++++++++---------
 .../plugins/dynamix/sheets/CacheDevices.css   |  1 +
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 67978da2d..e7a3971df 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -63,7 +63,7 @@ function dialogStyle() {
   $('.ui-button-text').css({'padding':'0px 5px'});
 }
 function addPoolPopup() {
-  var popup = $('#dialogAddPool');
+  var popup = $('#dialogWindow');
   // Load popup with the template info
   popup.html($("#templatePopupPool").html());
   // Start Dialog section
@@ -100,7 +100,7 @@ function removeOption(inputString,value) {
   return result;
 }
 function addSubpoolPopup(poolname,currentsubpools) {
-  var popup = $('#dialogAddSubpool');
+  var popup = $('#dialogWindow');
   // Load popup with the template info
   popup.html($("#templatePopupSubpool").html());
   // Remove the options specifed by currentsubpools
@@ -153,11 +153,20 @@ $('#tab2').bind({click:function() {$('i.toggle').show('slow');}});
 </table>
 <?endif;?>
 <?endforeach;?>
+
+:cache_devices_help:
+
+<?if (_var($var,'fsState')=="Stopped"):?>
+<div></div>
+:cache_slots_help:
+<?endif;?>
+
+<div id="dialogWindow" class="template"></div>
+
 <?if (_var($var,'fsState')=="Stopped"):?>
 <input type="button" value="_(Add Pool)_" style="margin:0" onclick="addPoolPopup()">
 
-<div id="dialogAddPool" style="display:none"></div>
-<div id="templatePopupPool" style="display:none">
+<div id="templatePopupPool" class="template">
 <form markdown="1" method="POST" action="/update.htm" target="progressFrame" onsubmit="return validate(this.poolName.value)">
 <input type="hidden" name="changeSlots" value="apply">
 _(Name)_:
@@ -173,8 +182,7 @@ _(Slots)_:
 </form>
 </div>
 
-<div id="dialogAddSubpool" style="display:none"></div>
-<div id="templatePopupSubpool" style="display:none">
+<div id="templatePopupSubpool" class="template">
 <form markdown="1" method="POST" action="/update.htm" target="progressFrame">
 <input type="hidden" name="changeSlots" value="apply">
 <input type="hidden" name="poolName" value="">
@@ -197,10 +205,3 @@ _(Slots)_:
 </form>
 </div>
 <?endif;?>
-
-:cache_devices_help:
-
-<?if (_var($var,'fsState')=="Stopped"):?>
-<div></div>
-:cache_slots_help:
-<?endif;?>
diff --git a/emhttp/plugins/dynamix/sheets/CacheDevices.css b/emhttp/plugins/dynamix/sheets/CacheDevices.css
index 018084e3c..f8b6b084d 100644
--- a/emhttp/plugins/dynamix/sheets/CacheDevices.css
+++ b/emhttp/plugins/dynamix/sheets/CacheDevices.css
@@ -1 +1,2 @@
 table.divider{margin-top:20px}
+div.template{display:none}

From 0b5a3990ad5dce56f81372e9fbc50410f97a15a6 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 21:01:02 +0200
Subject: [PATCH 111/266] SysDrivers: fix PHP8 errors

---
 .../dynamix/include/SysDriversHelpers.php     | 295 ++++++++----------
 1 file changed, 138 insertions(+), 157 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/SysDriversHelpers.php b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
index 382e5791f..31a4c0d3c 100644
--- a/emhttp/plugins/dynamix/include/SysDriversHelpers.php
+++ b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
@@ -12,171 +12,152 @@
 
 
 function getplugin($in) {
-    $plugins = "/var/log/plugins/";
-    $plugin_link = $plugins.$in ;
-    $plugin_file = @readlink($plugin_link);
-    $support = plugin('support',$plugin_file) ?: "";
-    return($support) ;
+  $plugins = "/var/log/plugins/";
+  $plugin_link = $plugins.$in;
+  $plugin_file = @readlink($plugin_link);
+  $support = plugin('support',$plugin_file) ?: "";
+  return($support);
 }
 
-function getmodules($line) {
-    global $arrModules,$lsmod,$kernel,$arrModtoPlg,$modplugins ;
-    $modprobe = "" ;
-    $desc = $file = $pluginfile = $option = $filename = $depends = $support = $supporturl = $dir = $state =  null ;
-    $name = $line ;
-    $modname = shell_exec("modinfo  $name > /dev/null") ;
-    if ($modname != null) $modname = trim($modname,"\n") ;
-    $output=null ;
-    exec("modinfo $name",$output,$error) ;
-    $parms = array() ;
-    foreach($output as $outline) {
-    $data = explode(":",$outline) ;
-    $support = false ; $supporturl = null ;
-    switch ($data[0])
-    {
-        case "name":
-            $modname = trim($data[1]) ;
-            break ;
-        case "depends":
-            $depends = trim($data[1]) ;
-            break ;
-        case "filename":
-            $filename = trim($data[1]) ;
-            break ;
-        case "description":
-            $desc = trim($data[1]) ;
-            break ;            
-        case "parm":
-            $parms[] = trim(str_replace("parm:","",$outline)) ;
-            break ;
-        case "file":
-            $file = trim(str_replace("file:","",$outline)) ;
-            break ;
-        case "version":
-            $version = trim(str_replace("version:","",$data[1])) ;
-            break ;
-        case "alias":
-        case "author":
-        case "firmware":
-        case "intree":
-        case "vermagic":
-        case "retpoline":
-        case "import_ns":
-        case "license":
-            break ;
-        default:
-            $parms[] = trim($outline) ;
-            break ;
+function getmodules($name) {
+  global $arrModules,$lsmod,$kernel,$arrModtoPlg,$modplugins;
+  // preset variables
+  $modname = $depends = $filename = $desc = $file = $version = $state = $modprobe = $dir = $support = $supporturl = $pluginfile = "";
+  $parms   = [];
+  exec("modinfo $name",$output,$error);
+  foreach($output as $outline) {
+    [$key,$data] = explode(':',$outline,2);
+    $data = trim($data);
+    switch ($key) {
+    case "name":
+      $modname = $data;
+      break;
+    case "depends":
+      $depends = $data;
+      break;
+    case "filename":
+      $filename = $data;
+      break;
+    case "description":
+      $desc = $data;
+      break;
+    case "parm":
+      $parms[] = $data;
+      break;
+    case "file":
+      $file = $data;
+      break;
+    case "version":
+      $version = $data;
+      break;
+    case "alias":
+    case "author":
+    case "firmware":
+    case "intree":
+    case "vermagic":
+    case "retpoline":
+    case "import_ns":
+    case "license":
+      // ignore
+      break;
+    default:
+      $parms[] = trim($outline);
+      break;
     }
-}
-if ($modname != null) {
-    if (strpos($lsmod, $modname,0)) $state = "Inuse" ; else $state = "Available";
-    if (isset($arrModtoPlg[$modname])) { $support = true ; $supporturl = plugin("support", $modplugins[$arrModtoPlg[$modname]]) ; $pluginfile = "Plugin name: {$arrModtoPlg[$modname]}" ; } else { $support = false ; $supporturl = null ; }
+  }
+  if ($modname) {
+    $state = strpos($lsmod,$modname)!==false ? "Inuse" : "Available";
+    if (isset($arrModtoPlg[$modname])) {
+      $support = true;
+      $supporturl = plugin("support", $modplugins[$arrModtoPlg[$modname]]);
+      $pluginfile = "Plugin name: {$arrModtoPlg[$modname]}" ;
     }
-if (is_file("/boot/config/modprobe.d/$modname.conf")) {
-    $modprobe = file_get_contents("/boot/config/modprobe.d/$modname.conf") ;
-    $state = strpos($modprobe, "blacklist");
-    $modprobe = explode(PHP_EOL,$modprobe) ;
-    if($state !== false) {$state = "Disabled" ;} 
-    else $state="Custom" ;
-    } else {
-        if (is_file("/etc/modprobe.d/$modname.conf")) {
-            $modprobe = file_get_contents("/etc/modprobe.d/$modname.conf") ;
-            $state = strpos($modprobe, "blacklist");
-            $modprobe = explode(PHP_EOL,$modprobe) ;
-            if($state !== false) {$state = "Disabled" ;} else $state="System" ;
-            $module['state'] = $state ;
-            $module['modprobe'] = $modprobe ;
-            }
-        }
-
-if ($filename != "(builtin)") {
-if ($filename != null) {
-$type = pathinfo($filename) ;
-$dir =  $type['dirname'] ;
-
-$dir = str_replace("/lib/modules/$kernel/kernel/drivers/", "" ,$dir) ;
-$dir = str_replace("/lib/modules/$kernel/kernel/", "" ,$dir) ;
-}
-} else {
-    $dir = $file ;
-    $dir = str_replace("drivers/", "" ,$dir) ;
-    if ($state == "Inuse")  $state= "Kernel - Inuse"; else $state="Kernel" ;
-}
-if ($desc != null) $description = substr($desc , 0 ,60) ; else  $description = null ;
-$arrModules[$modname] = [
-            'modname' => $modname,
-            'dependacy' => $depends,
-            'version' => $version, 
-            'parms' => $parms,
-            'file' =>  $file,
-            'modprobe' => $modprobe,
-            'plugin' => $pluginfile ,
-            'state' => $state,
-            'type' => $dir,
-            'support' => $support,
-            'supporturl' => $supporturl,
-            'description' => $description  ,
-] ;
+  }
+  if (is_file("/boot/config/modprobe.d/$modname.conf")) {
+    $modprobe = file_get_contents("/boot/config/modprobe.d/$modname.conf");
+    $modprobe = explode(PHP_EOL,$modprobe);
+    $state = strpos($modprobe,"blacklist")!==false ? "Disabled" : "Custom";
+  } else {
+    if (is_file("/etc/modprobe.d/$modname.conf")) {
+      $modprobe = file_get_contents("/etc/modprobe.d/$modname.conf");
+      $modprobe = explode(PHP_EOL,$modprobe);
+      $state = strpos($modprobe, "blacklist")!==false ? "Disabled" : "System";
+      $module['state'] = $state;
+      $module['modprobe'] = $modprobe;
+    }
+  }
+  if ($filename != "(builtin)") {
+    if ($filename) {
+      $type = pathinfo($filename);
+      $dir = str_replace("/lib/modules/$kernel/kernel/drivers/", "", $type['dirname']);
+      $dir = str_replace("/lib/modules/$kernel/kernel/", "", $dir);
+    }
+  } else {
+    $dir = str_replace("drivers/", "", $file);
+    $state = ($state=="Inuse") ? "Kernel - Inuse" : "Kernel";
+  }
+  $description = $desc ? substr($desc,0,60) : "";
+  $arrModules[$modname] = [
+    'modname'     => $modname,
+    'dependacy'   => $depends,
+    'version'     => $version,
+    'parms'       => $parms,
+    'file'        => $file,
+    'modprobe'    => $modprobe,
+    'plugin'      => $pluginfile,
+    'state'       => $state,
+    'type'        => $dir,
+    'support'     => $support,
+    'supporturl'  => $supporturl,
+    'description' => $description
+  ];
 }
 
 function modtoplg() {
-    global $modtoplgfile,$kernel ;
-
-    $files = array(); 
-    $kernelsplit = explode('-',$kernel) ;
-    $kernelvers = trim($kernelsplit[0],"\n") ;
-
-    $list = array() ;
-    $files = glob('/boot/config/plugins/*/packages/' . $kernelvers . '/*.{txz,tgz}', GLOB_BRACE);
-    foreach ($files as $f) {
-            $plugin = str_replace("/boot/config/plugins/", "", $f) ;
-            $plugin = substr($plugin,0,strpos($plugin,'/') ) ;
-            $tar = [] ;
-            exec("tar -tf $f | grep -E '.ko.xz|.ko' ",$tar) ;
-            foreach ($tar as $t) {
-                $p = pathinfo($t) ;
-                $filename = str_replace(".ko","",$p["filename"]) ;
-                $list[$filename] = $plugin ;
-            }
-        }
-
-    file_put_contents($modtoplgfile,json_encode($list,JSON_PRETTY_PRINT)) ;
-   
+  global $modtoplgfile,$kernel;
+  $files = $list = [];
+  $kernelsplit = explode('-',$kernel);
+  $kernelvers = trim($kernelsplit[0],"\n");
+  $files = glob('/boot/config/plugins/*/packages/'.$kernelvers.'/*.{txz,tgz}', GLOB_BRACE);
+  foreach ($files as $f) {
+    $plugin = str_replace("/boot/config/plugins/", "", $f);
+    $plugin = substr($plugin,0,strpos($plugin,'/') );
+    $tar = [];
+    exec("tar -tf $f | grep -E '.ko.xz|.ko' ",$tar);
+    foreach ($tar as $t) {
+      $p = pathinfo($t);
+      $filename = str_replace(".ko","",$p["filename"]);
+      $list[$filename] = $plugin;
+    }
+  }
+  file_put_contents($modtoplgfile,json_encode($list,JSON_PRETTY_PRINT));
 }
 
 function createlist() {
-    global $modtoplgfile, $sysdrvfile, $lsmod, $kernel,$arrModules, $modplugins,$arrModtoPlg ;
-    $arrModtoPlg = json_decode(file_get_contents($modtoplgfile) ,TRUE) ;
-    $builtinmodules = file_get_contents("/lib/modules/$kernel/modules.builtin") ;
-    $builtinmodules = explode(PHP_EOL,$builtinmodules) ;
-    $procmodules =file_get_contents("/lib/modules/$kernel/modules.order") ;
-    $procmodules = explode(PHP_EOL,$procmodules) ; 
-    $arrModules = array() ;
-
-    $list = scandir('/var/log/plugins/') ;
-    foreach($list as $f) $modplugins[plugin("name" , @readlink("/var/log/plugins/$f"))] = @readlink("/var/log/plugins/$f") ;
-  
-    foreach($builtinmodules as $bultin)
-    {
-      if ($bultin == "") continue ;
-      getmodules(pathinfo($bultin)["filename"]) ;
-    }
-  
-    foreach($procmodules as $line) {
-      if ($line == "") continue ;
-      getmodules(pathinfo($line)["filename"]) ;
-    } 
-
-    $lsmod2 = explode(PHP_EOL,$lsmod) ; 
-    foreach($lsmod2 as $line) {
-            if ($line == "") continue ;
-            $line2 = explode(" ",$line) ;
-         getmodules($line2['0']) ;
-      } 
-
-    unset($arrModules['null']);  
-    file_put_contents($sysdrvfile,json_encode($arrModules,JSON_PRETTY_PRINT)) ;   
+  global $modtoplgfile, $sysdrvfile, $lsmod, $kernel,$arrModules, $modplugins,$arrModtoPlg;
+  $arrModtoPlg = json_decode(file_get_contents($modtoplgfile) ,TRUE);
+  $builtinmodules = file_get_contents("/lib/modules/$kernel/modules.builtin");
+  $builtinmodules = explode(PHP_EOL,$builtinmodules);
+  $procmodules =file_get_contents("/lib/modules/$kernel/modules.order");
+  $procmodules = explode(PHP_EOL,$procmodules);
+  $arrModules = [];
+  $list = scandir('/var/log/plugins/');
+  foreach($list as $f) $modplugins[plugin("name" , @readlink("/var/log/plugins/$f"))] = @readlink("/var/log/plugins/$f");
+  foreach($builtinmodules as $bultin) {
+    if (!$bultin) continue;
+    getmodules(pathinfo($bultin)["filename"]);
+  }
+  foreach($procmodules as $line) {
+    if (!$line) continue;
+    getmodules(pathinfo($line)["filename"]);
+  }
+  $lsmod2 = explode(PHP_EOL,$lsmod);
+  foreach($lsmod2 as $line) {
+    if (!$line) continue;
+    $line2 = explode(" ",$line);
+    getmodules($line2['0']);
+  }
+  unset($arrModules['null']);
+  file_put_contents($sysdrvfile,json_encode($arrModules,JSON_PRETTY_PRINT));
 }
-
-?>
\ No newline at end of file
+?>

From e3addef78d56f656c32bd6dcf02b4df789bc9066 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 21:01:23 +0200
Subject: [PATCH 112/266] ups_status: fix PHP8 error

---
 emhttp/plugins/dynamix/nchan/ups_status | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/ups_status b/emhttp/plugins/dynamix/nchan/ups_status
index 8738ba78c..fc080effc 100755
--- a/emhttp/plugins/dynamix/nchan/ups_status
+++ b/emhttp/plugins/dynamix/nchan/ups_status
@@ -118,7 +118,7 @@ while (true) {
         break;
       }
     }
-    if ($power && isset($load)) $status[5] = ($load<90 ? "<span $green>" : "<span $red>").round($power*$load/100)." W (".$status[5].")</span>";
+    if (isset($power) && isset($load)) $status[5] = ($load<90 ? "<span $green>" : "<span $red>").round($power*$load/100)." W (".$status[5].")</span>";
     elseif (isset($load)) $status[5] = ($load<90 ? "<span>" : "<span $red>").$status[5]."</span>";
     $status[6] = isset($output) ? ((!$volt || ($minv<$output && $output<$maxv) ? "<span $green>" : "<span $red>").$status[6].(isset($freq) ? " ~ $freq Hz" : "")."</span>") : $status[6];
   }

From 2adac042ae3dda661bc418b7fb1aae317f90502e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 21:07:03 +0200
Subject: [PATCH 113/266] SysDrivers: fix PHP8 errors

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

diff --git a/emhttp/plugins/dynamix/include/SysDriversHelpers.php b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
index 31a4c0d3c..579bfec28 100644
--- a/emhttp/plugins/dynamix/include/SysDriversHelpers.php
+++ b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
@@ -16,7 +16,7 @@ function getplugin($in) {
   $plugin_link = $plugins.$in;
   $plugin_file = @readlink($plugin_link);
   $support = plugin('support',$plugin_file) ?: "";
-  return($support);
+  return $support;
 }
 
 function getmodules($name) {

From 6734542fac8e6d0c4edbcc770c18fe74565588d3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 22:48:39 +0200
Subject: [PATCH 114/266] VM manager: display and dialog fixes

---
 .../dynamix.vm.manager/VMMachines.page        | 52 +++++-----
 .../dynamix.vm.manager/include/VMMachines.php | 97 ++++++++++---------
 .../dynamix.vm.manager/sheets/VMMachines.css  |  3 +-
 3 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index 178eb984b..cfa68e74d 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -143,35 +143,30 @@ function dialogStyle() {
   $('.ui-button-text').css({'padding':'0px 5px'});
 }
 function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
-  var root = "<?=$domain_cfg["MEDIADIR"]?>";
-  var match = ".iso";
   var box = $("#dialogWindow");
   box.html($("#templateISOboth").html());
-  box.find('#target').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).attr('value',file).fileTreeAttach(null,null,function(path){
+  box.find('#target').attr('value',file).fileTreeAttach(null,null,function(path){
     var bits = path.substr(1).split('/');
     var auto = bits.length>3 ? '' : share;
     box.find('#target').val(path+auto).change();
   });
-  box.find('#target2').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).attr('value',file2).fileTreeAttach(null,null,function(path){
+  box.find('#target2').attr('value',file2).fileTreeAttach(null,null,function(path){
     var bits = path.substr(1).split('/');
     var auto = bits.length>3 ? '' : share;
     box.find('#target2').val(path+auto).change();
   });
   box.dialog({
     title: "_(Select ISOs for CDROMs)_",
-    width: 600,
+    height: 630,
+    width: 900,
     resizable: false,
     modal: true,
     buttons: {
       "_(Update)_": function(){
         var target = box.find('#target');
-        if (target.length) {
-          target = target.val();
-        } else target = '';
+        if (target.length) target = target.val(); else target = '';
         var target2 = box.find('#target2');
-        if (target2.length) {
-          target2 = target2.val();
-        } else target2 = '';
+        if (target2.length) target2 = target2.val(); else target2 = '';
         box.find('#target').prop('disabled',true);
         box.find('#target2').prop('disabled',true);
         ajaxVMDispatch({action:"change-media-both", uuid:uuid, cdrom:"", dev:dev, bus:bus, file:target, dev2:dev2, bus2:bus2, file2:target2}, "loadlist");
@@ -185,27 +180,23 @@ function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
   dialogStyle();
 }
 function getisoimage(uuid,dev,bus,file){
-  var root = "<?=$domain_cfg["MEDIADIR"]?>";
-  var match = ".iso";
   var box = $("#dialogWindow");
   box.html($("#templateISO").html());
-  box.find('#target').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).fileTreeAttach(null,null,function(path){
+  box.find('#target').attr('value',file).fileTreeAttach(null,null,function(path){
     var bits = path.substr(1).split('/');
     var auto = bits.length>3 ? '' : share;
     box.find('#target').val(path+auto).change();
   });
   box.dialog({
     title: "_(Select ISO)_",
-    width: 600,
+    height: 630,
+    width: 900,
     resizable: false,
     modal: true,
     buttons: {
       "_(Insert)_": function(){
         var target = box.find('#target');
-        if (target.length) {
-          target = target.val();
-          if (!target ) {errorTarget(); return;}
-        } else target = '';
+        if (target.length) target = target.val(); else target = '';
         box.find('#target').prop('disabled',true);
         ajaxVMDispatch({action:"change-media", uuid:uuid, cdrom:"", dev:dev, bus:bus, file:target}, "loadlist");
         box.dialog('close');
@@ -483,19 +474,20 @@ $(function() {
 
 <div id="dialogWindow"></div>
 
-<div markdown="1" id="templateISO" class="template">
-_(ISO Image)_:
-: <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
-
+<div id="templateISO" class="template">
+<dl>
+<dt>_(ISO Image)_:</dt>
+<dd><input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="iso" data-pickmatch=""></dd>
+</dl>
 </div>
 
-<div markdown="1" id="templateISOboth" class="template">
-_(CD1 ISO Image)_:
-: <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
-
-_(CD2 ISO Image)_:
-: <input type="text" id="target2" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
-
+<div id="templateISOboth" class="template">
+<dl>
+<dt>_(CD1 ISO Image)_:</dt>
+<dd><input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="iso" data-pickmatch=""></dd>
+<dt>_(CD2 ISO Image)_:</dt>
+<dd><input type="text" id="target2" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="iso" data-pickmatch=""></dd>
+</dl>
 </div>
 
 <div id="templatesnapshotcreate" class="template">
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
index 6ff87184c..0fd847a86 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
@@ -88,7 +88,7 @@ foreach ($vms as $vm) {
     if ($autoport == "yes") $auto = "auto"; else $auto="manual";
     $graphics = strtoupper($vmrcprotocol).':'._($auto)."\n";
     $virtual = true ;
-  } 
+  }
   if (!empty($arrConfig['gpu'])) {
     $arrValidGPUDevices = getValidGPUDevices();
     foreach ($arrConfig['gpu'] as $arrGPU) {
@@ -130,10 +130,9 @@ foreach ($vms as $vm) {
   }
 
   /* VM information */
-  
-  if ($snapshots != null)  $snapshotstr = _("(Snapshots :").count($snapshots).')' ; else $snapshotstr = _("(Snapshots :None)") ;
-  $cdbus = $cdbus2 = $cdfile = $cdfile2 = "" ;
-  $cdromcount = 0 ;
+  if ($snapshots != null)  $snapshotstr = _("(Snapshots :").count($snapshots).')'; else $snapshotstr = _("(Snapshots :None)");
+  $cdbus = $cdbus2 = $cdfile = $cdfile2 = "";
+  $cdromcount = 0;
     foreach ($cdroms as $arrCD) {
     $disk = $arrCD['file'] ?? $arrCD['partition'];
     $dev = $arrCD['device'];
@@ -141,12 +140,12 @@ foreach ($vms as $vm) {
     if ($dev == "hda") {
       $cdbus = $arrValidDiskBuses[$arrCD['bus']] ?? 'VirtIO';
       $cdfile = $arrCD['file'] ?? $arrCD['partition'];
-      if ($cdfile != "") $cdromcount++ ;
+      if ($cdfile != "") $cdromcount++;
     }
     if ($dev == "hdb") {
       $cdbus2 = $arrValidDiskBuses[$arrCD['bus']] ?? 'VirtIO';
       $cdfile2 = $arrCD['file'] ?? $arrCD['partition'];
-      if ($cdfile2 != "") $cdromcount++ ;
+      if ($cdfile2 != "") $cdromcount++;
     }
   }
 
@@ -159,7 +158,7 @@ foreach ($vms as $vm) {
       foreach ($ip as $arrIP) {
         $ipname = $arrIP["name"];
         if (preg_match('/^(lo|Loopback)/',$ipname)) continue; // omit loopback interface
-        $iphdwadr = $arrIP["hwaddr"] == "" ?  _("N/A") : $arrIP["hwaddr"];
+        $iphdwadr = $arrIP["hwaddr"] == "" ? _("N/A") : $arrIP["hwaddr"];
         $iplist = $arrIP["addrs"];
         foreach ($iplist as $arraddr) {
           $ipaddrval = $arraddr["addr"];
@@ -174,13 +173,19 @@ foreach ($vms as $vm) {
       }
     }
   } else {
-  if ($gastate == "disconnected") { $ipliststr .= "<tr><td>"._('Guest agent not installed')."</td><td></td><td></td><td></td></tr>"; $iptablestr = _('Requires guest agent installed') ; }
-  else { $ipliststr =  "<tr><td>"._('Guest not running')."</td><td></td><td></td><td></td><td></td></tr>"; $iptablestr = _('Requires guest running') ;  }
+    if ($gastate == "disconnected") {
+      $ipliststr .= "<tr><td>"._('Guest agent not installed')."</td><td></td><td></td><td></td></tr>";
+      $iptablestr = _('Requires guest agent installed');
+    } else {
+      $ipliststr =  "<tr><td>"._('Guest not running')."</td><td></td><td></td><td></td><td></td></tr>";
+      $iptablestr = _('Requires guest running');
+    }
   }
   $iptablestr = str_replace("\n", "<br>", trim($iptablestr));
 
   $changemedia = "getisoimageboth(\"{$uuid}\",\"hda\",\"{$cdbus}\",\"{$cdfile}\",\"hdb\",\"{$cdbus2}\",\"{$cdfile2}\")";
-  $cdstr = $cdromcount." / 2<a class='hand' title='$title' href='#'  onclick='$changemedia'> <i class='fa fa-bullseye' ></i></a>";
+  $title = _('Select ISO image');
+  $cdstr = $cdromcount." / 2<a class='hand' title='$title' href='#'  onclick='$changemedia'><i class='fa fa-bullseye' ></i></a>";
   echo "<tr parent-id='$i' class='sortable'><td class='vm-name' style='width:220px;padding:8px'><i class='fa fa-arrows-v mover orange-text'></i>";
   echo "<span class='outer'><span id='vm-$uuid' $menu class='hand'>$image</span><span class='inner'><a href='#' onclick='return toggle_id(\"name-$i\")' title='click for more VM info'>$vm</a><br><i class='fa fa-$shape $status $color'></i><span class='state'>"._($status)." $snapshotstcount</span></span></span></td>";
   echo "<td>$desc</td>";
@@ -195,7 +200,7 @@ foreach ($vms as $vm) {
   echo "<tr child-id='$i' id='name-$i".(in_array('name-'.$i++,$show) ? "'>" : "' style='display:none'>");
   echo "<td colspan='8' style='margin:0;padding:0'>";
   echo "<table class='tablesorter domdisk'>";
-  echo "<thead class='child'><tr><th><i class='fa fa-hdd-o'></i> <b>"._('Disk devices')."</b></th><th>"._('Serial')."</b></th><th>"._('Bus')."</th><th>"._('Capacity')."</th><th>"._('Allocation')."</th><th>Boot Order</th</tr></thead>";
+  echo "<thead class='child'><tr><th><i class='fa fa-hdd-o'></i> <b>",_('Disk devices'),"</b></th><th>",_('Serial'),"</b></th><th>",_('Bus'),"</th><th>",_('Capacity'),"</th><th>",_('Allocation'),"</th><th>Boot Order</th</tr></thead>";
   echo "<tbody class='child'>";
 
   /* Display VM disks */
@@ -231,60 +236,56 @@ foreach ($vms as $vm) {
     $capacity = $lv->format_size($arrCD['capacity'], 0);
     $allocation = $lv->format_size($arrCD['allocation'], 0);
     $disk = $arrCD['file'] ?? $arrCD['partition'] ?? "" ;
-    $dev = $arrCD['device'];
-    $bus = $arrValidDiskBuses[$arrCD['bus']] ?? 'VirtIO';
-    $boot= $arrCD["boot order"] ?? "" ;
-    if ($boot < 1) $boot="Not set";
+    $dev  = $arrCD['device'];
+    $bus  = $arrValidDiskBuses[$arrCD['bus']] ?? 'VirtIO';
+    $boot = $arrCD["boot order"] ?? "" ;
+    if ($boot < 1) $boot = "Not set";
     if ($disk != "" ) {
-    $title = _("Eject CD Drive").".";
-    $changemedia = "changemedia(\"{$uuid}\",\"{$dev}\",\"{$bus}\", \"--eject\")";
-    echo "<tr><td>$disk <a title='$title' href='#'  onclick='$changemedia'> <i class='fa fa-eject' aria-hidden=true></i></a></td><td></td><td>$bus</td><td>$capacity</td><td>$allocation</td><td>$boot</td></tr>";
+      $title = _('Eject CD Drive');
+      $changemedia = "changemedia(\"{$uuid}\",\"{$dev}\",\"{$bus}\", \"--eject\")";
+      echo "<tr><td>$disk <a title='$title' href='#' onclick='$changemedia'> <i class='fa fa-eject'></i></a></td><td></td><td>$bus</td><td>$capacity</td><td>$allocation</td><td>$boot</td></tr>";
     } else {
-      $title = _("Insert CD").".";
+      $title = _('Insert CD');
       $changemedia = "changemedia(\"{$uuid}\",\"{$dev}\",\"{$bus}\",\"--select\")";
       $disk = _("No CD image inserted in to drive");
-      echo "<tr><td>$disk<a title='$title' href='#'  onclick='$changemedia'> <i class='fa fa-bullseye' aria-hidden=true></i></a> </td><td></td><td>$bus</td><td>$capacity</td><td>$allocation</td><td>$boot</td></tr>";
-
+      echo "<tr><td>$disk<a title='$title' href='#' onclick='$changemedia'><i class='fa fa-bullseye'></i></a></td><td></td><td>$bus</td><td>$capacity</td><td>$allocation</td><td>$boot</td></tr>";
     }
-
   }
   echo "</tbody>";
   /* Display VM  IP Addresses "execute":"guest-network-get-interfaces" --pretty */
-  echo "<thead class='child'><tr><th><i class='fa fa-sitemap'></i> <b>"._('Interfaces')."</b></th><th></th><th></th><th>"._('Type')."</th><th>"._('IP Address')."</th><th>"._('Prefix')."</th></tr></thead>";
+  echo "<thead class='child'><tr><th><i class='fa fa-sitemap'></i> <b>",_('Interfaces')."</b></th><th></th><th></th><th>",_('Type')."</th><th>",_('IP Address'),"</th><th>",_('Prefix'),"</th></tr></thead>";
   echo "<tbody class='child'>";
   echo $ipliststr ;
   echo "</tbody>";
   /* Display VM  Snapshots */
   if ($snapshots != null) {
-    $j=0 ;
-    $steps = array() ;
-    foreach($snapshots as $snap) {
+    $j = 0;
+    $steps = array();
+    foreach ($snapshots as $snap) {
       if ($snap['parent'] == "" || $snap['parent'] == "Base") $j++;
-      $steps[$j] .= $snap['name'].';' ;
-  }
-  echo "<thead class='child' child-id='$i'><tr><th><i class='fa fa-clone'></i> <b>"._('Snapshots')."</b></th><th></th><th>"._('Date/Time')."</th><th>"._('Type')."</th><th>"._('Parent')."</th><th>"._('Memory')."</th></tr></thead>";
-  echo "<tbody class='child'child-id='$i'>";
-  foreach($steps as $stepsline)
-  {
-    $snapshotlist = explode(";",$stepsline) ;
-    $tab = "&nbsp;&nbsp;&nbsp;&nbsp;" ;
-    foreach($snapshotlist as  $snapshotitem) {
-      if ($snapshotitem == "") continue ;
-      $snapshot = $snapshots[$snapshotitem]  ;
-      $snapshotstate = _(ucfirst($snapshot["state"])) ;
-      $snapshotdesc = $snapshot["desc"] ;
-      $snapshotmemory = _(ucfirst($snapshot["memory"]["@attributes"]["snapshot"])) ;
-      $snapshotparent = $snapshot["parent"] ? $snapshot["parent"]  : "None";
-      $snapshotdatetime = my_time($snapshot["creationtime"],"Y-m-d" )."<br>".my_time($snapshot["creationtime"],"H:i:s") ;
-      $snapmenu = sprintf("onclick=\"addVMSnapContext('%s','%s','%s','%s','%s','%s')\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,$snapshot["name"],$vmpreview);
-      echo "<tr><td><span id='vmsnap-$uuid' $snapmenu class='hand'>$tab|__&nbsp;&nbsp;<i class='fa fa-clone'></i></span>&nbsp;".$snapshot["name"]."</td><td>$snapshotdesc</td><td><span class='inner' style='font-size:1.1rem;'>$snapshotdatetime</span></td><td>$snapshotstate</td><td>$snapshotparent</td><td>$snapshotmemory</td></tr>";
-      $tab .="&nbsp;&nbsp;&nbsp;&nbsp;" ;
+      $steps[$j] .= $snap['name'].';';
+    }
+    echo "<thead class='child' child-id='$i'><tr><th><i class='fa fa-clone'></i> <b>",_('Snapshots'),"</b></th><th></th><th>",_('Date/Time'),"</th><th>",_('Type'),"</th><th>",_('Parent'),"</th><th>",_('Memory'),"</th></tr></thead>";
+    echo "<tbody class='child'child-id='$i'>";
+    foreach ($steps as $stepsline) {
+      $snapshotlist = explode(";",$stepsline);
+      $tab = "&nbsp;&nbsp;&nbsp;&nbsp;";
+      foreach ($snapshotlist as  $snapshotitem) {
+        if ($snapshotitem == "") continue;
+        $snapshot = $snapshots[$snapshotitem] ;
+        $snapshotstate = _(ucfirst($snapshot["state"]));
+        $snapshotdesc = $snapshot["desc"];
+        $snapshotmemory = _(ucfirst($snapshot["memory"]["@attributes"]["snapshot"]));
+        $snapshotparent = $snapshot["parent"] ? $snapshot["parent"]  : "None";
+        $snapshotdatetime = my_time($snapshot["creationtime"],"Y-m-d" )."<br>".my_time($snapshot["creationtime"],"H:i:s");
+        $snapmenu = sprintf("onclick=\"addVMSnapContext('%s','%s','%s','%s','%s','%s')\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,$snapshot["name"],$vmpreview);
+        echo "<tr><td><span id='vmsnap-$uuid' $snapmenu class='hand'>$tab|__&nbsp;&nbsp;<i class='fa fa-clone'></i></span>&nbsp;",$snapshot["name"],"</td><td>$snapshotdesc</td><td><span class='inner' style='font-size:1.1rem;'>$snapshotdatetime</span></td><td>$snapshotstate</td><td>$snapshotparent</td><td>$snapshotmemory</td></tr>";
+        $tab .="&nbsp;&nbsp;&nbsp;&nbsp;";
       }
       echo "</tbody>";
-    } 
+    }
   }
   echo "</table>";
 }
-
 echo "\0".implode($kvm);
 ?>
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
index 0abb29c13..8ddbe8c2e 100644
--- a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
@@ -15,7 +15,8 @@ table.domdisk tbody tr:nth-child(even){background-color:transparent!important}
 table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
 table.snapshot{margin-top:0}
 i.mover{margin-right:8px;display:none}
+i.fa-bullseye{padding-left:8px}
 #resetsort{margin-left:12px;display:inline-block;width:32px}
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
 .dropdown-menu{z-index:10001}
-span.vmgraphics{font-size:1.1rem;text-align: left}
+span.vmgraphics{font-size:1.1rem;text-align:left}

From 9bd92dca966c89cfa1dc424d34757d428924516d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 22:50:25 +0200
Subject: [PATCH 115/266] VM manager: display and dialog fixes

---
 emhttp/plugins/dynamix.vm.manager/VMMachines.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index cfa68e74d..f4ac2e72e 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -157,7 +157,7 @@ function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
   });
   box.dialog({
     title: "_(Select ISOs for CDROMs)_",
-    height: 630,
+    height: 530,
     width: 900,
     resizable: false,
     modal: true,
@@ -189,7 +189,7 @@ function getisoimage(uuid,dev,bus,file){
   });
   box.dialog({
     title: "_(Select ISO)_",
-    height: 630,
+    height: 530,
     width: 900,
     resizable: false,
     modal: true,

From 39faad3430bf0823d254125e5c9bcc4786b81357 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 22:53:00 +0200
Subject: [PATCH 116/266] VM manager: display and dialog fixes

---
 emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
index 8ddbe8c2e..0eec953a3 100644
--- a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
@@ -15,7 +15,7 @@ table.domdisk tbody tr:nth-child(even){background-color:transparent!important}
 table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
 table.snapshot{margin-top:0}
 i.mover{margin-right:8px;display:none}
-i.fa-bullseye{padding-left:8px}
+i.fa-bullseye{padding-left:12px}
 #resetsort{margin-left:12px;display:inline-block;width:32px}
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
 .dropdown-menu{z-index:10001}

From de4e0f1e148cf6b05da62314b332ef963f7873c1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 25 Oct 2023 22:57:19 +0200
Subject: [PATCH 117/266] VM manager: display and dialog fixes

---
 emhttp/plugins/dynamix.vm.manager/VMMachines.page | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index f4ac2e72e..acdee1332 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -477,16 +477,16 @@ $(function() {
 <div id="templateISO" class="template">
 <dl>
 <dt>_(ISO Image)_:</dt>
-<dd><input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="iso" data-pickmatch=""></dd>
+<dd><input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="iso"></dd>
 </dl>
 </div>
 
 <div id="templateISOboth" class="template">
 <dl>
 <dt>_(CD1 ISO Image)_:</dt>
-<dd><input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="iso" data-pickmatch=""></dd>
+<dd><input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="iso"></dd>
 <dt>_(CD2 ISO Image)_:</dt>
-<dd><input type="text" id="target2" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="iso" data-pickmatch=""></dd>
+<dd><input type="text" id="target2" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="iso"></dd>
 </dl>
 </div>
 

From 5df25dd3e2318c1ab9bc70bc0fa9e5eb9c0d12ac Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 00:45:39 +0200
Subject: [PATCH 118/266] Fix subpool errors

---
 emhttp/plugins/dynamix/CacheDevices.page | 10 +++++-----
 emhttp/plugins/dynamix/nchan/device_list | 15 ++++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index e7a3971df..130ca3bbc 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -16,19 +16,19 @@ Cond="($pool_devices || $var['fsState']=='Stopped')"
  */
 ?>
 <?
+// pool name ending in any of these => zfs subpool
+$subpools = ['special','logs','dedup','cache','spares'];
+
 function makeList($list) {
   return implode(',',array_map('escapestring',$list));
 }
 function sharename($share) {
   return basename($share,'.cfg');
 }
-$subpools = array( "special", "logs", "dedup", "cache", "spares");
 function isSubpool($name) {
   global $subpools;
-  // pool name ending in any of these => zfs subpool
-  $tildaPosition = strpos($name, '~');
-  $subpool = ($tildaPosition!==false) ? substr($name, $tildaPosition+1) : false;
-  return ($subpool!==false && in_array($subpool, $subpools)) ? $subpool : false;
+  $subpool = array_pad(explode('~',$name,2),2,'')[1];
+  return in_array($subpool,$subpools) ? $subpool : false;
 }
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index d290b8a56..e1066760e 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -30,19 +30,19 @@ require_once "$docroot/webGui/include/Translations.php";
 // remember current language
 $locale_init = $locale;
 
+// pool name ending in any of these => zfs subpool
+$subpools = ['special','logs','dedup','cache','spares'];
+
 function initSum() {
   return ['count'=>0, 'temp'=>0, 'fsSize'=>0, 'fsUsed'=>0, 'fsFree'=>0, 'ioReads'=>0, 'ioWrites'=>0, 'numReads'=>0, 'numWrites'=>0, 'numErrors'=>0];
 }
 function model($id) {
   return substr($id,0,strrpos($id,'_'));
 }
-$subpools = array( "special", "logs", "dedup", "cache", "spares");
 function isSubpool($name) {
-  // pool name ending in any of these => zfs subpool
   global $subpools;
-  $tildaPosition = strpos($name, '~');
-  $subpool = ($tildaPosition!==false) ? substr($name, $tildaPosition+1) : false;
-  return ($subpool!==false && in_array($subpool, $subpools)) ? $subpool : false;
+  $subpool = array_pad(explode('~',$name,2),2,'')[1];
+  return in_array($subpool,$subpools) ? $subpool : false;
 }
 function device_info(&$disk,$online) {
   global $pools, $var, $crypto;
@@ -450,11 +450,12 @@ while (true) {
     $echo[$n] = "pool_device".($n-2)."\n";
     foreach ($cache as $disk) if (prefix(_var($disk,'name'))==$pool) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType'));
     if (_var($var,'fsState')=='Stopped') {
-      $log = file_exists($pool_log) ? parse_ini_file($pool_log) : [];
+      $log = @parse_ini_file($pool_log) ?: [];
       $off = false;
       foreach ($cache as $disk) if (prefix(_var($disk,'name'))==$pool) {
         $echo[$n] .= array_offline($disk,$pool);
-        if (isset($log[_var($disk,'name')])) $off |= ($log[$disk['name']]!=_var($disk,'id')); else $log[_var($disk,'name')] = _var($disk,'id');
+        $diskname = str_replace('~','_-_',_var($disk,'name'));
+        if (isset($log[$diskname])) $off |= ($log[$diskname] != _var($disk,'id')); elseif ($diskname) $log[$diskname] = _var($disk,'id');
       }
       $data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\"";
       file_put_contents($pool_log,implode("\n",$data));

From 65b73b3c4081ff46f2c44a65418dfcffd3cd4afb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 00:46:12 +0200
Subject: [PATCH 119/266] Fix PHP8 errors

---
 .../dynamix/include/SysDriversHelpers.php     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/SysDriversHelpers.php b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
index 579bfec28..5af4783ac 100644
--- a/emhttp/plugins/dynamix/include/SysDriversHelpers.php
+++ b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
@@ -22,11 +22,12 @@ function getplugin($in) {
 function getmodules($name) {
   global $arrModules,$lsmod,$kernel,$arrModtoPlg,$modplugins;
   // preset variables
-  $modname = $depends = $filename = $desc = $file = $version = $state = $modprobe = $dir = $support = $supporturl = $pluginfile = "";
-  $parms   = [];
+  $modname = $depends = $filename = $desc = $file = $version = $state = $dir = $support = $supporturl = $pluginfile = "";
+  $modprobe = $parms = [];
   exec("modinfo $name",$output,$error);
   foreach($output as $outline) {
-    [$key,$data] = explode(':',$outline,2);
+    if (!$outline) continue;
+    [$key,$data] = array_pad(explode(':',$outline,2),2,'');
     $data = trim($data);
     switch ($key) {
     case "name":
@@ -75,16 +76,14 @@ function getmodules($name) {
   }
   if (is_file("/boot/config/modprobe.d/$modname.conf")) {
     $modprobe = file_get_contents("/boot/config/modprobe.d/$modname.conf");
-    $modprobe = explode(PHP_EOL,$modprobe);
     $state = strpos($modprobe,"blacklist")!==false ? "Disabled" : "Custom";
-  } else {
-    if (is_file("/etc/modprobe.d/$modname.conf")) {
-      $modprobe = file_get_contents("/etc/modprobe.d/$modname.conf");
-      $modprobe = explode(PHP_EOL,$modprobe);
-      $state = strpos($modprobe, "blacklist")!==false ? "Disabled" : "System";
-      $module['state'] = $state;
-      $module['modprobe'] = $modprobe;
-    }
+    $modprobe = explode(PHP_EOL,$modprobe);
+  } elseif (is_file("/etc/modprobe.d/$modname.conf")) {
+    $modprobe = file_get_contents("/etc/modprobe.d/$modname.conf");
+    $state = strpos($modprobe, "blacklist")!==false ? "Disabled" : "System";
+    $module['state'] = $state;
+    $module['modprobe'] = $modprobe;
+    $modprobe = explode(PHP_EOL,$modprobe);
   }
   if ($filename != "(builtin)") {
     if ($filename) {

From dd1fc4a04e8f19f6ab236e85bdb87558094b2681 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 00:48:49 +0200
Subject: [PATCH 120/266] Fix subpool errors

---
 emhttp/plugins/dynamix/nchan/device_list | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index e1066760e..872097434 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -454,6 +454,7 @@ while (true) {
       $off = false;
       foreach ($cache as $disk) if (prefix(_var($disk,'name'))==$pool) {
         $echo[$n] .= array_offline($disk,$pool);
+        // tilde is not allowed in array key - replace it
         $diskname = str_replace('~','_-_',_var($disk,'name'));
         if (isset($log[$diskname])) $off |= ($log[$diskname] != _var($disk,'id')); elseif ($diskname) $log[$diskname] = _var($disk,'id');
       }

From e2bfc62c026231b7c463c1cdada704f8e5546322 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 01:00:18 +0200
Subject: [PATCH 121/266] Fix subpool errors

---
 emhttp/plugins/dynamix/CacheDevices.page | 2 +-
 emhttp/plugins/dynamix/nchan/device_list | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 130ca3bbc..4f62a53cb 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -27,7 +27,7 @@ function sharename($share) {
 }
 function isSubpool($name) {
   global $subpools;
-  $subpool = array_pad(explode('~',$name,2),2,'')[1];
+  $subpool = my_explode('~',$name)[1];
   return in_array($subpool,$subpools) ? $subpool : false;
 }
 ?>
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 872097434..43c692cce 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -41,7 +41,7 @@ function model($id) {
 }
 function isSubpool($name) {
   global $subpools;
-  $subpool = array_pad(explode('~',$name,2),2,'')[1];
+  $subpool = my_explode('~',$name)[1];
   return in_array($subpool,$subpools) ? $subpool : false;
 }
 function device_info(&$disk,$online) {

From 92b2179abf1092e0d4ea52bd1233ca1c01ce7f5e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 01:13:36 +0200
Subject: [PATCH 122/266] Vars: suppress $webComponentTranslations content

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

diff --git a/emhttp/plugins/dynamix/Vars.page b/emhttp/plugins/dynamix/Vars.page
index 48d15a661..c15913b17 100644
--- a/emhttp/plugins/dynamix/Vars.page
+++ b/emhttp/plugins/dynamix/Vars.page
@@ -27,7 +27,7 @@ $(function() {
 </script>
 <?endif;?>
 <?
-$myPage['text'] = $page['text'] = $pages['Vars']['text'] = $language = $text = $notes = $site = '...';
+$myPage['text'] = $page['text'] = $pages['Vars']['text'] = $language = $text = $notes = $site = $webComponentTranslations = '...';
 $globals = $GLOBALS;
 ksort($globals);
 if (isset($globals['_SERVER']['PHP_AUTH_PW'])) $globals['_SERVER']['PHP_AUTH_PW'] = "***";

From c3826a541685e82fb2e327b20f15badfec7f5f51 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 02:06:06 +0200
Subject: [PATCH 123/266] Dashboard: update time when timezone is changed

---
 emhttp/plugins/dynamix/DateTime.page       | 14 ++++++++-----
 emhttp/plugins/dynamix/include/ResetTZ.php | 23 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 emhttp/plugins/dynamix/include/ResetTZ.php

diff --git a/emhttp/plugins/dynamix/DateTime.page b/emhttp/plugins/dynamix/DateTime.page
index f141e48c9..b3da8bdf5 100644
--- a/emhttp/plugins/dynamix/DateTime.page
+++ b/emhttp/plugins/dynamix/DateTime.page
@@ -4,8 +4,8 @@ Icon="icon-clock"
 Tag="clock-o"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -17,12 +17,12 @@ Tag="clock-o"
 ?>
 <?$keys = explode("\n", file_get_contents('webGui/include/timezones.key'));?>
 
-<form markdown="1" name="datetime_settings" method="POST" action="/update.htm" target="progressFrame">
+<form markdown="1" name="datetime_settings" method="POST" action="/update.htm" target="progressFrame" onsubmit="resetTZ(this.timeZone.value)">
 _(Current date and time)_:
 : <?=_(my_time(time()),0)?>
 
 _(Time zone)_:
-: <select name="timeZone" size="1"><?
+: <select name="timeZone"><?
   foreach ($keys as $key) {
     [$timezone, $city] = my_explode('|', $key);
     echo mk_option($var['timeZone'], $timezone, $city);
@@ -32,7 +32,7 @@ _(Time zone)_:
 :timezone_help:
 
 _(Use NTP)_:
-: <select name="USE_NTP" size="1" onchange="checkDateTimeSettings(this.form)">
+: <select name="USE_NTP" onchange="checkDateTimeSettings(this.form)">
   <?=mk_option($var['USE_NTP'], "yes", _('Yes'))?>
   <?=mk_option($var['USE_NTP'], "no", _('No'))?>
   </select>
@@ -69,6 +69,10 @@ _(New date and time)_:
 </form>
 
 <script>
+function resetTZ(new_tz) {
+  var old_tz = "<?=$var['timeZone']?>";
+  if (new_tz != old_tz) $.post('/webGui/include/ResetTZ.php');
+}
 function checkDateTimeSettings() {
   form = document.datetime_settings;
   if (form.USE_NTP.value=="yes") {
diff --git a/emhttp/plugins/dynamix/include/ResetTZ.php b/emhttp/plugins/dynamix/include/ResetTZ.php
new file mode 100644
index 000000000..d6a24ce8d
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/ResetTZ.php
@@ -0,0 +1,23 @@
+<?PHP
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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.
+ */
+?>
+<?
+$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$pid     = '/var/run/nchan.pid';
+$nchan   = 'webGui/nchan/update_3';
+
+if (is_file($pid) && exec("grep -Pom1 '^$nchan' $pid")) {
+  // restart update_3 script
+  exec("pkill -f $nchan");
+  exec("$docroot/$nchan &>/dev/null &");
+}
+?>

From c60156f6e6f3e2951b0cb34f41b09a6c3b1776eb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 02:26:56 +0200
Subject: [PATCH 124/266] Cache devices: add translation

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

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 4f62a53cb..ec4fc09d1 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -188,11 +188,11 @@ _(Slots)_:
 <input type="hidden" name="poolName" value="">
 _(Name)_:
 : <select name="subpool">
-  <?=mk_option("","special","special - Special Allocation Class")?>
-  <?=mk_option("","logs","logs - ZFS Intent Log")?>
-  <?=mk_option("","dedup","dedup - Deduplication Tables")?>
-  <?=mk_option("","cache","cache - Cache Devices")?>
-  <?=mk_option("","spares","spares - Hot Spares")?>
+  <?=mk_option("","special","_(special - Special Allocation Class)_")?>
+  <?=mk_option("","logs","_(logs - ZFS Intent Log)_")?>
+  <?=mk_option("","dedup","_(dedup - Deduplication Tables)_")?>
+  <?=mk_option("","cache","_(cache - Cache Devices)_")?>
+  <?=mk_option("","spares","_(spares - Hot Spares)_")?>
   </select>
 
 _(Slots)_:

From 2235eefe09497ee160f9b5b2894422fea5680cdb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 02:28:37 +0200
Subject: [PATCH 125/266] Cache devices: add translation

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

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index ec4fc09d1..3fc0c0204 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -188,11 +188,11 @@ _(Slots)_:
 <input type="hidden" name="poolName" value="">
 _(Name)_:
 : <select name="subpool">
-  <?=mk_option("","special","_(special - Special Allocation Class)_")?>
-  <?=mk_option("","logs","_(logs - ZFS Intent Log)_")?>
-  <?=mk_option("","dedup","_(dedup - Deduplication Tables)_")?>
-  <?=mk_option("","cache","_(cache - Cache Devices)_")?>
-  <?=mk_option("","spares","_(spares - Hot Spares)_")?>
+  <?=mk_option("","special",_("special - Special Allocation Class"))?>
+  <?=mk_option("","logs",_("logs - ZFS Intent Log"))?>
+  <?=mk_option("","dedup",_("dedup - Deduplication Tables"))?>
+  <?=mk_option("","cache",_("cache - Cache Devices"))?>
+  <?=mk_option("","spares",_("spares - Hot Spares"))?>
   </select>
 
 _(Slots)_:

From d1d0880ceb6d41777dc08769bc39b8658815517a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 02:43:31 +0200
Subject: [PATCH 126/266] SysDrivers: fix PHP8 errors

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

diff --git a/emhttp/plugins/dynamix/include/SysDriversHelpers.php b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
index 5af4783ac..5a0e241e8 100644
--- a/emhttp/plugins/dynamix/include/SysDriversHelpers.php
+++ b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
@@ -81,9 +81,9 @@ function getmodules($name) {
   } elseif (is_file("/etc/modprobe.d/$modname.conf")) {
     $modprobe = file_get_contents("/etc/modprobe.d/$modname.conf");
     $state = strpos($modprobe, "blacklist")!==false ? "Disabled" : "System";
+    $modprobe = explode(PHP_EOL,$modprobe);
     $module['state'] = $state;
     $module['modprobe'] = $modprobe;
-    $modprobe = explode(PHP_EOL,$modprobe);
   }
   if ($filename != "(builtin)") {
     if ($filename) {

From a671e237a080430c0bdab5d250757f127ffb8b0f Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 02:52:44 +0200
Subject: [PATCH 127/266] VM machines: add translation

---
 emhttp/plugins/dynamix.vm.manager/include/VMMachines.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
index 0fd847a86..1e4fea84c 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
@@ -212,7 +212,7 @@ foreach ($vms as $vm) {
     $bus = $arrValidDiskBuses[$arrDisk['bus']] ?? 'VirtIO';
     $boot= $arrDisk["boot order"];
     $serial = $arrDisk["serial"];
-    if ($boot < 1) $boot="Not set";
+    if ($boot < 1) $boot = _('Not set');
     echo "<tr><td>$disk</td><td>$serial</td><td>$bus</td>";
     if ($state == 'shutoff') {
       echo "<td title='Click to increase Disk Size'>";
@@ -239,7 +239,7 @@ foreach ($vms as $vm) {
     $dev  = $arrCD['device'];
     $bus  = $arrValidDiskBuses[$arrCD['bus']] ?? 'VirtIO';
     $boot = $arrCD["boot order"] ?? "" ;
-    if ($boot < 1) $boot = "Not set";
+    if ($boot < 1) $boot = _('Not set');
     if ($disk != "" ) {
       $title = _('Eject CD Drive');
       $changemedia = "changemedia(\"{$uuid}\",\"{$dev}\",\"{$bus}\", \"--eject\")";

From ceeb125ba96c5fbf2634b90c0b8a0756d07a975d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 14:00:15 +0200
Subject: [PATCH 128/266] Use "null coalescing assignment" operator for
 $docroot

---
 .../dynamix.apcupsd/include/UPSstatus.php     |   3 +-
 .../include/ContainerManager.php              |   8 +-
 .../include/CreateDocker.php                  |   8 +-
 .../include/DockerClient.php                  |  11 +-
 .../include/DockerContainers.php              |   9 +-
 .../include/DockerUpdate.php                  |   8 +-
 .../dynamix.docker.manager/include/Events.php |   5 +-
 .../include/UpdateConfig.php                  |  10 +-
 .../include/UserPrefs.php                     |   8 +-
 .../scripts/container_size                    |   3 +-
 .../scripts/dockerupdate                      |   7 +-
 .../scripts/rebuild_container                 |   2 +-
 .../scripts/update_container                  |   3 +-
 .../dynamix.my.servers/data/server-state.php  |   4 +-
 .../dynamix.my.servers/include/myservers2.php |   4 +-
 .../include/Downgrade.php                     |   3 +-
 .../include/ShowChanges.php                   |   3 +-
 .../include/ShowPlugins.php                   |   3 +-
 .../scripts/PluginAPI.php                     |  19 +-
 .../dynamix.plugin.manager/scripts/checkall   |   3 +-
 .../scripts/languagecheck                     |   5 +-
 .../scripts/plugincheck                       |   6 +-
 .../scripts/showchanges                       |   3 +-
 .../scripts/unraidcheck                       |   5 +-
 .../dynamix.vm.manager/VMMachines.page        |  19 +-
 .../dynamix.vm.manager/VMTemplates.page       |   5 +-
 .../include/Fedora-virtio-isos.php            |  12 +-
 .../dynamix.vm.manager/include/VMMachines.php |  14 +-
 .../dynamix.vm.manager/include/VMManager.php  |   8 +-
 .../dynamix.vm.manager/include/VMajax.php     |   8 +-
 .../dynamix.vm.manager/include/VMedit.php     |  10 +-
 .../include/libvirt_helpers.php               | 180 ++++++++---------
 .../dynamix.vm.manager/scripts/VMAjaxCall.php | 102 +++++-----
 .../dynamix.vm.manager/scripts/VMClone.php    | 127 ++++++------
 .../dynamix.vm.manager/sheets/VMMachines.css  |   2 +-
 .../templates/Custom.form.php                 | 101 +++++-----
 .../templates/LibreELEC.form.php              |  65 +++---
 .../templates/OpenELEC.form.php               |  57 +++---
 .../templates/XML_Expert.form.php             |  11 +-
 emhttp/plugins/dynamix/CacheDevices.page      |   2 +
 emhttp/plugins/dynamix/DashStats.page         |   3 +
 emhttp/plugins/dynamix/DeviceInfo.page        |   3 +-
 emhttp/plugins/dynamix/ManagementAccess.page  |   2 +-
 emhttp/plugins/dynamix/SyslogSettings.page    |   2 +-
 emhttp/plugins/dynamix/WG0.page               |   2 +-
 emhttp/plugins/dynamix/include/Boot.php       |   3 +-
 emhttp/plugins/dynamix/include/Browse.php     |   2 +-
 emhttp/plugins/dynamix/include/CPUset.php     |   3 +-
 emhttp/plugins/dynamix/include/CheckPort.php  |   7 +-
 emhttp/plugins/dynamix/include/Control.php    |   4 +-
 .../dynamix/include/CryptoBenchmark.php       |  12 +-
 .../plugins/dynamix/include/DashboardApps.php |  11 +-
 .../plugins/dynamix/include/DeleteLogFile.php |   3 +-
 emhttp/plugins/dynamix/include/DiskList.php   |   4 +-
 emhttp/plugins/dynamix/include/Download.php   |   3 +-
 emhttp/plugins/dynamix/include/Feedback.php   |   4 +-
 .../dynamix/include/FileSystemStatus.php      |   2 +-
 emhttp/plugins/dynamix/include/Helpers.php    |   2 +-
 emhttp/plugins/dynamix/include/InitCharts.php |   9 +-
 emhttp/plugins/dynamix/include/InstallKey.php |   5 +-
 .../dynamix/include/NotificationsArchive.php  |   7 +-
 emhttp/plugins/dynamix/include/Notify.php     |   5 +-
 .../plugins/dynamix/include/OpenTerminal.php  |   6 +-
 .../plugins/dynamix/include/PHPsettings.php   |   2 +-
 .../plugins/dynamix/include/ProcessStatus.php |   7 +-
 .../plugins/dynamix/include/ProtocolData.php  |   7 +-
 .../plugins/dynamix/include/ProvisionCert.php |  11 +-
 emhttp/plugins/dynamix/include/ReplaceKey.php |  10 +-
 emhttp/plugins/dynamix/include/Report.php     |   5 +-
 emhttp/plugins/dynamix/include/ResetTZ.php    |   7 +-
 emhttp/plugins/dynamix/include/SMTPtest.php   |   7 +-
 emhttp/plugins/dynamix/include/ShareData.php  |   5 +-
 emhttp/plugins/dynamix/include/ShareList.php  |  12 +-
 emhttp/plugins/dynamix/include/SmartInfo.php  |   6 +-
 .../plugins/dynamix/include/StartCommand.php  |   2 +-
 emhttp/plugins/dynamix/include/SysDevs.php    |  20 +-
 emhttp/plugins/dynamix/include/SysDrivers.php | 190 +++++++++---------
 .../dynamix/include/SysDriversInit.php        |  34 ++--
 emhttp/plugins/dynamix/include/Syslog.php     |   6 +-
 .../plugins/dynamix/include/ToggleState.php   |   5 +-
 .../plugins/dynamix/include/TrialRequest.php  |  10 +-
 emhttp/plugins/dynamix/include/UpdateDNS.php  |  10 +-
 emhttp/plugins/dynamix/include/UpdateOne.php  |   9 +-
 emhttp/plugins/dynamix/include/UpdateTwo.php  |   7 +-
 emhttp/plugins/dynamix/include/Wrappers.php   |   2 +-
 .../plugins/dynamix/include/update.btrfs.php  |   6 +-
 .../dynamix/include/update.encryption.php     |   5 +-
 .../plugins/dynamix/include/update.parity.php |   6 +-
 .../plugins/dynamix/include/update.ssmtp.php  |   6 +-
 .../dynamix/include/update.vfio-pci-cfg.php   |   3 +-
 .../dynamix/include/update.wireguard.php      |   3 +-
 emhttp/plugins/dynamix/include/update.zfs.php |   2 +-
 emhttp/plugins/dynamix/nchan/device_list      |  10 +-
 emhttp/plugins/dynamix/nchan/parity_list      |   2 +-
 emhttp/plugins/dynamix/nchan/session_check    |   2 +-
 emhttp/plugins/dynamix/nchan/update_2         |   8 +-
 emhttp/plugins/dynamix/scripts/diagnostics    |  17 +-
 emhttp/plugins/dynamix/scripts/emcmd          |   5 +-
 emhttp/plugins/dynamix/scripts/feedback       |   3 +-
 emhttp/plugins/dynamix/scripts/flash_backup   |   5 +-
 emhttp/plugins/dynamix/scripts/monitor        |  12 +-
 emhttp/plugins/dynamix/scripts/notify         |   2 +-
 emhttp/plugins/dynamix/scripts/parity_history |   3 +-
 emhttp/plugins/dynamix/scripts/run_cmd        |   2 +-
 emhttp/plugins/dynamix/scripts/select_case    |   3 +-
 emhttp/plugins/dynamix/scripts/ssd_trim       |   3 +-
 emhttp/plugins/dynamix/scripts/statuscheck    |   9 +-
 .../dynamix/scripts/system_information        |   5 +-
 emhttp/plugins/dynamix/scripts/wg_config      |   3 +-
 109 files changed, 726 insertions(+), 743 deletions(-)

diff --git a/emhttp/plugins/dynamix.apcupsd/include/UPSstatus.php b/emhttp/plugins/dynamix.apcupsd/include/UPSstatus.php
index 69ed7c9f8..0c8a7e56f 100644
--- a/emhttp/plugins/dynamix.apcupsd/include/UPSstatus.php
+++ b/emhttp/plugins/dynamix.apcupsd/include/UPSstatus.php
@@ -12,7 +12,8 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'settings';
 require_once "$docroot/webGui/include/Translations.php";
diff --git a/emhttp/plugins/dynamix.docker.manager/include/ContainerManager.php b/emhttp/plugins/dynamix.docker.manager/include/ContainerManager.php
index eff069086..90f2f770a 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/ContainerManager.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/ContainerManager.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2014-2022, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 $user_prefs = $dockerManPaths['user-prefs'];
diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index 5ac8830c9..73a405ad2 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2023, Bergware International.
- * Copyright 2015-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2015-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,10 +12,8 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
-libxml_use_internal_errors(true);
-
 require_once "$docroot/webGui/include/Helpers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
@@ -398,6 +396,7 @@ function addConfigPopup() {
   // Start Dialog section
   popup.dialog({
     title: title,
+    height: 'auto',
     width: 900,
     resizable: false,
     modal: true,
@@ -466,6 +465,7 @@ function editConfigPopup(num,disabled) {
   popup.find(".switch-button-background").css("margin-top", "6px");
   popup.dialog({
     title: title,
+    height: 'auto',
     width: 900,
     resizable: false,
     modal: true,
diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
index 8fc260c18..fa5923f8e 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2014-2023, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,10 +12,7 @@
  */
 ?>
 <?
-libxml_use_internal_errors(true); # Suppress any warnings from xml errors.
-
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/Helpers.php";
 require_once "$docroot/webGui/include/Wrappers.php";
 
@@ -56,8 +53,8 @@ if (file_exists($docker_cfgfile) && exec("grep -Pom1 '_{$port}(_[0-9]+)?=' $dock
   exec("sed -ri 's/_(BR0|BOND0|ETH0)(_[0-9]+)?=/_{$port}\\2=/' $docker_cfgfile");
 }
 
-$defaults = @parse_ini_file("$docroot/plugins/dynamix.docker.manager/default.cfg") ?: [];
-$dockercfg = array_replace_recursive($defaults, @parse_ini_file($docker_cfgfile) ?: []);
+$defaults = (array)@parse_ini_file("$docroot/plugins/dynamix.docker.manager/default.cfg");
+$dockercfg = array_replace_recursive($defaults, (array)@parse_ini_file($docker_cfgfile));
 
 function var_split($item, $i=0) {
 	return array_pad(explode(' ',$item),$i+1,'')[$i];
diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
index 0dc11bb93..400898dd6 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2014-2023, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
@@ -34,7 +33,7 @@ if (!$containers && !$images) {
 }
 
 if (file_exists($user_prefs)) {
-  $prefs = @parse_ini_file($user_prefs) ?: [];
+  $prefs = (array)@parse_ini_file($user_prefs);
   $sort = [];
   foreach ($containers as $ct) $sort[] = array_search($ct['Name'],$prefs);
   array_multisort($sort,SORT_NUMERIC,$containers);
@@ -46,7 +45,7 @@ $allInfo = $DockerTemplates->getAllInfo();
 $docker = [];
 $null = '0.0.0.0';
 
-$autostart = @file($autostart_file,FILE_IGNORE_NEW_LINES) ?: [];
+$autostart = (array)@file($autostart_file,FILE_IGNORE_NEW_LINES);
 $names = array_map('var_split',$autostart);
 
 function my_lang_time($text) {
diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerUpdate.php b/emhttp/plugins/dynamix.docker.manager/include/DockerUpdate.php
index 3b4647624..ee0233318 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/DockerUpdate.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/DockerUpdate.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2014-2022, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 $ncsi = exec("wget --spider --no-check-certificate -nv -T10 -t1 https://www.msftncsi.com/ncsi.txt 2>&1|grep -o 'OK'")=='OK';
diff --git a/emhttp/plugins/dynamix.docker.manager/include/Events.php b/emhttp/plugins/dynamix.docker.manager/include/Events.php
index 1ac064cbd..a16c1d418 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/Events.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/Events.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2014-2023, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Secure.php";
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
diff --git a/emhttp/plugins/dynamix.docker.manager/include/UpdateConfig.php b/emhttp/plugins/dynamix.docker.manager/include/UpdateConfig.php
index 6c202dda9..413217eb6 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/UpdateConfig.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/UpdateConfig.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2021, 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,
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 $autostart_file = $dockerManPaths['autostart-file'];
@@ -25,7 +25,7 @@ case 'autostart':
   $container = urldecode(($_POST['container']));
   $wait = $_POST['wait'];
   $item = rtrim("$container $wait");
-  $autostart = @file($autostart_file, FILE_IGNORE_NEW_LINES) ?: [];
+  $autostart = (array)@file($autostart_file, FILE_IGNORE_NEW_LINES);
   $key = array_search($item, $autostart);
   if ($_POST['auto']=='true') {
     if ($key===false) $autostart[] = $item;
@@ -48,7 +48,7 @@ case 'wait':
   $container = urldecode(($_POST['container']));
   $wait = $_POST['wait'];
   $item = rtrim("$container $wait");
-  $autostart = file($autostart_file, FILE_IGNORE_NEW_LINES) ?: [];
+  $autostart = (array)@file($autostart_file, FILE_IGNORE_NEW_LINES);
   $names = array_map('var_split', $autostart);
   $autostart[array_search($container,$names)] = $item;
   file_put_contents($autostart_file, implode("\n", $autostart)."\n");
diff --git a/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php b/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php
index cb3e091ee..a7de43532 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2015-2018, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2018, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 $autostart_file = $dockerManPaths['autostart-file'];
diff --git a/emhttp/plugins/dynamix.docker.manager/scripts/container_size b/emhttp/plugins/dynamix.docker.manager/scripts/container_size
index ee43b699b..cbc8b0a39 100755
--- a/emhttp/plugins/dynamix.docker.manager/scripts/container_size
+++ b/emhttp/plugins/dynamix.docker.manager/scripts/container_size
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
diff --git a/emhttp/plugins/dynamix.docker.manager/scripts/dockerupdate b/emhttp/plugins/dynamix.docker.manager/scripts/dockerupdate
index da6ae3e08..8f5482095 100755
--- a/emhttp/plugins/dynamix.docker.manager/scripts/dockerupdate
+++ b/emhttp/plugins/dynamix.docker.manager/scripts/dockerupdate
@@ -1,8 +1,8 @@
 #!/usr/bin/php -q
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2014-2023, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -13,8 +13,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 extract(parse_plugin_cfg('dynamix', true));
@@ -45,7 +44,7 @@ if (!isset($check)) {
   echo " Done.";
 } else {
   $notify = "$docroot/webGui/scripts/notify";
-  $var    = @parse_ini_file("/var/local/emhttp/var.ini") ?: [];
+  $var    = (array)@parse_ini_file("/var/local/emhttp/var.ini");
   $server = strtoupper(_var($var,'NAME','tower'));
   $output = _var($notify,'docker_notify');
   $info   = $DockerTemplates->getAllInfo(true);
diff --git a/emhttp/plugins/dynamix.docker.manager/scripts/rebuild_container b/emhttp/plugins/dynamix.docker.manager/scripts/rebuild_container
index 533670ee8..55bc7205c 100755
--- a/emhttp/plugins/dynamix.docker.manager/scripts/rebuild_container
+++ b/emhttp/plugins/dynamix.docker.manager/scripts/rebuild_container
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 $DockerClient = new DockerClient();
diff --git a/emhttp/plugins/dynamix.docker.manager/scripts/update_container b/emhttp/plugins/dynamix.docker.manager/scripts/update_container
index f37897abd..12588f0bb 100755
--- a/emhttp/plugins/dynamix.docker.manager/scripts/update_container
+++ b/emhttp/plugins/dynamix.docker.manager/scripts/update_container
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
diff --git a/emhttp/plugins/dynamix.my.servers/data/server-state.php b/emhttp/plugins/dynamix.my.servers/data/server-state.php
index 6ed4af1f9..9c2afa414 100644
--- a/emhttp/plugins/dynamix.my.servers/data/server-state.php
+++ b/emhttp/plugins/dynamix.my.servers/data/server-state.php
@@ -1,5 +1,5 @@
-<?php
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+<?PHP
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 $var = (array)parse_ini_file('state/var.ini');
 
 require_once "$docroot/webGui/include/Wrappers.php";
diff --git a/emhttp/plugins/dynamix.my.servers/include/myservers2.php b/emhttp/plugins/dynamix.my.servers/include/myservers2.php
index 0ef9dae2a..b65f26524 100644
--- a/emhttp/plugins/dynamix.my.servers/include/myservers2.php
+++ b/emhttp/plugins/dynamix.my.servers/include/myservers2.php
@@ -1,5 +1,5 @@
-<?php
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+<?PHP
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once("$docroot/plugins/dynamix.my.servers/include/state.php");
 require_once("$docroot/plugins/dynamix.my.servers/include/translations.php");
 ?>
diff --git a/emhttp/plugins/dynamix.plugin.manager/include/Downgrade.php b/emhttp/plugins/dynamix.plugin.manager/include/Downgrade.php
index a3a92ba2a..9742e7bbc 100644
--- a/emhttp/plugins/dynamix.plugin.manager/include/Downgrade.php
+++ b/emhttp/plugins/dynamix.plugin.manager/include/Downgrade.php
@@ -11,8 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/webGui/include/Secure.php";
 
diff --git a/emhttp/plugins/dynamix.plugin.manager/include/ShowChanges.php b/emhttp/plugins/dynamix.plugin.manager/include/ShowChanges.php
index 9a74a136c..3500f5e32 100644
--- a/emhttp/plugins/dynamix.plugin.manager/include/ShowChanges.php
+++ b/emhttp/plugins/dynamix.plugin.manager/include/ShowChanges.php
@@ -11,8 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
diff --git a/emhttp/plugins/dynamix.plugin.manager/include/ShowPlugins.php b/emhttp/plugins/dynamix.plugin.manager/include/ShowPlugins.php
index 60a81355d..2d9b9bea5 100644
--- a/emhttp/plugins/dynamix.plugin.manager/include/ShowPlugins.php
+++ b/emhttp/plugins/dynamix.plugin.manager/include/ShowPlugins.php
@@ -11,8 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
 
diff --git a/emhttp/plugins/dynamix.plugin.manager/scripts/PluginAPI.php b/emhttp/plugins/dynamix.plugin.manager/scripts/PluginAPI.php
index 1915ab237..66b457448 100644
--- a/emhttp/plugins/dynamix.plugin.manager/scripts/PluginAPI.php
+++ b/emhttp/plugins/dynamix.plugin.manager/scripts/PluginAPI.php
@@ -10,12 +10,13 @@
  * all copies or substantial portions of the Software.
  */
 
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
+require_once "$docroot/plugins/dynamix/include/Secure.php";
+
 //add translations
 $_SERVER['REQUEST_URI'] = "plugins";
 require_once "$docroot/plugins/dynamix/include/Translations.php";
-require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
-require_once "$docroot/plugins/dynamix/include/Secure.php";
 
 function download_url($url, $path = "") {
 	$ch = curl_init();
@@ -39,21 +40,17 @@ switch ($_POST['action']) {
 	case 'checkPlugin':
 		$options = $_POST['options'] ?? '';
 		$plugin = $options['plugin'] ?? '';
-
 		$name = unbundle($options['name'] ?? $plugin);
 		$file = "/boot/config/plugins/$plugin";
 		$file = realpath($file)==$file ? $file : "";
-
 		if ( ! $plugin || ! file_exists($file) ) {
 			echo json_encode(["updateAvailable"=>false]);
 			break;
 		}
-
 		exec("mkdir -p /tmp/plugins");
 		@unlink("/tmp/plugins/$plugin");
 		$url = plugin("pluginURL","/boot/config/plugins/$plugin");
 		download_url($url,"/tmp/plugins/$plugin");
-
 		$changes = plugin("changes","/tmp/plugins/$plugin");
 		$alerts = plugin("alert","/tmp/plugins/$plugin");
 		$version = plugin("version","/tmp/plugins/$plugin");
@@ -69,7 +66,6 @@ switch ($_POST['action']) {
 		} else {
 			@unlink('/tmp/plugins/my_alerts.txt');
 		}
-
 		$update = false;
 		if ( strcmp($version,$installedVersion) > 0 ) {
 			$unraid = parse_ini_file("/etc/unraid-version");
@@ -77,17 +73,14 @@ switch ($_POST['action']) {
 		}
 		$updateMessage = sprintf(_("%s: An update is available."),$name);
 		$linkMessage = sprintf(_("Click here to install version %s"),$version);
-
 		echo json_encode(["updateAvailable"=>$update, "version"=>$version, "min"=>$min, "alert"=>$alerts, "changes"=>$changes, "installedVersion"=>$installedVersion, "updateMessage"=>$updateMessage, "linkMessage"=>$linkMessage]);
 		break;
 
 	case 'addRebootNotice':
 		$message = htmlspecialchars(trim($_POST['message']));
-		if ( ! $message ) break;
-
-		$existing = @file("/tmp/reboot_notifications",FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: [];
+		if (!$message) break;
+		$existing = (array)@file("/tmp/reboot_notifications",FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 		$existing[] = $message;
-
 		file_put_contents("/tmp/reboot_notifications",implode("\n",array_unique($existing)));
 		break;
 
diff --git a/emhttp/plugins/dynamix.plugin.manager/scripts/checkall b/emhttp/plugins/dynamix.plugin.manager/scripts/checkall
index eee96871d..7c46a8ed5 100755
--- a/emhttp/plugins/dynamix.plugin.manager/scripts/checkall
+++ b/emhttp/plugins/dynamix.plugin.manager/scripts/checkall
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
diff --git a/emhttp/plugins/dynamix.plugin.manager/scripts/languagecheck b/emhttp/plugins/dynamix.plugin.manager/scripts/languagecheck
index 6290cbe1e..93e8265fe 100755
--- a/emhttp/plugins/dynamix.plugin.manager/scripts/languagecheck
+++ b/emhttp/plugins/dynamix.plugin.manager/scripts/languagecheck
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
 extract(parse_plugin_cfg('dynamix', true));
@@ -23,7 +22,7 @@ $_SERVER['REQUEST_URI'] = "scripts";
 $login_locale = _var($display,'locale');
 require_once "$docroot/webGui/include/Translations.php";
 
-$var = @parse_ini_file('/var/local/emhttp/var.ini') ?: [];
+$var = (array)@parse_ini_file('/var/local/emhttp/var.ini');
 
 function apos($text) {
   // So that "&apos;" doesn't show up in email
diff --git a/emhttp/plugins/dynamix.plugin.manager/scripts/plugincheck b/emhttp/plugins/dynamix.plugin.manager/scripts/plugincheck
index 763b2915c..6eb1acec0 100755
--- a/emhttp/plugins/dynamix.plugin.manager/scripts/plugincheck
+++ b/emhttp/plugins/dynamix.plugin.manager/scripts/plugincheck
@@ -12,11 +12,9 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
-
 extract(parse_plugin_cfg('dynamix',true));
 
 // Multi-language support
@@ -24,7 +22,7 @@ $_SERVER['REQUEST_URI'] = "scripts";
 $login_locale = _var($display,'locale');
 require_once "$docroot/webGui/include/Translations.php";
 
-$var = @parse_ini_file('/var/local/emhttp/var.ini') ?: [];
+$var = (array)@parse_ini_file('/var/local/emhttp/var.ini');
 
 function apos($text) {
   // So that "&apos;" doesn't show up in email
diff --git a/emhttp/plugins/dynamix.plugin.manager/scripts/showchanges b/emhttp/plugins/dynamix.plugin.manager/scripts/showchanges
index b64ba83d4..1f0ffbb7a 100755
--- a/emhttp/plugins/dynamix.plugin.manager/scripts/showchanges
+++ b/emhttp/plugins/dynamix.plugin.manager/scripts/showchanges
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
diff --git a/emhttp/plugins/dynamix.plugin.manager/scripts/unraidcheck b/emhttp/plugins/dynamix.plugin.manager/scripts/unraidcheck
index 710c0e496..d4f87f0aa 100755
--- a/emhttp/plugins/dynamix.plugin.manager/scripts/unraidcheck
+++ b/emhttp/plugins/dynamix.plugin.manager/scripts/unraidcheck
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
 
@@ -24,7 +23,7 @@ if (!function_exists('_')) {
 
 extract(parse_plugin_cfg('dynamix', true));
 
-$var     = @parse_ini_file('/var/local/emhttp/var.ini') ?: [];
+$var     = (array)@parse_ini_file('/var/local/emhttp/var.ini');
 $script  = "$docroot/webGui/scripts/notify";
 $server  = strtoupper(_var($var,'NAME','server'));
 $output  = _var($notify,'plugin');
diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index acdee1332..0a145c53b 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -6,8 +6,8 @@ Markdown="false"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2015-2023, Derek Macias, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * 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,7 +18,7 @@ Markdown="false"
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 $cpus = cpu_list();
@@ -146,14 +146,10 @@ function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
   var box = $("#dialogWindow");
   box.html($("#templateISOboth").html());
   box.find('#target').attr('value',file).fileTreeAttach(null,null,function(path){
-    var bits = path.substr(1).split('/');
-    var auto = bits.length>3 ? '' : share;
-    box.find('#target').val(path+auto).change();
+    box.find('#target').val(path).change();
   });
   box.find('#target2').attr('value',file2).fileTreeAttach(null,null,function(path){
-    var bits = path.substr(1).split('/');
-    var auto = bits.length>3 ? '' : share;
-    box.find('#target2').val(path+auto).change();
+    box.find('#target2').val(path).change();
   });
   box.dialog({
     title: "_(Select ISOs for CDROMs)_",
@@ -183,9 +179,7 @@ function getisoimage(uuid,dev,bus,file){
   var box = $("#dialogWindow");
   box.html($("#templateISO").html());
   box.find('#target').attr('value',file).fileTreeAttach(null,null,function(path){
-    var bits = path.substr(1).split('/');
-    var auto = bits.length>3 ? '' : share;
-    box.find('#target').val(path+auto).change();
+    box.find('#target').val(path).change();
   });
   box.dialog({
     title: "_(Select ISO)_",
@@ -217,6 +211,7 @@ function VMClone(uuid, name){
   document.getElementById("Overwrite").checked = true;
   box.dialog({
     title: "_(VM Clone)_",
+    height: 'auto',
     width: 600,
     resizable: false,
     modal: true,
@@ -263,6 +258,7 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist,state){
   document.getElementById("targetsnapfspc").checked = true;
   box.dialog({
     title: optiontext,
+    height: 'auto',
     width: 600,
     resizable: false,
     modal: true,
@@ -335,6 +331,7 @@ function selectblock(uuid, name, snaps, opt, getlist, state){
   }
   box.dialog({
     title: optiontext,
+    height: 'auto',
     width: 600,
     resizable: false,
     modal: true,
diff --git a/emhttp/plugins/dynamix.vm.manager/VMTemplates.page b/emhttp/plugins/dynamix.vm.manager/VMTemplates.page
index 96b2d3819..c9d610bac 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMTemplates.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMTemplates.page
@@ -5,7 +5,8 @@ Markdown="false"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2015-2023, Derek Macias, Eric Schultz, Jon Panozzo.
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -16,7 +17,7 @@ Markdown="false"
  */
 ?>
 <?
-	$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+	$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 	foreach($arrAllTemplates as $strName => $arrTemplate):
diff --git a/emhttp/plugins/dynamix.vm.manager/include/Fedora-virtio-isos.php b/emhttp/plugins/dynamix.vm.manager/include/Fedora-virtio-isos.php
index 7aaddf74d..cf53cb6ed 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/Fedora-virtio-isos.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/Fedora-virtio-isos.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2021, 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,
@@ -12,14 +12,14 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/plugins/dynamix/include/Helpers.php";
+require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'vms';
 require_once "$docroot/webGui/include/Translations.php";
 
-require_once "$docroot/plugins/dynamix/include/Helpers.php";
-require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
-
 // get Fedora download archive
 $fedora  = '/var/tmp/fedora-virtio-isos';
 $archive = 'https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio';
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
index 1e4fea84c..ca365da83 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2015-2023, Derek Macias, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,13 +12,13 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 // add translations
 $_SERVER['REQUEST_URI'] = 'vms';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Helpers.php";
-require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 $user_prefs = '/boot/config/plugins/dynamix.vm.manager/userprefs.cfg';
 if (file_exists('/boot/config/plugins/dynamix.vm.manager/vmpreview')) $vmpreview = true ; else $vmpreview =  false ;
@@ -28,7 +28,7 @@ if (empty($vms)) {
   return;
 }
 if (file_exists($user_prefs)) {
-  $prefs = @parse_ini_file($user_prefs) ?: [];
+  $prefs = (array)@parse_ini_file($user_prefs);
   $sort = [];
   foreach ($vms as $vm) $sort[] = array_search($vm,$prefs);
   array_multisort($sort,SORT_NUMERIC,$vms);
@@ -185,7 +185,7 @@ foreach ($vms as $vm) {
 
   $changemedia = "getisoimageboth(\"{$uuid}\",\"hda\",\"{$cdbus}\",\"{$cdfile}\",\"hdb\",\"{$cdbus2}\",\"{$cdfile2}\")";
   $title = _('Select ISO image');
-  $cdstr = $cdromcount." / 2<a class='hand' title='$title' href='#'  onclick='$changemedia'><i class='fa fa-bullseye' ></i></a>";
+  $cdstr = $cdromcount." / 2<a class='hand' title='$title' href='#' onclick='$changemedia'><i class='fa fa-floppy-o'></i></a>";
   echo "<tr parent-id='$i' class='sortable'><td class='vm-name' style='width:220px;padding:8px'><i class='fa fa-arrows-v mover orange-text'></i>";
   echo "<span class='outer'><span id='vm-$uuid' $menu class='hand'>$image</span><span class='inner'><a href='#' onclick='return toggle_id(\"name-$i\")' title='click for more VM info'>$vm</a><br><i class='fa fa-$shape $status $color'></i><span class='state'>"._($status)." $snapshotstcount</span></span></span></td>";
   echo "<td>$desc</td>";
@@ -248,7 +248,7 @@ foreach ($vms as $vm) {
       $title = _('Insert CD');
       $changemedia = "changemedia(\"{$uuid}\",\"{$dev}\",\"{$bus}\",\"--select\")";
       $disk = _("No CD image inserted in to drive");
-      echo "<tr><td>$disk<a title='$title' href='#' onclick='$changemedia'><i class='fa fa-bullseye'></i></a></td><td></td><td>$bus</td><td>$capacity</td><td>$allocation</td><td>$boot</td></tr>";
+      echo "<tr><td>$disk<a title='$title' href='#' onclick='$changemedia'><i class='fa fa-floppy-o'></i></a></td><td></td><td>$bus</td><td>$capacity</td><td>$allocation</td><td>$boot</td></tr>";
     }
   }
   echo "</tbody>";
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMManager.php b/emhttp/plugins/dynamix.vm.manager/include/VMManager.php
index a56278de2..435e537f2 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMManager.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMManager.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 $user_prefs = '/boot/config/plugins/dynamix.vm.manager/userprefs.cfg';
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMajax.php b/emhttp/plugins/dynamix.vm.manager/include/VMajax.php
index ed28dffe0..6ef653bad 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMajax.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMajax.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2015-2023, Derek Macias, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,13 +12,13 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 // add translations
 $_SERVER['REQUEST_URI'] = 'vms';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Helpers.php";
-require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 function requireLibvirt() {
 	global $lv;
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMedit.php b/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
index fbf2a5d8b..410fc53de 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
@@ -1,6 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2015-2023, Derek Macias, Eric Schultz, Jon Panozzo.
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -11,14 +12,15 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
+
 // add translations
 if (substr($_SERVER['REQUEST_URI'],0,4) != '/VMs') {
 	$_SERVER['REQUEST_URI'] = 'vms';
 	require_once "$docroot/webGui/include/Translations.php";
 }
-require_once "$docroot/webGui/include/Helpers.php";
-require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 switch ($display['theme']) {
 	case 'gray' : $bgcolor = '#121510'; $border = '#606e7f'; $top = -44; break;
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 337dd1480..d70c25445 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2021, 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,
@@ -42,7 +42,8 @@
  * Usage:
  *       $xml = Array2XML::createXML('root_node_name', $php_array);
  *       echo $xml->saveXML();
- */
+**/
+
 class Array2XML {
 	private static $xml = null;
 private static $encoding = 'UTF-8';
@@ -160,8 +161,7 @@ private static $encoding = 'UTF-8';
 	}
 }
 
-
-	$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+	$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt.php";
 	require_once "$docroot/webGui/include/Custom.php";
 
@@ -756,13 +756,13 @@ private static $encoding = 'UTF-8';
 		$arrWhitelistGPUClassIDregex = '/^(0001|03)/';
 		$arrWhitelistAudioClassIDregex = '/^(0403)/';
 
-		# "System peripheral [0880]" "Global unichip corp. [1ac1]" "Coral Edge Tpu [089a]" -pff "Global unichip corp. [1ac1]" "Coral Edge Tpu [089a]" 
+		# "System peripheral [0880]" "Global unichip corp. [1ac1]" "Coral Edge Tpu [089a]" -pff "Global unichip corp. [1ac1]" "Coral Edge Tpu [089a]"
 		#                    typeid													productid
 		# file is csv typeid:productid
 		#
 		if (is_file("/boot/config/VMPCIOverride.cfg")) {
 			$arrWhiteListOverride = str_getcsv(file_get_contents("/boot/config/VMPCIOverride.cfg")) ;
-		} 
+		}
 		$arrWhiteListOverride[] = "0880:089a" ;
 
 		$arrValidPCIDevices = [];
@@ -1498,7 +1498,7 @@ private static $encoding = 'UTF-8';
 		*/
 		$uuid = $lv->domain_get_uuid($clone) ;
 		write("addLog\0".htmlspecialchars(_("Checking if clone exists")));
-		if ($uuid) { $arrResponse =  ['error' => _("Clone VM name already inuse")]; return false ;} 
+		if ($uuid) { $arrResponse =  ['error' => _("Clone VM name already inuse")]; return false ;}
 		#VM must be shutdown.
 		$res = $lv->get_domain_by_name($vm);
 		$dom = $lv->domain_get_info($res);
@@ -1518,18 +1518,18 @@ private static $encoding = 'UTF-8';
 			$pathinfo =  pathinfo($file) ;
 			$capacity = $capacity + $disk["capacity"] ;
 		}
-	
+
 		#Check free space.
 		write("addLog\0".htmlspecialchars("Checking for free space"));
 		$dirfree = disk_free_space($pathinfo["dirname"]) ;
-		$sourcedir = trim(shell_exec("getfattr --absolute-names --only-values -n system.LOCATION ".escapeshellarg($pathinfo["dirname"])." 2>/dev/null"));	
+		$sourcedir = trim(shell_exec("getfattr --absolute-names --only-values -n system.LOCATION ".escapeshellarg($pathinfo["dirname"])." 2>/dev/null"));
 		$repdir = str_replace('/mnt/user/', "/mnt/$sourcedir/", $pathinfo["dirname"]);
 		$repdirfree = disk_free_space($repdir) ;
 		$reflink = true ;
 		$capacity *=  1 ;
 
 		if ($free == "yes" && $repdirfree < $capacity) { $reflink = false ;}
-		if ($free == "yes" && $dirfree < $capacity) { write("addLog\0".htmlspecialchars(_("Insufficent storage for clone")));  return false ;} 
+		if ($free == "yes" && $dirfree < $capacity) { write("addLog\0".htmlspecialchars(_("Insufficent storage for clone")));  return false ;}
 
 		#Clone XML
 		$uuid = $lv->domain_get_uuid($vm) ;
@@ -1567,17 +1567,17 @@ private static $encoding = 'UTF-8';
 			chgrp($clonedir, 'users');
 		}
 		write("addLog\0".htmlspecialchars("Checking for image files"));
-		if ($file_exists && $overwrite != "yes") { write("addLog\0".htmlspecialchars(_("New image file names exist and Overwrite is not allowed")));  return( false) ; } 
+		if ($file_exists && $overwrite != "yes") { write("addLog\0".htmlspecialchars(_("New image file names exist and Overwrite is not allowed")));  return( false) ; }
 
 		#Create duplicate files.
 		foreach($file_clone as $diskid => $disk)  {
 			$target = $disk['target'] ;
-			$source = $disk['source'] ; 
-			if ($target == $source) { write("addLog\0".htmlspecialchars(_("New image file is same as old")));  return( false) ; } 
-			$sourcerealdisk = trim(shell_exec("getfattr --absolute-names --only-values -n system.LOCATION ".escapeshellarg($source)." 2>/dev/null"));	
+			$source = $disk['source'] ;
+			if ($target == $source) { write("addLog\0".htmlspecialchars(_("New image file is same as old")));  return( false) ; }
+			$sourcerealdisk = trim(shell_exec("getfattr --absolute-names --only-values -n system.LOCATION ".escapeshellarg($source)." 2>/dev/null"));
             $reptgt = str_replace('/mnt/user/', "/mnt/$sourcerealdisk/", $target);
             $repsrc = str_replace('/mnt/user/', "/mnt/$sourcerealdisk/", $source);
-        
+
 			$cmdstr = "cp --reflink=always '$repsrc' '$reptgt'" ;
         	if ($reflink == true) { $refcmd = $cmdstr ; } else {$refcmd = false; }
 			$cmdstr = "rsync -ahPIXS  --out-format=%f --info=flist0,misc0,stats0,name1,progress2 '$source' '$target'" ;
@@ -1592,23 +1592,23 @@ private static $encoding = 'UTF-8';
 		file_put_contents("/tmp/clonexml" ,$xml) ;
 		$rtn = $lv->domain_define($xml) ;
 		return($rtn) ;
-	
+
 	}
 
-	
+
 	function compare_creationtime($a, $b) 	{
 		return strnatcmp($a['creationtime'], $b['creationtime']);
-  }	
+  }
 
   function compare_creationtimelt($a, $b) 	{
 	  return $a['creationtime'] < $b['creationtime'];
-	}	
+	}
 
   function getvmsnapshots($vm) {
 	  $snaps=array() ;
 	  $dbpath = "/etc/libvirt/qemu/snapshot/$vm" ;
 	  $snaps_json = file_get_contents($dbpath."/snapshots.db") ;
-	  $snaps = json_decode($snaps_json,true) ; 
+	  $snaps = json_decode($snaps_json,true) ;
 	  if (is_array($snaps)) uasort($snaps,'compare_creationtime') ;
 	  return $snaps ;
   }
@@ -1618,7 +1618,7 @@ private static $encoding = 'UTF-8';
 	  $dbpath = "/etc/libvirt/qemu/snapshot/$vm" ;
 	  if (!is_dir($dbpath)) mkdir($dbpath) ;
 	  $snaps_json = file_get_contents($dbpath."/snapshots.db") ;
-	  $snaps = json_decode($snaps_json,true) ; 
+	  $snaps = json_decode($snaps_json,true) ;
 	  $snapshot_res=$lv->domain_snapshot_lookup_by_name($vm,$name) ;
 	  $snapshot_xml=$lv->domain_snapshot_get_xml($snapshot_res) ;
 	  $a = simplexml_load_string($snapshot_xml) ;
@@ -1639,10 +1639,10 @@ private static $encoding = 'UTF-8';
 			  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 			  foreach($output as $key => $line) {
 				  $line=str_replace("image: ","",$line) ;
-				  $output[$key] = $line ;  
+				  $output[$key] = $line ;
 			  }
 
-			  $snaps[$vmsnap]['backing'][$disk["device"]] = $output ; 
+			  $snaps[$vmsnap]['backing'][$disk["device"]] = $output ;
 			  $rev = "r".$disk["device"] ;
 			  $reversed = array_reverse($output) ;
 			  $snaps[$vmsnap]['backing'][$rev] = $reversed ;
@@ -1655,7 +1655,7 @@ private static $encoding = 'UTF-8';
 
 		  if (array_key_exists(0 , $b["disks"]["disk"])) $snaps[$vmsnap]["disks"]= $b["disks"]["disk"]; else $snaps[$vmsnap]["disks"][0]= $b["disks"]["disk"];
 
-		  
+
 		  $value = json_encode($snaps,JSON_PRETTY_PRINT) ;
 	  file_put_contents($dbpath."/snapshots.db",$value) ;
   }
@@ -1665,7 +1665,7 @@ private static $encoding = 'UTF-8';
 	  $dbpath = "/etc/libvirt/qemu/snapshot/$vm" ;
 	  if (!is_dir($dbpath)) mkdir($dbpath) ;
 	  $snaps_json = file_get_contents($dbpath."/snapshots.db") ;
-	  $snaps = json_decode($snaps_json,true) ; 
+	  $snaps = json_decode($snaps_json,true) ;
 	  foreach($snaps as $vmsnap=>$snap)
 
 		  $disks =$lv->get_disk_stats($vm) ;
@@ -1675,10 +1675,10 @@ private static $encoding = 'UTF-8';
 			  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 			  foreach($output as $key => $line) {
 				  $line=str_replace("image: ","",$line) ;
-				  $output[$key] = $line ;  
+				  $output[$key] = $line ;
 			  }
-  
-			  $snaps[$vmsnap]['backing'][$disk["device"]] = $output ; 
+
+			  $snaps[$vmsnap]['backing'][$disk["device"]] = $output ;
 			  $rev = "r".$disk["device"] ;
 			  $reversed = array_reverse($output) ;
 			  $snaps[$vmsnap]['backing'][$rev] = $reversed ;
@@ -1688,7 +1688,7 @@ private static $encoding = 'UTF-8';
 		  $snaps[$vmsnap]["parent"]= $parendfileinfo["extension"];
 		  $snaps[$vmsnap]["parent"] = str_replace("qcow2",'',$snaps[$vmsnap]["parent"]) ;
 		  if (isset($parentfind[1]) && !isset($parentfind[2])) $snaps[$vmsnap]["parent"]="Base" ;
-  
+
 		  $value = json_encode($snaps,JSON_PRETTY_PRINT) ;
 		  $res = $lv->get_domain_by_name($vm);
 		  #if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_create_snapshot($lv->domain_get_uuid($vm),$name) ;
@@ -1697,12 +1697,12 @@ private static $encoding = 'UTF-8';
 		  #Remove any NVRAMs that are no longer valid.
 		  # Get uuid
 		  $vmuuid = $lv->domain_get_uuid($vm) ;
-		  #Get list of files 
-		  #$filepath = "/etc/libvirt/qemu/nvram/'.$uuid*" ; #$snapshotname" 
-		  $filepath = "/etc/libvirt/qemu/nvram/$vmuuid*" ; #$snapshotname" 
+		  #Get list of files
+		  #$filepath = "/etc/libvirt/qemu/nvram/'.$uuid*" ; #$snapshotname"
+		  $filepath = "/etc/libvirt/qemu/nvram/$vmuuid*" ; #$snapshotname"
 		  $nvram_files=glob($filepath) ;
 		  foreach($nvram_files as $key => $nvram_file)  {
-			  if ($nvram_file == "/etc/libvirt/qemu/nvram/$vmuuid"."_VARS-pure-efi.fd" || $nvram_file == "/etc/libvirt/qemu/nvram/$vmuuid"."_VARS-pure-efi-tpm.fd" ) unset($nvram_files[$key]) ;              
+			  if ($nvram_file == "/etc/libvirt/qemu/nvram/$vmuuid"."_VARS-pure-efi.fd" || $nvram_file == "/etc/libvirt/qemu/nvram/$vmuuid"."_VARS-pure-efi-tpm.fd" ) unset($nvram_files[$key]) ;
 			  foreach ($snaps as $snapshotname => $snap) {
 				  $tpmfilename = "/etc/libvirt/qemu/nvram/".$vmuuid.$snapshotname."_VARS-pure-efi-tpm.fd" ;
 				  $nontpmfilename = "/etc/libvirt/qemu/nvram/".$vmuuid.$snapshotname."_VARS-pure-efi.fd" ;
@@ -1712,7 +1712,7 @@ private static $encoding = 'UTF-8';
 		  }
 		  foreach ($nvram_files  as $nvram_file) unlink($nvram_file) ;
 
-	 
+
 	  file_put_contents($dbpath."/snapshots.db",$value) ;
   }
 
@@ -1720,7 +1720,7 @@ private static $encoding = 'UTF-8';
 	  global $lv ;
 	  $dbpath = "/etc/libvirt/qemu/snapshot/$vm" ;
 	  $snaps_json = file_get_contents($dbpath."/snapshots.db") ;
-	  $snaps = json_decode($snaps_json,true) ; 
+	  $snaps = json_decode($snaps_json,true) ;
 	  unset($snaps[$name]) ;
 	  $value = json_encode($snaps,JSON_PRETTY_PRINT) ;
 	  file_put_contents($dbpath."/snapshots.db",$value) ;
@@ -1730,19 +1730,19 @@ private static $encoding = 'UTF-8';
 
   function vm_snapshot($vm,$snapshotname, $snapshotdesc, $free = "yes",  $memorysnap = "yes") {
 	  global $lv ;
-	  
+
 	  #Get State
 	  $res = $lv->get_domain_by_name($vm);
 	  $dom = $lv->domain_get_info($res);
 	  $state = $lv->domain_state_translate($dom['state']);
-  
-	  #Get disks for --diskspec 
+
+	  #Get disks for --diskspec
 	  $disks =$lv->get_disk_stats($vm) ;
 	  $diskspec = "" ;
 	  $capacity = 0 ;
 	  if ($snapshotname == "--generate") $name= "S" . date("YmdHis") ; else $name=$snapshotname ;
 	  if ($snapshotdesc != "") $snapshotdesc = " --description '$snapshotdesc'" ;
-		  
+
 	  foreach($disks as $disk)   {
 		  $file = $disk["file"] ;
 		  $pathinfo =  pathinfo($file) ;
@@ -1754,38 +1754,38 @@ private static $encoding = 'UTF-8';
 	  #get memory
 	  $mem = $lv->domain_get_memory_stats($vm) ;
 	  $memory = $mem[6] ;
-  
+
 	  if ($memorysnap = "yes") $memspec = ' --memspec "'.$pathinfo["dirname"].'/memory'.$name.'.mem",snapshot=external' ; else $memspec = "" ;
 	  $cmdstr = "virsh snapshot-create-as '$vm' --name '$name' $snapshotdesc  --atomic" ;
-	  
-	
+
+
 	  if ($state == "running") {
 		  $cmdstr .= " --live ".$memspec.$diskspec ;
 		  $capacity = $capacity + $memory ;
-		  
+
 	  } else {
-		  $cmdstr .= "  --disk-only ".$diskspec ;    
+		  $cmdstr .= "  --disk-only ".$diskspec ;
 	  }
-  
+
 	  #Check free space.
 	  $dirfree = disk_free_space($pathinfo["dirname"]) ;
-  
+
 	  $capacity *=  1 ;
-  
-	  if ($free == "yes" && $dirfree < $capacity) { $arrResponse =  ['error' => _("Insufficent Storage for Snapshot")]; return $arrResponse ;} 
-	  
+
+	  if ($free == "yes" && $dirfree < $capacity) { $arrResponse =  ['error' => _("Insufficent Storage for Snapshot")]; return $arrResponse ;}
+
 	  #Copy nvram
 	  if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_create_snapshot($lv->domain_get_uuid($vm),$name) ;
 
 	  $xmlfile = $pathinfo["dirname"]."/".$name.".running" ;
 	  file_put_contents("/tmp/xmltst", "$xmlfile" ) ;
 	  if ($state == "running") exec("virsh dumpxml '$vm' > ".escapeshellarg($xmlfile),$outxml,$rtnxml) ;
-		
+
 	  $output= [] ;
 	  $test = false ;
 	  if ($test)  exec($cmdstr." --print-xml 2>&1",$output,$return) ; else   exec($cmdstr." 2>&1",$output,$return) ;
 
-	  if (strpos(" ".$output[0],"error") ) { 
+	  if (strpos(" ".$output[0],"error") ) {
 		  $arrResponse =  ['error' => substr($output[0],6) ] ;
 	  } else {
 		$arrResponse = ['success' => true] ;
@@ -1803,8 +1803,8 @@ private static $encoding = 'UTF-8';
 	  $disks =$lv->get_disk_stats($vm) ;
 
 	  switch ($snapslist[$snap]['state']) {
-		  case "shutoff":	
-		  case "running":	
+		  case "shutoff":
+		  case "running":
 			  #VM must be shutdown.
 			  $res = $lv->get_domain_by_name($vm);
 			  $dom = $lv->domain_get_info($res);
@@ -1817,7 +1817,7 @@ private static $encoding = 'UTF-8';
 			  $xmlobj = custom::createArray('domain',$strXML) ;
 
 			  # Process disks and update path.
-			  $disks=($snapslist[$snap]['disks']) ;			
+			  $disks=($snapslist[$snap]['disks']) ;
 			  foreach ($disks as $disk) {
 				  $diskname = $disk["@attributes"]["name"] ;
 				  if ($diskname == "hda" || $diskname == "hdb") continue ;
@@ -1859,7 +1859,7 @@ private static $encoding = 'UTF-8';
 				  $item++ ;
 				  }
 			  }
-	  
+
 				  uasort($snapslist,'compare_creationtimelt') ;
 				  foreach($snapslist as $s) {
 					  $name = $s['name'] ;
@@ -1877,13 +1877,13 @@ private static $encoding = 'UTF-8';
 					  # Restore Memory.
 
 					  $makerun = true ;
-					  if ($makerun == true) exec("virsh restore ".escapeshellarg($memoryfile)) ;	
-					  #exec("virsh restore $memoryfile") ;			
-					  }	
+					  if ($makerun == true) exec("virsh restore ".escapeshellarg($memoryfile)) ;
+					  #exec("virsh restore $memoryfile") ;
+					  }
 					  #Delete Metadata only.
-					  if ($actionmeta == "yes") { 
+					  if ($actionmeta == "yes") {
 						  $ret = delete_snapshots_database("$vm","$name") ;
-					  } 
+					  }
 					  if (is_file($memoryfile) && $action == "yes") unlink($memoryfile) ;
 					  if (is_file($xmlfile) && $action == "yes") unlink($xmlfile) ;
 					  if ($s['name'] == $snap) break ;
@@ -1891,11 +1891,11 @@ private static $encoding = 'UTF-8';
 				  #if VM was started restart.
 				  if ($state == 'running' && $snapslist[$snap]['state'] != "running") {
 					  $arrResponse = $lv->domain_start($vm) ;
-				  } 
-	  
+				  }
+
 				  if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_revert_snapshot($lv->domain_get_uuid($vm),$name) ;
 				  break ;
-	  
+
 		  }
 	  $arrResponse  = ['success' => true] ;
 	  return($arrResponse) ;
@@ -1914,9 +1914,9 @@ private static $encoding = 'UTF-8';
 		  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 		  foreach($output as $key => $line) {
 			  $line=str_replace("image: ","",$line) ;
-			  $output[$key] = $line ;  
+			  $output[$key] = $line ;
 		  }
-		  $snaps[$vm][$disk["device"]] = $output  ; 
+		  $snaps[$vm][$disk["device"]] = $output  ;
 		  $rev = "r".$disk["device"] ;
 		  $reversed = array_reverse($output) ;
 		  $snaps[$vm][$rev] = $reversed ;
@@ -1927,7 +1927,7 @@ private static $encoding = 'UTF-8';
 	  }
 
 	  $snapdisks= $snapslist[$snap]['disks'] ;
-	  
+
 	  foreach ($snapdisks as $diskkey => $snapdisk) {
 		  $diskname = $snapdisk["@attributes"]["name"] ;
 		  if ($diskname == "hda" || $diskname == "hdb") continue ;
@@ -1940,7 +1940,7 @@ private static $encoding = 'UTF-8';
 		  {
 		  if (!isset($snaps[$vm]["r".$diskname][$item])) break ;
 		  $newpath =  $snaps[$vm]["r".$diskname][$item] ;
-			  if (is_file($path)) $data .= "$newpath<br>" ;				
+			  if (is_file($path)) $data .= "$newpath<br>" ;
 		  $item++ ;
 
 		  }
@@ -1958,7 +1958,7 @@ private static $encoding = 'UTF-8';
 	  }
 	  return($data) ;
   }
-  
+
 
   function vm_snapremove($vm, $snap) {
 	  global $lv ;
@@ -1973,10 +1973,10 @@ private static $encoding = 'UTF-8';
 		  exec("qemu-img info --backing-chain -U $file  | grep image:",$output) ;
 		  foreach($output as $key => $line) {
 			  $line=str_replace("image: ","",$line) ;
-			  $output[$key] = $line ;  
+			  $output[$key] = $line ;
 		  }
 
-		  $snaps[$vm][$disk["device"]] = $output ; 
+		  $snaps[$vm][$disk["device"]] = $output ;
 		  $rev = "r".$disk["device"] ;
 		  $reversed = array_reverse($output) ;
 		  $snaps[$vm][$rev] = $reversed ;
@@ -1988,7 +1988,7 @@ private static $encoding = 'UTF-8';
 	  $xmlobj = custom::createArray('domain',$strXML) ;
 
 	  # Process disks.
-	  $disks=($snapslist[$snap]['disks']) ;		
+	  $disks=($snapslist[$snap]['disks']) ;
 	  foreach ($disks as $disk) {
 		  $diskname = $disk["@attributes"]["name"] ;
 		  if ($diskname == "hda" || $diskname == "hdb") continue ;
@@ -1999,30 +1999,30 @@ private static $encoding = 'UTF-8';
 			  return ($data) ;
 			  }
 		  }
-  
+
 	  $disks=($snapslist[$snap]['disks']) ;
 	  foreach ($disks as $disk) {
 		  $diskname = $disk["@attributes"]["name"] ;
 		  if ($diskname == "hda" || $diskname == "hdb") continue ;
 		  $path = $disk["source"]["@attributes"]["file"] ;
 		  if (is_file($path)) {
-			  if(!unlink("$path")) {				
+			  if(!unlink("$path")) {
 				  $data = ["error" => "Unable to remove image file $path"] ;
 				  return ($data) ;
-			  }  
+			  }
 		  }
 	  }
 
-	  # Delete NVRAM 
+	  # Delete NVRAM
 	  if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_delete_snapshot($lv->domain_get_uuid($vm),$snap) ;
 
 	  $ret = delete_snapshots_database("$vm","$snap")  ;
-  
+
 	  if(!$ret)
 		  $data = ["error" => "Unable to remove snap metadata $snap"] ;
 	  else
 		  $data = ["success => 'true"] ;
-	  
+
 	  return($data) ;
   }
 
@@ -2059,7 +2059,7 @@ OPTIONS
   blockcommit Debian --path /mnt/user/domains/Debian/vdisk1.S20230513120410qcow2 --verbose --pivot --delete
   */
 	  # Error if VM Not running.
-	  
+
 	  $snapslist= getvmsnapshots($vm) ;
 	  $disks =$lv->get_disk_stats($vm) ;
 
@@ -2069,7 +2069,7 @@ OPTIONS
 		  if ($pivot == "yes") $cmdstr .= " --pivot " ;
 		  if ($action == "yes") $cmdstr .= " --delete " ;
 		  # Process disks and update path.
-		  $snapdisks=($snapslist[$snap]['disks']) ;	
+		  $snapdisks=($snapslist[$snap]['disks']) ;
 		  if ($base != "--base" && $base != "") {
 			  #get file name from  snapshot.
 			  $snapdisks=($snapslist[$base]['disks']) ;
@@ -2094,15 +2094,15 @@ OPTIONS
 		  }
 
 		  $error = execCommand_nchan($cmdstr,$path) ;
-		  if (!$error) { 
+		  if (!$error) {
 			  $arrResponse =  ['error' => "Process Failed"] ;
 			  return($arrResponse) ;
 		  } else {
 			  $arrResponse = ['success' => true] ;
 		  }
-		  
+
 	  }
-	  # Delete NVRAM 
+	  # Delete NVRAM
 	  #if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_delete_snapshot($lv->domain_get_uuid($vm),$snap) ;
 
 	  refresh_snapshots_database($vm) ;
@@ -2149,9 +2149,9 @@ OPTIONS
 	  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 	  foreach($output as $key => $line) {
 		  $line=str_replace("image: ","",$line) ;
-		  $output[$key] = $line ;  
+		  $output[$key] = $line ;
 	  }
-	  $snaps[$vm][$disk["device"]] = $output  ; 
+	  $snaps[$vm][$disk["device"]] = $output  ;
 	  $rev = "r".$disk["device"] ;
 	  $reversed = array_reverse($output) ;
 	  $snaps[$vm][$rev] = $reversed ;
@@ -2166,7 +2166,7 @@ OPTIONS
   $cmdstr = "virsh blockpull '$vm' --path '$path' --verbose --pivot --delete" ;
   $cmdstr = "virsh blockpull '$vm' --path '$path' --verbose --wait " ;
   # Process disks and update path.
-  $snapdisks=($snapslist[$snap]['disks']) ;	
+  $snapdisks=($snapslist[$snap]['disks']) ;
   if ($base != "--base" && $base != "") {
 	  #get file name from  snapshot.
 	  $snapdisks=($snapslist[$base]['disks']) ;
@@ -2183,8 +2183,8 @@ OPTIONS
 
 
   $error = execCommand_nchan($cmdstr,$path) ;
-  
-  if (!$error)  { 
+
+  if (!$error)  {
 	  $arrResponse =  ['error' => "Process Failed" ] ;
 	  return($arrResponse) ;
   } else {
@@ -2195,7 +2195,7 @@ OPTIONS
 	  }
 
   refresh_snapshots_database($vm) ;
-  $ret = $ret = delete_snapshots_database("$vm","$snap") ; 
+  $ret = $ret = delete_snapshots_database("$vm","$snap") ;
   if($ret)
 	  $data = ["error" => "Unable to remove snap metadata $snap"] ;
   else
@@ -2241,6 +2241,6 @@ OPTIONS
   */
 }
 
-  
+
 
 ?>
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
index 73c4fef67..a5659426d 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php -q
 <?PHP
 /* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,47 +12,47 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
+require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 // add translations
 $_SERVER['REQUEST_URI'] = '';
 $login_locale = _var($display,'locale');
-require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
+
 function write(...$messages){
-	$com = curl_init();
-	curl_setopt_array($com,[
-	  CURLOPT_URL => 'http://localhost/pub/vmaction?buffer_length=1',
-	  CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
-	  CURLOPT_POST => 1,
-	  CURLOPT_RETURNTRANSFER => true
-	]);
-	foreach ($messages as $message) {
-	  curl_setopt($com, CURLOPT_POSTFIELDS, $message);
-	  curl_exec($com);
-	}
-	curl_close($com);
+  $com = curl_init();
+  curl_setopt_array($com,[
+    CURLOPT_URL => 'http://localhost/pub/vmaction?buffer_length=1',
+    CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
+    CURLOPT_POST => 1,
+    CURLOPT_RETURNTRANSFER => true
+  ]);
+  foreach ($messages as $message) {
+    curl_setopt($com, CURLOPT_POSTFIELDS, $message);
+    curl_exec($com);
+  }
+  curl_close($com);
   }
 function execCommand_nchan($command,$idx) {
-	$waitID = mt_rand();
-	[$cmd,$args] = explode(' ',$command,2);
-	write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Command execution')."</legend>".basename($cmd).' '.str_replace(" -","<br>&nbsp;&nbsp;-",htmlspecialchars($args))."<br><span id='wait-$waitID'>"._('Please wait')." </span><p class='logLine'></p></fieldset>","show_Wait\0$waitID");
-	write("addLog\0<br>") ;
-	#write("addToID\0$idx\0 $action") ;
-	$proc = popen("$command 2>&1",'r');
-	while ($out = fgets($proc)) {
-		$out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out);
-		if (substr($out,0,1) == "B") {  ; 
-			write("progress\0$idx\0".htmlspecialchars(substr($out,strrpos($out,"Block Pull")))) ;
-		} else echo write("addToID\0$idx\0 ".htmlspecialchars($out));
-	}
-	$retval = pclose($proc);
-	$out = $retval ? _('The command failed').'.' : _('The command finished successfully').'!';
-	write("stop_Wait\0$waitID","addLog\0<br><b>$out</b>");
-	return $retval===0;
+  $waitID = mt_rand();
+  [$cmd,$args] = explode(' ',$command,2);
+  write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Command execution')."</legend>".basename($cmd).' '.str_replace(" -","<br>&nbsp;&nbsp;-",htmlspecialchars($args))."<br><span id='wait-$waitID'>"._('Please wait')." </span><p class='logLine'></p></fieldset>","show_Wait\0$waitID");
+  write("addLog\0<br>") ;
+  #write("addToID\0$idx\0 $action") ;
+  $proc = popen("$command 2>&1",'r');
+  while ($out = fgets($proc)) {
+    $out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out);
+    if (substr($out,0,1) == "B") {  ; 
+      write("progress\0$idx\0".htmlspecialchars(substr($out,strrpos($out,"Block Pull")))) ;
+    } else echo write("addToID\0$idx\0 ".htmlspecialchars($out));
+  }
+  $retval = pclose($proc);
+  $out = $retval ? _('The command failed').'.' : _('The command finished successfully').'!';
+  write("stop_Wait\0$waitID","addLog\0<br><b>$out</b>");
+  return $retval===0;
   }
 
 #{action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc}
@@ -65,10 +66,10 @@ $style[] = "legend{font-size:1.1rem!important;font-weight:bold}";
 $style[] = "</style>";
 
 foreach (explode('&', $url) as $chunk) {
-    $param = explode("=", $chunk);
-    if ($param) {
-		${urldecode($param[0])} = urldecode($param[1]) ;
-    }
+  $param = explode("=", $chunk);
+  if ($param) {
+    ${urldecode($param[0])} = urldecode($param[1]) ;
+  }
 }
 $id = 1 ;
 write(implode($style)."<p class='logLine'></p>");
@@ -78,24 +79,23 @@ write("addLog\0".htmlspecialchars("VMName $name "));
 write("addLog\0".htmlspecialchars("SNAP $snapshotname "));
 write("addLog\0".htmlspecialchars("Base $targetbase "));
 if ($action == "commit") {
-	write("addLog\0".htmlspecialchars("Top $targettop "));
-	write("addLog\0".htmlspecialchars("Pivot $targetpivot "));
-	write("addLog\0".htmlspecialchars("Delete $targetdelete "));
+  write("addLog\0".htmlspecialchars("Top $targettop "));
+  write("addLog\0".htmlspecialchars("Pivot $targetpivot "));
+  write("addLog\0".htmlspecialchars("Delete $targetdelete "));
 }
 
 switch ($action) {
-	case "commit":	
-		vm_blockcommit($name,$snapshotname,$path,$targetbase,$targettop,$targetpivot,$targetdelete) ;
-		break ;
-	case "copy":
-		vm_blockcopy($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ;
-		break;
-	case "pull":
-		vm_blockpull($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ;
-		break ;
-
-	}	
+case "commit":  
+  vm_blockcommit($name,$snapshotname,$path,$targetbase,$targettop,$targetpivot,$targetdelete) ;
+  break ;
+case "copy":
+  vm_blockcopy($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ;
+  break;
+case "pull":
+  vm_blockpull($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ;
+  break ;
+} 
 #execCommand_nchan("ls /") ;
 write("stop_Wait\0$waitID") ;
 write('_DONE_','');
-?>
\ No newline at end of file
+?>
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
index 2c33227f7..2cdd7a319 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php -q
 <?PHP
 /* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,67 +12,65 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
-require_once "$docroot/webGui/include/Wrappers.php";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 // add translations
 $_SERVER['REQUEST_URI'] = '';
 $login_locale = _var($display,'locale');
-require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
-require_once "$docroot/webGui/include/Helpers.php";
-function write(...$messages){
-	$com = curl_init();
-	curl_setopt_array($com,[
-	  CURLOPT_URL => 'http://localhost/pub/vmaction?buffer_length=1',
-	  CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
-	  CURLOPT_POST => 1,
-	  CURLOPT_RETURNTRANSFER => true
-	]);
-	foreach ($messages as $message) {
-	  curl_setopt($com, CURLOPT_POSTFIELDS, $message);
-	  curl_exec($com);
-	}
-	curl_close($com);
-  }
-  function execCommand_nchan_clone($command,$idx,$refcmd=false) {
-	$waitID = mt_rand();
-	if ($refcmd) {
-		[$cmd,$args] = explode(' ',$refcmd,2);
-		write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Command execution')."</legend>".basename($cmd).' '.str_replace(" -","<br>&nbsp;&nbsp;-",htmlspecialchars($args))."<br><span id='wait-$waitID'>"._('Please wait')." </span><p class='logLine'></p></fieldset>","show_Wait\0$waitID");
-		$rtn = exec("$refcmd 2>&1", $output,$return) ;
-		if ($return == 0) $reflinkok = true ; else {
-			$reflinkok = false ;
-			write("addLog\0<br><b>{$output[0]}</b>");
-		}	
-		$out = $return ? _('The command failed revert to rsync')."." : _('The command finished successfully').'!';
-		write("stop_Wait\0$waitID","addLog\0<br><b>$out</b>");
-	}
 
-	if ($reflinkok) {
-		return true ;
-	} else {
-		$waitID = mt_rand();
-	[$cmd,$args] = explode(' ',$command,2);
-	write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Command execution')."</legend>".basename($cmd).' '.str_replace(" -","<br>&nbsp;&nbsp;-",htmlspecialchars($args))."<br><span id='wait-$waitID'>"._('Please wait')." </span><p class='logLine'></p></fieldset>","show_Wait\0$waitID");
-		
-	write("addToID\0$idx\0Cloning VM: ") ;
-	$proc = popen("$command 2>&1 &",'r');
-	while ($out = fread($proc,100)) {
-		$out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out);
-		$out = trim($out) ;
-		$values = explode('  ',$out) ;
-		$string = _("Data copied: ").$values[0].' '._(" Percentage: ").$values[1].' '._(" Transfer Rate: ").$values[2].' '._(" Time remaining: ").$values[4].$values[5]  ;
-		write("progress\0$idx\0".htmlspecialchars($string)) ;
-		if ($out) $stringsave=$string ;
-	}
-	$retval = pclose($proc);
-	write("progress\0$idx\0".htmlspecialchars($stringsave)) ;
-	$out = $retval ? _('The command failed').'.' : _('The command finished successfully').'!';
-	write("stop_Wait\0$waitID","addLog\0<br><b>$out</b>");
-	return $retval===0;
+function write(...$messages) {
+  $com = curl_init();
+  curl_setopt_array($com,[
+    CURLOPT_URL => 'http://localhost/pub/vmaction?buffer_length=1',
+    CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
+    CURLOPT_POST => 1,
+    CURLOPT_RETURNTRANSFER => true
+  ]);
+  foreach ($messages as $message) {
+    curl_setopt($com, CURLOPT_POSTFIELDS, $message);
+    curl_exec($com);
+  }
+  curl_close($com);
+}
+
+function execCommand_nchan_clone($command,$idx,$refcmd=false) {
+  $waitID = mt_rand();
+  if ($refcmd) {
+    [$cmd,$args] = explode(' ',$refcmd,2);
+    write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Command execution')."</legend>".basename($cmd).' '.str_replace(" -","<br>&nbsp;&nbsp;-",htmlspecialchars($args))."<br><span id='wait-$waitID'>"._('Please wait')." </span><p class='logLine'></p></fieldset>","show_Wait\0$waitID");
+    $rtn = exec("$refcmd 2>&1", $output,$return) ;
+    if ($return == 0) $reflinkok = true ; else {
+      $reflinkok = false ;
+      write("addLog\0<br><b>{$output[0]}</b>");
+    }
+    $out = $return ? _('The command failed revert to rsync')."." : _('The command finished successfully').'!';
+    write("stop_Wait\0$waitID","addLog\0<br><b>$out</b>");
+  }
+  if ($reflinkok) {
+    return true ;
+  } else {
+    $waitID = mt_rand();
+    [$cmd,$args] = explode(' ',$command,2);
+    write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Command execution')."</legend>".basename($cmd).' '.str_replace(" -","<br>&nbsp;&nbsp;-",htmlspecialchars($args))."<br><span id='wait-$waitID'>"._('Please wait')." </span><p class='logLine'></p></fieldset>","show_Wait\0$waitID");
+    write("addToID\0$idx\0Cloning VM: ") ;
+    $proc = popen("$command 2>&1 &",'r');
+    while ($out = fread($proc,100)) {
+      $out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out);
+      $out = trim($out);
+      $values = explode('  ',$out);
+      $string = _("Data copied: ").$values[0].' '._(" Percentage: ").$values[1].' '._(" Transfer Rate: ").$values[2].' '._(" Time remaining: ").$values[4].$values[5];
+      write("progress\0$idx\0".htmlspecialchars($string));
+      if ($out) $stringsave=$string;
+    }
+    $retval = pclose($proc);
+    write("progress\0$idx\0".htmlspecialchars($stringsave));
+    $out = $retval ? _('The command failed').'.' : _('The command finished successfully').'!';
+    write("stop_Wait\0$waitID","addLog\0<br><b>$out</b>");
+    return $retval===0;
   }
 }
 
@@ -86,10 +85,10 @@ $style[] = "legend{font-size:1.1rem!important;font-weight:bold}";
 $style[] = "</style>";
 
 foreach (explode('&', $url) as $chunk) {
-    $param = explode("=", $chunk);
-    if ($param) {
-		${urldecode($param[0])} = urldecode($param[1]) ;
-    }
+  $param = explode("=", $chunk);
+  if ($param) {
+    ${urldecode($param[0])} = urldecode($param[1]) ;
+  }
 }
 $id = 1 ;
 write(implode($style)."<p class='logLine'></p>");
@@ -99,10 +98,10 @@ write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._("O
 write("addLog\0".htmlspecialchars("Cloning $name to $clone"));
 
 switch ($action) {
-	case "clone":	
-		$rtn = vm_clone($name,$clone,$overwrite,$start,$edit,$free,$waitID) ;
-        break ;
-	}	
+case "clone":
+  $rtn = vm_clone($name,$clone,$overwrite,$start,$edit,$free,$waitID) ;
+  break ;
+}
 write("stop_Wait\0$waitID") ;
 if ($rtn) write('_DONE_',''); else write('_ERROR_','');
-?>
\ No newline at end of file
+?>
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
index 0eec953a3..705cc8381 100644
--- a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
@@ -15,7 +15,7 @@ table.domdisk tbody tr:nth-child(even){background-color:transparent!important}
 table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
 table.snapshot{margin-top:0}
 i.mover{margin-right:8px;display:none}
-i.fa-bullseye{padding-left:12px}
+i.fa-floppy-o{padding-left:12px}
 #resetsort{margin-left:12px;display:inline-block;width:32px}
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
 .dropdown-menu{z-index:10001}
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 939d352ed..256b831f6 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2021, 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,
@@ -12,15 +12,16 @@
  */
 ?>
 <?
-	$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+	$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+	require_once "$docroot/webGui/include/Helpers.php";
+	require_once "$docroot/webGui/include/Custom.php";
+	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
+
 	// add translations
 	if (substr($_SERVER['REQUEST_URI'],0,4) != '/VMs') {
 		$_SERVER['REQUEST_URI'] = 'vms';
 		require_once "$docroot/webGui/include/Translations.php";
 	}
-	require_once "$docroot/webGui/include/Helpers.php";
-	require_once "$docroot/webGui/include/Custom.php";
-	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 	$arrValidMachineTypes = getValidMachineTypes();
 	$arrValidGPUDevices = getValidGPUDevices();
@@ -449,13 +450,13 @@
 					}
 				?>
 				</select>
-			
-			<?			
+
+			<?
 			$usbboothidden =  "hidden" ;
 				if ($arrConfig['domain']['ovmf'] != '0') $usbboothidden = "" ;
 				?>
 				<span id="USBBoottext" class="advanced" <?=$usbboothidden?>>_(Enable USB boot)_:</span>
-								
+
 				<select name="domain[usbboot]" id="domain_usbboot" class="narrow" title="_(define OS boot options)_" <?=$usbboothidden?> onchange="USBBootChange(this)">
 				<?
 					echo mk_option($arrConfig['domain']['usbboot'], 'No', 'No');
@@ -607,8 +608,8 @@
 							$boolShowAllDisks = (strpos($domain_cfg['DOMAINDIR'], '/mnt/user/') === 0);
 
 							if (!empty($arrDisk['new'])) {
-								if (strpos($domain_cfg['DOMAINDIR'], dirname(dirname($arrDisk['new']))) === false || 
-									basename(dirname($arrDisk['new'])) != $arrConfig['domain']['name'] || 
+								if (strpos($domain_cfg['DOMAINDIR'], dirname(dirname($arrDisk['new']))) === false ||
+									basename(dirname($arrDisk['new'])) != $arrConfig['domain']['name'] ||
 									basename($arrDisk['new']) != 'vdisk'.($i+1).'.img') {
 									$default_option = 'manual';
 								}
@@ -736,12 +737,12 @@
 				<b>vDisk Bus</b><br>
 				Select virtio for best performance.
 			</p>
-			
+
 			<p class="advanced">
 				<b>vDisk Boot Order</b><br>
 				Specify the order the devices are used for booting.
 			</p>
-			
+
 			<p class="advanced">
 				<b>vDisk Serial</b><br>
 				Set the device serial number presented to the VM.
@@ -837,7 +838,7 @@
 					<select name="disk[{{INDEX}}][bus]" class="disk_bus narrow">
 					<?mk_dropdown_options($arrValidDiskBuses, '');?>
 					</select>
-				
+
 				_(Boot Order)_:
 				<input type="number" size="5" maxlength="5" id="disk[{{INDEX}}][boot]" class="narrow bootorder" style="width: 50px;" name="disk[{{INDEX}}][boot]"   title="_(Boot order)_"  value="" >
 				</td>
@@ -868,7 +869,7 @@
 				</select>
 				_(Unraid Share)_:
 				<select name="shares[<?=$i?>][unraid]" class="disk_bus narrow"  onchange="ShareChange(this)" >
-				    <?	$UnraidShareDisabled = ' disabled="disabled"' ; 
+				    <?	$UnraidShareDisabled = ' disabled="disabled"' ;
 					    $arrUnraidIndex = array_search("User:".$arrShare['target'],$arrUnraidShares) ;
 					    if ($arrUnraidIndex != false && substr($arrShare['source'],0,10) != '/mnt/user/') $arrUnraidIndex = false ;
 					    if ($arrUnraidIndex == false) $arrUnraidIndex = array_search("Disk:".$arrShare['target'],$arrUnraidShares) ;
@@ -876,11 +877,11 @@
 						mk_dropdown_options($arrUnraidShares, $arrUnraidIndex);?>
 				</select>
 				</td>
-				</tr>	
+				</tr>
 
 			<tr class="advanced">
-				<td> 
-					<text id="shares[<?=$i?>]sourcetext" > _(Unraid Source Path)_: </text> 
+				<td>
+					<text id="shares[<?=$i?>]sourcetext" > _(Unraid Source Path)_: </text>
 				</td>
 				<td>
 					<input type="text" <?=$UnraidShareDisabled?> id="shares[<?=$i?>][source]" name="shares[<?=$i?>][source]" autocomplete="off" data-pickfolders="true" data-pickfilter="NO_FILES_FILTER" data-pickroot="/mnt/" value="<?=htmlspecialchars($arrShare['source'])?>" placeholder="_(e.g.)_ /mnt/user/..." title="_(path of Unraid share)_" />
@@ -903,7 +904,7 @@
 						Used to create a VirtFS mapping to a Linux-based guest.  Specify the mode you want to use either 9p or Virtiofs.
 					</p>
 
-					
+
 					<p>
 						<b>Unraid Share</b><br>
 						Set tag and path to match the selected Unraid share.
@@ -918,8 +919,8 @@
 						<b>Unraid Mount tag</b><br>
 						Specify the mount tag that you will use for mounting the VirtFS share inside the VM.  See this page for how to do this on a Linux-based guest: <a href="http://wiki.qemu.org/Documentation/9psetup" target="_blank">http://wiki.qemu.org/Documentation/9psetup</a>
 					</p>
-					<p>	
-						For Windows additional software needs to be installed: <a href="https://virtio-fs.gitlab.io/howto-windows.html" target="_blank">https://virtio-fs.gitlab.io/howto-windows.html</a>	
+					<p>
+						For Windows additional software needs to be installed: <a href="https://virtio-fs.gitlab.io/howto-windows.html" target="_blank">https://virtio-fs.gitlab.io/howto-windows.html</a>
 					</p>
 
 					<p>Additional devices can be added/removed by clicking the symbols to the left.</p>
@@ -939,12 +940,12 @@
 				</select>
 
 				_(Unraid Share)_:
-				
+
 				<select name="shares[{{INDEX}}][unraid]" class="disk_bus narrow"  onchange="ShareChange(this)" >
 					<?mk_dropdown_options($arrUnraidShares, '');?>
 				</select>
 				</td>
-				</tr>	
+				</tr>
 
 			<tr class="advanced">
 				<td>_(Unraid Source Path)_:</td>
@@ -975,7 +976,7 @@
 						if ($i == 0) {
 							// Only the first video card can be VNC or SPICE
 							echo mk_option($arrGPU['id'], 'virtual', _('Virtual'));
-							
+
 						} else {
 							echo mk_option($arrGPU['id'], '', _('None'));
 						}
@@ -985,11 +986,11 @@
 						}
 					?>
 					</select>
-					<?			
+					<?
 					if ($arrGPU['id'] != 'virtual') $multifunction = "" ; else $multifunction =  " disabled " ;
 					?>
 					<span id="GPUMulti<?=$i?>" name="gpu[<?=$i?>][multi]" class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced gpumultiline<?=$i?>"   >_(Multifunction)_:</span>
-								
+
 					<select id="GPUMultiSel<?=$i?>" name="gpu[<?=$i?>][multi]" class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced narrow gpumultiselect<?=$i?>" title="_(define Multifunctiion Support)_" <?=$multifunction?> >
 					<?
 						echo mk_option($arrGPU['guest']['multi'], 'off', 'Off');
@@ -999,7 +1000,7 @@
 				</td>
 			</tr>
 
-			<?if ($i == 0) { 
+			<?if ($i == 0) {
 				$hiddenport = $hiddenwsport = "hidden" ;
 				if ($arrGPU['autoport'] == "no"){
 				if ($arrGPU['protocol'] == "vnc") $hiddenport = $hiddenwsport = "" ;
@@ -1033,13 +1034,13 @@
 						echo mk_option($arrGPU['autoport'], 'no', _('No'));
 						?>
 					</select>
-				
+
 					<span id="Porttext"  <?=$hiddenport?>>_(VM Console Port)_:</span>
-				
+
 				    <input type="number" size="5" maxlength="5"  id="port" class="narrow" style="width: 50px;" name="gpu[<?=$i?>][port]"   title="_(port for virtual console)_"  value="<?=$arrGPU['port']?>"  <?=$hiddenport?> >
-				
+
 					<span id="WSPorttext" <?=$hiddenwsport?>>_(VM Console WS Port)_:</span>
-				
+
 				    <input type="number" size="5" maxlength="5" id="wsport" class="narrow" style="width: 50px;" name="gpu[<?=$i?>][wsport]"   title="_(wsport for virtual console)_"  value="<?=$arrGPU['wsport']?>" <?=$hiddenwsport?> >
 				</td>
 			</tr>
@@ -1082,7 +1083,7 @@
 
 			<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
 				<b>Virtual video protocol VNC/SPICE</b><br>
-				If you wish to assign a protocol type, specify one here. 
+				If you wish to assign a protocol type, specify one here.
 			</p>
 
 			<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
@@ -1092,7 +1093,7 @@
 
 			<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
 				<b>Virtual auto port</b><br>
-				Set it you want to specify a manual port for VNC or Spice. VNC needs two ports where Spice only requires one. Leave as auto yes for the system to set. 
+				Set it you want to specify a manual port for VNC or Spice. VNC needs two ports where Spice only requires one. Leave as auto yes for the system to set.
 			</p>
 
 			<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced vncmodel">
@@ -1196,13 +1197,13 @@
 	</script>
 
 	<?	if ( $arrConfig['nic'] == false) {
-	  		$arrConfig['nic']['0'] = 
+	  		$arrConfig['nic']['0'] =
 			[
 				'network' => $domain_bridge,
 				'mac' => "",
 				'model' => 'virtio-net'
 			] ;
-		}	
+		}
 	  	foreach ($arrConfig['nic'] as $i => $arrNic) {
 		$strLabel = ($i > 0) ? appendOrdinalSuffix($i + 1) : '';
 
@@ -1326,7 +1327,7 @@
 
 	<table>
 		<tr><td></td>
-		<td>_(Select)_&nbsp&nbsp_(Optional)_&nbsp&nbsp_(Boot Order)_</td></tr></div> 
+		<td>_(Select)_&nbsp&nbsp_(Optional)_&nbsp&nbsp_(Boot Order)_</td></tr></div>
 		<tr>
 			<td>_(USB Devices)_:</td>
 			<td>
@@ -1336,7 +1337,7 @@
 						foreach($arrVMUSBs as $i => $arrDev) {
 						?>
 						<label for="usb<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="usb[]" id="usb<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if (count(array_filter($arrConfig['usb'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) echo 'checked="checked"';?>
-						/> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp <input type="checkbox" name="usbopt[<?=htmlspecialchars($arrDev['id'])?>]" id="usbopt<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if ($arrDev["startupPolicy"] =="optional") echo 'checked="checked"';?>/>&nbsp&nbsp&nbsp&nbsp&nbsp 
+						/> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp <input type="checkbox" name="usbopt[<?=htmlspecialchars($arrDev['id'])?>]" id="usbopt<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if ($arrDev["startupPolicy"] =="optional") echo 'checked="checked"';?>/>&nbsp&nbsp&nbsp&nbsp&nbsp
 						<input type="number" size="5" maxlength="5" id="usbboot<?=$i?>" class="narrow bootorder" <?=$bootdisable?>  style="width: 50px;" name="usbboot[<?=htmlspecialchars($arrDev['id'])?>]"   title="_(Boot order)_"  value="<?=$arrDev['usbboot']?>" >
 						<?=htmlspecialchars($arrDev['name'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
 						<?
@@ -1357,7 +1358,7 @@
 
 	<table>
 	<tr><td></td>
-		<td>_(Select)_&nbsp&nbsp_(Boot Order)_</td></tr></div> 
+		<td>_(Select)_&nbsp&nbsp_(Boot Order)_</td></tr></div>
 		<tr>
 		<tr>
 			<td>_(Other PCI Devices)_:</td>
@@ -1373,14 +1374,14 @@
 							if (count($pcidevice=array_filter($arrConfig['pci'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) {
 								$extra .= ' checked="checked"';
 								foreach ($pcidevice as $pcikey => $pcidev)  $pciboot = $pcidev["boot"];  ;
-									
+
 							} elseif (!in_array($arrDev['driver'], ['pci-stub', 'vfio-pci'])) {
 								//$extra .= ' disabled="disabled"';
 								continue;
 							}
 							$intAvailableOtherPCIDevices++;
 					?>
-						<label for="pci<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="pci[]" id="pci<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?=$extra?>/> &nbsp 
+						<label for="pci<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="pci[]" id="pci<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?=$extra?>/> &nbsp
 						<input type="number" size="5" maxlength="5" id="pciboot<?=$i?>" class="narrow pcibootorder" <?=$bootdisable?>  style="width: 50px;" name="pciboot[<?=htmlspecialchars($arrDev['id'])?>]"   title="_(Boot order)_"  value="<?=$pciboot?>" >
 						<?=htmlspecialchars($arrDev['name'])?> | <?=htmlspecialchars($arrDev['type'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
 					<?
@@ -1471,8 +1472,8 @@ function ShareChange(share) {
 			var path = "/mnt/" + strArray[1] ;
 		}
 		if (strArray[0] != "Manual") {
-		document.getElementById(name+"[target]").value = strArray[1] ;	
-		document.getElementById(name+"[source]").value = path ;	
+		document.getElementById(name+"[target]").value = strArray[1] ;
+		document.getElementById(name+"[source]").value = path ;
 		document.getElementById(name+"[target]").setAttribute("disabled","disabled");
 		document.getElementById(name+"[source]").setAttribute("disabled","disabled");
 		} else {
@@ -1503,18 +1504,18 @@ function SetBootorderfields(usbbootvalue) {
 		} else bootelements[i].removeAttribute("disabled");
 	}
 	var bootelements = document.getElementsByClassName("pcibootorder");
-	const bootpcidevs = <? 	
+	const bootpcidevs = <?
 		$devlist = [] ;
 		foreach($arrValidOtherDevices as $i => $arrDev) {
 			if ($arrDev["typeid"] != "0108" && substr($arrDev["typeid"],0,2) != "02") $devlist[$arrDev['id']] = "N" ; else $devlist[$arrDev['id']] = "Y" ;
 		}
 		echo json_encode($devlist) ;
-		?>  
+		?>
 
 	for(var i = 0; i < bootelements.length; i++) {
 		let bootpciid = bootelements[i].name.split('[') ;
 		bootpciid= bootpciid[1].replace(']', '') ;
-		
+
 		if (usbbootvalue == "Yes") {
 		bootelements[i].value = "";
 		bootelements[i].setAttribute("disabled","disabled");
@@ -1552,7 +1553,7 @@ function AutoportChange(autoport) {
 				document.getElementById("wsport").style.visibility="hidden";
 				document.getElementById("WSPorttext").style.visibility="hidden";
 			}
-		}	
+		}
 	}
 
 function ProtocolChange(protocol) {
@@ -1576,10 +1577,10 @@ function ProtocolChange(protocol) {
 				document.getElementById("wsport").style.visibility="hidden";
 				document.getElementById("WSPorttext").style.visibility="hidden";
 			}
-		}	
+		}
 	}
-		
-	
+
+
 
 
 
@@ -1747,7 +1748,7 @@ $(function() {
 				var auto_serial = 'vdisk' + (index+1) ;
 				$disk_serial.val(auto_serial);
 
-			} 
+			}
 
 		});
 	};
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/LibreELEC.form.php b/emhttp/plugins/dynamix.vm.manager/templates/LibreELEC.form.php
index 693b36e48..7a95546a0 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/LibreELEC.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/LibreELEC.form.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2021, 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,
@@ -12,15 +12,16 @@
  */
 ?>
 <?
-	$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+	$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+	require_once "$docroot/webGui/include/Helpers.php";
+	require_once "$docroot/webGui/include/Custom.php";
+	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
+
 	// add translations
 	if (substr($_SERVER['REQUEST_URI'],0,4) != '/VMs') {
 		$_SERVER['REQUEST_URI'] = 'vms';
 		require_once "$docroot/webGui/include/Translations.php";
 	}
-	require_once "$docroot/webGui/include/Helpers.php";
-	require_once "$docroot/webGui/include/Custom.php";
-	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 	$arrValidMachineTypes = getValidMachineTypes();
 	$arrValidGPUDevices = getValidGPUDevices();
@@ -666,12 +667,12 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 						}
 					?>
 					</select>
-					<?			
+					<?
 			$usbboothidden =  "hidden" ;
 				if ($arrConfig['domain']['ovmf'] != '0') $usbboothidden = "" ;
 				?>
 				<span id="USBBoottext" class="advanced" <?=$usbboothidden?>>_(Enable USB boot)_:</span>
-								
+
 				<select name="domain[usbboot]" id="domain_usbboot" class="narrow" title="_(define OS boot options)_" <?=$usbboothidden?> onchange="USBBootChange(this)">
 				<?
 					echo mk_option($arrConfig['domain']['usbboot'], 'No', 'No');
@@ -748,7 +749,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 						</select>
 					</td>
 				</tr>
-				<?if ($i == 0) { 
+				<?if ($i == 0) {
 					$hiddenport = $hiddenwsport = "hidden" ;
 					if ($arrGPU['autoport'] == "no"){
 					if ($arrGPU['protocol'] == "vnc") $hiddenport = $hiddenwsport = "" ;
@@ -772,13 +773,13 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 							echo mk_option($arrGPU['autoport'], 'no', _('No'));
 							?>
 						</select>
-										
+
 					<span id="Porttext"  <?=$hiddenport?>>_(VM Console Port)_:</span>
-				
+
 				    <input type="number" size="5" maxlength="5"  id="port" class="narrow" style="width: 50px;" name="gpu[<?=$i?>][port]"  title="_(port for virtual console)_"  value="<?=$arrGPU['port']?>"  <?=$hiddenport?> >
-				
+
 					<span id="WSPorttext" <?=$hiddenwsport?>>_(VM Console WS Port)_:</span>
-				
+
 				    <input type="number" size="5" maxlength="5" id="wsport" class="narrow" style="width: 50px;" name="gpu[<?=$i?>][wsport]"  title="_(wsport for virtual console)_"  value="<?=$arrGPU['wsport']?>" <?=$hiddenwsport?> >
 				</td>
 				</tr>
@@ -800,19 +801,19 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 					<b>virtual video protocol VDA/SPICE</b><br>
 					If you wish to assign a protocol type, specify one here.
 				</p>
-	
+
 				<b>Graphics Card</b><br>
 				If you wish to assign a graphics card to the VM, select it from this list, otherwise leave it set to virtual.
 				</p>
 
 				<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
 					<b>virtual video protocol VDC/SPICE</b><br>
-					If you wish to assign a protocol type, specify one here. 
+					If you wish to assign a protocol type, specify one here.
 				</p>
 
 				<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
 					<b>virtual auto port</b><br>
-					Set it you want to specify a manual port for VNC or Spice. VNC needs two ports where Spice only requires one. Leave as auto yes for the system to set. 
+					Set it you want to specify a manual port for VNC or Spice. VNC needs two ports where Spice only requires one. Leave as auto yes for the system to set.
 				</p>
 
 
@@ -898,15 +899,15 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 			</table>
 		</script>
 
-		<?	
+		<?
 		if ( $arrConfig['nic'] == false) {
-			$arrConfig['nic']['0'] = 
+			$arrConfig['nic']['0'] =
 		  	[
 			  'network' => $domain_bridge,
 			  'mac' => "",
 			  'model' => 'virtio-net'
 		  	] ;
-	  	}	
+	  	}
 	  	foreach ($arrConfig['nic'] as $i => $arrNic) {
 		$strLabel = ($i > 0) ? appendOrdinalSuffix($i + 1) : '';
 
@@ -951,7 +952,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 					<td>
 					<input type="number" size="5" maxlength="5" id="nic[<?=$i?>][boot]" class="narrow bootorder" <?=$bootdisable?>  style="width: 50px;" name="nic[<?=$i?>][boot]"   title="_(Boot order)_"  value="<?=$arrNic['boot']?>" >
 					</td>
-				</tr>	
+				</tr>
 			</table>
 			<?if ($i == 0) {?>
 			<div class="advanced">
@@ -1025,7 +1026,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 
 		<table>
 			<tr><td></td>
-			<td>_(Select)_&nbsp&nbsp_(Optional)_&nbsp&nbsp_(Boot Order)_</td></tr></div> 
+			<td>_(Select)_&nbsp&nbsp_(Optional)_&nbsp&nbsp_(Boot Order)_</td></tr></div>
 			<tr>
 			<tr>
 				<td>_(USB Devices)_:</td>
@@ -1057,7 +1058,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 
 	<table>
 	<tr><td></td>
-		<td>_(Select)_&nbsp&nbsp_(Boot Order)_</td></tr></div> 
+		<td>_(Select)_&nbsp&nbsp_(Boot Order)_</td></tr></div>
 		<tr>
 			<tr>
 				<td>_(Other PCI Devices)_:</td>
@@ -1073,14 +1074,14 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 							if (count($pcidevice=array_filter($arrConfig['pci'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) {
 								$extra .= ' checked="checked"';
 								foreach ($pcidevice as $pcikey => $pcidev)  $pciboot = $pcidev["boot"];  ;
-									
+
 								} elseif (!in_array($arrDev['driver'], ['pci-stub', 'vfio-pci'])) {
 									//$extra .= ' disabled="disabled"';
 									continue;
 								}
 								$intAvailableOtherPCIDevices++;
 						?>
-						<label for="pci<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="pci[]" id="pci<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?=$extra?>/> &nbsp 
+						<label for="pci<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="pci[]" id="pci<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?=$extra?>/> &nbsp
 						<input type="number" size="5" maxlength="5" id="pciboot<?=$i?>" class="narrow pcibootorder" <?=$bootdisable?>  style="width: 50px;" name="pciboot[<?=htmlspecialchars($arrDev['id'])?>]"   title="_(Boot order)_"  value="<?=$pciboot?>" >
 						<?=htmlspecialchars($arrDev['name'])?> | <?=htmlspecialchars($arrDev['type'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
 					<?
@@ -1159,7 +1160,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 <script src="<?autov('/plugins/dynamix.vm.manager/scripts/codemirror/addon/hint/libvirt-schema.js')?>"></script>
 <script src="<?autov('/plugins/dynamix.vm.manager/scripts/codemirror/mode/xml/xml.js')?>"></script>
 <script type="text/javascript">
-	
+
 function BIOSChange(bios) {
 		var value = bios.value;
 		if (value == "0") {
@@ -1182,18 +1183,18 @@ function SetBootorderfields(usbbootvalue) {
 		} else bootelements[i].removeAttribute("disabled");
 	}
 	var bootelements = document.getElementsByClassName("pcibootorder");
-	const bootpcidevs = <? 	
+	const bootpcidevs = <?
 		$devlist = [] ;
 		foreach($arrValidOtherDevices as $i => $arrDev) {
 			if ($arrDev["typeid"] != "0108") $devlist[$arrDev['id']] = "N" ; else $devlist[$arrDev['id']] = "Y" ;
 		}
 		echo json_encode($devlist) ;
-		?>  
+		?>
 
 	for(var i = 0; i < bootelements.length; i++) {
 		let bootpciid = bootelements[i].name.split('[') ;
 		bootpciid= bootpciid[1].replace(']', '') ;
-		
+
 		if (usbbootvalue == "Yes") {
 		bootelements[i].value = "";
 		bootelements[i].setAttribute("disabled","disabled");
@@ -1231,7 +1232,7 @@ function AutoportChange(autoport) {
 				document.getElementById("wsport").style.visibility="hidden";
 				document.getElementById("WSPorttext").style.visibility="hidden";
 			}
-		}	
+		}
 	}
 
 function ProtocolChange(protocol) {
@@ -1255,10 +1256,10 @@ function ProtocolChange(protocol) {
 				document.getElementById("wsport").style.visibility="hidden";
 				document.getElementById("WSPorttext").style.visibility="hidden";
 			}
-		}	
+		}
 	}
-		
-	
+
+
 $(function() {
 	function completeAfter(cm, pred) {
 		var cur = cm.getCursor();
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/OpenELEC.form.php b/emhttp/plugins/dynamix.vm.manager/templates/OpenELEC.form.php
index 90fe5fcce..a476296bb 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/OpenELEC.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/OpenELEC.form.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2021, 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,
@@ -12,15 +12,16 @@
  */
 ?>
 <?
-	$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+	$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+	require_once "$docroot/webGui/include/Helpers.php";
+	require_once "$docroot/webGui/include/Custom.php";
+	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
+
 	// add translations
 	if (substr($_SERVER['REQUEST_URI'],0,4) != '/VMs') {
 		$_SERVER['REQUEST_URI'] = 'vms';
 		require_once "$docroot/webGui/include/Translations.php";
 	}
-	require_once "$docroot/webGui/include/Helpers.php";
-	require_once "$docroot/webGui/include/Custom.php";
-	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 	$arrValidMachineTypes = getValidMachineTypes();
 	$arrValidGPUDevices = getValidGPUDevices();
@@ -665,12 +666,12 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 						}
 					?>
 					</select>
-					<?			
+					<?
 			$usbboothidden =  "hidden" ;
 				if ($arrConfig['domain']['ovmf'] != '0') $usbboothidden = "" ;
 				?>
 				<span id="USBBoottext" class="advanced" <?=$usbboothidden?>>_(Enable USB boot)_:</span>
-								
+
 				<select name="domain[usbboot]" id="domain_usbboot" class="narrow" title="_(define OS boot options)_" <?=$usbboothidden?> onchange="USBBootChange(this)">
 				<?
 					echo mk_option($arrConfig['domain']['usbboot'], 'No', 'No');
@@ -747,7 +748,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 						</select>
 					</td>
 				</tr>
-			<?if ($i == 0) { 
+			<?if ($i == 0) {
 				$hiddenport = $hiddenwsport = "hidden" ;
 				if ($arrGPU['autoport'] == "no"){
 				if ($arrGPU['protocol'] == "vnc") $hiddenport = $hiddenwsport = "" ;
@@ -771,13 +772,13 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 						echo mk_option($arrGPU['autoport'], 'no', _('No'));
 						?>
 					</select>
-									
+
 				<span id="Porttext"  <?=$hiddenport?>>_(VM Console Port)_:</span>
-			
+
 				<input type="number" size="5" maxlength="5"  id="port" class="narrow" style="width: 50px;" name="gpu[<?=$i?>][port]"  title="_(port for virtual console)_"  value="<?=$arrGPU['port']?>"  <?=$hiddenport?> >
-		
+
 				<span id="WSPorttext" <?=$hiddenwsport?>>_(VM Console WS Port)_:</span>
-		
+
 				<input type="number" size="5" maxlength="5" id="wsport" class="narrow" style="width: 50px;" name="gpu[<?=$i?>][wsport]"  title="_(wsport for virtual console)_"  value="<?=$arrGPU['wsport']?>" <?=$hiddenwsport?> >
 			</td>
 			</tr>
@@ -802,12 +803,12 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 
 				<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
 					<b>virtual video protocol VDC/SPICE</b><br>
-					If you wish to assign a protocol type, specify one here. 
+					If you wish to assign a protocol type, specify one here.
 				</p>
 
 				<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
 					<b>virtual auto port</b><br>
-					Set it you want to specify a manual port for VNC or Spice. VNC needs two ports where Spice only requires one. Leave as auto yes for the system to set. 
+					Set it you want to specify a manual port for VNC or Spice. VNC needs two ports where Spice only requires one. Leave as auto yes for the system to set.
 				</p>
 
 				<p class="<?if ($arrGPU['id'] == 'virtual') echo 'was';?>advanced romfile">
@@ -893,7 +894,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 		</script>
 
 		<?if ( $arrConfig['nic'] == false) {
-	  		$arrConfig['nic']['0'] = 
+	  		$arrConfig['nic']['0'] =
 			[
 				'network' => $domain_bridge,
 				'mac' => "",
@@ -944,7 +945,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 					<td>
 					<input type="number" size="5" maxlength="5" id="nic[<?=$i?>][boot]" class="narrow bootorder" <?=$bootdisable?>  style="width: 50px;" name="nic[<?=$i?>][boot]"   title="_(Boot order)_"  value="<?=$arrNic['boot']?>" >
 					</td>
-				</tr>	
+				</tr>
 			</table>
 			<?if ($i == 0) {?>
 			<div class="advanced">
@@ -1018,7 +1019,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 
 		<table>
 		<tr><td></td>
-			<td>_(Select)_&nbsp&nbsp_(Optional)_&nbsp&nbsp_(Boot Order)_</td></tr></div> 
+			<td>_(Select)_&nbsp&nbsp_(Optional)_&nbsp&nbsp_(Boot Order)_</td></tr></div>
 			<tr>
 			<tr>
 				<td>_(USB Devices)_:</td>
@@ -1029,7 +1030,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 							foreach($arrVMUSBs as $i => $arrDev) {
 							?>
 							<label for="usb<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="usb[]" id="usb<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if (count(array_filter($arrConfig['usb'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) echo 'checked="checked"';?>
-							/> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp <input type="checkbox" name="usbopt[<?=htmlspecialchars($arrDev['id'])?>]]" id="usbopt<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if ($arrDev["startupPolicy"] =="optional") echo 'checked="checked"';?>/>&nbsp&nbsp&nbsp&nbsp&nbsp			
+							/> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp <input type="checkbox" name="usbopt[<?=htmlspecialchars($arrDev['id'])?>]]" id="usbopt<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if ($arrDev["startupPolicy"] =="optional") echo 'checked="checked"';?>/>&nbsp&nbsp&nbsp&nbsp&nbsp
 							<input type="number" size="5" maxlength="5" id="usbboot<?=$i?>" class="narrow bootorder" <?=$bootdisable?>  style="width: 50px;" name="usbboot[<?=htmlspecialchars($arrDev['id'])?>]]"   title="_(Boot order)_"  value="<?=$arrDev['usbboot']?>" >
 						    <?=htmlspecialchars($arrDev['name'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
 							<?
@@ -1050,7 +1051,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 
 	<table>
 	<tr><td></td>
-		<td>_(Select)_&nbsp&nbsp_(Boot Order)_</td></tr></div> 
+		<td>_(Select)_&nbsp&nbsp_(Boot Order)_</td></tr></div>
 		<tr>
 			<tr>
 				<td>_(Other PCI Devices)_:</td>
@@ -1066,14 +1067,14 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 							if (count($pcidevice=array_filter($arrConfig['pci'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) {
 								$extra .= ' checked="checked"';
 								foreach ($pcidevice as $pcikey => $pcidev)  $pciboot = $pcidev["boot"];  ;
-									
+
 								} elseif (!in_array($arrDev['driver'], ['pci-stub', 'vfio-pci'])) {
 									//$extra .= ' disabled="disabled"';
 									continue;
 								}
 								$intAvailableOtherPCIDevices++;
 						?>
-						<label for="pci<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="pci[]" id="pci<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?=$extra?>/> &nbsp 
+						<label for="pci<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="pci[]" id="pci<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?=$extra?>/> &nbsp
 						<input type="number" size="5" maxlength="5" id="pciboot<?=$i?>" class="narrow pcibootorder" <?=$bootdisable?>  style="width: 50px;" name="pciboot[<?=htmlspecialchars($arrDev['id'])?>]"   title="_(Boot order)_"  value="<?=$pciboot?>" >
 						<?=htmlspecialchars($arrDev['name'])?> | <?=htmlspecialchars($arrDev['type'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
 					<?
@@ -1175,18 +1176,18 @@ function SetBootorderfields(usbbootvalue) {
 		} else bootelements[i].removeAttribute("disabled");
 	}
 	var bootelements = document.getElementsByClassName("pcibootorder");
-	const bootpcidevs = <? 	
+	const bootpcidevs = <?
 		$devlist = [] ;
 		foreach($arrValidOtherDevices as $i => $arrDev) {
 			if ($arrDev["typeid"] != "0108") $devlist[$arrDev['id']] = "N" ; else $devlist[$arrDev['id']] = "Y" ;
 		}
 		echo json_encode($devlist) ;
-		?>  
+		?>
 
 	for(var i = 0; i < bootelements.length; i++) {
 		let bootpciid = bootelements[i].name.split('[') ;
 		bootpciid= bootpciid[1].replace(']', '') ;
-		
+
 		if (usbbootvalue == "Yes") {
 		bootelements[i].value = "";
 		bootelements[i].setAttribute("disabled","disabled");
@@ -1224,7 +1225,7 @@ function AutoportChange(autoport) {
 				document.getElementById("wsport").style.visibility="hidden";
 				document.getElementById("WSPorttext").style.visibility="hidden";
 			}
-		}	
+		}
 	}
 
 function ProtocolChange(protocol) {
@@ -1248,7 +1249,7 @@ function ProtocolChange(protocol) {
 				document.getElementById("wsport").style.visibility="hidden";
 				document.getElementById("WSPorttext").style.visibility="hidden";
 			}
-		}	
+		}
 	}
 $(function() {
 	function completeAfter(cm, pred) {
@@ -1292,7 +1293,7 @@ $(function() {
 	});
 
 	SetBootorderfields("<?=$arrConfig['domain']['usbboot']?>") ;
-	
+
 	function resetForm() {
 		$("#vmform .domain_vcpu").change(); // restore the cpu checkbox disabled states
 		<?if ($boolRunning):?>
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/XML_Expert.form.php b/emhttp/plugins/dynamix.vm.manager/templates/XML_Expert.form.php
index 666b868a7..b73ede75a 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/XML_Expert.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/XML_Expert.form.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2021, 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,
@@ -12,14 +12,15 @@
  */
 ?>
 <?
-	$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+	$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+	require_once "$docroot/webGui/include/Helpers.php";
+	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
+
 	// add translations
 	if (substr($_SERVER['REQUEST_URI'],0,4) != '/VMs') {
 		$_SERVER['REQUEST_URI'] = 'vms';
 		require_once "$docroot/webGui/include/Translations.php";
 	}
-	require_once "$docroot/webGui/include/Helpers.php";
-	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 
 	$hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaration
 
diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 3fc0c0204..114a11309 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -69,6 +69,7 @@ function addPoolPopup() {
   // Start Dialog section
   popup.dialog({
     title: "_(Add Pool)_",
+    height: 'auto',
     width: 600,
     resizable: false,
     modal: true,
@@ -115,6 +116,7 @@ function addSubpoolPopup(poolname,currentsubpools) {
   // Start Dialog section
   popup.dialog({
     title: "_(Add ZFS Subpool)_",
+    height: 'auto',
     width: 600,
     resizable: false,
     modal: true,
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 7a7ccaa6b..544986cb7 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -1289,6 +1289,7 @@ function contentMgmt() {
   box.html($("#templateContentMgmt").html().build());
   box.dialog({
     title: "_(Tile Management)_",
+    height: 'auto',
     width: 900,
     resizable: false,
     modal: true,
@@ -1328,6 +1329,7 @@ function VMClone(uuid, name){
   document.getElementById("Overwrite").checked = true;
   box.dialog({
     title: "_(VM Clone)_",
+    height: 'auto',
     width: 600,
     resizable: false,
     modal: true,
@@ -1369,6 +1371,7 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist){
   document.getElementById("targetsnapfspc").checked = true;
   box.dialog({
     title: optiontext,
+    height: 'auto',
     width: 600,
     resizable: false,
     modal: true,
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 179e1fad1..102db94f8 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -484,6 +484,7 @@ function renamePoolPopup() {
   // Start Dialog section
   popup.dialog({
     title: "_(Rename Pool)_",
+    height: 'auto',
     width: 600,
     resizable: false,
     modal: true,
@@ -1335,7 +1336,7 @@ $(function() {
 <?if (fsType('btrfs')):?>
   presetBTRFS(document.balance_schedule,'#balance-hour');
   presetBTRFS(document.scrub_schedule,'#scrub-hour');
-<?elseif (fsType('zfs')):?>
+<?elseif (fsType('zfs') && !isSubpool($name)):?>
   presetZFS(document.scrub_schedule,'#scrub-hour');
 <?endif;?>
 });
diff --git a/emhttp/plugins/dynamix/ManagementAccess.page b/emhttp/plugins/dynamix/ManagementAccess.page
index 9836b3824..da7fb78e7 100644
--- a/emhttp/plugins/dynamix/ManagementAccess.page
+++ b/emhttp/plugins/dynamix/ManagementAccess.page
@@ -52,7 +52,7 @@ function acceptableCert($certFile, $hostname, $expectedURL) {
   return false;
 }
 $tasks       = find_tasks();
-$nginx       = @parse_ini_file('/var/local/emhttp/nginx.ini') ?: [];
+$nginx       = (array)@parse_ini_file('/var/local/emhttp/nginx.ini');
 $addr        = _var($nginx,'NGINX_LANIP') ?: _var($nginx,'NGINX_LANIP6');
 $keyfile     = empty(_var($var,'regFILE')) ? false : @file_get_contents(_var($var,'regFILE'));
 $cert2Issuer = '';
diff --git a/emhttp/plugins/dynamix/SyslogSettings.page b/emhttp/plugins/dynamix/SyslogSettings.page
index 22db32271..6dbff1a0d 100644
--- a/emhttp/plugins/dynamix/SyslogSettings.page
+++ b/emhttp/plugins/dynamix/SyslogSettings.page
@@ -16,7 +16,7 @@ Tag="file-text-o"
  */
 ?>
 <?
-$syslog = @parse_ini_file('/boot/config/rsyslog.cfg') ?: [];
+$syslog = (array)@parse_ini_file('/boot/config/rsyslog.cfg');
 
 function plain($ip) {
   return str_replace(['[',']'],'',$ip);
diff --git a/emhttp/plugins/dynamix/WG0.page b/emhttp/plugins/dynamix/WG0.page
index 27513b2fe..29419de2d 100644
--- a/emhttp/plugins/dynamix/WG0.page
+++ b/emhttp/plugins/dynamix/WG0.page
@@ -27,7 +27,7 @@ exec("ip -br -6 addr show scope global|awk '/^(br|bond|eth)[0-9]+(\\.[0-9]+)?/{s
 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 = @parse_ini_file('state/nginx.ini') ?: [];
+$nginx = (array)@parse_ini_file('state/nginx.ini');
 
 // add subnets defined in Docker custom networks
 if (count($filter)) {
diff --git a/emhttp/plugins/dynamix/include/Boot.php b/emhttp/plugins/dynamix/include/Boot.php
index 8841b82dc..cd3934bb0 100644
--- a/emhttp/plugins/dynamix/include/Boot.php
+++ b/emhttp/plugins/dynamix/include/Boot.php
@@ -11,8 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
diff --git a/emhttp/plugins/dynamix/include/Browse.php b/emhttp/plugins/dynamix/include/Browse.php
index 4ff3e553f..94fe0c8d9 100644
--- a/emhttp/plugins/dynamix/include/Browse.php
+++ b/emhttp/plugins/dynamix/include/Browse.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
 // add translations
 $_SERVER['REQUEST_URI'] = '';
diff --git a/emhttp/plugins/dynamix/include/CPUset.php b/emhttp/plugins/dynamix/include/CPUset.php
index 68e156491..c3078472c 100644
--- a/emhttp/plugins/dynamix/include/CPUset.php
+++ b/emhttp/plugins/dynamix/include/CPUset.php
@@ -11,8 +11,7 @@
 */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 
 // add translations
diff --git a/emhttp/plugins/dynamix/include/CheckPort.php b/emhttp/plugins/dynamix/include/CheckPort.php
index bfaf176a3..4fc99a840 100644
--- a/emhttp/plugins/dynamix/include/CheckPort.php
+++ b/emhttp/plugins/dynamix/include/CheckPort.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,7 +11,8 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'settings';
 require_once "$docroot/webGui/include/Translations.php";
diff --git a/emhttp/plugins/dynamix/include/Control.php b/emhttp/plugins/dynamix/include/Control.php
index 58b61994e..66aa20ab3 100644
--- a/emhttp/plugins/dynamix/include/Control.php
+++ b/emhttp/plugins/dynamix/include/Control.php
@@ -11,12 +11,12 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
 
 // add translations
 $_SERVER['REQUEST_URI'] = '';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Helpers.php";
 
 function age($number,$time) {
   return sprintf(_('%s '.($number==1 ? $time : $time.'s').' ago'),$number);
diff --git a/emhttp/plugins/dynamix/include/CryptoBenchmark.php b/emhttp/plugins/dynamix/include/CryptoBenchmark.php
index c46c541e3..8db17d950 100644
--- a/emhttp/plugins/dynamix/include/CryptoBenchmark.php
+++ b/emhttp/plugins/dynamix/include/CryptoBenchmark.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,14 +11,14 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+extract(parse_plugin_cfg('dynamix',true));
+
 // add translations
 $_SERVER['REQUEST_URI'] = '';
 require_once "$docroot/webGui/include/Translations.php";
 
-require_once "$docroot/webGui/include/Helpers.php";
-extract(parse_plugin_cfg('dynamix',true));
-
 [$luks,$size,$hash,$rng] = my_explode(',',exec("/usr/sbin/cryptsetup --help|tail -1"),4);
 $luks = str_replace('-plain64','',trim(explode(':',$luks)[1]));
 $size = str_replace(' bits','',trim(explode(':',$size)[1]));
diff --git a/emhttp/plugins/dynamix/include/DashboardApps.php b/emhttp/plugins/dynamix/include/DashboardApps.php
index 8f9bc08aa..f07e3aec5 100644
--- a/emhttp/plugins/dynamix/include/DashboardApps.php
+++ b/emhttp/plugins/dynamix/include/DashboardApps.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2014-2023, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,13 +12,14 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'dashboard';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
-require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
-require_once "$docroot/webGui/include/Helpers.php";
 
 if (isset($_POST['sys'])) {
   switch ($_POST['sys']) {
diff --git a/emhttp/plugins/dynamix/include/DeleteLogFile.php b/emhttp/plugins/dynamix/include/DeleteLogFile.php
index 384aa9873..0cee578c8 100644
--- a/emhttp/plugins/dynamix/include/DeleteLogFile.php
+++ b/emhttp/plugins/dynamix/include/DeleteLogFile.php
@@ -11,9 +11,8 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
-
 extract(parse_plugin_cfg('dynamix',true));
 
 $path    = _var($notify,'path','/tmp/notifications');
diff --git a/emhttp/plugins/dynamix/include/DiskList.php b/emhttp/plugins/dynamix/include/DiskList.php
index 7c78e0998..3819ccab5 100644
--- a/emhttp/plugins/dynamix/include/DiskList.php
+++ b/emhttp/plugins/dynamix/include/DiskList.php
@@ -11,12 +11,12 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
 
 // add translations
 $_SERVER['REQUEST_URI'] = 'shares';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Helpers.php";
 
 $compute = rawurldecode(_var($_POST,'compute'));
 $path    = rawurldecode(_var($_POST,'path'));
diff --git a/emhttp/plugins/dynamix/include/Download.php b/emhttp/plugins/dynamix/include/Download.php
index e593cb4ec..e7146479a 100644
--- a/emhttp/plugins/dynamix/include/Download.php
+++ b/emhttp/plugins/dynamix/include/Download.php
@@ -11,7 +11,8 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
 $file = $_POST['file']??'';
 
 function validpath($file) {
diff --git a/emhttp/plugins/dynamix/include/Feedback.php b/emhttp/plugins/dynamix/include/Feedback.php
index 2d92c1ef7..d552a59ff 100644
--- a/emhttp/plugins/dynamix/include/Feedback.php
+++ b/emhttp/plugins/dynamix/include/Feedback.php
@@ -1,5 +1,5 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
+/* Copyright 2005-2023, Lime Technology
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -10,7 +10,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
 if (array_key_exists('getdiagnostics', $_GET)) {
   $anonymize = empty($_GET['anonymize']) ? '-a' : '';
diff --git a/emhttp/plugins/dynamix/include/FileSystemStatus.php b/emhttp/plugins/dynamix/include/FileSystemStatus.php
index d4ebc21ea..0342a4f4e 100644
--- a/emhttp/plugins/dynamix/include/FileSystemStatus.php
+++ b/emhttp/plugins/dynamix/include/FileSystemStatus.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
 $cmd  = $_POST['cmd'];
 $path = $_POST['path'];
diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index 80cb3e887..0d0e97ab6 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/webGui/include/Secure.php";
 
diff --git a/emhttp/plugins/dynamix/include/InitCharts.php b/emhttp/plugins/dynamix/include/InitCharts.php
index 7ea093497..e341a0fa6 100644
--- a/emhttp/plugins/dynamix/include/InitCharts.php
+++ b/emhttp/plugins/dynamix/include/InitCharts.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,8 +11,9 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-$charts  = '/var/tmp/charts_data.tmp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
+$charts = '/var/tmp/charts_data.tmp';
 
 switch ($_POST['cmd']) {
 case 'get':
diff --git a/emhttp/plugins/dynamix/include/InstallKey.php b/emhttp/plugins/dynamix/include/InstallKey.php
index 3bea405ce..3dc24a702 100644
--- a/emhttp/plugins/dynamix/include/InstallKey.php
+++ b/emhttp/plugins/dynamix/include/InstallKey.php
@@ -10,8 +10,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 
 // add translations
@@ -49,7 +48,7 @@ if ($host && in_array($host,['keys.lime-technology.com','lime-technology.com']))
   $key_file = basename($url);
   exec("/usr/bin/wget -q -O ".escapeshellarg("/boot/config/$key_file")." ".escapeshellarg($url), $output, $return_var);
   if ($return_var === 0) {
-    $var = @parse_ini_file('/var/local/emhttp/var.ini') ?: [];
+    $var = (array)@parse_ini_file('/var/local/emhttp/var.ini');
     if (_var($var,'mdState')=="STARTED") {
       response_complete(200, array('status' => _('Please Stop array to complete key installation')), _('success').', '._('Please Stop array to complete key installation'));
     } else {
diff --git a/emhttp/plugins/dynamix/include/NotificationsArchive.php b/emhttp/plugins/dynamix/include/NotificationsArchive.php
index f77a345fb..d25a719ba 100644
--- a/emhttp/plugins/dynamix/include/NotificationsArchive.php
+++ b/emhttp/plugins/dynamix/include/NotificationsArchive.php
@@ -11,12 +11,13 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Secure.php";
+require_once "$docroot/webGui/include/Wrappers.php";
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'tools';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Secure.php";
-require_once "$docroot/webGui/include/Wrappers.php";
 
 $dynamix = parse_plugin_cfg('dynamix',true);
 $filter  = unscript($_GET['filter']??false);
diff --git a/emhttp/plugins/dynamix/include/Notify.php b/emhttp/plugins/dynamix/include/Notify.php
index a3982e98b..e692b41b0 100644
--- a/emhttp/plugins/dynamix/include/Notify.php
+++ b/emhttp/plugins/dynamix/include/Notify.php
@@ -12,8 +12,9 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-$notify  = "$docroot/webGui/scripts/notify";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
+$notify = "$docroot/webGui/scripts/notify";
 
 switch ($_POST['cmd']??'') {
 case 'init':
diff --git a/emhttp/plugins/dynamix/include/OpenTerminal.php b/emhttp/plugins/dynamix/include/OpenTerminal.php
index 388bdb906..1b0abdd07 100644
--- a/emhttp/plugins/dynamix/include/OpenTerminal.php
+++ b/emhttp/plugins/dynamix/include/OpenTerminal.php
@@ -11,13 +11,13 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Secure.php";
+require_once "$docroot/webGui/include/Wrappers.php";
 
 // add translations
 $_SERVER['REQUEST_URI'] = '';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Secure.php";
-require_once "$docroot/webGui/include/Wrappers.php";
 
 // Get the webGui configuration preferences
 extract(parse_plugin_cfg('dynamix',true));
diff --git a/emhttp/plugins/dynamix/include/PHPsettings.php b/emhttp/plugins/dynamix/include/PHPsettings.php
index 38a20c5dd..15945b8b3 100644
--- a/emhttp/plugins/dynamix/include/PHPsettings.php
+++ b/emhttp/plugins/dynamix/include/PHPsettings.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
 switch ($_POST['cmd']??'') {
 case 'clear':
diff --git a/emhttp/plugins/dynamix/include/ProcessStatus.php b/emhttp/plugins/dynamix/include/ProcessStatus.php
index a870cc220..0ec74b946 100644
--- a/emhttp/plugins/dynamix/include/ProcessStatus.php
+++ b/emhttp/plugins/dynamix/include/ProcessStatus.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2015-2021, Bergware International
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2015-2023, 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,
@@ -11,7 +11,8 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
 // add translations
 $_SERVER['REQUEST_URI'] = '';
 require_once "$docroot/webGui/include/Translations.php";
diff --git a/emhttp/plugins/dynamix/include/ProtocolData.php b/emhttp/plugins/dynamix/include/ProtocolData.php
index ae50ab692..3edf9e7d1 100644
--- a/emhttp/plugins/dynamix/include/ProtocolData.php
+++ b/emhttp/plugins/dynamix/include/ProtocolData.php
@@ -11,14 +11,13 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Secure.php";
 require_once "$docroot/webGui/include/Wrappers.php";
 
 switch (_var($_GET,'protocol')) {
-  case 'smb': $data = @parse_ini_file('state/sec.ini',true) ?: []; break;
-  case 'nfs': $data = @parse_ini_file('state/sec_nfs.ini',true) ?: []; break;
+  case 'smb': $data = (array)@parse_ini_file('state/sec.ini',true); break;
+  case 'nfs': $data = (array)@parse_ini_file('state/sec_nfs.ini',true); break;
 }
 $name = unscript(_var($_GET,'name'));
 echo json_encode(_var($data,$name));
diff --git a/emhttp/plugins/dynamix/include/ProvisionCert.php b/emhttp/plugins/dynamix/include/ProvisionCert.php
index bd85e06ae..5e8376595 100644
--- a/emhttp/plugins/dynamix/include/ProvisionCert.php
+++ b/emhttp/plugins/dynamix/include/ProvisionCert.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,13 +11,14 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-$certPath = "/boot/config/ssl/certs/certificate_bundle.pem";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Wrappers.php";
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'settings';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Wrappers.php";
 
+$certPath = "/boot/config/ssl/certs/certificate_bundle.pem";
 $cli = php_sapi_name()=='cli';
 
 function response_complete($httpcode, $result, $cli_success_msg='') {
diff --git a/emhttp/plugins/dynamix/include/ReplaceKey.php b/emhttp/plugins/dynamix/include/ReplaceKey.php
index 8f28549ed..990e7f269 100644
--- a/emhttp/plugins/dynamix/include/ReplaceKey.php
+++ b/emhttp/plugins/dynamix/include/ReplaceKey.php
@@ -1,5 +1,5 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -10,14 +10,14 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+extract(parse_plugin_cfg('dynamix',true));
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'tools';
 require_once "$docroot/webGui/include/Translations.php";
 
-require_once "$docroot/webGui/include/Helpers.php";
-extract(parse_plugin_cfg('dynamix',true));
-
 $var = parse_ini_file('state/var.ini');
 $keyfile = base64_encode(file_get_contents($var['regFILE']));
 ?>
diff --git a/emhttp/plugins/dynamix/include/Report.php b/emhttp/plugins/dynamix/include/Report.php
index 8594f2d10..a294f59ac 100644
--- a/emhttp/plugins/dynamix/include/Report.php
+++ b/emhttp/plugins/dynamix/include/Report.php
@@ -11,8 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Secure.php";
 require_once "$docroot/webGui/include/Wrappers.php";
 
@@ -42,7 +41,7 @@ case 'notice':
   break;
 case 'state':
   $pools = explode(',',_var($_POST,'pools'));
-  $disks = @parse_ini_file('state/disks.ini',true) ?: [];
+  $disks = (array)@parse_ini_file('state/disks.ini',true);
   $error = [];
   foreach ($pools as $pool) if (stripos(_var($disks[$pool],'state'),'ERROR:')===0) $error[] = $pool.' - '.str_ireplace('ERROR:','',$disks[$pool]['state']);
   echo implode('<br>',$error);
diff --git a/emhttp/plugins/dynamix/include/ResetTZ.php b/emhttp/plugins/dynamix/include/ResetTZ.php
index d6a24ce8d..d946a8c65 100644
--- a/emhttp/plugins/dynamix/include/ResetTZ.php
+++ b/emhttp/plugins/dynamix/include/ResetTZ.php
@@ -11,9 +11,10 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-$pid     = '/var/run/nchan.pid';
-$nchan   = 'webGui/nchan/update_3';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
+$pid = '/var/run/nchan.pid';
+$nchan = 'webGui/nchan/update_3';
 
 if (is_file($pid) && exec("grep -Pom1 '^$nchan' $pid")) {
   // restart update_3 script
diff --git a/emhttp/plugins/dynamix/include/SMTPtest.php b/emhttp/plugins/dynamix/include/SMTPtest.php
index f7973e169..2d3b2f1e3 100644
--- a/emhttp/plugins/dynamix/include/SMTPtest.php
+++ b/emhttp/plugins/dynamix/include/SMTPtest.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,7 +11,8 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
 // add translations
 $_SERVER['REQUEST_URI'] = '';
 require_once "$docroot/webGui/include/Translations.php";
diff --git a/emhttp/plugins/dynamix/include/ShareData.php b/emhttp/plugins/dynamix/include/ShareData.php
index 9509e3a49..ebb8f15a6 100644
--- a/emhttp/plugins/dynamix/include/ShareData.php
+++ b/emhttp/plugins/dynamix/include/ShareData.php
@@ -11,12 +11,11 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Secure.php";
 require_once "$docroot/webGui/include/Wrappers.php";
 
-$shares = @parse_ini_file('state/shares.ini',true) ?: [];
+$shares = (array)@parse_ini_file('state/shares.ini',true);
 $name = unscript(_var($_GET,'name'));
 echo json_encode(_var($shares,$name));
 ?>
diff --git a/emhttp/plugins/dynamix/include/ShareList.php b/emhttp/plugins/dynamix/include/ShareList.php
index 72a78e56a..595f0f8fb 100644
--- a/emhttp/plugins/dynamix/include/ShareList.php
+++ b/emhttp/plugins/dynamix/include/ShareList.php
@@ -11,7 +11,12 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+
+// add translations
+$_SERVER['REQUEST_URI'] = 'shares';
+require_once "$docroot/webGui/include/Translations.php";
 
 if (isset($_POST['scan'])) {
   die((new FilesystemIterator("/mnt/user/{$_POST['scan']}"))->valid() ? '0' : '1');
@@ -31,11 +36,6 @@ if (isset($_POST['cleanup'])) {
   die((string)$n);
 }
 
-// add translations
-$_SERVER['REQUEST_URI'] = 'shares';
-require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Helpers.php";
-
 $compute = rawurldecode(_var($_POST,'compute'));
 $path    = rawurldecode(_var($_POST,'path'));
 $all     = _var($_POST,'all');
diff --git a/emhttp/plugins/dynamix/include/SmartInfo.php b/emhttp/plugins/dynamix/include/SmartInfo.php
index 679018770..995e27a38 100644
--- a/emhttp/plugins/dynamix/include/SmartInfo.php
+++ b/emhttp/plugins/dynamix/include/SmartInfo.php
@@ -11,7 +11,9 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/webGui/include/Preselect.php";
 
 // add translations
 $_SERVER['REQUEST_URI'] = 'main';
@@ -19,8 +21,6 @@ require_once "$docroot/webGui/include/Translations.php";
 
 $disks = array_merge_recursive(@parse_ini_file('state/disks.ini',true)?:[], @parse_ini_file('state/devs.ini',true)?:[]);
 require_once "$docroot/webGui/include/CustomMerge.php";
-require_once "$docroot/webGui/include/Helpers.php";
-require_once "$docroot/webGui/include/Preselect.php";
 
 function normalize($text, $glue='_') {
   $words = explode($glue,$text);
diff --git a/emhttp/plugins/dynamix/include/StartCommand.php b/emhttp/plugins/dynamix/include/StartCommand.php
index 8360103e8..254c41501 100644
--- a/emhttp/plugins/dynamix/include/StartCommand.php
+++ b/emhttp/plugins/dynamix/include/StartCommand.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Secure.php";
 
 function pgrep($proc) {
diff --git a/emhttp/plugins/dynamix/include/SysDevs.php b/emhttp/plugins/dynamix/include/SysDevs.php
index 259b56567..10f3a3963 100644
--- a/emhttp/plugins/dynamix/include/SysDevs.php
+++ b/emhttp/plugins/dynamix/include/SysDevs.php
@@ -11,26 +11,27 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'tools';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Helpers.php";
 
 function usb_physical_port($usbbusdev) {
   if (preg_match('/^Bus (?P<bus>\S+) Device (?P<dev>\S+): ID (?P<id>\S+)(?P<name>.*)$/', $usbbusdev, $usbMatch)) {
     //udevadm info -a   --name=/dev/bus/usb/003/002 | grep KERNEL==
-    $udevcmd = "udevadm info -a   --name=/dev/bus/usb/".$usbMatch['bus']."/".$usbMatch['dev']." | grep KERNEL==" ;
-    $physical_busid = _("None") ;
+    $udevcmd = "udevadm info -a   --name=/dev/bus/usb/".$usbMatch['bus']."/".$usbMatch['dev']." | grep KERNEL==";
+    $physical_busid = _("None");
     exec($udevcmd , $udev);
     if (isset($udev)) {
-      $physical_busid = trim(substr($udev[0], 13) , '"') ;
+      $physical_busid = trim(substr($udev[0], 13) , '"');
       if (substr($physical_busid,0,3) =='usb') {
-        $physical_busid = substr($physical_busid,3).'-0' ;
+        $physical_busid = substr($physical_busid,3).'-0';
       }
     }
   }
-  return($physical_busid) ;
+  return($physical_busid);
 }
 
 switch ($_POST['table']) {
@@ -103,7 +104,6 @@ case 't1':
       }
     }
     $lines = array_values(array_unique($lines, SORT_STRING));
-
     $iommuinuse = array ();
     foreach ($lines as $pciinuse){
       $string = exec("ls /sys/kernel/iommu_groups/*/devices/$pciinuse -1 -d");
@@ -152,7 +152,7 @@ case 't1':
               exec('for usb_ctrl in $(find /sys/bus/usb/devices/usb* -maxdepth 0 -type l);do path="$(realpath "${usb_ctrl}")";if [[ $path == *'.$pciaddress.'* ]];then bus="$(cat "${usb_ctrl}/busnum")";lsusb -s $bus:|sort;fi;done',$getusb);
               foreach($getusb as $usbdevice) {
                 [$bus,$id] = my_explode(':',$usbdevice);
-                $usbport = usb_physical_port($usbdevice) ;
+                $usbport = usb_physical_port($usbdevice);
                 if (strlen($usbport) > 7 ) {$usbport .= "\t"; } else { $usbport .= "\t\t"; }
                 echo "<tr><td></td><td></td><td></td><td></td><td style=\"padding-left: 50px;\">$bus Port $usbport".trim($id)."</td></tr>";
               }
@@ -218,7 +218,7 @@ case 't3':
   exec('lsusb|sort',$lsusb);
   foreach ($lsusb as $line) {
     [$bus,$id] = my_explode(':',$line);
-    $usbport = usb_physical_port($line) ;
+    $usbport = usb_physical_port($line);
     echo "<tr><td>$bus Port $usbport</td><td>  ".trim($id)."</td></tr>";
   }
   break;
diff --git a/emhttp/plugins/dynamix/include/SysDrivers.php b/emhttp/plugins/dynamix/include/SysDrivers.php
index f6ad7cf34..251e6e240 100644
--- a/emhttp/plugins/dynamix/include/SysDrivers.php
+++ b/emhttp/plugins/dynamix/include/SysDrivers.php
@@ -11,112 +11,106 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/webGui/include/SysDriversHelpers.php";
+require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'tools';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Helpers.php";
-require_once "$docroot/webGui/include/SysDriversHelpers.php";
-require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php"; 
 
-$kernel = shell_exec("uname -r") ;
-$kernel = trim($kernel,"\n") ;
-$lsmod = shell_exec("lsmod") ;
+$kernel = shell_exec("uname -r");
+$kernel = trim($kernel,"\n");
+$lsmod = shell_exec("lsmod");
 $supportpage = true;
-$modtoplgfile = "/tmp/modulestoplg.json" ;
-$sysdrvfile = "/tmp/sysdrivers.json" ;
-$sysdrvinit = "/tmp/sysdrivers.init" ;
-if (!is_file($modtoplgfile) || !is_file($sysdrvfile)) { modtoplg() ; createlist() ;}
-$arrModtoPlg = json_decode(file_get_contents("/tmp/modulestoplg.json") ,TRUE) ;
+$modtoplgfile = "/tmp/modulestoplg.json";
+$sysdrvfile = "/tmp/sysdrivers.json";
+$sysdrvinit = "/tmp/sysdrivers.init";
+if (!is_file($modtoplgfile) || !is_file($sysdrvfile)) { modtoplg(); createlist();}
+$arrModtoPlg = json_decode(file_get_contents("/tmp/modulestoplg.json") ,TRUE);
 
 switch ($_POST['table']) {
-  
-    case 't1create':    
-        if (is_file("/tmp/sysdrvbuild.running")) break ;
-        touch("/tmp/sysdrvbuild.running")  ;
-        modtoplg() ;
-        createlist() ;  
-        unlink("/tmp/sysdrvbuild.running") ;             
-        break;
+case 't1create':
+  if (is_file("/tmp/sysdrvbuild.running")) break;
+  touch("/tmp/sysdrvbuild.running");
+  modtoplg();
+  createlist();
+  unlink("/tmp/sysdrvbuild.running");
+  break;
 
-    case 't1load':
-        $list = file_get_contents($sysdrvfile) ;
-        $arrModules = json_decode($list,TRUE) ; 
-        $init = false;
-        if (is_file($sysdrvinit)) $init = file_get_contents($sysdrvinit);
-        $html =  "<thead><tr><th><b>"._("Driver")."</th><th><b>"._("Description")."</th><th data-value='System|Inuse|Custom|Disabled|\"Kernel - Inuse\"'><b>"._("State")."</th><th><b>"._("Type")."</th><th><b>"._("Modprobe.d config file")."</th></tr></thead>";
-        $html .= "<tbody>" ;
-     
-        if (is_array($arrModules)) ksort($arrModules) ;
-        foreach($arrModules as $modname => $module) {
-            if ($modname == "") continue ;
+case 't1load':
+  $list = file_get_contents($sysdrvfile);
+  $arrModules = json_decode($list,TRUE);
+  $init = false;
+  if (is_file($sysdrvinit)) $init = file_get_contents($sysdrvinit);
+  $html =  "<thead><tr><th><b>"._("Driver")."</th><th><b>"._("Description")."</th><th data-value='System|Inuse|Custom|Disabled|\"Kernel - Inuse\"'><b>"._("State")."</th><th><b>"._("Type")."</th><th><b>"._("Modprobe.d config file")."</th></tr></thead>";
+  $html .= "<tbody>";
+  if (is_array($arrModules)) ksort($arrModules);
+  foreach($arrModules as $modname => $module) {
+    if ($modname == "") continue;
+    if (is_file("/boot/config/modprobe.d/$modname.conf")) {
+      $modprobe = file_get_contents("/boot/config/modprobe.d/$modname.conf");
+      $state = strpos($modprobe, "blacklist");
+      $modprobe = explode(PHP_EOL,$modprobe);
+      if($state !== false) {$state = "Disabled";} else $state="Custom";
+      $module['state'] = $state;
+      $module['modprobe'] = $modprobe;
+    } else {
+      if (is_file("/etc/modprobe.d/$modname.conf")) {
+        $modprobe = file_get_contents("/etc/modprobe.d/$modname.conf");
+        $state = strpos($modprobe, "blacklist");
+        $modprobe = explode(PHP_EOL,$modprobe);
+        if($state !== false) {$state = "Disabled";} else $state="System";
+        $module['state'] = $state;
+        $module['modprobe'] = $modprobe;
+      }
+    }
+    $html .=  "<tr id='row$modname'>";
+    if ($supportpage) {
+      if ($module['support'] == false) {
+        $supporthtml = "";
+      } else {
+        $supporturl = $module['supporturl'];
+        $pluginname = $module['plugin'];
+        $supporthtml = "<span id='link$modname'><a href='$supporturl' target='_blank'><i title='"._("Support page $pluginname")."' class='fa fa-phone-square'></i></a></span>";
+      }
+    }
+    if (isset($module["version"])) $version = " (".$module["version"].")"; else $version = "";
+    $html .= "<td>$modname$version$supporthtml</td>";
+    $html .= "<td>{$module['description']}</td><td id=\"status$modname\">{$module['state']}</td><td>{$module['type']}</td>";
+    $text = "";
+    if (is_array($module["modprobe"])) {
+      $text = implode("\n",$module["modprobe"]);
+      $html .= "<td><span><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
+      $hidden = "";
+      if ($module['state'] == "System") $hidden = "hidden";
+      $html .= " <a class='info' href=\"#\" id=\"bin$modname\" $hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash'></i></a><span>";
+      $html .= "<span><textarea id=\"text".$modname."\" rows=3 disabled>$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a  class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save' ></i></a></span></td></tr>";
+    } else {
+      $html .= "<td><span><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
+      $html .= " <a class='info' href=\"#\" id=\"bin$modname\" hidden><i title='"._("Delete Modprobe config")."'  onclick=\"removecfg('".$modname."',true);return false;\"  class='fa fa-trash'></i></a><span>";
+      $html .= "<textarea id=\"text".$modname."\" rows=1 hidden disabled >$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save' ></i></a></span></td></tr>";
+    }
+  }
+  $html .=  "</tbody>";
+  $rtn = array();
+  $rtn['html'] = $html;
+  if ($init !== false) {$init = true; unlink($sysdrvinit);}
+  $rtn['init'] = $init;
+  echo json_encode($rtn);
+  break;
 
-            if (is_file("/boot/config/modprobe.d/$modname.conf")) {
-                $modprobe = file_get_contents("/boot/config/modprobe.d/$modname.conf") ;
-                $state = strpos($modprobe, "blacklist");
-                $modprobe = explode(PHP_EOL,$modprobe) ;
-                if($state !== false) {$state = "Disabled" ;} else $state="Custom" ;
-                $module['state'] = $state ;
-                $module['modprobe'] = $modprobe ;
-                } else {
-                    if (is_file("/etc/modprobe.d/$modname.conf")) {
-                        $modprobe = file_get_contents("/etc/modprobe.d/$modname.conf") ;
-                        $state = strpos($modprobe, "blacklist");
-                        $modprobe = explode(PHP_EOL,$modprobe) ;
-                        if($state !== false) {$state = "Disabled" ;} else $state="System" ;
-                        $module['state'] = $state ;
-                        $module['modprobe'] = $modprobe ;
-                    }
-                }
-
-            $html .=  "<tr id='row$modname'>" ;
-            if ($supportpage) {
-                if ($module['support'] == false) {
-                        $supporthtml = "" ;
-                    } else {
-                        $supporturl = $module['supporturl'] ;
-                        $pluginname = $module['plugin'] ;
-                        $supporthtml = "<span id='link$modname'><a href='$supporturl' target='_blank'><i title='"._("Support page $pluginname")."' class='fa fa-phone-square'></i></a></span>" ;
-                    } 
-            }  
-            if (isset($module["version"])) $version = " (".$module["version"].")" ; else $version = "" ;
-        
-            $html .= "<td>$modname$version$supporthtml</td>" ;
-            $html .= "<td>{$module['description']}</td><td id=\"status$modname\">{$module['state']}</td><td>{$module['type']}</td>";
-    
-            $text = "" ;
-            if (is_array($module["modprobe"])) {
-                    $text = implode("\n",$module["modprobe"]) ;
-                    $html .= "<td><span><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>" ;
-                    $hidden = "" ;
-                    if ($module['state'] == "System") $hidden = "hidden" ;
-                    $html .= " <a class='info' href=\"#\" id=\"bin$modname\" $hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash'></i></a><span>" ;
-                    $html .= "<span><textarea id=\"text".$modname."\" rows=3 disabled>$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a  class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save' ></i></a></span></td></tr>";
-                } else {
-                    $html .= "<td><span><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>" ;
-                    $html .= " <a class='info' href=\"#\" id=\"bin$modname\" hidden><i title='"._("Delete Modprobe config")."'  onclick=\"removecfg('".$modname."',true);return false;\"  class='fa fa-trash'></i></a><span>" ;
-                    $html .= "<textarea id=\"text".$modname."\" rows=1 hidden disabled >$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save' ></i></a></span></td></tr>";  
-                }
-    
-            } 
-        $html .=  "</tbody>" ;
-        $rtn = array() ;
-        $rtn['html'] = $html ;
-        if ($init !== false) {$init = true ; unlink($sysdrvinit) ;}
-        $rtn['init'] = $init ;
-        echo json_encode($rtn) ;
-        break;
-  
 case "update":
-    $conf = $_POST['conf'] ;
-    $module = $_POST['module'] ;
-    if ($conf == "") $error = unlink("/boot/config/modprobe.d/$module.conf") ; else $error = file_put_contents("/boot/config/modprobe.d/$module.conf",$conf) ;
-    getmodules($module) ;
-    $return = $arrModules[$module] ;
-    $return['supportpage'] = $supportpage ;
-    if (is_array($return["modprobe"]))$return["modprobe"] = implode("\n",$return["modprobe"]) ;
-    if ($error !== false) $return["error"] = false ; else $return["error"] = true ;
-    echo json_encode($return) ;
-    break ;   
-}             
+  $conf = $_POST['conf'];
+  $module = $_POST['module'];
+  if ($conf == "") $error = unlink("/boot/config/modprobe.d/$module.conf"); else $error = file_put_contents("/boot/config/modprobe.d/$module.conf",$conf);
+  getmodules($module);
+  $return = $arrModules[$module];
+  $return['supportpage'] = $supportpage;
+  if (is_array($return["modprobe"]))$return["modprobe"] = implode("\n",$return["modprobe"]);
+  if ($error !== false) $return["error"] = false; else $return["error"] = true;
+  echo json_encode($return);
+  break;
+}
 ?>
diff --git a/emhttp/plugins/dynamix/include/SysDriversInit.php b/emhttp/plugins/dynamix/include/SysDriversInit.php
index f9a5c3971..1beae8711 100755
--- a/emhttp/plugins/dynamix/include/SysDriversInit.php
+++ b/emhttp/plugins/dynamix/include/SysDriversInit.php
@@ -1,5 +1,5 @@
 #!/usr/bin/php
-<?php
+<?PHP
 function SysDriverslog($m, $type = "NOTICE") {
   if ($type == "DEBUG") return NULL;
   $m = print_r($m,true);
@@ -8,23 +8,25 @@ function SysDriverslog($m, $type = "NOTICE") {
   exec("logger -t webGUI -- \"$m\"");
 }
 
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-// add translations
-require_once "$docroot/webGui/include/Translations.php";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 require_once "$docroot/webGui/include/SysDriversHelpers.php";
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
 
-$kernel = shell_exec("uname -r") ;
-$kernel = trim($kernel,"\n") ;
-$lsmod = shell_exec("lsmod") ;
+// add translations
+require_once "$docroot/webGui/include/Translations.php";
+
+$kernel = shell_exec("uname -r");
+$kernel = trim($kernel,"\n");
+$lsmod = shell_exec("lsmod");
 $supportpage = true;
-$modtoplgfile = "/tmp/modulestoplg.json" ;
-$sysdrvfile = "/tmp/sysdrivers.json" ;
-$arrModtoPlg = json_decode(file_get_contents("/tmp/modulestoplg.json") ,TRUE) ;
-file_put_contents("/tmp/sysdrivers.init","1") ;
-SysDriverslog("SysDrivers Build Starting") ;
-modtoplg() ;
-createlist() ;
-SysDriverslog("SysDrivers Build Complete") ;
-?>
\ No newline at end of file
+$modtoplgfile = "/tmp/modulestoplg.json";
+$sysdrvfile = "/tmp/sysdrivers.json";
+$arrModtoPlg = json_decode(file_get_contents("/tmp/modulestoplg.json") ,TRUE);
+file_put_contents("/tmp/sysdrivers.init","1");
+
+SysDriverslog("SysDrivers Build Starting");
+modtoplg();
+createlist();
+SysDriverslog("SysDrivers Build Complete");
+?>
diff --git a/emhttp/plugins/dynamix/include/Syslog.php b/emhttp/plugins/dynamix/include/Syslog.php
index 72fcaf814..32b7f3a5a 100644
--- a/emhttp/plugins/dynamix/include/Syslog.php
+++ b/emhttp/plugins/dynamix/include/Syslog.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/ColorCoding.php";
 
 array_multisort(array_map('filemtime',($logs = glob($_POST['log'].'*',GLOB_NOSORT))),SORT_ASC,$logs);
diff --git a/emhttp/plugins/dynamix/include/ToggleState.php b/emhttp/plugins/dynamix/include/ToggleState.php
index c57652697..b04ce54fe 100644
--- a/emhttp/plugins/dynamix/include/ToggleState.php
+++ b/emhttp/plugins/dynamix/include/ToggleState.php
@@ -11,8 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 
 $device = $_POST['device']??'';
@@ -52,7 +51,7 @@ default:
     break;
   }
   // spin up/down group of devices
-  $disks = @parse_ini_file('state/disks.ini',true) ?: [];
+  $disks = (array)@parse_ini_file('state/disks.ini',true);
   // remove '*' from name
   $name = substr($name,0,-1);
   foreach ($disks as $disk) {
diff --git a/emhttp/plugins/dynamix/include/TrialRequest.php b/emhttp/plugins/dynamix/include/TrialRequest.php
index 485e88ddc..53f66865c 100644
--- a/emhttp/plugins/dynamix/include/TrialRequest.php
+++ b/emhttp/plugins/dynamix/include/TrialRequest.php
@@ -1,5 +1,5 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -10,14 +10,14 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+extract(parse_plugin_cfg('dynamix',true));
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'tools';
 require_once "$docroot/webGui/include/Translations.php";
 
-require_once "$docroot/webGui/include/Helpers.php";
-extract(parse_plugin_cfg('dynamix',true));
-
 $var = parse_ini_file('state/var.ini');
 
 if (!empty($_POST['trial'])) {
diff --git a/emhttp/plugins/dynamix/include/UpdateDNS.php b/emhttp/plugins/dynamix/include/UpdateDNS.php
index 72318315b..5c6a350fe 100644
--- a/emhttp/plugins/dynamix/include/UpdateDNS.php
+++ b/emhttp/plugins/dynamix/include/UpdateDNS.php
@@ -11,12 +11,12 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
 
 // add translations
 $_SERVER['REQUEST_URI'] = 'settings';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Helpers.php";
 
 function host_lookup_ip($host) {
   $result = @dns_get_record($host, DNS_A);
@@ -180,8 +180,8 @@ if ($cli && ($argc > 1) && $argv[1] == "-v") {
 if ($cli && ($argc > 1) && $argv[1] == "-vv") {
   $verbose = true;
 }
-$var = @parse_ini_file('/var/local/emhttp/var.ini') ?: [];
-$nginx = @parse_ini_file('/var/local/emhttp/nginx.ini') ?: [];
+$var = (array)@parse_ini_file('/var/local/emhttp/var.ini');
+$nginx = (array)@parse_ini_file('/var/local/emhttp/nginx.ini');
 $is69 = version_compare(_var($var,'version'),"6.9.9","<");
 $reloadNginx = false;
 $dnserr = false;
@@ -189,7 +189,7 @@ $icon_warn = "⚠️  ";
 $icon_ok = "✅  ";
 
 $myservers_flash_cfg_path='/boot/config/plugins/dynamix.my.servers/myservers.cfg';
-$myservers = file_exists($myservers_flash_cfg_path) ? @parse_ini_file($myservers_flash_cfg_path,true) : [];
+$myservers = (array)@parse_ini_file($myservers_flash_cfg_path,true);
 // ensure some vars are defined here so we don't have to test them later
 if (empty($myservers['remote']['apikey'])) {
   $myservers['remote']['apikey'] = "";
diff --git a/emhttp/plugins/dynamix/include/UpdateOne.php b/emhttp/plugins/dynamix/include/UpdateOne.php
index d44a45b03..ebfe8539c 100644
--- a/emhttp/plugins/dynamix/include/UpdateOne.php
+++ b/emhttp/plugins/dynamix/include/UpdateOne.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,11 +11,12 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'settings';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Helpers.php";
 
 $map = $changes = [];
 
diff --git a/emhttp/plugins/dynamix/include/UpdateTwo.php b/emhttp/plugins/dynamix/include/UpdateTwo.php
index 995c10cfa..9cb4e5047 100644
--- a/emhttp/plugins/dynamix/include/UpdateTwo.php
+++ b/emhttp/plugins/dynamix/include/UpdateTwo.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,7 +11,8 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'settings';
 require_once "$docroot/webGui/include/Translations.php";
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index e30869617..f9b434f13 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
 // Wrapper functions
 function parse_plugin_cfg($plugin, $sections=false, $scanner=INI_SCANNER_NORMAL) {
diff --git a/emhttp/plugins/dynamix/include/update.btrfs.php b/emhttp/plugins/dynamix/include/update.btrfs.php
index 90fa8e855..e26055cd6 100644
--- a/emhttp/plugins/dynamix/include/update.btrfs.php
+++ b/emhttp/plugins/dynamix/include/update.btrfs.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 
 [$job, $cmd] = explode(';',$_POST['#job']);
diff --git a/emhttp/plugins/dynamix/include/update.encryption.php b/emhttp/plugins/dynamix/include/update.encryption.php
index 77c21632f..1bb937646 100644
--- a/emhttp/plugins/dynamix/include/update.encryption.php
+++ b/emhttp/plugins/dynamix/include/update.encryption.php
@@ -11,11 +11,12 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Wrappers.php";
+
 // add translations
 $_SERVER['REQUEST_URI'] = 'settings';
 require_once "$docroot/webGui/include/Translations.php";
-require_once "$docroot/webGui/include/Wrappers.php";
 
 $save   = false;
 $disks  = parse_ini_file('state/disks.ini',true);
diff --git a/emhttp/plugins/dynamix/include/update.parity.php b/emhttp/plugins/dynamix/include/update.parity.php
index 65e02a1a5..db09d54cc 100644
--- a/emhttp/plugins/dynamix/include/update.parity.php
+++ b/emhttp/plugins/dynamix/include/update.parity.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 
 $memory = '/tmp/memory.tmp';
diff --git a/emhttp/plugins/dynamix/include/update.ssmtp.php b/emhttp/plugins/dynamix/include/update.ssmtp.php
index f51f840ca..88f2c8b14 100644
--- a/emhttp/plugins/dynamix/include/update.ssmtp.php
+++ b/emhttp/plugins/dynamix/include/update.ssmtp.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Encryption.php";
 
 $_POST['AuthPass'] = base64_encrypt($_POST['AuthPass']);
diff --git a/emhttp/plugins/dynamix/include/update.vfio-pci-cfg.php b/emhttp/plugins/dynamix/include/update.vfio-pci-cfg.php
index 5267e0964..86521362e 100644
--- a/emhttp/plugins/dynamix/include/update.vfio-pci-cfg.php
+++ b/emhttp/plugins/dynamix/include/update.vfio-pci-cfg.php
@@ -11,8 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Secure.php";
 require_once "$docroot/webGui/include/Wrappers.php";
 
diff --git a/emhttp/plugins/dynamix/include/update.wireguard.php b/emhttp/plugins/dynamix/include/update.wireguard.php
index e8db69300..4892371e7 100644
--- a/emhttp/plugins/dynamix/include/update.wireguard.php
+++ b/emhttp/plugins/dynamix/include/update.wireguard.php
@@ -11,8 +11,7 @@
  */
 ?>
 <?
-$docroot  = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 
 // add translations
diff --git a/emhttp/plugins/dynamix/include/update.zfs.php b/emhttp/plugins/dynamix/include/update.zfs.php
index cef78b9a6..374090acc 100644
--- a/emhttp/plugins/dynamix/include/update.zfs.php
+++ b/emhttp/plugins/dynamix/include/update.zfs.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 
 [$job, $cmd] = explode(';',$_POST['#job']);
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 43c692cce..4caafc8cc 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -376,11 +376,11 @@ function update_translation($locale) {
   }
 }
 while (true) {
-  $var    = @parse_ini_file("$varroot/var.ini") ?: [];
-  $devs   = @parse_ini_file("$varroot/devs.ini",true) ?: [];
-  $disks  = @parse_ini_file("$varroot/disks.ini",true) ?: [];
-  $sec    = @parse_ini_file("$varroot/sec.ini",true) ?: [];
-  $diskio = @parse_ini_file("$varroot/diskload.ini") ?: [];
+  $var    = (array)@parse_ini_file("$varroot/var.ini");
+  $devs   = (array)@parse_ini_file("$varroot/devs.ini",true);
+  $disks  = (array)@parse_ini_file("$varroot/disks.ini",true);
+  $sec    = (array)@parse_ini_file("$varroot/sec.ini",true);
+  $diskio = (array)@parse_ini_file("$varroot/diskload.ini");
   $crypto = false;
   $pools  = pools_filter($disks);
   $echo   = [];
diff --git a/emhttp/plugins/dynamix/nchan/parity_list b/emhttp/plugins/dynamix/nchan/parity_list
index f4a5ab4c5..827ff3f60 100755
--- a/emhttp/plugins/dynamix/nchan/parity_list
+++ b/emhttp/plugins/dynamix/nchan/parity_list
@@ -69,7 +69,7 @@ function create_file($file,...$data) {
 }
 
 while (true) {
-  $var = @parse_ini_file("$varroot/var.ini") ?: [];
+  $var = (array)@parse_ini_file("$varroot/var.ini");
   // check for language changes
   extract(parse_plugin_cfg('dynamix',true));
   if (_var($display,'locale') != $locale_init) {
diff --git a/emhttp/plugins/dynamix/nchan/session_check b/emhttp/plugins/dynamix/nchan/session_check
index 823ae9524..ff74c224f 100755
--- a/emhttp/plugins/dynamix/nchan/session_check
+++ b/emhttp/plugins/dynamix/nchan/session_check
@@ -19,7 +19,7 @@ require_once "$docroot/webGui/include/publish.php";
 require_once "$docroot/webGui/include/Wrappers.php";
 
 while (true) {
-  $var = @parse_ini_file("$varroot/var.ini") ?: [];
+  $var = (array)@parse_ini_file("$varroot/var.ini");
   publish('session',_var($var,'csrf_token'),0);
   sleep(10);
 }
diff --git a/emhttp/plugins/dynamix/nchan/update_2 b/emhttp/plugins/dynamix/nchan/update_2
index 82926588a..579331d10 100755
--- a/emhttp/plugins/dynamix/nchan/update_2
+++ b/emhttp/plugins/dynamix/nchan/update_2
@@ -278,10 +278,10 @@ function print_error($error) {
 }
 
 while (true) {
-  $var   = @parse_ini_file("$varroot/var.ini") ?: [];
-  $devs  = @parse_ini_file("$varroot/devs.ini",true) ?: [];
-  $disks = @parse_ini_file("$varroot/disks.ini",true) ?: [];
-  $saved = @parse_ini_file("$varroot/monitor.ini",true) ?: [];
+  $var   = (array)@parse_ini_file("$varroot/var.ini");
+  $devs  = (array)@parse_ini_file("$varroot/devs.ini",true);
+  $disks = (array)@parse_ini_file("$varroot/disks.ini",true);
+  $saved = (array)@parse_ini_file("$varroot/monitor.ini",true);
   $echo  = [];
   $size  = _var($var,'mdResyncSize');
   $spot  = _var($var,'mdResyncPos');
diff --git a/emhttp/plugins/dynamix/scripts/diagnostics b/emhttp/plugins/dynamix/scripts/diagnostics
index a8dbbfb1c..3c4d2cfb9 100755
--- a/emhttp/plugins/dynamix/scripts/diagnostics
+++ b/emhttp/plugins/dynamix/scripts/diagnostics
@@ -18,20 +18,21 @@
 // if called from cli:
 //   anonymous: diagnostics
 //   all data:  diagnostics -a
+
 $opt = getopt('a',['all']);
 $all = isset($opt['a']) || isset($opt['all']);
 $zip = $all ? ($argv[2]??'') : ($argv[1]??'');
 $cli = empty($zip);
 
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-$folders = ['/boot','/boot/config','/boot/config/plugins','/boot/syslinux','/var/log','/var/log/plugins','/boot/extra','/var/log/packages','/var/lib/pkgtools/packages','/tmp'];
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 
+$folders = ['/boot','/boot/config','/boot/config/plugins','/boot/syslinux','/var/log','/var/log/plugins','/boot/extra','/var/log/packages','/var/lib/pkgtools/packages','/tmp'];
+
 // global variables
 $path  = "/var/local/emhttp";
-$var   = @parse_ini_file("$path/var.ini") ?: [];
-$disks = @parse_ini_file("$path/disks.ini",true) ?: [];
+$var   = (array)@parse_ini_file("$path/var.ini");
+$disks = (array)@parse_ini_file("$path/disks.ini",true);
 $pools = pools_filter($disks);
 
 require_once "$docroot/webGui/include/CustomMerge.php";
@@ -354,8 +355,8 @@ if ($cli) {
 }
 
 // don't anonymize system share names
-$vardomain    = @parse_ini_file('/boot/config/domain.cfg') ?: [];
-$vardocker    = @parse_ini_file('/boot/config/docker.cfg') ?: [];
+$vardomain    = (array)@parse_ini_file('/boot/config/domain.cfg');
+$vardocker    = (array)@parse_ini_file('/boot/config/docker.cfg');
 $showshares   = [];
 $customShares = '';
 if (!empty($vardomain['IMAGE_FILE']))             $showshares[] = current(array_slice(explode('/',$vardomain['IMAGE_FILE']),3,1));
@@ -495,7 +496,7 @@ foreach ($files as $file) {
 file_put_contents("/$diag/shares/shareDisks.txt",implode($shareDisk));
 
 // create default user shares information
-$shares = @parse_ini_file("$path/shares.ini", true) ?: [];
+$shares = (array)@parse_ini_file("$path/shares.ini", true);
 foreach ($shares as $share) {
   $name = _var($share,'name');
   if ($name && !in_array("/boot/config/shares/$name.cfg",$files)) {
diff --git a/emhttp/plugins/dynamix/scripts/emcmd b/emhttp/plugins/dynamix/scripts/emcmd
index 5c09c74c6..5d831c7da 100755
--- a/emhttp/plugins/dynamix/scripts/emcmd
+++ b/emhttp/plugins/dynamix/scripts/emcmd
@@ -1,9 +1,10 @@
 #!/usr/bin/php -q
 <?PHP
-require_once "/usr/local/emhttp/webGui/include/publish.php";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/publish.php";
 
 function emhttp_command($cmd) {
-  $var = @parse_ini_file("/var/local/emhttp/var.ini") ?: [];
+  $var = (array)@parse_ini_file("/var/local/emhttp/var.ini");
   $cmd .= "&csrf_token=".($var['csrf_token']??'');
   return curl_socket("/var/run/emhttpd.socket", "http://localhost/update", $cmd);
 }
diff --git a/emhttp/plugins/dynamix/scripts/feedback b/emhttp/plugins/dynamix/scripts/feedback
index af7bcb430..8ed3efdf3 100755
--- a/emhttp/plugins/dynamix/scripts/feedback
+++ b/emhttp/plugins/dynamix/scripts/feedback
@@ -11,8 +11,7 @@
  * all copies or substantial portions of the Software.
  */
 
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 extract(parse_plugin_cfg('dynamix', true));
 
diff --git a/emhttp/plugins/dynamix/scripts/flash_backup b/emhttp/plugins/dynamix/scripts/flash_backup
index ba845a87b..59a5a3183 100755
--- a/emhttp/plugins/dynamix/scripts/flash_backup
+++ b/emhttp/plugins/dynamix/scripts/flash_backup
@@ -12,8 +12,9 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-$var = file_exists('/var/local/emhttp/var.ini') ? parse_ini_file('/var/local/emhttp/var.ini') : [];
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
+$var = (array)@parse_ini_file('/var/local/emhttp/var.ini');
 $dir = ['system','appdata','isos','domains'];
 $out = ['prev','previous'];
 
diff --git a/emhttp/plugins/dynamix/scripts/monitor b/emhttp/plugins/dynamix/scripts/monitor
index 767a18f73..834596abd 100755
--- a/emhttp/plugins/dynamix/scripts/monitor
+++ b/emhttp/plugins/dynamix/scripts/monitor
@@ -12,7 +12,9 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/webGui/include/Preselect.php";
 
 // Multi-language handling
 if (!function_exists('_')) {
@@ -21,12 +23,10 @@ if (!function_exists('_')) {
 // Exit when settings are not yet initialized
 if (!file_exists("/var/local/emhttp/var.ini")) exit;
 
-$var   = @parse_ini_file("/var/local/emhttp/var.ini") ?: [];
-$devs  = @parse_ini_file("/var/local/emhttp/devs.ini",true) ?: [];
-$disks = @parse_ini_file("/var/local/emhttp/disks.ini",true) ?: [];
+$var   = (array)@parse_ini_file("/var/local/emhttp/var.ini");
+$devs  = (array)@parse_ini_file("/var/local/emhttp/devs.ini",true);
+$disks = (array)@parse_ini_file("/var/local/emhttp/disks.ini",true);
 
-require_once "$docroot/webGui/include/Helpers.php";
-require_once "$docroot/webGui/include/Preselect.php";
 require_once "$docroot/webGui/include/CustomMerge.php";
 
 extract(parse_plugin_cfg("dynamix",true));
diff --git a/emhttp/plugins/dynamix/scripts/notify b/emhttp/plugins/dynamix/scripts/notify
index d46980913..babd23a24 100755
--- a/emhttp/plugins/dynamix/scripts/notify
+++ b/emhttp/plugins/dynamix/scripts/notify
@@ -13,7 +13,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/webGui/include/Encryption.php";
 
diff --git a/emhttp/plugins/dynamix/scripts/parity_history b/emhttp/plugins/dynamix/scripts/parity_history
index 6d6bb47ed..2a812f4b1 100755
--- a/emhttp/plugins/dynamix/scripts/parity_history
+++ b/emhttp/plugins/dynamix/scripts/parity_history
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
diff --git a/emhttp/plugins/dynamix/scripts/run_cmd b/emhttp/plugins/dynamix/scripts/run_cmd
index f97c0d676..dc82a52d4 100755
--- a/emhttp/plugins/dynamix/scripts/run_cmd
+++ b/emhttp/plugins/dynamix/scripts/run_cmd
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/ColorCoding.php";
 
 $last  = "\e[0m";
diff --git a/emhttp/plugins/dynamix/scripts/select_case b/emhttp/plugins/dynamix/scripts/select_case
index 264c52456..ce4cfbf8f 100755
--- a/emhttp/plugins/dynamix/scripts/select_case
+++ b/emhttp/plugins/dynamix/scripts/select_case
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
diff --git a/emhttp/plugins/dynamix/scripts/ssd_trim b/emhttp/plugins/dynamix/scripts/ssd_trim
index 931e898fa..3e850d394 100755
--- a/emhttp/plugins/dynamix/scripts/ssd_trim
+++ b/emhttp/plugins/dynamix/scripts/ssd_trim
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
diff --git a/emhttp/plugins/dynamix/scripts/statuscheck b/emhttp/plugins/dynamix/scripts/statuscheck
index 482096e05..f8e8b3b0c 100755
--- a/emhttp/plugins/dynamix/scripts/statuscheck
+++ b/emhttp/plugins/dynamix/scripts/statuscheck
@@ -12,11 +12,12 @@
  */
 ?>
 <?
-$var   = @parse_ini_file("/var/local/emhttp/var.ini") ?: [];
-$disks = @parse_ini_file("/var/local/emhttp/disks.ini",true) ?: [];
-
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
+
+$var   = (array)@parse_ini_file("/var/local/emhttp/var.ini");
+$disks = (array)@parse_ini_file("/var/local/emhttp/disks.ini",true);
+
 require_once "$docroot/webGui/include/CustomMerge.php";
 
 $script = "$docroot/webGui/scripts/notify";
diff --git a/emhttp/plugins/dynamix/scripts/system_information b/emhttp/plugins/dynamix/scripts/system_information
index 73090631e..36ee74fc8 100755
--- a/emhttp/plugins/dynamix/scripts/system_information
+++ b/emhttp/plugins/dynamix/scripts/system_information
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
 extract(parse_plugin_cfg('dynamix',true));
 
@@ -36,7 +35,7 @@ function dmidecode($key, $n, $all=true) {
   return $all ? $properties : $properties[0]??null;
 }
 
-$var      = @parse_ini_file('state/var.ini') ?: [];
+$var      = (array)@parse_ini_file('state/var.ini');
 $model    = _var($var,'SYS_MODEL',_('N/A'));
 $board    = dmidecode('Base Board Information',2,0);
 $bios     = dmidecode('BIOS Information',0,0);
diff --git a/emhttp/plugins/dynamix/scripts/wg_config b/emhttp/plugins/dynamix/scripts/wg_config
index 470ce7d60..10c0490c5 100755
--- a/emhttp/plugins/dynamix/scripts/wg_config
+++ b/emhttp/plugins/dynamix/scripts/wg_config
@@ -12,8 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 extract(parse_plugin_cfg('dynamix',true));
 

From de4aa58e2aa6ffa9eba2f1f11140be0ec565ad9b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:04:48 +0200
Subject: [PATCH 129/266] Copyright update

---
 emhttp/plugins/dynamix.vm.manager/AddVM.page      | 2 +-
 emhttp/plugins/dynamix.vm.manager/UpdateVM.page   | 2 +-
 emhttp/plugins/dynamix.vm.manager/VMSettings.page | 2 +-
 emhttp/plugins/dynamix.vm.manager/VMs.page        | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/AddVM.page b/emhttp/plugins/dynamix.vm.manager/AddVM.page
index 7db9d73fd..2e099b6b5 100644
--- a/emhttp/plugins/dynamix.vm.manager/AddVM.page
+++ b/emhttp/plugins/dynamix.vm.manager/AddVM.page
@@ -6,7 +6,7 @@ Markdown="false"
 <?PHP
 /* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2023, Bergware International.
- * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.vm.manager/UpdateVM.page b/emhttp/plugins/dynamix.vm.manager/UpdateVM.page
index 1e4d5d745..b884e70a1 100644
--- a/emhttp/plugins/dynamix.vm.manager/UpdateVM.page
+++ b/emhttp/plugins/dynamix.vm.manager/UpdateVM.page
@@ -6,7 +6,7 @@ Markdown="false"
 <?PHP
 /* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2023, Bergware International.
- * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index b71e605bd..ee8227969 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -5,8 +5,8 @@ Tag="columns"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2015-2023, Derek Macias, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.vm.manager/VMs.page b/emhttp/plugins/dynamix.vm.manager/VMs.page
index f9e5d4218..e7c76fc61 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMs.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMs.page
@@ -5,8 +5,9 @@ Lock="true"
 Cond="exec(\"grep -o '^SERVICE=.enable' /boot/config/domain.cfg 2>/dev/null\")"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,

From 9cc9b70c54714d2fb872b6ef7dca0f673ff5c865 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:08:38 +0200
Subject: [PATCH 130/266] Copyright update

---
 emhttp/plugins/dynamix.docker.manager/AddContainer.page     | 2 +-
 emhttp/plugins/dynamix.docker.manager/Docker.page           | 1 +
 emhttp/plugins/dynamix.docker.manager/DockerContainers.page | 2 +-
 emhttp/plugins/dynamix.docker.manager/DockerSettings.page   | 2 +-
 emhttp/plugins/dynamix.docker.manager/UpdateContainer.page  | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/AddContainer.page b/emhttp/plugins/dynamix.docker.manager/AddContainer.page
index 9afe0734d..e0d6efbbe 100644
--- a/emhttp/plugins/dynamix.docker.manager/AddContainer.page
+++ b/emhttp/plugins/dynamix.docker.manager/AddContainer.page
@@ -5,7 +5,7 @@ Markdown="false"
 <?PHP
 /* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2023, Bergware International.
- * Copyright 2014-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.docker.manager/Docker.page b/emhttp/plugins/dynamix.docker.manager/Docker.page
index 9bd7c897d..38c98c736 100644
--- a/emhttp/plugins/dynamix.docker.manager/Docker.page
+++ b/emhttp/plugins/dynamix.docker.manager/Docker.page
@@ -6,6 +6,7 @@ Cond="exec(\"grep -o '^DOCKER_ENABLED=.yes' /boot/config/docker.cfg 2>/dev/null\
 ---
 <?PHP
 /* Copyright 2005-2021, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/emhttp/plugins/dynamix.docker.manager/DockerContainers.page b/emhttp/plugins/dynamix.docker.manager/DockerContainers.page
index 516c198d0..075786584 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerContainers.page
@@ -7,8 +7,8 @@ Nchan="docker_load:stop"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2014-2023, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
index d7983e98f..156a02b8a 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
@@ -5,8 +5,8 @@ Tag="icon-docker"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2014-2023, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page b/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page
index 502df4806..2882ed909 100644
--- a/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page
+++ b/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page
@@ -5,7 +5,7 @@ Markdown="false"
 <?PHP
 /* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2023, Bergware International.
- * Copyright 2014-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,

From dc700749a239f4f4be9f3d4947d491b623908024 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:11:36 +0200
Subject: [PATCH 131/266] Copyright update

---
 .../plugins/dynamix.docker.manager/include/CreateDocker.php   | 2 +-
 emhttp/plugins/dynamix.docker.manager/include/Helpers.php     | 2 +-
 emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php | 4 ++--
 emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index 73a405ad2..35b49e0a3 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2023, Bergware International.
- * Copyright 2015-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.docker.manager/include/Helpers.php b/emhttp/plugins/dynamix.docker.manager/include/Helpers.php
index 920996dc7..820acef3d 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/Helpers.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/Helpers.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2014-2023, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php b/emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php
index 694580dc6..8e176aeff 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2012-2018, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php b/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php
index a7de43532..5c67b5900 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2023, Bergware International.
- * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
+ * Copyright 2014-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,

From c9b86b8853dd292b1d010e09f7c10e365651f6d1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:14:53 +0200
Subject: [PATCH 132/266] Copyright update

---
 emhttp/plugins/dynamix.vm.manager/include/UserPrefs.php | 6 +++---
 emhttp/plugins/dynamix.vm.manager/include/libvirt.php   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/UserPrefs.php b/emhttp/plugins/dynamix.vm.manager/include/UserPrefs.php
index 3267a636b..57169f422 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/UserPrefs.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/UserPrefs.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index cebfe945f..ada7a1c13 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -1,5 +1,5 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
  * Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or

From 72683fdab06292c089c6f382cf95c5942e147bb1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:18:00 +0200
Subject: [PATCH 133/266] Copyright update

---
 emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php | 1 +
 emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php b/emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php
index 8e176aeff..8f0642dea 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php
@@ -1,6 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php b/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php
index 5c67b5900..3a2ea460b 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2023, Bergware International.
- * Copyright 2014-2021, Derek Macias, Eric Schultz, Jon Panozzo.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,

From af3eee47ae74d5568ce40ab28bb87910262c41e4 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:32:25 +0200
Subject: [PATCH 134/266] Dashboard: update time when timezone is changed

---
 emhttp/plugins/dynamix/include/ResetTZ.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/ResetTZ.php b/emhttp/plugins/dynamix/include/ResetTZ.php
index d946a8c65..0fa61182d 100644
--- a/emhttp/plugins/dynamix/include/ResetTZ.php
+++ b/emhttp/plugins/dynamix/include/ResetTZ.php
@@ -13,12 +13,17 @@
 <?
 $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
-$pid = '/var/run/nchan.pid';
-$nchan = 'webGui/nchan/update_3';
+$scripts = ['update_2','update_3'];
+$pidfile = '/var/run/nchan.pid';
+$nchan   = 'webGui/nchan';
 
-if (is_file($pid) && exec("grep -Pom1 '^$nchan' $pid")) {
-  // restart update_3 script
-  exec("pkill -f $nchan");
-  exec("$docroot/$nchan &>/dev/null &");
+if (!is_file($pidfile)) exit;
+
+foreach ($scripts as $script) {
+  if (exec("grep -Pom1 '^$nchan/$script' $pidfile")) {
+    // restart selected script
+    exec("pkill -f $nchan/$script");
+    exec("$docroot/$nchan/$script &>/dev/null &");
+  }
 }
 ?>

From 33a64665eab07aa6992abec1a97a8ae76785bb1a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:10:11 +0200
Subject: [PATCH 135/266] Use "null coalescing assignment" operator for
 $docroot

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

diff --git a/emhttp/plugins/dynamix/include/update.trim.php b/emhttp/plugins/dynamix/include/update.trim.php
index b845e4fa4..8a5f7b2fc 100644
--- a/emhttp/plugins/dynamix/include/update.trim.php
+++ b/emhttp/plugins/dynamix/include/update.trim.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 
 if ($_POST['mode']>0) {

From d4e8617eef86080d5d77ee41beb6c26cfcfd65d7 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:17:44 +0200
Subject: [PATCH 136/266] Use "null coalescing assignment" operator for
 $docroot

---
 .../dynamix.plugin.manager/post-hooks/post_plugin_checks    | 2 +-
 .../dynamix.plugin.manager/pre-hooks/pre_plugin_checks      | 2 +-
 emhttp/plugins/dynamix/include/LanguageReset.php            | 6 +++---
 emhttp/plugins/gui.search/exec.php                          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix.plugin.manager/post-hooks/post_plugin_checks b/emhttp/plugins/dynamix.plugin.manager/post-hooks/post_plugin_checks
index 272a30b3f..d681d3df3 100755
--- a/emhttp/plugins/dynamix.plugin.manager/post-hooks/post_plugin_checks
+++ b/emhttp/plugins/dynamix.plugin.manager/post-hooks/post_plugin_checks
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
 
 function readJson($file) {
diff --git a/emhttp/plugins/dynamix.plugin.manager/pre-hooks/pre_plugin_checks b/emhttp/plugins/dynamix.plugin.manager/pre-hooks/pre_plugin_checks
index 78f266f47..de0ffc911 100755
--- a/emhttp/plugins/dynamix.plugin.manager/pre-hooks/pre_plugin_checks
+++ b/emhttp/plugins/dynamix.plugin.manager/pre-hooks/pre_plugin_checks
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
 
 $type    = $argv[1]??'';   // plugin or language
diff --git a/emhttp/plugins/dynamix/include/LanguageReset.php b/emhttp/plugins/dynamix/include/LanguageReset.php
index 1a7953986..e75132c97 100644
--- a/emhttp/plugins/dynamix/include/LanguageReset.php
+++ b/emhttp/plugins/dynamix/include/LanguageReset.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
 $lang = $_POST['lang'] ?? '';
 $file = '/boot/config/plugins/dynamix/dynamix.cfg';
diff --git a/emhttp/plugins/gui.search/exec.php b/emhttp/plugins/gui.search/exec.php
index 588f66fb6..afa70a118 100755
--- a/emhttp/plugins/gui.search/exec.php
+++ b/emhttp/plugins/gui.search/exec.php
@@ -29,7 +29,7 @@ if ( $locale ) {
 	}
 }
 
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
 $_SERVER['REQUEST_URI'] = $uri;
 $_SESSION['locale'] = $locale;

From 42a24c41366c67804f09c17706d4a3ab05647d30 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:22:27 +0200
Subject: [PATCH 137/266] Use "null coalescing assignment" operator for
 $docroot

---
 emhttp/plugins/dynamix/nchan/ups_status | 3 +--
 emhttp/plugins/dynamix/nchan/wg_poller  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix/nchan/ups_status b/emhttp/plugins/dynamix/nchan/ups_status
index fc080effc..1d4a6c01f 100755
--- a/emhttp/plugins/dynamix/nchan/ups_status
+++ b/emhttp/plugins/dynamix/nchan/ups_status
@@ -13,8 +13,7 @@
  */
 ?>
 <?
-$docroot  = '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/webGui/include/publish.php";
 extract(parse_plugin_cfg('dynamix',true));
diff --git a/emhttp/plugins/dynamix/nchan/wg_poller b/emhttp/plugins/dynamix/nchan/wg_poller
index 6463087c7..388002655 100755
--- a/emhttp/plugins/dynamix/nchan/wg_poller
+++ b/emhttp/plugins/dynamix/nchan/wg_poller
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot  = '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/publish.php";
 
 function my_scale($value, &$unit) {

From f92ec16f8e4e21ca84f3ccabc73242c5fae725a0 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 20:08:55 +0200
Subject: [PATCH 138/266] SysDrivers: fix regression errors

---
 emhttp/plugins/dynamix/SysDrivers.page        |  4 +--
 emhttp/plugins/dynamix/include/SysDevs.php    | 28 +++++++++----------
 emhttp/plugins/dynamix/include/SysDrivers.php |  8 +++---
 .../dynamix/include/SysDriversHelpers.php     |  5 ++--
 emhttp/plugins/dynamix/sheets/SysDrivers.css  | 10 +++----
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/emhttp/plugins/dynamix/SysDrivers.page b/emhttp/plugins/dynamix/SysDrivers.page
index fe401b664..5316ee3ef 100644
--- a/emhttp/plugins/dynamix/SysDrivers.page
+++ b/emhttp/plugins/dynamix/SysDrivers.page
@@ -15,9 +15,9 @@ Tag="server"
  * all copies or substantial portions of the Software.
  */
 ?>
-<script type="text/javascript" src="/webGui/javascript/jquery.tablesorter.widgets.js"></script>
-<script type="text/javascript">
+<script src="/webGui/javascript/jquery.tablesorter.widgets.js"></script>
 
+<script>
 function showDrivers(options, init = false) {
   option = options ;
   if (init) {
diff --git a/emhttp/plugins/dynamix/include/SysDevs.php b/emhttp/plugins/dynamix/include/SysDevs.php
index 10f3a3963..e16f5269e 100644
--- a/emhttp/plugins/dynamix/include/SysDevs.php
+++ b/emhttp/plugins/dynamix/include/SysDevs.php
@@ -20,8 +20,8 @@ require_once "$docroot/webGui/include/Translations.php";
 
 function usb_physical_port($usbbusdev) {
   if (preg_match('/^Bus (?P<bus>\S+) Device (?P<dev>\S+): ID (?P<id>\S+)(?P<name>.*)$/', $usbbusdev, $usbMatch)) {
-    //udevadm info -a   --name=/dev/bus/usb/003/002 | grep KERNEL==
-    $udevcmd = "udevadm info -a   --name=/dev/bus/usb/".$usbMatch['bus']."/".$usbMatch['dev']." | grep KERNEL==";
+    //udevadm info -a --name=/dev/bus/usb/003/002 | grep KERNEL==
+    $udevcmd = "udevadm info -a --name=/dev/bus/usb/".$usbMatch['bus']."/".$usbMatch['dev']." | grep KERNEL==";
     $physical_busid = _("None");
     exec($udevcmd , $udev);
     if (isset($udev)) {
@@ -41,7 +41,7 @@ case 't1':
     exec('lspci -n|awk \'{print "["$3"]"}\'',$iommu);
     exec('lspci',$lspci);
     $i = 0;
-    foreach ($lspci as $line) echo "<tr><td>".$iommu[$i++]."</td><td>$line</td></tr>";
+    foreach ($lspci as $line) echo "<tr><td>",$iommu[$i++],"</td><td>$line</td></tr>";
     $noiommu = true;
   } else {
     $BDF_VD_REGEX = '/^[[:xdigit:]]{2}:[[:xdigit:]]{2}\.[[:xdigit:]](\|[[:xdigit:]]{4}:[[:xdigit:]]{4})?$/';
@@ -126,35 +126,35 @@ case 't1':
           // By default lspci does not output the <Domain> when the only domain in the system is 0000. Add it back.
           $pciaddress = "0000:".$pciaddress;
         }
-        echo ($append)?"":"<tr><td></td><td>";
+        echo ($append) ? "" : "<tr><td></td><td>";
         exec("lspci -v -s $pciaddress", $outputvfio);
         if (preg_grep("/vfio-pci/i", $outputvfio)) {
-          echo "<i class=\"fa fa-circle orb green-orb middle\" title=\""._('Kernel driver in use: vfio-pci')."\"></i>";
+          echo "<i class=\"fa fa-circle orb green-orb middle\" title=\"",_('Kernel driver in use: vfio-pci'),"\"></i>";
           $isbound = "true";
         }
         echo "</td><td>";
         if ((strpos($line, 'Host bridge') === false) && (strpos($line, 'PCI bridge') === false)) {
-          if (file_exists('/sys/kernel/iommu_groups/'.$iommu.'/devices/'.$pciaddress.'/reset')) echo "<i class=\"fa fa-retweet grey-orb middle\" title=\""._('Function Level Reset (FLR) supported').".\"></i>";
+          if (file_exists('/sys/kernel/iommu_groups/'.$iommu.'/devices/'.$pciaddress.'/reset')) echo "<i class=\"fa fa-retweet grey-orb middle\" title=\"",_('Function Level Reset (FLR) supported'),".\"></i>";
           echo "</td><td>";
-          echo in_array($iommu, $iommuinuse) ? ' <input type="checkbox" value="" title="'._('In use by Unraid').'" disabled ' : ' <input type="checkbox" class="iommu'.$iommu.'" value="'.$pciaddress."|".$vd.'" ';
+          echo in_array($iommu, $iommuinuse) ? '<input type="checkbox" value="" title="',_('In use by Unraid'),'" disabled ' : '<input type="checkbox" class="iommu',$iommu,'" value="',$pciaddress,"|",$vd,'" ';
           // check config file for two formats: <Domain:Bus:Device.Function>|<Vendor:Device> or just <Domain:Bus:Device.Function>
           echo (in_array($pciaddress."|".$vd, $vfio_cfg_devices) || in_array($pciaddress, $vfio_cfg_devices)) ? " checked>" : ">";
         } else { echo "</td><td>"; }
         echo '</td><td title="';
         foreach ($outputvfio as $line2) echo htmlentities($line2,ENT_QUOTES)."&#10;";
-        echo '">'.$line.'</td></tr>';
+        echo '">',$line,'</td></tr>';
         unset($outputvfio);
         switch (true) {
           case (strpos($line, 'USB controller') !== false):
             if (isset($isbound)) {
-              echo '<tr><td></td><td></td><td></td><td></td><td style="padding-left: 50px;">'._('This controller is bound to vfio, connected USB devices are not visible').'.</td></tr>';
+              echo '<tr><td></td><td></td><td></td><td></td><td>',_('This controller is bound to vfio, connected USB devices are not visible'),'.</td></tr>';
             } else {
               exec('for usb_ctrl in $(find /sys/bus/usb/devices/usb* -maxdepth 0 -type l);do path="$(realpath "${usb_ctrl}")";if [[ $path == *'.$pciaddress.'* ]];then bus="$(cat "${usb_ctrl}/busnum")";lsusb -s $bus:|sort;fi;done',$getusb);
               foreach($getusb as $usbdevice) {
                 [$bus,$id] = my_explode(':',$usbdevice);
                 $usbport = usb_physical_port($usbdevice);
                 if (strlen($usbport) > 7 ) {$usbport .= "\t"; } else { $usbport .= "\t\t"; }
-                echo "<tr><td></td><td></td><td></td><td></td><td style=\"padding-left: 50px;\">$bus Port $usbport".trim($id)."</td></tr>";
+                echo "<tr><td></td><td></td><td></td><td></td><td>$bus Port $usbport",trim($id),"</td></tr>";
               }
               unset($getusb);
             }
@@ -167,14 +167,14 @@ case 't1':
           case (strpos($line, 'Mass storage controller') !== false):
           case (strpos($line, 'Non-Volatile memory controller') !== false):
             if (isset($isbound)) {
-              echo '<tr><td></td><td></td><td></td><td></td><td style="padding-left: 50px;">'._('This controller is bound to vfio, connected drives are not visible').'.</td></tr>';
+              echo '<tr><td></td><td></td><td></td><td></td><td>',_('This controller is bound to vfio, connected drives are not visible'),'.</td></tr>';
             } else {
               exec('ls -al /sys/block/sd* /sys/block/hd* /sys/block/sr* /sys/block/nvme* 2>/dev/null | grep -i "'.$pciaddress.'"',$getsata);
               foreach($getsata as $satadevice) {
                 $satadevice = substr($satadevice, strrpos($satadevice, '/', -1)+1);
                 $search = preg_grep('/'.$satadevice.'.*/', $lsscsi);
                 foreach ($search as $deviceline) {
-                  echo '<tr><td></td><td></td><td></td><td></td><td style="padding-left: 50px;">'.$deviceline.'</td></tr>';
+                  echo '<tr><td></td><td></td><td></td><td></td><td>',$deviceline,'</td></tr>';
                 }
               }
               unset($search);
@@ -219,14 +219,14 @@ case 't3':
   foreach ($lsusb as $line) {
     [$bus,$id] = my_explode(':',$line);
     $usbport = usb_physical_port($line);
-    echo "<tr><td>$bus Port $usbport</td><td>  ".trim($id)."</td></tr>";
+    echo "<tr><td>$bus Port $usbport</td><td>".trim($id)."</td></tr>";
   }
   break;
 case 't4':
   exec('lsscsi -s',$lsscsi);
   foreach ($lsscsi as $line) {
     if (strpos($line,'/dev/')===false) continue;
-    echo "<tr><td>".preg_replace('/\]  +/',']</td><td>',$line)."</td></tr>";
+    echo "<tr><td>",preg_replace('/\]  +/',']</td><td>',$line),"</td></tr>";
   }
   break;
 }
diff --git a/emhttp/plugins/dynamix/include/SysDrivers.php b/emhttp/plugins/dynamix/include/SysDrivers.php
index 251e6e240..31e0906ea 100644
--- a/emhttp/plugins/dynamix/include/SysDrivers.php
+++ b/emhttp/plugins/dynamix/include/SysDrivers.php
@@ -46,7 +46,7 @@ case 't1load':
   if (is_file($sysdrvinit)) $init = file_get_contents($sysdrvinit);
   $html =  "<thead><tr><th><b>"._("Driver")."</th><th><b>"._("Description")."</th><th data-value='System|Inuse|Custom|Disabled|\"Kernel - Inuse\"'><b>"._("State")."</th><th><b>"._("Type")."</th><th><b>"._("Modprobe.d config file")."</th></tr></thead>";
   $html .= "<tbody>";
-  if (is_array($arrModules)) ksort($arrModules);
+  ksort($arrModules);
   foreach($arrModules as $modname => $module) {
     if ($modname == "") continue;
     if (is_file("/boot/config/modprobe.d/$modname.conf")) {
@@ -76,17 +76,17 @@ case 't1load':
         $supporthtml = "<span id='link$modname'><a href='$supporturl' target='_blank'><i title='"._("Support page $pluginname")."' class='fa fa-phone-square'></i></a></span>";
       }
     }
-    if (isset($module["version"])) $version = " (".$module["version"].")"; else $version = "";
+    if (!empty($module["version"])) $version = " (".$module["version"].")"; else $version = "";
     $html .= "<td>$modname$version$supporthtml</td>";
     $html .= "<td>{$module['description']}</td><td id=\"status$modname\">{$module['state']}</td><td>{$module['type']}</td>";
     $text = "";
-    if (is_array($module["modprobe"])) {
+    if (is_array($module["modprobe"]) && count($module["modprobe"])) {
       $text = implode("\n",$module["modprobe"]);
       $html .= "<td><span><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
       $hidden = "";
       if ($module['state'] == "System") $hidden = "hidden";
       $html .= " <a class='info' href=\"#\" id=\"bin$modname\" $hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash'></i></a><span>";
-      $html .= "<span><textarea id=\"text".$modname."\" rows=3 disabled>$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a  class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save' ></i></a></span></td></tr>";
+      $html .= "<span><textarea id=\"text".$modname."\" rows=2 disabled>$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a  class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save' ></i></a></span></td></tr>";
     } else {
       $html .= "<td><span><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
       $html .= " <a class='info' href=\"#\" id=\"bin$modname\" hidden><i title='"._("Delete Modprobe config")."'  onclick=\"removecfg('".$modname."',true);return false;\"  class='fa fa-trash'></i></a><span>";
diff --git a/emhttp/plugins/dynamix/include/SysDriversHelpers.php b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
index 5a0e241e8..37a8ae11e 100644
--- a/emhttp/plugins/dynamix/include/SysDriversHelpers.php
+++ b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
@@ -15,14 +15,13 @@ function getplugin($in) {
   $plugins = "/var/log/plugins/";
   $plugin_link = $plugins.$in;
   $plugin_file = @readlink($plugin_link);
-  $support = plugin('support',$plugin_file) ?: "";
-  return $support;
+  return plugin('support',$plugin_file) ?: '';
 }
 
 function getmodules($name) {
   global $arrModules,$lsmod,$kernel,$arrModtoPlg,$modplugins;
   // preset variables
-  $modname = $depends = $filename = $desc = $file = $version = $state = $dir = $support = $supporturl = $pluginfile = "";
+  $modname = $depends = $filename = $desc = $file = $version = $state = $dir = $support = $supporturl = $pluginfile = null;
   $modprobe = $parms = [];
   exec("modinfo $name",$output,$error);
   foreach($output as $outline) {
diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 835aff61e..b68c6fb5a 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -1,9 +1,9 @@
 table.t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
 table.t1 tr td{padding:0 0 3px 0;margin:0}
 table.t1 tr td.thin{line-height:8px;height:8px}
-table.t1 tr>td{width:1%;text-align:centre;white-space: nowrap}
-table.t1 tr>td+td{width:1%;white-space:nowrap}
-table.t1 tr>td+td+td{width:auto;text-align:left}
-table.t1 tr>td+td+td+td{text-align:left}
-table.t1 tr>td+td+td+td+td{text-align:left}
+table.t1 tr>td{width:5%;text-align:left;white-space:nowrap}
+table.t1 tr>td+td{width:35%;text-align:left;white-space:normal}
+table.t1 tr>td+td+td{width:20%;text-align:left}
+table.t1 tr>td+td+td+td{width:20%;text-align:left}
+table.t1 tr>td+td+td+td+td{width:20%;text-align:left}
 .t1.tablesorter .filtered{display:none}

From 52a42ce3dc00a192afd75441dba40bde54c1d01b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 21:17:24 +0200
Subject: [PATCH 139/266] SysDrivers: place edit icon at bottom

---
 emhttp/plugins/dynamix/include/SysDrivers.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/SysDrivers.php b/emhttp/plugins/dynamix/include/SysDrivers.php
index 31e0906ea..a46741d99 100644
--- a/emhttp/plugins/dynamix/include/SysDrivers.php
+++ b/emhttp/plugins/dynamix/include/SysDrivers.php
@@ -82,15 +82,15 @@ case 't1load':
     $text = "";
     if (is_array($module["modprobe"]) && count($module["modprobe"])) {
       $text = implode("\n",$module["modprobe"]);
-      $html .= "<td><span><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
+      $html .= "<td><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
       $hidden = "";
       if ($module['state'] == "System") $hidden = "hidden";
-      $html .= " <a class='info' href=\"#\" id=\"bin$modname\" $hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash'></i></a><span>";
-      $html .= "<span><textarea id=\"text".$modname."\" rows=2 disabled>$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a  class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save' ></i></a></span></td></tr>";
+      $html .= " <a class='info' href=\"#\" id=\"bin$modname\" $hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash'></i></a>";
+      $html .= "<textarea id=\"text".$modname."\" rows=2 disabled>$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a  class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save'></i></a></td></tr>";
     } else {
-      $html .= "<td><span><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
-      $html .= " <a class='info' href=\"#\" id=\"bin$modname\" hidden><i title='"._("Delete Modprobe config")."'  onclick=\"removecfg('".$modname."',true);return false;\"  class='fa fa-trash'></i></a><span>";
-      $html .= "<textarea id=\"text".$modname."\" rows=1 hidden disabled >$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save' ></i></a></span></td></tr>";
+      $html .= "<td><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
+      $html .= " <a class='info' href=\"#\" id=\"bin$modname\" hidden><i title='"._("Delete Modprobe config")."'  onclick=\"removecfg('".$modname."',true);return false;\"  class='fa fa-trash'></i></a>";
+      $html .= "<textarea id=\"text".$modname."\" rows=1 hidden disabled >$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save'></i></a></td></tr>";
     }
   }
   $html .=  "</tbody>";

From 43402f3eba0c89614315d6024e8b84dc78b2c80a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 21:23:21 +0200
Subject: [PATCH 140/266] SysDrivers: place edit icon at bottom

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

diff --git a/emhttp/plugins/dynamix/include/SysDrivers.php b/emhttp/plugins/dynamix/include/SysDrivers.php
index a46741d99..921bbbefc 100644
--- a/emhttp/plugins/dynamix/include/SysDrivers.php
+++ b/emhttp/plugins/dynamix/include/SysDrivers.php
@@ -86,11 +86,11 @@ case 't1load':
       $hidden = "";
       if ($module['state'] == "System") $hidden = "hidden";
       $html .= " <a class='info' href=\"#\" id=\"bin$modname\" $hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash'></i></a>";
-      $html .= "<textarea id=\"text".$modname."\" rows=2 disabled>$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a  class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save'></i></a></td></tr>";
+      $html .= "<textarea id=\"text".$modname."\" rows=2 disabled>$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a  class='info' href=\"#\"><i title='"._("Save Modprobe config")."' class='fa fa-save'></i></a></td></tr>";
     } else {
       $html .= "<td><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
-      $html .= " <a class='info' href=\"#\" id=\"bin$modname\" hidden><i title='"._("Delete Modprobe config")."'  onclick=\"removecfg('".$modname."',true);return false;\"  class='fa fa-trash'></i></a>";
-      $html .= "<textarea id=\"text".$modname."\" rows=1 hidden disabled >$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a class='info' href=\"#\"><i  title='"._("Save Modprobe config")."' class='fa fa-save'></i></a></td></tr>";
+      $html .= " <a class='info' href=\"#\" id=\"bin$modname\" hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash'></i></a>";
+      $html .= "<textarea id=\"text".$modname."\" rows=1 hidden disabled >$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a class='info' href=\"#\"><i title='"._("Save Modprobe config")."' class='fa fa-save'></i></a></td></tr>";
     }
   }
   $html .=  "</tbody>";

From b5e8481848bf71560b35bed503671de9c164d505 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 21:27:45 +0200
Subject: [PATCH 141/266] SysDrivers: adjusted column widths

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index b68c6fb5a..a04442464 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -3,7 +3,7 @@ table.t1 tr td{padding:0 0 3px 0;margin:0}
 table.t1 tr td.thin{line-height:8px;height:8px}
 table.t1 tr>td{width:5%;text-align:left;white-space:nowrap}
 table.t1 tr>td+td{width:35%;text-align:left;white-space:normal}
-table.t1 tr>td+td+td{width:20%;text-align:left}
-table.t1 tr>td+td+td+td{width:20%;text-align:left}
-table.t1 tr>td+td+td+td+td{width:20%;text-align:left}
+table.t1 tr>td+td+td{width:18%;text-align:left}
+table.t1 tr>td+td+td+td{width:18%;text-align:left}
+table.t1 tr>td+td+td+td+td{width:24%;text-align:left}
 .t1.tablesorter .filtered{display:none}

From 0cac30a0e197934fdadcf41b11e768c523697174 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 21:31:26 +0200
Subject: [PATCH 142/266] Update SysDrivers.css

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index a04442464..1aa804a0d 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -7,3 +7,4 @@ table.t1 tr>td+td+td{width:18%;text-align:left}
 table.t1 tr>td+td+td+td{width:18%;text-align:left}
 table.t1 tr>td+td+td+td+td{width:24%;text-align:left}
 .t1.tablesorter .filtered{display:none}
+textarea[id^=text]{width:80%}

From 7805f1fbe603876e789bcd8f2f03cdf6e79713b1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 21:32:03 +0200
Subject: [PATCH 143/266] Update SysDrivers.css

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 1aa804a0d..a0464ef01 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -7,4 +7,4 @@ table.t1 tr>td+td+td{width:18%;text-align:left}
 table.t1 tr>td+td+td+td{width:18%;text-align:left}
 table.t1 tr>td+td+td+td+td{width:24%;text-align:left}
 .t1.tablesorter .filtered{display:none}
-textarea[id^=text]{width:80%}
+textarea[id^=text]{width:85%}

From dc760f17c7aa935244744cd83f0d1ed0f1312c36 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 21:34:09 +0200
Subject: [PATCH 144/266] Update SysDrivers.css

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index a0464ef01..8aca94f15 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -7,4 +7,4 @@ table.t1 tr>td+td+td{width:18%;text-align:left}
 table.t1 tr>td+td+td+td{width:18%;text-align:left}
 table.t1 tr>td+td+td+td+td{width:24%;text-align:left}
 .t1.tablesorter .filtered{display:none}
-textarea[id^=text]{width:85%}
+textarea[id^=text]{width:90%;margin:0;padding:0}

From 944fcc60955f4612ae471e7644a075ce9a13d345 Mon Sep 17 00:00:00 2001
From: Tom Mortensen <tomm@lime-technology.com>
Date: Thu, 26 Oct 2023 14:01:44 -0700
Subject: [PATCH 145/266] add missing rc.mysqld - not used but added for
 completeness

---
 etc/rc.d/rc.mysqld | 87 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 etc/rc.d/rc.mysqld

diff --git a/etc/rc.d/rc.mysqld b/etc/rc.d/rc.mysqld
new file mode 100644
index 000000000..1844fe27a
--- /dev/null
+++ b/etc/rc.d/rc.mysqld
@@ -0,0 +1,87 @@
+#!/bin/sh
+# Start/stop/restart mysqld.
+#
+# Copyright 2003  Patrick J. Volkerding, Concord, CA
+# Copyright 2003  Slackware Linux, Inc., Concord, CA
+# Copyright 2008, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+#
+# This program comes with NO WARRANTY, to the extent permitted by law.
+# You may redistribute copies of this program under the terms of the
+# GNU General Public License.
+
+# To start MariaDB automatically at boot, be sure this script is executable:
+# chmod 755 /etc/rc.d/rc.mysqld
+
+# Before you can run MariaDB, you must have a database.  To install an initial
+# database, do this as root:
+#
+#   mysql_install_db --user=mysql
+#
+# Note that the mysql user must exist in /etc/passwd, and the created files
+# will be owned by this dedicated user.  This is important, or else mysql
+# (which runs as user "mysql") will not be able to write to the database
+# later (this can be fixed with 'chown -R mysql.mysql /var/lib/mysql').
+#
+# To increase system security, consider using "mysql_secure_installation"
+# as well.  For more information on this tool, please read:
+#   man mysql_secure_installation
+
+# To allow outside connections to the database comment out the next line.
+# If you don't need incoming network connections, then leave the line
+# uncommented to improve system security.
+SKIP="--skip-networking"
+
+# Start mysqld:
+mysqld_start() {
+  if [ -x /usr/bin/mysqld_safe ]; then
+    # If there is an old PID file (no mysqld running), clean it up:
+    if [ -r /var/run/mysql/mysql.pid ]; then
+      if ! ps axc | grep mysqld 1> /dev/null 2> /dev/null ; then
+        echo "Cleaning up old /var/run/mysql/mysql.pid."
+        rm -f /var/run/mysql/mysql.pid
+      fi
+    fi
+
+    /usr/bin/mysqld_safe --datadir=/var/lib/mysql --pid-file=/var/run/mysql/mysql.pid $SKIP &
+  fi
+}
+
+# Stop mysqld:
+mysqld_stop() {
+  # If there is no PID file, ignore this request...
+  if [ -r /var/run/mysql/mysql.pid ]; then
+    PID=$(cat /var/run/mysql/mysql.pid)
+    kill $PID
+    # Wait at least one minute for it to exit, as we don't know how big the DB is...
+    for second in $(seq 0 60) ; do
+      if [ ! -r /var/run/mysql/mysql.pid ]; then
+        break;
+      fi
+      sleep 1
+    done
+    if [ "$second" = "60" ]; then
+      echo "WARNING:  Gave up waiting for mysqld to exit!"
+      sleep 15
+    fi
+  fi
+}
+
+# Restart mysqld:
+mysqld_restart() {
+  mysqld_stop
+  mysqld_start
+}
+
+case "$1" in
+'start')
+  mysqld_start
+  ;;
+'stop')
+  mysqld_stop
+  ;;
+'restart')
+  mysqld_restart
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac

From 3b2540a2fc406a43a1bac65fcddb386d4f2539d6 Mon Sep 17 00:00:00 2001
From: Tom Mortensen <tomm@lime-technology.com>
Date: Thu, 26 Oct 2023 14:09:36 -0700
Subject: [PATCH 146/266] corrections displaying zfs profiles

---
 emhttp/plugins/dynamix/DeviceInfo.page | 42 ++++++++++++++------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 102db94f8..2f841149f 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -190,24 +190,26 @@ function prepareZFS(form) {
 }
 <?endif;?>
 
-function selectDiskFsWidth(num_devices,selected_width) {
+function selectDiskFsWidth() {
+  var num_slots = <?=_var($disk,'slots',0)?>;
+  var selected_width = <?=_var($disk,'fsWidth',0)?>;
   $('#diskFsWidthZFS').empty();
-  if (num_devices == 0) {
+  if (num_slots == 0) {
     $('#diskFsWidthZFS').prop('disabled',true).append($('<option>', {
       value: 0,
       text: "<?=_('no devices')?>"
     }));
   } else if ($('#diskFsProfileZFS').val() == '') {
-    var label = (num_devices == 1) ? "device" : "devices";
+    var label = (num_slots == 1) ? "device" : "devices";
     $('#diskFsWidthZFS').append($('<option>', {
       value: 1,
-      text: _(sprintf('%s '+label,num_devices))
+      text: _(sprintf('%s '+label,num_slots))
     }));
   } else if ($('#diskFsProfileZFS').val() == 'mirror') {
     var width;
-    for (width=2; width<=Math.min(num_devices,4); width++) {
-      if ((num_devices % width) == 0) {
-        var groups = num_devices / width;
+    for (width=2; width<=Math.min(num_slots,4); width++) {
+      if ((num_slots % width) == 0) {
+        var groups = num_slots / width;
         var label = (groups == 1) ? "group" : "groups";
         $('#diskFsWidthZFS').append($('<option>', {
           value: width,
@@ -221,9 +223,9 @@ function selectDiskFsWidth(num_devices,selected_width) {
     if ($('#diskFsProfileZFS').val() == 'raidz1') min_width = 3;
     else if ($('#diskFsProfileZFS').val() == 'raidz2') min_width = 3;
     else if ($('#diskFsProfileZFS').val() == 'raidz3') min_width = 4;
-    for (width=min_width; width<=num_devices; width++) {
-      if ((num_devices % width) == 0) {
-        var groups = num_devices / width;
+    for (width=min_width; width<=num_slots; width++) {
+      if ((num_slots % width) == 0) {
+        var groups = num_slots / width;
         var label = (groups == 1) ? "group" : "groups";
         $('#diskFsWidthZFS').append($('<option>', {
           value: width,
@@ -234,7 +236,7 @@ function selectDiskFsWidth(num_devices,selected_width) {
     }
   }
 }
-function selectDiskFsProfile(num_slots, width, init) {
+function selectDiskFsProfile(init) {
   var t = init ? null : 'slow';
   if (($('#diskFsType').val()||'').indexOf('auto') != -1) {
     $('#diskFsProfileBTRFS').prop('disabled',true).hide();
@@ -259,7 +261,7 @@ function selectDiskFsProfile(num_slots, width, init) {
     }
     $('#diskFsProfileZFS').show();
     $('#diskFsWidthZFS').show();
-    selectDiskFsWidth(num_slots, width);
+    selectDiskFsWidth();
     $('#compression').show(t);
 <?if (diskType('Cache')):?>
     $('#autotrim').show(t);
@@ -615,7 +617,7 @@ _(File system type)_:
 
 <?elseif (!isSubpool($name) && _var($disk,'slots',0)>1):?>
 _(File system type)_:
-: <select id="diskFsType" name="diskFsType.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsProfile(<?=_var($disk,'slots',0)?>,0)" <?=$disabled?>>
+: <select id="diskFsType" name="diskFsType.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsProfile(false)" <?=$disabled?>>
   <?=mk_option(_var($disk,'fsType'), "auto", _('auto'))?>
   <?=mk_option(_var($disk,'fsType'), "zfs", _('zfs'))?>
   <?=mk_option(_var($disk,'fsType'), "btrfs", _('btrfs'))?>
@@ -632,7 +634,7 @@ _(File system type)_:
   <?if (_var($disk,'slots',0)>=3) echo mk_option(_var($disk,'fsProfile'),"raid5", _('raid5'))?>
   <?if (_var($disk,'slots',0)>=4) echo mk_option(_var($disk,'fsProfile'),"raid6", _('raid6'))?>
   </select>
-  <select id="diskFsProfileZFS" name="diskFsProfile.<?=_var($disk,'idx',0)?>" style="display:none" onchange="selectDiskFsWidth(<?=_var($disk,'slots',0)?>,0)" <?=$disabled?>>
+  <select id="diskFsProfileZFS" name="diskFsProfile.<?=_var($disk,'idx',0)?>" style="display:none" onchange="selectDiskFsWidth()" <?=$disabled?>>
   <?if (_var($disk,'slots',0)==1) echo mk_option(_var($disk,'fsProfile'),"", _('single'))?>
   <?if (_var($disk,'slots',0)>=2) echo mk_option(_var($disk,'fsProfile'),"", _('raid0'))?>
   <?if ((_var($disk,'slots',0)%2)==0 || (_var($disk,'slots',0)%3)==0 || (_var($disk,'slots',0)%4)==0) echo mk_option(_var($disk,'fsProfile'),"mirror", _('mirror'))?>
@@ -644,10 +646,10 @@ _(File system type)_:
   </select>
 <?elseif (isSubpool($name)=="special" || isSubpool($name)=="logs" || isSubpool($name)=="dedup"):?>
 _(File system type)_:
-: <select id="diskFsType" name="diskFsType.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsProfile(<?=_var($disk,'slots',0)?>,0)" <?=$disabled?>>
+: <select id="diskFsType" name="diskFsType.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsProfile(false)" <?=$disabled?>>
   <?=mk_option(_var($disk,'fsType'), "zfs", _('zfs'))?>
   </select>
-  <select id="diskFsProfileZFS" name="diskFsProfile.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsWidth(<?=_var($disk,'slots',0)?>,0)" <?=$disabled?>>
+  <select id="diskFsProfileZFS" name="diskFsProfile.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsWidth()" <?=$disabled?>>
   <?if (_var($disk,'slots',0)==1) echo mk_option(_var($disk,'fsProfile'),"", _('single'))?>
   <?if (_var($disk,'slots',0)>=2) echo mk_option(_var($disk,'fsProfile'),"", _('raid0'))?>
   <?if ((_var($disk,'slots',0)%2)==0 || (_var($disk,'slots',0)%3)==0 || (_var($disk,'slots',0)%4)==0) echo mk_option(_var($disk,'fsProfile'),"mirror", _('mirror'))?>
@@ -656,10 +658,10 @@ _(File system type)_:
   </select>
 <?elseif (isSubpool($name)=="cache"):?>
 _(File system type)_:
-: <select id="diskFsType" name="diskFsType.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsProfile(<?=_var($disk,'slots',0)?>,0)" <?=$disabled?>>
+: <select id="diskFsType" name="diskFsType.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsProfile(false)" <?=$disabled?>>
   <?=mk_option(_var($disk,'fsType'), "zfs", _('zfs'))?>
   </select>
-  <select id="diskFsProfileZFS" name="diskFsProfile.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsWidth(<?=_var($disk,'slots',0)?>,0)" <?=$disabled?>>
+  <select id="diskFsProfileZFS" name="diskFsProfile.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsWidth()" <?=$disabled?>>
   <?if (_var($disk,'slots',0)==1) echo mk_option(_var($disk,'fsProfile'),"", _('single'))?>
   <?if (_var($disk,'slots',0)>=2) echo mk_option(_var($disk,'fsProfile'),"", _('raid0'))?>
   </select>
@@ -667,7 +669,7 @@ _(File system type)_:
   </select>
 <?elseif (isSubpool($name)=="spares"):?>
 _(File system type)_:
-: <select id="diskFsType" name="diskFsType.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsProfile(<?=_var($disk,'slots',0)?>,0)" <?=$disabled?>>
+: <select id="diskFsType" name="diskFsType.<?=_var($disk,'idx',0)?>" onchange="selectDiskFsProfile(false)" <?=$disabled?>>
   <?=mk_option(_var($disk,'fsType'), "zfs", _('zfs'))?>
   </select>
 <?endif;?>
@@ -1332,7 +1334,7 @@ $(function() {
       }
     });
   }
-  selectDiskFsProfile(<?=_var($disk,'slots',0)?>,true);
+  selectDiskFsProfile(true);
 <?if (fsType('btrfs')):?>
   presetBTRFS(document.balance_schedule,'#balance-hour');
   presetBTRFS(document.scrub_schedule,'#scrub-hour');

From b072f98787c8ee8f6b42c626459fee4399478c42 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 23:28:30 +0200
Subject: [PATCH 147/266] Make $subpools a global variable (single occurence)

---
 emhttp/plugins/dynamix/CacheDevices.page | 3 ---
 emhttp/plugins/dynamix/DeviceInfo.page   | 8 +++-----
 emhttp/plugins/dynamix/template.php      | 3 +++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 114a11309..dfbb439ae 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -16,9 +16,6 @@ Cond="($pool_devices || $var['fsState']=='Stopped')"
  */
 ?>
 <?
-// pool name ending in any of these => zfs subpool
-$subpools = ['special','logs','dedup','cache','spares'];
-
 function makeList($list) {
   return implode(',',array_map('escapestring',$list));
 }
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 2f841149f..7e604f3dd 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -80,11 +80,9 @@ function maintenance_mode() {
   return _var($var,'fsState')=="Started" && _var($var,'startMode')=="Maintenance" && _var($disk,'luksState',0)<=1;
 }
 function isSubpool($name) {
-  // pool name ending in any of these => zfs subpool
-  $subpools = array( "special", "logs", "dedup", "cache", "spares");
-  $tildaPosition = strpos($name, '~');
-  $subpool = ($tildaPosition!==false) ? substr($name, $tildaPosition+1) : false;
-  return ($subpool!==false && in_array($subpool, $subpools)) ? $subpool : false;
+  global $subpools;
+  $subpool = my_explode('~',$name)[1];
+  return in_array($subpool,$subpools) ? $subpool : false;
 }
 function isPool($name) {
   global $pools;
diff --git a/emhttp/plugins/dynamix/template.php b/emhttp/plugins/dynamix/template.php
index d6238d19f..23caa5191 100644
--- a/emhttp/plugins/dynamix/template.php
+++ b/emhttp/plugins/dynamix/template.php
@@ -78,6 +78,9 @@ $pageroot = $docroot.'/'._var($myPage,'root');
 $nchan_pid = "/var/run/nchan.pid";
 $nchan_run = "";
 
+// pool name ending in any of these => zfs subpool
+$subpools = ['special','logs','dedup','cache','spares'];
+
 // Giddyup
 require_once "$docroot/webGui/include/DefaultPageLayout.php";
 ?>

From 49c8980bb1276484c75c04b9065d4ea5c2172ed6 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 23:33:41 +0200
Subject: [PATCH 148/266] Make $subpools a global variable (single occurence)

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

diff --git a/emhttp/plugins/dynamix/template.php b/emhttp/plugins/dynamix/template.php
index 23caa5191..08839cbc0 100644
--- a/emhttp/plugins/dynamix/template.php
+++ b/emhttp/plugins/dynamix/template.php
@@ -46,6 +46,9 @@ $pool_devices = false;
 $pools = pools_filter($disks);
 foreach ($pools as $pool) $pool_devices |= _var($disks[$pool],'devices')!='';
 
+// pool name ending in any of these => zfs subpool
+$subpools = ['special','logs','dedup','cache','spares'];
+
 // Read network settings
 extract(parse_ini_file('state/network.ini',true));
 
@@ -78,9 +81,6 @@ $pageroot = $docroot.'/'._var($myPage,'root');
 $nchan_pid = "/var/run/nchan.pid";
 $nchan_run = "";
 
-// pool name ending in any of these => zfs subpool
-$subpools = ['special','logs','dedup','cache','spares'];
-
 // Giddyup
 require_once "$docroot/webGui/include/DefaultPageLayout.php";
 ?>

From d006f3da4dfaddf55e2f10822b589034ee260afb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 10:29:28 +0200
Subject: [PATCH 149/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/include/SysDrivers.php | 19 +++++++++++--------
 emhttp/plugins/dynamix/sheets/SysDrivers.css  |  5 ++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/SysDrivers.php b/emhttp/plugins/dynamix/include/SysDrivers.php
index 921bbbefc..8a9706577 100644
--- a/emhttp/plugins/dynamix/include/SysDrivers.php
+++ b/emhttp/plugins/dynamix/include/SysDrivers.php
@@ -82,15 +82,18 @@ case 't1load':
     $text = "";
     if (is_array($module["modprobe"]) && count($module["modprobe"])) {
       $text = implode("\n",$module["modprobe"]);
-      $html .= "<td><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
-      $hidden = "";
-      if ($module['state'] == "System") $hidden = "hidden";
-      $html .= " <a class='info' href=\"#\" id=\"bin$modname\" $hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash'></i></a>";
-      $html .= "<textarea id=\"text".$modname."\" rows=2 disabled>$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a  class='info' href=\"#\"><i title='"._("Save Modprobe config")."' class='fa fa-save'></i></a></td></tr>";
+      $hidden = ($module['state'] == "System") ? "hidden" : "";
+      $html .= "<td><span class='pin'>";
+      $html .= "<a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit pin'></i></a>";
+      $html .= "<a class='info' href=\"#\" id=\"bin$modname\" $hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash pin'></i></a>";
+      $html .= "<span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\"><a class='info' href=\"#\"><i title='"._("Save Modprobe config")."' class='fa fa-save pin'></i></a></span></span>";
+      $html .= "<textarea id=\"text".$modname."\" rows=2 disabled>$text</textarea></td></tr>";
     } else {
-      $html .= "<td><a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit'></i></a>";
-      $html .= " <a class='info' href=\"#\" id=\"bin$modname\" hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash'></i></a>";
-      $html .= "<textarea id=\"text".$modname."\" rows=1 hidden disabled >$text</textarea><span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\" ><a class='info' href=\"#\"><i title='"._("Save Modprobe config")."' class='fa fa-save'></i></a></td></tr>";
+      $html .= "<td><span class='pin'>";
+      $html .= "<a class='info' href=\"#\"><i title='"._("Edit Modprobe config")."' onclick=\"textedit('".$modname."');return false;\" id=\"icon'.$modname.'\" class='fa fa-edit pin'></i></a>";
+      $html .= "<a class='info' href=\"#\" id=\"bin$modname\" hidden><i title='"._("Delete Modprobe config")."' onclick=\"removecfg('".$modname."',true);return false;\" class='fa fa-trash pin'></i></a>";
+      $html .= "<span id=\"save$modname\" hidden onclick=\"textsave('".$modname."');return false;\"><a class='info' href=\"#\"><i title='"._("Save Modprobe config")."' class='fa fa-save pin'></i></a></span></span>";
+      $html .= "<textarea id=\"text".$modname."\" rows=2 hidden disabled >$text</textarea></td></tr>";
     }
   }
   $html .=  "</tbody>";
diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 8aca94f15..192b49b80 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -7,4 +7,7 @@ table.t1 tr>td+td+td{width:18%;text-align:left}
 table.t1 tr>td+td+td+td{width:18%;text-align:left}
 table.t1 tr>td+td+td+td+td{width:24%;text-align:left}
 .t1.tablesorter .filtered{display:none}
-textarea[id^=text]{width:90%;margin:0;padding:0}
+textarea[id^=text]{width:90%;margin:0!important;padding:0!important;float:right}
+span[id^=save]{margin:0!important;padding:0!important}
+span.pin{display:inline-block;float:left}
+i.pin{margin:0!important;padding:4px 0 0 0!important;float:left;clear:both}

From 094ffccbdca7b1902e62156bf2b9fb6a4bba812d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 10:31:35 +0200
Subject: [PATCH 150/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 192b49b80..dc476b014 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -10,4 +10,4 @@ table.t1 tr>td+td+td+td+td{width:24%;text-align:left}
 textarea[id^=text]{width:90%;margin:0!important;padding:0!important;float:right}
 span[id^=save]{margin:0!important;padding:0!important}
 span.pin{display:inline-block;float:left}
-i.pin{margin:0!important;padding:4px 0 0 0!important;float:left;clear:both}
+i.pin{margin:0!important;padding:2px 0!important;float:left;clear:both}

From 99d7c3a5b513cea727320bb70d6a59b5144dde62 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 10:55:39 +0200
Subject: [PATCH 151/266] Dashboard: show timezone as GMT offset

---
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index edc823ad5..033cd5c4f 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -127,7 +127,7 @@ while (true) {
     // 12 hour format wih am/pm
     $clock = date('g:i',$now); $ampm = '<span class="ampm">'.date('a',$now).'</span>';
   }
-  $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0).', '.date('T',$now);
+  $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0).', '._('GMT').' '.date('P',$now);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$timedate);
   $time0 = $time;
   sleep(1);

From 2910c2e921039366762a320b6243ab2b947aad71 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 10:57:42 +0200
Subject: [PATCH 152/266] Dashboard: show timezone as UTC offset

---
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 033cd5c4f..a44e3341c 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -127,7 +127,7 @@ while (true) {
     // 12 hour format wih am/pm
     $clock = date('g:i',$now); $ampm = '<span class="ampm">'.date('a',$now).'</span>';
   }
-  $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0).', '._('GMT').' '.date('P',$now);
+  $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0).', '._('UTC').' '.date('P',$now);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$timedate);
   $time0 = $time;
   sleep(1);

From 58575efa9d60e881d3af84497bf8f8fef81652f5 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 11:00:17 +0200
Subject: [PATCH 153/266] Dashboard: show timezone as UTC offset

---
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index a44e3341c..bc8841a39 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -127,7 +127,7 @@ while (true) {
     // 12 hour format wih am/pm
     $clock = date('g:i',$now); $ampm = '<span class="ampm">'.date('a',$now).'</span>';
   }
-  $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0).', '._('UTC').' '.date('P',$now);
+  $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0).', '._('UTC').date('P',$now);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$timedate);
   $time0 = $time;
   sleep(1);

From 41e661505b790cd68ba1a99e56747d848e9f5130 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 11:52:07 +0200
Subject: [PATCH 154/266] Dashboard: show timezone as UTC offset with DST
 indicator

---
 emhttp/plugins/dynamix/nchan/update_3 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index bc8841a39..a9ba9ad19 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -57,6 +57,10 @@ function port_get_contents($port) {
   return file_exists($port) ? @file_get_contents($port) : 0;
 }
 
+function esc($text) {
+  return "\\".join("\\",str_split($text));
+}
+
 // initialize variables
 $time0 = $time = microtime(true);
 foreach (ports() as $port) {
@@ -122,12 +126,12 @@ while (true) {
   $now = time();
   if (_var($display,'time')=='%R') {
     // 24 hour format
-    $clock = date('G:i',$now); $ampm = '';
+    $clock = date('G:i',$now);
   } else {
     // 12 hour format wih am/pm
-    $clock = date('g:i',$now); $ampm = '<span class="ampm">'.date('a',$now).'</span>';
+    $clock = date('g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
   }
-  $timedate = "$clock $ampm\n"._(date('l, F j, Y',$now),0).', '._('UTC').date('P',$now);
+  $timedate = "$clock\n"._(date('l, F j, Y, '.esc(_('UTC')).'P',$now),0).(date('I',$now) ? ' <sup>'._('DST').'</sup>' : '');
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$timedate);
   $time0 = $time;
   sleep(1);

From 410ea26b0ef41eacbeeba8033cc9be575e7b3bae Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 12:40:38 +0200
Subject: [PATCH 155/266] Dashboard: display date and time in user selected
 formats

---
 emhttp/plugins/dynamix/nchan/update_3 | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index a9ba9ad19..024ee30ce 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -58,9 +58,15 @@ function port_get_contents($port) {
 }
 
 function esc($text) {
+  // escape literal text in date format string
   return "\\".join("\\",str_split($text));
 }
 
+function mix($text) {
+  // convert linux date format to PHP equivalent
+  return str_replace(['%A','%Y','%B','%e','%m','%d'],['l','Y','F','j','m','d'],$text);
+}
+
 // initialize variables
 $time0 = $time = microtime(true);
 foreach (ports() as $port) {
@@ -124,15 +130,10 @@ while (true) {
   }
   // current date and time
   $now = time();
-  if (_var($display,'time')=='%R') {
-    // 24 hour format
-    $clock = date('G:i',$now);
-  } else {
-    // 12 hour format wih am/pm
-    $clock = date('g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
-  }
-  $timedate = "$clock\n"._(date('l, F j, Y, '.esc(_('UTC')).'P',$now),0).(date('I',$now) ? ' <sup>'._('DST').'</sup>' : '');
-  publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$timedate);
+  $clock = _var($display,'time')=='%R' ? date('G:i',$now) : date('g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
+  $date  = _var($display,'date','%c')=='%c' ? date('l, F j, Y, '.esc(_('UTC')).'P',$now) : date(mix($display['date']).', '.esc(_('UTC')).'P',$now);
+  $dst   = date('I',$now) ? ' <sup>'._('DST').'</sup>' : '';
+  publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1"."$clock\n"._($date,0).$dst);
   $time0 = $time;
   sleep(1);
   $time = microtime(true);

From afa05760f188a6c2695c18a39d840d1dce1b419c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 12:42:36 +0200
Subject: [PATCH 156/266] Dashboard: display date and time in user selected
 formats

---
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 024ee30ce..547e3afdf 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -129,7 +129,7 @@ while (true) {
     $stat[] = "Errors: {$rx_errors}<br>Drops: {$rx_drops}<br>Overruns: {$rx_fifo}\0Errors: {$tx_errors}<br>Drops: {$tx_drops}<br>Overruns: {$tx_fifo}";
   }
   // current date and time
-  $now = time();
+  $now   = time();
   $clock = _var($display,'time')=='%R' ? date('G:i',$now) : date('g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
   $date  = _var($display,'date','%c')=='%c' ? date('l, F j, Y, '.esc(_('UTC')).'P',$now) : date(mix($display['date']).', '.esc(_('UTC')).'P',$now);
   $dst   = date('I',$now) ? ' <sup>'._('DST').'</sup>' : '';

From a0cc91b24ce3c9ff553a74af14b132a959b493d1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 12:56:14 +0200
Subject: [PATCH 157/266] Dashboard: display date and time in user selected
 formats

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

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 547e3afdf..74c8b4d88 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -130,8 +130,8 @@ while (true) {
   }
   // current date and time
   $now   = time();
-  $clock = _var($display,'time')=='%R' ? date('G:i',$now) : date('g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
-  $date  = _var($display,'date','%c')=='%c' ? date('l, F j, Y, '.esc(_('UTC')).'P',$now) : date(mix($display['date']).', '.esc(_('UTC')).'P',$now);
+  $clock = date(_var($display,'time')=='%R' ? 'G:i' : 'g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
+  $date  = date((_var($display,'date','%c')=='%c' ? 'l, F j, Y' : mix($display['date'])).', '.esc(_('UTC')).'P',$now);
   $dst   = date('I',$now) ? ' <sup>'._('DST').'</sup>' : '';
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1"."$clock\n"._($date,0).$dst);
   $time0 = $time;

From 7a2f8edc5fe1169005951e923bcdd27fc40249fc Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 12:59:21 +0200
Subject: [PATCH 158/266] Dashboard: display date and time in user selected
 formats

---
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 74c8b4d88..97aa405ee 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -133,7 +133,7 @@ while (true) {
   $clock = date(_var($display,'time')=='%R' ? 'G:i' : 'g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
   $date  = date((_var($display,'date','%c')=='%c' ? 'l, F j, Y' : mix($display['date'])).', '.esc(_('UTC')).'P',$now);
   $dst   = date('I',$now) ? ' <sup>'._('DST').'</sup>' : '';
-  publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1"."$clock\n"._($date,0).$dst);
+  publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0).$dst);
   $time0 = $time;
   sleep(1);
   $time = microtime(true);

From 38f52e637fa4ff6c7b8696099a6d3c17be63e940 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:25:18 +0200
Subject: [PATCH 159/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index dc476b014..ce2b66419 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -5,7 +5,7 @@ table.t1 tr>td{width:5%;text-align:left;white-space:nowrap}
 table.t1 tr>td+td{width:35%;text-align:left;white-space:normal}
 table.t1 tr>td+td+td{width:18%;text-align:left}
 table.t1 tr>td+td+td+td{width:18%;text-align:left}
-table.t1 tr>td+td+td+td+td{width:24%;text-align:left}
+table.t1 tr>td+td+td+td+td{width:24%;text-align:left;padding-right:0}
 .t1.tablesorter .filtered{display:none}
 textarea[id^=text]{width:90%;margin:0!important;padding:0!important;float:right}
 span[id^=save]{margin:0!important;padding:0!important}

From b04c2e38a3c9be8425d55f8aca45f9dcdef1059c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:28:43 +0200
Subject: [PATCH 160/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index ce2b66419..bb1d9f667 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -3,9 +3,9 @@ table.t1 tr td{padding:0 0 3px 0;margin:0}
 table.t1 tr td.thin{line-height:8px;height:8px}
 table.t1 tr>td{width:5%;text-align:left;white-space:nowrap}
 table.t1 tr>td+td{width:35%;text-align:left;white-space:normal}
-table.t1 tr>td+td+td{width:18%;text-align:left}
-table.t1 tr>td+td+td+td{width:18%;text-align:left}
-table.t1 tr>td+td+td+td+td{width:24%;text-align:left;padding-right:0}
+table.t1 tr>td+td+td{width:15%;text-align:left}
+table.t1 tr>td+td+td+td{width:20%;text-align:left}
+table.t1 tr>td+td+td+td+td{width:25%;text-align:left;padding-right:0}
 .t1.tablesorter .filtered{display:none}
 textarea[id^=text]{width:90%;margin:0!important;padding:0!important;float:right}
 span[id^=save]{margin:0!important;padding:0!important}

From 4bbccde8f75318abfd00256812746dfed3400379 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:49:16 +0200
Subject: [PATCH 161/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index bb1d9f667..41ef30f5d 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -1,11 +1,10 @@
 table.t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
-table.t1 tr td{padding:0 0 3px 0;margin:0}
-table.t1 tr td.thin{line-height:8px;height:8px}
-table.t1 tr>td{width:5%;text-align:left;white-space:nowrap}
-table.t1 tr>td+td{width:35%;text-align:left;white-space:normal}
-table.t1 tr>td+td+td{width:15%;text-align:left}
-table.t1 tr>td+td+td+td{width:20%;text-align:left}
-table.t1 tr>td+td+td+td+td{width:25%;text-align:left;padding-right:0}
+table.t1 tr td{padding:0 20px 0 0!important;margin:0!important;text-align:left!important;white-space:normal!important}
+table.t1 tr td:nth-child(1){width:5%}
+table.t1 tr td:nth-child(2){width:35%}
+table.t1 tr td:nth-child(3){width:15%}
+table.t1 tr td:nth-child(4){width:20%}
+table.t1 tr td:nth-child(5){width:25%;padding-right:0!important}
 .t1.tablesorter .filtered{display:none}
 textarea[id^=text]{width:90%;margin:0!important;padding:0!important;float:right}
 span[id^=save]{margin:0!important;padding:0!important}

From 5c627a44cd3b47f8d91c4c4a3415f4e63e564a1e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:51:15 +0200
Subject: [PATCH 162/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 41ef30f5d..00a022ec7 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -1,5 +1,5 @@
 table.t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
-table.t1 tr td{padding:0 20px 0 0!important;margin:0!important;text-align:left!important;white-space:normal!important}
+table.t1 tr td{padding:4px 20px 4px 0!important;margin:0!important;text-align:left!important;white-space:normal!important}
 table.t1 tr td:nth-child(1){width:5%}
 table.t1 tr td:nth-child(2){width:35%}
 table.t1 tr td:nth-child(3){width:15%}

From 28567ed365e152812bc419077deff793c0526251 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:54:29 +0200
Subject: [PATCH 163/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 00a022ec7..4e8b0c9e8 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -1,7 +1,7 @@
 table.t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
 table.t1 tr td{padding:4px 20px 4px 0!important;margin:0!important;text-align:left!important;white-space:normal!important}
-table.t1 tr td:nth-child(1){width:5%}
-table.t1 tr td:nth-child(2){width:35%}
+table.t1 tr td:nth-child(1){width:7%}
+table.t1 tr td:nth-child(2){width:33%}
 table.t1 tr td:nth-child(3){width:15%}
 table.t1 tr td:nth-child(4){width:20%}
 table.t1 tr td:nth-child(5){width:25%;padding-right:0!important}

From a29d3220f0209b5f9e98284fbdd225637325b8c7 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 14:09:02 +0200
Subject: [PATCH 164/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/include/SysDrivers.php |  2 +-
 emhttp/plugins/dynamix/sheets/SysDrivers.css  | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/SysDrivers.php b/emhttp/plugins/dynamix/include/SysDrivers.php
index 8a9706577..194583063 100644
--- a/emhttp/plugins/dynamix/include/SysDrivers.php
+++ b/emhttp/plugins/dynamix/include/SysDrivers.php
@@ -44,7 +44,7 @@ case 't1load':
   $arrModules = json_decode($list,TRUE);
   $init = false;
   if (is_file($sysdrvinit)) $init = file_get_contents($sysdrvinit);
-  $html =  "<thead><tr><th><b>"._("Driver")."</th><th><b>"._("Description")."</th><th data-value='System|Inuse|Custom|Disabled|\"Kernel - Inuse\"'><b>"._("State")."</th><th><b>"._("Type")."</th><th><b>"._("Modprobe.d config file")."</th></tr></thead>";
+  $html =  "<thead><tr><th>"._('Driver')."</th><th>"._('Description')."</th><th data-value='System|Inuse|Custom|Disabled|\"Kernel - Inuse\"'>"._('State')."</th><th>"._('Type')."</th><th>"._('Modprobe.d config file')."</th></tr></thead>";
   $html .= "<tbody>";
   ksort($arrModules);
   foreach($arrModules as $modname => $module) {
diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 4e8b0c9e8..7ab686356 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -1,11 +1,12 @@
-table.t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
-table.t1 tr td{padding:4px 20px 4px 0!important;margin:0!important;text-align:left!important;white-space:normal!important}
-table.t1 tr td:nth-child(1){width:7%}
-table.t1 tr td:nth-child(2){width:33%}
-table.t1 tr td:nth-child(3){width:15%}
-table.t1 tr td:nth-child(4){width:20%}
-table.t1 tr td:nth-child(5){width:25%;padding-right:0!important}
-.t1.tablesorter .filtered{display:none}
+table#t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
+table#t1 thead tr th{font-weight:bold}
+table#t1 tbody tr td{padding:4px 20px 4px 0;margin:0;text-align:left;white-space:normal}
+table#t1 tbody tr td:nth-child(1){width:7%}
+table#t1 tbody tr td:nth-child(2){width:33%}
+table#t1 tbody tr td:nth-child(3){width:15%}
+table#t1 tbody tr td:nth-child(4){width:20%}
+table#t1 tbody tr td:nth-child(5){width:25%;padding-right:0}
+table.t1.tablesorter .filtered{display:none}
 textarea[id^=text]{width:90%;margin:0!important;padding:0!important;float:right}
 span[id^=save]{margin:0!important;padding:0!important}
 span.pin{display:inline-block;float:left}

From 03132c0dd5dacdcdd20b51c93f52ec43e65e4a65 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 14:11:54 +0200
Subject: [PATCH 165/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 7ab686356..0bb768fee 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -1,4 +1,4 @@
-table#t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
+table#t1{margin-top:0}
 table#t1 thead tr th{font-weight:bold}
 table#t1 tbody tr td{padding:4px 20px 4px 0;margin:0;text-align:left;white-space:normal}
 table#t1 tbody tr td:nth-child(1){width:7%}

From 25033cfaccda41c2dac3728b3d6c657496fbd88f Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 14:14:49 +0200
Subject: [PATCH 166/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 0bb768fee..12acbf932 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -1,4 +1,4 @@
-table#t1{margin-top:0}
+table#t1{margin-top:0;font-family:clear-sans}
 table#t1 thead tr th{font-weight:bold}
 table#t1 tbody tr td{padding:4px 20px 4px 0;margin:0;text-align:left;white-space:normal}
 table#t1 tbody tr td:nth-child(1){width:7%}

From ecdce3704658601796de0315487bebdda2702869 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 14:17:10 +0200
Subject: [PATCH 167/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/sheets/SysDrivers.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 12acbf932..7a9414451 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -1,8 +1,8 @@
 table#t1{margin-top:0;font-family:clear-sans}
 table#t1 thead tr th{font-weight:bold}
 table#t1 tbody tr td{padding:4px 20px 4px 0;margin:0;text-align:left;white-space:normal}
-table#t1 tbody tr td:nth-child(1){width:7%}
-table#t1 tbody tr td:nth-child(2){width:33%}
+table#t1 tbody tr td:nth-child(1){width:10%}
+table#t1 tbody tr td:nth-child(2){width:30%}
 table#t1 tbody tr td:nth-child(3){width:15%}
 table#t1 tbody tr td:nth-child(4){width:20%}
 table#t1 tbody tr td:nth-child(5){width:25%;padding-right:0}

From e6518f69e968acb66f64994a0415444a0fbdfd13 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 14:46:22 +0200
Subject: [PATCH 168/266] SysDrivers: improved styling

---
 emhttp/plugins/dynamix/SysDrivers.page       | 32 ++++++++++----------
 emhttp/plugins/dynamix/sheets/SysDrivers.css |  1 +
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/emhttp/plugins/dynamix/SysDrivers.page b/emhttp/plugins/dynamix/SysDrivers.page
index 5316ee3ef..2419f93d5 100644
--- a/emhttp/plugins/dynamix/SysDrivers.page
+++ b/emhttp/plugins/dynamix/SysDrivers.page
@@ -19,7 +19,7 @@ Tag="server"
 
 <script>
 function showDrivers(options, init = false) {
-  option = options ;
+  option = options;
   if (init) {
   $('#driversearch').prop('disabled', true);
   $('#select').prop('disabled', true);
@@ -29,15 +29,15 @@ function showDrivers(options, init = false) {
     $("#t1").trigger("destroy");
     $('#t1').html(data.html);
     $('#t1').tablesorter({
-      sortList:[[0,0]],
-      sortAppend:[[0,0]],
-      widgets: ['stickyHeaders','filter', 'zebra'],
+      sortList: [[0,0]],
+      sortAppend: [[0,0]],
+      widgets: ['stickyHeaders','filter','zebra'],
       widgetOptions: {
         // on black and white, offset is height of #menu
         // on azure and gray, offset is height of #header
-        stickyHeaders_offset: ( $('#menu').height() < 50 ) ? $('#menu').height() : $('#header').height(),
+        stickyHeaders_offset: ($('#menu').height() < 50) ? $('#menu').height() : $('#header').height(),
         filter_columnFilters: false,
-        zebra : [ "normal-row", "alt-row" ]
+        zebra: ["normal-row","alt-row"]
       }
     });
     $('div.spinner.fixed').hide('slow');
@@ -46,8 +46,8 @@ function showDrivers(options, init = false) {
     $('#rebuild').prop('disabled', data.init);
   },"json");
   } else {
-  filter = [];
-    filterDrivers() ;
+    filter = [];
+    filterDrivers();
   }
 }
 
@@ -56,7 +56,7 @@ function filterDrivers() {
   var filter = [];
   filter[2] = ($('#select').val() === "inuse") ? "System|Inuse|Custom|Disabled|'Kernel - Inuse'" : "";
   filter[totalColumns] = $('#driversearch').val(); // this searches all columns
-  $('#t1').trigger('search', [ filter ]);
+  $('#t1').trigger('search', [filter]);
 }
 
 function showDriversupdate() {
@@ -67,13 +67,13 @@ function showDriversupdate() {
   $('div.spinner.fixed').show('slow');
   $.post('/webGui/include/SysDrivers.php',{table:'t1create',option:"all"},function(data){
     $('#rebuild').prop('disabled', false);
-    showDrivers("all",true) ;
+    showDrivers("all",true);
     $('div.spinner.fixed').hide('slow');
   });
 }
 
 function textedit(module) {
-  var i=module ;
+  var i=module;
   $('#text'+module).prop('disabled', false);
   $('#save'+module).attr('hidden', false);
   $('#text'+module).attr('hidden', false);
@@ -84,15 +84,15 @@ function removecfg(module) {
 }
 
 function textsave(module,remove = false) {
-  var i=module ;
+  var i=module;
   $('#text'+module).prop('disabled', true);
   $('#save'+module).attr('hidden', true);
   var x = (remove) ? "" : document.getElementById("text" + module).value;
   $.post('/webGui/include/SysDrivers.php',{table:'update',module:module,conf:x},function(data){
     if (data) {
       formHasUnsavedChanges=false;
-      $('#text'+module).val(data.modprobe) ;
-      $('#status'+module).html(data.state) ;
+      $('#text'+module).val(data.modprobe);
+      $('#status'+module).html(data.state);
       if (data.state == "Custom") {
         $('#bin'+module).show();
       } else {
@@ -101,7 +101,7 @@ function textsave(module,remove = false) {
       if (data.modprobe == "")  $('#text'+module).attr('hidden', true); else $('#text'+module).attr('rows', 3);
       if (data.supportpage == true) {
         if (data.support == true) {
-          document.getElementById("link" + module).innerHTML = "<a href='" + data.supporturl + "'target='_blank'><i title='" + _("Support page")_ + "' class='fa fa-phone-square'></i></a>" ;
+          document.getElementById("link" + module).innerHTML = "<a href='" + data.supporturl + "'target='_blank'><i title='" + _("Support page")_ + "' class='fa fa-phone-square'></i></a>";
         }
       }
     }
@@ -113,7 +113,7 @@ function textsave(module,remove = false) {
 }
 
 $('.tabs').append("<span class='status'><span class='lite label'>_(Select View)_:</span><select id='select' onchange='showDrivers(this.value)'><option value='all' >All Drivers</option><option value='inuse' selected >Inuse Drivers</option></select>");
-showDrivers("all",true) ;
+showDrivers("all",true);
 </script>
 
 :sysdrivers_intro_help:
diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
index 7a9414451..069faf5f3 100644
--- a/emhttp/plugins/dynamix/sheets/SysDrivers.css
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -11,3 +11,4 @@ textarea[id^=text]{width:90%;margin:0!important;padding:0!important;float:right}
 span[id^=save]{margin:0!important;padding:0!important}
 span.pin{display:inline-block;float:left}
 i.pin{margin:0!important;padding:2px 0!important;float:left;clear:both}
+.tablesorter-header-inner{font-family:clear-sans;font-weight:bold}

From adef4eb786cc1aaa644a15465b2f69bd859818bb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 15:09:15 +0200
Subject: [PATCH 169/266] SysDevs: fix regression error

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

diff --git a/emhttp/plugins/dynamix/include/SysDevs.php b/emhttp/plugins/dynamix/include/SysDevs.php
index e16f5269e..cf5d90905 100644
--- a/emhttp/plugins/dynamix/include/SysDevs.php
+++ b/emhttp/plugins/dynamix/include/SysDevs.php
@@ -136,7 +136,7 @@ case 't1':
         if ((strpos($line, 'Host bridge') === false) && (strpos($line, 'PCI bridge') === false)) {
           if (file_exists('/sys/kernel/iommu_groups/'.$iommu.'/devices/'.$pciaddress.'/reset')) echo "<i class=\"fa fa-retweet grey-orb middle\" title=\"",_('Function Level Reset (FLR) supported'),".\"></i>";
           echo "</td><td>";
-          echo in_array($iommu, $iommuinuse) ? '<input type="checkbox" value="" title="',_('In use by Unraid'),'" disabled ' : '<input type="checkbox" class="iommu',$iommu,'" value="',$pciaddress,"|",$vd,'" ';
+          echo in_array($iommu, $iommuinuse) ? '<input type="checkbox" value="" title="'._('In use by Unraid').'" disabled ' : '<input type="checkbox" class="iommu'.$iommu.'" value="'.$pciaddress."|".$vd.'" ';
           // check config file for two formats: <Domain:Bus:Device.Function>|<Vendor:Device> or just <Domain:Bus:Device.Function>
           echo (in_array($pciaddress."|".$vd, $vfio_cfg_devices) || in_array($pciaddress, $vfio_cfg_devices)) ? " checked>" : ">";
         } else { echo "</td><td>"; }

From eb0efc0d5c466ea82fefd7c1dcf7a66210e6930e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 15:13:38 +0200
Subject: [PATCH 170/266] Update SysDriversHelpers.php

---
 emhttp/plugins/dynamix/include/SysDriversHelpers.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/SysDriversHelpers.php b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
index 37a8ae11e..8374a1551 100644
--- a/emhttp/plugins/dynamix/include/SysDriversHelpers.php
+++ b/emhttp/plugins/dynamix/include/SysDriversHelpers.php
@@ -94,7 +94,6 @@ function getmodules($name) {
     $dir = str_replace("drivers/", "", $file);
     $state = ($state=="Inuse") ? "Kernel - Inuse" : "Kernel";
   }
-  $description = $desc ? substr($desc,0,60) : "";
   $arrModules[$modname] = [
     'modname'     => $modname,
     'dependacy'   => $depends,
@@ -107,7 +106,7 @@ function getmodules($name) {
     'type'        => $dir,
     'support'     => $support,
     'supporturl'  => $supporturl,
-    'description' => $description
+    'description' => $desc
   ];
 }
 

From b06fa2b659966f45bfc22c86409922ce871f8457 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 18:53:30 +0200
Subject: [PATCH 171/266] Move date & time settings from "Display Settings" to
 "Date & Time Settings"

---
 emhttp/plugins/dynamix/DateTime.page        | 28 ++++++++++++++++++---
 emhttp/plugins/dynamix/DisplaySettings.page | 18 -------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/emhttp/plugins/dynamix/DateTime.page b/emhttp/plugins/dynamix/DateTime.page
index b3da8bdf5..01073bc3c 100644
--- a/emhttp/plugins/dynamix/DateTime.page
+++ b/emhttp/plugins/dynamix/DateTime.page
@@ -17,10 +17,28 @@ Tag="clock-o"
 ?>
 <?$keys = explode("\n", file_get_contents('webGui/include/timezones.key'));?>
 
-<form markdown="1" name="datetime_settings" method="POST" action="/update.htm" target="progressFrame" onsubmit="resetTZ(this.timeZone.value)">
+<form markdown="1" name="datetime_settings" method="POST" action="/update.htm" target="progressFrame" onsubmit="doDispatch(this)">
 _(Current date and time)_:
 : <?=_(my_time(time()),0)?>
 
+_(Date format)_:
+: <select name="display_date" onchange="presetTime(this.form)">
+  <?=mk_option($display['date'], "%c","_(System Setting)_")?>
+  <?=mk_option($display['date'], "%A, %Y %B %e",_('Day, YYYY Month D'))?>
+  <?=mk_option($display['date'], "%A, %e %B %Y",_('Day, D Month YYYY'))?>
+  <?=mk_option($display['date'], "%A, %B %e, %Y",_('Day, Month D, YYYY'))?>
+  <?=mk_option($display['date'], "%A, %m/%d/%Y",_('Day, MM/DD/YYYY'))?>
+  <?=mk_option($display['date'], "%A, %d-%m-%Y",_('Day, DD-MM-YYYY'))?>
+  <?=mk_option($display['date'], "%A, %d.%m.%Y",_('Day, DD.MM.YYYY'))?>
+  <?=mk_option($display['date'], "%A, %Y-%m-%d",_('Day, YYYY-MM-DD'))?>
+  </select>
+
+_(Time format)_:
+: <select name="display_time">
+  <?=mk_option($display['time'], "%I:%M %p",_('12 hours'))?>
+  <?=mk_option($display['time'], "%R",_('24 hours'))?>
+  </select>
+
 _(Time zone)_:
 : <select name="timeZone"><?
   foreach ($keys as $key) {
@@ -69,9 +87,13 @@ _(New date and time)_:
 </form>
 
 <script>
-function resetTZ(new_tz) {
+function doDispatch(form) {
+  var fields = {};
   var old_tz = "<?=$var['timeZone']?>";
-  if (new_tz != old_tz) $.post('/webGui/include/ResetTZ.php');
+  fields['#cfg'] = "/boot/config/plugins/dynamix/dynamix.cfg";
+  $(form).find('select[name^="display_"]').each(function(){fields[$(this).attr('name')] = $(this).val(); $(this).prop('disabled',true);});
+  $.post('/webGui/include/Dispatcher.php',fields);
+  if (form.timeZone.value != old_tz) $.post('/webGui/include/ResetTZ.php');
 }
 function checkDateTimeSettings() {
   form = document.datetime_settings;
diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index a60288de3..7cab6b118 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -167,24 +167,6 @@ _(Terminal font size)_:
 
 :display_tty_size_help:
 
-_(Date format)_:
-: <select name="date" onchange="presetTime(this.form)">
-  <?=mk_option($display['date'], "%c","_(System Setting)_")?>
-  <?=mk_option($display['date'], "%A, %Y %B %e",_('Day, YYYY Month D'))?>
-  <?=mk_option($display['date'], "%A, %e %B %Y",_('Day, D Month YYYY'))?>
-  <?=mk_option($display['date'], "%A, %B %e, %Y",_('Day, Month D, YYYY'))?>
-  <?=mk_option($display['date'], "%A, %m/%d/%Y",_('Day, MM/DD/YYYY'))?>
-  <?=mk_option($display['date'], "%A, %d-%m-%Y",_('Day, DD-MM-YYYY'))?>
-  <?=mk_option($display['date'], "%A, %d.%m.%Y",_('Day, DD.MM.YYYY'))?>
-  <?=mk_option($display['date'], "%A, %Y-%m-%d",_('Day, YYYY-MM-DD'))?>
-  </select>
-
-_(Time format)_:
-: <select name="time">
-  <?=mk_option($display['time'], "%I:%M %p",_('12 hours'))?>
-  <?=mk_option($display['time'], "%R",_('24 hours'))?>
-  </select>
-
 _(Number format)_:
 : <select name="number">
   <?=mk_option($display['number'], ".,",_('[D] dot : [G] comma'))?>

From 060794224399c5ee0db4af4d0ef4d5997487c121 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 19:11:16 +0200
Subject: [PATCH 172/266] Update Dispatcher.php

---
 emhttp/plugins/dynamix/include/Dispatcher.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/Dispatcher.php b/emhttp/plugins/dynamix/include/Dispatcher.php
index ed1994cae..874aefad4 100644
--- a/emhttp/plugins/dynamix/include/Dispatcher.php
+++ b/emhttp/plugins/dynamix/include/Dispatcher.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -11,20 +11,21 @@
  */
 ?>
 <?
-$keys = parse_ini_file($_POST['#cfg'], true);
+$text    = "";
+$keys    = parse_ini_file($_POST['#cfg'], true);
 $cleanup = isset($_POST['#cleanup']);
-$text = "";
+
 foreach ($_POST as $field => $value) {
   if ($field[0] == '#') continue;
-  $n = strrpos($field,'_');
-  $section = str_replace('%3E','.',substr($field,0,$n));
-  $key = substr($field,$n+1);
-  $keys[$section][$key] = $value;
+  [$section,$key] = explode('_',$field,2);
+  $keys[str_replace('%3E','.',$section)][$key] = $value;
 }
+
 foreach ($keys as $section => $block) {
   $pairs = "";
   foreach ($block as $key => $value) if (strlen($value) || !$cleanup) $pairs .= "$key=\"$value\"\n";
   if ($pairs) $text .= "[$section]\n".$pairs;
 }
+
 if ($text) file_put_contents($_POST['#cfg'], $text); else @unlink($_POST['#cfg']);
 ?>

From 16803cc7f1cbbd7f9bcb00cd6b46522aa0b853ab Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 19:32:27 +0200
Subject: [PATCH 173/266] Move date & time settings from "Display Settings" to
 "Date & Time Settings"

---
 emhttp/plugins/dynamix/DateTime.page  | 2 +-
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/DateTime.page b/emhttp/plugins/dynamix/DateTime.page
index 01073bc3c..3d62381d6 100644
--- a/emhttp/plugins/dynamix/DateTime.page
+++ b/emhttp/plugins/dynamix/DateTime.page
@@ -91,7 +91,7 @@ function doDispatch(form) {
   var fields = {};
   var old_tz = "<?=$var['timeZone']?>";
   fields['#cfg'] = "/boot/config/plugins/dynamix/dynamix.cfg";
-  $(form).find('select[name^="display_"]').each(function(){fields[$(this).attr('name')] = $(this).val(); $(this).prop('disabled',true);});
+  $(form).find('select[name^="display_"]').each(function(){fields[$(this).attr('name')] = $(this).val();});
   $.post('/webGui/include/Dispatcher.php',fields);
   if (form.timeZone.value != old_tz) $.post('/webGui/include/ResetTZ.php');
 }
diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 97aa405ee..45e1a5d88 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -131,7 +131,7 @@ while (true) {
   // current date and time
   $now   = time();
   $clock = date(_var($display,'time')=='%R' ? 'G:i' : 'g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
-  $date  = date((_var($display,'date','%c')=='%c' ? 'l, F j, Y' : mix($display['date'])).', '.esc(_('UTC')).'P',$now);
+  $date  = date((_var($display,'date','%c')=='%c' ? 'D j M Y' : mix($display['date'])).', '.esc(_('UTC')).'P',$now);
   $dst   = date('I',$now) ? ' <sup>'._('DST').'</sup>' : '';
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0).$dst);
   $time0 = $time;

From fcb72a9b5c2c678ffed62244553ed341b8b55129 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 19:48:16 +0200
Subject: [PATCH 174/266] Move date & time settings from "Display Settings" to
 "Date & Time Settings"

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

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 45e1a5d88..0932773b7 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -131,8 +131,8 @@ while (true) {
   // current date and time
   $now   = time();
   $clock = date(_var($display,'time')=='%R' ? 'G:i' : 'g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
-  $date  = date((_var($display,'date','%c')=='%c' ? 'D j M Y' : mix($display['date'])).', '.esc(_('UTC')).'P',$now);
-  $dst   = date('I',$now) ? ' <sup>'._('DST').'</sup>' : '';
+  $date  = date(_var($display,'date','%c')=='%c' ? 'D j M Y, T' : mix($display['date']).', '.esc(_('UTC')).'P',$now);
+  $dst   = _var($display,'date','%c')!='%c' && date('I',$now) ? ' <sup>'._('DST').'</sup>' : '';
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0).$dst);
   $time0 = $time;
   sleep(1);

From 88e4d42c55980a4cecaaee7e9202bfeb46ec559c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 20:32:11 +0200
Subject: [PATCH 175/266] Dashboard: display date and time in user selected
 formats

---
 emhttp/plugins/dynamix/nchan/update_3 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 0932773b7..181456fb5 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -131,9 +131,8 @@ while (true) {
   // current date and time
   $now   = time();
   $clock = date(_var($display,'time')=='%R' ? 'G:i' : 'g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
-  $date  = date(_var($display,'date','%c')=='%c' ? 'D j M Y, T' : mix($display['date']).', '.esc(_('UTC')).'P',$now);
-  $dst   = _var($display,'date','%c')!='%c' && date('I',$now) ? ' <sup>'._('DST').'</sup>' : '';
-  publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0).$dst);
+  $date  = date(_var($display,'date','%c')=='%c' ? 'D j M Y, T' : mix($display['date']).', T',$now);
+  publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0));
   $time0 = $time;
   sleep(1);
   $time = microtime(true);

From 13316fc3c2afd9c73bb71d9d91201eac3e679d65 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 20:53:58 +0200
Subject: [PATCH 176/266] Move date & time settings from "Display Settings" to
 "Date & Time Settings"

---
 emhttp/plugins/dynamix/DateTime.page        | 14 +++++++++++---
 emhttp/plugins/dynamix/DisplaySettings.page |  6 ------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/emhttp/plugins/dynamix/DateTime.page b/emhttp/plugins/dynamix/DateTime.page
index 3d62381d6..09f4e8220 100644
--- a/emhttp/plugins/dynamix/DateTime.page
+++ b/emhttp/plugins/dynamix/DateTime.page
@@ -95,8 +95,12 @@ function doDispatch(form) {
   $.post('/webGui/include/Dispatcher.php',fields);
   if (form.timeZone.value != old_tz) $.post('/webGui/include/ResetTZ.php');
 }
-function checkDateTimeSettings() {
-  form = document.datetime_settings;
+function presetTime(form) {
+  var system = form.display_date.selectedIndex==0;
+  if (system) form.display_time.selectedIndex = 0;
+  form.display_time.disabled = system;
+}
+function checkDateTimeSettings(form) {
   if (form.USE_NTP.value=="yes") {
     form.newDateTime.disabled=true;
     form.NTP_SERVER1.disabled=false;
@@ -111,5 +115,9 @@ function checkDateTimeSettings() {
     form.NTP_SERVER4.disabled=true;
   }
 }
-$(checkDateTimeSettings);
+$(function() {
+  var form = document.datetime_settings;
+  presetTime(form);
+  checkDateTimeSettings(form);
+});
 </script>
diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 7cab6b118..84391e17f 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -50,11 +50,6 @@ function upload(lang) {
     $.removeCookie('hidden_content');
   }
 }
-function presetTime(form) {
-  var system = form.date.selectedIndex==0;
-  if (system) form.time.selectedIndex = 0;
-  form.time.disabled = system;
-}
 function presetBanner(form) {
   if (form.banner.selectedIndex == 0) $('.js-bannerSettings').hide(); else $('.js-bannerSettings').show();
 }
@@ -121,7 +116,6 @@ $(function() {
     var files = e.target.files;
     if ($('#dropbox').triggerHandler({type:'drop',dataTransfer:{files:files}})==false) e.stopImmediatePropagation();
   });
-  presetTime(document.display_settings);
   presetBanner(document.display_settings);
 });
 </script>

From 323376b8e09f4d0cfdbf91ba880793fbb2851645 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 21:33:45 +0200
Subject: [PATCH 177/266] Date-Time: disable buttons asap

---
 emhttp/plugins/dynamix/DateTime.page | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/DateTime.page b/emhttp/plugins/dynamix/DateTime.page
index 09f4e8220..c28d91b01 100644
--- a/emhttp/plugins/dynamix/DateTime.page
+++ b/emhttp/plugins/dynamix/DateTime.page
@@ -17,7 +17,8 @@ Tag="clock-o"
 ?>
 <?$keys = explode("\n", file_get_contents('webGui/include/timezones.key'));?>
 
-<form markdown="1" name="datetime_settings" method="POST" action="/update.htm" target="progressFrame" onsubmit="doDispatch(this)">
+<form markdown="1" name="datetime_settings" method="POST" action="/update.htm" target="progressFrame">
+<input type="hidden" name="setDateTime" value="Apply">
 _(Current date and time)_:
 : <?=_(my_time(time()),0)?>
 
@@ -83,17 +84,19 @@ _(New date and time)_:
 :current_time_help:
 
 &nbsp;
-: <input type="submit" name="setDateTime" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
+: <input type="button" value="_(Apply)_" onclick="doDispatch(this.form)" disabled><input type="button" value="_(Done)_" onclick="done()">
 </form>
 
 <script>
 function doDispatch(form) {
   var fields = {};
   var old_tz = "<?=$var['timeZone']?>";
+  $(form).find('button').prop('disabled',true);
   fields['#cfg'] = "/boot/config/plugins/dynamix/dynamix.cfg";
   $(form).find('select[name^="display_"]').each(function(){fields[$(this).attr('name')] = $(this).val();});
   $.post('/webGui/include/Dispatcher.php',fields);
   if (form.timeZone.value != old_tz) $.post('/webGui/include/ResetTZ.php');
+  form.submit();
 }
 function presetTime(form) {
   var system = form.display_date.selectedIndex==0;

From 9feff82facf482438ec27bcfe0b2fc8c69e569b3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 21:55:10 +0200
Subject: [PATCH 178/266] Update update_3

---
 emhttp/plugins/dynamix/nchan/update_3 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 181456fb5..268d097bb 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -62,11 +62,6 @@ function esc($text) {
   return "\\".join("\\",str_split($text));
 }
 
-function mix($text) {
-  // convert linux date format to PHP equivalent
-  return str_replace(['%A','%Y','%B','%e','%m','%d'],['l','Y','F','j','m','d'],$text);
-}
-
 // initialize variables
 $time0 = $time = microtime(true);
 foreach (ports() as $port) {
@@ -131,7 +126,7 @@ while (true) {
   // current date and time
   $now   = time();
   $clock = date(_var($display,'time')=='%R' ? 'G:i' : 'g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
-  $date  = date(_var($display,'date','%c')=='%c' ? 'D j M Y, T' : mix($display['date']).', T',$now);
+  $date  = date(_var($display,'date','%c')=='%c' ? 'D j M Y, T' : my_date($display['date']).', T',$now);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0));
   $time0 = $time;
   sleep(1);

From f6ae39c70b3a44348d893fd2fa0031e2919fc89f Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 22:00:06 +0200
Subject: [PATCH 179/266] Update update_3

---
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 268d097bb..8c2541048 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -126,7 +126,7 @@ while (true) {
   // current date and time
   $now   = time();
   $clock = date(_var($display,'time')=='%R' ? 'G:i' : 'g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
-  $date  = date(_var($display,'date','%c')=='%c' ? 'D j M Y, T' : my_date($display['date']).', T',$now);
+  $date  = _var($display,'date','%c')=='%c' ? date('D j M Y, T',$now) : my_date($display['date'].', T',$now);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0));
   $time0 = $time;
   sleep(1);

From 16b1608856952b593709e919161184fc14de9ec0 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 22:16:55 +0200
Subject: [PATCH 180/266] Update update_3

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

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 8c2541048..bbb20f310 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -125,8 +125,10 @@ while (true) {
   }
   // current date and time
   $now   = time();
-  $clock = date(_var($display,'time')=='%R' ? 'G:i' : 'g:i '.esc('<span class="ampm">').'a'.esc('</span>'),$now);
-  $date  = _var($display,'date','%c')=='%c' ? date('D j M Y, T',$now) : my_date($display['date'].', T',$now);
+  $xtime = _var($display,'time')!='%R';
+  $xdate = _var($display,'date')=='%c';
+  $clock = date($xtime||$xdate ? 'g:i '.esc('<span class="ampm">').'a'.esc('</span>') : 'G:i',$now);
+  $date  = $xdate ? date('D j M Y, T',$now) : my_date($display['date'].', T',$now);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0));
   $time0 = $time;
   sleep(1);

From e9af9d2dba669f330a6b279e9e709f7d6d7f289b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 22:34:44 +0200
Subject: [PATCH 181/266] Update Wrappers.php

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

diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index f9b434f13..1e4753a62 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -88,7 +88,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', '%T' => 'H:i:s'];
+  $legacy = ['%c' => 'D j M Y h:i:s A','%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);
 }
 ?>

From 41d5c0d536c3c1847554cd995ef151804d238c33 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 22:36:44 +0200
Subject: [PATCH 182/266] Update Wrappers.php

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

diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index 1e4753a62..acdae30ee 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -88,7 +88,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','%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'];
+  $legacy = ['%c' => 'D j M Y h:i A','%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);
 }
 ?>

From 0b70d9800d075ac58a3b8976dc3de3e533c13568 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 22:56:17 +0200
Subject: [PATCH 183/266] Update Wrappers.php

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

diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index acdae30ee..a163f5a12 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -88,7 +88,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 A','%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'];
+  $legacy = ['%c' => 'D, j M Y h:i A','%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);
 }
 ?>

From 889a002884a3e78359d92a68195e7030d10b1e4e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 23:01:18 +0200
Subject: [PATCH 184/266] Update update_3

---
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index bbb20f310..f57d026d9 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -128,7 +128,7 @@ while (true) {
   $xtime = _var($display,'time')!='%R';
   $xdate = _var($display,'date')=='%c';
   $clock = date($xtime||$xdate ? 'g:i '.esc('<span class="ampm">').'a'.esc('</span>') : 'G:i',$now);
-  $date  = $xdate ? date('D j M Y, T',$now) : my_date($display['date'].', T',$now);
+  $date  = $xdate ? date('D, j M Y, T',$now) : my_date($display['date'].', T',$now);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0));
   $time0 = $time;
   sleep(1);

From 49ae347b1aac331246a0584afd82d795d811df12 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 23:06:01 +0200
Subject: [PATCH 185/266] Revert "Update update_3"

This reverts commit 889a002884a3e78359d92a68195e7030d10b1e4e.
---
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index f57d026d9..bbb20f310 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -128,7 +128,7 @@ while (true) {
   $xtime = _var($display,'time')!='%R';
   $xdate = _var($display,'date')=='%c';
   $clock = date($xtime||$xdate ? 'g:i '.esc('<span class="ampm">').'a'.esc('</span>') : 'G:i',$now);
-  $date  = $xdate ? date('D, j M Y, T',$now) : my_date($display['date'].', T',$now);
+  $date  = $xdate ? date('D j M Y, T',$now) : my_date($display['date'].', T',$now);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0));
   $time0 = $time;
   sleep(1);

From 7042fbc3ce34d4e9cf02b3c700e35db949a01386 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 23:06:08 +0200
Subject: [PATCH 186/266] Revert "Update Wrappers.php"

This reverts commit 0b70d9800d075ac58a3b8976dc3de3e533c13568.
---
 emhttp/plugins/dynamix/include/Wrappers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index a163f5a12..acdae30ee 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -88,7 +88,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 A','%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'];
+  $legacy = ['%c' => 'D j M Y h:i A','%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);
 }
 ?>

From 424ece83d0b84e2f2818fdecd106413c7d27a272 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 27 Oct 2023 23:28:31 +0200
Subject: [PATCH 187/266] Update update_3

---
 emhttp/plugins/dynamix/nchan/update_3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index bbb20f310..813b3b4a6 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -128,7 +128,7 @@ while (true) {
   $xtime = _var($display,'time')!='%R';
   $xdate = _var($display,'date')=='%c';
   $clock = date($xtime||$xdate ? 'g:i '.esc('<span class="ampm">').'a'.esc('</span>') : 'G:i',$now);
-  $date  = $xdate ? date('D j M Y, T',$now) : my_date($display['date'].', T',$now);
+  $date  = my_date($xdate ? 'D j M Y, T' : $display['date'].', T',$now);
   publish('update3',implode("\n",$echo)."\1".implode("\0",$mode)."\1".implode("\0",$rxtx)."\1".implode("\0",$stat)."\1".$clock."\n"._($date,0));
   $time0 = $time;
   sleep(1);

From e7b31f410cccfd9fc61b0bb3368079976e5ab0bb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 28 Oct 2023 09:46:41 +0200
Subject: [PATCH 188/266] Update DateTime.page

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

diff --git a/emhttp/plugins/dynamix/DateTime.page b/emhttp/plugins/dynamix/DateTime.page
index c28d91b01..0026dbd4d 100644
--- a/emhttp/plugins/dynamix/DateTime.page
+++ b/emhttp/plugins/dynamix/DateTime.page
@@ -15,8 +15,9 @@ Tag="clock-o"
  * all copies or substantial portions of the Software.
  */
 ?>
-<?$keys = explode("\n", file_get_contents('webGui/include/timezones.key'));?>
-
+<?
+$keys = explode("\n", file_get_contents('webGui/include/timezones.key'));
+?>
 <form markdown="1" name="datetime_settings" method="POST" action="/update.htm" target="progressFrame">
 <input type="hidden" name="setDateTime" value="Apply">
 _(Current date and time)_:

From d4b1366daeb51ce76127a1fdf5bd1108311a8c87 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 28 Oct 2023 10:13:39 +0200
Subject: [PATCH 189/266] Update DateTime.page

---
 emhttp/plugins/dynamix/DateTime.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/DateTime.page b/emhttp/plugins/dynamix/DateTime.page
index 0026dbd4d..d7fdaae60 100644
--- a/emhttp/plugins/dynamix/DateTime.page
+++ b/emhttp/plugins/dynamix/DateTime.page
@@ -16,10 +16,10 @@ Tag="clock-o"
  */
 ?>
 <?
-$keys = explode("\n", file_get_contents('webGui/include/timezones.key'));
+$keys = explode("\n",file_get_contents("$docroot/webGui/include/timezones.key"));
 ?>
 <form markdown="1" name="datetime_settings" method="POST" action="/update.htm" target="progressFrame">
-<input type="hidden" name="setDateTime" value="Apply">
+<input type="hidden" name="setDateTime" value="apply">
 _(Current date and time)_:
 : <?=_(my_time(time()),0)?>
 

From 030127933e1be3d5aed0d7bb53c0d66583db35f9 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 28 Oct 2023 11:02:49 +0200
Subject: [PATCH 190/266] DefaultPageLayout: move styling from inline to file

---
 .../plugins/dynamix/include/DefaultPageLayout.php  | 14 +++-----------
 .../plugins/dynamix/styles/defaultpagelayout.css   | 10 ++++++++++
 2 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 emhttp/plugins/dynamix/styles/defaultpagelayout.css

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index d36fcc2bb..e85eeabf3 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$display['font'] = filter_var($_COOKIE['fontSize']??$display['font']??'',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+$display['font'] = filter_var($_COOKIE['fontSize'] ?? $display['font'] ?? '',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 $theme   = strtok($display['theme'],'-');
 $header  = $display['header'];
 $backgnd = $display['background'];
@@ -46,6 +46,8 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.sweetalert.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-{$display['theme']}.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/dynamix-{$display['theme']}.css")?>">
+<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/defaultpagelayout.css")?>">
+
 <style>
 <?if ($display['font']):?>
 html{font-size:<?=$display['font']?>%}
@@ -64,16 +66,6 @@ html{font-size:<?=$display['font']?>%}
 <?endif;?>
 <?endif;?>
 <?endif;?>
-.inline_help{display:none}
-.upgrade_notice{position:fixed;top:24px;left:50%;margin-left:-480px;width:900px;height:38px;line-height:38px;color:#e68a00;background-color:#feefb3;border:#e68a00 1px solid;border-radius:38px;text-align:center;font-size:1.4rem;z-index:999}
-.upgrade_notice.done{color:#4f8a10;background-color:#dff2bf;border-color:#4f8a10}
-.upgrade_notice.alert{color:#f0000c;background-color:#ff9e9e;border-color:#f0000c}
-.upgrade_notice i{float:right;cursor:pointer}
-.back_to_top{display:none;position:fixed;bottom:30px;right:12px;color:#e22828;font-size:2.5rem;z-index:999}
-span.big.blue-text{cursor:pointer}
-span.strong.tour{margin-left:5px;padding-left:0}
-i.abortOps{font-size:2rem;float:right;margin-right:20px;margin-top:8px;cursor:pointer}
-pre#swalbody p{margin-block-end:1em}
 <?
 $nchan = ['webGui/nchan/notify_poller','webGui/nchan/session_check'];
 $safemode = _var($var,'safeMode')=='yes';
diff --git a/emhttp/plugins/dynamix/styles/defaultpagelayout.css b/emhttp/plugins/dynamix/styles/defaultpagelayout.css
new file mode 100644
index 000000000..70548d17b
--- /dev/null
+++ b/emhttp/plugins/dynamix/styles/defaultpagelayout.css
@@ -0,0 +1,10 @@
+.inline_help{display:none}
+.upgrade_notice{position:fixed;top:24px;left:50%;margin-left:-480px;width:900px;height:38px;line-height:38px;color:#e68a00;background-color:#feefb3;border:#e68a00 1px solid;border-radius:38px;text-align:center;font-size:1.4rem;z-index:999}
+.upgrade_notice.done{color:#4f8a10;background-color:#dff2bf;border-color:#4f8a10}
+.upgrade_notice.alert{color:#f0000c;background-color:#ff9e9e;border-color:#f0000c}
+.upgrade_notice i{float:right;cursor:pointer}
+.back_to_top{display:none;position:fixed;bottom:30px;right:12px;color:#e22828;font-size:2.5rem;z-index:999}
+span.big.blue-text{cursor:pointer}
+span.strong.tour{margin-left:5px;padding-left:0}
+i.abortOps{font-size:2rem;float:right;margin-right:20px;margin-top:8px;cursor:pointer}
+pre#swalbody p{margin-block-end:1em}

From 7663e0ca68b4b0be43a2bee31747032bcf90b8d6 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 28 Oct 2023 13:39:52 +0100
Subject: [PATCH 191/266] Fix errors in VS

---
 .../dynamix.vm.manager/include/libvirt.php    | 30 +++++++++----------
 .../include/libvirt_helpers.php               |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index 1f61a5735..0e2ae0816 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -1430,7 +1430,7 @@
 		}
 
 		//create a storage volume and add file extension
-		function volume_create($name, $capacity, $allocation, $format) {
+		/*function volume_create($name, $capacity, $allocation, $format) {
 			$capacity = $this->parse_size($capacity);
 			$allocation = $this->parse_size($allocation);
 			($format != 'raw' ) ? $ext = $format : $ext = 'img';
@@ -1447,7 +1447,7 @@
 
 			$tmp = libvirt_storagevolume_create_xml($pool, $xml);
 			return ($tmp) ? $tmp : $this->_set_last_error();
-		}
+		}*/
 
 		function get_hypervisor_name() {
 			$tmp = libvirt_connect_get_information($this->conn);
@@ -2262,20 +2262,20 @@
 			$objNodes = $xpath->query('//domain/devices/hostdev[@type="pci"]');
 			if ($objNodes->length > 0) {
 				foreach ($objNodes as $objNode) {
-					$dom  = $xpath->query('source/address/@domain', $objNode)->Item(0)->value;
-					$bus  = $xpath->query('source/address/@bus', $objNode)->Item(0)->value;
-					$slot = $xpath->query('source/address/@slot', $objNode)->Item(0)->value;
-					$func = $xpath->query('source/address/@function', $objNode)->Item(0)->value;
+					$dom  = $xpath->query('source/address/@domain', $objNode)->Item(0)->nodeValue;
+					$bus  = $xpath->query('source/address/@bus', $objNode)->Item(0)->nodeValue;
+					$slot = $xpath->query('source/address/@slot', $objNode)->Item(0)->nodeValue;
+					$func = $xpath->query('source/address/@function', $objNode)->Item(0)->nodeValue;
 					$rom = $xpath->query('rom/@file', $objNode);
-					$rom = ($rom->length > 0 ? $rom->Item(0)->value : '');
-					$boot =$xpath->query('boot/@order', $objNode)->Item(0)->value;
+					$rom = ($rom->length > 0 ? $rom->Item(0)->nodeValue : '');
+					$boot =$xpath->query('boot/@order', $objNode)->Item(0)->nodeValue;
 					$devid = str_replace('0x', '', 'pci_'.$dom.'_'.$bus.'_'.$slot.'_'.$func);
 					$tmp2 = $this->get_node_device_information($devid);
-					$guest["multi"] = $xpath->query('address/@multifunction', $objNode)->Item(0)->value ? "on" : "off" ;
-					$guest["dom"]  = $xpath->query('address/@domain', $objNode)->Item(0)->value;
-					$guest["bus"]  = $xpath->query('address/@bus', $objNode)->Item(0)->value;
-					$guest["slot"] = $xpath->query('address/@slot', $objNode)->Item(0)->value;
-					$guest["func"] = $xpath->query('address/@function', $objNode)->Item(0)->value;
+					$guest["multi"] = $xpath->query('address/@multifunction', $objNode)->Item(0)->nodeValue ? "on" : "off" ;
+					$guest["dom"]  = $xpath->query('address/@domain', $objNode)->Item(0)->nodeValue;
+					$guest["bus"]  = $xpath->query('address/@bus', $objNode)->Item(0)->nodeValue;
+					$guest["slot"] = $xpath->query('address/@slot', $objNode)->Item(0)->nodeValue;
+					$guest["func"] = $xpath->query('address/@function', $objNode)->Item(0)->nodeValue;
 					$devs[] = [
 						'domain' => $dom,
 						'bus' => $bus,
@@ -2643,7 +2643,7 @@
 		}
 
 		//change disk capacity
-		function disk_set_cap($disk, $cap) {
+		/*function disk_set_cap($disk, $cap) {
 			$xml = $this->domain_get_xml($domain);
 			$tmp = explode("\n", $xml);
 			for ($i = 0; $i < sizeof($tmp); $i++)
@@ -2653,7 +2653,7 @@
 			$xml = join("\n", $tmp);
 
 			return $this->domain_define($xml);
-		}
+		}*/
 
 		//change domain boot device
 		function domain_set_boot_device($domain, $bootdev) {
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 2b12163ec..fce31ea18 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1094,7 +1094,7 @@ private static $encoding = 'UTF-8';
 		$arrValidNetworks['bridges'] = array_values($arrBridges);
 
 		// This breaks VMSettings.page if libvirt is not running
-			if ($libvirt_running == "yes") {
+		/*	if ($libvirt_running == "yes") {
 			$arrVirtual = $lv->libvirt_get_net_list($lv->get_connection());
 
 			if (($key = array_search('default', $arrVirtual)) !== false) {
@@ -1104,7 +1104,7 @@ private static $encoding = 'UTF-8';
 			array_unshift($arrVirtual, 'default');
 
 			$arrValidNetworks['libvirt'] = array_values($arrVirtual);
-		}
+		}*/
 
 		return $arrValidNetworks;
 	}

From 98fe14560b3781f21e3708c76c051e452600d4ff Mon Sep 17 00:00:00 2001
From: Tom Mortensen <tomm@lime-technology.com>
Date: Sat, 28 Oct 2023 09:18:18 -0700
Subject: [PATCH 192/266] remove pool name suffix from subpool names displayed
 on Main

---
 emhttp/plugins/dynamix/nchan/device_list | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 4caafc8cc..f95232ceb 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -53,7 +53,8 @@ function device_info(&$disk,$online) {
     $view = "<a class='view' href=\"/Main/Browse?dir=".htmlspecialchars($dir)."\"><i class=\"icon-u-tab\" title=\""._('Browse')." $dir\"></i></a>";
   }
   $name = _var($disk,'name');
-  $fancyname = compress(_(my_disk($name),3),16,5);
+  $namex = (strpos($name, '~') !== false) ? substr($name, strpos($name, '~')) : $name;
+  $fancyname = compress(_(my_disk($namex,true),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $action = strpos(_var($disk,'color'),'blink')===false ? 'down' : 'up';
   switch (_var($disk,'color')) {

From ce53616c6bf800e4c05b6fda6299b138fd4aef08 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 28 Oct 2023 21:42:25 +0100
Subject: [PATCH 193/266] Fix to multifunction which fails with non zero slot
 on beta21

---
 .../plugins/dynamix.vm.manager/include/libvirt.php  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index 0e2ae0816..702c29264 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -842,7 +842,8 @@
 					}
 
 					if ($gpu['multi'] == "on"){
-						$strSpecialAddress = "<address type='pci' domain='0x0000' bus='0x20' slot='0x$gpu_bus' function='0x".$gpu_function."' multifunction='on' />" ;
+						$newgpu_bus = dechex(hexdec($gpu_bus) + 0x20) ;
+						$strSpecialAddress = "<address type='pci' domain='0x0000' bus='0x$newgpu_bus' slot='0x0' function='0x".$gpu_function."' multifunction='on' />" ;
 						$multidevices[$gpu_bus] = "0x$gpu_bus" ;
 					}
 
@@ -871,7 +872,10 @@
 
 					[$audio_bus, $audio_slot, $audio_function] = my_explode(":", str_replace('.', ':', $audio['id']), 3);
 					if ($audio_function != 0) {
-						if (isset($multidevices[$audio_bus]))	$strSpecialAddressAudio = "<address type='pci' domain='0x0000' bus='0x20' slot='0x$audio_bus'  function='0x".$audio_function."' />" ;
+						if (isset($multidevices[$audio_bus]))	{
+							$newaudio_bus = dechex(hexdec($audio_bus) + 0x20) ;
+							$strSpecialAddressAudio = "<address type='pci' domain='0x0000' bus='0x$newaudio_bus' slot='0x0'  function='0x".$audio_function."' />" ;
+						}
 					}
 
 					$pcidevs .= "<hostdev mode='subsystem' type='pci' managed='yes'>
@@ -898,7 +902,10 @@
 					else [$pci_bus, $pci_slot, $pci_function] = my_explode(":", str_replace('.', ':', $pci_id), 3);
 					
 					if ($pci_function != 0) {
-						if (isset($multidevices[$pci_bus]))	$strSpecialAddressOther = "<address type='pci' domain='0x0000' bus='0x20' slot='0x$pci_bus' function='0x".$pci_function."' />" ;
+						if (isset($multidevices[$pci_bus]))	{
+							$newpci_bus = dechex(hexdec($pci_bus) + 0x20) ;
+							$strSpecialAddressOther = "<address type='pci' domain='0x0000' bus='0x$newpci_bus' slot='0x0' function='0x".$pci_function."' />" ;
+						}
 					}
 
 					$pcidevs .= "<hostdev mode='subsystem' type='pci' managed='yes'>

From b10bceac79cd3babc38f6d11b020e6b502ee5282 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 29 Oct 2023 17:29:32 +0000
Subject: [PATCH 194/266] Additional multifunction changes

Slot has to be > 1 for pc and 0 for q35
---
 .../dynamix.vm.manager/include/libvirt.php      |  9 ++++++---
 .../include/libvirt_helpers.php                 | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index 702c29264..dfe4b6780 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -843,7 +843,8 @@
 
 					if ($gpu['multi'] == "on"){
 						$newgpu_bus = dechex(hexdec($gpu_bus) + 0x20) ;
-						$strSpecialAddress = "<address type='pci' domain='0x0000' bus='0x$newgpu_bus' slot='0x0' function='0x".$gpu_function."' multifunction='on' />" ;
+						if ($machine_type == "pc") $newgpu_slot = "0x01" ; else $newgpu_slot = "0x00" ; 
+						$strSpecialAddress = "<address type='pci' domain='0x0000' bus='0x$newgpu_bus' slot='$newgpu_slot' function='0x".$gpu_function."' multifunction='on' />" ;
 						$multidevices[$gpu_bus] = "0x$gpu_bus" ;
 					}
 
@@ -874,7 +875,8 @@
 					if ($audio_function != 0) {
 						if (isset($multidevices[$audio_bus]))	{
 							$newaudio_bus = dechex(hexdec($audio_bus) + 0x20) ;
-							$strSpecialAddressAudio = "<address type='pci' domain='0x0000' bus='0x$newaudio_bus' slot='0x0'  function='0x".$audio_function."' />" ;
+							if ($machine_type == "pc") $newaudio_slot = "0x01" ; else $newaudio_slot = "0x00" ; 
+							$strSpecialAddressAudio = "<address type='pci' domain='0x0000' bus='0x$newaudio_bus' slot='$newaudio_slot'  function='0x".$audio_function."' />" ;
 						}
 					}
 
@@ -904,7 +906,8 @@
 					if ($pci_function != 0) {
 						if (isset($multidevices[$pci_bus]))	{
 							$newpci_bus = dechex(hexdec($pci_bus) + 0x20) ;
-							$strSpecialAddressOther = "<address type='pci' domain='0x0000' bus='0x$newpci_bus' slot='0x0' function='0x".$pci_function."' />" ;
+							if ($machine_type == "pc") $newpci_slot = "0x01" ; else $newpci_slot = "0x00" ; 
+							$strSpecialAddressOther = "<address type='pci' domain='0x0000' bus='0x$newpci_bus' slot='$newpci_slot' function='0x".$pci_function."' />" ;
 						}
 					}
 
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index fce31ea18..7cf94223d 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1448,6 +1448,23 @@ private static $encoding = 'UTF-8';
 		return json_encode($memorybacking); ;
 	}
 
+	function getClocks($xml) {
+		$clocks = new SimpleXMLElement($xml);
+		$clocks = $clocks->clock ;
+		return json_encode($clocks); ;
+	}
+
+	function getQEMUCmdLine($xml) {
+		$x = strpos($xml,"<qemu:commandline>", 0) ;
+		$y = strpos($xml,"</qemu:commandline>", 0)  ;
+		$z=$y ;
+		while ($y!=false) {
+			$y = strpos($xml,"<qemu:commandline>", $z +19)  ;
+			if ($y != false) $z =$y  ;
+		}
+		return substr($xml,$x, ($z + 19) -$x) ;
+	}
+
 	function getchannels($res) {
 		global $lv ;
         $xml = $lv->domain_get_xml($res) ;

From 87e4de608470cf9914fb1d8fd874c278f74951b6 Mon Sep 17 00:00:00 2001
From: Christoph Hummer <christophhummer@gmail.com>
Date: Tue, 31 Oct 2023 10:36:45 +0100
Subject: [PATCH 195/266] Custom rsyslog config files

This allows to create custom config files for rsyslog in `/boot/config/rsyslog.d/` and link them on boot in the directory `/etc/rsyslog.d/`
---
 etc/rc.d/rc.M | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/rc.d/rc.M b/etc/rc.d/rc.M
index 0026b0ded..2ae1f5dc8 100755
--- a/etc/rc.d/rc.M
+++ b/etc/rc.d/rc.M
@@ -52,6 +52,12 @@ dmesg -s 65536 > /var/log/dmesg
 if [[ -x /etc/rc.d/rc.rsyslogd ]]; then
   [[ -f /boot/logs/syslog-previous ]] && rm /boot/logs/syslog-previous
   [[ -f /boot/logs/syslog ]] && mv /boot/logs/syslog /boot/logs/syslog-previous
+  # Check for additional rsyslog config files and link them if found
+  if [[ ! -z "$(ls -1 /boot/config/rsyslog.d/ 2>/dev/null)" ]]; then
+    for file in $(ls -1 /boot/config/rsyslog.d/); do
+      ln -s "/boot/config/rsyslog.d/$file" "/etc/rsyslog.d/$file"
+    done
+  fi
   /etc/rc.d/rc.rsyslogd start
 fi
 

From f03d8a00901c9b3eff5db959e379c83dcbae81be Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:18:22 +0100
Subject: [PATCH 196/266] Fixes for ZFS subpools

ZFS subpools have a tilde in their name, which is an illegal character in PHP keys and HTML ids. A tilde is automatically replaced to avoid conflicts.

The MAIN page shows the total of a ZFS pool at end, also when subpools are part of it.
---
 emhttp/plugins/dynamix/CacheDevices.page      |  4 +-
 emhttp/plugins/dynamix/include/Helpers.php    |  3 +
 emhttp/plugins/dynamix/nchan/device_list      | 40 ++++++-------
 emhttp/plugins/dynamix/nchan/update_2         |  5 +-
 emhttp/plugins/dynamix/scripts/monitor        | 60 ++++++++++---------
 .../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 +
 9 files changed, 71 insertions(+), 53 deletions(-)

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index dfbb439ae..e9c316d6a 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -141,9 +141,7 @@ $('#tab2').bind({click:function() {$('i.toggle').show('slow');}});
 <?foreach ($pools as $pool):?>
 <?if (isset($disks[$pool]['devices']) or _var($var,'fsState')=="Stopped"):?>
 <table class="disk_status wide<?=$i?' divider':''?>">
-<?if (isSubpool($pool)):?>
-<thead></thead>
-<?else:?>
+<?if (!isSubpool($pool)):?>
 <thead><tr><td>_(Device)_</td><td>_(Identification)_</td><td>_(Temp)_.</td><td>_(Reads)_</td><td>_(Writes)_</td><td>_(Errors)_</td><td>_(FS)_</td><td>_(Size)_</td><td>_(Used)_</td><td>_(Free)_</td></tr></thead>
 <?endif;?>
 <tbody id="pool_device<?=$i++?>">
diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index 0d0e97ab6..a4b27fc3a 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -63,6 +63,9 @@ function my_disks($disk) {
 function my_hyperlink($text, $link) {
   return str_replace(['[',']'],["<a href=\"$link\">","</a>"],$text);
 }
+function no_tilde($name) {
+  return str_replace('~','_-_',$name);
+}
 function prefix($key) {
   return preg_replace('/\d+$/','',$key);
 }
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 4caafc8cc..2715cfe0a 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -53,7 +53,7 @@ function device_info(&$disk,$online) {
     $view = "<a class='view' href=\"/Main/Browse?dir=".htmlspecialchars($dir)."\"><i class=\"icon-u-tab\" title=\""._('Browse')." $dir\"></i></a>";
   }
   $name = _var($disk,'name');
-  $fancyname = compress(_(my_disk($name),3),16,5);
+  $fancyname = compress(_(my_disk(my_explode('~',$name)[1]?:$name,true),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $action = strpos(_var($disk,'color'),'blink')===false ? 'down' : 'up';
   switch (_var($disk,'color')) {
@@ -445,45 +445,45 @@ while (true) {
   $echo[1] .= "</tr>";
 
   $sum = initSum();
-  $cache  = cache_filter($disks); $n = 2;
+  $cache = cache_filter($disks); $n = 2;
+  foreach ($cache as $disk) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType'));
   foreach ($pools as $pool) {
     $echo[$n] = "pool_device".($n-2)."\n";
-    foreach ($cache as $disk) if (prefix(_var($disk,'name'))==$pool) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType'));
+    $root = explode('~',$pool)[0];
+    $print = end(array_filter(array_column($cache,'name'),function($name) use ($pools,$root) {return in_array($name,$pools) && strncmp($root,$name,strlen($root))==0;}));
     if (_var($var,'fsState')=='Stopped') {
       $log = @parse_ini_file($pool_log) ?: [];
       $off = false;
       foreach ($cache as $disk) if (prefix(_var($disk,'name'))==$pool) {
         $echo[$n] .= array_offline($disk,$pool);
+        $name = _var($disk,'name');
         // tilde is not allowed in array key - replace it
-        $diskname = str_replace('~','_-_',_var($disk,'name'));
-        if (isset($log[$diskname])) $off |= ($log[$diskname] != _var($disk,'id')); elseif ($diskname) $log[$diskname] = _var($disk,'id');
+        $named = no_tilde($name);
+        if (isset($log[$named])) $off |= ($log[$named] != _var($disk,'id')); elseif ($named) $log[$named] = _var($disk,'id');
       }
       $data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\"";
       file_put_contents($pool_log,implode("\n",$data));
-      $echo[$n] .= "<tr class='tr_last'><td>"._('Slots')."</td><td colspan='8'>".cache_slots($off,$pool,_var($cache[$pool],'devicesSb'),_var($cache[$pool],'slots',0))."</td><td></td></tr>";
+      $echo[$n] .= "<tr class='tr_last'><td>"._('Slots')."</td><td colspan='8'><span class='slots'><span class='slots-left'>".cache_slots($off,$pool,_var($cache[$pool],'devicesSb'),_var($cache[$pool],'slots',0))."</span>";
       $zfsPool = strstr(_var($cache[$pool],'fsType'),'zfs') && !isSubpool($pool);
       if ($zfsPool) {
-        $current_subpools = array_filter($pools, function ($element) use ($pool) {
-          return strpos($element, "$pool~")!==false;
-        });
-        if (count($current_subpools) < count($subpools)) {
-          $current_subpools_list = str_replace("$pool~","", implode(',', $current_subpools));
-          $subPoolButton = "<input type='button' value='"._('Add Subpool')."' style='margin:0' onclick='addSubpoolPopup(\"$pool\",\"$current_subpools_list\")'>";
-        } else {
-          $subPoolButton = "<input type='button' value='"._('Add Subpool')."' style='margin:0' disabled>";
-        }
-        $echo[$n] .= "<tr class='tr_last'><td></td><td colspan='8'>$subPoolButton</td><td></td></tr>";
+        $current_subpools = array_filter($pools, function($element) use ($pool) {return strpos($element, "$pool~")!==false;});
+        $current_subpools_list = str_replace("$pool~","", implode(',', $current_subpools));
+        $echo[$n] .= "<input type='button' value='"._('Add Subpool')."' class='subpool' onclick='addSubpoolPopup(\"$pool\",\"$current_subpools_list\")'".(count($current_subpools)<count($subpools)?'':' disabled').">";
       }
+      $echo[$n] .= "</span></td><td></td></tr>";
     } else {
       foreach ($cache as $disk) if (prefix($disk['name'])==$pool) {
         if (isset($disk['fsType'])) $fstype = vfs_type($disk['fsType']);
         if (substr(_var($cache[$pool],'fsStatus'),0,11)=='Unmountable' && empty($disk['fsStatus'])) $disk['fsStatus'] = _var($cache[$pool],'fsStatus');
         $echo[$n] .= array_online($disk,$fstype);
       }
-      delete_file($pool_log);
-      if (_var($display,'total') && _var($cache[$pool],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$pool]['devices'])),false,"$pool*");
-      $sum = initSum();
-    }
+      if (strcmp($root,$pool)!=0) $cache[$root]['devices'] += $cache[$pool]['devices'];
+      if (strcmp($pool,$print)==0) {
+        delete_file($pool_log);
+        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,'~')!==false,"$pool*");
+        $sum = initSum();
+      }
+   }
     $n++;
   }
 
diff --git a/emhttp/plugins/dynamix/nchan/update_2 b/emhttp/plugins/dynamix/nchan/update_2
index 579331d10..6d7b29d66 100755
--- a/emhttp/plugins/dynamix/nchan/update_2
+++ b/emhttp/plugins/dynamix/nchan/update_2
@@ -175,6 +175,7 @@ function device_smart(&$disk, &$fail, &$smart) {
   if (!_var($disk,'device') || strpos(_var($disk,'color'),'blink')!==false) return "-";
   $failed = ['FAILED','NOK'];
   $name   = _var($disk,'name');
+  $named  = no_tilde($name);
   $select = get_value($name,'smSelect',0);
   $level  = get_value($name,'smLevel',1);
   $events = explode('|',get_value($disk,'smEvents',$numbers));
@@ -186,7 +187,7 @@ function device_smart(&$disk, &$fail, &$smart) {
   if (file_exists("$file") && exec("grep -Pom1 '^SMART.*: \K[A-Z]+' ".escapeshellarg($file)." |tr -d '\n' 2>/dev/null", $ssa) && in_array("$ssa",$failed)) {
     $title = _('SMART health-check failed')."\n"; $thumb = 'thumbs-o-down'; $color = 'red'; $text = 'fail'; $fail++;
   } else {
-    if (empty($saved["smart"]["$name.ack"])) {
+    if (empty($saved["smart"]["$named.ack"])) {
       exec("awk 'NR>7{print $1,$2,$4,$6,$9,$10}' ".escapeshellarg($file)." 2>/dev/null", $codes);
       foreach ($codes as $code) {
         if (!$code || !is_numeric($code[0])) continue;
@@ -199,7 +200,7 @@ function device_smart(&$disk, &$fail, &$smart) {
     }
   }
   $title .= _('Click for context menu');
-  return "<span id='smart-$name' name=Device class='fa fa-$thumb $color-text' style='margin-right:8px' onmouseover='this.style.cursor=\"pointer\"' title='$title'></span><span id='text-$name'>$text</span>";
+  return "<span id='smart-$named' name=Device class='fa fa-$thumb $color-text' style='margin-right:8px' onmouseover='this.style.cursor=\"pointer\"' title='$title'></span><span id='text-$named'>$text</span>";
 }
 function device_usage(&$disk, &$full, &$high) {
   global $display;
diff --git a/emhttp/plugins/dynamix/scripts/monitor b/emhttp/plugins/dynamix/scripts/monitor
index 834596abd..098a4d503 100755
--- a/emhttp/plugins/dynamix/scripts/monitor
+++ b/emhttp/plugins/dynamix/scripts/monitor
@@ -44,28 +44,30 @@ $top    = 120;
 
 function check_temp(&$disk,$text,$info) {
   global $notify,$saved,$server,$display,$top;
-  $name = _var($disk,'name');
-  $temp = _var($disk,'temp','*');
-  $max  = _var($disk,'maxTemp')>=0 ? $disk['maxTemp'] : (_var($display,'max')>=0 ? $display['max'] : 0);
-  $hot  = _var($disk,'hotTemp')>=0 ? $disk['hotTemp'] : (_var($display,'hot')>=0 ? $display['hot'] : 0);
-  $warn = exceed($temp,$max,$top) ? 'alert' : (exceed($temp,$hot,$top) ? 'warning' : false);
-  $item = 'temp';
-  $last = $saved[$item][$name] ?? 0;
+  $name  = _var($disk,'name');
+  $named = no_tilde($name);
+  $temp  = _var($disk,'temp','*');
+  $max   = _var($disk,'maxTemp')>=0 ? $disk['maxTemp'] : (_var($display,'max')>=0 ? $display['max'] : 0);
+  $hot   = _var($disk,'hotTemp')>=0 ? $disk['hotTemp'] : (_var($display,'hot')>=0 ? $display['hot'] : 0);
+  $warn  = exceed($temp,$max,$top) ? 'alert' : (exceed($temp,$hot,$top) ? 'warning' : false);
+  $item  = 'temp';
+  $last  = $saved[$item][$named] ?? 0;
   if ($warn) {
     if ($temp>$last) {
       exec("$notify -l '/Main' -e ".escapeshellarg("Unraid $text temperature")." -s ".escapeshellarg(ucfirst($warn)." [$server] - $text ".($warn=='alert'?'overheated (':'is hot (').my_temp($temp).")")." -d ".escapeshellarg("$info")." -i \"$warn\" 2>/dev/null");
-      $saved[$item][$name] = max($max,$temp);
+      $saved[$item][$named] = max($max,$temp);
     }
   } else {
     if ($last && $temp<=$top) {
       exec("$notify -l '/Main' -e ".escapeshellarg("Unraid $text message")." -s ".escapeshellarg("Notice [$server] - $text returned to normal temperature")." -d ".escapeshellarg("$info")." 2>/dev/null");
-      unset($saved[$item][$name]);
+      unset($saved[$item][$named]);
     }
   }
 }
 function check_smart(&$disk,$port,$text,$info) {
   global $notify,$saved,$server,$numbers;
   $name   = _var($disk,'name');
+  $named  = no_tilde($name);
   $select = get_value($disk,'smSelect',0);
   $level  = get_value($disk,'smLevel',1);
   $events = explode('|',get_value($disk,'smEvents',$numbers));
@@ -80,10 +82,10 @@ function check_smart(&$disk,$port,$text,$info) {
     $fail = strpos($when,'FAILING_NOW')!==false;
     if (!$fail && !in_array($id,$events)) continue;
     $word = str_replace(['_',' (-)'],[' ',''],strtolower("$class ($when)"));
-    $ack = "$name.ack";
+    $ack = "$named.ack";
     switch ($select) {
     case 0:
-      $attr = "$name.$id";
+      $attr = "$named.$id";
       $last = ($saved[$item][$attr] ?? 0)*$level;
       if ($raw>0 || $fail) {
         if ($raw>$last) {
@@ -100,7 +102,7 @@ function check_smart(&$disk,$port,$text,$info) {
       }
       break;
     case 1:
-      $attr = "$name.{$id}n";
+      $attr = "$named.{$id}n";
       $last = $saved[$item][$attr] ?? 255;
       if (($thres>0 && $value<=$thres*$level) || $fail) {
         if ($value*($value>$thres?$level:1)<$last) {
@@ -122,32 +124,34 @@ function check_smart(&$disk,$port,$text,$info) {
 function check_usage(&$disk,$used,$text,$info) {
   global $notify,$saved,$server,$display;
   if ($used == -1) return;
-  $name = _var($disk,'name');
+  $name     = _var($disk,'name');
+  $named    = no_tilde($name);
   $critical = _var($disk,'critical')>=0 ? $disk['critical'] : (_var($display,'critical')>=0 ? $display['critical'] : 0);
-  $warning = _var($disk,'warning')>=0 ? $disk['warning'] : (_var($display,'warning')>=0 ? $display['warning'] : 0);
-  $warn = exceed($used,$critical) ? 'alert' : (exceed($used,$warning) ? 'warning' : false);
-  $item = 'used';
-  $last = $saved[$item][$name] ?? 0;
+  $warning  = _var($disk,'warning')>=0 ? $disk['warning'] : (_var($display,'warning')>=0 ? $display['warning'] : 0);
+  $warn     = exceed($used,$critical) ? 'alert' : (exceed($used,$warning) ? 'warning' : false);
+  $item     = 'used';
+  $last     = $saved[$item][$named] ?? 0;
   if ($warn) {
     if ($used>$last) {
       exec("$notify -l '/Main' -e ".escapeshellarg("Unraid $text disk utilization")." -s ".escapeshellarg(ucfirst($warn)." [$server] - $text is ".($warn=='alert'?'low on space':'high on usage')." ({$used}%)")." -d ".escapeshellarg("$info")." -i \"$warn\" 2>/dev/null");
-      $saved[$item][$name] = max($critical,$used);
+      $saved[$item][$named] = max($critical,$used);
     }
   } else {
     if ($last && $used<=100) {
       exec("$notify -l '/Main' -e ".escapeshellarg("Unraid $text message")." -s ".escapeshellarg("Notice [$server] - $text returned to normal utilization level")." -d ".escapeshellarg("$info")." 2>/dev/null");
-      unset($saved[$item][$name]);
+      unset($saved[$item][$named]);
     }
   }
 }
 
 // check array devices
 foreach ($disks as $disk) {
-  $name = _var($disk,'name');
+  $name   = _var($disk,'name');
   if ($name=='flash' || substr(_var($disk,'status'),-3)=='_NP') continue;
-  $text = my_disk($name).(in_array($name,$pools)||$name=='parity'?' disk':'');
+  $named  = no_tilde($name);
+  $text   = my_disk($name).(in_array($name,$pools)||$name=='parity'?' disk':'');
   $device = _var($disk,'device');
-  $info = !empty($disk['id']) ? "{$disk['id']} ($device)" : "No device identification ($device)";
+  $info   = !empty($disk['id']) ? "{$disk['id']} ($device)" : "No device identification ($device)";
 // process disk temperature notifications
   check_temp($disk,$text,$info);
 // process disk SMART notifications
@@ -157,7 +161,7 @@ foreach ($disks as $disk) {
 // process disk operation notifications
   $warn = strtok(_var($disk,'color'),'-');
   $item = 'disk';
-  $last = $saved[$item][$name] ?? '';
+  $last = $saved[$item][$named] ?? '';
   switch ($warn) {
   case 'red':
     if ($warn!=$last) {
@@ -165,7 +169,7 @@ foreach ($disks as $disk) {
         $status = strtolower(str_replace(['NP_','_'],['',' '],_var($disk,'status')));
         exec("$notify -l '/Main' -e ".escapeshellarg("Unraid $text error")." -s ".escapeshellarg("Alert [$server] - $text in error state ($status)")." -d ".escapeshellarg("$info")." -i \"alert\" 2>/dev/null");
       }
-      $saved[$item][$name] = $warn;
+      $saved[$item][$named] = $warn;
     }
   break;
   case 'yellow':
@@ -174,7 +178,7 @@ foreach ($disks as $disk) {
         $status = $name=='parity' ? "parity-sync in progress" : " is being reconstructed and is available for normal operation";
         exec("$notify -l '/Main' -e ".escapeshellarg("Unraid $text message")." -s ".escapeshellarg("Notice [$server] - $text, $status")." -d ".escapeshellarg("$info")." 2>/dev/null");
       }
-      $saved[$item][$name] = $warn;
+      $saved[$item][$named] = $warn;
     }
   break;
   default:
@@ -182,7 +186,7 @@ foreach ($disks as $disk) {
       if (_var($var,'fsState')!='Stopped') {
         exec("$notify -l '/Main' -e ".escapeshellarg("Unraid $text message")." -s ".escapeshellarg("Notice [$server] - $text returned to normal operation")." -d ".escapeshellarg("$info")." 2>/dev/null");
       }
-      unset($saved[$item][$name]);
+      unset($saved[$item][$named]);
     }
   break;}
 // count disk errors
@@ -197,7 +201,7 @@ foreach ($disks as $disk) {
         $saved[$item][$attr] = 1;
       }
     } elseif (isset($saved[$item][$attr])) unset($saved[$item][$attr]);
-    $attr = "profile-$name";
+    $attr = "profile-$named";
     if (exec("/sbin/btrfs filesystem df /mnt/$name 2>/dev/null|grep -c '^Data'")>1) {
       if (empty($saved[$item][$attr])) {
         exec("$notify -l '/Main' -e ".escapeshellarg("Unraid $text message")." -s ".escapeshellarg("Warning [$server] - $pool pool BTRFS too many profiles (You can ignore this warning when a pool balance operation is in progress)")." -d ".escapeshellarg("$info")." -i \"warning\" 2>/dev/null");
@@ -318,7 +322,7 @@ if ($saved) {
   $text = '';
   foreach ($saved as $item => $block) {
     if ($block) $text .= "[$item]\n";
-    foreach ($block as $key => $value) $text .= "$key=\"$value\"\n";
+    foreach ($block as $key => $value) $text .= str_replace('~','_-_',$key)."=\"$value\"\n";
   }
   if ($text) {
     if ($text != @file_get_contents($ram)) file_put_contents($ram, $text);
diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index b79049e5f..eecff92b9 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -205,6 +205,9 @@ span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
 span.outer.paused>img,span.outer.paused>i.img{opacity:0.6}
 span.inner{display:inline-block;vertical-align:top}
 span.state{font-size:1.1rem;margin-left:7px}
+span.slots{display:inline-block;width:44rem}
+span.slots-left{float:left}
+input.subpool{float:right;margin:0}
 i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
 i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
 i.lock{margin-left:8px;cursor:default;vertical-align:middle}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index 7e2a1ebee..a4bfb2ace 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -199,6 +199,9 @@ span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
 span.outer.paused>img,span.outer.paused>i.img{opacity:0.6}
 span.inner{display:inline-block;vertical-align:top}
 span.state{font-size:1.1rem;margin-left:7px}
+span.slots{display:inline-block;width:44rem}
+span.slots-left{float:left}
+input.subpool{float:right;margin:0}
 i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
 i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
 i.lock{margin-left:8px;cursor:default;vertical-align:middle}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index 3c058ea18..cb0a8349f 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -205,6 +205,9 @@ span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
 span.outer.paused>img,span.outer.paused>i.img{opacity:0.6}
 span.inner{display:inline-block;vertical-align:top}
 span.state{font-size:1.1rem;margin-left:7px}
+span.slots{display:inline-block;width:44rem}
+span.slots-left{float:left}
+input.subpool{float:right;margin:0}
 i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
 i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
 i.lock{margin-left:8px;cursor:default;vertical-align:middle}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index 0f9dff443..f7f925af2 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -199,6 +199,9 @@ span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
 span.outer.paused>img,span.outer.paused>i.img{opacity:0.6}
 span.inner{display:inline-block;vertical-align:top}
 span.state{font-size:1.1rem;margin-left:7px}
+span.slots{display:inline-block;width:44rem}
+span.slots-left{float:left}
+input.subpool{float:right;margin:0}
 i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
 i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
 i.lock{margin-left:8px;cursor:default;vertical-align:middle}

From 491bc801814dc7797daa6328921d8966b8e2a01c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:39:24 +0100
Subject: [PATCH 197/266] Update device_list

---
 emhttp/plugins/dynamix/nchan/device_list | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 2715cfe0a..73e27dff2 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -53,7 +53,8 @@ function device_info(&$disk,$online) {
     $view = "<a class='view' href=\"/Main/Browse?dir=".htmlspecialchars($dir)."\"><i class=\"icon-u-tab\" title=\""._('Browse')." $dir\"></i></a>";
   }
   $name = _var($disk,'name');
-  $fancyname = compress(_(my_disk(my_explode('~',$name)[1]?:$name,true),3),16,5);
+  //$fancyname = compress(_(my_disk(my_explode('~',$name)[1]?:$name),3),16,5);
+  $fancyname = compress(_(my_disk(my_explode('~',$name)[1]?:$name),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $action = strpos(_var($disk,'color'),'blink')===false ? 'down' : 'up';
   switch (_var($disk,'color')) {

From 839745a48f6c3f7280c3794d7292eb0c7daf9581 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:50:07 +0100
Subject: [PATCH 198/266] Update device_list

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

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 73e27dff2..cb172f19a 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -53,8 +53,8 @@ function device_info(&$disk,$online) {
     $view = "<a class='view' href=\"/Main/Browse?dir=".htmlspecialchars($dir)."\"><i class=\"icon-u-tab\" title=\""._('Browse')." $dir\"></i></a>";
   }
   $name = _var($disk,'name');
-  //$fancyname = compress(_(my_disk(my_explode('~',$name)[1]?:$name),3),16,5);
-  $fancyname = compress(_(my_disk(my_explode('~',$name)[1]?:$name),3),16,5);
+  $extra = my_explode('~',$name)[1];
+  $fancyname = compress($extra ? '~'.my_disk(_($extra,3)) : my_disk(_($name,3)),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $action = strpos(_var($disk,'color'),'blink')===false ? 'down' : 'up';
   switch (_var($disk,'color')) {

From 304be089eeaa6beb0223571f74fc82d04a0b4d13 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 19:02:29 +0100
Subject: [PATCH 199/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/ArrayDevices.page | 2 +-
 emhttp/plugins/dynamix/nchan/device_list | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index cb2586eb3..422226d50 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -20,7 +20,7 @@ function toggle_state(device,name,action) {
   if (name) {
     var group = name.replace(/(\d+|\*)$/,'');
     if (name.slice(-1)!='*') {
-      $('#dev-'+name).removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
+      $('#dev-'+name.replace('~','_-_')).removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
     } else {
       if (group=='array') {
         $('[id^="dev-parity"]').removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index cb172f19a..7baaec4db 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -53,6 +53,7 @@ function device_info(&$disk,$online) {
     $view = "<a class='view' href=\"/Main/Browse?dir=".htmlspecialchars($dir)."\"><i class=\"icon-u-tab\" title=\""._('Browse')." $dir\"></i></a>";
   }
   $name = _var($disk,'name');
+  $named = no_tilde($name);
   $extra = my_explode('~',$name)[1];
   $fancyname = compress($extra ? '~'.my_disk(_($extra,3)) : my_disk(_($name,3)),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
@@ -75,7 +76,7 @@ function device_info(&$disk,$online) {
     $ctrl = " style='cursor:pointer' onclick=\"toggle_state('$type','$name','$action')\"";
     $help .= "<br>"._("Click to spin $action device");
   }
-  $status = "<a class='info'><i ".($ctrl?"id='dev-$name' ":"")."class='fa fa-$orb orb $color-orb'$ctrl></i><span>$help</span></a>";
+  $status = "<a class='info'><i ".($ctrl?"id='dev-$named' ":"")."class='fa fa-$orb orb $color-orb'$ctrl></i><span>$help</span></a>";
   $link   = (_var($disk,'type')=='Parity' && strpos($disk_status,'_NP')===false) ||
             (_var($disk,'type')=='Data' && $disk_status!='DISK_NP') ||
             (_var($disk,'type')=='Cache' && $disk_status!='DISK_NP') ||

From eef112fbd2d3d4b13e1d75b92a56200f7aa009a2 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 19:51:40 +0100
Subject: [PATCH 200/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/ArrayDevices.page | 4 +++-
 emhttp/plugins/dynamix/scripts/monitor   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index 422226d50..5c465b1f9 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -15,12 +15,14 @@ Tag="database"
  */
 ?>
 <script>
+String.prototype.no_tilde = function(){return this.replace('~','_-_');}
+
 function toggle_state(device,name,action) {
   var button = null;
   if (name) {
     var group = name.replace(/(\d+|\*)$/,'');
     if (name.slice(-1)!='*') {
-      $('#dev-'+name.replace('~','_-_')).removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
+      $('#dev-'+name.no_tilde()).removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
     } else {
       if (group=='array') {
         $('[id^="dev-parity"]').removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
diff --git a/emhttp/plugins/dynamix/scripts/monitor b/emhttp/plugins/dynamix/scripts/monitor
index 098a4d503..61159416c 100755
--- a/emhttp/plugins/dynamix/scripts/monitor
+++ b/emhttp/plugins/dynamix/scripts/monitor
@@ -322,7 +322,7 @@ if ($saved) {
   $text = '';
   foreach ($saved as $item => $block) {
     if ($block) $text .= "[$item]\n";
-    foreach ($block as $key => $value) $text .= str_replace('~','_-_',$key)."=\"$value\"\n";
+    foreach ($block as $key => $value) $text .= no_tilde($key)."=\"$value\"\n";
   }
   if ($text) {
     if ($text != @file_get_contents($ram)) file_put_contents($ram, $text);

From b7b7d2b01c0b453cab6d4ba8c106f77bd68533b0 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 19:57:18 +0100
Subject: [PATCH 201/266] Fixes for ZFS subpools

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

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index 5c465b1f9..d1e21a6dc 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -28,7 +28,7 @@ function toggle_state(device,name,action) {
         $('[id^="dev-parity"]').removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
         $('[id^="dev-disk"]').removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
       } else {
-        $('[id^="dev-'+group+'"]').removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
+        $('[id^="dev-'+group.no_tilde()+'"]').removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
       }
     }
   } else if (device!='Clear') {

From 0be84e8fa0423d97a5e2e06ffe8f26512c5b47db Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 20:01:27 +0100
Subject: [PATCH 202/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/ArrayDevices.page | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index d1e21a6dc..a101b4098 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -16,6 +16,7 @@ Tag="database"
 ?>
 <script>
 String.prototype.no_tilde = function(){return this.replace('~','_-_');}
+String.prototype.master = function(){return this.split('~')[0];}
 
 function toggle_state(device,name,action) {
   var button = null;
@@ -28,7 +29,7 @@ function toggle_state(device,name,action) {
         $('[id^="dev-parity"]').removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
         $('[id^="dev-disk"]').removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
       } else {
-        $('[id^="dev-'+group.no_tilde()+'"]').removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
+        $('[id^="dev-'+group.master()+'"]').removeClass('fa-circle fa-square fa-warning fa-times').addClass('fa-refresh fa-spin');
       }
     }
   } else if (device!='Clear') {

From 54eae13ef40f125d9b79240624e35808c96dcac0 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 20:33:36 +0100
Subject: [PATCH 203/266] Fixes for ZFS subpools

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

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 7baaec4db..db03ad94e 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -465,7 +465,7 @@ while (true) {
       }
       $data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\"";
       file_put_contents($pool_log,implode("\n",$data));
-      $echo[$n] .= "<tr class='tr_last'><td>"._('Slots')."</td><td colspan='8'><span class='slots'><span class='slots-left'>".cache_slots($off,$pool,_var($cache[$pool],'devicesSb'),_var($cache[$pool],'slots',0))."</span>";
+      $echo[$n] .= "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='8'><span class='slots'><span class='slots-left'>".cache_slots($off,$pool,_var($cache[$pool],'devicesSb'),_var($cache[$pool],'slots',0))."</span>";
       $zfsPool = strstr(_var($cache[$pool],'fsType'),'zfs') && !isSubpool($pool);
       if ($zfsPool) {
         $current_subpools = array_filter($pools, function($element) use ($pool) {return strpos($element, "$pool~")!==false;});
diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index eecff92b9..af30d0b41 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -205,8 +205,8 @@ span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
 span.outer.paused>img,span.outer.paused>i.img{opacity:0.6}
 span.inner{display:inline-block;vertical-align:top}
 span.state{font-size:1.1rem;margin-left:7px}
-span.slots{display:inline-block;width:44rem}
-span.slots-left{float:left}
+span.slots{display:inline-block;width:44rem;margin:0!important}
+span.slots-left{float:left;margin:0!important}
 input.subpool{float:right;margin:0}
 i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
 i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index a4bfb2ace..8e84de9d7 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -199,8 +199,8 @@ span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
 span.outer.paused>img,span.outer.paused>i.img{opacity:0.6}
 span.inner{display:inline-block;vertical-align:top}
 span.state{font-size:1.1rem;margin-left:7px}
-span.slots{display:inline-block;width:44rem}
-span.slots-left{float:left}
+span.slots{display:inline-block;width:44rem;margin:0!important}
+span.slots-left{float:left;margin:0!important}
 input.subpool{float:right;margin:0}
 i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
 i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index cb0a8349f..b73835521 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -205,8 +205,8 @@ span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
 span.outer.paused>img,span.outer.paused>i.img{opacity:0.6}
 span.inner{display:inline-block;vertical-align:top}
 span.state{font-size:1.1rem;margin-left:7px}
-span.slots{display:inline-block;width:44rem}
-span.slots-left{float:left}
+span.slots{display:inline-block;width:44rem;margin:0!important}
+span.slots-left{float:left;margin:0!important}
 input.subpool{float:right;margin:0}
 i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
 i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index f7f925af2..42f1536db 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -199,8 +199,8 @@ span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3}
 span.outer.paused>img,span.outer.paused>i.img{opacity:0.6}
 span.inner{display:inline-block;vertical-align:top}
 span.state{font-size:1.1rem;margin-left:7px}
-span.slots{display:inline-block;width:44rem}
-span.slots-left{float:left}
+span.slots{display:inline-block;width:44rem;margin:0!important}
+span.slots-left{float:left;margin:0!important}
 input.subpool{float:right;margin:0}
 i.padlock{margin-right:8px;cursor:default;vertical-align:middle}
 i.nolock{visibility:hidden;margin-right:8px;vertical-align:middle}

From 01fea8a0f039b7d19b0bb29550bed4d553112a90 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 21:22:01 +0100
Subject: [PATCH 204/266] Device_list: update help text for pools

---
 emhttp/plugins/dynamix/nchan/device_list | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index db03ad94e..249f6edb7 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -57,17 +57,19 @@ function device_info(&$disk,$online) {
   $extra = my_explode('~',$name)[1];
   $fancyname = compress($extra ? '~'.my_disk(_($extra,3)) : my_disk(_($name,3)),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
+  $pool = _var($disk,'type')=='Cache';
+  $parity = _var($disk,'type')=='Parity';
   $action = strpos(_var($disk,'color'),'blink')===false ? 'down' : 'up';
   switch (_var($disk,'color')) {
     case 'green-on':     $orb = 'circle';  $color = 'green';  $help = _('Normal operation, device is active'); break;
     case 'green-blink':  $orb = 'circle';  $color = 'grey';   $help = _('Device is in standby mode (spun-down)'); break;
     case 'blue-on':      $orb = 'square';  $color = 'blue';   $help = _('New device'); break;
     case 'blue-blink':   $orb = 'square';  $color = 'grey';   $help = _('New device, in standby mode (spun-down)'); break;
-    case 'yellow-on':    $orb = 'warning'; $color = 'yellow'; $help = _var($disk,'type')=='Parity' ? _('Parity is invalid') : _('Device contents emulated'); break;
-    case 'yellow-blink': $orb = 'warning'; $color = 'grey';   $help = _var($disk,'type')=='Parity' ? _('Parity is invalid, in standby mode (spun-down)') : _('Device contents emulated, in standby mode (spun-down)'); break;
+    case 'yellow-on':    $orb = 'warning'; $color = 'yellow'; $help = $pool ? _('Device contents invalid') : ($parity ? _('Parity is invalid') : _('Device contents emulated')); break;
+    case 'yellow-blink': $orb = 'warning'; $color = 'grey';   $help = $pool ? _('Device contents invalid, in standby mode (spun-down)') : ($parity ? _('Parity is invalid, in standby mode (spun-down)') : _('Device contents emulated, in standby mode (spun-down)')); break;
     case 'red-on':
-    case 'red-blink':    $orb = 'times';   $color = 'red';    $help = _var($disk,'type')=='Parity' ? _('Parity device is disabled') : _('Device is disabled, contents emulated'); break;
-    case 'red-off':      $orb = 'times';   $color = 'red';    $help = _var($disk,'type')=='Parity' ? _('Parity device is missing') : _('Device is missing (disabled), contents emulated'); break;
+    case 'red-blink':    $orb = 'times';   $color = 'red';    $help = $pool ? _('Device is disabled') : ($parity ? _('Parity device is disabled') : _('Device is disabled, contents emulated')); break;
+    case 'red-off':      $orb = 'times';   $color = 'red';    $help = $pool ? _('Device is missing (disabled)') : ($parity ? _('Parity device is missing') : _('Device is missing (disabled), contents emulated')); break;
     case 'grey-off':     $orb = 'square';  $color = 'grey';   $help = _('Device not present'); break;
   }
   $ctrl = '';

From 2d39033930148db30f875ac94e1fcb87d126b33c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 21:43:57 +0100
Subject: [PATCH 205/266] Device_list: add warning to disabled disk

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

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 249f6edb7..3537d5d30 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -183,15 +183,15 @@ function my_diskio($data) {
 function array_offline(&$disk, $pool='') {
   global $var, $disks;
   $echo = []; $warning = '';
+  $text = "<span class='red-text'><em>"._('All existing data on this device will be OVERWRITTEN when array is Started')."</em></span>";
   if (strpos(_var($var,'mdState'),'ERROR:')===false) {
-    $text = "<span class='red-text'><em>"._('All existing data on this device will be OVERWRITTEN when array is Started')."</em></span>";
     if (_var($disk,'type')=='Cache') {
       if (_var($disks[$pool],'uuid') && _var($disk,'status')=='DISK_NEW') $warning = $text;
     } else {
       if (_var($var,'mdState')=='NEW_ARRAY') {
         if (_var($disk,'type')=='Parity') $warning = $text;
       } elseif (_var($var,'mdNumInvalid',0)<=1) {
-        if (in_array(_var($disk,'status'),['DISK_INVALID','DISK_DSBL_NEW','DISK_WRONG','DISK_NEW'])) $warning = $text;
+        if (in_array(_var($disk,'status'),['DISK_DSBL','DISK_INVALID','DISK_DSBL_NEW','DISK_NEW','DISK_WRONG'])) $warning = $text;
       }
     }
   }

From 5686a8b5ae3e466dcb480ee61a7e3a37a71cbffd Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 1 Nov 2023 21:46:13 +0100
Subject: [PATCH 206/266] Device_list: add warning to disabled disk

---
 emhttp/plugins/dynamix/nchan/device_list | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 3537d5d30..869c4a561 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -183,6 +183,7 @@ function my_diskio($data) {
 function array_offline(&$disk, $pool='') {
   global $var, $disks;
   $echo = []; $warning = '';
+  $status = ['DISK_DSBL','DISK_INVALID','DISK_DSBL_NEW','DISK_NEW','DISK_WRONG'];
   $text = "<span class='red-text'><em>"._('All existing data on this device will be OVERWRITTEN when array is Started')."</em></span>";
   if (strpos(_var($var,'mdState'),'ERROR:')===false) {
     if (_var($disk,'type')=='Cache') {
@@ -191,7 +192,7 @@ function array_offline(&$disk, $pool='') {
       if (_var($var,'mdState')=='NEW_ARRAY') {
         if (_var($disk,'type')=='Parity') $warning = $text;
       } elseif (_var($var,'mdNumInvalid',0)<=1) {
-        if (in_array(_var($disk,'status'),['DISK_DSBL','DISK_INVALID','DISK_DSBL_NEW','DISK_NEW','DISK_WRONG'])) $warning = $text;
+        if (in_array(_var($disk,'status'),$status)) $warning = $text;
       }
     }
   }

From bbf495a8ce11748112909027e3afe9ecbc807e56 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:54:26 +0100
Subject: [PATCH 207/266] Device_list fixes

- Allow changing slots when pool is erased
- Fix changing slots sometimes not updating the GUI
---
 emhttp/plugins/dynamix/nchan/device_list | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 869c4a561..3ab29a09f 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -130,7 +130,7 @@ function assignment(&$disk) {
   $echo[] = "<form method='POST' action='/update.htm' target='progressFrame'>";
   $echo[] = "<input type='hidden' name='changeDevice' value='apply'>";
   $echo[] = "<input type='hidden' name='csrf_token' value='"._var($var,'csrf_token')."'>";
-  $echo[] = "<select class='slot' name='slotId."._var($disk,'idx')."' onChange='this.form.submit()'>";
+  $echo[] = "<select class='slot' name='slotId."._var($disk,'idx')."' onChange='devices.start();this.form.submit()'>";
   $empty = _var($disk,'idSb')!='' ? _('no device') : _('unassigned');
   if (_var($disk,'id')) {
     $echo[] = "<option value=\"{$disk['id']}\" selected>".device_desc($disk)."</option>";
@@ -336,7 +336,7 @@ function array_slots() {
   $echo[] = "<form method='POST' action='/update.htm' target='progressFrame'>";
   $echo[] = "<input type='hidden' name='csrf_token' value='"._var($var,'csrf_token')."'>";
   $echo[] = "<input type='hidden' name='changeSlots' value='apply'>";
-  $echo[] = "<select class='narrow' name='SYS_ARRAY_SLOTS' onChange='this.form.submit()'>";
+  $echo[] = "<select class='narrow' name='SYS_ARRAY_SLOTS' onChange='devices.start();this.form.submit()'>";
   for ($n=$min; $n<=$max; $n++) {
     $selected = $n==_var($var,'SYS_ARRAY_SLOTS') ? ' selected' : '';
     $echo[] = "<option value='$n'{$selected}>$n</option>";
@@ -353,7 +353,7 @@ function cache_slots($off,$pool,$min,$slots) {
   $echo[] = "<input type='hidden' name='csrf_token' value='"._var($var,'csrf_token')."'>";
   $echo[] = "<input type='hidden' name='changeSlots' value='apply'>";
   $echo[] = "<input type='hidden' name='poolName' value='$pool'>";
-  $echo[] = "<select class='narrow' name='poolSlots' onChange='this.form.submit()'{$off}>";
+  $echo[] = "<select class='narrow' name='poolSlots' onChange='devices.start();this.form.submit()'{$off}>";
   for ($n=$min; $n<=$max; $n++) {
     $option = $n ?: _('none');
     $selected = ($n==$slots) ? ' selected' : '';
@@ -455,7 +455,8 @@ while (true) {
   foreach ($pools as $pool) {
     $echo[$n] = "pool_device".($n-2)."\n";
     $root = explode('~',$pool)[0];
-    $print = end(array_filter(array_column($cache,'name'),function($name) use ($pools,$root) {return in_array($name,$pools) && strncmp($root,$name,strlen($root))==0;}));
+    $print = array_filter(array_column($cache,'name'),function($name) use ($pools,$root) {return in_array($name,$pools) && strncmp($root,$name,strlen($root))==0;});
+    $print = end($print);
     if (_var($var,'fsState')=='Stopped') {
       $log = @parse_ini_file($pool_log) ?: [];
       $off = false;
@@ -467,6 +468,7 @@ while (true) {
         if (isset($log[$named])) $off |= ($log[$named] != _var($disk,'id')); elseif ($named) $log[$named] = _var($disk,'id');
       }
       $data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\"";
+      $off &= !empty(_var($cache[$pool],'uuid'));
       file_put_contents($pool_log,implode("\n",$data));
       $echo[$n] .= "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='8'><span class='slots'><span class='slots-left'>".cache_slots($off,$pool,_var($cache[$pool],'devicesSb'),_var($cache[$pool],'slots',0))."</span>";
       $zfsPool = strstr(_var($cache[$pool],'fsType'),'zfs') && !isSubpool($pool);

From c709c45413517395d0028da65157a098e9824379 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:55:09 +0100
Subject: [PATCH 208/266] Fix timing issue when changing slots

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

diff --git a/emhttp/plugins/dynamix/ArrayOperation.page b/emhttp/plugins/dynamix/ArrayOperation.page
index 09771ec57..e61408e41 100644
--- a/emhttp/plugins/dynamix/ArrayOperation.page
+++ b/emhttp/plugins/dynamix/ArrayOperation.page
@@ -320,9 +320,9 @@ devices.on('message', function(msg,meta) {
     // stop updating when array is stopped
     if (stopped==1) {
 <?if (_var($var,'fsState')=='Started'):?>
-      setTimeout(refresh,0);
+      setTimeout(refresh);
 <?else:?>
-      if (!timers.stopped) timers.stopped = setTimeout(function(){devices.stop(); arraymonitor.start();},1000);
+      if (!timers.stopped) timers.stopped = setTimeout(function(){devices.stop(); arraymonitor.start();},1500);
 <?endif;?>
     }
     break;

From d09c9142e828ec860c40a0c7c76bfddbc6581ad4 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:56:06 +0100
Subject: [PATCH 209/266] Remove Erase button from ZFS subpools

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

diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 7e604f3dd..7db1495a1 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -727,19 +727,13 @@ _(Critical disk utilization threshold)_ (%):
 : <input type="submit" name="changeDisk" value="_(Apply)_" disabled><input type="button" id="doneButton" value="_(Done)_" onclick="done()">
   <?$erasable=false?>
   <?if (diskType('Parity','Data')):?>
-    <?if (_var($var,'fsState')=="Stopped" && diskStatus('_NEW')):?>
-      <?$erasable=true?>
-    <?endif;?>
-    <?if (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal" && diskType('Data')):?>
-      <?$erasable=true?>
-    <?endif;?>
-    <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':'  disabled'?>>
+    <?if (_var($var,'fsState')=="Stopped" && diskStatus('_NEW')): $erasable=true; endif;?>
+    <?if (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal" && diskType('Data')): $erasable=true; endif;?>
+    <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
   <?endif;?>
-  <?if (isPool($name)):?>
-    <?if (_var($var,'fsState')=="Stopped" || (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal")):?>
-      <?$erasable=true?>
-    <?endif;?>
-    <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':'  disabled'?>>
+  <?if (isPool($name) && strpos($name,'~')===false):?>
+    <?if (_var($var,'fsState')=="Stopped" || (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal")): $erasable=true; endif;?>
+    <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
   <?endif;?>
   <?if (_var($var,'fsState')=="Stopped" && isPool($name)):?>
     <?$empty = _var($disk,'devices',0)==0?>

From 7154cc48fe1f947824ca131ec86923d042f57820 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:56:26 +0100
Subject: [PATCH 210/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/ArrayDevices.page   |  2 +-
 emhttp/plugins/dynamix/include/Helpers.php |  7 ++++-
 emhttp/plugins/dynamix/include/publish.php | 31 +++++++++++-----------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index a101b4098..f7f500d31 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -15,7 +15,7 @@ Tag="database"
  */
 ?>
 <script>
-String.prototype.no_tilde = function(){return this.replace('~','_-_');}
+String.prototype.no_tilde = function(){return this.replace('<?=$tilde?>','<?=$proxy?>');}
 String.prototype.master = function(){return this.split('~')[0];}
 
 function toggle_state(device,name,action) {
diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index a4b27fc3a..50cc41f65 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -15,6 +15,10 @@ $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/webGui/include/Secure.php";
 
+// ZFS subpool name separator and replacement
+$tilde = '~';
+$proxy = '__';
+
 // Helper functions
 function my_scale($value, &$unit, $decimals=NULL, $scale=NULL, $kilo=1000) {
   global $display,$language;
@@ -64,7 +68,8 @@ function my_hyperlink($text, $link) {
   return str_replace(['[',']'],["<a href=\"$link\">","</a>"],$text);
 }
 function no_tilde($name) {
-  return str_replace('~','_-_',$name);
+  global $tilde,$proxy;
+  return str_replace($tilde,$proxy,$name);
 }
 function prefix($key) {
   return preg_replace('/\d+$/','',$key);
diff --git a/emhttp/plugins/dynamix/include/publish.php b/emhttp/plugins/dynamix/include/publish.php
index 6f7f1acb6..9dc5a44ce 100644
--- a/emhttp/plugins/dynamix/include/publish.php
+++ b/emhttp/plugins/dynamix/include/publish.php
@@ -1,5 +1,5 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -10,21 +10,20 @@
  */
 ?>
 <?
-function curl_socket($socket, $url, $postdata=NULL)
-{
-    $ch = curl_init($url);
-    curl_setopt($ch, CURLOPT_UNIX_SOCKET_PATH, $socket);
-    if ($postdata !== NULL) {
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $postdata);
-    }
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    $result = curl_exec($ch);
-    curl_close($ch);
-    return $result;
+function curl_socket($socket, $url, $message) {
+  $com = curl_init($url);
+  curl_setopt_array($com,[
+    CURLOPT_UNIX_SOCKET_PATH => $socket,
+    CURLOPT_POST=> 1,
+    CURLOPT_POSTFIELDS => $message,
+    CURLOPT_RETURNTRANSFER => true
+  ]);
+  $reply = curl_exec($com);
+  curl_close($com);
+  return $reply;
 }
-function publish($endpoint, $message, $len=1)
-{
-    return curl_socket("/var/run/nginx.socket", "http://localhost/pub/$endpoint?buffer_length=$len", $message);
+
+function publish($endpoint, $message, $len=1) {
+  return curl_socket("/var/run/nginx.socket", "http://localhost/pub/$endpoint?buffer_length=$len", $message);
 }
 ?>

From ad456ee5a9f9ae36f2c293a3c15696ffe3409a52 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 02:18:53 +0100
Subject: [PATCH 211/266] Update device_list

---
 emhttp/plugins/dynamix/nchan/device_list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 3ab29a09f..918edcf01 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -55,7 +55,7 @@ function device_info(&$disk,$online) {
   $name = _var($disk,'name');
   $named = no_tilde($name);
   $extra = my_explode('~',$name)[1];
-  $fancyname = compress($extra ? '~'.my_disk(_($extra,3)) : my_disk(_($name,3)),16,5);
+  $fancyname = compress($extra ? '~'._(my_disk($extra),3) : _(my_disk($name),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $pool = _var($disk,'type')=='Cache';
   $parity = _var($disk,'type')=='Parity';

From 582bdb15072afcb7acb0fbb27d5f4b755a23d53e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 02:27:37 +0100
Subject: [PATCH 212/266] Update device_list

---
 emhttp/plugins/dynamix/nchan/device_list | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 918edcf01..d68991d99 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -40,12 +40,12 @@ function model($id) {
   return substr($id,0,strrpos($id,'_'));
 }
 function isSubpool($name) {
-  global $subpools;
-  $subpool = my_explode('~',$name)[1];
+  global $subpools, $tilde;
+  $subpool = my_explode($tilde,$name)[1];
   return in_array($subpool,$subpools) ? $subpool : false;
 }
 function device_info(&$disk,$online) {
-  global $pools, $var, $crypto;
+  global $pools, $var, $crypto, $tilde;
   if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) {
     $view = "<a class='view'></a>";
   } else {
@@ -54,8 +54,8 @@ function device_info(&$disk,$online) {
   }
   $name = _var($disk,'name');
   $named = no_tilde($name);
-  $extra = my_explode('~',$name)[1];
-  $fancyname = compress($extra ? '~'._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  $extra = my_explode($tilde,$name)[1];
+  $fancyname = compress($extra ? $tilde._(my_disk($extra),3) : _(my_disk($name),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $pool = _var($disk,'type')=='Cache';
   $parity = _var($disk,'type')=='Parity';
@@ -454,7 +454,7 @@ while (true) {
   foreach ($cache as $disk) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType'));
   foreach ($pools as $pool) {
     $echo[$n] = "pool_device".($n-2)."\n";
-    $root = explode('~',$pool)[0];
+    $root  = explode($tilde,$pool)[0];
     $print = array_filter(array_column($cache,'name'),function($name) use ($pools,$root) {return in_array($name,$pools) && strncmp($root,$name,strlen($root))==0;});
     $print = end($print);
     if (_var($var,'fsState')=='Stopped') {
@@ -473,8 +473,8 @@ while (true) {
       $echo[$n] .= "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='8'><span class='slots'><span class='slots-left'>".cache_slots($off,$pool,_var($cache[$pool],'devicesSb'),_var($cache[$pool],'slots',0))."</span>";
       $zfsPool = strstr(_var($cache[$pool],'fsType'),'zfs') && !isSubpool($pool);
       if ($zfsPool) {
-        $current_subpools = array_filter($pools, function($element) use ($pool) {return strpos($element, "$pool~")!==false;});
-        $current_subpools_list = str_replace("$pool~","", implode(',', $current_subpools));
+        $current_subpools = array_filter($pools, function($element) use ($pool,$tilde) {return strpos($element, "{$pool}{$tilde}")!==false;});
+        $current_subpools_list = str_replace("{$pool}{$tilde}","", implode(',', $current_subpools));
         $echo[$n] .= "<input type='button' value='"._('Add Subpool')."' class='subpool' onclick='addSubpoolPopup(\"$pool\",\"$current_subpools_list\")'".(count($current_subpools)<count($subpools)?'':' disabled').">";
       }
       $echo[$n] .= "</span></td><td></td></tr>";
@@ -487,7 +487,7 @@ while (true) {
       if (strcmp($root,$pool)!=0) $cache[$root]['devices'] += $cache[$pool]['devices'];
       if (strcmp($pool,$print)==0) {
         delete_file($pool_log);
-        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,'~')!==false,"$pool*");
+        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,$tilde)!==false,"$pool*");
         $sum = initSum();
       }
    }

From 5206813efef127ab600adcda3e529f85b11e9f29 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 02:55:22 +0100
Subject: [PATCH 213/266] Update DeviceInfo.page

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

diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 7db1495a1..ecdc3207f 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -596,7 +596,7 @@ _(Spin down delay)_:
 _(File system status)_:
 : <?=_(_var($disk,'fsStatus'))?>&nbsp;
 
-<?$disabled = (_var($var,'fsState')=="Stopped" && _var($disk,'uuid')) || (_var($var,'fsState')=="Started" &&  _var($disk,'fsStatus')=='Mounted') ? "disabled" : ""?>
+<?$disabled = (_var($var,'fsState')=="Stopped" && !empty(_var($disk,'uuid'))) || (_var($var,'fsState')=="Started" &&  _var($disk,'fsStatus')=='Mounted') ? "disabled" : ""?>
 <?if (diskType('Data') || (!isSubpool($name) && _var($disk,'slots',0)==1)):?>
 _(File system type)_:
 : <select id="diskFsType" name="diskFsType.<?=_var($disk,'idx',0)?>" onchange="changeFsType()" <?=$disabled?>>

From 193a0b22709c085b86665423bdd6f45a441f58dd Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 02:55:27 +0100
Subject: [PATCH 214/266] Update device_list

---
 emhttp/plugins/dynamix/nchan/device_list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index d68991d99..939153cf2 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -187,7 +187,7 @@ function array_offline(&$disk, $pool='') {
   $text = "<span class='red-text'><em>"._('All existing data on this device will be OVERWRITTEN when array is Started')."</em></span>";
   if (strpos(_var($var,'mdState'),'ERROR:')===false) {
     if (_var($disk,'type')=='Cache') {
-      if (_var($disks[$pool],'uuid') && _var($disk,'status')=='DISK_NEW') $warning = $text;
+      if (!empty(_var($disks[$pool],'uuid')) && _var($disk,'status')=='DISK_NEW') $warning = $text;
     } else {
       if (_var($var,'mdState')=='NEW_ARRAY') {
         if (_var($disk,'type')=='Parity') $warning = $text;

From 8a94509dc697e35859374547051743486f1134ef Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 03:00:03 +0100
Subject: [PATCH 215/266] Update CacheDevices.page

---
 emhttp/plugins/dynamix/CacheDevices.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index e9c316d6a..6ff3c8afd 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -23,8 +23,8 @@ function sharename($share) {
   return basename($share,'.cfg');
 }
 function isSubpool($name) {
-  global $subpools;
-  $subpool = my_explode('~',$name)[1];
+  global $subpools, $tilde;
+  $subpool = my_explode($tilde,$name)[1];
   return in_array($subpool,$subpools) ? $subpool : false;
 }
 ?>

From b037b2f1d72529204afc73e8bcfcf06470d77406 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 03:04:41 +0100
Subject: [PATCH 216/266] Update DeviceInfo.page

---
 emhttp/plugins/dynamix/DeviceInfo.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index ecdc3207f..2a425445c 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -80,8 +80,8 @@ function maintenance_mode() {
   return _var($var,'fsState')=="Started" && _var($var,'startMode')=="Maintenance" && _var($disk,'luksState',0)<=1;
 }
 function isSubpool($name) {
-  global $subpools;
-  $subpool = my_explode('~',$name)[1];
+  global $subpools, $tilde;
+  $subpool = my_explode($tilde,$name)[1];
   return in_array($subpool,$subpools) ? $subpool : false;
 }
 function isPool($name) {

From 76660f6ca7f360e037f6f24e4e5493c83f82a538 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 03:07:36 +0100
Subject: [PATCH 217/266] Update ArrayDevices.page

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

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index f7f500d31..033761024 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -16,7 +16,7 @@ Tag="database"
 ?>
 <script>
 String.prototype.no_tilde = function(){return this.replace('<?=$tilde?>','<?=$proxy?>');}
-String.prototype.master = function(){return this.split('~')[0];}
+String.prototype.master = function(){return this.split('<?=$tilde?>')[0];}
 
 function toggle_state(device,name,action) {
   var button = null;

From e6c594e4dd4db043e3be6970decc4597a91e403b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 03:13:35 +0100
Subject: [PATCH 218/266] Update CacheDevices.page

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

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 6ff3c8afd..fe96ff5ed 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -120,7 +120,7 @@ function addSubpoolPopup(poolname,currentsubpools) {
     buttons: {
     "_(Add)_": function() {
         subpool=$(this).find('select[name="subpool"]').val();
-        $(this).find('input[name="poolName"]').val(poolname + "~" + subpool);
+        $(this).find('input[name="poolName"]').val(poolname + '<?=$tilde?>' + subpool);
         $(this).find('form').submit();
         $(this).dialog('close');
       },

From 6bea55b8d2ca25f672922989ad52a7281437f4b5 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 03:13:47 +0100
Subject: [PATCH 219/266] Update DeviceInfo.page

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

diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 2a425445c..e437625aa 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -731,7 +731,7 @@ _(Critical disk utilization threshold)_ (%):
     <?if (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal" && diskType('Data')): $erasable=true; endif;?>
     <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
   <?endif;?>
-  <?if (isPool($name) && strpos($name,'~')===false):?>
+  <?if (isPool($name) && strpos($name,$tilde)===false):?>
     <?if (_var($var,'fsState')=="Stopped" || (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal")): $erasable=true; endif;?>
     <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
   <?endif;?>

From af3a468654fd079d73537f4570ffe25982cbf6f8 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 04:31:07 +0100
Subject: [PATCH 220/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/ArrayDevices.page       |  2 +-
 emhttp/plugins/dynamix/include/ToggleState.php | 17 +++--------------
 emhttp/plugins/dynamix/nchan/device_list       |  2 +-
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index 033761024..4d6427f4f 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -37,7 +37,7 @@ function toggle_state(device,name,action) {
     button = '[id^=button-]';
   }
   devices.stop();
-  $.post('/webGui/include/ToggleState.php',{device:device,name:name,action:action,state:'<?=$var['mdState']?>',csrf:'<?=$var['csrf_token']?>'},function(){setTimeout(function(){devices.start();},1000);if (button) $(button).prop('disabled',false);});
+  $.post('/webGui/include/ToggleState.php',{device:device,name:name,action:action},function(){setTimeout(function(){devices.start();},1000);if (button) $(button).prop('disabled',false);});
 }
 function display_diskio() {
   if ($.cookie('diskio')===undefined) {
diff --git a/emhttp/plugins/dynamix/include/ToggleState.php b/emhttp/plugins/dynamix/include/ToggleState.php
index b04ce54fe..f71c2f8a1 100644
--- a/emhttp/plugins/dynamix/include/ToggleState.php
+++ b/emhttp/plugins/dynamix/include/ToggleState.php
@@ -12,26 +12,15 @@
 ?>
 <?
 $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
-require_once "$docroot/webGui/include/Wrappers.php";
+require_once "$docroot/webGui/include/Helpers.php";
 
 $device = $_POST['device']??'';
 $name   = $_POST['name']??'';
 $action = $_POST['action']??'';
-$state  = $_POST['state']??'';
-$csrf   = $_POST['csrf']??'';
 
-function prefix($key) {
-  return preg_replace('/\d+$/','',$key);
-}
 function emhttpd($cmd) {
-  global $state, $csrf;
-  $ch = curl_init("http://127.0.0.1/update");
-  $options = [CURLOPT_UNIX_SOCKET_PATH => '/var/run/emhttpd.socket', CURLOPT_POST => 1, CURLOPT_POSTFIELDS => "$cmd&startState=$state&csrf_token=$csrf"];
-  curl_setopt_array($ch, $options);
-  curl_exec($ch);
-  curl_close($ch);
+  exec("emcmd $cmd");
 }
-
 switch ($device) {
 case 'New':
   emhttpd("cmdSpin{$action}={$name}");
@@ -57,7 +46,7 @@ default:
   foreach ($disks as $disk) {
     if (_var($disk,'status') != 'DISK_OK') continue;
     $array = ($name=='array' && in_array(_var($disk,'type'),['Parity','Data']));
-    if ($array || prefix(_var($disk,'name'))==$name) emhttpd("cmdSpin{$action}="._var($disk,'name'));
+    if ($array || explode($tilde,prefix(_var($disk,'name')))[0]==$name) emhttpd("cmdSpin{$action}="._var($disk,'name'));
   }
   break;
 }
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 939153cf2..42ac86c8f 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -487,7 +487,7 @@ while (true) {
       if (strcmp($root,$pool)!=0) $cache[$root]['devices'] += $cache[$pool]['devices'];
       if (strcmp($pool,$print)==0) {
         delete_file($pool_log);
-        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,$tilde)!==false,"$pool*");
+        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,$tilde)!==false,"$root*");
         $sum = initSum();
       }
    }

From 46ad2a266d2f664919b135c5746250e4d899275d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 04:55:10 +0100
Subject: [PATCH 221/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/include/Helpers.php     | 11 -----------
 emhttp/plugins/dynamix/include/ToggleState.php |  2 +-
 emhttp/plugins/dynamix/include/Wrappers.php    | 11 +++++++++++
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index 50cc41f65..765fbfd36 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -15,10 +15,6 @@ $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/webGui/include/Secure.php";
 
-// ZFS subpool name separator and replacement
-$tilde = '~';
-$proxy = '__';
-
 // Helper functions
 function my_scale($value, &$unit, $decimals=NULL, $scale=NULL, $kilo=1000) {
   global $display,$language;
@@ -67,13 +63,6 @@ function my_disks($disk) {
 function my_hyperlink($text, $link) {
   return str_replace(['[',']'],["<a href=\"$link\">","</a>"],$text);
 }
-function no_tilde($name) {
-  global $tilde,$proxy;
-  return str_replace($tilde,$proxy,$name);
-}
-function prefix($key) {
-  return preg_replace('/\d+$/','',$key);
-}
 function parity_only($disk) {
   return _var($disk,'type')=='Parity';
 }
diff --git a/emhttp/plugins/dynamix/include/ToggleState.php b/emhttp/plugins/dynamix/include/ToggleState.php
index f71c2f8a1..76cd4e0fc 100644
--- a/emhttp/plugins/dynamix/include/ToggleState.php
+++ b/emhttp/plugins/dynamix/include/ToggleState.php
@@ -12,7 +12,7 @@
 ?>
 <?
 $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
-require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/webGui/include/Wrappers.php";
 
 $device = $_POST['device']??'';
 $name   = $_POST['name']??'';
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index acdae30ee..e18bc2128 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -13,6 +13,10 @@
 <?
 $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
+// ZFS subpool name separator and replacement
+$tilde = '~';
+$proxy = '__';
+
 // Wrapper functions
 function parse_plugin_cfg($plugin, $sections=false, $scanner=INI_SCANNER_NORMAL) {
   global $docroot;
@@ -86,6 +90,13 @@ function ipaddr($ethX='eth0', $prot=4) {
     return _var($$ethX,'IPADDR:0');
   }
 }
+function no_tilde($name) {
+  global $tilde,$proxy;
+  return str_replace($tilde,$proxy,$name);
+}
+function prefix($key) {
+  return preg_replace('/\d+$/','',$key);
+}
 // convert strftime to date format
 function my_date($fmt, $time) {
   $legacy = ['%c' => 'D j M Y h:i A','%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'];

From 0e8bb053f9cc45fce69791e0e84e0525309aa946 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 04:56:13 +0100
Subject: [PATCH 222/266] Update ToggleState.php

---
 emhttp/plugins/dynamix/include/ToggleState.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/ToggleState.php b/emhttp/plugins/dynamix/include/ToggleState.php
index 76cd4e0fc..07241d31b 100644
--- a/emhttp/plugins/dynamix/include/ToggleState.php
+++ b/emhttp/plugins/dynamix/include/ToggleState.php
@@ -18,25 +18,25 @@ $device = $_POST['device']??'';
 $name   = $_POST['name']??'';
 $action = $_POST['action']??'';
 
-function emhttpd($cmd) {
+function emcmd($cmd) {
   exec("emcmd $cmd");
 }
 switch ($device) {
 case 'New':
-  emhttpd("cmdSpin{$action}={$name}");
+  emcmd("cmdSpin{$action}={$name}");
   break;
 case 'Clear':
-  emhttpd("clearStatistics=true");
+  emcmd("clearStatistics=true");
   break;
 default:
   if (!$name) {
     // spin up/down all devices
-    emhttpd("cmdSpin{$device}All=true");
+    emcmd("cmdSpin{$device}All=true");
     break;
   }
   if (substr($name,-1) != '*') {
     // spin up/down single device
-    emhttpd("cmdSpin{$action}={$name}");
+    emcmd("cmdSpin{$action}={$name}");
     break;
   }
   // spin up/down group of devices
@@ -46,7 +46,7 @@ default:
   foreach ($disks as $disk) {
     if (_var($disk,'status') != 'DISK_OK') continue;
     $array = ($name=='array' && in_array(_var($disk,'type'),['Parity','Data']));
-    if ($array || explode($tilde,prefix(_var($disk,'name')))[0]==$name) emhttpd("cmdSpin{$action}="._var($disk,'name'));
+    if ($array || explode($tilde,prefix(_var($disk,'name')))[0]==$name) emcmd("cmdSpin{$action}="._var($disk,'name'));
   }
   break;
 }

From 44e2a8ca6ef1a9da6ee9e168a010dfa214b80662 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 05:04:55 +0100
Subject: [PATCH 223/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/CacheDevices.page    | 5 -----
 emhttp/plugins/dynamix/DeviceInfo.page      | 5 -----
 emhttp/plugins/dynamix/include/Wrappers.php | 8 ++++++++
 emhttp/plugins/dynamix/nchan/device_list    | 8 --------
 emhttp/plugins/dynamix/template.php         | 3 ---
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index fe96ff5ed..a373aa65f 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -22,11 +22,6 @@ function makeList($list) {
 function sharename($share) {
   return basename($share,'.cfg');
 }
-function isSubpool($name) {
-  global $subpools, $tilde;
-  $subpool = my_explode($tilde,$name)[1];
-  return in_array($subpool,$subpools) ? $subpool : false;
-}
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index e437625aa..6546b7d95 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -79,11 +79,6 @@ function maintenance_mode() {
   global $var;
   return _var($var,'fsState')=="Started" && _var($var,'startMode')=="Maintenance" && _var($disk,'luksState',0)<=1;
 }
-function isSubpool($name) {
-  global $subpools, $tilde;
-  $subpool = my_explode($tilde,$name)[1];
-  return in_array($subpool,$subpools) ? $subpool : false;
-}
 function isPool($name) {
   global $pools;
   return in_array($name,$pools);
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index e18bc2128..04b15e53a 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -13,6 +13,9 @@
 <?
 $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
+// pool name ending in any of these => zfs subpool
+$subpools = ['special','logs','dedup','cache','spares'];
+
 // ZFS subpool name separator and replacement
 $tilde = '~';
 $proxy = '__';
@@ -97,6 +100,11 @@ function no_tilde($name) {
 function prefix($key) {
   return preg_replace('/\d+$/','',$key);
 }
+function isSubpool($name) {
+  global $subpools, $tilde;
+  $subpool = my_explode($tilde,$name)[1];
+  return in_array($subpool,$subpools) ? $subpool : false;
+}
 // convert strftime to date format
 function my_date($fmt, $time) {
   $legacy = ['%c' => 'D j M Y h:i A','%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'];
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 42ac86c8f..4d297f90d 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -30,20 +30,12 @@ require_once "$docroot/webGui/include/Translations.php";
 // remember current language
 $locale_init = $locale;
 
-// pool name ending in any of these => zfs subpool
-$subpools = ['special','logs','dedup','cache','spares'];
-
 function initSum() {
   return ['count'=>0, 'temp'=>0, 'fsSize'=>0, 'fsUsed'=>0, 'fsFree'=>0, 'ioReads'=>0, 'ioWrites'=>0, 'numReads'=>0, 'numWrites'=>0, 'numErrors'=>0];
 }
 function model($id) {
   return substr($id,0,strrpos($id,'_'));
 }
-function isSubpool($name) {
-  global $subpools, $tilde;
-  $subpool = my_explode($tilde,$name)[1];
-  return in_array($subpool,$subpools) ? $subpool : false;
-}
 function device_info(&$disk,$online) {
   global $pools, $var, $crypto, $tilde;
   if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) {
diff --git a/emhttp/plugins/dynamix/template.php b/emhttp/plugins/dynamix/template.php
index 08839cbc0..d6238d19f 100644
--- a/emhttp/plugins/dynamix/template.php
+++ b/emhttp/plugins/dynamix/template.php
@@ -46,9 +46,6 @@ $pool_devices = false;
 $pools = pools_filter($disks);
 foreach ($pools as $pool) $pool_devices |= _var($disks[$pool],'devices')!='';
 
-// pool name ending in any of these => zfs subpool
-$subpools = ['special','logs','dedup','cache','spares'];
-
 // Read network settings
 extract(parse_ini_file('state/network.ini',true));
 

From 8d43f6291064cc5c9148f2e8df73baec1a7da1c9 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 11:28:45 +0100
Subject: [PATCH 224/266] Update device_list

---
 emhttp/plugins/dynamix/nchan/device_list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 4d297f90d..5ea8fc278 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -47,7 +47,7 @@ function device_info(&$disk,$online) {
   $name = _var($disk,'name');
   $named = no_tilde($name);
   $extra = my_explode($tilde,$name)[1];
-  $fancyname = compress($extra ? $tilde._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  $fancyname = compress($extra ? '&#187; '._(my_disk($extra),3) : _(my_disk($name),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $pool = _var($disk,'type')=='Cache';
   $parity = _var($disk,'type')=='Parity';

From 1132e39eeb13260bd7a1df253dfff0709899a608 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 11:47:55 +0100
Subject: [PATCH 225/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/DashStats.page       | 2 +-
 emhttp/plugins/dynamix/include/Wrappers.php | 1 +
 emhttp/plugins/dynamix/nchan/device_list    | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 544986cb7..686d39d56 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -570,7 +570,7 @@ if (!$group) {
 <?$i=0?>
 <?foreach ($pools as $pool):?>
 <tbody id='pool_list<?=$i?>' title="_(<?=ucfirst($pool)?> Information)_">
-<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst($pool)?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
+<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst(str_replace($tilde," $arrow ",$pool))?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
 <span><?if ($started):?><?=sprintf(_("%s used of %s (%s %%)"),my_scale($cache_used[$pool]*1024,$unit)." $unit",my_scale($cache_size[$pool]*1024,$unit,-1,-1)." $unit",$cache_rate[$pool])?><?endif;?></span><br></div>
 <a href='/Dashboard/Settings/Device?name=<?=$pool?>' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index 04b15e53a..bd59159c4 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -19,6 +19,7 @@ $subpools = ['special','logs','dedup','cache','spares'];
 // ZFS subpool name separator and replacement
 $tilde = '~';
 $proxy = '__';
+$arrow = '&#187;';
 
 // Wrapper functions
 function parse_plugin_cfg($plugin, $sections=false, $scanner=INI_SCANNER_NORMAL) {
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 5ea8fc278..eccbd2a01 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -37,7 +37,7 @@ function model($id) {
   return substr($id,0,strrpos($id,'_'));
 }
 function device_info(&$disk,$online) {
-  global $pools, $var, $crypto, $tilde;
+  global $pools, $var, $crypto, $tilde, $arrow;
   if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) {
     $view = "<a class='view'></a>";
   } else {
@@ -47,7 +47,7 @@ function device_info(&$disk,$online) {
   $name = _var($disk,'name');
   $named = no_tilde($name);
   $extra = my_explode($tilde,$name)[1];
-  $fancyname = compress($extra ? '&#187; '._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  $fancyname = compress($extra ? "$arrow "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $pool = _var($disk,'type')=='Cache';
   $parity = _var($disk,'type')=='Parity';

From ec125653d64f1bd317c67fa03b55813cde04cec2 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 12:10:58 +0100
Subject: [PATCH 226/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/DeviceInfo.page | 2 +-
 emhttp/plugins/dynamix/nchan/update_2  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 6546b7d95..a11bb5adc 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -537,7 +537,7 @@ _(Name)_:
 
 <?else:?>
 _(Name)_:
-: <?=_(my_disk($name),3)?>
+: <?=str_replace($tilde," $arrow ",_(my_disk($name),3))?>
 
 <?endif;?>
 <?if (diskStatus('_NP')):?>
diff --git a/emhttp/plugins/dynamix/nchan/update_2 b/emhttp/plugins/dynamix/nchan/update_2
index 6d7b29d66..975c07110 100755
--- a/emhttp/plugins/dynamix/nchan/update_2
+++ b/emhttp/plugins/dynamix/nchan/update_2
@@ -126,16 +126,17 @@ function active_disks($disk) {
   return substr(_var($disk,'status'),0,7)!='DISK_NP' && in_array(_var($disk,'type'),['Parity','Data']);
 }
 function device_name(&$disk) {
+  global $tilde, $arrow;
   switch (_var($disk,'type')) {
     case 'Extra' :
     case 'Parity': $type = _var($disk,'rotational') ? 'disk' : 'nvme'; break;
     case 'Data'  :
     case 'Cache' : $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break;
   }
-  $name = my_disk(_var($disk,'name'));
-  [$p1,$p2] = my_explode(' ',$name);
-  $name = _($p1).($p2?" $p2":"");
-  return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name="._var($disk,'name'))."\" title=\"$name settings\">$name</a>";
+  $name = _var($disk,'name');
+  $extra = my_explode($tilde,$name)[1];
+  $fancyname = compress($extra ? "$arrow "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name=$name")."\" title=\"$fancyname settings\">$fancyname</a>";
 }
 function device_status(&$disk, &$error, &$warning) {
   global $var;

From 76757b5cf0d3076fd1ff3af1691b60371f252011 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:07:48 +0100
Subject: [PATCH 227/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/ArrayDevices.page       |  4 ++--
 emhttp/plugins/dynamix/CacheDevices.page       |  2 +-
 emhttp/plugins/dynamix/DashStats.page          |  2 +-
 emhttp/plugins/dynamix/DeviceInfo.page         |  4 ++--
 emhttp/plugins/dynamix/include/ToggleState.php |  2 +-
 emhttp/plugins/dynamix/include/Wrappers.php    | 14 +++++++-------
 emhttp/plugins/dynamix/nchan/device_list       | 14 +++++++-------
 emhttp/plugins/dynamix/nchan/update_2          |  6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index 4d6427f4f..e50d96245 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -15,8 +15,8 @@ Tag="database"
  */
 ?>
 <script>
-String.prototype.no_tilde = function(){return this.replace('<?=$tilde?>','<?=$proxy?>');}
-String.prototype.master = function(){return this.split('<?=$tilde?>')[0];}
+String.prototype.no_tilde = function(){return this.replace('<?=$tilde_?>','<?=$proxy_?>');}
+String.prototype.master = function(){return this.split('<?=$tilde_?>')[0];}
 
 function toggle_state(device,name,action) {
   var button = null;
diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index a373aa65f..51ce7578e 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -115,7 +115,7 @@ function addSubpoolPopup(poolname,currentsubpools) {
     buttons: {
     "_(Add)_": function() {
         subpool=$(this).find('select[name="subpool"]').val();
-        $(this).find('input[name="poolName"]').val(poolname + '<?=$tilde?>' + subpool);
+        $(this).find('input[name="poolName"]').val(poolname + '<?=$tilde_?>' + subpool);
         $(this).find('form').submit();
         $(this).dialog('close');
       },
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 686d39d56..466e6b9bf 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -570,7 +570,7 @@ if (!$group) {
 <?$i=0?>
 <?foreach ($pools as $pool):?>
 <tbody id='pool_list<?=$i?>' title="_(<?=ucfirst($pool)?> Information)_">
-<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst(str_replace($tilde," $arrow ",$pool))?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
+<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst(str_replace($tilde_," $arrow_ ",$pool))?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
 <span><?if ($started):?><?=sprintf(_("%s used of %s (%s %%)"),my_scale($cache_used[$pool]*1024,$unit)." $unit",my_scale($cache_size[$pool]*1024,$unit,-1,-1)." $unit",$cache_rate[$pool])?><?endif;?></span><br></div>
 <a href='/Dashboard/Settings/Device?name=<?=$pool?>' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index a11bb5adc..4f21a7cf3 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -537,7 +537,7 @@ _(Name)_:
 
 <?else:?>
 _(Name)_:
-: <?=str_replace($tilde," $arrow ",_(my_disk($name),3))?>
+: <?=str_replace($tilde_," $arrow_ ",_(my_disk($name),3))?>
 
 <?endif;?>
 <?if (diskStatus('_NP')):?>
@@ -726,7 +726,7 @@ _(Critical disk utilization threshold)_ (%):
     <?if (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal" && diskType('Data')): $erasable=true; endif;?>
     <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
   <?endif;?>
-  <?if (isPool($name) && strpos($name,$tilde)===false):?>
+  <?if (isPool($name) && strpos($name,$tilde_)===false):?>
     <?if (_var($var,'fsState')=="Stopped" || (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal")): $erasable=true; endif;?>
     <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
   <?endif;?>
diff --git a/emhttp/plugins/dynamix/include/ToggleState.php b/emhttp/plugins/dynamix/include/ToggleState.php
index 07241d31b..d8e8b81e4 100644
--- a/emhttp/plugins/dynamix/include/ToggleState.php
+++ b/emhttp/plugins/dynamix/include/ToggleState.php
@@ -46,7 +46,7 @@ default:
   foreach ($disks as $disk) {
     if (_var($disk,'status') != 'DISK_OK') continue;
     $array = ($name=='array' && in_array(_var($disk,'type'),['Parity','Data']));
-    if ($array || explode($tilde,prefix(_var($disk,'name')))[0]==$name) emcmd("cmdSpin{$action}="._var($disk,'name'));
+    if ($array || explode($tilde_,prefix(_var($disk,'name')))[0]==$name) emcmd("cmdSpin{$action}="._var($disk,'name'));
   }
   break;
 }
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index bd59159c4..e8e2f034f 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -17,9 +17,9 @@ $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 $subpools = ['special','logs','dedup','cache','spares'];
 
 // ZFS subpool name separator and replacement
-$tilde = '~';
-$proxy = '__';
-$arrow = '&#187;';
+$tilde_ = '~';
+$proxy_ = '__';
+$arrow_ = '&#187;';
 
 // Wrapper functions
 function parse_plugin_cfg($plugin, $sections=false, $scanner=INI_SCANNER_NORMAL) {
@@ -95,15 +95,15 @@ function ipaddr($ethX='eth0', $prot=4) {
   }
 }
 function no_tilde($name) {
-  global $tilde,$proxy;
-  return str_replace($tilde,$proxy,$name);
+  global $tilde_,$proxy_;
+  return str_replace($tilde_,$proxy_,$name);
 }
 function prefix($key) {
   return preg_replace('/\d+$/','',$key);
 }
 function isSubpool($name) {
-  global $subpools, $tilde;
-  $subpool = my_explode($tilde,$name)[1];
+  global $subpools, $tilde_;
+  $subpool = my_explode($tilde_,$name)[1];
   return in_array($subpool,$subpools) ? $subpool : false;
 }
 // convert strftime to date format
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index eccbd2a01..84ec7c8c6 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -37,7 +37,7 @@ function model($id) {
   return substr($id,0,strrpos($id,'_'));
 }
 function device_info(&$disk,$online) {
-  global $pools, $var, $crypto, $tilde, $arrow;
+  global $pools, $var, $crypto, $tilde_, $arrow_;
   if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) {
     $view = "<a class='view'></a>";
   } else {
@@ -46,8 +46,8 @@ function device_info(&$disk,$online) {
   }
   $name = _var($disk,'name');
   $named = no_tilde($name);
-  $extra = my_explode($tilde,$name)[1];
-  $fancyname = compress($extra ? "$arrow "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  $extra = my_explode($tilde_,$name)[1];
+  $fancyname = compress($extra ? "$arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $pool = _var($disk,'type')=='Cache';
   $parity = _var($disk,'type')=='Parity';
@@ -446,7 +446,7 @@ while (true) {
   foreach ($cache as $disk) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType'));
   foreach ($pools as $pool) {
     $echo[$n] = "pool_device".($n-2)."\n";
-    $root  = explode($tilde,$pool)[0];
+    $root  = explode($tilde_,$pool)[0];
     $print = array_filter(array_column($cache,'name'),function($name) use ($pools,$root) {return in_array($name,$pools) && strncmp($root,$name,strlen($root))==0;});
     $print = end($print);
     if (_var($var,'fsState')=='Stopped') {
@@ -465,8 +465,8 @@ while (true) {
       $echo[$n] .= "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='8'><span class='slots'><span class='slots-left'>".cache_slots($off,$pool,_var($cache[$pool],'devicesSb'),_var($cache[$pool],'slots',0))."</span>";
       $zfsPool = strstr(_var($cache[$pool],'fsType'),'zfs') && !isSubpool($pool);
       if ($zfsPool) {
-        $current_subpools = array_filter($pools, function($element) use ($pool,$tilde) {return strpos($element, "{$pool}{$tilde}")!==false;});
-        $current_subpools_list = str_replace("{$pool}{$tilde}","", implode(',', $current_subpools));
+        $current_subpools = array_filter($pools, function($element) use ($pool,$tilde_) {return strpos($element, "{$pool}{$tilde_}")!==false;});
+        $current_subpools_list = str_replace("{$pool}{$tilde_}","", implode(',', $current_subpools));
         $echo[$n] .= "<input type='button' value='"._('Add Subpool')."' class='subpool' onclick='addSubpoolPopup(\"$pool\",\"$current_subpools_list\")'".(count($current_subpools)<count($subpools)?'':' disabled').">";
       }
       $echo[$n] .= "</span></td><td></td></tr>";
@@ -479,7 +479,7 @@ while (true) {
       if (strcmp($root,$pool)!=0) $cache[$root]['devices'] += $cache[$pool]['devices'];
       if (strcmp($pool,$print)==0) {
         delete_file($pool_log);
-        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,$tilde)!==false,"$root*");
+        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,$tilde_)!==false,"$root*");
         $sum = initSum();
       }
    }
diff --git a/emhttp/plugins/dynamix/nchan/update_2 b/emhttp/plugins/dynamix/nchan/update_2
index 975c07110..b80d35319 100755
--- a/emhttp/plugins/dynamix/nchan/update_2
+++ b/emhttp/plugins/dynamix/nchan/update_2
@@ -126,7 +126,7 @@ function active_disks($disk) {
   return substr(_var($disk,'status'),0,7)!='DISK_NP' && in_array(_var($disk,'type'),['Parity','Data']);
 }
 function device_name(&$disk) {
-  global $tilde, $arrow;
+  global $tilde_, $arrow_;
   switch (_var($disk,'type')) {
     case 'Extra' :
     case 'Parity': $type = _var($disk,'rotational') ? 'disk' : 'nvme'; break;
@@ -134,8 +134,8 @@ function device_name(&$disk) {
     case 'Cache' : $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break;
   }
   $name = _var($disk,'name');
-  $extra = my_explode($tilde,$name)[1];
-  $fancyname = compress($extra ? "$arrow "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  $extra = my_explode($tilde_,$name)[1];
+  $fancyname = compress($extra ? "$arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
   return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name=$name")."\" title=\"$fancyname settings\">$fancyname</a>";
 }
 function device_status(&$disk, &$error, &$warning) {

From 58ad4a8c87136ce1b1e0a98a40a228900da9a9b0 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:51:41 +0100
Subject: [PATCH 228/266] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/ArrayDevices.page       |  4 ++--
 emhttp/plugins/dynamix/CacheDevices.page       |  2 +-
 emhttp/plugins/dynamix/DashStats.page          |  2 +-
 emhttp/plugins/dynamix/DeviceInfo.page         |  4 ++--
 emhttp/plugins/dynamix/include/ToggleState.php |  2 +-
 emhttp/plugins/dynamix/include/Wrappers.php    | 14 +++++++-------
 emhttp/plugins/dynamix/nchan/device_list       | 14 +++++++-------
 emhttp/plugins/dynamix/nchan/update_2          |  6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index e50d96245..152050f32 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -15,8 +15,8 @@ Tag="database"
  */
 ?>
 <script>
-String.prototype.no_tilde = function(){return this.replace('<?=$tilde_?>','<?=$proxy_?>');}
-String.prototype.master = function(){return this.split('<?=$tilde_?>')[0];}
+String.prototype.no_tilde = function(){return this.replace('<?=$_tilde_?>','<?=$_proxy_?>');}
+String.prototype.master = function(){return this.split('<?=$_tilde_?>')[0];}
 
 function toggle_state(device,name,action) {
   var button = null;
diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index 51ce7578e..dad31fdda 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -115,7 +115,7 @@ function addSubpoolPopup(poolname,currentsubpools) {
     buttons: {
     "_(Add)_": function() {
         subpool=$(this).find('select[name="subpool"]').val();
-        $(this).find('input[name="poolName"]').val(poolname + '<?=$tilde_?>' + subpool);
+        $(this).find('input[name="poolName"]').val(poolname + '<?=$_tilde_?>' + subpool);
         $(this).find('form').submit();
         $(this).dialog('close');
       },
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 466e6b9bf..3dbec663b 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -570,7 +570,7 @@ if (!$group) {
 <?$i=0?>
 <?foreach ($pools as $pool):?>
 <tbody id='pool_list<?=$i?>' title="_(<?=ucfirst($pool)?> Information)_">
-<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst(str_replace($tilde_," $arrow_ ",$pool))?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
+<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst(str_replace($_tilde_," $_arrow_ ",$pool))?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
 <span><?if ($started):?><?=sprintf(_("%s used of %s (%s %%)"),my_scale($cache_used[$pool]*1024,$unit)." $unit",my_scale($cache_size[$pool]*1024,$unit,-1,-1)." $unit",$cache_rate[$pool])?><?endif;?></span><br></div>
 <a href='/Dashboard/Settings/Device?name=<?=$pool?>' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 4f21a7cf3..e4d0a818a 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -537,7 +537,7 @@ _(Name)_:
 
 <?else:?>
 _(Name)_:
-: <?=str_replace($tilde_," $arrow_ ",_(my_disk($name),3))?>
+: <?=str_replace($_tilde_," $_arrow_ ",_(my_disk($name),3))?>
 
 <?endif;?>
 <?if (diskStatus('_NP')):?>
@@ -726,7 +726,7 @@ _(Critical disk utilization threshold)_ (%):
     <?if (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal" && diskType('Data')): $erasable=true; endif;?>
     <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
   <?endif;?>
-  <?if (isPool($name) && strpos($name,$tilde_)===false):?>
+  <?if (isPool($name) && strpos($name,$_tilde_)===false):?>
     <?if (_var($var,'fsState')=="Stopped" || (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal")): $erasable=true; endif;?>
     <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
   <?endif;?>
diff --git a/emhttp/plugins/dynamix/include/ToggleState.php b/emhttp/plugins/dynamix/include/ToggleState.php
index d8e8b81e4..54b5393cd 100644
--- a/emhttp/plugins/dynamix/include/ToggleState.php
+++ b/emhttp/plugins/dynamix/include/ToggleState.php
@@ -46,7 +46,7 @@ default:
   foreach ($disks as $disk) {
     if (_var($disk,'status') != 'DISK_OK') continue;
     $array = ($name=='array' && in_array(_var($disk,'type'),['Parity','Data']));
-    if ($array || explode($tilde_,prefix(_var($disk,'name')))[0]==$name) emcmd("cmdSpin{$action}="._var($disk,'name'));
+    if ($array || explode($_tilde_,prefix(_var($disk,'name')))[0]==$name) emcmd("cmdSpin{$action}="._var($disk,'name'));
   }
   break;
 }
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index e8e2f034f..f14cf4187 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -17,9 +17,9 @@ $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 $subpools = ['special','logs','dedup','cache','spares'];
 
 // ZFS subpool name separator and replacement
-$tilde_ = '~';
-$proxy_ = '__';
-$arrow_ = '&#187;';
+$_tilde_ = '~';
+$_proxy_ = '__';
+$_arrow_ = '&#187;';
 
 // Wrapper functions
 function parse_plugin_cfg($plugin, $sections=false, $scanner=INI_SCANNER_NORMAL) {
@@ -95,15 +95,15 @@ function ipaddr($ethX='eth0', $prot=4) {
   }
 }
 function no_tilde($name) {
-  global $tilde_,$proxy_;
-  return str_replace($tilde_,$proxy_,$name);
+  global $_tilde_,$_proxy_;
+  return str_replace($_tilde_,$_proxy_,$name);
 }
 function prefix($key) {
   return preg_replace('/\d+$/','',$key);
 }
 function isSubpool($name) {
-  global $subpools, $tilde_;
-  $subpool = my_explode($tilde_,$name)[1];
+  global $subpools, $_tilde_;
+  $subpool = my_explode($_tilde_,$name)[1];
   return in_array($subpool,$subpools) ? $subpool : false;
 }
 // convert strftime to date format
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index 84ec7c8c6..aded5c9ee 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -37,7 +37,7 @@ function model($id) {
   return substr($id,0,strrpos($id,'_'));
 }
 function device_info(&$disk,$online) {
-  global $pools, $var, $crypto, $tilde_, $arrow_;
+  global $pools, $var, $crypto, $_tilde_, $_arrow_;
   if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) {
     $view = "<a class='view'></a>";
   } else {
@@ -46,8 +46,8 @@ function device_info(&$disk,$online) {
   }
   $name = _var($disk,'name');
   $named = no_tilde($name);
-  $extra = my_explode($tilde_,$name)[1];
-  $fancyname = compress($extra ? "$arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  $extra = my_explode($_tilde_,$name)[1];
+  $fancyname = compress($extra ? "$_arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $pool = _var($disk,'type')=='Cache';
   $parity = _var($disk,'type')=='Parity';
@@ -446,7 +446,7 @@ while (true) {
   foreach ($cache as $disk) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType'));
   foreach ($pools as $pool) {
     $echo[$n] = "pool_device".($n-2)."\n";
-    $root  = explode($tilde_,$pool)[0];
+    $root  = explode($_tilde_,$pool)[0];
     $print = array_filter(array_column($cache,'name'),function($name) use ($pools,$root) {return in_array($name,$pools) && strncmp($root,$name,strlen($root))==0;});
     $print = end($print);
     if (_var($var,'fsState')=='Stopped') {
@@ -465,8 +465,8 @@ while (true) {
       $echo[$n] .= "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='8'><span class='slots'><span class='slots-left'>".cache_slots($off,$pool,_var($cache[$pool],'devicesSb'),_var($cache[$pool],'slots',0))."</span>";
       $zfsPool = strstr(_var($cache[$pool],'fsType'),'zfs') && !isSubpool($pool);
       if ($zfsPool) {
-        $current_subpools = array_filter($pools, function($element) use ($pool,$tilde_) {return strpos($element, "{$pool}{$tilde_}")!==false;});
-        $current_subpools_list = str_replace("{$pool}{$tilde_}","", implode(',', $current_subpools));
+        $current_subpools = array_filter($pools, function($element) use ($pool,$_tilde_) {return strpos($element, "{$pool}{$_tilde_}")!==false;});
+        $current_subpools_list = str_replace("{$pool}{$_tilde_}","", implode(',', $current_subpools));
         $echo[$n] .= "<input type='button' value='"._('Add Subpool')."' class='subpool' onclick='addSubpoolPopup(\"$pool\",\"$current_subpools_list\")'".(count($current_subpools)<count($subpools)?'':' disabled').">";
       }
       $echo[$n] .= "</span></td><td></td></tr>";
@@ -479,7 +479,7 @@ while (true) {
       if (strcmp($root,$pool)!=0) $cache[$root]['devices'] += $cache[$pool]['devices'];
       if (strcmp($pool,$print)==0) {
         delete_file($pool_log);
-        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,$tilde_)!==false,"$root*");
+        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,$_tilde_)!==false,"$root*");
         $sum = initSum();
       }
    }
diff --git a/emhttp/plugins/dynamix/nchan/update_2 b/emhttp/plugins/dynamix/nchan/update_2
index b80d35319..cad69d9f4 100755
--- a/emhttp/plugins/dynamix/nchan/update_2
+++ b/emhttp/plugins/dynamix/nchan/update_2
@@ -126,7 +126,7 @@ function active_disks($disk) {
   return substr(_var($disk,'status'),0,7)!='DISK_NP' && in_array(_var($disk,'type'),['Parity','Data']);
 }
 function device_name(&$disk) {
-  global $tilde_, $arrow_;
+  global $_tilde_, $_arrow_;
   switch (_var($disk,'type')) {
     case 'Extra' :
     case 'Parity': $type = _var($disk,'rotational') ? 'disk' : 'nvme'; break;
@@ -134,8 +134,8 @@ function device_name(&$disk) {
     case 'Cache' : $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break;
   }
   $name = _var($disk,'name');
-  $extra = my_explode($tilde_,$name)[1];
-  $fancyname = compress($extra ? "$arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  $extra = my_explode($_tilde_,$name)[1];
+  $fancyname = compress($extra ? "$_arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
   return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name=$name")."\" title=\"$fancyname settings\">$fancyname</a>";
 }
 function device_status(&$disk, &$error, &$warning) {

From e60f1129590872b802c02d298c7670aea4dad4df Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Nov 2023 11:29:25 +0100
Subject: [PATCH 229/266] Docker settings: always show custom network type

network type is forced to macvlan when no bridging is enabled
---
 .../plugins/dynamix.docker.manager/DockerSettings.page | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
index 156a02b8a..17073eb1a 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
@@ -232,16 +232,14 @@ _(Template Authoring Mode)_:
 
 :docker_authoring_mode_help:
 
-<?if ($bridge):?>
 _(Docker custom network type)_:
 : <select name="DOCKER_NETWORK_TYPE">
-  <?=mk_option(_var($dockercfg,'DOCKER_NETWORK_TYPE'), '1', _('ipvlan'))?>
-  <?=mk_option(_var($dockercfg,'DOCKER_NETWORK_TYPE'), '', _('macvlan'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_NETWORK_TYPE'), '1', _('ipvlan'), $bridge?'':'disabled')?>
+  <?=mk_option(_var($dockercfg,'DOCKER_NETWORK_TYPE'), '', _('macvlan'), $bridge?'':'selected')?>
   </select>&nbsp;_(Please read the Help carefully)_.  _(Misconfiguration can cause problems)_.
 
 :docker_custom_network_type_help:
 
-<?endif;?>
 _(Host access to custom networks)_:
 : <select name="DOCKER_ALLOW_ACCESS">
   <?=mk_option(_var($dockercfg,'DOCKER_ALLOW_ACCESS'), '', _('Disabled'))?>
@@ -440,13 +438,11 @@ _(Docker LOG rotation)_:
 
 :docker_log_rotation_active_help:
 
-<?if ($bridge):?>
 _(Docker custom network type)_:
-: <?=_var($dockercfg,'DOCKER_NETWORK_TYPE')=='1' ? _('ipvlan') : _('macvlan')?>
+: <?=_var($dockercfg,'DOCKER_NETWORK_TYPE')!='1' || !$bridge ? _('macvlan') : _('ipvlan')?>
 
 :docker_custom_network_type_help:
 
-<?endif;?>
 _(Host access to custom networks)_:
 : <?=_var($dockercfg,'DOCKER_ALLOW_ACCESS')=='yes' ? _('Enabled') : _('Disabled')?>
 

From c9eb2593cf41b78f59dc4d92aaea52a026497ba3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Nov 2023 12:36:03 +0100
Subject: [PATCH 230/266] Updated copyright year to 2023

---
 emhttp/plugins/dynamix.apcupsd/UPSdetails.page            | 4 ++--
 emhttp/plugins/dynamix.apcupsd/include/update.apcupsd.php | 4 ++--
 emhttp/plugins/dynamix.docker.manager/Docker.page         | 2 +-
 emhttp/plugins/dynamix.plugin.manager/PluginInstall.page  | 4 ++--
 emhttp/plugins/dynamix.plugin.manager/PluginsError.page   | 4 ++--
 emhttp/plugins/dynamix.plugin.manager/PluginsStale.page   | 4 ++--
 emhttp/plugins/dynamix/CPUisol.page                       | 4 ++--
 emhttp/plugins/dynamix/CPUpin.page                        | 4 ++--
 emhttp/plugins/dynamix/Confirmations.page                 | 4 ++--
 emhttp/plugins/dynamix/FTP.page                           | 2 +-
 emhttp/plugins/dynamix/FeedbackButton.page                | 4 ++--
 emhttp/plugins/dynamix/FlashInfo.page                     | 4 ++--
 emhttp/plugins/dynamix/HardwareProfile.page               | 4 ++--
 emhttp/plugins/dynamix/InfoButton.page                    | 4 ++--
 emhttp/plugins/dynamix/Language.page                      | 4 ++--
 emhttp/plugins/dynamix/LogButton.page                     | 4 ++--
 emhttp/plugins/dynamix/LogoutButton.page                  | 4 ++--
 emhttp/plugins/dynamix/MoverSettings.page                 | 4 ++--
 emhttp/plugins/dynamix/NFS.page                           | 4 ++--
 emhttp/plugins/dynamix/OpenDevices.page                   | 4 ++--
 emhttp/plugins/dynamix/SMBActiveDirectory.page            | 4 ++--
 emhttp/plugins/dynamix/SMBWorkGroup.page                  | 4 ++--
 emhttp/plugins/dynamix/SMBsettings.page                   | 4 ++--
 emhttp/plugins/dynamix/SecurityNFS.page                   | 4 ++--
 emhttp/plugins/dynamix/TerminalButton.page                | 4 ++--
 emhttp/plugins/dynamix/include/Acknowledge.php            | 4 ++--
 emhttp/plugins/dynamix/include/Custom.php                 | 4 ++--
 emhttp/plugins/dynamix/include/CustomMerge.php            | 4 ++--
 emhttp/plugins/dynamix/include/DiskLog.php                | 4 ++--
 emhttp/plugins/dynamix/include/HardwareCollect.php        | 4 ++--
 emhttp/plugins/dynamix/include/InputSecurity.php          | 4 ++--
 emhttp/plugins/dynamix/include/KeyUpload.php              | 4 ++--
 emhttp/plugins/dynamix/include/PageBuilder.php            | 4 ++--
 emhttp/plugins/dynamix/include/ParityControl.php          | 4 ++--
 emhttp/plugins/dynamix/include/PortToggle.php             | 4 ++--
 emhttp/plugins/dynamix/include/Preselect.php              | 4 ++--
 emhttp/plugins/dynamix/include/RoutingTable.php           | 4 ++--
 emhttp/plugins/dynamix/include/Secure.php                 | 4 ++--
 emhttp/plugins/dynamix/include/update.ethernet.php        | 4 ++--
 emhttp/plugins/dynamix/include/update.rules.php           | 4 ++--
 emhttp/plugins/dynamix/include/update.smart.php           | 4 ++--
 41 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/emhttp/plugins/dynamix.apcupsd/UPSdetails.page b/emhttp/plugins/dynamix.apcupsd/UPSdetails.page
index 73b5cd688..9eaa96693 100644
--- a/emhttp/plugins/dynamix.apcupsd/UPSdetails.page
+++ b/emhttp/plugins/dynamix.apcupsd/UPSdetails.page
@@ -3,8 +3,8 @@ Title="UPS Details"
 Tag="battery-3"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015, Dan Landon.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/emhttp/plugins/dynamix.apcupsd/include/update.apcupsd.php b/emhttp/plugins/dynamix.apcupsd/include/update.apcupsd.php
index d0884c934..5cfc11b33 100644
--- a/emhttp/plugins/dynamix.apcupsd/include/update.apcupsd.php
+++ b/emhttp/plugins/dynamix.apcupsd/include/update.apcupsd.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015, Dan Landon.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/emhttp/plugins/dynamix.docker.manager/Docker.page b/emhttp/plugins/dynamix.docker.manager/Docker.page
index 38c98c736..1d20e958a 100644
--- a/emhttp/plugins/dynamix.docker.manager/Docker.page
+++ b/emhttp/plugins/dynamix.docker.manager/Docker.page
@@ -5,7 +5,7 @@ Lock="true"
 Cond="exec(\"grep -o '^DOCKER_ENABLED=.yes' /boot/config/docker.cfg 2>/dev/null\")"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
diff --git a/emhttp/plugins/dynamix.plugin.manager/PluginInstall.page b/emhttp/plugins/dynamix.plugin.manager/PluginInstall.page
index 3c7275cd0..93ca7a556 100644
--- a/emhttp/plugins/dynamix.plugin.manager/PluginInstall.page
+++ b/emhttp/plugins/dynamix.plugin.manager/PluginInstall.page
@@ -3,8 +3,8 @@ Title="Install Plugin"
 Tag="download"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix.plugin.manager/PluginsError.page b/emhttp/plugins/dynamix.plugin.manager/PluginsError.page
index 8c53132b6..10b746975 100644
--- a/emhttp/plugins/dynamix.plugin.manager/PluginsError.page
+++ b/emhttp/plugins/dynamix.plugin.manager/PluginsError.page
@@ -4,8 +4,8 @@ Tag="puzzle-piece"
 Cond="glob('/boot/config/plugins-error/*.plg')"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix.plugin.manager/PluginsStale.page b/emhttp/plugins/dynamix.plugin.manager/PluginsStale.page
index 3d028677b..b226866b8 100644
--- a/emhttp/plugins/dynamix.plugin.manager/PluginsStale.page
+++ b/emhttp/plugins/dynamix.plugin.manager/PluginsStale.page
@@ -4,8 +4,8 @@ Tag="puzzle-piece"
 Cond="glob('/boot/config/plugins-stale/*.plg')"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/CPUisol.page b/emhttp/plugins/dynamix/CPUisol.page
index 5268b81de..c367bb564 100644
--- a/emhttp/plugins/dynamix/CPUisol.page
+++ b/emhttp/plugins/dynamix/CPUisol.page
@@ -3,8 +3,8 @@ Title="CPU Isolation"
 Tag="icon-cpu"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/CPUpin.page b/emhttp/plugins/dynamix/CPUpin.page
index 584544167..73e37a453 100644
--- a/emhttp/plugins/dynamix/CPUpin.page
+++ b/emhttp/plugins/dynamix/CPUpin.page
@@ -3,8 +3,8 @@ Title="CPU Pinning Docker"
 Tag="icon-cpu"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/Confirmations.page b/emhttp/plugins/dynamix/Confirmations.page
index 551031ad9..a258896b2 100644
--- a/emhttp/plugins/dynamix/Confirmations.page
+++ b/emhttp/plugins/dynamix/Confirmations.page
@@ -4,8 +4,8 @@ Icon="icon-confirmations"
 Tag="check-square"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/FTP.page b/emhttp/plugins/dynamix/FTP.page
index 240f454b5..7c4d27018 100644
--- a/emhttp/plugins/dynamix/FTP.page
+++ b/emhttp/plugins/dynamix/FTP.page
@@ -4,7 +4,7 @@ Icon="icon-ftp"
 Tag="globe"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
  * Copyright 2012-2020 Bergware International.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/emhttp/plugins/dynamix/FeedbackButton.page b/emhttp/plugins/dynamix/FeedbackButton.page
index dd93c4faf..3ec179896 100644
--- a/emhttp/plugins/dynamix/FeedbackButton.page
+++ b/emhttp/plugins/dynamix/FeedbackButton.page
@@ -5,8 +5,8 @@ Tag="icon-u-chat"
 Code="e93e"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/FlashInfo.page b/emhttp/plugins/dynamix/FlashInfo.page
index a58a79a83..5fdf62048 100644
--- a/emhttp/plugins/dynamix/FlashInfo.page
+++ b/emhttp/plugins/dynamix/FlashInfo.page
@@ -3,8 +3,8 @@ Title="Flash Device Settings"
 Tag="usb"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/HardwareProfile.page b/emhttp/plugins/dynamix/HardwareProfile.page
index 3df68d8ff..23e8c4e98 100644
--- a/emhttp/plugins/dynamix/HardwareProfile.page
+++ b/emhttp/plugins/dynamix/HardwareProfile.page
@@ -4,8 +4,8 @@ Icon="icon-profile"
 Tag="wrench"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/InfoButton.page b/emhttp/plugins/dynamix/InfoButton.page
index 96bd2f63e..89d383b81 100644
--- a/emhttp/plugins/dynamix/InfoButton.page
+++ b/emhttp/plugins/dynamix/InfoButton.page
@@ -4,8 +4,8 @@ Icon="icon-u-display"
 Code="e930"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/Language.page b/emhttp/plugins/dynamix/Language.page
index 5c86deae4..aa282a02d 100644
--- a/emhttp/plugins/dynamix/Language.page
+++ b/emhttp/plugins/dynamix/Language.page
@@ -4,8 +4,8 @@ Icon="icon-language"
 Tag="icon-language"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/LogButton.page b/emhttp/plugins/dynamix/LogButton.page
index 075fd8e9c..16f5179f0 100644
--- a/emhttp/plugins/dynamix/LogButton.page
+++ b/emhttp/plugins/dynamix/LogButton.page
@@ -4,8 +4,8 @@ Icon="icon-u-log"
 Code="e936"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/LogoutButton.page b/emhttp/plugins/dynamix/LogoutButton.page
index 7b43091c0..f1024923e 100644
--- a/emhttp/plugins/dynamix/LogoutButton.page
+++ b/emhttp/plugins/dynamix/LogoutButton.page
@@ -5,8 +5,8 @@ Code="e937"
 Cond="$_SERVER['HTTP_HOST']!='localhost'"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/MoverSettings.page b/emhttp/plugins/dynamix/MoverSettings.page
index 939027845..d7587dc98 100644
--- a/emhttp/plugins/dynamix/MoverSettings.page
+++ b/emhttp/plugins/dynamix/MoverSettings.page
@@ -3,8 +3,8 @@ Title="Mover Settings"
 Tag="calendar-check-o"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/NFS.page b/emhttp/plugins/dynamix/NFS.page
index 3b25daf25..b321269aa 100644
--- a/emhttp/plugins/dynamix/NFS.page
+++ b/emhttp/plugins/dynamix/NFS.page
@@ -4,8 +4,8 @@ Icon="icon-linux"
 Tag="linux"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/OpenDevices.page b/emhttp/plugins/dynamix/OpenDevices.page
index 0dfc8262e..1fdd64548 100644
--- a/emhttp/plugins/dynamix/OpenDevices.page
+++ b/emhttp/plugins/dynamix/OpenDevices.page
@@ -4,8 +4,8 @@ Tag="unlink"
 Cond="(count($devs)>0)"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/SMBActiveDirectory.page b/emhttp/plugins/dynamix/SMBActiveDirectory.page
index 2174a1d7a..1952ae5bf 100644
--- a/emhttp/plugins/dynamix/SMBActiveDirectory.page
+++ b/emhttp/plugins/dynamix/SMBActiveDirectory.page
@@ -4,8 +4,8 @@ Tag="list-ul"
 Cond="($var['shareSMBEnabled']=='ads')"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/SMBWorkGroup.page b/emhttp/plugins/dynamix/SMBWorkGroup.page
index 4d2feabd1..7d0ceaf94 100644
--- a/emhttp/plugins/dynamix/SMBWorkGroup.page
+++ b/emhttp/plugins/dynamix/SMBWorkGroup.page
@@ -4,8 +4,8 @@ Tag="sitemap"
 Cond="($var['shareSMBEnabled']=='yes')"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/SMBsettings.page b/emhttp/plugins/dynamix/SMBsettings.page
index eccf3265a..117e9d673 100644
--- a/emhttp/plugins/dynamix/SMBsettings.page
+++ b/emhttp/plugins/dynamix/SMBsettings.page
@@ -3,8 +3,8 @@ Title="SMB Settings"
 Tag="windows"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/SecurityNFS.page b/emhttp/plugins/dynamix/SecurityNFS.page
index c79bc2a4d..6a6223b71 100644
--- a/emhttp/plugins/dynamix/SecurityNFS.page
+++ b/emhttp/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-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/TerminalButton.page b/emhttp/plugins/dynamix/TerminalButton.page
index af41a7f83..3c35d623f 100644
--- a/emhttp/plugins/dynamix/TerminalButton.page
+++ b/emhttp/plugins/dynamix/TerminalButton.page
@@ -4,8 +4,8 @@ Icon="icon-u-terminal"
 Code="e93f"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/Acknowledge.php b/emhttp/plugins/dynamix/include/Acknowledge.php
index 73d1488a6..236ec98e5 100644
--- a/emhttp/plugins/dynamix/include/Acknowledge.php
+++ b/emhttp/plugins/dynamix/include/Acknowledge.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/Custom.php b/emhttp/plugins/dynamix/include/Custom.php
index 259f6c905..5e570a32a 100644
--- a/emhttp/plugins/dynamix/include/Custom.php
+++ b/emhttp/plugins/dynamix/include/Custom.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/CustomMerge.php b/emhttp/plugins/dynamix/include/CustomMerge.php
index 99a12825a..a82053cd2 100644
--- a/emhttp/plugins/dynamix/include/CustomMerge.php
+++ b/emhttp/plugins/dynamix/include/CustomMerge.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/DiskLog.php b/emhttp/plugins/dynamix/include/DiskLog.php
index 27097d30b..b56af1864 100644
--- a/emhttp/plugins/dynamix/include/DiskLog.php
+++ b/emhttp/plugins/dynamix/include/DiskLog.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/HardwareCollect.php b/emhttp/plugins/dynamix/include/HardwareCollect.php
index 684d6a69b..7a4ac1b4f 100644
--- a/emhttp/plugins/dynamix/include/HardwareCollect.php
+++ b/emhttp/plugins/dynamix/include/HardwareCollect.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/InputSecurity.php b/emhttp/plugins/dynamix/include/InputSecurity.php
index ac2c5d85d..b25c6d6ab 100644
--- a/emhttp/plugins/dynamix/include/InputSecurity.php
+++ b/emhttp/plugins/dynamix/include/InputSecurity.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/KeyUpload.php b/emhttp/plugins/dynamix/include/KeyUpload.php
index 84b779552..193af71f5 100644
--- a/emhttp/plugins/dynamix/include/KeyUpload.php
+++ b/emhttp/plugins/dynamix/include/KeyUpload.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/PageBuilder.php b/emhttp/plugins/dynamix/include/PageBuilder.php
index c74a9846f..931d05943 100644
--- a/emhttp/plugins/dynamix/include/PageBuilder.php
+++ b/emhttp/plugins/dynamix/include/PageBuilder.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/ParityControl.php b/emhttp/plugins/dynamix/include/ParityControl.php
index 22995ebcd..bdde9356f 100644
--- a/emhttp/plugins/dynamix/include/ParityControl.php
+++ b/emhttp/plugins/dynamix/include/ParityControl.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/PortToggle.php b/emhttp/plugins/dynamix/include/PortToggle.php
index ed8849754..0746c4147 100644
--- a/emhttp/plugins/dynamix/include/PortToggle.php
+++ b/emhttp/plugins/dynamix/include/PortToggle.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/Preselect.php b/emhttp/plugins/dynamix/include/Preselect.php
index 4c468c670..ac55a8ae0 100644
--- a/emhttp/plugins/dynamix/include/Preselect.php
+++ b/emhttp/plugins/dynamix/include/Preselect.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/RoutingTable.php b/emhttp/plugins/dynamix/include/RoutingTable.php
index 1b61e2933..863925bd4 100644
--- a/emhttp/plugins/dynamix/include/RoutingTable.php
+++ b/emhttp/plugins/dynamix/include/RoutingTable.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/Secure.php b/emhttp/plugins/dynamix/include/Secure.php
index 977921efc..d44406762 100644
--- a/emhttp/plugins/dynamix/include/Secure.php
+++ b/emhttp/plugins/dynamix/include/Secure.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/update.ethernet.php b/emhttp/plugins/dynamix/include/update.ethernet.php
index 9a8f89ffc..1e8197360 100644
--- a/emhttp/plugins/dynamix/include/update.ethernet.php
+++ b/emhttp/plugins/dynamix/include/update.ethernet.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/update.rules.php b/emhttp/plugins/dynamix/include/update.rules.php
index 50ced4f49..cef769ff8 100644
--- a/emhttp/plugins/dynamix/include/update.rules.php
+++ b/emhttp/plugins/dynamix/include/update.rules.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
diff --git a/emhttp/plugins/dynamix/include/update.smart.php b/emhttp/plugins/dynamix/include/update.smart.php
index 630fe14e1..708fcb054 100644
--- a/emhttp/plugins/dynamix/include/update.smart.php
+++ b/emhttp/plugins/dynamix/include/update.smart.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,

From dbde622c27da3917d4cb6b804406cdb1aa3ac499 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Nov 2023 12:40:31 +0100
Subject: [PATCH 231/266] Update Acknowledge.php

---
 .../plugins/dynamix/include/Acknowledge.php   | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/Acknowledge.php b/emhttp/plugins/dynamix/include/Acknowledge.php
index 236ec98e5..cdd84e48c 100644
--- a/emhttp/plugins/dynamix/include/Acknowledge.php
+++ b/emhttp/plugins/dynamix/include/Acknowledge.php
@@ -11,17 +11,24 @@
  */
 ?>
 <?
-$ram   = "/var/local/emhttp/monitor.ini";
-$rom   = "/boot/config/plugins/dynamix/monitor.ini";
-$saved = parse_ini_file($ram,true);
-$saved["smart"]["{$_POST['disk']}.ack"] = "true";
+$ram  = "/var/local/emhttp/monitor.ini";
+$rom  = "/boot/config/plugins/dynamix/monitor.ini";
+$disk = $_POST['disk'] ?? '';
 
-$text = "";
-foreach ($saved as $item => $block) {
-  if ($block) $text .= "[$item]\n";
-  foreach ($block as $key => $value) $text .= "$key=\"$value\"\n";
+if ($disk) {
+  $text  = "";
+  $saved = parse_ini_file($ram,true);
+  $saved["smart"]["$disk.ack"] = "true";
+
+  foreach ($saved as $item => $block) {
+    if ($block) $text .= "[$item]\n";
+    foreach ($block as $key => $value) $text .= "$key=\"$value\"\n";
+  }
+
+  file_put_contents($ram, $text);
+  file_put_contents($rom, $text);
+  echo "200 OK";
+} else {
+  echo "404 ERROR";
 }
-file_put_contents($ram, $text);
-file_put_contents($rom, $text);
-echo "200 OK";
-?>
\ No newline at end of file
+?>

From 6f8c5ec69e45a2ec55778a4ddd48761dcb0047c7 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Nov 2023 12:45:07 +0100
Subject: [PATCH 232/266] Updated copyright year to 2023

---
 emhttp/plugins/dynamix.plugin.manager/scripts/plugin | 2 +-
 emhttp/plugins/dynamix/nchan/notify_poller           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix.plugin.manager/scripts/plugin b/emhttp/plugins/dynamix.plugin.manager/scripts/plugin
index 9de7c7db3..25adb52d6 100755
--- a/emhttp/plugins/dynamix.plugin.manager/scripts/plugin
+++ b/emhttp/plugins/dynamix.plugin.manager/scripts/plugin
@@ -1,6 +1,6 @@
 #!/usr/bin/php -q
 <?PHP
-// Copyright 2005-2022, Lime Technology
+// Copyright 2005-2023, Lime Technology
 // License: GPLv2 only
 //
 // Program updates made by Bergware International (April 2020)
diff --git a/emhttp/plugins/dynamix/nchan/notify_poller b/emhttp/plugins/dynamix/nchan/notify_poller
index fe9cb4127..bdcfe1016 100755
--- a/emhttp/plugins/dynamix/nchan/notify_poller
+++ b/emhttp/plugins/dynamix/nchan/notify_poller
@@ -1,7 +1,7 @@
 #!/usr/bin/php -q
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,

From f340ab8635e78d9de38c5ee547cf5c40b3f5f697 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Nov 2023 12:49:46 +0100
Subject: [PATCH 233/266] Updated copyright year to 2023

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

diff --git a/emhttp/plugins/dynamix/FTP.page b/emhttp/plugins/dynamix/FTP.page
index 7c4d27018..ef50a6a0c 100644
--- a/emhttp/plugins/dynamix/FTP.page
+++ b/emhttp/plugins/dynamix/FTP.page
@@ -5,7 +5,7 @@ Tag="globe"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2012-2020 Bergware International.
+ * Copyright 2012-2023, 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,

From 8706f118eb0810499ff3a41b213e7e2a062f77e9 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Nov 2023 18:06:40 +0100
Subject: [PATCH 234/266] File Manager: fix incorrect references

---
 emhttp/plugins/dynamix/include/Templates.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/Templates.php b/emhttp/plugins/dynamix/include/Templates.php
index cb9f930b9..2d827c0c8 100644
--- a/emhttp/plugins/dynamix/include/Templates.php
+++ b/emhttp/plugins/dynamix/include/Templates.php
@@ -274,8 +274,8 @@ _(Search pattern)_:
 <!--!
 <style>div#dfm_editor{position:absolute;top:0;bottom:0;left:0;right:0}</style>
 <div id="dfm_editor"></div>
-<script src="<?autov('/plugins/dynamix.file.manager/javascript/ace/ace.js')?>"></script>
-<script src="<?autov('/plugins/dynamix.file.manager/javascript/ace/ext-modelist.js')?>"></script>
+<script src="<?autov('/webGui/javascript/ace/ace.js')?>"></script>
+<script src="<?autov('/webGui/javascript/ace/ext-modelist.js')?>"></script>
 <script>
 function getMode(file){
   var modelist = require('ace/ext/modelist');
@@ -291,7 +291,7 @@ editor.setOptions({
   theme:'ace/theme/<?if (in_array($theme,['black','gray'])):?>tomorrow_night<?else:?>tomorrow<?endif;?>'
 });
 timers.editor = setTimeout(function(){$('div.spinner.fixed').show();},500);
-$.post('/plugins/dynamix.file.manager/include/Control.php',{mode:'edit',file:encodeURIComponent(source)},function(data){
+$.post('/webGui/include/Control.php',{mode:'edit',file:encodeURIComponent(source)},function(data){
   clearTimeout(timers.editor);
   $('div.spinner.fixed').hide();
   editor.session.setValue(data);
@@ -303,7 +303,7 @@ $.post('/plugins/dynamix.file.manager/include/Control.php',{mode:'edit',file:enc
 <div id="dfm_templateViewFile">
 <!--!
 <img id="dfm_viewer" href="{$0}">
-<script src="<?autov('/plugins/dynamix.file.manager/javascript/EZView.js')?>"></script>
+<script src="<?autov('/webGui/javascript/EZView.js')?>"></script>
 <script>
 $('#dfm_viewer').EZView();
 $('#dfm_viewer').click();
@@ -316,7 +316,7 @@ $('#dfm_viewer').click();
 <style>div#dfm_jobs{position:absolute;top:0;bottom:0;left:0;right:0;line-height:3rem}</style>
 <div id="dfm_jobs"></div>
 <script>
-$.post('/plugins/dynamix.file.manager/include/Control.php',{mode:'jobs'},function(jobs){
+$.post('/webGui/include/Control.php',{mode:'jobs'},function(jobs){
   $('#dfm_jobs').html(jobs);
 });
 </script>

From 3a073ed4bd14b08218e1e0f62bf77a9e44f8fbd7 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 4 Nov 2023 10:05:51 +0100
Subject: [PATCH 235/266] Code alignment

---
 emhttp/plugins/dynamix/DashStats.page       | 2 +-
 emhttp/plugins/dynamix/DeviceInfo.page      | 2 +-
 emhttp/plugins/dynamix/include/Wrappers.php | 9 ++++++++-
 emhttp/plugins/dynamix/nchan/device_list    | 7 +++----
 emhttp/plugins/dynamix/nchan/update_2       | 6 ++----
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 3dbec663b..83eeb7850 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -570,7 +570,7 @@ if (!$group) {
 <?$i=0?>
 <?foreach ($pools as $pool):?>
 <tbody id='pool_list<?=$i?>' title="_(<?=ucfirst($pool)?> Information)_">
-<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst(str_replace($_tilde_," $_arrow_ ",$pool))?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
+<tr><td><i class='icon-disk f32'></i><div class='section'><?=_(native($pool),3).($started ? '' : ' ('._('stopped').')')?><br>
 <span><?if ($started):?><?=sprintf(_("%s used of %s (%s %%)"),my_scale($cache_used[$pool]*1024,$unit)." $unit",my_scale($cache_size[$pool]*1024,$unit,-1,-1)." $unit",$cache_rate[$pool])?><?endif;?></span><br></div>
 <a href='/Dashboard/Settings/Device?name=<?=$pool?>' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index e4d0a818a..086ab3ce1 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -537,7 +537,7 @@ _(Name)_:
 
 <?else:?>
 _(Name)_:
-: <?=str_replace($_tilde_," $_arrow_ ",_(my_disk($name),3))?>
+: <?=_(my_disk(native($name)),3)?>
 
 <?endif;?>
 <?if (diskStatus('_NP')):?>
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index f14cf4187..a7a8ef78b 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -95,12 +95,19 @@ function ipaddr($ethX='eth0', $prot=4) {
   }
 }
 function no_tilde($name) {
-  global $_tilde_,$_proxy_;
+  global $_tilde_ ,$_proxy_;
   return str_replace($_tilde_,$_proxy_,$name);
 }
 function prefix($key) {
   return preg_replace('/\d+$/','',$key);
 }
+function native($name, $full=0) {
+  global $_tilde_, $_arrow_;
+  switch ($full) {
+    case 0: return str_replace($_tilde_," $_arrow_ ",$name);
+    case 1: return strpos($name,$_tilde_)!==false ? "$_arrow_ ".explode($_tilde_,$name)[1] : $name;
+  }
+}
 function isSubpool($name) {
   global $subpools, $_tilde_;
   $subpool = my_explode($_tilde_,$name)[1];
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index aded5c9ee..d57bdfa84 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -37,7 +37,7 @@ function model($id) {
   return substr($id,0,strrpos($id,'_'));
 }
 function device_info(&$disk,$online) {
-  global $pools, $var, $crypto, $_tilde_, $_arrow_;
+  global $pools, $var, $crypto;
   if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) {
     $view = "<a class='view'></a>";
   } else {
@@ -46,8 +46,7 @@ function device_info(&$disk,$online) {
   }
   $name = _var($disk,'name');
   $named = no_tilde($name);
-  $extra = my_explode($_tilde_,$name)[1];
-  $fancyname = compress($extra ? "$_arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  $fancy = compress(_(my_disk(native($name,1)),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $pool = _var($disk,'type')=='Cache';
   $parity = _var($disk,'type')=='Parity';
@@ -75,7 +74,7 @@ function device_info(&$disk,$online) {
             (_var($disk,'type')=='Data' && $disk_status!='DISK_NP') ||
             (_var($disk,'type')=='Cache' && $disk_status!='DISK_NP') ||
             (_var($disk,'name')=='flash') || in_array(_var($disk,'name'),$pools) ||
-             _var($disk,'type')=='New' ? "<a href=\"".htmlspecialchars("/Main/Settings/$type?name=$name")."\">$fancyname</a>" : $fancyname;
+             _var($disk,'type')=='New' ? "<a href=\"".htmlspecialchars("/Main/Settings/$type?name=$name")."\">$fancy</a>" : $fancy;
   if ($crypto) switch (_var($disk,'luksState',0)) {
     case 0:
       if (!vfs_luks(_var($disk,'fsType')))
diff --git a/emhttp/plugins/dynamix/nchan/update_2 b/emhttp/plugins/dynamix/nchan/update_2
index cad69d9f4..9b1adcc9f 100755
--- a/emhttp/plugins/dynamix/nchan/update_2
+++ b/emhttp/plugins/dynamix/nchan/update_2
@@ -126,7 +126,6 @@ function active_disks($disk) {
   return substr(_var($disk,'status'),0,7)!='DISK_NP' && in_array(_var($disk,'type'),['Parity','Data']);
 }
 function device_name(&$disk) {
-  global $_tilde_, $_arrow_;
   switch (_var($disk,'type')) {
     case 'Extra' :
     case 'Parity': $type = _var($disk,'rotational') ? 'disk' : 'nvme'; break;
@@ -134,9 +133,8 @@ function device_name(&$disk) {
     case 'Cache' : $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break;
   }
   $name = _var($disk,'name');
-  $extra = my_explode($_tilde_,$name)[1];
-  $fancyname = compress($extra ? "$_arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
-  return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name=$name")."\" title=\"$fancyname settings\">$fancyname</a>";
+  $fancy = compress(_(my_disk(native($name,1)),3),16,5);
+  return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name=$name")."\" title=\"$fancy settings\">$fancy</a>";
 }
 function device_status(&$disk, &$error, &$warning) {
   global $var;

From 9f39b162d05f42f99204853ca607a0cd5878cb76 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 4 Nov 2023 11:31:46 +0000
Subject: [PATCH 236/266] Add QEMU arg Support

---
 .../dynamix.vm.manager/include/libvirt.php    | 10 ++++++++-
 .../include/libvirt_helpers.php               | 21 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index c6379c458..f66fb2843 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -984,6 +984,12 @@
 
 		}
 
+		function appendqemucmdline($xml,$cmdline) {
+			$newxml = $xml ;
+			if ($cmdline != null) $newxml = str_replace("</domain>",$cmdline."\n</domain>",$xml) ;
+			return $newxml ;
+		}
+
 		function domain_new($config) {
 
 			// attempt to create all disk images if needed
@@ -1007,6 +1013,8 @@
 
 			// generate xml for this domain
 			$strXML = $this->config_to_xml($config);
+			$qemucmdline = $config['qemucmdline'];
+			$strXML = $this->appendqemucmdline($strXML,$qemucmdline) ;
 
 
 			// Start the VM now if requested
@@ -1698,7 +1706,7 @@
 			if (strpos($xml,'<qemu:commandline>')) {
 				$tmp = explode("\n", $xml);
 				for ($i = 0; $i < sizeof($tmp); $i++)
-					if (strpos('.'.$tmp[$i], "<domain type='kvm'"))
+					if (strpos('.'.$tmp[$i], "<domain type='kvm'") || strpos('.'.$tmp[$i], '<domain type="kvm"'))
 						$tmp[$i] = "<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>";
 				$xml = join("\n", $tmp);
 			}
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 74e7bc6d8..092c84dcb 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1300,7 +1300,9 @@ private static $encoding = 'UTF-8';
 			'pci' => $arrOtherDevices,
 			'nic' => $arrNICs,
 			'usb' => $arrUSBDevs,
-			'shares' => $lv->domain_get_mount_filesystems($res)
+			'shares' => $lv->domain_get_mount_filesystems($res),
+			'qemucmdline' => getQEMUCmdLine($strDOMXML),
+			'clocks' => getClocks($strDOMXML)
 		];
 	}
 
@@ -1447,6 +1449,23 @@ private static $encoding = 'UTF-8';
 		$memorybacking = $memoryBacking->memoryBacking ;
 		return json_encode($memorybacking); ;
 	}
+	function getClocks($xml) {
+		$clocks = new SimpleXMLElement($xml);
+		$clocks = $clocks->clock ;
+		return json_encode($clocks); ;
+	}
+
+	function getQEMUCmdLine($xml) {
+		$x = strpos($xml,"<qemu:commandline>", 0) ;
+		if ($x === false) return null ;
+		$y = strpos($xml,"</qemu:commandline>", 0)  ;
+		$z=$y ;
+		while ($y!=false) {
+			$y = strpos($xml,"<qemu:commandline>", $z +19)  ;
+			if ($y != false) $z =$y  ;
+		}
+		return substr($xml,$x, ($z + 19) -$x) ;
+	}
 
 	function getchannels($res) {
 		global $lv ;

From e0a55a18bec42ba65fd4da169cd39aa904e4aa99 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 4 Nov 2023 11:32:15 +0000
Subject: [PATCH 237/266] Add QEMU args Support

---
 .../templates/Custom.form.php                  | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index d9a9eb22a..8b8129422 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -229,6 +229,7 @@
 				array_update_recursive($arrExistingConfig, $arrUpdatedConfig);
 				$arrConfig = array_replace_recursive($arrExistingConfig, $arrUpdatedConfig);
 				$xml = custom::createXML('domain',$arrConfig)->saveXML();
+				$xml = $lv->appendqemucmdline($xml,$_POST["qemucmdline"]) ;
 			} else {
 				echo json_encode(['error' => $error]);
 				exit;
@@ -291,6 +292,7 @@
 <input type="hidden" name="domain[arch]" value="<?=htmlspecialchars($arrConfig['domain']['arch'])?>">
 <input type="hidden" name="domain[oldname]" id="domain_oldname" value="<?=htmlspecialchars($arrConfig['domain']['name'])?>">
 <input type="hidden" name="domain[memoryBacking]" id="domain_memorybacking" value="<?=htmlspecialchars($arrConfig['domain']['memoryBacking'])?>">
+<input type="hidden" name="clocks" value="<?=htmlspecialchars($arrConfig['clocks'])?>">
 
 	<table>
 		<tr>
@@ -1416,6 +1418,20 @@
 		<p>Use boot order to set device as bootable and boot sequence. Only NVMe and Network devices (PCI types 0108 and 02xx) supported for boot order.</p>
 	</blockquote>
 
+	<table>
+		<tr>
+			<td>_(QEMU Command Line)_:</td>
+			<td>
+			<textarea id="qemucmdline" name="qemucmdline" rows=15 style="width: 850px"><?=htmlspecialchars($arrConfig['qemucmdline'])?></textarea></td></tr>
+			</td>
+		</tr>
+	</table>
+	<blockquote class="inline_help">
+		<p>If you need to add QEMU arguments to the XML</p>
+		Examples can be found on the Libvirt page => <a href="https://libvirt.org/kbase/qemu-passthrough-security.html "  target="_blank">https://libvirt.org/kbase/qemu-passthrough-security.html </a>
+		</p>
+	</blockquote>
+
 	<table>
 		<tr>
 			<td></td>
@@ -1950,7 +1966,7 @@ $(function() {
 			if (audio && !sound.includes(audio)) form.append('<input type="hidden" name="pci[]" value="'+audio+'#remove">');
 		});
 		<?endif?>
-		var postdata = form.find('input,select').serialize().replace(/'/g,"%27");
+		var postdata = form.find('input,select,textarea[name="qemucmdline"').serialize().replace(/'/g,"%27");
 		<?if (!$boolNew):?>
 		// keep checkbox visually unchecked
 		form.find('input[name="usb[]"],input[name="usbopt[]"],input[name="pci[]"]').each(function(){

From f725ea1acdd04ea4810b927ad21eab5ebc8446e3 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 4 Nov 2023 11:38:07 +0000
Subject: [PATCH 238/266] Update libvirt_helpers.php

---
 .../include/libvirt_helpers.php                 | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 1df69c82e..aa5ab0d39 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1449,23 +1449,6 @@ private static $encoding = 'UTF-8';
 		$memorybacking = $memoryBacking->memoryBacking ;
 		return json_encode($memorybacking); ;
 	}
-	function getClocks($xml) {
-		$clocks = new SimpleXMLElement($xml);
-		$clocks = $clocks->clock ;
-		return json_encode($clocks); ;
-	}
-
-	function getQEMUCmdLine($xml) {
-		$x = strpos($xml,"<qemu:commandline>", 0) ;
-		if ($x === false) return null ;
-		$y = strpos($xml,"</qemu:commandline>", 0)  ;
-		$z=$y ;
-		while ($y!=false) {
-			$y = strpos($xml,"<qemu:commandline>", $z +19)  ;
-			if ($y != false) $z =$y  ;
-		}
-		return substr($xml,$x, ($z + 19) -$x) ;
-	}
 
 	function getClocks($xml) {
 		$clocks = new SimpleXMLElement($xml);

From 21c8d79c71b201961c5ec761ffe0da1152aef518 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 4 Nov 2023 11:45:39 +0000
Subject: [PATCH 239/266] Fix QEMU args value

---
 emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index aa5ab0d39..aea9312d3 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1458,6 +1458,7 @@ private static $encoding = 'UTF-8';
 
 	function getQEMUCmdLine($xml) {
 		$x = strpos($xml,"<qemu:commandline>", 0) ;
+		if ($x === false) return null ;
 		$y = strpos($xml,"</qemu:commandline>", 0)  ;
 		$z=$y ;
 		while ($y!=false) {

From a18a6032fd38c08685b6221053428fb4cecdbfe1 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 4 Nov 2023 20:23:03 +0000
Subject: [PATCH 240/266] Update get Clock function

---
 .../include/libvirt_helpers.php               | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index aea9312d3..ef047fb22 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1452,8 +1452,34 @@ private static $encoding = 'UTF-8';
 
 	function getClocks($xml) {
 		$clocks = new SimpleXMLElement($xml);
-		$clocks = $clocks->clock ;
-		return json_encode($clocks); ;
+		$clocks = json_decode(json_encode($clocks->clock),true) ;
+		$arrClocks = [
+			"offset" => $clocks['@attributes']['offset'] ,
+			"hpet" => [
+				"present" => "no",
+				"tickpolicy" => "delay"
+			],
+			"hypervclock" => [
+				"present" => "no",
+				"tickpolicy" => "delay"
+			],
+			"pit" => [
+				"present" => "no",
+				"tickpolicy" => "delay"
+			],
+			"rtc" => [
+				"present" => "no",
+				"tickpolicy" => "delay"
+			]
+		] ;
+		foreach ($clocks['timer'] as $timer) {
+			$name = $timer["@attributes"]["name"] ;
+			$tickpolicy = $timer["@attributes"]["tickpolicy"] ;
+			$present = $timer["@attributes"]["present"] ;
+			if (isset($present)) $arrClocks[$name]['present'] = $present ;
+			if (isset($tickpolicy)) $arrClocks[$name]['tickpolicy'] = $tickpolicy ; 
+		}
+		return json_encode($arrClocks) ;
 	}
 
 	function getQEMUCmdLine($xml) {

From 78c704beba8fde78c8f26b0d3f17f00516368f0b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 11:02:32 +0100
Subject: [PATCH 241/266] Display settings: new setting "width"

width = boxed (default, content width is constrained)
width = unlimited (content width is unlimited for higher resolutions)

This should stop the complaints about dashboard not displaying three columns on wide screens.
---
 emhttp/plugins/dynamix/DisplaySettings.page          | 9 +++++++++
 emhttp/plugins/dynamix/default.cfg                   | 1 +
 emhttp/plugins/dynamix/include/DefaultPageLayout.php | 9 +++++++++
 emhttp/plugins/dynamix/styles/default-azure.css      | 3 ---
 emhttp/plugins/dynamix/styles/default-black.css      | 3 ---
 emhttp/plugins/dynamix/styles/default-gray.css       | 3 ---
 emhttp/plugins/dynamix/styles/default-white.css      | 3 ---
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 84391e17f..75059aeb1 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -126,6 +126,15 @@ $(function() {
 <input type="hidden" name="#file" value="dynamix/dynamix.cfg">
 <input type="hidden" name="#section" value="display">
 <input type="hidden" name="rtl" value="<?=$display['rtl']?>">
+
+_(Display width)_:
+: <select name="width">
+  <?=mk_option($display['width'], "",_('Boxed'))?>
+  <?=mk_option($display['width'], "1",_('Unlimited'))?>
+  </select>
+
+:display_width_help:
+
 _(Language)_:
 : <select name="locale" class="fixed" onchange="updateDirection(this.value)">
 <?echo mk_option($display['locale'], "","English");
diff --git a/emhttp/plugins/dynamix/default.cfg b/emhttp/plugins/dynamix/default.cfg
index 3f377d32c..1b0834ae8 100644
--- a/emhttp/plugins/dynamix/default.cfg
+++ b/emhttp/plugins/dynamix/default.cfg
@@ -2,6 +2,7 @@
 down="1"
 stop="1"
 [display]
+width=""
 font=""
 tty="15"
 date="%c"
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index e85eeabf3..4d9fbd4f0 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -49,6 +49,15 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/defaultpagelayout.css")?>">
 
 <style>
+<?if (empty($display['width'])):?>
+@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
+@media (min-width:1281px){#template{min-width:1260px;margin:0 10px}}
+@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
+<?else:?>
+@media (max-width:1280px){#template{margin:0}}
+@media (min-width:1281px){#template{margin:0 10px}}
+@media (min-width:1921px){#template{margin:0 <?=$themes1?'20px':'auto'?>}
+<?endif;?>
 <?if ($display['font']):?>
 html{font-size:<?=$display['font']?>%}
 <?endif;?>
diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index af30d0b41..ef617eec0 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -1,8 +1,5 @@
 html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#606e7f;background-color:#e4e2e4;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
-@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
-@media (min-width:1281px){#template{min-width:1260px;margin:0}}
-@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:left}
 p.centered{text-align:left}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index 8e84de9d7..34fa87119 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -1,8 +1,5 @@
 html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#f2f2f2;background-color:#1c1b1b;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
-@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
-@media (min-width:1281px){#template{min-width:1260px;margin:0 10px}}
-@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:justify}
 p.centered{text-align:left}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index b73835521..fbb81d713 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -1,8 +1,5 @@
 html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#606e7f;background-color:#1b1d1b;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
-@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
-@media (min-width:1281px){#template{min-width:1260px;margin:0}}
-@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:left}
 p.centered{text-align:left}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index 42f1536db..e71b6b4e6 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -1,8 +1,5 @@
 html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#1c1b1b;background-color:#f2f2f2;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
-@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
-@media (min-width:1281px){#template{min-width:1260px;margin:0 10px}}
-@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:justify}
 p.centered{text-align:left}

From d903a1da07f5849596b703dddba06cfb5981a94b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 11:08:18 +0100
Subject: [PATCH 242/266] Update helptext.txt

---
 emhttp/languages/en_US/helptext.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/emhttp/languages/en_US/helptext.txt b/emhttp/languages/en_US/helptext.txt
index d5f7082a4..8bbe6599c 100644
--- a/emhttp/languages/en_US/helptext.txt
+++ b/emhttp/languages/en_US/helptext.txt
@@ -1527,6 +1527,12 @@ The display settings below determine how items are displayed on screen. Use thes
 You can experiment with these settings as desired, they only affect visual properties.
 :end
 
+:display_width_help:
+**Boxed** is the legacy setting which constrains the content width to maximum 1920 pixels
+
+**Unlimited** allows content to use all available width, which maybe useful on wide screens
+:end
+
 :display_font_size_help:
 Changes the font size in the GUI. This is a per device setting.
 :end

From c10c255f2d861b72e7719625a6ce3d20ea015872 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 11:24:04 +0100
Subject: [PATCH 243/266] Display settings: new setting "width"

---
 .../plugins/dynamix/include/DefaultPageLayout.php  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 4d9fbd4f0..cc4e2d60f 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -50,13 +50,13 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 
 <style>
 <?if (empty($display['width'])):?>
-@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
-@media (min-width:1281px){#template{min-width:1260px;margin:0 10px}}
-@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
+@media (max-width:1280px){#display{min-width:1260px;max-width:1260px;margin:0}}
+@media (min-width:1281px){#display{min-width:1260px;margin:0 10px}}
+@media (min-width:1921px){#display{min-width:1260px;max-width:1920px;margin:0 auto}}
 <?else:?>
-@media (max-width:1280px){#template{margin:0}}
-@media (min-width:1281px){#template{margin:0 10px}}
-@media (min-width:1921px){#template{margin:0 <?=$themes1?'20px':'auto'?>}
+@media (max-width:1280px){#display{margin:0}}
+@media (min-width:1281px){#display{margin:0 10px}}
+@media (min-width:1921px){#display{margin:0 <?=$themes1?'20px':'auto'?>}
 <?endif;?>
 <?if ($display['font']):?>
 html{font-size:<?=$display['font']?>%}
@@ -623,7 +623,7 @@ $.ajaxPrefilter(function(s, orig, xhr){
 <?include "$docroot/plugins/dynamix.my.servers/include/myservers1.php"?>
 </head>
 <body>
- <div id="template">
+ <div id="display">
   <div class="upgrade_notice" style="display:none"></div>
   <div id="header" class="<?=$display['banner']?>">
    <div class="logo">

From c7a1caba8ad5d691fab56e12d9e63c0c4ab62478 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 11:38:19 +0100
Subject: [PATCH 244/266] Display settings: new setting "width"

---
 .../plugins/dynamix/include/DefaultPageLayout.php  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index cc4e2d60f..26ca3abb6 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -50,13 +50,13 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 
 <style>
 <?if (empty($display['width'])):?>
-@media (max-width:1280px){#display{min-width:1260px;max-width:1260px;margin:0}}
-@media (min-width:1281px){#display{min-width:1260px;margin:0 10px}}
-@media (min-width:1921px){#display{min-width:1260px;max-width:1920px;margin:0 auto}}
+@media (max-width:1280px){#displaybox{min-width:1260px;max-width:1260px;margin:0}}
+@media (min-width:1281px){#displaybox{min-width:1260px;margin:0 10px}}
+@media (min-width:1921px){#displaybox{min-width:1260px;max-width:1920px;margin:0 auto}}
 <?else:?>
-@media (max-width:1280px){#display{margin:0}}
-@media (min-width:1281px){#display{margin:0 10px}}
-@media (min-width:1921px){#display{margin:0 <?=$themes1?'20px':'auto'?>}
+@media (max-width:1280px){#displaybox{margin:0}}
+@media (min-width:1281px){#displaybox{margin:0 10px}}
+@media (min-width:1921px){#displaybox{margin:0 <?=$themes1?'20px':'auto'?>}
 <?endif;?>
 <?if ($display['font']):?>
 html{font-size:<?=$display['font']?>%}
@@ -623,7 +623,7 @@ $.ajaxPrefilter(function(s, orig, xhr){
 <?include "$docroot/plugins/dynamix.my.servers/include/myservers1.php"?>
 </head>
 <body>
- <div id="display">
+ <div id="displaybox">
   <div class="upgrade_notice" style="display:none"></div>
   <div id="header" class="<?=$display['banner']?>">
    <div class="logo">

From b01c0b9affed6cae1fedb7e9b195c17420272a14 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 11:44:47 +0100
Subject: [PATCH 245/266] Display settings: new setting "width"

---
 emhttp/plugins/dynamix/include/DefaultPageLayout.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 26ca3abb6..10c618029 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -51,11 +51,11 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 <style>
 <?if (empty($display['width'])):?>
 @media (max-width:1280px){#displaybox{min-width:1260px;max-width:1260px;margin:0}}
-@media (min-width:1281px){#displaybox{min-width:1260px;margin:0 10px}}
+@media (min-width:1281px){#displaybox{min-width:1260px;margin:0 <?=$themes1?'10px':'auto'?>}}
 @media (min-width:1921px){#displaybox{min-width:1260px;max-width:1920px;margin:0 auto}}
 <?else:?>
 @media (max-width:1280px){#displaybox{margin:0}}
-@media (min-width:1281px){#displaybox{margin:0 10px}}
+@media (min-width:1281px){#displaybox{margin:0 <?=$themes1?'10px':'auto'?>}}
 @media (min-width:1921px){#displaybox{margin:0 <?=$themes1?'20px':'auto'?>}
 <?endif;?>
 <?if ($display['font']):?>

From 0669cacb6af771170e9c66989552ee58c864913a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 12:32:49 +0100
Subject: [PATCH 246/266] Display settings: new setting "width"

---
 emhttp/plugins/dynamix/include/DefaultPageLayout.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 10c618029..6c568cde2 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -49,15 +49,9 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/defaultpagelayout.css")?>">
 
 <style>
-<?if (empty($display['width'])):?>
-@media (max-width:1280px){#displaybox{min-width:1260px;max-width:1260px;margin:0}}
+@media (max-width:1280px){#displaybox{min-width:1260px;margin:0}}
 @media (min-width:1281px){#displaybox{min-width:1260px;margin:0 <?=$themes1?'10px':'auto'?>}}
-@media (min-width:1921px){#displaybox{min-width:1260px;max-width:1920px;margin:0 auto}}
-<?else:?>
-@media (max-width:1280px){#displaybox{margin:0}}
-@media (min-width:1281px){#displaybox{margin:0 <?=$themes1?'10px':'auto'?>}}
-@media (min-width:1921px){#displaybox{margin:0 <?=$themes1?'20px':'auto'?>}
-<?endif;?>
+@media (min-width:1921px){#displaybox{min-width:1260px;<?=empty($display['width'])?'max-width:1920px;':''?>margin:0 <?=$themes1?'20px':'auto'?>}}
 <?if ($display['font']):?>
 html{font-size:<?=$display['font']?>%}
 <?endif;?>

From bafcba3269c1077575a564dd1629af0d0f42e9dc Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 12:33:51 +0100
Subject: [PATCH 247/266] Display settings: new setting "width"

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

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 6c568cde2..1e0fb5fe8 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -49,7 +49,7 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/defaultpagelayout.css")?>">
 
 <style>
-@media (max-width:1280px){#displaybox{min-width:1260px;margin:0}}
+@media (max-width:1280px){#displaybox{min-width:1280px;margin:0}}
 @media (min-width:1281px){#displaybox{min-width:1260px;margin:0 <?=$themes1?'10px':'auto'?>}}
 @media (min-width:1921px){#displaybox{min-width:1260px;<?=empty($display['width'])?'max-width:1920px;':''?>margin:0 <?=$themes1?'20px':'auto'?>}}
 <?if ($display['font']):?>

From e848e346d11e5d0c5d09c7a46e3cab6d184473a3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 12:47:23 +0100
Subject: [PATCH 248/266] Display settings: new setting "width"

---
 emhttp/plugins/dynamix/include/DefaultPageLayout.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 1e0fb5fe8..792760dd6 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -49,9 +49,15 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/defaultpagelayout.css")?>">
 
 <style>
-@media (max-width:1280px){#displaybox{min-width:1280px;margin:0}}
-@media (min-width:1281px){#displaybox{min-width:1260px;margin:0 <?=$themes1?'10px':'auto'?>}}
-@media (min-width:1921px){#displaybox{min-width:1260px;<?=empty($display['width'])?'max-width:1920px;':''?>margin:0 <?=$themes1?'20px':'auto'?>}}
+<?if (empty($display['width'])):?>
+@media (max-width:1280px){#displaybox{min-width:1280px;max-width:1280px;margin:0}}
+@media (min-width:1281px){#displaybox{min-width:1280px;margin:0 <?=$themes1?'10px':'auto'?>}}
+@media (min-width:1921px){#displaybox{min-width:1280px;max-width:1920px;margin:0 auto}}
+<?else:?>
+@media (max-width:1280px){#displaybox{min-width:1280px;max-width:1280px;margin:0}}
+@media (min-width:1281px){#displaybox{min-width:1280px;margin:0 <?=$themes1?'10px':'auto'?>}}
+@media (min-width:1921px){#displaybox{min-width:1280px;margin:0 <?=$themes1?'20px':'auto'?>}
+<?endif;?>
 <?if ($display['font']):?>
 html{font-size:<?=$display['font']?>%}
 <?endif;?>

From c10f57d7d5a256996a113224aca8a4e2d054712b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 12:49:46 +0100
Subject: [PATCH 249/266] Display settings: new setting "width"

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

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 792760dd6..4627f8c24 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -56,7 +56,7 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 <?else:?>
 @media (max-width:1280px){#displaybox{min-width:1280px;max-width:1280px;margin:0}}
 @media (min-width:1281px){#displaybox{min-width:1280px;margin:0 <?=$themes1?'10px':'auto'?>}}
-@media (min-width:1921px){#displaybox{min-width:1280px;margin:0 <?=$themes1?'20px':'auto'?>}
+@media (min-width:1921px){#displaybox{min-width:1280px;margin:0 <?=$themes1?'20px':'auto'?>}}
 <?endif;?>
 <?if ($display['font']):?>
 html{font-size:<?=$display['font']?>%}

From 247786bc5cfbe666477f00b667b65b4201e5deae Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 12:51:47 +0100
Subject: [PATCH 250/266] Display settings: new setting "width"

---
 emhttp/plugins/dynamix/include/DefaultPageLayout.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 4627f8c24..1eb616ff7 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -51,10 +51,10 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 <style>
 <?if (empty($display['width'])):?>
 @media (max-width:1280px){#displaybox{min-width:1280px;max-width:1280px;margin:0}}
-@media (min-width:1281px){#displaybox{min-width:1280px;margin:0 <?=$themes1?'10px':'auto'?>}}
+@media (min-width:1281px){#displaybox{min-width:1280px;max-width:1920px;margin:0 <?=$themes1?'10px':'auto'?>}}
 @media (min-width:1921px){#displaybox{min-width:1280px;max-width:1920px;margin:0 auto}}
 <?else:?>
-@media (max-width:1280px){#displaybox{min-width:1280px;max-width:1280px;margin:0}}
+@media (max-width:1280px){#displaybox{min-width:1280px;margin:0}}
 @media (min-width:1281px){#displaybox{min-width:1280px;margin:0 <?=$themes1?'10px':'auto'?>}}
 @media (min-width:1921px){#displaybox{min-width:1280px;margin:0 <?=$themes1?'20px':'auto'?>}}
 <?endif;?>

From ea6500ae356802c90d06f1343cf1a4acb7dd7268 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 5 Nov 2023 14:02:38 +0000
Subject: [PATCH 251/266] Add timer support

---
 .../dynamix.vm.manager/include/libvirt.php    |  38 +++++++
 .../include/libvirt_helpers.php               |  63 ++++++++++-
 .../templates/Custom.form.php                 | 105 +++++++++++++++---
 3 files changed, 187 insertions(+), 19 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index ec996fc28..1c93a863d 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -281,6 +281,7 @@
 			$pciboot = $config['pciboot'];
 			$audios = $config['audio'];
 			$template = $config['template'];
+			$clocks = $config['clock'];
 
 			$type = $domain['type'];
 			$name = $domain['name'];
@@ -442,6 +443,7 @@
 					break;
 			}
 
+			/*
 			if ($os_type == "windows") $hypervclock = "<timer name='hypervclock' present='yes'/>" ; else $hypervclock = "" ;
 
 			$clock = "<clock offset='" . $domain['clock'] . "'>
@@ -465,6 +467,42 @@
 							<timer name='hpet' present='no'/>
 						</clock>";
 			}
+			*/
+
+			$clock = "<clock offset='" . $domain['clock'] . "'>" ;
+            foreach ($clocks as $clockname => $clockvalues) { 
+				switch ($clockname){
+					case "rtc":
+						if ($clockvalues['present'] == "yes") $clock .= "<timer name='rtc' tickpolicy='{$clockvalues['tickpolicy']}'/>";
+						break ;
+					case "pit":
+						if ($clockvalues['present'] == "yes") $clock .= "<timer name='pit' tickpolicy='{$clockvalues['tickpolicy']}'/>";
+						break ;
+					case "hpet":
+						$clock .= "<timer name='hpet' present='{$clockvalues['present']}'/>" ;
+						break ;
+					case "hypervclock":
+						$clock .= "<timer name='hypervclock' present='{$clockvalues['present']}'/>" ;
+						break ;
+            	}
+			}
+			$hyperv = "" ;
+			if ($domain['hyperv'] == 1 && $os_type == "windows") {
+				$hyperv = "<hyperv>
+							<relaxed state='on'/>
+							<vapic state='on'/>
+							<spinlocks state='on' retries='8191'/>
+							<vendor_id state='on' value='none'/>
+						";
+
+						if ($clocks['hypervclock']['present'] == "yes") 
+						$hyperv .= "<vpindex state='on'/><synic state='on'/><stimer state='on'/>" ;
+						$hyperv .="</hyperv>";
+				#$clock = "<clock offset='" . $domain['clock'] . "'>
+				#			<timer name='hypervclock' present='yes'/>
+				#			<timer name='hpet' present='no'/>";
+			}
+			$clock .= "</clock>" ;
 
 			$usbstr = '';
 			if (!empty($usb)) {
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index ef047fb22..1c6a33402 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -650,6 +650,64 @@ private static $encoding = 'UTF-8';
 		]
 	];}
 
+	$arrDefaultClocks = [
+		"windows" => [ 
+			"hpet" => [
+				"present" => "no",
+				"tickpolicy" => "delay"
+			],
+			"hypervclock" => [
+				"present" => "yes",
+				"tickpolicy" => "delay"
+			],
+			"pit" => [
+				"present" => "yes",
+				"tickpolicy" => "delay"
+			],
+			"rtc" => [
+				"present" => "yes",
+				"tickpolicy" => "catchup"
+			]
+		], 
+		"hyperv" => [ 
+			"hpet" => [
+				"present" => "no",
+				"tickpolicy" => "delay"
+			],
+			"hypervclock" => [
+				"present" => "yes",
+				"tickpolicy" => "delay"
+			],
+			"pit" => [
+				"present" => "no",
+				"tickpolicy" => "delay"
+			],
+			"rtc" => [
+				"present" => "no",
+				"tickpolicy" => "catchup"
+			]
+		] ,
+		"other" => [ 
+			"hpet" => [
+				"present" => "no",
+				"tickpolicy" => "delay"
+			],
+			"hypervclock" => [
+				"present" => "no",
+				"tickpolicy" => "delay"
+			],
+			"pit" => [
+				"present" => "yes",
+				"tickpolicy" => "delay"
+			],
+			"rtc" => [
+				"present" => "yes",
+				"tickpolicy" => "catchup"
+			]
+		]
+	] ;
+
+
 	// Read configuration file (guaranteed to exist)
 	$domain_cfgfile = "/boot/config/domain.cfg";
 	$domain_cfg = parse_ini_file($domain_cfgfile);
@@ -1351,7 +1409,7 @@ private static $encoding = 'UTF-8';
 			foreach ($old['devices']['disk'] as $k => $d) if ($source==$d['source']['@attributes']['file']) $new['devices']['disk'][$key]['driver']['@attributes'] = $d['driver']['@attributes'];
 		}
 		// settings not in the GUI, but maybe customized
-		unset($new['clock']);
+		unset($old['clock']);
 		// preserve vnc/spice port settings
 		// unset($new['devices']['graphics']['@attributes']['port'],$new['devices']['graphics']['@attributes']['autoport']);
 		if (!$new['devices']['graphics']) unset($old['devices']['graphics']);
@@ -1454,7 +1512,6 @@ private static $encoding = 'UTF-8';
 		$clocks = new SimpleXMLElement($xml);
 		$clocks = json_decode(json_encode($clocks->clock),true) ;
 		$arrClocks = [
-			"offset" => $clocks['@attributes']['offset'] ,
 			"hpet" => [
 				"present" => "no",
 				"tickpolicy" => "delay"
@@ -1477,7 +1534,7 @@ private static $encoding = 'UTF-8';
 			$tickpolicy = $timer["@attributes"]["tickpolicy"] ;
 			$present = $timer["@attributes"]["present"] ;
 			if (isset($present)) $arrClocks[$name]['present'] = $present ;
-			if (isset($tickpolicy)) $arrClocks[$name]['tickpolicy'] = $tickpolicy ; 
+			if (isset($tickpolicy)) { $arrClocks[$name]['tickpolicy'] = $tickpolicy ; $arrClocks[$name]['present'] = 'yes' ; }
 		}
 		return json_encode($arrClocks) ;
 	}
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 8b8129422..d0f3138b4 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -275,6 +275,11 @@
 		$arrConfig['template']['os'] = ($arrConfig['domain']['clock']=='localtime' ? 'windows' : 'linux');
 	}
 	$os_type = ((empty($arrConfig['template']['os']) || stripos($arrConfig['template']['os'], 'windows') === false) ? 'other' : 'windows');
+	if (isset($arrConfig['clocks'])) $arrClocks = json_decode($arrConfig['clocks'],true) ; else {
+		if ($os_type == "windows") {
+			if ($arrConfig['domain']['hyperv'] == 1) $arrClocks = $arrDefaultClocks['hyperv'] ; else $arrClocks = $arrDefaultClocks['windows'] ;
+		} else $arrClocks = $arrDefaultClocks['other'] ;
+	}
 ?>
 
 <link rel="stylesheet" href="<?autov('/plugins/dynamix.vm.manager/scripts/codemirror/lib/codemirror.css')?>">
@@ -288,11 +293,9 @@
 <input type="hidden" name="template[os]" id="template_os" value="<?=htmlspecialchars($arrConfig['template']['os'])?>">
 <input type="hidden" name="domain[persistent]" value="<?=htmlspecialchars($arrConfig['domain']['persistent'])?>">
 <input type="hidden" name="domain[uuid]" value="<?=htmlspecialchars($arrConfig['domain']['uuid'])?>">
-<input type="hidden" name="domain[clock]" id="domain_clock" value="<?=htmlspecialchars($arrConfig['domain']['clock'])?>">
 <input type="hidden" name="domain[arch]" value="<?=htmlspecialchars($arrConfig['domain']['arch'])?>">
 <input type="hidden" name="domain[oldname]" id="domain_oldname" value="<?=htmlspecialchars($arrConfig['domain']['name'])?>">
 <input type="hidden" name="domain[memoryBacking]" id="domain_memorybacking" value="<?=htmlspecialchars($arrConfig['domain']['memoryBacking'])?>">
-<input type="hidden" name="clocks" value="<?=htmlspecialchars($arrConfig['clocks'])?>">
 
 	<table>
 		<tr>
@@ -1356,7 +1359,7 @@
 						<label for="usb<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="usb[]" id="usb<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if (count(array_filter($arrConfig['usb'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) echo 'checked="checked"';?>
 						/> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp <input type="checkbox" name="usbopt[<?=htmlspecialchars($arrDev['id'])?>]" id="usbopt<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if ($arrDev["startupPolicy"] =="optional") echo 'checked="checked"';?>/>&nbsp&nbsp&nbsp&nbsp&nbsp
 						<input type="number" size="5" maxlength="5" id="usbboot<?=$i?>" class="narrow bootorder" <?=$bootdisable?>  style="width: 50px;" name="usbboot[<?=htmlspecialchars($arrDev['id'])?>]"   title="_(Boot order)_"  value="<?=$arrDev['usbboot']?>" >
-						<?=htmlspecialchars($arrDev['name'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
+						<?=htmlspecialchars(substr($arrDev['name'],0,100))?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
 						<?
 						}
 					} else {
@@ -1418,19 +1421,7 @@
 		<p>Use boot order to set device as bootable and boot sequence. Only NVMe and Network devices (PCI types 0108 and 02xx) supported for boot order.</p>
 	</blockquote>
 
-	<table>
-		<tr>
-			<td>_(QEMU Command Line)_:</td>
-			<td>
-			<textarea id="qemucmdline" name="qemucmdline" rows=15 style="width: 850px"><?=htmlspecialchars($arrConfig['qemucmdline'])?></textarea></td></tr>
-			</td>
-		</tr>
-	</table>
-	<blockquote class="inline_help">
-		<p>If you need to add QEMU arguments to the XML</p>
-		Examples can be found on the Libvirt page => <a href="https://libvirt.org/kbase/qemu-passthrough-security.html "  target="_blank">https://libvirt.org/kbase/qemu-passthrough-security.html </a>
-		</p>
-	</blockquote>
+
 
 	<table>
 		<tr>
@@ -1454,6 +1445,78 @@
 		<p>Click Create to generate the vDisks and return to the Virtual Machines page where your new VM will be created.</p>
 	</blockquote>
 	<?}?>
+
+	<table>
+	<tr>
+	<td></td>	<td>_(Advanced tuning options)_</td></tr>
+		<tr>
+			<td>_(QEMU Command Line)_:</td>
+			<?
+				if ($arrConfig['qemucmdline'] == "") $qemurows = 2 ; else $qemurows = 15 ;
+				?>
+			<td>
+			<textarea id="qemucmdline" name="qemucmdline" rows=<?=$qemurows?> style="width: 850px" onchange="QEMUChgCmd(this)"><?=htmlspecialchars($arrConfig['qemucmdline'])?> </textarea></td></tr>
+			</td>
+		</tr>
+	</table>
+	<blockquote class="inline_help">
+		<p>If you need to add QEMU arguments to the XML</p>
+		Examples can be found on the Libvirt page => <a href="https://libvirt.org/kbase/qemu-passthrough-security.html "  target="_blank">https://libvirt.org/kbase/qemu-passthrough-security.html </a>
+		</p>
+	</blockquote>
+
+	<table class="timers">
+		<tr><td></td><td>_(Clocks)_</td></tr>
+		<tr><td>_(Clocks Offset)_:<?=$arrConfig['domain']['clock']?></td>
+		<td>
+			<?$clockdisabled = "" ;?>
+			<select name="domain[clock]" <?=$clockdisabled?> id="clockoffset" class="narrow" title="_(Clock Offset)_" <?=$arrConfig["domain"]['clock']?>> 
+				<?
+					echo mk_option($arrConfig['domain']['clock'], 'localtime', 'Localtime');
+					echo mk_option($arrConfig['domain']['clock'], 'utc', "UTC");
+				?>
+				</select>
+			</td>
+		</tr>
+					<?$clockcount = 0 ;
+					if (!empty($arrClocks)) {
+						foreach($arrClocks as $i => $arrTimer) {
+							if ($i =="offset") continue ;
+							if ($clockcount == 0)  $clocksourcetext = _("Clocks Source").":" ;else $clocksourcetext = "" ;
+					?>
+		<tr><td><?=$clocksourcetext?></td>
+		<td>
+						<span class="narrow" style="width: 50px"><?=ucfirst($i)?></span></td><td>
+						<span class="narrow" style="width: 50px">_(Present)_:</span>
+						<select name="clock[<?=$i?>][present]" <?=$clockdisabled?>  id="clock[<?=$i?>]['present']" class="narrow" title="_(Clock Offset)_" <?=$arrTimer["present"]?>> 
+						<?
+							echo mk_option($arrTimer["present"], 'yes', 'Yes');
+							echo mk_option($arrTimer["present"], 'no', "No");
+						?>
+						</select></td><td>
+						<span class="narrow" style="width: 50px">_(Tickpolicy)_:</span>
+						<select name="clock[<?=$i?>][tickpolicy]" <?=$clockdisabled?>  id="clock[<?=$i?>]['tickpolicy']" class="narrow" title="_(Clock Offset)_" <?=$arrTimer["tickpolicy"]?>> 
+						<?
+							echo mk_option($arrTimer["tickpolicy"], 'delay', 'Delay');
+							echo mk_option($arrTimer["tickpolicy"], 'catchup', 'Catchup');
+							echo mk_option($arrTimer["tickpolicy"], 'merge', "Merge");
+							echo mk_option($arrTimer["tickpolicy"], 'discard', "Discard");
+						?>
+						</select>
+						</td></tr>
+						<?
+							$clockcount++ ;
+						}
+					}
+					?>
+			</td>
+		</tr>
+	</table>
+	<blockquote class="inline_help">
+		<p>Allows setting of timers and offset into the XML</p>
+		Details can be found on the Libvirt XML page => <a href="https://libvirt.org/formatdomain.html#id25"  target="_blank">https://libvirt.org/formatdomain.html#id25 </a>
+		</p>
+	</blockquote>
 </div>
 
 <div class="xmlview">
@@ -1526,6 +1589,15 @@ function BIOSChange(bios) {
 		}
 }
 
+function QEMUChgCmd(qemu) {
+		var value = qemu.value;
+		if (value != "") {
+			document.getElementById("qemucmdline").setAttribute("rows","15");
+		} else {
+			document.getElementById("qemucmdline").setAttribute("rows","2");
+		}
+}
+
 function SetBootorderfields(usbbootvalue) {
 	var bootelements = document.getElementsByClassName("bootorder");
 	for(var i = 0; i < bootelements.length; i++) {
@@ -2043,6 +2115,7 @@ $(function() {
 		});
 	} else {
 		$('#vmform #domain_clock').val('utc');
+		$('#vmform #clockoffset').val('utc');
 		$("#vmform #domain_machine option").each(function(){
 			if ($(this).val().indexOf('q35') != -1) {
 				$('#vmform #domain_machine').val($(this).val()).change();

From 9c4517df5857a6d183439fb79bf561341194cce1 Mon Sep 17 00:00:00 2001
From: Squidly271 <unraidsquid@gmail.com>
Date: Sun, 5 Nov 2023 09:25:36 -0500
Subject: [PATCH 252/266] Unlimitied Width Plugin Obsolete

Rendered obsolete by https://github.com/unraid/webgui/pull/1493

Finally :)
---
 etc/rc.d/rc.local | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/rc.d/rc.local b/etc/rc.d/rc.local
index 9724ca99e..b841af7cc 100755
--- a/etc/rc.d/rc.local
+++ b/etc/rc.d/rc.local
@@ -64,7 +64,7 @@ rm -f /boot/plugins/unRAIDServer.plg
 rm -f $CONFIG/plugins/unRAIDServer.plg
 
 # These plugins are now integrated in the OS or obsolete and may interfere
-OBSOLETE="vfio.pci dynamix.wireguard dynamix.ssd.trim dynamix.file.manager gui.search"
+OBSOLETE="vfio.pci dynamix.wireguard dynamix.ssd.trim dynamix.file.manager gui.search unlimited-width"
 for PLUGIN in $OBSOLETE; do
   if [[ -e $CONFIG/plugins/$PLUGIN.plg ]]; then
     log "moving obsolete plugin $PLUGIN.plg to $CONFIG/plugins-error"

From 8f1fa9de6d39c1fdab09798499ab62b25ab2b3d3 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 5 Nov 2023 15:45:33 +0000
Subject: [PATCH 253/266] Change timer defaults for new VM if hyperv changes

---
 .../templates/Custom.form.php                 | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index d0f3138b4..394fe0265 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -514,7 +514,7 @@
 		<tr class="advanced">
 			<td>_(Hyper-V)_:</td>
 			<td>
-				<select name="domain[hyperv]" id="hyperv" class="narrow" title="_(Hyperv tweaks for Windows)_">
+				<select name="domain[hyperv]" id="hyperv" class="narrow" title="_(Hyperv tweaks for Windows)_" 	<?if ($boolNew && $os_type == "windows"):?> onchange="HypervChgNew(this)" <?endif?>>
 				<?mk_dropdown_options([_('No'), _('Yes')], $arrConfig['domain']['hyperv']);?>
 				</select>
 			</td>
@@ -1488,14 +1488,14 @@
 		<td>
 						<span class="narrow" style="width: 50px"><?=ucfirst($i)?></span></td><td>
 						<span class="narrow" style="width: 50px">_(Present)_:</span>
-						<select name="clock[<?=$i?>][present]" <?=$clockdisabled?>  id="clock[<?=$i?>]['present']" class="narrow" title="_(Clock Offset)_" <?=$arrTimer["present"]?>> 
+						<select name="clock[<?=$i?>][present]" <?=$clockdisabled?>  id="clock[<?=$i?>][present]" class="narrow" title="_(Clock Offset)_" <?=$arrTimer["present"]?>> 
 						<?
 							echo mk_option($arrTimer["present"], 'yes', 'Yes');
 							echo mk_option($arrTimer["present"], 'no', "No");
 						?>
 						</select></td><td>
 						<span class="narrow" style="width: 50px">_(Tickpolicy)_:</span>
-						<select name="clock[<?=$i?>][tickpolicy]" <?=$clockdisabled?>  id="clock[<?=$i?>]['tickpolicy']" class="narrow" title="_(Clock Offset)_" <?=$arrTimer["tickpolicy"]?>> 
+						<select name="clock[<?=$i?>][tickpolicy]" <?=$clockdisabled?>  id="clock[<?=$i?>][tickpolicy]" class="narrow" title="_(Clock Offset)_" <?=$arrTimer["tickpolicy"]?>> 
 						<?
 							echo mk_option($arrTimer["tickpolicy"], 'delay', 'Delay');
 							echo mk_option($arrTimer["tickpolicy"], 'catchup', 'Catchup');
@@ -1598,6 +1598,19 @@ function QEMUChgCmd(qemu) {
 		}
 }
 
+function HypervChgNew(hyperv) {
+		var value = hyperv.value;
+		if (value == "0") {
+			var clockdefault = "windows" ;
+			document.getElementById("clock[rtc][present]").value = "<?=$arrDefaultClocks['windows']['rtc']['present']?>" ;
+			document.getElementById("clock[pit][present]").value = "<?=$arrDefaultClocks['windows']['pit']['present']?>" ;
+		} else {
+			var clockdefault = "hyperv" ;
+			document.getElementById("clock[rtc][present]").value = "<?=$arrDefaultClocks['hyperv']['rtc']['present']?>" ;
+			document.getElementById("clock[pit][present]").value = "<?=$arrDefaultClocks['hyperv']['pit']['present']?>";
+		}
+}
+
 function SetBootorderfields(usbbootvalue) {
 	var bootelements = document.getElementsByClassName("bootorder");
 	for(var i = 0; i < bootelements.length; i++) {

From 108c27c8ad90c189a16e44b91b7a8ec4d769c645 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 5 Nov 2023 16:29:00 +0000
Subject: [PATCH 254/266] Code clean up and second set of buttons after
 advanced options

---
 .../dynamix.vm.manager/include/libvirt.php    |  4 ++--
 .../templates/Custom.form.php                 | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index 1c93a863d..9a625ebac 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -470,7 +470,7 @@
 			*/
 
 			$clock = "<clock offset='" . $domain['clock'] . "'>" ;
-            foreach ($clocks as $clockname => $clockvalues) { 
+			foreach ($clocks as $clockname => $clockvalues) { 
 				switch ($clockname){
 					case "rtc":
 						if ($clockvalues['present'] == "yes") $clock .= "<timer name='rtc' tickpolicy='{$clockvalues['tickpolicy']}'/>";
@@ -484,7 +484,7 @@
 					case "hypervclock":
 						$clock .= "<timer name='hypervclock' present='{$clockvalues['present']}'/>" ;
 						break ;
-            	}
+				}
 			}
 			$hyperv = "" ;
 			if ($domain['hyperv'] == 1 && $os_type == "windows") {
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 394fe0265..5b9472311 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1517,6 +1517,29 @@
 		Details can be found on the Libvirt XML page => <a href="https://libvirt.org/formatdomain.html#id25"  target="_blank">https://libvirt.org/formatdomain.html#id25 </a>
 		</p>
 	</blockquote>
+
+	<table>
+		<tr>
+			<td></td>
+			<td>
+			<?if (!$boolNew) {?>
+				<input type="hidden" name="updatevm" value="1" />
+				<input type="button" value="_(Update)_" busyvalue="_(Updating)_..." readyvalue="_(Update)_" id="btnSubmit" />
+			<?} else {?>
+				<label for="domain_start"><input type="checkbox" name="domain[startnow]" id="domain_start" value="1" checked="checked"/> _(Start VM after creation)_</label>
+				<br>
+				<input type="hidden" name="createvm" value="1" />
+				<input type="button" value="_(Create)_" busyvalue="_(Creating)_..." readyvalue="_(Create)_" id="btnSubmit" />
+			<?}?>
+				<input type="button" value="_(Cancel)_" id="btnCancel" />
+			</td>
+		</tr>
+	</table>
+	<?if ($boolNew) {?>
+	<blockquote class="inline_help">
+		<p>Click Create to generate the vDisks and return to the Virtual Machines page where your new VM will be created.</p>
+	</blockquote>
+	<?}?>
 </div>
 
 <div class="xmlview">

From 7308a5b1fa2a666d350b864c4335b7970a11025f Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 5 Nov 2023 16:31:43 +0000
Subject: [PATCH 255/266] Remove duplicate startnow checkbox

---
 emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 5b9472311..0d89cdb9a 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1526,8 +1526,6 @@
 				<input type="hidden" name="updatevm" value="1" />
 				<input type="button" value="_(Update)_" busyvalue="_(Updating)_..." readyvalue="_(Update)_" id="btnSubmit" />
 			<?} else {?>
-				<label for="domain_start"><input type="checkbox" name="domain[startnow]" id="domain_start" value="1" checked="checked"/> _(Start VM after creation)_</label>
-				<br>
 				<input type="hidden" name="createvm" value="1" />
 				<input type="button" value="_(Create)_" busyvalue="_(Creating)_..." readyvalue="_(Create)_" id="btnSubmit" />
 			<?}?>

From 339f4145154a35a6672d17dcebeb96507cc2b14a Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 5 Nov 2023 16:58:55 +0000
Subject: [PATCH 256/266] remove testing code.

---
 emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 0d89cdb9a..ad6363ced 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1467,7 +1467,7 @@
 
 	<table class="timers">
 		<tr><td></td><td>_(Clocks)_</td></tr>
-		<tr><td>_(Clocks Offset)_:<?=$arrConfig['domain']['clock']?></td>
+		<tr><td>_(Clocks Offset)_:</td>
 		<td>
 			<?$clockdisabled = "" ;?>
 			<select name="domain[clock]" <?=$clockdisabled?> id="clockoffset" class="narrow" title="_(Clock Offset)_" <?=$arrConfig["domain"]['clock']?>> 

From 6c5f1f74380921d6e36553b11f3cb0aa2c7959c9 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 5 Nov 2023 21:14:27 +0100
Subject: [PATCH 257/266] Dashboard: set 5s lock when hovering over system
 resources

This prevents extensive cpu load when hovering over the bars
---
 emhttp/plugins/dynamix/DashStats.page | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 83eeb7850..6ff3b1108 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -1185,14 +1185,14 @@ function addProperties() {
     $(this).find('td:first').prepend("<i class='fa fa-fw fa-close control tile' onclick='dismiss($(this))' title=\"_(Close Tile)_\"></i>");
   });
   $('div.frame tr').attr('title','');
-  $('tr#var0').hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:0},function(val){$('.sys0').not('.head').text(val);})});
+  $('tr#var0').hover(function(){if(!timers.var0){$.post('/webGui/include/DashboardApps.php',{sys:0},function(val){$('.sys0').not('.head').text(val);timers.var0=setTimeout(function(){timers.var0=null},5000);});}});
 <?if ($zfs):?>
-  $('tr#var1').show().hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:1},function(val){$('.sys1').text(val);})});
+  $('tr#var1').show().hover(function(){if(!timers.var1){$.post('/webGui/include/DashboardApps.php',{sys:1},function(val){$('.sys1').text(val);timers.var1=setTimeout(function(){timers.var1=null},5000);});}});
 <?endif;?>
-  $('tr#var2').hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:2},function(val){$('.sys2').text(val);})});
-  $('tr#var3').hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:3},function(val){$('.sys3').text(val);})});
+  $('tr#var2').hover(function(){if(!timers.var2){$.post('/webGui/include/DashboardApps.php',{sys:2},function(val){$('.sys2').text(val);timers.var2=setTimeout(function(){timers.var2=null},5000);});}});
+  $('tr#var3').hover(function(){if(!timers.var3){$.post('/webGui/include/DashboardApps.php',{sys:3},function(val){$('.sys3').text(val);timers.var3=setTimeout(function(){timers.var3=null},5000);});}});
 <?if ($dockerd):?>
-  $('tr#var4').show().hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:4},function(val){$('.sys4').text(val);})});
+  $('tr#var4').show().hover(function(){if(!timers.var4){$.post('/webGui/include/DashboardApps.php',{sys:4},function(val){$('.sys4').text(val);timers.var4=setTimeout(function(){timers.var4=null},5000);});}});
 <?endif;?>
 }
 function showContent() {

From 78c0aab5a5cff7bc370c6c644eab3d0a6b60b3fb Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 5 Nov 2023 23:51:49 +0000
Subject: [PATCH 258/266] Update Libre and OpenELEC Templates.

---
 emhttp/plugins/dynamix.vm.manager/templates/LibreELEC.form.php | 2 ++
 emhttp/plugins/dynamix.vm.manager/templates/OpenELEC.form.php  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/emhttp/plugins/dynamix.vm.manager/templates/LibreELEC.form.php b/emhttp/plugins/dynamix.vm.manager/templates/LibreELEC.form.php
index 7a95546a0..88556695d 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/LibreELEC.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/LibreELEC.form.php
@@ -293,6 +293,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 			if (isset($_POST['shares'][0]['source'])) {
 				@mkdir($_POST['shares'][0]['source'], 0777, true);
 			}
+			$_POST['clock'] = $arrDefaultClocks["other"] ;
 			if ($lv->domain_new($_POST)){
 				$reply = ['success' => true];
 			} else {
@@ -376,6 +377,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 			if (isset($_POST['shares'][0]['source'])) {
 				@mkdir($_POST['shares'][0]['source'], 0777, true);
 			}
+			$_POST['clock'] = $arrDefaultClocks["other"] ;
 			$arrExistingConfig = custom::createArray('domain',$strXML);
 			$arrUpdatedConfig = custom::createArray('domain',$lv->config_to_xml($_POST));
 			array_update_recursive($arrExistingConfig, $arrUpdatedConfig);
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/OpenELEC.form.php b/emhttp/plugins/dynamix.vm.manager/templates/OpenELEC.form.php
index a476296bb..ce5bbddce 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/OpenELEC.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/OpenELEC.form.php
@@ -292,6 +292,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 			if (isset($_POST['shares'][0]['source'])) {
 				@mkdir($_POST['shares'][0]['source'], 0777, true);
 			}
+			$_POST['clock'] = $arrDefaultClocks["other"] ;
 			if ($lv->domain_new($_POST)){
 				$reply = ['success' => true];
 			} else {
@@ -375,6 +376,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
 			if (isset($_POST['shares'][0]['source'])) {
 				@mkdir($_POST['shares'][0]['source'], 0777, true);
 			}
+			$_POST['clock'] = $arrDefaultClocks["other"] ;
 			$arrExistingConfig = custom::createArray('domain',$strXML);
 			$arrUpdatedConfig = custom::createArray('domain',$lv->config_to_xml($_POST));
 			array_update_recursive($arrExistingConfig, $arrUpdatedConfig);

From 52b0358e099d1fdd6c0f53f1005254c04e5db640 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:23:50 +0100
Subject: [PATCH 259/266] Dashboard: set 3s lock when hovering over system
 resources

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

diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 6ff3b1108..6a6975b70 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -1185,14 +1185,14 @@ function addProperties() {
     $(this).find('td:first').prepend("<i class='fa fa-fw fa-close control tile' onclick='dismiss($(this))' title=\"_(Close Tile)_\"></i>");
   });
   $('div.frame tr').attr('title','');
-  $('tr#var0').hover(function(){if(!timers.var0){$.post('/webGui/include/DashboardApps.php',{sys:0},function(val){$('.sys0').not('.head').text(val);timers.var0=setTimeout(function(){timers.var0=null},5000);});}});
+  $('tr#var0').hover(function(){if(!timers.var0){timers.var0=setTimeout(function(){timers.var0=null},3000);$.post('/webGui/include/DashboardApps.php',{sys:0},function(val){$('.sys0').not('.head').text(val);});}});
 <?if ($zfs):?>
-  $('tr#var1').show().hover(function(){if(!timers.var1){$.post('/webGui/include/DashboardApps.php',{sys:1},function(val){$('.sys1').text(val);timers.var1=setTimeout(function(){timers.var1=null},5000);});}});
+  $('tr#var1').show().hover(function(){if(!timers.var1){timers.var1=setTimeout(function(){timers.var1=null},3000);$.post('/webGui/include/DashboardApps.php',{sys:1},function(val){$('.sys1').text(val);});}});
 <?endif;?>
-  $('tr#var2').hover(function(){if(!timers.var2){$.post('/webGui/include/DashboardApps.php',{sys:2},function(val){$('.sys2').text(val);timers.var2=setTimeout(function(){timers.var2=null},5000);});}});
-  $('tr#var3').hover(function(){if(!timers.var3){$.post('/webGui/include/DashboardApps.php',{sys:3},function(val){$('.sys3').text(val);timers.var3=setTimeout(function(){timers.var3=null},5000);});}});
+  $('tr#var2').hover(function(){if(!timers.var2){timers.var2=setTimeout(function(){timers.var2=null},3000);$.post('/webGui/include/DashboardApps.php',{sys:2},function(val){$('.sys2').text(val);});}});
+  $('tr#var3').hover(function(){if(!timers.var3){timers.var3=setTimeout(function(){timers.var3=null},3000);$.post('/webGui/include/DashboardApps.php',{sys:3},function(val){$('.sys3').text(val);});}});
 <?if ($dockerd):?>
-  $('tr#var4').show().hover(function(){if(!timers.var4){$.post('/webGui/include/DashboardApps.php',{sys:4},function(val){$('.sys4').text(val);timers.var4=setTimeout(function(){timers.var4=null},5000);});}});
+  $('tr#var4').show().hover(function(){if(!timers.var4){timers.var4=setTimeout(function(){timers.var4=null},3000);$.post('/webGui/include/DashboardApps.php',{sys:4},function(val){$('.sys4').text(val);});}});
 <?endif;?>
 }
 function showContent() {

From 67a998c8b26f03233b5fc5a414c3d8ad326f464a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:33:07 +0100
Subject: [PATCH 260/266] VMs: change icon to open circle

---
 emhttp/plugins/dynamix.vm.manager/include/VMMachines.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
index ca365da83..e82f84573 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
@@ -185,7 +185,7 @@ foreach ($vms as $vm) {
 
   $changemedia = "getisoimageboth(\"{$uuid}\",\"hda\",\"{$cdbus}\",\"{$cdfile}\",\"hdb\",\"{$cdbus2}\",\"{$cdfile2}\")";
   $title = _('Select ISO image');
-  $cdstr = $cdromcount." / 2<a class='hand' title='$title' href='#' onclick='$changemedia'><i class='fa fa-floppy-o'></i></a>";
+  $cdstr = $cdromcount." / 2<a class='hand' title='$title' href='#' onclick='$changemedia'><i class='fa fa-circle-o'></i></a>";
   echo "<tr parent-id='$i' class='sortable'><td class='vm-name' style='width:220px;padding:8px'><i class='fa fa-arrows-v mover orange-text'></i>";
   echo "<span class='outer'><span id='vm-$uuid' $menu class='hand'>$image</span><span class='inner'><a href='#' onclick='return toggle_id(\"name-$i\")' title='click for more VM info'>$vm</a><br><i class='fa fa-$shape $status $color'></i><span class='state'>"._($status)." $snapshotstcount</span></span></span></td>";
   echo "<td>$desc</td>";
@@ -248,7 +248,7 @@ foreach ($vms as $vm) {
       $title = _('Insert CD');
       $changemedia = "changemedia(\"{$uuid}\",\"{$dev}\",\"{$bus}\",\"--select\")";
       $disk = _("No CD image inserted in to drive");
-      echo "<tr><td>$disk<a title='$title' href='#' onclick='$changemedia'><i class='fa fa-floppy-o'></i></a></td><td></td><td>$bus</td><td>$capacity</td><td>$allocation</td><td>$boot</td></tr>";
+      echo "<tr><td>$disk<a title='$title' href='#' onclick='$changemedia'><i class='fa fa-circle-o'></i></a></td><td></td><td>$bus</td><td>$capacity</td><td>$allocation</td><td>$boot</td></tr>";
     }
   }
   echo "</tbody>";

From 4d673a650b736367fe9fe391fc26698701884afa Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 6 Nov 2023 12:17:58 +0100
Subject: [PATCH 261/266] set-password: update mobile view

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

diff --git a/emhttp/plugins/dynamix/include/.set-password.php b/emhttp/plugins/dynamix/include/.set-password.php
index 80c51ae27..19978ca76 100644
--- a/emhttp/plugins/dynamix/include/.set-password.php
+++ b/emhttp/plugins/dynamix/include/.set-password.php
@@ -50,7 +50,7 @@ $THEME_DARK = in_array($display['theme'],['black','gray']);
     <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="Expires" content="0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1300">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="robots" content="noindex, nofollow">
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <meta name="referrer" content="same-origin">

From 05a98e4aefd48ae464fbb86369c3af1ab4f90415 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 6 Nov 2023 12:22:39 +0100
Subject: [PATCH 262/266] Dashboard: css update for themes gray / azure

Make 2 columns display fit on mobile devices
---
 emhttp/plugins/dynamix/sheets/DashStats-azure.css | 2 +-
 emhttp/plugins/dynamix/sheets/DashStats-gray.css  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/sheets/DashStats-azure.css b/emhttp/plugins/dynamix/sheets/DashStats-azure.css
index df98991be..91ba12a5f 100644
--- a/emhttp/plugins/dynamix/sheets/DashStats-azure.css
+++ b/emhttp/plugins/dynamix/sheets/DashStats-azure.css
@@ -1 +1 @@
-div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(580px,1fr));column-gap:20px}
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(570px,1fr));column-gap:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats-gray.css b/emhttp/plugins/dynamix/sheets/DashStats-gray.css
index df98991be..91ba12a5f 100644
--- a/emhttp/plugins/dynamix/sheets/DashStats-gray.css
+++ b/emhttp/plugins/dynamix/sheets/DashStats-gray.css
@@ -1 +1 @@
-div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(580px,1fr));column-gap:20px}
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(570px,1fr));column-gap:20px}

From 10e3f0b8f7dbe8f4d01c1ad28cb1a5b448a1a249 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 6 Nov 2023 12:47:53 +0100
Subject: [PATCH 263/266] Revert "Dashboard: css update for themes gray /
 azure"

This reverts commit 05a98e4aefd48ae464fbb86369c3af1ab4f90415.
---
 emhttp/plugins/dynamix/sheets/DashStats-azure.css | 2 +-
 emhttp/plugins/dynamix/sheets/DashStats-gray.css  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/sheets/DashStats-azure.css b/emhttp/plugins/dynamix/sheets/DashStats-azure.css
index 91ba12a5f..df98991be 100644
--- a/emhttp/plugins/dynamix/sheets/DashStats-azure.css
+++ b/emhttp/plugins/dynamix/sheets/DashStats-azure.css
@@ -1 +1 @@
-div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(570px,1fr));column-gap:20px}
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(580px,1fr));column-gap:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats-gray.css b/emhttp/plugins/dynamix/sheets/DashStats-gray.css
index 91ba12a5f..df98991be 100644
--- a/emhttp/plugins/dynamix/sheets/DashStats-gray.css
+++ b/emhttp/plugins/dynamix/sheets/DashStats-gray.css
@@ -1 +1 @@
-div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(570px,1fr));column-gap:20px}
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(580px,1fr));column-gap:20px}

From dbb42cdd1bda6ba448b3341a7a218054b0ddcec0 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 6 Nov 2023 12:52:05 +0100
Subject: [PATCH 264/266] css update for themes gray / azure

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

diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index ef617eec0..087872048 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -217,7 +217,7 @@ a.list{text-decoration:none;color:inherit}
 div.content{position:absolute;top:0;left:0;width:100%;padding-bottom:30px;z-index:-1;clear:both}
 div.content.shift{margin-top:1px}
 label+.content{margin-top:64px}
-div.tabs{position:relative;margin:110px 30px 30px 100px;background-color:#e4e2e4}
+div.tabs{position:relative;margin:110px 20px 30px 90px;background-color:#e4e2e4}
 div.tab{float:left;margin-top:23px}
 div.tab input[id^='tab']{display:none}
 div.tab [type=radio]+label:hover{cursor:pointer;border-color:#004e86;opacity:1}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index fbb81d713..bb4d9b89c 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -217,7 +217,7 @@ a.list{text-decoration:none;color:inherit}
 div.content{position:absolute;top:0;left:0;width:100%;padding-bottom:30px;z-index:-1;clear:both}
 div.content.shift{margin-top:1px}
 label+.content{margin-top:64px}
-div.tabs{position:relative;margin:110px 30px 30px 100px;background-color:#1b1d1b}
+div.tabs{position:relative;margin:110px 20px 30px 90px;background-color:#1b1d1b}
 div.tab{float:left;margin-top:23px}
 div.tab input[id^='tab']{display:none}
 div.tab [type=radio]+label:hover{cursor:pointer;border-color:#0072c6;opacity:1}

From baa1fa53278fe3c73790f0f99d9a9b7a79c59741 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Mon, 6 Nov 2023 21:49:24 +0000
Subject: [PATCH 265/266] Fix table spacing

---
 emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css        | 1 +
 emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css     | 1 +
 .../plugins/dynamix.vm.manager/templates/Custom.form.php  | 8 +++++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
index a2c0ae2b4..589202983 100644
--- a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
@@ -40,3 +40,4 @@ span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
 #vmform .disk_preview{display:inline-block;color:#BBB;transform:translate(0px, 1px)}
 i.fa-plus-circle,i.fa-minus-circle{margin-left:8px}
 input[type=checkbox]{margin-left:0}
+#vmform table.timers td.present {width:150px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
index a2c0ae2b4..589202983 100644
--- a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
@@ -40,3 +40,4 @@ span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
 #vmform .disk_preview{display:inline-block;color:#BBB;transform:translate(0px, 1px)}
 i.fa-plus-circle,i.fa-minus-circle{margin-left:8px}
 input[type=checkbox]{margin-left:0}
+#vmform table.timers td.present {width:150px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index ad6363ced..102e72c5d 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1486,14 +1486,16 @@
 					?>
 		<tr><td><?=$clocksourcetext?></td>
 		<td>
-						<span class="narrow" style="width: 50px"><?=ucfirst($i)?></span></td><td>
-						<span class="narrow" style="width: 50px">_(Present)_:</span>
+						<span class="narrow" style="width: 50px"><?=ucfirst($i)?>:</span></td>
+						<td class="present">
+						<span>_(Present)_:</span>
 						<select name="clock[<?=$i?>][present]" <?=$clockdisabled?>  id="clock[<?=$i?>][present]" class="narrow" title="_(Clock Offset)_" <?=$arrTimer["present"]?>> 
 						<?
 							echo mk_option($arrTimer["present"], 'yes', 'Yes');
 							echo mk_option($arrTimer["present"], 'no', "No");
 						?>
-						</select></td><td>
+						</select></td>
+						<td>
 						<span class="narrow" style="width: 50px">_(Tickpolicy)_:</span>
 						<select name="clock[<?=$i?>][tickpolicy]" <?=$clockdisabled?>  id="clock[<?=$i?>][tickpolicy]" class="narrow" title="_(Clock Offset)_" <?=$arrTimer["tickpolicy"]?>> 
 						<?

From 07176e8ff0f482d2fbc2b70390580d4158ac8d64 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Tue, 7 Nov 2023 07:44:46 +0000
Subject: [PATCH 266/266] Update helptext for timers

---
 .../dynamix.vm.manager/templates/Custom.form.php      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 102e72c5d..008b987ed 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1482,7 +1482,7 @@
 					if (!empty($arrClocks)) {
 						foreach($arrClocks as $i => $arrTimer) {
 							if ($i =="offset") continue ;
-							if ($clockcount == 0)  $clocksourcetext = _("Clocks Source").":" ;else $clocksourcetext = "" ;
+							if ($clockcount == 0)  $clocksourcetext = _("Timer Source").":" ;else $clocksourcetext = "" ;
 					?>
 		<tr><td><?=$clocksourcetext?></td>
 		<td>
@@ -1515,8 +1515,13 @@
 		</tr>
 	</table>
 	<blockquote class="inline_help">
-		<p>Allows setting of timers and offset into the XML</p>
-		Details can be found on the Libvirt XML page => <a href="https://libvirt.org/formatdomain.html#id25"  target="_blank">https://libvirt.org/formatdomain.html#id25 </a>
+		<p>Allows setting of timers and offset into the XML You should not need to modify these values.</p>
+		<p>Windows tuning details can be found here <a href="https://forums.unraid.net/topic/134041-guide-optimizing-windows-vms-in-unraid/"  target="_blank">https://forums.unraid.net/topic/134041-guide-optimizing-windows-vms-in-unraid/ </a> </p>
+			<p>Details can be found on the Libvirt XML page => <a href="https://libvirt.org/formatdomain.html#time-keeping"  target="_blank">https://libvirt.org/formatdomain.html#time-keeping</a></p>
+			<p>Defaults are:	</p>
+			<p>linux Hpet:no Hypervclock: no Pit yes rtc yes tickpolicy catchup.	</p>
+			<p> Windows Hpet:no Hypervclock: yes Pit yes rtc yes tickpolicy catchup.	</p>
+			<p>Windows and Hyperv Hpet:no Hypervclock: yes Pit no rtc no.	</p>
 		</p>
 	</blockquote>