Merge pull request #9488 from nextcloud/disabled-users-fix

Added disabled count per groups & fixed disabled users query 

2 files changed, 44 insertions, 0 deletions

diff --git a/lib/public/Group/Backend/ICountDisabledInGroup.php b/lib/public/Group/Backend/ICountDisabledInGroup.php
new file mode 100644
index 00000000000..fa07bcf7e5b
--- /dev/null
+++ b/lib/public/Group/Backend/ICountDisabledInGroup.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP\Group\Backend;
+
+/**
+ * @since 14.0.0
+ */
+interface ICountDisabledInGroup {
+
+	/**
+	 * @since 14.0.0
+	 */
+	public function countDisabledInGroup(string $gid): int;
+}
diff --git a/lib/public/IGroup.php b/lib/public/IGroup.php
index da1a4f5dd1e..22fa28f94be 100644
--- a/lib/public/IGroup.php
+++ b/lib/public/IGroup.php
@@ -101,6 +101,14 @@ interface IGroup {
 	public function count($search = '');
 
 	/**
+	 * returns the number of disabled users
+	 *
+	 * @return int|bool
+	 * @since 14.0.0
+	 */
+	public function countDisabled();
+
+	/**
 	 * search for users in the group by displayname
 	 *
 	 * @param string $search