Merge pull request #363 from Squidly271/patch-9

dockerMan: Avoid filename collisions on FAT32
This commit is contained in:
Eric Schultz
2018-08-23 17:44:11 -05:00
committed by GitHub
@@ -81,7 +81,16 @@ if (isset($_POST['contName'])) {
$userTmplDir = $dockerManPaths['templates-user'];
if (!is_dir($userTmplDir)) mkdir($userTmplDir, 0777, true);
if ($Name) {
$filename = sprintf('%s/my-%s.xml', $userTmplDir, $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";
file_put_contents($filename, $postXML);
}
// Run dry