SBDevelopment/ThemeParkPlus-Panel
Archived
3
0
Fork 0
Code Activity

Lot's of bug fixes

Browse source
This commit is contained in:
BuildTools 2021-06-27 21:01:43 +02:00
parent ad320963fc
commit 7718ed6c32
196 changed files with 51167 additions and 3010 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/Http/Controllers/Auth/LoginController.php
View file

@ -48,6 +48,16 @@ class LoginController extends Controller
return 'uuid';
}
public function showLoginForm()
{
$urlPrevious = url()->previous();
$urlBase = url()->to('/');
if(($urlPrevious != $urlBase . '/login') && (substr($urlPrevious, 0, strlen($urlBase)) === $urlBase))
session()->put('url.intended', $urlPrevious);
return view('auth.login');
}
public function login(Request $request)
{
$this->validateLogin($request);
@ -67,15 +77,15 @@ class LoginController extends Controller
return redirect()->intended('home');
} else {
$this->incrementLoginAttempts($request);
return response()->json([
'error' => 'This account is not activated.'
], 401);
return view('auth.login')->withErrors([
'error' => 'Wrong credentials.'
]);
}
} else {
$this->incrementLoginAttempts($request);
return response()->json([
'error' => 'Credentials do not match our database.'
], 401);
return view('auth.login')->withErrors([
'error' => 'Wrong credentials.'
]);
}
}

2
app/Http/Controllers/Auth/RegisterController.php
View file

@ -68,7 +68,7 @@ class RegisterController extends Controller
protected function create(array $data)
{
return User::create([
'uuid' => '', Cache::getUUID($data['username']),
'uuid' => Cache::getUUID($data['username']),
'email' => $data['email'],
'password' => bcrypt($data['password'])
]);