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

Merge branch 'MDL-34468-master' of git://github.com/ankitagarwal/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-07-24 17:53:50 +08:00
commit 6d2cd4368a
31 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/quiz/attemptlib.php
View file

@ -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) {

2
mod/quiz/editlib.php
View file

@ -744,7 +744,7 @@ function quiz_print_pagecontrols($quiz, $pageurl, $page, $hasattempts,
echo '<div class="pagecontrols">';
// 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.

4
mod/quiz/index.php
View file

@ -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.

10
mod/quiz/lib.php
View file

@ -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)) . '</div>';
// 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));

4
mod/quiz/locallib.php
View file

@ -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);
}
/**

2
mod/quiz/overridedelete.php
View file

@ -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);

2
mod/quiz/overrideedit.php
View file

@ -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);

2
mod/quiz/overrides.php
View file

@ -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);

2
mod/quiz/report.php
View file

@ -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);

2
mod/quiz/view.php
View file

@ -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.