summaryrefslogtreecommitdiffstats
path: root/settings/application.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-11-03 10:55:52 +0100
committerLukas Reschke <lukas@owncloud.com>2014-11-03 16:53:03 +0100
commite73ccbd4cade0622615ee133496a571ac1d6dba7 (patch)
tree114c981b1ae7ae1e050dbfe74c1333b238a2b178 /settings/application.php
parentf8f38b06dfef0af2555124cf0d1ec55402aa8c8c (diff)
downloadnextcloud-server-e73ccbd4cade0622615ee133496a571ac1d6dba7.tar.gz
nextcloud-server-e73ccbd4cade0622615ee133496a571ac1d6dba7.zip
Migrate "setsecurity.php" to the AppFramework
Add switch to enforce SSL for subdomains Add unit tests Add test for boolean values Camel-case Fix ugly JS
Diffstat (limited to 'settings/application.php')
-rw-r--r--settings/application.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/settings/application.php b/settings/application.php
index 99d78aff2cc..64aa4671228 100644
--- a/settings/application.php
+++ b/settings/application.php
@@ -13,6 +13,7 @@ namespace OC\Settings;
use OC\AppFramework\Utility\SimpleContainer;
use OC\Settings\Controller\AppSettingsController;
use OC\Settings\Controller\MailSettingsController;
+use OC\Settings\Controller\SecuritySettingsController;
use \OCP\AppFramework\App;
use \OCP\Util;
@@ -53,6 +54,14 @@ class Application extends App {
$c->query('Config')
);
});
+ $container->registerService('SecuritySettingsController', function(SimpleContainer $c) {
+ return new SecuritySettingsController(
+ $c->query('AppName'),
+ $c->query('Request'),
+ $c->query('Config')
+ );
+ });
+
/**
* Core class wrappers
*/