diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-04-15 14:21:23 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-04-20 12:58:58 +0200 |
| commit | 20a6073a9feb6b0eb4c004e58bb47912c447fef9 (patch) | |
| tree | dea2c6537e304738fe62245e3cf2cfbe030218f4 /settings/application.php | |
| parent | 9f61cf60d49367726bc9b147993dab39eafa0c7b (diff) | |
| download | nextcloud-server-20a6073a9feb6b0eb4c004e58bb47912c447fef9.tar.gz nextcloud-server-20a6073a9feb6b0eb4c004e58bb47912c447fef9.zip | |
Migrate personal certificate handling into AppFramework controllers
Also added unit-tests and better error-handling
Diffstat (limited to 'settings/application.php')
| -rw-r--r-- | settings/application.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/settings/application.php b/settings/application.php index 59fe9f6b65a..920d172c93d 100644 --- a/settings/application.php +++ b/settings/application.php @@ -25,6 +25,7 @@ namespace OC\Settings; use OC\Files\View; use OC\Settings\Controller\AppSettingsController; +use OC\Settings\Controller\CertificateController; use OC\Settings\Controller\CheckSetupController; use OC\Settings\Controller\EncryptionController; use OC\Settings\Controller\GroupsController; @@ -97,6 +98,14 @@ class Application extends App { $c->query('Config') ); }); + $container->registerService('CertificateController', function(IContainer $c) { + return new CertificateController( + $c->query('AppName'), + $c->query('Request'), + $c->query('CertificateManager'), + $c->query('L10N') + ); + }); $container->registerService('GroupsController', function(IContainer $c) { return new GroupsController( $c->query('AppName'), @@ -223,5 +232,8 @@ class Application extends App { $container->registerService('DatabaseConnection', function(IContainer $c) { return $c->query('ServerContainer')->getDatabaseConnection(); }); + $container->registerService('CertificateManager', function(IContainer $c){ + return $c->query('ServerContainer')->getCertificateManager(); + }); } } |