moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +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.

2
mod/scorm/aicc.php
View file

@ -195,7 +195,7 @@ if (!empty($command)) {
if (! $cm = get_coursemodule_from_instance("scorm", $scorm->id, $scorm->course)) {
echo "error=1\r\nerror_text=Unknown\r\n"; // No one must see this error message if not hacked
}
if (!empty($aiccdata) && has_capability('mod/scorm:savetrack', get_context_instance(CONTEXT_MODULE, $cm->id), $aiccuser->id)) {
if (!empty($aiccdata) && has_capability('mod/scorm:savetrack', context_module::instance($cm->id), $aiccuser->id)) {
$initlessonstatus = 'not attempted';
$lessonstatus = 'not attempted';
if (isset($scormsession->scorm_lessonstatus)) {

2
mod/scorm/datamodel.php
View file

@ -53,7 +53,7 @@ require_login($course, false, $cm);
if (confirm_sesskey() && (!empty($scoid))) {
$result = true;
$request = null;
if (has_capability('mod/scorm:savetrack', get_context_instance(CONTEXT_MODULE, $cm->id))) {
if (has_capability('mod/scorm:savetrack', context_module::instance($cm->id))) {
foreach (data_submitted() as $element => $value) {
$element = str_replace('__', '.', $element);
if (substr($element, 0, 3) == 'cmi') {

2
mod/scorm/datamodels/aicclib.php
View file

@ -117,7 +117,7 @@ function scorm_parse_aicc($scorm) {
$cm = get_coursemodule_from_instance('scorm', $scorm->id);
$scorm->cmid = $cm->id;
}
$context = get_context_instance(CONTEXT_MODULE, $scorm->cmid);
$context = context_module::instance($scorm->cmid);
$fs = get_file_storage();

2
mod/scorm/grade.php
View file

@ -41,7 +41,7 @@ if (! $course = $DB->get_record('course', array('id'=> $scorm->course))) {
require_login($course, false, $cm);
if (has_capability('mod/scorm:viewreport', get_context_instance(CONTEXT_MODULE, $cm->id))) {
if (has_capability('mod/scorm:viewreport', context_module::instance($cm->id))) {
redirect('report.php?id='.$cm->id);
} else {
redirect('view.php?id='.$cm->id);

2
mod/scorm/index.php
View file

@ -74,7 +74,7 @@ if ($usesections) {
}
foreach ($scorms as $scorm) {
$context = get_context_instance(CONTEXT_MODULE, $scorm->coursemodule);
$context = context_module::instance($scorm->coursemodule);
$tt = "";
if ($usesections) {
if ($scorm->section) {

4
mod/scorm/lib.php
View file

@ -98,7 +98,7 @@ function scorm_add_instance($scorm, $mform=null) {
$cmidnumber = $scorm->cmidnumber;
$courseid = $scorm->course;
$context = get_context_instance(CONTEXT_MODULE, $cmid);
$context = context_module::instance($cmid);
$scorm = scorm_option2text($scorm);
$scorm->width = (int)str_replace('%', '', $scorm->width);
@ -189,7 +189,7 @@ function scorm_update_instance($scorm, $mform=null) {
$scorm->id = $scorm->instance;
$context = get_context_instance(CONTEXT_MODULE, $cmid);
$context = context_module::instance($cmid);
if ($scorm->scormtype === SCORM_TYPE_LOCAL) {
if ($mform) {

2
mod/scorm/loadSCO.php
View file

@ -61,7 +61,7 @@ if ($scorm->timeclose !=0) {
}
}
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
$context = context_module::instance($cm->id);
if (!empty($scoid)) {
//

8
mod/scorm/locallib.php
View file

@ -181,7 +181,7 @@ function scorm_parse($scorm, $full) {
$cm = get_coursemodule_from_instance('scorm', $scorm->id);
$scorm->cmid = $cm->id;
}
$context = get_context_instance(CONTEXT_MODULE, $scorm->cmid);
$context = context_module::instance($scorm->cmid);
$newhash = $scorm->sha1hash;
if ($scorm->scormtype === SCORM_TYPE_LOCAL or $scorm->scormtype === SCORM_TYPE_LOCALSYNC) {
@ -697,7 +697,7 @@ function scorm_course_format_display($user, $course) {
global $CFG, $DB, $PAGE, $OUTPUT;
$strupdate = get_string('update');
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$context = context_course::instance($course->id);
echo '<div class="mod-scorm">';
if ($scorms = get_all_instances_in_course('scorm', $course)) {
@ -706,7 +706,7 @@ function scorm_course_format_display($user, $course) {
if (! $cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id)) {
print_error('invalidcoursemodule');
}
$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
$contextmodule = context_module::instance($cm->id);
if ((has_capability('mod/scorm:skipview', $contextmodule))) {
scorm_simple_play($scorm, $user, $contextmodule, $cm->id);
}
@ -1426,7 +1426,7 @@ function scorm_get_toc($user,$scorm,$cmid,$toclink=TOCJSLINK,$currentorg='',$sco
$scoid = $sco->id;
}
}
if ($usertrack->score_raw != '' && has_capability('mod/scorm:viewscores', get_context_instance(CONTEXT_MODULE,$cmid))) {
if ($usertrack->score_raw != '' && has_capability('mod/scorm:viewscores', context_module::instance($cmid))) {
$score = '('.get_string('score','scorm').':&nbsp;'.$usertrack->score_raw.')';
}
$strsuspended = get_string('suspended','scorm');

2
mod/scorm/player.php
View file

@ -87,7 +87,7 @@ $strscorm = get_string('modulename', 'scorm');
$strpopup = get_string('popup', 'scorm');
$strexit = get_string('exitactivity', 'scorm');
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
$coursecontext = context_course::instance($course->id);
if ($displaymode == 'popup') {
$PAGE->set_pagelayout('popup');

2
mod/scorm/prereqs.php
View file

@ -64,7 +64,7 @@ require_once($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php');
if (confirm_sesskey() && (!empty($scoid))) {
$result = true;
$request = null;
if (has_capability('mod/scorm:savetrack', get_context_instance(CONTEXT_MODULE, $cm->id))) {
if (has_capability('mod/scorm:savetrack', context_module::instance($cm->id))) {
$result = scorm_get_toc($USER, $scorm, $cm->id, TOCJSLINK, $currentorg, $scoid, $mode, $attempt, true, false);
echo $result->toc;
}

2
mod/scorm/report.php
View file

@ -36,7 +36,7 @@ $cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$scorm = $DB->get_record('scorm', array('id'=>$cm->instance), '*', MUST_EXIST);
$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
$contextmodule = context_module::instance($cm->id);
$reportlist = scorm_report_list($contextmodule);
$url = new moodle_url('/mod/scorm/report.php');

2
mod/scorm/report/basic/report.php
View file

@ -33,7 +33,7 @@ class scorm_basic_report extends scorm_default_report {
*/
function display($scorm, $cm, $course, $download) {
global $CFG, $DB, $OUTPUT, $PAGE;
$contextmodule= get_context_instance(CONTEXT_MODULE, $cm->id);
$contextmodule= context_module::instance($cm->id);
$action = optional_param('action', '', PARAM_ALPHA);
$attemptids = optional_param_array('attemptid', array(), PARAM_RAW);
$attemptsmode = optional_param('attemptsmode', SCORM_REPORT_ATTEMPTS_ALL_STUDENTS, PARAM_INT);

4
mod/scorm/report/interactions/report.php
View file

@ -35,7 +35,7 @@ class scorm_interactions_report extends scorm_default_report {
*/
function display($scorm, $cm, $course, $download) {
global $CFG, $DB, $OUTPUT, $PAGE;
$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
$contextmodule = context_module::instance($cm->id);
$action = optional_param('action', '', PARAM_ALPHA);
$attemptids = optional_param_array('attemptid', array(), PARAM_RAW);
$attemptsmode = optional_param('attemptsmode', SCORM_REPORT_ATTEMPTS_ALL_STUDENTS, PARAM_INT);
@ -84,7 +84,7 @@ class scorm_interactions_report extends scorm_default_report {
groups_print_activity_menu($cm, new moodle_url($PAGE->url, $displayoptions));
}
}
$formattextoptions = array('context' => get_context_instance(CONTEXT_COURSE, $course->id));
$formattextoptions = array('context' => context_course::instance($course->id));
// We only want to show the checkbox to delete attempts
// if the user has permissions and if the report mode is showing attempts.

2
mod/scorm/tabs.php
View file

@ -32,7 +32,7 @@ if (!isset($cm)) {
$cm = get_coursemodule_from_instance('scorm', $scorm->id);
}
$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
$contextmodule = context_module::instance($cm->id);
$tabs = array();
$row = array();

2
mod/scorm/userreport.php
View file

@ -64,7 +64,7 @@ $PAGE->set_url($url);
// checking login +logging +getting context
require_login($course, false, $cm);
$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
$contextmodule = context_module::instance($cm->id);
require_capability('mod/scorm:viewreport', $contextmodule);
add_to_log($course->id, 'scorm', 'userreport', 'userreport.php?id='.$cm->id, $scorm->id, $cm->id);

4
mod/scorm/view.php
View file

@ -65,8 +65,8 @@ if (!empty($scorm->popup)) {
$PAGE->requires->js('/mod/scorm/view.js', true);
}
$context = get_context_instance(CONTEXT_COURSE, $course->id);
$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
$context = context_course::instance($course->id);
$contextmodule = context_module::instance($cm->id);
if (isset($SESSION->scorm)) {
unset($SESSION->scorm);

4
mod/survey/download.php
View file

@ -40,7 +40,7 @@ if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
print_error('coursemisconf');
}
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
$context = context_module::instance($cm->id);
$PAGE->set_url('/mod/survey/download.php', array('id'=>$id, 'type'=>$type, 'group'=>$group));
@ -146,7 +146,7 @@ foreach ($surveyanswers as $surveyanswer) {
}
// Output the file as a valid ODS spreadsheet if required
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
$coursecontext = context_course::instance($course->id);
$courseshortname = format_string($course->shortname, true, array('context' => $coursecontext));
if ($type == "ods") {

2
mod/survey/graph.php
View file

@ -39,7 +39,7 @@
require_login($course, false, $cm);
$groupmode = groups_get_activity_groupmode($cm); // Groups are being used
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
$context = context_module::instance($cm->id);
if (!has_capability('mod/survey:readresponses', $context)) {
if ($type != "student.png" or $sid != $USER->id ) {

2
mod/survey/report.php
View file

@ -63,7 +63,7 @@
require_login($course, false, $cm);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
$context = context_module::instance($cm->id);
require_capability('mod/survey:readresponses', $context);

2
mod/survey/save.php
View file

@ -47,7 +47,7 @@
$PAGE->set_url('/mod/survey/save.php', array('id'=>$id));
require_login($course, false, $cm);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
$context = context_module::instance($cm->id);
require_capability('mod/survey:participate', $context);
if (! $survey = $DB->get_record("survey", array("id"=>$cm->instance))) {

2
mod/survey/view.php
View file

@ -38,7 +38,7 @@
$PAGE->set_url('/mod/survey/view.php', array('id'=>$id));
require_login($course, false, $cm);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
$context = context_module::instance($cm->id);
require_capability('mod/survey:participate', $context);