gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 04:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some code simplifications.

Browse Source
This commit is contained in:
James Cole
2016-04-28 16:30:21 +02:00
parent e28e66e8f1
commit ea014a6504
5 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Auth/ConfirmationController.php
View File

@@ -69,14 +69,13 @@ class ConfirmationController extends Controller
$now = time();
$maxDiff = config('firefly.resend_confirmation');
$owner = env('SITE_OWNER', 'mail@example.com');
$view = 'auth.confirmation.no-resent';
if ($now - $time > $maxDiff) {
event(new ResendConfirmation(Auth::user(), $request->ip()));
return view('auth.confirmation.resent', ['owner' => $owner]);
} else {
return view('auth.confirmation.no-resent', ['owner' => $owner]);
$view = 'auth.confirmation.resent';
}
return view($view, ['owner' => $owner]);
}
}

11
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -53,11 +53,14 @@ class PasswordController extends Controller
{
$this->validate($request, ['email' => 'required|email']);
$user = User::whereEmail($request->get('email'))->first();
$user = User::whereEmail($request->get('email'))->first();
$response = 'passwords.blocked';
if (!is_null($user) && intval($user->blocked) === 1) {
$response = 'passwords.blocked';
} else {
if (is_null($user)) {
$response = Password::INVALID_USER;
}
if (!is_null($user) && intval($user->blocked) === 0) {
$response = Password::sendResetLink(
$request->only('email'), function (Message $message) {
$message->subject($this->getEmailSubject());