Changeset 4203

Timestamp:

10/08/2016 10:51:26 AM (10 years ago)

Author:

ocean90

Message:

WordPress.org SSO: Use a support email address for email/password change emails.

Location:

sites/trunk/common/includes/wporg-sso

Files:

• class-wporg-sso.php (modified) (1 diff)
• wp-plugin.php (modified) (1 diff)

sites/trunk/common/includes/wporg-sso/class-wporg-sso.php

@@ -8 +8 @@
         class WPOrg_SSO {
                 const SSO_HOST = 'login.wordpress.org';
+
+                const SUPPORT_EMAIL = 'forum-password-resets@wordpress.org';
 
                 public $sso_host_url;

sites/trunk/common/includes/wporg-sso/wp-plugin.php

@@ -31 +31 @@
 
                         if ( $this->has_host() ) {
-                                add_action( 'init', array( &$this, 'redirect_all_login_or_signup_to_sso' ) );
+                                add_action( 'init', array( $this, 'redirect_all_login_or_signup_to_sso' ) );
                                 // De-hooking the password change notification, too high volume on wp.org, for no admin value.
                                 remove_action( 'after_password_reset', 'wp_password_change_notification' );
-                        }
+
+                                add_filter( 'password_change_email', array( $this, 'replace_admin_email_in_change_emails' ) );
+                                add_filter( 'email_change_email', array( $this, 'replace_admin_email_in_change_emails' ) );
+                        }
+                }
+
+                /**
+                 * Replaces the admin email placeholder with a support email
+                 * to avoid using the site's admin email.
+                 *
+                 * @param array $email The email/password change email.
+                 * @return array The email/password change email.
+                 */
+                public function replace_admin_email_in_change_emails( $email ) {
+                        $email['headers'] = "From: WordPress.org <donotreply@wordpress.org>\n";
+                        $email['message'] = str_replace( '###ADMIN_EMAIL###', self::SUPPORT_EMAIL, $email['message'] );
+                        return $email;
                 }
 
                 /**
                  * Redirect all attempts to get to a WP login or signup to the SSO ones, or to a safe redirect location.
-
+                 *
                  * @example add_action( 'init', array( &$wporg_sso, 'redirect_all_wp_login_or_signup_to_sso' ) );
                  *