Changeset 10899

Timestamp:

04/14/2021 03:56:53 AM (4 years ago)

Author:

dd32

Message:

Login: Have users agree to abide by the Privacy Policy (and later, ToS/CoC) when registering.

Enabled for all new signups.
See #5618.

Location:

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

Files:

• functions-registration.php (modified) (4 diffs)
• functions.php (modified) (2 diffs)
• register.php (modified) (3 diffs)
• stylesheets/login.css (modified) (5 diffs)

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

@@ -80 +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  ) {
+function wporg_login_create_pending_user( $user_login, $user_email, $user_mailinglist = false, $tos_revision = 0  ) {
     global $wpdb, $wp_hasher;
 
@@ -97 +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 +109 @@
             'user_mailinglist' => $user_mailinglist,
             'registration_ip'  => $_SERVER['REMOTE_ADDR'], // Spam & fraud control. Will be discarded after the account is created.
+            $tos_meta_key      => $tos_revision,
         ),
         'scores' => array()
@@ -289 +292 @@
     }
 
-    foreach ( array( 'url', 'from', 'occ', 'interests' ) as $field ) {
+    $tos_meta_key = WPOrg_SSO::TOS_USER_META_KEY;
+
+    foreach ( array( 'url', 'from', 'occ', 'interests', $tos_meta_key ) as $field ) {
         if ( !empty( $pending_user['meta'][ $field ] ) ) {
             $value = $pending_user['meta'][ $field ];

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

@@ -57 +57 @@
  */
 function wporg_login_replace_css() {
-    wp_enqueue_style( 'wporg-login', get_template_directory_uri() . '/stylesheets/login.css', array( 'login', 'dashicons' ), '20200507' );
+    wp_enqueue_style( 'wporg-login', get_template_directory_uri() . '/stylesheets/login.css', array( 'login', 'dashicons' ), '20210414' );
 }
 add_action( 'login_init', 'wporg_login_replace_css' );
@@ -73 +73 @@
 
     wp_enqueue_style( 'wporg-normalize', get_template_directory_uri() . '/stylesheets/normalize.css', 3 );
-    wp_enqueue_style( 'wporg-login', get_template_directory_uri() . '/stylesheets/login.css', array( 'login', 'dashicons' ), '20200507' );
+    wp_enqueue_style( 'wporg-login', get_template_directory_uri() . '/stylesheets/login.css', array( 'login', 'dashicons' ), '20210414' );
 }
 add_action( 'wp_enqueue_scripts', 'wporg_login_scripts' );

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

@@ -6 +6 @@
  */
 
-$user_login = isset( $_POST['user_login'] ) ? trim( wp_unslash( $_POST['user_login'] ) ) : '';
-if ( ! $user_login && !empty( WP_WPOrg_SSO::$matched_route_params['user'] ) ) {
+$user_login       = isset( $_POST['user_login'] ) ? trim( wp_unslash( $_POST['user_login'] ) ) : '';
+$user_email       = isset( $_POST['user_email'] ) ? trim( wp_unslash( $_POST['user_email'] ) ) : '';
+$user_mailinglist = isset( $_POST['user_mailinglist'] ) && 'true' == $_POST['user_mailinglist'];
+$terms_of_service = isset( $_POST['terms_of_service'] ) ? $_POST['terms_of_service'] : false;
+
+if ( ! $user_login && ! empty( WP_WPOrg_SSO::$matched_route_params['user'] ) ) {
     $user_login = trim( WP_WPOrg_SSO::$matched_route_params['user'] );
 }
-$user_email = isset( $_POST['user_email'] ) ? trim( wp_unslash( $_POST['user_email'] ) ) : '';
-$user_mailinglist = isset( $_POST['user_mailinglist'] ) && 'true' == $_POST['user_mailinglist'];
 
 $error_user_login = $error_user_email = $error_recapcha_status = false;
@@ -26 +28 @@
     }
 
+    // Don't validate that it's equal to the current revision, just that they've agreed to one.
+    // Let the post-login interstitial handle TOS updates at time of registration.
+    $terms_of_service_error = ! $terms_of_service || $terms_of_service > TOS_REVISION;
+
     // handle user registrations.
-    if ( ! $error_user_login && ! $error_user_email ) {
+    if ( ! $error_user_login && ! $error_user_email && ! $terms_of_service_error ) {
         if ( ! wporg_login_check_recapcha_status( 'register' ) ) {
             $error_recapcha_status = true;
         } else {
-            wporg_login_create_pending_user( $user_login, $user_email, $user_mailinglist );
+            wporg_login_create_pending_user( $user_login, $user_email, $user_mailinglist, $terms_of_service );
             die();
         }
@@ -79 +85 @@
     ?>
 
-    <p class="login-mailinglist">
+    <p class="login-tos checkbox <?php if ( $terms_of_service_error ) { echo 'message error'; } ?>">
+        <label for="terms_of_service">
+            <input name="terms_of_service" type="checkbox" id="terms_of_service" value="<?php echo esc_attr( TOS_REVISION ); ?>" <?php checked( $terms_of_service, TOS_REVISION ); ?> required="required">
+            <?php
+                $localised_domain = parse_url( wporg_login_wordpress_url(), PHP_URL_HOST );
+                printf(
+                    __( 'I have read and accept the %s.', 'wporg' ),
+                    wp_sprintf_l( '%l', [
+                        "<a href='https://{$localised_domain}/about/privacy/'>" . __( 'Privacy Policy', 'wporg' ) . '</a>',
+                        // "<a href='https://{$localised_domain}/about/terms-of-service/'>" . __( 'Terms of Service', 'wporg' ) . '</a>',
+                        // "<a href='https://{$localised_domain}/about/code-of-conduct/'>" . __( 'Code of Conduct', 'wporg' ) . '</a>',
+                    ] )
+                )
+            ?>
+        </label>
+    </p>
+
+    <p class="login-mailinglist checkbox">
         <label for="user_mailinglist">
             <input name="user_mailinglist" type="checkbox" id="user_mailinglist" value="true" <?php checked( $user_mailinglist, true ); ?>>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/stylesheets/login.css

@@ -453 +453 @@
 }
 
-form .login-mailinglist label {
+form p.checkbox.error {
+    color: #dc3232;
+}
+
+form p.checkbox label {
     position: relative;
     display: block;
@@ -461 +465 @@
 }
 
-.rtl form .login-mailinglist label {
+.rtl form p.checkbox label {
     padding-left: 0;
     padding-right: 24px;
@@ -467 +471 @@
 
 @media screen and (max-width: 782px) {
-    form .login-mailinglist label {
+    form p.checkbox label {
         padding-left: 33px;
     }
 
-    .rtl form .login-mailinglist label {
+    .rtl form p.checkbox label {
         padding-left: 0;
         padding-right: 33px;
@@ -477 +481 @@
 }
 
-form .login-mailinglist label input {
+form p.checkbox label input {
     position: absolute;
     top: 0;
@@ -484 +488 @@
 }
 
-.rtl form .login-mailinglist label input {
+.rtl form p.checkbox label input {
     left: auto;
     right: 0;