moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib MDL-1975 Users who have been auto logged in by guest are now redirected to login on capability exceptions rather than being shown the exception.

Browse source
This commit is contained in:
Sam Hemelryk 2010-11-12 07:53:55 +00:00
parent ee14924440
commit d9e0726431
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/moodlelib.php
View file

@ -2330,6 +2330,7 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
} }
$lang = isset($SESSION->lang) ? $SESSION->lang : $CFG->lang; $lang = isset($SESSION->lang) ? $SESSION->lang : $CFG->lang;
complete_user_login($guest, false); complete_user_login($guest, false);
$USER->autologinguest = true;
$SESSION->lang = $lang; $SESSION->lang = $lang;
} else { } else {
//NOTE: $USER->site check was obsoleted by session test cookie, //NOTE: $USER->site check was obsoleted by session test cookie,

7
lib/setuplib.php
View file

@ -274,11 +274,16 @@ class invalid_dataroot_permissions extends moodle_exception {
* @return void -does not return. Terminates execution! * @return void -does not return. Terminates execution!
*/ */
function default_exception_handler($ex) { function default_exception_handler($ex) {
global $DB, $OUTPUT; global $CFG, $DB, $OUTPUT, $USER, $FULLME, $SESSION;
// detect active db transactions, rollback and log as error // detect active db transactions, rollback and log as error
abort_all_db_transactions(); abort_all_db_transactions();
if (($ex instanceof required_capability_exception) && !CLI_SCRIPT && !AJAX_SCRIPT && !empty($CFG->autologinguests) && !empty($USER->autologinguest)) {
$SESSION->wantsurl = $FULLME;
redirect(get_login_url());
}
$info = get_exception_info($ex); $info = get_exception_info($ex);
if (debugging('', DEBUG_MINIMAL)) { if (debugging('', DEBUG_MINIMAL)) {