From 632081c0412392f6d5cba9275212ec3d1981fbc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 10 Nov 2021 13:04:47 +0100 Subject: Load UIMode from config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Controller/DocumentController.php | 50 +++++++++++++---------------------- 1 file changed, 18 insertions(+), 32 deletions(-) (limited to 'lib') diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php index 189b4f0e..1ed67f21 100644 --- a/lib/Controller/DocumentController.php +++ b/lib/Controller/DocumentController.php @@ -11,6 +11,7 @@ namespace OCA\Richdocuments\Controller; +use OCA\Richdocuments\AppInfo\Application; use OCA\Richdocuments\Db\Wopi; use OCA\Richdocuments\Events\BeforeFederationRedirectEvent; use OCA\Richdocuments\Service\FederationService; @@ -48,7 +49,7 @@ class DocumentController extends Controller { /** @var IL10N */ private $l10n; /** @var IConfig */ - private $settings; + private $config; /** @var AppConfig */ private $appConfig; /** @var ILogger */ @@ -65,28 +66,16 @@ class DocumentController extends Controller { private $templateManager; /** @var FederationService */ private $federationService; - /** @var Helper */ - private $helper; + /** @var IInitialState */ + private $initialState; const ODT_TEMPLATE_PATH = '/assets/odttemplate.odt'; - /** - * @param string $appName - * @param IRequest $request - * @param IConfig $settings - * @param AppConfig $appConfig - * @param IL10N $l10n - * @param IManager $shareManager - * @param TokenManager $tokenManager - * @param IRootFolder $rootFolder - * @param ISession $session - * @param string $UserId - * @param ILogger $logger - */ + public function __construct( $appName, IRequest $request, - IConfig $settings, + IConfig $config, AppConfig $appConfig, IL10N $l10n, IManager $shareManager, @@ -103,7 +92,7 @@ class DocumentController extends Controller { parent::__construct($appName, $request); $this->uid = $UserId; $this->l10n = $l10n; - $this->settings = $settings; + $this->config = $config; $this->appConfig = $appConfig; $this->shareManager = $shareManager; $this->tokenManager = $tokenManager; @@ -112,7 +101,6 @@ class DocumentController extends Controller { $this->logger = $logger; $this->templateManager = $templateManager; $this->federationService = $federationService; - $this->helper = $helper; $this->initialState = $initialState; } @@ -194,13 +182,11 @@ class DocumentController extends Controller { private function provideDocumentInitialState(Wopi $wopi) { $this->initialState->provideInitialState('wopi', $wopi); $this->initialState->provideInitialState('uiDefaults', [ - 'UIMode' => 'classic' + 'UIMode' => $this->config->getAppValue(Application::APPNAME, 'uiDefaults-UIMode', 'classic') ]); - - $config = \OC::$server->getConfig(); - $logoSet = $config->getAppValue('theming', 'logoheaderMime', '') !== ''; + $logoSet = $this->config->getAppValue('theming', 'logoheaderMime', '') !== ''; if (!$logoSet) { - $logoSet = $config->getAppValue('theming', 'logoMime', '') !== ''; + $logoSet = $this->config->getAppValue('theming', 'logoMime', '') !== ''; } $this->initialState->provideInitialState('theming-customLogo', ($logoSet ? \OC::$server->getURLGenerator()->getAbsoluteURL(\OC::$server->getThemingDefaults()->getLogo()) @@ -243,11 +229,11 @@ class DocumentController extends Controller { $params = [ 'permissions' => $item->getPermissions(), 'title' => $item->getName(), - 'fileId' => $item->getId() . '_' . $this->settings->getSystemValue('instanceid'), + 'fileId' => $item->getId() . '_' . $this->config->getSystemValue('instanceid'), 'token' => $token, 'urlsrc' => $urlSrc, 'path' => $folder->getRelativePath($item->getPath()), - 'instanceId' => $this->settings->getSystemValue('instanceid'), + 'instanceId' => $this->config->getSystemValue('instanceid'), 'canonical_webroot' => $this->appConfig->getAppValue('canonical_webroot'), 'userId' => $this->uid ]; @@ -307,7 +293,7 @@ class DocumentController extends Controller { $template = $this->templateManager->get($templateId); list($urlSrc, $wopi) = $this->tokenManager->getTokenForTemplate($template, $this->uid, $file->getId()); - $wopiFileId = $wopi->getFileid() . '_' . $this->settings->getSystemValue('instanceid'); + $wopiFileId = $wopi->getFileid() . '_' . $this->config->getSystemValue('instanceid'); $params = [ 'permissions' => $template->getPermissions(), @@ -316,7 +302,7 @@ class DocumentController extends Controller { 'token' => $wopi->getToken(), 'urlsrc' => $urlSrc, 'path' => $userFolder->getRelativePath($file->getPath()), - 'instanceId' => $this->settings->getSystemValue('instanceid'), + 'instanceId' => $this->config->getSystemValue('instanceid'), 'canonical_webroot' => $this->appConfig->getAppValue('canonical_webroot'), 'userId' => $this->uid ]; @@ -368,9 +354,9 @@ class DocumentController extends Controller { $params = [ 'permissions' => $share->getPermissions(), 'title' => $item->getName(), - 'fileId' => $item->getId() . '_' . $this->settings->getSystemValue('instanceid'), + 'fileId' => $item->getId() . '_' . $this->config->getSystemValue('instanceid'), 'path' => '/', - 'instanceId' => $this->settings->getSystemValue('instanceid'), + 'instanceId' => $this->config->getSystemValue('instanceid'), 'canonical_webroot' => $this->appConfig->getAppValue('canonical_webroot'), 'userId' => $this->uid, ]; @@ -489,11 +475,11 @@ class DocumentController extends Controller { $params = [ 'permissions' => $permissions, 'title' => $node->getName(), - 'fileId' => $node->getId() . '_' . $this->settings->getSystemValue('instanceid'), + 'fileId' => $node->getId() . '_' . $this->config->getSystemValue('instanceid'), 'token' => $token, 'urlsrc' => $urlSrc, 'path' => '/', - 'instanceId' => $this->settings->getSystemValue('instanceid'), + 'instanceId' => $this->config->getSystemValue('instanceid'), 'canonical_webroot' => $this->appConfig->getAppValue('canonical_webroot'), 'userId' => $remoteWopi->getEditorUid() ? ($remoteWopi->getEditorUid() . '@' . $remoteServer) : null, ]; -- cgit v1.2.3