Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
01/25/2011 08:58:56 PM (14 years ago)
Author:
johnjamesjacoby
Message:

Rename new 'bp-users' component to 'bp-members' for consistency through-out project.
Core, Messages, and Friends Components now use the BP_Component class.
Split Friends and Messages components into smaller files.
Change references to 'profile' to 'xprofile' through-out project for consistency.
Introduce 'bp_actions' and 'bp_screens' standard hooks to replace the usage of 'wp' through-out project.
Move component loader sequence into bp-core-bootstrap.php,
Move old root_component action into 1.3 deprecated file.

Location:
trunk/bp-members
Files:
1 copied
1 moved

Legend:

Unmodified
Added
Removed

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

    r3916 r3917  
    22
    33
    4 function bp_users_screen_signup() {
     4function bp_members_screen_signup() {
    55    global $bp, $wpdb;
    66
    … …  
    3030
    3131        // Check the base account details for problems
    32         $account_details = bp_users_validate_user_signup( $_POST['signup_username'], $_POST['signup_email'] );
     32        $account_details = bp_members_validate_user_signup( $_POST['signup_username'], $_POST['signup_email'] );
    3333
    3434        // If there are errors with account details, set them for display
    … …  
    8282
    8383            if ( 'blog' == $active_signup || 'all' == $active_signup ) {
    84                 $blog_details = bp_users_validate_blog_signup( $_POST['signup_blog_url'], $_POST['signup_blog_title'] );
     84                $blog_details = bp_members_validate_blog_signup( $_POST['signup_blog_url'], $_POST['signup_blog_title'] );
    8585
    8686                // If there are errors with blog details, set them for display
    … …  
    9898        if ( !empty( $bp->signup->errors ) ) {
    9999            foreach ( (array)$bp->signup->errors as $fieldname => $error_message )
    100                 add_action( 'bp_' . $fieldname . '_errors', create_function( '', 'echo apply_filters(\'bp_users_signup_error_message\', "<div class=\"error\">' . $error_message . '</div>" );' ) );
     100                add_action( 'bp_' . $fieldname . '_errors', create_function( '', 'echo apply_filters(\'bp_members_signup_error_message\', "<div class=\"error\">' . $error_message . '</div>" );' ) );
    101101        } else {
    102102            $bp->signup->step = 'save-details';
    … …  
    135135                // Finally, sign up the user and/or blog
    136136                if ( isset( $_POST['signup_with_blog'] ) && is_multisite() )
    137                     bp_users_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
     137                    bp_members_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
    138138                else
    139                     bp_users_signup_user( $_POST['signup_username'], $_POST['signup_password'], $_POST['signup_email'], $usermeta );
     139                    bp_members_signup_user( $_POST['signup_username'], $_POST['signup_password'], $_POST['signup_email'], $usermeta );
    140140
    141141                $bp->signup->step = 'completed-confirmation';
    … …  
    148148
    149149    do_action( 'bp_core_screen_signup' );
    150     bp_core_load_template( apply_filters( 'bp_users_template_register', 'registration/register' ) );
    151 }
    152 add_action( 'wp', 'bp_users_screen_signup', 3 );
    153 
    154 function bp_users_screen_activation() {
     150    bp_core_load_template( apply_filters( 'bp_members_template_register', 'registration/register' ) );
     151}
     152add_action( 'bp_screens', 'bp_members_screen_signup' );
     153
     154function bp_members_screen_activation() {
    155155    global $bp, $wpdb;
    156156
    … …  
    162162
    163163        // Activate the signup
    164         $user = apply_filters( 'bp_users_activate_account', bp_users_activate_signup( $_GET['key'] ) );
     164        $user = apply_filters( 'bp_members_activate_account', bp_members_activate_signup( $_GET['key'] ) );
    165165
    166166        // If there were errors, add a message and redirect
    … …  
    191191        bp_core_load_template( apply_filters( 'bp_core_template_activate', 'registration/activate' ) );
    192192}
    193 add_action( 'wp', 'bp_users_screen_activation', 3 );
     193add_action( 'bp_screens', 'bp_members_screen_activation' );
    194194
    195195
    … …  
    206206 * Flush illegal names by getting and setting 'illegal_names' site option
    207207 */
    208 function bp_users_flush_illegal_names() {
     208function bp_members_flush_illegal_names() {
    209209    $illegal_names = get_site_option( 'illegal_names' );
    210210    update_site_option( 'illegal_names', $illegal_names );
    … …  
    219219 * @return array Merged and unique array of illegal names
    220220 */
    221 function bp_users_illegal_names( $value = '', $oldvalue = '' ) {
     221function bp_members_illegal_names( $value = '', $oldvalue = '' ) {
    222222
    223223    // Make sure $value is array
    … …  
    263263
    264264    // Add our slugs to the array and allow them to be filtered
    265     $filtered_illegal_names = apply_filters( 'bp_users_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
     265    $filtered_illegal_names = apply_filters( 'bp_members_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
    266266
    267267    // Merge the arrays together
    … …  
    271271    $illegal_names          = array_unique( (array)$merged_names );
    272272
    273     return apply_filters( 'bp_users_illegal_names', $illegal_names );
    274 }
    275 add_filter( 'pre_update_site_option_illegal_names', 'bp_users_illegal_names', 10, 2 );
     273    return apply_filters( 'bp_members_illegal_names', $illegal_names );
     274}
     275add_filter( 'pre_update_site_option_illegal_names', 'bp_members_illegal_names', 10, 2 );
    276276
    277277/**
    … …  
    283283 * @return array Results of user validation including errors, if any
    284284 */
    285 function bp_users_validate_user_signup( $user_name, $user_email ) {
     285function bp_members_validate_user_signup( $user_name, $user_email ) {
    286286    global $wpdb;
    287287
    … …  
    299299
    300300    // Make sure illegal names include BuddyPress slugs and values
    301     bp_users_flush_illegal_names();
     301    bp_members_flush_illegal_names();
    302302
    303303    $illegal_names = get_site_option( 'illegal_names' );
    … …  
    347347    $result = apply_filters( 'wpmu_validate_user_signup', $result );
    348348
    349     return apply_filters( 'bp_users_validate_user_signup', $result );
    350 }
    351 
    352 function bp_users_validate_blog_signup( $blog_url, $blog_title ) {
     349    return apply_filters( 'bp_members_validate_user_signup', $result );
     350}
     351
     352function bp_members_validate_blog_signup( $blog_url, $blog_title ) {
    353353    if ( !is_multisite() || !function_exists( 'wpmu_validate_blog_signup' ) )
    354354        return false;
    355355
    356     return apply_filters( 'bp_users_validate_blog_signup', wpmu_validate_blog_signup( $blog_url, $blog_title ) );
    357 }
    358 
    359 function bp_users_signup_user( $user_login, $user_password, $user_email, $usermeta ) {
     356    return apply_filters( 'bp_members_validate_blog_signup', wpmu_validate_blog_signup( $blog_url, $blog_title ) );
     357}
     358
     359function bp_members_signup_user( $user_login, $user_password, $user_email, $usermeta ) {
    360360    global $bp, $wpdb;
    361361
    … …  
    406406     * and validate their email address. Multisite installs send their own email, so this is only for single blog installs.
    407407     *
    408      * To disable sending activation emails you can user the filter 'bp_users_signup_send_activation_key' and return false.
     408     * To disable sending activation emails you can user the filter 'bp_members_signup_send_activation_key' and return false.
    409409     */
    410     if ( apply_filters( 'bp_users_signup_send_activation_key', true ) ) {
     410    if ( apply_filters( 'bp_members_signup_send_activation_key', true ) ) {
    411411        if ( !is_multisite() ) {
    412412            $activation_key = wp_hash( $user_id );
    413413            update_user_meta( $user_id, 'activation_key', $activation_key );
    414             bp_users_signup_send_validation_email( $user_id, $user_email, $activation_key );
     414            bp_members_signup_send_validation_email( $user_id, $user_email, $activation_key );
    415415        }
    416416    }
    417417
    418     do_action( 'bp_users_signup_user', $user_id, $user_login, $user_password, $user_email, $usermeta );
     418    do_action( 'bp_members_signup_user', $user_id, $user_login, $user_password, $user_email, $usermeta );
    419419
    420420    return $user_id;
    421421}
    422422
    423 function bp_users_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) {
     423function bp_members_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) {
    424424    if ( !is_multisite() || !function_exists( 'wpmu_signup_blog' ) )
    425425        return false;
    426426
    427     return apply_filters( 'bp_users_signup_blog', wpmu_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) );
    428 }
    429 
    430 function bp_users_activate_signup( $key ) {
     427    return apply_filters( 'bp_members_signup_blog', wpmu_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) );
     428}
     429
     430function bp_members_activate_signup( $key ) {
    431431    global $bp, $wpdb;
    432432
    … …  
    481481        require_once( ABSPATH . WPINC . '/registration.php' );
    482482
    483     wp_update_user( array( 'ID' => $user_id, 'user_url' => bp_users_get_user_domain( $user_id ), 'display_name' => bp_core_get_user_displayname( $user_id ) ) );
     483    wp_update_user( array( 'ID' => $user_id, 'user_url' => bp_members_get_user_domain( $user_id ), 'display_name' => bp_core_get_user_displayname( $user_id ) ) );
    484484
    485485    // Set the password on multisite installs
    … …  
    490490    wp_cache_delete( 'bp_total_member_count', 'bp' );
    491491
    492     do_action( 'bp_users_activated_user', $user_id, $key, $user );
     492    do_action( 'bp_members_activated_user', $user_id, $key, $user );
    493493
    494494    return $user_id;
    495495}
    496496
    497 function bp_users_new_user_activity( $user ) {
     497function bp_members_new_user_activity( $user ) {
    498498    if ( empty( $user ) || !function_exists( 'bp_activity_add' ) )
    499499        return false;
    … …  
    507507        return false;
    508508
    509     $userlink = bp_users_get_userlink( $user_id );
     509    $userlink = bp_members_get_userlink( $user_id );
    510510
    511511    bp_activity_add( array(
    512         'user_id' => $user_id,
    513         'action' => apply_filters( 'bp_users_activity_registered_member_action', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $user_id ),
    514         'component' => 'profile',
    515         'type' => 'new_member'
     512        'user_id'   => $user_id,
     513        'action'    => apply_filters( 'bp_members_activity_registered_member_action', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $user_id ),
     514        'component' => 'xprofile',
     515        'type'      => 'new_member'
    516516    ) );
    517517}
    518 add_action( 'bp_users_activated_user', 'bp_users_new_user_activity' );
    519 
    520 function bp_users_map_user_registration( $user_id ) {
     518add_action( 'bp_members_activated_user', 'bp_members_new_user_activity' );
     519
     520function bp_members_map_user_registration( $user_id ) {
    521521    // Only map data when the site admin is adding users, not on registration.
    522522    if ( !is_admin() )
    … …  
    535535    }
    536536}
    537 add_action( 'user_register', 'bp_users_map_user_registration' );
    538 
    539 function bp_users_signup_avatar_upload_dir() {
     537add_action( 'user_register', 'bp_members_map_user_registration' );
     538
     539function bp_members_signup_avatar_upload_dir() {
    540540    global $bp;
    541541
    … …  
    553553    $newsubdir = '/avatars/signups/' . $bp->signup->avatar_dir;
    554554
    555     return apply_filters( 'bp_users_signup_avatar_upload_dir', array( 'path' => $path, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
    556 }
    557 
    558 function bp_users_signup_send_validation_email( $user_id, $user_email, $key ) {
     555    return apply_filters( 'bp_members_signup_avatar_upload_dir', array( 'path' => $path, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
     556}
     557
     558function bp_members_signup_send_validation_email( $user_id, $user_email, $key ) {
    559559    $activate_url = bp_get_activation_page() ."?key=$key";
    560560    $activate_url = esc_url( $activate_url );
    … …  
    566566
    567567    // Send the message
    568     $to      = apply_filters( 'bp_users_signup_send_validation_email_to',     $user_email, $user_id                );
    569     $subject = apply_filters( 'bp_users_signup_send_validation_email_subject', $subject,    $user_id                );
    570     $message = apply_filters( 'bp_users_signup_send_validation_email_message', $message,    $user_id, $activate_url );
     568    $to      = apply_filters( 'bp_members_signup_send_validation_email_to',     $user_email, $user_id                );
     569    $subject = apply_filters( 'bp_members_signup_send_validation_email_subject', $subject,    $user_id                );
     570    $message = apply_filters( 'bp_members_signup_send_validation_email_message', $message,    $user_id, $activate_url );
    571571
    572572    wp_mail( $to, $subject, $message );
    573573
    574     do_action( 'bp_users_sent_user_validation_email', $subject, $message, $user_id, $user_email, $key );
     574    do_action( 'bp_members_sent_user_validation_email', $subject, $message, $user_id, $user_email, $key );
    575575}
    576576
    577577// Stop user accounts logging in that have not been activated (user_status = 2)
    578 function bp_users_signup_disable_inactive( $auth_obj, $username ) {
     578function bp_members_signup_disable_inactive( $auth_obj, $username ) {
    579579    global $bp, $wpdb;
    580580
    … …  
    589589        return $auth_obj;
    590590}
    591 add_filter( 'authenticate', 'bp_users_signup_disable_inactive', 30, 2 );
    592 
    593 /* Kill the wp-signup.php if custom registration signup templates are present */
    594 function bp_users_wpsignup_redirect() {
     591add_filter( 'authenticate', 'bp_members_signup_disable_inactive', 30, 2 );
     592
     593// Kill the wp-signup.php if custom registration signup templates are present
     594function bp_members_wpsignup_redirect() {
    595595    $action = '';
    596596    if ( isset( $_GET['action'] ) )
    … …  
    604604}
    605605if ( is_multisite() )
    606     add_action( 'wp', 'bp_users_wpsignup_redirect' );
     606    add_action( 'bp_screens', 'bp_members_wpsignup_redirect' );
    607607else
    608     add_action( 'bp_init', 'bp_users_wpsignup_redirect' );
     608    add_action( 'bp_init', 'bp_members_wpsignup_redirect' );
    609609
    610610?>
Note: See TracChangeset for help on using the changeset viewer.