<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[11623] sites/trunk/wordpress.org/public_html/wp-content: Support: User Blocking: When blocking a user, add where they've been blocked from, and context if possible.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/11623">11623</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/11623","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-03-02 07:51:58 +0000 (Wed, 02 Mar 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Support: User Blocking: When blocking a user, add where they've been blocked from, and context if possible.
Fixes <a href="http://meta.trac.wordpress.org/ticket/5764">#5764</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasshooksphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginadminclassuserregistrationslisttablephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginadminuiphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/ui.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasshooksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php 2022-03-02 06:40:41 UTC (rev 11622)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php 2022-03-02 07:51:58 UTC (rev 11623)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1335,6 +1335,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // WP_User::has_role() does not exist, and WP_User::has_cap( 'bbp_blocked' ) will be truthful for super admins.
</span><span class="cx" style="display: block; padding: 0 10px"> $user_has_blocked_role = ! empty( $user->roles ) && in_array( $blocked_role, $user->roles, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> ( $blocked_role === $new_role || $user_has_blocked_role ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! $password_broken
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1359,9 +1372,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a user note about this action.
</span><span class="cx" style="display: block; padding: 0 10px"> $note_text = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Forum role changed to %s.',
- get_role( $new_role )->name
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where_from ? 'Forum role changed to %s via %s.' : 'Forum role changed to %s.',
+ get_role( $new_role )->name,
+ $where_from
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Used in wporg-login to add context.
+ $note_text = apply_filters( 'wporg_bbp_forum_role_changed_note_text', $note_text, $user );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if (
</span><span class="cx" style="display: block; padding: 0 10px"> $password_broken &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! $user_has_blocked_role
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1382,9 +1399,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a user note about this action.
</span><span class="cx" style="display: block; padding: 0 10px"> $note_text = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Forum role changed to %s.',
- get_role( $new_role )->name
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where_from ? 'Forum role changed to %s via %s.' : 'Forum role changed to %s.',
+ get_role( $new_role )->name,
+ $where_from
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Unused, here for consistency with above.
+ $note_text = apply_filters( 'wporg_bbp_forum_role_changed_note_text', $note_text, $user );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $note_text ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginadminclassuserregistrationslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php 2022-03-02 06:40:41 UTC (rev 11622)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php 2022-03-02 07:51:58 UTC (rev 11623)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,8 +311,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_id',
- urlencode( $item->user->ID ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user',
+ urlencode( $item->user->user_login ),
</ins><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'admin-post.php?action=login_block_account' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_nonce_url( $url, 'block_account_' . $item->user->ID );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginadminuiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/ui.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/ui.php 2022-03-02 06:40:41 UTC (rev 11622)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/ui.php 2022-03-02 07:51:58 UTC (rev 11623)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $block_words = wp_unslash( $_POST['registration_block_words'] ?? '' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $block_words ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $block_words = explode( "\n", $block_words );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_words = array_values( array_unique( array_filter( array_map( 'trim', $block_words ) ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_words = array_values( array_unique( array_filter( $block_words ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanity; Don't let it change more than 20%.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $block_words ) < count( get_option( 'registration_block_words' ) ) * 0.8 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>reCaptcha v3 low-score threshold for Registration</th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><input name="recaptcha_v3_threshold" type="number" min="0.0" max="1.0" step="0.1" name="" value="%s"></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_option( 'recaptcha_v3_threshold', 0.2 ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +202,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th>Block words for registration</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="registration_block_words" rows="10" cols="80">%s</textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_textarea( implode( "\n", get_option( 'registration_block_words', [] ) ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,16 +361,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $_REQUEST['user_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_REQUEST['user'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = (int) $_REQUEST['user_id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pending_user = wporg_get_pending_user( $_REQUEST['user'] );
+ if ( ! $pending_user || ! $pending_user['created'] ) {
+ die();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- check_admin_referer( 'block_account_' . $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = get_user_by( 'slug', $pending_user['user_login'] );
+ if ( ! $user ) {
+ die();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user_id && defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $table = new User_Registrations_List_Table();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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' ) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Switch first so that bbPress loads with the correct context.
</span><span class="cx" style="display: block; padding: 0 10px"> // This also ensures that the bbp_participant code doesn't kick in.
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( WPORG_SUPPORT_FORUMS_BLOGID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,8 +405,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( WPORG_SUPPORT_FORUMS_BLOGID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wporg_bbp_forum_role_changed_note_text', function( $text ) use ( $meta_column ) {
+ return trim( "{$meta_column}\n\n{$text}" );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set the user to blocked. Support forum hooks will take care of the rest.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_set_user_role( $user_id, bbp_get_blocked_role() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_set_user_role( $user->ID, bbp_get_blocked_role() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>