mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle

Browse Source 
Conflicts:
	course/lib.php
This commit is contained in:
Sam Hemelryk 2013-08-21 12:08:46 +12:00
commit 6eee89bc8f
191 changed files with 280 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/roles/assign.php
View File

@ -39,7 +39,7 @@ if ($course) {
} else {
$isfrontpage = false;
if ($context->contextlevel == CONTEXT_USER) {
$course = $DB->get_record('course', array('id'=>optional_param('courseid', SITEID, PARAM_INT)), '*', MUST_EXIST);
$course = get_course(optional_param('courseid', SITEID, PARAM_INT));
$user = $DB->get_record('user', array('id'=>$context->instanceid), '*', MUST_EXIST);
$url->param('courseid', $course->id);
$url->param('userid', $user->id);

2
admin/roles/check.php
View File

@ -35,7 +35,7 @@ if ($course) {
} else {
$isfrontpage = false;
if ($context->contextlevel == CONTEXT_USER) {
$course = $DB->get_record('course', array('id'=>optional_param('courseid', SITEID, PARAM_INT)), '*', MUST_EXIST);
$course = get_course(optional_param('courseid', SITEID, PARAM_INT));
$user = $DB->get_record('user', array('id'=>$context->instanceid), '*', MUST_EXIST);
$url->param('courseid', $course->id);
$url->param('userid', $user->id);

2
admin/roles/override.php
View File

@ -36,7 +36,7 @@ if ($course) {
} else {
$isfrontpage = false;
if ($context->contextlevel == CONTEXT_USER) {
$course = $DB->get_record('course', array('id'=>optional_param('courseid', SITEID, PARAM_INT)), '*', MUST_EXIST);
$course = get_course(optional_param('courseid', SITEID, PARAM_INT));
$user = $DB->get_record('user', array('id'=>$context->instanceid), '*', MUST_EXIST);
$url->param('courseid', $course->id);
$url->param('userid', $user->id);

2
admin/roles/permissions.php
View File

@ -43,7 +43,7 @@ if ($course) {
} else {
$isfrontpage = false;
if ($context->contextlevel == CONTEXT_USER) {
$course = $DB->get_record('course', array('id'=>optional_param('courseid', SITEID, PARAM_INT)), '*', MUST_EXIST);
$course = get_course(optional_param('courseid', SITEID, PARAM_INT));
$user = $DB->get_record('user', array('id'=>$context->instanceid), '*', MUST_EXIST);
$url->param('courseid', $course->id);
$url->param('userid', $user->id);

2
admin/roles/usersroles.php
View File

@ -32,7 +32,7 @@ $courseid = required_param('courseid', PARAM_INT);
// Validate them and get the corresponding objects.
$user = $DB->get_record('user', array('id' => $userid), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$usercontext = context_user::instance($user->id);
$coursecontext = context_course::instance($course->id);

2
backup/backup.php
View File

@ -40,7 +40,7 @@ $PAGE->set_pagelayout('admin');
$id = $courseid;
$cm = null;
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$type = backup::TYPE_1COURSE;
if (!is_null($sectionid)) {
$section = $DB->get_record('course_sections', array('course'=>$course->id, 'id'=>$sectionid), '*', MUST_EXIST);

4
backup/import.php
View File

@ -17,7 +17,7 @@ $searchcourses = optional_param('searchcourses', false, PARAM_BOOL);
$restoretarget = optional_param('target', backup::TARGET_CURRENT_ADDING, PARAM_INT);
// Load the course and context
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$context = context_course::instance($courseid);
// Must pass login
@ -51,7 +51,7 @@ if ($importcourseid === false || $searchcourses) {
}
// Load the course +context to import from
$importcourse = $DB->get_record('course', array('id'=>$importcourseid), '*', MUST_EXIST);
$importcourse = get_course($importcourseid);
$importcontext = context_course::instance($importcourseid);
// Make sure the user can backup from that course

2
backup/moodle2/backup_section_task.class.php
View File

@ -148,7 +148,7 @@ class backup_section_task extends backup_task {
// All these are common settings to be shared by all sections
$section = $DB->get_record('course_sections', array('id' => $this->sectionid), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id' => $section->course), '*', MUST_EXIST);
$course = get_course($section->course);
// Define section_included (to decide if the whole task must be really executed)
$settingname = $settingprefix . 'included';

6
backup/moodle2/restore_stepslib.php
View File

@ -1422,7 +1422,7 @@ class restore_course_structure_step extends restore_structure_step {
}
// Course record ready, update it
$DB->update_record('course', $data);
update_course_record($data);
course_get_format($data)->update_course_format_options($data);
@ -1632,7 +1632,7 @@ class restore_default_enrolments_step extends restore_execution_step {
public function define_execution() {
global $DB;
$course = $DB->get_record('course', array('id'=>$this->get_courseid()), '*', MUST_EXIST);
$course = get_course($this->get_courseid());
if ($DB->record_exists('enrol', array('courseid'=>$this->get_courseid(), 'enrol'=>'manual'))) {
// Something already added instances, do not add default instances.
@ -1849,7 +1849,7 @@ class restore_fix_restorer_access_step extends restore_execution_step {
return;
}
if (!$DB->record_exists('enrol', array('enrol'=>'manual', 'courseid'=>$courseid))) {
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$fields = array('status'=>ENROL_INSTANCE_ENABLED, 'enrolperiod'=>$enrol->get_config('enrolperiod', 0), 'roleid'=>$enrol->get_config('roleid', 0));
$enrol->add_instance($course, $fields);
}

2
backup/util/checks/backup_check.class.php
View File

@ -109,7 +109,7 @@ abstract class backup_check {
$typecapstocheck = array();
switch ($type) {
case backup::TYPE_1COURSE :
$DB->get_record('course', array('id' => $id), '*', MUST_EXIST); // course exists
get_course($id); // course exists
$typecapstocheck['moodle/backup:backupcourse'] = $coursectx;
break;
case backup::TYPE_1SECTION :

2
blocks/community/communitycourse.php
View File

@ -34,7 +34,7 @@ require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
require_login();
$courseid = required_param('courseid', PARAM_INT); //if no courseid is given
$parentcourse = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$parentcourse = get_course($courseid);
$context = context_course::instance($courseid);
$PAGE->set_course($parentcourse);

2
blocks/completionstatus/details.php
View File

@ -32,7 +32,7 @@ $id = required_param('course', PARAM_INT);
$userid = optional_param('user', 0, PARAM_INT);
// Load course.
$course = $DB->get_record('course', array('id' => $id), '*', MUST_EXIST);
$course = get_course($id);
// Load user.
if ($userid) {

2
blocks/rss_client/editfeed.php
View File

@ -154,7 +154,7 @@ if ($courseid == SITEID) {
$courseid = 0;
}
if ($courseid) {
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$PAGE->set_course($course);
$context = $PAGE->context;
} else {

2
blocks/rss_client/managefeeds.php
View File

@ -36,7 +36,7 @@ if ($courseid == SITEID) {
$courseid = 0;
}
if ($courseid) {
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$PAGE->set_course($course);
$context = $PAGE->context;
} else {

2
blocks/rss_client/viewfeed.php
View File

@ -39,7 +39,7 @@ if ($courseid = SITEID) {
$courseid = 0;
}
if ($courseid) {
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$PAGE->set_course($course);
$context = $PAGE->context;
} else {

2
calendar/event.php
View File

@ -81,7 +81,7 @@ $PAGE->set_url($url);
$PAGE->set_pagelayout('standard');
if ($courseid != SITEID && !empty($courseid)) {
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$courses = array($course->id => $course);
$issite = false;
} else {

2
calendar/lib.php
View File

@ -1811,7 +1811,7 @@ function calendar_get_allowed_types(&$allowed, $course = null) {
if (!empty($course)) {
if (!is_object($course)) {
$course = $DB->get_record('course', array('id' => $course), '*', MUST_EXIST);
$course = get_course($course);
}
if ($course->id != SITEID) {
$coursecontext = context_course::instance($course->id);

2
calendar/preferences.php
View File

@ -7,7 +7,7 @@ require_once($CFG->dirroot.'/calendar/lib.php');
require_once($CFG->dirroot.'/calendar/preferences_form.php');
$courseid = required_param('course', PARAM_INT);
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$PAGE->set_url(new moodle_url('/calendar/preferences.php', array('course' => $courseid)));
$PAGE->set_pagelayout('standard');

2
course/changenumsections.php
View File

@ -30,7 +30,7 @@ require_once($CFG->dirroot.'/course/lib.php');
$courseid = required_param('courseid', PARAM_INT);
$increase = optional_param('increase', true, PARAM_BOOL);
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$courseformatoptions = course_get_format($course)->get_format_options();
$PAGE->set_url('/course/changenumsections.php', array('courseid' => $courseid));

2
course/dnduploadlib.php
View File

@ -460,7 +460,7 @@ class dndupload_ajax_processor {
throw new coding_exception('dndupload_ajax_processor should only be used within AJAX requests');
}
$this->course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$this->course = get_course($courseid);
require_login($this->course, false);
$this->context = context_course::instance($this->course->id);

2
course/editsection.php
View File

@ -33,7 +33,7 @@ $sectionreturn = optional_param('sr', 0, PARAM_INT);
$PAGE->set_url('/course/editsection.php', array('id'=>$id, 'sr'=> $sectionreturn));
$section = $DB->get_record('course_sections', array('id' => $id), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id' => $section->course), '*', MUST_EXIST);
$course = get_course($section->course);
$sectionnum = $section->section;
require_login($course);

10
course/externallib.php
View File

@ -67,7 +67,7 @@ class core_course_external extends external_api {
* @since Moodle 2.2
*/
public static function get_course_contents($courseid, $options = array()) {
global $CFG, $DB;
global $CFG;
require_once($CFG->dirroot . "/course/lib.php");
//validate parameter
@ -75,7 +75,7 @@ class core_course_external extends external_api {
array('courseid' => $courseid, 'options' => $options));
//retrieve the course
$course = $DB->get_record('course', array('id' => $params['courseid']), '*', MUST_EXIST);
$course = get_course($params['courseid']);
//check course format exist
if (!file_exists($CFG->dirroot . '/course/format/' . $course->format . '/lib.php')) {
@ -848,7 +848,7 @@ class core_course_external extends external_api {
$transaction = $DB->start_delegated_transaction();
foreach ($params['courseids'] as $courseid) {
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
// Check if the context is valid.
$coursecontext = context_course::instance($course->id);
@ -1077,13 +1077,13 @@ class core_course_external extends external_api {
$rc->execute_plan();
$rc->destroy();
$course = $DB->get_record('course', array('id' => $newcourseid), '*', MUST_EXIST);
$course = get_course($newcourseid);
$course->fullname = $params['fullname'];
$course->shortname = $params['shortname'];
$course->visible = $params['visible'];
// Set shortname and fullname back.
$DB->update_record('course', $course);
update_course_record($course);
if (empty($CFG->keeptempdirectoriesonbackup)) {
fulldelete($backupbasepath);

12
course/lib.php
View File

@ -2052,7 +2052,7 @@ function move_courses($courseids, $categoryid) {
$course->visible = 0;
}
$DB->update_record('course', $course);
update_course_record($course);
// Store the context.
$context = context_course::instance($course->id);
@ -2383,7 +2383,7 @@ function update_course($data, $editoroptions = NULL) {
}
// Update with the new data
$DB->update_record('course', $data);
update_course_record($data);
// make sure the modinfo cache is reset
rebuild_course_cache($data->id);
@ -3083,7 +3083,7 @@ function course_get_url($courseorid, $section = null, $options = array()) {
* @return object the created module info
*/
function create_module($moduleinfo) {
global $DB, $CFG;
global $CFG;
require_once($CFG->dirroot . '/course/modlib.php');
@ -3099,7 +3099,7 @@ function create_module($moduleinfo) {
}
// Some additional checks (capability / existing instances).
$course = $DB->get_record('course', array('id'=>$moduleinfo->course), '*', MUST_EXIST);
$course = get_course($moduleinfo->course);
list($module, $context, $cw) = can_add_moduleinfo($course, $moduleinfo->modulename, $moduleinfo->section);
// Load module library.
@ -3123,7 +3123,7 @@ function create_module($moduleinfo) {
* @return object the updated module info
*/
function update_module($moduleinfo) {
global $DB, $CFG;
global $CFG;
require_once($CFG->dirroot . '/course/modlib.php');
@ -3131,7 +3131,7 @@ function update_module($moduleinfo) {
$cm = get_coursemodule_from_id('', $moduleinfo->coursemodule, 0, false, MUST_EXIST);
// Check the course exists.
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
// Some checks (capaibility / existing instances).
list($cm, $context, $module, $data, $cw) = can_update_moduleinfo($cm);

2
course/loginas.php
View File

@ -33,7 +33,7 @@ if ($redirect) {
$userid = required_param('user', PARAM_INT);
require_sesskey();
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
// User must be logged in.

6
course/manage.php
View File

@ -237,17 +237,17 @@ if (!empty($moveto) && ($data = data_submitted()) && confirm_sesskey()) {
if ((!empty($hide) or !empty($show)) && confirm_sesskey()) {
// Hide or show a course.
if (!empty($hide)) {
$course = $DB->get_record('course', array('id' => $hide), '*', MUST_EXIST);
$course = get_course($hide);
$visible = 0;
} else {
$course = $DB->get_record('course', array('id' => $show), '*', MUST_EXIST);
$course = get_course($show);
$visible = 1;
}
$coursecontext = context_course::instance($course->id);
require_capability('moodle/course:visibility', $coursecontext);
// Set the visibility of the course. we set the old flag when user manually changes visibility of course.
$params = array('id' => $course->id, 'visible' => $visible, 'visibleold' => $visible, 'timemodified' => time());
$DB->update_record('course', $params);
update_course_record((object)$params);
cache_helper::purge_by_event('changesincourse');
// Update the course object we pass to the event class.

18
course/mod.php
View File

@ -80,7 +80,7 @@ if (!empty($add)) {
} else if (!empty($duplicate)) {
$cm = get_coursemodule_from_id('', $duplicate, 0, true, MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, false, $cm);
$coursecontext = context_course::instance($course->id);
@ -117,7 +117,7 @@ if (!empty($add)) {
} else if (!empty($delete)) {
$cm = get_coursemodule_from_id('', $delete, 0, true, MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, false, $cm);
$modcontext = context_module::instance($cm->id);
@ -158,7 +158,7 @@ if (!empty($add)) {
if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) {
$cm = get_coursemodule_from_id('', $USER->activitycopy, 0, true, MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, false, $cm);
$coursecontext = context_course::instance($course->id);
@ -198,7 +198,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) {
$id = required_param('id', PARAM_INT);
$cm = get_coursemodule_from_id('', $id, 0, true, MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, false, $cm);
$coursecontext = context_course::instance($course->id);
@ -219,7 +219,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) {
} else if (!empty($hide) and confirm_sesskey()) {
$cm = get_coursemodule_from_id('', $hide, 0, true, MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, false, $cm);
$coursecontext = context_course::instance($course->id);
@ -232,7 +232,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) {
} else if (!empty($show) and confirm_sesskey()) {
$cm = get_coursemodule_from_id('', $show, 0, true, MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, false, $cm);
$coursecontext = context_course::instance($course->id);
@ -253,7 +253,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) {
$id = required_param('id', PARAM_INT);
$cm = get_coursemodule_from_id('', $id, 0, true, MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, false, $cm);
$coursecontext = context_course::instance($course->id);
@ -266,7 +266,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) {
} else if (!empty($copy) and confirm_sesskey()) { // value = course module
$cm = get_coursemodule_from_id('', $copy, 0, true, MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, false, $cm);
$coursecontext = context_course::instance($course->id);
@ -285,7 +285,7 @@ if ((!empty($movetosection) or !empty($moveto)) and confirm_sesskey()) {
} else if (!empty($cancelcopy) and confirm_sesskey()) { // value = course module
$courseid = $USER->activitycopycourse;
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$cm = get_coursemodule_from_id('', $USER->activitycopy, 0, true, IGNORE_MISSING);
$sectionreturn = $USER->activitycopysectionreturn;

2
course/modduplicate.php
View File

@ -36,7 +36,7 @@ $cmid = required_param('cmid', PARAM_INT);
$courseid = required_param('course', PARAM_INT);
$sectionreturn = optional_param('sr', null, PARAM_INT);
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$cm = get_coursemodule_from_id('', $cmid, $course->id, true, MUST_EXIST);
$cmcontext = context_module::instance($cm->id);
$context = context_course::instance($courseid);

4
course/modedit.php
View File

@ -53,7 +53,7 @@ if (!empty($add)) {
$url->param('course', $course);
$PAGE->set_url($url);
$course = $DB->get_record('course', array('id'=>$course), '*', MUST_EXIST);
$course = get_course($course);
require_login($course);
list($module, $context, $cw) = can_add_moduleinfo($course, $add, $section);
@ -124,7 +124,7 @@ if (!empty($add)) {
$cm = get_coursemodule_from_id('', $update, 0, false, MUST_EXIST);
// Check the course exists.
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
// require_login
require_login($course, false, $cm); // needed to setup proper $COURSE

2
course/publish/backup.php
View File

@ -45,7 +45,7 @@ $huburl = required_param('huburl', PARAM_URL);
$hubname = optional_param('hubname', '', PARAM_TEXT);
//some permissions and parameters checking
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
require_login($course);
if (!has_capability('moodle/course:publish', context_course::instance($id))
or !confirm_sesskey()) {

2
course/publish/hubselector.php
View File

@ -30,7 +30,7 @@ require_once($CFG->dirroot.'/' . $CFG->admin . '/registration/lib.php');
require_once($CFG->dirroot.'/course/publish/forms.php');
$id = required_param('id', PARAM_INT);
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
require_login($course);
$PAGE->set_url('/course/publish/hubselector.php', array('id' => $course->id));

2
course/publish/index.php
View File

@ -34,7 +34,7 @@ $id = required_param('id', PARAM_INT);
$hubname = optional_param('hubname', 0, PARAM_TEXT);
$huburl = optional_param('huburl', 0, PARAM_URL);
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
require_login($course);
$context = context_course::instance($course->id);

2
course/publish/metadata.php
View File

@ -40,7 +40,7 @@ require_once($CFG->libdir . '/filelib.php');
//check user access capability to this page
$id = required_param('id', PARAM_INT);
$course = $DB->get_record('course', array('id' => $id), '*', MUST_EXIST);
$course = get_course($id);
require_login($course);
//page settings

2
course/report.php
View File

@ -4,7 +4,7 @@
require_once('../config.php');
$id = required_param('id', PARAM_INT); // course id to import TO
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$PAGE->set_pagelayout('standard');
require_login($course);

2
course/resources.php
View File

@ -28,7 +28,7 @@ require_once("$CFG->libdir/resourcelib.php");
$id = required_param('id', PARAM_INT); // course id
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$PAGE->set_pagelayout('course');
require_course_login($course, true);

2
course/rest.php
View File

@ -49,7 +49,7 @@ $PAGE->set_url('/course/rest.php', array('courseId'=>$courseid,'class'=>$class))
//NOTE: when making any changes here please make sure it is using the same access control as course/mod.php !!
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
// Check user is logged in and set contexts if we are dealing with resource
if (in_array($class, array('resource'))) {
$cm = get_coursemodule_from_id(null, $id, $course->id, false, MUST_EXIST);

4
course/togglecompletion.php
View File

@ -40,7 +40,7 @@ if ($courseid) {
$PAGE->set_url(new moodle_url('/course/togglecompletion.php', array('course'=>$courseid)));
// Check user is logged in
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$context = context_course::instance($course->id);
require_login($course);
@ -129,7 +129,7 @@ switch($targetstate) {
// Get course-modules entry
$cm = get_coursemodule_from_id(null, $cmid, null, true, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
// Check user is logged in
require_login($course, false, $cm);

2
course/user.php
View File

@ -31,7 +31,7 @@ $mode = optional_param('mode', "todaylogs", PARAM_ALPHA);
$url = new moodle_url('/course/user.php', array('id'=>$id,'user'=>$user, 'mode'=>$mode));
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$user = $DB->get_record("user", array("id"=>$user, 'deleted'=>0), '*', MUST_EXIST);
if ($mode === 'outline' or $mode === 'complete') {

2
enrol/ajax.php
View File

@ -38,7 +38,7 @@ $action = required_param('action', PARAM_ALPHANUMEXT);
$PAGE->set_url(new moodle_url('/enrol/ajax.php', array('id'=>$id, 'action'=>$action)));
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
if ($course->id == SITEID) {

2
enrol/bulkchange.php
View File

@ -34,7 +34,7 @@ $userids = required_param_array('bulkuser', PARAM_INT);
$action = optional_param('action', '', PARAM_ALPHANUMEXT);
$filter = optional_param('ifilter', 0, PARAM_INT);
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
if ($course->id == SITEID) {

2
enrol/cohort/ajax.php
View File

@ -38,7 +38,7 @@ $action = required_param('action', PARAM_ALPHANUMEXT);
$PAGE->set_url(new moodle_url('/enrol/cohort/ajax.php', array('id'=>$id, 'action'=>$action)));
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
if ($course->id == SITEID) {

2
enrol/cohort/edit.php
View File

@ -30,7 +30,7 @@ require_once("$CFG->dirroot/group/lib.php");
$courseid = required_param('courseid', PARAM_INT);
$instanceid = optional_param('id', 0, PARAM_INT);
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$context = context_course::instance($course->id, MUST_EXIST);
require_login($course);

2
enrol/editenrolment.php
View File

@ -38,7 +38,7 @@ $filter = optional_param('ifilter', 0, PARAM_INT); // Table filter for return ur
$ue = $DB->get_record('user_enrolments', array('id' => $ueid), '*', MUST_EXIST);
$user = $DB->get_record('user', array('id'=>$ue->userid), '*', MUST_EXIST);
$instance = $DB->get_record('enrol', array('id'=>$ue->enrolid), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$instance->courseid), '*', MUST_EXIST);
$course = get_course($instance->courseid);
// The URL of the enrolled users page for the course.
$usersurl = new moodle_url('/enrol/users.php', array('id' => $course->id));

4
enrol/externallib.php
View File

@ -124,7 +124,7 @@ class core_enrol_external extends external_api {
foreach ($params['coursecapabilities'] as $coursecapability) {
$courseid = $coursecapability['courseid'];
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$coursecontext = context_course::instance($courseid);
if (!$coursecontext) {
throw new moodle_exception('cannotfindcourse', 'error', '', null,
@ -423,7 +423,7 @@ class core_enrol_external extends external_api {
}
}
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$coursecontext = context_course::instance($courseid, IGNORE_MISSING);
if ($courseid == SITEID) {
$context = context_system::instance();

2
enrol/guest/addinstance.php
View File

@ -26,7 +26,7 @@ require('../../config.php');
$id = required_param('id', PARAM_INT); // course id
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
require_login($course);

2
enrol/index.php
View File

@ -33,7 +33,7 @@ if (!isloggedin()) {
redirect(get_login_url());
}
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
// Everybody is enrolled on the frontpage

2
enrol/instances.php
View File

@ -29,7 +29,7 @@ $action = optional_param('action', '', PARAM_ALPHANUMEXT);
$instanceid = optional_param('instance', 0, PARAM_INT);
$confirm = optional_param('confirm', 0, PARAM_BOOL);
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
if ($course->id == SITEID) {

2
enrol/manual/ajax.php
View File

@ -36,7 +36,7 @@ $action = required_param('action', PARAM_ALPHANUMEXT);
$PAGE->set_url(new moodle_url('/enrol/ajax.php', array('id'=>$id, 'action'=>$action)));
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
if ($course->id == SITEID) {

2
enrol/manual/edit.php
View File

@ -28,7 +28,7 @@ require_once('edit_form.php');
$courseid = required_param('courseid', PARAM_INT);
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$context = context_course::instance($course->id, MUST_EXIST);
require_login($course);

2
enrol/manual/locallib.php
View File

@ -389,7 +389,7 @@ function enrol_manual_migrate_plugin_enrolments($enrol) {
$minstance = false;
if (!$e->mid) {
// Manual instance does not exist yet, add a new one.
$course = $DB->get_record('course', array('id'=>$e->courseid), '*', MUST_EXIST);
$course = get_course($e->courseid);
if ($minstance = $DB->get_record('enrol', array('courseid'=>$course->id, 'enrol'=>'manual'))) {
// Already created by previous iteration.
$e->mid = $minstance->id;

2
enrol/manual/manage.php
View File

@ -31,7 +31,7 @@ $extendperiod = optional_param('extendperiod', 0, PARAM_INT);
$extendbase = optional_param('extendbase', 3, PARAM_INT);
$instance = $DB->get_record('enrol', array('id'=>$enrolid, 'enrol'=>'manual'), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$instance->courseid), '*', MUST_EXIST);
$course = get_course($instance->courseid);
$context = context_course::instance($course->id, MUST_EXIST);
require_login($course);

2
enrol/manual/unenrolself.php
View File

@ -28,7 +28,7 @@ $enrolid = required_param('enrolid', PARAM_INT);
$confirm = optional_param('confirm', 0, PARAM_BOOL);
$instance = $DB->get_record('enrol', array('id'=>$enrolid, 'enrol'=>'manual'), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$instance->courseid), '*', MUST_EXIST);
$course = get_course($instance->courseid);
$context = context_course::instance($course->id, MUST_EXIST);
require_login();

2
enrol/meta/addinstance.php
View File

@ -28,7 +28,7 @@ require_once("$CFG->dirroot/enrol/meta/locallib.php");
$id = required_param('id', PARAM_INT); // course id
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
$PAGE->set_url('/enrol/meta/addinstance.php', array('id'=>$course->id));

2
enrol/mnet/addinstance.php
View File

@ -28,7 +28,7 @@ require_once($CFG->dirroot.'/mnet/service/enrol/locallib.php');
$id = required_param('id', PARAM_INT); // course id
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
require_login($course);

2
enrol/otherusers.php
View File

@ -31,7 +31,7 @@ $id = required_param('id', PARAM_INT); // course id
$action = optional_param('action', '', PARAM_ALPHANUMEXT);
$filter = optional_param('ifilter', 0, PARAM_INT);
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
require_login($course);

2
enrol/paypal/edit.php
View File

@ -29,7 +29,7 @@ require_once('edit_form.php');
$courseid = required_param('courseid', PARAM_INT);
$instanceid = optional_param('id', 0, PARAM_INT); // instanceid
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$context = context_course::instance($course->id, MUST_EXIST);
require_login($course);

2
enrol/paypal/unenrolself.php
View File

@ -28,7 +28,7 @@ $enrolid = required_param('enrolid', PARAM_INT);
$confirm = optional_param('confirm', 0, PARAM_BOOL);
$instance = $DB->get_record('enrol', array('id'=>$enrolid, 'enrol'=>'paypal'), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$instance->courseid), '*', MUST_EXIST);
$course = get_course($instance->courseid);
$context = context_course::instance($course->id, MUST_EXIST);
require_login();

2
enrol/self/edit.php
View File

@ -29,7 +29,7 @@ require_once('edit_form.php');
$courseid = required_param('courseid', PARAM_INT);
$instanceid = optional_param('id', 0, PARAM_INT);
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$context = context_course::instance($course->id, MUST_EXIST);
require_login($course);

2
enrol/self/lib.php
View File

@ -397,7 +397,7 @@ class enrol_self_plugin extends enrol_plugin {
protected function email_welcome_message($instance, $user) {
global $CFG, $DB;
$course = $DB->get_record('course', array('id'=>$instance->courseid), '*', MUST_EXIST);
$course = get_course($instance->courseid);
$context = context_course::instance($course->id);
$a = new stdClass();

2
enrol/self/unenrolself.php
View File

@ -28,7 +28,7 @@ $enrolid = required_param('enrolid', PARAM_INT);
$confirm = optional_param('confirm', 0, PARAM_BOOL);
$instance = $DB->get_record('enrol', array('id'=>$enrolid, 'enrol'=>'self'), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$instance->courseid), '*', MUST_EXIST);
$course = get_course($instance->courseid);
$context = context_course::instance($course->id, MUST_EXIST);
require_login();

2
enrol/unenroluser.php
View File

@ -36,7 +36,7 @@ $filter = optional_param('ifilter', 0, PARAM_INT);
$ue = $DB->get_record('user_enrolments', array('id' => $ueid), '*', MUST_EXIST);
$user = $DB->get_record('user', array('id'=>$ue->userid), '*', MUST_EXIST);
$instance = $DB->get_record('enrol', array('id'=>$ue->enrolid), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$instance->courseid), '*', MUST_EXIST);
$course = get_course($instance->courseid);
$context = context_course::instance($course->id);

2
enrol/users.php
View File

@ -41,7 +41,7 @@ if (optional_param('resetbutton', '', PARAM_RAW) !== '') {
redirect('users.php?id=' . $id);
}
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$context = context_course::instance($course->id, MUST_EXIST);
if ($course->id == SITEID) {

2
file.php
View File

@ -63,7 +63,7 @@ $courseid = (int)array_shift($args);
$relativepath = implode('/', $args);
// security: limit access to existing course subdirectories
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
if ($course->legacyfiles != 2) {
// course files disabled

2
grade/edit/outcome/course.php
View File

@ -30,7 +30,7 @@ $courseid = required_param('id', PARAM_INT);
$PAGE->set_url('/grade/edit/outcome/course.php', array('id'=>$courseid));
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
/// Make sure they can even access this course
require_login($course);

2
grade/edit/outcome/edit.php
View File

@ -75,7 +75,7 @@ if ($id) {
} else if ($courseid){
$heading = get_string('addoutcome', 'grades');
/// adding new outcome from course
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
require_login($course);
$context = context_course::instance($course->id);
require_capability('moodle/grade:manage', $context);

2
grade/edit/outcome/index.php
View File

@ -34,7 +34,7 @@ $PAGE->set_pagelayout('admin');
/// Make sure they can even access this course
if ($courseid) {
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
require_login($course);
$context = context_course::instance($course->id);
require_capability('moodle/grade:manageoutcomes', $context);

2
group/import.php
View File

@ -30,7 +30,7 @@ include_once('import_form.php');
$id = required_param('id', PARAM_INT); // Course id
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
$PAGE->set_url('/group/import.php', array('id'=>$id));

2
group/index.php
View File

@ -42,7 +42,7 @@ $returnurl = $CFG->wwwroot.'/group/index.php?id='.$courseid;
// Get the course information so we can print the header and
// check the course id is valid
$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$url = new moodle_url('/group/index.php', array('id'=>$courseid));
if ($userid) {

2
group/lib.php
View File

@ -218,7 +218,7 @@ function groups_create_group($data, $editform = false, $editoroptions = false) {
global $CFG, $DB;
//check that courseid exists
$course = $DB->get_record('course', array('id' => $data->courseid), '*', MUST_EXIST);
$course = get_course($data->courseid);
$context = context_course::instance($course->id);
$data->timecreated = time();

2
group/members.php
View File

@ -32,7 +32,7 @@ $groupid = required_param('group', PARAM_INT);
$cancel = optional_param('cancel', false, PARAM_BOOL);
$group = $DB->get_record('groups', array('id'=>$groupid), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$group->courseid), '*', MUST_EXIST);
$course = get_course($group->courseid);
$PAGE->set_url('/group/members.php', array('group'=>$groupid));
$PAGE->set_pagelayout('admin');

10
lib/accesslib.php
View File

@ -1428,27 +1428,25 @@ function get_local_override($roleid, $contextid, $capability) {
* @return array of ($context, $course, $cm)
*/
function get_context_info_array($contextid) {
global $DB;
$context = context::instance_by_id($contextid, MUST_EXIST);
$course = null;
$cm = null;
if ($context->contextlevel == CONTEXT_COURSE) {
$course = $DB->get_record('course', array('id'=>$context->instanceid), '*', MUST_EXIST);
$course = get_course($context->instanceid);
} else if ($context->contextlevel == CONTEXT_MODULE) {
$cm = get_coursemodule_from_id('', $context->instanceid, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
} else if ($context->contextlevel == CONTEXT_BLOCK) {
$parent = $context->get_parent_context();
if ($parent->contextlevel == CONTEXT_COURSE) {
$course = $DB->get_record('course', array('id'=>$parent->instanceid), '*', MUST_EXIST);
$course = get_course($parent->instanceid);
} else if ($parent->contextlevel == CONTEXT_MODULE) {
$cm = get_coursemodule_from_id('', $parent->instanceid, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
}
}

23
lib/adminlib.php
View File

@ -3578,7 +3578,7 @@ class admin_setting_sitesetselect extends admin_setting_configselect {
* @return string empty or error message
*/
public function write_setting($data) {
global $DB, $SITE, $COURSE;
global $SITE, $COURSE;
if (!in_array($data, array_keys($this->choices))) {
return get_string('errorsetting', 'admin');
}
@ -3589,17 +3589,16 @@ class admin_setting_sitesetselect extends admin_setting_configselect {
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
$DB->update_record('course', $record);
update_course_record($record);
// Reset caches.
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);
$SITE = get_course($SITE->id);
if ($SITE->id == $COURSE->id) {
$COURSE = $SITE;
}
format_base::reset_course_cache($SITE->id);
return '';
}
}
@ -3781,22 +3780,21 @@ class admin_setting_sitesetcheckbox extends admin_setting_configcheckbox {
* @return string empty string or error message
*/
public function write_setting($data) {
global $DB, $SITE, $COURSE;
global $SITE, $COURSE;
$record = new stdClass();
$record->id = $SITE->id;
$record->{$this->name} = ($data == '1' ? 1 : 0);
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
$DB->update_record('course', $record);
update_course_record($record);
// Reset caches.
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);
$SITE = get_course($SITE->id);
if ($SITE->id == $COURSE->id) {
$COURSE = $SITE;
}
format_base::reset_course_cache($SITE->id);
return '';
}
}
@ -3843,7 +3841,7 @@ class admin_setting_sitesettext extends admin_setting_configtext {
* @return string empty or error message
*/
public function write_setting($data) {
global $DB, $SITE, $COURSE;
global $SITE, $COURSE;
$data = trim($data);
$validated = $this->validate($data);
if ($validated !== true) {
@ -3856,15 +3854,14 @@ class admin_setting_sitesettext extends admin_setting_configtext {
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
$DB->update_record('course', $record);
update_course_record($record);
// Reset caches.
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);
$SITE = get_course($SITE->id);
if ($SITE->id == $COURSE->id) {
$COURSE = $SITE;
}
format_base::reset_course_cache($SITE->id);
return '';
}
}
@ -3907,7 +3904,7 @@ class admin_setting_special_frontpagedesc extends admin_setting {
$record->timemodified = time();
course_get_format($SITE)->update_course_format_options($record);
$DB->update_record('course', $record);
update_course_record($record);
// Reset caches.
$SITE = $DB->get_record('course', array('id'=>$SITE->id), '*', MUST_EXIST);

21
lib/datalib.php
View File

@ -584,6 +584,27 @@ function get_course($courseid, $clone = true) {
}
}
/**
* Updates a course record in database. If the update affects the global $COURSE
* or $SITE, then these variables are also changed.
*
* @param stdClass $courserec Course record
* @throws dml_exception If error updating database
*/
function update_course_record($courserec) {
global $DB, $COURSE, $SITE;
$DB->update_record('course', $courserec);
if (!empty($COURSE->id) && $COURSE->id == $courserec->id) {
foreach ((array)$courserec as $name => $value) {
$COURSE->{$name} = $value;
}
} else if (!empty($SITE->id) && $SITE->id == $courserec->id) {
foreach ((array)$courserec as $name => $value) {
$SITE->{$name} = $value;
}
}
}
/**
* Returns list of courses, for whole site, or category
*

2
lib/db/install.php
View File

@ -96,7 +96,7 @@ function xmldb_main_install() {
}
// Make sure site course context exists
context_course::instance($SITE->id);
// Update the global frontpage cache
// Update the global frontpage cache from database.
$SITE = $DB->get_record('course', array('id'=>$newsite->id), '*', MUST_EXIST);

32
lib/modinfolib.php
View File

@ -247,7 +247,7 @@ class course_modinfo extends stdClass {
// Check modinfo field is set. If not, build and load it.
if (empty($course->modinfo) || empty($course->sectioncache)) {
rebuild_course_cache($course->id);
$course = $DB->get_record('course', array('id'=>$course->id), '*', MUST_EXIST);
$course = get_course($course->id);
}
// Set initial values
@ -1468,19 +1468,16 @@ function rebuild_course_cache($courseid=0, $clearonly=false) {
if ($clearonly) {
if (empty($courseid)) {
$DB->execute('UPDATE {course} set modinfo = ?, sectioncache = ?', array(null, null));
// Clear the cached globals too.
$COURSE->modinfo = null;
$COURSE->sectioncache = null;
$SITE->modinfo = null;
$SITE->sectioncache = null;
} else {
// Clear both fields in one update
$resetobj = (object)array('id' => $courseid, 'modinfo' => null, 'sectioncache' => null);
$DB->update_record('course', $resetobj);
}
// update cached global COURSE too ;-)
if ($courseid == $COURSE->id or empty($courseid)) {
$COURSE->modinfo = null;
$COURSE->sectioncache = null;
}
if ($courseid == $SITE->id) {
$SITE->modinfo = null;
$SITE->sectioncache = null;
// Update course object including cached globals.
update_course_record($resetobj);
}
// reset the fast modinfo cache
get_fast_modinfo($courseid, 0, true);
@ -1502,16 +1499,9 @@ function rebuild_course_cache($courseid=0, $clearonly=false) {
$sectioncache = serialize(course_modinfo::build_section_cache($course->id));
$updateobj = (object)array('id' => $course->id,
'modinfo' => $modinfo, 'sectioncache' => $sectioncache);
$DB->update_record("course", $updateobj);
// update cached global COURSE too ;-)
if ($course->id == $COURSE->id) {
$COURSE->modinfo = $modinfo;
$COURSE->sectioncache = $sectioncache;
}
if ($course->id == $SITE->id) {
$SITE->modinfo = $modinfo;
$SITE->sectioncache = $sectioncache;
}
// Update course object including cached globals.
update_course_record($updateobj);
}
$rs->close();
// reset the fast modinfo cache

6
lib/moodlelib.php
View File

@ -2887,7 +2887,7 @@ function require_login($courseorid = null, $autologinguest = true, $cm = null, $
} else if ($courseorid == SITEID) {
$course = clone($SITE);
} else {
$course = $DB->get_record('course', array('id' => $courseorid), '*', MUST_EXIST);
$course = get_course($courseorid);
}
if ($cm) {
if ($cm->course != $course->id) {
@ -4912,7 +4912,7 @@ function remove_course_contents($courseid, $showfeedback = true, array $options
// Some crazy wishlist of stuff we should skip during purging of course content.
$options = (array)$options;
$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
$course = get_course($courseid);
$coursecontext = context_course::instance($courseid);
$fs = get_file_storage();
@ -5105,7 +5105,7 @@ function remove_course_contents($courseid, $showfeedback = true, array $options
if (!empty($options['keep_groups_and_groupings'])) {
$oldcourse->defaultgroupingid = 0;
}
$DB->update_record('course', $oldcourse);
update_course_record($oldcourse);
// Delete course sections and availability options.
$DB->delete_records_select('course_sections_availability',

2
lib/navigationlib.php
View File

@ -2744,7 +2744,7 @@ class global_navigation_for_ajax extends global_navigation {
$this->load_category($this->instanceid, self::TYPE_MY_CATEGORY);
break;
case self::TYPE_COURSE :
$course = $DB->get_record('course', array('id' => $this->instanceid), '*', MUST_EXIST);
$course = get_course($this->instanceid);
require_course_login($course, true, null, false, true);
$this->page->set_context(context_course::instance($course->id));
$coursenode = $this->add_course($course);

2
lib/pagelib.php
View File

@ -950,7 +950,7 @@ class moodle_page {
if (!$this->_course || $this->_course->id != $cm->course) {
if (!$course) {
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
}
if ($course->id != $cm->course) {
throw new coding_exception('The course you passed to $PAGE->set_cm does not correspond to the $cm.');

8
lib/tests/accesslib_test.php
View File

@ -2120,8 +2120,8 @@ class core_accesslib_testcase extends advanced_testcase {
$guestid = $CFG->siteguest;
// Enrol some users into some courses.
$course1 = $DB->get_record('course', array('id'=>$testcourses[22]), '*', MUST_EXIST);
$course2 = $DB->get_record('course', array('id'=>$testcourses[7]), '*', MUST_EXIST);
$course1 = get_course($testcourses[22]);
$course2 = get_course($testcourses[7]);
$cms = $DB->get_records('course_modules', array('course'=>$course1->id), 'id');
$cm1 = reset($cms);
$blocks = $DB->get_records('block_instances', array('parentcontextid'=>context_module::instance($cm1->id)->id), 'id');
@ -2433,7 +2433,7 @@ class core_accesslib_testcase extends advanced_testcase {
$miscid = $DB->get_field_sql("SELECT MIN(id) FROM {course_categories}");
$categorycontext = context_coursecat::instance($miscid);
$course->category = $miscid;
$DB->update_record('course', $course);
update_course_record($course);
$context->update_moved($categorycontext);
$context = context_course::instance($course->id);
@ -2672,7 +2672,7 @@ class core_accesslib_testcase extends advanced_testcase {
$miscid = $DB->get_field_sql("SELECT MIN(id) FROM {course_categories}");
$categorycontext = context_coursecat::instance($miscid);
$course->category = $miscid;
$DB->update_record('course', $course);
update_course_record($course);
context_moved($context, $categorycontext);
$this->assertDebuggingCalled('context_moved() is deprecated, please use context::update_moved() instead.', DEBUG_DEVELOPER);
$context = context_course::instance($course->id);

2
mod/assign/index.php
View File

@ -27,7 +27,7 @@ require_once($CFG->dirroot.'/mod/assign/locallib.php');
// For this type of page this is the course id.
$id = required_param('id', PARAM_INT);
$course = $DB->get_record('course', array('id' => $id), '*', MUST_EXIST);
$course = get_course($id);
require_login($course);
$PAGE->set_url('/mod/assign/index.php', array('id' => $id));
$PAGE->set_pagelayout('incourse');

2
mod/assign/lib.php
View File

@ -69,7 +69,7 @@ function assign_reset_userdata($data) {
$status = array();
$params = array('courseid'=>$data->courseid);
$sql = "SELECT a.id FROM {assign} a WHERE a.course=:courseid";
$course = $DB->get_record('course', array('id'=>$data->courseid), '*', MUST_EXIST);
$course = get_course($data->courseid);
if ($assigns = $DB->get_records_sql($sql, $params)) {
foreach ($assigns as $assign) {
$cm = get_coursemodule_from_instance('assign',

2
mod/assign/locallib.php
View File

@ -575,7 +575,7 @@ class assign {
$returnid = $DB->insert_record('assign', $update);
$this->instance = $DB->get_record('assign', array('id'=>$returnid), '*', MUST_EXIST);
// Cache the course record.
$this->course = $DB->get_record('course', array('id'=>$formdata->course), '*', MUST_EXIST);
$this->course = get_course($formdata->course);
if ($callplugins) {
// Call save_settings hook for submission plugins.

4
mod/assign/mod_form.php
View File

@ -68,7 +68,7 @@ class mod_assign_mod_form extends moodleform_mod {
if (!$ctx) {
$ctx = context_course::instance($this->current->course);
}
$course = $DB->get_record('course', array('id'=>$this->current->course), '*', MUST_EXIST);
$course = get_course($this->current->course);
$assignment->set_course($course);
}
@ -259,7 +259,7 @@ class mod_assign_mod_form extends moodleform_mod {
if (!$ctx) {
$ctx = context_course::instance($this->current->course);
}
$course = $DB->get_record('course', array('id'=>$this->current->course), '*', MUST_EXIST);
$course = get_course($this->current->course);
$assignment->set_course($course);
}
$assignment->plugin_data_preprocessing($defaultvalues);

2
mod/assign/view.php
View File

@ -34,7 +34,7 @@ $urlparams = array('id' => $id,
$url = new moodle_url('/mod/assign/view.php', $urlparams);
$cm = get_coursemodule_from_id('assign', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, true, $cm);
$PAGE->set_url($url);

2
mod/book/delete.php
View File

@ -30,7 +30,7 @@ $chapterid = required_param('chapterid', PARAM_INT); // Chapter ID
$confirm = optional_param('confirm', 0, PARAM_BOOL);
$cm = get_coursemodule_from_id('book', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$book = $DB->get_record('book', array('id'=>$cm->instance), '*', MUST_EXIST);
require_login($course, false, $cm);

2
mod/book/edit.php
View File

@ -32,7 +32,7 @@ $pagenum = optional_param('pagenum', 0, PARAM_INT);
$subchapter = optional_param('subchapter', 0, PARAM_BOOL);
$cm = get_coursemodule_from_id('book', $cmid, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$book = $DB->get_record('book', array('id'=>$cm->instance), '*', MUST_EXIST);
require_login($course, false, $cm);

2
mod/book/index.php
View File

@ -27,7 +27,7 @@ require_once(dirname(__FILE__).'/locallib.php');
$id = required_param('id', PARAM_INT); // Course ID.
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
unset($id);

2
mod/book/move.php
View File

@ -30,7 +30,7 @@ $chapterid = required_param('chapterid', PARAM_INT); // Chapter ID
$up = optional_param('up', 0, PARAM_BOOL);
$cm = get_coursemodule_from_id('book', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$book = $DB->get_record('book', array('id'=>$cm->instance), '*', MUST_EXIST);
require_login($course, false, $cm);

2
mod/book/show.php
View File

@ -29,7 +29,7 @@ $id = required_param('id', PARAM_INT); // Course Module ID
$chapterid = required_param('chapterid', PARAM_INT); // Chapter ID
$cm = get_coursemodule_from_id('book', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$book = $DB->get_record('book', array('id'=>$cm->instance), '*', MUST_EXIST);
require_login($course, false, $cm);

2
mod/book/tool/exportimscp/index.php
View File

@ -32,7 +32,7 @@ require_once($CFG->libdir.'/filelib.php');
$id = required_param('id', PARAM_INT); // Course Module ID
$cm = get_coursemodule_from_id('book', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$book = $DB->get_record('book', array('id'=>$cm->instance), '*', MUST_EXIST);
$PAGE->set_url('/mod/book/tool/exportimscp/index.php', array('id'=>$id));

2
mod/book/tool/importhtml/index.php
View File

@ -30,7 +30,7 @@ $id = required_param('id', PARAM_INT); // Course Module ID
$chapterid = optional_param('chapterid', 0, PARAM_INT); // Chapter ID
$cm = get_coursemodule_from_id('book', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$book = $DB->get_record('book', array('id'=>$cm->instance), '*', MUST_EXIST);
require_login($course, false, $cm);

2
mod/book/tool/print/index.php
View File

@ -33,7 +33,7 @@ $chapterid = optional_param('chapterid', 0, PARAM_INT); // Chapter ID
// =========================================================================
$cm = get_coursemodule_from_id('book', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$book = $DB->get_record('book', array('id'=>$cm->instance), '*', MUST_EXIST);
require_course_login($course, true, $cm);

4
mod/book/view.php
View File

@ -36,12 +36,12 @@ $edit = optional_param('edit', -1, PARAM_BOOL); // Edit mode
// =========================================================================
if ($id) {
$cm = get_coursemodule_from_id('book', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$book = $DB->get_record('book', array('id'=>$cm->instance), '*', MUST_EXIST);
} else {
$book = $DB->get_record('book', array('id'=>$bid), '*', MUST_EXIST);
$cm = get_coursemodule_from_instance('book', $book->id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$id = $cm->id;
}

2
mod/chat/gui_ajax/index.php
View File

@ -14,7 +14,7 @@ $PAGE->set_url($url);
$PAGE->set_popup_notification_allowed(false); // No popup notifications in the chat window
$chat = $DB->get_record('chat', array('id'=>$id), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$chat->course), '*', MUST_EXIST);
$course = get_course($chat->course);
$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id, false, MUST_EXIST);
$context = context_module::instance($cm->id);

4
mod/data/import.php
View File

@ -49,14 +49,14 @@ if ($id) {
$url->param('id', $id);
$PAGE->set_url($url);
$cm = get_coursemodule_from_id('data', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$data = $DB->get_record('data', array('id'=>$cm->instance), '*', MUST_EXIST);
} else {
$url->param('d', $d);
$PAGE->set_url($url);
$data = $DB->get_record('data', array('id'=>$d), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$data->course), '*', MUST_EXIST);
$course = get_course($data->course);
$cm = get_coursemodule_from_instance('data', $data->id, $course->id, false, MUST_EXIST);
}

2
mod/data/lib.php
View File

@ -1439,7 +1439,7 @@ function data_rating_validate($params) {
}
}
$course = $DB->get_record('course', array('id'=>$info->course), '*', MUST_EXIST);
$course = get_course($info->course);
$cm = get_coursemodule_from_instance('data', $info->dataid, $course->id, false, MUST_EXIST);
$context = context_module::instance($cm->id);

4
mod/data/preset.php
View File

@ -36,12 +36,12 @@ require_once($CFG->libdir.'/xmlize.php');
$id = optional_param('id', 0, PARAM_INT); // course module id
if ($id) {
$cm = get_coursemodule_from_id('data', $id, null, null, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$data = $DB->get_record('data', array('id'=>$cm->instance), '*', MUST_EXIST);
} else {
$d = required_param('d', PARAM_INT); // database activity id
$data = $DB->get_record('data', array('id'=>$d), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$data->course), '*', MUST_EXIST);
$course = get_course($data->course);
$cm = get_coursemodule_from_instance('data', $data->id, $course->id, null, MUST_EXIST);
}

2
mod/feedback/ajax.php
View File

@ -35,7 +35,7 @@ $sesskey = optional_param('sesskey', false, PARAM_TEXT);
$itemorder = optional_param('itemorder', false, PARAM_SEQUENCE);
$cm = get_coursemodule_from_id('feedback', $id, 0, false, MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
$feedback = $DB->get_record('feedback', array('id'=>$cm->instance), '*', MUST_EXIST);
require_sesskey();

2
mod/folder/edit.php
View File

@ -34,7 +34,7 @@ $id = required_param('id', PARAM_INT); // Course module ID
$cm = get_coursemodule_from_id('folder', $id, 0, true, MUST_EXIST);
$context = context_module::instance($cm->id, MUST_EXIST);
$folder = $DB->get_record('folder', array('id'=>$cm->instance), '*', MUST_EXIST);
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_login($course, false, $cm);
require_capability('mod/folder:managefiles', $context);

2
mod/folder/index.php
View File

@ -28,7 +28,7 @@ require('../../config.php');
$id = required_param('id', PARAM_INT); // course id
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$course = get_course($id);
require_course_login($course, true);
$PAGE->set_pagelayout('incourse');

2
mod/folder/view.php
View File

@ -41,7 +41,7 @@ if ($f) { // Two ways to specify the module
$folder = $DB->get_record('folder', array('id'=>$cm->instance), '*', MUST_EXIST);
}
$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
$course = get_course($cm->course);
require_course_login($course, true, $cm);
$context = context_module::instance($cm->id);

Some files were not shown because too many files have changed in this diff Show More