Applied PHP formatting rules

This commit is contained in:
Bernd Bestel
2020-08-31 20:40:31 +02:00
parent 33325d5560
commit d4c5da2173
58 changed files with 3667 additions and 3082 deletions

View File

@@ -6,25 +6,34 @@ class UsersService extends BaseService
{
public function CreateUser(string $username, string $firstName, string $lastName, string $password)
{
$newUserRow = $this->getDatabase()->users()->createRow(array(
$newUserRow = $this->getDatabase()->users()->createRow([
'username' => $username,
'first_name' => $firstName,
'last_name' => $lastName,
'password' => password_hash($password, PASSWORD_DEFAULT)
));
]);
$newUserRow = $newUserRow->save();
$permList = array();
foreach ($this->getDatabase()->permission_hierarchy()->where('name', GROCY_DEFAULT_PERMISSIONS)->fetchAll() as $perm) {
$permList[] = array(
$permList = [];
foreach ($this->getDatabase()->permission_hierarchy()->where('name', GROCY_DEFAULT_PERMISSIONS)->fetchAll() as $perm)
{
$permList[] = [
'user_id' => $newUserRow->id,
'permission_id' => $perm->id
);
];
}
$this->getDatabase()->user_permissions()->insert($permList);
return $newUserRow;
}
public function DeleteUser($userId)
{
$row = $this->getDatabase()->users($userId);
$row->delete();
}
public function EditUser(int $userId, string $username, string $firstName, string $lastName, string $password)
{
if (!$this->UserExists($userId))
@@ -33,36 +42,18 @@ class UsersService extends BaseService
}
$user = $this->getDatabase()->users($userId);
$user->update(array(
$user->update([
'username' => $username,
'first_name' => $firstName,
'last_name' => $lastName,
'password' => password_hash($password, PASSWORD_DEFAULT)
));
}
public function DeleteUser($userId)
{
$row = $this->getDatabase()->users($userId);
$row->delete();
}
public function GetUsersAsDto()
{
$users = $this->getDatabase()->users();
$returnUsers = array();
foreach ($users as $user)
{
unset($user->password);
$user->display_name = GetUserDisplayName($user);
$returnUsers[] = $user;
}
return $returnUsers;
]);
}
public function GetUserSetting($userId, $settingKey)
{
$settingRow = $this->getDatabase()->user_settings()->where('user_id = :1 AND key = :2', $userId, $settingKey)->fetch();
if ($settingRow !== null)
{
return $settingRow->value;
@@ -71,13 +62,15 @@ class UsersService extends BaseService
{
return null;
}
}
public function GetUserSettings($userId)
{
$settings = array();
$settings = [];
$settingRows = $this->getDatabase()->user_settings()->where('user_id = :1', $userId)->fetchAll();
foreach ($settingRows as $settingRow)
{
$settings[$settingRow->key] = $settingRow->value;
@@ -88,25 +81,42 @@ class UsersService extends BaseService
return array_merge($GROCY_DEFAULT_USER_SETTINGS, $settings);
}
public function GetUsersAsDto()
{
$users = $this->getDatabase()->users();
$returnUsers = [];
foreach ($users as $user)
{
unset($user->password);
$user->display_name = GetUserDisplayName($user);
$returnUsers[] = $user;
}
return $returnUsers;
}
public function SetUserSetting($userId, $settingKey, $settingValue)
{
$settingRow = $this->getDatabase()->user_settings()->where('user_id = :1 AND key = :2', $userId, $settingKey)->fetch();
if ($settingRow !== null)
{
$settingRow->update(array(
$settingRow->update([
'value' => $settingValue,
'row_updated_timestamp' => date('Y-m-d H:i:s')
));
]);
}
else
{
$settingRow = $this->getDatabase()->user_settings()->createRow(array(
$settingRow = $this->getDatabase()->user_settings()->createRow([
'user_id' => $userId,
'key' => $settingKey,
'value' => $settingValue
));
]);
$settingRow->save();
}
}
private function UserExists($userId)
@@ -114,4 +124,5 @@ class UsersService extends BaseService
$userRow = $this->getDatabase()->users()->where('id = :1', $userId)->fetch();
return $userRow !== null;
}
}