| @@ -11,9 +11,9 @@ | ||
| 11 | 11 | exit; // Exit if accessed directly |
| 12 | 12 | |
| 13 | 13 | class UsersImport{ |
| 14 | 14 | private static $users_instance = null,$send_user_password; |
| 15 | - public $plugin; | |
| 15 | + | |
| 16 | 16 | public static function getInstance() { |
| 17 | 17 | if (UsersImport::$users_instance == null) { |
| 18 | 18 | UsersImport::$users_instance = new UsersImport; |
| 19 | 19 | return UsersImport::$users_instance; |
| @@ -68,9 +68,8 @@ | ||
| 68 | 68 | //filter to change user meta values before import |
| 69 | 69 | $data_array = apply_filters('smack_csv_modify_userdata_filter', $data_array); |
| 70 | 70 | |
| 71 | 71 | if ( $mode == 'Insert' ) { |
| 72 | - $send_password = isset($data_array['user_pass']) ? $data_array['user_pass'] : ''; | |
| 73 | 72 | if ( empty( $data_array['user_pass'] ) ) { |
| 74 | 73 | $data_array['user_pass'] = wp_generate_password( 12, false ); |
| 75 | 74 | $additional_meta_info = array( |
| 76 | 75 | 'user_login' => $data_array['user_login'], |
| @@ -92,9 +91,8 @@ | ||
| 92 | 91 | ); |
| 93 | 92 | $data_array['smack_uci_import'] = $additional_meta_info; |
| 94 | 93 | } |
| 95 | 94 | $retID = wp_insert_user($data_array); |
| 96 | - update_user_meta($retID, 'sendPassword', $send_password); | |
| 97 | 95 | if ( !is_wp_error($retID) && !empty( $data_array['user_pass'] ) ) { |
| 98 | 96 | $wpdb->get_results("UPDATE {$wpdb->prefix}users SET user_pass = '{$data_array['user_pass']}' WHERE ID = $retID"); |
| 99 | 97 | } |
| 100 | 98 | $mode_of_affect = 'Inserted'; |
| @@ -100,20 +98,17 @@ | ||
| 100 | 98 | $mode_of_affect = 'Inserted'; |
| 101 | 99 | |
| 102 | 100 | if ( is_wp_error( $retID ) ) { |
| 103 | 101 | $core_instance->detailed_log[$line_number]['Message'] = "Skipped, Due to duplicate User found with same email!."; |
| 104 | - $core_instance->detailed_log[$line_number]['state'] = 'Skipped'; | |
| 105 | 102 | $fields = $wpdb->get_results("UPDATE $log_table_name SET skipped = $skipped_count WHERE hash_key = '$hash_key'"); |
| 106 | 103 | return array('MODE' => $mode); |
| 107 | 104 | } |
| 108 | 105 | $core_instance->detailed_log[$line_number]['Message'] = 'Inserted User ID: ' . $retID; |
| 109 | - $core_instance->detailed_log[$line_number]['state'] = 'Inserted'; | |
| 110 | - $core_instance->detailed_log[$line_number]['id'] = $retID; | |
| 111 | 106 | $fields = $wpdb->get_results("UPDATE $log_table_name SET created = $created_count WHERE hash_key = '$hash_key'"); |
| 112 | 107 | |
| 113 | 108 | } else { |
| 114 | 109 | if ( $mode == 'Update') { |
| 115 | - $user_email = isset($data_array['user_email']) ? $data_array['user_email'] : ''; | |
| 110 | + | |
| 116 | 111 | $update_query = $wpdb->prepare( "select ID from {$wpdb->prefix}users where user_email = %s order by ID DESC", $user_email ); |
| 117 | 112 | $ID_result = $wpdb->get_results( $update_query ); |
| 118 | 113 | if ( is_array( $ID_result ) && ! empty( $ID_result ) ) { |
| 119 | 114 | $retID = $ID_result[0]->ID; |
| @@ -121,10 +116,8 @@ | ||
| 121 | 116 | wp_update_user( $data_array ); |
| 122 | 117 | $mode_of_affect = 'Updated'; |
| 123 | 118 | |
| 124 | 119 | $core_instance->detailed_log[$line_number]['Message'] = 'Updated User ID: ' . $retID; |
| 125 | - $core_instance->detailed_log[$line_number]['state'] = 'Updated'; | |
| 126 | - $core_instance->detailed_log[$line_number]['id'] = $retID; | |
| 127 | 120 | $fields = $wpdb->get_results("UPDATE $log_table_name SET updated = $updated_count WHERE hash_key = '$hash_key'"); |
| 128 | 121 | |
| 129 | 122 | }else{ |
| 130 | 123 | $retID = wp_insert_user($data_array); |
| @@ -136,10 +129,8 @@ | ||
| 136 | 129 | $fields = $wpdb->get_results("UPDATE $log_table_name SET skipped = $skipped_count WHERE hash_key = '$hash_key'"); |
| 137 | 130 | return array('MODE' => $mode); |
| 138 | 131 | } |
| 139 | 132 | $core_instance->detailed_log[$line_number]['Message'] = 'Inserted User ID: ' . $retID; |
| 140 | - $core_instance->detailed_log[$line_number]['state'] = 'Inserted'; | |
| 141 | - $core_instance->detailed_log[$line_number]['id'] = $retID; | |
| 142 | 133 | $fields = $wpdb->get_results("UPDATE $log_table_name SET created = $created_count WHERE hash_key = '$hash_key'"); |
| 143 | 134 | } |
| 144 | 135 | } |
| 145 | 136 | } |
| @@ -174,11 +165,8 @@ | ||
| 174 | 165 | //filter for modifying user metadata after import |
| 175 | 166 | apply_filters('smack_csv_modify_metadata_filter', $retID, $meta_key, $meta_value); |
| 176 | 167 | } |
| 177 | 168 | } |
| 178 | - $user_data = get_userdata($retID); | |
| 179 | - $user_title = isset($user_data) ? $user_data->display_name : ''; | |
| 180 | - $core_instance->detailed_log[$line_number]['user_title'] = $user_title; | |
| 181 | 169 | $core_instance->detailed_log[$line_number]['Email'] = $data_array['user_email']; |
| 182 | 170 | $core_instance->detailed_log[$line_number]['Role'] = $data_array['role']; |
| 183 | 171 | $ucisettings = get_option('sm_uci_pro_settings'); |
| 184 | 172 | if(isset($ucisettings['send_user_password']) && $ucisettings['send_user_password'] == "true") { |
