From b01d5ae55d0f05e1376700b5ca22a0facd202413 Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Sat, 10 Nov 2018 09:05:33 -0500 Subject: [PATCH] Revert FAT32 filename collisions #363 has been implicated in a glitch in the docker template system. While I cannot replicate the issue at all, revert the PR as the edge case issue that it solved has only ever occurred during synthetic tests. --- .../dynamix.docker.manager/include/CreateDocker.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index 69638fc1c..f3abe5066 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -81,16 +81,7 @@ if (isset($_POST['contName'])) { $userTmplDir = $dockerManPaths['templates-user']; if (!is_dir($userTmplDir)) mkdir($userTmplDir, 0777, true); if ($Name) { - $filename = sprintf('%s/my-%s', $userTmplDir, $Name); - // look for FAT32 filename hits due to different case - $userTemplates = glob("$userTmplDir/*.xml"); - foreach ($userTemplates as $tmpl) { - if ( ($tmpl != "$filename.xml") && (strcasecmp($tmpl,"$filename.xml") == 0) ) { - $filename .= " (1)"; - break; - } - } - $filename .= ".xml"; + $filename = sprintf('%s/my-%s.xml', $userTmplDir, $Name); file_put_contents($filename, $postXML); } // Run dry