Merge pull request #16889 from owncloud/group-sorting-fixes

Only sort by group name when LDAP is involved

2 files changed, 27 insertions, 0 deletions

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 12136a1bd25..70263fc2afa 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -98,6 +98,24 @@ class Manager extends PublicEmitter implements IGroupManager {
 	}
 
 	/**
+	 * Checks whether a given backend is used
+	 *
+	 * @param string $backendClass Full classname including complete namespace
+	 * @return bool
+	 */
+	public function isBackendUsed($backendClass) {
+		$backendClass = strtolower(ltrim($backendClass, '\\'));
+
+		foreach ($this->backends as $backend) {
+			if (strtolower(get_class($backend)) === $backendClass) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
 	 * @param \OC_Group_Backend $backend
 	 */
 	public function addBackend($backend) {
diff --git a/lib/public/igroupmanager.php b/lib/public/igroupmanager.php
index ffd459b09e1..ec4b03c5d18 100644
--- a/lib/public/igroupmanager.php
+++ b/lib/public/igroupmanager.php
@@ -41,6 +41,15 @@ namespace OCP;
  */
 interface IGroupManager {
 	/**
+	 * Checks whether a given backend is used
+	 *
+	 * @param string $backendClass Full classname including complete namespace
+	 * @return bool
+	 * @since 8.1.0
+	 */
+	public function isBackendUsed($backendClass);
+
+	/**
 	 * @param \OCP\UserInterface $backend
 	 * @since 8.0.0
 	 */