Skip to:
Content

BuddyPress.org

Changeset 5329


Ignore:
Timestamp:
11/14/2011 05:19:12 AM (13 years ago)
Author:
johnjamesjacoby
Message:

Find/replace on is_super_admin() to use bp_current_user_can( 'bp_moderate' ). See #3740.

Location:
trunk
Files:
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-activity/bp-activity-screens.php

    r5302 r5329  
    5656 * @uses bp_is_active()
    5757 * @uses bp_update_is_item_admin()
    58  * @uses is_super_admin()
     58 * @uses bp_current_user_can()
    5959 * @uses do_action() To call the 'bp_activity_screen_friends' hook
    6060 * @uses bp_core_load_template()
    … …  
    6565        return false;
    6666
    67     bp_update_is_item_admin( is_super_admin(), 'activity' );
     67    bp_update_is_item_admin( bp_current_user_can( 'bp_moderate' ), 'activity' );
    6868    do_action( 'bp_activity_screen_friends' );
    6969    bp_core_load_template( apply_filters( 'bp_activity_template_friends_activity', 'members/single/home' ) );
    … …  
    7777 * @uses bp_is_active()
    7878 * @uses bp_update_is_item_admin()
    79  * @uses is_super_admin()
     79 * @uses bp_current_user_can()
    8080 * @uses do_action() To call the 'bp_activity_screen_groups' hook
    8181 * @uses bp_core_load_template()
    … …  
    8686        return false;
    8787
    88     bp_update_is_item_admin( is_super_admin(), 'activity' );
     88    bp_update_is_item_admin( bp_current_user_can( 'bp_moderate' ), 'activity' );
    8989    do_action( 'bp_activity_screen_groups' );
    9090    bp_core_load_template( apply_filters( 'bp_activity_template_groups_activity', 'members/single/home' ) );
    … …  
    9797 *
    9898 * @uses bp_update_is_item_admin()
    99  * @uses is_super_admin()
     99 * @uses bp_current_user_can()
    100100 * @uses do_action() To call the 'bp_activity_screen_favorites' hook
    101101 * @uses bp_core_load_template()
    … …  
    103103 */
    104104function bp_activity_screen_favorites() {
    105     bp_update_is_item_admin( is_super_admin(), 'activity' );
     105    bp_update_is_item_admin( bp_current_user_can( 'bp_moderate' ), 'activity' );
    106106    do_action( 'bp_activity_screen_favorites' );
    107107    bp_core_load_template( apply_filters( 'bp_activity_template_favorite_activity', 'members/single/home' ) );
    … …  
    114114 *
    115115 * @uses bp_update_is_item_admin()
    116  * @uses is_super_admin()
     116 * @uses bp_current_user_can()
    117117 * @uses do_action() To call the 'bp_activity_screen_mentions' hook
    118118 * @uses bp_core_load_template()
    … …  
    120120 */
    121121function bp_activity_screen_mentions() {
    122     bp_update_is_item_admin( is_super_admin(), 'activity' );
     122    bp_update_is_item_admin( bp_current_user_can( 'bp_moderate' ), 'activity' );
    123123    do_action( 'bp_activity_screen_mentions' );
    124124    bp_core_load_template( apply_filters( 'bp_activity_template_mention_activity', 'members/single/home' ) );

  • trunk/bp-blogs/bp-blogs-classes.php

    r5302 r5329  
    7878        global $bp, $wpdb;
    7979
    80         if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != bp_loggedin_user_id() ) ) )
     80        if ( !is_user_logged_in() || ( !bp_current_user_can( 'bp_moderate' ) && ( $user_id != bp_loggedin_user_id() ) ) )
    8181            $hidden_sql = "AND wb.public = 1";
    8282        else
    … …  
    195195
    196196        // If the user is logged in return the blog count including their hidden blogs.
    197         if ( ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) || is_super_admin() )
     197        if ( ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) || bp_current_user_can( 'bp_moderate' ) )
    198198            return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id) );
    199199        else
    … …  
    206206        $filter = like_escape( $wpdb->escape( $filter ) );
    207207
    208         if ( !is_super_admin() )
     208        if ( !bp_current_user_can( 'bp_moderate' ) )
    209209            $hidden_sql = "AND wb.public = 1";
    210210
    … …  
    221221        global $bp, $wpdb;
    222222
    223         $hidden_sql = !is_super_admin() ? "AND wb.public = 1" : '';
     223        $hidden_sql = !bp_current_user_can( 'bp_moderate' ) ? "AND wb.public = 1" : '';
    224224        $pag_sql = ( $limit && $page ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
    225225
    … …  
    235235        $letter = like_escape( $wpdb->escape( $letter ) );
    236236
    237         if ( !is_super_admin() )
     237        if ( !bp_current_user_can( 'bp_moderate' ) )
    238238            $hidden_sql = "AND wb.public = 1";
    239239

  • trunk/bp-core/admin/bp-core-update.php

    r5309 r5329  
    14101410        return;
    14111411
    1412     if ( !is_super_admin() )
     1412    if ( !bp_current_user_can( 'bp_moderate' ) )
    14131413        return;
    14141414

  • trunk/bp-core/bp-core-buddybar.php

    r5313 r5329  
    3131
    3232    // If this is for site admins only and the user is not one, don't create the subnav item
    33     if ( $site_admin_only && !is_super_admin() )
     33    if ( $site_admin_only && !bp_current_user_can( 'bp_moderate' ) )
    3434        return false;
    3535
    … …  
    210210
    211211    // If this is for site admins only and the user is not one, don't create the subnav item
    212     if ( $site_admin_only && !is_super_admin() )
     212    if ( $site_admin_only && !bp_current_user_can( 'bp_moderate' ) )
    213213        return false;
    214214

  • trunk/bp-core/bp-core-caps.php

    r5304 r5329  
    378378}
    379379
     380/**
     381 * Whether current user has a capability or role. Can be passed blog ID, or will
     382 * use the root blod by default
     383 *
     384 * @since BuddyPress (1.6)
     385 *
     386 * @param string $capability Capability or role name.
     387 * @param int $blog_id Blog ID
     388 * @return bool
     389 */
     390function bp_current_user_can( $capability, $blog_id = 0 ) {
     391
     392    // Use root blog if no ID passed
     393    if ( empty( $blog_id ) )
     394        $blog_id = bp_get_root_blog_id();
     395
     396    $retval = current_user_can_for_blog( $blog_id, $capability );
     397
     398    return (bool) apply_filters( 'bp_current_user_can', $retval, $capability, $blog_id );
     399}
     400
    380401?>

  • trunk/bp-core/bp-core-catchuri.php

    r5322 r5329  
    268268                // in user is a super admin)
    269269                if ( bp_displayed_user_id() && bp_is_user_spammer( bp_displayed_user_id() ) ) {
    270                     if ( is_super_admin() ) {
     270                    if ( bp_current_user_can( 'bp_moderate' ) ) {
    271271                        bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'warning' );
    272272                    } else {

  • trunk/bp-core/bp-core-filters.php

    r5153 r5329  
    7070    global $bp, $wpdb;
    7171
    72     if ( !is_super_admin() )
     72    if ( !bp_current_user_can( 'bp_moderate' ) )
    7373        return $themes;
    7474

  • trunk/bp-core/bp-core-functions.php

    r5320 r5329  
    272272 *
    273273 * @package BuddyPress Core
    274  * @uses is_super_admin() returns true if the current user is a site admin, false if not
     274 * @uses bp_current_user_can() returns true if the current user is a site admin, false if not
    275275 */
    276276function bp_core_admin_menu_init() {
    277     if ( !is_super_admin() )
     277    if ( !bp_current_user_can( 'bp_moderate' ) )
    278278        return false;
    279279
    … …  
    289289 * @package BuddyPress Core
    290290 * @global object $bp Global BuddyPress settings object
    291  * @uses is_super_admin() returns true if the current user is a site admin, false if not
     291 * @uses bp_current_user_can() returns true if the current user is a site admin, false if not
    292292 * @uses add_submenu_page() WP function to add a submenu item
    293293 */
    294294function bp_core_add_admin_menu() {
    295     if ( !is_super_admin() )
     295    if ( !bp_current_user_can( 'bp_moderate' ) )
    296296        return false;
    297297
    … …  
    324324 *
    325325 * @global object $bp Global BuddyPress settings object
    326  * @uses is_super_admin() to check current user permissions before showing the notices
     326 * @uses bp_current_user_can() to check current user permissions before showing the notices
    327327 * @uses bp_is_root_blog()
    328328 */
    … …  
    331331
    332332    // Only the super admin should see messages
    333     if ( !is_super_admin() )
     333    if ( !bp_current_user_can( 'bp_moderate' ) )
    334334        return;
    335335
    … …  
    392392
    393393    // Only the super admin gets warnings
    394     if ( !is_super_admin() )
     394    if ( !bp_current_user_can( 'bp_moderate' ) )
    395395        return;
    396396

  • trunk/bp-core/bp-core-moderation.php

    r5278 r5329  
    5454 * @uses bp_current_author_ip() To get current user IP address
    5555 * @uses bp_current_author_ua() To get current user agent
    56  * @uses is_super_admin() Allow super admins to bypass blacklist
     56 * @uses bp_current_user_can() Allow super admins to bypass blacklist
    5757 */
    5858function bp_core_check_for_moderation( $user_id = 0, $title = '', $content = '' ) {
    … …  
    159159 * @uses bp_current_author_ip() To get current user IP address
    160160 * @uses bp_current_author_ua() To get current user agent
    161  * @uses is_super_admin() Allow super admins to bypass blacklist
     161 * @uses bp_current_user_can() Allow super admins to bypass blacklist
    162162 * @since 1.6
    163163 */

  • trunk/bp-core/bp-core-template.php

    r5302 r5329  
    700700
    701701function bp_user_has_access() {
    702     $has_access = ( is_super_admin() || bp_is_my_profile() ) ? true : false;
     702    $has_access = ( bp_current_user_can( 'bp_moderate' ) || bp_is_my_profile() ) ? true : false;
    703703
    704704    return apply_filters( 'bp_user_has_access', $has_access );

  • trunk/bp-core/deprecated/1.5.php

    r5301 r5329  
    463463    function bp_dtheme_page_on_front_update( $oldvalue, $newvalue ) {
    464464        _deprecated_function( __FUNCTION__, '1.5', "No longer required." );
    465         if ( !is_admin() || !is_super_admin() )
     465        if ( !is_admin() || !bp_current_user_can( 'bp_moderate' ) )
    466466            return false;
    467467

  • trunk/bp-forums/bp-forums-admin.php

    r5162 r5329  
    66    global $bp;
    77
    8     if ( !is_super_admin() )
     8    if ( !bp_current_user_can( 'bp_moderate' ) )
    99        return false;
    1010

  • trunk/bp-forums/bp-forums-screens.php

    r5302 r5329  
    2626            if ( !empty( $bp->groups->current_group->id ) ) {
    2727                // Auto join this user if they are not yet a member of this group
    28                 if ( !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) )
     28                if ( !bp_current_user_can( 'bp_moderate' ) && 'public' == $bp->groups->current_group->status && !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) )
    2929                    groups_join_group( $bp->groups->current_group->id );
    3030

  • trunk/bp-forums/bp-forums-template.php

    r5302 r5329  
    154154            } else {
    155155                // For forum directories (All Topics), get a true count
    156                 $status = is_super_admin() ? 'all' : 'public'; // todo: member-of
     156                $status = bp_current_user_can( 'bp_moderate' ) ? 'all' : 'public'; // todo: member-of
    157157                $topic_count = (int)groups_total_forum_topic_count( $status, $search_terms );
    158158            }
    … …  
    792792        $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'edit', 'bp_forums_edit_topic' ) . '">' . __( 'Edit Topic', 'buddypress' ) . '</a>';
    793793
    794         if ( $bp->is_item_admin || $bp->is_item_mod || is_super_admin() ) {
     794        if ( $bp->is_item_admin || $bp->is_item_mod || bp_current_user_can( 'bp_moderate' ) ) {
    795795            if ( 0 == (int)$forum_template->topic->topic_sticky )
    796796                $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'stick', 'bp_forums_stick_topic' ) . '">' . __( 'Sticky Topic', 'buddypress' ) . '</a>';

  • trunk/bp-groups/bp-groups-adminbar.php

    r5213 r5329  
    2828
    2929    // Only show this menu to group admins and super admins
    30     if ( !is_super_admin() && !bp_group_is_admin() )
     30    if ( !bp_current_user_can( 'bp_moderate' ) && !bp_group_is_admin() )
    3131        return false;
    3232

  • trunk/bp-groups/bp-groups-buddybar.php

    r5052 r5329  
    1010
    1111    // Don't show this menu to non site admins or if you're viewing your own profile
    12     if ( !current_user_can( 'edit_users' ) || !is_super_admin() || ( !$bp->is_item_admin && !$bp->is_item_mod ) )
     12    if ( !current_user_can( 'edit_users' ) || !bp_current_user_can( 'bp_moderate' ) || ( !$bp->is_item_admin && !$bp->is_item_mod ) )
    1313        return false; ?>
    1414

  • trunk/bp-groups/bp-groups-classes.php

    r5302 r5329  
    211211        }
    212212
    213         if ( !is_super_admin() )
     213        if ( !bp_current_user_can( 'bp_moderate' ) )
    214214            $hidden_sql = "AND status != 'hidden'";
    215215
    … …  
    387387        }
    388388
    389         if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != bp_loggedin_user_id() ) ) )
     389        if ( !is_user_logged_in() || ( !bp_current_user_can( 'bp_moderate' ) && ( $user_id != bp_loggedin_user_id() ) ) )
    390390            $hidden_sql = " AND g.status != 'hidden'";
    391391
    … …  
    428428        }
    429429
    430         if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != bp_loggedin_user_id() ) ) )
     430        if ( !is_user_logged_in() || ( !bp_current_user_can( 'bp_moderate' ) && ( $user_id != bp_loggedin_user_id() ) ) )
    431431            $hidden_sql = " AND g.status != 'hidden'";
    432432
    … …  
    478478        }
    479479
    480         if ( !is_super_admin() )
     480        if ( !bp_current_user_can( 'bp_moderate' ) )
    481481            $hidden_sql = $wpdb->prepare( " AND status != 'hidden'");
    482482
    … …  
    505505            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
    506506
    507         if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != bp_loggedin_user_id() ) ) )
     507        if ( !is_user_logged_in() || ( !bp_current_user_can( 'bp_moderate' ) && ( $user_id != bp_loggedin_user_id() ) ) )
    508508            $hidden_sql = "AND g.status != 'hidden'";
    509509
    … …  
    576576
    577577        $hidden_sql = '';
    578         if ( !is_super_admin() )
     578        if ( !bp_current_user_can( 'bp_moderate' ) )
    579579            $hidden_sql = "WHERE status != 'hidden'";
    580580
    … …  
    939939            $user_id = bp_displayed_user_id();
    940940
    941         if ( $user_id != bp_loggedin_user_id() && !is_super_admin() ) {
     941        if ( $user_id != bp_loggedin_user_id() && !bp_current_user_can( 'bp_moderate' ) ) {
    942942            return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id ) );
    943943        } else {

  • trunk/bp-groups/bp-groups-filters.php

    r4961 r5329  
    105105
    106106    // Are we a super admin?
    107     elseif ( is_super_admin() )
     107    elseif ( bp_current_user_can( 'bp_moderate' ) )
    108108        unset( $parts['private'] );
    109109
    … …  
    129129    global $bp;
    130130
    131     if ( is_super_admin() )
     131    if ( bp_current_user_can( 'bp_moderate' ) )
    132132        return true;
    133133

  • trunk/bp-groups/bp-groups-functions.php

    r5302 r5329  
    507507
    508508    // Be sure the user is a member of the group before posting.
    509     if ( !is_super_admin() && !groups_is_user_member( $user_id, $group_id ) )
     509    if ( !bp_current_user_can( 'bp_moderate' ) && !groups_is_user_member( $user_id, $group_id ) )
    510510        return false;
    511511

  • trunk/bp-groups/bp-groups-loader.php

    r5302 r5329  
    104104
    105105            // Using "item" not "group" for generic support in other components.
    106             if ( is_super_admin() )
     106            if ( bp_current_user_can( 'bp_moderate' ) )
    107107                bp_update_is_item_admin( true, 'groups' );
    108108            else
    … …  
    127127            // If this is a private or hidden group, does the user have access?
    128128            if ( 'private' == $this->current_group->status || 'hidden' == $this->current_group->status ) {
    129                 if ( $this->current_group->is_user_member && is_user_logged_in() || is_super_admin() )
     129                if ( $this->current_group->is_user_member && is_user_logged_in() || bp_current_user_can( 'bp_moderate' ) )
    130130                    $this->current_group->user_has_access = true;
    131131                else
    … …  
    312312            // If this is a private group, and the user is not a member, show a "Request Membership" nav item.
    313313            if ( is_user_logged_in() &&
    314                  !is_super_admin() &&
     314                 !bp_current_user_can( 'bp_moderate' ) &&
    315315                 !$this->current_group->is_user_member &&
    316316                 !groups_check_for_membership_request( bp_loggedin_user_id(), $this->current_group->id ) &&

  • trunk/bp-groups/bp-groups-screens.php

    r5302 r5329  
    130130        $user_is_banned = false;
    131131
    132         if ( !is_super_admin() && groups_is_user_banned( bp_loggedin_user_id(), $bp->groups->current_group->id ) )
     132        if ( !bp_current_user_can( 'bp_moderate' ) && groups_is_user_banned( bp_loggedin_user_id(), $bp->groups->current_group->id ) )
    133133            $user_is_banned = true;
    134134
    … …  
    141141
    142142                // Auto join this user if they are not yet a member of this group
    143                 if ( bp_groups_auto_join() && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) )
     143                if ( bp_groups_auto_join() && !bp_current_user_can( 'bp_moderate' ) && 'public' == $bp->groups->current_group->status && !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) )
    144144                    groups_join_group( $bp->groups->current_group->id, bp_loggedin_user_id() );
    145145
    … …  
    338338                    $error_message = __( "You have been banned from this group.", 'buddypress' );
    339339
    340                 } elseif ( bp_groups_auto_join() && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
     340                } elseif ( bp_groups_auto_join() && !bp_current_user_can( 'bp_moderate' ) && 'public' == $bp->groups->current_group->status && !groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
    341341                    // Auto join this user if they are not yet a member of this group
    342342                    groups_join_group( $bp->groups->current_group->id, bp_loggedin_user_id() );
    … …  
    773773    if ( bp_is_groups_component() && bp_is_action_variable( 'delete-group', 0 ) ) {
    774774
    775         if ( !$bp->is_item_admin && !is_super_admin() )
     775        if ( !$bp->is_item_admin && !bp_current_user_can( 'bp_moderate' ) )
    776776            return false;
    777777

  • trunk/bp-groups/bp-groups-template.php

    r5302 r5329  
    963963
    964964    if ( is_user_logged_in() ) {
    965         if ( is_super_admin() ) {
     965        if ( bp_current_user_can( 'bp_moderate' ) ) {
    966966            // Super admins can always send invitations
    967967            $can_send_invites = true;
    … …  
    19601960 * @uses apply_filters() To call 'bp_user_can_create_groups'.
    19611961 * @uses bp_get_option() To retrieve value of 'bp_restrict_group_creation'. Defaults to 0.
    1962  * @uses is_super_admin() To determine if current user if super admin.
     1962 * @uses bp_current_user_can() To determine if current user if super admin.
    19631963 *
    19641964 * @return bool True if user can create groups. False otherwise.
    … …  
    19661966function bp_user_can_create_groups() {
    19671967    // Super admin can always create groups
    1968     if ( is_super_admin() )
     1968    if ( bp_current_user_can( 'bp_moderate' ) )
    19691969        return true;
    19701970

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

    r5301 r5329  
    3333
    3434    // Only super admins can currently spam users
    35     if ( !is_super_admin() || bp_is_my_profile() )
     35    if ( !bp_current_user_can( 'bp_moderate' ) || bp_is_my_profile() )
    3636        return;
    3737
    … …  
    123123    global $bp;
    124124
    125     if ( !is_super_admin() || bp_is_my_profile() || !bp_displayed_user_id() )
     125    if ( !bp_current_user_can( 'bp_moderate' ) || bp_is_my_profile() || !bp_displayed_user_id() )
    126126        return false;
    127127

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

    r5319 r5329  
    643643 * @package BuddyPress Core
    644644 * @global object $bp Global BuddyPress settings object
    645  * @uses is_super_admin() Checks to see if the user is a site administrator.
     645 * @uses bp_current_user_can() Checks to see if the user is a site administrator.
    646646 * @uses wpmu_delete_user() Deletes a user from the system on multisite installs.
    647647 * @uses wp_delete_user() Deletes a user from the system on singlesite installs.
    … …  
    754754        return true;
    755755
    756     if ( is_super_admin() || current_user_can( 'edit_users' ) )
     756    if ( bp_current_user_can( 'bp_moderate' ) || current_user_can( 'edit_users' ) )
    757757        return true;
    758758

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

    r5313 r5329  
    7979
    8080        // Hits the DB on single WP installs so get this separately
    81         $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = is_super_admin();
     81        $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = bp_current_user_can( 'bp_moderate' );
    8282
    8383        // The domain for the user currently logged in. eg: http://domain.com/members/andy

  • trunk/bp-messages/bp-messages-actions.php

    r4961 r5329  
    1717    $thread_id = (int)bp_action_variable( 0 );
    1818
    19     if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access( $thread_id ) && !is_super_admin() ) )
     19    if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access( $thread_id ) && !bp_current_user_can( 'bp_moderate' ) ) )
    2020        bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() );
    2121

  • trunk/bp-messages/bp-messages-functions.php

    r5302 r5329  
    120120
    121121function messages_send_notice( $subject, $message ) {
    122     if ( !is_super_admin() || empty( $subject ) || empty( $message ) ) {
     122    if ( !bp_current_user_can( 'bp_moderate' ) || empty( $subject ) || empty( $message ) ) {
    123123        return false;
    124124

  • trunk/bp-messages/bp-messages-loader.php

    r5301 r5329  
    141141        );
    142142
    143         if ( is_super_admin() ) {
     143        if ( bp_current_user_can( 'bp_moderate' ) ) {
    144144            $sub_nav[] = array(
    145145                'name'            => __( 'Notices', 'buddypress' ),
    … …  
    149149                'screen_function' => 'messages_screen_notices',
    150150                'position'        => 90,
    151                 'user_has_access' => is_super_admin()
     151                'user_has_access' => bp_current_user_can( 'bp_moderate' )
    152152            );
    153153        }
    … …  
    216216
    217217            // Site Wide Notices
    218             if ( is_super_admin() ) {
     218            if ( bp_current_user_can( 'bp_moderate' ) ) {
    219219                $wp_admin_nav[] = array(
    220220                    'parent' => 'my-account-' . $this->id,

  • trunk/bp-messages/bp-messages-screens.php

    r5301 r5329  
    8888    global $notice_id;
    8989
    90     if ( !is_super_admin() )
     90    if ( !bp_current_user_can( 'bp_moderate' ) )
    9191        return false;
    9292

  • trunk/bp-messages/bp-messages-template.php

    r5302 r5329  
    170170    extract( $r, EXTR_SKIP );
    171171
    172     if ( 'notices' == $bp->current_action && !is_super_admin() ) {
     172    if ( 'notices' == $bp->current_action && !bp_current_user_can( 'bp_moderate' ) ) {
    173173        wp_redirect( bp_displayed_user_id() );
    174174    } else {

  • trunk/bp-settings/bp-settings-actions.php

    r5301 r5329  
    2222
    2323        // Validate the user again for the current password when making a big change
    24         if ( is_super_admin() || ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, bp_displayed_user_id() ) ) ) {
     24        if ( bp_current_user_can( 'bp_moderate' ) || ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, bp_displayed_user_id() ) ) ) {
    2525
    2626            $update_user = get_userdata( bp_displayed_user_id() );

  • trunk/bp-settings/bp-settings-loader.php

    r5300 r5329  
    111111
    112112        // Add Delete Account nav item
    113         if ( !is_super_admin() && empty( $bp->site_options['bp-disable-account-deletion'] ) ) {
     113        if ( !bp_current_user_can( 'bp_moderate' ) && empty( $bp->site_options['bp-disable-account-deletion'] ) ) {
    114114            $sub_nav[] = array(
    115115                'name'            => __( 'Delete Account', 'buddypress' ),
    … …  
    169169
    170170            // Delete Account
    171             if ( !is_super_admin() && empty( $bp->site_options['bp-disable-account-deletion'] ) ) {
     171            if ( !bp_current_user_can( 'bp_moderate' ) && empty( $bp->site_options['bp-disable-account-deletion'] ) ) {
    172172                $wp_admin_nav[] = array(
    173173                    'parent' => 'my-account-' . $this->id,

  • trunk/bp-themes/bp-default/_inc/ajax.php

    r5328 r5329  
    298298
    299299    /* Check access */
    300     if ( !is_super_admin() && $comment->user_id != bp_loggedin_user_id() )
     300    if ( !bp_current_user_can( 'bp_moderate' ) && $comment->user_id != bp_loggedin_user_id() )
    301301        return false;
    302302

  • trunk/bp-themes/bp-default/forums/index.php

    r5053 r5329  
    118118                                <?php while ( bp_groups() ) : bp_the_group(); ?>
    119119
    120                                     <?php if ( bp_group_is_forum_enabled() && ( is_super_admin() || 'public' == bp_get_group_status() || bp_group_is_member() ) ) : ?>
     120                                    <?php if ( bp_group_is_forum_enabled() && ( bp_current_user_can( 'bp_moderate' ) || 'public' == bp_get_group_status() || bp_group_is_member() ) ) : ?>
    121121
    122122                                        <option value="<?php bp_group_id(); ?>"><?php bp_group_name(); ?></option>

  • trunk/bp-themes/bp-default/forums/single/topic.php

    r5184 r5329  
    5454                            <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
    5555
    56                             <?php if ( is_super_admin() || current_user_can( 'moderate' ) ) : ?>
     56                            <?php if ( bp_current_user_can( 'bp_moderate' ) || current_user_can( 'moderate' ) ) : ?>
    5757
    5858                                <div class="last admin-links">
    … …  
    109109                                    <div class="admin-links">
    110110
    111                                         <?php if ( is_super_admin() || current_user_can( 'moderate' ) ) : ?>
     111                                        <?php if ( bp_current_user_can( 'bp_moderate' ) || current_user_can( 'moderate' ) ) : ?>
    112112
    113113                                            <?php bp_the_topic_post_admin_links() ?>

  • trunk/bp-themes/bp-default/groups/create.php

    r4961 r5329  
    6464
    6565                        <?php else : ?>
    66                             <?php if ( is_super_admin() ) : ?>
     66                            <?php if ( bp_current_user_can( 'bp_moderate' ) ) : ?>
    6767
    6868                                <div class="checkbox">

  • trunk/bp-themes/bp-default/members/single/messages/compose.php

    r4800 r5329  
    1111    </ul>
    1212
    13     <?php if ( is_super_admin() ) : ?>
     13    <?php if ( bp_current_user_can( 'bp_moderate' ) ) : ?>
    1414        <input type="checkbox" id="send-notice" name="send-notice" value="1" /> <?php _e( "This is a notice to all users.", "buddypress" ) ?>
    1515    <?php endif; ?>

  • trunk/bp-xprofile/bp-xprofile-actions.php

    r5301 r5329  
    3030    check_admin_referer( 'bp_delete_avatar_link' );
    3131
    32     if ( !bp_is_my_profile() && !is_super_admin() )
     32    if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
    3333        return false;
    3434

  • trunk/bp-xprofile/bp-xprofile-admin.php

    r4939 r5329  
    1010 * @global object $bp Global BuddyPress settings object
    1111 * @global $wpdb WordPress DB access object.
    12  * @uses is_super_admin() returns true if the current user is a site admin, false if not
     12 * @uses bp_current_user_can() returns true if the current user is a site admin, false if not
    1313 * @uses bp_xprofile_install() runs the installation of DB tables for the xprofile component
    1414 * @uses wp_enqueue_script() Adds a JS file to the JS queue ready for output
    … …  
    2020    global $wpdb, $bp;
    2121
    22     if ( !is_super_admin() )
     22    if ( !bp_current_user_can( 'bp_moderate' ) )
    2323        return false;
    2424

  • trunk/bp-xprofile/bp-xprofile-functions.php

    r5302 r5329  
    267267
    268268    // Super admins can skip required check
    269     if ( is_super_admin() && !is_admin() )
     269    if ( bp_current_user_can( 'bp_moderate' ) && !is_admin() )
    270270        $retval = false;
    271271

  • trunk/bp-xprofile/bp-xprofile-screens.php

    r5301 r5329  
    3333    global $bp;
    3434
    35     if ( !bp_is_my_profile() && !is_super_admin() )
     35    if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
    3636        return false;
    3737
    … …  
    132132    global $bp;
    133133
    134     if ( !bp_is_my_profile() && !is_super_admin() )
     134    if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
    135135        return false;
    136136

  • trunk/bp-xprofile/bp-xprofile-template.php

    r5301 r5329  
    661661
    662662        // Super admins can skip required check
    663         if ( is_super_admin() && !is_admin() )
     663        if ( bp_current_user_can( 'bp_moderate' ) && !is_admin() )
    664664            $retval = false;
    665665
Note: See TracChangeset for help on using the changeset viewer.