Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-27 19:19:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup RainLoop\Service with improved ?admin path detection

Browse source
This commit is contained in:
the-djmaze 2022-01-11 15:55:48 +01:00
parent c804f35347
commit 9fea092c43
5 changed files with 63 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dev/Common/Links.js
View file

@ -6,7 +6,11 @@ const
HASH_PREFIX = '#/',
SERVER_PREFIX = './?',
VERSION = Settings.app('version'),
VERSION_PREFIX = Settings.app('webVersionPath') || 'snappymail/v/' + VERSION + '/';
VERSION_PREFIX = Settings.app('webVersionPath') || 'snappymail/v/' + VERSION + '/',
adminPath = () => rl.adminArea() && !Settings.app('adminHostUse'),
prefix = () => SERVER_PREFIX + (adminPath() ? Settings.app('adminPath') : '');
export const
SUB_QUERY_PREFIX = '&q[]=',
@ -20,9 +24,7 @@ export const
/**
* @returns {string}
*/
logoutLink = () => (rl.adminArea() && !Settings.app('adminHostUse'))
? SERVER_PREFIX + Settings.app('adminPath')
: ROOT,
logoutLink = () => adminPath() ? prefix() : ROOT,
/**
* @param {string} type
@ -49,7 +51,7 @@ export const
* @param {string} type
* @returns {string}
*/
serverRequest = type => SERVER_PREFIX + '/' + type + '/' + SUB_QUERY_PREFIX + '/0/',
serverRequest = type => prefix() + '/' + type + '/' + SUB_QUERY_PREFIX + '/0/',
/**
* @param {string} lang