X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/dec0cbb1b25d139c504923a15b4ce884562c7404..refs/pull/261/head:/app/Http/Middleware/Authenticate.php diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index f3c6f5925..b78016688 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -1,24 +1,20 @@ check() && auth()->user()->email_confirmed == false) { - return redirect()->guest('/register/confirm/awaiting'); + if ($this->auth->check() && setting('registration-confirmation') && !$this->auth->user()->email_confirmed) { + return redirect(baseUrl('/register/confirm/awaiting')); } - if ($this->auth->guest() && !Setting::get('app-public')) { + + if ($this->auth->guest() && !setting('app-public')) { if ($request->ajax()) { return response('Unauthorized.', 401); } else { - return redirect()->guest('/login'); + return redirect()->guest(baseUrl('/login')); } }