@@ -31,7 +31,6 @@ |
||
| 31 | 31 | use IPTools\Range; |
| 32 | 32 | use Dingo\Api\Routing\Route; |
| 33 | 33 | use Illuminate\Http\Request; |
| 34 | -use Pterodactyl\Models\User; |
|
| 35 | 34 | use Pterodactyl\Models\APIKey; |
| 36 | 35 | use Pterodactyl\Models\APIPermission; |
| 37 | 36 | use Pterodactyl\Services\APILogService; |
@@ -42,7 +42,6 @@ |
||
| 42 | 42 | /** |
| 43 | 43 | * Create a new job instance. |
| 44 | 44 | * |
| 45 | - * @param int $server |
|
| 46 | 45 | * @return void |
| 47 | 46 | */ |
| 48 | 47 | public function __construct($id) |
@@ -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 bool |
| 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 bool |
|
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 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 bool |
| 635 | 635 | */ |
| 636 | 636 | public function createTask(User $user, Server $server) |
@@ -24,7 +24,6 @@ |
||
| 24 | 24 | |
| 25 | 25 | namespace Pterodactyl\Repositories\Daemon; |
| 26 | 26 | |
| 27 | -use GuzzleHttp\Client; |
|
| 28 | 27 | use Pterodactyl\Models; |
| 29 | 28 | use GuzzleHttp\Exception\RequestException; |
| 30 | 29 | use Pterodactyl\Exceptions\DisplayException; |
@@ -24,7 +24,6 @@ |
||
| 24 | 24 | |
| 25 | 25 | namespace Pterodactyl\Repositories\Daemon; |
| 26 | 26 | |
| 27 | -use GuzzleHttp\Client; |
|
| 28 | 27 | use Pterodactyl\Models; |
| 29 | 28 | use Pterodactyl\Exceptions\DisplayException; |
| 30 | 29 | |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | /** |
| 110 | 110 | * Creates a new subuser on the server. |
| 111 | - * @param int $id The ID of the server to add this subuser to. |
|
| 111 | + * @param int $sid The ID of the server to add this subuser to. |
|
| 112 | 112 | * @param array $data |
| 113 | 113 | * @throws DisplayValidationException |
| 114 | 114 | * @throws DisplayException |
@@ -214,7 +214,6 @@ discard block |
||
| 214 | 214 | /** |
| 215 | 215 | * Revokes a users permissions on a server. |
| 216 | 216 | * @param int $id The ID of the subuser row in MySQL. |
| 217 | - * @param array $data |
|
| 218 | 217 | * @throws DisplayValidationException |
| 219 | 218 | * @throws DisplayException |
| 220 | 219 | * @return void |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | * |
| 115 | 115 | * @param int $id |
| 116 | 116 | * @param array $data An array of columns and their associated values to update for the user. |
| 117 | - * @return bool |
|
| 117 | + * @return boolean|null |
|
| 118 | 118 | */ |
| 119 | 119 | public function update($id, array $data) |
| 120 | 120 | { |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | * Deletes a user on the panel, returns the number of records deleted. |
| 152 | 152 | * |
| 153 | 153 | * @param int $id |
| 154 | - * @return int |
|
| 154 | + * @return boolean |
|
| 155 | 155 | */ |
| 156 | 156 | public function delete($id) |
| 157 | 157 | { |