Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
07/04/2011 05:50:22 PM (14 years ago)
Author:
johnjamesjacoby
Message:

First pass at reverting members/core function & filter refactor. See #3158.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-members/bp-members-signup.php

    r4414 r4605  
    1111
    1212
    13 function bp_members_screen_signup() {
     13function bp_core_screen_signup() {
    1414    global $bp, $wpdb;
    1515
    … …  
    4343
    4444        // Check the base account details for problems
    45         $account_details = bp_members_validate_user_signup( $_POST['signup_username'], $_POST['signup_email'] );
     45        $account_details = bp_core_validate_user_signup( $_POST['signup_username'], $_POST['signup_email'] );
    4646
    4747        // If there are errors with account details, set them for display
    … …  
    9595
    9696            if ( 'blog' == $active_signup || 'all' == $active_signup ) {
    97                 $blog_details = bp_members_validate_blog_signup( $_POST['signup_blog_url'], $_POST['signup_blog_title'] );
     97                $blog_details = bp_core_validate_blog_signup( $_POST['signup_blog_url'], $_POST['signup_blog_title'] );
    9898
    9999                // If there are errors with blog details, set them for display
    … …  
    148148                // Finally, sign up the user and/or blog
    149149                if ( isset( $_POST['signup_with_blog'] ) && is_multisite() )
    150                     bp_members_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
     150                    bp_core_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
    151151                else
    152                     bp_members_signup_user( $_POST['signup_username'], $_POST['signup_password'], $_POST['signup_email'], $usermeta );
     152                    bp_core_signup_user( $_POST['signup_username'], $_POST['signup_password'], $_POST['signup_email'], $usermeta );
    153153
    154154                $bp->signup->step = 'completed-confirmation';
    … …  
    163163    bp_core_load_template( apply_filters( 'bp_members_template_register', 'registration/register' ) );
    164164}
    165 add_action( 'bp_screens', 'bp_members_screen_signup' );
    166 
    167 function bp_members_screen_activation() {
     165add_action( 'bp_screens', 'bp_core_screen_signup' );
     166
     167function bp_core_screen_activation() {
    168168    global $bp, $wpdb;
    169169
    … …  
    175175
    176176        // Activate the signup
    177         $user = apply_filters( 'bp_members_activate_account', bp_members_activate_signup( $_GET['key'] ) );
     177        $user = apply_filters( 'bp_members_activate_account', bp_core_activate_signup( $_GET['key'] ) );
    178178
    179179        // If there were errors, add a message and redirect
    … …  
    204204        bp_core_load_template( apply_filters( 'bp_core_template_activate', 'registration/activate' ) );
    205205}
    206 add_action( 'bp_screens', 'bp_members_screen_activation' );
     206add_action( 'bp_screens', 'bp_core_screen_activation' );
    207207
    208208
    … …  
    219219 * Flush illegal names by getting and setting 'illegal_names' site option
    220220 */
    221 function bp_members_flush_illegal_names() {
     221function bp_core_flush_illegal_names() {
    222222    $illegal_names = get_site_option( 'illegal_names' );
    223223    update_site_option( 'illegal_names', $illegal_names );
    … …  
    232232 * @return array Merged and unique array of illegal names
    233233 */
    234 function bp_members_illegal_names( $value = '', $oldvalue = '' ) {
     234function bp_core_illegal_names( $value = '', $oldvalue = '' ) {
    235235
    236236    // Make sure $value is array
    … …  
    284284    $illegal_names          = array_unique( (array)$merged_names );
    285285
    286     return apply_filters( 'bp_members_illegal_names', $illegal_names );
    287 }
    288 add_filter( 'pre_update_site_option_illegal_names', 'bp_members_illegal_names', 10, 2 );
     286    return apply_filters( 'bp_core_illegal_names', $illegal_names );
     287}
     288add_filter( 'pre_update_site_option_illegal_names', 'bp_core_illegal_names', 10, 2 );
    289289
    290290/**
    … …  
    296296 * @return array Results of user validation including errors, if any
    297297 */
    298 function bp_members_validate_user_signup( $user_name, $user_email ) {
     298function bp_core_validate_user_signup( $user_name, $user_email ) {
    299299    global $wpdb;
    300300
    … …  
    309309
    310310    // Make sure illegal names include BuddyPress slugs and values
    311     bp_members_flush_illegal_names();
     311    bp_core_flush_illegal_names();
    312312
    313313    $illegal_names = get_site_option( 'illegal_names' );
    … …  
    357357    $result = apply_filters( 'wpmu_validate_user_signup', $result );
    358358
    359     return apply_filters( 'bp_members_validate_user_signup', $result );
    360 }
    361 
    362 function bp_members_validate_blog_signup( $blog_url, $blog_title ) {
     359    return apply_filters( 'bp_core_validate_user_signup', $result );
     360}
     361
     362function bp_core_validate_blog_signup( $blog_url, $blog_title ) {
    363363    if ( !is_multisite() || !function_exists( 'wpmu_validate_blog_signup' ) )
    364364        return false;
    365365
    366     return apply_filters( 'bp_members_validate_blog_signup', wpmu_validate_blog_signup( $blog_url, $blog_title ) );
    367 }
    368 
    369 function bp_members_signup_user( $user_login, $user_password, $user_email, $usermeta ) {
     366    return apply_filters( 'bp_core_validate_blog_signup', wpmu_validate_blog_signup( $blog_url, $blog_title ) );
     367}
     368
     369function bp_core_signup_user( $user_login, $user_password, $user_email, $usermeta ) {
    370370    global $bp, $wpdb;
    371371
    … …  
    423423            $activation_key = wp_hash( $user_id );
    424424            update_user_meta( $user_id, 'activation_key', $activation_key );
    425             bp_members_signup_send_validation_email( $user_id, $user_email, $activation_key );
    426         }
    427     }
    428 
    429     do_action( 'bp_members_signup_user', $user_id, $user_login, $user_password, $user_email, $usermeta );
     425            bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key );
     426        }
     427    }
     428
     429    do_action( 'bp_core_signup_user', $user_id, $user_login, $user_password, $user_email, $usermeta );
    430430
    431431    return $user_id;
    432432}
    433433
    434 function bp_members_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) {
     434function bp_core_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) {
    435435    if ( !is_multisite() || !function_exists( 'wpmu_signup_blog' ) )
    436436        return false;
    437437
    438     return apply_filters( 'bp_members_signup_blog', wpmu_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) );
    439 }
    440 
    441 function bp_members_activate_signup( $key ) {
     438    return apply_filters( 'bp_core_signup_blog', wpmu_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) );
     439}
     440
     441function bp_core_activate_signup( $key ) {
    442442    global $bp, $wpdb;
    443443
    … …  
    502502}
    503503
    504 function bp_members_new_user_activity( $user ) {
     504function bp_core_new_user_activity( $user ) {
    505505    if ( empty( $user ) || !bp_is_active( 'activity' ) )
    506506        return false;
    … …  
    523523    ) );
    524524}
    525 add_action( 'bp_members_activated_user', 'bp_members_new_user_activity' );
    526 
    527 function bp_members_map_user_registration( $user_id ) {
     525add_action( 'bp_members_activated_user', 'bp_core_new_user_activity' );
     526
     527function bp_core_map_user_registration( $user_id ) {
    528528    // Only map data when the site admin is adding users, not on registration.
    529529    if ( !is_admin() )
    … …  
    542542    }
    543543}
    544 add_action( 'user_register', 'bp_members_map_user_registration' );
    545 
    546 function bp_members_signup_avatar_upload_dir() {
     544add_action( 'user_register', 'bp_core_map_user_registration' );
     545
     546function bp_core_signup_avatar_upload_dir() {
    547547    global $bp;
    548548
    … …  
    560560    $newsubdir = '/avatars/signups/' . $bp->signup->avatar_dir;
    561561
    562     return apply_filters( 'bp_members_signup_avatar_upload_dir', array( 'path' => $path, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
    563 }
    564 
    565 function bp_members_signup_send_validation_email( $user_id, $user_email, $key ) {
     562    return apply_filters( 'bp_core_signup_avatar_upload_dir', array( 'path' => $path, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
     563}
     564
     565function bp_core_signup_send_validation_email( $user_id, $user_email, $key ) {
    566566    $activate_url = bp_get_activation_page() ."?key=$key";
    567567    $activate_url = esc_url( $activate_url );
    … …  
    573573
    574574    // Send the message
    575     $to      = apply_filters( 'bp_members_signup_send_validation_email_to',     $user_email, $user_id                );
    576     $subject = apply_filters( 'bp_members_signup_send_validation_email_subject', $subject,    $user_id                );
    577     $message = apply_filters( 'bp_members_signup_send_validation_email_message', $message,    $user_id, $activate_url );
     575    $to      = apply_filters( 'bp_core_signup_send_validation_email_to',     $user_email, $user_id                );
     576    $subject = apply_filters( 'bp_core_signup_send_validation_email_subject', $subject,    $user_id                );
     577    $message = apply_filters( 'bp_core_signup_send_validation_email_message', $message,    $user_id, $activate_url );
    578578
    579579    wp_mail( $to, $subject, $message );
    … …  
    583583
    584584// Stop user accounts logging in that have not been activated (user_status = 2)
    585 function bp_members_signup_disable_inactive( $auth_obj, $username ) {
     585function bp_core_signup_disable_inactive( $auth_obj, $username ) {
    586586    global $bp, $wpdb;
    587587
    … …  
    596596        return $auth_obj;
    597597}
    598 add_filter( 'authenticate', 'bp_members_signup_disable_inactive', 30, 2 );
     598add_filter( 'authenticate', 'bp_core_signup_disable_inactive', 30, 2 );
    599599
    600600// Kill the wp-signup.php if custom registration signup templates are present
    601 function bp_members_wpsignup_redirect() {
     601function bp_core_wpsignup_redirect() {
    602602    global $bp;
    603603
    … …  
    613613        bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->register->slug ) );
    614614}
    615 add_action( 'bp_screens', 'bp_members_wpsignup_redirect' );
     615add_action( 'bp_screens', 'bp_core_wpsignup_redirect' );
    616616
    617617?>
Note: See TracChangeset for help on using the changeset viewer.