<!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>[10901] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login: Login: Store Akismet result for each signup, and expose it within the Admin UI.</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/10901">10901</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/10901","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-04-14 04:49:37 +0000 (Wed, 14 Apr 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: Store Akismet result for each signup, and expose it within the Admin UI.</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_htmlwpcontentthemespubwporgloginfunctionsregistrationphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginpendingcreatephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginregisterphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register.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-04-14 04:13:37 UTC (rev 10900)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php 2021-04-14 04:49:37 UTC (rev 10901)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,6 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'User Email',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_ip' => 'IP',
</span><span class="cx" style="display: block; padding: 0 10px"> 'scores' => 'reCaptcha',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'akismet' => 'Akismet',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => 'Registered Date',
</span><span class="cx" style="display: block; padding: 0 10px"> 'created_date' => 'Created Date',
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,6 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => array( 'user_login', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => array( 'user_email', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'scores' => array( 'scores', true ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'akismet' => array( 'akismet', true ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => array( 'user_registered', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'created_date' => array( 'created_date', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,4 +169,10 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function column_akismet( $item ) {
+ $meta = json_decode( $item->meta, true );
+
+ echo $meta['akismet_result'] ?? '';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsregistrationphp"></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/functions-registration.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/functions-registration.php 2021-04-14 04:13:37 UTC (rev 10900)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php 2021-04-14 04:49:37 UTC (rev 10901)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,18 +62,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $akismet = Akismet::rest_auto_check_comment( $payload );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $akismet ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return 'OK'; // Assume it's okay in the event of failure / unknown.
- // return $akismet->get_error_code();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $akismet->get_error_code();
</ins><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( $akismet['akismet_pro_tip'] ) ) {
- return $akismet['akismet_pro_tip'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $akismet['akismet_pro_tip'] ) && 'discard' === $akismet['akismet_pro_tip'] ) {
+ return 'spam';
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'true' === $akismet['akismet_result'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'spam';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'false' === $akismet['akismet_result'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'OK';
</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">- return 'OK'; // Assume it's okay in the event of failure / unknown.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'unknown';
</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">@@ -80,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Handles creating a "Pending" registration that will later be converted to an actual user 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">-function wporg_login_create_pending_user( $user_login, $user_email, $user_mailinglist = false, $tos_revision = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wporg_login_create_pending_user( $user_login, $user_email, $meta = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $wp_hasher;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove any whitespace which might have accidentally been added.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,8 +97,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $profile_key = wp_generate_password( 24, false, false );
</span><span class="cx" style="display: block; padding: 0 10px"> $hashed_profile_key = time() . ':' . wp_hash_password( $profile_key );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tos_meta_key = WPOrg_SSO::TOS_USER_META_KEY;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $pending_user = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => $user_login,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => $user_email,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,10 +103,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => gmdate('Y-m-d H:i:s'),
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_activation_key' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_profile_key' => $hashed_profile_key,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta' => array(
- 'user_mailinglist' => $user_mailinglist,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta' => $meta + array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'registration_ip' => $_SERVER['REMOTE_ADDR'], // Spam & fraud control. Will be discarded after the account is created.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tos_meta_key => $tos_revision,
</del><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'scores' => array()
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginpendingcreatephp"></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/pending-create.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/pending-create.php 2021-04-14 04:13:37 UTC (rev 10900)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php 2021-04-14 04:49:37 UTC (rev 10901)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,14 +82,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'OK' !== $akismet ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Store for reference.
+ $pending_user['meta']['akismet_result'] = $akismet;
+ wporg_update_pending_user( $pending_user );
+
+ if ( 'spam' == $akismet ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // No no. "Please try again."
</span><span class="cx" style="display: block; padding: 0 10px"> $error_akismet = true;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $_POST['user_pass'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Store for reference.
- $pending_user['meta']['akismet_result'] = $akismet;
- wporg_update_pending_user( $pending_user );
</del><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></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginregisterphp"></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/register.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/register.php 2021-04-14 04:13:37 UTC (rev 10900)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register.php 2021-04-14 04:49:37 UTC (rev 10901)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,11 +35,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $error_user_login && ! $error_user_email && ! $terms_of_service_error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wporg_login_check_recapcha_status( 'register' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error_recapcha_status = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'OK' !== wporg_login_check_akismet( $user_login, $user_email ) ) {
- $error_akismet = true;
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wporg_login_create_pending_user( $user_login, $user_email, $user_mailinglist, $terms_of_service );
- die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $akismet = wporg_login_check_akismet( $user_login, $user_email );
+
+ $tos_meta_key = WPOrg_SSO::TOS_USER_META_KEY;
+ $meta = [
+ 'user_mailinglist' => $user_mailinglist,
+ 'akismet_result' => $akismet,
+ $tos_meta_key => $terms_of_service,
+ ];
+
+ if ( 'spam' === $akismet ) {
+ $error_akismet = true;
+ } else {
+ wporg_login_create_pending_user( $user_login, $user_email, $meta );
+ die();
+ }
</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></pre>
</div>
</div>
</body>
</html>