<!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>[11262] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin: Login: Update the registration moderation table to be more efficient.</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/11262">11262</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/11262","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>2021-10-01 08:58:26 +0000 (Fri, 01 Oct 2021)</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'>Login: Update the registration moderation table to be more efficient.</pre>
<h3>Modified Paths</h3>
<ul>
<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_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 2021-09-29 21:45:20 UTC (rev 11261)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php 2021-10-01 08:58:26 UTC (rev 11262)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,6 +29,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><span class="cx" style="display: block; padding: 0 10px"> 'heuristics-block',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Heuristics: Block',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ],
+ [
+ 'banned-users',
+ 'Recent Banned Users',
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,6 +95,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return "meta LIKE '%heuristics\":\"block%'";
</span><span class="cx" style="display: block; padding: 0 10px"> case 'registered':
</span><span class="cx" style="display: block; padding: 0 10px"> return 'created = 1';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'banned-users':
+ return 'created = 1 AND users.user_pass LIKE "BLOCKED%"';
</ins><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> case 'all':
</span><span class="cx" style="display: block; padding: 0 10px"> return '1=1';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,14 +121,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )",
</span><span class="cx" style="display: block; padding: 0 10px"> $search_like, $search_like, $search_like, $search_like
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $join = "
- LEFT JOIN {$wpdb->users} users ON registrations.created = 1 AND registrations.user_login = users.user_login
- LEFT JOIN {$wpdb->usermeta} description ON users.ID = description.user_id AND description.meta_key = 'description'
- ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Join if the view needs the users or description table.
+ if ( strpos( $where, 'description.' ) ) {
+ $join .= "LEFT JOIN {$wpdb->usermeta} description ON users.ID = description.user_id AND description.meta_key = 'description'";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strpos( $where . $join, 'users.' ) ) {
+ $join .= "LEFT JOIN {$wpdb->users} users ON registrations.created = 1 AND registrations.user_login = users.user_login";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $join . $where;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $join . ' ' . $where;
</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"> function get_columns() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +178,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $per_page_offset = ($current_page-1) * $per_page;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->items = $wpdb->get_results(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sql = "SELECT SQL_CALC_FOUND_ROWS registrations.*
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT SQL_CALC_FOUND_ROWS registrations.*
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM {$wpdb->base_prefix}user_pending_registrations registrations
</span><span class="cx" style="display: block; padding: 0 10px"> $join_where
</span><span class="cx" style="display: block; padding: 0 10px"> ORDER BY {$sort_column} {$sort_order}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,8 +185,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> LIMIT {$per_page_offset}, {$per_page}"
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $total_items = $wpdb->get_var( 'SELECT FOUND_ROWS()' );
+
+ foreach ( $this->items as $i => $item ) {
+ $this->items[$i]->user = $item->created ? get_user_by( 'slug', $item->user_login ) : false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_pagination_args([
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'total_items' => $wpdb->get_var( 'SELECT FOUND_ROWS()' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'total_items' => $total_items,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => $per_page,
</span><span class="cx" style="display: block; padding: 0 10px"> ]);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,10 +224,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<a href='$url'>" . esc_html( $item->user_login ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $user = get_user_by( 'login', $item->user_login ) ) &&
- 'BLOCKED' === substr( $user->user_pass, 0, 7 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item->user &&
+ 'BLOCKED' === substr( $item->user->user_pass, 0, 7 )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' <span class="delete-red">(blocked)</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ' <span class="delete-red">(banned)</span>';
</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"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,17 +272,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $row_actions['delete'] = '<a href="' . esc_url( $url ) . '">Delete</a>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Account created, find the user.
- $user = get_user_by( 'login', $item->user_login );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- urlencode( $user->ID ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ urlencode( $item->user->ID ),
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = wp_nonce_url( $url, 'block_account_' . $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = wp_nonce_url( $url, 'block_account_' . $item->user->ID );
</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 && 'BLOCKED' !== substr( $user->user_pass, 0, 7 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $item->user && 'BLOCKED' !== substr( $item->user->user_pass, 0, 7 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $row_actions['block-account'] = '<a href="' . esc_url( $url ) . '">Block Account</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,6 +294,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function column_meta( $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = json_decode( $item->meta );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<div>';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo implode( ', ',
</span><span class="cx" style="display: block; padding: 0 10px"> array_map(
</span><span class="cx" style="display: block; padding: 0 10px"> [ $this, 'link_to_search' ],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +307,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<hr>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( [ 'url', 'from', 'occ', 'interests' ] as $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $meta->$field ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf( "%s: %s<br>", esc_html( $field ), $this->link_to_search( $meta->$field ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,13 +314,14 @@
</span><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"> // Add other meta after an account is created
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user = get_user_by( 'login', $item->user_login ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $item->user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Forum profile description (this is where the spam usually is)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $desc = get_user_meta( $user->ID, 'description', true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $desc = get_user_meta( $item->user->ID, 'description', true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( "forum bio: %s<br>", $this->link_to_search( $desc ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '</div>';
</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"> function column_scores( $item ) {
</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 2021-09-29 21:45:20 UTC (rev 11261)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/ui.php 2021-10-01 08:58:26 UTC (rev 11262)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,15 +57,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <style>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- table.wp-list-table td > a {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ table.wp-list-table td > a,
+ table.wp-list-table td.column-meta > div > a {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: inherit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- table.wp-list-table td > a:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ table.wp-list-table td > a:hover,
+ table.wp-list-table td.column-meta > div > a:hover {
</ins><span class="cx" style="display: block; padding: 0 10px"> text-decoration: underline;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> table.wp-list-table .delete-red {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #b32d2e;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ td.column-meta > div {
+ max-height: 200px;
+ overflow: scroll;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> </style>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>