From 8668a4449cbb1bcd16483a9ebf98312b55838275 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Mon, 14 Jun 2021 14:19:02 -0700
Subject: [PATCH] Partial fix for #2772.

---
 views/default.handlebars | 2 +-
 webserver.js             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/default.handlebars b/views/default.handlebars
index 6ff8430d..87510907 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -5099,7 +5099,7 @@
                 x += '<input type=file name=files id=d2uploadinput style=width:100% multiple=multiple onchange="d2batchUploadValidate()" /><br /><br />';
                 if (wintype) { x += addHtmlValue("Windows Path", '<input style=width:250px type=text onchange="d2batchUploadValidate()" onkeyup="d2batchUploadValidate()" name=winpath id=d2winuploadpath placeholder="C:\\temp" value="" />'); }
                 if (linuxtype) { x += addHtmlValue("Linux Path", '<input style=width:250px type=text onchange="d2batchUploadValidate()" onkeyup="d2batchUploadValidate()" name=linuxpath id=d2linuxuploadpath placeholder="/tmp" value="" />'); }
-                x += '<br /><label><input type=checkbox name=createFolder />' + "Create folder if it does not exists?" + '</label></form>';
+                x += '<br /><label><input type=checkbox name=createFolder />' + "Create folder if it does not exists?" + '</label><br />';
                 x += '<label><input type=checkbox name=overwriteFiles />' + "Overwrite if file exists?" + '</label></form>';
                 setDialogMode(2, "Batch File Upload", 3, d2batchUploadValidateOk, x);
                 d2batchUploadValidate();
diff --git a/webserver.js b/webserver.js
index cabbfb5b..8357437b 100644
--- a/webserver.js
+++ b/webserver.js
@@ -3745,7 +3745,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
 
             // Get fields
             if ((fields == null) || (fields.nodeIds == null) || (fields.nodeIds.length != 1)) { res.sendStatus(404); return; }
-            var cmd = { nodeids: fields.nodeIds[0].split(','), files: [], user: user, domain: domain };
+            var cmd = { nodeids: fields.nodeIds[0].split(','), files: [], user: user, domain: domain, overwrite: false, createFolder: false };
             if ((fields.winpath != null) && (fields.winpath.length == 1)) { cmd.windowsPath = fields.winpath[0]; }
             if ((fields.linuxpath != null) && (fields.linuxpath.length == 1)) { cmd.linuxPath = fields.linuxpath[0]; }
             if ((fields.overwriteFiles != null) && (fields.overwriteFiles.length == 1) && (fields.overwriteFiles[0] == 'on')) { cmd.overwrite = true; }