[smarcet] - #12953

* updated all members related emails ( reverification, registration) to be
  sent to proper recipient

Author: smarcet

change_password/code/model/PasswordManager.php

@@ -27,6 +27,7 @@ public function __construct(ITransactionManager $tx_manager)
     {
         $this->tx_manager = $tx_manager;
     }
+
     /**
      * @param int $member_id
      * @param string $token
@@ -35,8 +36,7 @@ public function __construct(ITransactionManager $tx_manager)
      */
     public function verifyToken($member_id, $token)
     {
-        return $this->tx_manager->transaction(function() use($member_id, $token)
-        {
+        return $this->tx_manager->transaction(function () use ($member_id, $token) {
             if (is_null($member_id) || $member_id == 0 || empty($token)) {
                 throw new InvalidPasswordResetLinkException;
             }
@@ -64,8 +64,7 @@ public function verifyToken($member_id, $token)
      */
     public function changePassword($token, $password, $password_confirmation)
     {
-        return $this->tx_manager->transaction(function() use($token, $password, $password_confirmation)
-        {
+        return $this->tx_manager->transaction(function () use ($token, $password, $password_confirmation) {
             $member = Member::currentUser();
             if (!$member) {
                 if (empty($token)) {
@@ -91,8 +90,11 @@ public function changePassword($token, $password, $password_confirmation)
             $member->generateAutologinTokenAndStoreHash();
 
             //send confirmation email
-            $email = EmailFactory::getInstance()->buildEmail(CHANGE_PASSWORD_EMAIL_FROM, $member->Email,
-                CHANGE_PASSWORD_EMAIL_SUBJECT);
+            $email = EmailFactory::getInstance()->buildEmailIgnoringEnv(CHANGE_PASSWORD_EMAIL_FROM,
+                $member->Email,
+                CHANGE_PASSWORD_EMAIL_SUBJECT
+            );
+
             $email->setTemplate('ChangedPasswordEmail');
             $email->populateTemplate(array('MemberName' => $member->getFullName()));
             $email->send();

change_password/code/ui/CustomLostPasswordForm.php

@@ -77,7 +77,7 @@ public function forgotPassword($data) {
                 if(is_null($e))
                     throw new Exception(sprintf('Email Template %s does not exists on DB!', MEMBER_FORGOT_PASSWORD_EMAIL_TEMPLATE_ID));
 
-                $e = EmailFactory::getInstance()->buildEmail("noreply@openstack.org", $member->Email);
+                $e = EmailFactory::getInstance()->buildEmailIgnoringEnv("noreply@openstack.org", $member->Email);
 
                 $e->setUserTemplate(MEMBER_FORGOT_PASSWORD_EMAIL_TEMPLATE_ID)->populateTemplate(
                   [

openstack/code/utils/email/EmailFactory.php

@@ -24,13 +24,9 @@ final class EmailFactory
      */
     private static $instance;
 
-    private function __construct()
-    {
-    }
+    private function __construct(){}
 
-    private function __clone()
-    {
-    }
+    private function __clone(){}
 
     /**
      * @return EmailFactory
@@ -44,6 +40,7 @@ public static function getInstance()
         return self::$instance;
     }
 
+
     /**
      * @param null $from
      * @param null $to
@@ -54,22 +51,47 @@ public static function getInstance()
      * @param null $bcc
      * @return Email
      */
-    public function buildEmail(
+    public function buildEmailIgnoringEnv
+    (
         $from = null,
         $to = null,
         $subject = null,
         $body = null,
         $bounceHandlerURL = null,
         $cc = null,
         $bcc = null
+    )
+    {
+        return $this->buildEmail($from, $to, $subject, $body, $bounceHandlerURL, $cc, $bcc, true);
+    }
+    /**
+     * @param null $from
+     * @param null $to
+     * @param null $subject
+     * @param null $body
+     * @param null $bounceHandlerURL
+     * @param null $cc
+     * @param null $bcc
+     * @param bool $ignore_env
+     * @return Email
+     */
+    public function buildEmail(
+        $from = null,
+        $to = null,
+        $subject = null,
+        $body = null,
+        $bounceHandlerURL = null,
+        $cc = null,
+        $bcc = null,
+        $ignore_env = false
     ) {
         $env = 'dev';
         if (defined('SS_ENVIRONMENT_TYPE')) {
             $env = SS_ENVIRONMENT_TYPE;
         }
 
         $email = Email::create();
-        if ($env == 'dev') {
+        if ($env == 'dev' && !$ignore_env) {
             $to = defined('DEV_EMAIL_TO') ? DEV_EMAIL_TO : Config::inst()->get('Email', 'admin_email');
         }
 

registration/code/infrastructure/services/MemberRegistrationSenderService.php

@@ -30,12 +30,10 @@ public function send($subject)
         }
 
         $from  = null;
-        $email = EmailFactory::getInstance()->buildEmail($from, $subject->Email);
+        $email = EmailFactory::getInstance()->buildEmailIgnoringEnv($from, $subject->Email);
 
         $token = $subject->generateEmailVerificationToken();
 
-
-
         $email->setUserTemplate(MEMBER_REGISTRATION_VERIFICATION_EMAIL_TEMPLATE_ID)->populateTemplate(
             array
             (

registration/code/infrastructure/services/MemberRegistrationVerifiedSenderService.php

@@ -30,7 +30,7 @@ public function send($subject)
         }
 
         $from  = null;
-        $email = EmailFactory::getInstance()->buildEmail($from, $subject->Email);
+        $email = EmailFactory::getInstance()->buildEmailIgnoringEnv($from, $subject->Email);
         $email->setUserTemplate(MEMBER_REGISTRATION_VERIFIED_EMAIL_TEMPLATE_ID)->populateTemplate(
             array
             (