From f6303deaa45c2a0b7f33f0bb645df170f759a166 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Mar 2016 11:22:58 +0100
Subject: [PATCH] Error when blocked user logs in

---
 app/Http/Controllers/Auth/AuthController.php   | 8 ++++----
 resources/views/emails/blocked-login-html.twig | 2 +-
 resources/views/emails/blocked-login.twig      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index da4ef51293..b19d6cc2da 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -73,7 +73,7 @@ class AuthController extends Controller
         }
 
         // check if user is blocked:
-        $message = '';
+        $errorMessage = '';
         /** @var User $foundUser */
         $foundUser = User::where('email', $credentials['email'])->where('blocked', 1)->first();
         if (!is_null($foundUser)) {
@@ -83,7 +83,7 @@ class AuthController extends Controller
             if (strlen($code) == 0) {
                 $code = 'general_blocked';
             }
-            $message = strval(trans('firefly.' . $code . '_error', ['email' => $credentials['email']]));
+            $errorMessage = strval(trans('firefly.' . $code . '_error', ['email' => $credentials['email']]));
 
             Log::debug('User "'.$credentials['email'].'" found, but code '.$code);
 
@@ -96,7 +96,7 @@ class AuthController extends Controller
                 'user_id' => $foundUser->id,
                 'user_address' => $credentials['email'],
                 'code' => $code,
-                'message' => $message,
+                'error_message' => $errorMessage,
                 'ip' => $request->ip(),
               ];
               Log::debug('Try to send error about user "'.$credentials['email'].'".');
@@ -116,7 +116,7 @@ class AuthController extends Controller
             $this->incrementLoginAttempts($request);
         }
         Log::debug('User "'.$credentials['email'].'" return failed login response.');
-        return $this->sendFailedLoginResponse($request, $message);
+        return $this->sendFailedLoginResponse($request, $errorMessage);
     }
 
     /**
diff --git a/resources/views/emails/blocked-login-html.twig b/resources/views/emails/blocked-login-html.twig
index 72c48eafd4..47ad194332 100644
--- a/resources/views/emails/blocked-login-html.twig
+++ b/resources/views/emails/blocked-login-html.twig
@@ -16,7 +16,7 @@
   The blocked code was "{{ code }}" and the subsequent message was:
 </p>
 <p style="font-family: monospace;font-size:13px;">
-"{{ message }}"
+"{{ error_message }}"
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
diff --git a/resources/views/emails/blocked-login.twig b/resources/views/emails/blocked-login.twig
index ba0907da26..3583c5d0d5 100644
--- a/resources/views/emails/blocked-login.twig
+++ b/resources/views/emails/blocked-login.twig
@@ -3,6 +3,6 @@ Hey there,
 Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}).
 
 The blocked code was "{{ code }}" and the subsequent message was:
-"{{ message }}"
+"{{ error_message }}"
 
 The login attempt came from IP {{ ip }}