hgfd
This commit is contained in:
+22
-1
@@ -1947,7 +1947,14 @@ process.on('uncaughtException', err => {
|
||||
enable_comments: cfg.enable_comments !== false,
|
||||
public_nsfw: !!cfg.websrv.public_nsfw,
|
||||
public_untagged: !!cfg.websrv.public_untagged,
|
||||
onara: !!(cfg.onara !== undefined ? cfg.onara : cfg.websrv?.onara),
|
||||
get onara() {
|
||||
const c = cfg.onara !== undefined ? cfg.onara : cfg.websrv?.onara;
|
||||
return !!c;
|
||||
},
|
||||
get onara_cfg() {
|
||||
const c = cfg.onara !== undefined ? cfg.onara : cfg.websrv?.onara;
|
||||
return (c !== undefined && c !== null) ? !!c : null;
|
||||
},
|
||||
is_onara_item: false,
|
||||
enable_private_uploads: cfg.enable_private_uploads !== false,
|
||||
get enable_expiring_uploads() { return getEnableExpiringUploads(); },
|
||||
@@ -2147,12 +2154,26 @@ process.on('uncaughtException', err => {
|
||||
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;
|
||||
|
||||
const cfgOnara = cfg.onara !== undefined ? cfg.onara : cfg.websrv?.onara;
|
||||
const cookieOnara = activeReq.cookies?.f0ck_onara !== undefined
|
||||
? (activeReq.cookies.f0ck_onara === '1' || activeReq.cookies.f0ck_onara === 'true')
|
||||
: (activeReq.cookies?.onara !== undefined ? (activeReq.cookies.onara === '1' || activeReq.cookies.onara === 'true') : null);
|
||||
const effectiveOnara = (cfgOnara !== undefined && cfgOnara !== null)
|
||||
? !!cfgOnara
|
||||
: (cookieOnara !== null ? cookieOnara : !!activeReq.session?.onara);
|
||||
data.onara = effectiveOnara;
|
||||
data.onara_cfg = (cfgOnara !== undefined && cfgOnara !== null) ? !!cfgOnara : null;
|
||||
} else {
|
||||
data.recaptcha_enabled = perRequestRecaptcha;
|
||||
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 || '';
|
||||
|
||||
const cfgOnara = cfg.onara !== undefined ? cfg.onara : cfg.websrv?.onara;
|
||||
data.onara = !!cfgOnara;
|
||||
data.onara_cfg = (cfgOnara !== undefined && cfgOnara !== null) ? !!cfgOnara : null;
|
||||
}
|
||||
|
||||
return originalRender.call(tpl, view, data, (data.url && data.url !== req?.url) ? undefined : req);
|
||||
|
||||
Reference in New Issue
Block a user