mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Provide config though initial state service 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2020-04-03 22:42:45 +02:00
parent 24e58947d6
commit cbd20867b5
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/private/Template/JSConfigHelper.php
View File

@ -37,6 +37,7 @@ use OCP\App\IAppManager;
use OCP\Defaults; use OCP\Defaults;
use OCP\IConfig; use OCP\IConfig;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IInitialStateService;
use OCP\IL10N; use OCP\IL10N;
use OCP\ISession; use OCP\ISession;
use OCP\IURLGenerator; use OCP\IURLGenerator;
@ -75,6 +76,9 @@ class JSConfigHelper {
/** @var CapabilitiesManager */ /** @var CapabilitiesManager */
private $capabilitiesManager; private $capabilitiesManager;
/** @var IInitialStateService */
private $initialStateService;
/** @var array user back-ends excluded from password verification */ /** @var array user back-ends excluded from password verification */
private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true]; private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
@ -99,7 +103,8 @@ class JSConfigHelper {
IGroupManager $groupManager, IGroupManager $groupManager,
IniGetWrapper $iniWrapper, IniGetWrapper $iniWrapper,
IURLGenerator $urlGenerator, IURLGenerator $urlGenerator,
CapabilitiesManager $capabilitiesManager) { CapabilitiesManager $capabilitiesManager,
IInitialStateService $initialStateService) {
$this->l = $l; $this->l = $l;
$this->defaults = $defaults; $this->defaults = $defaults;
$this->appManager = $appManager; $this->appManager = $appManager;
@ -110,6 +115,7 @@ class JSConfigHelper {
$this->iniWrapper = $iniWrapper; $this->iniWrapper = $iniWrapper;
$this->urlGenerator = $urlGenerator; $this->urlGenerator = $urlGenerator;
$this->capabilitiesManager = $capabilitiesManager; $this->capabilitiesManager = $capabilitiesManager;
$this->initialStateService = $initialStateService;
} }
public function getConfig() { public function getConfig() {
@ -175,6 +181,20 @@ class JSConfigHelper {
$capabilities = $this->capabilitiesManager->getCapabilities(); $capabilities = $this->capabilitiesManager->getCapabilities();
$config = [
'session_lifetime' => min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
'session_keepalive' => $this->config->getSystemValue('session_keepalive', true),
'auto_logout' => $this->config->getSystemValue('auto_logout', false),
'version' => implode('.', \OCP\Util::getVersion()),
'versionstring' => \OC_Util::getVersionString(),
'enable_avatars' => true, // here for legacy reasons - to not crash existing code that relies on this value
'lost_password_link' => $this->config->getSystemValue('lost_password_link', null),
'modRewriteWorking' => $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true',
'sharing.maxAutocompleteResults' => (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0),
'sharing.minSearchStringLength' => (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0),
'blacklist_files_regex' => \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX,
];
$array = [ $array = [
"_oc_debug" => $this->config->getSystemValue('debug', false) ? 'true' : 'false', "_oc_debug" => $this->config->getSystemValue('debug', false) ? 'true' : 'false',
"_oc_isadmin" => $this->groupManager->isAdmin($uid) ? 'true' : 'false', "_oc_isadmin" => $this->groupManager->isAdmin($uid) ? 'true' : 'false',
@ -241,18 +261,7 @@ class JSConfigHelper {
(string)$this->l->t('Dec.') (string)$this->l->t('Dec.')
]), ]),
"firstDay" => json_encode($this->l->l('firstday', null)), "firstDay" => json_encode($this->l->l('firstday', null)),
"_oc_config" => json_encode([ "_oc_config" => json_encode($config),
'session_lifetime' => min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
'session_keepalive' => $this->config->getSystemValue('session_keepalive', true),
'version' => implode('.', \OCP\Util::getVersion()),
'versionstring' => \OC_Util::getVersionString(),
'enable_avatars' => true, // here for legacy reasons - to not crash existing code that relies on this value
'lost_password_link'=> $this->config->getSystemValue('lost_password_link', null),
'modRewriteWorking' => $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true',
'sharing.maxAutocompleteResults' => (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0),
'sharing.minSearchStringLength' => (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0),
'blacklist_files_regex' => \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX,
]),
"oc_appconfig" => json_encode([ "oc_appconfig" => json_encode([
'core' => [ 'core' => [
'defaultExpireDateEnabled' => $defaultExpireDateEnabled, 'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
@ -296,6 +305,8 @@ class JSConfigHelper {
]); ]);
} }
$this->initialStateService->provideInitialState('core', 'config', $config);
// Allow hooks to modify the output values // Allow hooks to modify the output values
\OC_Hook::emit('\OCP\Config', 'js', ['array' => &$array]); \OC_Hook::emit('\OCP\Config', 'js', ['array' => &$array]);

4
lib/private/TemplateLayout.php
View File

@ -49,6 +49,7 @@ use OC\Template\JSCombiner;
use OC\Template\JSConfigHelper; use OC\Template\JSConfigHelper;
use OC\Template\SCSSCacher; use OC\Template\SCSSCacher;
use OCP\Defaults; use OCP\Defaults;
use OCP\IInitialStateService;
use OCP\Support\Subscription\IRegistry; use OCP\Support\Subscription\IRegistry;
class TemplateLayout extends \OC_Template { class TemplateLayout extends \OC_Template {
@ -183,7 +184,8 @@ class TemplateLayout extends \OC_Template {
\OC::$server->getGroupManager(), \OC::$server->getGroupManager(),
\OC::$server->getIniWrapper(), \OC::$server->getIniWrapper(),
\OC::$server->getURLGenerator(), \OC::$server->getURLGenerator(),
\OC::$server->getCapabilitiesManager() \OC::$server->getCapabilitiesManager(),
\OC::$server->query(IInitialStateService::class)
); );
$this->assign('inline_ocjs', $jsConfigHelper->getConfig()); $this->assign('inline_ocjs', $jsConfigHelper->getConfig());
} else { } else {