mirror of
https://github.com/filegator/filegator.git
synced 2025-08-20 16:31:47 +02:00
refactoring
This commit is contained in:
@@ -29,6 +29,8 @@ class Database implements Service, AuthInterface
|
||||
|
||||
protected $session;
|
||||
|
||||
protected $conn;
|
||||
|
||||
public function __construct(Session $session)
|
||||
{
|
||||
$this->session = $session;
|
||||
@@ -174,11 +176,11 @@ class Database implements Service, AuthInterface
|
||||
{
|
||||
$new = new User();
|
||||
|
||||
$new->setRole($user->role);
|
||||
$new->setHomedir($user->homedir);
|
||||
$new->setPermissions($user->permissions, true);
|
||||
$new->setUsername($user->username);
|
||||
$new->setName($user->name);
|
||||
$new->setRole(isset($user->role) ? $user->role : 'guest');
|
||||
$new->setHomedir(isset($user->homedir) ? $user->homedir : '/');
|
||||
$new->setPermissions(isset($user->permissions) ? $user->permissions : '', true);
|
||||
$new->setUsername(isset($user->username) ? $user->username : '');
|
||||
$new->setName(isset($user->name) ? $user->name : 'Guest');
|
||||
|
||||
return $new;
|
||||
}
|
||||
|
@@ -189,7 +189,7 @@ class JsonFile implements Service, AuthInterface
|
||||
|
||||
protected function getUsers(): array
|
||||
{
|
||||
$users = json_decode(file_get_contents($this->file), true);
|
||||
$users = json_decode((string) file_get_contents($this->file), true);
|
||||
|
||||
return is_array($users) ? $users : [];
|
||||
}
|
||||
|
Reference in New Issue
Block a user