MDL-34463 - lib - Alteration of the get_context_instance function to utilize the new function context_XXXX::instance().

This commit is contained in:
Adrian Greeve 2012-07-24 14:04:40 +08:00
parent 3294034b80
commit d40604724b
61 changed files with 95 additions and 100 deletions

View file

@ -41,7 +41,7 @@ if (!$course = $DB->get_record('course', array('id'=>$id))) {
}
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $id);
$context = context_course::instance($id);
require_capability('moodle/grade:import', $context);
require_capability('gradeimport/csv:view', $context);

View file

@ -59,7 +59,7 @@ if ($id) {
$key->courseid = $course->id;
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$context = context_course::instance($course->id);
require_capability('moodle/grade:import', $context);
// extra security check

View file

@ -35,7 +35,7 @@ if (!$course = $DB->get_record('course', array('id'=>$id))) {
}
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $id);
$context = context_course::instance($id);
require_capability('moodle/grade:import', $context);

View file

@ -161,13 +161,13 @@ function grade_import_commit($courseid, $importcode, $importfeedback=true, $verb
*/
function get_unenrolled_users_in_import($importcode, $courseid) {
global $CFG, $DB;
$relatedctxcondition = get_related_contexts_string(get_context_instance(CONTEXT_COURSE, $courseid));
$relatedctxcondition = get_related_contexts_string(context_course::instance($courseid));
//users with a gradeable role
list($gradebookrolessql, $gradebookrolesparams) = $DB->get_in_or_equal(explode(',', $CFG->gradebookroles), SQL_PARAMS_NAMED, 'grbr');
//enrolled users
$context = get_context_instance(CONTEXT_COURSE, $courseid);
$context = context_course::instance($courseid);
list($enrolledsql, $enrolledparams) = get_enrolled_sql($context);
$sql = "SELECT giv.id, u.firstname, u.lastname, u.idnumber AS useridnumber,

View file

@ -29,7 +29,7 @@ if (empty($CFG->gradepublishing)) {
print_error('gradepubdisable');
}
$context = get_context_instance(CONTEXT_COURSE, $id);
$context = context_course::instance($id);
require_capability('gradeimport/xml:publish', $context);
// use the same page parameters as import.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa

View file

@ -34,7 +34,7 @@ if (!$course = $DB->get_record('course', array('id'=>$id))) {
}
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $id);
$context = context_course::instance($id);
require_capability('moodle/grade:import', $context);
require_capability('gradeimport/xml:view', $context);

View file

@ -29,7 +29,7 @@ if (!$course = $DB->get_record('course', array('id'=>$id))) {
}
require_login($course);
$context = get_context_instance(CONTEXT_COURSE, $id);
$context = context_course::instance($id);
require_capability('moodle/grade:import', $context);
require_capability('gradeimport/xml:view', $context);