wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjust access constructor to master

Browse source
This commit is contained in:
Arthur Schiwon 2014-06-25 11:42:15 +02:00
parent 452efa5fab
commit 89f2691515
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/user_ldap/lib/access.php
View file

@ -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);
if(is_null($limit)) {
$limit = $this->connection->ldapPagingSize;
$limit = intval($this->connection->ldapPagingSize);
}
$counter = 0;

10
apps/user_ldap/lib/wizard.php
View file

@ -1107,7 +1107,15 @@ class Wizard extends LDAPUtility {
$con->setConfiguration($this->configuration->getConfiguration());
$con->ldapConfigurationActive = 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;
}