holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use importexport's more robust username parsing to try to avoid missing usernames.

Browse Source
This commit is contained in:
Nathan Gray 2015-09-21 17:58:40 +00:00
parent 06fb7f72b2
commit d18a0578b1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_import_csv.inc.php
View File

@ -110,7 +110,7 @@ class calendar_import_csv extends importexport_basic_import_csv {
// Search for direct account name, then user in accounts first // Search for direct account name, then user in accounts first
$search = "\"$name\""; $search = "\"$name\"";
$id = $GLOBALS['egw']->accounts->name2id($name, 'account_fullname'); $id = importexport_helper_functions::account_name2id($name);
if(!$id) { if(!$id) {
$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search,array('contact_id','account_id'),'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR',array(0,1)); $contacts = ExecMethod2('addressbook.addressbook_bo.search', $search,array('contact_id','account_id'),'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR',array(0,1));
if($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id']; if($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];