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

MDL-62493 tool_policy: correct redirection

Browse source 
do not override session->wantsurl
do not redirect guests to user.php, they get an error there
This commit is contained in:
Marina Glancy 2018-05-21 10:07:43 +08:00
parent deaf67147d
commit 7115c32949
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
admin/tool/policy/classes/output/page_agreedocs.php
View file

@ -236,16 +236,30 @@ class page_agreedocs implements renderable, templatable {
}
/**
* Redirect to $SESSION->wantsurl if defined or to $CFG->wwwroot if not.
* Redirect to signup page if defined or to $CFG->wwwroot if not.
*/
protected function redirect_to_previous_url() {
global $SESSION;
if (!empty($SESSION->wantsurl)) {
$returnurl = $SESSION->wantsurl;
unset($SESSION->wantsurl);
if ($this->isexistinguser) {
// Existing user.
if (!empty($SESSION->wantsurl)) {
$returnurl = $SESSION->wantsurl;
unset($SESSION->wantsurl);
} else {
$returnurl = new moodle_url('/admin/tool/policy/user.php');
}
} else {
$returnurl = (new moodle_url('/admin/tool/policy/user.php'))->out();
// Non-authenticated user.
$issignup = \cache::make('core', 'presignup')->get('tool_policy_issignup');
if ($issignup) {
// User came here from signup page - redirect back there.
$returnurl = new moodle_url('/login/signup.php');
\cache::make('core', 'presignup')->set('tool_policy_issignup', false);
} else {
// Guests should not be on this page unless it's part of signup - redirect home.
$returnurl = new moodle_url('/');
}
}
redirect($returnurl);
@ -257,10 +271,10 @@ class page_agreedocs implements renderable, templatable {
* @param int $userid
*/
protected function prepare_global_page_access($userid) {
global $PAGE, $SESSION, $SITE, $USER;
global $PAGE, $SITE, $USER;
// Guest users or not logged users (but the users during the signup process) are not allowed to access to this page.
$newsignupuser = !empty($SESSION->wantsurl) && strpos($SESSION->wantsurl, 'login/signup.php') !== false;
$newsignupuser = \cache::make('core', 'presignup')->get('tool_policy_issignup');
if (!$this->isexistinguser && !$newsignupuser) {
$this->redirect_to_previous_url();
}
@ -277,7 +291,7 @@ class page_agreedocs implements renderable, templatable {
}
// If the current user has the $USER->policyagreed = 1 or $userpolicyagreed = 1
// and $SESSION->wantsurl is defined, redirect to the return page.
// redirect to the return page.
$hasagreedsignupuser = !$this->isexistinguser && $this->signupuserpolicyagreed;
$hasagreedloggeduser = $USER->id == $userid && !empty($USER->policyagreed);
if (!is_siteadmin() && ($hasagreedsignupuser || $hasagreedloggeduser)) {

4
admin/tool/policy/lib.php
View file

@ -116,7 +116,7 @@ function tool_policy_standard_footer_html() {
* Hooks redirection to policy acceptance pages before sign up.
*/
function tool_policy_pre_signup_requests() {
global $CFG, $SESSION;
global $CFG;
// Do nothing if we are not set as the site policies handler.
if (empty($CFG->sitepolicyhandler) || $CFG->sitepolicyhandler !== 'tool_policy') {
@ -127,7 +127,7 @@ function tool_policy_pre_signup_requests() {
$userpolicyagreed = cache::make('core', 'presignup')->get('tool_policy_userpolicyagreed');
if (!empty($policies) && !$userpolicyagreed) {
// Redirect to "Policy" pages for consenting before creating the user.
$SESSION->wantsurl = (new \moodle_url('/login/signup.php'))->out();
cache::make('core', 'presignup')->set('tool_policy_issignup', 1);
redirect(new \moodle_url('/admin/tool/policy/index.php'));
}
}