Apply fixes from StyleCI

app/Http/Controllers/Auth/LoginController.php

@@ -2,7 +2,7 @@
 /**
  * Pterodactyl - Panel
  * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
- * Some Modifications (c) 2015 Dylan Seidt <dylan.seidt@gmail.com>
+ * Some Modifications (c) 2015 Dylan Seidt <dylan.seidt@gmail.com>.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,20 +22,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-namespace Pterodactyl\Http\Controllers\Auth;
 
-use Pterodactyl\Models\User;
+namespace Pterodactyl\Http\Controllers\Auth;
 
 use Auth;
 use Alert;
-use Validator;
-
-use Pterodactyl\Http\Controllers\Controller;
-use PragmaRX\Google2FA\Google2FA;
 use Illuminate\Http\Request;
-use Illuminate\Foundation\Auth\ThrottlesLogins;
-use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
-
+use Pterodactyl\Models\User;
+use PragmaRX\Google2FA\Google2FA;
+use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 class LoginController extends Controller
@@ -62,14 +57,14 @@ class LoginController extends Controller
     /**
      * Lockout time for failed login requests.
      *
-     * @var integer
+     * @var int
      */
     protected $lockoutTime = 120;
 
     /**
      * After how many attempts should logins be throttled and locked.
      *
-     * @var integer
+     * @var int
      */
     protected $maxLoginAttempts = 3;
 
@@ -91,7 +86,6 @@ class LoginController extends Controller
      */
     public function login(Request $request)
     {
-
         $this->validate($request, [
             'email' => 'required|email',
             'password' => 'required',
@@ -99,42 +93,40 @@ class LoginController extends Controller
 
         if ($lockedOut = $this->hasTooManyLoginAttempts($request)) {
             $this->fireLockoutEvent($request);
+
             return $this->sendLockoutResponse($request);
         }
 
         // Is the email & password valid?
-        if (!Auth::once([
+        if (! Auth::once([
             'email' => $request->input('email'),
-            'password' => $request->input('password')
+            'password' => $request->input('password'),
         ], $request->has('remember'))) {
-
-            if (!$lockedOut) {
+            if (! $lockedOut) {
                 $this->incrementLoginAttempts($request);
             }
 
             return $this->sendFailedLoginResponse($request);
-
         }
 
         // Verify TOTP Token was Valid
-        if(Auth::user()->use_totp === 1) {
+        if (Auth::user()->use_totp === 1) {
             $G2FA = new Google2FA();
-            if(is_null($request->input('totp_token')) || !$G2FA->verifyKey(Auth::user()->totp_secret, $request->input('totp_token'))) {
-
-                if (!$lockedOut) {
+            if (is_null($request->input('totp_token')) || ! $G2FA->verifyKey(Auth::user()->totp_secret, $request->input('totp_token'))) {
+                if (! $lockedOut) {
                     $this->incrementLoginAttempts($request);
                 }
 
                 Alert::danger(trans('auth.totp_failed'))->flash();
-                return $this->sendFailedLoginResponse($request);
 
+                return $this->sendFailedLoginResponse($request);
             }
         }
 
         // Successfully Authenticated.
         Auth::login(Auth::user(), $request->has('remember'));
-        return $this->sendLoginResponse($request);
 
+        return $this->sendLoginResponse($request);
     }
 
     /**
@@ -147,5 +139,4 @@ class LoginController extends Controller
     {
         return response()->json(User::select('id')->where('email', $request->input('email'))->where('use_totp', 1)->first());
     }
-
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -2,8 +2,8 @@
 
 namespace Pterodactyl\Http\Controllers\Auth;
 
-use Pterodactyl\User;
 use Validator;
+use Pterodactyl\User;
 use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\RegistersUsers;
 

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -33,8 +33,8 @@ class ResetPasswordController extends Controller
         $this->middleware('guest');
     }
 
-
-    protected function rules() {
+    protected function rules()
+    {
         return [
             'token' => 'required', 'email' => 'required|email',
             'password' => 'required|confirmed|' . User::PASSWORD_RULES,