mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-16 18:31:26 +01:00
- auth_type get's only used if account_repository is not set
- LDAP --> SQL: account-contact-data is now written
This commit is contained in:
parent
ba2ff67fbf
commit
6a0bd14bac
@ -74,7 +74,7 @@ while(($row = $GLOBALS['egw_setup']->db->row(true)))
|
|||||||
$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
|
$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
|
||||||
}
|
}
|
||||||
$to = $GLOBALS['egw_info']['server']['account_repository'];
|
$to = $GLOBALS['egw_info']['server']['account_repository'];
|
||||||
if (!$to && !($to = $GLOBALS['egw_info']['server']['auth_type']))
|
if (!$to || !($to = $GLOBALS['egw_info']['server']['auth_type']))
|
||||||
{
|
{
|
||||||
$to = 'sql';
|
$to = 'sql';
|
||||||
}
|
}
|
||||||
@ -191,6 +191,8 @@ else // do the migration
|
|||||||
// maybe we should change sql to store passwords identical to ldap prefixed with {hash}
|
// maybe we should change sql to store passwords identical to ldap prefixed with {hash}
|
||||||
$accounts[$account_id]['account_passwd'] = $accounts[$account_id]['account_pwd'];
|
$accounts[$account_id]['account_passwd'] = $accounts[$account_id]['account_pwd'];
|
||||||
}
|
}
|
||||||
|
unset($accounts[$account_id]['person_id']);
|
||||||
|
|
||||||
if (!$GLOBALS['egw']->accounts->save($accounts[$account_id]))
|
if (!$GLOBALS['egw']->accounts->save($accounts[$account_id]))
|
||||||
{
|
{
|
||||||
echo '<p>'.lang('Creation of %1 in %2 failed !!!',lang('User')." $account_id ({$accounts[$account_id]['account_lid']})",$target)."</p>\n";
|
echo '<p>'.lang('Creation of %1 in %2 failed !!!',lang('User')." $account_id ({$accounts[$account_id]['account_lid']})",$target)."</p>\n";
|
||||||
|
Loading…
Reference in New Issue
Block a user