diff --git a/src/inc/routes/admin.mjs b/src/inc/routes/admin.mjs index 3a73198..7437677 100644 --- a/src/inc/routes/admin.mjs +++ b/src/inc/routes/admin.mjs @@ -282,6 +282,10 @@ export default (router, tpl) => { totals: await lib.countf0cks(), session: req.session, manual_approval: getManualApproval(), + min_tags: getMinTags(), + trusted_uploads: getTrustedUploads(), + registration_open: getRegistrationOpen(), + registration_web_toggle_enabled: cfg.websrv.open_registration_web_toggle !== false, log_user_ips: getLogUserIps(), hash_user_ips: getHashUserIps(), enable_cleanup: getEnableCleanup(), diff --git a/src/index.mjs b/src/index.mjs index b891ab7..f1876ab 100644 --- a/src/index.mjs +++ b/src/index.mjs @@ -1595,7 +1595,8 @@ process.on('uncaughtException', err => { if (!data.url) data.url = activeReq.url; data.user_strict_bool = (activeReq.session && activeReq.session.strict_mode) ? true : false; data.user_logged_in_bool = !!activeReq.session; - data.csrf_token = activeReq.session?.csrf_token || ''; + data.csrf_token = activeReq.session?.csrf_token || data.csrf_token || ''; + globals.csrf_token = data.csrf_token; data.max_file_size = lib.formatSize(cfg.main.maxfilesize * (activeReq.session?.admin ? cfg.main.adminmultiplier : 1)); data.max_file_size_bytes = Math.floor(cfg.main.maxfilesize * (activeReq.session?.admin ? cfg.main.adminmultiplier : 1)); data.web_url_upload = data.web_url_upload !== undefined ? data.web_url_upload : !!cfg.websrv.web_url_upload; @@ -1604,6 +1605,7 @@ process.on('uncaughtException', err => { data.theme = data.theme || cfg.websrv.theme || 'f0ck'; data.user_strict_bool = false; data.user_logged_in_bool = false; + globals.csrf_token = data.csrf_token || ''; } return originalRender.call(tpl, view, data, (data.url && data.url !== req?.url) ? undefined : req);