From cecf8949116a103430db33e757b9ef8bf6a2b6ac Mon Sep 17 00:00:00 2001 From: Anthony Bocci Date: Fri, 28 Dec 2018 19:42:42 +0100 Subject: [PATCH] Let the mail_username required except for sendmail During the setup the "mail_username" was required and it was then undone, so using the sendmail driver we can let the username empty. It would be bad to let the username optional for every drivers, because in some configurations, like SMTP, the username is required for the SMTP server so if the user let it empty its mail configuration will be bad. The mail_username is now optional only if the mail driver is sendmail. See: #3244 --- app/Http/Controllers/SetupController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 6a789c83..6c978e79 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -198,6 +198,10 @@ class SetupController extends Controller return !in_array($input->env['mail_driver'], ['log', 'smtp']); }); + $v->sometimes(['env.mail_username'], 'required', function($input) { + return !in_array($input->env['mail_username'], ['sendmail']); + }); + if ($v->passes()) { return Response::json(['status' => 1]); }