diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-09-28 15:38:49 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-28 15:38:49 +0200 |
| commit | bf1057143cdff8ec289d9d766ab100d64d7ea45d (patch) | |
| tree | 6c35d0d99a72f27a981a07c93f0ecbf600764cd4 /lib/group/backend.php | |
| parent | 3efe1d3b24e65ed76d521c24b0cfe4e0ff2e7af5 (diff) | |
| parent | 5144d26088b98685a37c73c776a9a47203efa68a (diff) | |
| download | nextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.tar.gz nextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.zip | |
Merge branch 'master' into routing
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
Diffstat (limited to 'lib/group/backend.php')
| -rw-r--r-- | lib/group/backend.php | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/lib/group/backend.php b/lib/group/backend.php index 1ba34c940cf..9ff432d0663 100644 --- a/lib/group/backend.php +++ b/lib/group/backend.php @@ -47,7 +47,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { /** * @brief Get all supported actions - * @returns bitwise-or'ed actions + * @return int bitwise-or'ed actions * * Returns the supported actions as int to be * compared with OC_USER_BACKEND_CREATE_USER etc. @@ -65,8 +65,8 @@ abstract class OC_Group_Backend implements OC_Group_Interface { /** * @brief Check if backend implements actions - * @param $actions bitwise-or'ed actions - * @returns boolean + * @param int $actions bitwise-or'ed actions + * @return boolean * * Returns the supported actions as int to be * compared with OC_GROUP_BACKEND_CREATE_GROUP etc. @@ -77,9 +77,9 @@ abstract class OC_Group_Backend implements OC_Group_Interface { /** * @brief is user in group? - * @param $uid uid of the user - * @param $gid gid of the group - * @returns true/false + * @param string $uid uid of the user + * @param string $gid gid of the group + * @return bool * * Checks whether the user is member of a group or not. */ @@ -89,8 +89,8 @@ abstract class OC_Group_Backend implements OC_Group_Interface { /** * @brief Get all groups a user belongs to - * @param $uid Name of the user - * @returns array with group names + * @param string $uid Name of the user + * @return array with group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -101,7 +101,10 @@ abstract class OC_Group_Backend implements OC_Group_Interface { /** * @brief get a list of all groups - * @returns array with group names + * @param string $search + * @param int $limit + * @param int $offset + * @return array with group names * * Returns a list with all groups */ @@ -121,7 +124,11 @@ abstract class OC_Group_Backend implements OC_Group_Interface { /** * @brief get a list of all users in a group - * @returns array with user ids + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset + * @return array with user ids */ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { return array(); |