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

Apply fixes from StyleCI (#312)

Browse source 
* Bump for release

* Apply fixes from StyleCI
This commit is contained in:
Dane Everitt 2017-02-18 22:57:50 -05:00 committed by GitHub
parent ed4068bdb9
commit b11029a666
8 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/Base/APIController.php
View file

@ -80,6 +80,7 @@ class APIController extends Controller
return response('', 204);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An error occured while attempting to remove this key.',
], 503);

3
app/Policies/ServerPolicy.php
View file

@ -31,7 +31,6 @@ use Pterodactyl\Models\Server;
class ServerPolicy
{
/**
* Create a new policy instance.
*
@ -62,7 +61,7 @@ class ServerPolicy
})->values();
});
return ($permissions->search($permission, true) !== false);
return $permissions->search($permission, true) !== false;
}
/**

2
app/Repositories/APIRepository.php
View file

@ -225,7 +225,7 @@ class APIRepository
try {
$model = Models\APIKey::with('permissions')->where('public', $key)->where('user_id', $this->user->id)->firstOrFail();
foreach($model->permissions as &$permission) {
foreach ($model->permissions as &$permission) {
$permission->delete();
}

1
app/Repositories/Daemon/CommandRepository.php
View file

@ -24,7 +24,6 @@
namespace Pterodactyl\Repositories\Daemon;
use GuzzleHttp\Client;
use Pterodactyl\Models;
use GuzzleHttp\Exception\RequestException;
use Pterodactyl\Exceptions\DisplayException;

1
app/Repositories/Daemon/PowerRepository.php
View file

@ -24,7 +24,6 @@
namespace Pterodactyl\Repositories\Daemon;
use GuzzleHttp\Client;
use Pterodactyl\Models;
use Pterodactyl\Exceptions\DisplayException;

4
app/Repositories/ServerRepository.php
View file

@ -791,8 +791,8 @@ class ServerRepository
Models\ServerVariable::where('server_id', $server->id)->delete();
// Remove SubUsers
foreach(Models\Subuser::with('permissions')->where('server_id', $server->id)->get() as &$subuser) {
foreach($subuser->permissions as &$permission) {
foreach (Models\Subuser::with('permissions')->where('server_id', $server->id)->get() as &$subuser) {
foreach ($subuser->permissions as &$permission) {
$permission->delete();
}
$subuser->delete();

5
app/Repositories/UserRepository.php
View file

@ -34,7 +34,6 @@ use Validator;
use Pterodactyl\Models;
use Pterodactyl\Services\UuidService;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Notifications\AccountCreated;
use Pterodactyl\Exceptions\DisplayValidationException;
class UserRepository
@ -177,8 +176,8 @@ class UserRepository
DB::beginTransaction();
try {
foreach(Models\Subuser::with('permissions')->where('user_id', $id)->get() as &$subuser) {
foreach($subuser->permissions as &$permission) {
foreach (Models\Subuser::with('permissions')->where('user_id', $id)->get() as &$subuser) {
foreach ($subuser->permissions as &$permission) {
$permission->delete();
}

2
config/app.php
View file

@ -4,7 +4,7 @@ return [
'env' => env('APP_ENV', 'production'),
'version' => env('APP_VERSION', 'canary'),
'version' => env('APP_VERSION', '0.6.0-pre.4'),
'phrase_in_context' => env('PHRASE_IN_CONTEXT', false),