diff options
Diffstat (limited to 'lib/private/ocs')
| -rw-r--r-- | lib/private/ocs/cloud.php | 46 | ||||
| -rw-r--r-- | lib/private/ocs/privatedata.php | 1 | ||||
| -rw-r--r-- | lib/private/ocs/result.php | 1 |
3 files changed, 2 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( diff --git a/lib/private/ocs/privatedata.php b/lib/private/ocs/privatedata.php index 249c17b3792..92f029aa12a 100644 --- a/lib/private/ocs/privatedata.php +++ b/lib/private/ocs/privatedata.php @@ -3,6 +3,7 @@ * @author Andreas Fischer <bantu@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> * @author Frank Karlitschek <frank@owncloud.org> + * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php index e8ef253ee65..2c3f676510c 100644 --- a/lib/private/ocs/result.php +++ b/lib/private/ocs/result.php @@ -6,6 +6,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. |