extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Addressbook: During CSV import, only check 'exists' condition once. No re-check if it wasn't found

Browse Source
This commit is contained in:
nathan 2023-10-26 11:34:37 -06:00
parent 4ab788acc1
commit 031a70bb4e
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addressbook/inc/class.addressbook_import_contacts_csv.inc.php
View File

@ -127,6 +127,8 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
{ {
// exists // exists
case 'exists' : case 'exists' :
$searchcondition = $condition['string'][0] == Api\Storage::CF_PREFIX ? [$condition['string']] : [];
// if we use account_id for the condition, we need to set the owner for filtering, as this // if we use account_id for the condition, we need to set the owner for filtering, as this
// enables Api\Contacts\Storage to decide what backend is to be used // enables Api\Contacts\Storage to decide what backend is to be used
if($condition['string'] == 'account_id') if($condition['string'] == 'account_id')
@ -139,7 +141,7 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
'', '',
['contact_id', 'cat_id', $field], ['contact_id', 'cat_id', $field],
'', '', '', false, 'AND', false, '', '', '', false, 'AND', false,
$condition['string'][0] == Api\Storage::CF_PREFIX ? [$condition['string']] : null $searchcondition
); );
foreach($contacts as $contact) foreach($contacts as $contact)
{ {
@ -255,20 +257,6 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
{ {
$contacts = $this->cached_condition[$condition['string']][$record_array[$condition['string']]]; $contacts = $this->cached_condition[$condition['string']][$record_array[$condition['string']]];
} }
else if($record_array[$condition['string']])
{
$searchcondition = array( $condition['string'] => $record_array[$condition['string']]);
// if we use account_id for the condition, we need to set the owner for filtering, as this
// enables Api\Contacts\Storage to decide what backend is to be used
if ($condition['string']=='account_id') $searchcondition['owner']=0;
$contacts = $this->bocontacts->search(
//array( $condition['string'] => $record[$condition['string']],),
'',
$this->definition->plugin_options['update_cats'] == 'add' ? false : true,
'', '', '', false, 'AND', false,
$searchcondition
);
}
if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 ) { if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 ) {
// apply action to all contacts matching this exists condition // apply action to all contacts matching this exists condition
$action = $condition['true']; $action = $condition['true'];