Changeset 9280

Timestamp:

12/24/2014 09:26:41 PM (10 years ago)

Author:

djpaul

Message:

Blogs: when un-spamming a user, restore blog records.

When marking a user as a spammer, all BuddyPress data is deleted including the user's recorded blog(s). When you ham the user, their profile won't show their blog(s) anymore. This change adds a function to the ham action to re-calculate the user's blogs.

Fixes #5857, props imath, DJPaul.

Location:

trunk

Files:

• src/bp-blogs/bp-blogs-functions.php (modified) (1 diff)
• tests/phpunit/testcases/blogs/functions.php (modified) (1 diff)

trunk/src/bp-blogs/bp-blogs-functions.php

@@ -1423 +1423 @@
 add_action( 'delete_user',       'bp_blogs_remove_data' );
 add_action( 'bp_make_spam_user', 'bp_blogs_remove_data' );
+
+/**
+ * Restore all blog associations for a given user
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @param int $user_id ID whose blog data should be restored.
+ */
+function bp_blogs_restore_data( $user_id = 0 ) {
+    if ( ! is_multisite() ) {
+        return;
+    }
+
+    // Get the user's blogs
+    $user_blogs = get_blogs_of_user( $user_id );
+    if ( empty( $user_blogs ) ) {
+        return;
+    }
+
+    $blogs = array_keys( $user_blogs );
+
+    foreach ( $blogs as $blog_id ) {
+        bp_blogs_add_user_to_blog( $user_id, false, $blog_id );
+    }
+}
+add_action( 'bp_make_ham_user', 'bp_blogs_restore_data', 10, 1 );

trunk/tests/phpunit/testcases/blogs/functions.php

@@ -278 +278 @@
         bp_blogs_add_blogmeta( 1, 'foo', 'bar' );
         $this->assertNotEmpty( bp_blogs_add_blogmeta( 1, 'foo', 'baz' ) );
+    }
+
+    /**
+     * @group bp_blogs_restore_data
+     */
+    public function test_bp_blogs_restore_data() {
+        if ( ! is_multisite() ) {
+            return;
+        }
+
+        // Create a regular member
+        $u = $this->factory->user->create();
+
+        // Create blogs
+        $b1 = $this->factory->blog->create( array( 'user_id' => $u ) );
+        $b2 = $this->factory->blog->create( array( 'user_id' => $u ) );
+
+        $expected = array(
+            $b1 => $b1,
+            $b2 => $b2
+        );
+
+        // Mark the user as spam
+        bp_core_process_spammer_status( $u, 'spam' );
+
+        // get all blogs for user
+        $blogs = bp_blogs_get_blogs_for_user( $u, true );
+        $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+
+        $this->assertNotEquals( $expected, array_map( 'intval', $blog_ids ), 'User marked as spam should not have any blog registered' );
+
+        // Ham the user
+        bp_core_process_spammer_status( $u, 'ham' );
+
+        // get all blogs for user
+        $blogs = bp_blogs_get_blogs_for_user( $u, true );
+        $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+
+        $this->assertEquals( $expected, array_map( 'intval', $blog_ids ) );
     }