mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-14 05:30:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed corner case when 'confName' variable is not defined

Browse Source
This commit is contained in:
bergware
2018-03-29 11:48:40 +02:00
parent 8fcf6f6828
commit b59da9ac37
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/dynamix.docker.manager/include/CreateDocker.php
View File

@@ -194,8 +194,8 @@ function postToXML($post, $setOwnership=false) {
$xml->addChild("Data");
$xml->addChild("Environment");
$post['confName'] = $post['confName'] ?? [];
for ($i = 0; $i < count($post['confName']); $i++) {
$size = is_array($post['confName']) ? count($post['confName']) : 0;
for ($i = 0; $i < $size; $i++) {
$Type = $post['confType'][$i];
$config = $xml->addChild('Config', xml_encode($post['confValue'][$i]));
$config['Name'] = xml_encode($post['confName'][$i]);
@@ -208,21 +208,21 @@ function postToXML($post, $setOwnership=false) {
$config['Required'] = xml_encode($post['confRequired'][$i]);
$config['Mask'] = xml_encode($post['confMask'][$i]);
# V1 compatibility
if ($Type == "Port") {
if ($Type == 'Port') {
$port = $xml->Networking->Publish->addChild("Port");
$port->HostPort = $post['confValue'][$i];
$port->ContainerPort = $post['confTarget'][$i];
$port->Protocol = $post['confMode'][$i];
} elseif ($Type == "Path") {
$path = $xml->Data->addChild("Volume");
$path->HostDir = $post['confValue'][$i];
$path->ContainerDir = $post['confTarget'][$i];
$path->Mode = $post['confMode'][$i];
} elseif ($Type == "Variable") {
$variable = $xml->Environment->addChild("Variable");
$variable->Value = $post['confValue'][$i];
$variable->Name = $post['confTarget'][$i];
$variable->Mode = $post['confMode'][$i];
} elseif ($Type == 'Path') {
$path = $xml->Data->addChild("Volume");
$path->HostDir = $post['confValue'][$i];
$path->ContainerDir = $post['confTarget'][$i];
$path->Mode = $post['confMode'][$i];
} elseif ($Type == 'Variable') {
$variable = $xml->Environment->addChild("Variable");
$variable->Value = $post['confValue'][$i];
$variable->Name = $post['confTarget'][$i];
$variable->Mode = $post['confMode'][$i];
}
}
$dom = new DOMDocument('1.0');
@@ -635,7 +635,7 @@ if ($_GET['xmlTemplate']) {
if (is_file($xmlTemplate)) {
$xml = xmlToVar($xmlTemplate);
$templateName = $xml['Name'];
if ($xmlType == "default") {
if ($xmlType == 'default') {
if (!empty($dockercfg['DOCKER_APP_CONFIG_PATH']) && file_exists($dockercfg['DOCKER_APP_CONFIG_PATH'])) {
// override /config
foreach ($xml['Config'] as &$arrConfig) {
@@ -1117,7 +1117,7 @@ optgroup.title{background-color:#625D5D;color:#FFFFFF;text-align:center;margin-t
<div id="canvas">
<form method="POST" autocomplete="off" onsubmit="prepareConfig(this)">
<table class="settings">
<? if ($xmlType == "edit"):
<? if ($xmlType == 'edit'):
if ($DockerClient->doesContainerExist($templateName)): echo "<input type='hidden' name='existingContainer' value='${templateName}'>\n"; endif;
else:?>
<tr class='TemplateDropDown'>