Merge pull request #1399 from owncloud/fix_ldap_proxy_display_names

LDAP: implement getDisplayName and getDisplayNames also for UserProxy (m...

1 files changed, 27 insertions, 0 deletions

diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 47f901ddb51..a94be3354fc 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -147,6 +147,33 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	}
 
 	/**
+	 * @brief get display name of the user
+	 * @param $uid user ID of the user
+	 * @return display name
+	 */
+	public function getDisplayName($uid) {
+		return $this->handleRequest($uid, 'getDisplayName', array($uid));
+	}
+
+	/**
+	 * @brief Get a list of all display names
+	 * @returns array with  all displayNames (value) and the corresponding uids (key)
+	 *
+	 * Get a list of all display names and user ids.
+	 */
+	public function getDisplayNames($search = '', $limit = null, $offset = null) {
+		//we do it just as the /OC_User implementation: do not play around with limit and offset but ask all backends
+		$users = array();
+		foreach($this->backends as $backend) {
+			$backendUsers = $backend->getDisplayNames($search, $limit, $offset);
+			if (is_array($backendUsers)) {
+				$users = array_merge($users, $backendUsers);
+			}
+		}
+		return $users;
+	}
+
+	/**
 	 * @brief delete a user
 	 * @param $uid The username of the user to delete
 	 * @returns true/false