extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 20:40:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhance account name -> ID to be able to handle user names in Lastname, Firstname format

Browse Source
This commit is contained in:
Nathan Gray 2011-03-16 16:50:28 +00:00
parent 9f5f60bd0f
commit 2e752e17b6
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,12 +96,24 @@ class importexport_helper_functions {
*/ */
public static function account_name2id( $_account_lids ) { public static function account_name2id( $_account_lids ) {
$account_lids = is_array( $_account_lids ) ? $_account_lids : explode( ',', $_account_lids ); $account_lids = is_array( $_account_lids ) ? $_account_lids : explode( ',', $_account_lids );
foreach ( $account_lids as $account_lid ) { $skip = false;
foreach ( $account_lids as $key => $account_lid ) {
if($skip) {
$skip = false;
continue;
}
// Handle any IDs that slip in // Handle any IDs that slip in
if(is_numeric($account_lid) && $GLOBALS['egw']->accounts->id2name($account_lid)) { if(is_numeric($account_lid) && $GLOBALS['egw']->accounts->id2name($account_lid)) {
$account_ids[] = (int)$account_lid; $account_ids[] = (int)$account_lid;
continue; continue;
} }
// Handle users listed as Lastname, Firstname instead of login ID
// 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')) {
$account_ids[] = $account_id;
$skip = true; // Skip the next one, it's the first name
continue ;
}
if ( $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid )) { if ( $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid )) {
$account_ids[] = $account_id; $account_ids[] = $account_id;
continue; continue;
@ -110,6 +122,7 @@ class importexport_helper_functions {
$account_ids[] = $account_id; $account_ids[] = $account_id;
continue; continue;
} }
// Handle groups listed as Group, <name> // Handle groups listed as Group, <name>
if ( $account_lid[0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lid))) { if ( $account_lid[0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lid))) {
$account_ids[] = $account_id; $account_ids[] = $account_id;