From 5dd20a55e87922bce72d3ffcb70ed67ccfcc84f3 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 15 Aug 2016 15:32:22 +0200 Subject: dont register personal files_external setting if it's empty --- apps/files_external/lib/AppInfo/Application.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php index 06c163419f0..8e76ffd3352 100644 --- a/apps/files_external/lib/AppInfo/Application.php +++ b/apps/files_external/lib/AppInfo/Application.php @@ -68,7 +68,14 @@ class Application extends App implements IBackendProvider, IAuthMechanismProvide * Register settings templates */ public function registerSettings() { - \OCP\App::registerPersonal('files_external', 'personal'); + $container = $this->getContainer(); + $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'); + } } /** -- cgit v1.2.3 From 2332ed3292962a3af970ac98fcd802f97912855b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 15 Aug 2016 16:13:23 +0200 Subject: change remote cloud naming to Nextcloud --- apps/files_external/lib/Lib/Backend/OwnCloud.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'))) -- cgit v1.2.3 From c51e2eb3baf01cb82f30f61f0593fb93b3ba496f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 18 Aug 2016 16:06:25 +0200 Subject: fix error when not logged in --- apps/files_external/lib/AppInfo/Application.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php index 8e76ffd3352..fcf10adb375 100644 --- a/apps/files_external/lib/AppInfo/Application.php +++ b/apps/files_external/lib/AppInfo/Application.php @@ -69,6 +69,10 @@ class Application extends App implements IBackendProvider, IAuthMechanismProvide */ public function registerSettings() { $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 */ -- cgit v1.2.3