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

Add check for [username] when trying to convert a user to account ID

Browse Source
This commit is contained in:
Nathan Gray 2013-03-14 19:34:12 +00:00
parent fc4545d1ea
commit d226d759cd
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
importexport/inc/class.importexport_helper_functions.inc.php
View File

@ -135,6 +135,18 @@ class importexport_helper_functions {
$account_ids[] = (int)$account_lid; $account_ids[] = (int)$account_lid;
continue; continue;
} }
// Check for [username]
if(strpos($account_lid,'[') !== false)
{
if(preg_match('/\[(.+)\]/',$account_lid,$matches))
{
$account_id = $GLOBALS['egw']->accounts->name2id($matches[1]);
unset($account_lids[$key]);
$account_ids[] = $account_id;
}
continue;
}
// Handle users listed as Lastname, Firstname instead of login ID // Handle users listed as Lastname, Firstname instead of login ID
// Do this first, in case their first name matches a username // Do this first, in case their first name matches a username
if ( $account_lids[$key+1][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lids[$key+1]).' ' .$account_lid, 'account_fullname')) { if ( $account_lids[$key+1][0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lids[$key+1]).' ' .$account_lid, 'account_fullname')) {