aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2014-08-29 15:17:37 +0200
committerArthur Schiwon <blizzz@owncloud.com>2014-08-31 11:56:54 +0200
commit11b2835cc39e10a9fbaec07817478d62e58f0752 (patch)
treed3a58c750a995137ef5afa1317ddeb2c14845f3b
parent8b86df308bc4df0729126db55e5cde668074bd59 (diff)
downloadnextcloud-server-11b2835cc39e10a9fbaec07817478d62e58f0752.tar.gz
nextcloud-server-11b2835cc39e10a9fbaec07817478d62e58f0752.zip
retrieve local users, groups and group members in a sorted way
-rw-r--r--lib/private/group/database.php4
-rw-r--r--lib/private/user/database.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/group/database.php b/lib/private/group/database.php
index 8d6ea1f50a5..e6a5565b20e 100644
--- a/lib/private/group/database.php
+++ b/lib/private/group/database.php
@@ -168,7 +168,7 @@ class OC_Group_Database extends OC_Group_Backend {
* Returns a list with all groups
*/
public function getGroups($search = '', $limit = null, $offset = null) {
- $stmt = OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups` WHERE `gid` LIKE ?', $limit, $offset);
+ $stmt = OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups` WHERE `gid` LIKE ? ORDER BY `gid` ASC', $limit, $offset);
$result = $stmt->execute(array('%' . $search . '%'));
$groups = array();
while ($row = $result->fetchRow()) {
@@ -200,7 +200,7 @@ class OC_Group_Database extends OC_Group_Backend {
* @return array an array of user ids
*/
public function usersInGroup($gid, $search = '', $limit = null, $offset = null) {
- $stmt = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?',
+ $stmt = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ? ORDER BY `uid` ASC',
$limit,
$offset);
$result = $stmt->execute(array($gid, '%'.$search.'%'));
diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index e9844f0f79c..3a76adbe763 100644
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -157,7 +157,7 @@ class OC_User_Database extends OC_User_Backend {
$displayNames = array();
$query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`'
. ' WHERE LOWER(`displayname`) LIKE LOWER(?) OR '
- . 'LOWER(`uid`) LIKE LOWER(?)', $limit, $offset);
+ . 'LOWER(`uid`) LIKE LOWER(?) ORDER BY `uid` ASC', $limit, $offset);
$result = $query->execute(array('%' . $search . '%', '%' . $search . '%'));
$users = array();
while ($row = $result->fetchRow()) {
@@ -231,7 +231,7 @@ class OC_User_Database extends OC_User_Backend {
* Get a list of all users.
*/
public function getUsers($search = '', $limit = null, $offset = null) {
- $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset);
+ $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?) ORDER BY `uid` ASC', $limit, $offset);
$result = $query->execute(array('%' . $search . '%'));
$users = array();
while ($row = $result->fetchRow()) {