From 61317c5b3c4a459b31ec387cd11931a22bbd203c Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 19 Apr 2022 10:49:05 +0200
Subject: [PATCH 1/3] Docker: make Wireguard tunnel check more strict

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

diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index 03d65cc32..a549acbba 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -876,7 +876,7 @@ _(Network Type)_:
   <?=mk_option(1,'host',_('Host'))?>
   <?=mk_option(1,'none',_('None'))?>
   <?foreach ($custom as $network):?>
-  <?if (substr($network,0,2)=='wg') {$conf=file("/etc/wireguard/$network.conf"); $name=$conf[1][0]=='#' ? $network.' ('.compress(trim(substr($conf[1],1))).')' : $network;} else $name=$network;?>
+  <?if (preg_match('/^wg[0-9]+$/',$network)) {$conf=file("/etc/wireguard/$network.conf"); $name=$conf[1][0]=='#' ? $network.' ('.compress(trim(substr($conf[1],1))).')' : $network;} else $name=$network;?>
   <?=mk_option(1,$network,_('Custom')." : $name")?>
   <?endforeach;?></select>
 

From e0948fb02eaad76879c1df2e53c7ba82d31be41a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 19 Apr 2022 14:53:28 +0200
Subject: [PATCH 2/3] Docker: add description to all custom networks

---
 .../include/CreateDocker.php                   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index a549acbba..1c75fc8e5 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -14,7 +14,7 @@
 <?
 $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
-libxml_use_internal_errors(true); 
+libxml_use_internal_errors(true);
 
 require_once "$docroot/webGui/include/Helpers.php";
 extract(parse_plugin_cfg('dynamix',true));
@@ -841,7 +841,7 @@ Donation Link:
 
 Template URL:
 : <input type="text" name="contTemplateURL">
-  
+
 </div>
 <div markdown="1" class="advanced">
 _(Icon URL)_:
@@ -876,7 +876,17 @@ _(Network Type)_:
   <?=mk_option(1,'host',_('Host'))?>
   <?=mk_option(1,'none',_('None'))?>
   <?foreach ($custom as $network):?>
-  <?if (preg_match('/^wg[0-9]+$/',$network)) {$conf=file("/etc/wireguard/$network.conf"); $name=$conf[1][0]=='#' ? $network.' ('.compress(trim(substr($conf[1],1))).')' : $network;} else $name=$network;?>
+  <?$name = $network;
+  if (preg_match('/^(br|bond|eth)[0-9]+(\.[0-9]+)?$/',$network)) {
+    [$eth,$x] = my_explode('.',$network);
+    $eth = str_replace(['br','bond'],'eth',$eth);
+    $n = $x ? 1 : 0; while (isset($$eth["VLANID:$n"]) && $$eth["VLANID:$n"] != $x) $n++;
+    if ($$eth["DESCRIPTION:$n"]) $name = $network.' -- '.compress(trim($$eth["DESCRIPTION:$n"]));
+  } elseif (preg_match('/^wg[0-9]+$/',$network)) {
+    $conf = file("/etc/wireguard/$network.conf");
+    if ($conf[1][0]=='#') $name = $network.' -- '.compress(trim(substr($conf[1],1)));
+  }
+  ?>
   <?=mk_option(1,$network,_('Custom')." : $name")?>
   <?endforeach;?></select>
 
@@ -1077,7 +1087,7 @@ function load_contOverview() {
   new_overview = marked(new_overview);
   new_overview = new_overview.replaceAll("\n","<br>"); // has to be after marked
   $("#contDescription").html(new_overview);
-  
+
   var new_requires = $("textarea[name='contRequires']").val();
   new_requires = new_requires.replaceAll("[","<").replaceAll("]",">");
   // Handle code block being created by authors indenting (manually editing the xml and spacing)

From f62c6905423744ecbdd5a07633344c1649f74e0d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 19 Apr 2022 14:57:30 +0200
Subject: [PATCH 3/3] Docker: add description to all custom networks

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

diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index 1c75fc8e5..1bfc1186a 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -881,10 +881,10 @@ _(Network Type)_:
     [$eth,$x] = my_explode('.',$network);
     $eth = str_replace(['br','bond'],'eth',$eth);
     $n = $x ? 1 : 0; while (isset($$eth["VLANID:$n"]) && $$eth["VLANID:$n"] != $x) $n++;
-    if ($$eth["DESCRIPTION:$n"]) $name = $network.' -- '.compress(trim($$eth["DESCRIPTION:$n"]));
+    if ($$eth["DESCRIPTION:$n"]) $name .= ' -- '.compress(trim($$eth["DESCRIPTION:$n"]));
   } elseif (preg_match('/^wg[0-9]+$/',$network)) {
     $conf = file("/etc/wireguard/$network.conf");
-    if ($conf[1][0]=='#') $name = $network.' -- '.compress(trim(substr($conf[1],1)));
+    if ($conf[1][0]=='#') $name .= ' -- '.compress(trim(substr($conf[1],1)));
   }
   ?>
   <?=mk_option(1,$network,_('Custom')." : $name")?>