| @@ -32,9 +32,9 @@ | ||
| 32 | 32 | $created_count = $updated_row_counts['created']; |
| 33 | 33 | $updated_count = $updated_row_counts['updated']; |
| 34 | 34 | $skipped_count = $updated_row_counts['skipped']; |
| 35 | 35 | |
| 36 | - $data_array['role'] = trim(isset($data_array['role'])); | |
| 36 | + $data_array['role'] = trim($data_array['role']); | |
| 37 | 37 | if ( isset( $data_array['role'] ) && $data_array['role'] != '') { |
| 38 | 38 | $user_capability = ''; |
| 39 | 39 | if ( !is_numeric( $data_array['role'] ) ) { |
| 40 | 40 | $roles = $this->getRoles(); |
| @@ -64,13 +64,9 @@ | ||
| 64 | 64 | $data_array['role'] = 'subscriber'; #TODO: Add log message for assigning the default role |
| 65 | 65 | } |
| 66 | 66 | $user_email = $data_array['user_email']; |
| 67 | 67 | |
| 68 | - //filter to change user meta values before import | |
| 69 | - $data_array = apply_filters('smack_csv_modify_userdata_filter', $data_array); | |
| 70 | - | |
| 71 | 68 | if ( $mode == 'Insert' ) { |
| 72 | - $send_password = $data_array['user_pass'] ; | |
| 73 | 69 | if ( empty( $data_array['user_pass'] ) ) { |
| 74 | 70 | $data_array['user_pass'] = wp_generate_password( 12, false ); |
| 75 | 71 | $additional_meta_info = array( |
| 76 | 72 | 'user_login' => $data_array['user_login'], |
| @@ -81,9 +77,9 @@ | ||
| 81 | 77 | $data_array['smack_uci_import'] = $additional_meta_info; |
| 82 | 78 | } |
| 83 | 79 | else{ |
| 84 | 80 | if (strlen($data_array['user_pass'])!== 34 && $data_array['user_pass'][0]!=='$'){ |
| 85 | - $data_array['user_pass']=wp_hash_password($data_array['user_pass']); | |
| 81 | + $data_array['user_pass'] = wp_hash_password($data_array['user_pass']); | |
| 86 | 82 | } |
| 87 | 83 | $additional_meta_info = array( |
| 88 | 84 | 'user_login' => $data_array['user_login'], |
| 89 | 85 | 'user_pass' => $data_array['user_pass'], |
| @@ -92,9 +88,8 @@ | ||
| 92 | 88 | ); |
| 93 | 89 | $data_array['smack_uci_import'] = $additional_meta_info; |
| 94 | 90 | } |
| 95 | 91 | $retID = wp_insert_user($data_array); |
| 96 | - update_user_meta($retID, 'sendPassword', $send_password); | |
| 97 | 92 | if ( !is_wp_error($retID) && !empty( $data_array['user_pass'] ) ) { |
| 98 | 93 | $wpdb->get_results("UPDATE {$wpdb->prefix}users SET user_pass = '{$data_array['user_pass']}' WHERE ID = $retID"); |
| 99 | 94 | } |
| 100 | 95 | $mode_of_affect = 'Inserted'; |
| @@ -162,17 +157,14 @@ | ||
| 162 | 157 | |
| 163 | 158 | if ( ! empty ( $metaData ) ) { |
| 164 | 159 | foreach ( $metaData as $meta_key => $meta_value ) { |
| 165 | 160 | update_user_meta( $retID, $meta_key, $meta_value ); |
| 166 | - | |
| 167 | - //filter for modifying user metadata after import | |
| 168 | - apply_filters('smack_csv_modify_metadata_filter', $retID, $meta_key, $meta_value); | |
| 169 | 161 | } |
| 170 | 162 | } |
| 171 | 163 | $core_instance->detailed_log[$line_number]['Email'] = $data_array['user_email']; |
| 172 | 164 | $core_instance->detailed_log[$line_number]['Role'] = $data_array['role']; |
| 173 | 165 | $ucisettings = get_option('sm_uci_pro_settings'); |
| 174 | - if(isset($ucisettings['send_user_password']) && $ucisettings['send_user_password'] == "true") { | |
| 166 | + if($ucisettings['send_user_password'] == "true") { | |
| 175 | 167 | $send_user_password = new SendPassword; |
| 176 | 168 | $send_user_password->send_login_credentials_to_users(); |
| 177 | 169 | } |
| 178 | 170 | $returnArr['ID'] = $retID; |
