[Pkg-owncloud-commits] [owncloud] 07/205: Do not return backends but add a method to check for one

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 497fe93b6c0a7de212e69ec8a343867cb4904dca
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Tue Jun 16 11:31:04 2015 +0200

    Do not return backends but add a method to check for one
---
 lib/private/group/manager.php | 17 ++++++++++++++---
 lib/public/igroupmanager.php  |  7 +++++--
 settings/users.php            | 10 ++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 6399f16..70263fc 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -98,10 +98,21 @@ class Manager extends PublicEmitter implements IGroupManager {
 	}
 
 	/**
-	 * @return \OC_Group_Backend[] Get registered backends
+	 * Checks whether a given backend is used
+	 *
+	 * @param string $backendClass Full classname including complete namespace
+	 * @return bool
 	 */
-	public function getBackends() {
-		return $this->backends;
+	public function isBackendUsed($backendClass) {
+		$backendClass = strtolower(ltrim($backendClass, '\\'));
+
+		foreach ($this->backends as $backend) {
+			if (strtolower(get_class($backend)) === $backendClass) {
+				return true;
+			}
+		}
+
+		return false;
 	}
 
 	/**
diff --git a/lib/public/igroupmanager.php b/lib/public/igroupmanager.php
index 4e984e5..ec4b03c 100644
--- a/lib/public/igroupmanager.php
+++ b/lib/public/igroupmanager.php
@@ -41,10 +41,13 @@ namespace OCP;
  */
 interface IGroupManager {
 	/**
-	 * @return \OC_Group_Backend[] Get registered backends
+	 * Checks whether a given backend is used
+	 *
+	 * @param string $backendClass Full classname including complete namespace
+	 * @return bool
 	 * @since 8.1.0
 	 */
-	public function getBackends();
+	public function isBackendUsed($backendClass);
 
 	/**
 	 * @param \OCP\UserInterface $backend
diff --git a/settings/users.php b/settings/users.php
index 5da6902..c438e5f 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -41,12 +41,10 @@ $groupManager = \OC_Group::getManager();
 $sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT;
 
 if (class_exists('\OCA\user_ldap\GROUP_LDAP')) {
-	$backends = $groupManager->getBackends();
-	foreach ($backends as $backend) {
-		if ($backend instanceof \OCA\user_ldap\GROUP_LDAP) {
-			// LDAP user count can be slow, so we sort by gorup name here
-			$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
-		}
+	$isLDAPUsed = $groupManager->isBackendUsed('\OCA\user_ldap\GROUP_LDAP');
+	if ($isLDAPUsed) {
+		// LDAP user count can be slow, so we sort by group name here
+		$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
 	}
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git