adjust access constructor to master
This commit is contained in:
parent
452efa5fab
commit
89f2691515
|
@ -835,7 +835,7 @@ class Access extends LDAPUtility implements user\IUserTools {
|
||||||
\OCP\Util::writeLog('user_ldap', 'Count filter: '.print_r($filter, true), \OCP\Util::DEBUG);
|
\OCP\Util::writeLog('user_ldap', 'Count filter: '.print_r($filter, true), \OCP\Util::DEBUG);
|
||||||
|
|
||||||
if(is_null($limit)) {
|
if(is_null($limit)) {
|
||||||
$limit = $this->connection->ldapPagingSize;
|
$limit = intval($this->connection->ldapPagingSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
$counter = 0;
|
$counter = 0;
|
||||||
|
|
|
@ -1107,7 +1107,15 @@ class Wizard extends LDAPUtility {
|
||||||
$con->setConfiguration($this->configuration->getConfiguration());
|
$con->setConfiguration($this->configuration->getConfiguration());
|
||||||
$con->ldapConfigurationActive = true;
|
$con->ldapConfigurationActive = true;
|
||||||
$con->setIgnoreValidation(true);
|
$con->setIgnoreValidation(true);
|
||||||
$ldapAccess = new Access($con, $this->ldap);
|
|
||||||
|
$userManager = new user\Manager(
|
||||||
|
\OC::$server->getConfig(),
|
||||||
|
new FilesystemHelper(),
|
||||||
|
new LogWrapper(),
|
||||||
|
\OC::$server->getAvatarManager(),
|
||||||
|
new \OCP\Image());
|
||||||
|
|
||||||
|
$ldapAccess = new Access($con, $this->ldap, $userManager);
|
||||||
return $ldapAccess;
|
return $ldapAccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue