Wrong way to generate user name if AD id is empty

[andriyun]

During the user import process it's possible that AD id is empty
We can have it in employee_id as activation method mode.
With enabled os2intra_generate_username checkbox (see settings form) the code generate new ad_id in line

os2intra_user_import/includes/csv_mapping.inc

Line 72 in 066cfe0

$mapped_row['ad_id'] = os2intra_user_import_generate_username($mapped_row);

and pass it to user name afterwards

os2intra_user_import/includes/users.inc

Line 368 in 066cfe0

$fields['name'] = $user['ad_id'];

Users generated in this way also got wrong authorization credentials

os2intra_user_import/includes/users.inc

Line 427 in 066cfe0

} elseif (!empty($user['ad_id'])) {

Proposed solution

For employee_id as activation method mode:

Replace generation of new AD id to drupal user name

For ad_id as activation method mode:

Skip user from import scope with proper log message

[andriyun]

@stanbellcom, @skifter FYI
@juuliabellcom do you have something to add?

[juuliabellcom]

@andriyun About your fix
Maybe instead of/additionally to this line https://github.com/bellcom/os2intra_user_import/blob/fix-user_name-generation/os2intra_user_import.module#L135

to add
os2intra_user_import_save_log("User activation mode is not setup. Please check user import configuration /admin/config/os2intra/user_import/settings"); return;
It will save error into log and stop import.

Also some comment about the proposed solution
how we will check for user duplictaes for employee_id as activation method mode. I mean these lines

os2intra_user_import/includes/users.inc

Line 63 in edc330e

if (array_search($user['ad_id'], $duplicate_ids) !== false) {

will use `$user["employee_id"] to search user duplicats?

And this line

os2intra_user_import/includes/users.inc

Line 368 in edc330e

$fields['name'] = $user['ad_id'];

. What we use instead that? $fields['name'] = $user['name']; ? and in case of ad_id activation method $user['name']= $user['ad_id'];

[andriyun]

os2intra_user_import_save_log("User activation mode is not setup. Please check user import configuration /admin/config/os2intra/user_import/settings"); return;

Added

will use `$user["employee_id"] to search user duplicats?

Added additional check

What we use instead that? $fields['name'] = $user['name']; ? and in case of ad_id activation method $user['name']= $user['ad_id'];

See PR #13