lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix validation of setup values at step 1

Browse Source
This commit is contained in:
James Brooks
2016-10-07 12:38:36 +01:00
parent f7a8b7ed19
commit 985881c557
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/SetupController.php
View File

@@ -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()) {