extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-11 00:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Admin/API/LDAP: fixed not working pagination of accounts for 2. or further pages introduced by enabling caching again in last package

Browse Source
This commit is contained in:
Ralf Becker 2013-06-26 08:12:17 +00:00
parent 35da74fac0
commit ee41d4a09d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -737,7 +737,7 @@ class accounts_ldap
); );
if ($param['active'] && !$this->frontend->is_active($account)) if ($param['active'] && !$this->frontend->is_active($account))
{ {
--$totalcount; if (isset($totalcount)) --$totalcount;
continue; continue;
} }
$account['account_fullname'] = common::display_fullname($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$allVals['uidnumber'][0]); $account['account_fullname'] = common::display_fullname($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$allVals['uidnumber'][0]);
@ -798,9 +798,14 @@ class accounts_ldap
$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']); $this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
$sortedAccounts = $accounts; $sortedAccounts = $accounts;
uasort($sortedAccounts,array($this,'_sort_callback')); uasort($sortedAccounts,array($this,'_sort_callback'));
$account_search[$unl_serial]['data'] = $sortedAccounts; $this->total = isset($totalcount) ? $totalcount : count($accounts);
$account_search[$unl_serial]['total'] = $this->total = isset($totalcount) ? $totalcount : count($accounts); // if totalcount is set, $sortedAccounts is NOT the full set, but already a limited set!
if (!isset($totalcount))
{
$account_search[$unl_serial]['data'] = $sortedAccounts;
$account_search[$unl_serial]['total'] = $this->total;
}
} }
//echo "<p>accounts_ldap::search() found $this->total: ".microtime()."</p>\n"; //echo "<p>accounts_ldap::search() found $this->total: ".microtime()."</p>\n";
// return only the wanted accounts // return only the wanted accounts