Pterodactyl / Panel

app/Repositories/ServerRepository.php

Unused Use Statements -4 removed lines

@@ -25,18 +25,14 @@
 
 use Crypt;
 use DB;
-use Debugbar;
 use Validator;
 use Log;
-
 use Pterodactyl\Models;
 use Pterodactyl\Services\UuidService;
 use Pterodactyl\Services\DeploymentService;
 use Pterodactyl\Notifications\ServerCreated;
 use Pterodactyl\Events\ServerDeleted;
-
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Exceptions\AccountNotFoundException;
 use Pterodactyl\Exceptions\DisplayValidationException;
 
 class ServerRepository

Spacing +16 added lines, -16 removed lines

@@ -92,19 +92,19 @@ 
             'custom_id' => 'sometimes|required|numeric|unique:servers,id',
         ]);
 
-        $validator->sometimes('node', 'bail|required|numeric|min:1|exists:nodes,id', function ($input) {
+        $validator->sometimes('node', 'bail|required|numeric|min:1|exists:nodes,id', function($input) {
             return !($input->auto_deploy);
         });
 
-        $validator->sometimes('ip', 'required|ip', function ($input) {
+        $validator->sometimes('ip', 'required|ip', function($input) {
             return (!$input->auto_deploy && !$input->allocation);
         });
 
-        $validator->sometimes('port', 'required|numeric|min:1|max:65535', function ($input) {
+        $validator->sometimes('port', 'required|numeric|min:1|max:65535', function($input) {
             return (!$input->auto_deploy && !$input->allocation);
         });
 
-        $validator->sometimes('allocation', 'numeric|exists:allocations,id', function ($input) {
+        $validator->sometimes('allocation', 'numeric|exists:allocations,id', function($input) {
             return !($input->auto_deploy || ($input->port && $input->ip));
         });
 
@@ -144,7 +144,7 @@ 
             if (!isset($data['allocation'])) {
                 $allocation = Models\Allocation::where('ip', $data['ip'])->where('port', $data['port'])->where('node', $data['node'])->whereNull('assigned_to')->first();
             } else {
-                $allocation = Models\Allocation::where('id' , $data['allocation'])->where('node', $data['node'])->whereNull('assigned_to')->first();
+                $allocation = Models\Allocation::where('id', $data['allocation'])->where('node', $data['node'])->whereNull('assigned_to')->first();
             }
         }
 
@@ -169,7 +169,7 @@ 
         $variables = Models\ServiceVariables::where('option_id', $data['option'])->get();
         $variableList = [];
         if ($variables) {
-            foreach($variables as $variable) {
+            foreach ($variables as $variable) {
 
                 // Is the variable required?
                 if (!$data['env_' . $variable->env_variable]) {
@@ -208,7 +208,7 @@ 
                 if (is_numeric($node->memory_overallocate)) {
                     $newMemory = $totals->memory + $data['memory'];
                     $memoryLimit = ($node->memory * (1 + ($node->memory_overallocate / 100)));
-                    if($newMemory > $memoryLimit) {
+                    if ($newMemory > $memoryLimit) {
                         throw new DisplayException('The amount of memory allocated to this server would put the node over its allocation limits. This node is allowed ' . ($node->memory_overallocate + 100) . '% of its assigned ' . $node->memory . 'Mb of memory (' . $memoryLimit . 'Mb) of which ' . (($totals->memory / $node->memory) * 100) . '% (' . $totals->memory . 'Mb) is in use already. By allocating this server the node would be at ' . (($newMemory / $node->memory) * 100) . '% (' . $newMemory . 'Mb) usage.');
                     }
                 }
@@ -217,7 +217,7 @@ 
                 if (is_numeric($node->disk_overallocate)) {
                     $newDisk = $totals->disk + $data['disk'];
                     $diskLimit = ($node->disk * (1 + ($node->disk_overallocate / 100)));
-                    if($newDisk > $diskLimit) {
+                    if ($newDisk > $diskLimit) {
                         throw new DisplayException('The amount of disk allocated to this server would put the node over its allocation limits. This node is allowed ' . ($node->disk_overallocate + 100) . '% of its assigned ' . $node->disk . 'Mb of disk (' . $diskLimit . 'Mb) of which ' . (($totals->disk / $node->disk) * 100) . '% (' . $totals->disk . 'Mb) is in use already. By allocating this server the node would be at ' . (($newDisk / $node->disk) * 100) . '% (' . $newDisk . 'Mb) usage.');
                     }
                 }
@@ -271,7 +271,7 @@ 
             $environmentVariables = array_merge($environmentVariables, [
                 'STARTUP' => $data['startup']
             ]);
-            foreach($variableList as $item) {
+            foreach ($variableList as $item) {
                 $environmentVariables = array_merge($environmentVariables, [
                     $item['env'] => $item['val']
                 ]);
@@ -306,7 +306,7 @@ 
                             'port' => (int) $allocation->port
                         ],
                         'ports' => [
-                            (string) $allocation->ip => [ (int) $allocation->port ]
+                            (string) $allocation->ip => [(int) $allocation->port]
                         ],
                         'env' => $environmentVariables,
                         'memory' => (int) $server->memory,
@@ -418,7 +418,7 @@ 
                 DB::commit();
                 return true;
             } else {
-                throw new DisplayException('Daemon returned a a non HTTP/204 error code. HTTP/' + $res->getStatusCode());
+                throw new DisplayException('Daemon returned a a non HTTP/204 error code. HTTP/' +$res->getStatusCode());
             }
         } catch (\Exception $ex) {
             DB::rollBack();
@@ -584,9 +584,9 @@ 
             $assignments = Models\Allocation::where('assigned_to', $server->id)->get();
             foreach ($assignments as &$assignment) {
                 if (array_key_exists((string) $assignment->ip, $additionalAssignments)) {
-                    array_push($additionalAssignments[ (string) $assignment->ip ], (int) $assignment->port);
+                    array_push($additionalAssignments[(string) $assignment->ip], (int) $assignment->port);
                 } else {
-                    $additionalAssignments[ (string) $assignment->ip ] = [ (int) $assignment->port ];
+                    $additionalAssignments[(string) $assignment->ip] = [(int) $assignment->port];
                 }
             }
 
@@ -678,7 +678,7 @@ 
 
             $variableList = [];
             if ($variables) {
-                foreach($variables as &$variable) {
+                foreach ($variables as &$variable) {
                     // Move on if the new data wasn't even sent
                     if (!isset($data[$variable->env_variable])) {
                         $variableList = array_merge($variableList, [[
@@ -730,7 +730,7 @@ 
             $environmentVariables = array_merge($environmentVariables, [
                 'STARTUP' => $server->startup
             ]);
-            foreach($variableList as $item) {
+            foreach ($variableList as $item) {
                 $environmentVariables = array_merge($environmentVariables, [
                     $item['env'] => $item['val']
                 ]);
@@ -828,7 +828,7 @@ 
             // This is the one un-recoverable point where
             // transactions will not save us.
             $repository = new DatabaseRepository;
-            foreach(Models\Database::select('id')->where('server_id', $server->id)->get() as &$database) {
+            foreach (Models\Database::select('id')->where('server_id', $server->id)->get() as &$database) {
                 $repository->drop($database->id);
             }
 

app/Repositories/ServiceRepository/Option.php

Unused Use Statements -3 removed lines

@@ -25,10 +25,7 @@
 
 use DB;
 use Validator;
-
 use Pterodactyl\Models;
-use Pterodactyl\Services\UuidService;
-
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Exceptions\DisplayValidationException;
 

app/Repositories/ServiceRepository/Service.php

Unused Use Statements -3 removed lines

@@ -26,10 +26,7 @@
 use DB;
 use Validator;
 use Uuid;
-
 use Pterodactyl\Models;
-use Pterodactyl\Services\UuidService;
-
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Exceptions\DisplayValidationException;
 

app/Repositories/ServiceRepository/Variable.php

Unused Use Statements -3 removed lines

@@ -25,10 +25,7 @@
 
 use DB;
 use Validator;
-
 use Pterodactyl\Models;
-use Pterodactyl\Services\UuidService;
-
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Exceptions\DisplayValidationException;
 

app/Repositories/SubuserRepository.php

Doc Comments +1 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
 
     /**
      * Creates a new subuser on the server.
-     * @param  integer $id     The ID of the server to add this subuser to.
+     * @param  integer $sid     The ID of the server to add this subuser to.
      * @param  array  $data
      * @throws DisplayValidationException
      * @throws DisplayException
@@ -215,7 +215,6 @@ 
     /**
      * Revokes a users permissions on a server.
      * @param  integer  $id  The ID of the subuser row in MySQL.
-     * @param  array    $data
      * @throws DisplayValidationException
      * @throws DisplayException
      * @return void

Unused Use Statements -2 removed lines

@@ -27,11 +27,9 @@
 use Settings;
 use Validator;
 use Mail;
-
 use Pterodactyl\Models;
 use Pterodactyl\Repositories\UserRepository;
 use Pterodactyl\Services\UuidService;
-
 use Pterodactyl\Exceptions\DisplayValidationException;
 use Pterodactyl\Exceptions\DisplayException;
 

Spacing +3 added lines, -3 removed lines

@@ -156,7 +156,7 @@ 
             $subuser->save();
 
             $daemonPermissions = $this->coreDaemonPermissions;
-            foreach($data['permissions'] as $permission) {
+            foreach ($data['permissions'] as $permission) {
                 if (array_key_exists($permission, $this->permissions)) {
                     // Build the daemon permissions array for sending.
                     if (!is_null($this->permissions[$permission])) {
@@ -195,7 +195,7 @@ 
             Mail::queue('emails.added-subuser', [
                 'serverName' => $server->name,
                 'url' => route('server.index', $server->uuidShort),
-            ], function ($message) use ($email) {
+            ], function($message) use ($email) {
                 $message->to($email);
                 $message->from(Settings::get('email_from', env('MAIL_FROM')), Settings::get('email_sender_name', env('MAIL_FROM_NAME', 'Pterodactyl Panel')));
                 $message->subject(Settings::get('company') . ' - Added to Server');
@@ -287,7 +287,7 @@ 
             Models\Permission::where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->delete();
 
             $daemonPermissions = $this->coreDaemonPermissions;
-            foreach($data['permissions'] as $permission) {
+            foreach ($data['permissions'] as $permission) {
                 if (array_key_exists($permission, $this->permissions)) {
                     // Build the daemon permissions array for sending.
                     if (!is_null($this->permissions[$permission])) {

app/Repositories/TaskRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
      *
      * @throws DisplayException
      * @throws DisplayValidationException
-     * @return void
+     * @return boolean
      */
     public function create($id, $data)
     {

Unused Use Statements -2 removed lines

@@ -25,9 +25,7 @@
 
 use Cron;
 use Validator;
-
 use Pterodactyl\Models;
-
 use Pterodactyl\Exceptions\DisplayValidationException;
 use Pterodactyl\Exceptions\DisplayException;
 

app/Repositories/UserRepository.php

Doc Comments +2 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
      *
      * @param  integer $id
      * @param  array $data An array of columns and their associated values to update for the user.
-     * @return boolean
+     * @return boolean|null
      */
     public function update($id, array $data)
     {
@@ -154,7 +154,7 @@ 
      * Deletes a user on the panel, returns the number of records deleted.
      *
      * @param  integer $id
-     * @return integer
+     * @return boolean
      */
     public function delete($id)
     {

Unused Use Statements -4 removed lines

@@ -25,17 +25,13 @@
 namespace Pterodactyl\Repositories;
 
 use DB;
-use Settings;
 use Hash;
 use Validator;
-use Mail;
 use Carbon;
 use Auth;
-
 use Pterodactyl\Models;
 use Pterodactyl\Services\UuidService;
 use Pterodactyl\Notifications\AccountCreated;
-
 use Pterodactyl\Exceptions\DisplayValidationException;
 use Pterodactyl\Exceptions\DisplayException;
 

Indentation +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
 
         // @TODO: this should probably be checked outside of this method because we won't always have Auth::user()
         if(!is_null(Auth::user()) && Auth::user()->id === $id) {
-          throw new DisplayException('Cannot delete your own account.');
+            throw new DisplayException('Cannot delete your own account.');
         }
 
         DB::beginTransaction();

Spacing +3 added lines, -3 removed lines

@@ -138,7 +138,7 @@ 
             throw new DisplayValidationException($validator->errors());
         }
 
-        if(array_key_exists('password', $data)) {
+        if (array_key_exists('password', $data)) {
             $data['password'] = Hash::make($data['password']);
         }
 
@@ -158,12 +158,12 @@ 
      */
     public function delete($id)
     {
-        if(Models\Server::where('owner', $id)->count() > 0) {
+        if (Models\Server::where('owner', $id)->count() > 0) {
             throw new DisplayException('Cannot delete a user with active servers attached to thier account.');
         }
 
         // @TODO: this should probably be checked outside of this method because we won't always have Auth::user()
-        if(!is_null(Auth::user()) && Auth::user()->id === $id) {
+        if (!is_null(Auth::user()) && Auth::user()->id === $id) {
           throw new DisplayException('Cannot delete your own account.');
         }
 

app/Services/APILogService.php

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
         //
     }
 
+    /**
+     * @param string $error
+     */
     public static function log(Request $request, $error = null, $authorized = false)
     {
         if ($request->bearerToken() && !empty($request->bearerToken())) {

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 namespace Pterodactyl\Services;
 
 use Log;
-
 use Illuminate\Http\Request;
 use Pterodactyl\Models\APILog;
 

app/Services/DeploymentService.php

Doc Comments +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
      * @param  \Pterodactyl\Models\Node $node
      * @param  int $memory
      * @param  int $disk
-     * @return bool Returns true if this information would not put the node over it's limit.
+     * @return boolean|null Returns true if this information would not put the node over it's limit.
      */
     protected static function checkNodeAllocation(Models\Node $node, $memory, $disk)
     {

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 namespace Pterodactyl\Services;
 
 use DB;
-
 use Pterodactyl\Models;
 use Pterodactyl\Exceptions\DisplayException;