@@ -28,7 +28,7 @@ |
||
28 | 28 | * Get the notification's delivery channels. |
29 | 29 | * |
30 | 30 | * @param mixed $notifiable |
31 | - * @return array |
|
31 | + * @return string[] |
|
32 | 32 | */ |
33 | 33 | public function via($notifiable) |
34 | 34 | { |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | /** |
43 | 43 | * Determine if current user is the owner of a server. |
44 | 44 | * |
45 | - * @param Pterodactyl\Models\User $user |
|
46 | - * @param Pterodactyl\Models\Server $server |
|
45 | + * @param User $user |
|
46 | + * @param Server $server |
|
47 | 47 | * @return boolean |
48 | 48 | */ |
49 | 49 | protected function isOwner(User $user, Server $server) |
@@ -54,9 +54,9 @@ discard block |
||
54 | 54 | /** |
55 | 55 | * Runs before any of the functions are called. Used to determine if user is root admin, if so, ignore permissions. |
56 | 56 | * |
57 | - * @param Pterodactyl\Models\User $user |
|
57 | + * @param User $user |
|
58 | 58 | * @param string $ability |
59 | - * @return boolean |
|
59 | + * @return boolean|null |
|
60 | 60 | */ |
61 | 61 | public function before(User $user, $ability) |
62 | 62 | { |
@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | /** |
69 | 69 | * Check if user has permission to control power for a server. |
70 | 70 | * |
71 | - * @param Pterodactyl\Models\User $user |
|
72 | - * @param Pterodactyl\Models\Server $server |
|
71 | + * @param User $user |
|
72 | + * @param Server $server |
|
73 | 73 | * @return boolean |
74 | 74 | */ |
75 | 75 | public function power(User $user, Server $server) |
@@ -84,8 +84,8 @@ discard block |
||
84 | 84 | /** |
85 | 85 | * Check if user has permission to start a server. |
86 | 86 | * |
87 | - * @param Pterodactyl\Models\User $user |
|
88 | - * @param Pterodactyl\Models\Server $server |
|
87 | + * @param User $user |
|
88 | + * @param Server $server |
|
89 | 89 | * @return boolean |
90 | 90 | */ |
91 | 91 | public function powerStart(User $user, Server $server) |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | /** |
101 | 101 | * Check if user has permission to stop a server. |
102 | 102 | * |
103 | - * @param Pterodactyl\Models\User $user |
|
104 | - * @param Pterodactyl\Models\Server $server |
|
103 | + * @param User $user |
|
104 | + * @param Server $server |
|
105 | 105 | * @return boolean |
106 | 106 | */ |
107 | 107 | public function powerStop(User $user, Server $server) |
@@ -116,8 +116,8 @@ discard block |
||
116 | 116 | /** |
117 | 117 | * Check if user has permission to restart a server. |
118 | 118 | * |
119 | - * @param Pterodactyl\Models\User $user |
|
120 | - * @param Pterodactyl\Models\Server $server |
|
119 | + * @param User $user |
|
120 | + * @param Server $server |
|
121 | 121 | * @return boolean |
122 | 122 | */ |
123 | 123 | public function powerRestart(User $user, Server $server) |
@@ -132,8 +132,8 @@ discard block |
||
132 | 132 | /** |
133 | 133 | * Check if user has permission to kill a server. |
134 | 134 | * |
135 | - * @param Pterodactyl\Models\User $user |
|
136 | - * @param Pterodactyl\Models\Server $server |
|
135 | + * @param User $user |
|
136 | + * @param Server $server |
|
137 | 137 | * @return boolean |
138 | 138 | */ |
139 | 139 | public function powerKill(User $user, Server $server) |
@@ -148,8 +148,8 @@ discard block |
||
148 | 148 | /** |
149 | 149 | * Check if user has permission to run a command on a server. |
150 | 150 | * |
151 | - * @param Pterodactyl\Models\User $user |
|
152 | - * @param Pterodactyl\Models\Server $server |
|
151 | + * @param User $user |
|
152 | + * @param Server $server |
|
153 | 153 | * @return boolean |
154 | 154 | */ |
155 | 155 | public function sendCommand(User $user, Server $server) |
@@ -164,8 +164,8 @@ discard block |
||
164 | 164 | /** |
165 | 165 | * Check if user has permission to list files on a server. |
166 | 166 | * |
167 | - * @param Pterodactyl\Models\User $user |
|
168 | - * @param Pterodactyl\Models\Server $server |
|
167 | + * @param User $user |
|
168 | + * @param Server $server |
|
169 | 169 | * @return boolean |
170 | 170 | */ |
171 | 171 | public function listFiles(User $user, Server $server) |
@@ -180,8 +180,8 @@ discard block |
||
180 | 180 | /** |
181 | 181 | * Check if user has permission to edit files on a server. |
182 | 182 | * |
183 | - * @param Pterodactyl\Models\User $user |
|
184 | - * @param Pterodactyl\Models\Server $server |
|
183 | + * @param User $user |
|
184 | + * @param Server $server |
|
185 | 185 | * @return boolean |
186 | 186 | */ |
187 | 187 | public function editFiles(User $user, Server $server) |
@@ -196,8 +196,8 @@ discard block |
||
196 | 196 | /** |
197 | 197 | * Check if user has permission to save files on a server. |
198 | 198 | * |
199 | - * @param Pterodactyl\Models\User $user |
|
200 | - * @param Pterodactyl\Models\Server $server |
|
199 | + * @param User $user |
|
200 | + * @param Server $server |
|
201 | 201 | * @return boolean |
202 | 202 | */ |
203 | 203 | public function saveFiles(User $user, Server $server) |
@@ -212,8 +212,8 @@ discard block |
||
212 | 212 | /** |
213 | 213 | * Check if user has permission to move and rename files and folders on a server. |
214 | 214 | * |
215 | - * @param Pterodactyl\Models\User $user |
|
216 | - * @param Pterodactyl\Models\Server $server |
|
215 | + * @param User $user |
|
216 | + * @param Server $server |
|
217 | 217 | * @return boolean |
218 | 218 | */ |
219 | 219 | public function moveFiles(User $user, Server $server) |
@@ -228,8 +228,8 @@ discard block |
||
228 | 228 | /** |
229 | 229 | * Check if user has permission to copy folders and files on a server. |
230 | 230 | * |
231 | - * @param Pterodactyl\Models\User $user |
|
232 | - * @param Pterodactyl\Models\Server $server |
|
231 | + * @param User $user |
|
232 | + * @param Server $server |
|
233 | 233 | * @return boolean |
234 | 234 | */ |
235 | 235 | public function copyFiles(User $user, Server $server) |
@@ -244,8 +244,8 @@ discard block |
||
244 | 244 | /** |
245 | 245 | * Check if user has permission to compress files and folders on a server. |
246 | 246 | * |
247 | - * @param Pterodactyl\Models\User $user |
|
248 | - * @param Pterodactyl\Models\Server $server |
|
247 | + * @param User $user |
|
248 | + * @param Server $server |
|
249 | 249 | * @return boolean |
250 | 250 | */ |
251 | 251 | public function compressFiles(User $user, Server $server) |
@@ -260,8 +260,8 @@ discard block |
||
260 | 260 | /** |
261 | 261 | * Check if user has permission to decompress files on a server. |
262 | 262 | * |
263 | - * @param Pterodactyl\Models\User $user |
|
264 | - * @param Pterodactyl\Models\Server $server |
|
263 | + * @param User $user |
|
264 | + * @param Server $server |
|
265 | 265 | * @return boolean |
266 | 266 | */ |
267 | 267 | public function decompressFiles(User $user, Server $server) |
@@ -276,8 +276,8 @@ discard block |
||
276 | 276 | /** |
277 | 277 | * Check if user has permission to add files to a server. |
278 | 278 | * |
279 | - * @param Pterodactyl\Models\User $user |
|
280 | - * @param Pterodactyl\Models\Server $server |
|
279 | + * @param User $user |
|
280 | + * @param Server $server |
|
281 | 281 | * @return boolean |
282 | 282 | */ |
283 | 283 | public function addFiles(User $user, Server $server) |
@@ -293,8 +293,8 @@ discard block |
||
293 | 293 | * Check if user has permission to upload files to a server. |
294 | 294 | * This permission relies on the user having the 'add-files' permission as well due to page authorization. |
295 | 295 | * |
296 | - * @param Pterodactyl\Models\User $user |
|
297 | - * @param Pterodactyl\Models\Server $server |
|
296 | + * @param User $user |
|
297 | + * @param Server $server |
|
298 | 298 | * @return boolean |
299 | 299 | */ |
300 | 300 | public function uploadFiles(User $user, Server $server) |
@@ -309,8 +309,8 @@ discard block |
||
309 | 309 | /** |
310 | 310 | * Check if user has permission to download files from a server. |
311 | 311 | * |
312 | - * @param Pterodactyl\Models\User $user |
|
313 | - * @param Pterodactyl\Models\Server $server |
|
312 | + * @param User $user |
|
313 | + * @param Server $server |
|
314 | 314 | * @return boolean |
315 | 315 | */ |
316 | 316 | public function downloadFiles(User $user, Server $server) |
@@ -325,8 +325,8 @@ discard block |
||
325 | 325 | /** |
326 | 326 | * Check if user has permission to delete files from a server. |
327 | 327 | * |
328 | - * @param Pterodactyl\Models\User $user |
|
329 | - * @param Pterodactyl\Models\Server $server |
|
328 | + * @param User $user |
|
329 | + * @param Server $server |
|
330 | 330 | * @return boolean |
331 | 331 | */ |
332 | 332 | public function deleteFiles(User $user, Server $server) |
@@ -341,8 +341,8 @@ discard block |
||
341 | 341 | /** |
342 | 342 | * Check if user has permission to view subusers for the server. |
343 | 343 | * |
344 | - * @param Pterodactyl\Models\User $user |
|
345 | - * @param Pterodactyl\Models\Server $server |
|
344 | + * @param User $user |
|
345 | + * @param Server $server |
|
346 | 346 | * @return boolean |
347 | 347 | */ |
348 | 348 | public function listSubusers(User $user, Server $server) |
@@ -357,8 +357,8 @@ discard block |
||
357 | 357 | /** |
358 | 358 | * Check if user has permission to view specific subuser permissions. |
359 | 359 | * |
360 | - * @param Pterodactyl\Models\User $user |
|
361 | - * @param Pterodactyl\Models\Server $server |
|
360 | + * @param User $user |
|
361 | + * @param Server $server |
|
362 | 362 | * @return boolean |
363 | 363 | */ |
364 | 364 | public function viewSubuser(User $user, Server $server) |
@@ -373,8 +373,8 @@ discard block |
||
373 | 373 | /** |
374 | 374 | * Check if user has permission to edit a subuser. |
375 | 375 | * |
376 | - * @param Pterodactyl\Models\User $user |
|
377 | - * @param Pterodactyl\Models\Server $server |
|
376 | + * @param User $user |
|
377 | + * @param Server $server |
|
378 | 378 | * @return boolean |
379 | 379 | */ |
380 | 380 | public function editSubuser(User $user, Server $server) |
@@ -389,8 +389,8 @@ discard block |
||
389 | 389 | /** |
390 | 390 | * Check if user has permission to delete a subuser. |
391 | 391 | * |
392 | - * @param Pterodactyl\Models\User $user |
|
393 | - * @param Pterodactyl\Models\Server $server |
|
392 | + * @param User $user |
|
393 | + * @param Server $server |
|
394 | 394 | * @return boolean |
395 | 395 | */ |
396 | 396 | public function deleteSubuser(User $user, Server $server) |
@@ -405,8 +405,8 @@ discard block |
||
405 | 405 | /** |
406 | 406 | * Check if user has permission to edit a subuser. |
407 | 407 | * |
408 | - * @param Pterodactyl\Models\User $user |
|
409 | - * @param Pterodactyl\Models\Server $server |
|
408 | + * @param User $user |
|
409 | + * @param Server $server |
|
410 | 410 | * @return boolean |
411 | 411 | */ |
412 | 412 | public function createSubuser(User $user, Server $server) |
@@ -421,8 +421,8 @@ discard block |
||
421 | 421 | /** |
422 | 422 | * Check if user has permission to set the default connection for a server. |
423 | 423 | * |
424 | - * @param Pterodactyl\Models\User $user |
|
425 | - * @param Pterodactyl\Models\Server $server |
|
424 | + * @param User $user |
|
425 | + * @param Server $server |
|
426 | 426 | * @return boolean |
427 | 427 | */ |
428 | 428 | public function setConnection(User $user, Server $server) |
@@ -437,8 +437,8 @@ discard block |
||
437 | 437 | /** |
438 | 438 | * Check if user has permission to view the startup command used for a server. |
439 | 439 | * |
440 | - * @param Pterodactyl\Models\User $user |
|
441 | - * @param Pterodactyl\Models\Server $server |
|
440 | + * @param User $user |
|
441 | + * @param Server $server |
|
442 | 442 | * @return boolean |
443 | 443 | */ |
444 | 444 | public function viewStartup(User $user, Server $server) |
@@ -453,8 +453,8 @@ discard block |
||
453 | 453 | /** |
454 | 454 | * Check if user has permission to edit the startup command used for a server. |
455 | 455 | * |
456 | - * @param Pterodactyl\Models\User $user |
|
457 | - * @param Pterodactyl\Models\Server $server |
|
456 | + * @param User $user |
|
457 | + * @param Server $server |
|
458 | 458 | * @return boolean |
459 | 459 | */ |
460 | 460 | public function editStartup(User $user, Server $server) |
@@ -469,8 +469,8 @@ discard block |
||
469 | 469 | /** |
470 | 470 | * Check if user has permission to view the SFTP information for a server. |
471 | 471 | * |
472 | - * @param Pterodactyl\Models\User $user |
|
473 | - * @param Pterodactyl\Models\Server $server |
|
472 | + * @param User $user |
|
473 | + * @param Server $server |
|
474 | 474 | * @return boolean |
475 | 475 | */ |
476 | 476 | public function viewSftp(User $user, Server $server) |
@@ -485,8 +485,8 @@ discard block |
||
485 | 485 | /** |
486 | 486 | * Check if user has permission to reset the SFTP password for a server. |
487 | 487 | * |
488 | - * @param Pterodactyl\Models\User $user |
|
489 | - * @param Pterodactyl\Models\Server $server |
|
488 | + * @param User $user |
|
489 | + * @param Server $server |
|
490 | 490 | * @return boolean |
491 | 491 | */ |
492 | 492 | public function resetSftp(User $user, Server $server) |
@@ -501,8 +501,8 @@ discard block |
||
501 | 501 | /** |
502 | 502 | * Check if user has permission to view the SFTP password for a server. |
503 | 503 | * |
504 | - * @param Pterodactyl\Models\User $user |
|
505 | - * @param Pterodactyl\Models\Server $server |
|
504 | + * @param User $user |
|
505 | + * @param Server $server |
|
506 | 506 | * @return boolean |
507 | 507 | */ |
508 | 508 | public function viewSftpPassword(User $user, Server $server) |
@@ -517,8 +517,8 @@ discard block |
||
517 | 517 | /** |
518 | 518 | * Check if user has permission to view databases for a server. |
519 | 519 | * |
520 | - * @param Pterodactyl\Models\User $user |
|
521 | - * @param Pterodactyl\Models\Server $server |
|
520 | + * @param User $user |
|
521 | + * @param Server $server |
|
522 | 522 | * @return boolean |
523 | 523 | */ |
524 | 524 | public function viewDatabases(User $user, Server $server) |
@@ -533,8 +533,8 @@ discard block |
||
533 | 533 | /** |
534 | 534 | * Check if user has permission to reset database passwords. |
535 | 535 | * |
536 | - * @param Pterodactyl\Models\User $user |
|
537 | - * @param Pterodactyl\Models\Server $server |
|
536 | + * @param User $user |
|
537 | + * @param Server $server |
|
538 | 538 | * @return boolean |
539 | 539 | */ |
540 | 540 | public function resetDbPassword(User $user, Server $server) |
@@ -549,8 +549,8 @@ discard block |
||
549 | 549 | /** |
550 | 550 | * Check if user has permission to view all tasks for a server. |
551 | 551 | * |
552 | - * @param Pterodactyl\Models\User $user |
|
553 | - * @param Pterodactyl\Models\Server $server |
|
552 | + * @param User $user |
|
553 | + * @param Server $server |
|
554 | 554 | * @return boolean |
555 | 555 | */ |
556 | 556 | public function listTasks(User $user, Server $server) |
@@ -565,8 +565,8 @@ discard block |
||
565 | 565 | /** |
566 | 566 | * Check if user has permission to view a specific task for a server. |
567 | 567 | * |
568 | - * @param Pterodactyl\Models\User $user |
|
569 | - * @param Pterodactyl\Models\Server $server |
|
568 | + * @param User $user |
|
569 | + * @param Server $server |
|
570 | 570 | * @return boolean |
571 | 571 | */ |
572 | 572 | public function viewTask(User $user, Server $server) |
@@ -581,8 +581,8 @@ discard block |
||
581 | 581 | /** |
582 | 582 | * Check if user has permission to view a toggle a task for a server. |
583 | 583 | * |
584 | - * @param Pterodactyl\Models\User $user |
|
585 | - * @param Pterodactyl\Models\Server $server |
|
584 | + * @param User $user |
|
585 | + * @param Server $server |
|
586 | 586 | * @return boolean |
587 | 587 | */ |
588 | 588 | public function toggleTask(User $user, Server $server) |
@@ -597,8 +597,8 @@ discard block |
||
597 | 597 | /** |
598 | 598 | * Check if user has permission to queue a task for a server. |
599 | 599 | * |
600 | - * @param Pterodactyl\Models\User $user |
|
601 | - * @param Pterodactyl\Models\Server $server |
|
600 | + * @param User $user |
|
601 | + * @param Server $server |
|
602 | 602 | * @return boolean |
603 | 603 | */ |
604 | 604 | public function queueTask(User $user, Server $server) |
@@ -613,8 +613,8 @@ discard block |
||
613 | 613 | /** |
614 | 614 | * Check if user has permission to delete a specific task for a server. |
615 | 615 | * |
616 | - * @param Pterodactyl\Models\User $user |
|
617 | - * @param Pterodactyl\Models\Server $server |
|
616 | + * @param User $user |
|
617 | + * @param Server $server |
|
618 | 618 | * @return boolean |
619 | 619 | */ |
620 | 620 | public function deleteTask(User $user, Server $server) |
@@ -629,8 +629,8 @@ discard block |
||
629 | 629 | /** |
630 | 630 | * Check if user has permission to create a task for a server. |
631 | 631 | * |
632 | - * @param Pterodactyl\Models\User $user |
|
633 | - * @param Pterodactyl\Models\Server $server |
|
632 | + * @param User $user |
|
633 | + * @param Server $server |
|
634 | 634 | * @return boolean |
635 | 635 | */ |
636 | 636 | public function createTask(User $user, Server $server) |
@@ -19,7 +19,6 @@ |
||
19 | 19 | /** |
20 | 20 | * Define your route model bindings, pattern filters, etc. |
21 | 21 | * |
22 | - * @param \Illuminate\Routing\Router $router |
|
23 | 22 | * @return void |
24 | 23 | */ |
25 | 24 | public function boot() |
@@ -36,7 +36,7 @@ |
||
36 | 36 | */ |
37 | 37 | public function map() |
38 | 38 | { |
39 | - Route::group(['namespace' => $this->namespace], function ($router) { |
|
39 | + Route::group(['namespace' => $this->namespace], function($router) { |
|
40 | 40 | foreach (glob(app_path('Http//Routes') . '/*.php') as $file) { |
41 | 41 | $this->app->make('Pterodactyl\\Http\\Routes\\' . basename($file, '.php'))->map($router); |
42 | 42 | } |
@@ -28,7 +28,6 @@ |
||
28 | 28 | use Crypt; |
29 | 29 | use Validator; |
30 | 30 | use IPTools\Network; |
31 | - |
|
32 | 31 | use Pterodactyl\Models; |
33 | 32 | use Pterodactyl\Exceptions\DisplayException; |
34 | 33 | use Pterodactyl\Exceptions\DisplayValidationException; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | |
128 | 128 | $validator->after(function($validator) use ($data) { |
129 | 129 | if (array_key_exists('allowed_ips', $data) && !empty($data['allowed_ips'])) { |
130 | - foreach(explode("\n", $data['allowed_ips']) as $ip) { |
|
130 | + foreach (explode("\n", $data['allowed_ips']) as $ip) { |
|
131 | 131 | $ip = trim($ip); |
132 | 132 | try { |
133 | 133 | Network::parse($ip); |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | |
162 | 162 | $totalPermissions = 0; |
163 | 163 | if (isset($data['permissions'])) { |
164 | - foreach($data['permissions'] as $permNode) { |
|
164 | + foreach ($data['permissions'] as $permNode) { |
|
165 | 165 | if (!strpos($permNode, ':')) continue; |
166 | 166 | |
167 | 167 | list($toss, $permission) = explode(':', $permNode); |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | } |
179 | 179 | |
180 | 180 | if ($this->user->root_admin === 1 && isset($data['adminPermissions'])) { |
181 | - foreach($data['adminPermissions'] as $permNode) { |
|
181 | + foreach ($data['adminPermissions'] as $permNode) { |
|
182 | 182 | if (!strpos($permNode, ':')) continue; |
183 | 183 | |
184 | 184 | list($toss, $permission) = explode(':', $permNode); |
@@ -162,7 +162,9 @@ discard block |
||
162 | 162 | $totalPermissions = 0; |
163 | 163 | if (isset($data['permissions'])) { |
164 | 164 | foreach($data['permissions'] as $permNode) { |
165 | - if (!strpos($permNode, ':')) continue; |
|
165 | + if (!strpos($permNode, ':')) { |
|
166 | + continue; |
|
167 | + } |
|
166 | 168 | |
167 | 169 | list($toss, $permission) = explode(':', $permNode); |
168 | 170 | if (in_array($permission, $this->permissions['user'])) { |
@@ -179,7 +181,9 @@ discard block |
||
179 | 181 | |
180 | 182 | if ($this->user->root_admin === 1 && isset($data['adminPermissions'])) { |
181 | 183 | foreach($data['adminPermissions'] as $permNode) { |
182 | - if (!strpos($permNode, ':')) continue; |
|
184 | + if (!strpos($permNode, ':')) { |
|
185 | + continue; |
|
186 | + } |
|
183 | 187 | |
184 | 188 | list($toss, $permission) = explode(':', $permNode); |
185 | 189 | if (in_array($permission, $this->permissions['admin'])) { |
@@ -35,6 +35,9 @@ |
||
35 | 35 | protected $node; |
36 | 36 | protected $client; |
37 | 37 | |
38 | + /** |
|
39 | + * @param Models\Server $server |
|
40 | + */ |
|
38 | 41 | public function __construct($server) |
39 | 42 | { |
40 | 43 | $this->server = ($server instanceof Models\Server) ? $server : Models\Server::findOrFail($server); |
@@ -25,8 +25,6 @@ |
||
25 | 25 | |
26 | 26 | use Pterodactyl\Models; |
27 | 27 | use Pterodactyl\Exceptions\DisplayException; |
28 | - |
|
29 | -use GuzzleHttp\Client; |
|
30 | 28 | use GuzzleHttp\Exception\RequestException; |
31 | 29 | |
32 | 30 | class CommandRepository { |
@@ -69,7 +69,6 @@ |
||
69 | 69 | /** |
70 | 70 | * Constructor |
71 | 71 | * |
72 | - * @param string $server The server Short UUID |
|
73 | 72 | */ |
74 | 73 | public function __construct($uuid) |
75 | 74 | { |
@@ -24,15 +24,11 @@ |
||
24 | 24 | namespace Pterodactyl\Repositories\Daemon; |
25 | 25 | |
26 | 26 | use \Exception; |
27 | -use Log; |
|
28 | - |
|
29 | 27 | use Pterodactyl\Models\Server; |
30 | 28 | use Pterodactyl\Models\Node; |
31 | 29 | use Pterodactyl\Repositories\HelperRepository; |
32 | 30 | use Pterodactyl\Exceptions\DisplayException; |
33 | - |
|
34 | 31 | use GuzzleHttp\Client; |
35 | -use GuzzleHttp\Exception\RequestException; |
|
36 | 32 | |
37 | 33 | class FileRepository |
38 | 34 | { |
@@ -98,12 +98,12 @@ discard block |
||
98 | 98 | |
99 | 99 | $file->dirname = (in_array($file->dirname, ['.', './', '/'])) ? null : trim($file->dirname, '/') . '/'; |
100 | 100 | |
101 | - $res = $this->client->request('GET', '/server/file/stat/' . rawurlencode($file->dirname.$file->basename) , [ |
|
101 | + $res = $this->client->request('GET', '/server/file/stat/' . rawurlencode($file->dirname . $file->basename), [ |
|
102 | 102 | 'headers' => $this->headers |
103 | 103 | ]); |
104 | 104 | |
105 | 105 | $stat = json_decode($res->getBody()); |
106 | - if($res->getStatusCode() !== 200 || !isset($stat->size)) { |
|
106 | + if ($res->getStatusCode() !== 200 || !isset($stat->size)) { |
|
107 | 107 | throw new DisplayException('The daemon provided a non-200 error code on stat lookup: HTTP\\' . $res->getStatusCode()); |
108 | 108 | } |
109 | 109 | |
@@ -115,12 +115,12 @@ discard block |
||
115 | 115 | throw new DisplayException('That file is too large to open in the browser, consider using a SFTP client.'); |
116 | 116 | } |
117 | 117 | |
118 | - $res = $this->client->request('GET', '/server/file/f/' . rawurlencode($file->dirname.$file->basename) , [ |
|
118 | + $res = $this->client->request('GET', '/server/file/f/' . rawurlencode($file->dirname . $file->basename), [ |
|
119 | 119 | 'headers' => $this->headers |
120 | 120 | ]); |
121 | 121 | |
122 | 122 | $json = json_decode($res->getBody()); |
123 | - if($res->getStatusCode() !== 200 || !isset($json->content)) { |
|
123 | + if ($res->getStatusCode() !== 200 || !isset($json->content)) { |
|
124 | 124 | throw new DisplayException('The daemon provided a non-200 error code: HTTP\\' . $res->getStatusCode()); |
125 | 125 | } |
126 | 126 | |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | $res = $this->client->request('POST', '/server/file/save', [ |
153 | 153 | 'headers' => $this->headers, |
154 | 154 | 'json' => [ |
155 | - 'path' => rawurlencode($file->dirname.$file->basename), |
|
155 | + 'path' => rawurlencode($file->dirname . $file->basename), |
|
156 | 156 | 'content' => $content |
157 | 157 | ] |
158 | 158 | ]); |
@@ -183,14 +183,14 @@ discard block |
||
183 | 183 | ]); |
184 | 184 | |
185 | 185 | $json = json_decode($res->getBody()); |
186 | - if($res->getStatusCode() !== 200) { |
|
186 | + if ($res->getStatusCode() !== 200) { |
|
187 | 187 | throw new DisplayException('An error occured while attempting to save this file. ' . $res->getBody()); |
188 | 188 | } |
189 | 189 | |
190 | 190 | // Iterate through results |
191 | 191 | $files = []; |
192 | 192 | $folders = []; |
193 | - foreach($json as &$value) { |
|
193 | + foreach ($json as &$value) { |
|
194 | 194 | |
195 | 195 | if ($value->directory === true) { |
196 | 196 |
@@ -35,6 +35,9 @@ |
||
35 | 35 | protected $node; |
36 | 36 | protected $client; |
37 | 37 | |
38 | + /** |
|
39 | + * @param Models\Server $server |
|
40 | + */ |
|
38 | 41 | public function __construct($server) |
39 | 42 | { |
40 | 43 | $this->server = ($server instanceof Models\Server) ? $server : Models\Server::findOrFail($server); |
@@ -26,9 +26,6 @@ |
||
26 | 26 | use Pterodactyl\Models; |
27 | 27 | use Pterodactyl\Exceptions\DisplayException; |
28 | 28 | |
29 | -use GuzzleHttp\Client; |
|
30 | -use GuzzleHttp\Exception\RequestException; |
|
31 | - |
|
32 | 29 | class PowerRepository { |
33 | 30 | |
34 | 31 | protected $server; |
@@ -42,7 +42,8 @@ discard block |
||
42 | 42 | $this->client = Models\Node::guzzleRequest($this->server->node); |
43 | 43 | } |
44 | 44 | |
45 | - public function do($action) |
|
45 | + public function do { |
|
46 | + ($action) |
|
46 | 47 | { |
47 | 48 | // We don't use the user's specific daemon secret here since we |
48 | 49 | // are assuming that a call to this function has been validated. |
@@ -58,6 +59,7 @@ discard block |
||
58 | 59 | 'action' => $action |
59 | 60 | ] |
60 | 61 | ]); |
62 | + } |
|
61 | 63 | |
62 | 64 | if ($response->getStatusCode() < 200 || $response->getStatusCode() >= 300) { |
63 | 65 | throw new DisplayException('Power status responded with a non-200 error code.'); |
@@ -119,7 +119,7 @@ |
||
119 | 119 | * Updates the password for a given database. |
120 | 120 | * @param int $database The ID of the database to modify. |
121 | 121 | * @param string $password The new password to use for the database. |
122 | - * @return bool |
|
122 | + * @return boolean|null |
|
123 | 123 | */ |
124 | 124 | public function modifyPassword($database, $password) |
125 | 125 | { |
@@ -24,14 +24,11 @@ |
||
24 | 24 | namespace Pterodactyl\Repositories; |
25 | 25 | |
26 | 26 | use Crypt; |
27 | -use Log; |
|
28 | 27 | use DB; |
29 | 28 | use Validator; |
30 | - |
|
31 | 29 | use Pterodactyl\Models; |
32 | 30 | use Pterodactyl\Exceptions\DisplayException; |
33 | 31 | use Pterodactyl\Exceptions\DisplayValidationException; |
34 | - |
|
35 | 32 | use Illuminate\Database\Capsule\Manager as Capsule; |
36 | 33 | |
37 | 34 | class DatabaseRepository { |
@@ -157,7 +157,7 @@ |
||
157 | 157 | )); |
158 | 158 | |
159 | 159 | DB::commit(); |
160 | - } catch(\Exception $ex) { |
|
160 | + } catch (\Exception $ex) { |
|
161 | 161 | DB::rollback(); |
162 | 162 | throw $ex; |
163 | 163 | } |
@@ -24,7 +24,6 @@ |
||
24 | 24 | namespace Pterodactyl\Repositories; |
25 | 25 | |
26 | 26 | use Validator; |
27 | - |
|
28 | 27 | use Pterodactyl\Models; |
29 | 28 | use Pterodactyl\Exceptions\DisplayValidationException; |
30 | 29 |