extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Addressbook - better handling of missing contact type when importing.

Browse Source 
If it's missing and there's only the normal type, it'll quietly use that.
This commit is contained in:
nathangray 2017-10-05 13:23:09 -06:00
parent 6f12a443e5
commit 838daeac40
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,15 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
$this->lookups['tid'][$tid] = $data['name'];
}
// Try and set a default type, for use if file does not specify
if(!$this->lookups['tid'][Api\Contacts\Storage::DELETED_TYPE] && count($this->lookups['tid']) == 1 ||
$this->lookups['tid'][Api\Contacts\Storage::DELETED_TYPE] && count($this->lookups['tid']) == 2)
{
reset($this->lookups['tid']);
$this->default_type = key($this->lookups['tid']);
}
// set contact owner
$contact_owner = isset( $_definition->plugin_options['contact_owner'] ) ?
$_definition->plugin_options['contact_owner'] : $this->user;
@ -140,12 +149,12 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
if(!$record->tid || !$this->lookups['tid'][$record->tid])
{
// Avoid lots of warnings about type (2 types are contact and deleted)
if(!$this->type_warned || count($this->lookups['tid']) == 2 )
if($record->tid && !$this->type_warned[$record->tid] && !$this->lookups['tid'][$record->tid] )
{
$this->warnings[$import_csv->get_current_position()] = lang('Unknown type %1, imported as %2',$record->tid,lang($this->lookups['tid']['n']));
$this->type_warned = true;
$this->type_warned[$record->tid] = true;
}
$record->tid = 'n';
$record->tid = $this->default_type;
}
// Also handle categories in their own field