Merge branch '2.4' of github.com:CachetHQ/Cachet into 2.4

mdkmisc · Dec 3, 2017 · 50d46f1 · 50d46f1
2 parents beb0d42 + fe154be
commit 50d46f1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
@@ -195,7 +195,7 @@ public function postStep1()
         });
 
         $v->sometimes(['env.mail_address', 'env.mail_username', 'env.mail_password'], 'required', function ($input) {
-            return $input->env['mail_driver'] !== 'log';
+            return !in_array($input->env['mail_driver'], ['log', 'smtp']);
         });
 
         if ($v->passes()) {

diff --git a/public/dist/css/dashboard/dashboard.css b/public/dist/css/dashboard/dashboard.css
diff --git a/public/dist/js/all.js b/public/dist/js/all.js
diff --git a/public/dist/js/app.js b/public/dist/js/app.js
diff --git a/resources/assets/js/components/Setup.vue b/resources/assets/js/components/Setup.vue
@@ -7,7 +7,7 @@ module.exports = {
                 cache_driver: null,
                 queue_driver: null,
                 session_driver: null,
-                mail_driver: null,
+                mail_driver: 'smtp',
             },
             mail: {
                 host: null,
@@ -19,8 +19,8 @@ module.exports = {
                 password: null,
 
                 requiresHost: true,
-                requiresUsername: true,
-                requiresPassword: true,
+                requiresUsername: false,
+                requiresPassword: false,
             },
             system: {
                 name: null,
@@ -40,6 +40,10 @@ module.exports = {
                 this.mail.requiresHost = false
                 this.mail.requiresUsername = true
                 this.mail.requiresPassword = true
+            } else if (driver === 'smtp') {
+                this.mail.requiresHost = true
+                this.mail.requiresUsername = false
+                this.mail.requiresPassword = false
             } else {
                 this.mail.requiresHost = true
                 this.mail.requiresUsername = true

diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php
@@ -86,9 +86,9 @@
                             <span class="text-danger">{{ $errors->first('env.mail_driver') }}</span>
                             @endif
                         </div>
-                        <div class="form-group" v-if="mail.requiresHost">
-                            <label>{{ trans('forms.setup.mail_host') }} (optional)</label>
-                            <input type="text" class="form-control" name="env[mail_host]" value="{{ Binput::old('env.mail_host', $mail_config['host']) }}" placeholder="{{ trans('forms.setup.mail_host') }}">
+                        <div class="form-group">
+                            <label>{{ trans('forms.setup.mail_host') }}</label>
+                            <input type="text" class="form-control" name="env[mail_host]" value="{{ Binput::old('env.mail_host', $mail_config['host']) }}" placeholder="{{ trans('forms.setup.mail_host') }}" :required="mail.requiresHost">
                             @if($errors->has('env.mail_host'))
                             <span class="text-danger">{{ $errors->first('env.mail_host') }}</span>
                             @endif
@@ -100,16 +100,16 @@
                             <span class="text-danger">{{ $errors->first('env.mail_address') }}</span>
                             @endif
                         </div>
-                        <div class="form-group" v-if="mail.requiresUsername">
+                        <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', $mail_config['username']) }}" placeholder="{{ trans('forms.setup.mail_username') }}">
+                            <input type="text" class="form-control" name="env[mail_username]" value="{{ Binput::old('env.mail_username', $mail_config['username']) }}" placeholder="{{ trans('forms.setup.mail_username') }}" :required="mail.requiresUsername">
                             @if($errors->has('env.mail_username'))
                             <span class="text-danger">{{ $errors->first('env.mail_username') }}</span>
                             @endif
                         </div>
-                        <div class="form-group" v-if="mail.requiresPassword">
+                        <div class="form-group">
                             <label>{{ trans('forms.setup.mail_password') }}</label>
-                            <input type="password" class="form-control" name="env[mail_password]" value="{{ Binput::old('env.mail_password', $mail_config['password']) }}" autocomplete="off" placeholder="{{ trans('forms.setup.mail_password') }}">
+                            <input type="password" class="form-control" name="env[mail_password]" value="{{ Binput::old('env.mail_password', $mail_config['password']) }}" autocomplete="off" placeholder="{{ trans('forms.setup.mail_password') }}" :required="mail.requiresUsername">
                             @if($errors->has('env.mail_password'))
                             <span class="text-danger">{{ $errors->first('env.mail_password') }}</span>
                             @endif