summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Blüm <marius@lineone.io>2016-08-18 23:32:13 +0200
committerGitHub <noreply@github.com>2016-08-18 23:32:13 +0200
commita83c5e8b005209adf349636b2175fdb46bbc2d66 (patch)
tree0032b2f45613b6ea932a73ce58223d66810844d0
parent7f96e4e6754cf421b6325e757477e69badd5f579 (diff)
parentc51e2eb3baf01cb82f30f61f0593fb93b3ba496f (diff)
downloadnextcloud-server-a83c5e8b005209adf349636b2175fdb46bbc2d66.tar.gz
nextcloud-server-a83c5e8b005209adf349636b2175fdb46bbc2d66.zip
Merge pull request #906 from nextcloud/files_external-settings-polish-missing
Files external settings polish
-rw-r--r--apps/files_external/lib/AppInfo/Application.php13
-rw-r--r--apps/files_external/lib/Lib/Backend/OwnCloud.php2
2 files changed, 13 insertions, 2 deletions
diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php
index 06c163419f0..fcf10adb375 100644
--- a/apps/files_external/lib/AppInfo/Application.php
+++ b/apps/files_external/lib/AppInfo/Application.php
@@ -68,7 +68,18 @@ class Application extends App implements IBackendProvider, IAuthMechanismProvide
* Register settings templates
*/
public function registerSettings() {
- \OCP\App::registerPersonal('files_external', 'personal');
+ $container = $this->getContainer();
+ $userSession = $container->getServer()->getUserSession();
+ if (!$userSession->isLoggedIn()) {
+ return;
+ }
+ $backendService = $container->query('OCA\\Files_External\\Service\\BackendService');
+
+ /** @var \OCA\Files_External\Service\UserGlobalStoragesService $userGlobalStoragesService */
+ $userGlobalStoragesService = $container->query('OCA\Files_External\Service\UserGlobalStoragesService');
+ if (count($userGlobalStoragesService->getStorages()) > 0 || $backendService->isUserMountingAllowed()) {
+ \OCP\App::registerPersonal('files_external', 'personal');
+ }
}
/**
diff --git a/apps/files_external/lib/Lib/Backend/OwnCloud.php b/apps/files_external/lib/Lib/Backend/OwnCloud.php
index 59d1b2cec52..1304b09c87c 100644
--- a/apps/files_external/lib/Lib/Backend/OwnCloud.php
+++ b/apps/files_external/lib/Lib/Backend/OwnCloud.php
@@ -37,7 +37,7 @@ class OwnCloud extends Backend {
->setIdentifier('owncloud')
->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat
->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud')
- ->setText($l->t('ownCloud'))
+ ->setText($l->t('Nextcloud'))
->addParameters([
(new DefinitionParameter('host', $l->t('URL'))),
(new DefinitionParameter('root', $l->t('Remote subfolder')))