diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php index 009c701bf4..88fe56a057 100644 --- a/addressbook/csv_import.php +++ b/addressbook/csv_import.php @@ -295,10 +295,14 @@ switch($_POST['action']) $log = ''."\n\t\n"; - if (!in_array('id',$addr_fields)) // autocreate public access if not set by user + if (!in_array('id',$addr_fields)) // allways show ID { $log .= "\t\t\n"; } + if (!in_array('owner',$addr_fields)) // allways show addressbook + { + $log .= "\t\t\n"; + } if (!in_array('private',$addr_fields)) // autocreate public access if not set by user { $log .= "\t\t\n"; @@ -452,7 +456,7 @@ switch($_POST['action']) $values[$user] = $GLOBALS['egw']->accounts->name2id($values[$user],'account_lid',$user=='owner'?null:'u'); } } - if (!isset($values['owner']) || isset($values['owner']) && !$values['owner']) + if (!isset($values['owner']) || isset($values['owner']) && (string)$values['owner'] === '') { // use default addressbook for new contacts (user preferences), if no owner specified if(!($values['owner'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'])) @@ -464,6 +468,10 @@ switch($_POST['action']) { $log .= "\t\t\n"; } + if (!in_array('owner',$addr_fields)) + { + $log .= "\t\t\n"; + } if (!in_array('private',$addr_fields)) { $values['private'] = 0; // public access if not set by user
#ID".lang('Addressbook')."private".$values['id']."".$values['owner']."