Changeset 2405

Timestamp:

01/22/2010 01:03:10 PM (15 years ago)

Author:

apeatling

Message:

Hide a user's activity when they are marked as a spammer.

Location:

trunk

Files:

• bp-activity.php (modified) (3 diffs)
• bp-activity/bp-activity-classes.php (modified) (1 diff)
• bp-blogs.php (modified) (1 diff)
• bp-core.php (modified) (2 diffs)
• bp-core/bp-core-avatars.php (modified) (1 diff)
• bp-themes/bp-default/members/single/messages/messages-loop.php (modified) (1 diff)

trunk/bp-activity.php

@@ -734 +734 @@
 }
 
+function bp_activity_hide_user_activity( $user_id ) {
+    return BP_Activity_Activity::hide_all_for_user( $user_id );
+}
+
 /**
- * bp_activity_thumnail_content_images()
+ * bp_activity_thumbnail_content_images()
  *
  * Take content, remove all images and replace them with one thumbnail image.
@@ -743 +747 @@
  * @return $content str - The content with images stripped and replaced with a single thumb.
  */
-function bp_activity_thumnail_content_images( $content ) {
+function bp_activity_thumbnail_content_images( $content ) {
     preg_match_all( '/<img[^>]*>/Ui', $content, $matches );
     $content = preg_replace('/<img[^>]*>/Ui', '', $content );
@@ -773 +777 @@
     }
 
-    return apply_filters( 'bp_activity_thumnail_content_images', $content, $matches );
+    return apply_filters( 'bp_activity_thumbnail_content_images', $content, $matches );
 }
 

trunk/bp-activity/bp-activity-classes.php

@@ -540 +540 @@
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE content = %s", $content ) );
     }
+
+    function hide_all_for_user( $user_id ) {
+        global $wpdb, $bp;
+
+        return $wpdb->get_var( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET hide_sitewide = 1 WHERE user_id = %d", $user_id ) );
+    }
 }
 

trunk/bp-blogs.php

@@ -261 +261 @@
 
     /* Remove large images and replace them with just one image thumbnail */
-    if ( function_exists( 'bp_activity_thumnail_content_images' ) && !empty( $content ) )
-        $content = bp_activity_thumnail_content_images( $content );
+    if ( function_exists( 'bp_activity_thumbnail_content_images' ) && !empty( $content ) )
+        $content = bp_activity_thumbnail_content_images( $content );
 
     if ( !empty( $action ) )

trunk/bp-core.php

@@ -468 +468 @@
             bp_core_add_message( __( 'User removed as spammer.', 'buddypress' ) );
 
-        do_action( 'bp_core_action_set_spammer_status' );
+        /* Hide this user's activity */
+        if ( $is_spam && function_exists( 'bp_activity_hide_user_activity' ) )
+            bp_activity_hide_user_activity( $bp->displayed_user->id );
+
+        do_action( 'bp_core_action_set_spammer_status', $bp->displayed_user->id, $is_spam );
 
         bp_core_redirect( wp_get_referer() );
@@ -1812 +1816 @@
  *
  * @package BuddyPress Core
- * @param $username The username of the user
- * @uses delete_usermeta() deletes a row from the wp_usermeta table based on meta_key
+ * @param $auth_obj The WP authorization object
+ * @param $username The username of the user logging in.
+ * @uses get_userdatabylogin() Get the userdata object for a user based on their username
+ * @uses bp_core_redirect() Safe redirect to a page
+ * @return $auth_obj If the user is not a spammer, return the authorization object
  */
 function bp_core_boot_spammer( $auth_obj, $username ) {

trunk/bp-core/bp-core-avatars.php

@@ -386 +386 @@
         return WP_CONTENT_URL;
 
-    return apply_filters( 'bp_core_avatar_upload_path', get_blog_option( BP_ROOT_BLOG, 'siteurl' ) );
+    return apply_filters( 'bp_core_avatar_url', get_blog_option( BP_ROOT_BLOG, 'siteurl' ) );
 }
 

trunk/bp-themes/bp-default/members/single/messages/messages-loop.php

@@ -3 +3 @@
 <?php if ( bp_has_message_threads() ) : ?>
 
-    <div class="pagination" id="user-pag">
+    <div class="pagination no-ajax" id="user-pag">
 
         <div class="pag-count" id="messages-dir-count">