Changeset 5330

Timestamp:

11/14/2011 05:27:59 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Audit is_super_admin and is_site_admin usage. See #3740.

Location:

trunk

Files:

• bp-activity/bp-activity-admin.php (modified) (1 diff)
• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-activity/bp-activity-template.php (modified) (2 diffs)
• bp-groups/bp-groups-template.php (modified) (6 diffs)
• bp-members/bp-members-functions.php (modified) (1 diff)
• bp-members/bp-members-loader.php (modified) (1 diff)

trunk/bp-activity/bp-activity-admin.php

@@ -29 +29 @@
     global $bp;
 
-    if ( !$bp->loggedin_user->is_super_admin )
+    if ( !bp_current_user_can( 'bp_moderate' ) )
         return;
 

trunk/bp-activity/bp-activity-functions.php

@@ -1336 +1336 @@
 function bp_activity_user_can_mark_spam() {
     global $bp;
-    return apply_filters( 'bp_activity_user_can_mark_spam', $bp->loggedin_user->is_site_admin );
+    return apply_filters( 'bp_activity_user_can_mark_spam', bp_current_user_can( 'bp_moderate' ) );
 }
 

trunk/bp-activity/bp-activity-template.php

@@ -273 +273 @@
         $primary_id = $bp->groups->current_group->id;
 
-        if ( 'public' != $bp->groups->current_group->status && ( groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) || $bp->loggedin_user->is_super_admin ) )
+        if ( ( 'public' != $bp->groups->current_group->status ) && ( groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) || bp_current_user_can( 'bp_moderate' ) ) )
             $show_hidden = true;
     }
@@ -1222 +1222 @@
     $can_delete = false;
 
-    if ( $bp->loggedin_user->is_super_admin )
+    if ( bp_current_user_can( 'bp_moderate' ) )
         $can_delete = true;
 

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

@@ -111 +111 @@
         $this->pag_num  = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
 
-        if ( $bp->loggedin_user->is_super_admin || ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) )
+        if ( bp_current_user_can( 'bp_moderate' ) || ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) )
             $show_hidden = true;
 
@@ -300 +300 @@
     global $bp, $groups_template;
 
-    if ( $bp->loggedin_user->is_super_admin )
+    if ( bp_current_user_can( 'bp_moderate' ) )
         return true;
 
@@ -1344 +1344 @@
  * Checks if current user is member of a group.
  *
- * @uses is_super_admin Check if current user is super admin
+ * @uses bp_current_user_can() Check if current user is super admin
  * @uses apply_filters Creates bp_group_is_member filter and passes $is_member
  * @usedby groups/activity.php, groups/single/forum/edit.php, groups/single/forum/topic.php to determine template part visibility
@@ -1356 +1356 @@
 
     // Site admins always have access
-    if ( $bp->loggedin_user->is_super_admin )
+    if ( bp_current_user_can( 'bp_moderate' ) )
         return true;
 
@@ -1372 +1372 @@
  * However, if used in a single group's pages, we must use groups_is_user_banned().
  *
- * @global object $bp BuddyPress global settings
  * @global BP_Groups_Template $groups_template Group template loop object
  * @param object $group Group to check if user is banned from the group
@@ -1380 +1379 @@
  */
 function bp_group_is_user_banned( $group = false, $user_id = 0 ) {
-    global $bp, $groups_template;
+    global $groups_template;
 
     // Site admins always have access
-    if ( $bp->loggedin_user->is_super_admin )
+    if ( bp_current_user_can( 'bp_moderate' ) )
         return false;
 

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

@@ -654 +654 @@
 
     // Make sure account deletion is not disabled
-    if ( !empty( $bp->site_options['bp-disable-account-deletion'] ) && !$bp->loggedin_user->is_super_admin )
+    if ( !empty( $bp->site_options['bp-disable-account-deletion'] ) && !bp_current_user_can( 'bp_moderate' ) )
         return false;
 
     // Site admins cannot be deleted
-    if ( is_super_admin( bp_core_get_username( $user_id ) ) )
+    if ( is_super_admin( $user_id ) )
         return false;
 

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

@@ -79 +79 @@
 
         // Hits the DB on single WP installs so get this separately
-        $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = bp_current_user_can( 'bp_moderate' );
+        $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = is_super_admin( bp_loggedin_user_id() );
 
         // The domain for the user currently logged in. eg: http://domain.com/members/andy