Add form to not-authenticated message in admin section + Add possible custom message to api_protect_admin_script()

1.9.x
Yannick Warnier 12 years ago
parent 99b4c84518
commit 12515956c5
  1. 2
      main/admin/user_import.php
  2. 7
      main/inc/lib/main_api.lib.php

@ -276,7 +276,7 @@ function parse_xml_data($file) {
}
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true);
api_protect_admin_script(true, null, 'login');
$defined_auth_sources[] = PLATFORM_AUTH_SOURCE;

@ -930,12 +930,13 @@ function api_protect_course_script($print_headers = false, $allow_session_admins
* The function blocks access when the user has no platform admin rights with an error message printed on default output
* @param bool Whether to allow session admins as well
* @param bool Whether to allow HR directors as well
* @param string An optional message (already passed through get_lang)
* @return bool True if user is allowed, false otherwise. The function also outputs an error message in case not allowed
* @author Roan Embrechts (original author)
*/
function api_protect_admin_script($allow_sessions_admins = false, $allow_drh = false) {
function api_protect_admin_script($allow_sessions_admins = false, $allow_drh = false, $message = null) {
if (!api_is_platform_admin($allow_sessions_admins, $allow_drh)) {
api_not_allowed(true);
api_not_allowed(true, $message);
return false;
}
return true;
@ -2963,7 +2964,7 @@ function api_not_allowed($print_headers = false, $message = null) {
exit;
}
if (!empty($_SERVER['REQUEST_URI']) && (!empty($_GET['cidReq']) || $this_section == SECTION_MYPROFILE)) {
if (!empty($_SERVER['REQUEST_URI']) && (!empty($_GET['cidReq']) || $this_section == SECTION_MYPROFILE || $this_section == SECTION_PLATFORM_ADMIN)) {
//only display form and return to the previous URL if there was a course ID included
if ($user_id != 0 && !api_is_anonymous()) {

Loading…
Cancel
Save