Apply fixes from StyleCI

app/Http/Controllers/Base/APIController.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,31 +22,29 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Http\Controllers\Base;
 
-use Alert;
 use Log;
-
+use Alert;
 use Pterodactyl\Models;
-
+use Illuminate\Http\Request;
 use Pterodactyl\Repositories\APIRepository;
-use Pterodactyl\Exceptions\DisplayValidationException;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
-
-use Illuminate\Http\Request;
+use Pterodactyl\Exceptions\DisplayValidationException;
 
 class APIController extends Controller
 {
     public function index(Request $request)
     {
         $keys = Models\APIKey::where('user', $request->user()->id)->get();
-        foreach($keys as &$key) {
+        foreach ($keys as &$key) {
             $key->permissions = Models\APIPermission::where('key_id', $key->id)->get();
         }
 
         return view('base.api.index', [
-            'keys' => $keys
+            'keys' => $keys,
         ]);
     }
 
@@ -61,6 +59,7 @@ class APIController extends Controller
             $repo = new APIRepository($request->user());
             $secret = $repo->new($request->except(['_token']));
             Alert::success('An API Keypair has successfully been generated. The API secret for this public key is shown below and will not be shown again.<br /><br /><code>' . $secret . '</code>')->flash();
+
             return redirect()->route('account.api');
         } catch (DisplayValidationException $ex) {
             return redirect()->route('account.api.new')->withErrors(json_decode($ex->getMessage()))->withInput();
@@ -70,6 +69,7 @@ class APIController extends Controller
             Log::error($ex);
             Alert::danger('An unhandled exception occured while attempting to add this API key.')->flash();
         }
+
         return redirect()->route('account.api.new')->withInput();
     }
 
@@ -78,10 +78,11 @@ class APIController extends Controller
         try {
             $repo = new APIRepository($request->user());
             $repo->revoke($key);
+
             return response('', 204);
         } catch (\Exception $ex) {
             return response()->json([
-                'error' => 'An error occured while attempting to remove this key.'
+                'error' => 'An error occured while attempting to remove this key.',
             ], 503);
         }
     }

app/Http/Controllers/Base/AccountController.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,16 +22,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Http\Controllers\Base;
 
 use Alert;
-
+use Illuminate\Http\Request;
 use Pterodactyl\Models\User;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 
-use Illuminate\Http\Request;
-
 class AccountController extends Controller
 {
     /**
@@ -53,16 +52,16 @@ class AccountController extends Controller
      */
     public function email(Request $request)
     {
-
         $this->validate($request, [
             'new_email' => 'required|email',
-            'password' => 'required'
+            'password' => 'required',
         ]);
 
         $user = $request->user();
 
-        if (!password_verify($request->input('password'), $user->password)) {
+        if (! password_verify($request->input('password'), $user->password)) {
             Alert::danger('The password provided was not valid for this account.')->flash();
+
             return redirect()->route('account');
         }
 
@@ -70,8 +69,8 @@ class AccountController extends Controller
         $user->save();
 
         Alert::success('Your email address has successfully been updated.')->flash();
-        return redirect()->route('account');
 
+        return redirect()->route('account');
     }
 
     /**
@@ -82,17 +81,17 @@ class AccountController extends Controller
      */
     public function password(Request $request)
     {
-
         $this->validate($request, [
             'current_password' => 'required',
             'new_password' => 'required|confirmed|different:current_password|' . User::PASSWORD_RULES,
-            'new_password_confirmation' => 'required'
+            'new_password_confirmation' => 'required',
         ]);
 
         $user = $request->user();
 
-        if (!password_verify($request->input('current_password'), $user->password)) {
+        if (! password_verify($request->input('current_password'), $user->password)) {
             Alert::danger('The password provided was not valid for this account.')->flash();
+
             return redirect()->route('account');
         }
 
@@ -104,6 +103,5 @@ class AccountController extends Controller
         }
 
         return redirect()->route('account');
-
     }
 }

app/Http/Controllers/Base/IndexController.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,18 +22,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Http\Controllers\Base;
 
+use Illuminate\Http\Request;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Http\Controllers\Controller;
 
-use Illuminate\Http\Request;
-
 class IndexController extends Controller
 {
-
     /**
-     * Controller Constructor
+     * Controller Constructor.
      */
     public function __construct()
     {
@@ -64,7 +63,7 @@ class IndexController extends Controller
         $length = ($length < 8) ? 8 : $length;
 
         $returnable = false;
-        while (!$returnable) {
+        while (! $returnable) {
             $generated = str_random($length);
             if (preg_match('/[A-Z]+[a-z]+[0-9]+/', $generated)) {
                 $returnable = true;
@@ -73,5 +72,4 @@ class IndexController extends Controller
 
         return $generated;
     }
-
 }

app/Http/Controllers/Base/LanguageController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Pterodactyl - Panel
- * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+ * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.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
@@ -21,18 +21,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Http\Controllers\Base;
 
 use Auth;
 use Session;
-
-use Pterodactyl\Models\User;
 use Illuminate\Http\Request;
+use Pterodactyl\Models\User;
 use Pterodactyl\Http\Controllers\Controller;
 
 class LanguageController extends Controller
 {
-
     protected $languages = [
         'de' => 'Danish',
         'en' => 'English',
@@ -47,7 +46,7 @@ class LanguageController extends Controller
     ];
 
     /**
-     * Controller Constructor
+     * Controller Constructor.
      */
     public function __construct()
     {
@@ -64,7 +63,7 @@ class LanguageController extends Controller
             }
             Session::set('applocale', $language);
         }
+
         return redirect()->back();
     }
-
 }

app/Http/Controllers/Base/SecurityController.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,19 +22,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 namespace Pterodactyl\Http\Controllers\Base;
 
-use Google2FA;
 use Alert;
-
+use Google2FA;
+use Illuminate\Http\Request;
 use Pterodactyl\Models\Session;
 use Pterodactyl\Http\Controllers\Controller;
 
-use Illuminate\Http\Request;
-
 class SecurityController extends Controller
 {
-
     /**
      * Returns Security Management Page.
      *
@@ -44,7 +42,7 @@ class SecurityController extends Controller
     public function index(Request $request)
     {
         return view('base.security', [
-            'sessions' => Session::where('user_id', $request->user()->id)->get()
+            'sessions' => Session::where('user_id', $request->user()->id)->get(),
         ]);
     }
 
@@ -57,7 +55,6 @@ class SecurityController extends Controller
      */
     public function generateTotp(Request $request)
     {
-
         $user = $request->user();
 
         $user->totp_secret = Google2FA::generateSecretKey();
@@ -69,9 +66,8 @@ class SecurityController extends Controller
                 $user->email,
                 $user->totp_secret
             ),
-            'secret' => $user->totp_secret
+            'secret' => $user->totp_secret,
         ]);
-
     }
 
     /**
@@ -82,18 +78,16 @@ class SecurityController extends Controller
      */
     public function setTotp(Request $request)
     {
-
-        if (!$request->has('token')) {
+        if (! $request->has('token')) {
             return response(null, 500);
         }
 
         $user = $request->user();
-        if($user->toggleTotp($request->input('token'))) {
+        if ($user->toggleTotp($request->input('token'))) {
             return response('true');
         }
 
         return response('false');
-
     }
 
     /**
@@ -104,27 +98,27 @@ class SecurityController extends Controller
      */
     public function disableTotp(Request $request)
     {
-
-        if (!$request->has('token')) {
+        if (! $request->has('token')) {
             Alert::danger('Missing required `token` field in request.')->flash();
+
             return redirect()->route('account.totp');
         }
 
         $user = $request->user();
-        if($user->toggleTotp($request->input('token'))) {
+        if ($user->toggleTotp($request->input('token'))) {
             return redirect()->route('account.security');
         }
 
         Alert::danger('The TOTP token provided was invalid.')->flash();
-        return redirect()->route('account.security');
 
+        return redirect()->route('account.security');
     }
 
     public function revoke(Request $request, $id)
     {
         $session = Session::where('id', $id)->where('user_id', $request->user()->id)->firstOrFail();
         $session->delete();
+
         return redirect()->route('account.security');
     }
-
 }