fixes #12533 メール通知動作時にReturn－Pathを設定する

- 参考URL: http://norm-nois.com/blog/archives/2865
baserproject · Jun 25, 2016 · 69802a7 · 69802a7
1 parent 88bf7bd
commit 69802a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/Baser/Controller/BcAppController.php b/lib/Baser/Controller/BcAppController.php
@@ -811,6 +811,14 @@ public function sendMail($to, $title = '', $body = '', $options = array()) {
 			'tls' => $tls
 		);
 
+		/**
+		 * CakeEmailでは、return-path の正しい設定のためには additionalParameters を設定する必要がある
+		 * @url http://norm-nois.com/blog/archives/2865
+		 */
+		if (!empty($options['additionalParameters'])) {
+			$config = Hash::merge($config, array('additionalParameters' => $options['additionalParameters']));
+		}
+
 		$cakeEmail = new CakeEmail($config);
 
 		// charset

diff --git a/lib/Baser/Plugin/Mail/Controller/MailController.php b/lib/Baser/Plugin/Mail/Controller/MailController.php
@@ -569,7 +569,8 @@ protected function _sendEmail() {
 				'from'		=> $fromAdmin,
 				'template'	=> 'Mail.' . $mailContent['mail_template'],
 				'replyTo'		=> $fromAdmin,
-				'attachments'	=> $attachments
+				'attachments'	=> $attachments,
+				'additionalParameters'	 => '-f ' . $fromAdmin,
 			);
 			$this->sendMail($userMail, $mailContent['subject_user'], $data, $options);
 		}
@@ -584,7 +585,8 @@ protected function _sendEmail() {
 				'template' => 'Mail.' . $mailContent['mail_template'],
 				'bcc' => $mailContent['sender_2'],
 				'agentTemplate' => false,
-				'attachments'	=> $attachments
+				'attachments'	=> $attachments,
+				'additionalParameters'	 => '-f ' . $fromAdmin,
 			);
 			$this->sendMail($adminMail, $mailContent['subject_admin'], $data, $options);
 		}