From 6a0bd14bac97cc1f6c594a37f138f9f775c289f2 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 13 Jul 2006 17:42:09 +0000 Subject: [PATCH] - auth_type get's only used if account_repository is not set - LDAP --> SQL: account-contact-data is now written --- setup/account_migration.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup/account_migration.php b/setup/account_migration.php index 3b43912856..ca9d2bf9e2 100644 --- a/setup/account_migration.php +++ b/setup/account_migration.php @@ -74,7 +74,7 @@ while(($row = $GLOBALS['egw_setup']->db->row(true))) $GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value']; } $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'; } @@ -191,6 +191,8 @@ else // do the migration // maybe we should change sql to store passwords identical to ldap prefixed with {hash} $accounts[$account_id]['account_passwd'] = $accounts[$account_id]['account_pwd']; } + unset($accounts[$account_id]['person_id']); + if (!$GLOBALS['egw']->accounts->save($accounts[$account_id])) { echo '

'.lang('Creation of %1 in %2 failed !!!',lang('User')." $account_id ({$accounts[$account_id]['account_lid']})",$target)."

\n";