diff options
| author | Bjoern Schiessle <bjoern@schiessle.org> | 2017-04-26 13:19:15 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-04-28 23:41:36 -0300 |
| commit | 9a366dbe2e84bad7d6c40f284794aa6f34c2b0f5 (patch) | |
| tree | e91741f25ad76c888946253d0e51ab57495dffe1 /settings/BackgroundJobs | |
| parent | 08a33cc4751eebc4fc1384187677efac3ac6b1d0 (diff) | |
| download | nextcloud-server-9a366dbe2e84bad7d6c40f284794aa6f34c2b0f5.tar.gz nextcloud-server-9a366dbe2e84bad7d6c40f284794aa6f34c2b0f5.zip | |
add missing translation and other small fixes
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'settings/BackgroundJobs')
| -rw-r--r-- | settings/BackgroundJobs/VerifyUserData.php | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/settings/BackgroundJobs/VerifyUserData.php b/settings/BackgroundJobs/VerifyUserData.php index 2ec0ce2ea13..f044c9f31fb 100644 --- a/settings/BackgroundJobs/VerifyUserData.php +++ b/settings/BackgroundJobs/VerifyUserData.php @@ -62,27 +62,25 @@ class VerifyUserData extends Job { /** * VerifyUserData constructor. * - * @param AccountManager|null $accountManager - * @param IUserManager|null $userManager - * @param IClientService|null $clientService - * @param IConfig|null $config + * @param AccountManager $accountManager + * @param IUserManager $userManager + * @param IClientService $clientService + * @param ILogger $logger + * @param IConfig $config */ - public function __construct(AccountManager $accountManager = null, - IUserManager $userManager = null, - IClientService $clientService = null, - ILogger $logger = null, - IConfig $config = null + public function __construct(AccountManager $accountManager, + IUserManager $userManager, + IClientService $clientService, + ILogger $logger, + IConfig $config ) { - $this->accountManager = $accountManager !== null ? $accountManager : \OC::$server->query(AccountManager::class); - $this->userManager = $userManager !== null ? $userManager : \OC::$server->getUserManager(); - $this->httpClientService = $clientService !== null ? $clientService : \OC::$server->getHTTPClientService(); - $this->logger = $logger !== null ? $logger : \OC::$server->getLogger(); - - if ($config !== null) { - $this->lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com'); - } else { - $this->lookupServerUrl = \OC::$server->getConfig()->getSystemValue('lookup_server', 'https://lookup.nextcloud.com'); - } + $this->accountManager = $accountManager; + $this->userManager = $userManager; + $this->httpClientService = $clientService; + $this->logger = $logger; + + $lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com'); + $this->lookupServerUrl = rtrim($lookupServerUrl, '/'); } /** |