L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-22510-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2012-03-27 11:03:08 +13:00
parent 015c334a73 d06b2e0c89
commit ec202ddbba
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+15 -5
View File
@@ -2654,7 +2654,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);
@@ -2677,7 +2679,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);
}
@@ -2697,13 +2701,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');
}
}
@@ -2855,7 +2863,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);
}
}