Changeset 5305

Timestamp:

11/08/2011 02:15:22 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Port user active/status functions from bbPress 2. Deprecate old _core_ functions into 1.6.php as wrappers. See #3739.

Location:

trunk

Files:

• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-activity/bp-activity-template.php (modified) (1 diff)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-core/deprecated/1.6.php (modified) (1 diff)
• bp-forums/bp-forums-functions.php (modified) (3 diffs)
• bp-members/bp-members-functions.php (modified) (4 diffs)

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

@@ -871 +871 @@
                 return false;
 
-        if ( bp_core_is_user_spammer( $user_id ) || bp_core_is_user_deleted( $user_id ) )
+        if ( bp_is_user_inactive( $user_id ) )
                 return false;
 

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

@@ -2046 +2046 @@
                         $user_id = bp_displayed_user_id();
 
-                if ( bp_core_is_user_spammer( $user_id ) || bp_core_is_user_deleted( $user_id ) )
+                if ( bp_is_user_inactive( $user_id ) )
                         return false;
 

trunk/bp-core/bp-core-catchuri.php

@@ -255 +255 @@
                                 // If the displayed user is marked as a spammer, 404 (unless logged-
                                 // in user is a super admin)
-                                if ( bp_displayed_user_id() && bp_core_is_user_spammer( bp_displayed_user_id() ) ) {
+                                if ( bp_displayed_user_id() && bp_is_user_spammer( bp_displayed_user_id() ) ) {
                                         if ( is_super_admin() ) {
                                                 bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'error' );

trunk/bp-core/bp-core-functions.php

@@ -704 +704 @@
         $user_id = bp_loggedin_user_id();
 
-        if ( bp_core_is_user_spammer( $user_id ) || bp_core_is_user_deleted( $user_id ) )
+        if ( bp_is_user_inactive( $user_id ) )
                 return false;
 

trunk/bp-core/deprecated/1.6.php

@@ -39 +39 @@
 }
 
+function bp_core_is_user_deleted( $user_id = 0 ) {
+        _deprecated_function( __FUNCTION__, '1.6' );
+        bp_is_user_deleted( $user_id );
+}
+
+function bp_core_is_user_spammer( $user_id = 0 ) {
+        _deprecated_function( __FUNCTION__, '1.6' );
+        bp_is_user_spammer( $user_id );
+}
 ?>

trunk/bp-forums/bp-forums-functions.php

@@ -169 +169 @@
                 return false;
 
-        if ( bp_core_is_user_spammer( $topic_poster ) || bp_core_is_user_deleted( $topic_poster ) )
+        if ( bp_is_user_inactive( $topic_poster ) )
                 return false;
 
@@ -203 +203 @@
 
         // Check if the user is a spammer 
-        if ( bp_core_is_user_spammer( bp_loggedin_user_id() ) || bp_core_is_user_deleted( bp_loggedin_user_id() ) ) 
+        if ( bp_is_user_inactive( bp_loggedin_user_id() ) ) 
                 return false;
 
@@ -515 +515 @@
                 return false;
 
-        if ( bp_core_is_user_spammer( bp_loggedin_user_id() ) || bp_core_is_user_deleted( bp_loggedin_user_id() ) )
+        if ( bp_is_user_inactive( bp_loggedin_user_id() ) )
                 return false;
 

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

@@ -494 +494 @@
  * @return bool True if spammer, False if not.
  */
-function bp_core_is_user_spammer( $user_id = 0 ) {
+function bp_is_user_spammer( $user_id = 0 ) {
         global $wpdb;
 
@@ -522 +522 @@
         }
 
-        return apply_filters( 'bp_core_is_user_spammer', (bool) $is_spammer );
+        return apply_filters( 'bp_is_user_spammer', (bool) $is_spammer );
 }
 
@@ -532 +532 @@
  * @return bool True if deleted, False if not.
  */
-function bp_core_is_user_deleted( $user_id = 0 ) {
+function bp_is_user_deleted( $user_id = 0 ) {
         global $wpdb;
 
@@ -561 +561 @@
         }
 
-        return apply_filters( 'bp_core_is_user_deleted', (bool) $is_deleted );
+        return apply_filters( 'bp_is_user_deleted', (bool) $is_deleted );
+}
+
+/**
+ * Checks if user is active
+ * 
+ * @since BuddyPress (1.6)
+ * 
+ * @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 bp_is_user_active( $user_id = 0 ) {
+
+        // Default to current user
+        if ( empty( $user_id ) && is_user_logged_in() )
+                $user_id = bp_loggedin_user_id();
+
+        // No user to check
+        if ( empty( $user_id ) )
+                return false;
+
+        // Check spam
+        if ( bp_is_user_spammer( $user_id ) )
+                return false;
+
+        // Check deleted
+        if ( bp_is_user_deleted( $user_id ) )
+                return false;
+
+        // Assume true if not spam or deleted
+        return true;
+}
+
+/**
+ * Checks if user is not active.
+ * 
+ * @since BuddyPress (1.6)
+ * 
+ * @uses is_user_logged_in() To check if user is logged in
+ * @uses bp_get_displayed_user_id() To get current user ID
+ * @uses bp_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 bp_is_user_inactive( $user_id = 0 ) {
+
+        // Default to current user
+        if ( empty( $user_id ) && is_user_logged_in() )
+                $user_id = bp_loggedin_user_id();
+
+        // No user to check
+        if ( empty( $user_id ) )
+                return false;
+
+        // Return the inverse of active
+        return !bp_is_user_active( $user_id );
 }