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

respect restrictive account-selection "groupmembers" and "none" when linking with accounts and sort search for accounts alphabetically

Browse Source
This commit is contained in:
Ralf Becker 2011-09-07 16:44:00 +00:00
parent 89304fca0c
commit f5c5df3299
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
phpgwapi/inc/class.accounts.inc.php
View File

@ -231,7 +231,8 @@ class accounts
* Searches / lists accounts: users and/or groups * Searches / lists accounts: users and/or groups
* *
* @param array with the following keys: * @param array with the following keys:
* @param $param['type'] string/int 'accounts', 'groups', 'owngroups' (groups the user is a member of), 'both' * @param $param['type'] string/int 'accounts', 'groups', 'owngroups' (groups the user is a member of), 'both',
* 'groupmembers' (members of groups the user is a member of), 'groupmembers+memberships' (incl. memberships too)
* or integer group-id for a list of members of that group * or integer group-id for a list of members of that group
* @param $param['start'] int first account to return (returns offset or max_matches entries) or all if not set * @param $param['start'] int first account to return (returns offset or max_matches entries) or all if not set
* @param $param['order'] string column to sort after, default account_lid if unset * @param $param['order'] string column to sort after, default account_lid if unset
@ -249,7 +250,7 @@ class accounts
*/ */
function search($param) function search($param)
{ {
//echo "<p>accounts::search(".print_r($param,True).") start: ".microtime()."</p>\n"; //error_log(__METHOD__.'('.array2string($param).')');
self::setup_cache(); self::setup_cache();
$account_search = &self::$cache['account_search']; $account_search = &self::$cache['account_search'];
$serial = serialize($param); $serial = serialize($param);
@ -261,7 +262,7 @@ class accounts
// no backend understands $param['app'] and sql does not understand group-parameters // no backend understands $param['app'] and sql does not understand group-parameters
// --> do an full search first and then filter and limit that search // --> do an full search first and then filter and limit that search
elseif($param['app'] || $this->config['account_repository'] != 'ldap' && elseif($param['app'] || $this->config['account_repository'] != 'ldap' &&
(is_numeric($param['type']) || $param['type'] == 'owngroups')) (is_numeric($param['type']) || in_array($param['type'],array('owngroups','groupmembers','groupmembers+memberships'))))
{ {
$app = $param['app']; $app = $param['app'];
unset($param['app']); unset($param['app']);
@ -270,14 +271,24 @@ class accounts
if ($this->config['account_repository'] != 'ldap' && is_numeric($param['type'])) if ($this->config['account_repository'] != 'ldap' && is_numeric($param['type']))
{ {
$group = (int) $param['type']; $members = $this->members($group,true);
$param['type'] = 'accounts'; $param['type'] = 'accounts';
} }
elseif ($param['type'] == 'owngroups') elseif ($param['type'] == 'owngroups')
{ {
$group = true; $members = $this->memberships($GLOBALS['egw_info']['user']['account_id'],true);
$param['type'] = 'groups'; $param['type'] = 'groups';
} }
elseif(in_array($param['type'],array('groupmembers','groupmembers+memberships')))
{
$members = array();
foreach($this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
{
$members = array_unique(array_merge($members,$this->members($grp,true)));
if ($param['type'] == 'groupmembers+memberships') $members[] = $grp;
}
$param['type'] = $param['type'] == 'groupmembers+memberships' ? 'both' : 'accounts';
}
// call ourself recursive to get (evtl. cached) full search // call ourself recursive to get (evtl. cached) full search
$full_search = $this->search($param); $full_search = $this->search($param);
@ -288,9 +299,9 @@ class accounts
// we want the result merged, whatever it takes, as we only care for the ids // we want the result merged, whatever it takes, as we only care for the ids
$valid = $this->split_accounts($app,!in_array($param['type'],array('accounts','groups')) ? 'merge' : $param['type']); $valid = $this->split_accounts($app,!in_array($param['type'],array('accounts','groups')) ? 'merge' : $param['type']);
} }
if ($group) if (isset($members))
{ {
$members = is_int($group) ? $this->members($group,true) : $this->memberships($GLOBALS['egw_info']['user']['account_id'],true); //error_log(__METHOD__.'() members='.array2string($members));
if (!$members) $members = array(); if (!$members) $members = array();
$valid = !$app ? $members : array_intersect($valid,$members); // use the intersection $valid = !$app ? $members : array_intersect($valid,$members); // use the intersection
} }
@ -352,11 +363,27 @@ class accounts
{ {
$options['filter'] = (array)$options['filter']; $options['filter'] = (array)$options['filter'];
} }
switch($GLOBALS['egw_info']['user']['preferences']['common']['account_display'])
{
case 'firstname':
case 'firstall':
$order = 'account_firstname,account_lastname';
break;
case 'lastname':
case 'lastall':
$order = 'account_lastname,account_firstname';
break;
default:
$order = 'account_lid';
break;
}
$accounts = array(); $accounts = array();
foreach(self::getInstance()->search(array( foreach(self::getInstance()->search(array(
'type' => 'both', 'type' => $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
!isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'groupmembers+memberships' : 'both',
'query' => $pattern, 'query' => $pattern,
'query_type' => 'all', 'query_type' => 'all',
'order' => $order,
)) as $account) )) as $account)
{ {
$accounts[$account['account_id']] = common::display_fullname($account['account_lid'], $accounts[$account['account_id']] = common::display_fullname($account['account_lid'],

6
phpgwapi/inc/class.egw_link.inc.php
View File

@ -185,6 +185,12 @@ class egw_link extends solink
} }
} }
} }
// disable ability to link to accounts for non-admins, if account-selection is disabled
if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none' &&
!isset($GLOBALS['egw_info']['user']['apps']['admin']))
{
unset(self::$app_register['home-accounts']);
}
if (!(self::$title_cache = $GLOBALS['egw']->session->appsession('link_title_cache','phpgwapi'))) if (!(self::$title_cache = $GLOBALS['egw']->session->appsession('link_title_cache','phpgwapi')))
{ {
self::$title_cache = array(); self::$title_cache = array();