Changeset 12679 for trunk/src/bp-members/screens/register.php

Timestamp:

07/04/2020 01:29:50 PM (6 years ago)

Author:

imath

Message:

BP Members: improve our password validation process

We're introducing a new function to validate the member's chosen password: bp_members_validate_user_password().

This function is primarly used to check the password is not empty, and to make sure the password confirmation matches the password. If it's the case, the function will return a WP_Error object with no error message. Otherwise this object will contain an error message.

Plugins can now use the bp_members_validate_user_password filter to add their own error messages according to a custom validation process. See the last unit tests of this commit for an example of use.

Props devnik, tharsheblows

Fixes #8066

File:

• trunk/src/bp-members/screens/register.php (modified) (1 diff)

trunk/src/bp-members/screens/register.php

@@ -60 +60 @@
 
                 // If there are errors with account details, set them for display.
-                if ( !empty( $account_details['errors']->errors['user_name'] ) )
+                if ( ! empty( $account_details['errors']->errors['user_name'] ) ) {
                         $bp->signup->errors['signup_username'] = $account_details['errors']->errors['user_name'][0];
-
-                if ( !empty( $account_details['errors']->errors['user_email'] ) )
+                }
+
+                if ( ! empty( $account_details['errors']->errors['user_email'] ) ) {
                         $bp->signup->errors['signup_email'] = $account_details['errors']->errors['user_email'][0];
-
-                // Check that both password fields are filled in.
-                if ( empty( $_POST['signup_password'] ) || empty( $_POST['signup_password_confirm'] ) )
-                        $bp->signup->errors['signup_password'] = __( 'Please make sure you enter your password twice', 'buddypress' );
-
-                // Check that the passwords match.
-                if ( ( !empty( $_POST['signup_password'] ) && !empty( $_POST['signup_password_confirm'] ) ) && $_POST['signup_password'] != $_POST['signup_password_confirm'] )
-                        $bp->signup->errors['signup_password'] = __( 'The passwords you entered do not match.', 'buddypress' );
+                }
+
+                $signup_pass = '';
+                if ( isset( $_POST['signup_password'] ) ) {
+                        $signup_pass = wp_unslash( $_POST['signup_password'] );
+                }
+
+                $signup_pass_confirm = '';
+                if ( isset( $_POST['signup_password_confirm'] ) ) {
+                        $signup_pass_confirm = wp_unslash( $_POST['signup_password_confirm'] );
+                }
+
+                // Check the account password for problems.
+                $account_password = bp_members_validate_user_password( $signup_pass, $signup_pass_confirm );
+                $password_error   = $account_password->get_error_message();
+
+                if ( $password_error ) {
+                        $bp->signup->errors['signup_password'] = $password_error;
+                }
 
                 if ( bp_signup_requires_privacy_policy_acceptance() && ! empty( $_POST['signup-privacy-policy-check'] ) && empty( $_POST['signup-privacy-policy-accept'] ) ) {