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

MDL-56739 auth: Support new redirect parameter in confirmation

Browse Source
This commit is contained in:
Juan Leyva
2016-11-10 09:35:21 +00:00
parent d6a25bc49a
commit b0f00b3166
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
login/confirm.php
+8 -3
View File
@@ -31,6 +31,7 @@ $data = optional_param('data', '', PARAM_RAW); // Formatted as: secret/usernam
$p = optional_param('p', '', PARAM_ALPHANUM); // Old parameter: secret
$s = optional_param('s', '', PARAM_RAW); // Old parameter: username
$redirect = optional_param('redirect', '', PARAM_LOCALURL); // Where to redirect the browser once the user has been confirmed.
$PAGE->set_url('/login/confirm.php');
$PAGE->set_context(context_system::instance());
@@ -78,10 +79,14 @@ if (!empty($data) || (!empty($p) && !empty($s))) {
\core\session\manager::apply_concurrent_login_limit($user->id, session_id());
if ( ! empty($SESSION->wantsurl) ) { // Send them where they were going.
$goto = $SESSION->wantsurl;
// Check where to go, $redirect has a higher preference.
if (empty($redirect) and !empty($SESSION->wantsurl) ) {
$redirect = $SESSION->wantsurl;
unset($SESSION->wantsurl);
redirect($goto);
}
if (!empty($redirect)) {
redirect($redirect);
}
}