Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply fixes from StyleCI (#471)

Browse source
This commit is contained in:
Dane Everitt 2017-06-03 17:07:50 -05:00 committed by GitHub
parent 2f0f002299
commit 265b697066
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/Server/AjaxController.php
View file

@ -28,7 +28,6 @@ use Log;
use Pterodactyl\Models; use Pterodactyl\Models;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Pterodactyl\Repositories; use Pterodactyl\Repositories;
use GuzzleHttp\Exception\RequestException;
use Pterodactyl\Exceptions\DisplayException; use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Controller; use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Exceptions\DisplayValidationException; use Pterodactyl\Exceptions\DisplayValidationException;

2
app/Repositories/Daemon/FileRepository.php
View file

@ -146,7 +146,7 @@ class FileRepository
try { try {
$res = $this->server->guzzleClient()->request('GET', '/server/directory/' . rawurlencode($directory)); $res = $this->server->guzzleClient()->request('GET', '/server/directory/' . rawurlencode($directory));
} catch(\GuzzleHttp\Exception\ClientException $ex) { } catch (\GuzzleHttp\Exception\ClientException $ex) {
$json = json_decode($ex->getResponse()->getBody()); $json = json_decode($ex->getResponse()->getBody());
throw new DisplayException($json->error); throw new DisplayException($json->error);

2
app/Repositories/ServerRepository.php
View file

@ -724,7 +724,7 @@ class ServerRepository
$allocations = $server->allocations->where('id', '!=', $server->allocation_id); $allocations = $server->allocations->where('id', '!=', $server->allocation_id);
$i = 0; $i = 0;
foreach($allocations as $allocation) { foreach ($allocations as $allocation) {
$merge[] = [ $merge[] = [
'variable' => 'ALLOC_' . $i . '__PORT', 'variable' => 'ALLOC_' . $i . '__PORT',
'value' => $allocation->port, 'value' => $allocation->port,