MDL-39876 Change get_record('course') calls to get_course

diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index cce2334..6549125 100644 (file)
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -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);

diff --git a/admin/roles/check.php b/admin/roles/check.php
index 0590165..b1da3f5 100644 (file)
--- a/admin/roles/check.php
+++ b/admin/roles/check.php
@@ -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);

diff --git a/admin/roles/override.php b/admin/roles/override.php
index bc506f1..35d8164 100644 (file)
--- a/admin/roles/override.php
+++ b/admin/roles/override.php
@@ -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);

diff --git a/admin/roles/permissions.php b/admin/roles/permissions.php
index cfff956..cacc654 100644 (file)
--- a/admin/roles/permissions.php
+++ b/admin/roles/permissions.php
@@ -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);

diff --git a/admin/roles/usersroles.php b/admin/roles/usersroles.php
index c62c979..1845765 100644 (file)
--- a/admin/roles/usersroles.php
+++ b/admin/roles/usersroles.php
@@ -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);

diff --git a/backup/backup.php b/backup/backup.php
index cfe16ef..b8a52b9 100644 (file)
--- a/backup/backup.php
+++ b/backup/backup.php
@@ -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);

diff --git a/backup/import.php b/backup/import.php
index 6dd5038..a677805 100644 (file)
--- a/backup/import.php
+++ b/backup/import.php
@@ -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

diff --git a/backup/moodle2/backup_section_task.class.php b/backup/moodle2/backup_section_task.class.php
index b84d338..0144cff 100644 (file)
--- a/backup/moodle2/backup_section_task.class.php
+++ b/backup/moodle2/backup_section_task.class.php
@@ -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';

diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php
index 2b6cdab..84f6b23 100644 (file)
--- a/backup/moodle2/restore_stepslib.php
+++ b/backup/moodle2/restore_stepslib.php
@@ -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);
         }

diff --git a/backup/util/checks/backup_check.class.php b/backup/util/checks/backup_check.class.php
index 164da0b..dc510ac 100644 (file)
--- a/backup/util/checks/backup_check.class.php
+++ b/backup/util/checks/backup_check.class.php
@@ -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 :

diff --git a/blocks/community/communitycourse.php b/blocks/community/communitycourse.php
index fe21d76..62d1893 100644 (file)
--- a/blocks/community/communitycourse.php
+++ b/blocks/community/communitycourse.php
@@ -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);

diff --git a/blocks/completionstatus/details.php b/blocks/completionstatus/details.php
index be4cd2f..bcb1739 100644 (file)
--- a/blocks/completionstatus/details.php
+++ b/blocks/completionstatus/details.php
@@ -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) {

diff --git a/blocks/rss_client/editfeed.php b/blocks/rss_client/editfeed.php
index 110c4d2..2bafefe 100644 (file)
--- a/blocks/rss_client/editfeed.php
+++ b/blocks/rss_client/editfeed.php
@@ -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 {

diff --git a/blocks/rss_client/managefeeds.php b/blocks/rss_client/managefeeds.php
index 2252bc9..1212605 100644 (file)
--- a/blocks/rss_client/managefeeds.php
+++ b/blocks/rss_client/managefeeds.php
@@ -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 {

diff --git a/blocks/rss_client/viewfeed.php b/blocks/rss_client/viewfeed.php
index 1c287d7..f269496 100644 (file)
--- a/blocks/rss_client/viewfeed.php
+++ b/blocks/rss_client/viewfeed.php
@@ -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 {

diff --git a/calendar/event.php b/calendar/event.php
index 027527b..f0b1bd9 100644 (file)
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -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 {

diff --git a/calendar/lib.php b/calendar/lib.php
index 86c265f..1d2ff96 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1817,7 +1817,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);

diff --git a/calendar/preferences.php b/calendar/preferences.php
index 165466d..7114d71 100644 (file)
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -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');

diff --git a/course/changenumsections.php b/course/changenumsections.php
index deed367..f11728b 100644 (file)
--- a/course/changenumsections.php
+++ b/course/changenumsections.php
@@ -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));

diff --git a/course/dnduploadlib.php b/course/dnduploadlib.php
index 917d670..506a778 100644 (file)
--- a/course/dnduploadlib.php
+++ b/course/dnduploadlib.php
@@ -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);

diff --git a/course/editsection.php b/course/editsection.php
index c75e3dc..3206598 100644 (file)
--- a/course/editsection.php
+++ b/course/editsection.php
@@ -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);

diff --git a/course/externallib.php b/course/externallib.php
index 61232fd..65881ea 100644 (file)
--- a/course/externallib.php
+++ b/course/externallib.php
@@ -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,7 +1077,7 @@ 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'];

diff --git a/course/lib.php b/course/lib.php
index 31f539c..3e4c296 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -3053,7 +3053,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');
 
@@ -3069,7 +3069,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.
@@ -3093,7 +3093,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');
 
@@ -3101,7 +3101,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);

diff --git a/course/loginas.php b/course/loginas.php
index 0c1ec26..ae0bbdb 100644 (file)
--- a/course/loginas.php
+++ b/course/loginas.php
@@ -35,7 +35,7 @@ if ($redirect) {
 $userid = required_param('user', PARAM_INT);         // login as this user
 
 require_sesskey();
-$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
+$course = get_course($id);
 
 /// User must be logged in
 

diff --git a/course/manage.php b/course/manage.php
index d4a9054..0cec446 100644 (file)
--- a/course/manage.php
+++ b/course/manage.php
@@ -237,10 +237,10 @@ 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);

diff --git a/course/mod.php b/course/mod.php
index 1ea8b78..12f2dfc 100644 (file)
--- a/course/mod.php
+++ b/course/mod.php
@@ -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;

diff --git a/course/modduplicate.php b/course/modduplicate.php
index 7247671..6432b20 100644 (file)
--- a/course/modduplicate.php
+++ b/course/modduplicate.php
@@ -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);

diff --git a/course/modedit.php b/course/modedit.php
index 8cfe0a0..5918614 100644 (file)
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -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

diff --git a/course/publish/backup.php b/course/publish/backup.php
index 15e091a..d5cc313 100644 (file)
--- a/course/publish/backup.php
+++ b/course/publish/backup.php
@@ -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()) {

diff --git a/course/publish/hubselector.php b/course/publish/hubselector.php
index 095e33b..74181c2 100644 (file)
--- a/course/publish/hubselector.php
+++ b/course/publish/hubselector.php
@@ -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));

diff --git a/course/publish/index.php b/course/publish/index.php
index 2e11f5b..b100fbe 100644 (file)
--- a/course/publish/index.php
+++ b/course/publish/index.php
@@ -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);

diff --git a/course/publish/metadata.php b/course/publish/metadata.php
index 298e5f3..4e5e1fc 100644 (file)
--- a/course/publish/metadata.php
+++ b/course/publish/metadata.php
@@ -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

diff --git a/course/report.php b/course/report.php
index 90b51b8..d604d66 100644 (file)
--- a/course/report.php
+++ b/course/report.php
@@ -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);

diff --git a/course/resources.php b/course/resources.php
index d0235f5..45e94a9 100644 (file)
--- a/course/resources.php
+++ b/course/resources.php
@@ -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);
 

diff --git a/course/rest.php b/course/rest.php
index 4bae0b0..a926511 100644 (file)
--- a/course/rest.php
+++ b/course/rest.php
@@ -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);

diff --git a/course/togglecompletion.php b/course/togglecompletion.php
index 53992db..6c58d7b 100644 (file)
--- a/course/togglecompletion.php
+++ b/course/togglecompletion.php
@@ -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);

diff --git a/course/user.php b/course/user.php
index 73839e1..49c5859 100644 (file)
--- a/course/user.php
+++ b/course/user.php
@@ -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') {

diff --git a/enrol/ajax.php b/enrol/ajax.php
index 2d41a98..21c86c9 100644 (file)
--- a/enrol/ajax.php
+++ b/enrol/ajax.php
@@ -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) {

diff --git a/enrol/bulkchange.php b/enrol/bulkchange.php
index 1d451ae..c5f1ea9 100644 (file)
--- a/enrol/bulkchange.php
+++ b/enrol/bulkchange.php
@@ -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) {

diff --git a/enrol/cohort/ajax.php b/enrol/cohort/ajax.php
index e987f87..ec58e65 100644 (file)
--- a/enrol/cohort/ajax.php
+++ b/enrol/cohort/ajax.php
@@ -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) {

diff --git a/enrol/cohort/edit.php b/enrol/cohort/edit.php
index 050bdff..99c90b8 100644 (file)
--- a/enrol/cohort/edit.php
+++ b/enrol/cohort/edit.php
@@ -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);

diff --git a/enrol/editenrolment.php b/enrol/editenrolment.php
index 8b6f54e..6fa1016 100644 (file)
--- a/enrol/editenrolment.php
+++ b/enrol/editenrolment.php
@@ -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));

diff --git a/enrol/externallib.php b/enrol/externallib.php
index ddfb976..980e3d5 100644 (file)
--- a/enrol/externallib.php
+++ b/enrol/externallib.php
@@ -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();

diff --git a/enrol/guest/addinstance.php b/enrol/guest/addinstance.php
index faa0531..51770dc 100644 (file)
--- a/enrol/guest/addinstance.php
+++ b/enrol/guest/addinstance.php
@@ -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);

diff --git a/enrol/index.php b/enrol/index.php
index d0e91b5..6bf65c3 100644 (file)
--- a/enrol/index.php
+++ b/enrol/index.php
@@ -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

diff --git a/enrol/instances.php b/enrol/instances.php
index 0ad5d2c..bdc2338 100644 (file)
--- a/enrol/instances.php
+++ b/enrol/instances.php
@@ -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) {

diff --git a/enrol/manual/ajax.php b/enrol/manual/ajax.php
index c1a6f80..18f4a25 100644 (file)
--- a/enrol/manual/ajax.php
+++ b/enrol/manual/ajax.php
@@ -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) {

diff --git a/enrol/manual/edit.php b/enrol/manual/edit.php
index d6d01e2..12c8aee 100644 (file)
--- a/enrol/manual/edit.php
+++ b/enrol/manual/edit.php
@@ -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);

diff --git a/enrol/manual/locallib.php b/enrol/manual/locallib.php
index 5c3e345..067131f 100644 (file)
--- a/enrol/manual/locallib.php
+++ b/enrol/manual/locallib.php
@@ -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;

diff --git a/enrol/manual/manage.php b/enrol/manual/manage.php
index 7d91e4b..76892cd 100644 (file)
--- a/enrol/manual/manage.php
+++ b/enrol/manual/manage.php
@@ -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);

diff --git a/enrol/manual/unenrolself.php b/enrol/manual/unenrolself.php
index c7304fb..472fcf0 100644 (file)
--- a/enrol/manual/unenrolself.php
+++ b/enrol/manual/unenrolself.php
@@ -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();

diff --git a/enrol/meta/addinstance.php b/enrol/meta/addinstance.php
index ac2f2ff..cfcb20b 100644 (file)
--- a/enrol/meta/addinstance.php
+++ b/enrol/meta/addinstance.php
@@ -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));

diff --git a/enrol/mnet/addinstance.php b/enrol/mnet/addinstance.php
index 9678b40..2dbf0a9 100644 (file)
--- a/enrol/mnet/addinstance.php
+++ b/enrol/mnet/addinstance.php
@@ -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);

diff --git a/enrol/otherusers.php b/enrol/otherusers.php
index 063d5b4..7052bcd 100644 (file)
--- a/enrol/otherusers.php
+++ b/enrol/otherusers.php
@@ -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);

diff --git a/enrol/paypal/edit.php b/enrol/paypal/edit.php
index 6175b3b..52a111a 100644 (file)
--- a/enrol/paypal/edit.php
+++ b/enrol/paypal/edit.php
@@ -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);

diff --git a/enrol/paypal/unenrolself.php b/enrol/paypal/unenrolself.php
index 8fd16d2..a305004 100644 (file)
--- a/enrol/paypal/unenrolself.php
+++ b/enrol/paypal/unenrolself.php
@@ -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();

diff --git a/enrol/self/edit.php b/enrol/self/edit.php
index a339b8e..c88553e 100644 (file)
--- a/enrol/self/edit.php
+++ b/enrol/self/edit.php
@@ -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);

diff --git a/enrol/self/lib.php b/enrol/self/lib.php
index 9b0fa48..c823595 100644 (file)
--- a/enrol/self/lib.php
+++ b/enrol/self/lib.php
@@ -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();

diff --git a/enrol/self/unenrolself.php b/enrol/self/unenrolself.php
index 7e7d269..906d072 100644 (file)
--- a/enrol/self/unenrolself.php
+++ b/enrol/self/unenrolself.php
@@ -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();

diff --git a/enrol/unenroluser.php b/enrol/unenroluser.php
index 9903391..8428dcb 100644 (file)
--- a/enrol/unenroluser.php
+++ b/enrol/unenroluser.php
@@ -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);
 

diff --git a/enrol/users.php b/enrol/users.php
index c01e361..78d0d53 100644 (file)
--- a/enrol/users.php
+++ b/enrol/users.php
@@ -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) {

diff --git a/file.php b/file.php
index fce3f78..410a835 100644 (file)
--- a/file.php
+++ b/file.php
@@ -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

diff --git a/grade/edit/outcome/course.php b/grade/edit/outcome/course.php
index b23dc99..0bdcf88 100644 (file)
--- a/grade/edit/outcome/course.php
+++ b/grade/edit/outcome/course.php
@@ -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);

diff --git a/grade/edit/outcome/edit.php b/grade/edit/outcome/edit.php
index 2d2c670..f5aa234 100644 (file)
--- a/grade/edit/outcome/edit.php
+++ b/grade/edit/outcome/edit.php
@@ -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);

diff --git a/grade/edit/outcome/index.php b/grade/edit/outcome/index.php
index 658d5ce..81bbe3f 100644 (file)
--- a/grade/edit/outcome/index.php
+++ b/grade/edit/outcome/index.php
@@ -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);

diff --git a/group/import.php b/group/import.php
index a4d351b..756533f 100644 (file)
--- a/group/import.php
+++ b/group/import.php
@@ -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));
 

diff --git a/group/index.php b/group/index.php
index ffd8f74..ba1b9c7 100644 (file)
--- a/group/index.php
+++ b/group/index.php
@@ -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) {

diff --git a/group/lib.php b/group/lib.php
index f3f2f7e..4477cff 100644 (file)
--- a/group/lib.php
+++ b/group/lib.php
@@ -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();

diff --git a/group/members.php b/group/members.php
index 9a013bd..91a786f 100644 (file)
--- a/group/members.php
+++ b/group/members.php
@@ -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');

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 2927638..37f571c 100644 (file)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -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);
         }
     }
 

diff --git a/lib/db/install.php b/lib/db/install.php
index c5e4150..36bee1f 100644 (file)
--- a/lib/db/install.php
+++ b/lib/db/install.php
@@ -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);
 
 

diff --git a/lib/modinfolib.php b/lib/modinfolib.php
index 990fc6a..01e80f3 100644 (file)
--- a/lib/modinfolib.php
+++ b/lib/modinfolib.php
@@ -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

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index cfab5d8..5df8d15 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -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) {
@@ -4906,7 +4906,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();
 

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 1fa0f0c..4fdff85 100644 (file)
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -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);

diff --git a/lib/pagelib.php b/lib/pagelib.php
index 7e733ee..07b1d71 100644 (file)
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -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.');

diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php
index d3c3c1e..5180bf7 100644 (file)
--- a/lib/tests/accesslib_test.php
+++ b/lib/tests/accesslib_test.php
@@ -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');

diff --git a/mod/assign/index.php b/mod/assign/index.php
index f072009..4e7c1c8 100644 (file)
--- a/mod/assign/index.php
+++ b/mod/assign/index.php
@@ -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');

diff --git a/mod/assign/lib.php b/mod/assign/lib.php
index 49a13f1..d8cd9ff 100644 (file)
--- a/mod/assign/lib.php
+++ b/mod/assign/lib.php
@@ -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',

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index be7eedb..9ac7a36 100644 (file)
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -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.

diff --git a/mod/assign/mod_form.php b/mod/assign/mod_form.php
index edfe6eb..e49ae53 100644 (file)
--- a/mod/assign/mod_form.php
+++ b/mod/assign/mod_form.php
@@ -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);

diff --git a/mod/assign/view.php b/mod/assign/view.php
index 9fa7e24..03dadc9 100644 (file)
--- a/mod/assign/view.php
+++ b/mod/assign/view.php
@@ -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);

diff --git a/mod/book/delete.php b/mod/book/delete.php
index 63c9507..4ea5a83 100644 (file)
--- a/mod/book/delete.php
+++ b/mod/book/delete.php
@@ -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);

diff --git a/mod/book/edit.php b/mod/book/edit.php
index 547a9d1..f68936e 100644 (file)
--- a/mod/book/edit.php
+++ b/mod/book/edit.php
@@ -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);

diff --git a/mod/book/index.php b/mod/book/index.php
index 7546188..53a5166 100644 (file)
--- a/mod/book/index.php
+++ b/mod/book/index.php
@@ -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);
 

diff --git a/mod/book/move.php b/mod/book/move.php
index 7ae229b..1d86c93 100644 (file)
--- a/mod/book/move.php
+++ b/mod/book/move.php
@@ -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);

diff --git a/mod/book/show.php b/mod/book/show.php
index 7af7de2..6918d4b 100644 (file)
--- a/mod/book/show.php
+++ b/mod/book/show.php
@@ -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);

diff --git a/mod/book/tool/exportimscp/index.php b/mod/book/tool/exportimscp/index.php
index 29418ed..d49ad62 100644 (file)
--- a/mod/book/tool/exportimscp/index.php
+++ b/mod/book/tool/exportimscp/index.php
@@ -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));

diff --git a/mod/book/tool/importhtml/index.php b/mod/book/tool/importhtml/index.php
index 25ee6f7..3f1085e 100644 (file)
--- a/mod/book/tool/importhtml/index.php
+++ b/mod/book/tool/importhtml/index.php
@@ -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);

diff --git a/mod/book/tool/print/index.php b/mod/book/tool/print/index.php
index cb258b0..3a7308f 100644 (file)
--- a/mod/book/tool/print/index.php
+++ b/mod/book/tool/print/index.php
@@ -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);

diff --git a/mod/book/view.php b/mod/book/view.php
index cf9ed55..a712101 100644 (file)
--- a/mod/book/view.php
+++ b/mod/book/view.php
@@ -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;
 }
 

diff --git a/mod/chat/gui_ajax/index.php b/mod/chat/gui_ajax/index.php
index 4c2d69f..a2efd4f 100644 (file)
--- a/mod/chat/gui_ajax/index.php
+++ b/mod/chat/gui_ajax/index.php
@@ -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);

diff --git a/mod/data/import.php b/mod/data/import.php
index 9b7425b..f1dbd41 100644 (file)
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -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);
 }
 

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 8e108b9..02c8301 100644 (file)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -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);
 

diff --git a/mod/data/preset.php b/mod/data/preset.php
index 673d43a..ac13d22 100644 (file)
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -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);
 }
 

diff --git a/mod/feedback/ajax.php b/mod/feedback/ajax.php
index a562690..14d9c2f 100644 (file)
--- a/mod/feedback/ajax.php
+++ b/mod/feedback/ajax.php
@@ -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();

diff --git a/mod/folder/edit.php b/mod/folder/edit.php
index 473f8b8..55e1cac 100644 (file)
--- a/mod/folder/edit.php
+++ b/mod/folder/edit.php
@@ -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);

diff --git a/mod/folder/index.php b/mod/folder/index.php
index 9cbe696..a95d1a3 100644 (file)
--- a/mod/folder/index.php
+++ b/mod/folder/index.php
@@ -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');

diff --git a/mod/folder/view.php b/mod/folder/view.php
index 19c16a7..8672d3b 100644 (file)
--- a/mod/folder/view.php
+++ b/mod/folder/view.php
@@ -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);

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index c387790..14bc28b 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -40,7 +40,7 @@
     $PAGE->set_url($url);
 
     $discussion = $DB->get_record('forum_discussions', array('id' => $d), '*', MUST_EXIST);
-    $course = $DB->get_record('course', array('id' => $discussion->course), '*', MUST_EXIST);
+    $course = get_course($discussion->course);
     $forum = $DB->get_record('forum', array('id' => $discussion->forum), '*', MUST_EXIST);
     $cm = get_coursemodule_from_instance('forum', $forum->id, $course->id, false, MUST_EXIST);
 

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 8a5a46b..751498a 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -3629,7 +3629,7 @@ function forum_rating_validate($params) {
     $post = $DB->get_record('forum_posts', array('id' => $params['itemid'], 'userid' => $params['rateduserid']), '*', MUST_EXIST);
     $discussion = $DB->get_record('forum_discussions', array('id' => $post->discussion), '*', MUST_EXIST);
     $forum = $DB->get_record('forum', array('id' => $discussion->forum), '*', MUST_EXIST);
-    $course = $DB->get_record('course', array('id' => $forum->course), '*', MUST_EXIST);
+    $course = get_course($forum->course);
     $cm = get_coursemodule_from_instance('forum', $forum->id, $course->id , false, MUST_EXIST);
     $context = context_module::instance($cm->id);
 

diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index 1bd5277..c246257 100644 (file)
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -53,7 +53,7 @@ if (!is_null($sesskey)) {
 $PAGE->set_url($url);
 
 $forum   = $DB->get_record('forum', array('id' => $id), '*', MUST_EXIST);
-$course  = $DB->get_record('course', array('id' => $forum->course), '*', MUST_EXIST);
+$course  = get_course($forum->course);
 $cm      = get_coursemodule_from_instance('forum', $forum->id, $course->id, false, MUST_EXIST);
 $context = context_module::instance($cm->id);
 

diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php
index 87c3b54..1dbfe66 100644 (file)
--- a/mod/forum/subscribers.php
+++ b/mod/forum/subscribers.php
@@ -40,7 +40,7 @@ if ($edit !== 0) {
 $PAGE->set_url($url);
 
 $forum = $DB->get_record('forum', array('id'=>$id), '*', MUST_EXIST);
-$course = $DB->get_record('course', array('id'=>$forum->course), '*', MUST_EXIST);
+$course = get_course($forum->course);
 if (! $cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) {
     $cm->id = 0;
 }

diff --git a/mod/forum/user.php b/mod/forum/user.php
index 0059ae8..5dfebeb 100644 (file)
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -90,7 +90,7 @@ $hasparentaccess = $isparent && has_all_capabilities(array('moodle/user:viewdeta
 // Check whether a specific course has been requested
 if ($isspecificcourse) {
     // Get the requested course and its context
-    $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
+    $course = get_course($courseid);
     $coursecontext = context_course::instance($courseid, MUST_EXIST);
     // We have a specific course to search, which we will also assume we are within.
     if ($hasparentaccess) {

diff --git a/mod/glossary/approve.php b/mod/glossary/approve.php
index 4069376..1a7685b 100644 (file)
--- a/mod/glossary/approve.php
+++ b/mod/glossary/approve.php
@@ -14,7 +14,7 @@ $PAGE->set_url($url);
 $entry = $DB->get_record('glossary_entries', array('id'=> $eid), '*', MUST_EXIST);
 $glossary = $DB->get_record('glossary', array('id'=> $entry->glossaryid), '*', MUST_EXIST);
 $cm = get_coursemodule_from_instance('glossary', $glossary->id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id'=> $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 require_login($course, false, $cm);
 

diff --git a/mod/glossary/rsslib.php b/mod/glossary/rsslib.php
index 6a51b2f..4c22cb7 100644 (file)
--- a/mod/glossary/rsslib.php
+++ b/mod/glossary/rsslib.php
@@ -49,7 +49,7 @@
         if ($COURSE->id == $cm->course) {
             $course = $COURSE;
         } else {
-            $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
+            $course = get_course($cm->course);
         }
         //context id from db should match the submitted one
         if ($context->id != $modcontext->id || !has_capability('mod/glossary:view', $modcontext)) {

diff --git a/mod/glossary/showentry.php b/mod/glossary/showentry.php
index 3c927a2..2623f49 100644 (file)
--- a/mod/glossary/showentry.php
+++ b/mod/glossary/showentry.php
@@ -23,7 +23,7 @@ if ($eid) {
     $entry = $DB->get_record('glossary_entries', array('id'=>$eid), '*', MUST_EXIST);
     $glossary = $DB->get_record('glossary', array('id'=>$entry->glossaryid), '*', MUST_EXIST);
     $cm = get_coursemodule_from_instance('glossary', $glossary->id, 0, false, MUST_EXIST);
-    $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
+    $course = get_course($cm->course);
     require_course_login($course, true, $cm);
     $entry->glossaryname = $glossary->name;
     $entry->cmid = $cm->id;
@@ -31,7 +31,7 @@ if ($eid) {
     $entries = array($entry);
 
 } else if ($concept) {
-    $course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+    $course = get_course($courseid);
     require_course_login($course);
     $entries = glossary_get_entries_search($concept, $courseid);
 
@@ -45,7 +45,7 @@ if ($entries) {
     foreach ($entries as $key => $entry) {
         // Need to get the course where the entry is,
         // in order to check for visibility/approve permissions there
-        $entrycourse = $DB->get_record('course', array('id' => $entry->courseid), '*', MUST_EXIST);
+        $entrycourse = get_course($entry->courseid);
         $modinfo = get_fast_modinfo($entrycourse);
         // make sure the entry is visible
         if (empty($modinfo->cms[$entry->cmid]->uservisible)) {

diff --git a/mod/glossary/showentry_ajax.php b/mod/glossary/showentry_ajax.php
index 4e986d4..e07ad21 100644 (file)
--- a/mod/glossary/showentry_ajax.php
+++ b/mod/glossary/showentry_ajax.php
@@ -25,7 +25,7 @@ if ($eid) {
     $entry = $DB->get_record('glossary_entries', array('id'=>$eid), '*', MUST_EXIST);
     $glossary = $DB->get_record('glossary', array('id'=>$entry->glossaryid), '*', MUST_EXIST);
     $cm = get_coursemodule_from_instance('glossary', $glossary->id, 0, false, MUST_EXIST);
-    $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
+    $course = get_course($cm->course);
     require_course_login($course, true, $cm);
     $entry->glossaryname = $glossary->name;
     $entry->cmid = $cm->id;
@@ -33,7 +33,7 @@ if ($eid) {
     $entries = array($entry);
 
 } else if ($concept) {
-    $course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+    $course = get_course($courseid);
     require_course_login($course);
     $entries = glossary_get_entries_search($concept, $courseid);
 
@@ -45,7 +45,7 @@ if ($entries) {
     foreach ($entries as $key => $entry) {
         // Need to get the course where the entry is,
         // in order to check for visibility/approve permissions there
-        $entrycourse = $DB->get_record('course', array('id' => $entry->courseid), '*', MUST_EXIST);
+        $entrycourse = get_course($entry->courseid);
         $modinfo = get_fast_modinfo($entrycourse);
         // make sure the entry is visible
         if (empty($modinfo->cms[$entry->cmid]->uservisible)) {

diff --git a/mod/imscp/index.php b/mod/imscp/index.php
index 53505da..10d4550 100644 (file)
--- a/mod/imscp/index.php
+++ b/mod/imscp/index.php
@@ -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');

diff --git a/mod/imscp/view.php b/mod/imscp/view.php
index 7b59b0b..975e102 100644 (file)
--- a/mod/imscp/view.php
+++ b/mod/imscp/view.php
@@ -40,7 +40,7 @@ if ($i) {  // Two ways to specify the module
     $imscp = $DB->get_record('imscp', 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);

diff --git a/mod/lesson/continue.php b/mod/lesson/continue.php
index 79f3499..4e6bfb2 100644 (file)
--- a/mod/lesson/continue.php
+++ b/mod/lesson/continue.php
@@ -31,7 +31,7 @@ require_once($CFG->dirroot.'/mod/lesson/locallib.php');
 $id = required_param('id', PARAM_INT);
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lesson/edit.php b/mod/lesson/edit.php
index aeeb201..a55f65e 100644 (file)
--- a/mod/lesson/edit.php
+++ b/mod/lesson/edit.php
@@ -30,7 +30,7 @@ require_once($CFG->dirroot.'/mod/lesson/locallib.php');
 $id = required_param('id', PARAM_INT);
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lesson/editpage.php b/mod/lesson/editpage.php
index 140de2e..93882f0 100644 (file)
--- a/mod/lesson/editpage.php
+++ b/mod/lesson/editpage.php
@@ -35,7 +35,7 @@ $qtype  = optional_param('qtype', 0, PARAM_INT);
 $edit   = optional_param('edit', false, PARAM_BOOL);
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php
index c824a63..1a2e945 100644 (file)
--- a/mod/lesson/essay.php
+++ b/mod/lesson/essay.php
@@ -33,7 +33,7 @@ $id   = required_param('id', PARAM_INT);             // Course Module ID
 $mode = optional_param('mode', 'display', PARAM_ALPHA);
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lesson/grade.php b/mod/lesson/grade.php
index 8a98406..f587281 100644 (file)
--- a/mod/lesson/grade.php
+++ b/mod/lesson/grade.php
@@ -32,7 +32,7 @@ require_once($CFG->dirroot.'/mod/lesson/locallib.php');
 $id = required_param('id', PARAM_INT);
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lesson/highscores.php b/mod/lesson/highscores.php
index c75dbbf..36f1d27 100644 (file)
--- a/mod/lesson/highscores.php
+++ b/mod/lesson/highscores.php
@@ -33,7 +33,7 @@ $mode    = optional_param('mode', '', PARAM_ALPHA);
 $link = optional_param('link', 0, PARAM_INT);
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lesson/import.php b/mod/lesson/import.php
index 4f3814c..ac0ba0e 100644 (file)
--- a/mod/lesson/import.php
+++ b/mod/lesson/import.php
@@ -36,7 +36,7 @@ $pageid = optional_param('pageid', '', PARAM_INT); // Page ID
 $PAGE->set_url('/mod/lesson/import.php', array('id'=>$id, 'pageid'=>$pageid));
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lesson/lesson.php b/mod/lesson/lesson.php
index 75ee4bb..55c3620 100644 (file)
--- a/mod/lesson/lesson.php
+++ b/mod/lesson/lesson.php
@@ -37,7 +37,7 @@ $action = required_param('action', PARAM_ALPHA);   // Action
 $pageid = required_param('pageid', PARAM_INT);
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lesson/mediafile.php b/mod/lesson/mediafile.php
index 7ad10af..5703ec7 100644 (file)
--- a/mod/lesson/mediafile.php
+++ b/mod/lesson/mediafile.php
@@ -34,7 +34,7 @@ $id = required_param('id', PARAM_INT);    // Course Module ID
 $printclose = optional_param('printclose', 0, PARAM_INT);
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lesson/report.php b/mod/lesson/report.php
index e48dea9..40cec6c 100644 (file)
--- a/mod/lesson/report.php
+++ b/mod/lesson/report.php
@@ -33,7 +33,7 @@ $action = optional_param('action', 'reportoverview', PARAM_ALPHA);  // action to
 $nothingtodisplay = false;
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 91e856e..0697ab9 100644 (file)
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -36,7 +36,7 @@ $userpassword = optional_param('userpassword','',PARAM_RAW);
 $backtocourse = optional_param('backtocourse', false, PARAM_RAW);
 
 $cm = get_coursemodule_from_id('lesson', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
 require_login($course, false, $cm);

diff --git a/mod/lti/grade.php b/mod/lti/grade.php
index 0fb22eb..2e131b8 100644 (file)
--- a/mod/lti/grade.php
+++ b/mod/lti/grade.php
@@ -65,7 +65,7 @@ if ($l) {  // Two ways to specify the module
     $lti = $DB->get_record('lti', 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);
 $context = context_module::instance($cm->id);

diff --git a/mod/lti/index.php b/mod/lti/index.php
index 346f6e1..17cdebf 100644 (file)
--- a/mod/lti/index.php
+++ b/mod/lti/index.php
@@ -51,7 +51,7 @@ require_once($CFG->dirroot.'/mod/lti/lib.php');
 
 $id = required_param('id', PARAM_INT);   // course id
 
-$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
+$course = get_course($id);
 
 require_login($course);
 $PAGE->set_pagelayout('incourse');

diff --git a/mod/lti/launch.php b/mod/lti/launch.php
index fced3b4..c016010 100644 (file)
--- a/mod/lti/launch.php
+++ b/mod/lti/launch.php
@@ -55,7 +55,7 @@ $id = required_param('id', PARAM_INT); // Course Module ID
 
 $cm = get_coursemodule_from_id('lti', $id, 0, false, MUST_EXIST);
 $lti = $DB->get_record('lti', 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);
 

diff --git a/mod/lti/view.php b/mod/lti/view.php
index c07408a..70b8e30 100644 (file)
--- a/mod/lti/view.php
+++ b/mod/lti/view.php
@@ -63,7 +63,7 @@ if ($l) {  // Two ways to specify the module
     $lti = $DB->get_record('lti', array('id' => $cm->instance), '*', MUST_EXIST);
 }
 
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 $tool = lti_get_tool_by_url_match($lti->toolurl);
 if ($tool) {

diff --git a/mod/page/index.php b/mod/page/index.php
index 9843372..ac34897 100644 (file)
--- a/mod/page/index.php
+++ b/mod/page/index.php
@@ -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');

diff --git a/mod/page/view.php b/mod/page/view.php
index e04a2ec..b778643 100644 (file)
--- a/mod/page/view.php
+++ b/mod/page/view.php
@@ -45,7 +45,7 @@ if ($p) {
     $page = $DB->get_record('page', 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);

diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php
index df659ae..90155b7 100644 (file)
--- a/mod/quiz/attemptlib.php
+++ b/mod/quiz/attemptlib.php
@@ -108,7 +108,7 @@ class quiz {
         global $DB;
 
         $quiz = quiz_access_manager::load_quiz_and_settings($quizid);
-        $course = $DB->get_record('course', array('id' => $quiz->course), '*', MUST_EXIST);
+        $course = get_course($quiz->course);
         $cm = get_coursemodule_from_instance('quiz', $quiz->id, $course->id, false, MUST_EXIST);
 
         // Update quiz with override information.
@@ -489,7 +489,7 @@ class quiz_attempt {
 
         $attempt = $DB->get_record('quiz_attempts', $conditions, '*', MUST_EXIST);
         $quiz = quiz_access_manager::load_quiz_and_settings($attempt->quiz);
-        $course = $DB->get_record('course', array('id' => $quiz->course), '*', MUST_EXIST);
+        $course = get_course($quiz->course);
         $cm = get_coursemodule_from_instance('quiz', $quiz->id, $course->id, false, MUST_EXIST);
 
         // Update quiz with override information.

diff --git a/mod/quiz/cronlib.php b/mod/quiz/cronlib.php
index 175e5c6..8f74ba3 100644 (file)
--- a/mod/quiz/cronlib.php
+++ b/mod/quiz/cronlib.php
@@ -66,7 +66,7 @@ class mod_quiz_overdue_attempt_updater {
 
                 // If we have moved on to a different course, fetch the new data.
                 if (!$course || $course->id != $quiz->course) {
-                    $course = $DB->get_record('course', array('id' => $quiz->course), '*', MUST_EXIST);
+                    $course = get_course($quiz->course);
                 }
 
                 // Make a specialised version of the quiz settings, with the relevant overrides.

diff --git a/mod/quiz/grade.php b/mod/quiz/grade.php
index dd0c9f8..9e71e31 100644 (file)
--- a/mod/quiz/grade.php
+++ b/mod/quiz/grade.php
@@ -34,7 +34,7 @@ $id = required_param('id', PARAM_INT);
 $userid = optional_param('userid', 0, PARAM_INT);
 
 $cm = get_coursemodule_from_id('quiz', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $quiz = $DB->get_record('quiz', array('id' => $cm->instance), '*', MUST_EXIST);
 require_login($course, false, $cm);
 

diff --git a/mod/quiz/overridedelete.php b/mod/quiz/overridedelete.php
index 7528226..7abf7bd 100644 (file)
--- a/mod/quiz/overridedelete.php
+++ b/mod/quiz/overridedelete.php
@@ -40,7 +40,7 @@ if (! $quiz = $DB->get_record('quiz', array('id' => $override->quiz))) {
 if (! $cm = get_coursemodule_from_instance("quiz", $quiz->id, $quiz->course)) {
     print_error('invalidcoursemodule');
 }
-$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 $context = context_module::instance($cm->id);
 

diff --git a/mod/quiz/overrideedit.php b/mod/quiz/overrideedit.php
index b298780..2bd3de5 100644 (file)
--- a/mod/quiz/overrideedit.php
+++ b/mod/quiz/overrideedit.php
@@ -58,7 +58,7 @@ if ($overrideid) {
 } else {
     print_error('invalidcoursemodule');
 }
-$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 $url = new moodle_url('/mod/quiz/overrideedit.php');
 if ($action) {

diff --git a/mod/quiz/overrides.php b/mod/quiz/overrides.php
index e6a5d84..82a89a9 100644 (file)
--- a/mod/quiz/overrides.php
+++ b/mod/quiz/overrides.php
@@ -38,7 +38,7 @@ if (! $cm = get_coursemodule_from_id('quiz', $cmid)) {
 if (! $quiz = $DB->get_record('quiz', array('id' => $cm->instance))) {
     print_error('invalidcoursemodule');
 }
-$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 // Get the course groups.
 $groups = groups_get_all_groups($cm->course);

diff --git a/mod/resource/index.php b/mod/resource/index.php
index 3e9baf3..8524713 100644 (file)
--- a/mod/resource/index.php
+++ b/mod/resource/index.php
@@ -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');

diff --git a/mod/resource/view.php b/mod/resource/view.php
index 0fb05f4..6c901b4 100644 (file)
--- a/mod/resource/view.php
+++ b/mod/resource/view.php
@@ -47,7 +47,7 @@ if ($r) {
     $resource = $DB->get_record('resource', 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);

diff --git a/mod/scorm/datamodels/sequencinghandler.php b/mod/scorm/datamodels/sequencinghandler.php
index f1de51b..bb3377f 100644 (file)
--- a/mod/scorm/datamodels/sequencinghandler.php
+++ b/mod/scorm/datamodels/sequencinghandler.php
@@ -26,11 +26,11 @@ $request = optional_param('request', '', PARAM_RAW);  // Scorm ID.
 
 if (!empty($id)) {
     $cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
-    $course = $DB->get_record("course", array("id" => $cm->course), '*', MUST_EXIST);
+    $course = get_course($cm->course);
     $scorm = $DB->get_record("scorm", array("id" => $cm->instance), '*', MUST_EXIST);
 } else if (!empty($a)) {
     $scorm = $DB->get_record("scorm", array("id" => $a), '*', MUST_EXIST);
-    $course = $DB->get_record("course", array("id" => $scorm->course), '*', MUST_EXIST);
+    $course = get_course($scorm->course);
     $cm = get_coursemodule_from_instance("scorm", $scorm->id, $course->id, false, MUST_EXIST);
 } else {
     print_error('missingparameter');

diff --git a/mod/scorm/loaddatamodel.php b/mod/scorm/loaddatamodel.php
index 297375d..ff7a377 100644 (file)
--- a/mod/scorm/loaddatamodel.php
+++ b/mod/scorm/loaddatamodel.php
@@ -33,11 +33,11 @@ $attempt = required_param('attempt', PARAM_INT); // new attempt.
 
 if (!empty($id)) {
     $cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
-    $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
+    $course = get_course($cm->course);
     $scorm = $DB->get_record('scorm', array('id'=>$cm->instance), '*', MUST_EXIST);
 } else if (!empty($a)) {
     $scorm = $DB->get_record('scorm', array('id'=>$a), '*', MUST_EXIST);
-    $course = $DB->get_record('course', array('id'=>$scorm->course), '*', MUST_EXIST);
+    $course = get_course($scorm->course);
     $cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id, false, MUST_EXIST);
 } else {
     print_error('missingparameter');

diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index b2fedfb..bb53048 100644 (file)
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -33,7 +33,7 @@ $download = optional_param('download', '', PARAM_RAW);
 $mode = optional_param('mode', '', PARAM_ALPHA); // Report mode
 
 $cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 $scorm = $DB->get_record('scorm', array('id'=>$cm->instance), '*', MUST_EXIST);
 
 $contextmodule = context_module::instance($cm->id);

diff --git a/mod/scorm/report/graphs/graph.php b/mod/scorm/report/graphs/graph.php
index 3d9b7f4..d56e0e2 100644 (file)
--- a/mod/scorm/report/graphs/graph.php
+++ b/mod/scorm/report/graphs/graph.php
@@ -33,7 +33,7 @@ $scoid = required_param('scoid', PARAM_INT);// sco ID
 $sco = $DB->get_record('scorm_scoes', array('id'=>$scoid), '*', MUST_EXIST);
 $scorm = $DB->get_record('scorm', array('id'=>$sco->scorm), '*', MUST_EXIST);
 $cm = get_coursemodule_from_instance('scorm', $scorm->id, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id'=>$scorm->course), '*', MUST_EXIST);
+$course = get_course($scorm->course);
 
 
 // Capability Checks

diff --git a/mod/scorm/userreport.php b/mod/scorm/userreport.php
index 5a02c42..aa32174 100644 (file)
--- a/mod/scorm/userreport.php
+++ b/mod/scorm/userreport.php
@@ -44,7 +44,7 @@ if ($attempt !== '1') {
 if (!empty($id)) {
     $url->param('id', $id);
     $cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
-    $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+    $course = get_course($cm->course);
     $scorm = $DB->get_record('scorm', array('id' => $cm->instance), '*', MUST_EXIST);
 } else {
     if (!empty($b)) {
@@ -55,7 +55,7 @@ if (!empty($id)) {
     if (!empty($a)) {
         $url->param('a', $a);
         $scorm = $DB->get_record('scorm', array('id' => $a), '*', MUST_EXIST);
-        $course = $DB->get_record('course', array('id' => $scorm->course), '*', MUST_EXIST);
+        $course = get_course($scorm->course);
         $cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id, false, MUST_EXIST);
     }
 }

diff --git a/mod/url/index.php b/mod/url/index.php
index e5d096d..752a2c8 100644 (file)
--- a/mod/url/index.php
+++ b/mod/url/index.php
@@ -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');

diff --git a/mod/url/lib.php b/mod/url/lib.php
index 8433058..ad2b99f 100644 (file)
--- a/mod/url/lib.php
+++ b/mod/url/lib.php
@@ -306,7 +306,7 @@ function url_export_contents($cm, $baseurl) {
     $contents = array();
     $context = context_module::instance($cm->id);
 
-    $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
+    $course = get_course($cm->course);
     $url = $DB->get_record('url', array('id'=>$cm->instance), '*', MUST_EXIST);
 
     $fullurl = str_replace('&', '&', url_get_full_url($url, $cm, $course));

diff --git a/mod/url/view.php b/mod/url/view.php
index 7248394..614dc4d 100644 (file)
--- a/mod/url/view.php
+++ b/mod/url/view.php
@@ -41,7 +41,7 @@ if ($u) {  // Two ways to specify the module
     $url = $DB->get_record('url', 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);

diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index 873a921..d1fef98 100644 (file)
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -48,7 +48,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
 if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
     print_error('invalidcoursemodule');
 }
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }

diff --git a/mod/wiki/comments.php b/mod/wiki/comments.php
index f10fccb..749dd22 100644 (file)
--- a/mod/wiki/comments.php
+++ b/mod/wiki/comments.php
@@ -55,7 +55,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 require_login($course, true, $cm);
 

diff --git a/mod/wiki/create.php b/mod/wiki/create.php
index 971c26a..a79dd01 100644 (file)
--- a/mod/wiki/create.php
+++ b/mod/wiki/create.php
@@ -82,7 +82,7 @@ if (groups_get_activity_groupmode($cm)) {
     }
 }
 
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 require_login($course, true, $cm);
 

diff --git a/mod/wiki/diff.php b/mod/wiki/diff.php
index cdd354c..d4dba02 100644 (file)
--- a/mod/wiki/diff.php
+++ b/mod/wiki/diff.php
@@ -60,7 +60,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 if ($compare >= $comparewith) {
     print_error("A page version can only be compared with an older version.");

diff --git a/mod/wiki/edit.php b/mod/wiki/edit.php
index fa9da8e..7a85b48 100644 (file)
--- a/mod/wiki/edit.php
+++ b/mod/wiki/edit.php
@@ -66,7 +66,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section)) {
     print_error('invalidsection', 'wiki');

diff --git a/mod/wiki/editcomments.php b/mod/wiki/editcomments.php
index 13c9ebc..9f6cdf9 100644 (file)
--- a/mod/wiki/editcomments.php
+++ b/mod/wiki/editcomments.php
@@ -48,7 +48,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
 if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
     print_error('invalidcoursemodule');
 }
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }

diff --git a/mod/wiki/files.php b/mod/wiki/files.php
index 4ee6bc1..fdc8687 100644 (file)
--- a/mod/wiki/files.php
+++ b/mod/wiki/files.php
@@ -71,7 +71,7 @@ if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
 }
 
 // Checking course instance
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 $context = context_module::instance($cm->id);
 

diff --git a/mod/wiki/filesedit.php b/mod/wiki/filesedit.php
index c306eb1..809ccc4 100644 (file)
--- a/mod/wiki/filesedit.php
+++ b/mod/wiki/filesedit.php
@@ -48,7 +48,7 @@ if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
 }
 
 // Checking course instance
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 $context = context_module::instance($cm->id);
 

diff --git a/mod/wiki/history.php b/mod/wiki/history.php
index 6601022..df297ae 100644 (file)
--- a/mod/wiki/history.php
+++ b/mod/wiki/history.php
@@ -56,7 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 require_login($course, true, $cm);
 $context = context_module::instance($cm->id);

diff --git a/mod/wiki/instancecomments.php b/mod/wiki/instancecomments.php
index 1294c82..97a791c 100644 (file)
--- a/mod/wiki/instancecomments.php
+++ b/mod/wiki/instancecomments.php
@@ -54,7 +54,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
 if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
     print_error('invalidcoursemodule');
 }
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }

diff --git a/mod/wiki/lock.php b/mod/wiki/lock.php
index 97cd63c..ec705c8 100644 (file)
--- a/mod/wiki/lock.php
+++ b/mod/wiki/lock.php
@@ -60,7 +60,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section)) {
     print_error('invalidsection', 'wiki');

diff --git a/mod/wiki/map.php b/mod/wiki/map.php
index 745f724..58b0ee5 100644 (file)
--- a/mod/wiki/map.php
+++ b/mod/wiki/map.php
@@ -48,7 +48,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
 if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
     print_error('invalidcoursemodule');
 }
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }

diff --git a/mod/wiki/overridelocks.php b/mod/wiki/overridelocks.php
index 7af1f45..583a1d1 100644 (file)
--- a/mod/wiki/overridelocks.php
+++ b/mod/wiki/overridelocks.php
@@ -56,7 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section)) {
     print_error('invalidsection', 'wiki');

diff --git a/mod/wiki/prettyview.php b/mod/wiki/prettyview.php
index e208ecf..f92e7d0 100644 (file)
--- a/mod/wiki/prettyview.php
+++ b/mod/wiki/prettyview.php
@@ -46,7 +46,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
 if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
     print_error('invalidcoursemodule');
 }
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }

diff --git a/mod/wiki/restoreversion.php b/mod/wiki/restoreversion.php
index d5ad02c..4915057 100644 (file)
--- a/mod/wiki/restoreversion.php
+++ b/mod/wiki/restoreversion.php
@@ -56,7 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 require_login($course, true, $cm);
 

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index bbfd6f4..461dd07 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -66,7 +66,7 @@ if ($id) {
     }
 
     // Checking course instance
-    $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+    $course = get_course($cm->course);
 
     require_login($course, true, $cm);
 
@@ -138,7 +138,7 @@ if ($id) {
     $currentgroup = $subwiki->groupid;
 
     // Checking course instance
-    $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+    $course = get_course($cm->course);
 
     require_login($course, true, $cm);
     /*
@@ -169,7 +169,7 @@ if ($id) {
     }
 
     // Checking course instance
-    $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+    $course = get_course($cm->course);
 
     require_login($course, true, $cm);
 
@@ -252,7 +252,7 @@ if ($id) {
     //    }
     //
     //    // Checking course instance
-    //    $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
+    //    $course = get_course($cm->course);
     //
     //    // Checking course module instance
     //    if (!$cm = get_coursemodule_from_instance("wiki", $wiki->id, $course->id)) {

diff --git a/mod/wiki/viewversion.php b/mod/wiki/viewversion.php
index ecdd650..108e7c1 100644 (file)
--- a/mod/wiki/viewversion.php
+++ b/mod/wiki/viewversion.php
@@ -56,7 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 require_login($course, true, $cm);
 

diff --git a/mod/workshop/aggregate.php b/mod/workshop/aggregate.php
index ee8fb9b..3743d70 100644 (file)
--- a/mod/workshop/aggregate.php
+++ b/mod/workshop/aggregate.php
@@ -36,7 +36,7 @@ $sortby     = optional_param('sortby', 'lastname', PARAM_ALPHA);
 $sorthow    = optional_param('sorthow', 'ASC', PARAM_ALPHA);
 
 $cm         = get_coursemodule_from_id('workshop', $cmid, 0, false, MUST_EXIST);
-$course     = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course     = get_course($cm->course);
 $workshop   = $DB->get_record('workshop', array('id' => $cm->instance), '*', MUST_EXIST);
 $workshop   = new workshop($workshop, $cm, $course);
 

diff --git a/mod/workshop/allocation.php b/mod/workshop/allocation.php
index 33842a8..a4f1ff1 100644 (file)
--- a/mod/workshop/allocation.php
+++ b/mod/workshop/allocation.php
@@ -35,7 +35,7 @@ $cmid       = required_param('cmid', PARAM_INT);                    // course mo
 $method     = optional_param('method', 'manual', PARAM_ALPHA);      // method to use
 
 $cm         = get_coursemodule_from_id('workshop', $cmid, 0, false, MUST_EXIST);
-$course     = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course     = get_course($cm->course);
 $workshop   = $DB->get_record('workshop', array('id' => $cm->instance), '*', MUST_EXIST);
 $workshop   = new workshop($workshop, $cm, $course);
 

diff --git a/mod/workshop/allocation/scheduled/lib.php b/mod/workshop/allocation/scheduled/lib.php
index 8809e93..0e1fead 100644 (file)
--- a/mod/workshop/allocation/scheduled/lib.php
+++ b/mod/workshop/allocation/scheduled/lib.php
@@ -277,7 +277,7 @@ function workshopallocation_scheduled_cron() {
 
     foreach ($workshops as $workshop) {
         $cm = get_coursemodule_from_instance('workshop', $workshop->id, $workshop->course, false, MUST_EXIST);
-        $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+        $course = get_course($cm->course);
         $workshop = new workshop($workshop, $cm, $course);
         $allocator = $workshop->allocator_instance('scheduled');
         $result = $allocator->execute();

diff --git a/mod/workshop/assessment.php b/mod/workshop/assessment.php
index ddddfe0..f74b8ee 100644 (file)
--- a/mod/workshop/assessment.php
+++ b/mod/workshop/assessment.php
@@ -42,7 +42,7 @@ $asid       = required_param('asid', PARAM_INT);  // assessment id
 $assessment = $DB->get_record('workshop_assessments', array('id' => $asid), '*', MUST_EXIST);
 $submission = $DB->get_record('workshop_submissions', array('id' => $assessment->submissionid, 'example' => 0), '*', MUST_EXIST);
 $workshop   = $DB->get_record('workshop', array('id' => $submission->workshopid), '*', MUST_EXIST);
-$course     = $DB->get_record('course', array('id' => $workshop->course), '*', MUST_EXIST);
+$course     = get_course($workshop->course);
 $cm         = get_coursemodule_from_instance('workshop', $workshop->id, $course->id, false, MUST_EXIST);
 
 require_login($course, false, $cm);

diff --git a/mod/workshop/editform.php b/mod/workshop/editform.php
index 5c6d2f1..993c59b 100644 (file)
--- a/mod/workshop/editform.php
+++ b/mod/workshop/editform.php
@@ -30,7 +30,7 @@ require_once(dirname(__FILE__).'/locallib.php');
 $cmid       = required_param('cmid', PARAM_INT);
 
 $cm         = get_coursemodule_from_id('workshop', $cmid, 0, false, 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/workshop:editdimensions', $PAGE->context);

diff --git a/mod/workshop/editformpreview.php b/mod/workshop/editformpreview.php
index a1185d4..5614299 100644 (file)
--- a/mod/workshop/editformpreview.php
+++ b/mod/workshop/editformpreview.php
@@ -29,7 +29,7 @@ require_once(dirname(__FILE__).'/locallib.php');
 
 $cmid     = required_param('cmid', PARAM_INT);
 $cm       = get_coursemodule_from_id('workshop', $cmid, 0, false, MUST_EXIST);
-$course   = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course   = get_course($cm->course);
 $workshop = $DB->get_record('workshop', array('id' => $cm->instance), '*', MUST_EXIST);
 
 require_login($course, false, $cm);

diff --git a/mod/workshop/exassessment.php b/mod/workshop/exassessment.php
index 6112a41..48b9470 100644 (file)
--- a/mod/workshop/exassessment.php
+++ b/mod/workshop/exassessment.php
@@ -31,7 +31,7 @@ $asid       = required_param('asid', PARAM_INT);  // assessment id
 $assessment = $DB->get_record('workshop_assessments', array('id' => $asid), '*', MUST_EXIST);
 $example    = $DB->get_record('workshop_submissions', array('id' => $assessment->submissionid, 'example' => 1), '*', MUST_EXIST);
 $workshop   = $DB->get_record('workshop', array('id' => $example->workshopid), '*', MUST_EXIST);
-$course     = $DB->get_record('course', array('id' => $workshop->course), '*', MUST_EXIST);
+$course     = get_course($workshop->course);
 $cm         = get_coursemodule_from_instance('workshop', $workshop->id, $course->id, false, MUST_EXIST);
 
 require_login($course, false, $cm);

diff --git a/mod/workshop/excompare.php b/mod/workshop/excompare.php
index c5b972e..d1ecf04 100644 (file)
--- a/mod/workshop/excompare.php
+++ b/mod/workshop/excompare.php
@@ -32,7 +32,7 @@ $sid    = required_param('sid', PARAM_INT);     // example submission id
 $aid    = required_param('aid', PARAM_INT);     // the user's assessment id
 
 $cm     = get_coursemodule_from_id('workshop', $cmid, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 require_login($course, false, $cm);
 if (isguestuser()) {

diff --git a/mod/workshop/exsubmission.php b/mod/workshop/exsubmission.php
index 3a29bdf..eeadde9 100644 (file)
--- a/mod/workshop/exsubmission.php
+++ b/mod/workshop/exsubmission.php
@@ -35,7 +35,7 @@ $confirm    = optional_param('confirm', false, PARAM_BOOL); // example removal r
 $assess     = optional_param('assess', false, PARAM_BOOL);  // assessment required
 
 $cm         = get_coursemodule_from_id('workshop', $cmid, 0, false, MUST_EXIST);
-$course     = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course     = get_course($cm->course);
 
 require_login($course, false, $cm);
 if (isguestuser()) {

diff --git a/mod/workshop/index.php b/mod/workshop/index.php
index 263807a..48115af 100644 (file)
--- a/mod/workshop/index.php
+++ b/mod/workshop/index.php
@@ -29,7 +29,7 @@ require_once(dirname(__FILE__).'/lib.php');
 
 $id = required_param('id', PARAM_INT);   // course
 
-$course = $DB->get_record('course', array('id' => $id), '*', MUST_EXIST);
+$course = get_course($id);
 
 require_course_login($course);
 

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index b4ad846..de810e3 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -944,7 +944,7 @@ function workshop_cron() {
         require_once($CFG->dirroot.'/mod/workshop/locallib.php');
         foreach ($workshops as $workshop) {
             $cm = get_coursemodule_from_instance('workshop', $workshop->id, $workshop->course, false, MUST_EXIST);
-            $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+            $course = get_course($cm->course);
             $workshop = new workshop($workshop, $cm, $course);
             $workshop->switch_phase(workshop::PHASE_ASSESSMENT);
             $workshop->log('update switch phase', $workshop->view_url(), $workshop->phase);

diff --git a/mod/workshop/submission.php b/mod/workshop/submission.php
index 2b1c1e7..bd9e4b3 100644 (file)
--- a/mod/workshop/submission.php
+++ b/mod/workshop/submission.php
@@ -33,7 +33,7 @@ $edit   = optional_param('edit', false, PARAM_BOOL);    // open for editing?
 $assess = optional_param('assess', false, PARAM_BOOL);  // instant assessment required
 
 $cm     = get_coursemodule_from_id('workshop', $cmid, 0, false, MUST_EXIST);
-$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course = get_course($cm->course);
 
 require_login($course, false, $cm);
 if (isguestuser()) {

diff --git a/mod/workshop/switchphase.php b/mod/workshop/switchphase.php
index 11512e5..4bcae0c 100644 (file)
--- a/mod/workshop/switchphase.php
+++ b/mod/workshop/switchphase.php
@@ -32,7 +32,7 @@ $phase      = required_param('phase', PARAM_INT);           // the code of the n
 $confirm    = optional_param('confirm', false, PARAM_BOOL); // confirmation
 
 $cm         = get_coursemodule_from_id('workshop', $cmid, 0, false, MUST_EXIST);
-$course     = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course     = get_course($cm->course);
 $workshop   = $DB->get_record('workshop', array('id' => $cm->instance), '*', MUST_EXIST);
 $workshop   = new workshop($workshop, $cm, $course);
 

diff --git a/mod/workshop/toolbox.php b/mod/workshop/toolbox.php
index a9f33d1..4338298 100644 (file)
--- a/mod/workshop/toolbox.php
+++ b/mod/workshop/toolbox.php
@@ -31,7 +31,7 @@ $id         = required_param('id', PARAM_INT); // course_module ID
 $tool       = required_param('tool', PARAM_ALPHA);
 
 $cm         = get_coursemodule_from_id('workshop', $id, 0, false, MUST_EXIST);
-$course     = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+$course     = get_course($cm->course);
 $workshop   = $DB->get_record('workshop', array('id' => $cm->instance), '*', MUST_EXIST);
 
 require_login($course, false, $cm);

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 37168ce..1cce49f 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -42,11 +42,11 @@ $eval       = optional_param('eval', null, PARAM_PLUGIN);
 
 if ($id) {
     $cm         = get_coursemodule_from_id('workshop', $id, 0, false, MUST_EXIST);
-    $course     = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+    $course     = get_course($cm->course);
     $workshop   = $DB->get_record('workshop', array('id' => $cm->instance), '*', MUST_EXIST);
 } else {
     $workshop   = $DB->get_record('workshop', array('id' => $w), '*', MUST_EXIST);
-    $course     = $DB->get_record('course', array('id' => $workshop->course), '*', MUST_EXIST);
+    $course     = get_course($workshop->course);
     $cm         = get_coursemodule_from_instance('workshop', $workshop->id, $course->id, false, MUST_EXIST);
 }
 

diff --git a/notes/index.php b/notes/index.php
index 62c01b9..41a64a0 100644 (file)
--- a/notes/index.php
+++ b/notes/index.php
@@ -39,7 +39,7 @@ if (empty($courseid)) {
 }
 
 /// locate course information
-$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+$course = get_course($courseid);
 
 /// locate user information
 if ($userid) {

diff --git a/report/completion/index.php b/report/completion/index.php
index e80bb56..1da2665 100644 (file)
--- a/report/completion/index.php
+++ b/report/completion/index.php
@@ -44,7 +44,7 @@ $sort = optional_param('sort','',PARAM_ALPHA);
 $edituser = optional_param('edituser', 0, PARAM_INT);
 
 
-$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
+$course = get_course($courseid);
 $context = context_course::instance($course->id);
 
 $url = new moodle_url('/report/completion/index.php', array('course'=>$course->id));

diff --git a/report/completion/user.php b/report/completion/user.php
index 7100df8..e037758 100644 (file)
--- a/report/completion/user.php
+++ b/report/completion/user.php
@@ -31,7 +31,7 @@ $userid   = required_param('id', PARAM_INT);
 $courseid = required_param('course', PARAM_INT);
 
 $user = $DB->get_record('user', array('id'=>$userid, 'deleted'=>0), '*', MUST_EXIST);
-$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+$course = get_course($courseid);
 
 $coursecontext   = context_course::instance($course->id);
 $personalcontext = context_user::instance($user->id);

diff --git a/report/log/graph.php b/report/log/graph.php
index 58a49cb..e2813a6 100644 (file)
--- a/report/log/graph.php
+++ b/report/log/graph.php
@@ -40,7 +40,7 @@ if ($type !== "usercourse.png" and $type !== "userday.png") {
     $type = 'userday.png';
 }
 
-$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);
 
 $coursecontext   = context_course::instance($course->id);

diff --git a/report/log/index.php b/report/log/index.php
index 6c0e7ed..4d3f222 100644 (file)
--- a/report/log/index.php
+++ b/report/log/index.php
@@ -100,7 +100,7 @@ $PAGE->set_url('/report/log/index.php', $params);
 $PAGE->set_pagelayout('report');
 
 if ($hostid == $CFG->mnet_localhost_id) {
-    $course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
+    $course = get_course($id);
 
 } else {
     $course_stub       = $DB->get_record('mnet_log', array('hostid'=>$hostid, 'course'=>$id), '*', true);

diff --git a/report/log/user.php b/report/log/user.php
index 32ed582..8afaede 100644 (file)
--- a/report/log/user.php
+++ b/report/log/user.php
@@ -36,7 +36,7 @@ if ($mode !== 'today' and $mode !== 'all') {
 }
 
 $user = $DB->get_record('user', array('id'=>$userid, 'deleted'=>0), '*', MUST_EXIST);
-$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+$course = get_course($courseid);
 
 $coursecontext   = context_course::instance($course->id);
 $personalcontext = context_user::instance($user->id);

diff --git a/report/loglive/index.php b/report/loglive/index.php
index 782679b..fc6cb51 100644 (file)
--- a/report/loglive/index.php
+++ b/report/loglive/index.php
@@ -36,7 +36,7 @@ $id      = optional_param('id', $SITE->id, PARAM_INT);
 $page    = optional_param('page', 0, PARAM_INT);
 $inpopup = optional_param('inpopup', 0, PARAM_BOOL);
 
-$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
+$course = get_course($id);
 
 require_login($course);
 

diff --git a/report/outline/index.php b/report/outline/index.php
index 592c60b..0ba3819 100644 (file)
--- a/report/outline/index.php
+++ b/report/outline/index.php
@@ -28,7 +28,7 @@ require_once($CFG->dirroot.'/report/outline/locallib.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('/report/outline/index.php', array('id'=>$id));
 $PAGE->set_pagelayout('report');

diff --git a/report/outline/user.php b/report/outline/user.php
index d191861..668e801 100644 (file)
--- a/report/outline/user.php
+++ b/report/outline/user.php
@@ -35,7 +35,7 @@ if ($mode !== 'complete' and $mode !== 'outline') {
 }
 
 $user = $DB->get_record('user', array('id'=>$userid, 'deleted'=>0), '*', MUST_EXIST);
-$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+$course = get_course($courseid);
 
 $coursecontext   = context_course::instance($course->id);
 $personalcontext = context_user::instance($user->id);

diff --git a/report/stats/graph.php b/report/stats/graph.php
index f45a587..21ee319 100644 (file)
--- a/report/stats/graph.php
+++ b/report/stats/graph.php
@@ -37,7 +37,7 @@ $roleid   = optional_param('roleid',0,PARAM_INT);
 $url = new moodle_url('/report/stats/graph.php', array('course'=>$courseid, 'report'=>$report, 'time'=>$time, 'mode'=>$mode, 'userid'=>$userid, 'roleid'=>$roleid));
 $PAGE->set_url($url);
 
-$course = $DB->get_record("course", array("id"=>$courseid), '*', MUST_EXIST);
+$course = get_course($courseid);
 $coursecontext   = context_course::instance($course->id);
 $PAGE->set_context($coursecontext);
 

diff --git a/report/stats/user.php b/report/stats/user.php
index fce42e7..2c18eaf 100644 (file)
--- a/report/stats/user.php
+++ b/report/stats/user.php
@@ -30,7 +30,7 @@ $userid   = required_param('id', PARAM_INT);
 $courseid = required_param('course', PARAM_INT);
 
 $user = $DB->get_record('user', array('id'=>$userid, 'deleted'=>0), '*', MUST_EXIST);
-$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+$course = get_course($courseid);
 
 $coursecontext   = context_course::instance($course->id);
 $personalcontext = context_user::instance($user->id);

diff --git a/user/editadvanced.php b/user/editadvanced.php
index 9409937..77f57f4 100644 (file)
--- a/user/editadvanced.php
+++ b/user/editadvanced.php
@@ -38,7 +38,7 @@ $course = optional_param('course', SITEID, PARAM_INT);   // course id (defaults
 
 $PAGE->set_url('/user/editadvanced.php', array('course'=>$course, 'id'=>$id));
 
-$course = $DB->get_record('course', array('id'=>$course), '*', MUST_EXIST);
+$course = get_course($course);
 
 if (!empty($USER->newadminuser)) {
     $PAGE->set_course($SITE);

diff --git a/user/index.php b/user/index.php
index 8130981..e5e9ea5 100644 (file)
--- a/user/index.php
+++ b/user/index.php
@@ -38,9 +38,9 @@
         if ($context->contextlevel != CONTEXT_COURSE) {
             print_error('invalidcontext');
         }
-        $course = $DB->get_record('course', array('id'=>$context->instanceid), '*', MUST_EXIST);
+        $course = get_course($context->instanceid);
     } else {
-        $course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+        $course = get_course($courseid);
         $context = context_course::instance($course->id, MUST_EXIST);
     }
     // not needed anymore

diff --git a/user/repository.php b/user/repository.php
index daa6de0..4826102 100644 (file)
--- a/user/repository.php
+++ b/user/repository.php
@@ -35,7 +35,7 @@ if ($config !== 0) {
 }
 $PAGE->set_url($url);
 
-$course = $DB->get_record("course", array("id"=>$course), '*', MUST_EXIST);
+$course = get_course($course);
 
 $user = $USER;
 $baseurl = $CFG->wwwroot . '/user/repository.php';

diff --git a/user/view.php b/user/view.php
index 27df57e..24bf47b 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -43,7 +43,7 @@ if ($courseid == SITEID) {   // Since Moodle 2.0 all site-level profiles are sho
 $PAGE->set_url('/user/view.php', array('id'=>$id,'course'=>$courseid));
 
 $user = $DB->get_record('user', array('id'=>$id), '*', MUST_EXIST);
-$course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+$course = get_course($courseid);
 $currentuser = ($user->id == $USER->id);
 
 $systemcontext = context_system::instance();