retrieve local users, groups and group members in a sorted way

diff --git a/lib/private/group/database.php b/lib/private/group/database.php
index 8d6ea1f50a58668d76707dcb0740f81cd7689f64..e6a5565b20eaca3f98f03645e90858b1f4608beb 100644 (file)
--- 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 e9844f0f79ceafcc6fb5a7365871aca9293f4913..3a76adbe7633127a13dc96e7cb77c755592a0d69 100644 (file)
--- 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()) {