Changeset 5829 for trunk/bp-members/bp-members-functions.php

Timestamp:

02/23/2012 06:18:39 AM (13 years ago)

Author:

johnjamesjacoby

Message:

First pass at adding user capabilities screen and action to settings component:

• Add capabilities template
• Unhook core spammer and deleted user actions and move to settings
• Route admin bar links appropriately to new locations
• Allow delete-account to be accessed by super admins in place of broken alerts
• Improve general settings feedback
• @todo - backpat post mortem
• See #4038

File:

• trunk/bp-members/bp-members-functions.php (modified) (8 diffs)

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

@@ -489 +489 @@
  * Processes a spammed or unspammed user
  *
- * This function is called in two ways:
- *  - in bp_core_action_set_spammer_status() (when spamming from the front-end)
- *  - by bp_core_mark_user_spam_admin() or bp_core_mark_user_ham_admin() (when spamming from the
- *    Dashboard)
- *
- * @since 1.6
+ * This function is called in three ways:
+ *  - in bp_settings_action_capabilities() (from the front-end)
+ *  - by bp_core_mark_user_spam_admin()    (from wp-admin)
+ *  - bp_core_mark_user_ham_admin()        (from wp-admin)
+ *
+ * @since BuddyPress (1.6)
  *
  * @param int $user_id The user being spammed/hammed
@@ -519 +519 @@
     }
 
-    $is_spam = 'spam' == $status;
+    $is_spam = ( 'spam' == $status );
 
     // Only you can prevent infinite loops
     remove_action( 'make_spam_user', 'bp_core_mark_user_spam_admin' );
-    remove_action( 'make_ham_user', 'bp_core_mark_user_ham_admin' );
+    remove_action( 'make_ham_user',  'bp_core_mark_user_ham_admin'  );
 
     // When marking as spam in the Dashboard, these actions are handled by WordPress
     if ( !is_admin() ) {
+
         // Get the blogs for the user
         $blogs = get_blogs_of_user( $user_id, true );
@@ -551 +552 @@
         // Call multisite actions in single site mode for good measure
         if ( !is_multisite() ) {
-            $wp_action = $is_spam ? 'make_spam_user' : 'make_ham_user';
+            $wp_action = ( true === $is_spam ) ? 'make_spam_user' : 'make_ham_user';
             do_action( $wp_action, bp_displayed_user_id() );
         }
@@ -557 +558 @@
 
     // Hide this user's activity
-    if ( $is_spam && bp_is_active( 'activity' ) ) {
+    if ( ( true === $is_spam ) && bp_is_active( 'activity' ) ) {
         bp_activity_hide_user_activity( $user_id );
     }
 
     // We need a special hook for is_spam so that components can delete data at spam time
-    $bp_action = $is_spam ? 'bp_make_spam_user' : 'bp_make_ham_user';
+    $bp_action = ( true === $is_spam ) ? 'bp_make_spam_user' : 'bp_make_ham_user';
     do_action( $bp_action, $user_id );
 
@@ -574 +575 @@
  * Hook to WP's make_spam_user and run our custom BP spam functions
  *
- * @since 1.6
+ * @since BuddyPress (1.6)
  * 
  * @param int $user_id The user id passed from the make_spam_user hook
@@ -586 +587 @@
  * Hook to WP's make_ham_user and run our custom BP spam functions
  *
- * @since 1.6
+ * @since BuddyPress (1.6)
  * 
  * @param int $user_id The user id passed from the make_ham_user hook
@@ -751 +752 @@
  *
  * @package BuddyPress Core
- * @global object $bp Global BuddyPress settings object
- * @uses bp_current_user_can() Checks to see if the user is a site administrator.
  * @uses wpmu_delete_user() Deletes a user from the system on multisite installs.
  * @uses wp_delete_user() Deletes a user from the system on singlesite installs.
  */
 function bp_core_delete_account( $user_id = 0 ) {
-    global $bp, $wp_version;
-
-    if ( !$user_id )
+
+    if ( empty( $user_id ) )
         $user_id = bp_loggedin_user_id();
 
     // Make sure account deletion is not disabled
-    if ( !empty( $bp->site_options['bp-disable-account-deletion'] ) && !bp_current_user_can( 'bp_moderate' ) )
+    if ( bp_disable_account_deletion() )
         return false;
 
@@ -772 +770 @@
     // Specifically handle multi-site environment
     if ( is_multisite() ) {
-        if ( $wp_version >= '3.0' )
-            require( ABSPATH . '/wp-admin/includes/ms.php' );
-        else
-            require( ABSPATH . '/wp-admin/includes/mu.php' );
-
+        require( ABSPATH . '/wp-admin/includes/ms.php'   );
         require( ABSPATH . '/wp-admin/includes/user.php' );