Use named recipient in from and reply-to

Author: carlbennett

etc/config.sample.json

@@ -41,12 +41,18 @@
     }
   },
   "email": {
-    "recipient_from": "",
-    "recipient_reply_to": "",
-    "smtp_host": "smtp.example.com",
+    "recipient_from": [
+      "root@localhost",
+      "BNETDocs"
+    ],
+    "recipient_reply_to": [
+      "root@localhost",
+      "root"
+    ],
+    "smtp_host": "localhost",
     "smtp_password": "",
-    "smtp_port": 587,
-    "smtp_tls": true,
+    "smtp_port": 25,
+    "smtp_tls": false,
     "smtp_user": ""
   },
   "memcache": {

src/controllers/User/Register.php

@@ -213,14 +213,20 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {
         $mail->Port       = $mail_config->smtp_port;
 
         //Recipients
-        if (!empty($mail_config->recipient_from)) {
-          $mail->setFrom($mail_config->recipient_from, 'BNETDocs');
+        if (isset($mail_config->recipient_from[0])) {
+          $mail->setFrom(
+            $mail_config->recipient_from[0],
+            $mail_config->recipient_from[1]
+          );
         }
 
         $mail->addAddress($email, $username);
 
-        if (!empty($mail_config->recipient_reply_to)) {
-          $mail->addReplyTo($mail_config->recipient_reply_to);
+        if (isset($mail_config->recipient_reply_to[0])) {
+          $mail->addReplyTo(
+            $mail_config->recipient_reply_to[0],
+            $mail_config->recipient_reply_to[1]
+          );
         }
 
         // Content

src/controllers/User/ResetPassword.php

@@ -128,14 +128,20 @@ protected function doPasswordReset( UserResetPasswordModel &$model, &$data ) {
         $mail->Port       = $mail_config->smtp_port;
 
         //Recipients
-        if (!empty($mail_config->recipient_from)) {
-          $mail->setFrom($mail_config->recipient_from, 'BNETDocs');
+        if (isset($mail_config->recipient_from[0])) {
+          $mail->setFrom(
+            $mail_config->recipient_from[0],
+            $mail_config->recipient_from[1]
+          );
         }
 
         $mail->addAddress($model->user->getEmail(), $model->user->getName());
 
-        if (!empty($mail_config->recipient_reply_to)) {
-          $mail->addReplyTo($mail_config->recipient_reply_to);
+        if (isset($mail_config->recipient_reply_to[0])) {
+          $mail->addReplyTo(
+            $mail_config->recipient_reply_to[0],
+            $mail_config->recipient_reply_to[1]
+          );
         }
 
         // Content