Changeset 10008

Timestamp:

07/03/2020 06:48:14 AM (6 years ago)

Author:

dd32

Message:

Login: Split the function to send users a confirmation email into it's own function for flexability.

See #5278.

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

@@ -58 +58 @@
         }
 
-        $activation_key = wp_generate_password( 24, false, false );
-        $profile_key    = wp_generate_password( 24, false, false );
-
-        $hashed_activation_key = time() . ':' . wp_hash_password( $activation_key );
-        $hashed_profile_key    = time() . ':' . wp_hash_password( $profile_key );
+
+        $profile_key        = wp_generate_password( 24, false, false );
+        $hashed_profile_key = time() . ':' . wp_hash_password( $profile_key );
 
         $pending_user = array(
@@ -68 +66 @@
                 'user_email' => $user_email,
                 'user_registered' => gmdate('Y-m-d  H:i:s'),
-                'user_activation_key' => $hashed_activation_key,
+                'user_activation_key' => '',
                 'user_profile_key' => $hashed_profile_key,
                 'meta' => array(
@@ -93 +91 @@
         if ( ! $inserted ) {
                 wp_die( __( 'Error! Something went wrong with your registration. Try again?', 'wporg' ) );
+        }
+
+        wporg_send_confirmation_email( $user_email );
+
+        $url = home_url( sprintf(
+                '/register/create-profile/%s/%s/',
+                $user_login,
+                $profile_key
+        ) );
+
+        wp_safe_redirect( $url );
+        die();
+}
+
+/**
+ * Send a "Welcome to WordPress.org" confirmation email.
+ */
+function wporg_send_confirmation_email( $user_email ) {
+        global $wpdb;
+
+        $user = wporg_get_pending_user( $user_email );
+
+        if ( ! $user ) {
+                return false;
+        }
+
+        $user_login = $user['user_login'];
+
+        // Every email gets a new key (and expiration time..)
+        $activation_key        = wp_generate_password( 24, false, false );
+        $hashed_activation_key = time() . ':' . wp_hash_password( $activation_key );
+
+        $user['user_activation_key'] = $hashed_activation_key;
+        if ( ! wporg_update_pending_user( $user ) ) {
+                return false;
         }
 
@@ -104 +137 @@
         $body .= __( '-- The WordPress.org Team', 'wporg' );
 
-        wp_mail(
+        return wp_mail(
                 $user_email,
                 __( '[WordPress.org] Your new account', 'wporg' ),
@@ -112 +145 @@
                 )
         );
-
-        $url = home_url( sprintf(
-                '/register/create-profile/%s/%s/',
-                $user_login,
-                $profile_key
-        ) );
-
-        wp_safe_redirect( $url );
-        die();
 }