starred/newznab-tmux-NNTmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 03:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix user login by email

Browse Source
This commit is contained in:
DariusIII
2018-09-22 21:24:33 +02:00
parent 656f0d6cd0
commit b7fef38afd
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changelog
+2
View File
@@ -1,3 +1,5 @@
2018-09-22 DariusIIi
* Fix: Fix user login by email
2018-09-21 DariusIII
* Chg: Update install script to set admin as verified
* Chg: Update nesbot/carbon to version 1.34.0 and fancybox to latest
app/Http/Controllers/Auth/LoginController.php
+8 -6
View File
@@ -53,7 +53,15 @@ class LoginController extends Controller
]);
$error = '';
$login_type = filter_var($request->input('username'), FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
$request->merge([
$login_type => $request->input('username'),
]);
$user = User::getByUsername($request->input('username'));
if ($user === null) {
$user = User::getByEmail($request->input('username'));
}
if ($user !== null && \Firewall::isBlacklisted($user->host) === false) {
if (env('NOCAPTCHA_ENABLED') === true && (! empty(env('NOCAPTCHA_SECRET')) && ! empty(env('NOCAPTCHA_SITEKEY')))) {
@@ -64,12 +72,6 @@ class LoginController extends Controller
$rememberMe = $request->has('rememberme') && $request->input('rememberme') === 'on';
$login_type = filter_var($request->input('username'), FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
$request->merge([
$login_type => $request->input('username'),
]);
if ($user->isVerified() === false || $user->isPendingVerification()) {
return $this->showLoginForm('You have not verified your email address!');
}