Changeset 5700 for trunk/bp-members/bp-members-screens.php

Timestamp:

02/11/2012 02:29:55 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Members component. Remove signup file and move its code into screens and functions. See #3989.

File:

• trunk/bp-members/bp-members-screens.php (modified) (3 diffs)

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

@@ -1 +1 @@
 <?php
+
 /**
  * BuddyPress Member Screens
@@ -6 +7 @@
  *
  * @package BuddyPress
- * @subpackage Members
+ * @subpackage MembersScreens
  */
 
@@ -46 +47 @@
 
 
+function bp_core_screen_signup() {
+    global $bp;
+
+    if ( !bp_is_current_component( 'register' ) )
+        return;
+
+    // Not a directory
+    bp_update_is_directory( false, 'register' );
+
+    // If the user is logged in, redirect away from here
+    if ( is_user_logged_in() ) {
+        if ( bp_is_component_front_page( 'register' ) )
+            $redirect_to = trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() );
+        else
+            $redirect_to = bp_get_root_domain();
+
+        bp_core_redirect( apply_filters( 'bp_loggedin_register_page_redirect_to', $redirect_to ) );
+
+        return;
+    }
+
+    $bp->signup->step = 'request-details';
+
+    if ( !bp_get_signup_allowed() ) {
+        $bp->signup->step = 'registration-disabled';
+    }
+
+    // If the signup page is submitted, validate and save
+    elseif ( isset( $_POST['signup_submit'] ) ) {
+
+        // Check the nonce
+        check_admin_referer( 'bp_new_signup' );
+
+        // Check the base account details for problems
+        $account_details = bp_core_validate_user_signup( $_POST['signup_username'], $_POST['signup_email'] );
+
+        // If there are errors with account details, set them for display
+        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'] ) )
+            $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' );
+
+        $bp->signup->username = $_POST['signup_username'];
+        $bp->signup->email = $_POST['signup_email'];
+
+        // Now we've checked account details, we can check profile information
+        if ( bp_is_active( 'xprofile' ) ) {
+
+            // Make sure hidden field is passed and populated
+            if ( isset( $_POST['signup_profile_field_ids'] ) && !empty( $_POST['signup_profile_field_ids'] ) ) {
+
+                // Let's compact any profile field info into an array
+                $profile_field_ids = explode( ',', $_POST['signup_profile_field_ids'] );
+
+                // Loop through the posted fields formatting any datebox values then validate the field
+                foreach ( (array) $profile_field_ids as $field_id ) {
+                    if ( !isset( $_POST['field_' . $field_id] ) ) {
+                        if ( !empty( $_POST['field_' . $field_id . '_day'] ) && !empty( $_POST['field_' . $field_id . '_month'] ) && !empty( $_POST['field_' . $field_id . '_year'] ) )
+                            $_POST['field_' . $field_id] = date( 'Y-m-d H:i:s', strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] ) );
+                    }
+
+                    // Create errors for required fields without values
+                    if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
+                        $bp->signup->errors['field_' . $field_id] = __( 'This is a required field', 'buddypress' );
+                }
+
+            // This situation doesn't naturally occur so bounce to website root
+            } else {
+                bp_core_redirect( bp_get_root_domain() );
+            }
+        }
+
+        // Finally, let's check the blog details, if the user wants a blog and blog creation is enabled
+        if ( isset( $_POST['signup_with_blog'] ) ) {
+            $active_signup = $bp->site_options['registration'];
+
+            if ( 'blog' == $active_signup || 'all' == $active_signup ) {
+                $blog_details = bp_core_validate_blog_signup( $_POST['signup_blog_url'], $_POST['signup_blog_title'] );
+
+                // If there are errors with blog details, set them for display
+                if ( !empty( $blog_details['errors']->errors['blogname'] ) )
+                    $bp->signup->errors['signup_blog_url'] = $blog_details['errors']->errors['blogname'][0];
+
+                if ( !empty( $blog_details['errors']->errors['blog_title'] ) )
+                    $bp->signup->errors['signup_blog_title'] = $blog_details['errors']->errors['blog_title'][0];
+            }
+        }
+
+        do_action( 'bp_signup_validate' );
+
+        // Add any errors to the action for the field in the template for display.
+        if ( !empty( $bp->signup->errors ) ) {
+            foreach ( (array)$bp->signup->errors as $fieldname => $error_message )
+                add_action( 'bp_' . $fieldname . '_errors', create_function( '', 'echo apply_filters(\'bp_members_signup_error_message\', "<div class=\"error\">' . $error_message . '</div>" );' ) );
+        } else {
+            $bp->signup->step = 'save-details';
+
+            // No errors! Let's register those deets.
+            $active_signup = !empty( $bp->site_options['registration'] ) ? $bp->site_options['registration'] : '';
+
+            if ( 'none' != $active_signup ) {
+
+                // Let's compact any profile field info into usermeta
+                $profile_field_ids = explode( ',', $_POST['signup_profile_field_ids'] );
+
+                // Loop through the posted fields formatting any datebox values then add to usermeta
+                foreach ( (array) $profile_field_ids as $field_id ) {
+                    if ( !isset( $_POST['field_' . $field_id] ) ) {
+                        if ( isset( $_POST['field_' . $field_id . '_day'] ) )
+                            $_POST['field_' . $field_id] = date( 'Y-m-d H:i:s', strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] ) );
+                    }
+
+                    if ( !empty( $_POST['field_' . $field_id] ) )
+                        $usermeta['field_' . $field_id] = $_POST['field_' . $field_id];
+                }
+
+                // Store the profile field ID's in usermeta
+                $usermeta['profile_field_ids'] = $_POST['signup_profile_field_ids'];
+
+                // Hash and store the password
+                $usermeta['password'] = wp_hash_password( $_POST['signup_password'] );
+
+                // If the user decided to create a blog, save those details to usermeta
+                if ( 'blog' == $active_signup || 'all' == $active_signup )
+                    $usermeta['public'] = ( isset( $_POST['signup_blog_privacy'] ) && 'public' == $_POST['signup_blog_privacy'] ) ? true : false;
+
+                $usermeta = apply_filters( 'bp_signup_usermeta', $usermeta );
+
+                // Finally, sign up the user and/or blog
+                if ( isset( $_POST['signup_with_blog'] ) && is_multisite() )
+                    bp_core_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
+                else
+                    bp_core_signup_user( $_POST['signup_username'], $_POST['signup_password'], $_POST['signup_email'], $usermeta );
+
+                $bp->signup->step = 'completed-confirmation';
+            }
+
+            do_action( 'bp_complete_signup' );
+        }
+
+    }
+
+    do_action( 'bp_core_screen_signup' );
+    bp_core_load_template( apply_filters( 'bp_core_template_register', 'registration/register' ) );
+}
+add_action( 'bp_screens', 'bp_core_screen_signup' );
+
+function bp_core_screen_activation() {
+    global $bp;
+
+    if ( !bp_is_current_component( 'activate' ) )
+        return false;
+
+    // Check if an activation key has been passed
+    if ( isset( $_GET['key'] ) ) {
+
+        // Activate the signup
+        $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $_GET['key'] ) );
+
+        // If there were errors, add a message and redirect
+        if ( !empty( $user->errors ) ) {
+            bp_core_add_message( $user->get_error_message(), 'error' );
+            bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
+        }
+
+        // Check for an uploaded avatar and move that to the correct user folder
+        if ( is_multisite() )
+            $hashed_key = wp_hash( $_GET['key'] );
+        else
+            $hashed_key = wp_hash( $user );
+
+        // Check if the avatar folder exists. If it does, move rename it, move
+        // it and delete the signup avatar dir
+        if ( file_exists( bp_core_avatar_upload_path() . '/avatars/signups/' . $hashed_key ) )
+            @rename( bp_core_avatar_upload_path() . '/avatars/signups/' . $hashed_key, bp_core_avatar_upload_path() . '/avatars/' . $user );
+
+        bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
+
+        $bp->activation_complete = true;
+    }
+
+    if ( '' != locate_template( array( 'registration/activate' ), false ) )
+        bp_core_load_template( apply_filters( 'bp_core_template_activate', 'activate' ) );
+    else
+        bp_core_load_template( apply_filters( 'bp_core_template_activate', 'registration/activate' ) );
+}
+add_action( 'bp_screens', 'bp_core_screen_activation' );
+
 ?>