From c492a78ee23028f9b181d52f8dc98130b6fca71e Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Tue, 24 Jul 2012 16:55:49 +0800 Subject: [PATCH] MDL-34468 quiz: Replace all instances of get_context_instance() with respective context_XXXX class in mod/quiz --- mod/quiz/attemptlib.php | 2 +- mod/quiz/editlib.php | 2 +- mod/quiz/index.php | 4 ++-- mod/quiz/lib.php | 10 +++++----- mod/quiz/locallib.php | 4 ++-- mod/quiz/overridedelete.php | 2 +- mod/quiz/overrideedit.php | 2 +- mod/quiz/overrides.php | 2 +- mod/quiz/report.php | 2 +- mod/quiz/view.php | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php index 1de37c1b0cb..78a74a61307 100644 --- a/mod/quiz/attemptlib.php +++ b/mod/quiz/attemptlib.php @@ -87,7 +87,7 @@ class quiz { $this->quiz->cmid = $this->cm->id; $this->course = $course; if ($getcontext && !empty($cm->id)) { - $this->context = get_context_instance(CONTEXT_MODULE, $cm->id); + $this->context = context_module::instance($cm->id); } $questionids = quiz_questions_in_quiz($this->quiz->questions); if ($questionids) { diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php index 6d16aa752d2..44f00d6ec89 100644 --- a/mod/quiz/editlib.php +++ b/mod/quiz/editlib.php @@ -744,7 +744,7 @@ function quiz_print_pagecontrols($quiz, $pageurl, $page, $hasattempts, echo '
'; // Get the current context. - $thiscontext = get_context_instance(CONTEXT_COURSE, $quiz->course); + $thiscontext = context_course::instance($quiz->course); $contexts = new question_edit_contexts($thiscontext); // Get the default category. diff --git a/mod/quiz/index.php b/mod/quiz/index.php index 6317a4a1373..8249d68e6ed 100644 --- a/mod/quiz/index.php +++ b/mod/quiz/index.php @@ -32,7 +32,7 @@ $PAGE->set_url('/mod/quiz/index.php', array('id'=>$id)); if (!$course = $DB->get_record('course', array('id' => $id))) { print_error('invalidcourseid'); } -$coursecontext = get_context_instance(CONTEXT_COURSE, $id); +$coursecontext = context_course::instance($id); require_login($course); $PAGE->set_pagelayout('incourse'); @@ -124,7 +124,7 @@ $table->align = $align; $currentsection = ''; foreach ($quizzes as $quiz) { $cm = get_coursemodule_from_instance('quiz', $quiz->id); - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $data = array(); // Section number if necessary. diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index 6e28cbfec20..f704992376e 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -839,7 +839,7 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart, return; } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $accessallgroups = has_capability('moodle/site:accessallgroups', $context); $viewfullnames = has_capability('moodle/site:viewfullnames', $context); $grader = has_capability('mod/quiz:viewreports', $context); @@ -1075,7 +1075,7 @@ function quiz_after_add_or_update($quiz) { // We need to use context now, so we need to make sure all needed info is already in db. $DB->set_field('course_modules', 'instance', $quiz->id, array('id'=>$cmid)); - $context = get_context_instance(CONTEXT_MODULE, $cmid); + $context = context_module::instance($cmid); // Save the feedback. $DB->delete_records('quiz_feedback', array('quizid' => $quiz->id)); @@ -1378,7 +1378,7 @@ function quiz_check_file_access($attemptuniqueid, $questionid, $context = null) if ($context === null) { $quiz = $DB->get_record('quiz', array('id' => $attempt->quiz)); $cm = get_coursemodule_from_id('quiz', $quiz->id); - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); } // Load those questions and the associated states. @@ -1439,7 +1439,7 @@ function quiz_print_overview($courses, &$htmlarray) { userdate($quiz->timeclose)) . '
'; // Now provide more information depending on the uers's role. - $context = get_context_instance(CONTEXT_MODULE, $quiz->coursemodule); + $context = context_module::instance($quiz->coursemodule); if (has_capability('mod/quiz:viewreports', $context)) { // For teacher-like people, show a summary of the number of student attempts. // The $quiz objects returned by get_all_instances_in_course have the necessary $cm @@ -1590,7 +1590,7 @@ function quiz_get_extra_capabilities() { function quiz_extend_navigation($quiznode, $course, $module, $cm) { global $CFG; - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); if (has_capability('mod/quiz:view', $context)) { $url = new moodle_url('/mod/quiz/view.php', array('id'=>$cm->id)); diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php index f535e9b8936..f19a9086dc0 100644 --- a/mod/quiz/locallib.php +++ b/mod/quiz/locallib.php @@ -1416,7 +1416,7 @@ function quiz_attempt_submitted_handler($event) { } return quiz_send_notification_messages($course, $quiz, $attempt, - get_context_instance(CONTEXT_MODULE, $cm->id), $cm); + context_module::instance($cm->id), $cm); } /** @@ -1442,7 +1442,7 @@ function quiz_attempt_overdue_handler($event) { } return quiz_send_overdue_message($course, $quiz, $attempt, - get_context_instance(CONTEXT_MODULE, $cm->id), $cm); + context_module::instance($cm->id), $cm); } /** diff --git a/mod/quiz/overridedelete.php b/mod/quiz/overridedelete.php index f0b4f27dcdc..75282260482 100644 --- a/mod/quiz/overridedelete.php +++ b/mod/quiz/overridedelete.php @@ -42,7 +42,7 @@ if (! $cm = get_coursemodule_from_instance("quiz", $quiz->id, $quiz->course)) { } $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST); -$context = get_context_instance(CONTEXT_MODULE, $cm->id); +$context = context_module::instance($cm->id); require_login($course, false, $cm); diff --git a/mod/quiz/overrideedit.php b/mod/quiz/overrideedit.php index 1a62b02e325..fa0c53d84f8 100644 --- a/mod/quiz/overrideedit.php +++ b/mod/quiz/overrideedit.php @@ -74,7 +74,7 @@ $PAGE->set_url($url); require_login($course, false, $cm); -$context = get_context_instance(CONTEXT_MODULE, $cm->id); +$context = context_module::instance($cm->id); // Add or edit an override. require_capability('mod/quiz:manageoverrides', $context); diff --git a/mod/quiz/overrides.php b/mod/quiz/overrides.php index 88333deac68..88739209a86 100644 --- a/mod/quiz/overrides.php +++ b/mod/quiz/overrides.php @@ -62,7 +62,7 @@ $PAGE->set_url($url); require_login($course, false, $cm); -$context = get_context_instance(CONTEXT_MODULE, $cm->id); +$context = context_module::instance($cm->id); // Check the user has the required capabilities to list overrides. require_capability('mod/quiz:manageoverrides', $context); diff --git a/mod/quiz/report.php b/mod/quiz/report.php index 6a7c3cc73de..1741e97c183 100644 --- a/mod/quiz/report.php +++ b/mod/quiz/report.php @@ -63,7 +63,7 @@ if ($mode !== '') { $PAGE->set_url($url); require_login($course, false, $cm); -$context = get_context_instance(CONTEXT_MODULE, $cm->id); +$context = context_module::instance($cm->id); $PAGE->set_pagelayout('report'); $reportlist = quiz_report_list($context); diff --git a/mod/quiz/view.php b/mod/quiz/view.php index 606f45a1134..7d666ebc71b 100644 --- a/mod/quiz/view.php +++ b/mod/quiz/view.php @@ -54,7 +54,7 @@ if ($id) { // Check login and get context. require_login($course, false, $cm); -$context = get_context_instance(CONTEXT_MODULE, $cm->id); +$context = context_module::instance($cm->id); require_capability('mod/quiz:view', $context); // Cache some other capabilities we use several times.