Explicitly adds/removes rights, makes possible to remove all rights

main
Yasen Pramatarov 2025-04-15 18:05:09 +03:00
parent 9cb7812144
commit 0a7f3737c5
1 changed files with 32 additions and 28 deletions

View File

@ -91,13 +91,20 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
]; ];
$result = $userObject->editUser($userId, $updatedUser); $result = $userObject->editUser($userId, $updatedUser);
if ($result === true) { if ($result === true) {
Feedback::flash('NOTICE', 'DEFAULT', "User details for \"{$updatedUser['name']}\" are edited."); Feedback::flash('NOTICE', 'DEFAULT', "User details for \"{$userDetails[0]['username']}\" are edited.");
} else { } else {
Feedback::flash('ERROR', 'DEFAULT', "Editing the user details failed. Error: $result"); Feedback::flash('ERROR', 'DEFAULT', "Editing the user details failed. Error: $result");
} }
// update the rights // update the rights
if (isset($_POST['rights'])) { // Get current rights IDs
$userRightsIds = array_column($userRights, 'right_id');
// If no rights are selected, remove all rights
if (!isset($_POST['rights'])) {
$_POST['rights'] = [];
}
$validator = new Validator(['rights' => $_POST['rights']]); $validator = new Validator(['rights' => $_POST['rights']]);
$rules = [ $rules = [
'rights' => [ 'rights' => [
@ -112,8 +119,6 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
} }
$newRights = $_POST['rights']; $newRights = $_POST['rights'];
// extract the new right_ids
$userRightsIds = array_column($userRights, 'right_id');
// what rights we need to add // what rights we need to add
$rightsToAdd = array_diff($newRights, $userRightsIds); $rightsToAdd = array_diff($newRights, $userRightsIds);
if (!empty($rightsToAdd)) { if (!empty($rightsToAdd)) {
@ -128,7 +133,6 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$userObject->removeUserRight($userId, $rightId); $userObject->removeUserRight($userId, $rightId);
} }
} }
}
// update the avatar // update the avatar
if (!empty($_FILES['avatar_file']['tmp_name'])) { if (!empty($_FILES['avatar_file']['tmp_name'])) {