wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LDAP: don't pass -1 as length to array slice, when no limit is given. It cuts off the last item.

Browse source
This commit is contained in:
Arthur Schiwon 2012-08-22 10:29:15 +02:00
parent ac9fd79329
commit 2b8a2e16ed
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/user_ldap/group_ldap.php
View file

@ -143,6 +143,9 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
if(!empty($this->groupSearch)) {
$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
}
if($limit = -1) {
$limit = null;
}
return array_slice($groupUsers, $offset, $limit);
}
@ -184,6 +187,9 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
if(!empty($this->groupSearch)) {
$groupUsers = array_filter($groupUsers, array($this, 'groupMatchesFilter'));
}
if($limit = -1) {
$limit = null;
}
return array_slice($groupUsers, $offset, $limit);
}
@ -210,6 +216,9 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
if(!empty($this->groupSearch)) {
$ldap_groups = array_filter($ldap_groups, array($this, 'groupMatchesFilter'));
}
if($limit = -1) {
$limit = null;
}
return array_slice($ldap_groups, $offset, $limit);
}

3
apps/user_ldap/user_ldap.php
View file

@ -111,6 +111,9 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
if(!empty($this->userSearch)) {
$ldap_users = array_filter($ldap_users, array($this, 'userMatchesFilter'));
}
if($limit = -1) {
$limit = null;
}
return array_slice($ldap_users, $offset, $limit);
}