Changeset 11623

Timestamp:

03/02/2022 07:51:58 AM (3 years ago)

Author:

dd32

Message:

Support: User Blocking: When blocking a user, add where they've been blocked from, and context if possible.

Fixes #5764.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/support-forums/inc/class-hooks.php (modified) (3 diffs)
• themes/pub/wporg-login/admin/class-user-registrations-list-table.php (modified) (1 diff)
• themes/pub/wporg-login/admin/ui.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php

@@ -1336 +1336 @@
         $user_has_blocked_role = ! empty( $user->roles ) && in_array( $blocked_role, $user->roles, true );
 
+        // Define what has blocked the user.
+        if ( ! ms_is_switched() ) {
+            $where_from = preg_replace( '!^https?://!i', '', home_url( is_admin() ? '/wp-admin' : '' ) );
+        } else {
+            // When we're switched, we can't determine the source of the switch, so we use a bit of URL parsing magic.
+            $where_from = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+            if ( str_contains( $where_from, '?' ) ) {
+                list( $where_from, ) = explode( '?', $where_from );
+            }
+            // Trim actual filename off, just the major path component.
+            $where_from = preg_replace( '!/[^/?]+\.[a-z]{3}$!i', '', $where_from  );
+        }
+
         if (
             ( $blocked_role === $new_role || $user_has_blocked_role ) &&
@@ -1360 +1373 @@
             // Add a user note about this action.
             $note_text = sprintf(
-                'Forum role changed to %s.',
-                get_role( $new_role )->name
+                $where_from ? 'Forum role changed to %s via %s.' : 'Forum role changed to %s.',
+                get_role( $new_role )->name,
+                $where_from
             );
+
+            // Used in wporg-login to add context.
+            $note_text = apply_filters( 'wporg_bbp_forum_role_changed_note_text', $note_text, $user );
         } else if (
             $password_broken &&
@@ -1383 +1400 @@
             // Add a user note about this action.
             $note_text = sprintf(
-                'Forum role changed to %s.',
-                get_role( $new_role )->name
+                $where_from ? 'Forum role changed to %s via %s.' : 'Forum role changed to %s.',
+                get_role( $new_role )->name,
+                $where_from
             );
+
+            // Unused, here for consistency with above.
+            $note_text = apply_filters( 'wporg_bbp_forum_role_changed_note_text', $note_text, $user );
         }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php

@@ -312 +312 @@
         } else {
             $url = add_query_arg(
-                'user_id',
-                urlencode( $item->user->ID ),
+                'user',
+                urlencode( $item->user->user_login ),
                 admin_url( 'admin-post.php?action=login_block_account' )
             );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/ui.php

@@ -140 +140 @@
         if ( $block_words ) {
             $block_words = explode( "\n", $block_words );
-            $block_words = array_values( array_unique( array_filter( array_map( 'trim', $block_words ) ) ) );
+            $block_words = array_values( array_unique( array_filter( $block_words ) ) );
 
             // Sanity; Don't let it change more than 20%.
@@ -190 +190 @@
         '<tr>
             <th>reCaptcha v3 low-score threshold for Registration</th>
-            <td><input name="recaptcha_v3_threshold" type="number" min="0.0" max="1.0" step="0.1" name="" value="%s"></td>
+            <td>
+                <input name="recaptcha_v3_threshold" type="number" min="0.0" max="1.0" step="0.1" name="" value="%s">
+                <p><em>Any reCaptcha v3 score lower than this threshold is considered to have failed the reCaptcha and will be put into manual review.</em></p>
+            </td>
         </tr>',
         esc_attr( get_option( 'recaptcha_v3_threshold', 0.2 ) )
@@ -200 +203 @@
             <td>
                 <textarea name="registration_block_words" rows="10" cols="80">%s</textarea>
-                <p><em>Any registrations with any of these phrases within their username, email address, or profile fields will be put into manual review. One phrase per line.</em></p>
+                <p>
+                    <em>Any registrations with any of these phrases within their username, email address, or profile fields will be put into manual review.</em><br>
+                    <em>Multiple words allowed to form a phrase. Leading/trailing whitespace is not removed. One phrase per line.</em>
+                </p>
             </td>
         </tr>',
@@ -356 +362 @@
     }
 
-    if ( empty( $_REQUEST['user_id'] ) ) {
+    if ( empty( $_REQUEST['user'] ) ) {
         die();
     }
 
-    $user_id = (int) $_REQUEST['user_id'];
-
-    check_admin_referer( 'block_account_' . $user_id );
-
-    if ( $user_id && defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) ) {
+    $pending_user = wporg_get_pending_user( $_REQUEST['user'] );
+    if ( ! $pending_user || ! $pending_user['created'] ) {
+        die();
+    }
+
+    $user = get_user_by( 'slug', $pending_user['user_login'] );
+    if ( ! $user ) {
+        die();
+    }
+
+    $table = new User_Registrations_List_Table();
+
+    ob_start();
+    $pending_as_object       = (object) $pending_user;
+    $pending_as_object->meta = (object) $pending_as_object->meta;
+    $pending_as_object->user = $user;
+
+    unset( $pending_as_object->meta->registration_ip, $pending_as_object->meta->confirmed_ip );
+
+    $table->column_meta( $pending_as_object );
+    $meta_column = ob_get_clean();
+    $meta_column = wp_strip_all_tags( str_replace( '<br>', "\n", $meta_column ), false );
+
+    check_admin_referer( 'block_account_' . $user->ID );
+
+    if ( $user && defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) ) {
 
         // Switch first so that bbPress loads with the correct context.
@@ -379 +406 @@
         switch_to_blog( WPORG_SUPPORT_FORUMS_BLOGID );
 
+        add_filter( 'wporg_bbp_forum_role_changed_note_text', function( $text ) use ( $meta_column ) {
+            return trim( "{$meta_column}\n\n{$text}" );
+        } );
+
         // Set the user to blocked. Support forum hooks will take care of the rest.
-        bbp_set_user_role( $user_id, bbp_get_blocked_role() );
+        bbp_set_user_role( $user->ID, bbp_get_blocked_role() );
 
         restore_current_blog();