Changeset 4363

Timestamp:

11/08/2012 10:24:15 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Introduce bbp_user_has_profile() function in /users/capabilities.php.
• Use this function to suppress links to a profile of a user with no role on the site.
• Replaces some logic in bbp_parse_query() for setting user profile query variables.
• See #1939.

Location:

trunk/includes

Files:

• core/template-functions.php (modified) (2 diffs)
• replies/template-tags.php (modified) (1 diff)
• topics/template-tags.php (modified) (1 diff)
• users/capabilities.php (modified) (2 diffs)
• users/template-tags.php (modified) (1 diff)

trunk/includes/core/template-functions.php

@@ -317 +317 @@
         }
 
-        // Create new user
-        $user = get_userdata( $bbp_user );
-
-        // 404 and bail if no user found, is inactive, or not a member
-        if ( empty( $user ) || ! is_user_member_of_blog( $user->ID ) || ( ! is_super_admin() && bbp_is_user_inactive( $user->ID ) ) ) {
+        // Cast as int, just in case
+        $bbp_user = (int) $bbp_user;
+
+        // 404 and bail if user does not have a profile
+        if ( ! bbp_user_has_profile( $bbp_user ) ) {
             $posts_query->set_404();
             return;
@@ -386 +386 @@
         // Correct is_home variable
         $posts_query->is_home = false;
+
+        // Get the user data
+        $user = get_userdata( $bbp_user );
 
         // User is looking at their own profile

trunk/includes/replies/template-tags.php

@@ -1040 +1040 @@
 
             // Add links if not anonymous
-            if ( empty( $anonymous ) ) {
+            if ( empty( $anonymous ) && bbp_user_has_profile( bbp_get_reply_author_id( $reply_id ) ) ) {
                 foreach ( $author_links as $link => $link_text ) {
                     $link_class = ' class="bbp-author-' . $link . '"';

trunk/includes/topics/template-tags.php

@@ -1360 +1360 @@
 
             // Add links if not anonymous
-            if ( empty( $anonymous ) ) {
+            if ( empty( $anonymous ) && bbp_user_has_profile( bbp_get_topic_author_id( $topic_id ) ) ) {
 
                 // Assemble the links

trunk/includes/users/capabilities.php

@@ -161 +161 @@
  * @since bbPress (r3380)
  *
- * @uses bbp_allow_global_access()
- * @uses bbp_is_user_inactive()
- * @uses is_user_logged_in()
- * @uses is_user_member_of_blog()
+ * @uses is_user_logged_in() To bail if user is not logged in
+ * @uses bbp_get_user_role() To bail if user already has a role
+ * @uses bbp_is_user_inactive() To bail if user is inactive
+ * @uses bbp_allow_global_access() To know whether to save role to database
+ * @uses bbp_get_user_role_map() To get the WP to BBP role map array
+ * @uses bbp_get_default_role() To get the site's default forums role
  * @uses get_option()
  *
@@ -573 +575 @@
     return !bbp_is_user_active( $user_id );
 }
+
+/**
+ * Does a user have a profile for the current site
+ *
+ * @since bbPress (r4362)
+ *
+ * @param int $user_id User ID to check
+ * @param int $blog_id Blog ID to check
+ *
+ * @uses bbp_get_user_id() To verify the user ID
+ * @uses get_userdata() To get the user's data
+ * @uses is_super_admin() To determine if user can see inactive users
+ * @uses bbp_is_user_inactive() To check if user is spammer or deleted
+ * @uses apply_filters() To allow override of this functions result
+ *
+ * @return boolean Whether or not the user has a profile on this blog_id
+ */
+function bbp_user_has_profile( $user_id = 0 ) {
+
+    // Validate user ID, default to displayed or current user
+    $user_id = bbp_get_user_id( $user_id, true, true );
+
+    // Try to get this user's data
+    $user    = get_userdata( $user_id );
+
+    // No user found, return false
+    if ( empty( $user ) ) {
+        $retval = false;
+
+    // User found
+    } else {
+
+        // User is inactive, and current user is not a super admin
+        if ( ! is_super_admin() && bbp_is_user_inactive( $user->ID ) ) {
+            $retval = false;
+
+        // Check for site caps
+        } else {
+            $retval  = (bool) bbp_get_user_role( $user_id );
+        }
+    }
+
+    // Filter and return
+    return (bool) apply_filters( 'bbp_show_user_profile', $retval, $user_id );
+}

trunk/includes/users/template-tags.php

@@ -1392 +1392 @@
 
             // Add links if not anonymous
-            if ( empty( $anonymous ) ) {
+            if ( empty( $anonymous ) && bbp_user_has_profile( $user_id ) ) {
                 foreach ( $author_links as $link_text ) {
                     $author_link[] = sprintf( '<a href="%1$s"%2$s>%3$s</a>', $author_url, $link_title, $link_text );