From aa6060846d7ccefacdc01b0dcdfbe4f9b790c501 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Thu, 27 Apr 2017 23:44:26 -0400
Subject: [PATCH] Actually show errors on password reset page.

---
 app/Http/Controllers/Auth/ResetPasswordController.php |  3 ++-
 .../themes/pterodactyl/auth/passwords/reset.blade.php | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 02138d04d..628f55f42 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -46,7 +46,8 @@ class ResetPasswordController extends Controller
     protected function rules()
     {
         return [
-            'token' => 'required', 'email' => 'required|email',
+            'token' => 'required',
+            'email' => 'required|email',
             'password' => 'required|confirmed|' . User::PASSWORD_RULES,
         ];
     }
diff --git a/resources/themes/pterodactyl/auth/passwords/reset.blade.php b/resources/themes/pterodactyl/auth/passwords/reset.blade.php
index cb00994e0..bf54cb6f4 100644
--- a/resources/themes/pterodactyl/auth/passwords/reset.blade.php
+++ b/resources/themes/pterodactyl/auth/passwords/reset.blade.php
@@ -25,6 +25,17 @@
 
 @section('content')
 <div class="login-box-body">
+    @if (count($errors) > 0)
+        <div class="callout callout-danger">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            @lang('auth.auth_error')<br><br>
+            <ul>
+                @foreach ($errors->all() as $error)
+                    <li>{{ $error }}</li>
+                @endforeach
+            </ul>
+        </div>
+    @endif
     <p class="login-box-msg">@lang('auth.reset_password_text')</p>
     <form action="{{ route('auth.reset.post') }}" method="POST">
         <div class="form-group">