Changeset 3504 for branches/plugin/bbp-includes/bbp-core-caps.php

Timestamp:

09/10/2011 07:30:45 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Introduce bbp_is_user_active() and bbp_is_user_inactive() to help with spammed and deleted user checks. See #1630 and r3503.

File:

• branches/plugin/bbp-includes/bbp-core-caps.php (modified) (8 diffs)

branches/plugin/bbp-includes/bbp-core-caps.php

@@ -181 +181 @@
 
             // Add do_not_allow cap if user is spam or deleted
-            if ( bbp_is_user_spammer( $user_id ) || bbp_is_user_deleted( $user_id ) )
+            if ( bbp_is_user_inactive( $user_id ) )
                 $caps = array( 'do_not_allow' );
 
@@ -195 +195 @@
 
                 // Add 'do_not_allow' cap if user is spam or deleted
-                if ( bbp_is_user_spammer( $user_id ) || bbp_is_user_deleted( $user_id ) )
+                if ( bbp_is_user_inactive( $user_id ) )
                     $caps[] = 'do_not_allow';
 
@@ -217 +217 @@
 
                 // Add 'do_not_allow' cap if user is spam or deleted
-                if ( bbp_is_user_spammer( $user_id ) || bbp_is_user_deleted( $user_id ) )
+                if ( bbp_is_user_inactive( $user_id ) )
                     $caps[] = 'do_not_allow';
 
@@ -239 +239 @@
 
                 // Add 'do_not_allow' cap if user is spam or deleted
-                if ( bbp_is_user_spammer( $user_id ) || bbp_is_user_deleted( $user_id ) )
+                if ( bbp_is_user_inactive( $user_id ) )
                     $caps[] = 'do_not_allow';
 
@@ -479 +479 @@
  * @uses is_multisite()
  * @uses bbp_allow_global_access()
- * @uses bbp_is_user_deleted()
- * @uses bbp_is_user_spammer()
+ * @uses bbp_is_user_inactive()
  * @uses is_user_logged_in()
  * @uses current_user_can()
@@ -493 +492 @@
         return;
 
-    // Bail if user is marked as spam or is deleted
-    if ( bbp_is_user_deleted() || bbp_is_user_spammer() )
+    // Bail if user is not active
+    if ( bbp_is_user_inactive() )
         return;
 
@@ -562 +561 @@
  * @uses is_multisite()
  * @uses bbp_allow_global_access()
- * @uses bbp_is_user_deleted()
- * @uses bbp_is_user_spammer()
+ * @uses bbp_is_user_inactive()
  * @uses is_user_logged_in()
  * @uses current_user_can()
@@ -579 +577 @@
 
     // Bail if user is marked as spam or is deleted
-    if ( bbp_is_user_deleted() || bbp_is_user_spammer() )
+    if ( bbp_is_user_inactive() )
         return;