← All changes | includes/class-validation.php +12 -34 trunk → 1.2.32 View file →

		@@ -17,13 +17,13 @@
17	17	*
18	18	* @param array $data Submitted form data
19	19	* @param string $type Form type.
20	20	* @param array|bool $fields Fields applicable for validation.
21		- * @param string $extra_where Extra where query.
22	21	*
23	22	* @return array|mixed|WP_Error Validated form data.
24	23	*/
25		- public function validate_fields( $data, $type, $fields = false, $extra_where = '' ) {
	24	+ public function validate_fields($data, $type, $fields = false) {
	25	+
26	26	$errors = new WP_Error();
27	27
28	28	$errors = apply_filters('uwp_validate_fields_before', $errors, $data, $type);
29	29
		@@ -44,9 +44,9 @@
44	44	$fields = get_register_validate_form_fields($form_id);
45	45	} elseif ($type == 'change') {
46	46	$fields = get_change_validate_form_fields();
47	47	} elseif ($type == 'account') {
48		- $fields = get_account_form_fields( $extra_where );
	48	+ $fields = get_account_form_fields();
49	49	} else {
50	50	$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $table_name . " WHERE form_type = %s AND field_type != 'fieldset' AND field_type != 'file' AND is_active = '1' ORDER BY sort_order ASC", array($type)));
51	51	}
52	52	}
		@@ -61,11 +61,11 @@
61	61
62	62	$enable_confirm_email_field = isset($email_extra['confirm_email']) ? $email_extra['confirm_email'] : '0';
63	63
64	64	$password_field = uwp_get_custom_field_info('password','account');
65		- $enable_password = isset($data['password']) && !empty($password_field) && $password_field->is_active ? 1 : 0;
	65	+ $enable_password = isset($data['password']) && $password_field->is_active ? 1 : 0;
66	66	$password_extra = array();
67		- if (!empty($password_field) && isset($password_field->extra_fields) && $password_field->extra_fields != '') {
	67	+ if (isset($password_field->extra_fields) && $password_field->extra_fields != '') {
68	68	$password_extra = unserialize($password_field->extra_fields);
69	69	}
70	70
71	71	$enable_confirm_password_field = isset($password_extra['confirm_password']) ? $password_extra['confirm_password'] : '0';
		@@ -132,13 +132,9 @@
132	132	case 'uwp_register_email':
133	133	case 'uwp_forgot_email':
134	134	case 'email':
135	135	case 'confirm_email':
136		- if ($type == 'forgot' && $field->htmlvar_name == 'email') {
137		- $sanitized_value = is_email($value) ? sanitize_email($value) : sanitize_user($value);
138		- } else {
139		- $sanitized_value = sanitize_email($value);
140		- }
	136	+ $sanitized_value = sanitize_email($value);
141	137	$sanitized = true;
142	138	break;
143	139
144	140	}
		@@ -185,23 +181,11 @@
185	181	case 'editor':
186	182	$sanitized_value = wp_kses_post( strip_shortcodes( $value ) );
187	183	break;
188	184
189		- case 'url':
190		- $sanitized_value = sanitize_url( wp_unslash( $value ) );
191		- break;
192		-
193		- case 'file':
194		- $sanitized_value = sanitize_text_field( $value );
195		-
196		- // Validate the file path.
197		- if ( $sanitized_value && validate_file( $sanitized_value ) !== 0 ) {
198		- $sanitized_value = '';
199		- }
200		- break;
201		-
202	185	default:
203	186	$sanitized_value = sanitize_text_field($value);
	187	+
204	188	}
205	189	}
206	190
207	191	if ($field->is_required == 1 && $sanitized_value == '' && $field->field_type != 'file') {
		@@ -217,15 +201,9 @@
217	201	}
218	202	}
219	203	}
220	204
221		- if ($type == 'forgot' && $field->htmlvar_name == 'email') {
222		- if (!empty($sanitized_value) && !is_email($sanitized_value) && !validate_username($sanitized_value)) {
223		- $incorrect_username_or_email_error_msg = apply_filters('uwp_incorrect_username_or_email_error_msg', __('<strong>Error</strong>: Please enter a valid username or email address.', 'userswp'));
224		- $errors->add('invalid_username_or_email', $incorrect_username_or_email_error_msg);
225		- return $errors;
226		- }
227		- } elseif ($field->field_type == 'email' && !empty($sanitized_value) && !is_email($sanitized_value)) {
	205	+ if ($field->field_type == 'email' && !empty($sanitized_value) && !is_email($sanitized_value)) {
228	206	$incorrect_email_error_msg = apply_filters('uwp_incorrect_email_error_msg', __('<strong>Error</strong>: The email address isn&#8217;t correct.', 'userswp'));
229	207	$errors->add('invalid_email', $incorrect_email_error_msg);
230	208	return $errors;
231	209	}
		@@ -253,13 +231,13 @@
253	231	if (username_exists($sanitized_value)) {
254	232	$errors->add('username_exists', __('<strong>Error</strong>: This username is already registered. Please choose another one.', 'userswp'));
255	233	return $errors;
256	234	}
257		- $username_length = uwp_get_option( 'register_username_length', 4);
258		- $username_length_max = uwp_get_option( 'register_username_length_max', 20);
	235	+ $username_length = uwp_get_option( 'register_username_length');
	236	+ $username_length = !empty($username_length) ? (int)$username_length : 4;
259	237
260		- if(!empty($sanitized_value) && (strlen($sanitized_value) < $username_length || strlen($sanitized_value) > $username_length_max)) {
261		- $errors->add('username_length', sprintf(__('<strong>Error</strong>: Username must be between %s and %s characters.', 'userswp'), $username_length, $username_length_max));
	238	+ if(!empty($sanitized_value) && strlen($sanitized_value) < $username_length) {
	239	+ $errors->add('username_length', sprintf(__('<strong>Error</strong>: Username must be %s characters or more.', 'userswp'), $username_length));
262	240	return $errors;
263	241	}
264	242	}
265	243