From b16ed900ccf29b70e4b8c9263df18dfafcd71c41 Mon Sep 17 00:00:00 2001
From: echicken <echicken@bbs.electronicchicken.com>
Date: Thu, 8 Oct 2020 15:57:03 -0400
Subject: [PATCH] Attempt to ensure minimum default settings.

---
 webv4/root/api/attachments.ssjs | 2 +-
 webv4/root/api/auth.ssjs        | 2 +-
 webv4/root/api/events.ssjs      | 2 +-
 webv4/root/api/files.ssjs       | 2 +-
 webv4/root/api/forum.ssjs       | 2 +-
 webv4/root/api/github.ssjs      | 2 +-
 webv4/root/api/register.ssjs    | 2 +-
 webv4/root/api/sbbsimsg.ssjs    | 2 +-
 webv4/root/api/system.ssjs      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/webv4/root/api/attachments.ssjs b/webv4/root/api/attachments.ssjs
index 50411bb234..e8098686ff 100644
--- a/webv4/root/api/attachments.ssjs
+++ b/webv4/root/api/attachments.ssjs
@@ -1,6 +1,6 @@
 require('sbbsdefs.js', 'SYS_CLOSED');
 
-var settings = load('modopts.js', 'web');
+var settings = load('modopts.js', 'web') || { web_directory: '../webv4' };
 
 load(settings.web_directory + '/lib/init.js');
 load(settings.web_lib + 'auth.js');
diff --git a/webv4/root/api/auth.ssjs b/webv4/root/api/auth.ssjs
index f0454aea47..156ef16a6d 100644
--- a/webv4/root/api/auth.ssjs
+++ b/webv4/root/api/auth.ssjs
@@ -1,4 +1,4 @@
-var settings = load('modopts.js', 'web');
+var settings = load('modopts.js', 'web') || { web_directory: '../webv4' };
 
 load(settings.web_directory + '/lib/init.js');
 load(settings.web_lib + 'auth.js');
diff --git a/webv4/root/api/events.ssjs b/webv4/root/api/events.ssjs
index 93d50b7191..e2c72062f0 100644
--- a/webv4/root/api/events.ssjs
+++ b/webv4/root/api/events.ssjs
@@ -1,5 +1,5 @@
 require('sbbsdefs.js', 'SYS_CLOSED');
-var settings = load('modopts.js', 'web');
+var settings = load('modopts.js', 'web') || { web_directory: '../webv4' };
 load(settings.web_directory + '/lib/init.js');
 load(settings.web_lib + 'auth.js');
 load(settings.web_lib + 'request.js');
diff --git a/webv4/root/api/files.ssjs b/webv4/root/api/files.ssjs
index 6737c49b61..06855704fd 100644
--- a/webv4/root/api/files.ssjs
+++ b/webv4/root/api/files.ssjs
@@ -1,5 +1,5 @@
 load('sbbsdefs.js');
-var settings = load('modopts.js', 'web');
+var settings = load('modopts.js', 'web') || { web_directory: '../webv4' };
 
 load(settings.web_directory + '/lib/init.js');
 load(settings.web_lib + 'auth.js');
diff --git a/webv4/root/api/forum.ssjs b/webv4/root/api/forum.ssjs
index 2a660f299b..6b6e29fa85 100644
--- a/webv4/root/api/forum.ssjs
+++ b/webv4/root/api/forum.ssjs
@@ -3,7 +3,7 @@
     is done here; otherwise all permission checking is done at the function
     level. */
 
-var settings = load('modopts.js', 'web');
+var settings = load('modopts.js', 'web') || { web_directory: '../webv4' };
 
 load(settings.web_directory + '/lib/init.js');
 load(settings.web_lib + 'auth.js');
diff --git a/webv4/root/api/github.ssjs b/webv4/root/api/github.ssjs
index 48a5d889b6..2d69150c30 100644
--- a/webv4/root/api/github.ssjs
+++ b/webv4/root/api/github.ssjs
@@ -21,7 +21,7 @@
 require('sbbsdefs.js', 'SYS_CLOSED');
 require('hmac.js', 'hmac_sha1');
 var options = load({}, 'modopts.js', 'github_notify');
-load(system.exec_dir + '../web/lib/init.js');
+load(system.exec_dir + '../webv4/lib/init.js');
 
 function b2h(str) {
 	return str.split('').map(function (e) {
diff --git a/webv4/root/api/register.ssjs b/webv4/root/api/register.ssjs
index 350a084e62..53400a58c7 100644
--- a/webv4/root/api/register.ssjs
+++ b/webv4/root/api/register.ssjs
@@ -1,5 +1,5 @@
 require('sbbsdefs.js', 'SYS_CLOSED');
-var settings = load('modopts.js', 'web');
+var settings = load('modopts.js', 'web') || { web_directory: '../webv4' };
 load(settings.web_directory + '/lib/init.js');
 load(settings.web_lib + 'auth.js');
 load(settings.web_lib + 'request.js');
diff --git a/webv4/root/api/sbbsimsg.ssjs b/webv4/root/api/sbbsimsg.ssjs
index 0c3eba0bd9..501dbb4f34 100644
--- a/webv4/root/api/sbbsimsg.ssjs
+++ b/webv4/root/api/sbbsimsg.ssjs
@@ -1,7 +1,7 @@
 
 require('sbbsdefs.js', 'SYS_CLOSED'); // Is this actually used?
 require('nodedefs.js', 'NODE_WFC'); // Is this actually used?
-var settings = load('modopts.js', 'web');
+var settings = load('modopts.js', 'web') || { web_directory: '../webv4' };
 load(settings.web_directory + '/lib/init.js');
 load(settings.web_lib + 'auth.js');
 var sbbsimsg = load({}, "sbbsimsg_lib.js");
diff --git a/webv4/root/api/system.ssjs b/webv4/root/api/system.ssjs
index 1ed5bc1005..26cca159d2 100644
--- a/webv4/root/api/system.ssjs
+++ b/webv4/root/api/system.ssjs
@@ -1,6 +1,6 @@
 require('sbbsdefs.js', 'SYS_CLOSED');
 require('nodedefs.js', 'NODE_WFC');
-var settings = load('modopts.js', 'web');
+var settings = load('modopts.js', 'web') || { web_directory: '../webv4' };
 
 load(settings.web_directory + '/lib/init.js');
 load(settings.web_lib + 'auth.js');
-- 
GitLab