refactoring

This commit is contained in:
Milos Stojanovic
2019-06-14 12:46:45 +02:00
parent 667389ab1a
commit f6185c92ab
14 changed files with 1019 additions and 34 deletions

View File

@@ -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;
}

View File

@@ -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 : [];
}