Code refactoring (Q -> Promise)

This commit is contained in:
RainLoop Team 2016-05-23 20:33:01 +03:00
parent 7e4479d655
commit 1323a9ce52
10 changed files with 164 additions and 139 deletions

View file

@ -1478,7 +1478,8 @@ class Actions
'languages' => $this->GetLanguages(false),
'languagesAdmin' => $this->GetLanguages(true),
'attachmentsActions' => $aAttachmentsActions,
'rsaPublicKey' => $sRsaPublicKey
'rsaPublicKey' => $sRsaPublicKey,
'openpgpPublicKeyServer' => $oConfig->Get('security', 'openpgp_public_key_server', '')
), $bAdmin ? array(
'adminPath' => \strtolower($oConfig->Get('security', 'admin_panel_key', 'admin')),
'allowAdminPanel' => (bool) $oConfig->Get('security', 'allow_admin_panel', true),