mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-09-20 15:45:55 +08:00
Custom admin query key
This commit is contained in:
parent
27870cec26
commit
54c3e0732e
|
@ -13,6 +13,7 @@ class Links
|
|||
this.sVersion = Settings.settingsGet('Version');
|
||||
this.sAuthSuffix = Settings.settingsGet('AuthAccountHash') || '0';
|
||||
this.sWebPrefix = Settings.settingsGet('WebPath') || '';
|
||||
this.sAdminPath = Settings.settingsGet('AdminPath') || 'admin';
|
||||
this.sVersionPrefix = Settings.settingsGet('WebVersionPath') || 'rainloop/v/' + this.sVersion + '/';
|
||||
this.sStaticPrefix = this.sVersionPrefix + 'static/';
|
||||
}
|
||||
|
@ -40,7 +41,7 @@ class Links
|
|||
* @return {string}
|
||||
*/
|
||||
rootAdmin() {
|
||||
return this.sServer + '/Admin/';
|
||||
return this.sServer + this.sAdminPath;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -249,7 +250,7 @@ class Links
|
|||
search = Utils.pString(search);
|
||||
|
||||
let result = this.sBase + 'mailbox/';
|
||||
|
||||
|
||||
if ('' !== folder)
|
||||
{
|
||||
const resultThreadUid = Utils.pInt(threadUid);
|
||||
|
|
|
@ -1402,6 +1402,7 @@ class Actions
|
|||
'Auth' => false,
|
||||
'AccountHash' => '',
|
||||
'WebPath' => \RainLoop\Utils::WebPath(),
|
||||
'AdminPath' => \strtolower($oConfig->Get('security', 'admin_panel_key', 'admin')),
|
||||
'WebVersionPath' => \RainLoop\Utils::WebVersionPath(),
|
||||
'AccountSignMe' => false,
|
||||
'AuthAccountHash' => '',
|
||||
|
|
|
@ -129,6 +129,7 @@ class Application extends \RainLoop\Config\AbstractConfig
|
|||
'force_two_factor_auth' => array(false),
|
||||
'allow_universal_login' => array(false),
|
||||
'admin_panel_host' => array(''),
|
||||
'admin_panel_key' => array('admin'),
|
||||
'core_install_access_domain' => array('')
|
||||
),
|
||||
|
||||
|
|
|
@ -110,7 +110,8 @@ class Service
|
|||
$sAdminPanelHost = $this->oActions->Config()->Get('security', 'admin_panel_host', '');
|
||||
if (empty($sAdminPanelHost))
|
||||
{
|
||||
$bAdmin = !empty($aPaths[0]) && \in_array(\strtolower($aPaths[0]), array('admin', 'cp'));
|
||||
$sAdminPanelKey = \strtolower($this->oActions->Config()->Get('security', 'admin_panel_key', 'admin'));
|
||||
$bAdmin = !empty($aPaths[0]) && $aPaths[0] === $sAdminPanelKey;
|
||||
}
|
||||
else if (empty($aPaths[0]) &&
|
||||
\MailSo\Base\Utils::StrToLowerIfAscii($sAdminPanelHost) === \MailSo\Base\Utils::StrToLowerIfAscii($this->oHttp->GetHost()))
|
||||
|
|
Loading…
Reference in a new issue