holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backported two bugfixes from HEAD:

Browse Source 
1) fixed bug report by Dros on the german list: using account in ldap, nextmatch (eg. in setting group ACL's) is not working
2) implemented the same default, as for the sql class: everything which is not 'accounts' or 'groups'
This commit is contained in:
Ralf Becker 2005-11-04 07:01:23 +00:00
parent b4104657b2
commit a5c24a7b3e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/inc/class.accounts_ldap.inc.php
View File

@ -458,7 +458,7 @@
//print "\$_type=$_type, \$start=$start , \$sort=$sort, \$order=$order, \$query=$query, \$offset=$offset, \$query_type=$query_type<br>"; //print "\$_type=$_type, \$start=$start , \$sort=$sort, \$order=$order, \$query=$query, \$offset=$offset, \$query_type=$query_type<br>";
$query = strtolower($query); $query = strtolower($query);
if($_type == 'accounts' || $_type == 'both') if($_type != 'groups')
{ {
$filter = "(&(uidnumber=*)(phpgwaccounttype=u)"; $filter = "(&(uidnumber=*)(phpgwaccounttype=u)";
if (!empty($query) && $query != '*') if (!empty($query) && $query != '*')
@ -511,7 +511,7 @@
} }
} }
} }
if ($_type == 'groups' || $_type == 'both') if ($_type != 'accounts')
{ {
if(empty($query) || $query == '*') if(empty($query) || $query == '*')
{ {
@ -551,15 +551,14 @@
$this->total = count($accounts); $this->total = count($accounts);
// return only the wanted accounts // return only the wanted accounts
if (is_array($sortedAccounts)) if (is_array($sortedAccounts))
{ {
reset($sortedAccounts); reset($sortedAccounts);
if(is_int($start) && is_int($offset)) if(is_numeric($start) && is_numeric($offset))
{ {
return array_slice($sortedAccounts, $start, $offset); return array_slice($sortedAccounts, $start, $offset);
} }
elseif(is_int($start)) elseif(is_numeric($start))
{ {
return array_slice($sortedAccounts, $start, $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']); return array_slice($sortedAccounts, $start, $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']);
} }