extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-01 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

"allow to specify more then one group for an auto-created user

Browse Source 
(first is primary, further are just memberships)"
This commit is contained in:
Ralf Becker 2010-03-29 07:40:30 +00:00
parent cd0d07ad48
commit aa7eba5d31
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,7 +252,6 @@ class accounts
//echo "<p>accounts::search(".print_r($param,True).") start: ".microtime()."</p>\n"; //echo "<p>accounts::search(".print_r($param,True).") start: ".microtime()."</p>\n";
self::setup_cache(); self::setup_cache();
$account_search = &self::$cache['account_search']; $account_search = &self::$cache['account_search'];
$serial = serialize($param); $serial = serialize($param);
if (isset($account_search[$serial])) if (isset($account_search[$serial]))
@ -298,7 +297,7 @@ class accounts
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
} }
//echo "<p>limiting result to app='app' and/or group=$group valid-ids=".print_r($valid,true)."</p>\n"; //echo "<p>limiting result to app='$app' and/or group=$group valid-ids=".print_r($valid,true)."</p>\n";
$offset = $param['offset'] ? $param['offset'] : $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $offset = $param['offset'] ? $param['offset'] : $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
$stop = $start + $offset; $stop = $start + $offset;
$n = 0; $n = 0;
@ -725,10 +724,18 @@ class accounts
$this->config['auto_create_expire'] == 'never' ? -1 : $this->config['auto_create_expire'] == 'never' ? -1 :
time() + $this->config['auto_create_expire'] + 2; time() + $this->config['auto_create_expire'] + 2;
if (!($default_group_id = $this->name2id($this->config['default_group_lid'],'account_lid','g')))
if (!($default_group_id = $this->name2id($this->config['default_group_lid'])))
{ {
$default_group_id = $this->name2id('Default'); // check if we have a comma or semicolon delimited list of groups --> add first as primary and rest as memberships
foreach(preg_split('/[,;] */',$this->config['default_group_lid']) as $n => $group_lid)
{
if (($group_id = $this->name2id($group_lid,'account_lid','g')))
{
if (!$default_group_id) $default_group_id = $group_id;
$memberships[] = $group_id;
}
}
if (!$default_group_id) $default_group_id = $this->name2id('Default','account_lid','g');
} }
$primary_group = $GLOBALS['auto_create_acct']['primary_group'] && $primary_group = $GLOBALS['auto_create_acct']['primary_group'] &&
$this->get_type((int)$GLOBALS['auto_create_acct']['primary_group']) === 'g' ? $this->get_type((int)$GLOBALS['auto_create_acct']['primary_group']) === 'g' ?
@ -764,6 +771,11 @@ class accounts
'order' => array('felamimail','fudforum'), 'order' => array('felamimail','fudforum'),
),False,True); // called for every app now, not only enabled ones ),False,True); // called for every app now, not only enabled ones
// set memberships if given
if ($memberships)
{
$this->set_memberships($memberships,$data['account_id']);
}
return $data['account_id']; return $data['account_id'];
} }