diff --git a/plugins/dynamix/VPNmanager.page b/plugins/dynamix/VPNmanager.page
deleted file mode 100644
index ee5113182..000000000
--- a/plugins/dynamix/VPNmanager.page
+++ /dev/null
@@ -1,5 +0,0 @@
-Menu="NetworkServices"
-Type="xmenu"
-Title="VPN Manager"
-Icon="icon-vpn"
-Tabs="false"
\ No newline at end of file
diff --git a/plugins/dynamix/WG0.page b/plugins/dynamix/WG0.page
deleted file mode 100644
index 0b9dd07b6..000000000
--- a/plugins/dynamix/WG0.page
+++ /dev/null
@@ -1,1508 +0,0 @@
-Menu="VPNmanager:100"
-Title="Tunnel wg0"
-Tag="icon-vpn"
----
-<?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.
- */
-?>
-<?
-$etc = '/etc/wireguard';
-$tmp = '/tmp/list.tmp';
-
-unset($subnets,$hosts,$subnets6,$hosts6,$vtuns,$macvlan,$docker);
-exec("ip -4 route show scope link|awk '/^[^d].+ dev (eth|br|bond)[0-9]+/{print \$1}'",$subnets);
-exec("ip -4 addr show scope global|awk '/inet .+ (eth|br|bond)[0-9]+/{split(\$2,ip,\"/\");print ip[1]}'",$hosts);
-exec("ip -6 route show type unicast|grep -Pv 'expires|shim-'|awk '/^[^dfm:]/{print \$1}'",$subnets6);
-exec("ip -6 addr show scope global|grep -PA2 ': (eth|br|bond)\d+'|awk '/inet6 .+ (global|noprefixroute) \$/{split(\$2,ip,\"/\");print ip[1]}'",$hosts6);
-exec("ls  --indicator-style=none $etc/wg*.conf*|grep -Po wg[0-9]+",$vtuns);
-exec("docker network ls --filter driver='macvlan' --format='{{.Name}}'",$macvlan);
-
-// add subnets defined in Docker custom networks
-exec("docker network inspect --format='{{range .IPAM.Config}}{{println .Subnet}}{{end}}' ".implode(' ',$macvlan),$docker);
-foreach (array_filter($docker) as $network) {
-  if (strpos($network,'.')!==false && !in_array($network,$subnets)) $subnets[] = $network;
-  elseif (strpos($network,':')!==false && !in_array($network,$subnets6)) $subnets6[] = $network;
-}
-
-$subnets = implode(', ',$subnets);
-$hosts = implode(', ',$hosts);
-$subnets6 = implode(', ',$subnets6);
-$hosts6 = implode(', ',$hosts6);
-
-function readConf(&$peer_wg,&$wg,$vtun) {
-  global $etc,$netbase,$netpool,$netbase6,$netpool6,$validIP4,$validIP6;
-  $conf = "$etc/$vtun.conf";
-  $cfg  = "$etc/$vtun.cfg";
-  $file = $vpn = false;
-  if (file_exists($conf) && filesize($conf)>0) {
-    $entries = array_filter(array_map('trim',preg_split('/\[(Interface|Peer)\]/',file_get_contents($conf))));
-    foreach ($entries as $key => $entry) {
-      $i = $key-1;
-      if ($i) $peer_wg[] = $i;
-      $rows = explode("\n",$entry);
-      foreach ($rows as $row) {
-        [$id,$data] = array_map('trim',explode('=',$row,2));
-        switch ($id) {
-        case 'PostUp':
-        case 'PostDown':
-          break;
-        case 'Address':
-          foreach (array_map('trim',explode(',',$data)) as $ip) {
-            if (strpos($ip,'.')!==false) $wg["Address:$i"] = $ip;
-            elseif (strpos($ip,':')!==false) $wg["Address6:$i"] = $ip;
-          }
-          break;
-        case 'Endpoint':
-          if ($data[0]=='[') {
-            [$ip,$port] = explode(']:',$data);
-            $ip = substr($ip,1);
-          } else {
-            [$ip,$port] = explode(':',$data);
-          }
-          $wg["Endpoint:$i"] = $ip;
-          $wg["ListenPort:$i"] = $port;
-          break;
-        default:
-          if ($id[0]=='#') $wg["Name:$i"] = substr($id,1); else $wg["$id:$i"] = $data;
-          break;
-        }
-      }
-    }
-    $file = true;
-  }
-  if (file_exists($cfg)) {
-    $more = parse_ini_file($cfg);
-    foreach ($more as $key => $data) {
-      [$id,$i] = explode(':',$key);
-      if ($id!='Address') continue;
-      switch ($more['PROT:0']) {
-      case '46':
-        [$ip4,$ip6] = array_map('trim',explode(',',$data));
-        $more[$key] = $ip4;
-        $more["Address6:$i"] = $ip6;
-        break;
-      case '6':
-        unset($more[$key]);
-        $more["Address6:$i"] = $data;
-        break;
-      }
-    }
-    $wg = array_merge($wg,$more);
-    [$subnet,$mask] = explode('/',$wg['Network:0']);
-    [$subnet6,$mask6] = explode('/',$wg['Network6:0']);
-    $netbase[$vtun] = ip2long($subnet) & (0x100000000-2**(32-$mask));
-    $netbase6[$vtun] = $subnet6 ?: $netpool6[$vtun];
-  } else {
-    $netbase[$vtun] = ip2long($netpool[$vtun]);
-    $netbase6[$vtun] = $netpool6[$vtun];
-  }
-  foreach ($peer_wg as $i) if ((int)$wg["TYPE:$i"]==7) {$vpn = true; break;}
-  return [$conf,$cfg,$file,$vpn];
-}
-$public    = strpos($_SERVER['HTTP_HOST'],'unraid.net')!==false && $remote['wanaccess']=='yes' ? (substr($_SERVER['HTTP_HOST'],0,4)!='www.'?'www.':'').explode(':',$_SERVER['HTTP_HOST'])[0] : '';
-$active    = (array)explode(' ',exec('wg show interfaces'));
-$autostart = (array)explode(' ',@file_get_contents("$etc/autostart"));
-$build     = false;
-$script    = "$docroot/webGui/scripts/upnp_port";
-$template  = "$docroot/webGui/WGX.page";
-$tower     = $var['NAME'];
-$server    = $eth0['IPADDR:0'];
-$server6   = $eth0['IPADDR6:0'];
-
-$link      = file_exists('/sys/class/net/br0') ? 'br0' : (file_exists('/sys/class/net/bond0') ? 'bond0' : 'eth0');
-$postUp0   = "$script add $link WireGuard-<wg> $server <port> <port> udp";
-$postUp1   = "logger -t wireguard 'Tunnel WireGuard-<wg> started'";
-$postUp2   = "iptables -t nat -A POSTROUTING -s <source> -o $link -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";
-$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'";
-$postDown2 = "iptables -t nat -D POSTROUTING -s <source> -o $link -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";
-$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");
-$validDNS  = "([0-9a-z]([0-9a-z\-]{0,61}[0-9a-z])?\.)+($tld)";
-$validIP4  = "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}";
-$validIP6  = "(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(:|([0-9a-fA-F]{1,4}:)+):(([0-9a-fA-F]{1,4}:)*[0-9a-fA-F]{1,4})?)";
-$maskIP4   = "([0-9]|[12][0-9]|3[0-2])?";
-$maskIP6   = "([0-9]|[1-9][[0-9]|1[01][0-9]|12[0-8])?";
-
-$validText = "^($validDNS|$validIP4|$validIP6)$";
-$validList = "^(($validIP4/?$maskIP4|$validIP6/?$maskIP6)(, *)?)+$";
-$validDNSServerList = "^(($validIP4|$validIP6)(, *)?)+$";
-$validname = "^[0-9a-zA-Z \-_]*$";
-
-$netbase   = $netpool = $netport = [];
-$netbase6  = $netpool6 = [];
-$check_wg0 = in_array('wg0',$active) ? 'true' : 'false';
-$start_wg0 = in_array('wg0',$autostart);
-$peer_wg0  = $wg0 = [];
-
-$netpool['wg0']  = '10.253.0.0';
-$netpool6['wg0'] = 'fc00:253:0:0::';
-$netport['wg0']  = 51820;
-
-// read current configuration
-[$conf_wg0, $cfg_wg0, $this_wg0, $vpn_wg0] = readConf($peer_wg0, $wg0, 'wg0');
-
-// gather IPv4 and IPv6 addresses for available interfaces
-$endpoints = [];
-$ethX = 'eth0';
-while (isset($$ethX)) {
-  if (!empty($$ethX['IPADDR:0']))  $endpoints[] = $$ethX['IPADDR:0'];
-  if (!empty($$eth0['IPADDR6:0'])) $endpoints[] = $$ethX['IPADDR6:0'];
-  $ethX = 'eth'.(substr($ethX,3)+1);
-}
-
-// remove obsolete tunnels
-foreach (glob("$docroot/webGui/WG[1-9]*.page",GLOB_NOSORT) as $wgX) {
-  if (!in_array(strtolower(basename($wgX,'.page')), $vtuns)) {
-    unlink($wgX);
-    $build = true;
-  }
-}
-// add additional tunnels
-foreach ($vtuns as $wgX) {
-  if ($wgX == 'wg0') continue;
-  $file = "$docroot/webGui/".strtoupper($wgX).".page";
-  if (!file_exists($file)) {
-    $X = filter_var($wgX,FILTER_SANITIZE_NUMBER_INT);
-    $nnn = 100 + $X;
-    copy($template, $file);
-    exec("sed -i 's/parentname:nnn/VPNmanager:$nnn/;s/XXX/$X/g;s/wgX/$wgX/g' $file");
-    chmod($file,0644);
-    $build = true;
-  }
-}
-?>
-<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):?>
-refresh();
-<?endif;?>
-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);}
-Array.prototype.bind     = function(w){return (this.join(';')).replace(/<WG>/g,w).replace(/,/g,';');}
-
-var xml = $.cookie('upnp')||'<?=@file_get_contents('/var/tmp/upnp')?>';
-var netbase = {}, netpool = {}, netport = {}, netbase6 = {}, netpool6 = {};
-
-netbase['wg0'] = <?=$netbase['wg0']?>;
-netpool['wg0'] = '<?=$netpool['wg0']?>';
-netport['wg0'] = '<?=$netport['wg0']?>';
-netbase6['wg0'] = '<?=$netbase6['wg0']?>';
-netpool6['wg0'] = '<?=$netpool6['wg0']?>';
-
-// polyfill to fix reportValidity() for Firefox
-if (!HTMLInputElement.prototype.reportValidity || (navigator.userAgent.indexOf("Firefox") !== -1)) {
-  HTMLInputElement.prototype.reportValidity = function () {
-    if (this.checkValidity()) {
-      return true;
-    } else {
-      var labelText = "_(Invalid data)_";
-      try {
-        labelText = $(this).closest('dl').children().first()[0].textContent;
-      } catch (err) { }
-      // the browser generates the validationMessage, we cannot translate it
-      swal({title:labelText,text:this.validationMessage,html:true,type:'error',confirmButtonText:"_(Ok)_"});
-      return false;
-    }
-  };
-}
-
-function ipv4(ip) {
-  return ip.indexOf('.')>0;
-}
-function ipv6(ip) {
-  return ip.indexOf(':')>0;
-}
-function ipset(ip) {
-  return ipv4(ip) ? ip : '['+ip+']';
-}
-function nodefault(ip) {
-  return ip != '0.0.0.0/0';
-}
-function nodefault6(ip) {
-  return ip != '::/0';
-}
-function validateForm(form,vtun) {
-  // this runs when the Apply button is clicked, before built-in form validation and before the form's onsubmit function
-  // if any fields do not pass basic validation, ensure they are visible then manually show the validation error
-  // this prevents validation errors on hidden fields
-  var isValid = true;
-  form.find('input').each(function(){
-    var i = this.name.match(/.*:(\d+)/) ? this.name.match(/.*:(\d+)/)[1] : -1;
-    if (i > -1 && !this.checkValidity()) {
-      if ($(this).is(":hidden")) {
-        var icon = $('#chevron-'+vtun+'-'+i);
-        openClose(form,icon,'div.zone'+i);
-      }
-      this.reportValidity();
-      isValid = false;
-    }
-  });
-  return isValid;
-}
-function prepareSettings(form,vtun) {
-  var subnets = '<?=$subnets?>';
-  var hosts = '<?=$hosts?>';
-  var subnets6 = '<?=$subnets6?>';
-  var hosts6 = '<?=$hosts6?>';
-  var protocol = form.find('select[name="PROT:0"]').val();
-  var listen = form.find('input[name="gui:ListenPort:0"]').val()||netport[vtun];
-  var network = form.find('input[name="gui:Network:0"]').val();
-  var mypool = netpool[vtun];
-  var network6 = form.find('input[name="gui:Network6:0"]').val();
-  var mypool6 = netpool6[vtun];
-  var vpn = false;
-  form.find('input[name="Network:0"]').val((network||mypool)+'/'+(form.find('input[name="gui:Mask:0"]').val()||24));
-  form.find('input[name="Network6:0"]').val((network6||mypool6)+'/'+(form.find('input[name="gui:Mask6:0"]').val()||64));
-  form.find('input[name^="Address:"]').each(function(){
-    var i = $(this).attr('name').split(':')[1];
-    var address = $(this).val();
-    var address6 = form.find('input[name="Address6:'+i+'"]').val();
-    switch (protocol) {
-      case '46': $(this).val(address+', '+address6); break;
-      case '6' : $(this).val(address6); break;
-      default  : break;
-    }
-  });
-  switch (protocol) {
-  case '46':
-    form.find('input[name="#subnets1"]').val(form.find('input[name="Address:0"]').val()+', '+form.find('input[name="Address6:0"]').val()+', '+subnets+', '+subnets6);
-    form.find('input[name="#subnets2"]').val(form.find('input[name="Address:0"]').val()+', '+form.find('input[name="Address6:0"]').val()+', '+hosts+', '+hosts6);
-    form.find('input[name="#shared1"]').val(form.find('input[name="Network:0"]').val()+', '+form.find('input[name="Network6:0"]').val()+', '+subnets+', '+subnets6);
-    form.find('input[name="#shared2"]').val(form.find('input[name="Network:0"]').val()+', '+form.find('input[name="Network6:0"]').val()+', '+hosts+', '+hosts6);
-    break;
-  case '6':
-    form.find('input[name="#subnets1"]').val(form.find('input[name="Address6:0"]').val()+', '+subnets6);
-    form.find('input[name="#subnets2"]').val(form.find('input[name="Address6:0"]').val()+', '+hosts6);
-    form.find('input[name="#shared1"]').val(form.find('input[name="Network6:0"]').val()+', '+subnets6);
-    form.find('input[name="#shared2"]').val(form.find('input[name="Network6:0"]').val()+', '+hosts6);
-    break;
-  default:
-    form.find('input[name="#subnets1"]').val(form.find('input[name="Address:0"]').val()+', '+subnets);
-    form.find('input[name="#subnets2"]').val(form.find('input[name="Address:0"]').val()+', '+hosts);
-    form.find('input[name="#shared1"]').val(form.find('input[name="Network:0"]').val()+', '+subnets);
-    form.find('input[name="#shared2"]').val(form.find('input[name="Network:0"]').val()+', '+hosts);
-    break;
-  }
-  form.find('select[name^="TYPE:"]').each(function(){if($(this).val()==7){vpn=true;return false};});
-  if (!vpn) form.find('input[name="ListenPort:0"]').val(listen);
-  form.find('input[name^="gui:Endpoint:"]').each(function(){
-    var i = $(this).attr('name').split(':')[2];
-    var endpoint = form.find('input[name="Endpoint:'+i+'"]');
-    var port = form.find('input[name="gui:ListenPort:'+i+'"]').val()||listen;
-    if ($(this).val()) endpoint.val(ipset($(this).val())+':'+port);
-  });
-  form.find('input[name^="Address6:"]').each(function(){$(this).prop('disabled',true);});
-  form.find('input[name^="gui:"]').each(function(){$(this).prop('disabled',true);});
-  form.find('input[name="#wg"]').val(tstate[vtun]);
-  form.find('input[name="#internet"]').val(ipset(form.find('input[name="#internet"]').val())+':'+listen);
-  var upnp = form.find('select[name="UPNP:0"]');
-  var postup = form.find('input[name="PostUp:0:0"]');
-  var postdown = form.find('input[name="PostDown:0:0"]');
-  var source = form.find('input[name="Network:0"]').val();
-  var source6 = form.find('input[name="Network6:0"]').val();
-  upnp.prop('disabled',false);
-<?if (!is_executable('/usr/bin/upnpc')):?>
-  upnp.val('no');
-<?endif;?>
-  if (!xml||vpn||upnp.val()=='no') {
-    postup.prop('disabled',true);
-    postdown.prop('disabled',true);
-  } else {
-    postup.val(postup.val().replace(/<wg>/,vtun).replace(/<port>/g,listen));
-    postdown.val(postdown.val().replace(/<port>/,listen));
-  }
-  postup = form.find('input[name="PostUp:0:1"]');
-  postdown = form.find('input[name="PostDown:0:1"]');
-  postup.val(postup.val().replace(/<wg>/,vtun));
-  postdown.val(postdown.val().replace(/<wg>/,vtun));
-
-  postup = form.find('input[name="PostUp:0:2"]');
-  postdown = form.find('input[name="PostDown:0:2"]');
-  var drop = form.find('input[name="DROP:0"]').val();
-  var postup1 = [], postup16 = [];
-  var postdown1 = [], postdown16 = [];
-  var ip4 = []; ip6 = [];
-  if (form.find('select[name="NAT:0"]').val()=='') {
-    var postup2 = '<?=$postUp2?>';
-    var postup26 = '<?=$postUp26?>';
-    var postdown2 = '<?=$postDown2?>';
-    var postdown26 = '<?=$postDown26?>';
-    switch (protocol) {
-    case '46':
-      postup1.push(postup2.patch(source));
-      postdown1.push(postdown2.patch(source));
-      postup16.push(postup26.patch(source6));
-      postdown16.push(postdown26.patch(source6));
-      break;
-    case '6':
-      postup16.push(postup26.patch(source6));
-      postdown16.push(postdown26.patch(source6));
-      break;
-    default:
-      postup1.push(postup2.patch(source));
-      postdown1.push(postdown2.patch(source));
-      break;
-    }
-  }
-  if (drop) {
-    var postup3 = '<?=$postUp3?>';
-    var postupX = '<?=$postUpX?>';
-    var postupZ = '<?=$postUpZ?>';
-    var postup36 = '<?=$postUp36?>';
-    var postupX6 = '<?=$postUpX6?>';
-    var postupZ6 = '<?=$postUpZ6?>';
-    var postdown3 = '<?=$postDown3?>';
-    var postdown36 = '<?=$postDown36?>';
-    vtun = vtun.toUpperCase();
-    drop = drop.replace(/ /g,'').split(',');
-    if (form.find('select[name="RULE:0"]').val()) {
-      postupX = postupX.replace('-j DROP','-j ACCEPT');
-      postupZ = postupZ.replace('-j ACCEPT','-j DROP');
-      postupX6 = postupX6.replace('-j DROP','-j ACCEPT');
-      postupZ6 = postupZ6.replace('-j ACCEPT','-j DROP');
-    }
-    for (var i=0,target; target=drop[i]; i++) {
-      switch (protocol) {
-      case '46':
-        if (ipv4(target)) ip4.push(postupX.patch(source,target));
-        if (ipv6(target)) ip6.push(postupX6.patch(source6,target));
-        break;
-      case '6':
-        if (ipv6(target)) ip6.push(postupX6.patch(source6,target));
-        break;
-      default:
-        if (ipv4(target)) ip4.push(postupX.patch(source,target));
-        break;
-      }
-    }
-  }
-  switch (protocol) {
-  case '46':
-    if (ip4.length>0) {
-      postup1.push(postup3);
-      postup1.push(ip4);
-      postup1.push(postupZ.patch(source));
-      postdown1.push(postdown3);
-    }
-    if (ip6.length>0) {
-      postup16.push(postup36);
-      postup16.push(ip6);
-      postup16.push(postupZ6.patch(source6));
-      postdown16.push(postdown36);
-    }
-    postup1.push(postup16);
-    postdown1.push(postdown16);
-    postup.val(postup1.bind(vtun));
-    postdown.val(postdown1.bind(vtun));
-    break;
-  case '6':
-    if (ip6.length>0) {
-      postup16.push(postup36);
-      postup16.push(ip6);
-      postup16.push(postupZ6.patch(source6));
-      postdown16.push(postdown36);
-    }
-    postup.val(postup16.bind(vtun));
-    postdown.val(postdown16.bind(vtun));
-    break;
-  default:
-    if (ip4.length>0) {
-      postup1.push(postup3);
-      postup1.push(ip4);
-      postup1.push(postupZ.patch(source));
-      postdown1.push(postdown3);
-    }
-    postup.val(postup1.bind(vtun));
-    postdown.val(postdown1.bind(vtun));
-    break;
-  }
-  if (!postup.val()) postup.prop('disabled',true);
-  if (!postdown.val()) postdown.prop('disabled',true);
-}
-function keypair(form,i) {
-  $.post('/webGui/include/update.wireguard.php',{'#cmd':'keypair'},function(keys){
-    var key = keys.split('\0');
-    form.find('.private-'+i).val(key[0]).trigger('change');
-    form.find('.public-'+i).val(key[1]).trigger('change');
-  });
-}
-function presharedkey(form,i) {
-  $.post('/webGui/include/update.wireguard.php',{'#cmd':'presharedkey'},function(key){
-    form.find('.preshared-'+i).val(key).trigger('change');
-  });
-}
-function clearTunnel(vtun) {
-  $.removeCookie('my-'+vtun);
-  $.removeCookie('view-'+vtun);
-  $.removeCookie('block-'+vtun);
-  refresh();
-}
-function addTunnel() {
-  $.post('/webGui/include/update.wireguard.php',{'#cmd':'addtunnel','#name':'<?=$tower?>'},function(){refresh();});
-}
-function delTunnel(vtun) {
-  swal({title:"_(Delete Tunnel)_ "+vtun,text:"_(This removes any connections running over this tunnel)_",type:'warning',confirmButtonText:"_(Proceed)_",cancelButtonText:"_(Cancel)_",showCancelButton:true},function(){
-    $.post('/webGui/include/update.wireguard.php',{'#cmd':'deltunnel','#vtun':vtun,'#name':'<?=$tower?>'},function(){clearTunnel(vtun);});
-  });
-}
-function addPeer(form,vtun) {
-  // don't add peer if there are errors that would be propagated to the peer
-  if (!validateForm(form,vtun)) return false;
-
-  var index = [0];
-  form.find('div[id^="index-'+vtun+'-"]').each(function(){index.push($(this).prop('id').split('-')[2]);});
-  var i = Math.max(...index)+1;
-  var template = $($('<div/>').loadTemplate($('#peer-template-'+vtun)).html().replace(/INDEX/g,i));
-  var peer = i==1 ? $('div#peers-list-'+vtun) : $('[id^="index-'+vtun+'-"]').last();
-  $(peer).after(template);
-  if (i==1) form.find('select[name="TYPE:1"] option:last').prop('disabled',false);
-  var address = [], address6 = [];
-  var protocol = form.find('select[name="PROT:0"]').val();
-  if (protocol!='6') {
-    form.find('input[name^="Address:"]').each(function(){if ($(this).val()) address.push($(this).val().ip2long());});
-    var ip = (Math.max(...address)+1).long2ip();
-    form.find('input[name="Address:'+i+'"]').val(ip);
-  }
-  if (protocol!='') {
-    form.find('input[name^="Address6:"]').each(function(){if ($(this).val()) address6.push($(this).val().split('::')[1]);});
-    var ip6 = (form.find('input[name="Network6:0"]').val()||netpool6[vtun])+(address6.sort(function(x,y){return x-y}).pop()*1+1);
-    form.find('input[name="Address6:'+i+'"]').val(ip6);
-  }
-  switch (protocol) {
-  case '46':
-    var data = ip+', '+ip6;
-    form.find('input[name="Address:'+i+'"]').attr('placeholder',"(_(mandatory)_)").prop('required',true);
-    form.find('input[name="Address6:'+i+'"]').attr('placeholder',"(_(mandatory)_)").prop('required',true);
-    $('div[class="ipv4 '+vtun+'"]').show();
-    $('div[class="ipv6 '+vtun+'"]').show();
-    break;
-  case '6':
-    var data = ip6;
-    form.find('input[name="Address:'+i+'"]').attr('placeholder',"(_(not used)_)").removeAttr('required').val('');
-    form.find('input[name="Address6:'+i+'"]').attr('placeholder',"(_(mandatory)_)").prop('required',true);
-    $('div[class="ipv4 '+vtun+'"]').hide();
-    $('div[class="ipv6 '+vtun+'"]').show();
-    break;
-  default:
-    var data = ip;
-    form.find('input[name="Address:'+i+'"]').attr('placeholder',"(_(mandatory)_)").prop('required',true);
-    form.find('input[name="Address6:'+i+'"]').attr('placeholder',"(_(not used)_)").removeAttr('required').val('');
-    $('div[class="ipv4 '+vtun+'"]').show();
-    $('div[class="ipv6 '+vtun+'"]').hide();
-    break;
-  }
-  form.find('input[name="AllowedIPs:'+i+'"]').val(data);
-  form.find('input[name="Address:'+i+'"]').on('input change',function(){form.find('#ping-button1-'+i).prop('disabled',$(this).val()=='');});
-  form.find('input[name="Address6:'+i+'"]').on('input change',function(){form.find('#ping-button6-'+i).prop('disabled',$(this).val()=='');});
-  form.find('input[name="gui:Endpoint:'+i+'"]').on('input change',function(){form.find('#ping-button2-'+i).prop('disabled',$(this).val()=='');});
-  if ($.cookie('view-'+vtun)=='advanced') {
-    form.find('div.zone'+i).show();
-    form.find('i.fa-chevron-down').last().removeClass().addClass('fa fa-chevron-up');
-  }
-  form.find('input[class$="zone'+i+'"]').show();
-  form.find('input[name="Name:0"]').trigger('change');
-  $('blockquote.inline_help').each(function(i) {
-    $(this).attr('id','helpinfo'+i);
-    var pin = $(this).prev();
-    if (!pin.prop('nodeName')) pin = $(this).parent().prev();
-    while (pin.prop('nodeName') && pin.prop('nodeName').search(/(table|dl)/i)==-1) pin = pin.prev();
-    pin.find('tr:first,dt:last').each(function() {
-      var node = $(this);
-      var name = node.prop('nodeName').toLowerCase();
-      if (name=='dt') {
-        while (!node.html() || node.html().search(/(<input|<select|nbsp;)/i)>=0 || name!='dt') {
-          if (name=='dt' && node.is(':first-of-type')) break;
-          node = node.prev();
-          name = node.prop('nodeName').toLowerCase();
-        }
-        node.css('cursor','help').prop('onclick',null).off('click').click(function(){$('#helpinfo'+i).toggle('slow');});
-      } else {
-        if (node.html() && (name!='tr' || node.children('td:first').html())) node.css('cursor','help').prop('onclick',null).off('click').click(function(){$('#helpinfo'+i).toggle('slow');});
-      }
-    });
-  });
-}
-function delPeer(form,peer) {
-  var deleted = form.find('input[name="#deleted"]');
-  var comma = deleted.val() ? ',' : '';
-  deleted.val(deleted.val()+comma+peer.substr(7));
-  form.find(peer).remove();
-  form.find('input[name="Name:0"]').trigger('change');
-}
-function lockEye(form,i) {
-  form.find('i[class*="eye'+i+'"]').removeClass('key-off').addClass('key-off');
-}
-function toLC(field) {
-  field.value=(field.value) ? field.value.toLowerCase() : '';
-}
-function updatePeer(form,i,n,vtun) {
-  var unraid = form.find('input[name="#internet"]').val().replace(/^(www\.).+(\.unraid.net)$/,'$1<hash>$2');
-  var type = form.find('select[name="TYPE:'+i+'"]').val();
-  var icon = $('#chevron-'+vtun+'-'+i);
-  var protocol = form.find('select[name="PROT:0"]').val();
-  switch (n) {
-  case '6':
-    form.find('input[name="Endpoint:0"]').attr('placeholder',unraid);
-    form.find('input[name="gui:ListenPort:0"]').attr('placeholder',netport[vtun]);
-    form.find('select[name="NAT:0"]').prop('disabled',false);
-    form.find('input[name="gui:Endpoint:'+i+'"]').attr('placeholder',"(_(not used)_)").removeAttr('required').val('');
-    form.find('input[name="gui:ListenPort:'+i+'"]').removeAttr('placeholder').val('');
-    form.find('input[name="DNS:'+i+'"]').attr('placeholder',"(_(optional)_)");
-    break;
-  case '7':
-    form.find('input[name="Endpoint:0"]').attr('placeholder',"(_(not used)_)");
-    form.find('input[name="gui:ListenPort:0"]').removeAttr('placeholder');
-    form.find('select[name="NAT:0"]').prop('disabled',true);
-    form.find('input[name="gui:Endpoint:'+i+'"]').attr('placeholder',"(_(mandatory)_)").prop('required',true);
-    form.find('input[name="gui:ListenPort:'+i+'"]').attr('placeholder',form.find('input[name="gui:ListenPort:0"]').val()||netport[vtun]);
-    form.find('input[name="Address:'+i+'"]').attr('placeholder',"(_(not used)_)").removeAttr('required');
-    form.find('input[name="Address6:'+i+'"]').attr('placeholder',"(_(not used)_)").removeAttr('required');
-    form.find('input[name="DNS:'+i+'"]').attr('placeholder',"(_(not used)_)");
-    if (icon.hasClass('fa-chevron-down')) openClose(form,icon,'div.zone'+i);
-    break;
-  default:
-    form.find('input[name="Endpoint:0"]').attr('placeholder',unraid);
-    form.find('input[name="gui:ListenPort:0"]').attr('placeholder',netport[vtun]);
-    form.find('select[name="NAT:0"]').prop('disabled',false);
-    if (n=='2'||n=='3') {
-      form.find('input[name="gui:Endpoint:'+i+'"]').attr('placeholder',"(_(mandatory)_)").prop('required',true);
-      form.find('input[name="gui:ListenPort:'+i+'"]').attr('placeholder',form.find('input[name="gui:ListenPort:0"]').val()||netport[vtun]);
-      if (icon.hasClass('fa-chevron-down')) openClose(form,icon,'div.zone'+i);
-    } else {
-      form.find('input[name="gui:Endpoint:'+i+'"]').attr('placeholder',"(_(not used)_)").removeAttr('required').val('');
-      form.find('input[name="gui:ListenPort:'+i+'"]').removeAttr('placeholder').val('');
-    }
-    form.find('input[name="DNS:'+i+'"]').attr('placeholder',"(_(optional)_)");
-    break;
-  }
-  var subnet = form.find('input[name="Address:'+i+'"]').val();
-  var subnet6 = form.find('input[name="Address6:'+i+'"]').val();
-  switch (protocol) {
-  case '46':
-    setAllow6(form,subnet6,i);
-    setAllow(form,subnet,i);
-    break;
-  case '6':
-    setAllow6(form,subnet6,i);
-    break;
-  default:
-    setAllow(form,subnet,i);
-    break;
-  }
-  showRemark(form);
-  showRoute(form,vtun);
-  showAccess(form,i,n);
-}
-function setProtocol(form,vtun,update) {
-  switch (form.find('select[name="PROT:0"]').val()) {
-  case '46':
-    $('div[class="ipv4 '+vtun+'"]').show();
-    $('div[class="ipv6 '+vtun+'"]').show();
-    form.find('input[name^="Address:"]').each(function(){
-      var i = $(this).attr('name').split(':')[1];
-      if (i==0) {
-        $(this).attr('placeholder',"(_(mandatory)_)").prop('required',true);
-      } else {
-        if (form.find('select[name="TYPE:'+i+'"]').val()<7) $(this).attr('placeholder',"(_(mandatory)_)").prop('required',true); else $(this).attr('placeholder',"(_(not used)_)").removeAttr('required');
-      }
-    });
-    form.find('input[name^="Address6:"]').each(function(){
-      var i = $(this).attr('name').split(':')[1];
-      if (i==0) {
-        $(this).attr('placeholder',"(_(mandatory)_)").prop('required',true);
-      } else {
-        if (form.find('select[name="TYPE:'+i+'"]').val()<7) $(this).attr('placeholder',"(_(mandatory)_)").prop('required',true); else $(this).attr('placeholder',"(_(not used)_)").removeAttr('required');
-      }
-    });
-    if (update) {
-      form.find('input[name="gui:Network6:0"]').trigger('change');
-      form.find('input[name="gui:Network:0"]').trigger('change');
-    }
-    break;
-  case '6':
-    $('div[class="ipv4 '+vtun+'"]').hide();
-    $('div[class="ipv6 '+vtun+'"]').show();
-    form.find('input[name^="Address:"]').each(function(){$(this).attr('placeholder',"(_(not used)_)").removeAttr('required').val('');});
-    form.find('input[name^="Address6:"]').each(function(){
-      var i = $(this).attr('name').split(':')[1];
-      if (i==0) {
-        $(this).attr('placeholder',"(_(mandatory)_)").prop('required',true);
-      } else {
-        if (form.find('select[name="TYPE:'+i+'"]').val()<7) $(this).attr('placeholder',"(_(mandatory)_)").prop('required',true); else $(this).attr('placeholder',"(_(not used)_)").removeAttr('required');
-      }
-    });
-    if (update) {
-      form.find('input[name="gui:Network6:0"]').trigger('change');
-    }
-    break;
-  default:
-    $('div[class="ipv4 '+vtun+'"]').show();
-    $('div[class="ipv6 '+vtun+'"]').hide();
-    form.find('input[name^="Address6:"]').each(function(){$(this).attr('placeholder',"(_(not used)_)").removeAttr('required').val('');});
-    form.find('input[name^="Address:"]').each(function(){
-      var i = $(this).attr('name').split(':')[1];
-      if (i==0) {
-        $(this).attr('placeholder',"(_(mandatory)_)").prop('required',true);
-      } else {
-        if (form.find('select[name="TYPE:'+i+'"]').val()<7) $(this).attr('placeholder',"(_(mandatory)_)").prop('required',true); else $(this).attr('placeholder',"(_(not used)_)").removeAttr('required');
-      }
-    });
-    if (update) {
-      form.find('input[name="gui:Network:0"]').trigger('change');
-    }
-    break;
-  }
-}
-function quickValidate(field) {
-  try {
-    var form = $(field).parents('form');
-    var i = field.name.match(/.*:(\d+)/)[1];
-    lockEye(form,i);
-  } catch (err) { }
-  return field.reportValidity();
-}
-function setPool(form,vtun) {
-  // perform standard field validation on Network and Mask before custom validation
-  field = form.find('input[name="gui:Network:0"]')[0];
-  field.setCustomValidity('');
-  if (!quickValidate(field)) return false;
-  field2 = form.find('input[name="gui:Mask:0"]')[0];
-  if (!quickValidate(field2)) return false;
-  // ensure Local tunnel network pool is a pool address
-  var network = form.find('input[name="gui:Network:0"]').val();
-  var mask = form.find('select[name="gui:Mask:0"]').val()||24;
-  var networkSubnet = network.ip2long() & (0x100000000-2**(32-mask));
-  if (network && network.ip2long() !== networkSubnet) {
-    network = networkSubnet.long2ip();
-    form.find('input[name="gui:Network:0"]').val(network);
-  }
-  // ensure Local tunnel network pool is not already in use on this server
-  var subnets = '<?=$subnets?>';
-  if (network && subnets.includes(network+"/")) {
-    field.setCustomValidity("_(The Local tunnel network pool cannot be in)_ "+subnets);
-    field.reportValidity();
-    return false;
-  }
-  // remove existing IPv4 addresses in AllowedIP list
-  form.find('input[name^="AllowedIPs:"]').each(function(){
-    var list = $(this).val().replace(/ +/g,'').split(',');
-    list = list.filter(ipv6);
-    $(this).val(list.join(', '));
-  });
-  // update existing IPv4 addresses with new pool address
-  netbase[vtun] = (network||netpool[vtun]).ip2long() & (0x100000000-2**(32-mask));
-  var assign = netbase[vtun];
-  form.find('input[name^="Address:"]').each(function(){
-    ++assign;
-    var i = $(this).attr('name').split(':')[1];
-    $(this).val((assign).long2ip()).trigger('change');
-  });
-}
-function setPool6(form,vtun) {
-  // perform standard field validation on Network6 and Mask6 before custom validation
-  field = form.find('input[name="gui:Network6:0"]')[0];
-  field.setCustomValidity('');
-  if (!quickValidate(field)) return false;
-  field2 = form.find('input[name="gui:Mask6:0"]')[0];
-  if (!quickValidate(field2)) return false;
-  // ensure Local tunnel network pool is a pool address
-  var network6 = form.find('input[name="gui:Network6:0"]').val();
-  var mask6 = form.find('select[name="gui:Mask6:0"]').val()||64;
-  // this logic only handles IPv6 mask of 64. for other masks, assume the user knows what they are doing.
-  if (network6 && mask6 === 64) {
-    var network6Subnet = network6.match(/((.*?):){4}/) ? network6.match(/((.*?):){4}/)[0].slice(0,-1) : "";
-    if (network6Subnet && network6 !== network6Subnet+"::") {
-      network6 = network6Subnet+"::";
-      form.find('input[name="gui:Network6:0"]').val(network6);
-    }
-  }
-  // ensure Local tunnel network pool is not already in use on this server
-  var subnets6 = '<?=$subnets6?>';
-  if (network6 && subnets6.includes(network6+"/")) {
-    field.setCustomValidity("_(The Local tunnel network pool IPv6 cannot be in)_ "+subnets6);
-    field.reportValidity();
-    return false;
-  }
-  // remove existing IPv6 addresses in AllowedIP list
-  form.find('input[name^="AllowedIPs:"]').each(function(){
-    var list = $(this).val().replace(/ +/g,'').split(',');
-    list = list.filter(ipv4);
-    $(this).val(list.join(', '));
-  });
-  // update existing IPv6 addresses with new pool address
-  netbase6[vtun] = network6||netpool6[vtun];
-  var assign = 0;
-  form.find('input[name^="Address6:"]').each(function(){
-    ++assign;
-    var i = $(this).attr('name').split(':')[1];
-    $(this).val(netbase6[vtun]+assign).trigger('change');
-  });
-}
-function verifyInSubnet(field) {
-  // perform standard field validation before custom validation
-  field.setCustomValidity('');
-  if (!quickValidate(field)) return false;
-  // ensure this IP address is in the Local tunnel network pool
-  var form = $(field).parents('form');
-  // note: if network or mask are invalid, subnet calculation will be unpredictable
-  // not going to validate them here as the UI would be confusing
-  var network = form.find('input[name="gui:Network:0"]').val()||form.find('input[name="gui:Network:0"]').prop('placeholder');
-  var mask = form.find('input[name="gui:Mask:0"]').val()||24;
-  var addr = $(field).val();
-  var networkSubnet = network.ip2long() & (0x100000000-2**(32-mask));
-  var addrSubnet = addr.ip2long() & (0x100000000-2**(32-mask));
-  if (networkSubnet !== addrSubnet) {
-    field.setCustomValidity(addr+" _(is not in the)_ "+networkSubnet.long2ip()+"/"+mask+" _(subnet)_");
-    field.reportValidity();
-    return false;
-  }
-  return true;
-}
-function verifyInSubnet6(field) {
-  // perform standard field validation before custom validation
-  field.setCustomValidity('');
-  if (!quickValidate(field)) return false;
-  // ensure this IPv6 address is in the Local tunnel network pool IPv6
-  var form = $(field).parents('form');
-  var network6 = form.find('input[name="gui:Network6:0"]').val()||form.find('input[name="gui:Network6:0"]').prop('placeholder');;
-  var mask6 = form.find('input[name="gui:Mask6:0"]').val()||64;
-  if (mask6 !== 64) {
-    // this logic only handles IPv6 mask of 64. for other masks, assume the user knows what they are doing.
-    return true;
-  }
-  var network6Subnet = network6.match(/((.*?):){4}/) ? network6.match(/((.*?):){4}/)[0].slice(0,-1) : "";
-  var addr6 = $(field).val();
-  var addr6Subnet = addr6.match(/((.*?):){4}/) ? addr6.match(/((.*?):){4}/)[0].slice(0,-1) : "";
-  if (!network6Subnet || network6Subnet !== addr6Subnet) {
-    field.setCustomValidity(addr6+" _(is not in the)_ "+network6Subnet+"/"+mask6+" _(subnet)_");
-    field.reportValidity();
-    return false;
-  }
-  return true;
-}
-function setAllow(form,subnet,i) {
-  var input = form.find('input[name="AllowedIPs:'+i+'"]');
-  var type = form.find('select[name="TYPE:'+i+'"]').val();
-  var prot = form.find('select[name="PROT:0"]').val();
-  if (type!='7') {
-    var list = input.val().replace(/ +/g,'').split(',');
-    var n = prot=='46' ? 0 : (list.length>1 ? 2 : 1);
-    list.splice(0,n);
-    list.unshift(subnet);
-    list = [...new Set(list)];
-    list = list.filter(nodefault);
-    if (n>0) list = list.filter(ipv4);
-  } else {
-    var list = prot!='46' ? ['0.0.0.0/0'] : ['0.0.0.0/0','::/0'];
-  }
-  input.val(list.join(', '));
-  lockEye(form,i);
-}
-function setAllow6(form,subnet6,i) {
-  var input = form.find('input[name="AllowedIPs:'+i+'"]');
-  var type = form.find('select[name="TYPE:'+i+'"]').val();
-  var prot = form.find('select[name="PROT:0"]').val();
-  if (type!='7') {
-    var list = input.val().replace(/ +/g,'').split(',');
-    var n = prot=='46' ? 0 : (list.length>1 ? 2 : 1);
-    list.splice(0,n);
-    list.unshift(subnet6);
-    list = [...new Set(list)];
-    list = list.filter(nodefault6);
-    if (n>0) list = list.filter(ipv6);
-  } else {
-    var list = prot!='46' ? ['::/0'] : ['0.0.0.0/0','::/0'];
-  }
-  input.val(list.join(', '));
-  lockEye(form,i);
-}
-function ping(form,button,field) {
-  $(button).val('Pinging...');
-  $.post('/webGui/include/update.wireguard.php',{'#cmd':'ping','#addr':form.find(field).val().replace(/\/.+$/,'')},function(reply){
-    if (reply) {
-      $(button).addClass('ok').val("_(Replied)_");
-    } else {
-      $(button).addClass('nok').val("_(No Reply)_");
-    }
-    setTimeout(function(){$(button).removeClass('ok nok').val("_(Ping)_")},3000);
-  });
-}
-function WGconfig(icon,file,path) {
-  if (!$(icon).hasClass('key-off')) openBox('/webGui/include/WGconfig.php?file='+file+'&path='+path+'&csrf_token=<?=$var['csrf_token']?>',"_(WireGuard Configuration)_",600,600);
-}
-function highlight(form,input,i) {
-  $(input).css({'color':'#e68a00'});
-  lockEye(form,i);
-}
-function showRemark(form) {
-  var upnp = form.find('select[name="UPNP:0"]').val();
-  var vpn = false;
-  form.find('select[name^="TYPE:"]').each(function(){vpn |= $(this).val()=='7';});
-  if (upnp=='' || vpn) form.find('span.remark').hide(); else form.find('span.remark').show();
-  if (upnp=='' && !vpn) form.find('span.upnp').show(); else form.find('span.upnp').hide();
-}
-function showRoute(form,vtun,i) {
-  var nat = form.find('select[name="NAT:0"]').val();
-  var vpn = false, lan = false;
-  form.find('select[name^="TYPE:"]').each(function(){
-    vpn |= $(this).val()=='7';
-    lan |= $(this).val()=='6' || $(this).val() % 2;
-  });
-  if (nat=='no' && !vpn && lan) {
-    $('span#my-static1-'+vtun).show();
-    $('span#my-static2-'+vtun).hide();
-  } else {
-    $('span#my-static1-'+vtun).hide();
-    if (lan) $('span#my-static2-'+vtun).show(); else $('span#my-static2-'+vtun).hide();
-  }
-  if (i!=null) lockEye(form,i);
-}
-function showAccess(form,i,n) {
-  switch (n) {
-    case '0': 
-      switch (form.find('select[name="PROT:0"]').val()) {
-        case '6' : var peer_addr = form.find('input[name="Address6:0"]').val()+"</b>"; break;
-        case '46': var peer_addr = form.find('input[name="Address:0"]').val()+"</b> _(or)_ <b>"+form.find('input[name="Address6:0"]').val()+"</b>"; break;
-        default  : var peer_addr = form.find('input[name="Address:0"]').val()+"</b>"; break;
-      }
-      form.find('span#access-type-'+i).html("_(Remark)_: _(connect to this server using IP address)_ <b>"+peer_addr);
-      break;
-    case '1':
-    case '2':
-    case '3':
-    case '6': form.find('span#access-type-'+i).html("_(Remark)_: _(ensure the peer network is different from)_ <b><?=exec("ip -4 route show dev $link scope link|awk '{print \$1;exit}'")?></b>"); break;
-    case '4':
-      switch (form.find('select[name="PROT:0"]').val()) {
-        case '6' : var peer_net = form.find('input[name="gui:Network6:0"]').val()+'/'+(form.find('input[name="gui:Mask6:0"]').val()||64)+"</b>"; break;
-        case '46': var peer_net = form.find('input[name="gui:Network:0"]').val()+'/'+(form.find('input[name="gui:Mask:0"]').val()||24)+"</b> _(or)_ <b>"+form.find('input[name="gui:Network6:0"]').val()+'/'+(form.find('input[name="gui:Mask6:0"]').val()||64)+"</b>"; break;
-        default  : var peer_net = form.find('input[name="gui:Network:0"]').val()+'/'+(form.find('input[name="gui:Mask:0"]').val()||24)+"</b>"; break;
-      }
-      form.find('span#access-type-'+i).html("_(Remark)_: _(connect to any device on the VPN tunnel)_ <b>"+peer_net);
-      break;
-    case '5': form.find('span#access-type-'+i).html("_(Remark)_: _(ensure the peer networks are different from)_ <b><?=exec("ip -4 route show dev $link scope link|awk '{print \$1;exit}'")?></b>"); break;
-    case '7': form.find('span#access-type-'+i).html("_(Remark)_: _(this must be the only peer in the tunnel and sole active tunnel when in use)_"); break;
-  }
-}
-function portRemark(form,vtun,val) {
-  $('#my-port-'+vtun).text(val);
-  var port = form.find('input[name="gui:ListenPort:0"]').val()||netport[vtun];
-  form.find('input[name^="gui:ListenPort:"]').each(function(i) {
-    if (i>0 && form.find('input[name="gui:Endpoint:'+i+'"]').val()) $(this).attr('placeholder',port);
-  });
-}
-function openClose(form,icon,zone) {
-  if (icon) {
-    form.find(zone).toggle('slow');
-    if ($(icon).hasClass('fa-chevron-down')) {
-      // advanced view
-      form.find(zone.replace('div','input')).show('slow');
-      $(icon).removeClass('fa-chevron-down').addClass('fa-chevron-up');
-      if (!form.find('input[name="PublicKey:'+zone.replace('div.zone','')+'"]').val()) {
-        form.find(zone.replace('zone','key')).show();
-        form.find(zone.replace('div','i')).removeClass('key-off').addClass('key-off');
-      }
-    } else {
-      // basic view
-      $(icon).removeClass('fa-chevron-up').addClass('fa-chevron-down');
-      if (form.find('input[name="PublicKey:'+zone.replace('div.zone','')+'"]').val()) {
-        form.find(zone.replace('div','input')).hide('slow');
-        form.find(zone.replace('zone','key')).hide();
-        form.find(zone.replace('div','i')).removeClass('key-off');
-      }
-    }
-  } else {
-    if (!form.find(zone.replace('div.key','i.zone')).hasClass('key-off')) form.find(zone).toggle('slow');
-  }
-}
-function blockToggle(vtun) {
-  $('div#block-'+vtun).toggle('slow');
-  if ($('i#block-'+vtun).hasClass('fa-chevron-up')) {
-    $('i#block-'+vtun).removeClass('fa-chevron-up').addClass('fa-chevron-down');
-    $.cookie('block-'+vtun,'hide',{expires:3650});
-  } else {
-    $('i#block-'+vtun).removeClass('fa-chevron-down').addClass('fa-chevron-up');
-    $.removeCookie('block-'+vtun);
-  }
-}
-function importFile(file) {
-  var reader = new FileReader();
-  reader.readAsText(file,'UTF-8');
-  reader.onload = function(e){$.post('/webGui/include/update.wireguard.php',{'#cmd':'import','#name':'<?=$tower?>','#data':e.target.result},function(vtun){clearTunnel(vtun);});};
-}
-function getPublicIP(ip,wg,protocol) {
-  $.post('/webGui/include/update.wireguard.php',{'#cmd':'public','#ip':ip,'#prot':protocol},function(x){
-    var ips = x.split(';');
-    var endpoints = [<?=implode(',',array_map(function($v){return "'$v'";},$endpoints))?>];
-    var int_ipv4 = ips[0];
-    var ext_ipv4 = ips[1];
-    var int_ipv6 = ips[2];
-    var ext_ipv6 = ips[3];
-    if ((protocol==''||protocol=='46') && ext_ipv4 && ip) {
-      if (!int_ipv4) {
-        $('#endpoint4-'+wg).html("<dt>&nbsp;</dt><dd><span class='input'></span>  <span class='block'>_(Remark)_: _(The Local endpoint does not resolve to an IPv4 address)_. _(In most cases, this should be your public WAN IPv4)_: <b>"+ext_ipv4+"</b></span></dd>\n").show();
-      } else if (!endpoints.includes(int_ipv4)) {
-        $('#endpoint4-'+wg).html("<dt>&nbsp;</dt><dd><span class='input'></span>  <span class='block'>_(Remark)_: _(The Local endpoint resolves to)_ <b>"+int_ipv4+".</b> _(In most cases, this should be your public WAN IPv4 instead)_: <b>"+ext_ipv4+"</b></span></dd>\n").show();
-      }
-    }
-    if ((protocol=='6'||protocol=='46') && ext_ipv6 && ip) {
-      if (!int_ipv6) {
-        $('#endpoint6-'+wg).html("<dt>&nbsp;</dt><dd><span class='input'></span>  <span class='block'>_(Remark)_: _(The Local endpoint does not resolve to an IPv6 address)_. _(In most cases, this should be your public WAN IPv6)_: <b>"+ext_ipv6+"</b></span></dd>\n").show();
-      } else if (!endpoints.includes(int_ipv6)) {
-        $('#endpoint6-'+wg).html("<dt>&nbsp;</dt><dd><span class='input'></span>  <span class='block'>_(Remark)_: _(The Local endpoint resolves to)_ <b>"+int_ipv6+".</b> _(In most cases, this should be your public WAN IPv6 instead)_: <b>"+ext_ipv6+"</b></span></dd>\n").show();
-      }
-    }
-<?if (!$public):?>
-    $('input[name="#internet"]').val(ext_ipv4||ext_ipv6);
-    $('input[name="Endpoint:0"]').each(function(){if ($(this).attr('placeholder')=='') $(this).attr('placeholder',ext_ipv4||ext_ipv6);});
-<?endif;?>
-  });
-}
-
-function simplef() {
-  var text = arguments[0];
-  for (var i=1,arg; arg=arguments[i]; i++) text = text.replace('%s',arg);
-  return text;
-}
-
-// keep tunnel states in global variable
-var tstate = [];
-tstate['wg0'] = "<?=$check_wg0 ? 'active' : ''?>";
-
-var statistics = new NchanSubscriber('/sub/wireguard');
-statistics.on('message', function(data) {
-  var list = [];
-  var rows = data.split('\0');
-  var x = 0; var vtun = '';
-  // get all existing tunnels
-  $('div[id^="block-wg"]').each(function(){list.push($(this).prop('id').split('-')[1]);});
-  // update active tunnels
-  for (var i=0,row; row=rows[i]; i++) {
-    var info = row.split(';');
-    if (info[0] != vtun) {
-      vtun = info[0];
-      // remove tunnel from inactive list
-      for (var n=0,done; done=list[n]; n++) if (vtun==done) list.splice(n,1);
-      x = 1;
-    } else x++;
-    if (info[1] > 0) {
-      var hr = parseInt(info[1]/3600);
-      var mn = parseInt(info[1]/60%60);
-      var sc = parseInt(info[1]%60);
-      $('.hs-'+vtun+'-'+x).text(simplef("_(%s ago)_",plus(hr,"_(hour)_","_(hours)_",false)+plus(mn,"_(minute)_","_(minutes)_",false)+plus(sc,"_(second)_","_(seconds)_",true)));
-    } else {
-      $('.hs-'+vtun+'-'+x).text("_(not received)_");
-    }
-    $('.rx-'+vtun+'-'+x).text(info[2]);
-    $('.tx-'+vtun+'-'+x).text(info[3]);
-  }
-  // update inactive tunnels
-  for (var i=0,vtun; vtun=list[i]; i++) {
-    $('span[class^="hs-'+vtun+'"]').text("_(tunnel is inactive)_");
-    $('span[class^="tx-'+vtun+'"]').text('---');
-    $('span[class^="rx-'+vtun+'"]').text('---');
-  }
-});
-
-$(function(){
-  var form = $(document.wg0);
-  var ctrl = "<span class='status vhshift hshift'><i id='block-wg0' class='fa fa-fw fa-chevron-up' style='cursor:pointer' onclick='blockToggle(&quot;wg0&quot;)'></i></span>";
-  ctrl += "<span class='even wide'><span class='status vshift label'>_(Autostart)_</span><span class='status vhshift'><input type='checkbox' id='start-wg0' style='display:none'<?=$start_wg0?' checked':''?>></span></span>";
-  ctrl += "<span class='even'><span class='status vhshift'><input type='checkbox' id='view-wg0' style='display:none'></span></span>";
-  ctrl += "<span class='even'><span class='status vhshift'><input type='checkbox' id='toggle-wg0' style='display:none'></span></span>";
-  statistics.start();
-  getPublicIP($('#endpoint-wg0').val(),'wg0',$('#protocol-wg0').val());
-  $('div.content').prepend('<div class="preset"><input type="button" value="_(Import Tunnel)_" onclick="$(&apos;input#file&apos;).trigger(&apos;click&apos;);"><input type="button" value="_(Add Tunnel)_" onclick="addTunnel()";<?=$this_wg0?"":" disabled"?>></div>');
-  $('div#title').eq(0).find('span.left').append(ctrl);
-  $.post('/webGui/include/update.wireguard.php',{'#cmd':'upnp','#gw':'<?=$eth0['GATEWAY:0']?>','#link':'<?=$link?>'},function(url){
-    if (url) {
-      $('div.upnp').show();
-      $.cookie('upnp',url,{expires:3650});
-      var upnp = 'ON';
-    } else {
-      $('div.upnp').hide();
-      $.removeCookie('upnp');
-      var upnp = 'OFF';
-    }
-    $('span.upnp').each(function(){
-      var vtun = $(this).attr('class').split(' ')[1];
-      $.post('/webGui/include/update.wireguard.php',{'#cmd':'upnpc','#xml':xml,'#vtun':vtun,'#link':'<?=$link?>','#ip':'<?=$server?>','#wg':tstate[vtun]},function(data){$('span.upnp.'+vtun).text(data);});
-    });
-    if (xml.desc() != url.desc()) {
-      xml = url;
-      swal({title:"_(UPnP state changed to)_ "+upnp,text:"_(Please consider re-applying all configurations)_<br>(_(enable advanced settings view)_)",type:'warning',html:true});
-    }
-  });
-  $('#start-wg0').switchButton({labels_placement:'left',off_label:"_(Off)_",on_label:"_(On)_",clear:false});
-  $('#start-wg0').change(function(){
-    var start = $('#start-wg0').is(':checked') ? 'on' : 'off';
-    $.post('/webGui/include/update.wireguard.php',{'#cmd':'autostart','#start':start,'#vtun':'wg0'});
-  });
-  $('#toggle-wg0').switchButton({labels_placement:'left',off_label:"_(Inactive)_",on_label:"_(Active)_",checked:<?=$check_wg0?>});
-  $('#toggle-wg0').change(function(e){
-<?if ($this_wg0):?>
-    e.preventDefault();
-    e.stopPropagation();
-    var wg = $('#toggle-wg0').is(':checked') ? 'start' : 'stop';
-    $.post('/webGui/include/update.wireguard.php',{'#cmd':'toggle','#wg':wg,'#vtun':'wg0'},function(ok){
-      if (wg=='start') {
-        if (ok) tstate['wg0']='active'; else $('#toggle-wg0').switchButton({checked:false});
-      } else {
-        if (ok) tstate['wg0']=''; else $('#toggle-wg0').switchButton({checked:true});
-      }
-<?if ($wg0['UPNP:0']===''):?>
-      $.post('/webGui/include/update.wireguard.php',{'#cmd':'upnpc','#xml':xml,'#vtun':'wg0','#link':'<?=$link?>','#ip':'<?=$server?>','#wg':tstate['wg0']},function(data){$('span.upnp.wg0').text(data);});
-<?endif;?>
-    });
-<?else:?>
-    $('#toggle-wg0').prop('checked',false).trigger('change');
-<?endif;?>
-  });
-  if ($.cookie('view-wg0')=='advanced') {
-    $('.advanced.wg0').show();
-    form.find('i.fa-chevron-down').removeClass('fa-chevron-down').addClass('fa-chevron-up');
-    form.find('input[class*="zone"]').show();
-    form.find('i[class*="zone"]').each(function(i){if (!form.find('input[name="PublicKey:'+i+'"]').val()) {
-      $('div.wg0.key'+i).show();
-      $(this).removeClass('key-off').addClass('key-off');
-    }});
-  }
-  $('#view-wg0').switchButton({labels_placement:'left',off_label:"_(Basic)_",on_label:"_(Advanced)_",checked:$.cookie('view-wg0')=='advanced'});
-  $('#view-wg0').change(function(){
-    if ($.cookie('view-wg0')==null) {
-      // advanced view
-      $.cookie('view-wg0','advanced',{expires:3650});
-      $('.advanced.wg0').show('slow');
-      form.find('input[class*="zone"]').show('slow');
-      form.find('i.fa-chevron-down').removeClass('fa-chevron-down').addClass('fa-chevron-up');
-      form.find('i[class*="zone"]').each(function(i){if (!form.find('input[name="PublicKey:'+i+'"]').val()) {
-        $('div.wg0.key'+i).show('slow');
-        $(this).removeClass('key-off').addClass('key-off');
-      }});
-    } else {
-      // basic view
-      $.removeCookie('view-wg0');
-      $('.advanced.wg0').hide('slow');
-      form.find('i.fa-chevron-up').removeClass('fa-chevron-up').addClass('fa-chevron-down');
-      form.find('i[class*="zone"]').each(function(i){if (form.find('input[name="PublicKey:'+i+'"]').val()) {
-        form.find('input[class$="zone'+i+'"]').hide('slow');
-        $('div.wg0.key'+i).hide('slow');
-        $(this).removeClass('key-off');
-      }});
-    }
-  });
-  showRemark(form);
-  setProtocol(form,'wg0');
-  form.find('input[name^="Address:"]').each(function(){
-    var i = $(this).attr('name').split(':')[1];
-    if (i>0) $(this).on('input change',function(){form.find('.ping-button1-'+i).prop('disabled',$(this).val()=='');});
-  });
-  form.find('input[name^="Address6:"]').each(function(){
-    var i = $(this).attr('name').split(':')[1];
-    if (i>0) $(this).on('input change',function(){form.find('.ping-button6-'+i).prop('disabled',$(this).val()=='');});
-  });
-  form.find('input[name^="gui:Endpoint:"]').each(function(){
-    var i = $(this).attr('name').split(':')[2];
-    $(this).on('input change',function(){
-      form.find('.ping-button2-'+i).prop('disabled',$(this).val()=='');
-    });
-  });
-  if (!$.cookie('block-wg0')) $('div#block-wg0').show(); else $('i#block-wg0').removeClass('fa-chevron-up').addClass('fa-chevron-down');
-  if (xml) {
-    $('div.upnp.wg0').show();
-<?if ($wg0['UPNP:0']===''):?>
-    $.post('/webGui/include/update.wireguard.php',{'#cmd':'upnpc','#xml':xml,'#vtun':'wg0','#link':'<?=$link?>','#ip':'<?=$server?>','#wg':$.cookie('my-wg0')},function(data){$('span.upnp.wg0').text(data);});
-<?endif;?>
-  } else {
-    form.find('select[name="UPNP:0"]').val('no');
-  }
-  var vpn = false, lan = false
-  form.find('select[name^="TYPE:"]').each(function(){
-    var i = $(this).attr('name').split(':')[1];
-    vpn |= $(this).val()=='7';
-    lan |= $(this).val()=='6' || $(this).val() % 2;
-    form.find('input[name="DNS:'+i+'"]').attr('placeholder',$(this).val()=='7' ? "(_(not used)_)" : "(_(optional)_)");
-    showAccess(form,i,$(this).val());
-  });
-  if (vpn) form.find('select[name="NAT:0"]').val('no').prop('disabled',true);
-  else if (form.find('select[name="NAT:0"]').val()=='no' && lan) $('span#my-static1-wg0').show();
-  else if (lan) $('span#my-static2-wg0').show();
-<?if (file_exists($tmp)):?>
-  setTimeout(function(){swal({title:"_(Peer update required)_",text:"<b><u>_(List of peers)_</u></b><br><span style='display:inline-block;text-align:left'><?=file_get_contents($tmp)?></span>",type:'warning',html:true});},200);
-<?unlink($tmp);?>
-<?endif;?>
-});
-</script>
-<input type='file' id='file' accept='.conf' onchange='importFile(this.files[0])' style='display:none'>
-<div markdown="1" id="block-wg0" style="display:none">
-<form markdown="1" name="wg0" autocomplete="off" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareSettings($(this),'wg0')">
-<input type="hidden" name="#include" value="/webGui/include/update.wireguard.php">
-<input type="hidden" name="#file" value="<?=$conf_wg0?>">
-<input type="hidden" name="#cfg" value="<?=$cfg_wg0?>">
-<input type="hidden" name="#cmd" value="update">
-<input type="hidden" name="#name" value="<?=$tower?>">
-<input type="hidden" name="#vtun" value="wg0">
-<input type="hidden" name="#wg" value="">
-<input type="hidden" name="#internet" value="<?=$public?>">
-<input type="hidden" name="#subnets1" value="">
-<input type="hidden" name="#subnets2" value="">
-<input type="hidden" name="#shared1" value="">
-<input type="hidden" name="#shared2" value="">
-<input type="hidden" name="#deleted" value="">
-<input type="hidden" name="#locale" value="<?=$locale?>">
-_(Local name)_:
-: <span class="input"><input type="text" name="Name:0" class="wide" maxlength="99" value="<?=$wg0["Name:0"]?>" pattern="<?=$validname?>" title="_(Use only letters A-Z, digits or space,dash,underscore)_" placeholder="(_(optional)_)"></span>
-  <span class="pin"><i class="fa fa-fw fa-eye eye0<?=$this_wg0?'':' key-off'?>" style="cursor:pointer" onclick="WGconfig(this,'wg0','')" title="_(View Local Config)_"></i>
-  <i class="fa fa-fw fa-key zone0<?=$wg0['PublicKey:0']?'':' key-off'?>" style="cursor:pointer" onclick="openClose($(document.wg0),null,'div.key0')" title="_(Toggle keys)_"></i>
-  <i id="chevron-wg0-0" class="fa fa-fw fa-chevron-down" style="cursor:pointer" onclick="openClose($(document.wg0),this,'div.zone0')" title="_(Toggle view)_"></i></span>
-
-:wg_local_name_help:
-
-<div markdown="1" class="keys wg0 key0"<?=$wg0['PublicKey:0']?' style="display:none">':'>'?>
-_(Local private key)_:
-: <span class="input"><input type="text" name="PrivateKey:0" class="wide private-0" maxlength="64" value="<?=$wg0['PrivateKey:0']?>" onchange="highlight($(document.wg0),this,0)" placeholder="(_(mandatory)_)" required></span>
-  <input type="button" class="form" value="_(Generate Keypair)_" onclick="keypair($(document.wg0),'0')">
-
-:wg_generate_keypair_help:
-
-_(Local public key)_:
-: <span class="input"><input type="text" name="PublicKey:0" class="wide public-0" maxlength="64" value="<?=$wg0['PublicKey:0']?>" onchange="highlight($(document.wg0),this,0)" placeholder="(_(mandatory)_)" required></span>
-
-:wg_generate_keypair_help:
-
-</div>
-<div markdown="1" class="advanced wg0 zone0" style="display:none">
-_(Network protocol)_:
-: <span class="input"><select id="protocol-wg0" name="PROT:0" class="subnet" onchange="setProtocol($(document.wg0),'wg0',true)">
-  <?=mk_option($wg0['PROT:0'], "", "_(IPv4 only)_")?>
-  <?=mk_option($wg0['PROT:0'], "6", "_(IPv6 only)_")?>
-  <?=mk_option($wg0['PROT:0'], "46", "_(IPv4 + IPv6)_")?>
-  </select></span>
-
-<div markdown="1" class="ipv4 wg0" style="display:none">
-_(Local tunnel network pool)_:
-<input type="hidden" name="Network:0" value="">
-: <span class="input"><input type="text" name="gui:Network:0" class="subnet" maxlength="15" value="<?=explode('/',$wg0['Network:0'])[0]?>" onchange="setPool($(document.wg0),'wg0')" pattern="<?=$validIP4?>" title="_(IPv4 network)_" placeholder="<?=$netpool['wg0']?>">/
- <input type="number" name="gui:Mask:0" class="mask" min="1" max="32" value="<?=explode('/',$wg0['Network:0'])[1]?>" onchange="if(quickValidate(this)) {setPool($(document.wg0),'wg0')}" placeholder="24"></span>
-
-</div>
-<div markdown="1" class="ipv6 wg0" style="display:none">
-_(Local tunnel network pool IPv6)_:
-<input type="hidden" name="Network6:0" value="">
-: <span class="input"><input type="text" name="gui:Network6:0" class="subnet" maxlength="40" value="<?=explode('/',$wg0['Network6:0'])[0]?>" onchange="setPool6($(document.wg0),'wg0')" pattern="<?=$validIP6?>" title="_(IPv6 network)_" placeholder="<?=$netpool6['wg0']?>">/
- <input type="number" name="gui:Mask6:0" class="mask" min="1" max="128" value="<?=explode('/',$wg0['Network6:0'])[1]?>" onchange="if(quickValidate(this)) {setPool6($(document.wg0),'wg0')}" placeholder="64"></span>
-
-</div>
-:wg_local_tunnel_network_pool_help:
-
-<div markdown="1" class="ipv4 wg0" style="display:none">
-_(Local tunnel address)_:
-: <span class="input"><input type="text" name="Address:0" class="subnet" maxlength="15" value="<?=$wg0['Address:0']?:long2ip($netbase['wg0']+1)?>" onchange="verifyInSubnet(this)" pattern="<?=$validIP4?>" title="_(IPv4 address)_"></span>
-
-:wg_local_tunnel_address_help:
-
-</div>
-<div markdown="1" class="ipv6 wg0" style="display:none">
-_(Local tunnel address IPv6)_:
-: <span class="input"><input type="text" name="Address6:0" class="subnet" maxlength="40" value="<?=$wg0['Address6:0']?:($netbase6['wg0'].'1')?>" onchange="verifyInSubnet6(this)" pattern="<?=$validIP6?>" title="_(IPv6 address)_"></span>
-
-:wg_local_tunnel_address_help:
-
-</div>
-</div>
-_(Local endpoint)_:
-: <span class="input"><input type="text" id="endpoint-wg0" name="Endpoint:0" class="subnet" value="<?=$vpn_wg0?'':$wg0['Endpoint:0']?>" onchange="toLC(this);quickValidate(this);" pattern="<?=$validText?>" title="_(IP address or FQDN)_" placeholder="<?=$vpn_wg0?'(not used)':preg_replace('/^(www\.).+(\.unraid.net)$/','$1<hash>$2',$public)?>">:
-  <input type="number" name="gui:ListenPort:0" class="port" min="1" max="65535" value="<?=$vpn_wg0?'':$wg0['ListenPort:0']?>" onchange="if(quickValidate(this)) {portRemark($(document.wg0),'wg0',this.value)}" placeholder="<?=$vpn_wg0?'':$netport['wg0']?>"></span>
-  <span class="remark block" style="display:none">_(Remark)_: _(configure your router with port forwarding of port)_ **<span id="my-port-wg0"><?=$wg0['ListenPort:0']?:$netport['wg0']?></span>/_(UDP)_** _(to)_ **<?=$server?>:<?=$wg0['ListenPort:0']?:$netport['wg0']?>**</span><span class="upnp wg0 block"></span>
-  <input type="hidden" name="ListenPort:0" value=""><dl id="endpoint4-wg0" style="display:none"></dl><dl id="endpoint6-wg0" style="display:none"></dl>
-
-:wg_local_endpoint_help:
-
-<div markdown="1" class="advanced wg0 zone0" style="display:none">
-_(Local server uses NAT)_:
-: <span class="input"><select name="NAT:0" class="narrow" onchange="showRoute($(document.wg0),'wg0',0)">
-  <?=mk_option($wg0['NAT:0'], "", _("Yes"))?>
-  <?=mk_option($wg0['NAT:0'], "no", _("No"))?>
-  </select></span>
-  <span id="my-static1-wg0" class="block" style="display:none">_(Remark)_: _(configure your router with a static route of)_ **<?=$wg0['Network:0']?>** _(to)_ **<?=$server?>**</span><span id="my-static2-wg0" class="block" style="display:none">_(Remark)_: _(docker containers on custom networks need static routing)_ **<?=$wg0['Network:0']?>** _(to)_ **<?=$server?>**</span>
-
-:wg_local_server_uses_nat_help:
-
-<div markdown="1" class="upnp wg0" style="display:none">
-_(Local gateway uses UPnP)_:
-: <span class="input"><select name="UPNP:0" class="narrow" onchange="showRemark($(document.wg0))">
-  <?=mk_option($wg0['UPNP:0'], "", _("Yes"))?>
-  <?=mk_option($wg0['UPNP:0'], "no", _("No"))?>
-  </select></span>
-
-:wg_local_gateway_uses_upnp_help:
-
-</div>
-_(Local tunnel firewall)_:
-: <span class="input"><input type="text" name="DROP:0" class="wide" value="<?=$wg0['DROP:0']?>" onchange="quickValidate(this);" pattern="<?=$validList?>" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_, _(CIDR optional)_" placeholder="(_(optional)_)"></span>
-  _(Rule)_: <select name="RULE:0" class="auto">
-  <?=mk_option($wg0['RULE:0'], "", _("Deny"))?>
-  <?=mk_option($wg0['RULE:0'], "1", _("Allow"))?>
-  </select>
-
-:wg_local_tunnel_firewall_help:
-
-_(MTU size)_:
-: <span class="input"><input type="number" name="MTU:0" class="trim" min="68" max="9198" value="<?=$wg0['MTU:0']?>" onchange="quickValidate(this);" placeholder="(_(automatic)_)">_(bytes)_</span>
-
-:wg_mtu_size_help:
-
-<!--
-_(DNS servers)_:
-: <span class="input"><input type="text" name="DNS:0" class="wide" value="" placeholder="(_(optional)_)"></span>
-
-> Not used at the moment. It gives errors when used together with Unraid.
--->
-</div>
-<input type="hidden" name="PostUp:0:0" value="<?=$postUp0?>">
-<input type="hidden" name="PostUp:0:1" value="<?=$postUp1?>">
-<input type="hidden" name="PostUp:0:2" value="">
-<input type="hidden" name="PostDown:0:0" value="<?=$postDown0?>">
-<input type="hidden" name="PostDown:0:1" value="<?=$postDown1?>">
-<input type="hidden" name="PostDown:0:2" value="">
-
-:wg_peer_configuration_help:
-
-<div id="peers-list-wg0" style="display:none"></div>
-<?foreach ($peer_wg0 as $i):?>
-<div markdown="1" id="index-wg0-<?=$i?>" class="shade-<?=$display['theme']?>">
-_(Peer name)_:
-: <span class="input"><input type="text" name="Name:<?=$i?>" class="wide" maxlength="99" value="<?=$wg0["Name:$i"]?>" onchange="quickValidate(this);" pattern="<?=$validname?>" title="_(Use only letters A-Z, digits or space,dash,underscore)_" placeholder="(_(optional)_)"></span>
-  <input type="button" class="form" value="_(Delete Peer)_" onclick="delPeer($(document.wg0),'#index-wg0-<?=$i?>')">
-  <span class="pin"><i class="fa fa-fw fa-eye eye<?=$i?><?=(file_exists("$etc/peers/peer-$tower-wg0-$i.conf")&&(int)$wg0["TYPE:$i"]!=7)?'':' key-off'?>" style="cursor:pointer" onclick="WGconfig(this,'peer-<?=$tower?>-wg0-<?=$i?>','/peers')" title="_(View Peer Config)_"></i>
-  <i class="fa fa-fw fa-key zone<?=$i?><?=$wg0["PublicKey:$i"]?'':' key-off'?>" style="cursor:pointer" onclick="openClose($(document.wg0),null,'div.key<?=$i?>')" title="_(Toggle keys)_"></i>
-  <i id="chevron-wg0-<?=$i?>" class="fa fa-fw fa-chevron-down" style="cursor:pointer" onclick="openClose($(document.wg0),this,'div.zone<?=$i?>')" title="_(Toggle view)_"></i></span>
-
-:wg_peer_name_help:
-
-_(Peer type of access)_:
-: <span class="input"><select name="TYPE:<?=$i?>" class="auto" onchange="updatePeer($(document.wg0),<?=$i?>,this.value,'wg0')">
-  <?=mk_option($wg0["TYPE:$i"], "0", _("Remote access to server"))?>
-  <?=mk_option($wg0["TYPE:$i"], "1", _("Remote access to LAN"))?>
-  <?=mk_option($wg0["TYPE:$i"], "2", _("Server to server access"))?>
-  <?=mk_option($wg0["TYPE:$i"], "3", _("LAN to LAN access"))?>
-  <?=mk_option($wg0["TYPE:$i"], "4", _("Server hub & spoke access"))?>
-  <?=mk_option($wg0["TYPE:$i"], "5", _("LAN hub & spoke access"))?>
-  <?=mk_option($wg0["TYPE:$i"], "6", _("Remote tunneled access"))?>
-  <?=mk_option($wg0["TYPE:$i"], "7", _("VPN tunneled access"),count($peer_wg0)==1?'':'disabled')?>
-  </select></span>
-  <span id="access-type-<?=$i?>" class="access-type"></span>
-
-<?if ($i==1):?>
-> ![](<?=autov('/webGui/images/wireguard-help.png')?>)
-<?endif;?>
-
-<div markdown="1" class="keys wg0 key<?=$i?>"<?=$wg0["PublicKey:$i"]?' style="display:none">':'>'?>
-_(Peer private key)_:
-: <span class="input"><input type="text" name="PrivateKey:<?=$i?>" class="wide private-<?=$i?>" maxlength="64" value="<?=$wg0["PrivateKey:$i"]?>" onchange="highlight($(document.wg0),this,<?=$i?>)" placeholder="(_(optional)_)"></span>
-  <input type="button" class="form" value="_(Generate Keypair)_" onclick="keypair($(document.wg0),'<?=$i?>')">
-
-:wg_generate_keypair_help:
-
-_(Peer public key)_:
-: <span class="input"><input type="text" name="PublicKey:<?=$i?>" class="wide public-<?=$i?>" maxlength="64" value="<?=$wg0["PublicKey:$i"]?>" onchange="highlight($(document.wg0),this,<?=$i?>)" placeholder="(_(mandatory)_)" required></span>
-
-:wg_generate_keypair_help:
-
-_(Peer preshared key)_:
-: <span class="input"><input type="text" name="PresharedKey:<?=$i?>" class="wide preshared-<?=$i?>" maxlength="64" value="<?=$wg0["PresharedKey:$i"]?>" onchange="highlight($(document.wg0),this,<?=$i?>)" placeholder="(_(optional)_)"></span>
-  <input type="button" class="form" value="_(Generate Key)_" onclick="presharedkey($(document.wg0),'<?=$i?>')">
-
-: wg_peer_preshared_key_help:
-
-</div>
-<div markdown="1" class="advanced wg0 zone<?=$i?>" style="display:none">
-<div markdown="1" class="ipv4 wg0" style="display:none">
-_(Peer tunnel address)_:
-: <span class="input"><input type="text" name="Address:<?=$i?>" class="subnet" maxlength="15" value="<?=$wg0["Address:$i"]?>" onchange="if(verifyInSubnet(this)){setAllow($(document.wg0),this.value,<?=$i?>)}" pattern="<?=$validIP4?>" title="_(IPv4 address)_"></span>
-  <input type="button" class="form ping-button1-<?=$i?>" value="_(Ping)_" onclick="ping($(document.wg0),this,'input[name=&quot;Address:<?=$i?>&quot;]')"<?=$wg0["Address:$i"]?'':' disabled'?>>
-
-</div>
-<div markdown="1" class="ipv6 wg0" style="display:none">
-_(Peer tunnel address IPv6)_:
-: <span class="input"><input type="text" name="Address6:<?=$i?>" class="subnet" maxlength="40" value="<?=$wg0["Address6:$i"]?>" onchange="if(verifyInSubnet6(this)){setAllow6($(document.wg0),this.value,<?=$i?>)}" pattern="<?=$validIP6?>" title="_(IPv6 address)_"></span>
-  <input type="button" class="form ping-button6-<?=$i?>" value="_(Ping)_" onclick="ping($(document.wg0),this,'input[name=&quot;Address6:<?=$i?>&quot;]')"<?=$wg0["Address6:$i"]?'':' disabled'?>>
-
-</div>
-:wg_peer_tunnel_address_help:
-
-_(Peer endpoint)_:
-<input type="hidden" name="Endpoint:<?=$i?>" value="">
-: <span class="input"><input type="text" name="gui:Endpoint:<?=$i?>" class="subnet" value="<?=$wg0["Endpoint:$i"]?>" pattern="<?=$validText?>" title="_(IP address or FQDN)_" onchange="toLC(this);quickValidate(this);" <?=($vpn_wg0||(int)$wg0["TYPE:$i"]==2||(int)$wg0["TYPE:$i"]==3)?'placeholder="(_(mandatory)_)" required':'placeholder="(_(not used)_)"'?>>:
-  <input type="number" name="gui:ListenPort:<?=$i?>" class="port" min="1" max="65535" value="<?=$wg0["ListenPort:$i"]?>" onchange="quickValidate(this);"<?=$wg0["Endpoint:$i"]?" placeholder=\"".($wg0['ListenPort:0']?:$netport['wg0'])."\"":""?>></span>
-  <input type="button" class="form ping-button2-<?=$i?>" value="_(Ping)_" onclick="ping($(document.wg0),this,'input[name=&quot;gui:Endpoint:<?=$i?>&quot;]')"<?=$wg0["Endpoint:$i"]?'':' disabled'?>>
-
-:wg_peer_endpoint_help:
-
-_(Peer allowed IPs)_:
-: <span class="input"><input type="text" name="AllowedIPs:<?=$i?>" class="wide" value="<?=$wg0["AllowedIPs:$i"]?>" onchange="quickValidate(this);" pattern="<?=$validList?>" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_, _(CIDR optional)_" placeholder="(_(mandatory)_)" required></span>
-
-:wg_peer_allowed_ips_help:
-
-_(Peer DNS server)_:
-: <span class="input"><input type="text" name="DNS:<?=$i?>" class="subnet" maxlength="40" value="<?=$wg0["DNS:$i"]?>" onchange="quickValidate(this);" pattern="<?=$validDNSServerList?>" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_"></span>
-
-:wg_peer_dns_server_help:
-
-_(Persistent keepalive)_:
-: <span class="input"><input type="number" name="PersistentKeepalive:<?=$i?>" class="trim" min="0" max="600" value="<?=$wg0["PersistentKeepalive:$i"]?>" onchange="quickValidate(this);" placeholder="(_(disabled)_)">_(seconds)_</span>
-
-:wg_persistent_keepalive_help:
-
-</div>
-<span class="pin">_(Data received)_: <span class="rx-wg0-<?=$i?>">0 B</span>_(Data sent)_: <span class="tx-wg0-<?=$i?>">0 B</span><br>_(Last handshake)_: <span class="hs-wg0-<?=$i?>">_(unknown)_</span></span>
-</div>
-<?endforeach;?>
-
-&nbsp;
-: <input type="submit" value="_(Apply)_" onclick="return(validateForm($(document.wg0),'wg0'))" disabled><input type="button" value="_(Done)_" onclick="done()"><input type="button" value="_(Add Peer)_" onclick="addPeer($(document.wg0),'wg0')">
-  <input type="button" class="advanced wg0" value="_(Delete Tunnel)_" style="float:right;display:none" onclick="delTunnel('wg0')"<?=file_exists($conf_wg0)?'':' disabled'?>>
-</form>
-<small style="position:absolute;right:0;bottom:0">"WireGuard" and the "WireGuard" logo are registered trademarks of Jason A. Donenfield</small>
-
-<script markdown="1" type="text/html" id="peer-template-wg0">
-<div markdown="1" id="index-wg0-INDEX" class="shade-<?=$display['theme']?>">
-_(Peer name)_:
-: <span class="input"><input type="text" name="Name:INDEX" class="wide" maxlength="99" value="" onchange="quickValidate(this);" pattern="<?=$validname?>" title="_(Use only letters A-Z, digits or space,dash,underscore)_" placeholder="(_(optional)_)"></span>
-  <span class="pin"><i class="fa fa-fw fa-eye eyeINDEX key-off" title="_(Show Peer Config)_"></i>
-  <i class="fa fa-fw fa-key zoneINDEX key-off" title="_(Toggle keys)_"></i>
-  <i id="chevron-wg0-INDEX" class="fa fa-fw fa-chevron-down" style="cursor:pointer" onclick="openClose($(document.wg0),this,'div.zoneINDEX')" title="_(Toggle view)_"></i></span>
-
-:wg_peer_name_help:
-
-_(Peer type of access)_:
-: <span class="input"><select name="TYPE:INDEX" class="auto" onchange="updatePeer($(document.wg0),INDEX,this.value,'wg0')">
-  <?=mk_option(0, "0", _("Remote access to server"))?>
-  <?=mk_option(0, "1", _("Remote access to LAN"))?>
-  <?=mk_option(0, "2", _("Server to server access"))?>
-  <?=mk_option(0, "3", _("LAN to LAN access"))?>
-  <?=mk_option(0, "4", _("Server hub & spoke access"))?>
-  <?=mk_option(0, "5", _("LAN hub & spoke access"))?>
-  <?=mk_option(0, "6", _("Remote tunneled access"))?>
-  <?=mk_option(0, "7", _("VPN tunneled access"),'disabled')?>
-  </select></span>
-  <span id="access-type-INDEX" class="access-type"></span>
-
-> ![](<?=autov('/webGui/images/wireguard-help.png')?>)
-
-<div markdown="1" class="keys wg0 keyINDEX">
-_(Peer private key)_:
-: <span class="input"><input type="text" name="PrivateKey:INDEX" class="wide private-INDEX" maxlength="64" value="" onchange="highlight($(document.wg0),this,0)" placeholder="(_(optional)_)"></span>
-  <input type="button" class="form" value="_(Generate Keypair)_" onclick="keypair($(document.wg0),'INDEX')">
-
-:wg_generate_keypair_help:
-
-_(Peer public key)_:
-: <span class="input"><input type="text" name="PublicKey:INDEX" class="wide public-INDEX" maxlength="64" onchange="highlight($(document.wg0),this,0)" placeholder="(_(mandatory)_)" value="" required></span>
-
-:wg_generate_keypair_help:
-
-_(Peer preshared key)_:
-: <span class="input"><input type="text" name="PresharedKey:INDEX" class="wide preshared-INDEX" maxlength="64" value="" onchange="highlight($(document.wg0),this,0)" placeholder="(_(optional)_)"></span>
-  <input type="button" class="form" value="_(Generate Key)_" onclick="presharedkey($(document.wg0),'INDEX')">
-
-:wg_peer_preshared_key_help:
-
-</div>
-<div markdown="1" class="advanced wg0 zoneINDEX" style="display:none">
-<div markdown="1" class="ipv4 wg0" style="display:none">
-_(Peer tunnel address)_:
-: <span class="input"><input type="text" name="Address:INDEX" class="subnet" maxlength="15" value="" onchange="if(verifyInSubnet(this)){setAllow($(document.wg0),this.value,INDEX)}" pattern="<?=$validIP4?>" title="_(IPv4 address)_"></span>
-  <input type="button" class="form ping-button1-INDEX" value="_(Ping)_" onclick="ping($(document.wg0),this,'input[name=&quot;Address:INDEX&quot;]')" disabled>
-
-</div>
-<div markdown="1" class="ipv6 wg0" style="display:none">
-_(Peer tunnel address IPv6)_:
-: <span class="input"><input type="text" name="Address6:INDEX" class="subnet" maxlength="40" value="" onchange="if(verifyInSubnet6(this)){setAllow6($(document.wg0),this.value,INDEX)}" pattern="<?=$validIP6?>" title="_(IPv6 address)_"></span>
-  <input type="button" class="form ping-button6-INDEX" value="_(Ping)_" onclick="ping($(document.wg0),this,'input[name=&quot;Address6:INDEX&quot;]')" disabled>
-
-</div>
-:wg_peer_tunnel_address_help:
-
-_(Peer endpoint)_:
-<input type="hidden" name="Endpoint:INDEX" value="">
-: <span class="input"><input type="text" name="gui:Endpoint:INDEX" class="subnet" value="" pattern="<?=$validText?>" title="_(IP address or FQDN)_" onchange="toLC(this);quickValidate(this);" placeholder="(_(not used)_)">:
-  <input type="number" name="gui:ListenPort:INDEX" class="port" min="1" max="65535" value="" onchange="quickValidate(this);"></span>
-  <input type="button" class="form ping-button2-INDEX" value="_(Ping)_" onclick="ping($(document.wg0),this,'input[name=&quot;gui:Endpoint:INDEX&quot;]')" disabled>
-
-:wg_peer_endpoint_help:
-
-_(Peer allowed IPs)_:
-: <span class="input"><input type="text" name="AllowedIPs:INDEX" class="wide" value="" onchange="quickValidate(this);" pattern="<?=$validList?>" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_, _(CIDR optional)_" placeholder="(_(mandatory)_)" required></span>
-
-:wg_peer_allowed_ips_help:
-
-_(Peer DNS server)_:
-: <span class="input"><input type="text" name="DNS:INDEX" class="subnet" maxlength="40" value="" onchange="quickValidate(this);" pattern="<?=$validDNSServerList?>" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_" placeholder="(_(optional)_)"></span>
-
-:wg_peer_dns_server_help:
-
-_(Persistent keepalive)_:
-: <span class="input"><input type="number" name="PersistentKeepalive:INDEX" class="trim" min="0" max="600" value="" onchange="quickValidate(this);" placeholder="(_(disabled)_)">_(seconds)_</span>
-
-:wg_persistent_keepalive_help:
-
-</div>
-</div>
-</script>
-</div>
diff --git a/plugins/dynamix/WGX.page b/plugins/dynamix/WGX.page
deleted file mode 100644
index a63903946..000000000
--- a/plugins/dynamix/WGX.page
+++ /dev/null
@@ -1,456 +0,0 @@
-Menu="parentname:nnn"
-Title="Tunnel wgX"
-Tag="icon-vpn"
----
-<?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.
- */
-?>
-<?
-$check_wgX = in_array('wgX',$active) ? 'true' : 'false';
-$start_wgX = in_array('wgX',$autostart);
-$peer_wgX  = $wgX = [];
-
-$netpool['wgX']  = long2ip(ip2long($netpool['wg0'])+XXX*256);
-$netpool6['wgX'] = str_replace(':0:0:',':XXX:0:',$netpool6['wg0']);
-$netport['wgX']  = $netport['wg0']+XXX;
-
-// read current configuration
-[$conf_wgX,$cfg_wgX,$this_wgX,$vpn_wgX] = readConf($peer_wgX,$wgX,'wgX');
-?>
-<script>
-netbase['wgX'] = <?=$netbase['wgX']?>;
-netpool['wgX'] = '<?=$netpool['wgX']?>';
-netport['wgX'] = '<?=$netport['wgX']?>';
-netbase6['wgX'] = '<?=$netbase6['wgX']?>';
-netpool6['wgX'] = '<?=$netpool6['wgX']?>';
-
-tstate['wgX'] = "<?=$check_wgX ? 'active' : ''?>";
-
-$(function(){
-  var ctrl = "<span class='status vhshift hshift'><i id='block-wgX' class='fa fa-fw fa-chevron-up' style='cursor:pointer' onclick='blockToggle(&quot;wgX&quot;)'></i></span>";
-  ctrl += "<span class='even wide'><span class='status vshift label'>_(Autostart)_</span><span class='status vhshift'><input type='checkbox' id='start-wgX' style='display:none'<?=$start_wgX?' checked':''?>></span></span>";
-  ctrl += "<span class='even'><span class='status vhshift'><input type='checkbox' id='view-wgX' style='display:none'></span></span>";
-  ctrl += "<span class='even'><span class='status vhshift'><input type='checkbox' id='toggle-wgX' style='display:none'></span></span>";
-  var form = $(document.wgX);
-  getPublicIP($('#endpoint-wgX').val(),'wgX',$('#protocol-wgX').val());
-  $('div#title').each(function(){if ($(this).html().indexOf('status vhshift')==-1) {$(this).find('span.left').append(ctrl);return false;}});
-  $('#start-wgX').switchButton({labels_placement:'left',off_label:"_(Off)_",on_label:"_(On)_"});
-  $('#start-wgX').change(function(){
-    var start = $('#start-wgX').is(':checked') ? 'on' : 'off';
-    $.post('/webGui/include/update.wireguard.php',{'#cmd':'autostart','#start':start,'#vtun':'wgX'});
-  });
-  $('#toggle-wgX').switchButton({labels_placement:'left',off_label:"_(Inactive)_",on_label:"_(Active)_",checked:<?=$check_wgX?>});
-  $('#toggle-wgX').change(function(e){
-<?if ($this_wgX):?>
-    e.preventDefault();
-    e.stopPropagation();
-    var wg = $('#toggle-wgX').is(':checked') ? 'start' : 'stop';
-    $.post('/webGui/include/update.wireguard.php',{'#cmd':'toggle','#wg':wg,'#vtun':'wgX'},function(ok){
-      if (wg=='start') {
-        if (ok) tstate['wgX']='active'; else $('#toggle-wgX').switchButton({checked:false});
-      } else {
-        if (ok) tstate['wgX']=''; else $('#toggle-wgX').switchButton({checked:true});
-      }
-<?if ($wgX['UPNP:0']===''):?>
-      $.post('/webGui/include/update.wireguard.php',{'#cmd':'upnpc','#xml':xml,'#vtun':'wgX','#link':'<?=$link?>','#ip':'<?=$server?>','#wg':tstate['wgX']},function(data){$('span.upnp.wgX').text(data);});
-<?endif;?>
-    });
-<?else:?>
-    $('#toggle-wgX').prop('checked',false).trigger('change');
-<?endif;?>
-  });
-  if ($.cookie('view-wgX')=='advanced') {
-    $('.advanced.wgX').show();
-    form.find('i.fa-chevron-down').removeClass('fa-chevron-down').addClass('fa-chevron-up');
-    form.find('input[class*="zone"]').show();
-    form.find('i[class*="zone"]').each(function(i){if (!form.find('input[name="PublicKey:'+i+'"]').val()) {
-      $('div.wgX.key'+i).show();
-      $(this).removeClass('key-off').addClass('key-off');
-    }});
-  }
-  $('#view-wgX').switchButton({labels_placement:'left',off_label:"_(Basic)_",on_label:"_(Advanced)_",checked:$.cookie('view-wgX')=='advanced'});
-  $('#view-wgX').change(function(){
-    if ($.cookie('view-wgX')==null) {
-      // advanced view
-      $.cookie('view-wgX','advanced',{expires:3650});
-      $('.advanced.wgX').show('slow');
-      form.find('input[class*="zone"]').show('slow');
-      form.find('i.fa-chevron-down').removeClass('fa-chevron-down').addClass('fa-chevron-up');
-      form.find('i[class*="zone"]').each(function(i){if (!form.find('input[name="PublicKey:'+i+'"]').val()) {
-        $('div.wgX.key'+i).show('slow');
-        $(this).removeClass('key-off').addClass('key-off');
-      }});
-    } else {
-      // basic view
-      $.removeCookie('view-wgX');
-      $('.advanced.wgX').hide('slow');
-      form.find('i.fa-chevron-up').removeClass('fa-chevron-up').addClass('fa-chevron-down');
-      form.find('i[class*="zone"]').each(function(i){if (form.find('input[name="PublicKey:'+i+'"]').val()) {
-        form.find('input[class$="zone'+i+'"]').hide('slow');
-        $('div.wgX.key'+i).hide('slow');
-        $(this).removeClass('key-off');
-      }});
-    }
-  });
-  showRemark(form);
-  setProtocol(form,'wgX');
-  form.find('input[name^="Address:"]').each(function(){
-    var i = $(this).attr('name').split(':')[1];
-    if (i>0) $(this).on('input change',function(){form.find('#ping-button1-'+i).prop('disabled',$(this).val()=='');});
-  });
-  form.find('input[name^="Address6:"]').each(function(){
-    var i = $(this).attr('name').split(':')[1];
-    if (i>0) $(this).on('input change',function(){form.find('.ping-button6-'+i).prop('disabled',$(this).val()=='');});
-  });
-  form.find('input[name^="gui:Endpoint:"]').each(function(){
-    var i = $(this).attr('name').split(':')[2];
-    $(this).on('input change',function(){
-      form.find('#ping-button2-'+i).prop('disabled',$(this).val()=='');
-    });
-  });
-  if (!$.cookie('block-wgX')) $('div#block-wgX').show(); else $('i#block-wgX').removeClass('fa-chevron-up').addClass('fa-chevron-down');
-  if (xml) {
-    $('div.upnp.wgX').show();
-<?if ($wgX['UPNP:0']===''):?>
-    $.post('/webGui/include/update.wireguard.php',{'#cmd':'upnpc','#xml':xml,'#vtun':'wgX','#link':'<?=$link?>','#ip':'<?=$server?>','#wg':$.cookie('my-wgX')},function(data){$('span.upnp.wgX').text(data);});
-<?endif;?>
-  } else {
-    form.find('select[name="UPNP:0"]').val('no');
-  }
-  var vpn = false, lan = false
-  form.find('select[name^="TYPE:"]').each(function(){
-    var i = $(this).attr('name').split(':')[1];
-    vpn |= $(this).val()=='7';
-    lan |= $(this).val()=='6' || $(this).val() % 2;
-    form.find('input[name="DNS:'+i+'"]').attr('placeholder',$(this).val()=='7' ? "(_(not used)_)" : "(_(optional)_)");
-    showAccess(form,i,$(this).val());
-  });
-  if (vpn) form.find('select[name="NAT:0"]').val('no').prop('disabled',true);
-  else if (form.find('select[name="NAT:0"]').val()=='no' && lan) $('span#my-static1-wgX').show();
-  else if (lan) $('span#my-static2-wgX').show();
-});
-</script>
-<div markdown="1" id="block-wgX" style="display:none">
-<form markdown="1" name="wgX" autocomplete="off" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareSettings($(this),'wgX')">
-<input type="hidden" name="#include" value="/webGui/include/update.wireguard.php">
-<input type="hidden" name="#file" value="<?=$conf_wgX?>">
-<input type="hidden" name="#cfg" value="<?=$cfg_wgX?>">
-<input type="hidden" name="#cmd" value="update">
-<input type="hidden" name="#name" value="<?=$tower?>">
-<input type="hidden" name="#vtun" value="wgX">
-<input type="hidden" name="#wg" value="">
-<input type="hidden" name="#internet" value="<?=$public?>">
-<input type="hidden" name="#subnets1" value="">
-<input type="hidden" name="#subnets2" value="">
-<input type="hidden" name="#shared1" value="">
-<input type="hidden" name="#shared2" value="">
-<input type="hidden" name="#deleted" value="">
-<input type="hidden" name="#locale" value="<?=$locale?>">
-_(Local name)_:
-: <span class="input"><input type="text" name="Name:0" class="wide" maxlength="99" value="<?=$wgX["Name:0"]?>" pattern="<?=$validname?>" title="_(Use only letters A-Z, digits or space,dash,underscore)_" placeholder="(_(optional)_)"></span>
-  <span class="pin"><i class="fa fa-fw fa-eye eye0<?=$this_wgX?'':' key-off'?>" style="cursor:pointer" onclick="WGconfig(this,'wgX','')" title="_(View Local Config)_"></i>
-  <i class="fa fa-fw fa-key zone0<?=$wgX['PublicKey:0']?'':' key-off'?>" style="cursor:pointer" onclick="openClose($(document.wgX),null,'div.key0')" title="_(Toggle keys)_"></i>
-  <i id="chevron-wgX-0" class="fa fa-fw fa-chevron-down" style="cursor:pointer" onclick="openClose($(document.wgX),this,'div.zone0')" title="_(Toggle view)_"></i></span>
-
-:wg_local_name_help:
-
-<div markdown="1" class="keys wgX key0"<?=$wgX['PublicKey:0']?' style="display:none">':'>'?>
-_(Local private key)_:
-: <span class="input"><input type="text" name="PrivateKey:0" class="wide private-0" maxlength="64" value="<?=$wgX['PrivateKey:0']?>" onchange="highlight($(document.wgX),this,0)" placeholder="(_(mandatory)_)" required></span>
-  <input type="button" class="form" value="_(Generate Keypair)_" onclick="keypair($(document.wgX),'0')">
-
-:wg_generate_keypair_help:
-
-_(Local public key)_:
-: <span class="input"><input type="text" name="PublicKey:0" class="wide public-0" maxlength="64" value="<?=$wgX['PublicKey:0']?>" onchange="highlight($(document.wgX),this,0)" placeholder="(_(mandatory)_)" required></span>
-
-:wg_generate_keypair_help:
-
-</div>
-<div markdown="1" class="advanced wgX zone0" style="display:none">
-_(Network protocol)_:
-: <span class="input"><select id="protocol-wgX" name="PROT:0" class="subnet" onchange="setProtocol($(document.wgX),'wgX',true)">
-  <?=mk_option($wgX['PROT:0'], "", _("IPv4 only"))?>
-  <?=mk_option($wgX['PROT:0'], "6", _("IPv6 only"))?>
-  <?=mk_option($wgX['PROT:0'], "46", _("IPv4 + IPv6"))?>
-  </select></span>
-
-<div markdown="1" class="ipv4 wgX" style="display:none">
-_(Local tunnel network pool)_:
-<input type="hidden" name="Network:0" value="">
-: <span class="input"><input type="text" name="gui:Network:0" class="subnet" maxlength="15" value="<?=explode('/',$wgX['Network:0'])[0]?>" onchange="setPool($(document.wgX),'wgX')" pattern="<?=$validIP4?>" title="_(IPv4 network)_" placeholder="<?=$netpool['wgX']?>">/
- <input type="number" name="gui:Mask:0" class="mask" min="1" max="32" value="<?=explode('/',$wgX['Network:0'])[1]?>" onchange="if(quickValidate(this)) {setPool($(document.wgX),'wgX')}" placeholder="24"></span>
-
-</div>
-<div markdown="1" class="ipv6 wgX" style="display:none">
-_(Local tunnel network pool IPv6)_:
-<input type="hidden" name="Network6:0" value="">
-: <span class="input"><input type="text" name="gui:Network6:0" class="subnet" maxlength="40" value="<?=explode('/',$wgX['Network6:0'])[0]?>" onchange="setPool6($(document.wgX),'wgX')" pattern="<?=$validIP6?>" title="_(IPv6 network)_" placeholder="<?=$netpool6['wgX']?>">/
- <input type="number" name="gui:Mask6:0" class="mask" min="1" max="128" value="<?=explode('/',$wgX['Network6:0'])[1]?>" onchange="if(quickValidate(this)) {setPool6($(document.wgX),'wgX')}" placeholder="64"></span>
-
-</div>
-:wg_local_tunnel_network_pool_X_help:
-
-<div markdown="1" class="ipv4 wgX" style="display:none">
-_(Local tunnel address)_:
-: <span class="input"><input type="text" name="Address:0" class="subnet" maxlength="15" value="<?=$wgX['Address:0']?:long2ip($netbase['wgX']+1)?>" onchange="verifyInSubnet(this);" pattern="<?=$validIP4?>" title="_(IPv4 address)_"></span>
-
-:wg_local_tunnel_address_help:
-
-</div>
-<div markdown="1" class="ipv6 wgX" style="display:none">
-_(Local tunnel address IPv6)_:
-: <span class="input"><input type="text" name="Address6:0" class="subnet" maxlength="40" value="<?=$wgX['Address6:0']?:($netbase6['wgX'].'1')?>" onchange="verifyInSubnet6(this);" pattern="<?=$validIP6?>" title="_(IPv6 address)_"></span>
-
-:wg_local_tunnel_address_help:
-
-</div>
-</div>
-_(Local endpoint)_:
-: <span class="input"><input type="text" id="endpoint-wgX" name="Endpoint:0" class="subnet" value="<?=$vpn_wgX?'':$wgX['Endpoint:0']?>" onchange="toLC(this);quickValidate(this);" pattern="<?=$validText?>" title="_(IP address or FQDN)_" placeholder="<?=$vpn_wgX?'(not used)':preg_replace('/^(www\.).+(\.unraid.net)$/','$1<hash>$2',$public)?>">:
-  <input type="number" name="gui:ListenPort:0" class="port" min="1" max="65535" value="<?=$vpn_wgX?'':$wgX['ListenPort:0']?>" onchange="if(quickValidate(this)) {portRemark($(document.wgX),'wgX',this.value)}"  placeholder="<?=$vpn_wgX?'':$netport['wgX']?>"></span>
-  <span class="remark block" style="display:none">_(Remark)_: _(configure your router with port forwarding of port)_ **<span id="my-port-wgX"><?=$wgX['ListenPort:0']?:$netport['wgX']?></span>/_(UDP)_** _(to)_ **<?=$server?>:<?=$wgX['ListenPort:0']?:$netport['wgX']?>**</span><span class="upnp wgX block"></span>
-  <input type="hidden" name="ListenPort:0" value=""><dl id="endpoint4-wgX" style="display:none"></dl><dl id="endpoint6-wgX" style="display:none"></dl>
-
-:wg_local_endpoint_X_help:
-
-<div markdown="1" class="advanced wgX zone0" style="display:none">
-_(Local server uses NAT)_:
-: <span class="input"><select name="NAT:0" class="narrow" onchange="showRoute($(document.wgX),'wgX',0)">
-  <?=mk_option($wgX['NAT:0'], "", _("Yes"))?>
-  <?=mk_option($wgX['NAT:0'], "no", _("No"))?>
-  </select></span>
-  <span id="my-static1-wgX" class="block" style="display:none">_(Remark)_: _(configure your router with a static route of)_ **<?=$wgX['Network:0']?>** _(to)_ **<?=$server?>**</span><span id="my-static2-wgX" class="block" style="display:none">_(Remark)_: _(docker containers on custom networks need static routing)_ **<?=$wgX['Network:0']?>** _(to)_ **<?=$server?>**</span>
-
-:wg_local_server_uses_nat_help:
-
-<div markdown="1" class="upnp wg0" style="display:none">
-_(Local gateway uses UPnP)_:
-: <span class="input"><select name="UPNP:0" class="narrow" onchange="showRemark($(document.wgX))">
-  <?=mk_option($wgX['UPNP:0'], "", _("Yes"))?>
-  <?=mk_option($wgX['UPNP:0'], "no", _("No"))?>
-  </select></span>
-
-:wg_local_gateway_uses_upnp_help:
-
-</div>
-_(Local tunnel firewall)_:
-: <span class="input"><input type="text" name="DROP:0" class="wide" value="<?=$wgX['DROP:0']?>" onchange="quickValidate(this);" pattern="<?=$validList?>" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_, _(CIDR optional)_" placeholder="(_(optional)_)"></span>
-  _(Rule)_: <select name="RULE:0" class="auto">
-  <?=mk_option($wgX['RULE:0'], "", _("Deny"))?>
-  <?=mk_option($wgX['RULE:0'], "1", _("Allow"))?>
-  </select>
-
-:wg_local_tunnel_firewall_help:
-
-_(MTU size)_:
-: <span class="input"><input type="number" name="MTU:0" class="trim" min="68" max="9198" value="<?=$wgX['MTU:0']?>" onchange="quickValidate(this);" placeholder="(_(automatic)_)">_(bytes)_</span>
-
-:wg_mtu_size_help:
-
-<!--
-_(DNS servers)_:
-: <span class="input"><input type="text" name="DNS:0" class="wide" value="" placeholder="(_(optional)_)"></span>
-
-> Not used at the moment. It gives errors when used together with Unraid.
--->
-</div>
-<input type="hidden" name="PostUp:0:0" value="<?=$postUp0?>">
-<input type="hidden" name="PostUp:0:1" value="<?=$postUp1?>">
-<input type="hidden" name="PostUp:0:2" value="">
-<input type="hidden" name="PostDown:0:0" value="<?=$postDown0?>">
-<input type="hidden" name="PostDown:0:1" value="<?=$postDown1?>">
-<input type="hidden" name="PostDown:0:2" value="">
-
-:wg_peer_configuration_help:
-
-<div id="peers-list-wgX" style="display:none"></div>
-<?foreach ($peer_wgX as $i):?>
-<div markdown="1" id="index-wgX-<?=$i?>" class="shade-<?=$display['theme']?>">
-_(Peer name)_:
-: <span class="input"><input type="text" name="Name:<?=$i?>" class="wide" maxlength="99" value="<?=$wgX["Name:$i"]?>" onchange="quickValidate(this);" pattern="<?=$validname?>" title="_(Use only letters A-Z, digits or space,dash,underscore)_" placeholder="(_(optional)_)"></span>
-  <input type="button" class="form" value="_(Delete Peer)_" onclick="delPeer($(document.wgX),'#index-wgX-<?=$i?>')">
-  <span class="pin"><i class="fa fa-fw fa-eye eye<?=$i?><?=(file_exists("$etc/peers/peer-$tower-wgX-$i.conf")&&(int)$wgX["TYPE:$i"]!=7)?'':' key-off'?>" style="cursor:pointer" onclick="WGconfig(this,'peer-<?=$tower?>-wgX-<?=$i?>','/peers')" title="_(View Peer Config)_"></i>
-  <i class="fa fa-fw fa-key zone<?=$i?><?=$wgX["PublicKey:$i"]?'':' key-off'?>" style="cursor:pointer" onclick="openClose($(document.wgX),null,'div.key<?=$i?>')" title="_(Toggle keys)_"></i>
-  <i id="chevron-wgX-<?=$i?>" class="fa fa-fw fa-chevron-down" style="cursor:pointer" onclick="openClose($(document.wgX),this,'div.zone<?=$i?>')" title="_(Toggle view)_"></i></span>
-
-:wg_peer_name_help:
-
-_(Peer type of access)_:
-: <span class="input"><select name="TYPE:<?=$i?>" class="auto" onchange="updatePeer($(document.wgX),<?=$i?>,this.value,'wgX')">
-  <?=mk_option($wgX["TYPE:$i"], "0", _("Remote access to server"))?>
-  <?=mk_option($wgX["TYPE:$i"], "1", _("Remote access to LAN"))?>
-  <?=mk_option($wgX["TYPE:$i"], "2", _("Server to server access"))?>
-  <?=mk_option($wgX["TYPE:$i"], "3", _("LAN to LAN access"))?>
-  <?=mk_option($wgX["TYPE:$i"], "4", _("Server hub & spoke access"))?>
-  <?=mk_option($wgX["TYPE:$i"], "5", _("LAN hub & spoke access"))?>
-  <?=mk_option($wgX["TYPE:$i"], "6", _("Remote tunneled access"))?>
-  <?=mk_option($wgX["TYPE:$i"], "7", _("VPN tunneled access"),count($peer_wgX)==1?'':'disabled')?>
-  </select></span>
-  <span id="access-type-<?=$i?>" class="access-type"></span>
-
-<?if ($i==1):?>
-> ![](<?=autov('/webGui/images/wireguard-help.png')?>)
-<?endif;?>
-
-<div markdown="1" class="keys wgX key<?=$i?>"<?=$wgX["PublicKey:$i"]?' style="display:none">':'>'?>
-_(Peer private key)_:
-: <span class="input"><input type="text" name="PrivateKey:<?=$i?>" class="wide private-<?=$i?>" maxlength="64" value="<?=$wgX["PrivateKey:$i"]?>" onchange="highlight($(document.wgX),this,<?=$i?>)" placeholder="(_(optional)_)"></span>
-  <input type="button" class="form" value="_(Generate Keypair)_" onclick="keypair($(document.wgX),'<?=$i?>')">
-
-:wg_generate_keypair_help:
-
-_(Peer public key)_:
-: <span class="input"><input type="text" name="PublicKey:<?=$i?>" class="wide public-<?=$i?>" maxlength="64" value="<?=$wgX["PublicKey:$i"]?>" onchange="highlight($(document.wgX),this,<?=$i?>)" placeholder="(_(mandatory)_)" required></span>
-
-:wg_generate_keypair_help:
-
-_(Peer preshared key)_:
-: <span class="input"><input type="text" name="PresharedKey:<?=$i?>" class="wide preshared-<?=$i?>" maxlength="64" value="<?=$wgX["PresharedKey:$i"]?>" onchange="highlight($(document.wgX),this,<?=$i?>)" placeholder="(_(optional)_)"></span>
-  <input type="button" class="form" value="_(Generate Key)_" onclick="presharedkey($(document.wgX),'<?=$i?>')">
-
-: wg_peer_preshared_key_help:
-
-</div>
-<div markdown="1" class="advanced wgX zone<?=$i?>" style="display:none">
-<div markdown="1" class="ipv4 wgX" style="display:none">
-_(Peer tunnel address)_:
-: <span class="input"><input type="text" name="Address:<?=$i?>" class="subnet" maxlength="15" value="<?=$wgX["Address:$i"]?>" onchange="if(verifyInSubnet(this)){setAllow($(document.wgX),this.value,<?=$i?>)}" pattern="<?=$validIP4?>" title="_(IPv4 address)_"></span>
-  <input type="button" class="form ping-button1-<?=$i?>" value="_(Ping)_" onclick="ping($(document.wgX),this,'input[name=&quot;Address:<?=$i?>&quot;]')"<?=$wgX["Address:$i"]?'':' disabled'?>>
-
-</div>
-<div markdown="1" class="ipv6 wgX" style="display:none">
-_(Peer tunnel address IPv6)_:
-: <span class="input"><input type="text" name="Address6:<?=$i?>" class="subnet" maxlength="40" value="<?=$wgX["Address6:$i"]?>" onchange="if(verifyInSubnet6(this)){setAllow6($(document.wgX),this.value,<?=$i?>)}" pattern="<?=$validIP6?>" title="_(IPv6 address)_"></span>
-  <input type="button" class="form ping-button6-<?=$i?>" value="_(Ping)_" onclick="ping($(document.wgX),this,'input[name=&quot;Address6:<?=$i?>&quot;]')"<?=$wgX["Address6:$i"]?'':' disabled'?>>
-
-</div>
-:wg_peer_tunnel_address_help:
-
-_(Peer endpoint)_:
-<input type="hidden" name="Endpoint:<?=$i?>" value="">
-: <span class="input"><input type="text" name="gui:Endpoint:<?=$i?>" class="subnet" value="<?=$wgX["Endpoint:$i"]?>" pattern="<?=$validText?>" title="_(IP address or FQDN)_" onchange="toLC(this);quickValidate(this);" <?=($vpn_wgX||(int)$wgX["TYPE:$i"]==2||(int)$wgX["TYPE:$i"]==3)?'placeholder="(_(mandatory)_)" required':'placeholder="(_(not used)_)"'?>>:
-  <input type="number" name="gui:ListenPort:<?=$i?>" class="port" min="1" max="65535" value="<?=$wgX["ListenPort:$i"]?>" onchange="quickValidate(this);"<?=$wgX["Endpoint:$i"]?" placeholder=\"".($wgX['ListenPort:0']?:$netport['wgX'])."\"":""?>></span>
-  <input type="button" class="form ping-button2-<?=$i?>" value="Ping" onclick="ping($(document.wgX),this,'input[name=&quot;gui:Endpoint:<?=$i?>&quot;]')"<?=$wgX["Endpoint:$i"]?'':' disabled'?>>
-
-:wg_peer_endpoint_help:
-
-_(Peer allowed IPs)_:
-: <span class="input"><input type="text" name="AllowedIPs:<?=$i?>" class="wide" value="<?=$wgX["AllowedIPs:$i"]?>" onchange="quickValidate(this);" pattern="<?=$validList?>" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_, _(CIDR optional)_" placeholder="(_(mandatory)_)" required></span>
-
-:wg_peer_allowed_ips_help:
-
-_(Peer DNS server)_:
-: <span class="input"><input type="text" name="DNS:<?=$i?>" class="subnet" maxlength="40" value="<?=$wgX["DNS:$i"]?>" onchange="quickValidate(this);" pattern="<?=$validDNSServerList?>" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_" placeholder="(_(optional)_)"></span>
-
-:wg_peer_dns_server_help:
-
-_(Persistent keepalive)_:
-: <span class="input"><input type="number" name="PersistentKeepalive:<?=$i?>" class="trim" min="0" max="600" value="<?=$wgX["PersistentKeepalive:$i"]?>" onchange="quickValidate(this);" placeholder="(_(disabled)_)">_(seconds)_</span>
-
-:wg_persistent_keepalive_help:
-
-</div>
-<span class="pin">_(Data received)_: <span class="rx-wgX-<?=$i?>">0 B</span>_(Data sent)_: <span class="tx-wgX-<?=$i?>">0 B</span><br>_(Last handshake)_: <span class="hs-wgX-<?=$i?>">_(unknown)_</span></span>
-</div>
-<?endforeach;?>
-
-&nbsp;
-: <input type="submit" value="_(Apply)_" onclick="return(validateForm($(document.wgX),'wgX'))" disabled><input type="button" value="_(Done)_" onclick="done()"><input type="button" value="_(Add Peer)_" onclick="addPeer($(document.wgX),'wgX')"><input type="button" class="advanced wgX" value="_(Delete Tunnel)_" style="float:right;display:none" onclick="delTunnel('wgX')">
-</form>
-
-<script markdown="1" type="text/html" id="peer-template-wgX">
-<div markdown="1" id="index-wgX-INDEX" class="shade-<?=$display['theme']?>">
-_(Peer name)_:
-: <span class="input"><input type="text" name="Name:INDEX" class="wide" maxlength="99" value="" onchange="quickValidate(this);" pattern="<?=$validname?>" title="_(Use only letters A-Z, digits or space,dash,underscore)_" placeholder="(_(optional)_)"></span>
-  <span class="pin"><i class="fa fa-fw fa-eye eyeINDEX key-off" title="_(Show Peer Config)_"></i>
-  <i class="fa fa-fw fa-key zoneINDEX key-off" title="_(Toggle keys)_"></i>
-  <i id="chevron-wgX-INDEX" class="fa fa-fw fa-chevron-down" style="cursor:pointer" onclick="openClose($(document.wgX),this,'div.zoneINDEX')" title="_(Toggle view)_"></i></span>
-
-:wg_peer_name_help:
-
-_(Peer type of access)_:
-: <span class="input"><select name="TYPE:INDEX" class="auto" onchange="updatePeer($(document.wgX),INDEX,this.value,'wgX')">
-  <?=mk_option(0, "0", _("Remote access to server"))?>
-  <?=mk_option(0, "1", _("Remote access to LAN"))?>
-  <?=mk_option(0, "2", _("Server to server access"))?>
-  <?=mk_option(0, "3", _("LAN to LAN access"))?>
-  <?=mk_option(0, "4", _("Server hub & spoke access"))?>
-  <?=mk_option(0, "5", _("LAN hub & spoke access"))?>
-  <?=mk_option(0, "6", _("Remote tunneled access"))?>
-  <?=mk_option(0, "7", _("VPN tunneled access"),'disabled')?>
-  </select></span>
-  <span id="access-type-INDEX" class="access-type"></span>
-
-> ![](<?=autov('/webGui/images/wireguard-help.png')?>)
-
-<div markdown="1" class="keys wgX keyINDEX">
-_(Peer private key)_:
-: <span class="input"><input type="text" name="PrivateKey:INDEX" class="wide private-INDEX" maxlength="64" value="" onchange="highlight($(document.wgX),this,0)" placeholder="(_(optional)_)"></span>
-  <input type="button" class="form" value="_(Generate Keypair)_" onclick="keypair($(document.wgX),'INDEX')">
-
-:wg_generate_keypair_help:
-
-_(Peer public key)_:
-: <span class="input"><input type="text" name="PublicKey:INDEX" class="wide public-INDEX" maxlength="64" onchange="highlight($(document.wgX),this,0)" placeholder="(_(mandatory)_)" value="" required></span>
-
-:wg_generate_keypair_help:
-
-_(Peer preshared key)_:
-: <span class="input"><input type="text" name="PresharedKey:INDEX" class="wide preshared-INDEX" maxlength="64" value="" onchange="highlight($(document.wgX),this,0)" placeholder="(_(optional)_)"></span>
-  <input type="button" class="form" value="_(Generate Key)_" onclick="presharedkey($(document.wgX),'INDEX')">
-
-:wg_peer_preshared_key_help:
-
-</div>
-<div markdown="1" class="advanced wgX zoneINDEX" style="display:none">
-<div markdown="1" class="ipv4 wgX" style="display:none">
-_(Peer tunnel address)_:
-: <span class="input"><input type="text" name="Address:INDEX" class="subnet" maxlength="15" value="" onchange="if(verifyInSubnet(this)){setAllow($(document.wgX),this.value,INDEX)}" pattern="<?=$validIP4?>" title="_(IPv4 address)_"></span>
-  <input type="button" class="form ping-button1-INDEX" value="_(Ping)_" onclick="ping($(document.wgX),this,'input[name=&quot;Address:INDEX&quot;]')" disabled>
-
-</div>
-<div markdown="1" class="ipv6 wgX" style="display:none">
-_(Peer tunnel address IPv6)_:
-: <span class="input"><input type="text" name="Address6:INDEX" class="subnet" maxlength="40" value="" onchange="if(verifyInSubnet6(this)){setAllow6($(document.wgX),this.value,INDEX)}" pattern="<?=$validIP6?>" title="_(IPv6 address)_"></span>
-  <input type="button" class="form ping-button6-INDEX" value="_(Ping)_" onclick="ping($(document.wgX),this,'input[name=&quot;Address6:INDEX&quot;]')" disabled>
-
-</div>
-:wg_peer_tunnel_address_help:
-
-_(Peer endpoint)_:
-<input type="hidden" name="Endpoint:INDEX" value="">
-: <span class="input"><input type="text" name="gui:Endpoint:INDEX" class="subnet" value="" pattern="<?=$validText?>" title="_(IP address or FQDN)_" onchange="toLC(this);quickValidate(this);" placeholder="(_(not used)_)">:
-  <input type="number" name="gui:ListenPort:INDEX" class="port" min="1" max="65535" value="" onchange="quickValidate(this);"></span>
-  <input type="button" class="form ping-button2-INDEX" value="_(Ping)_" onclick="ping($(document.wgX),this,'input[name=&quot;gui:Endpoint:INDEX&quot;]')" disabled>
-
-:wg_peer_endpoint_help:
-
-_(Peer allowed IPs)_:
-: <span class="input"><input type="text" name="AllowedIPs:INDEX" class="wide" value="" onchange="quickValidate(this);" pattern="<?=$validList?>" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_, _(CIDR optional)_" placeholder="(_(mandatory)_)" required></span>
-
-:wg_peer_allowed_ips_help:
-
-_(Peer DNS server)_:
-: <span class="input"><input type="text" name="DNS:INDEX" class="subnet" maxlength="40" value="" onchange="quickValidate(this);" pattern="<?=$validDNSServerList?>" title="_(Comma separated list of IPv4 and IPv6 IP addresses)_" placeholder="(_(optional)_)"></span>
-
-:wg_peer_dns_server_help:
-
-_(Persistent keepalive)_:
-: <span class="input"><input type="number" name="PersistentKeepalive:INDEX" class="trim" min="0" max="600" value="" onchange="quickValidate(this);" placeholder="(_(disabled)_)">_(seconds)_</span>
-
-:wg_persistent_keepalive_help:
-
-</div>
-</div>
-</script>
-</div>
diff --git a/plugins/dynamix/images/wireguard-help.png b/plugins/dynamix/images/wireguard-help.png
deleted file mode 100644
index e9fe651bb..000000000
Binary files a/plugins/dynamix/images/wireguard-help.png and /dev/null differ
diff --git a/plugins/dynamix/include/WGconfig.php b/plugins/dynamix/include/WGconfig.php
deleted file mode 100644
index 47b3788aa..000000000
--- a/plugins/dynamix/include/WGconfig.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.
- */
-?>
-<?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-// add translations
-$_SERVER['REQUEST_URI'] = 'settings';
-require_once "$docroot/webGui/include/Translations.php";
-
-require_once "$docroot/webGui/include/Helpers.php";
-
-$file = $_GET['file'];
-$path = realpath('/etc/wireguard'.$_GET['path']);
-$csrf = exec("grep -Pom1 '^csrf_token=\"\K.[^\"]+' /var/local/emhttp/var.ini");
-if (!$path || strpos($path,'/boot/config/wireguard')!==0 || !$_GET['csrf_token'] || $_GET['csrf_token']!=$csrf) return;
-?>
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-popup.css")?>">
-
-<script src="<?autov('/webGui/javascript/dynamix.js')?>"></script>
-<style>
-body{margin:20px 0 0 50px}
-pre{margin:0}
-div{width:100%;margin-bottom:30px}
-img{display:block;margin-bottom:10px}
-img:hover{transform:scale(1.1)}
-</style>
-<script>
-function cleanUp(id,file) {
-  if (document.hasFocus()) {
-    $('#'+id).val("<?=_('Download')?>").prop('disabled',false);
-    $.post('/webGui/include/Download.php',{cmd:'delete',file:file,csrf_token:'<?=$_GET['csrf_token']?>'});
-  } else {
-    setTimeout(function(){cleanUp(id,file);},1000);
-  }
-}
-function download(id,source,file) {
-  $('#'+id).val("<?=_('Downloading')?>...").prop('disabled',true);
-  $.post('/webGui/include/Download.php',{cmd:'save',source:source+'.conf',file:file,opts:'qj',csrf_token:'<?=$_GET['csrf_token']?>'},function(){
-    $.post('/webGui/include/Download.php',{cmd:'save',source:source+'.png',file:file,opts:'qj',csrf_token:'<?=$_GET['csrf_token']?>'},function(zip){
-      location = zip;
-      setTimeout(function(){cleanUp(id,file);},1000);
-    });
-  });
-}
-</script>
-<body>
-<h3><u><?=$_GET['path']?_('Remote peer configuration'):_('Local server configuration')?></u></h3>
-<div>
-<pre>
-<?readfile("$path/$file.conf")?>
-</pre>
-</div>
-<div>
-<?if (file_exists("$path/$file.png")):?>
-<img src="/webGui/include/WGimage.php?file=<?="$file.png"?>&csrf_token=<?=$_GET['csrf_token']?>&v=<?=filemtime("$path/$file.png")?>">
-<?endif;?>
-<input type="button" value="Close" onclick="top.Shadowbox.close()">
-<input type="button" id="download" value="<?=_('Download')?>" onclick="download(this.id,'<?="$path/$file"?>','<?=$file?>.zip')">
-</div>
-</body>
diff --git a/plugins/dynamix/include/WGimage.php b/plugins/dynamix/include/WGimage.php
deleted file mode 100644
index 7e42eb50f..000000000
--- a/plugins/dynamix/include/WGimage.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
- */
-?>
-<?
-$file = realpath('/etc/wireguard/peers/'.$_GET['file']);
-$lastmod = filemtime($file);
-$csrf = exec("grep -Pom1 '^csrf_token=\"\K.[^\"]+' /var/local/emhttp/var.ini");
-if (!$file || strpos($file,'/boot/config/wireguard')!==0 || !$_GET['csrf_token'] || $_GET['csrf_token']!=$csrf) return;
-
-if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $lastmod) {
-  header($_SERVER["SERVER_PROTOCOL"].' 304 Not Modified');
-} else {
-  header('Last-Modified:'.gmdate('D, d M Y H:i:s', $lastmod).' GMT');
-  header('Content-type:image/png');
-  readfile($file);
-}
-?>
\ No newline at end of file
diff --git a/plugins/dynamix/include/tld.key b/plugins/dynamix/include/tld.key
deleted file mode 100644
index cf3a39565..000000000
--- a/plugins/dynamix/include/tld.key
+++ /dev/null
@@ -1 +0,0 @@
-aaa|aarp|abarth|abb|abbott|abbvie|abc|able|abogado|abudhabi|ac|academy|accenture|accountant|accountants|aco|actor|ad|adac|ads|adult|ae|aeg|aero|aetna|af|afamilycompany|afl|africa|ag|agakhan|agency|ai|aig|aigo|airbus|airforce|airtel|akdn|al|alfaromeo|alibaba|alipay|allfinanz|allstate|ally|alsace|alstom|am|americanexpress|americanfamily|amex|amfam|amica|amsterdam|analytics|android|anquan|anz|ao|aol|apartments|app|apple|aq|aquarelle|ar|arab|aramco|archi|army|arpa|art|arte|as|asda|asia|associates|at|athleta|attorney|au|auction|audi|audible|audio|auspost|author|auto|autos|avianca|aw|aws|ax|axa|az|azure|ba|baby|baidu|banamex|bananarepublic|band|bank|bar|barcelona|barclaycard|barclays|barefoot|bargains|baseball|basketball|bauhaus|bayern|bb|bbc|bbt|bbva|bcg|bcn|bd|be|beats|beauty|beer|bentley|berlin|best|bestbuy|bet|bf|bg|bh|bharti|bi|bible|bid|bike|bing|bingo|bio|biz|bj|black|blackfriday|blockbuster|blog|bloomberg|blue|bm|bms|bmw|bn|bnpparibas|bo|boats|boehringer|bofa|bom|bond|boo|book|booking|bosch|bostik|boston|bot|boutique|box|br|bradesco|bridgestone|broadway|broker|brother|brussels|bs|bt|budapest|bugatti|build|builders|business|buy|buzz|bv|bw|by|bz|bzh|ca|cab|cafe|cal|call|calvinklein|cam|camera|camp|cancerresearch|canon|capetown|capital|capitalone|car|caravan|cards|care|career|careers|cars|casa|case|caseih|cash|casino|cat|catering|catholic|cba|cbn|cbre|cbs|cc|cd|ceb|center|ceo|cern|cf|cfa|cfd|cg|ch|chanel|channel|charity|chase|chat|cheap|chintai|christmas|chrome|church|ci|cipriani|circle|cisco|citadel|citi|citic|city|cityeats|ck|cl|claims|cleaning|click|clinic|clinique|clothing|cloud|club|clubmed|cm|cn|co|coach|codes|coffee|college|cologne|com|comcast|commbank|community|company|compare|computer|comsec|condos|construction|consulting|contact|contractors|cooking|cookingchannel|cool|coop|corsica|country|coupon|coupons|courses|cpa|cr|credit|creditcard|creditunion|cricket|crown|crs|cruise|cruises|csc|cu|cuisinella|cv|cw|cx|cy|cymru|cyou|cz|dabur|dad|dance|data|date|dating|datsun|day|dclk|dds|de|deal|dealer|deals|degree|delivery|dell|deloitte|delta|democrat|dental|dentist|desi|design|dev|dhl|diamonds|diet|digital|direct|directory|discount|discover|dish|diy|dj|dk|dm|dnp|do|docs|doctor|dog|domains|dot|download|drive|dtv|dubai|duck|dunlop|dupont|durban|dvag|dvr|dz|earth|eat|ec|eco|edeka|edu|education|ee|eg|email|emerck|energy|engineer|engineering|enterprises|epson|equipment|er|ericsson|erni|es|esq|estate|esurance|et|etisalat|eu|eurovision|eus|events|exchange|expert|exposed|express|extraspace|fage|fail|fairwinds|faith|family|fan|fans|farm|farmers|fashion|fast|fedex|feedback|ferrari|ferrero|fi|fiat|fidelity|fido|film|final|finance|financial|fire|firestone|firmdale|fish|fishing|fit|fitness|fj|fk|flickr|flights|flir|florist|flowers|fly|fm|fo|foo|food|foodnetwork|football|ford|forex|forsale|forum|foundation|fox|fr|free|fresenius|frl|frogans|frontdoor|frontier|ftr|fujitsu|fujixerox|fun|fund|furniture|futbol|fyi|ga|gal|gallery|gallo|gallup|game|games|gap|garden|gay|gb|gbiz|gd|gdn|ge|gea|gent|genting|george|gf|gg|ggee|gh|gi|gift|gifts|gives|giving|gl|glade|glass|gle|global|globo|gm|gmail|gmbh|gmo|gmx|gn|godaddy|gold|goldpoint|golf|goo|goodyear|goog|google|gop|got|gov|gp|gq|gr|grainger|graphics|gratis|green|gripe|grocery|group|gs|gt|gu|guardian|gucci|guge|guide|guitars|guru|gw|gy|hair|hamburg|hangout|haus|hbo|hdfc|hdfcbank|health|healthcare|help|helsinki|here|hermes|hgtv|hiphop|hisamitsu|hitachi|hiv|hk|hkt|hm|hn|hockey|holdings|holiday|homedepot|homegoods|homes|homesense|honda|horse|hospital|host|hosting|hot|hoteles|hotels|hotmail|house|how|hr|hsbc|ht|hu|hughes|hyatt|hyundai|ibm|icbc|ice|icu|id|ie|ieee|ifm|ikano|il|im|imamat|imdb|immo|immobilien|in|inc|industries|infiniti|info|ing|ink|institute|insurance|insure|int|intel|international|intuit|investments|io|ipiranga|iq|ir|irish|is|ismaili|ist|istanbul|it|itau|itv|iveco|jaguar|java|jcb|jcp|je|jeep|jetzt|jewelry|jio|jll|jm|jmp|jnj|jo|jobs|joburg|jot|joy|jp|jpmorgan|jprs|juegos|juniper|kaufen|kddi|ke|kerryhotels|kerrylogistics|kerryproperties|kfh|kg|kh|ki|kia|kim|kinder|kindle|kitchen|kiwi|km|kn|koeln|komatsu|kosher|kp|kpmg|kpn|kr|krd|kred|kuokgroup|kw|ky|kyoto|kz|la|lacaixa|lamborghini|lamer|lancaster|lancia|land|landrover|lanxess|lasalle|lat|latino|latrobe|law|lawyer|lb|lc|lds|lease|leclerc|lefrak|legal|lego|lexus|lgbt|li|liaison|lidl|life|lifeinsurance|lifestyle|lighting|like|lilly|limited|limo|lincoln|linde|link|lipsy|live|living|lixil|lk|llc|llp|loan|loans|locker|locus|loft|lol|london|lotte|lotto|love|lpl|lplfinancial|lr|ls|lt|ltd|ltda|lu|lundbeck|lupin|luxe|luxury|lv|ly|ma|macys|madrid|maif|maison|makeup|man|management|mango|map|market|marketing|markets|marriott|marshalls|maserati|mattel|mba|mc|mckinsey|md|me|med|media|meet|melbourne|meme|memorial|men|menu|merckmsd|metlife|mg|mh|miami|microsoft|mil|mini|mint|mit|mitsubishi|mk|ml|mlb|mls|mm|mma|mn|mo|mobi|mobile|moda|moe|moi|mom|monash|money|monster|mormon|mortgage|moscow|moto|motorcycles|mov|movie|movistar|mp|mq|mr|ms|msd|mt|mtn|mtr|mu|museum|mutual|mv|mw|mx|my|mz|na|nab|nadex|nagoya|name|nationwide|natura|navy|nba|nc|ne|nec|net|netbank|netflix|network|neustar|new|newholland|news|next|nextdirect|nexus|nf|nfl|ng|ngo|nhk|ni|nico|nike|nikon|ninja|nissan|nissay|nl|no|nokia|northwesternmutual|norton|now|nowruz|nowtv|np|nr|nra|nrw|ntt|nu|nyc|nz|obi|observer|off|office|okinawa|olayan|olayangroup|oldnavy|ollo|om|omega|one|ong|onl|online|onyourside|ooo|open|oracle|orange|org|organic|origins|osaka|otsuka|ott|ovh|pa|page|panasonic|paris|pars|partners|parts|party|passagens|pay|pccw|pe|pet|pf|pfizer|pg|ph|pharmacy|phd|philips|phone|photo|photography|photos|physio|pics|pictet|pictures|pid|pin|ping|pink|pioneer|pizza|pk|pl|place|play|playstation|plumbing|plus|pm|pn|pnc|pohl|poker|politie|porn|post|pr|pramerica|praxi|press|prime|pro|prod|productions|prof|progressive|promo|properties|property|protection|pru|prudential|ps|pt|pub|pw|pwc|py|qa|qpon|quebec|quest|qvc|racing|radio|raid|re|read|realestate|realtor|realty|recipes|red|redstone|redumbrella|rehab|reise|reisen|reit|reliance|ren|rent|rentals|repair|report|republican|rest|restaurant|review|reviews|rexroth|rich|richardli|ricoh|rightathome|ril|rio|rip|rmit|ro|rocher|rocks|rodeo|rogers|room|rs|rsvp|ru|rugby|ruhr|run|rw|rwe|ryukyu|sa|saarland|safe|safety|sakura|sale|salon|samsclub|samsung|sandvik|sandvikcoromant|sanofi|sap|sarl|sas|save|saxo|sb|sbi|sbs|sc|sca|scb|schaeffler|schmidt|scholarships|school|schule|schwarz|science|scjohnson|scor|scot|sd|se|search|seat|secure|security|seek|select|sener|services|ses|seven|sew|sex|sexy|sfr|sg|sh|shangrila|sharp|shaw|shell|shia|shiksha|shoes|shop|shopping|shouji|show|showtime|shriram|si|silk|sina|singles|site|sj|sk|ski|skin|sky|skype|sl|sling|sm|smart|smile|sn|sncf|so|soccer|social|softbank|software|sohu|solar|solutions|song|sony|soy|space|sport|spot|spreadbetting|sr|srl|ss|st|stada|staples|star|statebank|statefarm|stc|stcgroup|stockholm|storage|store|stream|studio|study|style|su|sucks|supplies|supply|support|surf|surgery|suzuki|sv|swatch|swiftcover|swiss|sx|sy|sydney|symantec|systems|sz|tab|taipei|talk|taobao|target|tatamotors|tatar|tattoo|tax|taxi|tc|tci|td|tdk|team|tech|technology|tel|telefonica|temasek|tennis|teva|tf|tg|th|thd|theater|theatre|tiaa|tickets|tienda|tiffany|tips|tires|tirol|tj|tjmaxx|tjx|tk|tkmaxx|tl|tm|tmall|tn|to|today|tokyo|tools|top|toray|toshiba|total|tours|town|toyota|toys|tr|trade|trading|training|travel|travelchannel|travelers|travelersinsurance|trust|trv|tt|tube|tui|tunes|tushu|tv|tvs|tw|tz|ua|ubank|ubs|ug|uk|unicom|university|uno|uol|ups|us|uy|uz|va|vacations|vana|vanguard|vc|ve|vegas|ventures|verisign|versicherung|vet|vg|vi|viajes|video|vig|viking|villas|vin|vip|virgin|visa|vision|vistaprint|viva|vivo|vlaanderen|vn|vodka|volkswagen|volvo|vote|voting|voto|voyage|vu|vuelos|wales|walmart|walter|wang|wanggou|watch|watches|weather|weatherchannel|webcam|weber|website|wed|wedding|weibo|weir|wf|whoswho|wien|wiki|williamhill|win|windows|wine|winners|wme|wolterskluwer|woodside|work|works|world|wow|ws|wtc|wtf|xbox|xerox|xfinity|xihuan|xin|xn--11b4c3d|xn--1ck2e1b|xn--1qqw23a|xn--2scrj9c|xn--30rr7y|xn--3bst00m|xn--3ds443g|xn--3e0b707e|xn--3hcrj9c|xn--3oq18vl8pn36a|xn--3pxu8k|xn--42c2d9a|xn--45br5cyl|xn--45brj9c|xn--45q11c|xn--4gbrim|xn--54b7fta0cc|xn--55qw42g|xn--55qx5d|xn--5su34j936bgsg|xn--5tzm5g|xn--6frz82g|xn--6qq986b3xl|xn--80adxhks|xn--80ao21a|xn--80aqecdr1a|xn--80asehdb|xn--80aswg|xn--8y0a063a|xn--90a3ac|xn--90ae|xn--90ais|xn--9dbq2a|xn--9et52u|xn--9krt00a|xn--b4w605ferd|xn--bck1b9a5dre4c|xn--c1avg|xn--c2br7g|xn--cck2b3b|xn--cg4bki|xn--clchc0ea0b2g2a9gcd|xn--czr694b|xn--czrs0t|xn--czru2d|xn--d1acj3b|xn--d1alf|xn--e1a4c|xn--eckvdtc9d|xn--efvy88h|xn--estv75g|xn--fct429k|xn--fhbei|xn--fiq228c5hs|xn--fiq64b|xn--fiqs8s|xn--fiqz9s|xn--fjq720a|xn--flw351e|xn--fpcrj9c3d|xn--fzc2c9e2c|xn--fzys8d69uvgm|xn--g2xx48c|xn--gckr3f0f|xn--gecrj9c|xn--gk3at1e|xn--h2breg3eve|xn--h2brj9c|xn--h2brj9c8c|xn--hxt814e|xn--i1b6b1a6a2e|xn--imr513n|xn--io0a7i|xn--j1aef|xn--j1amh|xn--j6w193g|xn--jlq61u9w7b|xn--jvr189m|xn--kcrx77d1x4a|xn--kprw13d|xn--kpry57d|xn--kpu716f|xn--kput3i|xn--l1acc|xn--lgbbat1ad8j|xn--mgb9awbf|xn--mgba3a3ejt|xn--mgba3a4f16a|xn--mgba7c0bbn0a|xn--mgbaakc7dvf|xn--mgbaam7a8h|xn--mgbab2bd|xn--mgbah1a3hjkrd|xn--mgbai9azgqp6j|xn--mgbayh7gpa|xn--mgbbh1a|xn--mgbbh1a71e|xn--mgbc0a9azcg|xn--mgbca7dzdo|xn--mgberp4a5d4ar|xn--mgbgu82a|xn--mgbi4ecexp|xn--mgbpl2fh|xn--mgbt3dhd|xn--mgbtx2b|xn--mgbx4cd0ab|xn--mix891f|xn--mk1bu44c|xn--mxtq1m|xn--ngbc5azd|xn--ngbe9e0a|xn--ngbrx|xn--node|xn--nqv7f|xn--nqv7fs00ema|xn--nyqy26a|xn--o3cw4h|xn--ogbpf8fl|xn--otu796d|xn--p1acf|xn--p1ai|xn--pbt977c|xn--pgbs0dh|xn--pssy2u|xn--q9jyb4c|xn--qcka1pmc|xn--qxa6a|xn--qxam|xn--rhqv96g|xn--rovu88b|xn--rvc1e0am3e|xn--s9brj9c|xn--ses554g|xn--t60b56a|xn--tckwe|xn--tiq49xqyj|xn--unup4y|xn--vermgensberater-ctb|xn--vermgensberatung-pwb|xn--vhquv|xn--vuq861b|xn--w4r85el8fhu5dnra|xn--w4rs40l|xn--wgbh1c|xn--wgbl6a|xn--xhq521b|xn--xkc2al3hye2a|xn--xkc2dl3a5ee0h|xn--y9a3aq|xn--yfro4i67o|xn--ygbi2ammx|xn--zfr164b|xxx|xyz|yachts|yahoo|yamaxun|yandex|ye|yodobashi|yoga|yokohama|you|youtube|yt|yun|za|zappos|zara|zero|zip|zm|zone|zuerich|zw
\ No newline at end of file
diff --git a/plugins/dynamix/include/update.wireguard.php b/plugins/dynamix/include/update.wireguard.php
deleted file mode 100644
index 058b95e9d..000000000
--- a/plugins/dynamix/include/update.wireguard.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?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.
- */
-?>
-<?
-$docroot  = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-// add translations
-$_SERVER['REQUEST_URI'] = 'settings';
-// special case when script is called on form-submit and processed by update.php
-if (!isset($_SESSION['locale'])) $_SESSION['locale'] = $_POST['#locale'];
-require_once "$docroot/webGui/include/Translations.php";
-
-$etc      = '/etc/wireguard';
-$validIP4 = "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}";
-$validIP6 = "(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(:|([0-9a-fA-F]{1,4}:)+):(([0-9a-fA-F]{1,4}:)*[0-9a-fA-F]{1,4})?)";
-
-$t1 = '6';  // 6 sec timeout
-$t2 = '12'; // 12 sec timeout
-
-function ipv4($ip) {
-  return strpos($ip,'.')!==false;
-}
-function ipset($ip) {
-  return ipv4($ip) ? $ip : "[$ip]";
-}
-function ipv6($ip) {
-  return ipv4($ip) ? ':' : ']:';
-}
-function host($ip) {
-  return strpos($ip,'/')!==false ? $ip : (ipv4($ip) ? "$ip/32" : "$ip/128");
-}
-function status($vtun) {
-  return strpos(exec("wg show interfaces|tr '\n' ' '"),"$vtun ")===false;
-}
-function vtun() {
-  global $etc;
-  $x = 0; while (file_exists("$etc/wg{$x}.conf")) $x++;
-  return "wg{$x}";
-}
-function delPeer($vtun, $id='') {
-  global $etc,$name;
-  $dir = "$etc/peers";
-  foreach (glob("$dir/peer-$name-$vtun-$id*",GLOB_NOSORT) as $peer) unlink($peer);
-}
-function addPeer(&$x) {
-  global $peers,$var;
-  $peers[$x] = ['[Interface]'];                                  // [Interface]
-  if ($var['client']) $peers[$x][] = $var['client'];             // #name
-  if ($var['privateKey']) $peers[$x][] = $var['privateKey'];     // PrivateKey
-  $peers[$x][] = $var['address'];                                // Address
-  if ($var['listenport']) $peers[$x][] = $var['listenport'];     // ListenPort
-  if ($var['dns']) $peers[$x][] = $var['dns'];                   // DNS server
-  if ($var['mtu']) $peers[$x][] = $var['mtu'];                   // MTU
-  $peers[$x][] = '';
-  $peers[$x][] = "[Peer]";                                       // [Peer]
-  if ($var['server']) $peers[$x][] = $var['server'];             // #name
-  if ($var['handshake']) $peers[$x][] = $var['handshake'];       // PersistentKeepalive
-  if ($var['presharedKey']) $peers[$x][] = $var['presharedKey']; // PresharedKey
-  $peers[$x][] = $var['publicKey'];                              // PublicKey
-  if ($var['tunnel']) $peers[$x][] = $var['tunnel'];             // Tunnel address
-  $peers[$x][] = $var['endpoint'] ?: $var['internet'];           // Endpoint
-  $peers[$x][] = $var['allowedIPs'];                             // AllowedIPs
-  $x++;
-}
-function autostart($cmd,$vtun) {
-  global $etc;
-  $autostart = "$etc/autostart";
-  $list = @file_get_contents($autostart) ?: '';
-  switch ($cmd) {
-  case 'off':
-    if ($list && strpos($list,"$vtun ")!==false) file_put_contents($autostart,str_replace("$vtun ","",$list));
-    break;
-  case 'on':
-    if (!$list || strpos($list,"$vtun ")===false) file_put_contents($autostart,$list."$vtun ");
-    break;
-  }
-}
-function createPeerFiles($vtun) {
-  global $etc,$peers,$name,$gone;
-  $dir = "$etc/peers";
-  $tmp = "/tmp/list.tmp";
-  if (is_dir($dir)) {
-    if (count($gone)) {
-      foreach ($gone as $peer) {
-        // one or more peers are removed, delete the associated files
-        [$n,$i] = explode('-',$peer);
-        delPeer($n,$i);
-      }
-      $new = 1;
-      $peer = "$dir/peer-$name-$vtun";
-      $files = glob("$peer-*.conf",GLOB_NOSORT);
-      natsort($files);
-      foreach ($files as $file) {
-        $id = explode('-',basename($file,'.conf'))[3];
-        if ($id > $new) {
-          // rename files to match revised peers list
-          rename($file, "$peer-$new.conf");
-          rename(str_replace('.conf','.png',$file), "$peer-$new.png");
-        }
-        $new++;
-      }
-    }
-  } else {
-    mkdir($dir);
-  }
-  $list = [];
-  foreach ($peers as $id => $peer) {
-    if (empty($peer[1])) break; // tunnel without any peers
-    $cfg    = "$dir/peer-$name-$vtun-$id.conf";
-    $cfgold = @file_get_contents($cfg) ?: '';
-    $cfgnew = implode("\n",$peer)."\n";
-    if ($cfgnew !== $cfgold) {
-      $list[] = "$vtun: peer $id (".($peer[1][0]=='#' ? substr($peer[1],1) : _('no name')).')';
-      file_put_contents($cfg,$cfgnew);
-      $png = str_replace('.conf','.png',$cfg);
-      exec("qrencode -t PNG -r $cfg -o $png");
-    }
-  }
-  // store the peer names which are updated
-  if (count($list)) file_put_contents($tmp,implode("<br>",$list)); else @unlink($tmp);
-}
-function parseInput(&$input,&$x) {
-  global $conf,$user,$var,$default,$default6;
-  $section = 0; $addPeer = false;
-  foreach ($input as $key => $value) {
-    if ($key[0]=='#') continue;
-    [$id,$i] = explode(':',$key);
-    if ($i != $section) {
-      $conf[] = "\n[Peer]";
-      // add peers only for peer sections
-      $addPeer ? addPeer($x) : $addPeer = true;
-      $section = $i;
-    }
-    switch ($id) {
-    case 'Name':
-      if ($value) $conf[] = "#$value";
-      if ($i==0) {
-        $var['server'] = $value ? "#$value" : false;
-      } else {
-        $var['client'] = $value ? "#$value" : false;
-      }
-      break;
-    case 'PrivateKey':
-      if ($i==0) {
-        $conf[] = "$id=$value";
-      } else {
-        if ($value) $user[] = "$id:$x=\"$value\"";
-        $var['privateKey'] = $value ? "$id=$value" : false;
-      }
-      break;
-    case 'PublicKey':
-      if ($i==0) {
-        $user[] = "$id:0=\"$value\"";
-        $var['publicKey'] = "$id=$value";
-      } else {
-        $conf[] = "$id=$value";
-      }
-      break;
-    case 'DNS':
-      if ($i>0 && $value) {
-        $user[] = "$id:$x=\"$value\"";
-        $var['dns'] = "$id=$value";
-      } else $var['dns'] = false;
-      break;
-    case 'PROT':
-      $protocol = $value;
-      $user[] = "$id:0=\"$value\"";
-      switch ($protocol) {
-        case '46': $var['default']  = "AllowedIPs=$default, $default6"; break;
-        case '6' : $var['default']  = "AllowedIPs=$default6"; break;
-        default  : $var['default']  = "AllowedIPs=$default"; break;
-      }
-      break;
-    case 'TYPE':
-      $list = array_map('trim',explode(',',$value<4 ? ($value%2==1 ? $var['subnets1'] : $var['subnets2']) : ($value<6 ? ($value%2==1 ? $var['shared1'] : $var['shared2']) : $var['default'])));
-      $var['allowedIPs'] = implode(', ',array_map('host',array_filter($list)));
-      $var['tunnel'] = ($value==2||$value==3) ? $tunnel : false;
-      $user[] = "$id:$x=\"$value\"";
-      break;
-    case 'Network':
-    case 'Network6':
-    case 'UPNP':
-    case 'DROP':
-    case 'RULE':
-    case 'NAT':
-      $user[] = "$id:0=\"$value\"";
-      break;
-    case 'Address':
-      $hosts = implode(', ',array_map('host',array_filter(explode(', ',$value))));
-      if ($i==0) {
-        $conf[] = "$id=$value";
-        $tunnel = "$id=$hosts";
-      } else {
-        $user[] = "$id:$x=\"$value\"";
-        $var['address'] = "$id=$hosts";
-      }
-      break;
-    case 'MTU':
-      if ($value) $conf[] = "$id=$value";
-      $var['mtu'] = $value ? "$id=$value" : false;
-      break;
-    case 'Endpoint':
-      if ($i==0) {
-        $user[] = "$id:0=\"$value\"";
-        $var['endpoint'] = $value ? "Endpoint=".ipset($value) : false;
-      } else {
-        if ($value) $conf[] = "$id=$value";
-        $var['listenport'] = $value ? "ListenPort=".explode(ipv6($value),$value)[1] : false;
-        if ($var['endpoint'] && strpos($var['endpoint'],ipv6($var['endpoint']))===false) $var['endpoint'] .= ":".explode(ipv6($var['internet']),$var['internet'])[1];
-      }
-      break;
-    case 'PersistentKeepalive':
-      if ($value) $conf[] = "$id=$value";
-      $var['handshake'] = $value ? "$id=$value" : false;
-      break;
-    case 'PresharedKey':
-      if ($value) $conf[] = "$id=$value";
-      $var['presharedKey'] = $value ? "$id=$value" : false;
-      break;
-    default:
-      if ($value) $conf[] = "$id=$value";
-      break;
-    }
-  }
-}
-$default = '0.0.0.0/0';
-$default6 = '::/0';
-switch ($_POST['#cmd']) {
-case 'keypair':
-  $private = exec("wg genkey");
-  $public = exec("wg pubkey <<<'$private'");
-  echo $private."\0".$public;
-  break;
-case 'presharedkey':
-  echo exec("wg genpsk");
-  break;
-case 'update':
-  if (!exec("iptables -S|grep -om1 'WIREGUARD$'")) {
-    exec("iptables -N WIREGUARD;iptables -A FORWARD -j WIREGUARD");
-  }
-  if (!exec("ip6tables -S|grep -om1 'WIREGUARD$'")) {
-    exec("ip6tables -N WIREGUARD;ip6tables -A FORWARD -j WIREGUARD");
-  }
-  $cfg  = $_POST['#cfg'];
-  $wg   = $_POST['#wg'];
-  $name = $_POST['#name'];
-  $vtun = $_POST['#vtun'];
-  $gone = explode(',',$_POST['#deleted']);
-  $conf = ['[Interface]'];
-  $user = $peers = $var = [];
-  $var['subnets1'] = "AllowedIPs=".implode(', ',(array_unique(explode(', ',$_POST['#subnets1']))));
-  $var['subnets2'] = "AllowedIPs=".implode(', ',(array_unique(explode(', ',$_POST['#subnets2']))));
-  $var['shared1']  = "AllowedIPs=".implode(', ',(array_unique(explode(', ',$_POST['#shared1']))));
-  $var['shared2']  = "AllowedIPs=".implode(', ',(array_unique(explode(', ',$_POST['#shared2']))));
-  $var['internet'] = "Endpoint=".implode(', ',(array_unique(explode(', ',$_POST['#internet']))));
-  $x = 1;
-  parseInput($_POST,$x);
-  addPeer($x);
-  exec("wg-quick down $vtun 2>/dev/null");
-  file_put_contents($file,implode("\n",$conf)."\n");
-  file_put_contents($cfg,implode("\n",$user)."\n");
-  createPeerFiles($vtun);
-  if ($wg) exec("wg-quick up $vtun >/dev/null");
-  $save = false;
-  break;
-case 'toggle':
-  $vtun = $_POST['#vtun'];
-  switch ($_POST['#wg']) {
-  case 'stop':
-    exec("timeout $t1 wg-quick down $vtun 2>/dev/null");
-    echo status($vtun) ? 1 : 0;
-    break;
-  case 'start':
-    exec("timeout $t1 wg-quick up $vtun 2>/dev/null");
-    echo status($vtun) ? 0 : 1;
-    break;
-  }
-  break;
-case 'ping':
-  $addr = $_POST['#addr'];
-  echo exec("ping -qc1 -W4 $addr|grep -Po '1 received'");
-  break;
-case 'public':
-  $ip = $_POST['#ip'];
-  $v4 = $_POST['#prot']!='6';
-  $v6 = $_POST['#prot']!='';
-  $context = stream_context_create(['https'=>['timeout'=>12]]);
-  $int_ipv4 = $v4 ? (preg_match("/^$validIP4$/", $ip) ? $ip : (@dns_get_record($ip, DNS_A)[0]['ip'] ?: '')) : '';
-  $ext_ipv4 = $v4 ? (@file_get_contents('https://api.ipify.org',false,$context) ?: '') : '';
-  $int_ipv6 = $v6 ? (preg_match("/^$validIP6$/", $ip) ? $ip : (@dns_get_record($ip, DNS_AAAA)[0]['ipv6'] ?: '')) : '';
-  $ext_ipv6 = $v6 ? (@file_get_contents('https://api6.ipify.org',false,$context) ?: '') : '';
-  echo "$int_ipv4;$ext_ipv4;$int_ipv6;$ext_ipv6";
-  break;
-case 'addtunnel':
-  $vtun = vtun();
-  $name = $_POST['#name'];
-  touch("$etc/$vtun.conf");
-  exec("wg-quick down $vtun 2>/dev/null");
-  @unlink("$etc/$vtun.cfg");
-  delPeer($vtun);
-  autostart('off',$vtun);
-  break;
-case 'deltunnel':
-  $vtun = $_POST['#vtun'];
-  $name = $_POST['#name'];
-  exec("wg-quick down $vtun 2>/dev/null");
-  @unlink("$etc/$vtun.conf");
-  @unlink("$etc/$vtun.cfg");
-  delPeer($vtun);
-  autostart('off',$vtun);
-  break;
-case 'import':
-  $name = $_POST['#name'];
-  $user = $peers = $var = $import = $sort = [];
-  $entries = array_filter(array_map('trim',preg_split('/\[(Interface|Peer)\]/',$_POST['#data'])));
-  foreach($entries as $key => $entry) {
-    $i = $key-1;
-    foreach (explode("\n",$entry) as $row) {
-      if (ltrim($row)[0]!='#') {
-        [$id,$data] = array_map('trim',explode('=',$row,2));
-        $import["$id:$i"] = $data;
-      } elseif ($i>=0) {
-        $import["Name:$i"] = substr(trim($row),1);
-      }
-    }
-  }
-  if ($import['PrivateKey:0'] && !$import['PublicKey:0']) $import['PublicKey:0'] = exec("wg pubkey <<<'{$import['PrivateKey:0']}'");
-  $import['UPNP:0'] = 'no';
-  $import['NAT:0'] = 'no';
-  [$subnet,$mask] = explode('/',$import['Address:0']);
-  if (ipv4($subnet)) {
-    $mask = ($mask>0 && $mask<32) ? $mask : 24;
-    $import['Network:0'] = long2ip(ip2long($subnet) & (0x100000000-2**(32-$mask))).'/'.$mask;
-    $import['Address:0'] = $subnet;
-    $import['PROT:0'] = '';
-  } else {
-    $mask = ($mask>0 && $mask<128) ? $mask : 64;
-    $import['Network6:0'] = strstr($subnet,'::',true).'::/'.$mask;
-    $import['Address:0'] = $subnet;
-    $import['PROT:0'] = '6';
-  }
-  $import['Endpoint:0'] = '';
-  for ($n = 1; $n <= $i; $n++) {
-    $vpn = strpos($import["AllowedIPs:$n"],$default)!==false || strpos($import["AllowedIPs:$n"],$default6)!==false;
-    if ($vpn) $import["Address:$n"] = '';
-    $import["TYPE:$n"] = $vpn ? 7 : 0;
-    if ($import["TYPE:$n"]==0) $var['subnets1'] = "AllowedIPs=".$import["AllowedIPs:$n"];
-  }
-  foreach ($import as $key => $val) $sort[] = explode(':',$key)[1];
-  array_multisort($sort,$import);
-  $x = 1;
-  $conf = ['[Interface]'];
-  $var['default'] = $import['PROT:0']=='' ? "AllowedIPs=$default" : "AllowedIPs=$default6";
-  $var['internet'] = "Endpoint=unknown";
-  parseInput($import,$x);
-  addPeer($x);
-  $vtun = vtun();
-  file_put_contents("$etc/$vtun.conf",implode("\n",$conf)."\n");
-  file_put_contents("$etc/$vtun.cfg",implode("\n",$user)."\n");
-  delPeer($vtun);
-  autostart('off',$vtun);
-  echo $vtun;
-  break;
-case 'autostart':
-  autostart($_POST['#start'],$_POST['#vtun']);
-  break;
-case 'upnp':
-  $upnp = '/var/tmp/upnp';
-  if (is_executable('/usr/bin/upnpc')) {
-    $gw = $_POST['#gw'].':';
-    $link = $_POST['#link'];
-    $xml = @file_get_contents($upnp) ?: '';
-    if ($xml) {
-      exec("timeout $t1 stdbuf -o0 upnpc -u $xml -m $link -l 2>&1|grep -qm1 'refused'",$output,$code);
-      if ($code!=1) $xml = '';
-    }
-    if (!$xml) {
-      exec("timeout $t2 stdbuf -o0 upnpc -m $link -l 2>/dev/null|grep -Po 'desc: \K.+'",$desc);
-      foreach ($desc as $url) if ($url && strpos($url,$gw)!==false) {$xml = $url; break;}
-    }
-  } else $xml = "";
-  file_put_contents($upnp,$xml);
-  echo $xml;
-  break;
-case 'upnpc':
-  if (!is_executable('/usr/bin/upnpc')) break;
-  $xml = $_POST['#xml'];
-  $vtun = $_POST['#vtun'];
-  $link = $_POST['#link'];
-  $ip = $_POST['#ip'];
-  if ($_POST['#wg']=='active') {
-    exec("timeout $t1 stdbuf -o0 upnpc -u $xml -m $link -l 2>/dev/null|grep -Po \"^(ExternalIPAddress = \K.+|.+\KUDP.+>$ip:[0-9]+ 'WireGuard-$vtun')\"",$upnp);
-    [$addr,$upnp] = $upnp;
-    [$type,$rule] = explode(' ',$upnp);
-    echo $rule ? "UPnP: $addr:$rule/$type" : _("UPnP: forwarding not set");
-  } else {
-    echo _("UPnP: tunnel is inactive");
-  }
-  break;
-}
-?>
diff --git a/plugins/dynamix/scripts/wg_poller b/plugins/dynamix/scripts/wg_poller
deleted file mode 100644
index 5c3ab963f..000000000
--- a/plugins/dynamix/scripts/wg_poller
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/php -q
-<?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 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);
-  curl_exec($ch);
-  curl_close($ch);
-}
-function publish($endpoint, $message) {
-  curl_socket("/var/run/nginx.socket", "http://localhost/pub/$endpoint?buffer_length=1", $message);
-}
-function my_scale($value, &$unit) {
-  $units = [' ','Ki','Mi','Gi','Ti','Pi','Ei','Zi','Yi'];
-  $size = count($units);
-  $base = $value ? floor(log($value, 1024)) : 0;
-  if ($base>$size) $base = $size-1;
-  $value /= pow(1024, $base);
-  $decimals = $value>=100 ? 0 : ($value>=10 ? 1 : (round($value*100)%100===0 ? 0 : 2));
-  if (round($value,-1)==1000) {$value = 1; $base++;}
-  $unit = $units[$base].'B';
-  return number_format($value, $decimals, '.', $value>9999 ? ',':'');
-}
-
-while (true) {
-  $now = time(); $i = 0;
-  unset($dump);   $vtun = [];
-  exec('wg show all dump',$dump);
-  foreach ($dump as $row) {
-    $row = preg_split('/\s+/',$row);
-    if (count($row)>5) $vtun[] = $row[0].';'.($row[5] ? $now - $row[5] : 0).';'.my_scale($row[6],$unit)." $unit;".my_scale($row[7],$unit)." $unit";
-  }
-  publish('wireguard', implode("\0",$vtun));
-  sleep(1);
-}
-?>
\ No newline at end of file