commit
c8c0e72e73
|
@ -308,15 +308,16 @@ class OC_Group {
|
||||||
* @return array with display names (Key) user ids (value)
|
* @return array with display names (Key) user ids (value)
|
||||||
*/
|
*/
|
||||||
public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) {
|
public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) {
|
||||||
$displayNames = array();
|
$displayNames = array();
|
||||||
foreach ($gids as $gid) {
|
foreach ($gids as $gid) {
|
||||||
// TODO Need to apply limits to groups as total
|
// TODO Need to apply limits to groups as total
|
||||||
$displayNames = array_merge(
|
$diff = array_diff(
|
||||||
array_diff(
|
self::displayNamesInGroup($gid, $search, $limit, $offset),
|
||||||
self::displayNamesInGroup($gid, $search, $limit, $offset),
|
$displayNames
|
||||||
$displayNames
|
);
|
||||||
),
|
if ($diff) {
|
||||||
$displayNames);
|
$displayNames = array_merge($diff, $displayNames);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return $displayNames;
|
return $displayNames;
|
||||||
}
|
}
|
||||||
|
|
|
@ -225,7 +225,7 @@ class OC_Group_Database extends OC_Group_Backend {
|
||||||
$stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`'
|
$stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`'
|
||||||
.' FROM `*PREFIX*users`'
|
.' FROM `*PREFIX*users`'
|
||||||
.' INNER JOIN `*PREFIX*group_user` ON `*PREFIX*group_user`.`uid` = `*PREFIX*users`.`uid`'
|
.' INNER JOIN `*PREFIX*group_user` ON `*PREFIX*group_user`.`uid` = `*PREFIX*users`.`uid`'
|
||||||
.' WHERE `gid` = ? AND `*PREFIX*group_user.uid` LIKE ?',
|
.' WHERE `gid` = ? AND `*PREFIX*group_user`.`uid` LIKE ?',
|
||||||
$limit,
|
$limit,
|
||||||
$offset);
|
$offset);
|
||||||
$result = $stmt->execute(array($gid, $search.'%'));
|
$result = $stmt->execute(array($gid, $search.'%'));
|
||||||
|
|
Loading…
Reference in New Issue