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

MDL-30148 remember guest access key

Browse Source 
Remember password for course guest access and reuse it if the enrol cache is reset. Do not print guest access form when already using guest course access.
This commit is contained in:
Petr Skoda 2011-11-05 15:06:32 +01:00
parent bbfdff344c
commit 817e396a84
5 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
enrol/guest/addinstance.php
View File

@ -1,5 +1,4 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify

35
enrol/guest/lib.php
View File

@ -1,5 +1,4 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
@ -45,7 +44,7 @@ class enrol_guest_plugin extends enrol_plugin {
*/
public function get_info_icons(array $instances) {
foreach ($instances as $instance) {
if ($instance->password) {
if ($instance->password !== '') {
return array(new pix_icon('withpassword', get_string('pluginname', 'enrol_guest'), 'enrol_guest'));
} else {
return array(new pix_icon('withoutpassword', get_string('pluginname', 'enrol_guest'), 'enrol_guest'));
@ -73,7 +72,18 @@ class enrol_guest_plugin extends enrol_plugin {
public function try_guestaccess(stdClass $instance) {
global $USER, $CFG;
if (empty($instance->password)) {
$allow = false;
if ($instance->password === '') {
$allow = true;
} else if (isset($USER->enrol_guest_passwords[$instance->id])) { // this is a hack, ideally we should not add stuff to $USER...
if ($USER->enrol_guest_passwords[$instance->id] === $instance->password) {
$allow = true;
}
}
if ($allow) {
// Temporarily assign them some guest role for this context
$context = get_context_instance(CONTEXT_COURSE, $instance->courseid);
load_temp_course_role($context, $CFG->guestroleid);
@ -114,7 +124,12 @@ class enrol_guest_plugin extends enrol_plugin {
public function enrol_page_hook(stdClass $instance) {
global $CFG, $OUTPUT, $SESSION, $USER;
if (empty($instance->password)) {
if ($instance->password === '') {
return null;
}
if (isset($USER->enrol['tempguest'][$instance->courseid]) and $USER->enrol['tempguest'][$instance->courseid] > time()) {
// no need to show the guest access when user can already enter course as guest
return null;
}
@ -124,13 +139,14 @@ class enrol_guest_plugin extends enrol_plugin {
if ($instance->id == $instanceid) {
if ($data = $form->get_data()) {
// set up primitive require_login() caching
unset($USER->enrol['enrolled'][$instance->courseid]);
$USER->enrol['tempguest'][$instance->courseid] = time() + 60*60*8; // 8 hours access before asking for pw again
// add guest role
$context = get_context_instance(CONTEXT_COURSE, $instance->courseid);
$USER->enrol_guest_passwords[$instance->id] = $data->guestpassword; // this is a hack, ideally we should not add stuff to $USER...
if (isset($USER->enrol['tempguest'][$instance->courseid])) {
remove_temp_course_roles($context);
}
load_temp_course_role($context, $CFG->guestroleid);
$USER->enrol['tempguest'][$instance->courseid] = ENROL_MAX_TIMESTAMP;
// go to the originally requested page
if (!empty($SESSION->wantsurl)) {
@ -282,6 +298,9 @@ class enrol_guest_plugin extends enrol_plugin {
$instance->status = $data->{'enrol_guest_status_'.$i};
$instance->timemodified = time();
if ($instance->status == ENROL_INSTANCE_ENABLED) {
if ($instance->password !== $data->{'enrol_guest_password_'.$i}) {
$reset = true;
}
$instance->password = $data->{'enrol_guest_password_'.$i};
}
$DB->update_record('enrol', $instance);

3
enrol/guest/locallib.php
View File

@ -1,5 +1,4 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
@ -59,7 +58,7 @@ class enrol_guest_enrol_form extends moodleform {
$errors = parent::validation($data, $files);
$instance = $this->instance;
if ($instance->password) {
if ($instance->password !== '') {
if ($data['guestpassword'] !== $instance->password) {
$plugin = enrol_get_plugin('guest');
if ($plugin->get_config('showhint')) {

1
enrol/guest/settings.php
View File

@ -1,5 +1,4 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify

4
enrol/guest/version.php
View File

@ -1,5 +1,4 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
@ -26,4 +25,5 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2010081800;
$plugin->version = 2011110600;
$plugin->component = 'enrol_guest';