From 26b5a69cccf623545334e95d3b2005b713c6b65a Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sun, 7 Feb 2021 19:38:14 -0500
Subject: [PATCH] ImportHandler: Use `JSON.stringify()` to properly escape
 characters

---
 src/node/handler/ImportHandler.js | 2 +-
 src/static/js/pad_impexp.js       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index e1ac59ccb..9653bc929 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -276,7 +276,7 @@ exports.doImport = (req, res, padId) => {
       '<script>',
       "document.addEventListener('DOMContentLoaded', () => {",
       '  window.parent.padimpexp.handleFrameCall(',
-      `      '${req.directDatabaseAccess}', '${status}');`,
+      `      ${JSON.stringify(!!req.directDatabaseAccess)}, ${JSON.stringify(status)});`,
       '});',
       '</script>',
     ].join('\n'));
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index ea93de7c9..07848d141 100644
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@@ -171,7 +171,6 @@ const padimpexp = (() => {
       $('.disabledexport').click(cantExport);
     },
     handleFrameCall: (directDatabaseAccess, status) => {
-      if (directDatabaseAccess === 'undefined') directDatabaseAccess = false;
       if (status !== 'ok') {
         importErrorMessage(status);
       } else {