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

fix not generally not working display multiple groups in status and also not displayed avatar pictures in that case

Browse Source
This commit is contained in:
ralf 2023-02-28 15:15:03 +01:00
parent 057afb8623
commit a94038163c
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/inc/class.admin_ui.inc.php
View File

@ -374,6 +374,10 @@ class admin_ui
$params['query'] = $query['search'];
$params['query_type'] = 'all';
}
if (!empty($query['account_id']))
{
$params['account_id'] = (array)$query['account_id'];
}
$rows = array_values(self::$accounts->search($params));
//error_log(__METHOD__."() accounts->search(".array2string($params).") total=".self::$accounts->total);

2
api/src/Accounts.php
View File

@ -187,6 +187,7 @@ class Accounts
{
// normalize our cache-key by not storing anything, plus adding default the default sort (if none requested)
$keys = array_filter($params)+['order' => 'account_lid', 'sort' => 'ASC'];
if (isset($keys['account_id'])) $keys['account_id'] = md5(json_encode($keys['account_id']));
// sort keys
ksort($keys);
$key = json_encode($keys);
@ -221,6 +222,7 @@ class Accounts
* 'lid','firstname','lastname','email' - query only the given field for containing $param[query]
* @param $param['app'] string with an app-name, to limit result on accounts with run-right for that app
* @param $param['active']=true boolean - true: return only acctive accounts, false: return expired or deactivated too
* @param $param['account_id'] int[] return only given account_id's
* @return array with account_id => data pairs, data is an array with account_id, account_lid, account_firstname,
* account_lastname, person_id (id of the linked addressbook entry), account_status, account_expires, account_primary_group
*/

6
api/src/Accounts/Ads.php
View File

@ -918,6 +918,7 @@ class Ads
* @param $param['objectclass'] boolean return objectclass(es) under key 'objectclass' in each account
* @param $param['active'] boolean true: only return active / not expired accounts
* @param $param['modified'] int if given minimum modification time
* @param $param['account_id'] int[] return only given account_id's
* @return array with account_id => data pairs, data is an array with account_id, account_lid, account_firstname,
* account_lastname, person_id (id of the linked addressbook entry), account_status, account_expires, account_primary_group
*/
@ -967,6 +968,11 @@ class Ads
$membership_filter = '(|(memberOf='.$this->id2name((int)$param['type'], 'account_dn').')(PrimaryGroupId='.abs($param['type']).'))';
$filter = $filter ? "(&$membership_filter$filter)" : $membership_filter;
}
if (!empty($param['account_id']))
{
$account_ids_filter = '(|(objectsid='.implode(')(objectsid=', array_map([$this, 'get_sid'], $param['account_id'])).')';
$filter = $filter ? "(&$filter$account_ids_filter)" : $account_ids_filter;
}
if (!empty($param['modified']))
{
$filter = "(&(whenChanged>=".gmdate('YmdHis', $param['modified']).".0Z)$filter)";

6
api/src/Accounts/Ldap.php
View File

@ -731,6 +731,7 @@ class Ldap
* @param $param['offset'] int - number of matches to return if start given, default use the value in the prefs
* @param $param['objectclass'] boolean return objectclass(es) under key 'objectclass' in each account
* @param $param['modified'] int if given minimum modification time
* @param $param['account_id'] int[] return only given account_id's
* @return array with account_id => data pairs, data is an array with account_id, account_lid, account_firstname,
* account_lastname, person_id (id of the linked addressbook entry), account_status, account_expires, account_primary_group
*/
@ -812,6 +813,11 @@ class Ldap
$filter .= '(uidNumber=0)'; // to NOT find any user
}
}
// only return given account_id's
if (!empty($param['account_id']))
{
$filter .= '(|(uidNumber=' . implode(')(uidNumber=', $param['account_id']) . '))';
}
if (!empty($param['modified']))
{
$filter .= "(modifytimestamp>=".gmdate('YmdHis', $param['modified']).".0Z)";

7
api/src/Accounts/Sql.php
View File

@ -424,6 +424,7 @@ class Sql
* 'lid','firstname','lastname','email' - query only the given field for containing $param[query]
* @param $param['offset'] int - number of matches to return if start given, default use the value in the prefs
* @param $param['objectclass'] boolean return objectclass(es) under key 'objectclass' in each account
* @param $param['account_id'] int[] return only given account_id's
* @return array with account_id => data pairs, data is an array with account_id, account_lid, account_firstname,
* account_lastname, person_id (id of the linked addressbook entry), account_status, account_expires, account_primary_group
*/
@ -443,7 +444,7 @@ class Sql
}
$order = str_replace(array_keys($order2contact),array_values($order2contact),$param['order'] ?? '');
// allways add 'account_lid'
// always add 'account_lid'
if (strpos($order, 'account_lid') === false)
{
$order .= ($order?',':'').'account_lid';
@ -465,7 +466,7 @@ class Sql
$join .= ' LEFT JOIN '.Api\Mail\Smtp\Sql::TABLE.' ON '.$this->table.'.account_id=-'.Api\Mail\Smtp\Sql::TABLE.'.account_id AND mail_type='.Api\Mail\Smtp\Sql::TYPE_ALIAS;
}
$filter = array();
$filter = empty($param['account_id']) ? [] : ['account_id' => (array)$param['account_id']];
switch($param['type'])
{
case 'accounts':
@ -487,7 +488,7 @@ class Sql
$members = array_unique(array_merge($members, array_keys((array)$this->members($grp))));
if ($param['type'] == 'groupmembers+memberships') $members[] = abs($grp);
}
$filter['account_id'] = $members;
$filter['account_id'] = empty($filter['account_id']) ? $members : array_merge($members, $filter['account_id']);
break;
default:
if (is_numeric($param['type']))