diff --git a/supported/user.inc b/supported/user.inc index 4e73d3b..d99c2f0 100644 --- a/supported/user.inc +++ b/supported/user.inc @@ -13,6 +13,7 @@ function user_user_import_form_field_match() { $options['user']['email'] = t('Email Address*'); $options['user']['password'] = t('Password'); $options['user']['roles'] = t('Roles'); + $options['user']['picture'] = t('Picture'); return $options; } @@ -60,6 +61,10 @@ function user_user_import_data($settings, $update_setting, $column_settings, $mo $value = user_user_import_roles_data($data[$column_id], $settings['roles_new']); } + if ($field_id == 'picture') { + $value = user_user_import_picture_date($data[$column_id], $settings['pictures']); + } + return $value; } @@ -129,6 +134,10 @@ function user_user_import_pre_save($settings, $account, $fields, $errors, $updat if (!empty($role_set)) $account_add['roles'][$rid] = $rid; } } + + if (isset($fields['user']['picture']) && isset($fields['user']['picture'][0]) && !empty($fields['user']['picture'][0])) { + $account_add['picture'] = $fields['user']['picture'][0]; + } return $account_add; } @@ -280,6 +289,14 @@ function user_user_import_roles_data($data, $new_roles_allowed) { } /** + * Import the picture data + */ +function user_user_import_picture_date($data, $settings = array()) { + // expect the pictures to be in the default picture path for user pictures + return file_directory_path() . '/' . variable_get('user_picture_path', 'pictures') . '/' . $data; +} + +/** * Return an existing user ID, if present, for a given email. */ function _user_import_existing_uid($email) {