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

Conflicts:
	course/lib.php

admin/roles/assign.php

@@ -39,7 +39,7 @@
 } 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);

admin/roles/check.php

@@ -35,7 +35,7 @@
 } 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);

admin/roles/override.php

@@ -36,7 +36,7 @@
 } 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);

admin/roles/permissions.php

@@ -43,7 +43,7 @@
 } 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);

admin/roles/usersroles.php

@@ -32,7 +32,7 @@
 
 // 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);

backup/backup.php

@@ -40,7 +40,7 @@
 
 $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);

backup/import.php

@@ -17,7 +17,7 @@
 $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 @@
 }
 
 // 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

backup/moodle2/backup_section_task.class.php

@@ -148,7 +148,7 @@ protected function define_settings() {
         // 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';

backup/moodle2/restore_stepslib.php

@@ -1422,7 +1422,7 @@ public function process_course($data) {
         }
 
         // Course record ready, update it
-        $DB->update_record('course', $data);
+        update_course_record($data);
 
         course_get_format($data)->update_course_format_options($data);
 
@@ -1632,7 +1632,7 @@ class restore_default_enrolments_step extends restore_execution_step {
     public function define_execution() {
         global $DB;
 
-        $course = $DB->get_record('course', array('id'=>$this->get_courseid()), '*', MUST_EXIST);
+        $course = get_course($this->get_courseid());
 
         if ($DB->record_exists('enrol', array('courseid'=>$this->get_courseid(), 'enrol'=>'manual'))) {
             // Something already added instances, do not add default instances.
@@ -1849,7 +1849,7 @@ protected function define_execution() {
             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);
         }

backup/util/checks/backup_check.class.php

@@ -109,7 +109,7 @@ public static function check_security($backup_controller, $apply) {
         $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 :

blocks/community/communitycourse.php

@@ -34,7 +34,7 @@
 
 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);

blocks/completionstatus/details.php

@@ -32,7 +32,7 @@
 $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) {

blocks/rss_client/editfeed.php

@@ -154,7 +154,7 @@ public static function autodiscover_feed_url($url){
     $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 {

blocks/rss_client/managefeeds.php

@@ -36,7 +36,7 @@
     $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 {

blocks/rss_client/viewfeed.php

@@ -39,7 +39,7 @@
     $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 {

calendar/event.php

@@ -81,7 +81,7 @@
 $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 {

calendar/lib.php

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

calendar/preferences.php

@@ -7,7 +7,7 @@
 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');

course/changenumsections.php

@@ -30,7 +30,7 @@
 
 $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));

course/dnduploadlib.php

@@ -460,7 +460,7 @@ public function __construct($courseid, $section, $type, $modulename) {
             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);

course/editsection.php

@@ -33,7 +33,7 @@
 $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);

course/externallib.php

@@ -67,15 +67,15 @@ public static function get_course_contents_parameters() {
      * @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
         $params = self::validate_parameters(self::get_course_contents_parameters(),
                         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 @@ public static function delete_courses($courseids) {
         $transaction = $DB->start_delegated_transaction();
 
         foreach ($params['courseids'] as $courseid) {
-            $course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
+            $course = get_course($courseid);
 
             // Check if the context is valid.
             $coursecontext = context_course::instance($course->id);
@@ -1077,13 +1077,13 @@ public static function duplicate_course($courseid, $fullname, $shortname, $categ
         $rc->execute_plan();
         $rc->destroy();
 
-        $course = $DB->get_record('course', array('id' => $newcourseid), '*', MUST_EXIST);
+        $course = get_course($newcourseid);
         $course->fullname = $params['fullname'];
         $course->shortname = $params['shortname'];
         $course->visible = $params['visible'];
 
         // Set shortname and fullname back.
-        $DB->update_record('course', $course);
+        update_course_record($course);
 
         if (empty($CFG->keeptempdirectoriesonbackup)) {
             fulldelete($backupbasepath);

course/lib.php

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

course/loginas.php

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

course/manage.php

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