Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Author: DaneEveritt

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -65,14 +65,14 @@ public function __construct(ConfigRepository $config)
     public function handle()
     {
         $this->variables['MAIL_DRIVER'] = $this->option('driver') ?? $this->choice(
-                trans('command/messages.environment.mail.ask_driver'), [
+            trans('command/messages.environment.mail.ask_driver'), [
                 'smtp' => 'SMTP Server',
                 'mail' => 'PHP\'s Internal Mail Function',
                 'mailgun' => 'Mailgun Transactional Email',
                 'mandrill' => 'Mandrill Transactional Email',
                 'postmark' => 'Postmarkapp Transactional Email',
             ], $this->config->get('mail.driver', 'smtp')
-            );
+        );
 
         $method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables';
         if (method_exists($this, $method)) {

app/Contracts/Repository/UserRepositoryInterface.php

@@ -22,4 +22,12 @@ public function getAllUsersWithCounts(): LengthAwarePaginator;
      * @return \Illuminate\Support\Collection
      */
     public function filterUsersByQuery(?string $query): Collection;
+
+    /**
+     * Returns a user with the given id in a format that can be used for dropdowns.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\Model
+     */
+    public function filterById(int $id): \Pterodactyl\Models\Model;
 }

app/Helpers/Utilities.php

@@ -6,6 +6,7 @@
 use Carbon\Carbon;
 use Cron\CronExpression;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\ViewErrorBag;
 
 class Utilities
 {
@@ -50,4 +51,15 @@ public static function getScheduleNextRunDate(string $minute, string $hour, stri
             sprintf('%s %s %s * %s', $minute, $hour, $dayOfMonth, $dayOfWeek)
         )->getNextRunDate());
     }
+
+    public static function checked($name, $default)
+    {
+        $errors = session('errors');
+
+        if (isset($errors) && $errors instanceof ViewErrorBag && $errors->any()) {
+            return old($name) ? 'checked' : '';
+        }
+
+        return ($default) ? 'checked' : '';
+    }
 }

app/Http/Controllers/Admin/DatabaseController.php

@@ -165,6 +165,7 @@ public function update(DatabaseHostFormRequest $request, DatabaseHost $host): Re
                 $this->alert->danger(
                     sprintf('There was an error while trying to connect to the host or while executing a query: "%s"', $exception->getMessage())
                 )->flash();
+
                 return $redirect->withInput($request->normalize());
             } else {
                 throw $exception;

app/Http/Controllers/Admin/UserController.php

@@ -177,10 +177,15 @@ public function update(UserFormRequest $request, User $user)
      * Get a JSON response of users on the system.
      *
      * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Support\Collection|\Pterodactyl\Models\Model
      */
     public function json(Request $request)
     {
+        // Handle single user requests.
+        if ($request->query('user_id')) {
+            return $this->repository->filterById($request->input('user_id'));
+        }
+
         return $this->repository->filterUsersByQuery($request->input('q'));
     }
 }

app/Http/Controllers/Api/Client/Servers/ScheduleTaskController.php

@@ -86,7 +86,7 @@ public function update(StoreTaskRequest $request, Server $server, Schedule $sche
         }
 
         $this->repository->update($task->id, [
-           'action' => $request->input('action'),
+            'action' => $request->input('action'),
             'payload' => $request->input('payload'),
             'time_offset' => $request->input('time_offset'),
         ]);

app/Http/Controllers/Api/Remote/Servers/ServerBackupController.php

@@ -3,8 +3,6 @@
 namespace Pterodactyl\Http\Controllers\Api\Remote\Servers;
 
 use Carbon\Carbon;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Server;
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Repositories\Eloquent\BackupRepository;

app/Repositories/Eloquent/UserRepository.php

@@ -54,4 +54,22 @@ public function filterUsersByQuery(?string $query): Collection
             return $item;
         });
     }
+
+    /**
+     * Returns a user with the given id in a format that can be used for dropdowns.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\Model
+     */
+    public function filterById(int $id): \Pterodactyl\Models\Model
+    {
+        $this->setColumns([
+            'id', 'email', 'username', 'name_first', 'name_last',
+        ]);
+
+        $model = $this->getBuilder()->findOrFail($id, $this->getColumns())->getModel();
+        $model->md5 = md5(strtolower($model->email));
+
+        return $model;
+    }
 }

app/Services/Nodes/NodeCreationService.php

@@ -41,8 +41,8 @@ public function __construct(Encrypter $encrypter, NodeRepositoryInterface $repos
      */
     public function handle(array $data)
     {
-        $data['daemon_token'] = Str::random(Node::DAEMON_TOKEN_LENGTH);
-        $data['daemon_token_id'] = $this->encrypter->encrypt(Str::random(Node::DAEMON_TOKEN_ID_LENGTH));
+        $data['daemon_token'] = $this->encrypter->encrypt(Str::random(Node::DAEMON_TOKEN_LENGTH));
+        $data['daemon_token_id'] = Str::random(Node::DAEMON_TOKEN_ID_LENGTH);
 
         return $this->repository->create($data, true, true);
     }

config/ide-helper.php

@@ -168,8 +168,8 @@
     | Cast the given "real type" to the given "type".
     |
     */
-   'type_overrides' => [
+    'type_overrides' => [
         'integer' => 'int',
         'boolean' => 'bool',
-   ],
+    ],
 ];