summaryrefslogtreecommitdiffstats
path: root/settings/Controller/UsersController.php
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-09-12 16:16:20 +0200
committerMorris Jobke <hey@morrisjobke.de>2017-04-29 00:54:30 -0300
commit7be031ae6de807862d7d9e3632c79f8b80cf73c9 (patch)
tree9f03ddfbfc7a974a3bc80512131848b4c7f7b70b /settings/Controller/UsersController.php
parentd91b4044fc040d4ddc541812c1afb6497873031a (diff)
downloadnextcloud-server-7be031ae6de807862d7d9e3632c79f8b80cf73c9.tar.gz
nextcloud-server-7be031ae6de807862d7d9e3632c79f8b80cf73c9.zip
change group id to _disabledUsers
Diffstat (limited to 'settings/Controller/UsersController.php')
-rw-r--r--settings/Controller/UsersController.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 5949d9c9746..293afe9e6ff 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -268,15 +268,15 @@ class UsersController extends Controller {
$users = [];
if ($this->isAdmin) {
- if($gid !== '' && $gid !== 'disabledUsers') {
+ if($gid !== '' && $gid !== '_disabledUsers') {
$batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset));
} else {
$batch = $this->userManager->search($pattern, $limit, $offset);
}
foreach ($batch as $user) {
- if( ($gid !== 'disabledUsers' && $user->isEnabled()) ||
- ($gid === 'disabledUsers' && !$user->isEnabled())
+ if( ($gid !== '_disabledUsers' && $user->isEnabled()) ||
+ ($gid === '_disabledUsers' && !$user->isEnabled())
) {
$users[] = $this->formatUserForIndex($user);
}
@@ -292,7 +292,7 @@ class UsersController extends Controller {
$subAdminOfGroups = $gids;
// Set the $gid parameter to an empty value if the subadmin has no rights to access a specific group
- if($gid !== '' && $gid !== 'disabledUsers' && !in_array($gid, $subAdminOfGroups)) {
+ if($gid !== '' && $gid !== '_disabledUsers' && !in_array($gid, $subAdminOfGroups)) {
$gid = '';
}
@@ -317,8 +317,8 @@ class UsersController extends Controller {
$this->groupManager->getUserGroupIds($user),
$subAdminOfGroups
));
- if( ($gid !== 'disabledUsers' && $user->isEnabled()) ||
- ($gid === 'disabledUsers' && !$user->isEnabled())
+ if( ($gid !== '_disabledUsers' && $user->isEnabled()) ||
+ ($gid === '_disabledUsers' && !$user->isEnabled())
) {
$users[] = $this->formatUserForIndex($user, $userGroups);
}