From e538bfb913086ec9380bad58c5c1bb10d2b0173d Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Mon, 26 Sep 2022 16:46:27 -0400
Subject: [PATCH] some fixes for pages that broke from the new VM based eval

---
 zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-name.js      | 1 +
 zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user.js           | 1 +
 zefie_wtvp_minisrv/ServiceVault/wtv-setup/remove-users.js       | 1 +
 zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user.js  | 2 +-
 .../ServiceVault/wtv-setup/validate-remove-users.js             | 1 +
 zefie_wtvp_minisrv/app.js                                       | 2 ++
 zefie_wtvp_minisrv/package.json                                 | 2 +-
 7 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-name.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-name.js
index f0c5a2ec..1d90574c 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-name.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-name.js
@@ -1,4 +1,5 @@
 var minisrv_service_file = true;
+var errpage;
 
 
 if (ssid_sessions[socket.ssid].user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user.js
index cd6f37c9..a795182f 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user.js
@@ -1,4 +1,5 @@
 var minisrv_service_file = true;
+var errpage;
 
 if (Object.keys(ssid_sessions[socket.ssid].listPrimaryAccountUsers()).length >= minisrv_config.config.user_accounts.max_users_per_account) {
     errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/remove-users.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/remove-users.js
index 5faece0e..d084a9d8 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/remove-users.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/remove-users.js
@@ -1,4 +1,5 @@
 var minisrv_service_file = true;
+var errpage;
 
 if (Object.keys(ssid_sessions[socket.ssid].listPrimaryAccountUsers()).length == 1) {
 	errpage = wtvshared.doErrorPage(400, "There are no more users to remove.");
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user.js
index 91ef260e..5d4f94fb 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user.js
@@ -115,7 +115,7 @@ display_name=${request_headers.query.display_name}&
 user_name=${request_headers.query.user_name}&
 user_password=${request_headers.query.user_password}&
 user_password2=${request_headers.query.user_password2}&
-review-only='TRUE'">
+review-only=true">
 ${request_headers.query.display_name || request_headers.query.user_name}
 </a>
 <tr>
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-remove-users.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-remove-users.js
index 94f38c95..e8af9cca 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-remove-users.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-remove-users.js
@@ -1,4 +1,5 @@
 var minisrv_service_file = true;
+var errpage;
 
 if (Object.keys(ssid_sessions[socket.ssid].listPrimaryAccountUsers()).length == 1) {
 	errpage = wtvshared.doErrorPage(400, "There are no more users to remove.");
diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js
index a72ed551..e6b6c441 100644
--- a/zefie_wtvp_minisrv/app.js
+++ b/zefie_wtvp_minisrv/app.js
@@ -120,6 +120,7 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
         https: https,
         wtvshared: wtvshared,
         clientShowAlert: clientShowAlert,
+        WTVClientSessionData: WTVClientSessionData,
         strftime: strftime,
         CryptoJS: CryptoJS,
         fs: fs,
@@ -128,6 +129,7 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
         getServiceString: getServiceString,
         sendToClient: sendToClient,
         socket: socket,
+        SessionStore: SessionStore,
         request_headers: request_headers,
         service_name: service_name,
         service_vaults: service_vaults,
diff --git a/zefie_wtvp_minisrv/package.json b/zefie_wtvp_minisrv/package.json
index c754e9db..3d03d066 100644
--- a/zefie_wtvp_minisrv/package.json
+++ b/zefie_wtvp_minisrv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zefie_wtvp_minisrv",
-  "version": "0.9.26",
+  "version": "0.9.30",
   "description": "WebTV Service (WTVP) Emulation Server",
   "main": "app.js",
   "homepage": "https://github.com/zefie/zefie_wtvp_minisrv",