Changeset 49255

Timestamp:

10/20/2020 08:01:04 PM (4 years ago)

Author:

helen

Message:

Privacy: Add requester IP to password reset emails.

Props garrett-eclipse, bridgetwillard, isharis, ocean90.
Fixes #43856.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-privacy-policy-content.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php

@@ -585 +585 @@
         }
 
+        /* translators: Default privacy policy text. */
+        $strings[] = '<p>' . $suggested_text . __( 'If you request a password reset, your IP address will be included in the reset email.' ) . '</p>';
+
         /* translators: Default privacy policy heading. */
         $strings[] = '<h2>' . __( 'How long we retain your data' ) . '</h2>';

trunk/src/wp-login.php

@@ -433 +433 @@
     /* translators: %s: User login. */
     $message .= sprintf( __( 'Username: %s' ), $user_login ) . "\r\n\r\n";
-    $message .= __( 'If this was a mistake, just ignore this email and nothing will happen.' ) . "\r\n\r\n";
+    $message .= __( 'If this was a mistake, ignore this email and nothing will happen.' ) . "\r\n\r\n";
     $message .= __( 'To reset your password, visit the following address:' ) . "\r\n\r\n";
-    $message .= network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user_login ), 'login' ) . "\r\n";
+    $message .= network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user_login ), 'login' ) . "\r\n\r\n";
+
+    $requestor_ip = $_SERVER['REMOTE_ADDR'];
+    if ( $requestor_ip ) {
+        $message .= sprintf(
+            /* translators: %s: IP address of password reset requestor. */
+            __( 'This password reset request originated from the IP address %s.' ),
+            $requestor_ip
+        ) . "\r\n";
+    }
 
     /* translators: Password reset notification email subject. %s: Site title. */