holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from cmorty/pull/migrate

Browse Source 
Also adjust links when migrating from Ldap to DB
This commit is contained in:
Ralf Becker 2016-07-14 10:32:15 +02:00 committed by GitHub
commit 5c360a03e1
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/src/Contacts/Storage.php
View File

@ -959,6 +959,7 @@ class Storage
{
$contact = $ldap_contacts->read($contact['id']);
}
$old_contact_id = $contact['id'];
unset($contact['id']); // ldap uid/account_lid
if ($contact['account_id'] && ($old = $sql_contacts->read(array('account_id' => $contact['account_id']))))
{
@ -971,7 +972,25 @@ class Storage
{
echo '<p style="margin: 0px;">'.$n.': '.$contact['n_fn'].
($contact['org_name'] ? ' ('.$contact['org_name'].')' : '')." --> SQL (".
($contact['owner']?lang('User'):lang('Contact')).")</p>\n";
($contact['owner']?lang('User'):lang('Contact')).")<br>\n";
$new_contact_id = $sql_contacts->data['id'];
echo "&nbsp;&nbsp;&nbsp;&nbsp;" . $old_contact_id . " --> " . $new_contact_id . " / ";
$tq = $this->db->update('egw_links',array(
'link_id1' => $new_contact_id,
),array(
'link_app1' => 'addressbook',
'link_id1' => $old_contact_id
),__LINE__,__FILE__);
$tq = $this->db->update('egw_links',array(
'link_id2' => $new_contact_id,
),array(
'link_app2' => 'addressbook',
'link_id2' => $old_contact_id
),__LINE__,__FILE__);
echo "</p>\n";
}
else
{