summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2015-10-08 21:47:30 +0200
committerRoeland Jago Douma <rullzer@owncloud.com>2015-10-13 21:07:48 +0200
commit002e9c76cdfa805c798ff9f9543df17ae7fa4232 (patch)
tree3c13a17fcba5d6be468905b1ff1f4914e48b438c /lib
parentef4278cfa9570b3910b35cc82313d6391aec3c22 (diff)
downloadnextcloud-server-002e9c76cdfa805c798ff9f9543df17ae7fa4232.tar.gz
nextcloud-server-002e9c76cdfa805c798ff9f9543df17ae7fa4232.zip
Combine OCS API getUser method code into provisioning_api app
Fixes #13002 Move the cloud/users/{userid} code in total to the provisioning API.
Diffstat (limited to 'lib')
-rw-r--r--lib/private/ocs/cloud.php46
1 files changed, 0 insertions, 46 deletions
diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php
index 8f4f1769e9c..441e53400a3 100644
--- a/lib/private/ocs/cloud.php
+++ b/lib/private/ocs/cloud.php
@@ -42,52 +42,6 @@ class OC_OCS_Cloud {
return new OC_OCS_Result($result);
}
- /**
- * gets user info
- *
- * exposes the quota of an user:
- * <data>
- * <quota>
- * <free>1234</free>
- * <used>4321</used>
- * <total>5555</total>
- * <ralative>0.78</ralative>
- * </quota>
- * </data>
- *
- * @param array $parameters should contain parameter 'userid' which identifies
- * the user from whom the information will be returned
- */
- public static function getUser($parameters) {
- $return = array();
- // Check if they are viewing information on themselves
- if($parameters['userid'] === OC_User::getUser()) {
- // Self lookup
- $storage = OC_Helper::getStorageInfo('/');
- $return['quota'] = array(
- 'free' => $storage['free'],
- 'used' => $storage['used'],
- 'total' => $storage['total'],
- 'relative' => $storage['relative'],
- );
- }
- if(OC_User::isAdminUser(OC_User::getUser())
- || OC_Subadmin::isUserAccessible(OC_User::getUser(), $parameters['userid'])) {
- if(OC_User::userExists($parameters['userid'])) {
- // Is an admin/subadmin so can see display name
- $return['displayname'] = OC_User::getDisplayName($parameters['userid']);
- } else {
- return new OC_OCS_Result(null, 101);
- }
- }
- if(count($return)) {
- return new OC_OCS_Result($return);
- } else {
- // No permission to view this user data
- return new OC_OCS_Result(null, 997);
- }
- }
-
public static function getCurrentUser() {
$email=\OC::$server->getConfig()->getUserValue(OC_User::getUser(), 'settings', 'email', '');
$data = array(