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

return account_expires and account_primary_group via accounts::search

Browse Source
This commit is contained in:
Ralf Becker 2013-07-03 16:26:18 +00:00
parent 486298a7c9
commit 76ab4eee25
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.accounts_sql.inc.php
View File

@ -441,7 +441,7 @@ class accounts_sql
$accounts = array();
foreach((array) $GLOBALS['egw']->contacts->search($criteria,"1,n_given,n_family,email,id,created,modified,$this->table.account_id AS account_id",
$order,"account_lid,account_type,account_status",
$order,"account_lid,account_type,account_status,account_expires,account_primary_group",
$wildcard,false,$query[0] == '!' ? 'AND' : 'OR',$offset ? array($start,$offset) : is_null($start) ? false : $start,
$filter,$this->contacts_join) as $contact)
{
@ -456,6 +456,8 @@ class accounts_sql
'account_email' => $contact['email'],
'person_id' => $contact['id'],
'account_status' => $contact['account_status'],
'account_expires' => $contact['account_expires'],
'account_primary_group' => $contact['account_primary_group'],
// addressbook_bo::search() returns everything in user-time, need to convert to server-time
'account_created' => egw_time::user2server($contact['created']),
'account_modified' => egw_time::user2server($contact['modified']),