Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index

Add filter for backend to rest index

3 files changed, 19 insertions, 4 deletions

diff --git a/lib/private/user.php b/lib/private/user.php
index f93b76a3a64..ff45e9e26a6 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -546,6 +546,7 @@ class OC_User {
 	 * @return array associative array with all display names (value) and corresponding uids (key)
 	 *
 	 * Get a list of all display names and user ids.
+	 * @deprecated Use \OC::$server->getUserManager->searchDisplayName($search, $limit, $offset) instead.
 	 */
 	public static function getDisplayNames($search = '', $limit = null, $offset = null) {
 		$displayNames = array();
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 4fa3711e3b8..1bc3b51c2ef 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -28,7 +28,7 @@ use OCP\IConfig;
  */
 class Manager extends PublicEmitter implements IUserManager {
 	/**
-	 * @var \OC_User_Interface[] $backends
+	 * @var \OCP\UserInterface [] $backends
 	 */
 	private $backends = array();
 
@@ -63,9 +63,17 @@ class Manager extends PublicEmitter implements IUserManager {
 	}
 
 	/**
+	 * Get the active backends
+	 * @return \OCP\UserInterface[]
+	 */
+	public function getBackends() {
+		return $this->backends;
+	}
+
+	/**
 	 * register a user backend
 	 *
-	 * @param \OC_User_Interface $backend
+	 * @param \OCP\UserInterface $backend
 	 */
 	public function registerBackend($backend) {
 		$this->backends[] = $backend;
@@ -74,7 +82,7 @@ class Manager extends PublicEmitter implements IUserManager {
 	/**
 	 * remove a user backend
 	 *
-	 * @param \OC_User_Interface $backend
+	 * @param \OCP\UserInterface $backend
 	 */
 	public function removeBackend($backend) {
 		$this->cachedUsers = array();
@@ -113,7 +121,7 @@ class Manager extends PublicEmitter implements IUserManager {
 	 * get or construct the user object
 	 *
 	 * @param string $uid
-	 * @param \OC_User_Interface $backend
+	 * @param \OCP\UserInterface $backend
 	 * @return \OC\User\User
 	 */
 	protected function getUserObject($uid, $backend) {
diff --git a/lib/public/iusermanager.php b/lib/public/iusermanager.php
index fc0729b860b..1691aee8e7d 100644
--- a/lib/public/iusermanager.php
+++ b/lib/public/iusermanager.php
@@ -32,6 +32,12 @@ interface IUserManager {
 	public function registerBackend($backend);
 
 	/**
+	 * Get the active backends
+	 * @return \OCP\UserInterface[]
+	 */
+	public function getBackends();
+
+	/**
 	 * remove a user backend
 	 *
 	 * @param \OCP\UserInterface $backend