mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 08:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-22510-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2012-03-27 11:03:19 +13:00
commit a7cd1f5a53
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/moodlelib.php
View File

@ -2726,7 +2726,9 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
if (get_user_preferences('auth_forcepasswordchange') && !session_is_loggedinas()) {
$userauth = get_auth_plugin($USER->auth);
if ($userauth->can_change_password() and !$preventredirect) {
$SESSION->wantsurl = $FULLME;
if ($setwantsurltome) {
$SESSION->wantsurl = $FULLME;
}
if ($changeurl = $userauth->change_password_url()) {
//use plugin custom url
redirect($changeurl);
@ -2749,7 +2751,9 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
if ($preventredirect) {
throw new require_login_exception('User not fully set-up');
}
$SESSION->wantsurl = $FULLME;
if ($setwantsurltome) {
$SESSION->wantsurl = $FULLME;
}
redirect($CFG->wwwroot .'/user/edit.php?id='. $USER->id .'&course='. SITEID);
}
@ -2769,13 +2773,17 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
if ($preventredirect) {
throw new require_login_exception('Policy not agreed');
}
$SESSION->wantsurl = $FULLME;
if ($setwantsurltome) {
$SESSION->wantsurl = $FULLME;
}
redirect($CFG->wwwroot .'/user/policy.php');
} else if (!empty($CFG->sitepolicyguest) and isguestuser()) {
if ($preventredirect) {
throw new require_login_exception('Policy not agreed');
}
$SESSION->wantsurl = $FULLME;
if ($setwantsurltome) {
$SESSION->wantsurl = $FULLME;
}
redirect($CFG->wwwroot .'/user/policy.php');
}
}
@ -2927,7 +2935,9 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
if ($preventredirect) {
throw new require_login_exception('Not enrolled');
}
$SESSION->wantsurl = $FULLME;
if ($setwantsurltome) {
$SESSION->wantsurl = $FULLME;
}
redirect($CFG->wwwroot .'/enrol/index.php?id='. $course->id);
}
}