Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2020-10-26 16:44:15 +0300
committerArthur Schiwon <blizzz@arthur-schiwon.de>2020-10-26 18:05:28 +0300
commitfd1fd5afa4712166cbb136d4df197bf7e37545af (patch)
tree7dcf7f64c5e3b409e5c5fc40681965a42a4d47b9 /apps/user_ldap/lib/Jobs/Sync.php
parent951887e922bfc47613f0cfda5e7798df2b4286d6 (diff)
user share manager to determine share ownership
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/user_ldap/lib/Jobs/Sync.php')
-rw-r--r--apps/user_ldap/lib/Jobs/Sync.php19
1 files changed, 3 insertions, 16 deletions
diff --git a/apps/user_ldap/lib/Jobs/Sync.php b/apps/user_ldap/lib/Jobs/Sync.php
index 053ca894902..483c21386eb 100644
--- a/apps/user_ldap/lib/Jobs/Sync.php
+++ b/apps/user_ldap/lib/Jobs/Sync.php
@@ -29,16 +29,13 @@ use OC\ServerNotAvailableException;
use OCA\User_LDAP\AccessFactory;
use OCA\User_LDAP\Configuration;
use OCA\User_LDAP\ConnectionFactory;
-use OCA\User_LDAP\FilesystemHelper;
use OCA\User_LDAP\Helper;
use OCA\User_LDAP\LDAP;
-use OCA\User_LDAP\LogWrapper;
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User\Manager;
use OCP\IAvatarManager;
use OCP\IConfig;
use OCP\IDBConnection;
-use OCP\Image;
use OCP\IUserManager;
use OCP\Notification\IManager;
@@ -68,7 +65,8 @@ class Sync extends TimedJob {
/** @var AccessFactory */
protected $accessFactory;
- public function __construct() {
+ public function __construct(Manager $userManager) {
+ $this->userManager = $userManager;
$this->setInterval(
\OC::$server->getConfig()->getAppValue(
'user_ldap',
@@ -345,17 +343,6 @@ class Sync extends TimedJob {
if (isset($argument['userManager'])) {
$this->userManager = $argument['userManager'];
- } else {
- $this->userManager = new Manager(
- $this->config,
- new FilesystemHelper(),
- new LogWrapper(),
- $this->avatarManager,
- new Image(),
- $this->dbc,
- $this->ncUserManager,
- $this->notificationManager
- );
}
if (isset($argument['mapper'])) {
@@ -363,7 +350,7 @@ class Sync extends TimedJob {
} else {
$this->mapper = new UserMapping($this->dbc);
}
-
+
if (isset($argument['connectionFactory'])) {
$this->connectionFactory = $argument['connectionFactory'];
} else {