← All changes | importExtensions/UsersImport.php +2 -4 1.4.3 → 1.2.7 View file →

		@@ -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';
		@@ -108,9 +106,9 @@
108	106	$fields = $wpdb->get_results("UPDATE $log_table_name SET created = $created_count WHERE hash_key = '$hash_key'");
109	107
110	108	} else {
111	109	if ( $mode == 'Update') {
112		- $user_email = isset($data_array['user_email']) ? $data_array['user_email'] : '';
	110	+
113	111	$update_query = $wpdb->prepare( "select ID from {$wpdb->prefix}users where user_email = %s order by ID DESC", $user_email );
114	112	$ID_result = $wpdb->get_results( $update_query );
115	113	if ( is_array( $ID_result ) && ! empty( $ID_result ) ) {
116	114	$retID = $ID_result[0]->ID;