mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:50 +01:00
some fixes:
- using string 'not set' for a not set lastname, as LDAP allows no accounts without lastname. - addaccount hook was not called if account was auto-created at login-time (as the apps array is not yet read). Atm. app-names with hooks need to be listed here. I just added felamimail, which need to create mailboxes for new users
This commit is contained in:
parent
b883eca49d
commit
a9e8ee4e1c
@ -824,7 +824,7 @@
|
|||||||
$entry['cn'] = $GLOBALS['egw']->translation->convert($account_info['account_lid'],$GLOBALS['egw']->translation->charset(),'utf-8');
|
$entry['cn'] = $GLOBALS['egw']->translation->convert($account_info['account_lid'],$GLOBALS['egw']->translation->charset(),'utf-8');
|
||||||
$entry['gidnumber'] = $account_id;
|
$entry['gidnumber'] = $account_id;
|
||||||
#$entry['userpassword'] = $GLOBALS['egw']->common->encrypt_password($account_info['account_passwd']);
|
#$entry['userpassword'] = $GLOBALS['egw']->common->encrypt_password($account_info['account_passwd']);
|
||||||
$entry['description'] = 'phpgw-created group';
|
$entry['description'] = 'eGW-created group';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -841,7 +841,7 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
$entry['sn'] = $GLOBALS['egw']->translation->convert(
|
$entry['sn'] = $GLOBALS['egw']->translation->convert(
|
||||||
$account_info['account_lastname'],
|
$account_info['account_lastname'] ? $account_info['account_lastname'] : 'not set',
|
||||||
$GLOBALS['egw']->translation->charset(),
|
$GLOBALS['egw']->translation->charset(),
|
||||||
'utf-8'
|
'utf-8'
|
||||||
);
|
);
|
||||||
@ -1045,9 +1045,10 @@
|
|||||||
$GLOBALS['hook_values']['account_firstname'] = $acct_info['account_firstname'];
|
$GLOBALS['hook_values']['account_firstname'] = $acct_info['account_firstname'];
|
||||||
$GLOBALS['hook_values']['account_lastname'] = $acct_info['account_lastname'];
|
$GLOBALS['hook_values']['account_lastname'] = $acct_info['account_lastname'];
|
||||||
$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
|
$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
|
||||||
'location' => 'addaccount'
|
'location' => 'addaccount',
|
||||||
|
// at login-time only the hooks from the following apps will be called
|
||||||
|
'order' => array('felamimail'),
|
||||||
),False,True); // called for every app now, not only enabled ones
|
),False,True); // called for every app now, not only enabled ones
|
||||||
|
|
||||||
} /* end account setup */
|
} /* end account setup */
|
||||||
else /* if no account id abort the account creation */
|
else /* if no account id abort the account creation */
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user