upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-26 16:48:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

Merge pull request #19602 from owncloud/allow-certificate-import

Browse source 
Fix importing of certificates
This commit is contained in:
Thomas Müller 2015-10-06 15:23:27 +02:00
commit 932e64f77f
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
settings/controller/certificatecontroller.php
View file

@ -122,8 +122,9 @@ class CertificateController extends Controller {
protected function isCertificateImportAllowed() {
$externalStorageEnabled = $this->appManager->isEnabledForUser('files_external');
if ($externalStorageEnabled) {
$backendService = \OC_Mount_Config::$app->getContainer()->query('OCA\Files_External\Service\BackendService');
if ($backendService->getBackendsVisibleFor(\OCA\Files_External\Service\BackendService::VISIBILITY_PERSONAL)) {
/** @var \OCA\Files_External\Service\BackendService $backendService */
$backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
if ($backendService->isUserMountingAllowed()) {
return true;
}
}

4
settings/personal.php
View file

@ -119,7 +119,9 @@ $clients = array(
$enableCertImport = false;
$externalStorageEnabled = \OC::$server->getAppManager()->isEnabledForUser('files_external');
if ($externalStorageEnabled) {
$enableCertImport = true;
/** @var \OCA\Files_External\Service\BackendService $backendService */
$backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
$enableCertImport = $backendService->isUserMountingAllowed();
}