Pterodactyl / Panel

app/Http/Controllers/Admin/ServiceController.php

Unused Use Statements -3 removed lines

@@ -26,13 +26,10 @@
 use Alert;
 use DB;
 use Log;
-use Validator;
-
 use Pterodactyl\Models;
 use Pterodactyl\Repositories\ServiceRepository;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Exceptions\DisplayValidationException;
-
 use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 

Spacing +4 added lines, -4 removed lines

@@ -186,15 +186,15 @@
                 'user_editable' => '0',
                 'required' => '0'
             ];
-            foreach($request->except(['_token']) as $id => $val) {
-                $data[str_replace($variable.'_', '', $id)] = $val;
+            foreach ($request->except(['_token']) as $id => $val) {
+                $data[str_replace($variable . '_', '', $id)] = $val;
             }
             $repo->update($variable, $data);
             Alert::success('Successfully updated variable.')->flash();
         } catch (DisplayValidationException $ex) {
             $data = [];
-            foreach(json_decode($ex->getMessage(), true) as $id => $val) {
-                $data[$variable.'_'.$id] = $val;
+            foreach (json_decode($ex->getMessage(), true) as $id => $val) {
+                $data[$variable . '_' . $id] = $val;
             }
             return redirect()->route('admin.services.option', [$service, $option])->withErrors((object) $data)->withInput();
         } catch (DisplayException $ex) {

app/Http/Controllers/Admin/UserController.php

Unused Use Statements -4 removed lines

@@ -25,16 +25,12 @@
 namespace Pterodactyl\Http\Controllers\Admin;
 
 use Alert;
-use Settings;
-use Mail;
 use Log;
 use Pterodactyl\Models\User;
 use Pterodactyl\Repositories\UserRepository;
 use Pterodactyl\Models\Server;
-
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Exceptions\DisplayValidationException;
-
 use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
         $query = User::select('users.*');
         if ($request->input('filter') && !is_null($request->input('filter'))) {
             preg_match_all('/[^\s"\']+|"([^"]*)"|\'([^\']*)\'/', urldecode($request->input('filter')), $matches);
-            foreach($matches[0] as $match) {
+            foreach ($matches[0] as $match) {
                 $match = str_replace('"', '', $match);
                 if (strpos($match, ':')) {
                     list($field, $term) = explode(':', $match);
@@ -105,7 +105,7 @@ 
             $repo->delete($id);
             Alert::success('Successfully deleted user from system.')->flash();
             return redirect()->route('admin.users');
-        } catch(DisplayException $ex) {
+        } catch (DisplayException $ex) {
             Alert::danger($ex->getMessage())->flash();
         } catch (\Exception $ex) {
             Log::error($ex);
@@ -157,7 +157,7 @@ 
 
     public function getJson(Request $request)
     {
-        foreach(User::select('email')->get() as $user) {
+        foreach (User::select('email')->get() as $user) {
             $resp[] = $user->email;
         }
         return $resp;

app/Http/Controllers/API/NodeController.php

Unused Use Statements -4 removed lines

@@ -24,12 +24,8 @@
 namespace Pterodactyl\Http\Controllers\API;
 
 use Illuminate\Http\Request;
-
 use Pterodactyl\Models;
-use Pterodactyl\Transformers\NodeTransformer;
-use Pterodactyl\Transformers\AllocationTransformer;
 use Pterodactyl\Repositories\NodeRepository;
-
 use Pterodactyl\Exceptions\DisplayValidationException;
 use Pterodactyl\Exceptions\DisplayException;
 use Dingo\Api\Exception\ResourceException;

Indentation +10 added lines, -10 removed lines

@@ -220,14 +220,14 @@ 
      * @Versions({"v1"})
      * @Response(200)
      */
-     public function allocations(Request $request)
-     {
-         $allocations = Models\Allocation::all();
-         if ($allocations->count() < 1) {
-             throw new NotFoundHttpException('No allocations have been created.');
-         }
-         return $allocations;
-     }
+        public function allocations(Request $request)
+        {
+            $allocations = Models\Allocation::all();
+            if ($allocations->count() < 1) {
+                throw new NotFoundHttpException('No allocations have been created.');
+            }
+            return $allocations;
+        }
 	 
     /**
      * List Node Allocation based on assigned to ID
@@ -238,8 +238,8 @@ 
      * @Versions({"v1"})
      * @Response(200)
      */
-     public function allocationsView(Request $request, $id)
-     {
+        public function allocationsView(Request $request, $id)
+        {
         $query = Models\Allocation::where('assigned_to', $id)->get();
         try {
 			

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
         try {
             $node = new NodeRepository;
             $new = $node->create($request->all());
-            return [ 'id' => $new ];
+            return ['id' => $new];
         } catch (DisplayValidationException $ex) {
             throw new ResourceException('A validation error occured.', json_decode($ex->getMessage(), true));
         } catch (DisplayException $ex) {
@@ -130,7 +130,7 @@ 
         $node = Models\Node::where('id', $id);
 
         if (!is_null($request->input('fields'))) {
-            foreach(explode(',', $request->input('fields')) as $field) {
+            foreach (explode(',', $request->input('fields')) as $field) {
                 if (!empty($field)) {
                     $node->addSelect($field);
                 }
@@ -273,7 +273,7 @@ 
             return $this->response->noContent();
         } catch (DisplayException $ex) {
             throw new ResourceException($ex->getMessage());
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             throw new ServiceUnavailableHttpException('An error occured while attempting to delete this node.');
         }
     }

app/Http/Controllers/API/ServerController.php

Unused Use Statements -3 removed lines

@@ -24,12 +24,9 @@
 namespace Pterodactyl\Http\Controllers\API;
 
 use Illuminate\Http\Request;
-
 use Log;
 use Pterodactyl\Models;
-use Pterodactyl\Transformers\ServerTransformer;
 use Pterodactyl\Repositories\ServerRepository;
-
 use Pterodactyl\Exceptions\DisplayValidationException;
 use Pterodactyl\Exceptions\DisplayException;
 use Dingo\Api\Exception\ResourceException;

Indentation +5 added lines, -5 removed lines

@@ -66,11 +66,11 @@
     }
 
     /**
-    * Create Server
-    *
-    * @Post("/servers")
-    * @Versions({"v1"})
-    * @Response(201)
+     * Create Server
+     *
+     * @Post("/servers")
+     * @Versions({"v1"})
+     * @Response(201)
      */
     public function create(Request $request)
     {

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
         try {
             $server = new ServerRepository;
             $new = $server->create($request->all());
-            return [ 'id' => $new ];
+            return ['id' => $new];
         } catch (DisplayValidationException $ex) {
             throw new ResourceException('A validation error occured.', json_decode($ex->getMessage(), true));
         } catch (DisplayException $ex) {
@@ -106,7 +106,7 @@ 
         $query = Models\Server::where('id', $id);
 
         if (!is_null($request->input('fields'))) {
-            foreach(explode(',', $request->input('fields')) as $field) {
+            foreach (explode(',', $request->input('fields')) as $field) {
                 if (!empty($field)) {
                     $query->addSelect($field);
                 }
@@ -298,7 +298,7 @@ 
             return $this->response->noContent();
         } catch (DisplayException $ex) {
             throw new ResourceException($ex->getMessage());
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             throw new ServiceUnavailableHttpException('An error occured while attempting to delete this server.');
         }
     }

app/Http/Controllers/API/ServiceController.php

Unused Use Statements -3 removed lines

@@ -24,10 +24,7 @@
 namespace Pterodactyl\Http\Controllers\API;
 
 use Illuminate\Http\Request;
-
 use Pterodactyl\Models;
-use Pterodactyl\Transformers\ServiceTransformer;
-
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         }
 
         $options = Models\ServiceOptions::select('id', 'name', 'description', 'tag', 'docker_image')->where('parent_service', $service->id)->get();
-        foreach($options as &$opt) {
+        foreach ($options as &$opt) {
             $opt->variables = Models\ServiceVariables::where('option_id', $opt->id)->get();
         }
 

app/Http/Controllers/API/User/InfoController.php

Unused Use Statements -3 removed lines

@@ -23,11 +23,8 @@
  */
 namespace Pterodactyl\Http\Controllers\API\User;
 
-use Auth;
-use Dingo;
 use Pterodactyl\Models;
 use Illuminate\Http\Request;
-
 use Pterodactyl\Http\Controllers\API\BaseController;
 
 class InfoController extends BaseController

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $servers = Models\Server::getUserServers();
         $response = [];
 
-        foreach($servers as &$server) {
+        foreach ($servers as &$server) {
             $response = array_merge($response, [[
                 'id' => $server->uuidShort,
                 'uuid' => $server->uuid,

app/Http/Controllers/API/User/ServerController.php

Unused Use Statements -1 removed lines

@@ -27,7 +27,6 @@
 use Log;
 use Pterodactyl\Models;
 use Illuminate\Http\Request;
-
 use Pterodactyl\Http\Controllers\API\BaseController;
 
 class ServerController extends BaseController

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         }
 
         $allocations = Models\Allocation::select('id', 'ip', 'port', 'ip_alias as alias')->where('assigned_to', $server->id)->get();
-        foreach($allocations as &$allocation) {
+        foreach ($allocations as &$allocation) {
             $allocation->default = ($allocation->id === $server->allocation);
             unset($allocation->id);
         }

app/Http/Controllers/API/UserController.php

Unused Use Statements -4 removed lines

@@ -24,13 +24,9 @@
 namespace Pterodactyl\Http\Controllers\API;
 
 use Illuminate\Http\Request;
-
 use Dingo\Api\Exception\ResourceException;
-
 use Pterodactyl\Models;
-use Pterodactyl\Transformers\UserTransformer;
 use Pterodactyl\Repositories\UserRepository;
-
 use Pterodactyl\Exceptions\DisplayValidationException;
 use Pterodactyl\Exceptions\DisplayException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
         $query = Models\User::where('id', $id);
 
         if (!is_null($request->input('fields'))) {
-            foreach(explode(',', $request->input('fields')) as $field) {
+            foreach (explode(',', $request->input('fields')) as $field) {
                 if (!empty($field)) {
                     $query->addSelect($field);
                 }
@@ -97,7 +97,7 @@ 
 
             $user = $query->first();
             $userArray = $user->toArray();
-            $userArray['servers'] =  Models\Server::select('id', 'uuid', 'node', 'suspended')->where('owner', $user->id)->get();
+            $userArray['servers'] = Models\Server::select('id', 'uuid', 'node', 'suspended')->where('owner', $user->id)->get();
 
             return $userArray;
         } catch (NotFoundHttpException $ex) {
@@ -129,7 +129,7 @@ 
         try {
             $user = new UserRepository;
             $create = $user->create($request->input('email'), $request->input('password'), $request->input('admin'), $request->input('custom_id'));
-            return [ 'id' => $create ];
+            return ['id' => $create];
         } catch (DisplayValidationException $ex) {
             throw new ResourceException('A validation error occured.', json_decode($ex->getMessage(), true));
         } catch (DisplayException $ex) {

app/Http/Controllers/Auth/LoginController.php

Doc Comments +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
      * Check if the provided user has TOTP enabled.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function checkTotp(Request $request)
     {

Unused Use Statements -6 removed lines

@@ -25,17 +25,11 @@
 namespace Pterodactyl\Http\Controllers\Auth;
 
 use Pterodactyl\Models\User;
-
 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 Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 class LoginController extends Controller

Spacing +2 added lines, -2 removed lines

@@ -117,9 +117,9 @@
         }
 
         // 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 (is_null($request->input('totp_token')) || !$G2FA->verifyKey(Auth::user()->totp_secret, $request->input('totp_token'))) {
 
                 if (!$lockedOut) {
                     $this->incrementLoginAttempts($request);