summaryrefslogtreecommitdiffstats
path: root/settings/application.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-04-09 16:07:15 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2015-04-16 14:15:04 +0200
commitd2ef73367c6fbc85a3032da405e1dad2fc714a4c (patch)
tree2ebcd339cc1547889adc96fe1cb15e331fd41697 /settings/application.php
parent6bcf88ca96bb7fc0a1f80de4a0a36e59d513dcc6 (diff)
downloadnextcloud-server-d2ef73367c6fbc85a3032da405e1dad2fc714a4c.tar.gz
nextcloud-server-d2ef73367c6fbc85a3032da405e1dad2fc714a4c.zip
allow user to start migration in admin settings if no external user back-ends are enabled
Diffstat (limited to 'settings/application.php')
-rw-r--r--settings/application.php16
1 files changed, 16 insertions, 0 deletions
diff --git a/settings/application.php b/settings/application.php
index be127da31ac..59fe9f6b65a 100644
--- a/settings/application.php
+++ b/settings/application.php
@@ -23,8 +23,10 @@
namespace OC\Settings;
+use OC\Files\View;
use OC\Settings\Controller\AppSettingsController;
use OC\Settings\Controller\CheckSetupController;
+use OC\Settings\Controller\EncryptionController;
use OC\Settings\Controller\GroupsController;
use OC\Settings\Controller\LogSettingsController;
use OC\Settings\Controller\MailSettingsController;
@@ -65,6 +67,17 @@ class Application extends App {
$c->query('DefaultMailAddress')
);
});
+ $container->registerService('EncryptionController', function(IContainer $c) {
+ return new EncryptionController(
+ $c->query('AppName'),
+ $c->query('Request'),
+ $c->query('L10N'),
+ $c->query('Config'),
+ $c->query('DatabaseConnection'),
+ $c->query('UserManager'),
+ new View()
+ );
+ });
$container->registerService('AppSettingsController', function(IContainer $c) {
return new AppSettingsController(
$c->query('AppName'),
@@ -207,5 +220,8 @@ class Application extends App {
$container->registerService('Util', function(IContainer $c) {
return new \OC_Util();
});
+ $container->registerService('DatabaseConnection', function(IContainer $c) {
+ return $c->query('ServerContainer')->getDatabaseConnection();
+ });
}
}