summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2014-04-22 19:41:35 +0200
committerArthur Schiwon <blizzz@owncloud.com>2014-06-02 12:53:57 +0200
commitf9f95509695c6ae654addfdab01dceb48f41ce56 (patch)
tree5fd1e528e07e92e95f820f9b1f946da3518db8bf
parentf2fed6de4e186f3f5ff66bc727d5576827433c16 (diff)
downloadnextcloud-server-f9f95509695c6ae654addfdab01dceb48f41ce56.tar.gz
nextcloud-server-f9f95509695c6ae654addfdab01dceb48f41ce56.zip
small fixes / cleanup
-rw-r--r--lib/private/group/metadata.php3
-rw-r--r--lib/private/user/user.php2
-rw-r--r--settings/users.php11
3 files changed, 2 insertions, 14 deletions
diff --git a/lib/private/group/metadata.php b/lib/private/group/metadata.php
index 65444cc04e8..a901ccdce32 100644
--- a/lib/private/group/metadata.php
+++ b/lib/private/group/metadata.php
@@ -81,9 +81,8 @@ class MetaData {
$sortAdminGroupsKeys = array();
foreach($this->getGroups($search) as $group) {
- $usersInGroup = $group->count();
$groupMetaData = $this->generateGroupMetaData($group);
- if (strtolower($gid) !== 'admin') {
+ if (strtolower($group->getGID()) !== 'admin') {
$this->addEntry(
$groups,
$sortGroupsKeys,
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index 86a362ae758..ddef3b7adf1 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -53,7 +53,7 @@ class User {
private $config;
/**
- * @var int $home
+ * @var int $lastLogin
*/
private $lastLogin;
diff --git a/settings/users.php b/settings/users.php
index f9655793e2f..8f72fc9d5c8 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -22,17 +22,6 @@ $users = array();
$userManager = \OC_User::getManager();
$groupManager = \OC_Group::getManager();
-if (isset($_GET['offset'])) {
- $offset = $_GET['offset'];
-} else {
- $offset = 0;
-}
-if (isset($_GET['limit'])) {
- $limit = $_GET['limit'];
-} else {
- $limit = 10;
-}
-
$isAdmin = OC_User::isAdminUser(OC_User::getUser());
$groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), $isAdmin, $groupManager);