summaryrefslogtreecommitdiffstats
path: root/apps/files_external/personal.php
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@owncloud.com>2015-08-11 18:45:07 +0100
committerRobin McCorkell <rmccorkell@owncloud.com>2015-08-19 10:05:11 +0100
commit37beb58c6f395523d8e2934870c5f52a8c6f6df0 (patch)
treeb14325a790ddaf7236c3f8c1939ce9ef10df58bb /apps/files_external/personal.php
parent74237a9c44192fb98944ea7f3c14fa6f22c0814b (diff)
downloadnextcloud-server-37beb58c6f395523d8e2934870c5f52a8c6f6df0.tar.gz
nextcloud-server-37beb58c6f395523d8e2934870c5f52a8c6f6df0.zip
Introduce BackendService for managing external storage backends
Backends are registered to the BackendService through new data structures: Backends are concrete classes, deriving from \OCA\Files_External\Lib\Backend\Backend. During construction, the various configuration parameters of the Backend can be set, in a design similar to Symfony Console. DefinitionParameter stores a parameter configuration for an external storage: name of parameter, human-readable name, type of parameter (text, password, hidden, checkbox), flags (optional or not). Storages in the StoragesController now get their parameters validated server-side (fixes a TODO).
Diffstat (limited to 'apps/files_external/personal.php')
-rw-r--r--apps/files_external/personal.php34
1 files changed, 10 insertions, 24 deletions
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 1ac0f65a1f0..e204cdbeb99 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -24,34 +24,20 @@
*
*/
-OCP\Util::addScript('files_external', 'settings');
-OCP\Util::addStyle('files_external', 'settings');
-$backends = OC_Mount_Config::getPersonalBackends();
+use \OCA\Files_External\Service\BackendService;
-$mounts = OC_Mount_Config::getPersonalMountPoints();
-$hasId = true;
-foreach ($mounts as $mount) {
- if (!isset($mount['id'])) {
- // some mount points are missing ids
- $hasId = false;
- break;
- }
-}
+$app = new \OCA\Files_external\Appinfo\Application();
+$appContainer = $app->getContainer();
+$backendService = $appContainer->query('OCA\Files_External\Service\BackendService');
+$userStoragesService = $appContainer->query('OCA\Files_external\Service\UserStoragesService');
-if (!$hasId) {
- $service = new \OCA\Files_external\Service\UserStoragesService(\OC::$server->getUserSession());
- // this will trigger the new storage code which will automatically
- // generate storage config ids
- $service->getAllStorages();
- // re-read updated config
- $mounts = OC_Mount_Config::getPersonalMountPoints();
- // TODO: use the new storage config format in the template
-}
+OCP\Util::addScript('files_external', 'settings');
+OCP\Util::addStyle('files_external', 'settings');
$tmpl = new OCP\Template('files_external', 'settings');
$tmpl->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled());
$tmpl->assign('isAdminPage', false);
-$tmpl->assign('mounts', $mounts);
-$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies());
-$tmpl->assign('backends', $backends);
+$tmpl->assign('storages', $userStoragesService->getAllStorages());
+$tmpl->assign('dependencies', OC_Mount_Config::dependencyMessage($backendService->getBackends()));
+$tmpl->assign('backends', $backendService->getBackendsVisibleFor(BackendService::VISIBILITY_PERSONAL));
return $tmpl->fetchPage();