mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10610 from nextcloud/fix/noid/dontcountwithldap 

do not trigger counting on LDAP
This commit is contained in:
Roeland Jago Douma 2018-08-10 20:54:18 +02:00 committed by GitHub
parent c2dfea57c8 1b74bfc999
commit 2afd37331e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
settings/Controller/UsersController.php
View File

@ -43,6 +43,7 @@ use OC\Accounts\AccountManager;
use OC\AppFramework\Http; use OC\AppFramework\Http;
use OC\ForbiddenException; use OC\ForbiddenException;
use OC\Security\IdentityProof\Manager; use OC\Security\IdentityProof\Manager;
use OCA\User_LDAP\User_Proxy;
use OCP\App\IAppManager; use OCP\App\IAppManager;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
@ -53,7 +54,6 @@ use OCP\IConfig;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IL10N; use OCP\IL10N;
use OCP\IRequest; use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUser; use OCP\IUser;
use OCP\IUserManager; use OCP\IUserManager;
use OCP\IUserSession; use OCP\IUserSession;
@ -153,14 +153,13 @@ class UsersController extends Controller {
/* SORT OPTION: SORT_USERCOUNT or SORT_GROUPNAME */ /* SORT OPTION: SORT_USERCOUNT or SORT_GROUPNAME */
$sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT; $sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT;
$isLDAPUsed = false;
if ($this->config->getSystemValue('sort_groups_by_name', false)) { if ($this->config->getSystemValue('sort_groups_by_name', false)) {
$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
} else { } else {
$isLDAPUsed = false;
if ($this->appManager->isEnabledForUser('user_ldap')) { if ($this->appManager->isEnabledForUser('user_ldap')) {
$isLDAPUsed = $isLDAPUsed =
$this->groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP') $this->groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
|| $this->groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
if ($isLDAPUsed) { if ($isLDAPUsed) {
// LDAP user count can be slow, so we sort by group name here // LDAP user count can be slow, so we sort by group name here
$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
@ -186,9 +185,15 @@ class UsersController extends Controller {
$groupsInfo->setSorting($sortGroupsBy); $groupsInfo->setSorting($sortGroupsBy);
list($adminGroup, $groups) = $groupsInfo->get(); list($adminGroup, $groups) = $groupsInfo->get();
if(!$isLDAPUsed && $this->appManager->isEnabledForUser('user_ldap')) {
$isLDAPUsed = (bool)array_reduce($this->userManager->getBackends(), function ($ldapFound, $backend) {
return $ldapFound || $backend instanceof User_Proxy;
});
}
if ($this->isAdmin) { if ($this->isAdmin) {
$disabledUsers = $isLDAPUsed ? 0 : $this->userManager->countDisabledUsers(); $disabledUsers = $isLDAPUsed ? 0 : $this->userManager->countDisabledUsers();
$userCount = array_reduce($this->userManager->countUsers(), function($v, $w) { $userCount = $isLDAPUsed ? 0 : array_reduce($this->userManager->countUsers(), function($v, $w) {
return $v + (int)$w; return $v + (int)$w;
}, 0); }, 0);
} else { } else {
@ -208,7 +213,7 @@ class UsersController extends Controller {
$userCount = -1; // we also lower from one the total count $userCount = -1; // we also lower from one the total count
} }
}; };
$userCount += $this->userManager->countUsersOfGroups($groupsInfo->getGroups()); $userCount += $isLDAPUsed ? 0 : $this->userManager->countUsersOfGroups($groupsInfo->getGroups());
$disabledUsers = $isLDAPUsed ? 0 : $this->userManager->countDisabledUsersOfGroups($groupsNames); $disabledUsers = $isLDAPUsed ? 0 : $this->userManager->countDisabledUsersOfGroups($groupsNames);
} }
$disabledUsersGroup = [ $disabledUsersGroup = [