From 958c9eadc7101d76fa2e1e88b6f66d4c1f7fbde4 Mon Sep 17 00:00:00 2001
From: Joseph Cohen <joseph.cohen@dinkbit.com>
Date: Fri, 3 Jun 2016 01:26:28 -0500
Subject: [PATCH] Add mail data to wizard

---
 app/Http/Controllers/SetupController.php | 11 +++++++++-
 config/services.php                      | 12 +++++-----
 resources/lang/en/forms.php              |  4 ++++
 resources/views/setup.blade.php          | 28 ++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 5957572c..798f8927 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -53,7 +53,7 @@ class SetupController extends Controller
         'sendmail'  => 'Sendmail',
         'mailgun'   => 'Mailgun',
         'mandrill'  => 'Mandrill',
-        'ses'       => 'Amazon SES',
+        // 'ses'       => 'Amazon SES', this will be available only if aws/aws-sdk-php is installed
         'sparkpost' => 'SparkPost',
     ];
 
@@ -88,6 +88,7 @@ class SetupController extends Controller
         $this->rulesStep1 = [
             'env.cache_driver'   => 'required|in:'.implode(',', array_keys($this->cacheDrivers)),
             'env.session_driver' => 'required|in:'.implode(',', array_keys($this->cacheDrivers)),
+            'env.mail_driver'    => 'required|in:'.implode(',', array_keys($this->mailDrivers)),
         ];
 
         $this->rulesStep2 = [
@@ -143,6 +144,14 @@ class SetupController extends Controller
 
         $v = Validator::make($postData, $this->rulesStep1);
 
+        $v->sometimes('env.mail_host', 'required', function ($input) {
+            return $input->mail_driver === 'smtp';
+        });
+
+        $v->sometimes(['env.mail_from', 'env.mail_username', 'env.mail_password'], 'required', function ($input) {
+            return $input->mail_driver !== 'log';
+        });
+
         if ($v->passes()) {
             return Response::json(['status' => 1]);
         }
diff --git a/config/services.php b/config/services.php
index 77ea1cba..f1a4e4c1 100644
--- a/config/services.php
+++ b/config/services.php
@@ -28,22 +28,22 @@ return [
     ],
 
     'mailgun' => [
-        'domain' => env('MAILGUN_DOMAIN'),
-        'secret' => env('MAILGUN_SECRET'),
+        'domain' => env('MAIL_USERNAME'),
+        'secret' => env('MAIL_PASSWORD'),
     ],
 
     'mandrill' => [
-        'secret' => env('MANDRILL_SECRET'),
+        'secret' => env('MAIL_PASSWORD'),
     ],
 
     'ses' => [
-        'key'    => env('SES_KEY'),
-        'secret' => env('SES_SECRET'),
+        'key'    => env('MAIL_USERNAME'),
+        'secret' => env('MAIL_PASSWORD'),
         'region' => 'us-east-1',
     ],
 
     'sparkpost' => [
-        'secret' => env('SPARKPOST_SECRET'),
+        'secret' => env('MAIL_PASSWORD'),
     ],
 
 ];
diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index 51975abc..867d79c5 100755
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -24,6 +24,10 @@ return [
         'cache_driver'     => 'Cache Driver',
         'session_driver'   => 'Session Driver',
         'mail_driver'      => 'Mail Driver',
+        'mail_host'        => 'Mail Host',
+        'mail_from'        => 'Mail From',
+        'mail_username'    => 'Mail Client User',
+        'mail_password'    => 'Mail Client Password',
     ],
 
     // Login form fields
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index 57e698af..d2f7efcf 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -68,6 +68,34 @@
                         <span class="text-danger">{{ $errors->first('env.mail_driver') }}</span>
                         @endif
                     </div>
+                    <div class="form-group">
+                        <label>{{ trans('forms.setup.mail_host') }} (optional)</label>
+                        <input type="text" class="form-control" name="env[mail_host]" value="{{ Binput::old('env.mail_host') }}">
+                        @if($errors->has('env.mail_host'))
+                        <span class="text-danger">{{ $errors->first('env.mail_host') }}</span>
+                        @endif
+                    </div>
+                    <div class="form-group">
+                        <label>{{ trans('forms.setup.mail_from') }}</label>
+                        <input type="text" class="form-control" name="env[mail_from]" value="{{ Binput::old('env.mail_from') }}" placeholder="notifications@alt-three.com">
+                        @if($errors->has('env.mail_from'))
+                        <span class="text-danger">{{ $errors->first('env.mail_from') }}</span>
+                        @endif
+                    </div>
+                    <div class="form-group">
+                        <label>{{ trans('forms.setup.mail_username') }}</label>
+                        <input type="text" class="form-control" name="env[mail_username]" value="{{ Binput::old('env.mail_username') }}">
+                        @if($errors->has('env.mail_username'))
+                        <span class="text-danger">{{ $errors->first('env.mail_username') }}</span>
+                        @endif
+                    </div>
+                    <div class="form-group">
+                        <label>{{ trans('forms.setup.mail_password') }}</label>
+                        <input type="text" class="form-control" name="env[mail_password]" value="{{ Binput::old('env.mail_password') }}" autocomplete="off">
+                        @if($errors->has('env.mail_password'))
+                        <span class="text-danger">{{ $errors->first('env.mail_password') }}</span>
+                        @endif
+                    </div>
                 </fieldset>
                 <hr>
                 <div class="form-group text-center">