@@ -26,14 +26,11 @@ |
||
26 | 26 | |
27 | 27 | use Alert; |
28 | 28 | use Log; |
29 | - |
|
30 | 29 | use Pterodactyl\Models; |
31 | - |
|
32 | 30 | use Pterodactyl\Repositories\APIRepository; |
33 | 31 | use Pterodactyl\Exceptions\DisplayValidationException; |
34 | 32 | use Pterodactyl\Exceptions\DisplayException; |
35 | 33 | use Pterodactyl\Http\Controllers\Controller; |
36 | - |
|
37 | 34 | use Illuminate\Http\Request; |
38 | 35 | |
39 | 36 | class APIController extends Controller |
@@ -41,7 +41,7 @@ |
||
41 | 41 | public function index(Request $request) |
42 | 42 | { |
43 | 43 | $keys = Models\APIKey::where('user', $request->user()->id)->get(); |
44 | - foreach($keys as &$key) { |
|
44 | + foreach ($keys as &$key) { |
|
45 | 45 | $key->permissions = Models\APIPermission::where('key_id', $key->id)->get(); |
46 | 46 | } |
47 | 47 |
@@ -26,7 +26,6 @@ |
||
26 | 26 | |
27 | 27 | use Pterodactyl\Models\Server; |
28 | 28 | use Pterodactyl\Http\Controllers\Controller; |
29 | - |
|
30 | 29 | use Illuminate\Http\Request; |
31 | 30 | |
32 | 31 | class IndexController extends Controller |
@@ -25,7 +25,6 @@ |
||
25 | 25 | |
26 | 26 | use Auth; |
27 | 27 | use Session; |
28 | - |
|
29 | 28 | use Pterodactyl\Models\User; |
30 | 29 | use Illuminate\Http\Request; |
31 | 30 | use Pterodactyl\Http\Controllers\Controller; |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | * that they can generate a valid response. |
54 | 54 | * |
55 | 55 | * @param \Illuminate\Http\Request $request |
56 | - * @return \Illuminate\Contracts\View\View |
|
56 | + * @return \Illuminate\Http\JsonResponse |
|
57 | 57 | */ |
58 | 58 | public function generateTotp(Request $request) |
59 | 59 | { |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | * Disables TOTP on an account. |
101 | 101 | * |
102 | 102 | * @param \Illuminate\Http\Request $request |
103 | - * @return \Illuminate\Http\Response |
|
103 | + * @return \Illuminate\Http\RedirectResponse |
|
104 | 104 | */ |
105 | 105 | public function disableTotp(Request $request) |
106 | 106 | { |
@@ -26,10 +26,8 @@ |
||
26 | 26 | |
27 | 27 | use Google2FA; |
28 | 28 | use Alert; |
29 | - |
|
30 | 29 | use Pterodactyl\Models\Session; |
31 | 30 | use Pterodactyl\Http\Controllers\Controller; |
32 | - |
|
33 | 31 | use Illuminate\Http\Request; |
34 | 32 | |
35 | 33 | class SecurityController extends Controller |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | } |
89 | 89 | |
90 | 90 | $user = $request->user(); |
91 | - if($user->toggleTotp($request->input('token'))) { |
|
91 | + if ($user->toggleTotp($request->input('token'))) { |
|
92 | 92 | return response('true'); |
93 | 93 | } |
94 | 94 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | } |
112 | 112 | |
113 | 113 | $user = $request->user(); |
114 | - if($user->toggleTotp($request->input('token'))) { |
|
114 | + if ($user->toggleTotp($request->input('token'))) { |
|
115 | 115 | return redirect()->route('account.security'); |
116 | 116 | } |
117 | 117 |
@@ -24,9 +24,7 @@ |
||
24 | 24 | namespace Pterodactyl\Http\Controllers\Remote; |
25 | 25 | |
26 | 26 | use Pterodactyl\Models; |
27 | -use Pterodactyl\Exceptions\DisplayException; |
|
28 | 27 | use Pterodactyl\Services\NotificationService; |
29 | - |
|
30 | 28 | use Pterodactyl\Http\Controllers\Controller; |
31 | 29 | use Illuminate\Http\Request; |
32 | 30 |
@@ -67,7 +67,7 @@ |
||
67 | 67 | * |
68 | 68 | * @param \Illuminate\Http\Request $request |
69 | 69 | * @param string $uuid |
70 | - * @return \Illuminate\Contracts\View\View |
|
70 | + * @return \Illuminate\Http\JsonResponse |
|
71 | 71 | */ |
72 | 72 | public function getStatus(Request $request, $uuid) |
73 | 73 | { |
@@ -25,15 +25,11 @@ |
||
25 | 25 | |
26 | 26 | use Log; |
27 | 27 | use Pterodactyl\Models; |
28 | - |
|
29 | 28 | use Pterodactyl\Exceptions\DisplayException; |
30 | 29 | use Pterodactyl\Exceptions\DisplayValidationException; |
31 | - |
|
32 | 30 | use Pterodactyl\Repositories; |
33 | 31 | use Pterodactyl\Http\Controllers\Controller; |
34 | 32 | use Illuminate\Http\Request; |
35 | - |
|
36 | -use GuzzleHttp\Client; |
|
37 | 33 | use GuzzleHttp\Exception\RequestException; |
38 | 34 | |
39 | 35 | class AjaxController extends Controller |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $res = $client->request('GET', '/server', [ |
84 | 84 | 'headers' => Models\Server::getGuzzleHeaders($uuid) |
85 | 85 | ]); |
86 | - if($res->getStatusCode() === 200) { |
|
86 | + if ($res->getStatusCode() === 200) { |
|
87 | 87 | return response()->json(json_decode($res->getBody())); |
88 | 88 | } |
89 | 89 | } catch (RequestException $e) { |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | return response()->json([ |
235 | 235 | 'error' => $ex->getMessage(), |
236 | 236 | ], 503); |
237 | - } catch(\Exception $ex) { |
|
237 | + } catch (\Exception $ex) { |
|
238 | 238 | Log::error($ex); |
239 | 239 | return response()->json([ |
240 | 240 | 'error' => 'An unhandled error occured while attempting to modify this database\'s password.' |
@@ -169,7 +169,7 @@ |
||
169 | 169 | * @param Request $request |
170 | 170 | * @param string $uuid |
171 | 171 | * @param string $file |
172 | - * @return \Illuminate\Contracts\View\View |
|
172 | + * @return \Illuminate\Http\RedirectResponse |
|
173 | 173 | */ |
174 | 174 | public function getDownloadFile(Request $request, $uuid, $file) |
175 | 175 | { |
@@ -23,21 +23,17 @@ |
||
23 | 23 | */ |
24 | 24 | namespace Pterodactyl\Http\Controllers\Server; |
25 | 25 | |
26 | -use Auth; |
|
27 | 26 | use DB; |
28 | 27 | use Uuid; |
29 | 28 | use Alert; |
30 | 29 | use Log; |
31 | - |
|
32 | 30 | use Pterodactyl\Models; |
33 | 31 | use Pterodactyl\Exceptions\DisplayException; |
34 | 32 | use Pterodactyl\Exceptions\DisplayValidationException; |
35 | 33 | use Pterodactyl\Repositories\Daemon\FileRepository; |
36 | 34 | use Pterodactyl\Repositories\ServerRepository; |
37 | - |
|
38 | 35 | use Pterodactyl\Http\Controllers\Controller; |
39 | 36 | use Illuminate\Http\Request; |
40 | - |
|
41 | 37 | use InvalidArgumentException; |
42 | 38 | |
43 | 39 | class ServerController extends Controller |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | |
188 | 188 | $download->save(); |
189 | 189 | |
190 | - return redirect( $node->scheme . '://' . $node->fqdn . ':' . $node->daemonListen . '/server/file/download/' . $download->token); |
|
190 | + return redirect($node->scheme . '://' . $node->fqdn . ':' . $node->daemonListen . '/server/file/download/' . $download->token); |
|
191 | 191 | |
192 | 192 | } |
193 | 193 | |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | ]; |
225 | 225 | |
226 | 226 | $processed = str_replace(array_keys($serverVariables), array_values($serverVariables), $server->startup); |
227 | - foreach($variables as &$variable) { |
|
227 | + foreach ($variables as &$variable) { |
|
228 | 228 | $replace = ($variable->user_viewable === 1) ? $variable->a_serverValue : '**'; |
229 | 229 | $processed = str_replace('{{' . $variable->env_variable . '}}', $replace, $processed); |
230 | 230 | } |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | Alert::success('Server startup variables were successfully updated.')->flash(); |
276 | 276 | } catch (DisplayException $ex) { |
277 | 277 | Alert::danger($ex->getMessage())->flash(); |
278 | - } catch(\Exception $ex) { |
|
278 | + } catch (\Exception $ex) { |
|
279 | 279 | Log::error($ex); |
280 | 280 | Alert::danger('An unhandled exception occured while attemping to update startup variables for this server. Please try again.')->flash(); |
281 | 281 | } |
@@ -27,13 +27,10 @@ |
||
27 | 27 | use Auth; |
28 | 28 | use Alert; |
29 | 29 | use Log; |
30 | - |
|
31 | 30 | use Pterodactyl\Models; |
32 | 31 | use Pterodactyl\Repositories\SubuserRepository; |
33 | - |
|
34 | 32 | use Pterodactyl\Exceptions\DisplayException; |
35 | 33 | use Pterodactyl\Exceptions\DisplayValidationException; |
36 | - |
|
37 | 34 | use Illuminate\Http\Request; |
38 | 35 | use Pterodactyl\Http\Controllers\Controller; |
39 | 36 |
@@ -85,7 +85,7 @@ |
||
85 | 85 | ->where('user_id', $subuser->user_id)->where('server_id', $server->id) |
86 | 86 | ->get(); |
87 | 87 | |
88 | - foreach($modelPermissions as &$perm) { |
|
88 | + foreach ($modelPermissions as &$perm) { |
|
89 | 89 | $permissions[$perm->permission] = true; |
90 | 90 | } |
91 | 91 |
@@ -25,13 +25,10 @@ |
||
25 | 25 | |
26 | 26 | use Alert; |
27 | 27 | use Log; |
28 | -use Cron; |
|
29 | - |
|
30 | 28 | use Pterodactyl\Repositories; |
31 | 29 | use Pterodactyl\Models; |
32 | 30 | use Pterodactyl\Exceptions\DisplayException; |
33 | 31 | use Pterodactyl\Exceptions\DisplayValidationException; |
34 | - |
|
35 | 32 | use Pterodactyl\Http\Controllers\Controller; |
36 | 33 | use Illuminate\Http\Request; |
37 | 34 |