summaryrefslogtreecommitdiffstats
path: root/settings/Application.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-05-19 00:50:44 +0200
committerGitHub <noreply@github.com>2017-05-19 00:50:44 +0200
commit7976927628fba974570753759b9aaebb1faee413 (patch)
tree0c0b64e674795f21008c10c24d40e56953a2643f /settings/Application.php
parent8c624bdef9f3d7c2304ba4a3fba9dbbb23c65f3e (diff)
parent19a1e01d6cc08e486bb5afe83f25b2c28852603d (diff)
downloadnextcloud-server-7976927628fba974570753759b9aaebb1faee413.tar.gz
nextcloud-server-7976927628fba974570753759b9aaebb1faee413.zip
Merge pull request #4894 from nextcloud/generic-security-activities
Change 2FA activities to more generic security activities
Diffstat (limited to 'settings/Application.php')
-rw-r--r--settings/Application.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/settings/Application.php b/settings/Application.php
index 0ca2d28dfe6..f79453e3d01 100644
--- a/settings/Application.php
+++ b/settings/Application.php
@@ -34,6 +34,9 @@ use OC\AppFramework\Utility\TimeFactory;
use OC\Authentication\Token\IProvider;
use OC\Server;
use OC\Settings\Activity\Provider;
+use OC\Settings\Activity\SecurityFilter;
+use OC\Settings\Activity\SecurityProvider;
+use OC\Settings\Activity\SecuritySetting;
use OC\Settings\Activity\Setting;
use OC\Settings\Mailer\NewUserMailHelper;
use OC\Settings\Middleware\SubadminMiddleware;
@@ -114,6 +117,9 @@ class Application extends App {
$activityManager = $this->getContainer()->getServer()->getActivityManager();
$activityManager->registerSetting(Setting::class); // FIXME move to info.xml
$activityManager->registerProvider(Provider::class); // FIXME move to info.xml
+ $activityManager->registerFilter(SecurityFilter::class); // FIXME move to info.xml
+ $activityManager->registerSetting(SecuritySetting::class); // FIXME move to info.xml
+ $activityManager->registerProvider(SecurityProvider::class); // FIXME move to info.xml
Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');