diff --git a/webv4/lib/init.js b/webv4/lib/init.js index 637bb18a99bfc85d2c79cccabead9dea9059e054..cdd6b394166960c5c9e067cb8266575b7ebc7597 100644 --- a/webv4/lib/init.js +++ b/webv4/lib/init.js @@ -2,20 +2,8 @@ require('sbbsdefs.js', 'SYS_CLOSED'); load('array.js'); // Paths -settings.web_directory = fullpath( - backslash( - typeof settings.web_directory === 'undefined' - ? '../web' - : settings.web_directory - ) -); -settings.web_root = fullpath( - backslash( - typeof settings.web_root === 'undefined' - ? settings.web_directory + 'root' - : settings.web_root - ) -); +settings.web_directory = fullpath(backslash(settings.web_directory === undefined ? '../webv4' : settings.web_directory)); +settings.web_root = fullpath(backslash(settings.web_root === undefined ? settings.web_directory + 'root' : settings.web_root)); settings.web_lib = backslash(settings.web_directory + 'lib/'); settings.web_components = backslash(settings.web_directory + 'components/'); settings.web_pages = backslash(fullpath(settings.web_root + '../pages')); @@ -25,47 +13,47 @@ settings.web_mods_pages = backslash(fullpath(settings.web_mods + 'pages/')); settings.web_mods_sidebar = backslash(fullpath(settings.web_mods + 'sidebar/')); var defaults = { - guest : { - default : 'Guest', - test : function () { - return system.matchuser(settings.guest) ? null : 'Guest account unavailable'; - } - }, - timeout : { default : 43200 }, - user_registration : { default : false }, - minimum_password_length : { default : 4 }, - email_validation : { default : true }, - email_validation_level : { default : 50 }, - max_messages : { - default : 0, - test : function () { - return settings.max_messages >= 0 ? null : 'max_messages must be >= 0'; - } - }, - page_size : { - default : 25, - test : function () { - return settings.page_size >= 1 ? null : 'page_size must be >= 1'; - } - }, - forum_extended_ascii : { default : true }, - active_node_list : { default : true }, - hide_empty_stats : { default : true } + guest: { + default: 'Guest', + test: function () { + return system.matchuser(settings.guest) ? null : 'Guest account unavailable'; + } + }, + timeout: { default: 43200 }, + user_registration: { default: false }, + minimum_password_length: { default: 4 }, + email_validation: { default: true }, + email_validation_level: { default: 50 }, + max_messages: { + default: 0, + test: function () { + return settings.max_messages >= 0 ? null : 'max_messages must be >= 0'; + } + }, + page_size: { + default: 25, + test: function () { + return settings.page_size >= 1 ? null : 'page_size must be >= 1'; + } + }, + forum_extended_ascii: { default: true }, + active_node_list: { default: true }, + hide_empty_stats: { default: true } }; Object.keys(defaults).forEach(function (e) { - if (typeof settings[e] == 'undefined') { - settings[e] = defaults[e].default; - } else if (typeof settings[e] != typeof defaults[e].default) { - log(LOG_ERROR, 'Invalid ' + e + ' setting: ' + settings[e]); - exit(); - } else if (typeof defaults[e].test == 'function') { - const t = defaults[e].test(); - if (t !== null) { - log(LOG_ERROR, t); - exit(); - } - } + if (typeof settings[e] == 'undefined') { + settings[e] = defaults[e].default; + } else if (typeof settings[e] != typeof defaults[e].default) { + log(LOG_ERROR, 'Invalid ' + e + ' setting: ' + settings[e]); + exit(); + } else if (typeof defaults[e].test == 'function') { + const t = defaults[e].test(); + if (t !== null) { + log(LOG_ERROR, t); + exit(); + } + } }); defaults = undefined;