diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php old mode 100644 new mode 100755 index 4f54ad238..794faadfb --- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -1094,8 +1094,8 @@ _(Network Type)_: $n = $x ? 1 : 0; while (isset($$eth["VLANID:$n"]) && $$eth["VLANID:$n"] != $x) $n++; if (!empty($$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 .= ' -- '.compress(trim(substr($conf[1],1))); + $conf = is_file("/etc/wireguard/$network.conf") ? file("/etc/wireguard/$network.conf") : []; + if ( ($conf[1][0]??'')=='#') $name .= ' -- '.compress(trim(substr($conf[1],1))); } elseif (substr($network,0,4)=='wlan') { $name .= ' -- '._('Wireless interface'); } diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php old mode 100644 new mode 100755 index 185cb76bf..c6d5685fd --- a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php @@ -1007,7 +1007,7 @@ class DockerClient { foreach($ct['NetworkSettings']['Networks'] as $netName => $netVals) { $i = $c['NetworkMode']=='host' ? $host : $netVals['IPAddress']; $c['Networks'][$netName] = [ 'IPAddress' => $i ]; - if ($driver[$netName]=='ipvlan' || $driver[$netName]=='macvlan') { + if ( isset($driver[$netName]) && ($driver[$netName]=='ipvlan' || $driver[$netName]=='macvlan') ) { if (!isset($c['Ports']['vlan'])) $c['Ports']['vlan'] = []; $c['Ports']['vlan']["$i"] = $i; } diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page old mode 100644 new mode 100755 index 5e137ef24..d4ff614e8 --- a/emhttp/plugins/dynamix/DeviceInfo.page +++ b/emhttp/plugins/dynamix/DeviceInfo.page @@ -1932,11 +1932,11 @@ _(Name)_: