From aa30cbd5efbcfe8d9448f6eab0986999906ac4f6 Mon Sep 17 00:00:00 2001
From: Egorka <error-202@mail.ru>
Date: Wed, 8 Aug 2018 16:58:01 +0300
Subject: [PATCH] Send message fix

---
 backend/config/params.php                                    | 2 +-
 common/modules/forms/controllers/FormController.php          | 9 +++++++--
 common/modules/forms/forms/FormForm.php                      | 2 +-
 common/modules/forms/messages/ru/form.php                    | 2 +-
 common/modules/forms/views/manage/form/_form/_form-items.php | 6 +++---
 frontend/config/params.php                                   | 2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/backend/config/params.php b/backend/config/params.php
index 7f754b9..4ef2d82 100644
--- a/backend/config/params.php
+++ b/backend/config/params.php
@@ -1,4 +1,4 @@
 <?php
 return [
-    'adminEmail' => 'admin@example.com',
+    //'adminEmail' => 'admin@example.com',
 ];
diff --git a/common/modules/forms/controllers/FormController.php b/common/modules/forms/controllers/FormController.php
index 7a0d0b3..6bf941f 100644
--- a/common/modules/forms/controllers/FormController.php
+++ b/common/modules/forms/controllers/FormController.php
@@ -57,12 +57,17 @@ class FormController extends FrontendController
 		// save message
 		$this->message_service->create($form->id, Json::encode($messageItems, JSON_UNESCAPED_UNICODE));
 		//prepare e-mail message
+		$to = isset($form->return) && $form->return ? explode(',',$form->return) : [Yii::$app->params['adminEmail']];
+		$from = isset($form->from) && $form->from ? explode(',',$form->from) : [Yii::$app->params['adminEmail']];
+		$reply = isset($form->reply) && $form->reply ? explode(',',$form->reply) : $from;
+
 		$sent = $this->mailer->compose(
 			['html' => '@common/modules/forms/mail/form-html', 'text' => '@common/modules/forms/mail/form-text'],
 			['items' => $messageItems]
 		)
-             ->setTo($form->from)
-			 ->setReplyTo(isset($form->reply) ? $form->reply : $form->from)
+			 ->setTo($to)
+             ->setFrom($from)
+			 ->setReplyTo($reply)
              ->setSubject($form->subject)
              ->send();
 		if (!$sent) {
diff --git a/common/modules/forms/forms/FormForm.php b/common/modules/forms/forms/FormForm.php
index 737e952..f5f475e 100644
--- a/common/modules/forms/forms/FormForm.php
+++ b/common/modules/forms/forms/FormForm.php
@@ -48,7 +48,7 @@ class FormForm extends Model
     public function rules(): array
     {
         return [
-            [['name', 'from', 'data'], 'required'],
+            [['name', 'data'], 'required'],
             [['status', 'captcha', 'complete_page_id'], 'integer'],
             [['name', 'subject'], 'string', 'max' => 255],
 	        [['from', 'reply', 'return'], 'email'],
diff --git a/common/modules/forms/messages/ru/form.php b/common/modules/forms/messages/ru/form.php
index 3baf90c..2701efc 100644
--- a/common/modules/forms/messages/ru/form.php
+++ b/common/modules/forms/messages/ru/form.php
@@ -7,7 +7,7 @@ return [
 	'Subject' => 'Тема сообщения',
 	'From E-mail' => 'Адрес отправителя',
 	'Reply E-mail' => 'Адрес для ответов',
-	'Return E-mail' => 'Адрес для возврата',
+	'Return E-mail' => 'Адрес, кому отправлять уведомления',
 	'Complete Text' => 'Сообщение после отправки',
 	'Complete Page' => 'Страница после отправки',
 	'Status' => 'Статус',
diff --git a/common/modules/forms/views/manage/form/_form/_form-items.php b/common/modules/forms/views/manage/form/_form/_form-items.php
index df8bc40..112c6d6 100644
--- a/common/modules/forms/views/manage/form/_form/_form-items.php
+++ b/common/modules/forms/views/manage/form/_form/_form-items.php
@@ -26,13 +26,13 @@ $fetchUrl = Url::to( [ '/forms/manage/form/page-search' ] );
 
 	<div class="row">
 		<div class="col-md-4">
-			<?= $form->field($model, 'from')->textInput(['maxlength' => true]) ?>
+			<?= $form->field($model, 'return')->textInput(['maxlength' => true]) ?>
 		</div>
 		<div class="col-md-4">
-			<?= $form->field($model, 'reply')->textInput(['maxlength' => true]) ?>
+			<?= $form->field($model, 'from')->textInput(['maxlength' => true]) ?>
 		</div>
 		<div class="col-md-4">
-			<?= $form->field($model, 'return')->textInput(['maxlength' => true]) ?>
+			<?= $form->field($model, 'reply')->textInput(['maxlength' => true]) ?>
 		</div>
 	</div>
 
diff --git a/frontend/config/params.php b/frontend/config/params.php
index 7f754b9..4ef2d82 100644
--- a/frontend/config/params.php
+++ b/frontend/config/params.php
@@ -1,4 +1,4 @@
 <?php
 return [
-    'adminEmail' => 'admin@example.com',
+    //'adminEmail' => 'admin@example.com',
 ];