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

Petr's patch for MDL-7327 to modify require_capability login a bit (merged from stable)

Browse source
This commit is contained in:
moodler 2006-11-02 08:12:54 +00:00
parent 2753336a80
commit 71483894b2
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/accesslib.php
View file

@ -227,21 +227,30 @@ function get_parent_cats($context, $type) {
* @param string $stringfile - which stringfile to get it from * @param string $stringfile - which stringfile to get it from
*/ */
function require_capability($capability, $context=NULL, $userid=NULL, $doanything=true, function require_capability($capability, $context=NULL, $userid=NULL, $doanything=true,
$errormessage="nopermissions", $stringfile='') { $errormessage='nopermissions', $stringfile='') {
global $USER; global $USER, $CFG;
/// If the current user is not logged in, then make sure they are /// If the current user is not logged in, then make sure they are (if needed)
if (empty($userid) and empty($USER->capabilities)) { if (empty($userid) and empty($USER->capabilities)) {
if ($context && ($context->contextlevel == CONTEXT_COURSE)) { if ($context && ($context->contextlevel == CONTEXT_COURSE)) {
require_login($context->instanceid); require_login($context->instanceid);
} else if ($context && ($context->contextlevel == CONTEXT_MODULE)) { } else if ($context && ($context->contextlevel == CONTEXT_MODULE)) {
if ($cm = get_record('course_modules','id',$context->instanceid)) { if ($cm = get_record('course_modules','id',$context->instanceid)) {
require_login($cm->course, true, $cm); if (!$course = get_record('course', 'id', $cm->course)) {
error('Incorrect course.');
}
require_course_login($course, true, $cm);
} else { } else {
require_login(); require_login();
} }
} else if ($context && ($context->contextlevel == CONTEXT_SYSTEM)) {
if (!empty($CFG->forcelogin)) {
require_login();
}
} else { } else {
require_login(); require_login();
} }