Changeset 3504 for branches/plugin/bbp-includes/bbp-user-template.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-user-template.php (modified) (6 diffs)

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