From 7be031ae6de807862d7d9e3632c79f8b80cf73c9 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 12 Sep 2016 16:16:20 +0200
Subject: [PATCH] change group id to _disabledUsers

---
 settings/Controller/UsersController.php     | 12 ++++++------
 settings/js/users/groups.js                 |  4 ++--
 settings/js/users/users.js                  |  8 ++++----
 settings/templates/users/part.grouplist.php |  2 +-
 settings/users.php                          |  4 ++--
 5 files changed, 15 insertions(+), 15 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);
 				}
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index b54f26b4ccb..16621441a64 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -211,9 +211,9 @@ GroupList = {
 
 	showDisabledUsers: function () {
 		UserList.empty();
-		UserList.update('disabledUsers');
+		UserList.update('_disabledUsers');
 		$userGroupList.find('li').removeClass('active');
-		GroupList.getGroupLI('disabledUsers').addClass('active');
+		GroupList.getGroupLI('_disabledUsers').addClass('active');
 	},
 
 	showGroup: function (gid) {
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 552d28ad505..117c61b7dcb 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -52,7 +52,7 @@ var UserList = {
 	 * 			}
 	 */
 	add: function (user) {
-		if (this.currentGid && this.currentGid !== '_everyone' && this.currentGid !== 'disabledUsers' && _.indexOf(user.groups, this.currentGid) < 0) {
+		if (this.currentGid && this.currentGid !== '_everyone' && this.currentGid !== '_disabledUsers' && _.indexOf(user.groups, this.currentGid) < 0) {
 			return false;
 		}
 
@@ -936,14 +936,14 @@ $(document).ready(function () {
 			{username: uid, enabled: setEnabled},
 			function (result) {
 				if (result && result.status==='success'){
-					var count = GroupList.getUserCount(GroupList.getGroupLI('disabledUsers'));
+					var count = GroupList.getUserCount(GroupList.getGroupLI('_disabledUsers'));
 					$tr.remove();
 					if(result.data.enabled == 1) {
 						$tr.data('userEnabled', true);
-						GroupList.setUserCount(GroupList.getGroupLI('disabledUsers'), count-1);
+						GroupList.setUserCount(GroupList.getGroupLI('_disabledUsers'), count-1);
 					} else {
 						$tr.data('userEnabled', false);
-						GroupList.setUserCount(GroupList.getGroupLI('disabledUsers'), count+1);
+						GroupList.setUserCount(GroupList.getGroupLI('_disabledUsers'), count+1);
 					}
 				} else {
 					OC.dialogs.alert(result.data.message, t('settings', 'Unable to change status of {user}', {user: uid}));
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 0b953c0298f..5dfd7836f6a 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -39,7 +39,7 @@
 
 	<!-- Disabled Users -->
 	<?php $disabledUsersGroup = $_["disabledUsersGroup"] ?>
-	<li data-gid="disabledUsers" data-usercount="<?php if($disabledUsersGroup['usercount'] > 0) { p($disabledUsersGroup['usercount']); } ?>" class="isgroup">
+	<li data-gid="_disabledUsers" data-usercount="<?php if($disabledUsersGroup['usercount'] > 0) { p($disabledUsersGroup['usercount']); } ?>" class="isgroup">
 		<a href="#"><span class="groupname"><?php p($l->t('Disabled')); ?></span></a>
 		<span class="utils">
 			<span class="usercount"><?php if($disabledUsersGroup['usercount'] > 0) { p($disabledUsersGroup['usercount']); } ?></span>
diff --git a/settings/users.php b/settings/users.php
index c3b32d0473e..9f3433aa33a 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -102,8 +102,8 @@ foreach (OC_User::getUsers() as $uid) {
 	}
 }
 $disabledUsersGroup = array(
-	'id' => 'disabledUsers',
-	'name' => 'disabledUsers',
+	'id' => '_disabledUsers',
+	'name' => '_disabledUsers',
 	'usercount' => $disabledUsers
 );