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

* LDAP/AD: auto-created accounts not allways set primary group also as membership

Browse Source
This commit is contained in:
Ralf Becker 2014-08-21 15:44:20 +00:00
parent ea026cf328
commit 98d5c4ff51
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -893,8 +893,8 @@ 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'))) $memberships = array();
{ $default_group_id = null;
// check if we have a comma or semicolon delimited list of groups --> add first as primary and rest as memberships // 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 $group_lid) foreach(preg_split('/[,;] */',$this->config['default_group_lid']) as $group_lid)
{ {
@ -904,12 +904,18 @@ class accounts
$memberships[] = $group_id; $memberships[] = $group_id;
} }
} }
if (!$default_group_id) $default_group_id = $this->name2id('Default','account_lid','g'); if (!$default_group_id && ($default_group_id = $this->name2id('Default','account_lid','g')))
{
$memberships[] = $default_group_id;
} }
$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' ?
(int)$GLOBALS['auto_create_acct']['primary_group'] : $default_group_id; (int)$GLOBALS['auto_create_acct']['primary_group'] : $default_group_id;
if ($primary_group && !in_array($primary_group, $memberships))
{
$memberships[] = $primary_group;
}
$data = array( $data = array(
'account_lid' => $account_lid, 'account_lid' => $account_lid,
'account_type' => 'u', 'account_type' => 'u',
@ -932,6 +938,11 @@ class accounts
{ {
return false; return false;
} }
// set memberships if given
if ($memberships)
{
$this->set_memberships($memberships,$data['account_id']);
}
// set the appropriate value for the can change password flag (assume users can, if the admin requires users to change their password) // set the appropriate value for the can change password flag (assume users can, if the admin requires users to change their password)
$data['changepassword'] = (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days']; $data['changepassword'] = (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'];
if(!$data['changepassword']) if(!$data['changepassword'])
@ -950,11 +961,7 @@ 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
unset($data['changepassword']); unset($data['changepassword']);
// set memberships if given
if ($memberships)
{
$this->set_memberships($memberships,$data['account_id']);
}
return $data['account_id']; return $data['account_id'];
} }