Skip to:
Content

BuddyPress.org

Changeset 5305


Ignore:
Timestamp:
11/08/2011 02:15:22 AM (13 years ago)
Author:
johnjamesjacoby
Message:

Port user active/status functions from bbPress 2. Deprecate old _core_ functions into 1.6.php as wrappers. See #3739.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-activity/bp-activity-functions.php

    r5302 r5305  
    871871        return false;
    872872
    873     if ( bp_core_is_user_spammer( $user_id ) || bp_core_is_user_deleted( $user_id ) )
     873    if ( bp_is_user_inactive( $user_id ) )
    874874        return false;
    875875
  • trunk/bp-activity/bp-activity-template.php

    r5302 r5305  
    20462046            $user_id = bp_displayed_user_id();
    20472047
    2048         if ( bp_core_is_user_spammer( $user_id ) || bp_core_is_user_deleted( $user_id ) )
     2048        if ( bp_is_user_inactive( $user_id ) )
    20492049            return false;
    20502050
  • trunk/bp-core/bp-core-catchuri.php

    r5301 r5305  
    255255                // If the displayed user is marked as a spammer, 404 (unless logged-
    256256                // in user is a super admin)
    257                 if ( bp_displayed_user_id() && bp_core_is_user_spammer( bp_displayed_user_id() ) ) {
     257                if ( bp_displayed_user_id() && bp_is_user_spammer( bp_displayed_user_id() ) ) {
    258258                    if ( is_super_admin() ) {
    259259                        bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'error' );
  • trunk/bp-core/bp-core-functions.php

    r5302 r5305  
    704704    $user_id = bp_loggedin_user_id();
    705705
    706     if ( bp_core_is_user_spammer( $user_id ) || bp_core_is_user_deleted( $user_id ) )
     706    if ( bp_is_user_inactive( $user_id ) )
    707707        return false;
    708708
  • trunk/bp-core/deprecated/1.6.php

    r5289 r5305  
    3939}
    4040
     41function bp_core_is_user_deleted( $user_id = 0 ) {
     42    _deprecated_function( __FUNCTION__, '1.6' );
     43    bp_is_user_deleted( $user_id );
     44}
     45
     46function bp_core_is_user_spammer( $user_id = 0 ) {
     47    _deprecated_function( __FUNCTION__, '1.6' );
     48    bp_is_user_spammer( $user_id );
     49}
    4150?>
  • trunk/bp-forums/bp-forums-functions.php

    r5302 r5305  
    169169        return false;
    170170
    171     if ( bp_core_is_user_spammer( $topic_poster ) || bp_core_is_user_deleted( $topic_poster ) )
     171    if ( bp_is_user_inactive( $topic_poster ) )
    172172        return false;
    173173
     
    203203
    204204    // Check if the user is a spammer
    205     if ( bp_core_is_user_spammer( bp_loggedin_user_id() ) || bp_core_is_user_deleted( bp_loggedin_user_id() ) )
     205    if ( bp_is_user_inactive( bp_loggedin_user_id() ) )
    206206        return false;
    207207
     
    515515        return false;
    516516
    517     if ( bp_core_is_user_spammer( bp_loggedin_user_id() ) || bp_core_is_user_deleted( bp_loggedin_user_id() ) )
     517    if ( bp_is_user_inactive( bp_loggedin_user_id() ) )
    518518        return false;
    519519
  • trunk/bp-members/bp-members-functions.php

    r5302 r5305  
    494494 * @return bool True if spammer, False if not.
    495495 */
    496 function bp_core_is_user_spammer( $user_id = 0 ) {
     496function bp_is_user_spammer( $user_id = 0 ) {
    497497    global $wpdb;
    498498
     
    522522    }
    523523
    524     return apply_filters( 'bp_core_is_user_spammer', (bool) $is_spammer );
     524    return apply_filters( 'bp_is_user_spammer', (bool) $is_spammer );
    525525}
    526526
     
    532532 * @return bool True if deleted, False if not.
    533533 */
    534 function bp_core_is_user_deleted( $user_id = 0 ) {
     534function bp_is_user_deleted( $user_id = 0 ) {
    535535    global $wpdb;
    536536
     
    561561    }
    562562
    563     return apply_filters( 'bp_core_is_user_deleted', (bool) $is_deleted );
     563    return apply_filters( 'bp_is_user_deleted', (bool) $is_deleted );
     564}
     565
     566/**
     567 * Checks if user is active
     568 *
     569 * @since BuddyPress (1.6)
     570 *
     571 * @uses is_user_logged_in() To check if user is logged in
     572 * @uses bbp_get_displayed_user_id() To get current user ID
     573 * @uses bbp_is_user_spammer() To check if user is spammer
     574 * @uses bbp_is_user_deleted() To check if user is deleted
     575 *
     576 * @param int $user_id The user ID to check
     577 * @return bool True if public, false if not
     578 */
     579function bp_is_user_active( $user_id = 0 ) {
     580
     581    // Default to current user
     582    if ( empty( $user_id ) && is_user_logged_in() )
     583        $user_id = bp_loggedin_user_id();
     584
     585    // No user to check
     586    if ( empty( $user_id ) )
     587        return false;
     588
     589    // Check spam
     590    if ( bp_is_user_spammer( $user_id ) )
     591        return false;
     592
     593    // Check deleted
     594    if ( bp_is_user_deleted( $user_id ) )
     595        return false;
     596
     597    // Assume true if not spam or deleted
     598    return true;
     599}
     600
     601/**
     602 * Checks if user is not active.
     603 *
     604 * @since BuddyPress (1.6)
     605 *
     606 * @uses is_user_logged_in() To check if user is logged in
     607 * @uses bp_get_displayed_user_id() To get current user ID
     608 * @uses bp_is_user_active() To check if user is active
     609 *
     610 * @param int $user_id The user ID to check
     611 * @return bool True if inactive, false if active
     612 */
     613function bp_is_user_inactive( $user_id = 0 ) {
     614
     615    // Default to current user
     616    if ( empty( $user_id ) && is_user_logged_in() )
     617        $user_id = bp_loggedin_user_id();
     618
     619    // No user to check
     620    if ( empty( $user_id ) )
     621        return false;
     622
     623    // Return the inverse of active
     624    return !bp_is_user_active( $user_id );
    564625}
    565626
Note: See TracChangeset for help on using the changeset viewer.