Skip to content

Commit 0f4ac57

Browse files
committed
Prevent session admins to see all users - refs BT#9324
1 parent 1fff46f commit 0f4ac57

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

main/admin/add_users_to_session.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ function search_users($needle, $type)
9595
$order_clause = ' ORDER BY official_code, firstname, lastname, username';
9696
}
9797

98-
if (api_is_session_admin() && api_get_setting('allow_session_admins_to_manage_all_users') == 'false') {
98+
if (api_is_session_admin()
99+
&& isset($_configuration['prevent_session_admins_to_manage_all_users'])
100+
&& $_configuration['prevent_session_admins_to_manage_all_users'] == 'true'
101+
) {
99102
$order_clause = " AND user.creator_id = " . api_get_user_id() . $order_clause;
100103
}
101104

main/admin/user_list.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,11 @@ function get_user_data($from, $number_of_items, $column, $direction) {
446446
$from = intval($from);
447447
$number_of_items = intval($number_of_items);
448448

449-
if (api_is_session_admin() && api_get_setting('allow_session_admins_to_manage_all_users') == 'false') {
449+
global $_configuration;
450+
if (api_is_session_admin()
451+
&& isset($_configuration['prevent_session_admins_to_manage_all_users'])
452+
&& $_configuration['prevent_session_admins_to_manage_all_users'] == 'true'
453+
) {
450454
$sql .= " WHERE u.creator_id = " . api_get_user_id();
451455
}
452456

main/install/configuration.dist.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,5 +287,5 @@
287287
// Allows a comment field in the course calendar events. Requires DB change
288288
//$_configuration['allow_agenda_event_comment'] = false;
289289
// Filters administration users lists by the session admin who created them.
290-
// Change to 'false' to restrict the visibility
291-
//$_configuration['allow_session_admins_to_manage_all_users'] = true;
290+
// Change to true to restrict the visibility
291+
//$_configuration['prevent_session_admins_to_manage_all_users'] = false;

0 commit comments

Comments
 (0)