From 8537c50fe4fd16843f462d01dfc7d68ef629f87e Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Wed, 21 Jun 2017 07:24:03 -0500 Subject: [PATCH] webGui: improve reading docker template xml network settings --- plugins/dynamix.docker.manager/include/CreateDocker.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index b29c524e3..d74ce413c 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -291,11 +291,14 @@ function xmlToVar($xml) { } } + # some xml templates advertise as V2 but omit the new element + # check for and use the V1 element when this occurs + if (empty($out['Network']) && isset($xml->Networking->Mode)) { + $out['Network'] = xml_decode($xml->Networking->Mode); + } + # V1 compatibility if ($xml["version"] != "2") { - if (isset($xml->Networking->Mode)) { - $out['Network'] = xml_decode($xml->Networking->Mode); - } if (isset($xml->Description)) { $out['Overview'] = stripslashes(xml_decode($xml->Description)); }