From 478acde42ae81d7329746d60abf434b23382df6d Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Mon, 29 Feb 2016 23:47:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D0=B5=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D1=87=D1=82=D1=8B=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=20=D0=B2=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BF=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D1=82=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/mails/registration-confirmation-html.php    |  2 +-
 api/mails/registration-confirmation-text.php    |  2 +-
 api/models/RegistrationForm.php                 | 17 +++++++++++------
 environments/dev/common/config/params-local.php |  1 +
 .../prod/common/config/params-local.php         |  1 +
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/api/mails/registration-confirmation-html.php b/api/mails/registration-confirmation-html.php
index 75ca25f..0cc5dd7 100644
--- a/api/mails/registration-confirmation-html.php
+++ b/api/mails/registration-confirmation-html.php
@@ -4,5 +4,5 @@
  */
 ?>
 
-<p>Текст письма</p>
+<p>В общем, по результату работы сложного PHP скрипта, вы успешно зарегистрированы.</p>
 <p>Код: <?= $key ?></p>
diff --git a/api/mails/registration-confirmation-text.php b/api/mails/registration-confirmation-text.php
index 63e582c..f58daae 100644
--- a/api/mails/registration-confirmation-text.php
+++ b/api/mails/registration-confirmation-text.php
@@ -4,6 +4,6 @@
  */
 ?>
 
-В общем по результату работы сложного PHP скрипта вы успешно зарегистрированы.
+В общем, по результату работы сложного PHP скрипта, вы успешно зарегистрированы.
 
 Код активации <?= $key ?>
diff --git a/api/models/RegistrationForm.php b/api/models/RegistrationForm.php
index f476675..4b044eb 100644
--- a/api/models/RegistrationForm.php
+++ b/api/models/RegistrationForm.php
@@ -85,12 +85,17 @@ class RegistrationForm extends BaseApiForm {
             /** @var \yii\swiftmailer\Mailer $mailer */
             $mailer = Yii::$app->mailer;
             /** @var \yii\swiftmailer\Message $message */
-            $message = $mailer->compose([
-                'html' => '@app/mails/registration-confirmation-html',
-                'text' => '@app/mails/registration-confirmation-text',
-            ], [
-                'key' => $emailActivation->key,
-            ])->setFrom(['account@ely.by' => 'Ely.by']);
+            $message = $mailer->compose(
+                [
+                    'html' => '@app/mails/registration-confirmation-html',
+                    'text' => '@app/mails/registration-confirmation-text',
+                ],
+                [
+                    'key' => $emailActivation->key,
+                ]
+            )
+                ->setFrom([Yii::$app->params['fromEmail'] => 'Ely.by Accounts'])
+                ->setSubject('Ely.by Account registration');
 
             if (!$message->send()) {
                 throw new ErrorException('Unable send email with activation code.');
diff --git a/environments/dev/common/config/params-local.php b/environments/dev/common/config/params-local.php
index d0b9c34..c573d3a 100644
--- a/environments/dev/common/config/params-local.php
+++ b/environments/dev/common/config/params-local.php
@@ -1,3 +1,4 @@
 <?php
 return [
+    'fromEmail' => 'account@ely.by',
 ];
diff --git a/environments/prod/common/config/params-local.php b/environments/prod/common/config/params-local.php
index d0b9c34..c573d3a 100644
--- a/environments/prod/common/config/params-local.php
+++ b/environments/prod/common/config/params-local.php
@@ -1,3 +1,4 @@
 <?php
 return [
+    'fromEmail' => 'account@ely.by',
 ];