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

importexport: Better error message if contact can't be opened for update

Browse Source
This commit is contained in:
nathan 2023-07-07 08:10:20 -06:00
parent d3e3e7eb4d
commit 1cffc882fb
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,15 +317,27 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
case 'update' : case 'update' :
// Only update if there are changes // Only update if there are changes
$old = $this->bocontacts->read($_data['id']); $old = $this->bocontacts->read($_data['id']);
if(!$old || !is_array($old))
{
// Could not read existing record
$this->errors[$record_num] = lang("cant open '%1' for %2", $_data['id'], lang($_action));
return false;
}
// if we get countrycodes as countryname, try to translate them -> the rest should be handled by bo classes. // if we get countrycodes as countryname, try to translate them -> the rest should be handled by bo classes.
foreach(array('adr_one_', 'adr_two_') as $c_prefix) { foreach(array('adr_one_', 'adr_two_') as $c_prefix)
if (strlen(trim($_data[$c_prefix.'countryname']))==2) {
$_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']), true); if(strlen(trim($_data[$c_prefix . 'countryname'])) == 2)
{
$_data[$c_prefix . 'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix . 'countryname']), true);
}
} }
// Don't change a user account into a contact // Don't change a user account into a contact
if($old['owner'] == 0) { if($old['owner'] == 0)
{
unset($_data['owner']); unset($_data['owner']);
} elseif(!$this->definition->plugin_options['change_owner']) { }
elseif(!$this->definition->plugin_options['change_owner'])
{
// Don't change addressbook of an existing contact // Don't change addressbook of an existing contact
unset($_data['owner']); unset($_data['owner']);
} }