diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-10-22 11:25:33 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-10-23 12:25:31 +0200 |
| commit | 86e5e7d9274241b0373bfa494896534b251e1978 (patch) | |
| tree | 93bf7a5cee299889b8143304537265b1a5553b33 /apps/user_ldap/lib/Jobs/CleanUp.php | |
| parent | 872f03209cccd376c0be908581164f245e558070 (diff) | |
| download | nextcloud-server-86e5e7d9274241b0373bfa494896534b251e1978.tar.gz nextcloud-server-86e5e7d9274241b0373bfa494896534b251e1978.zip | |
LDAP simplify User_Proxy and Group_Proxy signatures
- make User_Proxy and Group_Proxy easy to instantiate
- simplify dependent code
- move commands to info.xml
- make UpdateGroups job class non-static
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/user_ldap/lib/Jobs/CleanUp.php')
| -rw-r--r-- | apps/user_ldap/lib/Jobs/CleanUp.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php index 8f729ae4372..6bb44b3e6ae 100644 --- a/apps/user_ldap/lib/Jobs/CleanUp.php +++ b/apps/user_ldap/lib/Jobs/CleanUp.php @@ -35,7 +35,6 @@ use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User\DeletedUsersIndex; use OCA\User_LDAP\User_LDAP; use OCA\User_LDAP\User_Proxy; -use OCA\User_LDAP\UserPluginManager; /** * Class CleanUp @@ -69,10 +68,11 @@ class CleanUp extends TimedJob { /** @var DeletedUsersIndex */ protected $dui; - public function __construct() { + public function __construct(User_Proxy $userBackend) { $minutes = \OC::$server->getConfig()->getSystemValue( 'ldapUserCleanupInterval', (string)$this->defaultIntervalMin); $this->setInterval((int)$minutes * 60); + $this->userBackend = $userBackend; } /** @@ -99,15 +99,6 @@ class CleanUp extends TimedJob { if (isset($arguments['userBackend'])) { $this->userBackend = $arguments['userBackend']; - } else { - $this->userBackend = new User_Proxy( - $this->ldapHelper->getServerConfigurationPrefixes(true), - new LDAP(), - $this->ocConfig, - \OC::$server->getNotificationManager(), - \OC::$server->getUserSession(), - \OC::$server->query(UserPluginManager::class) - ); } if (isset($arguments['db'])) { |