Merge 1.9.x

1.10.x
Julio Montoya 11 years ago
commit 9dda91924f
  1. 7
      main/admin/add_users_to_session.php
  2. 3
      main/install/configuration.dist.php

@ -94,6 +94,13 @@ function search_users($needle, $type)
$order_clause = ' ORDER BY official_code, firstname, lastname, username'; $order_clause = ' ORDER BY official_code, firstname, lastname, username';
} }
if (api_is_session_admin()
&& isset($_configuration['prevent_session_admins_to_manage_all_users'])
&& $_configuration['prevent_session_admins_to_manage_all_users'] == 'true'
) {
$order_clause = " AND user.creator_id = " . api_get_user_id() . $order_clause;
}
$cond_user_id = ''; $cond_user_id = '';
if (api_is_session_admin() && api_get_setting('prevent_session_admins_to_manage_all_users') == 'true') { if (api_is_session_admin() && api_get_setting('prevent_session_admins_to_manage_all_users') == 'true') {

@ -296,3 +296,6 @@ $_configuration['system_stable'] = NEW_VERSION_STABLE;
//$_configuration['cookie_warning'] = false; //$_configuration['cookie_warning'] = false;
// Allows a comment field in the course calendar events. Requires DB change // Allows a comment field in the course calendar events. Requires DB change
//$_configuration['allow_agenda_event_comment'] = false; //$_configuration['allow_agenda_event_comment'] = false;
// Filters administration users lists by the session admin who created them.
// Change to true to restrict the visibility
//$_configuration['prevent_session_admins_to_manage_all_users'] = false;

Loading…
Cancel
Save