mirror of
https://github.com/moodle/moodle.git
synced 2025-03-20 07:30:01 +01:00
Merge branch 'MDL-48441_profile_guest' of https://github.com/andyjdavis/moodle
This commit is contained in:
commit
44c3131c08
@ -48,8 +48,6 @@ $PAGE->set_url('/user/profile.php', array('id' => $userid));
|
||||
if (!empty($CFG->forceloginforprofiles)) {
|
||||
require_login();
|
||||
if (isguestuser()) {
|
||||
$SESSION->wantsurl = $PAGE->url->out(false);
|
||||
|
||||
$PAGE->set_context(context_system::instance());
|
||||
echo $OUTPUT->header();
|
||||
echo $OUTPUT->confirm(get_string('guestcantaccessprofiles', 'error'),
|
||||
|
@ -52,23 +52,28 @@ $systemcontext = context_system::instance();
|
||||
$coursecontext = context_course::instance($course->id);
|
||||
$usercontext = context_user::instance($user->id, IGNORE_MISSING);
|
||||
|
||||
// Require login first.
|
||||
// Check we are not trying to view guest's profile.
|
||||
if (isguestuser($user)) {
|
||||
// Can not view profile of guest - thre is nothing to see there.
|
||||
print_error('invaliduserid');
|
||||
}
|
||||
|
||||
$PAGE->set_context($coursecontext);
|
||||
|
||||
if (!empty($CFG->forceloginforprofiles)) {
|
||||
require_login(); // We can not log in to course due to the parent hack below.
|
||||
|
||||
// Guests do not have permissions to view anyone's profile if forceloginforprofiles is set.
|
||||
if (isguestuser()) {
|
||||
$SESSION->wantsurl = $PAGE->url->out(false);
|
||||
redirect(get_login_url());
|
||||
echo $OUTPUT->header();
|
||||
echo $OUTPUT->confirm(get_string('guestcantaccessprofiles', 'error'),
|
||||
get_login_url(),
|
||||
$CFG->wwwroot);
|
||||
echo $OUTPUT->footer();
|
||||
die;
|
||||
}
|
||||
}
|
||||
|
||||
$PAGE->set_context($coursecontext);
|
||||
$PAGE->set_course($course);
|
||||
$PAGE->set_pagetype('course-view-' . $course->format); // To get the blocks exactly like the course.
|
||||
$PAGE->add_body_class('path-user'); // So we can style it independently.
|
||||
|
Loading…
x
Reference in New Issue
Block a user