StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Apply fixes from StyleCI (#372)

Browse source
This commit is contained in:
Dane Everitt 2017-04-09 19:16:39 -04:00 • committed by GitHub
parent 7bd14db646
commit 93d79994f8
22 changed files with 43 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/API/Admin/NodeController.php
View file

@ -27,8 +27,8 @@ namespace Pterodactyl\Http\Controllers\API\Admin;
use Fractal;
use Illuminate\Http\Request;
use Pterodactyl\Models\Node;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Repositories\NodeRepository;
use Pterodactyl\Transformers\Admin\NodeTransformer;
use Pterodactyl\Exceptions\DisplayValidationException;
@ -135,6 +135,7 @@ class NodeController extends Controller
], 400);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to create this node. Please try again.',
], 500);
@ -163,6 +164,7 @@ class NodeController extends Controller
], 400);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to delete this node. Please try again.',
], 500);

17
app/Http/Controllers/API/Admin/ServerController.php
View file

@ -113,11 +113,13 @@ class ServerController extends Controller
], 400);
} catch (TransferException $ex) {
Log::warning($ex);
return response()->json([
'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
], 504);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to add this server. Please try again.',
], 500);
@ -146,18 +148,20 @@ class ServerController extends Controller
], 400);
} catch (TransferException $ex) {
Log::warning($ex);
return response()->json([
'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
], 504);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to add this server. Please try again.',
], 500);
}
}
/**
/**
* Update the details for a server.
*
* @param \Illuminate\Http\Request $request
@ -190,6 +194,7 @@ class ServerController extends Controller
], 400);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to modify this server. Please try again.',
], 500);
@ -223,11 +228,13 @@ class ServerController extends Controller
], 400);
} catch (TransferException $ex) {
Log::warning($ex);
return response()->json([
'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
], 504);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to modify this server container. Please try again.',
], 500);
@ -256,6 +263,7 @@ class ServerController extends Controller
], 400);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to toggle the install status for this server. Please try again.',
], 500);
@ -283,6 +291,7 @@ class ServerController extends Controller
return response('', 204);
} catch (TransferException $ex) {
Log::warning($ex);
return response()->json([
'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
], 504);
@ -318,11 +327,13 @@ class ServerController extends Controller
], 400);
} catch (TransferException $ex) {
Log::warning($ex);
return response()->json([
'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
], 504);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to ' . $action . ' this server. Please try again.',
], 500);
@ -363,11 +374,13 @@ class ServerController extends Controller
], 400);
} catch (TransferException $ex) {
Log::warning($ex);
return response()->json([
'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
], 504);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to modify the build settings for this server. Please try again.',
], 500);
@ -400,11 +413,13 @@ class ServerController extends Controller
], 400);
} catch (TransferException $ex) {
Log::warning($ex);
return response()->json([
'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
], 504);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to modify the startup settings for this server. Please try again.',
], 500);

5
app/Http/Controllers/API/Admin/UserController.php
View file

@ -27,8 +27,8 @@ namespace Pterodactyl\Http\Controllers\API\Admin;
use Fractal;
use Illuminate\Http\Request;
use Pterodactyl\Models\User;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Repositories\UserRepository;
use Pterodactyl\Transformers\Admin\UserTransformer;
use Pterodactyl\Exceptions\DisplayValidationException;
@ -109,6 +109,7 @@ class UserController extends Controller
], 400);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to create this user. Please try again.',
], 500);
@ -145,6 +146,7 @@ class UserController extends Controller
], 400);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to update this user. Please try again.',
], 500);
@ -173,6 +175,7 @@ class UserController extends Controller
], 400);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An unhandled exception occured while attemping to delete this user. Please try again.',
], 500);

3
app/Http/Controllers/API/User/ServerController.php
View file

@ -27,10 +27,9 @@ namespace Pterodactyl\Http\Controllers\API\User;
use Fractal;
use Illuminate\Http\Request;
use Pterodactyl\Models\Server;
use GuzzleHttp\Exception\ConnectException;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Transformers\User\ServerTransformer;
use Pterodactyl\Repositories\Daemon\PowerRepository;
use Pterodactyl\Transformers\User\ServerTransformer;
class ServerController extends Controller
{

4
app/Http/Middleware/CheckServer.php
View file

@ -64,7 +64,7 @@ class CheckServer
$this->request = $request;
$this->server = Server::byUuid($request->route()->server);
if(! $this->exists()) {
if (! $this->exists()) {
return response()->view('errors.404', [], 404);
}
@ -124,6 +124,6 @@ class CheckServer
}
}
return ($this->server->installed === 1);
return $this->server->installed === 1;
}
}

13
app/Http/Middleware/HMACAuthorization.php
View file

@ -28,13 +28,11 @@ use Auth;
use Crypt;
use Config;
use Closure;
use Response;
use Debugbar;
use IPTools\IP;
use IPTools\Range;
use Illuminate\Http\Request;
use Pterodactyl\Models\APIKey;
use Pterodactyl\Models\APIPermission;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; // 400
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; // 403
@ -150,7 +148,7 @@ class HMACAuthorization
protected function validateIPAccess()
{
if (! is_null($this->key()->allowed_ips)) {
foreach($this->key()->allowed_ips as $ip) {
foreach ($this->key()->allowed_ips as $ip) {
if (Range::parse($ip)->contains(new IP($this->request()->ip()))) {
return true;
}
@ -194,7 +192,8 @@ class HMACAuthorization
*
* @return string
*/
protected function public() {
protected function public()
{
return $this->token['public'];
}
@ -203,7 +202,8 @@ class HMACAuthorization
*
* @return string
*/
protected function hash() {
protected function hash()
{
return $this->token['hash'];
}
@ -212,7 +212,8 @@ class HMACAuthorization
*
* @return \Pterodactyl\Models\APIKey
*/
protected function key() {
protected function key()
{
return $this->key;
}