Merge branch 'develop' into feature/server-mounts
This commit is contained in:
commit
29876e023b
166 changed files with 5482 additions and 4130 deletions
|
@ -140,7 +140,7 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor
|
|||
*/
|
||||
public function createUser(string $username, string $remote, string $password, $max_connections): bool
|
||||
{
|
||||
if (!$max_connections) {
|
||||
if (! $max_connections) {
|
||||
return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\'', $username, $remote, $password));
|
||||
} else {
|
||||
return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\' WITH MAX_USER_CONNECTIONS %s', $username, $remote, $password, $max_connections));
|
||||
|
|
16
app/Repositories/Eloquent/RecoveryTokenRepository.php
Normal file
16
app/Repositories/Eloquent/RecoveryTokenRepository.php
Normal file
|
@ -0,0 +1,16 @@
|
|||
<?php
|
||||
|
||||
namespace Pterodactyl\Repositories\Eloquent;
|
||||
|
||||
use Pterodactyl\Models\RecoveryToken;
|
||||
|
||||
class RecoveryTokenRepository extends EloquentRepository
|
||||
{
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
{
|
||||
return RecoveryToken::class;
|
||||
}
|
||||
}
|
|
@ -34,7 +34,7 @@ class SessionRepository extends EloquentRepository implements SessionRepositoryI
|
|||
*
|
||||
* @param int $user
|
||||
* @param string $session
|
||||
* @return null|int
|
||||
* @return int|null
|
||||
*/
|
||||
public function deleteUserSession(int $user, string $session)
|
||||
{
|
||||
|
|
|
@ -41,7 +41,7 @@ class TaskRepository extends EloquentRepository implements TaskRepositoryInterfa
|
|||
*
|
||||
* @param int $schedule
|
||||
* @param int $index
|
||||
* @return null|\Pterodactyl\Models\Task
|
||||
* @return \Pterodactyl\Models\Task|null
|
||||
*/
|
||||
public function getNextTask(int $schedule, int $index)
|
||||
{
|
||||
|
|
Reference in a new issue