Changeset 10901 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php

Timestamp:

04/14/2021 04:49:37 AM (5 years ago)

Author:

dd32

Message:

Login: Store Akismet result for each signup, and expose it within the Admin UI.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php

@@ -63 +63 @@
     $akismet = Akismet::rest_auto_check_comment( $payload );
     if ( is_wp_error( $akismet ) ) {
-        return 'OK'; // Assume it's okay in the event of failure / unknown.
-        // return $akismet->get_error_code();
-    }
-
-    if ( ! empty( $akismet['akismet_pro_tip'] ) ) {
-        return $akismet['akismet_pro_tip'];
+        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';
@@ -74 +73 @@
         return 'OK';
     } else {
-        return 'OK'; // Assume it's okay in the event of failure / unknown.
+        return 'unknown';
     }
 }
@@ -81 +80 @@
  * Handles creating a "Pending" registration that will later be converted to an actual user  account.
  */
-function wporg_login_create_pending_user( $user_login, $user_email, $user_mailinglist = false, $tos_revision = 0  ) {
+function wporg_login_create_pending_user( $user_login, $user_email, $meta = array() ) {
     global $wpdb, $wp_hasher;
 
@@ -98 +97 @@
     $profile_key        = wp_generate_password( 24, false, false );
     $hashed_profile_key = time() . ':' . wp_hash_password( $profile_key );
-
-    $tos_meta_key = WPOrg_SSO::TOS_USER_META_KEY;
 
     $pending_user = array(
@@ -107 +104 @@
         'user_activation_key' => '',
         'user_profile_key' => $hashed_profile_key,
-        'meta' => array(
-            'user_mailinglist' => $user_mailinglist,
+        'meta' => $meta + array(
             'registration_ip'  => $_SERVER['REMOTE_ADDR'], // Spam & fraud control. Will be discarded after the account is created.
-            $tos_meta_key      => $tos_revision,
         ),
         'scores' => array()