From 0796e422d450c5d7b58e6d6efcd8816a16a90f92 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 17 Aug 2019 06:24:49 +0200
Subject: [PATCH] Cleanup showLoginForm()

---
 app/Http/Controllers/Auth/LoginController.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 4bd62b7691..96176032b2 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -26,7 +26,6 @@ use Adldap;
 use DB;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\User;
-use Illuminate\Cookie\CookieJar;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Log;
@@ -126,20 +125,16 @@ class LoginController extends Controller
     {
         $count         = DB::table('users')->count();
         $loginProvider = config('firefly.login_provider');
-        $pageTitle     = (string)trans('firefly.login_page_title');
+        $title         = (string)trans('firefly.login_page_title');
         if (0 === $count && 'eloquent' === $loginProvider) {
             return redirect(route('register')); // @codeCoverageIgnore
         }
 
-        // forget 2fa session thing.
-        $request->session()->forget('twoFactorAuthenticated');
-
         // is allowed to?
         $singleUserMode    = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
-        $userCount         = User::count();
         $allowRegistration = true;
         $allowReset        = true;
-        if (true === $singleUserMode && $userCount > 0) {
+        if (true === $singleUserMode && $count > 0) {
             $allowRegistration = false;
         }
 
@@ -152,6 +147,6 @@ class LoginController extends Controller
         $email    = $request->old('email');
         $remember = $request->old('remember');
 
-        return view('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'pageTitle'));
+        return view('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title'));
     }
 }