<!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>[10964] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login: Registration: Remove Akismet from the flow, rely upon the heuristics instead.</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/10964">10964</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/10964","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-05-11 05:19:18 +0000 (Tue, 11 May 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'>Registration: Remove Akismet from the flow, rely upon the heuristics instead.</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>
</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-05-10 18:01:46 UTC (rev 10963)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php 2021-05-11 05:19:18 UTC (rev 10964)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,12 +23,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Caught in spam',
</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">- 'akismet',
- 'Akismet said no',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'heuristics-review',
+ 'Heuristics: Review',
</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">- 'heuristics',
- 'Heiristics: Review / Block',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'heuristics-block',
+ 'Heuristics: Block',
</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">@@ -83,8 +83,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 'cleared = 0';
</span><span class="cx" style="display: block; padding: 0 10px"> case 'akismet':
</span><span class="cx" style="display: block; padding: 0 10px"> return "meta LIKE '%akismet_result\":\"spam%'";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'heuristics':
- return "meta LIKE '%heuristics%' AND meta NOT LIKE '%heuristics\":\"allow%'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'heuristics-allow':
+ return "meta LIKE '%heuristics\":\"allow%'";
+ case 'heuristics-review':
+ return "meta LIKE '%heuristics\":\"review%'";
+ case 'heuristics-block':
+ return "meta LIKE '%heuristics\":\"block%'";
</ins><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><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +275,6 @@
</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">-
</del><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></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-05-10 18:01:46 UTC (rev 10963)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php 2021-05-11 05:19:18 UTC (rev 10964)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,39 +44,6 @@
</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">- * Check the user registration attempt against Akismet.
- */
-function wporg_login_check_akismet( $user_login, $user_email, $user_url = '', $content = array() ) {
- if ( ! class_exists( 'Akismet' ) ) {
- return 'OK';
- }
-
- $payload = [
- 'type' => 'user_signup',
- 'comment_author' => $user_login,
- 'comment_author_email' => $user_email,
- 'comment_author_url' => $user_url,
- 'comment_content' => implode( "\n", $content ),
- 'comment_post_ID' => 0,
- ];
-
- $akismet = Akismet::rest_auto_check_comment( $payload );
- if ( is_wp_error( $akismet ) ) {
- return $akismet->get_error_code();
- }
-
- if ( ! empty( $akismet['akismet_pro_tip'] ) && 'discard' === $akismet['akismet_pro_tip'] ) {
- return 'spam';
- } elseif ( 'true' === $akismet['akismet_result'] ) {
- return 'spam';
- } elseif ( 'false' === $akismet['akismet_result'] ) {
- return 'OK';
- } else {
- return 'unknown';
- }
-}
-
-/**
</del><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><span class="cx" style="display: block; padding: 0 10px"> function wporg_login_create_pending_user( $user_login, $user_email, $meta = array() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,16 +88,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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pending_user['meta']['heuristics'] = 'allow';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'wporg_registration_check_private_heuristics' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Returns block, review, allow.
</span><span class="cx" style="display: block; padding: 0 10px"> $pending_user['meta']['heuristics'] = wporg_registration_check_private_heuristics( compact( 'user_login', 'user_email' ) );
</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">- $pending_user['meta']['akismet_result'] = wporg_login_check_akismet( $user_login, $user_email );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $pending_user['cleared'] = (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ( !isset( $pending_user['meta']['heuristics'] ) || 'allow' === $pending_user['meta']['heuristics'] ) && // Disabled for now, review results first, replace Akismet below
- 'spam' !== $pending_user['meta']['akismet_result'] &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'allow' === $pending_user['meta']['heuristics'] &&
</ins><span class="cx" style="display: block; padding: 0 10px"> (float)$pending_user['scores']['pending'] >= (float) get_option( 'recaptcha_v3_threshold', 0.2 )
</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_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-05-10 18:01:46 UTC (rev 10963)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php 2021-05-11 05:19:18 UTC (rev 10964)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,23 +83,6 @@
</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">- // Check Akismet with new profile information
- $pending_user['meta']['akismet_result'] = wporg_login_check_akismet(
- $pending_user['user_login'],
- $pending_user['user_email'],
- $pending_user['meta']['url'] ?? '',
- array_filter( [
- $pending_user['meta']['from'] ?? '',
- $pending_user['meta']['occ'] ?? '',
- $pending_user['meta']['interests'] ?? '',
- ] )
- );
-
- if ( 'spam' === $pending_user['meta']['akismet_result'] ) {
- $pending_user['cleared'] = 0;
- unset( $_POST['user_pass'] );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> wporg_update_pending_user( $pending_user );
</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>