From 985881c5570e3401d3ac134f475a3a6537604226 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 7 Oct 2016 12:38:36 +0100 Subject: [PATCH] Fix validation of setup values at step 1 --- app/Http/Controllers/SetupController.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 239c0913..363b6643 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -145,11 +145,17 @@ class SetupController extends Controller $v = Validator::make($postData, $this->rulesStep1); $v->sometimes('env.mail_host', 'required', function ($input) { - return $input->mail_driver === 'smtp'; + return $input->env['mail_driver'] === 'smtp'; }); - $v->sometimes(['env.mail_address', 'env.mail_username', 'env.mail_password'], 'required', function ($input) { - return $input->mail_driver !== 'log'; + $v->sometimes('env.mail_address', 'required', function ($input) { + return $input->env['mail_driver'] !== 'log'; + }); + $v->sometimes('env.mail_username', 'required', function ($input) { + return $input->env['mail_driver'] !== 'log'; + }); + $v->sometimes('env.mail_password', 'required', function ($input) { + return $input->env['mail_driver'] !== 'log'; }); if ($v->passes()) {