Changeset 3504

Timestamp:

09/10/2011 07:30:45 PM (13 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.

Location:

branches/plugin/bbp-includes

Files:

• bbp-core-caps.php (modified) (8 diffs)
• bbp-user-functions.php (modified) (1 diff)
• bbp-user-template.php (modified) (6 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;
 

branches/plugin/bbp-includes/bbp-user-functions.php

@@ -1186 +1186 @@
 }
 
+/**
+ * Checks if user is active
+ * 
+ * @since bbPress (r3502)
+ * 
+ * @uses is_user_logged_in() To check if user is logged in
+ * @uses bbp_get_displayed_user_id() To get current user ID
+ * @uses bbp_is_user_spammer() To check if user is spammer
+ * @uses bbp_is_user_deleted() To check if user is deleted
+ *
+ * @param int $user_id The user ID to check
+ * @return bool True if public, false if not
+ */
+function bbp_is_user_active( $user_id = 0 ) {
+
+    // Default to current user
+    if ( empty( $user_id ) && is_user_logged_in() )
+        $user_id = bbp_get_current_user_id();
+
+    // No user to check
+    if ( empty( $user_id ) )
+        return false;
+
+    // Check spam
+    if ( bbp_is_user_spammer( $user_id ) )
+        return false;
+
+    // Check deleted
+    if ( bbp_is_user_deleted( $user_id ) )
+        return false;
+
+    // Assume true if not spam or deleted
+    return true;
+}
+
+/**
+ * Checks if user is not active.
+ * 
+ * @since bbPress (r3502)
+ * 
+ * @uses is_user_logged_in() To check if user is logged in
+ * @uses bbp_get_displayed_user_id() To get current user ID
+ * @uses bbp_is_user_active() To check if user is active
+ *
+ * @param int $user_id The user ID to check
+ * @return bool True if inactive, false if active
+ */
+function bbp_is_user_inactive( $user_id = 0 ) {
+
+    // Default to current user
+    if ( empty( $user_id ) && is_user_logged_in() )
+        $user_id = bbp_get_current_user_id();
+
+    // No user to check
+    if ( empty( $user_id ) )
+        return false;
+
+    // Return the inverse of active
+    return !bbp_is_user_active( $user_id );
+}
+
 ?>

branches/plugin/bbp-includes/bbp-user-template.php

@@ -1155 +1155 @@
  * @uses is_user_logged_in()
  * @uses bbp_allow_anonymous()
+ * @uses bbp_is_user_active()
  * @uses current_user_can()
  * @uses apply_filters()
@@ -1174 +1175 @@
 
     // User is logged in
-    elseif ( !bbp_is_user_spammer() && !bbp_is_user_deleted() && current_user_can( 'publish_topics' ) )
+    elseif ( bbp_is_user_active() && current_user_can( 'publish_topics' ) )
         $retval = true;
 
@@ -1189 +1190 @@
  * @uses is_user_logged_in()
  * @uses bbp_allow_anonymous()
+ * @uses bbp_is_user_active()
  * @uses current_user_can()
  * @uses apply_filters()
@@ -1208 +1210 @@
 
     // User is logged in
-    elseif ( !bbp_is_user_spammer() && !bbp_is_user_deleted() && current_user_can( 'publish_replies' ) )
+    elseif ( bbp_is_user_active() && current_user_can( 'publish_replies' ) )
         $retval = true;
 
@@ -1288 +1290 @@
 
     // Looking at a single forum & forum is open
-    if ( ( bbp_is_single_forum() || is_page() || is_single() ) && bbp_is_forum_open() ) {
+    if ( ( bbp_is_single_forum() || is_page() || is_single() ) && bbp_is_forum_open() )
         $retval = bbp_current_user_can_publish_topics();
 
     // User can edit this topic
-    } elseif ( bbp_is_topic_edit() ) {
+    elseif ( bbp_is_topic_edit() )
         $retval = current_user_can( 'edit_topic', bbp_get_topic_id() );
-    }
 
     // Allow access to be filtered
@@ -1323 +1324 @@
 
     // Looking at a single topic, topic is open, and forum is open
-    if ( ( bbp_is_single_topic() || is_page() || is_single() ) && bbp_is_topic_open() && bbp_is_forum_open() ) {
+    if ( ( bbp_is_single_topic() || is_page() || is_single() ) && bbp_is_topic_open() && bbp_is_forum_open() )
         $retval = bbp_current_user_can_publish_replies();
 
     // User can edit this topic
-    } elseif ( bbp_is_reply_edit() ) {
+    elseif ( bbp_is_reply_edit() )
         $retval = current_user_can( 'edit_reply', bbp_get_reply_id() );
-    }
 
     // Allow access to be filtered