Skip to content

Internal: Fix role preselection in user_edit: normalize option keys and POST checks #6794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2025
Merged

Internal: Fix role preselection in user_edit: normalize option keys and POST checks #6794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions public/main/admin/user_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ function confirmation(name) {

$display = 'none';
if (isset($_POST['roles']) && is_array($_POST['roles'])) {
$display = in_array('ROLE_TEACHER', $_POST['roles']) || in_array('ROLE_SESSION_MANAGER', $_POST['roles']) ? 'block' : 'none';
$norm = array_map('api_normalize_role_code', $_POST['roles']);
$display = (in_array('ROLE_TEACHER', $norm, true) || in_array('ROLE_SESSION_MANAGER', $norm, true)) ? 'block' : 'none';
}

// Platform admin
Expand Down Expand Up @@ -398,9 +399,22 @@ function confirmation(name) {
$user_data['expiration_date'] = api_get_local_time($expiration_date);
}
}
$availableRoles = array_keys(api_get_roles());
$userRoles = array_intersect($userObj->getRoles(), $availableRoles);
$user_data['roles'] = $userRoles;

$roleOptions = api_get_roles();
$optionKeyByCanon = [];
foreach ($roleOptions as $optKey => $label) {
$optionKeyByCanon[api_normalize_role_code((string) $optKey)] = $optKey;
}

$userCanonRoles = array_map('api_normalize_role_code', (array) $userObj->getRoles());
$selectedOptionKeys = [];
foreach ($userCanonRoles as $canon) {
if (isset($optionKeyByCanon[$canon])) {
$selectedOptionKeys[] = $optionKeyByCanon[$canon];
}
}

$user_data['roles'] = array_values(array_unique($selectedOptionKeys));
$form->setDefaults($user_data);

$error_drh = false;
Expand Down
2 changes: 0 additions & 2 deletions public/main/inc/lib/api.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6499,8 +6499,6 @@ function api_normalize_role_code(string $code): string {
'QUESTION_MANAGER' => 'ROLE_QUESTION_MANAGER',
'ADMIN' => 'ROLE_ADMIN',
'GLOBAL_ADMIN' => 'ROLE_GLOBAL_ADMIN',
'SUPER_ADMIN' => 'ROLE_GLOBAL_ADMIN',
'ROLE_SUPER_ADMIN' => 'ROLE_GLOBAL_ADMIN',
];
if (!str_starts_with($c, 'ROLE_')) {
return $map[$c] ?? ('ROLE_'.$c);
Expand Down
Loading