extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix manual initial import cancels async job of automatic import

Browse Source 
also do not log DN as updated in contact-data
This commit is contained in:
ralf 2024-01-29 17:35:22 +02:00
parent dad6ade3f9
commit 64e77f6f50
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Accounts/Import.php
View File

@ -444,7 +444,7 @@ class Import
})); }));
// files need to be or'ed with the sql value, as otherwise e.g. picture would disappear // files need to be or'ed with the sql value, as otherwise e.g. picture would disappear
$to_update['files'] |= $sql_contact['files']; $to_update['files'] |= $sql_contact['files'];
unset($to_update['account_id']); // no need to update, specially as account_id might be different! unset($to_update['account_id'], $to_update['dn']); // no need to update, specially as account_id might be different!
$to_update['id'] = $sql_contact['id']; $to_update['id'] = $sql_contact['id'];
if (($diff = array_diff_assoc($to_update, $sql_contact))) if (($diff = array_diff_assoc($to_update, $sql_contact)))
{ {
@ -624,7 +624,8 @@ class Import
} }
$this->logger($result, 'info'); $this->logger($result, 'info');
if (!$dry_run && $initial_import && self::installAsyncJob()) if (!$dry_run && $initial_import && self::installAsyncJob((float)$GLOBALS['egw_info']['server']['account_import_frequency'] ?? 0.0,
$GLOBALS['egw_info']['server']['account_import_time'] ?? null))
{ {
$this->logger('Async job for periodic import installed', 'info'); $this->logger('Async job for periodic import installed', 'info');
} }