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

MDL-21782 reworked enrolment framework, the core infrastructure is in place, the basic plugins are all implemented; see the tracker issue for list of unfinished bits, expect more changes and improvements during the next week

Browse Source 
AMOS START
    MOV [sendcoursewelcomemessage,core_admin],[sendcoursewelcomemessage,enrol_self]
    MOV [configsendcoursewelcomemessage,core_admin],[sendcoursewelcomemessage_desc,enrol_self]
    MOV [enrolstartdate,core],[enrolstartdate,enrol_self]
    MOV [enrolenddate,core],[enrolenddate,enrol_self]
    CPY [welcometocourse,core],[welcometocourse,enrol_self]
    CPY [welcometocoursetext,core],[welcometocoursetext,enrol_self]
    MOV [notenrollable,core],[notenrollable,core_enrol]
    MOV [enrolenddaterror,core],[enrolenddaterror,enrol_self]
    MOV [enrolmentkeyhint,core],[passwordinvalidhint,enrol_self]
    MOV [coursemanager,core_admin],[coursecontact,core_admin]
    MOV [configcoursemanager,core_admin],[coursecontact_desc,core_admin]
    MOV [enrolledincourserole,core],[enrolledincourserole,enrol_manual]
    MOV [enrolme,core],[enrolme,core_enrol]
    MOV [unenrol,core],[unenrol,core_enrol]
    MOV [unenrolme,core],[unenrolme,core_enrol]
    MOV [enrolmentnew,core],[enrolmentnew,core_enrol]
    MOV [enrolmentnewuser,core],[enrolmentnewuser,core_enrol]
    MOV [enrolments,core],[enrolments,core_enrol]
    MOV [enrolperiod,core],[enrolperiod,core_enrol]
    MOV [unenrolroleusers,core],[unenrolroleusers,core_enrol]
AMOS END
This commit is contained in:
Petr Skoda
2010-06-21 15:30:49 +00:00
parent 2c9bb9c327
commit df997f841f
225 changed files with 11062 additions and 7646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pluginfile.php
+5 -20
View File
@@ -220,7 +220,7 @@ if (!empty($sendflashupgrader) && (($userplayerversion[0] < $requiredplayervers
if ($USER->id !== $userid) {
$usercontext = get_context_instance(CONTEXT_USER, $userid);
// The browsing user is not the current user
if (!has_coursemanager_role($userid) && !has_capability('moodle/user:viewdetails', $usercontext)) {
if (!has_coursecontact_role($userid) && !has_capability('moodle/user:viewdetails', $usercontext)) {
send_file_not_found();
}
@@ -228,7 +228,7 @@ if (!empty($sendflashupgrader) && (($userplayerversion[0] < $requiredplayervers
if (has_capability('moodle/user:viewdetails', $usercontext)) {
$canview = true;
} else {
$courses = get_my_courses($USER->id);
$courses = enrol_get_my_courses();
}
while (!$canview && count($courses) > 0) {
@@ -309,28 +309,13 @@ if (!empty($sendflashupgrader) && (($userplayerversion[0] < $requiredplayervers
session_get_instance()->write_close(); // unlock session during fileserving
send_stored_file($file, 0, 0, true);
} else if ($filearea === 'course_intro') {
} else if ($filearea === 'course_summary') {
if ($CFG->forcelogin) {
require_login();
}
$relativepath = '/'.implode('/', $args);
$fullpath = $context->id.'course_intro0'.$relativepath;
if (!$file = $fs->get_file_by_hash(sha1($fullpath)) or $file->is_directory()) {
send_file_not_found();
}
session_get_instance()->write_close(); // unlock session during fileserving
send_stored_file($file, 60*60, 0, false); // TODO: change timeout?
} else if ($filearea === 'course_summary') {
if ($CFG->forcelogin) {
require_login();
}
$fullpath = $context->id.$filearea.implode('/', $args);
$fullpath = $context->id.'course_summary0'.$relativepath;
if (!$file = $fs->get_file_by_hash(sha1($fullpath)) or $file->is_directory()) {
send_file_not_found();
@@ -455,7 +440,7 @@ if (!empty($sendflashupgrader) && (($userplayerversion[0] < $requiredplayervers
print_error('noguest');
}
if (!has_coursemanager_role($userid) and !has_capability('moodle/user:viewdetails', $usercontext)) {
if (!has_coursecontact_role($userid) and !has_capability('moodle/user:viewdetails', $usercontext)) {
print_error('usernotavailable');
}
if (!has_capability('moodle/user:viewdetails', $context) &&