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

Make getting all users and groups the default

This commit is contained in:
Michael Gapczynski 2012-08-11 16:06:31 -04:00
parent 9d2ae5fa1f
commit 874f31b8d7
11 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/group.php
View File

@ -237,7 +237,7 @@ class OC_Group {
* *
* Returns a list with all groups * Returns a list with all groups
*/ */
public static function getGroups($search = '', $limit = 10, $offset = 0) { public static function getGroups($search = '', $limit = -1, $offset = 0) {
$groups = array(); $groups = array();
foreach (self::$_usedBackends as $backend) { foreach (self::$_usedBackends as $backend) {
$groups = array_merge($backend->getGroups($search, $limit, $offset), $groups); $groups = array_merge($backend->getGroups($search, $limit, $offset), $groups);

2
lib/group/backend.php
View File

@ -105,7 +105,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
* *
* Returns a list with all groups * Returns a list with all groups
*/ */
public function getGroups($search = '', $limit = 10, $offset = 0) { public function getGroups($search = '', $limit = -1, $offset = 0) {
return array(); return array();
} }

8
lib/group/database.php
View File

@ -164,8 +164,12 @@ class OC_Group_Database extends OC_Group_Backend {
* *
* Returns a list with all groups * Returns a list with all groups
*/ */
public function getGroups($search = '', $limit = 10, $offset = 0) { public function getGroups($search = '', $limit = -1, $offset = 0) {
$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid LIKE ? LIMIT '.$limit.' OFFSET '.$offset); if ($limit == -1) {
$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid LIKE ?');
} else {
$query = OC_DB::prepare('SELECT gid FROM *PREFIX*groups WHERE gid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
}
$result = $query->execute(array($search.'%')); $result = $query->execute(array($search.'%'));
$groups = array(); $groups = array();
while ($row = $result->fetchRow()) { while ($row = $result->fetchRow()) {

2
lib/group/dummy.php
View File

@ -141,7 +141,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
* *
* Returns a list with all groups * Returns a list with all groups
*/ */
public function getGroups(){ public function getGroups($search = '', $limit = -1, $offset = 0) {
return array_keys($this->groups); return array_keys($this->groups);
} }

2
lib/group/example.php
View File

@ -91,7 +91,7 @@ abstract class OC_Group_Example {
* *
* Returns a list with all groups * Returns a list with all groups
*/ */
abstract public static function getGroups(); abstract public static function getGroups($search = '', $limit = -1, $offset = 0);
/** /**
* check if a group exists * check if a group exists

2
lib/group/interface.php
View File

@ -58,7 +58,7 @@ interface OC_Group_Interface {
* *
* Returns a list with all groups * Returns a list with all groups
*/ */
public function getGroups($search = '', $limit = 10, $offset = 0); public function getGroups($search = '', $limit = -1, $offset = 0);
/** /**
* check if a group exists * check if a group exists

2
lib/public/user.php
View File

@ -51,7 +51,7 @@ class User {
* *
* Get a list of all users. * Get a list of all users.
*/ */
public static function getUsers($search = '', $limit = 10, $offset = 0) { public static function getUsers($search = '', $limit = -1, $offset = 0) {
return \OC_USER::getUsers(); return \OC_USER::getUsers();
} }

2
lib/user/backend.php
View File

@ -97,7 +97,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
* *
* Get a list of all users. * Get a list of all users.
*/ */
public function getUsers($search = '', $limit = 10, $offset = 0) { public function getUsers($search = '', $limit = -1, $offset = 0) {
return array(); return array();
} }

8
lib/user/database.php
View File

@ -154,8 +154,12 @@ class OC_User_Database extends OC_User_Backend {
* *
* Get a list of all users. * Get a list of all users.
*/ */
public function getUsers($search = '', $limit = 10, $offset = 0) { public function getUsers($search = '', $limit = -1, $offset = 0) {
$query = OC_DB::prepare('SELECT uid FROM *PREFIX*users WHERE uid LIKE ? LIMIT '.$limit.' OFFSET '.$offset); if ($limit == -1) {
$query = OC_DB::prepare('SELECT uid FROM *PREFIX*users WHERE uid LIKE ?');
} else {
$query = OC_DB::prepare('SELECT uid FROM *PREFIX*users WHERE uid LIKE ? LIMIT '.$limit.' OFFSET '.$offset);
}
$result = $query->execute(array($search.'%')); $result = $query->execute(array($search.'%'));
$users = array(); $users = array();
while ($row = $result->fetchRow()) { while ($row = $result->fetchRow()) {

2
lib/user/dummy.php
View File

@ -100,7 +100,7 @@ class OC_User_Dummy extends OC_User_Backend {
* *
* Get a list of all users. * Get a list of all users.
*/ */
public function getUsers(){ public function getUsers($search = '', $limit = -1, $offset = 0) {
return array_keys($this->users); return array_keys($this->users);
} }

2
lib/user/interface.php
View File

@ -48,7 +48,7 @@ interface OC_User_Interface {
* *
* Get a list of all users. * Get a list of all users.
*/ */
public function getUsers($search = '', $limit = 10, $offset = 0); public function getUsers($search = '', $limit = -1, $offset = 0);
/** /**
* @brief check if a user exists * @brief check if a user exists