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

Search also the email and displayname in user mangement for groups 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2020-05-28 17:26:07 +02:00 committed by backportbot[bot]
parent 02680cf93d
commit 74e98940ef
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/private/Group/Database.php
View File

@ -345,15 +345,27 @@ class Database extends ABackend implements
$this->fixDI(); $this->fixDI();
$query = $this->dbConn->getQueryBuilder(); $query = $this->dbConn->getQueryBuilder();
$query->select('uid') $query->select('g.uid')
->from('group_user') ->from('group_user', 'g')
->where($query->expr()->eq('gid', $query->createNamedParameter($gid))) ->where($query->expr()->eq('gid', $query->createNamedParameter($gid)))
->orderBy('uid', 'ASC'); ->orderBy('g.uid', 'ASC');
if ($search !== '') { if ($search !== '') {
$query->andWhere($query->expr()->like('uid', $query->createNamedParameter( $query->leftJoin('g', 'users', 'u', $query->expr()->eq('g.uid', 'u.uid'))
'%' . $this->dbConn->escapeLikeParameter($search) . '%' ->leftJoin('u', 'preferences', 'p', $query->expr()->andX(
))); $query->expr()->eq('p.userid', 'u.uid'),
$query->expr()->eq('p.appid', $query->expr()->literal('settings')),
$query->expr()->eq('p.configkey', $query->expr()->literal('email')))
)
// sqlite doesn't like re-using a single named parameter here
->andWhere(
$query->expr()->orX(
$query->expr()->ilike('g.uid', $query->createNamedParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')),
$query->expr()->ilike('u.displayname', $query->createNamedParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')),
$query->expr()->ilike('p.configvalue', $query->createNamedParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%'))
)
)
->orderBy('u.uid_lower', 'ASC');
} }
if ($limit !== -1) { if ($limit !== -1) {