From c288a3dbf8a4254ab798836ab3fe9448c9fc4c6c Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Fri, 27 Jul 2012 13:27:13 +0800 Subject: [PATCH] MDL-34467 lti: Repalce all instances of get_context_instanc() with respective context_XXX::instance() --- mod/lti/grade.php | 2 +- mod/lti/instructor_edit_tool_type.php | 2 +- mod/lti/lib.php | 2 +- mod/lti/locallib.php | 4 ++-- mod/lti/request_tool.php | 2 +- mod/lti/return.php | 2 +- mod/lti/service.php | 2 +- mod/lti/view.php | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mod/lti/grade.php b/mod/lti/grade.php index e8c19a1d2a5..14e25c47983 100644 --- a/mod/lti/grade.php +++ b/mod/lti/grade.php @@ -68,7 +68,7 @@ if ($l) { // Two ways to specify the module $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); require_login($course, false, $cm); -$context = get_context_instance(CONTEXT_MODULE, $cm->id); +$context = context_module::instance($cm->id); require_capability('mod/lti:grade', $context); $url = new moodle_url('/mod/lti/grade.php', array('id' => $cm->id)); diff --git a/mod/lti/instructor_edit_tool_type.php b/mod/lti/instructor_edit_tool_type.php index c65b3f40522..3a700512f16 100644 --- a/mod/lti/instructor_edit_tool_type.php +++ b/mod/lti/instructor_edit_tool_type.php @@ -37,7 +37,7 @@ $PAGE->set_pagelayout('popup'); $action = optional_param('action', null, PARAM_TEXT); $typeid = optional_param('typeid', null, PARAM_INT); -require_capability('mod/lti:addcoursetool', get_context_instance(CONTEXT_COURSE, $courseid)); +require_capability('mod/lti:addcoursetool', context_course::instance($courseid)); if (!empty($typeid)) { $type = lti_get_type($typeid); diff --git a/mod/lti/lib.php b/mod/lti/lib.php index 0e154d8482c..fa74bbcd426 100644 --- a/mod/lti/lib.php +++ b/mod/lti/lib.php @@ -395,7 +395,7 @@ function lti_grade_item_delete($basiclti) { function lti_extend_settings_navigation($settings, $parentnode) { global $PAGE; - if (has_capability('mod/lti:grade', get_context_instance(CONTEXT_MODULE, $PAGE->cm->id))) { + if (has_capability('mod/lti:grade', context_module::instance($PAGE->cm->id))) { $keys = $parentnode->get_children_key_list(); $node = navigation_node::create('Submissions', diff --git a/mod/lti/locallib.php b/mod/lti/locallib.php index 0bbe06b85ba..8c9a3ef4d5b 100644 --- a/mod/lti/locallib.php +++ b/mod/lti/locallib.php @@ -462,7 +462,7 @@ function lti_get_ims_role($user, $cmid, $courseid) { //If no cmid is passed, check if the user is a teacher in the course //This allows other modules to programmatically "fake" a launch without //a real LTI instance - $coursecontext = get_context_instance(CONTEXT_COURSE, $courseid); + $coursecontext = context_course::instance($courseid); if (has_capability('moodle/course:manageactivities', $coursecontext)) { array_push($roles, 'Instructor'); @@ -470,7 +470,7 @@ function lti_get_ims_role($user, $cmid, $courseid) { array_push($roles, 'Learner'); } } else { - $context = get_context_instance(CONTEXT_MODULE, $cmid); + $context = context_module::instance($cmid); if (has_capability('mod/lti:manage', $context)) { array_push($roles, 'Instructor'); diff --git a/mod/lti/request_tool.php b/mod/lti/request_tool.php index d5c8c99bd42..daf664c596a 100644 --- a/mod/lti/request_tool.php +++ b/mod/lti/request_tool.php @@ -35,7 +35,7 @@ $course = $DB->get_record('course', array('id' => $lti->course)); require_login($course); -require_capability('mod/lti:requesttooladd', get_context_instance(CONTEXT_COURSE, $lti->course)); +require_capability('mod/lti:requesttooladd', context_course::instance($lti->course)); $baseurl = lti_get_domain_from_url($lti->toolurl); diff --git a/mod/lti/return.php b/mod/lti/return.php index 7b2ed8cb290..1ad5b3c19a7 100644 --- a/mod/lti/return.php +++ b/mod/lti/return.php @@ -61,7 +61,7 @@ if (!empty($errormsg)) { echo htmlspecialchars($errormsg); - $canaddtools = has_capability('mod/lti:addcoursetool', get_context_instance(CONTEXT_COURSE, $courseid)); + $canaddtools = has_capability('mod/lti:addcoursetool', context_course::instance($courseid)); if ($unsigned == 1 && $canaddtools) { echo '

'; diff --git a/mod/lti/service.php b/mod/lti/service.php index f3c9aca3819..fad61e64407 100644 --- a/mod/lti/service.php +++ b/mod/lti/service.php @@ -98,7 +98,7 @@ switch ($messagetype) { $ltiinstance = $DB->get_record('lti', array('id' => $parsed->instanceid)); //Getting the grade requires the context is set - $context = get_context_instance(CONTEXT_COURSE, $ltiinstance->course); + $context = context_course::instance($ltiinstance->course); $PAGE->set_context($context); lti_verify_sourcedid($ltiinstance, $parsed); diff --git a/mod/lti/view.php b/mod/lti/view.php index 7f43092eb14..5399bd72d93 100644 --- a/mod/lti/view.php +++ b/mod/lti/view.php @@ -73,7 +73,7 @@ if ($tool) { } $PAGE->set_cm($cm, $course); // set's up global $COURSE -$context = get_context_instance(CONTEXT_MODULE, $cm->id); +$context = context_module::instance($cm->id); $PAGE->set_context($context); $url = new moodle_url('/mod/lti/view.php', array('id'=>$cm->id));