From 2f1a24eee74d0bf7bf5d734d1abd99a7bc68052c Mon Sep 17 00:00:00 2001
From: tomneedham <tom@owncloud.com>
Date: Tue, 18 Feb 2014 09:50:46 +0000
Subject: [PATCH 1/2] Add displayname for admins

---
 lib/private/ocs/cloud.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php
index cbbf3b626f..784a5b0869 100644
--- a/lib/private/ocs/cloud.php
+++ b/lib/private/ocs/cloud.php
@@ -61,17 +61,25 @@ class OC_OCS_Cloud {
 	 *                           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('/');
-			$quota = array(
+			$return['quota'] = array(
 				'free' =>  $storage['free'],
 				'used' =>  $storage['used'],
 				'total' =>  $storage['total'],
 				'relative' => $storage['relative'],
 				);
-			return new OC_OCS_Result(array('quota' => $quota));
+		}
+		if(OC_User::isAdminUser(OC_User::getUser()) 
+			|| OC_Subadmin::isUserAccessible(OC_User::getUser(), $parameters['userid'])) {
+			// Is an admin/subadmin so can see display name
+			$return['displayname'] = OC_User::getDisplayName($parameters['userid']);
+		}
+		if(count($return)) {
+			return new OC_OCS_Result($return);
 		} else {
 			// No permission to view this user data
 			return new OC_OCS_Result(null, 997);

From df38d4ef1a591bd5b1aaa476b6240eac0a059a8e Mon Sep 17 00:00:00 2001
From: tomneedham <tom@owncloud.com>
Date: Tue, 18 Feb 2014 10:36:18 +0000
Subject: [PATCH 2/2] Return 101 if user doesnt exist

---
 lib/private/ocs/cloud.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php
index 784a5b0869..06d6a8eb4b 100644
--- a/lib/private/ocs/cloud.php
+++ b/lib/private/ocs/cloud.php
@@ -75,8 +75,12 @@ class OC_OCS_Cloud {
 		}
 		if(OC_User::isAdminUser(OC_User::getUser()) 
 			|| OC_Subadmin::isUserAccessible(OC_User::getUser(), $parameters['userid'])) {
-			// Is an admin/subadmin so can see display name
-			$return['displayname'] = OC_User::getDisplayName($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);